From 1f0884cfe7600115fdd7a5218b8e49253b5e6947 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 8 Jul 2008 19:00:17 +0200 Subject: [PATCH] --- yaml --- r: 104854 b: refs/heads/master c: a1ef5adb4cad43460ebba23c5a78cf4a55bb6a5b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/kmod.h | 2 +- trunk/kernel/exec_domain.c | 2 +- trunk/kernel/kmod.c | 2 +- trunk/kernel/sysctl.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 7733942645c4..c34f0673ad2e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a00caa1fa954c734f4214a074727a329a9ba6568 +refs/heads/master: a1ef5adb4cad43460ebba23c5a78cf4a55bb6a5b diff --git a/trunk/include/linux/kmod.h b/trunk/include/linux/kmod.h index 9bdb28d6660f..0509c4ce4857 100644 --- a/trunk/include/linux/kmod.h +++ b/trunk/include/linux/kmod.h @@ -25,7 +25,7 @@ #define KMOD_PATH_LEN 256 -#ifdef CONFIG_KMOD +#ifdef CONFIG_MODULES /* modprobe exit status on success, -ve on error. Return value * usually useless though. */ extern int request_module(const char * name, ...) __attribute__ ((format (printf, 1, 2))); diff --git a/trunk/kernel/exec_domain.c b/trunk/kernel/exec_domain.c index a9e6bad9f706..c1ef192aa655 100644 --- a/trunk/kernel/exec_domain.c +++ b/trunk/kernel/exec_domain.c @@ -65,7 +65,7 @@ lookup_exec_domain(u_long personality) goto out; } -#ifdef CONFIG_KMOD +#ifdef CONFIG_MODULES read_unlock(&exec_domains_lock); request_module("personality-%ld", pers); read_lock(&exec_domains_lock); diff --git a/trunk/kernel/kmod.c b/trunk/kernel/kmod.c index 8df97d3dfda8..90d7af1c1655 100644 --- a/trunk/kernel/kmod.c +++ b/trunk/kernel/kmod.c @@ -42,7 +42,7 @@ extern int max_threads; static struct workqueue_struct *khelper_wq; -#ifdef CONFIG_KMOD +#ifdef CONFIG_MODULES /* modprobe_path is set via /proc/sys. diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c index 6b16e16428d8..b859e6b5a767 100644 --- a/trunk/kernel/sysctl.c +++ b/trunk/kernel/sysctl.c @@ -110,7 +110,7 @@ static int min_percpu_pagelist_fract = 8; static int ngroups_max = NGROUPS_MAX; -#ifdef CONFIG_KMOD +#ifdef CONFIG_MODULES extern char modprobe_path[]; #endif #ifdef CONFIG_CHR_DEV_SG @@ -475,7 +475,7 @@ static struct ctl_table kern_table[] = { .proc_handler = &ftrace_enable_sysctl, }, #endif -#ifdef CONFIG_KMOD +#ifdef CONFIG_MODULES { .ctl_name = KERN_MODPROBE, .procname = "modprobe",