* linux-next: build failure after merge of the final tree (tile tree related)
@ 2011-05-24 3:42 Stephen Rothwell
2011-05-24 12:25 ` Chris Metcalf
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2011-05-24 3:42 UTC (permalink / raw)
To: Chris Metcalf; +Cc: linux-next, linux-kernel
Hi Chris,
After merging the final tree, today's linux-next build (sparc64 defconfig)
failed like this:
In file included from arch/sparc/include/asm/siginfo.h:19,
from include/linux/signal.h:5,
from include/linux/sched.h:73,
from arch/sparc/kernel/asm-offsets.c:13:
include/linux/compat.h:401: error: expected ')' before 'ctx_id'
include/linux/compat.h:406: error: expected ')' before 'ctx_id'
Caused by commit be84cb43833e ("compat: fixes to allow working with tile arch").
I added this patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 24 May 2011 13:28:54 +1000
Subject: [PATCH] compat: include aio_abi.h for aio_context_t
fixes this build error on sparc64 (at least):
In file included from arch/sparc/include/asm/siginfo.h:19,
from include/linux/signal.h:5,
from include/linux/sched.h:73,
from arch/sparc/kernel/asm-offsets.c:13:
include/linux/compat.h:401: error: expected ')' before 'ctx_id'
include/linux/compat.h:406: error: expected ')' before 'ctx_id'
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
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 644e1a4..ddcb7db 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -13,6 +13,7 @@
#include <linux/socket.h>
#include <linux/if.h>
#include <linux/fs.h>
+#include <linux/aio_abi.h> /* for aio_context_t */
#include <asm/compat.h>
#include <asm/siginfo.h>
--
1.7.5.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: linux-next: build failure after merge of the final tree (tile tree related)
2011-05-24 3:42 linux-next: build failure after merge of the final tree (tile tree related) Stephen Rothwell
@ 2011-05-24 12:25 ` Chris Metcalf
0 siblings, 0 replies; 5+ messages in thread
From: Chris Metcalf @ 2011-05-24 12:25 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
On 5/23/2011 11:42 PM, Stephen Rothwell wrote:
> Hi Chris,
>
> After merging the final tree, today's linux-next build (sparc64 defconfig)
> failed like this:
>
> [...]
>
> I added this patch for today:
>
> [...]
>
> diff --git a/include/linux/compat.h b/include/linux/compat.h
> index 644e1a4..ddcb7db 100644
> --- a/include/linux/compat.h
> +++ b/include/linux/compat.h
> @@ -13,6 +13,7 @@
> #include <linux/socket.h>
> #include <linux/if.h>
> #include <linux/fs.h>
> +#include <linux/aio_abi.h> /* for aio_context_t */
>
> #include <asm/compat.h>
> #include <asm/siginfo.h>
Stephen, thanks for the discovery and the fix. Apparently the uses in the
"tile" tree already happen to have this header included earlier, so I
didn't trip up against it. I'll take the change into my tree.
--
Chris Metcalf, Tilera Corp.
http://www.tilera.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: build failure after merge of the final tree (tile tree related)
@ 2011-05-24 12:25 ` Chris Metcalf
0 siblings, 0 replies; 5+ messages in thread
From: Chris Metcalf @ 2011-05-24 12:25 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
On 5/23/2011 11:42 PM, Stephen Rothwell wrote:
> Hi Chris,
>
> After merging the final tree, today's linux-next build (sparc64 defconfig)
> failed like this:
>
> [...]
>
> I added this patch for today:
>
> [...]
>
> diff --git a/include/linux/compat.h b/include/linux/compat.h
> index 644e1a4..ddcb7db 100644
> --- a/include/linux/compat.h
> +++ b/include/linux/compat.h
> @@ -13,6 +13,7 @@
> #include <linux/socket.h>
> #include <linux/if.h>
> #include <linux/fs.h>
> +#include <linux/aio_abi.h> /* for aio_context_t */
>
> #include <asm/compat.h>
> #include <asm/siginfo.h>
Stephen, thanks for the discovery and the fix. Apparently the uses in the
"tile" tree already happen to have this header included earlier, so I
didn't trip up against it. I'll take the change into my tree.
--
Chris Metcalf, Tilera Corp.
http://www.tilera.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: build failure after merge of the final tree (tile tree related)
2010-06-07 4:01 Stephen Rothwell
@ 2010-06-07 12:56 ` Chris Metcalf
0 siblings, 0 replies; 5+ messages in thread
From: Chris Metcalf @ 2010-06-07 12:56 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, David S. Miller, Arnd Bergmann
On 6/7/2010 12:01 AM, Stephen Rothwell wrote:
> I applied this patch for today. Something better could probably be
> done. I note that there is already a declaration of sys_rt_sigaction in
> include/asm-generic/syscalls.h ...
>
Yes, thanks for the pointer. In fact by adjusting a couple of tile
syscalls slightly I can just use <asm-generic/syscalls.h> wholesale. I
reverted the addition of sys_rt_sigaction() and sys_rt_sigsuspend() to
<linux/syscalls.h> and cleaned up the arch/tile/include/asm/syscalls.h
as well. I mailed the patch as another reply-to to Stephen's original
message.
--
Chris Metcalf, Tilera Corp.
http://www.tilera.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: build failure after merge of the final tree (tile tree related)
@ 2010-06-07 4:01 Stephen Rothwell
2010-06-07 12:56 ` Chris Metcalf
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2010-06-07 4:01 UTC (permalink / raw)
To: Chris Metcalf; +Cc: linux-next, linux-kernel, David S. Miller, Arnd Bergmann
Hi Chris,
After merging the final tree, today's linux-next build (sparc32 defconfig)
failed like this:
arch/sparc/kernel/sys_sparc_32.c:229: error: conflicting types for 'sys_rt_sigaction'
include/linux/syscalls.h:367: note: previous declaration of 'sys_rt_sigaction' was here
Caused by commit 5360bd776f73d0a7da571d72a09a03f237e99900 ("Fix up the
"generic" unistd.h ABI to be more useful") from the tile tree. Sparc's
sys_rt_sigaction has an extra argument.
I applied this patch for today. Something better could probably be
done. I note that there is already a declaration of sys_rt_sigaction in
include/asm-generic/syscalls.h ...
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 7 Jun 2010 13:49:46 +1000
Subject: [PATCH] Only declare sys_rt_sigaction if it is wanted.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
include/linux/syscalls.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 61663cb..4193907 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -364,9 +364,11 @@ asmlinkage long sys_init_module(void __user *umod, unsigned long len,
asmlinkage long sys_delete_module(const char __user *name_user,
unsigned int flags);
+#ifdef __ARCH_WANT_SYS_RT_SIGACTION
asmlinkage long sys_rt_sigaction(int sig, const struct sigaction __user *act,
struct sigaction __user *oact,
size_t sigsetsize);
+#endif
asmlinkage long sys_rt_sigprocmask(int how, sigset_t __user *set,
sigset_t __user *oset, size_t sigsetsize);
asmlinkage long sys_rt_sigpending(sigset_t __user *set, size_t sigsetsize);
--
1.7.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-05-24 12:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-05-24 3:42 linux-next: build failure after merge of the final tree (tile tree related) Stephen Rothwell
2011-05-24 12:25 ` Chris Metcalf
2011-05-24 12:25 ` Chris Metcalf
-- strict thread matches above, loose matches on Subject: below --
2010-06-07 4:01 Stephen Rothwell
2010-06-07 12:56 ` Chris Metcalf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.