Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3f2e05e90e0846c42626e3d272454f26be34a1bc

Authored by David Howells
Committed by Linus Torvalds
1 parent 9ec52099e4
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 4 changed files with 3 additions and 6 deletions Side-by-side Diff

arch/mips/kernel/signal_n32.c
Diff comments   View file @ 3f2e05e
... ... @@ -42,8 +42,6 @@
42 42  
43 43 #include "signal-common.h"
44 44  
45   -extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat);
46   -
47 45 /*
48 46 * Including <asm/unistd.h> would give use the 64-bit syscall numbers ...
49 47 */
... ... @@ -82,6 +80,8 @@
82 80 u32 rs_code[8] ____cacheline_aligned; /* signal trampoline */
83 81 #endif
84 82 };
  83 +
  84 +extern void sigset_from_compat (sigset_t *set, compat_sigset_t *compat);
85 85  
86 86 save_static_function(sysn32_rt_sigsuspend);
87 87 __attribute_used__ noinline static int
... ... @@ -56,8 +56,6 @@
56 56  
57 57 int compat_log = 1;
58 58  
59   -extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat);
60   -
61 59 int compat_printk(const char *fmt, ...)
62 60 {
63 61 va_list ap;
include/linux/compat.h
Diff comments   View file @ 3f2e05e
... ... @@ -13,6 +13,7 @@
13 13  
14 14 #include <asm/compat.h>
15 15 #include <asm/siginfo.h>
  16 +#include <asm/signal.h>
16 17  
17 18 #define compat_jiffies_to_clock_t(x) \
18 19 (((unsigned long)(x) * COMPAT_USER_HZ) / HZ)
... ... @@ -26,8 +26,6 @@
26 26  
27 27 #include <asm/uaccess.h>
28 28  
29   -extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat);
30   -
31 29 int get_compat_timespec(struct timespec *ts, const struct compat_timespec __user *cts)
32 30 {
33 31 return (!access_ok(VERIFY_READ, cts, sizeof(*cts)) ||