diff options
author | Franck Bui-Huu <vagabon.xyz@gmail.com> | 2006-09-26 02:31:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-26 11:48:45 -0400 |
commit | 2d1a07d487d8b36658404839cdf03a974968cefd (patch) | |
tree | 1123ffc446b5e118d93c03d773f8b3815166c4ef /include/linux | |
parent | 91023300057e96de7f46e95166a3e02394ae72f9 (diff) |
[PATCH] bootmem: remove useless __init in header file
__init in headers is pretty useless because the compiler doesn't check it, and
they get out of sync relatively frequently. So if you see an __init in a
header file, it's quite unreliable and you need to check the definition
anyway.
Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/bootmem.h | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h index e319c649e4fd..c7124d4ce7cf 100644 --- a/include/linux/bootmem.h +++ b/include/linux/bootmem.h | |||
@@ -41,23 +41,23 @@ typedef struct bootmem_data { | |||
41 | struct list_head list; | 41 | struct list_head list; |
42 | } bootmem_data_t; | 42 | } bootmem_data_t; |
43 | 43 | ||
44 | extern unsigned long __init bootmem_bootmap_pages (unsigned long); | 44 | extern unsigned long bootmem_bootmap_pages (unsigned long); |
45 | extern unsigned long __init init_bootmem (unsigned long addr, unsigned long memend); | 45 | extern unsigned long init_bootmem (unsigned long addr, unsigned long memend); |
46 | extern void __init free_bootmem (unsigned long addr, unsigned long size); | 46 | extern void free_bootmem (unsigned long addr, unsigned long size); |
47 | extern void * __init __alloc_bootmem (unsigned long size, unsigned long align, unsigned long goal); | 47 | extern void * __alloc_bootmem (unsigned long size, unsigned long align, unsigned long goal); |
48 | extern void * __init __alloc_bootmem_nopanic (unsigned long size, unsigned long align, unsigned long goal); | 48 | extern void * __alloc_bootmem_nopanic (unsigned long size, unsigned long align, unsigned long goal); |
49 | extern void * __init __alloc_bootmem_low(unsigned long size, | 49 | extern void * __alloc_bootmem_low(unsigned long size, |
50 | unsigned long align, | 50 | unsigned long align, |
51 | unsigned long goal); | 51 | unsigned long goal); |
52 | extern void * __init __alloc_bootmem_low_node(pg_data_t *pgdat, | 52 | extern void * __alloc_bootmem_low_node(pg_data_t *pgdat, |
53 | unsigned long size, | 53 | unsigned long size, |
54 | unsigned long align, | 54 | unsigned long align, |
55 | unsigned long goal); | 55 | unsigned long goal); |
56 | extern void * __init __alloc_bootmem_core(struct bootmem_data *bdata, | 56 | extern void * __alloc_bootmem_core(struct bootmem_data *bdata, |
57 | unsigned long size, unsigned long align, unsigned long goal, | 57 | unsigned long size, unsigned long align, unsigned long goal, |
58 | unsigned long limit); | 58 | unsigned long limit); |
59 | #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE | 59 | #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE |
60 | extern void __init reserve_bootmem (unsigned long addr, unsigned long size); | 60 | extern void reserve_bootmem (unsigned long addr, unsigned long size); |
61 | #define alloc_bootmem(x) \ | 61 | #define alloc_bootmem(x) \ |
62 | __alloc_bootmem((x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)) | 62 | __alloc_bootmem((x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)) |
63 | #define alloc_bootmem_low(x) \ | 63 | #define alloc_bootmem_low(x) \ |
@@ -67,12 +67,12 @@ extern void __init reserve_bootmem (unsigned long addr, unsigned long size); | |||
67 | #define alloc_bootmem_low_pages(x) \ | 67 | #define alloc_bootmem_low_pages(x) \ |
68 | __alloc_bootmem_low((x), PAGE_SIZE, 0) | 68 | __alloc_bootmem_low((x), PAGE_SIZE, 0) |
69 | #endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */ | 69 | #endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */ |
70 | extern unsigned long __init free_all_bootmem (void); | 70 | extern unsigned long free_all_bootmem (void); |
71 | extern void * __init __alloc_bootmem_node (pg_data_t *pgdat, unsigned long size, unsigned long align, unsigned long goal); | 71 | extern void * __alloc_bootmem_node (pg_data_t *pgdat, unsigned long size, unsigned long align, unsigned long goal); |
72 | extern unsigned long __init init_bootmem_node (pg_data_t *pgdat, unsigned long freepfn, unsigned long startpfn, unsigned long endpfn); | 72 | extern unsigned long init_bootmem_node (pg_data_t *pgdat, unsigned long freepfn, unsigned long startpfn, unsigned long endpfn); |
73 | extern void __init reserve_bootmem_node (pg_data_t *pgdat, unsigned long physaddr, unsigned long size); | 73 | extern void reserve_bootmem_node (pg_data_t *pgdat, unsigned long physaddr, unsigned long size); |
74 | extern void __init free_bootmem_node (pg_data_t *pgdat, unsigned long addr, unsigned long size); | 74 | extern void free_bootmem_node (pg_data_t *pgdat, unsigned long addr, unsigned long size); |
75 | extern unsigned long __init free_all_bootmem_node (pg_data_t *pgdat); | 75 | extern unsigned long free_all_bootmem_node (pg_data_t *pgdat); |
76 | #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE | 76 | #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE |
77 | #define alloc_bootmem_node(pgdat, x) \ | 77 | #define alloc_bootmem_node(pgdat, x) \ |
78 | __alloc_bootmem_node((pgdat), (x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)) | 78 | __alloc_bootmem_node((pgdat), (x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)) |
@@ -94,14 +94,14 @@ static inline void *alloc_remap(int nid, unsigned long size) | |||
94 | extern unsigned long __meminitdata nr_kernel_pages; | 94 | extern unsigned long __meminitdata nr_kernel_pages; |
95 | extern unsigned long nr_all_pages; | 95 | extern unsigned long nr_all_pages; |
96 | 96 | ||
97 | extern void *__init alloc_large_system_hash(const char *tablename, | 97 | extern void * alloc_large_system_hash(const char *tablename, |
98 | unsigned long bucketsize, | 98 | unsigned long bucketsize, |
99 | unsigned long numentries, | 99 | unsigned long numentries, |
100 | int scale, | 100 | int scale, |
101 | int flags, | 101 | int flags, |
102 | unsigned int *_hash_shift, | 102 | unsigned int *_hash_shift, |
103 | unsigned int *_hash_mask, | 103 | unsigned int *_hash_mask, |
104 | unsigned long limit); | 104 | unsigned long limit); |
105 | 105 | ||
106 | #define HASH_HIGHMEM 0x00000001 /* Consider highmem? */ | 106 | #define HASH_HIGHMEM 0x00000001 /* Consider highmem? */ |
107 | #define HASH_EARLY 0x00000002 /* Allocating during early boot? */ | 107 | #define HASH_EARLY 0x00000002 /* Allocating during early boot? */ |