Merge ../linux-2.6

3 files changed, 12 insertions, 25 deletions

diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
index 7d61f1bfd3d3..e55b5c6ece02 100644
--- a/arch/sparc64/kernel/time.c
+++ b/arch/sparc64/kernel/time.c
@@ -641,23 +641,8 @@ static void __init set_system_time(void)
                 mon = MSTK_REG_MONTH(mregs);
                 year = MSTK_CVT_YEAR( MSTK_REG_YEAR(mregs) );
         } else {
-                int i;
-
                 /* Dallas 12887 RTC chip. */
 
-                /* Stolen from arch/i386/kernel/time.c, see there for
-                 * credits and descriptive comments.
-                 */
-                for (i = 0; i < 1000000; i++) {
-                        if (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP)
-                                break;
-                        udelay(10);
-                }
-                for (i = 0; i < 1000000; i++) {
-                        if (!(CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP))
-                                break;
-                        udelay(10);
-                }
                 do {
                         sec  = CMOS_READ(RTC_SECONDS);
                         min  = CMOS_READ(RTC_MINUTES);
@@ -666,6 +651,7 @@ static void __init set_system_time(void)
                         mon  = CMOS_READ(RTC_MONTH);
                         year = CMOS_READ(RTC_YEAR);
                 } while (sec != CMOS_READ(RTC_SECONDS));
+
                 if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
                         BCD_TO_BIN(sec);
                         BCD_TO_BIN(min);
diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c
index df612e4f75f9..ff090bb9734b 100644
--- a/arch/sparc64/kernel/traps.c
+++ b/arch/sparc64/kernel/traps.c
@@ -43,18 +43,19 @@
 #include <linux/kmod.h>
 #endif
 
-struct notifier_block *sparc64die_chain;
-static DEFINE_SPINLOCK(die_notifier_lock);
+ATOMIC_NOTIFIER_HEAD(sparc64die_chain);
 
 int register_die_notifier(struct notifier_block *nb)
 {
-        int err = 0;
-        unsigned long flags;
-        spin_lock_irqsave(&die_notifier_lock, flags);
-        err = notifier_chain_register(&sparc64die_chain, nb);
-        spin_unlock_irqrestore(&die_notifier_lock, flags);
-        return err;
+        return atomic_notifier_chain_register(&sparc64die_chain, nb);
 }
+EXPORT_SYMBOL(register_die_notifier);
+
+int unregister_die_notifier(struct notifier_block *nb)
+{
+        return atomic_notifier_chain_unregister(&sparc64die_chain, nb);
+}
+EXPORT_SYMBOL(unregister_die_notifier);
 
 /* When an irrecoverable trap occurs at tl > 0, the trap entry
  * code logs the trap state registers at every level in the trap
diff --git a/arch/sparc64/mm/fault.c b/arch/sparc64/mm/fault.c
index d21ff3230c02..0db2f7d9fab5 100644
--- a/arch/sparc64/mm/fault.c
+++ b/arch/sparc64/mm/fault.c
@@ -413,12 +413,12 @@ good_area:
 #ifdef CONFIG_HUGETLB_PAGE
         mm_rss -= (mm->context.huge_pte_count * (HPAGE_SIZE / PAGE_SIZE));
 #endif
-        if (unlikely(mm_rss >=
+        if (unlikely(mm_rss >
                      mm->context.tsb_block[MM_TSB_BASE].tsb_rss_limit))
                 tsb_grow(mm, MM_TSB_BASE, mm_rss);
 #ifdef CONFIG_HUGETLB_PAGE
         mm_rss = mm->context.huge_pte_count;
-        if (unlikely(mm_rss >=
+        if (unlikely(mm_rss >
                      mm->context.tsb_block[MM_TSB_HUGE].tsb_rss_limit))
                 tsb_grow(mm, MM_TSB_HUGE, mm_rss);
 #endif