diff options
| author | James Morris <jmorris@namei.org> | 2009-05-08 03:56:47 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-05-08 03:56:47 -0400 |
| commit | d254117099d711f215e62427f55dfb8ebd5ad011 (patch) | |
| tree | 0848ff8dd74314fec14a86497f8d288c86ba7c65 /include/linux/moduleparam.h | |
| parent | 07ff7a0b187f3951788f64ae1f30e8109bc8e9eb (diff) | |
| parent | 8c9ed899b44c19e81859fbb0e9d659fe2f8630fc (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'include/linux/moduleparam.h')
| -rw-r--r-- | include/linux/moduleparam.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h index e4af3399ef48..a4f0b931846c 100644 --- a/include/linux/moduleparam.h +++ b/include/linux/moduleparam.h | |||
| @@ -138,6 +138,16 @@ extern int parse_args(const char *name, | |||
| 138 | unsigned num, | 138 | unsigned num, |
| 139 | int (*unknown)(char *param, char *val)); | 139 | int (*unknown)(char *param, char *val)); |
| 140 | 140 | ||
| 141 | /* Called by module remove. */ | ||
| 142 | #ifdef CONFIG_SYSFS | ||
| 143 | extern void destroy_params(const struct kernel_param *params, unsigned num); | ||
| 144 | #else | ||
| 145 | static inline void destroy_params(const struct kernel_param *params, | ||
| 146 | unsigned num) | ||
| 147 | { | ||
| 148 | } | ||
| 149 | #endif /* !CONFIG_SYSFS */ | ||
| 150 | |||
| 141 | /* All the helper functions */ | 151 | /* All the helper functions */ |
| 142 | /* The macros to do compile-time type checking stolen from Jakub | 152 | /* The macros to do compile-time type checking stolen from Jakub |
| 143 | Jelinek, who IIRC came up with this idea for the 2.4 module init code. */ | 153 | Jelinek, who IIRC came up with this idea for the 2.4 module init code. */ |