Skip to contentSkip to conversation

2.6.4-bk3 ppc32 compile fix

PATCH In review Colin Leroy 2 participants 6 messages Mar 14, 2004 – Mar 15, 2004

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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,

Signature · 1 line
Colin
#1 lore raw
Quoted 3 lines · Colin Leroy

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?

Signature · 2 lines
Tom Rini
http://gate.crashing.org/~trini/
#2 lore raw
Quoted 1 line
Quoted 1 line

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

without this patch.

Quoted 2 lines

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

Signature · 1 line
Colin
#3 lore raw
Quoted 5 lines · Colin Leroy
Quoted 1 line
Quoted 1 line

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

without this patch.

Quoted 2 lines

How does it fail to compile?

Quoted 7 lines

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.

Signature · 2 lines
Tom Rini
http://gate.crashing.org/~trini/
#4 lore raw

Hi again,

Quoted 3 lines

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)

Signature · 1 line
Colin
asm-ppc/unistd.h renamed from asm-ppc/unistd.h.orig +4 -4
@@ -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__ */
 
#5 lore raw
Quoted 8 lines · Colin Leroy

Hi again,

Quoted 3 lines

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:

asm-ppc/unistd.h renamed from asm-ppc/unistd.h.orig +4 -4
@@ -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.

Signature · 2 lines
Tom Rini
http://gate.crashing.org/~trini/