ChangeSet 1.2231.1.34, 2005/03/28 19:25:45-08:00, [EMAIL PROTECTED]
[PATCH] ppc64: fix linkage error on G5
Move the ppc64 specific cond_syscall(ppc_rtas) into sys_ni.c so that it
takes effect. With this fixed we can remove the #define hack.
Signed-off-by: Anton Blanchard <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
arch/ppc64/kernel/misc.S | 4 ----
arch/ppc64/kernel/syscalls.c | 3 ---
kernel/sys_ni.c | 1 +
3 files changed, 1 insertion(+), 7 deletions(-)
diff -Nru a/arch/ppc64/kernel/misc.S b/arch/ppc64/kernel/misc.S
--- a/arch/ppc64/kernel/misc.S 2005-03-28 21:13:49 -08:00
+++ b/arch/ppc64/kernel/misc.S 2005-03-28 21:13:49 -08:00
@@ -680,10 +680,6 @@
ld r30,-16(r1)
blr
-#ifdef CONFIG_PPC_RTAS /* hack hack hack */
-#define ppc_rtas sys_ni_syscall
-#endif
-
/* Why isn't this a) automatic, b) written in 'C'? */
.balign 8
_GLOBAL(sys_call_table32)
diff -Nru a/arch/ppc64/kernel/syscalls.c b/arch/ppc64/kernel/syscalls.c
--- a/arch/ppc64/kernel/syscalls.c 2005-03-28 21:13:49 -08:00
+++ b/arch/ppc64/kernel/syscalls.c 2005-03-28 21:13:49 -08:00
@@ -256,6 +256,3 @@
{
printk(" -> %lx, current=%p cpu=%d\n", r3, current, smp_processor_id());
}
-
-/* Only exists on P-series. */
-cond_syscall(ppc_rtas);
diff -Nru a/kernel/sys_ni.c b/kernel/sys_ni.c
--- a/kernel/sys_ni.c 2005-03-28 21:13:49 -08:00
+++ b/kernel/sys_ni.c 2005-03-28 21:13:49 -08:00
@@ -83,3 +83,4 @@
cond_syscall(sys_pciconfig_iobase);
cond_syscall(sys32_ipc);
cond_syscall(sys32_sysctl);
+cond_syscall(ppc_rtas);
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
