Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / m68k / kernel / sys_m68k.c

diff --git a/arch/m68k/kernel/sys_m68k.c b/arch/m68k/kernel/sys_m68k.c
index 2f431ece7b5f5c7f2afe8782eb7fe9b98cc26d6c..3db2e7f902aae8edb79209df2352800112f26028 100644 (file)
--- a/arch/m68k/kernel/sys_m68k.c
+++ b/arch/m68k/kernel/sys_m68k.c
@@ -12,7 +12,6 @@
 #include <linux/mm.h>
 #include <linux/fs.h>
 #include <linux/smp.h>
-#include <linux/smp_lock.h>
 #include <linux/sem.h>
 #include <linux/msg.h>
 #include <linux/shm.h>
@@ -377,7 +376,6 @@ sys_cacheflush (unsigned long addr, int scope, int cache, unsigned long len)
        struct vm_area_struct *vma;
        int ret = -EINVAL;
 
-       lock_kernel();
        if (scope < FLUSH_SCOPE_LINE || scope > FLUSH_SCOPE_ALL ||
            cache & ~FLUSH_CACHE_BOTH)
                goto out;
@@ -446,7 +444,6 @@ sys_cacheflush (unsigned long addr, int scope, int cache, unsigned long len)
            }
        }
 out:
-       unlock_kernel();
        return ret;
 }