From 43d01344bc750672f426e00ae07e25c80c8eecf4 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:13:49 +0200 Subject: [PATCH] --- yaml --- r: 65435 b: refs/heads/master c: 0b690a40d30ff6924953888d43ab8e90d401fcc7 h: refs/heads/master i: 65433: a10bfeb9a997a56829f7ada1a600b8ca64853852 65431: ef325076b999792ead97f62b531c4f13235cc510 v: v3 --- [refs] | 2 +- trunk/arch/i386/mm/Makefile | 2 +- trunk/arch/i386/mm/{mmap.c => mmap_32.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/i386/mm/{mmap.c => mmap_32.c} (100%) diff --git a/[refs] b/[refs] index 98dc59c3a01d..c35363ed2cb0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: afb5ce0671f8b14f15525fd3e952b4a989c94a6b +refs/heads/master: 0b690a40d30ff6924953888d43ab8e90d401fcc7 diff --git a/trunk/arch/i386/mm/Makefile b/trunk/arch/i386/mm/Makefile index fb0a4f3bbdf8..969769a036c5 100644 --- a/trunk/arch/i386/mm/Makefile +++ b/trunk/arch/i386/mm/Makefile @@ -2,7 +2,7 @@ # Makefile for the linux i386-specific parts of the memory manager. # -obj-y := init_32.o pgtable.o fault.o ioremap_32.o extable.o pageattr.o mmap.o +obj-y := init_32.o pgtable.o fault.o ioremap_32.o extable.o pageattr.o mmap_32.o obj-$(CONFIG_NUMA) += discontig_32.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o diff --git a/trunk/arch/i386/mm/mmap.c b/trunk/arch/i386/mm/mmap_32.c similarity index 100% rename from trunk/arch/i386/mm/mmap.c rename to trunk/arch/i386/mm/mmap_32.c