Commit 6bf9f755 authored by Roman Zippel's avatar Roman Zippel Committed by Linus Torvalds

[PATCH] m68k: fix constraints of the signal functions and some cleanup

Signed-off-by: default avatarRoman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 53617825
...@@ -156,13 +156,17 @@ typedef struct sigaltstack { ...@@ -156,13 +156,17 @@ typedef struct sigaltstack {
static inline void sigaddset(sigset_t *set, int _sig) static inline void sigaddset(sigset_t *set, int _sig)
{ {
__asm__("bfset %0{%1,#1}" : "=m" (*set) : "id" ((_sig - 1) ^ 31) asm ("bfset %0{%1,#1}"
: "+od" (*set)
: "id" ((_sig - 1) ^ 31)
: "cc"); : "cc");
} }
static inline void sigdelset(sigset_t *set, int _sig) static inline void sigdelset(sigset_t *set, int _sig)
{ {
__asm__("bfclr %0{%1,#1}" : "=m"(*set) : "id"((_sig - 1) ^ 31) asm ("bfclr %0{%1,#1}"
: "+od" (*set)
: "id" ((_sig - 1) ^ 31)
: "cc"); : "cc");
} }
...@@ -175,8 +179,10 @@ static inline int __const_sigismember(sigset_t *set, int _sig) ...@@ -175,8 +179,10 @@ static inline int __const_sigismember(sigset_t *set, int _sig)
static inline int __gen_sigismember(sigset_t *set, int _sig) static inline int __gen_sigismember(sigset_t *set, int _sig)
{ {
int ret; int ret;
__asm__("bfextu %1{%2,#1},%0" asm ("bfextu %1{%2,#1},%0"
: "=d"(ret) : "m"(*set), "id"((_sig-1) ^ 31)); : "=d" (ret)
: "od" (*set), "id" ((_sig-1) ^ 31)
: "cc");
return ret; return ret;
} }
...@@ -187,7 +193,10 @@ static inline int __gen_sigismember(sigset_t *set, int _sig) ...@@ -187,7 +193,10 @@ static inline int __gen_sigismember(sigset_t *set, int _sig)
static inline int sigfindinword(unsigned long word) static inline int sigfindinword(unsigned long word)
{ {
__asm__("bfffo %1{#0,#0},%0" : "=d"(word) : "d"(word & -word) : "cc"); asm ("bfffo %1{#0,#0},%0"
: "=d" (word)
: "d" (word & -word)
: "cc");
return word ^ 31; return word ^ 31;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment