diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-29 11:30:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-29 11:30:20 -0700 |
| commit | cab0d85c8dfcad4d799f9c294571440c6f1db091 (patch) | |
| tree | ba7b348832673f6c7433b9d7481bfcd415f7a7b5 /include/linux | |
| parent | 57ed609d4b64139b4d2cf5f3b4880a573a7905d2 (diff) | |
| parent | 3c5cffb66d8ea94832650fcb55194715b0229088 (diff) | |
| download | linux-stable-cab0d85c8dfcad4d799f9c294571440c6f1db091.tar.gz linux-stable-cab0d85c8dfcad4d799f9c294571440c6f1db091.tar.bz2 linux-stable-cab0d85c8dfcad4d799f9c294571440c6f1db091.zip | |
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/linux')
| -rw-r--r-- | include/linux/page-flags.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 79a6700b7162..6081493db68f 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, |