linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] 2.6.4-bk3 ppc32 compile fix
@ 2004-03-14 21:59 Colin Leroy
  2004-03-15 15:51 ` Tom Rini
  0 siblings, 1 reply; 6+ messages in thread
From: Colin Leroy @ 2004-03-14 21:59 UTC (permalink / raw)
  To: benh, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 107 bytes --]

Hi, 

2.6.4-bk3 (ie, 2.6.4 + bk3 patch at kernel.org) does not compile without this patch.

HTH,
-- 
Colin

[-- Attachment #2: 2.6.4-bk3.compile.fix --]
[-- Type: application/octet-stream, Size: 273 bytes --]

--- include/asm-ppc/unistd.h.old	2004-03-14 22:56:42.901105784 +0100
+++ include/asm-ppc/unistd.h	2004-03-14 22:56:45.276744632 +0100
@@ -380,6 +380,7 @@
 
 #include <linux/compiler.h>
 #include <linux/types.h>
+#include <linux/linkage.h>
 
 /*
  * System call prototypes.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] 2.6.4-bk3 ppc32 compile fix
  2004-03-15 15:51 ` Tom Rini
@ 2004-03-15 15:49   ` Colin Leroy
  2004-03-15 16:03     ` Tom Rini
  0 siblings, 1 reply; 6+ messages in thread
From: Colin Leroy @ 2004-03-15 15:49 UTC (permalink / raw)
  To: Tom Rini; +Cc: benh, linux-kernel

> > 2.6.4-bk3 (ie, 2.6.4 + bk3 patch at kernel.org) does not compile
without this patch.
>
> How does it fail to compile?

Same problem as here:
http://marc.theaimsgroup.com/?l=linux-kernel&m=107935807420183&w=2

include/asm/unistd.h:451: syntax error before "long"

(maybe adding the #include <linux/linkage.h> to init/do_mounts_initrd.c is
better than where I did put it).
-- 
Colin


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] 2.6.4-bk3 ppc32 compile fix
  2004-03-14 21:59 [PATCH] 2.6.4-bk3 ppc32 compile fix Colin Leroy
@ 2004-03-15 15:51 ` Tom Rini
  2004-03-15 15:49   ` Colin Leroy
  0 siblings, 1 reply; 6+ messages in thread
From: Tom Rini @ 2004-03-15 15:51 UTC (permalink / raw)
  To: Colin Leroy; +Cc: benh, linux-kernel

On Sun, Mar 14, 2004 at 10:59:13PM +0100, Colin Leroy wrote:

> Hi, 
> 
> 2.6.4-bk3 (ie, 2.6.4 + bk3 patch at kernel.org) does not compile without this patch.

How does it fail to compile?

-- 
Tom Rini
http://gate.crashing.org/~trini/

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] 2.6.4-bk3 ppc32 compile fix
  2004-03-15 15:49   ` Colin Leroy
@ 2004-03-15 16:03     ` Tom Rini
  2004-03-15 16:03       ` Colin Leroy
  0 siblings, 1 reply; 6+ messages in thread
From: Tom Rini @ 2004-03-15 16:03 UTC (permalink / raw)
  To: Colin Leroy; +Cc: benh, linux-kernel

On Mon, Mar 15, 2004 at 04:49:21PM +0100, Colin Leroy wrote:

> > > 2.6.4-bk3 (ie, 2.6.4 + bk3 patch at kernel.org) does not compile
> without this patch.
> >
> > How does it fail to compile?
> 
> Same problem as here:
> http://marc.theaimsgroup.com/?l=linux-kernel&m=107935807420183&w=2
> 
> include/asm/unistd.h:451: syntax error before "long"
> 
> (maybe adding the #include <linux/linkage.h> to init/do_mounts_initrd.c is
> better than where I did put it).

The problem is that on PPC32 (and probably sparc64) 'asmlinkage' is a
useless keyword, and should just be removed from
include/asm-ppc/unistd.h.

-- 
Tom Rini
http://gate.crashing.org/~trini/

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] 2.6.4-bk3 ppc32 compile fix
  2004-03-15 16:03     ` Tom Rini
@ 2004-03-15 16:03       ` Colin Leroy
  2004-03-15 16:12         ` Tom Rini
  0 siblings, 1 reply; 6+ messages in thread
From: Colin Leroy @ 2004-03-15 16:03 UTC (permalink / raw)
  To: Tom Rini; +Cc: benh, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 250 bytes --]

Hi again,

> The problem is that on PPC32 (and probably sparc64) 'asmlinkage' is a
> useless keyword, and should just be removed from
> include/asm-ppc/unistd.h.

Here's another patch, then :)
(not changing sparc64 stuff... I can't test it)
-- 
Colin

[-- Attachment #2: asmlinkage.diff --]
[-- Type: application/octet-stream, Size: 620 bytes --]

--- include/asm-ppc/unistd.h.orig	2004-03-11 03:55:23.000000000 +0100
+++ include/asm-ppc/unistd.h	2004-03-15 17:01:49.000000000 +0100
@@ -415,10 +415,10 @@
 int sys_pipe(int __user *fildes);
 int sys_ptrace(long request, long pid, long addr, long data);
 struct sigaction;
-asmlinkage long sys_rt_sigaction(int sig,
-				const struct sigaction __user *act,
-				struct sigaction __user *oact,
-				size_t sigsetsize);
+long sys_rt_sigaction(int sig,
+		      const struct sigaction __user *act,
+		      struct sigaction __user *oact,
+		      size_t sigsetsize);
 
 #endif /* __KERNEL_SYSCALLS__ */
 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] 2.6.4-bk3 ppc32 compile fix
  2004-03-15 16:03       ` Colin Leroy
@ 2004-03-15 16:12         ` Tom Rini
  0 siblings, 0 replies; 6+ messages in thread
From: Tom Rini @ 2004-03-15 16:12 UTC (permalink / raw)
  To: Colin Leroy, Andrew Morton; +Cc: benh, linux-kernel

On Mon, Mar 15, 2004 at 05:03:16PM +0100, Colin Leroy wrote:
> Hi again,
> 
> > The problem is that on PPC32 (and probably sparc64) 'asmlinkage' is a
> > useless keyword, and should just be removed from
> > include/asm-ppc/unistd.h.
> 
> Here's another patch, then :)
> (not changing sparc64 stuff... I can't test it)

Here it is inline:

--- include/asm-ppc/unistd.h.orig	2004-03-11 03:55:23.000000000 +0100
+++ include/asm-ppc/unistd.h	2004-03-15 17:01:49.000000000 +0100
@@ -415,10 +415,10 @@
 int sys_pipe(int __user *fildes);
 int sys_ptrace(long request, long pid, long addr, long data);
 struct sigaction;
-asmlinkage long sys_rt_sigaction(int sig,
-				const struct sigaction __user *act,
-				struct sigaction __user *oact,
-				size_t sigsetsize);
+long sys_rt_sigaction(int sig,
+		      const struct sigaction __user *act,
+		      struct sigaction __user *oact,
+		      size_t sigsetsize);
 
 #endif /* __KERNEL_SYSCALLS__ */
 

Andrew, can you please take this up?  Thanks.

-- 
Tom Rini
http://gate.crashing.org/~trini/

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2004-03-15 16:13 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-03-14 21:59 [PATCH] 2.6.4-bk3 ppc32 compile fix Colin Leroy
2004-03-15 15:51 ` Tom Rini
2004-03-15 15:49   ` Colin Leroy
2004-03-15 16:03     ` Tom Rini
2004-03-15 16:03       ` Colin Leroy
2004-03-15 16:12         ` Tom Rini

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).