From cb429ddd9feb50a07b9bc41d85d84b18b3d70141 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:14:37 +0200 Subject: [PATCH] --- yaml --- r: 65471 b: refs/heads/master c: ba733ec4725df406a6ff5c5c1e6c447f42bbf39d h: refs/heads/master i: 65469: 8763109aa7bdd3a3688562b84cbdc66fd6eb3559 65467: c995b60eeb60ae2143a727d86eaeee0c158f9557 65463: 150fa6fb3fb4ab6ae116beab2df5eaee615c8ac6 65455: 392fe400071bb0945875436456e4813ee122fe27 65439: 34329adf05fcbccb1a76d4df3a159e3c1fd53d6a 65407: eec7c4b4a1f272f69b48ffaf73d7d2b449164fe2 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/Makefile | 2 +- trunk/arch/x86_64/kernel/{suspend_asm.S => suspend_asm_64.S} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/x86_64/kernel/{suspend_asm.S => suspend_asm_64.S} (100%) diff --git a/[refs] b/[refs] index ac53f9d56b19..38ac8a4d47f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e86a989de27d4c0226928d6132f284f6156f30f7 +refs/heads/master: ba733ec4725df406a6ff5c5c1e6c447f42bbf39d diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile index 4702333f93b1..9799e58c243a 100644 --- a/trunk/arch/x86_64/kernel/Makefile +++ b/trunk/arch/x86_64/kernel/Makefile @@ -26,7 +26,7 @@ obj-y += io_apic_64.o mpparse.o genapic.o genapic_flat.o obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel_64.o crash_64.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.o obj-$(CONFIG_PM) += suspend.o -obj-$(CONFIG_HIBERNATION) += suspend_asm.o +obj-$(CONFIG_HIBERNATION) += suspend_asm_64.o obj-$(CONFIG_CPU_FREQ) += ../../i386/kernel/cpu/cpufreq/ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_IOMMU) += pci-gart.o aperture_64.o diff --git a/trunk/arch/x86_64/kernel/suspend_asm.S b/trunk/arch/x86_64/kernel/suspend_asm_64.S similarity index 100% rename from trunk/arch/x86_64/kernel/suspend_asm.S rename to trunk/arch/x86_64/kernel/suspend_asm_64.S