Merge branch 'cpus4096' into core/percpu

Browse source

Conflicts:
	arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
	arch/x86/kernel/tlb_32.c

Merge it here because both the cpumask changes and the ongoing percpu
work is touching the TLB code. The percpu changes take precedence, as
they eliminate tlb_32.c altogether.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

...

This commit is contained in:

Ingo Molnar 2009-01-21 10:14:17 +01:00

parent ae2b56b92b 5766b842b2

commit 3eb3963fd1

5 changed files with 43 additions and 34 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/ia64/include/asm/topology.h

View file

17

arch/x86/include/asm/topology.h

View file

5

arch/x86/kernel/apic.c

View file

33

arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c

View file

20

kernel/workqueue.c

View file