diff options
Diffstat (limited to 'arch/parisc')
-rw-r--r-- | arch/parisc/mm/init.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index b4d6c8777ed0..0ddf4904640a 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c | |||
@@ -36,7 +36,6 @@ extern int data_start; | |||
36 | 36 | ||
37 | #ifdef CONFIG_DISCONTIGMEM | 37 | #ifdef CONFIG_DISCONTIGMEM |
38 | struct node_map_data node_data[MAX_NUMNODES] __read_mostly; | 38 | struct node_map_data node_data[MAX_NUMNODES] __read_mostly; |
39 | bootmem_data_t bmem_data[MAX_NUMNODES] __read_mostly; | ||
40 | unsigned char pfnnid_map[PFNNID_MAP_MAX] __read_mostly; | 39 | unsigned char pfnnid_map[PFNNID_MAP_MAX] __read_mostly; |
41 | #endif | 40 | #endif |
42 | 41 | ||
@@ -262,7 +261,7 @@ static void __init setup_bootmem(void) | |||
262 | #ifdef CONFIG_DISCONTIGMEM | 261 | #ifdef CONFIG_DISCONTIGMEM |
263 | for (i = 0; i < MAX_PHYSMEM_RANGES; i++) { | 262 | for (i = 0; i < MAX_PHYSMEM_RANGES; i++) { |
264 | memset(NODE_DATA(i), 0, sizeof(pg_data_t)); | 263 | memset(NODE_DATA(i), 0, sizeof(pg_data_t)); |
265 | NODE_DATA(i)->bdata = &bmem_data[i]; | 264 | NODE_DATA(i)->bdata = &bootmem_node_data[i]; |
266 | } | 265 | } |
267 | memset(pfnnid_map, 0xff, sizeof(pfnnid_map)); | 266 | memset(pfnnid_map, 0xff, sizeof(pfnnid_map)); |
268 | 267 | ||