From: Balbir Singh <balbir@linux.vnet.ibm.com>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>
Cc: Balbir Singh <balbir@linux.vnet.ibm.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [x86 patch] Fix UML signal.h build errors
Date: Thu, 25 Oct 2007 18:30:22 +0530 [thread overview]
Message-ID: <20071025130022.8720.77346.sendpatchset@balbir-laptop> (raw)
Fix build errors seen in UML. Replaces #ifdef __i386__ with
#if BITS_PER_LONG == 32
Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
---
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
next reply other threads:[~2007-10-25 13:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-25 13:00 Balbir Singh [this message]
2007-10-25 15:05 ` [x86 patch] Fix UML signal.h build errors Jeff Dike
2007-10-25 15:31 ` Balbir Singh
2007-10-27 3:13 ` Al Viro
2007-10-27 6:05 ` Balbir Singh
2007-10-27 6:38 ` Al Viro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071025130022.8720.77346.sendpatchset@balbir-laptop \
--to=balbir@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox