From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ozlabs.org ([203.10.76.45]:49672 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2992594AbXDDECc (ORCPT ); Wed, 4 Apr 2007 00:02:32 -0400 From: Benjamin Herrenschmidt Date: Wed, 04 Apr 2007 14:02:21 +1000 Subject: [PATCH 12/14] get_unmapped_area handles MAP_FIXED in /dev/mem (nommu) In-Reply-To: <1175659331.690672.592289266160.qpush@grosgo> Message-Id: <20070404040232.2FEF6DDEBA@ozlabs.org> Sender: linux-arch-owner@vger.kernel.org To: Andrew Morton Cc: linux-arch@vger.kernel.org, Linux Memory Management , linux-kernel@vger.kernel.org List-ID: This also fixes a bug, I think, it used to return a pgoff (pfn) instead of an address. (To split ?) Signed-off-by: Benjamin Herrenschmidt --- drivers/char/mem.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Index: linux-cell/drivers/char/mem.c =================================================================== --- linux-cell.orig/drivers/char/mem.c 2007-03-22 16:24:04.000000000 +1100 +++ linux-cell/drivers/char/mem.c 2007-03-22 16:26:30.000000000 +1100 @@ -246,9 +246,12 @@ static unsigned long get_unmapped_area_m unsigned long pgoff, unsigned long flags) { + if (flags & MAP_FIXED) + if ((addr >> PAGE_SHIFT) != pgoff) + return (unsigned long) -EINVAL; if (!valid_mmap_phys_addr_range(pgoff, len)) return (unsigned long) -EINVAL; - return pgoff; + return pgoff << PAGE_SHIFT; } /* can't do an in-place private mapping if there's no MMU */