Merge branch 'arch-frv' into no-rebases
Al Viro [Sat, 17 Nov 2012 03:27:58 +0000 (22:27 -0500)]
14 files changed:
1  2 
arch/arm64/Kconfig
arch/arm64/include/asm/processor.h
arch/hexagon/include/asm/processor.h
arch/hexagon/include/uapi/asm/ptrace.h
arch/hexagon/include/uapi/asm/unistd.h
arch/hexagon/kernel/process.c
arch/hexagon/kernel/signal.c
arch/hexagon/kernel/syscall.c
arch/hexagon/kernel/vm_entry.S
arch/m68k/include/asm/unistd.h
arch/parisc/include/asm/unistd.h
arch/s390/Kconfig
arch/sparc/include/asm/ptrace.h
arch/sparc/kernel/process_64.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -45,9 -42,22 +45,20 @@@ struct global_reg_snapshot 
        struct thread_info      *thread;
        unsigned long           pad1;
  };
- extern struct global_reg_snapshot global_reg_snapshot[NR_CPUS];
+ struct global_pmu_snapshot {
+       unsigned long           pcr[4];
+       unsigned long           pic[4];
+ };
+ union global_cpu_snapshot {
+       struct global_reg_snapshot      reg;
+       struct global_pmu_snapshot      pmu;
+ };
+ extern union global_cpu_snapshot global_cpu_snapshot[NR_CPUS];
  
 -#define force_successful_syscall_return()         \
 -do {  current_thread_info()->syscall_noerror = 1; \
 -} while (0)
 +#define force_successful_syscall_return() set_thread_noerror(1)
  #define user_mode(regs) (!((regs)->tstate & TSTATE_PRIV))
  #define instruction_pointer(regs) ((regs)->tpc)
  #define instruction_pointer_set(regs, val) ((regs)->tpc = (val))
Simple merge