From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Zijlstra Subject: [PATCH 05/20] uml: rename arch/um remove_mapping() Date: Tue, 12 Sep 2006 17:25:49 +0200 Message-ID: <20060912144903.526938000@chello.nl> References: <20060912143049.278065000@chello.nl> Cc: Linus Torvalds , Andrew Morton , David Miller , Rik van Riel , Daniel Phillips , Peter Zijlstra , Jeff Dike Return-path: Received: from amsfep17-int.chello.nl ([213.46.243.15]:59855 "EHLO amsfep15-int.chello.nl") by vger.kernel.org with ESMTP id S1751421AbWILPuw (ORCPT ); Tue, 12 Sep 2006 11:50:52 -0400 To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Content-Disposition: inline; filename=uml_remove_mapping.patch Sender: netdev-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Now that 'include/linux/mm.h' includes 'include/linux/swap.h', the global remove_mapping() definition clashes with the arch/um one. Rename the arch/um one. Signed-off-by: Peter Zijlstra Acked-by: Jeff Dike --- arch/um/kernel/physmem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: linux-2.6/arch/um/kernel/physmem.c =================================================================== --- linux-2.6.orig/arch/um/kernel/physmem.c +++ linux-2.6/arch/um/kernel/physmem.c @@ -160,7 +160,7 @@ int physmem_subst_mapping(void *virt, in static int physmem_fd = -1; -static void remove_mapping(struct phys_desc *desc) +static void um_remove_mapping(struct phys_desc *desc) { void *virt = desc->virt; int err; @@ -184,7 +184,7 @@ int physmem_remove_mapping(void *virt) if(desc == NULL) return(0); - remove_mapping(desc); + um_remove_mapping(desc); return(1); } @@ -205,7 +205,7 @@ void physmem_forget_descriptor(int fd) page = list_entry(ele, struct phys_desc, list); offset = page->offset; addr = page->virt; - remove_mapping(page); + um_remove_mapping(page); err = os_seek_file(fd, offset); if(err) panic("physmem_forget_descriptor - failed to seek " --