summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-29 11:30:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-29 11:30:20 -0700
commitcab0d85c8dfcad4d799f9c294571440c6f1db091 (patch)
treeba7b348832673f6c7433b9d7481bfcd415f7a7b5 /include
parent57ed609d4b64139b4d2cf5f3b4880a573a7905d2 (diff)
parent3c5cffb66d8ea94832650fcb55194715b0229088 (diff)
downloadop-kernel-dev-cab0d85c8dfcad4d799f9c294571440c6f1db091.zip
op-kernel-dev-cab0d85c8dfcad4d799f9c294571440c6f1db091.tar.gz
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] mm: fix mmu_gather rework [S390] mm: fix storage key handling
Diffstat (limited to 'include')
-rw-r--r--include/linux/page-flags.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 79a6700..6081493 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -308,7 +308,7 @@ static inline void SetPageUptodate(struct page *page)
{
#ifdef CONFIG_S390
if (!test_and_set_bit(PG_uptodate, &page->flags))
- page_set_storage_key(page_to_pfn(page), PAGE_DEFAULT_KEY, 0);
+ page_set_storage_key(page_to_phys(page), PAGE_DEFAULT_KEY, 0);
#else
/*
* Memory barrier must be issued before setting the PG_uptodate bit,
OpenPOWER on IntegriCloud