[PATCH] ppc64: Problem disabling SYSVIPC

[Anton Blanchard]

Hi,

The kernel wouldnt link when SYSVIPC was disabled. x86-64 was already
defining a cond_syscall, instead of duplicating it in the ppc64 port
move it into the arch specific portion of kernel/sys_ni.c

Anton

Signed-off-by: Anton Blanchard <anton at samba.org>

diff -puN kernel/sys_ni.c~fix_config_sysvipc2 kernel/sys_ni.c
--- foobar2/kernel/sys_ni.c~fix_config_sysvipc2	2005-01-12 00:17:55.800846282 +1100
+++ foobar2-anton/kernel/sys_ni.c	2005-01-12 00:18:59.720579810 +1100
@@ -81,4 +81,4 @@ cond_syscall(compat_sys_socketcall)
 cond_syscall(sys_pciconfig_read)
 cond_syscall(sys_pciconfig_write)
 cond_syscall(sys_pciconfig_iobase)
-
+cond_syscall(sys32_ipc)
diff -puN arch/ppc64/kernel/sys_ppc32.c~fix_config_sysvipc2 arch/ppc64/kernel/sys_ppc32.c
--- foobar2/arch/ppc64/kernel/sys_ppc32.c~fix_config_sysvipc2	2005-01-12 00:18:09.526904432 +1100
+++ foobar2-anton/arch/ppc64/kernel/sys_ppc32.c	2005-01-12 00:18:25.130082960 +1100
@@ -492,6 +492,7 @@ asmlinkage long sys32_settimeofday(struc
 	return do_sys_settimeofday(tv ? &kts : NULL, tz ? &ktz : NULL);
 }
 
+#ifdef CONFIG_SYSVIPC
 long sys32_ipc(u32 call, u32 first, u32 second, u32 third, compat_uptr_t ptr,
 	       u32 fifth)
 {
@@ -556,6 +557,7 @@ long sys32_ipc(u32 call, u32 first, u32 
 
 	return -ENOSYS;
 }
+#endif
 
 /* Note: it is necessary to treat out_fd and in_fd as unsigned ints, 
  * with the corresponding cast to a signed int to insure that the 
diff -puN arch/x86_64/ia32/sys_ia32.c~fix_config_sysvipc2 arch/x86_64/ia32/sys_ia32.c
--- foobar2/arch/x86_64/ia32/sys_ia32.c~fix_config_sysvipc2	2005-01-12 00:18:46.324623956 +1100
+++ foobar2-anton/arch/x86_64/ia32/sys_ia32.c	2005-01-12 00:18:52.356042193 +1100
@@ -1082,8 +1082,6 @@ long sys32_lookup_dcookie(u32 addr_low, 
 	return sys_lookup_dcookie(((u64)addr_high << 32) | addr_low, buf, len);
 }
 
-cond_syscall(sys32_ipc)
-
 static int __init ia32_init (void)
 {
 	printk("IA32 emulation $Id: sys_ia32.c,v 1.32 2002/03/24 13:02:28 ak Exp $\n");  
_