From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 19 Oct 2012 13:13:39 +0000 (-0400)
Subject: Merge branch 'unicore32' of git://github.com/gxt/linux into no-rebases
X-Git-Tag: next-20121022~3^2^6~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=278307241f6e5950f3e78f74a9d4a9d47f56a71f;p=karo-tx-linux.git

Merge branch 'unicore32' of git://github.com/gxt/linux into no-rebases
---

278307241f6e5950f3e78f74a9d4a9d47f56a71f
diff --cc arch/sparc/include/asm/ptrace.h
index 1e8b81802263,da43bdc62294..bdfafd7af46f
--- a/arch/sparc/include/asm/ptrace.h
+++ b/arch/sparc/include/asm/ptrace.h
@@@ -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))