diff options
author | Geoff Levand <geoffrey.levand@am.sony.com> | 2006-11-20 12:44:56 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-12-04 04:39:42 -0500 |
commit | 8dc86ab954d28513f75918d743c40cddbff7388a (patch) | |
tree | b19f9393d0d753f1b7a5de6fea62f18262b1f277 /include/asm-powerpc | |
parent | 78dc4c20de0f2cb2aa6d4542f965f889be6da775 (diff) |
[POWERPC] 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 <geoffrey.levand@am.sony.com>
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc')
-rw-r--r-- | include/asm-powerpc/unistd.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/include/asm-powerpc/unistd.h b/include/asm-powerpc/unistd.h index 0e4ea37f6466..04b6c17cc59b 100644 --- a/include/asm-powerpc/unistd.h +++ b/include/asm-powerpc/unistd.h | |||
@@ -446,7 +446,6 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6 | |||
446 | #include <linux/types.h> | 446 | #include <linux/types.h> |
447 | #include <linux/compiler.h> | 447 | #include <linux/compiler.h> |
448 | #include <linux/linkage.h> | 448 | #include <linux/linkage.h> |
449 | #include <asm/syscalls.h> | ||
450 | 449 | ||
451 | #define __ARCH_WANT_IPC_PARSE_VERSION | 450 | #define __ARCH_WANT_IPC_PARSE_VERSION |
452 | #define __ARCH_WANT_OLD_READDIR | 451 | #define __ARCH_WANT_OLD_READDIR |
@@ -481,16 +480,9 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6 | |||
481 | 480 | ||
482 | /* | 481 | /* |
483 | * "Conditional" syscalls | 482 | * "Conditional" syscalls |
484 | * | ||
485 | * What we want is __attribute__((weak,alias("sys_ni_syscall"))), | ||
486 | * but it doesn't work on all toolchains, so we just do it by hand | ||
487 | */ | 483 | */ |
488 | #ifdef CONFIG_PPC32 | 484 | #define cond_syscall(x) \ |
489 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") | 485 | asmlinkage long x (void) __attribute__((weak,alias("sys_ni_syscall"))) |
490 | #else | ||
491 | #define cond_syscall(x) asm(".weak\t." #x "\n\t.set\t." #x ",.sys_ni_syscall") | ||
492 | #endif | ||
493 | |||
494 | 486 | ||
495 | #endif /* __ASSEMBLY__ */ | 487 | #endif /* __ASSEMBLY__ */ |
496 | #endif /* __KERNEL__ */ | 488 | #endif /* __KERNEL__ */ |