aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2006-10-02 14:12:31 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-02 08:03:31 -0700
commit3f2e05e90e0846c42626e3d272454f26be34a1bc (patch)
tree8a1701fcb7cde32373b6d7ceca09376416bf94eb
parent9ec52099e4b8678a60e9f93e41ad87885d64f3e6 (diff)
[PATCH] BLOCK: Revert patch to hack around undeclared sigset_t in linux/compat.h
Revert Andrew Morton's patch to temporarily hack around the lack of a declaration of sigset_t in linux/compat.h to make the block-disablement patches build on IA64. This got accidentally pushed to Linus and should be fixed in a different manner. Also make linux/compat.h #include asm/signal.h to gain a definition of sigset_t so that it can externally declare sigset_from_compat(). This has been compile-tested for i386, x86_64, ia64, mips, mips64, frv, ppc and ppc64 and run-tested on frv. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/mips/kernel/signal_n32.c4
-rw-r--r--fs/compat.c2
-rw-r--r--include/linux/compat.h1
-rw-r--r--kernel/compat.c2
4 files changed, 3 insertions, 6 deletions
diff --git a/arch/mips/kernel/signal_n32.c b/arch/mips/kernel/signal_n32.c
index 50c17eaa7f2..477c5334ec1 100644
--- a/arch/mips/kernel/signal_n32.c
+++ b/arch/mips/kernel/signal_n32.c
@@ -42,8 +42,6 @@
#include "signal-common.h"
-extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat);
-
/*
* Including <asm/unistd.h> would give use the 64-bit syscall numbers ...
*/
@@ -83,6 +81,8 @@ struct rt_sigframe_n32 {
#endif
};
+extern void sigset_from_compat (sigset_t *set, compat_sigset_t *compat);
+
save_static_function(sysn32_rt_sigsuspend);
__attribute_used__ noinline static int
_sysn32_rt_sigsuspend(nabi_no_regargs struct pt_regs regs)
diff --git a/fs/compat.c b/fs/compat.c
index 13fb08d096c..d98c96f4a44 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -56,8 +56,6 @@
int compat_log = 1;
-extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat);
-
int compat_printk(const char *fmt, ...)
{
va_list ap;
diff --git a/include/linux/compat.h b/include/linux/compat.h
index 9760753e662..6f110957cc9 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -13,6 +13,7 @@
#include <asm/compat.h>
#include <asm/siginfo.h>
+#include <asm/signal.h>
#define compat_jiffies_to_clock_t(x) \
(((unsigned long)(x) * COMPAT_USER_HZ) / HZ)
diff --git a/kernel/compat.c b/kernel/compat.c
index b4fbd838cd7..75573e5d27b 100644
--- a/kernel/compat.c
+++ b/kernel/compat.c
@@ -26,8 +26,6 @@
#include <asm/uaccess.h>
-extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat);
-
int get_compat_timespec(struct timespec *ts, const struct compat_timespec __user *cts)
{
return (!access_ok(VERIFY_READ, cts, sizeof(*cts)) ||