git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
[pandora-kernel.git]
/
kernel
/
kmod.c
diff --git
a/kernel/kmod.c
b/kernel/kmod.c
index
bb7df2a
..
8df97d3
100644
(file)
--- a/
kernel/kmod.c
+++ b/
kernel/kmod.c
@@
-27,6
+27,7
@@
#include <linux/mnt_namespace.h>
#include <linux/completion.h>
#include <linux/file.h>
#include <linux/mnt_namespace.h>
#include <linux/completion.h>
#include <linux/file.h>
+#include <linux/fdtable.h>
#include <linux/workqueue.h>
#include <linux/security.h>
#include <linux/mount.h>
#include <linux/workqueue.h>
#include <linux/security.h>
#include <linux/mount.h>
@@
-165,7
+166,7
@@
static int ____call_usermodehelper(void *data)
}
/* We can run anywhere, unlike our parent keventd(). */
}
/* We can run anywhere, unlike our parent keventd(). */
- set_cpus_allowed
(current, CPU_MASK_ALL
);
+ set_cpus_allowed
_ptr(current, CPU_MASK_ALL_PTR
);
/*
* Our parent is keventd, which runs with elevated scheduling priority.
/*
* Our parent is keventd, which runs with elevated scheduling priority.
@@
-173,10
+174,7
@@
static int ____call_usermodehelper(void *data)
*/
set_user_nice(current, 0);
*/
set_user_nice(current, 0);
- retval = -EPERM;
- if (current->fs->root)
- retval = kernel_execve(sub_info->path,
- sub_info->argv, sub_info->envp);
+ retval = kernel_execve(sub_info->path, sub_info->argv, sub_info->envp);
/* Exec failed? */
sub_info->retval = retval;
/* Exec failed? */
sub_info->retval = retval;