diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-16 20:57:41 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-16 20:57:41 +0100 |
| commit | dd7a5230cd651bfb119d222561c4032f30dd5659 (patch) | |
| tree | 85628ef75d1f512f43df6f760980b6cce6cf40c7 /drivers/xen | |
| parent | x86: remove duplicate #define from 'cpufeature.h' (diff) | |
| parent | Linux 2.6.28-rc8 (diff) | |
| download | linux-dd7a5230cd651bfb119d222561c4032f30dd5659.tar.xz linux-dd7a5230cd651bfb119d222561c4032f30dd5659.zip | |
Merge commit 'v2.6.28-rc8' into x86/cpufeature
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/balloon.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c index 8c83abc73400..526c191e84ea 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c @@ -41,7 +41,6 @@ #include <linux/pagemap.h> #include <linux/highmem.h> #include <linux/mutex.h> -#include <linux/highmem.h> #include <linux/list.h> #include <linux/sysdev.h> @@ -123,14 +122,7 @@ static struct timer_list balloon_timer; static void scrub_page(struct page *page) { #ifdef CONFIG_XEN_SCRUB_PAGES - if (PageHighMem(page)) { - void *v = kmap(page); - clear_page(v); - kunmap(v); - } else { - void *v = page_address(page); - clear_page(v); - } + clear_highpage(page); #endif } |