bkl removal in arch/* for 2.6.33
Subsystems (5)
Linus,
Please pull the latest bkl-arch-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git bkl-arch-for-linus
Thanks,
tglx
------------------>
John Kacur (6):
blackfin: Remove the BKL from sys_execve
frv: Remove the BKL from sys_execve
h83000: Remove BKL from sys_execve
m68k: Remove the BKL from sys_execve
m68knommu: Remove the BKL from sys_execve
mn10300: Remove the BKL from sys_execve
Thomas Gleixner (3):
s390: Remove BKL from prng
um: Remove BKL from random
um: Remove BKL from mmapper
arch/blackfin/kernel/process.c | 6 +----- arch/frv/kernel/process.c | 5 +---- arch/h8300/kernel/process.c | 5 +---- arch/m68k/kernel/process.c | 5 +---- arch/m68knommu/kernel/process.c | 5 +---- arch/mn10300/kernel/process.c | 12 ++++-------- arch/s390/crypto/prng.c | 2 -- arch/um/drivers/mmapper_kern.c | 11 ++++------- arch/um/drivers/random.c | 3 --- 9 files changed, 13 insertions(+), 41 deletions(-)
arch/blackfin/kernel/process.c +1 -5
@@ -215,22 +215,18 @@ copy_thread(unsigned long clone_flags,/* * sys_execve() executes a new program. */ - asmlinkage int sys_execve(char __user *name, char __user * __user *argv, char __user * __user *envp) {int error;char *filename;struct pt_regs *regs = (struct pt_regs *)((&name) +6 ); -lock_kernel (); filename =getname (name); error =PTR_ERR (filename);if (IS_ERR (filename)) - goto out; +return error; error =do_execve (filename, argv, envp, regs);putname (filename); - out: -unlock_kernel ();return error; }
arch/frv/kernel/process.c +1 -4
@@ -255,15 +255,12 @@ asmlinkage int sys_execve(char __user *name, char __user * __user *argv, char __int error;char * filename; -lock_kernel (); filename =getname (name); error =PTR_ERR (filename);if (IS_ERR (filename)) - goto out; +return error; error =do_execve (filename, argv, envp, __frame);putname (filename); - out: -unlock_kernel ();return error; }
arch/h8300/kernel/process.c +1 -4
@@ -218,15 +218,12 @@ asmlinkage int sys_execve(char *name, char **argv, char **envp,int dummy,...)char * filename;struct pt_regs *regs = (struct pt_regs *) ((unsigned char *)&dummy-4 ); -lock_kernel (); filename =getname (name); error =PTR_ERR (filename);if (IS_ERR (filename)) - goto out; +return error; error =do_execve (filename, argv, envp, regs);putname (filename); -out: -unlock_kernel ();return error; }
arch/m68k/kernel/process.c +1 -4
@@ -317,15 +317,12 @@ asmlinkage int sys_execve(char __user *name, char __user * __user *argv, char __char * filename;struct pt_regs *regs = (struct pt_regs *) &name; -lock_kernel (); filename =getname (name); error =PTR_ERR (filename);if (IS_ERR (filename)) - goto out; +return error; error =do_execve (filename, argv, envp, regs);putname (filename); -out: -unlock_kernel ();return error; }
arch/m68knommu/kernel/process.c +1 -4
@@ -352,15 +352,12 @@ asmlinkage int sys_execve(char *name, char **argv, char **envp)char * filename;struct pt_regs *regs = (struct pt_regs *) &name; -lock_kernel (); filename =getname (name); error =PTR_ERR (filename);if (IS_ERR (filename)) - goto out; +return error; error =do_execve (filename, argv, envp, regs);putname (filename); -out: -unlock_kernel ();return error; }
arch/mn10300/kernel/process.c +4 -8
@@ -275,16 +275,12 @@ asmlinkage long sys_execve(char __user *name,char *filename;int error; -lock_kernel (); - filename =getname (name); error =PTR_ERR (filename); -if (!IS_ERR (filename)) { - error =do_execve (filename, argv, envp, __frame); -putname (filename); - } - -unlock_kernel (); +if (IS_ERR (filename)) +return error; + error =do_execve (filename, argv, envp, __frame); +putname (filename);return error; }
arch/s390/crypto/prng.c +0 -2
@@ -6,7 +6,6 @@#include <linux/fs.h> #include <linux/init.h> #include <linux/kernel.h> -#include <linux/smp_lock.h> #include <linux/miscdevice.h> #include <linux/module.h> #include <linux/moduleparam.h>
@@ -49,7 +48,6 @@ static unsigned char parm_block[32] = {static int prng_open (struct inode *inode,struct file *file) { -cycle_kernel_lock ();return nonseekable_open (inode, file); }
arch/um/drivers/mmapper_kern.c +4 -7
@@ -16,7 +16,7 @@#include <linux/miscdevice.h> #include <linux/module.h> #include <linux/mm.h> -#include <linux/smp_lock.h> +#include <asm/uaccess.h> #include "mem_user.h"
@@ -78,7 +78,6 @@ out:static int mmapper_open (struct inode *inode,struct file *file) { -cycle_kernel_lock ();return 0 ; }
@@ -115,18 +114,16 @@ static int __init mmapper_init(void) v_buf = (char *)find_iomem ("mmapper" , &mmapper_size);if (mmapper_size ==0 ) {printk (KERN_ERR "mmapper_init - find_iomem failed\n" ); - goto out; +return -ENODEV ; } + p_buf =__pa (v_buf); err =misc_register (&mmapper_dev);if (err) {printk (KERN_ERR "mmapper - misc_register failed, err = %d\n" , err); - goto out; +return err;; } - - p_buf =__pa (v_buf); -out:return 0 ; }
arch/um/drivers/random.c +0 -3
@@ -7,7 +7,6 @@* of the GNU General Public License, incorporated herein by reference. */ #include <linux/sched.h> -#include <linux/smp_lock.h> #include <linux/module.h> #include <linux/fs.h> #include <linux/interrupt.h>
@@ -34,8 +33,6 @@ static DECLARE_WAIT_QUEUE_HEAD(host_read_wait);static int rng_dev_open (struct inode *inode,struct file *filp) { -cycle_kernel_lock (); -/* enforce read-only access to this chrdev */ if ((filp->f_mode &FMODE_READ ) ==0 )return -EINVAL ;