Signed-off-by: Christoph Lameter --- kernel/container.c | 4 ++-- kernel/futex.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) Index: vps/kernel/futex.c =================================================================== --- vps.orig/kernel/futex.c 2007-06-14 21:52:20.000000000 -0700 +++ vps/kernel/futex.c 2007-06-14 21:53:43.000000000 -0700 @@ -255,7 +255,7 @@ 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 << (compound_order(page) - PAGE_SHIFT); put_page(page); return 0; } Index: vps/kernel/container.c =================================================================== --- vps.orig/kernel/container.c 2007-06-14 21:53:57.000000000 -0700 +++ vps/kernel/container.c 2007-06-14 21:54:13.000000000 -0700 @@ -840,8 +840,8 @@ static int container_fill_super(struct s struct dentry *root; struct containerfs_root *hroot = options; - sb->s_blocksize = PAGE_CACHE_SIZE; - sb->s_blocksize_bits = PAGE_CACHE_SHIFT; + sb->s_blocksize = PAGE_SIZE; + sb->s_blocksize_bits = PAGE_SHIFT; sb->s_magic = CONTAINER_SUPER_MAGIC; sb->s_op = &container_ops; -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/