leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SuperH fixes for 3.6-rc7

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iEYEABECAAYFAlBYK+cACgkQGkmNcg7/o7jthwCfemhnr590s3hwWXjA88ZZMFDl
 U8kAoJA7hNCtAqdoj+LHXJlKLK1UalkD
 =aCxD
 -----END PGP SIGNATURE-----

Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh

Pull SuperH fixes from Paul Mundt.

* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh:
  sh: Fix up TIF_NOTIFY_RESUME sans TIF_SIGPENDING handling.
  sh: pfc: Release spinlock in sh_pfc_gpio_request_enable() error path
  sh: intc: Fix up multi-evt irq association.
This commit is contained in:
Linus Torvalds 2012-09-19 11:03:55 -07:00
commit 077fee0036
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sh/kernel/cpu/sh5/entry.S
View File

@ -933,7 +933,7 @@ ret_with_reschedule:
pta restore_all, tr1 pta restore_all, tr1
movi _TIF_SIGPENDING, r8 movi (_TIF_SIGPENDING|_TIF_NOTIFY_RESUME), r8
and r8, r7, r8 and r8, r7, r8
pta work_notifysig, tr0 pta work_notifysig, tr0
bne r8, ZERO, tr0 bne r8, ZERO, tr0

2
arch/sh/kernel/entry-common.S
View File

@ -139,7 +139,7 @@ work_pending:
! r8: current_thread_info ! r8: current_thread_info
! t: result of "tst #_TIF_NEED_RESCHED, r0" ! t: result of "tst #_TIF_NEED_RESCHED, r0"
bf/s work_resched bf/s work_resched
tst #_TIF_SIGPENDING, r0 tst #(_TIF_SIGPENDING | _TIF_NOTIFY_RESUME), r0
work_notifysig: work_notifysig:
bt/s __restore_all bt/s __restore_all
mov r15, r4 mov r15, r4

2
drivers/sh/intc/core.c
View File

@ -355,7 +355,7 @@ int __init register_intc_controller(struct intc_desc *desc)
if (unlikely(res)) { if (unlikely(res)) {
if (res == -EEXIST) { if (res == -EEXIST) {
res = irq_domain_associate(d->domain, res = irq_domain_associate(d->domain,
irq, irq); irq2, irq2);
if (unlikely(res)) { if (unlikely(res)) {
pr_err("domain association " pr_err("domain association "
"failure\n"); "failure\n");

3
drivers/sh/pfc/pinctrl.c
View File

@ -211,7 +211,8 @@ static int sh_pfc_gpio_request_enable(struct pinctrl_dev *pctldev,
break; break;
default: default:
pr_err("Unsupported mux type (%d), bailing...\n", pinmux_type); pr_err("Unsupported mux type (%d), bailing...\n", pinmux_type);
return -ENOTSUPP; ret = -ENOTSUPP;
goto err;
} }
ret = 0; ret = 0;