diff options
Diffstat (limited to 'ipc')
-rw-r--r-- | ipc/compat.c | 2 | ||||
-rw-r--r-- | ipc/util.c | 4 | ||||
-rw-r--r-- | ipc/util.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ipc/compat.c b/ipc/compat.c index 20f92b2f2932..ad9518eb26e0 100644 --- a/ipc/compat.c +++ b/ipc/compat.c | |||
@@ -118,7 +118,7 @@ extern int sem_ctls[]; | |||
118 | 118 | ||
119 | static inline int compat_ipc_parse_version(int *cmd) | 119 | static inline int compat_ipc_parse_version(int *cmd) |
120 | { | 120 | { |
121 | #ifdef __ARCH_WANT_COMPAT_IPC_PARSE_VERSION | 121 | #ifdef CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION |
122 | int version = *cmd & IPC_64; | 122 | int version = *cmd & IPC_64; |
123 | 123 | ||
124 | /* this is tricky: architectures that have support for the old | 124 | /* this is tricky: architectures that have support for the old |
diff --git a/ipc/util.c b/ipc/util.c index 75261a31d48d..eb07fd356f27 100644 --- a/ipc/util.c +++ b/ipc/util.c | |||
@@ -804,7 +804,7 @@ out_up: | |||
804 | return ERR_PTR(err); | 804 | return ERR_PTR(err); |
805 | } | 805 | } |
806 | 806 | ||
807 | #ifdef __ARCH_WANT_IPC_PARSE_VERSION | 807 | #ifdef CONFIG_ARCH_WANT_IPC_PARSE_VERSION |
808 | 808 | ||
809 | 809 | ||
810 | /** | 810 | /** |
@@ -826,7 +826,7 @@ int ipc_parse_version (int *cmd) | |||
826 | } | 826 | } |
827 | } | 827 | } |
828 | 828 | ||
829 | #endif /* __ARCH_WANT_IPC_PARSE_VERSION */ | 829 | #endif /* CONFIG_ARCH_WANT_IPC_PARSE_VERSION */ |
830 | 830 | ||
831 | #ifdef CONFIG_PROC_FS | 831 | #ifdef CONFIG_PROC_FS |
832 | struct ipc_proc_iter { | 832 | struct ipc_proc_iter { |
diff --git a/ipc/util.h b/ipc/util.h index 6f5c20bedaab..850ef3e962cb 100644 --- a/ipc/util.h +++ b/ipc/util.h | |||
@@ -130,7 +130,7 @@ struct kern_ipc_perm *ipcctl_pre_down(struct ipc_namespace *ns, | |||
130 | struct ipc_ids *ids, int id, int cmd, | 130 | struct ipc_ids *ids, int id, int cmd, |
131 | struct ipc64_perm *perm, int extra_perm); | 131 | struct ipc64_perm *perm, int extra_perm); |
132 | 132 | ||
133 | #ifndef __ARCH_WANT_IPC_PARSE_VERSION | 133 | #ifndef CONFIG_ARCH_WANT_IPC_PARSE_VERSION |
134 | /* On IA-64, we always use the "64-bit version" of the IPC structures. */ | 134 | /* On IA-64, we always use the "64-bit version" of the IPC structures. */ |
135 | # define ipc_parse_version(cmd) IPC_64 | 135 | # define ipc_parse_version(cmd) IPC_64 |
136 | #else | 136 | #else |