diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-18 18:15:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-18 18:15:49 +0100 |
| commit | af37501c792107c2bde1524bdae38d9a247b841a (patch) | |
| tree | b50ee90d29e72956b8b7d8d19677fe5996755d49 /arch/mips/lib/Makefile | |
| parent | d859e29fe34cb833071b20aef860ee94fbad9bb2 (diff) | |
| parent | 99937d6455cea95405ac681c86a857d0fcd530bd (diff) | |
| download | linux-af37501c792107c2bde1524bdae38d9a247b841a.tar.gz | |
Merge branch 'core/percpu' into perfcounters/core
Conflicts:
arch/x86/include/asm/pda.h
We merge tip/core/percpu into tip/perfcounters/core because of a
semantic and contextual conflict: the former eliminates the PDA,
while the latter extends it with apic_perf_irqs field.
Resolve the conflict by moving the new field to the irq_cpustat
structure on 64-bit too.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mips/lib/Makefile')
| -rw-r--r-- | arch/mips/lib/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile index dbcf6511b74e..c13c7ad2cdae 100644 --- a/arch/mips/lib/Makefile +++ b/arch/mips/lib/Makefile @@ -27,6 +27,7 @@ obj-$(CONFIG_CPU_SB1) += dump_tlb.o obj-$(CONFIG_CPU_TX39XX) += r3k_dump_tlb.o obj-$(CONFIG_CPU_TX49XX) += dump_tlb.o obj-$(CONFIG_CPU_VR41XX) += dump_tlb.o +obj-$(CONFIG_CPU_CAVIUM_OCTEON) += dump_tlb.o # libgcc-style stuff needed in the kernel obj-y += ashldi3.o ashrdi3.o cmpdi2.o lshrdi3.o ucmpdi2.o |