lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:
	include/linux/kernel_stat.h
This commit is contained in:
Ingo Molnar
2009-01-11 02:42:53 +01:00
parent e1df957670 c59765042f
commit 506c10f26c
6192 changed files with 842449 additions and 152253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/syscalls.h
View File

@@ -550,7 +550,7 @@ asmlinkage long sys_inotify_init(void);
asmlinkage long sys_inotify_init1(int flags);
asmlinkage long sys_inotify_add_watch(int fd, const char __user *path,
u32 mask);
asmlinkage long sys_inotify_rm_watch(int fd, u32 wd);
asmlinkage long sys_inotify_rm_watch(int fd, __s32 wd);
asmlinkage long sys_spu_run(int fd, __u32 __user *unpc,
__u32 __user *ustatus);