diff options
author | David Howells <dhowells@redhat.com> | 2006-10-02 09:12:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 11:03:31 -0400 |
commit | 3f2e05e90e0846c42626e3d272454f26be34a1bc (patch) | |
tree | 8a1701fcb7cde32373b6d7ceca09376416bf94eb /kernel/compat.c | |
parent | 9ec52099e4b8678a60e9f93e41ad87885d64f3e6 (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>
Diffstat (limited to 'kernel/compat.c')
-rw-r--r-- | kernel/compat.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/compat.c b/kernel/compat.c index b4fbd838cd77..75573e5d27b0 100644 --- a/kernel/compat.c +++ b/kernel/compat.c | |||
@@ -26,8 +26,6 @@ | |||
26 | 26 | ||
27 | #include <asm/uaccess.h> | 27 | #include <asm/uaccess.h> |
28 | 28 | ||
29 | extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat); | ||
30 | |||
31 | int get_compat_timespec(struct timespec *ts, const struct compat_timespec __user *cts) | 29 | int get_compat_timespec(struct timespec *ts, const struct compat_timespec __user *cts) |
32 | { | 30 | { |
33 | return (!access_ok(VERIFY_READ, cts, sizeof(*cts)) || | 31 | return (!access_ok(VERIFY_READ, cts, sizeof(*cts)) || |