Commit 0e9beb8a authored by Manfred Spraul's avatar Manfred Spraul Committed by Linus Torvalds
Browse files

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/20210918145337.3369-1-manfred@colorfullife.com


Signed-off-by: default avatarManfred Spraul <manfred@colorfullife.com>
Reviewed-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: default avatarDavidlohr Bueso <dbueso@suse.de>
Cc: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5563cabd

ipc/ipc_sysctl.c

+0 −13
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ static void *get_ipc(struct ctl_table *table) 
	return which;

}



#ifdef CONFIG_PROC_SYSCTL

static int proc_ipc_dointvec(struct ctl_table *table, int write,

		void *buffer, size_t *lenp, loff_t *ppos)

{
@@ -118,18 +117,6 @@ static int proc_ipc_dointvec_minmax_checkpoint_restore(struct ctl_table *table, 
}

#endif



#else

#define proc_ipc_doulongvec_minmax NULL

#define proc_ipc_dointvec	   NULL

#define proc_ipc_dointvec_minmax   NULL

#define proc_ipc_dointvec_minmax_orphans   NULL

#define proc_ipc_auto_msgmni	   NULL

#define proc_ipc_sem_dointvec	   NULL

#ifdef CONFIG_CHECKPOINT_RESTORE

#define proc_ipc_dointvec_minmax_checkpoint_restore	NULL

#endif	/* CONFIG_CHECKPOINT_RESTORE */

#endif



int ipc_mni = IPCMNI;

int ipc_mni_shift = IPCMNI_SHIFT;

int ipc_min_cycle = RADIX_TREE_MAP_SIZE;