5 files changed, 63 insertions, 65 deletions

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 75291fdd379..b7193986cbf 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -55,6 +55,9 @@ config ARCH_USES_GETTIMEOFFSET
         bool
         default y
 
+config GENERIC_CMOS_UPDATE
+        def_bool y
+
 config ZONE_DMA
         bool
         default y
diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
index 610dff44d94..e756d04b6cd 100644
--- a/arch/alpha/include/asm/atomic.h
+++ b/arch/alpha/include/asm/atomic.h
@@ -17,8 +17,8 @@
 #define ATOMIC_INIT(i)          ( (atomic_t) { (i) } )
 #define ATOMIC64_INIT(i)        ( (atomic64_t) { (i) } )
 
-#define atomic_read(v)          ((v)->counter + 0)
-#define atomic64_read(v)        ((v)->counter + 0)
+#define atomic_read(v)          (*(volatile int *)&(v)->counter)
+#define atomic64_read(v)        (*(volatile long *)&(v)->counter)
 
 #define atomic_set(v,i)         ((v)->counter = (i))
 #define atomic64_set(v,i)       ((v)->counter = (i))
diff --git a/arch/alpha/include/asm/bitops.h b/arch/alpha/include/asm/bitops.h
index 15f3ae25c51..296da1d5ed5 100644
--- a/arch/alpha/include/asm/bitops.h
+++ b/arch/alpha/include/asm/bitops.h
@@ -405,29 +405,31 @@ static inline int fls(int x)
 
 #if defined(CONFIG_ALPHA_EV6) && defined(CONFIG_ALPHA_EV67)
 /* Whee.  EV67 can calculate it directly.  */
-static inline unsigned long hweight64(unsigned long w)
+static inline unsigned long __arch_hweight64(unsigned long w)
 {
         return __kernel_ctpop(w);
 }
 
-static inline unsigned int hweight32(unsigned int w)
+static inline unsigned int __arch_weight32(unsigned int w)
 {
-        return hweight64(w);
+        return __arch_hweight64(w);
 }
 
-static inline unsigned int hweight16(unsigned int w)
+static inline unsigned int __arch_hweight16(unsigned int w)
 {
-        return hweight64(w & 0xffff);
+        return __arch_hweight64(w & 0xffff);
 }
 
-static inline unsigned int hweight8(unsigned int w)
+static inline unsigned int __arch_hweight8(unsigned int w)
 {
-        return hweight64(w & 0xff);
+        return __arch_hweight64(w & 0xff);
 }
 #else
-#include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/arch_hweight.h>
 #endif
 
+#include <asm-generic/bitops/const_hweight.h>
+
 #endif /* __KERNEL__ */
 
 #include <asm-generic/bitops/find.h>
diff --git a/arch/alpha/include/asm/thread_info.h b/arch/alpha/include/asm/thread_info.h
index b3e888638bb..6f32f9c84a2 100644
--- a/arch/alpha/include/asm/thread_info.h
+++ b/arch/alpha/include/asm/thread_info.h
@@ -77,7 +77,7 @@ register struct thread_info *__current_thread_info __asm__("$8");
 #define TIF_UAC_NOPRINT         10      /* see sysinfo.h */
 #define TIF_UAC_NOFIX           11
 #define TIF_UAC_SIGBUS          12
-#define TIF_MEMDIE              13
+#define TIF_MEMDIE              13      /* is terminating due to OOM killer */
 #define TIF_RESTORE_SIGMASK     14      /* restore signal mask in do_signal */
 #define TIF_FREEZE              16      /* is freezing for suspend */
 
diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c
index 5d0826654c6..5465e932e56 100644
--- a/arch/alpha/kernel/time.c
+++ b/arch/alpha/kernel/time.c
@@ -75,8 +75,6 @@ static struct {
         __u32 last_time;
         /* ticks/cycle * 2^48 */
         unsigned long scaled_ticks_per_cycle;
-        /* last time the CMOS clock got updated */
-        time_t last_rtc_update;
         /* partial unused tick */
         unsigned long partial_tick;
 } state;
@@ -91,6 +89,52 @@ static inline __u32 rpcc(void)
     return result;
 }
 
