Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d60cd46b authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

pageflags: use proper page flag functions in Xen 



Xen uses bitops to manipulate page flags.  Make it use proper page flag
functions.

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Cc: Andy Whitcroft <apw@shadowen.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6a1e7f77

arch/x86/xen/mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

include/linux/page-flags.h

+1 −1
Original line number Diff line number Diff line
@@ -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)