Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2588465b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'bkl-arch-for-linus' of... 

Merge branch 'bkl-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'bkl-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  mn10300: Remove the BKL from sys_execve
  m68knommu: Remove the BKL from sys_execve
  m68k: Remove the BKL from sys_execve
  h83000: Remove BKL from sys_execve
  frv: Remove the BKL from sys_execve
  blackfin: Remove the BKL from sys_execve
  um: Remove BKL from mmapper
  um: Remove BKL from random
  s390: Remove BKL from prng
parents 18821b04 8c0daee2

arch/blackfin/kernel/process.c

+1 −5
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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/m68knommu/kernel/process.c

+1 −4
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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)) {

	if (IS_ERR(filename))

		return error;

	error = do_execve(filename, argv, envp, __frame);

	putname(filename);

	}



	unlock_kernel();

	return error;

}