mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge commit 'v2.6.29-rc2' into perfcounters/core
Conflicts: include/linux/syscalls.h
This commit is contained in:
commit
77835492ed
524 changed files with 7963 additions and 3528 deletions
|
|
@ -100,7 +100,7 @@ static inline void put_binfmt(struct linux_binfmt * fmt)
|
|||
*
|
||||
* Also note that we take the address to load from from the file itself.
|
||||
*/
|
||||
asmlinkage long sys_uselib(const char __user * library)
|
||||
SYSCALL_DEFINE1(uselib, const char __user *, library)
|
||||
{
|
||||
struct file *file;
|
||||
struct nameidata nd;
|
||||
|
|
|
|||
Loading…
Reference in a new issue