From febada3c3425ca745d064df4cf8249b2d48052f3 Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Mon, 28 Apr 2008 02:12:51 -0700 Subject: [PATCH] --- yaml --- r: 94015 b: refs/heads/master c: d60cd46bbdc5a79d9a177e40009f960e44f0e334 h: refs/heads/master i: 94013: eb6a15c952afbd5eb340470217c54aafe2d81ac5 94011: c3b80c9cbe35691a80fc91d4fa0db045be32db53 94007: 13c7b5548874078681372ce46779e593e8f630f1 93999: 02a085846f021e9ba7b4740d7d115bfa475865e3 93983: 48247f194a3b6d7992ff43b9afdda623b2607de7 93951: 3d9b405d9b2ce5763867608ebcee5ab3f826f2f6 v: v3 --- [refs] | 2 +- trunk/arch/x86/xen/mmu.c | 4 ++-- trunk/include/linux/page-flags.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 59bfdbc4ed20..ae94c580d961 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a1e7f777f613bf0df99c7772fa2123d01ce2f7d +refs/heads/master: d60cd46bbdc5a79d9a177e40009f960e44f0e334 diff --git a/trunk/arch/x86/xen/mmu.c b/trunk/arch/x86/xen/mmu.c index 6cbcf65609ad..126766d43aea 100644 --- a/trunk/arch/x86/xen/mmu.c +++ b/trunk/arch/x86/xen/mmu.c @@ -387,7 +387,7 @@ static void xen_do_pin(unsigned level, unsigned long pfn) static int pin_page(struct page *page, enum pt_level level) { - unsigned pgfl = test_and_set_bit(PG_pinned, &page->flags); + unsigned pgfl = TestSetPagePinned(page); int flush; if (pgfl) @@ -468,7 +468,7 @@ void __init xen_mark_init_mm_pinned(void) static int unpin_page(struct page *page, enum pt_level level) { - unsigned pgfl = test_and_clear_bit(PG_pinned, &page->flags); + unsigned pgfl = TestClearPagePinned(page); if (pgfl && !PageHighMem(page)) { void *pt = lowmem_page_address(page); diff --git a/trunk/include/linux/page-flags.h b/trunk/include/linux/page-flags.h index ed7659adfaaf..3cafd878e4ca 100644 --- a/trunk/include/linux/page-flags.h +++ b/trunk/include/linux/page-flags.h @@ -159,7 +159,7 @@ PAGEFLAG(LRU, lru) __CLEARPAGEFLAG(LRU, lru) PAGEFLAG(Active, active) __CLEARPAGEFLAG(Active, active) __PAGEFLAG(Slab, slab) PAGEFLAG(Checked, checked) /* Used by some filesystems */ -PAGEFLAG(Pinned, pinned) /* Xen pinned pagetable */ +PAGEFLAG(Pinned, pinned) TESTSCFLAG(Pinned, pinned) /* Xen pagetable */ PAGEFLAG(Reserved, reserved) __CLEARPAGEFLAG(Reserved, reserved) PAGEFLAG(Private, private) __CLEARPAGEFLAG(Private, private) __SETPAGEFLAG(Private, private)