Auto-update from upstream

2 files changed, 9 insertions, 3 deletions

diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 5add0bcf87a7..088e5dded8dc 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -43,6 +43,7 @@
 #include <linux/initrd.h>
 #include <linux/platform.h>
 #include <linux/pm.h>
+#include <linux/cpufreq.h>
 
 #include <asm/ia32.h>
 #include <asm/machvec.h>
@@ -517,6 +518,7 @@ show_cpuinfo (struct seq_file *m, void *v)
         char family[32], features[128], *cp, sep;
         struct cpuinfo_ia64 *c = v;
         unsigned long mask;
+        unsigned int proc_freq;
         int i;
 
         mask = c->features;
@@ -549,6 +551,10 @@ show_cpuinfo (struct seq_file *m, void *v)
                 sprintf(cp, " 0x%lx", mask);
         }
 
+        proc_freq = cpufreq_quick_get(cpunum);
+        if (!proc_freq)
+                proc_freq = c->proc_freq / 1000;
+
         seq_printf(m,
                    "processor  : %d\n"
                    "vendor     : %s\n"
@@ -565,7 +571,7 @@ show_cpuinfo (struct seq_file *m, void *v)
                    "BogoMIPS   : %lu.%02lu\n",
                    cpunum, c->vendor, family, c->model, c->revision, c->archrev,
                    features, c->ppn, c->number,
-                   c->proc_freq / 1000000, c->proc_freq % 1000000,
+                   proc_freq / 1000, proc_freq % 1000,
                    c->itc_freq / 1000000, c->itc_freq % 1000000,
                    lpj*HZ/500000, (lpj*HZ/5000) % 100);
 #ifdef CONFIG_SMP
diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c
index 0d8592a745a7..768c21deb2e5 100644
--- a/arch/ia64/sn/kernel/tiocx.c
+++ b/arch/ia64/sn/kernel/tiocx.c
@@ -65,7 +65,7 @@ static int tiocx_match(struct device *dev, struct device_driver *drv)
 
 }
 
-static int tiocx_hotplug(struct device *dev, char **envp, int num_envp,
+static int tiocx_uevent(struct device *dev, char **envp, int num_envp,
                          char *buffer, int buffer_size)
 {
         return -ENODEV;
@@ -79,7 +79,7 @@ static void tiocx_bus_release(struct device *dev)
 struct bus_type tiocx_bus_type = {
         .name = "tiocx",
         .match = tiocx_match,
-        .hotplug = tiocx_hotplug,
+        .uevent = tiocx_uevent,
 };
 
 /**