Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946268AbXBCCi4 (ORCPT ); Fri, 2 Feb 2007 21:38:56 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1946259AbXBCCil (ORCPT ); Fri, 2 Feb 2007 21:38:41 -0500 Received: from 216-99-217-87.dsl.aracnet.com ([216.99.217.87]:52958 "EHLO sous-sol.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1946263AbXBCCiJ (ORCPT ); Fri, 2 Feb 2007 21:38:09 -0500 Message-Id: <20070203024224.681516000@sous-sol.org> References: <20070203023504.435051000@sous-sol.org> User-Agent: quilt/0.45-1 Date: Fri, 02 Feb 2007 18:35:34 -0800 From: Chris Wright To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Linus Torvalds , Franck Bui-Huu , Nadia Derbey , Andi Kleen , Arjan van de Ven , Andrew Morton Subject: [patch 30/59] Revert "[PATCH] Fix up mmap_kmem" Content-Disposition: inline; filename=revert-fix-up-mmap_kmem.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1828 Lines: 48 -stable review patch. If anyone has any objections, please let us know. ------------------ From: Linus Torvalds This reverts commit 99a10a60ba9bedcf5d70ef81414d3e03816afa3f. As per Hugh Dickins: "Nadia Derbey has reported that mmap of /dev/kmem no longer works with the kernel virtual address as offset, and Franck has confirmed that his patch came from a misunderstanding of what an offset means to /dev/kmem - whereas his patch description seems to say that he was correcting the offset on a few plaforms, there was no such problem to correct, and his patch was in fact changing its API on all platforms." Suggested-by: Hugh Dickins Cc: Franck Bui-Huu Cc: Nadia Derbey Cc: Andi Kleen Cc: Arjan van de Ven Cc: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright --- drivers/char/mem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- linux-2.6.19.2.orig/drivers/char/mem.c +++ linux-2.6.19.2/drivers/char/mem.c @@ -293,8 +293,8 @@ static int mmap_kmem(struct file * file, { unsigned long pfn; - /* Turn a pfn offset into an absolute pfn */ - pfn = PFN_DOWN(virt_to_phys((void *)PAGE_OFFSET)) + vma->vm_pgoff; + /* Turn a kernel-virtual address into a physical page frame */ + pfn = __pa((u64)vma->vm_pgoff << PAGE_SHIFT) >> PAGE_SHIFT; /* * RED-PEN: on some architectures there is more mapped memory -- - 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/