projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
[linux-2.6-microblaze.git]
/
arch
/
arm
/
kernel
/
machine_kexec.c
diff --git
a/arch/arm/kernel/machine_kexec.c
b/arch/arm/kernel/machine_kexec.c
index
a2e9ac7
..
46364b6
100644
(file)
--- a/
arch/arm/kernel/machine_kexec.c
+++ b/
arch/arm/kernel/machine_kexec.c
@@
-77,6
+77,8
@@
static void machine_crash_nonpanic_core(void *unused)
{
struct pt_regs regs;
+ local_fiq_disable();
+
crash_setup_regs(®s, get_irq_regs());
printk(KERN_DEBUG "CPU %u will stop doing anything useful since another CPU has crashed\n",
smp_processor_id());