o Merge with Linux 2.1.90.

 o Divide L1 cache sizes by 1024 before printing, makes the numbers a
   bit more credible ...

1 files changed, 5 insertions, 3 deletions

diff --git a/fs/exec.c b/fs/exec.c
index f023054c6..c3d420973 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -49,8 +49,9 @@
 #include <asm/mmu_context.h>
 
 #include <linux/config.h>
-#ifdef CONFIG_KERNELD
-#include <linux/kerneld.h>
+
+#ifdef CONFIG_KMOD
+#include <linux/kmod.h>
 #endif
 
 asmlinkage int sys_exit(int exit_code);
@@ -421,6 +422,7 @@ static int exec_mmap(void)
 	retval = new_page_tables(current);
 	if (retval)
 		goto fail_restore;
+	up(&mm->mmap_sem);
 	mmput(old_mm);
 	return 0;
 
@@ -697,7 +699,7 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
 		}
 		if (retval != -ENOEXEC) {
 			break;
-#ifdef CONFIG_KERNELD
+#ifdef CONFIG_KMOD
 		}else{
 #define printable(c) (((c)=='\t') || ((c)=='\n') || (0x20<=(c) && (c)<=0x7e))
 			char modname[20];