2004-03-14 22:01:02

by Colin Leroy

[permalink] [raw]
Subject: [PATCH] 2.6.4-bk3 ppc32 compile fix

Hi,

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

HTH,
--
Colin


Attachments:
2.6.4-bk3.compile.fix (273.00 B)

2004-03-15 15:51:24

by Tom Rini

[permalink] [raw]
Subject: Re: [PATCH] 2.6.4-bk3 ppc32 compile fix

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/

2004-03-15 15:54:55

by Colin Leroy

[permalink] [raw]
Subject: Re: [PATCH] 2.6.4-bk3 ppc32 compile fix

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

2004-03-15 16:03:17

by Tom Rini

[permalink] [raw]
Subject: Re: [PATCH] 2.6.4-bk3 ppc32 compile fix

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/

2004-03-15 16:08:50

by Colin Leroy

[permalink] [raw]
Subject: Re: [PATCH] 2.6.4-bk3 ppc32 compile fix

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


Attachments:
asmlinkage.diff (603.00 B)

2004-03-15 16:13:03

by Tom Rini

[permalink] [raw]
Subject: Re: [PATCH] 2.6.4-bk3 ppc32 compile fix

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/