diff options
| author | Pekka Enberg <penberg@kernel.org> | 2011-09-19 16:46:07 +0200 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-09-19 16:46:07 +0200 |
| commit | d20bbfab01802e195a50435940f7e4aa747c217c (patch) | |
| tree | 82b0007e33c083050a4e60a49dbb2f5477b4c99d /kernel/kmod.c | |
| parent | slub: doc: update the slabinfo.c file path (diff) | |
| parent | slub: explicitly document position of inserting slab to partial list (diff) | |
| download | linux-d20bbfab01802e195a50435940f7e4aa747c217c.tar.xz linux-d20bbfab01802e195a50435940f7e4aa747c217c.zip | |
Merge branch 'slab/urgent' into slab/next
Diffstat (limited to 'kernel/kmod.c')
| -rw-r--r-- | kernel/kmod.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/kmod.c b/kernel/kmod.c index 47613dfb7b28..ddc7644c1305 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c @@ -274,7 +274,7 @@ static void __call_usermodehelper(struct work_struct *work) * (used for preventing user land processes from being created after the user * land has been frozen during a system-wide hibernation or suspend operation). */ -static int usermodehelper_disabled; +static int usermodehelper_disabled = 1; /* Number of helpers running */ static atomic_t running_helpers = ATOMIC_INIT(0); |