* [PATCH 1/2] BLOCK: Revert patch to hack around undeclared sigset_t in linux/compat.h
@ 2006-10-02 13:12 David Howells
2006-10-02 13:12 ` [PATCH 2/2] BLOCK: Fix linux/compat.h's use sigset_t David Howells
0 siblings, 1 reply; 8+ messages in thread
From: David Howells @ 2006-10-02 13:12 UTC (permalink / raw)
To: torvalds, akpm, axboe; +Cc: dhowells, linux-fsdevel, linux-kernel
From: David Howells <dhowells@redhat.com>
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.
Signed-Off-By: David Howells <dhowells@redhat.com>
---
arch/mips/kernel/signal_n32.c | 4 ++--
fs/compat.c | 2 --
include/linux/compat.h | 1 +
kernel/compat.c | 2 --
4 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/arch/mips/kernel/signal_n32.c b/arch/mips/kernel/signal_n32.c
index 50c17ea..477c533 100644
--- a/arch/mips/kernel/signal_n32.c
+++ b/arch/mips/kernel/signal_n32.c
@@ -42,8 +42,6 @@ #include <asm/war.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 ...
*/
@@ -83,6 +81,8 @@ #if ICACHE_REFILLS_WORKAROUND_WAR
#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 13fb08d..d98c96f 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -56,8 +56,6 @@ #include "internal.h"
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 9760753..967e748 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -227,6 +227,7 @@ static inline int compat_timespec_compar
asmlinkage long compat_sys_adjtimex(struct compat_timex __user *utp);
extern int compat_printk(const char *fmt, ...);
+extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat);
#endif /* CONFIG_COMPAT */
#endif /* _LINUX_COMPAT_H */
diff --git a/kernel/compat.c b/kernel/compat.c
index b4fbd83..75573e5 100644
--- a/kernel/compat.c
+++ b/kernel/compat.c
@@ -26,8 +26,6 @@ #include <linux/posix-timers.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)
{
return (!access_ok(VERIFY_READ, cts, sizeof(*cts)) ||
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] BLOCK: Fix linux/compat.h's use sigset_t
2006-10-02 13:12 [PATCH 1/2] BLOCK: Revert patch to hack around undeclared sigset_t in linux/compat.h David Howells
@ 2006-10-02 13:12 ` David Howells
2006-10-02 16:51 ` Jens Axboe
0 siblings, 1 reply; 8+ messages in thread
From: David Howells @ 2006-10-02 13:12 UTC (permalink / raw)
To: torvalds, akpm, axboe; +Cc: dhowells, linux-fsdevel, linux-kernel
From: David Howells <dhowells@redhat.com>
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>
---
include/linux/compat.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/include/linux/compat.h b/include/linux/compat.h
index 967e748..ef5cd19 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -13,6 +13,7 @@ #include <linux/sem.h>
#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)
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] BLOCK: Fix linux/compat.h's use sigset_t
2006-10-02 13:12 ` [PATCH 2/2] BLOCK: Fix linux/compat.h's use sigset_t David Howells
@ 2006-10-02 16:51 ` Jens Axboe
2006-10-02 17:05 ` Linus Torvalds
0 siblings, 1 reply; 8+ messages in thread
From: Jens Axboe @ 2006-10-02 16:51 UTC (permalink / raw)
To: David Howells; +Cc: torvalds, akpm, linux-fsdevel, linux-kernel
On Mon, Oct 02 2006, David Howells wrote:
> From: David Howells <dhowells@redhat.com>
>
> 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.
Ack both patches, thanks David.
--
Jens Axboe
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] BLOCK: Fix linux/compat.h's use sigset_t
2006-10-02 16:51 ` Jens Axboe
@ 2006-10-02 17:05 ` Linus Torvalds
2006-10-02 17:49 ` Jens Axboe
2006-10-02 20:40 ` Olaf Hering
0 siblings, 2 replies; 8+ messages in thread
From: Linus Torvalds @ 2006-10-02 17:05 UTC (permalink / raw)
To: Jens Axboe; +Cc: David Howells, akpm, linux-fsdevel, linux-kernel
On Mon, 2 Oct 2006, Jens Axboe wrote:
> On Mon, Oct 02 2006, David Howells wrote:
> > From: David Howells <dhowells@redhat.com>
> >
> > 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.
>
> Ack both patches, thanks David.
Well, I already applied them, but I applied them as a single patch (since
1/2 wasn't actually usable on its own _or_ even just a plain revert, and
2/2 was really required for 1/2 to even compile).
Linus
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] BLOCK: Fix linux/compat.h's use sigset_t
2006-10-02 17:05 ` Linus Torvalds
@ 2006-10-02 17:49 ` Jens Axboe
2006-10-02 20:40 ` Olaf Hering
1 sibling, 0 replies; 8+ messages in thread
From: Jens Axboe @ 2006-10-02 17:49 UTC (permalink / raw)
To: Linus Torvalds; +Cc: David Howells, akpm, linux-fsdevel, linux-kernel
On Mon, Oct 02 2006, Linus Torvalds wrote:
>
>
> On Mon, 2 Oct 2006, Jens Axboe wrote:
>
> > On Mon, Oct 02 2006, David Howells wrote:
> > > From: David Howells <dhowells@redhat.com>
> > >
> > > 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.
> >
> > Ack both patches, thanks David.
>
> Well, I already applied them, but I applied them as a single patch (since
> 1/2 wasn't actually usable on its own _or_ even just a plain revert, and
> 2/2 was really required for 1/2 to even compile).
Works for me, thanks Linus.
--
Jens Axboe
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] BLOCK: Fix linux/compat.h's use sigset_t
2006-10-02 17:05 ` Linus Torvalds
2006-10-02 17:49 ` Jens Axboe
@ 2006-10-02 20:40 ` Olaf Hering
2006-10-02 21:00 ` Linus Torvalds
1 sibling, 1 reply; 8+ messages in thread
From: Olaf Hering @ 2006-10-02 20:40 UTC (permalink / raw)
To: Linus Torvalds
Cc: Jens Axboe, David Howells, akpm, linux-fsdevel, linux-kernel
On Mon, Oct 02, Linus Torvalds wrote:
> Well, I already applied them, but I applied them as a single patch (since
> 1/2 wasn't actually usable on its own _or_ even just a plain revert, and
> 2/2 was really required for 1/2 to even compile).
The sigset_from_compat() calls in fs/compat.c have currently no
declaration of that function.
The change for include/linux/compat.h is appearently missing.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] BLOCK: Fix linux/compat.h's use sigset_t
2006-10-02 20:40 ` Olaf Hering
@ 2006-10-02 21:00 ` Linus Torvalds
2006-10-02 21:28 ` Linus Torvalds
0 siblings, 1 reply; 8+ messages in thread
From: Linus Torvalds @ 2006-10-02 21:00 UTC (permalink / raw)
To: Olaf Hering; +Cc: Jens Axboe, David Howells, akpm, linux-fsdevel, linux-kernel
On Mon, 2 Oct 2006, Olaf Hering wrote:
> On Mon, Oct 02, Linus Torvalds wrote:
>
> > Well, I already applied them, but I applied them as a single patch (since
> > 1/2 wasn't actually usable on its own _or_ even just a plain revert, and
> > 2/2 was really required for 1/2 to even compile).
>
> The sigset_from_compat() calls in fs/compat.c have currently no
> declaration of that function.
> The change for include/linux/compat.h is appearently missing.
Yeah, damn, I don't know what happened there. I fixed the patch, but then
actually applied the old version, it looks like.
Duh.
Linus "uhh.. Too little coffee?" Torvalds
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] BLOCK: Fix linux/compat.h's use sigset_t
2006-10-02 21:00 ` Linus Torvalds
@ 2006-10-02 21:28 ` Linus Torvalds
0 siblings, 0 replies; 8+ messages in thread
From: Linus Torvalds @ 2006-10-02 21:28 UTC (permalink / raw)
To: Olaf Hering; +Cc: Jens Axboe, David Howells, akpm, linux-fsdevel, linux-kernel
On Mon, 2 Oct 2006, Linus Torvalds wrote:
>
> Yeah, damn, I don't know what happened there. I fixed the patch, but then
> actually applied the old version, it looks like.
Nope, I just messed up fixing the patch. Nothing to see here. I'm a
maroon.
I checked in the missing line.
Linus
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2006-10-02 21:28 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-10-02 13:12 [PATCH 1/2] BLOCK: Revert patch to hack around undeclared sigset_t in linux/compat.h David Howells
2006-10-02 13:12 ` [PATCH 2/2] BLOCK: Fix linux/compat.h's use sigset_t David Howells
2006-10-02 16:51 ` Jens Axboe
2006-10-02 17:05 ` Linus Torvalds
2006-10-02 17:49 ` Jens Axboe
2006-10-02 20:40 ` Olaf Hering
2006-10-02 21:00 ` Linus Torvalds
2006-10-02 21:28 ` Linus Torvalds
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).