Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[karo-tx-linux.git] / kernel / exec_domain.c

diff --git a/kernel/exec_domain.c b/kernel/exec_domain.c
index 3c2eaea66b1e16347bcd564b0c492b8f026dcf21..c1ef192aa65592b6286e6c224969e8af1eed3d81 100644 (file)
--- a/kernel/exec_domain.c
+++ b/kernel/exec_domain.c
@@ -57,7 +57,7 @@ lookup_exec_domain(u_long personality)
 {
        struct exec_domain *    ep;
        u_long                  pers = personality(personality);
-               
+
        read_lock(&exec_domains_lock);
        for (ep = exec_domains; ep; ep = ep->next) {
                if (pers >= ep->pers_low && pers <= ep->pers_high)
@@ -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);