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

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

Browse Source 
Conflicts:
	include/linux/syscalls.h
This commit is contained in:
Ingo Molnar
2009-01-21 16:37:27 +01:00
parent af37501c79 1de9e8e70f
commit 77835492ed
524 changed files with 7980 additions and 3545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/fork.c
View File

@@ -901,7 +901,7 @@ static void copy_flags(unsigned long clone_flags, struct task_struct *p)
clear_freeze_flag(p);
}
asmlinkage long sys_set_tid_address(int __user *tidptr)
SYSCALL_DEFINE1(set_tid_address, int __user *, tidptr)
{
current->clear_child_tid = tidptr;
@@ -1604,7 +1604,7 @@ static int unshare_fd(unsigned long unshare_flags, struct files_struct **new_fdp
* constructed. Here we are modifying the current, active,
* task_struct.
*/
asmlinkage long sys_unshare(unsigned long unshare_flags)
SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
{
int err = 0;
struct fs_struct *fs, *new_fs = NULL;