diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 10:48:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 10:48:31 +0100 |
| commit | c032a2de4c1a82187e9a754511043be47c8a92b5 (patch) | |
| tree | 6d20bfcff683555b641a376ffdffb2dbc1f1599a /drivers/xen/balloon.c | |
| parent | 722024dbb74f3ea316c285c0a71a4512e113b0c4 (diff) | |
| parent | cbe9ee00cea58d1f77b172fe22a51080e90877f2 (diff) | |
Merge branch 'x86/cleanups' into x86/irq
[ merged x86/cleanups into x86/irq to enable a wider IRQ entry code
patch to be applied, which depends on a cleanup patch in x86/cleanups. ]
Diffstat (limited to 'drivers/xen/balloon.c')
| -rw-r--r-- | drivers/xen/balloon.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c index a0fb5eac407..526c191e84e 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c @@ -122,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 } |