Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 077fee00 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents cf42d543 5e071e2b

arch/sh/kernel/cpu/sh5/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -933,7 +933,7 @@ ret_with_reschedule: 


	pta	restore_all, tr1



	movi	_TIF_SIGPENDING, r8

	movi	(_TIF_SIGPENDING|_TIF_NOTIFY_RESUME), r8

	and	r8, r7, r8

	pta	work_notifysig, tr0

	bne	r8, ZERO, tr0

arch/sh/kernel/entry-common.S

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ work_pending: 
	! r8: current_thread_info

	! t:  result of "tst	#_TIF_NEED_RESCHED, r0"

	bf/s	work_resched

	 tst	#_TIF_SIGPENDING, r0

	 tst	#(_TIF_SIGPENDING | _TIF_NOTIFY_RESUME), r0

work_notifysig:

	bt/s	__restore_all

	 mov	r15, r4

drivers/sh/intc/core.c

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ int __init register_intc_controller(struct intc_desc *desc) 
			if (unlikely(res)) {

				if (res == -EEXIST) {

					res = irq_domain_associate(d->domain,

								   irq, irq);

								   irq2, irq2);

					if (unlikely(res)) {

						pr_err("domain association "

						       "failure\n");

drivers/sh/pfc/pinctrl.c

+2 −1
Original line number Diff line number Diff line
@@ -211,7 +211,8 @@ static int sh_pfc_gpio_request_enable(struct pinctrl_dev *pctldev, 
		break;

	default:

		pr_err("Unsupported mux type (%d), bailing...\n", pinmux_type);

		return -ENOTSUPP;

		ret = -ENOTSUPP;

		goto err;

	}



	ret = 0;