Commit 3f2e05e9 authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

[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: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9ec52099

arch/mips/kernel/signal_n32.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

fs/compat.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

include/linux/compat.h

+1 −0
Original line number Diff line number Diff line
@@ -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)

kernel/compat.c

+0 −2
Original line number Diff line number Diff line
@@ -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)) ||

CRA Git | Maintained and supported by SUSTech CRA and CCSE