diff options
| author | Franck Bui-Huu <vagabon.xyz@gmail.com> | 2006-09-26 02:31:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-26 11:48:45 -0400 |
| commit | bb0923a66820718f636736b22ce47372f79e3400 (patch) | |
| tree | 56554098cb8cda63a1f805db211f1eea750befae /include/linux | |
| parent | 71fb2e8f8753b66b1f4295aa264a2eb4e69381e8 (diff) | |
[PATCH] bootmem: limit to 80 columns width
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 | 42 |
1 files changed, 29 insertions, 13 deletions
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h index fa2523f47628..1e8dddfb3083 100644 --- a/include/linux/bootmem.h +++ b/include/linux/bootmem.h | |||
| @@ -44,18 +44,24 @@ typedef struct bootmem_data { | |||
| 44 | extern unsigned long bootmem_bootmap_pages (unsigned long); | 44 | extern unsigned long bootmem_bootmap_pages (unsigned long); |
| 45 | extern unsigned long init_bootmem (unsigned long addr, unsigned long memend); | 45 | extern unsigned long init_bootmem (unsigned long addr, unsigned long memend); |
| 46 | extern void free_bootmem (unsigned long addr, unsigned long size); | 46 | extern void free_bootmem (unsigned long addr, unsigned long size); |
| 47 | extern void * __alloc_bootmem (unsigned long size, unsigned long align, unsigned long goal); | 47 | extern void * __alloc_bootmem (unsigned long size, |
| 48 | extern void * __alloc_bootmem_nopanic (unsigned long size, unsigned long align, unsigned long goal); | 48 | unsigned long align, |
| 49 | unsigned long goal); | ||
| 50 | extern void * __alloc_bootmem_nopanic (unsigned long size, | ||
| 51 | unsigned long align, | ||
| 52 | unsigned long goal); | ||
| 49 | extern void * __alloc_bootmem_low(unsigned long size, | 53 | extern void * __alloc_bootmem_low(unsigned long size, |
| 50 | unsigned long align, | 54 | unsigned long align, |
| 51 | unsigned long goal); | 55 | unsigned long goal); |
| 52 | extern void * __alloc_bootmem_low_node(pg_data_t *pgdat, | 56 | extern void * __alloc_bootmem_low_node(pg_data_t *pgdat, |
| 53 | unsigned long size, | 57 | unsigned long size, |
| 54 | unsigned long align, | 58 | unsigned long align, |
| 55 | unsigned long goal); | 59 | unsigned long goal); |
| 56 | extern void * __alloc_bootmem_core(struct bootmem_data *bdata, | 60 | extern void * __alloc_bootmem_core(struct bootmem_data *bdata, |
| 57 | unsigned long size, unsigned long align, unsigned long goal, | 61 | unsigned long size, |
| 58 | unsigned long limit); | 62 | unsigned long align, |
| 63 | unsigned long goal, | ||
| 64 | unsigned long limit); | ||
| 59 | #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE | 65 | #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE |
| 60 | extern void reserve_bootmem (unsigned long addr, unsigned long size); | 66 | extern void reserve_bootmem (unsigned long addr, unsigned long size); |
| 61 | #define alloc_bootmem(x) \ | 67 | #define alloc_bootmem(x) \ |
| @@ -68,10 +74,20 @@ extern void reserve_bootmem (unsigned long addr, unsigned long size); | |||
| 68 | __alloc_bootmem_low(x, PAGE_SIZE, 0) | 74 | __alloc_bootmem_low(x, PAGE_SIZE, 0) |
| 69 | #endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */ | 75 | #endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */ |
| 70 | extern unsigned long free_all_bootmem (void); | 76 | extern unsigned long free_all_bootmem (void); |
| 71 | extern void * __alloc_bootmem_node (pg_data_t *pgdat, unsigned long size, unsigned long align, unsigned long goal); | 77 | extern void * __alloc_bootmem_node (pg_data_t *pgdat, |
| 72 | extern unsigned long init_bootmem_node (pg_data_t *pgdat, unsigned long freepfn, unsigned long startpfn, unsigned long endpfn); | 78 | unsigned long size, |
| 73 | extern void reserve_bootmem_node (pg_data_t *pgdat, unsigned long physaddr, unsigned long size); | 79 | unsigned long align, |
| 74 | extern void free_bootmem_node (pg_data_t *pgdat, unsigned long addr, unsigned long size); | 80 | unsigned long goal); |
| 81 | extern unsigned long init_bootmem_node (pg_data_t *pgdat, | ||
| 82 | unsigned long freepfn, | ||
| 83 | unsigned long startpfn, | ||
| 84 | unsigned long endpfn); | ||
| 85 | extern void reserve_bootmem_node (pg_data_t *pgdat, | ||
| 86 | unsigned long physaddr, | ||
| 87 | unsigned long size); | ||
| 88 | extern void free_bootmem_node (pg_data_t *pgdat, | ||
| 89 | unsigned long addr, | ||
| 90 | unsigned long size); | ||
| 75 | extern unsigned long free_all_bootmem_node (pg_data_t *pgdat); | 91 | extern unsigned long free_all_bootmem_node (pg_data_t *pgdat); |
| 76 | #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE | 92 | #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE |
| 77 | #define alloc_bootmem_node(pgdat, x) \ | 93 | #define alloc_bootmem_node(pgdat, x) \ |