diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-19 18:51:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-19 18:51:56 -0800 |
| commit | 4f7dbc7ff4ec19b40ec083f7c54a87d3ece0089d (patch) | |
| tree | c37f34eee23ae96c78f72e445ad20f8fbcab010e /drivers | |
| parent | 9f92f4719764acf1c9185a5958200887a43e3483 (diff) | |
| parent | 73f56c0d35e6427081a4eabd620d8b8d8a35bd09 (diff) | |
| download | linux-4f7dbc7ff4ec19b40ec083f7c54a87d3ece0089d.tar.gz | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: more general identifier for Phoenix BIOS AMD IOMMU: check for next_bit also in unmapped area AMD IOMMU: fix fullflush comparison length AMD IOMMU: enable device isolation per default AMD IOMMU: add parameter to disable device isolation x86, PEBS/DS: fix code flow in ds_request() x86: add rdtsc barrier to TSC sync check xen: fix scrub_page() x86: fix es7000 compiling x86, bts: fix unlock problem in ds.c x86, voyager: fix smp generic helper voyager breakage x86: move iomap.h to the new include location
Diffstat (limited to 'drivers')
| -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 } |