Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k (aa7202c2) · Commits · 戴 / test

Pull m68k fix from Geert Uytterhoeven: "This is a bug fix for asm constraints that affect sending RT signals, also destined for -stable." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: fix sigset_t accessor functions

arch/m68k/include/asm/signal.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ struct k_sigaction {
		static inline void sigaddset(sigset_t *set, int _sig)
		{
		asm ("bfset %0{%1,#1}"
		: "+od" (*set)
		: "+o" (*set)
		: "id" ((_sig - 1) ^ 31)
		: "cc");
		}
		@@ -49,7 +49,7 @@ static inline void sigaddset(sigset_t *set, int _sig)
		static inline void sigdelset(sigset_t *set, int _sig)
		{
		asm ("bfclr %0{%1,#1}"
		: "+od" (*set)
		: "+o" (*set)
		: "id" ((_sig - 1) ^ 31)
		: "cc");
		}
		@@ -65,7 +65,7 @@ static inline int __gen_sigismember(sigset_t *set, int _sig)
		int ret;
		asm ("bfextu %1{%2,#1},%0"
		: "=d" (ret)
		: "od" (*set), "id" ((_sig-1) ^ 31)
		: "o" (*set), "id" ((_sig-1) ^ 31)
		: "cc");
		return ret;
		}

Admin message