Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 94015
b: refs/heads/master
c: d60cd46
h: refs/heads/master
i:
  94013: eb6a15c
  94011: c3b80c9
  94007: 13c7b55
  93999: 02a0858
  93983: 48247f1
  93951: 3d9b405
v: v3
  • Loading branch information
Christoph Lameter authored and Linus Torvalds committed Apr 28, 2008
1 parent 4947a2c commit febada3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6a1e7f777f613bf0df99c7772fa2123d01ce2f7d
refs/heads/master: d60cd46bbdc5a79d9a177e40009f960e44f0e334
4 changes: 2 additions & 2 deletions trunk/arch/x86/xen/mmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/linux/page-flags.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit febada3

Please sign in to comment.