projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
misc
/
sgi-xp
/
xpc_main.c
diff --git
a/drivers/misc/sgi-xp/xpc_main.c
b/drivers/misc/sgi-xp/xpc_main.c
index 82dc5748f873b72ea355b517c606d59dc6235c31..7f327121e6d7c43416a3ca6820cd39111796d683 100644
(file)
--- a/
drivers/misc/sgi-xp/xpc_main.c
+++ b/
drivers/misc/sgi-xp/xpc_main.c
@@
-1210,7
+1210,7
@@
xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
if (((die_args->trapnr == X86_TRAP_MF) ||
(die_args->trapnr == X86_TRAP_XF)) &&
- !user_mode
_vm
(die_args->regs))
+ !user_mode(die_args->regs))
xpc_die_deactivate();
break;