diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-09-03 16:38:52 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-03 16:38:52 -0400 |
| commit | 68885a3ff38ed51fa02f241feb405c9922a90ee0 (patch) | |
| tree | 2fc626df39d5e0e1f6b065238141f7d49187c737 /kernel/kmod.c | |
| parent | 7b28079b3284ccb15ad4f003fb7073890600d0c1 (diff) | |
| parent | a2acad8298a42b7be684a32fafaf83332bba9c2b (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'kernel/kmod.c')
| -rw-r--r-- | kernel/kmod.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/kmod.c b/kernel/kmod.c index 6e9b19667a8d..9cd0591c96a2 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c | |||
| @@ -153,7 +153,9 @@ static int ____call_usermodehelper(void *data) | |||
| 153 | goto fail; | 153 | goto fail; |
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | retval = kernel_execve(sub_info->path, sub_info->argv, sub_info->envp); | 156 | retval = kernel_execve(sub_info->path, |
| 157 | (const char *const *)sub_info->argv, | ||
| 158 | (const char *const *)sub_info->envp); | ||
| 157 | 159 | ||
| 158 | /* Exec failed? */ | 160 | /* Exec failed? */ |
| 159 | fail: | 161 | fail: |