summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorCedric Le Goater <clg@fr.ibm.com>2006-10-18 18:30:41 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2006-10-18 18:30:41 +0200
commit1df23957ba2da6eb8c7a5c2ad7bb1d4732132873 (patch)
tree01e1471f0e0a23e19508b25d7c7d7aa4e1eddbe4 /arch
parent73ed9a86cd77b6a3b46beec8d353ac3b0d4f50c1 (diff)
downloadlinux-1df23957ba2da6eb8c7a5c2ad7bb1d4732132873.tar.gz
linux-1df23957ba2da6eb8c7a5c2ad7bb1d4732132873.tar.bz2
linux-1df23957ba2da6eb8c7a5c2ad7bb1d4732132873.zip
[S390] fix vmlinux link when CONFIG_SYSIPC=n
Fix the following compile error: CC init/version.o LD init/built-in.o LD .tmp_vmlinux1 arch/s390/kernel/built-in.o(.text+0xdba4): In function `sys32_ipc': : undefined reference to `compat_sys_semtimedop' arch/s390/kernel/built-in.o(.text+0xdbee): In function `sys32_ipc': : undefined reference to `compat_sys_semctl' arch/s390/kernel/built-in.o(.text+0xdc08): In function `sys32_ipc': : undefined reference to `compat_sys_msgsnd' arch/s390/kernel/built-in.o(.text+0xdc30): In function `sys32_ipc': : undefined reference to `compat_sys_msgrcv' arch/s390/kernel/built-in.o(.text+0xdc58): In function `sys32_ipc': : undefined reference to `compat_sys_msgctl' arch/s390/kernel/built-in.o(.text+0xdc76): In function `sys32_ipc': : undefined reference to `compat_sys_shmat' arch/s390/kernel/built-in.o(.text+0xdcb0): In function `sys32_ipc': : undefined reference to `compat_sys_shmctl' make: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Cedric Le Goater <clg@fr.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/kernel/compat_linux.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index e15e1489aef5..2001767e1dc7 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -295,6 +295,7 @@ static inline long put_tv32(struct compat_timeval __user *o, struct timeval *i)
*
* This is really horribly ugly.
*/
+#ifdef CONFIG_SYSVIPC
asmlinkage long sys32_ipc(u32 call, int first, int second, int third, u32 ptr)
{
if (call >> 16) /* hack for backward compatibility */
@@ -338,6 +339,7 @@ asmlinkage long sys32_ipc(u32 call, int first, int second, int third, u32 ptr)
return -ENOSYS;
}
+#endif
asmlinkage long sys32_truncate64(const char __user * path, unsigned long high, unsigned long low)
{