x86_64: prepare shared kernel/head.S

[safe/jmp/linux-2.6] / arch / x86_64 / kernel / Makefile

diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index 175d604..b65abc2 100644 (file)
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -2,51 +2,51 @@
 # Makefile for the linux kernel.
 #
 
-extra-y        := head.o head64.o init_task.o vmlinux.lds
+extra-y        := head_64.o head64.o init_task_64.o vmlinux.lds
 EXTRA_AFLAGS   := -traditional
-obj-y  := process.o signal.o entry.o traps_64.o irq.o \
-               ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_x86_64.o \
-               x8664_ksyms.o i387.o syscall.o vsyscall.o \
-               setup64.o bootflag.o e820.o reboot.o quirks.o i8237.o \
-               pci-dma.o pci-nommu.o alternative.o hpet.o tsc.o bugs.o \
+obj-y  := process_64.o signal_64.o entry_64.o traps_64.o irq_64.o \
+               ptrace_64.o time_64.o ioport_64.o ldt_64.o setup_64.o i8259_64.o sys_x86_64.o \
+               x8664_ksyms_64.o i387_64.o syscall.o vsyscall_64.o \
+               setup64.o bootflag.o e820_64.o reboot_64.o quirks.o i8237.o \
+               pci-dma_64.o pci-nommu_64.o alternative.o hpet_64.o tsc_64.o bugs_64.o \
                perfctr-watchdog.o
 
 obj-$(CONFIG_STACKTRACE)       += stacktrace.o
-obj-$(CONFIG_X86_MCE)          += mce.o therm_throt.o
-obj-$(CONFIG_X86_MCE_INTEL)    += mce_intel.o
-obj-$(CONFIG_X86_MCE_AMD)      += mce_amd.o
+obj-$(CONFIG_X86_MCE)          += mce_64.o therm_throt.o
+obj-$(CONFIG_X86_MCE_INTEL)    += mce_intel_64.o
+obj-$(CONFIG_X86_MCE_AMD)      += mce_amd_64.o
 obj-$(CONFIG_MTRR)             += ../../i386/kernel/cpu/mtrr/
 obj-$(CONFIG_ACPI)             += acpi/
 obj-$(CONFIG_X86_MSR)          += msr.o
 obj-$(CONFIG_MICROCODE)                += microcode.o
 obj-$(CONFIG_X86_CPUID)                += cpuid.o
-obj-$(CONFIG_SMP)              += smp.o smpboot.o trampoline.o tsc_sync.o
-obj-y                          += apic.o  nmi.o
-obj-y                          += io_apic.o mpparse.o genapic.o genapic_flat.o
-obj-$(CONFIG_KEXEC)            += machine_kexec.o relocate_kernel.o crash.o
-obj-$(CONFIG_CRASH_DUMP)       += crash_dump.o
-obj-$(CONFIG_PM)               += suspend.o
-obj-$(CONFIG_HIBERNATION)      += suspend_asm.o
+obj-$(CONFIG_SMP)              += smp_64.o smpboot_64.o trampoline_64.o tsc_sync.o
+obj-y                          += apic_64.o  nmi_64.o
+obj-y                          += io_apic_64.o mpparse_64.o genapic_64.o genapic_flat_64.o
+obj-$(CONFIG_KEXEC)            += machine_kexec.o relocate_kernel_64.o crash_64.o
+obj-$(CONFIG_CRASH_DUMP)       += crash_dump_64.o
+obj-$(CONFIG_PM)               += suspend_64.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
-obj-$(CONFIG_CALGARY_IOMMU)    += pci-calgary.o tce.o
-obj-$(CONFIG_SWIOTLB)          += pci-swiotlb.o
-obj-$(CONFIG_KPROBES)          += kprobes.o
-obj-$(CONFIG_X86_PM_TIMER)     += pmtimer.o
-obj-$(CONFIG_X86_VSMP)         += vsmp.o
+obj-$(CONFIG_CALGARY_IOMMU)    += pci-calgary_64.o tce_64.o
+obj-$(CONFIG_SWIOTLB)          += pci-swiotlb_64.o
+obj-$(CONFIG_KPROBES)          += kprobes_64.o
+obj-$(CONFIG_X86_PM_TIMER)     += pmtimer_64.o
+obj-$(CONFIG_X86_VSMP)         += vsmp_64.o
 obj-$(CONFIG_K8_NB)            += k8.o
-obj-$(CONFIG_AUDIT)            += audit.o
+obj-$(CONFIG_AUDIT)            += audit_64.o
 
-obj-$(CONFIG_MODULES)          += module.o
-obj-$(CONFIG_PCI)              += early-quirks.o
+obj-$(CONFIG_MODULES)          += module_64.o
+obj-$(CONFIG_PCI)              += early-quirks_64.o
 
 obj-y                          += topology.o
 obj-y                          += intel_cacheinfo.o
 obj-y                          += addon_cpuid_features.o
 obj-y                          += pcspeaker.o
 
-CFLAGS_vsyscall.o              := $(PROFILING) -g0
+CFLAGS_vsyscall_64.o           := $(PROFILING) -g0
 
 therm_throt-y                   += ../../i386/kernel/cpu/mcheck/therm_throt.o
 bootflag-y                     += ../../i386/kernel/bootflag.o