git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[pandora-kernel.git]
/
arch
/
sh
/
mm
/
numa.c
diff --git
a/arch/sh/mm/numa.c
b/arch/sh/mm/numa.c
index
a2e645f
..
3d85225
100644
(file)
--- a/
arch/sh/mm/numa.c
+++ b/
arch/sh/mm/numa.c
@@
-9,7
+9,7
@@
*/
#include <linux/module.h>
#include <linux/bootmem.h>
*/
#include <linux/module.h>
#include <linux/bootmem.h>
-#include <linux/
lmb
.h>
+#include <linux/
memblock
.h>
#include <linux/mm.h>
#include <linux/numa.h>
#include <linux/pfn.h>
#include <linux/mm.h>
#include <linux/numa.h>
#include <linux/pfn.h>
@@
-39,12
+39,12
@@
void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end)
pmb_bolt_mapping((unsigned long)__va(start), start, end - start,
PAGE_KERNEL);
pmb_bolt_mapping((unsigned long)__va(start), start, end - start,
PAGE_KERNEL);
-
lmb
_add(start, end - start);
+
memblock
_add(start, end - start);
__add_active_range(nid, start_pfn, end_pfn);
/* Node-local pgdat */
__add_active_range(nid, start_pfn, end_pfn);
/* Node-local pgdat */
- NODE_DATA(nid) = __va(
lmb
_alloc_base(sizeof(struct pglist_data),
+ NODE_DATA(nid) = __va(
memblock
_alloc_base(sizeof(struct pglist_data),
SMP_CACHE_BYTES, end));
memset(NODE_DATA(nid), 0, sizeof(struct pglist_data));
SMP_CACHE_BYTES, end));
memset(NODE_DATA(nid), 0, sizeof(struct pglist_data));
@@
-54,7
+54,7
@@
void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end)
/* Node-local bootmap */
bootmap_pages = bootmem_bootmap_pages(end_pfn - start_pfn);
/* Node-local bootmap */
bootmap_pages = bootmem_bootmap_pages(end_pfn - start_pfn);
- bootmem_paddr =
lmb
_alloc_base(bootmap_pages << PAGE_SHIFT,
+ bootmem_paddr =
memblock
_alloc_base(bootmap_pages << PAGE_SHIFT,
PAGE_SIZE, end);
init_bootmem_node(NODE_DATA(nid), bootmem_paddr >> PAGE_SHIFT,
start_pfn, end_pfn);
PAGE_SIZE, end);
init_bootmem_node(NODE_DATA(nid), bootmem_paddr >> PAGE_SHIFT,
start_pfn, end_pfn);