Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / microblaze / kernel / cpu / cpuinfo-pvr-full.c

diff --git a/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c b/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c
index ee46894154101cad22e70e4ccbf91b44172cee2d..a32daec96c1231d3369fc0240c5fd8476e4f6d5e 100644 (file)
--- a/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c
+++ b/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c
@@ -33,7 +33,7 @@
 void set_cpuinfo_pvr_full(struct cpuinfo *ci, struct device_node *cpu)
 {
        struct pvr_s pvr;
-       int temp; /* for saving temp value */
+       u32 temp; /* for saving temp value */
        get_pvr(&pvr);
 
        CI(ver_code, VERSION);
@@ -112,7 +112,4 @@ void set_cpuinfo_pvr_full(struct cpuinfo *ci, struct device_node *cpu)
        CI(num_wr_brk, NUMBER_OF_WR_ADDR_BRK);
 
        CI(fpga_family_code, TARGET_FAMILY);
-
-       /* take timebase-frequency from DTS */
-       ci->cpu_clock_freq = fcpu(cpu, "timebase-frequency");
 }