mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-23 15:27:29 +00:00
lmb: rename to memblock
via following scripts FILES=$(find * -type f | grep -vE 'oprofile|[^K]config') sed -i \ -e 's/lmb/memblock/g' \ -e 's/LMB/MEMBLOCK/g' \ $FILES for N in $(find . -name lmb.[ch]); do M=$(echo $N | sed 's/lmb/memblock/g') mv $N $M done and remove some wrong change like lmbench and dlmb etc. also move memblock.c from lib/ to mm/ Suggested-by: Ingo Molnar <mingo@elte.hu> Acked-by: "H. Peter Anvin" <hpa@zytor.com> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
parent
1c5474a65b
commit
95f72d1ed4
72 changed files with 1025 additions and 1025 deletions
|
@ -36,7 +36,7 @@
|
|||
#include <linux/dma-mapping.h>
|
||||
#include <linux/vmalloc.h>
|
||||
#include <linux/suspend.h>
|
||||
#include <linux/lmb.h>
|
||||
#include <linux/memblock.h>
|
||||
#include <linux/gfp.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/prom.h>
|
||||
|
@ -232,7 +232,7 @@ static int __init dart_init(struct device_node *dart_node)
|
|||
* that to work around what looks like a problem with the HT bridge
|
||||
* prefetching into invalid pages and corrupting data
|
||||
*/
|
||||
tmp = lmb_alloc(DART_PAGE_SIZE, DART_PAGE_SIZE);
|
||||
tmp = memblock_alloc(DART_PAGE_SIZE, DART_PAGE_SIZE);
|
||||
dart_emptyval = DARTMAP_VALID | ((tmp >> DART_PAGE_SHIFT) &
|
||||
DARTMAP_RPNMASK);
|
||||
|
||||
|
@ -407,7 +407,7 @@ void __init alloc_dart_table(void)
|
|||
if (iommu_is_off)
|
||||
return;
|
||||
|
||||
if (!iommu_force_on && lmb_end_of_DRAM() <= 0x40000000ull)
|
||||
if (!iommu_force_on && memblock_end_of_DRAM() <= 0x40000000ull)
|
||||
return;
|
||||
|
||||
/* 512 pages (2MB) is max DART tablesize. */
|
||||
|
@ -416,7 +416,7 @@ void __init alloc_dart_table(void)
|
|||
* will blow up an entire large page anyway in the kernel mapping
|
||||
*/
|
||||
dart_tablebase = (unsigned long)
|
||||
abs_to_virt(lmb_alloc_base(1UL<<24, 1UL<<24, 0x80000000L));
|
||||
abs_to_virt(memblock_alloc_base(1UL<<24, 1UL<<24, 0x80000000L));
|
||||
|
||||
printk(KERN_INFO "DART table allocated at: %lx\n", dart_tablebase);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue