Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 2d0aae41695257603fc281b519677131ab5a752b

Authored by Tejun Heo
1 parent c132937556
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

bootmem: reorder interface functions and add a missing one 

Impact: cleanup and addition of missing interface wrapper

The interface functions in bootmem.h was ordered in not so orderly
manner.  Reorder them such that

* functions allocating the same area group together -
  ie. alloc_bootmem group and alloc_bootmem_low group.

* functions w/o node parameter come before the ones w/ node parameter.

* nopanic variants are immediately below their panicky counterparts.

While at it, add alloc_bootmem_pages_node_nopanic() which was missing.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Johannes Weiner <hannes@saeurebad.de>

Showing 1 changed file with 17 additions and 13 deletions Side-by-side Diff

include/linux/bootmem.h
Diff comments   View file @ 2d0aae4
... ... @@ -65,22 +65,20 @@
65 65 #define BOOTMEM_DEFAULT 0
66 66 #define BOOTMEM_EXCLUSIVE (1<<0)
67 67  
68   -extern int reserve_bootmem_node(pg_data_t *pgdat,
69   - unsigned long physaddr,
70   - unsigned long size,
71   - int flags);
72 68 extern int reserve_bootmem(unsigned long addr,
73 69 unsigned long size,
74 70 int flags);
75   -extern void *__alloc_bootmem_nopanic(unsigned long size,
  71 +extern int reserve_bootmem_node(pg_data_t *pgdat,
  72 + unsigned long physaddr,
  73 + unsigned long size,
  74 + int flags);
  75 +
  76 +extern void *__alloc_bootmem(unsigned long size,
76 77 unsigned long align,
77 78 unsigned long goal);
78   -extern void *__alloc_bootmem(unsigned long size,
  79 +extern void *__alloc_bootmem_nopanic(unsigned long size,
79 80 unsigned long align,
80 81 unsigned long goal);
81   -extern void *__alloc_bootmem_low(unsigned long size,
82   - unsigned long align,
83   - unsigned long goal);
84 82 extern void *__alloc_bootmem_node(pg_data_t *pgdat,
85 83 unsigned long size,
86 84 unsigned long align,
... ... @@ -89,6 +87,9 @@
89 87 unsigned long size,
90 88 unsigned long align,
91 89 unsigned long goal);
  90 +extern void *__alloc_bootmem_low(unsigned long size,
  91 + unsigned long align,
  92 + unsigned long goal);
92 93 extern void *__alloc_bootmem_low_node(pg_data_t *pgdat,
93 94 unsigned long size,
94 95 unsigned long align,
95 96  
96 97  
... ... @@ -98,18 +99,21 @@
98 99 __alloc_bootmem(x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
99 100 #define alloc_bootmem_nopanic(x) \
100 101 __alloc_bootmem_nopanic(x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
101   -#define alloc_bootmem_low(x) \
102   - __alloc_bootmem_low(x, SMP_CACHE_BYTES, 0)
103 102 #define alloc_bootmem_pages(x) \
104 103 __alloc_bootmem(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
105 104 #define alloc_bootmem_pages_nopanic(x) \
106 105 __alloc_bootmem_nopanic(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
107   -#define alloc_bootmem_low_pages(x) \
108   - __alloc_bootmem_low(x, PAGE_SIZE, 0)
109 106 #define alloc_bootmem_node(pgdat, x) \
110 107 __alloc_bootmem_node(pgdat, x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
111 108 #define alloc_bootmem_pages_node(pgdat, x) \
112 109 __alloc_bootmem_node(pgdat, x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
  110 +#define alloc_bootmem_pages_node_nopanic(pgdat, x) \
  111 + __alloc_bootmem_node_nopanic(pgdat, x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
  112 +
  113 +#define alloc_bootmem_low(x) \
  114 + __alloc_bootmem_low(x, SMP_CACHE_BYTES, 0)
  115 +#define alloc_bootmem_low_pages(x) \
  116 + __alloc_bootmem_low(x, PAGE_SIZE, 0)
113 117 #define alloc_bootmem_low_pages_node(pgdat, x) \
114 118 __alloc_bootmem_low_node(pgdat, x, PAGE_SIZE, 0)
115 119