Skip to content

Commit 0e9beb8

Browse files
manfred-colorfutorvalds
authored andcommitted
ipc/ipc_sysctl.c: remove fallback for !CONFIG_PROC_SYSCTL
Compilation of ipc/ipc_sysctl.c is controlled by obj-$(CONFIG_SYSVIPC_SYSCTL) [see ipc/Makefile] And CONFIG_SYSVIPC_SYSCTL depends on SYSCTL [see init/Kconfig] An SYSCTL is selected by PROC_SYSCTL. [see fs/proc/Kconfig] Thus: #ifndef CONFIG_PROC_SYSCTL in ipc/ipc_sysctl.c is impossible, the fallback can be removed. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Manfred Spraul <[email protected]> Reviewed-by: "Eric W. Biederman" <[email protected]> Acked-by: Davidlohr Bueso <[email protected]> Cc: Manfred Spraul <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 5563cab commit 0e9beb8

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

ipc/ipc_sysctl.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ static void *get_ipc(struct ctl_table *table)
2323
return which;
2424
}
2525

26-
#ifdef CONFIG_PROC_SYSCTL
2726
static int proc_ipc_dointvec(struct ctl_table *table, int write,
2827
void *buffer, size_t *lenp, loff_t *ppos)
2928
{
@@ -118,18 +117,6 @@ static int proc_ipc_dointvec_minmax_checkpoint_restore(struct ctl_table *table,
118117
}
119118
#endif
120119

121-
#else
122-
#define proc_ipc_doulongvec_minmax NULL
123-
#define proc_ipc_dointvec NULL
124-
#define proc_ipc_dointvec_minmax NULL
125-
#define proc_ipc_dointvec_minmax_orphans NULL
126-
#define proc_ipc_auto_msgmni NULL
127-
#define proc_ipc_sem_dointvec NULL
128-
#ifdef CONFIG_CHECKPOINT_RESTORE
129-
#define proc_ipc_dointvec_minmax_checkpoint_restore NULL
130-
#endif /* CONFIG_CHECKPOINT_RESTORE */
131-
#endif
132-
133120
int ipc_mni = IPCMNI;
134121
int ipc_mni_shift = IPCMNI_SHIFT;
135122
int ipc_min_cycle = RADIX_TREE_MAP_SIZE;

0 commit comments

Comments
 (0)