diff options
Diffstat (limited to 'ipc')
-rw-r--r-- | ipc/compat.c | 3 | ||||
-rw-r--r-- | ipc/ipc_sysctl.c | 2 | ||||
-rw-r--r-- | ipc/mqueue.c | 2 | ||||
-rw-r--r-- | ipc/util.c | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/ipc/compat.c b/ipc/compat.c index a4695ada3275..45d035d4cedc 100644 --- a/ipc/compat.c +++ b/ipc/compat.c @@ -113,9 +113,6 @@ struct compat_shm_info { compat_ulong_t swap_attempts, swap_successes; }; -extern int sem_ctls[]; -#define sc_semopm (sem_ctls[2]) - static inline int compat_ipc_parse_version(int *cmd) { #ifdef CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c index 17028648cfeb..998d31b230f1 100644 --- a/ipc/ipc_sysctl.c +++ b/ipc/ipc_sysctl.c @@ -281,4 +281,4 @@ static int __init ipc_sysctl_init(void) return 0; } -__initcall(ipc_sysctl_init); +device_initcall(ipc_sysctl_init); diff --git a/ipc/mqueue.c b/ipc/mqueue.c index c3b31179122c..4fcf39af1776 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c @@ -1459,4 +1459,4 @@ out_sysctl: return error; } -__initcall(init_mqueue_fs); +device_initcall(init_mqueue_fs); diff --git a/ipc/util.c b/ipc/util.c index e1b4c6db8aa0..2eb0d1eaa312 100644 --- a/ipc/util.c +++ b/ipc/util.c @@ -128,7 +128,7 @@ static int __init ipc_init(void) register_ipcns_notifier(&init_ipc_ns); return 0; } -__initcall(ipc_init); +device_initcall(ipc_init); /** * ipc_init_ids - initialise ipc identifiers |