aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2006-12-10 05:19:09 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-10 12:55:40 -0500
commit98d7340c360993fdd703609ff7462051e03cc2fb (patch)
treebf28bc9ee2e6c9ab4401154d47e7eb5966cf85ba /kernel
parent1d5636cc078d3750b7f590a20f748aeaa26e2daf (diff)
[PATCH] sysctl: remove some OPs
kernel.cap-bound uses only OP_SET and OP_AND Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Chris Wright <chrisw@sous-sol.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sysctl.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 1c5697e3521e..c86445a62af2 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1931,9 +1931,6 @@ int proc_dointvec(ctl_table *table, int write, struct file *filp,
1931 1931
1932#define OP_SET 0 1932#define OP_SET 0
1933#define OP_AND 1 1933#define OP_AND 1
1934#define OP_OR 2
1935#define OP_MAX 3
1936#define OP_MIN 4
1937 1934
1938static int do_proc_dointvec_bset_conv(int *negp, unsigned long *lvalp, 1935static int do_proc_dointvec_bset_conv(int *negp, unsigned long *lvalp,
1939 int *valp, 1936 int *valp,
@@ -1945,13 +1942,6 @@ static int do_proc_dointvec_bset_conv(int *negp, unsigned long *lvalp,
1945 switch(op) { 1942 switch(op) {
1946 case OP_SET: *valp = val; break; 1943 case OP_SET: *valp = val; break;
1947 case OP_AND: *valp &= val; break; 1944 case OP_AND: *valp &= val; break;
1948 case OP_OR: *valp |= val; break;
1949 case OP_MAX: if(*valp < val)
1950 *valp = val;
1951 break;
1952 case OP_MIN: if(*valp > val)
1953 *valp = val;
1954 break;
1955 } 1945 }
1956 } else { 1946 } else {
1957 int val = *valp; 1947 int val = *valp;