From mboxrd@z Thu Jan 1 00:00:00 1970 Message-Id: <20070504103200.331926063@chello.nl> References: <20070504102651.923946304@chello.nl> Date: Fri, 04 May 2007 12:27:12 +0200 From: Peter Zijlstra Subject: [PATCH 21/40] uml: rename arch/um remove_mapping() Content-Disposition: inline; filename=uml_remove_mapping.patch Sender: owner-linux-mm@kvack.org Return-Path: To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, netdev@vger.kernel.org Cc: Peter Zijlstra , Trond Myklebust , Thomas Graf , David Miller , James Bottomley , Mike Christie , Andrew Morton , Daniel Phillips , Jeff Dike List-ID: When '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-git/arch/um/kernel/physmem.c =================================================================== --- linux-2.6-git.orig/arch/um/kernel/physmem.c 2007-02-12 09:40:47.000000000 +0100 +++ linux-2.6-git/arch/um/kernel/physmem.c 2007-02-12 11:17:47.000000000 +0100 @@ -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 " -- -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org