kernel/git/stable/linux.git/include/asm-x86/smp.h, branch master

x86, um: ... and asm-x86 move

2008-10-23T05:55:20+00:00

Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin

x86: move prefill_possible_map calling early, fix, V2

2008-10-13T08:22:50+00:00

Commit 4a701737 ("x86: move prefill_possible_map calling early, fix") is the wrong fix: prefill_possible_map() needs to be available even when CONFIG_HOTPLUG_CPU is not set. A followon patch will do that. Fix this correctly by making prefill_possible_map() available even when CONFIG_HOTPLUG_CPU is not set. The function is needed so that the number of possible CPUs can be determined. Tested on uniprocessor machine with CPU hotplug disabled. From boot log: Before: NR_CPUS: 512, nr_cpu_ids: 512, nr_node_ids 1 After: NR_CPUS: 512, nr_cpu_ids: 1, nr_node_ids 1 Signed-off-by: Chuck Ebbert Signed-off-by: Ingo Molnar

Merge branch 'linus' into x86/xen

2008-10-12T10:37:32+00:00

Conflicts: arch/x86/kernel/cpu/common.c arch/x86/kernel/process_64.c arch/x86/xen/enlighten.c

x86: build fix for !CONFIG_SMP

2008-09-05T15:44:08+00:00

Move reset_lazy_tlbstate into tlb_32.c, and define noop versions of play_dead() in process_{32,64}.c when !CONFIG_SMP. Signed-off-by: Alex Nixon Signed-off-by: Ingo Molnar

x86: separate generic cpu disabling code from APIC writes in cpu_disable

2008-08-25T08:59:20+00:00

It allows paravirt implementations of cpu_disable to share the cpu_disable_common code, without having to take on board APIC writes, which may not be appropriate. Signed-off-by: Alex Nixon Acked-by: Jeremy Fitzhardinge Signed-off-by: Ingo Molnar

x86: unify x86_32 and x86_64 play_dead into one function

2008-08-25T08:59:19+00:00

Add the new play_dead into smpboot.c, as it fits more cleanly in there alongside other CONFIG_HOTPLUG functions. Separate out the common code into its own function. Signed-off-by: Alex Nixon Acked-by: Jeremy Fitzhardinge Signed-off-by: Ingo Molnar

x86_32: clean up play_dead

2008-08-25T08:59:18+00:00

The removal of the CPU from the various maps was redundant as it already happened in cpu_disable. After cleaning this up, cpu_uninit only resets the tlb state, so rename it and create a noop version for the X86_64 case (so the two play_deads can be unified later). Signed-off-by: Alex Nixon Acked-by: Jeremy Fitzhardinge Signed-off-by: Ingo Molnar

x86: add cpu hotplug hooks into smp_ops

2008-08-25T08:59:18+00:00

Signed-off-by: Alex Nixon Acked-by: Jeremy Fitzhardinge Signed-off-by: Ingo Molnar

Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core

2008-08-14T12:58:22+00:00

Merge branch 'x86/x2apic' into x86/core

2008-07-26T14:29:23+00:00

Conflicts: include/asm-x86/i8259.h include/asm-x86/msidef.h Signed-off-by: Ingo Molnar