diff --git a/sys/compat/linux/arch/amd64/linux_machdep.h b/sys/compat/linux/arch/amd64/linux_machdep.h index 1532c11ae4e0..b93be017deae 100644 --- a/sys/compat/linux/arch/amd64/linux_machdep.h +++ b/sys/compat/linux/arch/amd64/linux_machdep.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.h,v 1.11 2008/01/28 14:31:35 njoly Exp $ */ +/* $NetBSD: linux_machdep.h,v 1.12 2008/04/21 22:38:18 njoly Exp $ */ /*- * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. @@ -116,7 +116,7 @@ __END_DECLS #define LINUX_UNAME_ARCH MACHINE_ARCH #define LINUX_NPTL #define LINUX_LARGEFILE64 -#define LINUX_SHMCTL_FORCEIPC64 +#define LINUX_IPC_FORCE64 /* * Used in ugly patch to fake device numbers. diff --git a/sys/compat/linux/common/linux_ipc.c b/sys/compat/linux/common/linux_ipc.c index d6b575f7067b..19b5f5a4cf7b 100644 --- a/sys/compat/linux/common/linux_ipc.c +++ b/sys/compat/linux/common/linux_ipc.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ipc.c,v 1.46 2008/04/16 14:47:31 njoly Exp $ */ +/* $NetBSD: linux_ipc.c,v 1.47 2008/04/21 22:38:18 njoly Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_ipc.c,v 1.46 2008/04/16 14:47:31 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_ipc.c,v 1.47 2008/04/21 22:38:18 njoly Exp $"); #if defined(_KERNEL_OPT) #include "opt_sysv.h" @@ -483,7 +483,7 @@ linux_sys_shmctl(struct lwp *l, const struct linux_sys_shmctl_args *uap, registe shmid = SCARG(uap, shmid); cmd = SCARG(uap, cmd); -#ifdef LINUX_SHMCTL_FORCEIPC64 +#ifdef LINUX_IPC_FORCE64 if (cmd == LINUX_IPC_STAT || cmd == LINUX_SHM_STAT) cmd |= LINUX_IPC_64; #endif