diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-11-25 14:52:56 +0100 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-11-25 14:52:56 +0100 |
| commit | 65d76f368295973a35d195c9b13053502a67b6bc (patch) | |
| tree | fa7d9204b2da01a9c53633dda789380cfcad38c6 /drivers/xen/balloon.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| download | linux-65d76f368295973a35d195c9b13053502a67b6bc.tar.xz linux-65d76f368295973a35d195c9b13053502a67b6bc.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
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 a0fb5eac407c..526c191e84ea 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 } |