diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
| commit | 63fe46da9c380b3f2bbdf3765044649517cc717c (patch) | |
| tree | 9478c1aca1d692b408955aea20c9cd9a37e589c0 /arch/mips/kernel/setup.c | |
| parent | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (diff) | |
| parent | 066b2118976e6e7cc50eed39e2747c75343a23c4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
Diffstat (limited to 'arch/mips/kernel/setup.c')
| -rw-r--r-- | arch/mips/kernel/setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 39f3dfe134fb..c6a063b2a0d9 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c | |||
| @@ -331,6 +331,7 @@ static void __init bootmem_init(void) | |||
| 331 | /* | 331 | /* |
| 332 | * Determine low and high memory ranges | 332 | * Determine low and high memory ranges |
| 333 | */ | 333 | */ |
| 334 | max_pfn = max_low_pfn; | ||
| 334 | if (max_low_pfn > PFN_DOWN(HIGHMEM_START)) { | 335 | if (max_low_pfn > PFN_DOWN(HIGHMEM_START)) { |
| 335 | #ifdef CONFIG_HIGHMEM | 336 | #ifdef CONFIG_HIGHMEM |
| 336 | highstart_pfn = PFN_DOWN(HIGHMEM_START); | 337 | highstart_pfn = PFN_DOWN(HIGHMEM_START); |