memblock, bootmem: restore goal for alloc_low

Yinghai Lu · torvalds · commit 07bacb3826d6 · 2014-01-30T16:56:54.000-08:00
Now we have memblock_virt_alloc_low to replace original bootmem api in
swiotlb.

But we should not use BOOTMEM_LOW_LIMIT for arch that does not support
CONFIG_NOBOOTMEM, as old api take 0.

| #define alloc_bootmem_low(x) \
|        __alloc_bootmem_low(x, SMP_CACHE_BYTES, 0)
|#define alloc_bootmem_low_pages_nopanic(x) \
|        __alloc_bootmem_low_nopanic(x, PAGE_SIZE, 0)

and we have
 #define BOOTMEM_LOW_LIMIT __pa(MAX_DMA_ADDRESS)
for CONFIG_NOBOOTMEM.

Restore goal to 0 to fix ia64 crash, that Tony found.

Signed-off-by: Yinghai Lu &lt;yinghai@kernel.org&gt;
Reported-by: Tony Luck &lt;tony.luck@gmail.com&gt;
Tested-by: Tony Luck &lt;tony.luck@intel.com&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h
@@ -264,15 +264,15 @@ static inline void * __init memblock_virt_alloc_low(
 {
 	if (!align)
 		align = SMP_CACHE_BYTES;
-	return __alloc_bootmem_low(size, align, BOOTMEM_LOW_LIMIT);
+	return __alloc_bootmem_low(size, align, 0);
 }
 
 static inline void * __init memblock_virt_alloc_low_nopanic(
 					phys_addr_t size, phys_addr_t align)
 {
 	if (!align)
 		align = SMP_CACHE_BYTES;
-	return __alloc_bootmem_low_nopanic(size, align, BOOTMEM_LOW_LIMIT);
+	return __alloc_bootmem_low_nopanic(size, align, 0);
 }
 
 static inline void * __init memblock_virt_alloc_from_nopanic(

Original file line number	Diff line number	Diff line change
`@@ -264,15 +264,15 @@ static inline void * __init memblock_virt_alloc_low(`
`264`	`264`	`{`
`265`	`265`	`if (!align)`
`266`	`266`	`align = SMP_CACHE_BYTES;`
`267`		`- return __alloc_bootmem_low(size, align, BOOTMEM_LOW_LIMIT);`
	`267`	`+ return __alloc_bootmem_low(size, align, 0);`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`static inline void * __init memblock_virt_alloc_low_nopanic(`
`271`	`271`	`phys_addr_t size, phys_addr_t align)`
`272`	`272`	`{`
`273`	`273`	`if (!align)`
`274`	`274`	`align = SMP_CACHE_BYTES;`
`275`		`- return __alloc_bootmem_low_nopanic(size, align, BOOTMEM_LOW_LIMIT);`
	`275`	`+ return __alloc_bootmem_low_nopanic(size, align, 0);`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`static inline void * __init memblock_virt_alloc_from_nopanic(`