From aba344fdfed81b2c03d6114c54cfd73a486aa10b Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 5 Jul 1999 23:09:37 +0000
Subject: Merge with Linux 2.3.9.

---
 arch/arm/kernel/dec21285.c     | 1 +
 arch/arm/kernel/entry-common.S | 1 +
 arch/arm/kernel/sys_arm.c      | 2 ++
 3 files changed, 4 insertions(+)

(limited to 'arch/arm/kernel')

diff --git a/arch/arm/kernel/dec21285.c b/arch/arm/kernel/dec21285.c
index c4103abee..80cef0b23 100644
--- a/arch/arm/kernel/dec21285.c
+++ b/arch/arm/kernel/dec21285.c
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 1998 Russell King, Phil Blundell
  */
+#include <linux/config.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index 2fc0fdddc..7dbc7ff95 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -1,3 +1,4 @@
+#include <linux/config.h>
 /*============================================================================
  * All exits to user mode from the kernel go through this code.
  */
diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c
index 9da64aad0..94f158b3e 100644
--- a/arch/arm/kernel/sys_arm.c
+++ b/arch/arm/kernel/sys_arm.c
@@ -72,6 +72,7 @@ asmlinkage int old_mmap(struct mmap_arg_struct *arg)
 	struct file * file = NULL;
 	struct mmap_arg_struct a;
 
+	down(&current->mm->mmap_sem);
 	lock_kernel();
 	if (copy_from_user(&a, arg, sizeof(a)))
 		goto out;
@@ -87,6 +88,7 @@ asmlinkage int old_mmap(struct mmap_arg_struct *arg)
 		fput(file);
 out:
 	unlock_kernel();
+	up(&current->mm->mmap_sem);
 	return error;
 }
 
-- 
cgit v1.2.3