From d8b5d39cb99103c0a34cfe7ae4ed59e5e57cd166 Mon Sep 17 00:00:00 2001 From: Dave Young Date: Wed, 10 Mar 2010 15:24:06 -0800 Subject: [PATCH] --- yaml --- r: 187315 b: refs/heads/master c: 5ed109103d73b0bafc92e860cead56725231384d h: refs/heads/master i: 187313: a60cd87756a7e16217921e3809c9ed87bc2492e3 187311: d66bd0db69dde0f2a181996cf33c4f933bf47f79 v: v3 --- [refs] | 2 +- trunk/include/linux/kmod.h | 1 + trunk/include/linux/module.h | 1 + trunk/kernel/sysctl.c | 4 ---- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f3ed362ba455..8738a1acf557 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5ab67726f33b50f40db0ccf271ceb3c658554d5 +refs/heads/master: 5ed109103d73b0bafc92e860cead56725231384d diff --git a/trunk/include/linux/kmod.h b/trunk/include/linux/kmod.h index 384ca8bbf1ac..facb27fe7de0 100644 --- a/trunk/include/linux/kmod.h +++ b/trunk/include/linux/kmod.h @@ -27,6 +27,7 @@ #define KMOD_PATH_LEN 256 #ifdef CONFIG_MODULES +extern char modprobe_path[]; /* for sysctl */ /* modprobe exit status on success, -ve on error. Return value * usually useless though. */ extern int __request_module(bool wait, const char *name, ...) \ diff --git a/trunk/include/linux/module.h b/trunk/include/linux/module.h index dd618eb026aa..5e869ffd34aa 100644 --- a/trunk/include/linux/module.h +++ b/trunk/include/linux/module.h @@ -175,6 +175,7 @@ struct notifier_block; #ifdef CONFIG_MODULES +extern int modules_disabled; /* for sysctl */ /* Get/put a kernel symbol (calls must be symmetric) */ void *__symbol_get(const char *symbol); void *__symbol_get_gpl(const char *symbol); diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c index f18aaa7b0d65..44e9492368fd 100644 --- a/trunk/kernel/sysctl.c +++ b/trunk/kernel/sysctl.c @@ -116,10 +116,6 @@ static int min_percpu_pagelist_fract = 8; static int ngroups_max = NGROUPS_MAX; -#ifdef CONFIG_MODULES -extern char modprobe_path[]; -extern int modules_disabled; -#endif #ifdef CONFIG_CHR_DEV_SG extern int sg_big_buff; #endif