diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
| commit | aba344fdfed81b2c03d6114c54cfd73a486aa10b (patch) | |
| tree | d032d8430bf1234c3ecc6f6330d6de6e887e5963 /arch/arm/kernel | |
| parent | 40c138bfc6d37dbff5339f84575db1e3cec6e34e (diff) | |
Merge with Linux 2.3.9.
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/dec21285.c | 1 | ||||
| -rw-r--r-- | arch/arm/kernel/entry-common.S | 1 | ||||
| -rw-r--r-- | arch/arm/kernel/sys_arm.c | 2 |
3 files changed, 4 insertions, 0 deletions
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(¤t->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(¤t->mm->mmap_sem); return error; } |