2 files changed, 17 insertions, 18 deletions

diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c
index 489bf68d5f05..77840c804786 100644
--- a/arch/sparc/mm/iommu.c
+++ b/arch/sparc/mm/iommu.c
@@ -295,8 +295,7 @@ static void iommu_release_one(u32 busa, int npages, struct sbus_bus *sbus)
         int ioptex;
         int i;
 
-        if (busa < iommu->start)
-                BUG();
+        BUG_ON(busa < iommu->start);
         ioptex = (busa - iommu->start) >> PAGE_SHIFT;
         for (i = 0; i < npages; i++) {
                 iopte_val(iommu->page_table[ioptex + i]) = 0;
@@ -340,9 +339,9 @@ static int iommu_map_dma_area(dma_addr_t *pba, unsigned long va,
         iopte_t *first;
         int ioptex;
 
-        if ((va & ~PAGE_MASK) != 0) BUG();
-        if ((addr & ~PAGE_MASK) != 0) BUG();
-        if ((len & ~PAGE_MASK) != 0) BUG();
+        BUG_ON((va & ~PAGE_MASK) != 0);
+        BUG_ON((addr & ~PAGE_MASK) != 0);
+        BUG_ON((len & ~PAGE_MASK) != 0);
 
         /* page color = physical address */
         ioptex = bit_map_string_get(&iommu->usemap, len >> PAGE_SHIFT,
@@ -405,8 +404,8 @@ static void iommu_unmap_dma_area(unsigned long busa, int len)
         unsigned long end;
         int ioptex = (busa - iommu->start) >> PAGE_SHIFT;
 
-        if ((busa & ~PAGE_MASK) != 0) BUG();
-        if ((len & ~PAGE_MASK) != 0) BUG();
+        BUG_ON((busa & ~PAGE_MASK) != 0);
+        BUG_ON((len & ~PAGE_MASK) != 0);
 
         iopte += ioptex;
         end = busa + len;
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
index 459c8fbe02b4..a22930d62adf 100644
--- a/arch/sparc64/kernel/time.c
+++ b/arch/sparc64/kernel/time.c
@@ -280,9 +280,9 @@ static struct sparc64_tick_ops stick_operations __read_mostly = {
  * Since STICK is constantly updating, we have to access it carefully.
  *
  * The sequence we use to read is:
- * 1) read low
- * 2) read high
- * 3) read low again, if it rolled over increment high by 1
+ * 1) read high
+ * 2) read low
+ * 3) read high again, if it rolled re-read both low and high again.
  *
  * Writing STICK safely is also tricky:
  * 1) write low to zero
@@ -295,18 +295,18 @@ static struct sparc64_tick_ops stick_operations __read_mostly = {
 static unsigned long __hbird_read_stick(void)
 {
         unsigned long ret, tmp1, tmp2, tmp3;
-        unsigned long addr = HBIRD_STICK_ADDR;
+        unsigned long addr = HBIRD_STICK_ADDR+8;
 
-        __asm__ __volatile__("ldxa      [%1] %5, %2\n\t"
-                             "add       %1, 0x8, %1\n\t"
-                             "ldxa      [%1] %5, %3\n\t"
+        __asm__ __volatile__("ldxa      [%1] %5, %2\n"
+                             "1:\n\t"
                              "sub       %1, 0x8, %1\n\t"
+                             "ldxa      [%1] %5, %3\n\t"
+                             "add       %1, 0x8, %1\n\t"
                              "ldxa      [%1] %5, %4\n\t"
                              "cmp       %4, %2\n\t"
-                             "blu,a,pn  %%xcc, 1f\n\t"
-                             " add      %3, 1, %3\n"
-                             "1:\n\t"
-                             "sllx      %3, 32, %3\n\t"
+                             "bne,a,pn  %%xcc, 1b\n\t"
+                             " mov      %4, %2\n\t"
+                             "sllx      %4, 32, %4\n\t"
                              "or        %3, %4, %0\n\t"
                              : "=&r" (ret), "=&r" (addr),
                                "=&r" (tmp1), "=&r" (tmp2), "=&r" (tmp3)