Merge commit 'v2.6.30-rc1' into perfcounters/core
Ingo Molnar [Wed, 8 Apr 2009 08:35:30 +0000 (10:35 +0200)]
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>

1  2 
arch/powerpc/include/asm/systbl.h
arch/powerpc/include/asm/unistd.h
arch/powerpc/kernel/irq.c
include/linux/init_task.h
include/linux/sched.h
init/Kconfig
kernel/Makefile
kernel/exit.c
kernel/fork.c

@@@ -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)
  #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__
  
Simple merge
@@@ -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                                               \
  }
  
  
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc kernel/Makefile
Simple merge
diff --cc kernel/exit.c
Simple merge
diff --cc kernel/fork.c
Simple merge