From 61abd63397f6335a6fc08afaa4d14c4c7401c2b4 Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Wed, 25 Jul 2007 20:22:23 -0700 Subject: [PATCH] Fix PAGE SIZE assumption in miscellaneous places Fix PAGE SIZE assumption in miscellaneous places. Signed-off-by: Christoph Lameter --- kernel/futex.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: linux-2.6/kernel/futex.c =================================================================== --- linux-2.6.orig/kernel/futex.c 2007-09-05 01:19:50.000000000 -0700 +++ linux-2.6/kernel/futex.c 2007-09-05 01:37:04.000000000 -0700 @@ -258,7 +258,8 @@ int get_futex_key(u32 __user *uaddr, str err = get_user_pages(current, mm, address, 1, 0, 0, &page, NULL); if (err >= 0) { key->shared.pgoff = - page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT); + page->index << + (page_cache_page_shift(page) - PAGE_SHIFT); put_page(page); return 0; }