Merge commit 'v2.6.29-rc2' into perfcounters/core

Conflicts:
	include/linux/syscalls.h

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/exec.c b/fs/exec.c
index 605be57..97f9c22 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -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;