Skip to contentSkip to conversation

spufs: change ppc_rtas declaration to weak

PATCH In review Geoff Levand 2 participants 2 messages Nov 10, 2006 – Nov 11, 2006

lore
Share & tools
lore

Geoff Levand

author
#0 lore raw

PATCH 2/16 spufs: change ppc_rtas declaration to weak

Change the definition of powerpc's cond_syscall() to use the standard gcc weak attribute specifier which provides proper support for C linkage as needed by spu_syscall_table[].

Fixes this powerpc build error with CONFIG_SPU_FS=y, CONFIG_PPC_RTAS=n:

arch/powerpc/platforms/built-in.o: undefined reference to `ppc_rtas'

Signed-off-by Geoff Levand <[email protected]>

---

 include/asm-powerpc/unistd.h |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
include/asm-powerpc/unistd.h +2 -10
Index: cell--common--6/include/asm-powerpc/unistd.h
===================================================================
@@ -445,7 +445,6 @@
 #include <linux/types.h>
 #include <linux/compiler.h>
 #include <linux/linkage.h>
-#include <asm/syscalls.h>
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR

@@ -480,16 +479,9 @@
 
 /*
  * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
  */
-#ifdef CONFIG_PPC32
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
-#else
-#define cond_syscall(x) asm(".weak\t." #x "\n\t.set\t." #x ",.sys_ni_syscall")
-#endif
-
+#define cond_syscall(x) \
+	asmlinkage long x (void) __attribute__((weak,alias("sys_ni_syscall")))
 
 #endif		/* __ASSEMBLY__ */
 #endif		/* __KERNEL__ */
Acked-by on v1 2/16
#1 lore raw
Quoted 5 lines · Geoff Levand

Change the definition of powerpc's cond_syscall() to use the standard gcc weak attribute specifier which provides proper support for C linkage as needed by spu_syscall_table[].
=20
Fixes this powerpc build error with CONFIG_SPU_FS=3Dy, CONFIG_PPC_RTAS=3D=

n:

Quoted 6 lines

=20
=A0arch/powerpc/platforms/built-in.o: undefined reference to `ppc_rtas' =20
=20

Signed-off-by Geoff Levand <[email protected]>

=20

Acked-by Arnd Bergmann <[email protected]>