diff options
Diffstat (limited to 'drivers/misc/sgi-xp/xpc_main.c')
-rw-r--r-- | drivers/misc/sgi-xp/xpc_main.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c index fd3688a3e23f..8d082b46426b 100644 --- a/drivers/misc/sgi-xp/xpc_main.c +++ b/drivers/misc/sgi-xp/xpc_main.c | |||
@@ -44,6 +44,7 @@ | |||
44 | */ | 44 | */ |
45 | 45 | ||
46 | #include <linux/module.h> | 46 | #include <linux/module.h> |
47 | #include <linux/slab.h> | ||
47 | #include <linux/sysctl.h> | 48 | #include <linux/sysctl.h> |
48 | #include <linux/device.h> | 49 | #include <linux/device.h> |
49 | #include <linux/delay.h> | 50 | #include <linux/delay.h> |
@@ -89,48 +90,40 @@ static int xpc_disengage_max_timelimit = 120; | |||
89 | 90 | ||
90 | static ctl_table xpc_sys_xpc_hb_dir[] = { | 91 | static ctl_table xpc_sys_xpc_hb_dir[] = { |
91 | { | 92 | { |
92 | .ctl_name = CTL_UNNUMBERED, | ||
93 | .procname = "hb_interval", | 93 | .procname = "hb_interval", |
94 | .data = &xpc_hb_interval, | 94 | .data = &xpc_hb_interval, |
95 | .maxlen = sizeof(int), | 95 | .maxlen = sizeof(int), |
96 | .mode = 0644, | 96 | .mode = 0644, |
97 | .proc_handler = &proc_dointvec_minmax, | 97 | .proc_handler = proc_dointvec_minmax, |
98 | .strategy = &sysctl_intvec, | ||
99 | .extra1 = &xpc_hb_min_interval, | 98 | .extra1 = &xpc_hb_min_interval, |
100 | .extra2 = &xpc_hb_max_interval}, | 99 | .extra2 = &xpc_hb_max_interval}, |
101 | { | 100 | { |
102 | .ctl_name = CTL_UNNUMBERED, | ||
103 | .procname = "hb_check_interval", | 101 | .procname = "hb_check_interval", |
104 | .data = &xpc_hb_check_interval, | 102 | .data = &xpc_hb_check_interval, |
105 | .maxlen = sizeof(int), | 103 | .maxlen = sizeof(int), |
106 | .mode = 0644, | 104 | .mode = 0644, |
107 | .proc_handler = &proc_dointvec_minmax, | 105 | .proc_handler = proc_dointvec_minmax, |
108 | .strategy = &sysctl_intvec, | ||
109 | .extra1 = &xpc_hb_check_min_interval, | 106 | .extra1 = &xpc_hb_check_min_interval, |
110 | .extra2 = &xpc_hb_check_max_interval}, | 107 | .extra2 = &xpc_hb_check_max_interval}, |
111 | {} | 108 | {} |
112 | }; | 109 | }; |
113 | static ctl_table xpc_sys_xpc_dir[] = { | 110 | static ctl_table xpc_sys_xpc_dir[] = { |
114 | { | 111 | { |
115 | .ctl_name = CTL_UNNUMBERED, | ||
116 | .procname = "hb", | 112 | .procname = "hb", |
117 | .mode = 0555, | 113 | .mode = 0555, |
118 | .child = xpc_sys_xpc_hb_dir}, | 114 | .child = xpc_sys_xpc_hb_dir}, |
119 | { | 115 | { |
120 | .ctl_name = CTL_UNNUMBERED, | ||
121 | .procname = "disengage_timelimit", | 116 | .procname = "disengage_timelimit", |
122 | .data = &xpc_disengage_timelimit, | 117 | .data = &xpc_disengage_timelimit, |
123 | .maxlen = sizeof(int), | 118 | .maxlen = sizeof(int), |
124 | .mode = 0644, | 119 | .mode = 0644, |
125 | .proc_handler = &proc_dointvec_minmax, | 120 | .proc_handler = proc_dointvec_minmax, |
126 | .strategy = &sysctl_intvec, | ||
127 | .extra1 = &xpc_disengage_min_timelimit, | 121 | .extra1 = &xpc_disengage_min_timelimit, |
128 | .extra2 = &xpc_disengage_max_timelimit}, | 122 | .extra2 = &xpc_disengage_max_timelimit}, |
129 | {} | 123 | {} |
130 | }; | 124 | }; |
131 | static ctl_table xpc_sys_dir[] = { | 125 | static ctl_table xpc_sys_dir[] = { |
132 | { | 126 | { |
133 | .ctl_name = CTL_UNNUMBERED, | ||
134 | .procname = "xpc", | 127 | .procname = "xpc", |
135 | .mode = 0555, | 128 | .mode = 0555, |
136 | .child = xpc_sys_xpc_dir}, | 129 | .child = xpc_sys_xpc_dir}, |