projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-pull
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
sh
/
kernel
/
entry-common.S
diff --git
a/arch/sh/kernel/entry-common.S
b/arch/sh/kernel/entry-common.S
index
718bd23
..
5e0dd19
100644
(file)
--- a/
arch/sh/kernel/entry-common.S
+++ b/
arch/sh/kernel/entry-common.S
@@
-192,7
+192,7
@@
work_resched:
.align 2
1: .long schedule
2: .long do_notify_resume
-3: .long res
tore_all
+3: .long res
ume_userspace
#ifdef CONFIG_TRACE_IRQFLAGS
4: .long trace_hardirqs_on
5: .long trace_hardirqs_off