2 files changed, 15 insertions, 2 deletions

diff --git a/arch/hexagon/include/uapi/asm/registers.h b/arch/hexagon/include/uapi/asm/registers.h
index c20406f63b5c..80504155ca3a 100644
--- a/arch/hexagon/include/uapi/asm/registers.h
+++ b/arch/hexagon/include/uapi/asm/registers.h
@@ -57,10 +57,17 @@ struct pt_regs {
         };
         union {
                 struct {
-                        unsigned long gp;
                         unsigned long ugp;
+                        unsigned long gp;
+                };
+                long long int gpugp;
+        };
+        union {
+                struct {
+                        unsigned long cs0;
+                        unsigned long cs1;
                 };
-                long long int ugpgp;
+                long long int cs1cs0;
         };
         /*
         * Be extremely careful with rearranging these, if at all.  Some code
diff --git a/arch/hexagon/include/uapi/asm/user.h b/arch/hexagon/include/uapi/asm/user.h
index cef13ee1413f..3dae94d9ced7 100644
--- a/arch/hexagon/include/uapi/asm/user.h
+++ b/arch/hexagon/include/uapi/asm/user.h
@@ -55,9 +55,15 @@ struct user_regs_struct {
         unsigned long pc;
         unsigned long cause;
         unsigned long badva;
+#if CONFIG_HEXAGON_ARCH_VERSION < 4
         unsigned long pad1;  /* pad out to 48 words total */
         unsigned long pad2;  /* pad out to 48 words total */
         unsigned long pad3;  /* pad out to 48 words total */
+#else
+        unsigned long cs0;
+        unsigned long cs1;
+        unsigned long pad1;  /* pad out to 48 words total */
+#endif
 };
 
 #endif