4 files changed, 19 insertions, 31 deletions

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 54a0a9bb12dd..3a3e302b4ea2 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -19,6 +19,10 @@ config RWSEM_XCHGADD_ALGORITHM
         bool
         default y
 
+config GENERIC_HWEIGHT
+        bool
+        default y
+
 config GENERIC_CALIBRATE_DELAY
         bool
         default y
diff --git a/arch/ppc/kernel/ppc_htab.c b/arch/ppc/kernel/ppc_htab.c
index 2f5c7650274f..9b84bffdefce 100644
--- a/arch/ppc/kernel/ppc_htab.c
+++ b/arch/ppc/kernel/ppc_htab.c
@@ -52,7 +52,7 @@ static int ppc_htab_open(struct inode *inode, struct file *file)
         return single_open(file, ppc_htab_show, NULL);
 }
 
-struct file_operations ppc_htab_operations = {
+const struct file_operations ppc_htab_operations = {
         .open           = ppc_htab_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
diff --git a/arch/ppc/platforms/chrp_time.c b/arch/ppc/platforms/chrp_time.c
index c8627770af13..51e06ad66168 100644
--- a/arch/ppc/platforms/chrp_time.c
+++ b/arch/ppc/platforms/chrp_time.c
@@ -119,44 +119,28 @@ int chrp_set_rtc_time(unsigned long nowtime)
 unsigned long chrp_get_rtc_time(void)
 {
         unsigned int year, mon, day, hour, min, sec;
-        int uip, i;
 
-        /* The Linux interpretation of the CMOS clock register contents:
-         * When the Update-In-Progress (UIP) flag goes from 1 to 0, the
-         * RTC registers show the second which has precisely just started.
-         * Let's hope other operating systems interpret the RTC the same way.
-         */
-
-        /* Since the UIP flag is set for about 2.2 ms and the clock
-         * is typically written with a precision of 1 jiffy, trying
-         * to obtain a precision better than a few milliseconds is
-         * an illusion. Only consistency is interesting, this also
-         * allows to use the routine for /dev/rtc without a potential
-         * 1 second kernel busy loop triggered by any reader of /dev/rtc.
-         */
-
-        for ( i = 0; i<1000000; i++) {
-                uip = chrp_cmos_clock_read(RTC_FREQ_SELECT);
+        do {
                 sec = chrp_cmos_clock_read(RTC_SECONDS);
                 min = chrp_cmos_clock_read(RTC_MINUTES);
                 hour = chrp_cmos_clock_read(RTC_HOURS);
                 day = chrp_cmos_clock_read(RTC_DAY_OF_MONTH);
                 mon = chrp_cmos_clock_read(RTC_MONTH);
                 year = chrp_cmos_clock_read(RTC_YEAR);
-                uip |= chrp_cmos_clock_read(RTC_FREQ_SELECT);
-                if ((uip & RTC_UIP)==0) break;
+        } while (sec != chrp_cmos_clock_read(RTC_SECONDS));
+
+        if (!(chrp_cmos_clock_read(RTC_CONTROL) & RTC_DM_BINARY)
+            || RTC_ALWAYS_BCD) {
+                BCD_TO_BIN(sec);
+                BCD_TO_BIN(min);
+                BCD_TO_BIN(hour);
+                BCD_TO_BIN(day);
+                BCD_TO_BIN(mon);
+                BCD_TO_BIN(year);
         }
 
-        if (!(chrp_cmos_clock_read(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
-          {
-            BCD_TO_BIN(sec);
-            BCD_TO_BIN(min);
-            BCD_TO_BIN(hour);
-            BCD_TO_BIN(day);
-            BCD_TO_BIN(mon);
-            BCD_TO_BIN(year);
-          }
-        if ((year += 1900) < 1970)
+        year += 1900;
+        if (year < 1970)
                 year += 100;
         return mktime(year, mon, day, hour, min, sec);
 }
diff --git a/arch/ppc/platforms/prep_setup.c b/arch/ppc/platforms/prep_setup.c
index a0fc628ffb1e..d95c05d9824d 100644
--- a/arch/ppc/platforms/prep_setup.c
+++ b/arch/ppc/platforms/prep_setup.c
@@ -736,7 +736,7 @@ ibm_statusled_progress(char *s, unsigned short hex)
                 hex = 0xfff;
                 if (!notifier_installed) {
                         ++notifier_installed;
-                        notifier_chain_register(&panic_notifier_list,
+                        atomic_notifier_chain_register(&panic_notifier_list,
                                                 &ibm_statusled_block);
                 }
         }