diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
| commit | ff877ea80efa2015b6263766f78ee42c2a1b32f9 (patch) | |
| tree | 85205005c611ab774702148558321c6fb92f1ccd /include/asm-x86/signal.h | |
| parent | 30821fee4f0cb3e6d241d9f7ddc37742212e3eb7 (diff) | |
| parent | d37e6bf68fc1eb34a4ad21d9ae8890ed37ea80e7 (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
Diffstat (limited to 'include/asm-x86/signal.h')
| -rw-r--r-- | include/asm-x86/signal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86/signal.h b/include/asm-x86/signal.h index f15186d39c69..6dac49364e95 100644 --- a/include/asm-x86/signal.h +++ b/include/asm-x86/signal.h | |||
| @@ -181,12 +181,12 @@ typedef struct sigaltstack { | |||
| 181 | #ifdef __KERNEL__ | 181 | #ifdef __KERNEL__ |
| 182 | #include <asm/sigcontext.h> | 182 | #include <asm/sigcontext.h> |
| 183 | 183 | ||
| 184 | #ifdef __386__ | 184 | #ifdef __i386__ |
| 185 | 185 | ||
| 186 | #define __HAVE_ARCH_SIG_BITOPS | 186 | #define __HAVE_ARCH_SIG_BITOPS |
| 187 | 187 | ||
| 188 | #define sigaddset(set,sig) \ | 188 | #define sigaddset(set,sig) \ |
| 189 | (__builtin_constantp(sig) \ | 189 | (__builtin_constant_p(sig) \ |
| 190 | ? __const_sigaddset((set), (sig)) \ | 190 | ? __const_sigaddset((set), (sig)) \ |
| 191 | : __gen_sigaddset((set), (sig))) | 191 | : __gen_sigaddset((set), (sig))) |
| 192 | 192 | ||