diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-17 22:16:30 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-17 22:16:30 -0400 |
| commit | c71327ad9f925a4ddbf24db80ce66165104c4ed0 (patch) | |
| tree | a1560ddfb827d580843d2a32ba19fb0fc85490d8 /arch/parisc/mm/init.c | |
| parent | f507cd22035fdadd5dbb476dd05e9e7ee21c3b84 (diff) | |
| parent | a4bd6a93c3f14691c8a29e53eb04dc734b27f0db (diff) | |
Merge commit 'gcl/merge' into merge
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 | ||