diff --git a/arch/powerpc/bits/user.h b/arch/powerpc/bits/user.h
index 6cc8aaf7..7f528746 100644
--- a/arch/powerpc/bits/user.h
+++ b/arch/powerpc/bits/user.h
@@ -1,10 +1,8 @@
-struct pt_regs {
-	unsigned long gpr[32], nip, msr, orig_gpr3, ctr, link, xer, ccr, mq;
-	unsigned long trap, dar, dsisr, result;
-};
-
 struct user {
-	struct pt_regs regs;
+	struct {
+		unsigned long gpr[32], nip, msr, orig_gpr3, ctr, link, xer, ccr, mq;
+		unsigned long trap, dar, dsisr, result;
+	} regs;
 	unsigned long u_tsize, u_dsize, u_ssize;
 	unsigned long start_code, start_data, start_stack;
 	long signal;
diff --git a/arch/powerpc64/bits/user.h b/arch/powerpc64/bits/user.h
index 7ca459b3..7e75d201 100644
--- a/arch/powerpc64/bits/user.h
+++ b/arch/powerpc64/bits/user.h
@@ -1,10 +1,8 @@
-struct pt_regs {
-	unsigned long gpr[32], nip, msr, orig_gpr3, ctr, link, xer, ccr, softe;
-	unsigned long trap, dar, dsisr, result;
-};
-
 struct user {
-	struct pt_regs regs;
+	struct {
+		unsigned long gpr[32], nip, msr, orig_gpr3, ctr, link, xer, ccr, softe;
+		unsigned long trap, dar, dsisr, result;
+	} regs;
 	unsigned long u_tsize, u_dsize, u_ssize;
 	unsigned long start_code, start_data, start_stack;
 	long signal;
diff --git a/arch/sh/bits/user.h b/arch/sh/bits/user.h
index d7363f74..07fe843b 100644
--- a/arch/sh/bits/user.h
+++ b/arch/sh/bits/user.h
@@ -17,34 +17,6 @@
 #define REG_FPSCR	55
 #define REG_FPUL	56
 
-struct pt_regs {
-	unsigned long regs[16];
-	unsigned long pc;
-	unsigned long pr;
-	unsigned long sr;
-	unsigned long gbr;
-	unsigned long mach;
-	unsigned long macl;
-	long tra;
-};
-
-struct pt_dspregs {
-	unsigned long a1;
-	unsigned long a0g;
-	unsigned long a1g;
-	unsigned long m0;
-	unsigned long m1;
-	unsigned long a0;
-	unsigned long x0;
-	unsigned long x1;
-	unsigned long y0;
-	unsigned long y1;
-	unsigned long dsr;
-	unsigned long rs;
-	unsigned long re;
-	unsigned long mod;
-};
-
 struct user_fpu_struct {
 	unsigned long fp_regs[16];
 	unsigned long xfp_regs[16];
@@ -58,7 +30,11 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 typedef struct user_fpu_struct elf_fpregset_t;
 
 struct user {
-	struct pt_regs regs;
+	struct {
+		unsigned long regs[16];
+		unsigned long pc, pr, sr, gbr, mach, macl;
+		long tra;
+	} regs;
 	struct user_fpu_struct fpu;
 	int u_fpvalid;
 	unsigned long u_tsize;