Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c6af5e9f8a57467df2e55e428316a43480174521

Authored by Johannes Weiner
Committed by Linus Torvalds
1 parent 9b81361631
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

bootmem: Move node allocation macros back to !HAVE_ARCH_BOOTMEM_NODE 

These got unintentionally moved, put them back as x86 provides its own
versions.

Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 4 additions and 5 deletions Side-by-side Diff

include/linux/bootmem.h
Diff comments   View file @ c6af5e9
... ... @@ -103,17 +103,16 @@
103 103 __alloc_bootmem(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
104 104 #define alloc_bootmem_low_pages(x) \
105 105 __alloc_bootmem_low(x, PAGE_SIZE, 0)
106   -#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */
107   -
108   -extern int reserve_bootmem_generic(unsigned long addr, unsigned long size,
109   - int flags);
110   -
111 106 #define alloc_bootmem_node(pgdat, x) \
112 107 __alloc_bootmem_node(pgdat, x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
113 108 #define alloc_bootmem_pages_node(pgdat, x) \
114 109 __alloc_bootmem_node(pgdat, x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
115 110 #define alloc_bootmem_low_pages_node(pgdat, x) \
116 111 __alloc_bootmem_low_node(pgdat, x, PAGE_SIZE, 0)
  112 +#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */
  113 +
  114 +extern int reserve_bootmem_generic(unsigned long addr, unsigned long size,
  115 + int flags);
117 116  
118 117 extern void *alloc_bootmem_section(unsigned long size,
119 118 unsigned long section_nr);