From 19624ddd41199ca9705037214ce38ede47f23a3f Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:12:21 +0200 Subject: [PATCH] --- yaml --- r: 65371 b: refs/heads/master c: a6424facfa0fceb57982df3a6d7e6166c94c22be h: refs/heads/master i: 65369: 025bc84417cb592dd36c0f34296e8aee3d046c5f 65367: 06e36ec349274e94a73ccb88d915ad9b3ec201af v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/Makefile | 2 +- trunk/arch/i386/kernel/{sysenter.c => sysenter_32.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/i386/kernel/{sysenter.c => sysenter_32.c} (100%) diff --git a/[refs] b/[refs] index d91851b6551b..0f95856a8b69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae47fd49c73b7f4875bd1bf06f02f4209d5d2470 +refs/heads/master: a6424facfa0fceb57982df3a6d7e6166c94c22be diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile index 8bd7e8730046..ed9f4f49a6a2 100644 --- a/trunk/arch/i386/kernel/Makefile +++ b/trunk/arch/i386/kernel/Makefile @@ -31,7 +31,7 @@ obj-$(CONFIG_X86_NUMAQ) += numaq.o obj-$(CONFIG_X86_SUMMIT_NUMA) += summit.o obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_MODULES) += module_32.o -obj-y += sysenter.o vsyscall_32.o +obj-y += sysenter_32.o vsyscall_32.o obj-$(CONFIG_ACPI_SRAT) += srat_32.o obj-$(CONFIG_EFI) += efi_32.o efi_stub_32.o obj-$(CONFIG_DOUBLEFAULT) += doublefault.o diff --git a/trunk/arch/i386/kernel/sysenter.c b/trunk/arch/i386/kernel/sysenter_32.c similarity index 100% rename from trunk/arch/i386/kernel/sysenter.c rename to trunk/arch/i386/kernel/sysenter_32.c