Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] BLOCK: Revert patch to hack around undeclared sigset_t in linux/compat.h

Browse source 
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>
This commit is contained in:
David Howells 2006-10-02 14:12:31 +01:00 • committed by Linus Torvalds
parent 9ec52099e4
commit 3f2e05e90e
4 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/mips/kernel/signal_n32.c
View file

@ -42,8 +42,6 @@
#include "signal-common.h" #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 ... * Including <asm/unistd.h> would give use the 64-bit syscall numbers ...
*/ */
@ -83,6 +81,8 @@ struct rt_sigframe_n32 {
#endif #endif
}; };
extern void sigset_from_compat (sigset_t *set, compat_sigset_t *compat);
save_static_function(sysn32_rt_sigsuspend); save_static_function(sysn32_rt_sigsuspend);
__attribute_used__ noinline static int __attribute_used__ noinline static int
_sysn32_rt_sigsuspend(nabi_no_regargs struct pt_regs regs) _sysn32_rt_sigsuspend(nabi_no_regargs struct pt_regs regs)

2
fs/compat.c
View file

@ -56,8 +56,6 @@
int compat_log = 1; int compat_log = 1;
extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat);
int compat_printk(const char *fmt, ...) int compat_printk(const char *fmt, ...)
{ {
va_list ap; va_list ap;

1
include/linux/compat.h
View file

@ -13,6 +13,7 @@
#include <asm/compat.h> #include <asm/compat.h>
#include <asm/siginfo.h> #include <asm/siginfo.h>
#include <asm/signal.h>
#define compat_jiffies_to_clock_t(x) \ #define compat_jiffies_to_clock_t(x) \
(((unsigned long)(x) * COMPAT_USER_HZ) / HZ) (((unsigned long)(x) * COMPAT_USER_HZ) / HZ)

2
kernel/compat.c
View file

@ -26,8 +26,6 @@
#include <asm/uaccess.h> #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) int get_compat_timespec(struct timespec *ts, const struct compat_timespec __user *cts)
{ {
return (!access_ok(VERIFY_READ, cts, sizeof(*cts)) || return (!access_ok(VERIFY_READ, cts, sizeof(*cts)) ||