lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'origin/master'

Browse Source 
Manual merge of:

	arch/powerpc/Kconfig
	arch/powerpc/kernel/stacktrace.c
	arch/powerpc/mm/slice.c
	arch/ppc/kernel/smp.c
This commit is contained in:
Benjamin Herrenschmidt
2008-07-16 11:07:59 +10:00
parent 43d2548bb2 fafa3a3f16
commit 84c3d4aaec
941 changed files with 48176 additions and 76671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/kernel/machine_kexec_64.c
View File

@ -172,7 +172,7 @@ static void kexec_prepare_cpus(void)
{
int my_cpu, i, notified=-1;
smp_call_function(kexec_smp_down, NULL, 0, /* wait */0);
smp_call_function(kexec_smp_down, NULL, /* wait */0);
my_cpu = get_cpu();
/* check the others cpus are now down (via paca hw cpu id == -1) */