Merge branch 'linus'

1 files changed, 5 insertions, 6 deletions

diff --git a/arch/sparc64/kernel/us2e_cpufreq.c b/arch/sparc64/kernel/us2e_cpufreq.c
index b35dc8dc995a..1f83fe6a82d6 100644
--- a/arch/sparc64/kernel/us2e_cpufreq.c
+++ b/arch/sparc64/kernel/us2e_cpufreq.c
@@ -346,6 +346,9 @@ static int __init us2e_freq_init(void)
         unsigned long manuf, impl, ver;
         int ret;
 
+        if (tlb_type != spitfire)
+                return -ENODEV;
+
         __asm__("rdpr %%ver, %0" : "=r" (ver));
         manuf = ((ver >> 48) & 0xffff);
         impl  = ((ver >> 32) & 0xffff);
@@ -354,20 +357,16 @@ static int __init us2e_freq_init(void)
                 struct cpufreq_driver *driver;
 
                 ret = -ENOMEM;
-                driver = kmalloc(sizeof(struct cpufreq_driver), GFP_KERNEL);
+                driver = kzalloc(sizeof(struct cpufreq_driver), GFP_KERNEL);
                 if (!driver)
                         goto err_out;
-                memset(driver, 0, sizeof(*driver));
 
-                us2e_freq_table = kmalloc(
+                us2e_freq_table = kzalloc(
                         (NR_CPUS * sizeof(struct us2e_freq_percpu_info)),
                         GFP_KERNEL);
                 if (!us2e_freq_table)
                         goto err_out;
 
-                memset(us2e_freq_table, 0,
-                       (NR_CPUS * sizeof(struct us2e_freq_percpu_info)));
-
                 driver->init = us2e_freq_cpu_init;
                 driver->verify = us2e_freq_verify;
                 driver->target = us2e_freq_target;