xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Browse Source 
Conflicts:

	arch/x86/include/asm/topology.h
	drivers/oprofile/buffer_sync.c
(Both cases: changed in Linus' tree, removed in Ingo's).
This commit is contained in:
Rusty Russell
2009-03-31 13:33:50 +10:30
parent 15f7176eb1 65fb0d23fc
commit 558f6ab910
52 changed files with 641 additions and 661 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/xen/cpu_hotplug.c
View File

@@ -10,7 +10,7 @@ static void enable_hotplug_cpu(int cpu)
if (!cpu_present(cpu))
arch_register_cpu(cpu);
cpu_set(cpu, cpu_present_map);
set_cpu_present(cpu, true);
}
static void disable_hotplug_cpu(int cpu)
@@ -18,7 +18,7 @@ static void disable_hotplug_cpu(int cpu)
if (cpu_present(cpu))
arch_unregister_cpu(cpu);
cpu_clear(cpu, cpu_present_map);
set_cpu_present(cpu, false);
}
static void vcpu_hotplug(unsigned int cpu)