vserver 1.9.5.x5

[linux-2.6.git] / arch / x86_64 / kernel / Makefile

diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index e70de98..0a3318e 100644 (file)
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -5,11 +5,12 @@
 extra-y        := head.o head64.o init_task.o vmlinux.lds
 EXTRA_AFLAGS   := -traditional
 obj-y  := process.o semaphore.o signal.o entry.o traps.o irq.o \
-               ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_x86_64.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 warmreboot.o
-obj-y += mce.o
+               setup64.o bootflag.o e820.o reboot.o quirks.o
 
+obj-$(CONFIG_X86_MCE)         += mce.o
+obj-$(CONFIG_X86_MCE_INTEL)    += mce_intel.o
 obj-$(CONFIG_MTRR)             += ../../i386/kernel/cpu/mtrr/
 obj-$(CONFIG_ACPI_BOOT)                += acpi/
 obj-$(CONFIG_X86_MSR)          += msr.o
@@ -17,7 +18,8 @@ obj-$(CONFIG_MICROCODE)               += microcode.o
 obj-$(CONFIG_X86_CPUID)                += cpuid.o
 obj-$(CONFIG_SMP)              += smp.o smpboot.o trampoline.o
 obj-$(CONFIG_X86_LOCAL_APIC)   += apic.o  nmi.o
-obj-$(CONFIG_X86_IO_APIC)      += io_apic.o mpparse.o
+obj-$(CONFIG_X86_IO_APIC)      += io_apic.o mpparse.o \
+               genapic.o genapic_cluster.o genapic_flat.o
 obj-$(CONFIG_PM)               += suspend.o
 obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend_asm.o
 obj-$(CONFIG_CPU_FREQ)         += cpufreq/
@@ -25,13 +27,19 @@ obj-$(CONFIG_EARLY_PRINTK)  += early_printk.o
 obj-$(CONFIG_GART_IOMMU)       += pci-gart.o aperture.o
 obj-$(CONFIG_DUMMY_IOMMU)      += pci-nommu.o pci-dma.o
 obj-$(CONFIG_SWIOTLB)          += swiotlb.o
+obj-$(CONFIG_KPROBES)          += kprobes.o
 
 obj-$(CONFIG_MODULES)          += module.o
 
 obj-y                          += topology.o
+obj-y                          += intel_cacheinfo.o
+
+CFLAGS_vsyscall.o              := $(PROFILING) -g0
 
 bootflag-y                     += ../../i386/kernel/bootflag.o
 cpuid-$(subst m,y,$(CONFIG_X86_CPUID))  += ../../i386/kernel/cpuid.o
 topology-y                     += ../../i386/mach-default/topology.o
 swiotlb-$(CONFIG_SWIOTLB)      += ../../ia64/lib/swiotlb.o
 microcode-$(subst m,y,$(CONFIG_MICROCODE))  += ../../i386/kernel/microcode.o
+intel_cacheinfo-y              += ../../i386/kernel/cpu/intel_cacheinfo.o
+quirks-y                       += ../../i386/kernel/quirks.o