+int update_persistent_clock(struct timespec now)
+{
+        return set_rtc_mmss(now.tv_sec);
+}
+
+void read_persistent_clock(struct timespec *ts)
+{
+        unsigned int year, mon, day, hour, min, sec, epoch;
+
+        sec = CMOS_READ(RTC_SECONDS);
+        min = CMOS_READ(RTC_MINUTES);
+        hour = CMOS_READ(RTC_HOURS);
+        day = CMOS_READ(RTC_DAY_OF_MONTH);
+        mon = CMOS_READ(RTC_MONTH);
+        year = CMOS_READ(RTC_YEAR);
+
+        if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
+                sec = bcd2bin(sec);
+                min = bcd2bin(min);
+                hour = bcd2bin(hour);
+                day = bcd2bin(day);
+                mon = bcd2bin(mon);
+                year = bcd2bin(year);
+        }
+
+        /* PC-like is standard; used for year >= 70 */
+        epoch = 1900;
+        if (year < 20)
+                epoch = 2000;
+        else if (year >= 20 && year < 48)
+                /* NT epoch */
+                epoch = 1980;
+        else if (year >= 48 && year < 70)
+                /* Digital UNIX epoch */
+                epoch = 1952;
+
+        printk(KERN_INFO "Using epoch = %d\n", epoch);
+
+        if ((year += epoch) < 1970)
+                year += 100;
+
+        ts->tv_sec = mktime(year, mon, day, hour, min, sec);
+}
+
+
+
 /*
  * timer_interrupt() needs to keep up the real-time clock,
  * as well as call the "do_timer()" routine every clocktick
@@ -123,19 +167,6 @@ irqreturn_t timer_interrupt(int irq, void *dev)
         if (nticks)
                 do_timer(nticks);
 
-        /*
-         * If we have an externally synchronized Linux clock, then update
-         * CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be
-         * called as close as possible to 500 ms before the new second starts.
-         */
-        if (ntp_synced()
-            && xtime.tv_sec > state.last_rtc_update + 660
-            && xtime.tv_nsec >= 500000 - ((unsigned) TICK_SIZE) / 2
-            && xtime.tv_nsec <= 500000 + ((unsigned) TICK_SIZE) / 2) {
-                int tmp = set_rtc_mmss(xtime.tv_sec);
-                state.last_rtc_update = xtime.tv_sec - (tmp ? 600 : 0);
-        }
-
         write_sequnlock(&xtime_lock);
 
 #ifndef CONFIG_SMP
@@ -304,7 +335,7 @@ rpcc_after_update_in_progress(void)
 void __init
 time_init(void)
 {
-        unsigned int year, mon, day, hour, min, sec, cc1, cc2, epoch;
+        unsigned int cc1, cc2;
         unsigned long cycle_freq, tolerance;
         long diff;
 
@@ -348,43 +379,6 @@ time_init(void)
            bogomips yet, but this is close on a 500Mhz box.  */
         __delay(1000000);
 
-        sec = CMOS_READ(RTC_SECONDS);
-        min = CMOS_READ(RTC_MINUTES);
-        hour = CMOS_READ(RTC_HOURS);
-        day = CMOS_READ(RTC_DAY_OF_MONTH);
-        mon = CMOS_READ(RTC_MONTH);
-        year = CMOS_READ(RTC_YEAR);
-
-        if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
-                sec = bcd2bin(sec);
-                min = bcd2bin(min);
-                hour = bcd2bin(hour);
-                day = bcd2bin(day);
-                mon = bcd2bin(mon);
-                year = bcd2bin(year);
-        }
-
-        /* PC-like is standard; used for year >= 70 */
-        epoch = 1900;
-        if (year < 20)
-                epoch = 2000;
-        else if (year >= 20 && year < 48)
-                /* NT epoch */
-                epoch = 1980;
-        else if (year >= 48 && year < 70)
-                /* Digital UNIX epoch */
-                epoch = 1952;
-
-        printk(KERN_INFO "Using epoch = %d\n", epoch);
-
-        if ((year += epoch) < 1970)
-                year += 100;
-
-        xtime.tv_sec = mktime(year, mon, day, hour, min, sec);
-        xtime.tv_nsec = 0;
-
-        wall_to_monotonic.tv_sec -= xtime.tv_sec;
-        wall_to_monotonic.tv_nsec = 0;
 
         if (HZ > (1<<16)) {
                 extern void __you_loose (void);
@@ -394,7 +388,6 @@ time_init(void)
         state.last_time = cc1;
         state.scaled_ticks_per_cycle
                 = ((unsigned long) HZ << FIX_SHIFT) / cycle_freq;
-        state.last_rtc_update = 0;
         state.partial_tick = 0L;
 
         /* Startup the timer source. */