diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 08:33:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 08:33:27 -0800 |
| commit | 7df446e7e043b2ba5fd5de42529f9d797e8b501a (patch) | |
| tree | 9fe970cca27f2352f1834d43bf3a259b737f9895 /arch/ia64/kernel | |
| parent | 8d3d81cf023f34fa42955ce0a6e77e7c340a9d9d (diff) | |
| parent | 6fb93a92ec2a012fa525499c330522bbb8c18d80 (diff) | |
| download | linux-7df446e7e043b2ba5fd5de42529f9d797e8b501a.tar.bz2 | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/kernel')
| -rw-r--r-- | arch/ia64/kernel/mca_drv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c index f081c60ab206..eb39bc9c133b 100644 --- a/arch/ia64/kernel/mca_drv.c +++ b/arch/ia64/kernel/mca_drv.c @@ -88,7 +88,7 @@ mca_page_isolate(unsigned long paddr) if (!ia64_phys_addr_valid(paddr)) return ISOLATE_NONE; - if (!pfn_valid(paddr)) + if (!pfn_valid(paddr >> PAGE_SHIFT)) return ISOLATE_NONE; /* convert physical address to physical page number */ @@ -108,6 +108,7 @@ mca_page_isolate(unsigned long paddr) return ISOLATE_NG; /* add attribute 'Reserved' and register the page */ + get_page(p); SetPageReserved(p); page_isolate[num_page_isolate++] = p; |