diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c index b8379d0fe..f25239aca 100644 --- a/module/spl/spl-proc.c +++ b/module/spl/spl-proc.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #ifdef SS_DEBUG_SUBSYS @@ -37,6 +38,12 @@ #define SS_DEBUG_SUBSYS SS_PROC +#if defined(CONSTIFY_PLUGIN) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) +typedef struct ctl_table __no_const spl_ctl_table; +#else +typedef struct ctl_table spl_ctl_table; +#endif + #ifdef DEBUG_KMEM static unsigned long table_min = 0; static unsigned long table_max = ~0; @@ -323,7 +330,7 @@ SPL_PROC_HANDLER(proc_force_bug) SPL_PROC_HANDLER(proc_console_max_delay_cs) { int rc, max_delay_cs; - struct ctl_table dummy = *table; + spl_ctl_table dummy = *table; long d; SENTRY; @@ -355,7 +362,7 @@ SPL_PROC_HANDLER(proc_console_max_delay_cs) SPL_PROC_HANDLER(proc_console_min_delay_cs) { int rc, min_delay_cs; - struct ctl_table dummy = *table; + spl_ctl_table dummy = *table; long d; SENTRY; @@ -387,7 +394,7 @@ SPL_PROC_HANDLER(proc_console_min_delay_cs) SPL_PROC_HANDLER(proc_console_backoff) { int rc, backoff; - struct ctl_table dummy = *table; + spl_ctl_table dummy = *table; SENTRY; dummy.data = &backoff; @@ -417,7 +424,7 @@ SPL_PROC_HANDLER(proc_domemused) { int rc = 0; unsigned long min = 0, max = ~0, val; - struct ctl_table dummy = *table; + spl_ctl_table dummy = *table; SENTRY; dummy.data = &val; @@ -444,7 +451,7 @@ SPL_PROC_HANDLER(proc_doslab) { int rc = 0; unsigned long min = 0, max = ~0, val = 0, mask; - struct ctl_table dummy = *table; + spl_ctl_table dummy = *table; spl_kmem_cache_t *skc; SENTRY;