@@ -36,17 +36,6 @@ extern void free_bootmem_node(pg_data_t *pgdat,
36
36
extern void free_bootmem (unsigned long physaddr , unsigned long size );
37
37
extern void free_bootmem_late (unsigned long physaddr , unsigned long size );
38
38
39
- /*
40
- * Flags for reserve_bootmem (also if CONFIG_HAVE_ARCH_BOOTMEM_NODE,
41
- * the architecture-specific code should honor this).
42
- *
43
- * If flags is BOOTMEM_DEFAULT, then the return value is always 0 (success).
44
- * If flags contains BOOTMEM_EXCLUSIVE, then -EBUSY is returned if the memory
45
- * already was reserved.
46
- */
47
- #define BOOTMEM_DEFAULT 0
48
- #define BOOTMEM_EXCLUSIVE (1<<0)
49
-
50
39
extern void * __alloc_bootmem (unsigned long size ,
51
40
unsigned long align ,
52
41
unsigned long goal );
@@ -73,13 +62,6 @@ void *___alloc_bootmem_node_nopanic(pg_data_t *pgdat,
73
62
extern void * __alloc_bootmem_low (unsigned long size ,
74
63
unsigned long align ,
75
64
unsigned long goal ) __malloc ;
76
- void * __alloc_bootmem_low_nopanic (unsigned long size ,
77
- unsigned long align ,
78
- unsigned long goal ) __malloc ;
79
- extern void * __alloc_bootmem_low_node (pg_data_t * pgdat ,
80
- unsigned long size ,
81
- unsigned long align ,
82
- unsigned long goal ) __malloc ;
83
65
84
66
/* We are using top down, so it is safe to use 0 here */
85
67
#define BOOTMEM_LOW_LIMIT 0
@@ -92,8 +74,6 @@ extern void *__alloc_bootmem_low_node(pg_data_t *pgdat,
92
74
__alloc_bootmem(x, SMP_CACHE_BYTES, BOOTMEM_LOW_LIMIT)
93
75
#define alloc_bootmem_align (x , align ) \
94
76
__alloc_bootmem(x, align, BOOTMEM_LOW_LIMIT)
95
- #define alloc_bootmem_nopanic (x ) \
96
- __alloc_bootmem_nopanic(x, SMP_CACHE_BYTES, BOOTMEM_LOW_LIMIT)
97
77
#define alloc_bootmem_pages (x ) \
98
78
__alloc_bootmem(x, PAGE_SIZE, BOOTMEM_LOW_LIMIT)
99
79
#define alloc_bootmem_pages_nopanic (x ) \
@@ -104,17 +84,11 @@ extern void *__alloc_bootmem_low_node(pg_data_t *pgdat,
104
84
__alloc_bootmem_node_nopanic(pgdat, x, SMP_CACHE_BYTES, BOOTMEM_LOW_LIMIT)
105
85
#define alloc_bootmem_pages_node (pgdat , x ) \
106
86
__alloc_bootmem_node(pgdat, x, PAGE_SIZE, BOOTMEM_LOW_LIMIT)
107
- #define alloc_bootmem_pages_node_nopanic (pgdat , x ) \
108
- __alloc_bootmem_node_nopanic(pgdat, x, PAGE_SIZE, BOOTMEM_LOW_LIMIT)
109
87
110
88
#define alloc_bootmem_low (x ) \
111
89
__alloc_bootmem_low(x, SMP_CACHE_BYTES, 0)
112
- #define alloc_bootmem_low_pages_nopanic (x ) \
113
- __alloc_bootmem_low_nopanic(x, PAGE_SIZE, 0)
114
90
#define alloc_bootmem_low_pages (x ) \
115
91
__alloc_bootmem_low(x, PAGE_SIZE, 0)
116
- #define alloc_bootmem_low_pages_node (pgdat , x ) \
117
- __alloc_bootmem_low_node(pgdat, x, PAGE_SIZE, 0)
118
92
119
93
/* FIXME: use MEMBLOCK_ALLOC_* variants here */
120
94
#define BOOTMEM_ALLOC_ACCESSIBLE 0
0 commit comments