diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-10-21 05:39:26 -0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-10-21 05:39:26 -0400 |
| commit | 328b8f1ba50b708a1b3c0acd7c41ee1b356822f6 (patch) | |
| tree | 819e5cf05bcb160faee1eb546e3471284c9bbaae /kernel/sysctl.c | |
| parent | 57fa7214330be2e292ddb1402834ff0b221ef29a (diff) | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
Merge commit 'v2.6.36' into oprofile/core
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index f88552c6d227..3a45c224770f 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -2485,7 +2485,7 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int | |||
| 2485 | kbuf[left] = 0; | 2485 | kbuf[left] = 0; |
| 2486 | } | 2486 | } |
| 2487 | 2487 | ||
| 2488 | for (; left && vleft--; i++, min++, max++, first=0) { | 2488 | for (; left && vleft--; i++, first = 0) { |
| 2489 | unsigned long val; | 2489 | unsigned long val; |
| 2490 | 2490 | ||
| 2491 | if (write) { | 2491 | if (write) { |