diff options
Diffstat (limited to 'kernel/slow-work.c')
-rw-r--r-- | kernel/slow-work.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/kernel/slow-work.c b/kernel/slow-work.c index 00889bd3c590..7d3f4fa9ef4f 100644 --- a/kernel/slow-work.c +++ b/kernel/slow-work.c | |||
@@ -49,7 +49,6 @@ static const int slow_work_max_vslow = 99; | |||
49 | 49 | ||
50 | ctl_table slow_work_sysctls[] = { | 50 | ctl_table slow_work_sysctls[] = { |
51 | { | 51 | { |
52 | .ctl_name = CTL_UNNUMBERED, | ||
53 | .procname = "min-threads", | 52 | .procname = "min-threads", |
54 | .data = &slow_work_min_threads, | 53 | .data = &slow_work_min_threads, |
55 | .maxlen = sizeof(unsigned), | 54 | .maxlen = sizeof(unsigned), |
@@ -59,7 +58,6 @@ ctl_table slow_work_sysctls[] = { | |||
59 | .extra2 = &slow_work_max_threads, | 58 | .extra2 = &slow_work_max_threads, |
60 | }, | 59 | }, |
61 | { | 60 | { |
62 | .ctl_name = CTL_UNNUMBERED, | ||
63 | .procname = "max-threads", | 61 | .procname = "max-threads", |
64 | .data = &slow_work_max_threads, | 62 | .data = &slow_work_max_threads, |
65 | .maxlen = sizeof(unsigned), | 63 | .maxlen = sizeof(unsigned), |
@@ -69,16 +67,15 @@ ctl_table slow_work_sysctls[] = { | |||
69 | .extra2 = (void *) &slow_work_max_max_threads, | 67 | .extra2 = (void *) &slow_work_max_max_threads, |
70 | }, | 68 | }, |
71 | { | 69 | { |
72 | .ctl_name = CTL_UNNUMBERED, | ||
73 | .procname = "vslow-percentage", | 70 | .procname = "vslow-percentage", |
74 | .data = &vslow_work_proportion, | 71 | .data = &vslow_work_proportion, |
75 | .maxlen = sizeof(unsigned), | 72 | .maxlen = sizeof(unsigned), |
76 | .mode = 0644, | 73 | .mode = 0644, |
77 | .proc_handler = &proc_dointvec_minmax, | 74 | .proc_handler = proc_dointvec_minmax, |
78 | .extra1 = (void *) &slow_work_min_vslow, | 75 | .extra1 = (void *) &slow_work_min_vslow, |
79 | .extra2 = (void *) &slow_work_max_vslow, | 76 | .extra2 = (void *) &slow_work_max_vslow, |
80 | }, | 77 | }, |
81 | { .ctl_name = 0 } | 78 | {} |
82 | }; | 79 | }; |
83 | #endif | 80 | #endif |
84 | 81 | ||
@@ -640,7 +637,7 @@ int delayed_slow_work_enqueue(struct delayed_slow_work *dwork, | |||
640 | goto cancelled; | 637 | goto cancelled; |
641 | 638 | ||
642 | /* the timer holds a reference whilst it is pending */ | 639 | /* the timer holds a reference whilst it is pending */ |
643 | ret = work->ops->get_ref(work); | 640 | ret = slow_work_get_ref(work); |
644 | if (ret < 0) | 641 | if (ret < 0) |
645 | goto cant_get_ref; | 642 | goto cant_get_ref; |
646 | 643 | ||