AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity
af37501c79
kernel_optimize_test/arch
History
Ingo Molnar af37501c79 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>
2009-01-18 18:15:49 +01:00
..
alpha irq: update all arches for new irq_desc 2009-01-12 15:27:13 -08:00
arm linker script: add missing .data.percpu.page_aligned 2009-01-17 15:26:32 +09:00
avr32 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx 2009-01-09 11:52:14 -08:00
blackfin irq: update all arches for new irq_desc 2009-01-12 15:27:13 -08:00
cris Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2009-01-07 11:31:52 -08:00
frv NOMMU: Make VMAs per MM as for MMU-mode linux 2009-01-08 12:04:47 +00:00
h8300 NOMMU: Make VMAs per MM as for MMU-mode linux 2009-01-08 12:04:47 +00:00
ia64 linker script: add missing .data.percpu.page_aligned 2009-01-17 15:26:32 +09:00
m32r Merge branch 'cpus4096-for-linus-3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-01-03 12:04:39 -08:00
m68k m68k: Fix --build-id breakage for sun3 2009-01-12 20:56:44 +01:00
m68knommu NOMMU: Make VMAs per MM as for MMU-mode linux 2009-01-08 12:04:47 +00:00
mips Merge branches 'cpus4096', 'x86/cleanups' and 'x86/urgent' into x86/percpu 2009-01-15 13:18:57 +01:00
mn10300 irq: update all arches for new irq_desc, fix 2009-01-15 11:15:36 +01:00
parisc irq: update all arches for new irq_desc 2009-01-12 15:27:13 -08:00
powerpc Merge branch 'core/percpu' into perfcounters/core 2009-01-18 18:15:49 +01:00
s390 [S390] Use unsigned long long for u64 on 64bit. 2009-01-09 12:15:07 +01:00
sh NOMMU: Make VMAs per MM as for MMU-mode linux 2009-01-08 12:04:47 +00:00
sparc Merge branches 'cpus4096', 'x86/cleanups' and 'x86/urgent' into x86/percpu 2009-01-15 13:18:57 +01:00
um mm: invoke oom-killer from page fault 2009-01-06 15:58:58 -08:00
x86 Merge branch 'core/percpu' into perfcounters/core 2009-01-18 18:15:49 +01:00
xtensa xtensa: introduce swab.h 2009-01-07 12:22:04 -08:00
.gitignore
Kconfig