aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pretzel.yyz.us>2005-06-26 23:42:30 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-26 23:42:30 -0400
commitf45727d52d1581e9ff4df9d1a12a60789ad2d1eb (patch)
tree773ae25f98542e6d382c688f7e85e8137d065614 /arch/mips
parent4c925f452cfd16c690209e96821ee094e09a2404 (diff)
parent5696c1944a33b4434a9a1ebb6383b906afd43a10 (diff)
Merge /spare/repo/netdev-2.6/ branch 'ieee80211'
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/Kconfig8
-rw-r--r--arch/mips/configs/ip27_defconfig2
-rw-r--r--arch/mips/kernel/setup.c4
-rw-r--r--arch/mips/mm/init.c5
-rw-r--r--arch/mips/mm/pgtable.c2
-rw-r--r--arch/mips/sgi-ip27/ip27-memory.c5
6 files changed, 17 insertions, 9 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index ab9944693f1f..bd9de7b00c0a 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -492,7 +492,7 @@ config SGI_SN0_N_MODE
492 which allows for more memory. Your system is most probably 492 which allows for more memory. Your system is most probably
493 running in M-Mode, so you should say N here. 493 running in M-Mode, so you should say N here.
494 494
495config DISCONTIGMEM 495config ARCH_DISCONTIGMEM_ENABLE
496 bool 496 bool
497 default y if SGI_IP27 497 default y if SGI_IP27
498 help 498 help
@@ -1416,6 +1416,12 @@ config HIGHMEM
1416 bool "High Memory Support" 1416 bool "High Memory Support"
1417 depends on MIPS32 && (CPU_R3000 || CPU_SB1 || CPU_R7000 || CPU_RM9000 || CPU_R10000) && !(MACH_DECSTATION || MOMENCO_JAGUAR_ATX) 1417 depends on MIPS32 && (CPU_R3000 || CPU_SB1 || CPU_R7000 || CPU_RM9000 || CPU_R10000) && !(MACH_DECSTATION || MOMENCO_JAGUAR_ATX)
1418 1418
1419config ARCH_FLATMEM_ENABLE
1420 def_bool y
1421 depends on !NUMA
1422
1423source "mm/Kconfig"
1424
1419config SMP 1425config SMP
1420 bool "Multi-Processing support" 1426 bool "Multi-Processing support"
1421 depends on CPU_RM9000 || (SIBYTE_SB1250 && !SIBYTE_STANDALONE) || SGI_IP27 1427 depends on CPU_RM9000 || (SIBYTE_SB1250 && !SIBYTE_STANDALONE) || SGI_IP27
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig
index 13472292d0ec..b5bab3a42fc4 100644
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
@@ -82,7 +82,7 @@ CONFIG_STOP_MACHINE=y
82# CONFIG_SGI_IP22 is not set 82# CONFIG_SGI_IP22 is not set
83CONFIG_SGI_IP27=y 83CONFIG_SGI_IP27=y
84# CONFIG_SGI_SN0_N_MODE is not set 84# CONFIG_SGI_SN0_N_MODE is not set
85CONFIG_DISCONTIGMEM=y 85CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
86CONFIG_NUMA=y 86CONFIG_NUMA=y
87# CONFIG_MAPPED_KERNEL is not set 87# CONFIG_MAPPED_KERNEL is not set
88# CONFIG_REPLICATE_KTEXT is not set 88# CONFIG_REPLICATE_KTEXT is not set
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 6018ca25aceb..3a240e3e004c 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -33,6 +33,7 @@
33#include <linux/root_dev.h> 33#include <linux/root_dev.h>
34#include <linux/highmem.h> 34#include <linux/highmem.h>
35#include <linux/console.h> 35#include <linux/console.h>
36#include <linux/mmzone.h>
36 37
37#include <asm/addrspace.h> 38#include <asm/addrspace.h>
38#include <asm/bootinfo.h> 39#include <asm/bootinfo.h>
@@ -356,6 +357,8 @@ static inline void bootmem_init(void)
356 } 357 }
357#endif 358#endif
358 359
360 memory_present(0, first_usable_pfn, max_low_pfn);
361
359 /* Initialize the boot-time allocator with low memory only. */ 362 /* Initialize the boot-time allocator with low memory only. */
360 bootmap_size = init_bootmem(first_usable_pfn, max_low_pfn); 363 bootmap_size = init_bootmem(first_usable_pfn, max_low_pfn);
361 364
@@ -557,6 +560,7 @@ void __init setup_arch(char **cmdline_p)
557 560
558 parse_cmdline_early(); 561 parse_cmdline_early();
559 bootmem_init(); 562 bootmem_init();
563 sparse_init();
560 paging_init(); 564 paging_init();
561 resource_init(); 565 resource_init();
562} 566}
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index b027ce7efbc6..9c9a271c8a3a 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -128,7 +128,7 @@ static void __init fixrange_init(unsigned long start, unsigned long end,
128#endif /* CONFIG_MIPS64 */ 128#endif /* CONFIG_MIPS64 */
129#endif /* CONFIG_HIGHMEM */ 129#endif /* CONFIG_HIGHMEM */
130 130
131#ifndef CONFIG_DISCONTIGMEM 131#ifndef CONFIG_NEED_MULTIPLE_NODES
132extern void pagetable_init(void); 132extern void pagetable_init(void);
133 133
134void __init paging_init(void) 134void __init paging_init(void)
@@ -232,7 +232,6 @@ void __init mem_init(void)
232#ifdef CONFIG_LIMITED_DMA 232#ifdef CONFIG_LIMITED_DMA
233 set_page_address(page, lowmem_page_address(page)); 233 set_page_address(page, lowmem_page_address(page));
234#endif 234#endif
235 set_bit(PG_highmem, &page->flags);
236 set_page_count(page, 1); 235 set_page_count(page, 1);
237 __free_page(page); 236 __free_page(page);
238 totalhigh_pages++; 237 totalhigh_pages++;
@@ -254,7 +253,7 @@ void __init mem_init(void)
254 initsize >> 10, 253 initsize >> 10,
255 (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10))); 254 (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10)));
256} 255}
257#endif /* !CONFIG_DISCONTIGMEM */ 256#endif /* !CONFIG_NEED_MULTIPLE_NODES */
258 257
259#ifdef CONFIG_BLK_DEV_INITRD 258#ifdef CONFIG_BLK_DEV_INITRD
260void free_initrd_mem(unsigned long start, unsigned long end) 259void free_initrd_mem(unsigned long start, unsigned long end)
diff --git a/arch/mips/mm/pgtable.c b/arch/mips/mm/pgtable.c
index 3b88fdeef329..3fe94202da8c 100644
--- a/arch/mips/mm/pgtable.c
+++ b/arch/mips/mm/pgtable.c
@@ -5,7 +5,7 @@
5 5
6void show_mem(void) 6void show_mem(void)
7{ 7{
8#ifndef CONFIG_DISCONTIGMEM /* XXX(hch): later.. */ 8#ifndef CONFIG_NEED_MULTIPLE_NODES /* XXX(hch): later.. */
9 int pfn, total = 0, reserved = 0; 9 int pfn, total = 0, reserved = 0;
10 int shared = 0, cached = 0; 10 int shared = 0, cached = 0;
11 int highmem = 0; 11 int highmem = 0;
diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c
index 0a44a98d7adc..a160d04f7dbe 100644
--- a/arch/mips/sgi-ip27/ip27-memory.c
+++ b/arch/mips/sgi-ip27/ip27-memory.c
@@ -549,9 +549,8 @@ void __init mem_init(void)
549 */ 549 */
550 numslots = node_getlastslot(node); 550 numslots = node_getlastslot(node);
551 for (slot = 1; slot <= numslots; slot++) { 551 for (slot = 1; slot <= numslots; slot++) {
552 p = NODE_DATA(node)->node_mem_map + 552 p = nid_page_nr(node, slot_getbasepfn(node, slot) -
553 (slot_getbasepfn(node, slot) - 553 slot_getbasepfn(node, 0));
554 slot_getbasepfn(node, 0));
555 554
556 /* 555 /*
557 * Free valid memory in current slot. 556 * Free valid memory in current slot.