diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-10-28 14:32:56 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-10-28 14:32:56 -0700 |
| commit | c87ff94333642ce3db4fc0857ad1f723cb42c1dd (patch) | |
| tree | 9577010b5ca20b692904c4728b305a9cbde5373e /arch/ia64/mm/init.c | |
| parent | 556902cd2d2cfdc54fe1f1d7f3ac5e2eb276ac09 (diff) | |
| parent | 1e5c936e3cc2ab745f66c0ae296c42f892ffd42a (diff) | |
Pull sparsemem-v5 into release branch
Diffstat (limited to 'arch/ia64/mm/init.c')
| -rw-r--r-- | arch/ia64/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index 1281c609ee9..98246acd499 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c @@ -593,7 +593,7 @@ mem_init (void) platform_dma_init(); #endif -#ifndef CONFIG_DISCONTIGMEM +#ifdef CONFIG_FLATMEM if (!mem_map) BUG(); max_mapnr = max_low_pfn; |