Skip to content

Commit

Permalink
proc_sysctl: use CONFIG_PROC_SYSCTL around ipc and utsname proc_handlers
Browse files Browse the repository at this point in the history
As pointed out by Cedric Le Goater (in response to Alexey's original
comment wrt mqns), ipc_sysctl.c and utsname_sysctl.c are using
CONFIG_PROC_FS, not CONFIG_PROC_SYSCTL, to determine whether to define
the proc_handlers.  Change that.

Signed-off-by: Serge E. Hallyn <[email protected]>
Cc: Cedric Le Goater <[email protected]>
Acked-by: Alexey Dobriyan <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Serge E. Hallyn authored and torvalds committed Apr 3, 2009
1 parent e562aeb commit 11dea19
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ipc/ipc_sysctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ static void *get_ipc(ctl_table *table)
return which;
}

#ifdef CONFIG_PROC_FS
#ifdef CONFIG_PROC_SYSCTL
static int proc_ipc_dointvec(ctl_table *table, int write, struct file *filp,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
Expand Down
2 changes: 1 addition & 1 deletion kernel/utsname_sysctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ static void put_uts(ctl_table *table, int write, void *which)
up_write(&uts_sem);
}

#ifdef CONFIG_PROC_FS
#ifdef CONFIG_PROC_SYSCTL
/*
* Special case of dostring for the UTS structure. This has locks
* to observe. Should this be in kernel/sys.c ????
Expand Down

0 comments on commit 11dea19

Please sign in to comment.