5 files changed, 25 insertions, 16 deletions

diff --git a/arch/tile/include/asm/io.h b/arch/tile/include/asm/io.h
index d372641054d9..6ef4ecab1df2 100644
--- a/arch/tile/include/asm/io.h
+++ b/arch/tile/include/asm/io.h
@@ -396,8 +396,7 @@ extern void ioport_unmap(void __iomem *addr);
 static inline long ioport_panic(void)
 {
 #ifdef __tilegx__
-        panic("PCI IO space support is disabled. Configure the kernel with"
-              " CONFIG_TILE_PCI_IO to enable it");
+        panic("PCI IO space support is disabled. Configure the kernel with CONFIG_TILE_PCI_IO to enable it");
 #else
         panic("inb/outb and friends do not exist on tile");
 #endif
@@ -406,7 +405,7 @@ static inline long ioport_panic(void)
 
 static inline void __iomem *ioport_map(unsigned long port, unsigned int len)
 {
-        pr_info("ioport_map: mapping IO resources is unsupported on tile.\n");
+        pr_info("ioport_map: mapping IO resources is unsupported on tile\n");
         return NULL;
 }
 
diff --git a/arch/tile/include/asm/pgtable.h b/arch/tile/include/asm/pgtable.h
index 33587f16c152..5d1950788c69 100644
--- a/arch/tile/include/asm/pgtable.h
+++ b/arch/tile/include/asm/pgtable.h
@@ -235,9 +235,9 @@ static inline void __pte_clear(pte_t *ptep)
 #define pte_donemigrate(x) hv_pte_set_present(hv_pte_clear_migrating(x))
 
 #define pte_ERROR(e) \
-        pr_err("%s:%d: bad pte 0x%016llx.\n", __FILE__, __LINE__, pte_val(e))
+        pr_err("%s:%d: bad pte 0x%016llx\n", __FILE__, __LINE__, pte_val(e))
 #define pgd_ERROR(e) \
-        pr_err("%s:%d: bad pgd 0x%016llx.\n", __FILE__, __LINE__, pgd_val(e))
+        pr_err("%s:%d: bad pgd 0x%016llx\n", __FILE__, __LINE__, pgd_val(e))
 
 /* Return PA and protection info for a given kernel VA. */
 int va_to_cpa_and_pte(void *va, phys_addr_t *cpa, pte_t *pte);
diff --git a/arch/tile/include/asm/pgtable_64.h b/arch/tile/include/asm/pgtable_64.h
index 2c8a9cd102d3..e96cec52f6d8 100644
--- a/arch/tile/include/asm/pgtable_64.h
+++ b/arch/tile/include/asm/pgtable_64.h
@@ -86,7 +86,7 @@ static inline int pud_huge_page(pud_t pud)
 }
 
 #define pmd_ERROR(e) \
-        pr_err("%s:%d: bad pmd 0x%016llx.\n", __FILE__, __LINE__, pmd_val(e))
+        pr_err("%s:%d: bad pmd 0x%016llx\n", __FILE__, __LINE__, pmd_val(e))
 
 static inline void pud_clear(pud_t *pudp)
 {
diff --git a/arch/tile/include/uapi/asm/ptrace.h b/arch/tile/include/uapi/asm/ptrace.h
index 7757e1985fb6..d03b829857e8 100644
--- a/arch/tile/include/uapi/asm/ptrace.h
+++ b/arch/tile/include/uapi/asm/ptrace.h
@@ -52,12 +52,16 @@ typedef uint_reg_t pt_reg_t;
  * system call or exception.  "struct sigcontext" has the same shape.
  */
 struct pt_regs {
-        /* Saved main processor registers; 56..63 are special. */
-        /* tp, sp, and lr must immediately follow regs[] for aliasing. */
-        pt_reg_t regs[53];
-        pt_reg_t tp;            /* aliases regs[TREG_TP] */
-        pt_reg_t sp;            /* aliases regs[TREG_SP] */
-        pt_reg_t lr;            /* aliases regs[TREG_LR] */
+        union {
+                /* Saved main processor registers; 56..63 are special. */
+                pt_reg_t regs[56];
+                struct {
+                        pt_reg_t __regs[53];
+                        pt_reg_t tp;            /* aliases regs[TREG_TP] */
+                        pt_reg_t sp;            /* aliases regs[TREG_SP] */
+                        pt_reg_t lr;            /* aliases regs[TREG_LR] */
+                };
+        };
 
         /* Saved special registers. */
         pt_reg_t pc;            /* stored in EX_CONTEXT_K_0 */
diff --git a/arch/tile/include/uapi/asm/sigcontext.h b/arch/tile/include/uapi/asm/sigcontext.h
index 6348e59d3724..39ff5d1a232d 100644
--- a/arch/tile/include/uapi/asm/sigcontext.h
+++ b/arch/tile/include/uapi/asm/sigcontext.h
@@ -24,10 +24,16 @@
  * but is simplified since we know the fault is from userspace.
  */
 struct sigcontext {
-        __uint_reg_t gregs[53]; /* General-purpose registers.  */
-        __uint_reg_t tp;        /* Aliases gregs[TREG_TP].  */
-        __uint_reg_t sp;        /* Aliases gregs[TREG_SP].  */
-        __uint_reg_t lr;        /* Aliases gregs[TREG_LR].  */
+        __extension__ union {
+                /* General-purpose registers.  */
+                __uint_reg_t gregs[56];
+                __extension__ struct {
+                        __uint_reg_t __gregs[53];
+                        __uint_reg_t tp;        /* Aliases gregs[TREG_TP].  */
+                        __uint_reg_t sp;        /* Aliases gregs[TREG_SP].  */
+                        __uint_reg_t lr;        /* Aliases gregs[TREG_LR].  */
+                };
+        };
         __uint_reg_t pc;        /* Program counter.  */
         __uint_reg_t ics;       /* In Interrupt Critical Section?  */
         __uint_reg_t faultnum;  /* Fault number.  */