From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 18 Oct 2012 01:56:30 +0000 (+1100)
Subject: Merge remote-tracking branch 'signal/for-next'
X-Git-Tag: next-20121018~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f8f20c532c439a19fe686220c158e2af1385596e;p=karo-tx-linux.git

Merge remote-tracking branch 'signal/for-next'
---

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