From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 8 Apr 2009 08:35:30 +0000 (+0200)
Subject: Merge commit 'v2.6.30-rc1' into perfcounters/core
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5ea472a77f8e4811ceee3f44a9deda6ad6e8b789;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

Conflicts:
	arch/powerpc/include/asm/systbl.h
	arch/powerpc/include/asm/unistd.h
	include/linux/init_task.h

Merge reason: the conflicts are non-trivial: PowerPC placement
              of sys_perf_counter_open has to be mixed with the
	      new preadv/pwrite syscalls.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

5ea472a77f8e4811ceee3f44a9deda6ad6e8b789
diff --cc arch/powerpc/include/asm/systbl.h
index affa8caed7eb,d98a30dfd41c..a0b92de51c7e
--- a/arch/powerpc/include/asm/systbl.h
+++ b/arch/powerpc/include/asm/systbl.h
@@@ -322,4 -322,6 +322,6 @@@ SYSCALL_SPU(epoll_create1
  SYSCALL_SPU(dup3)
  SYSCALL_SPU(pipe2)
  SYSCALL(inotify_init1)
 -SYSCALL(ni_syscall)
 +SYSCALL_SPU(perf_counter_open)
+ COMPAT_SYS_SPU(preadv)
+ COMPAT_SYS_SPU(pwritev)
diff --cc arch/powerpc/include/asm/unistd.h
index 7cef5afe89d8,3f06f8ec81c5..4badac2d11d1
--- a/arch/powerpc/include/asm/unistd.h
+++ b/arch/powerpc/include/asm/unistd.h
@@@ -341,7 -341,8 +341,9 @@@
  #define __NR_dup3		316
  #define __NR_pipe2		317
  #define __NR_inotify_init1	318
 +#define __NR_perf_counter_open	319
+ #define __NR_preadv		320
+ #define __NR_pwritev		321
  
  #ifdef __KERNEL__
  
diff --cc include/linux/init_task.h
index ca226a91abee,dcfb93337e9a..c98866102817
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@@ -195,9 -184,9 +196,10 @@@ extern struct cred init_cred
  	},								\
  	.dirties = INIT_PROP_LOCAL_SINGLE(dirties),			\
  	INIT_IDS							\
++	INIT_PERF_COUNTERS(tsk)						\
  	INIT_TRACE_IRQFLAGS						\
  	INIT_LOCKDEP							\
- 	INIT_PERF_COUNTERS(tsk)						\
+ 	INIT_FTRACE_GRAPH						\
  }