diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-19 02:53:57 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-19 02:53:57 -0400 |
| commit | 0702b30dd821ac8a4103ddbe545518713fdca9be (patch) | |
| tree | 8ce0c9f5e58c5ccb99870505eecd139986caa05e /arch/parisc/mm/init.c | |
| parent | 192d7a4667c6d11d1a174ec4cad9a3c5d5f9043c (diff) | |
| parent | a1e4ee22863d41a6fbb24310d7951836cb6dafe7 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/parisc/mm/init.c')
| -rw-r--r-- | arch/parisc/mm/init.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index 7c155c254e72..9d704d9831d1 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c | |||
| @@ -304,10 +304,8 @@ static void __init setup_bootmem(void) | |||
| 304 | */ | 304 | */ |
| 305 | max_low_pfn = max_pfn; | 305 | max_low_pfn = max_pfn; |
| 306 | 306 | ||
| 307 | if ((bootmap_pfn - bootmap_start_pfn) != bootmap_pages) { | 307 | /* bootmap sizing messed up? */ |
| 308 | printk(KERN_WARNING "WARNING! bootmap sizing is messed up!\n"); | 308 | BUG_ON((bootmap_pfn - bootmap_start_pfn) != bootmap_pages); |
| 309 | BUG(); | ||
| 310 | } | ||
| 311 | 309 | ||
| 312 | /* reserve PAGE0 pdc memory, kernel text/data/bss & bootmap */ | 310 | /* reserve PAGE0 pdc memory, kernel text/data/bss & bootmap */ |
| 313 | 311 | ||