git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull sbs into release branch
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
traps.c
diff --git
a/arch/powerpc/kernel/traps.c
b/arch/powerpc/kernel/traps.c
index
bf6445a
..
2bb1cb9
100644
(file)
--- a/
arch/powerpc/kernel/traps.c
+++ b/
arch/powerpc/kernel/traps.c
@@
-149,6
+149,7
@@
int die(const char *str, struct pt_regs *regs, long err)
bust_spinlocks(0);
die.lock_owner = -1;
bust_spinlocks(0);
die.lock_owner = -1;
+ add_taint(TAINT_DIE);
spin_unlock_irqrestore(&die.lock, flags);
if (kexec_should_crash(current) ||
spin_unlock_irqrestore(&die.lock, flags);
if (kexec_should_crash(current) ||
@@
-777,7
+778,7
@@
void __kprobes program_check_exception(struct pt_regs *regs)
return;
if (!(regs->msr & MSR_PR) && /* not user-mode */
return;
if (!(regs->msr & MSR_PR) && /* not user-mode */
- report_bug(regs->nip) == BUG_TRAP_TYPE_WARN) {
+ report_bug(regs->nip
, regs
) == BUG_TRAP_TYPE_WARN) {
regs->nip += 4;
return;
}
regs->nip += 4;
return;
}