Fix build errors seen in UML. Replaces #ifdef __i386__ with
#if BITS_PER_LONG == 32
Signed-off-by: Balbir Singh <[email protected]>
---
include/asm-x86/signal.h | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff -puN include/asm-x86/signal.h~uml-fix-sigaction-build-errors include/asm-x86/signal.h
--- 2.6.24-rc1/include/asm-x86/signal.h~uml-fix-sigaction-build-errors 2007-10-25 18:24:40.000000000 +0530
+++ 2.6.24-rc1-balbir/include/asm-x86/signal.h 2007-10-25 18:27:53.000000000 +0530
@@ -17,7 +17,7 @@ struct siginfo;
#define _NSIG 64
-#ifdef __i386__
+#if BITS_PER_LONG == 32
# define _NSIG_BPW 32
#else
# define _NSIG_BPW 64
@@ -121,7 +121,7 @@ typedef unsigned long sigset_t;
#ifndef __ASSEMBLY__
-#ifdef __i386__
+#if BITS_PER_LONG == 32
# ifdef __KERNEL__
struct old_sigaction {
__sighandler_t sa_handler;
@@ -157,7 +157,7 @@ struct sigaction {
#define sa_sigaction _u._sa_sigaction
# endif /* ! __KERNEL__ */
-#else /* __i386__ */
+#else /* BITS_PER_LONG == 32 */
struct sigaction {
__sighandler_t sa_handler;
@@ -170,7 +170,7 @@ struct k_sigaction {
struct sigaction sa;
};
-#endif /* !__i386__ */
+#endif /* !BITS_PER_LONG == 32 */
typedef struct sigaltstack {
void __user *ss_sp;
@@ -181,12 +181,12 @@ typedef struct sigaltstack {
#ifdef __KERNEL__
#include <asm/sigcontext.h>
-#ifdef __386__
+#if BITS_PER_LONG == 32
#define __HAVE_ARCH_SIG_BITOPS
#define sigaddset(set,sig) \
- (__builtin_constantp(sig) ? \
+ (__builtin_constant_p(sig) ? \
__const_sigaddset((set),(sig)) : \
__gen_sigaddset((set),(sig)))
@@ -253,13 +253,13 @@ struct pt_regs;
} \
} while (0)
-#else /* __i386__ */
+#else /* BITS_PER_LONG == 32 */
#undef __HAVE_ARCH_SIG_BITOPS
#define ptrace_signal_deliver(regs, cookie) do { } while (0)
-#endif /* !__i386__ */
+#endif /* !BITS_PER_LONG == 32 */
#endif /* __KERNEL__ */
#endif /* __ASSEMBLY__ */
_
--
Warm Regards,
Balbir Singh
Linux Technology Center
IBM, ISTL
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
