2 files changed, 8 insertions, 8 deletions

diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index 45aa771e73a9..0144395448ae 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -58,7 +58,7 @@
 
 xmaddr_t arbitrary_virt_to_machine(unsigned long address)
 {
-        int level;
+        unsigned int level;
         pte_t *pte = lookup_address(address, &level);
         unsigned offset = address & PAGE_MASK;
 
@@ -71,7 +71,7 @@ void make_lowmem_page_readonly(void *vaddr)
 {
         pte_t *pte, ptev;
         unsigned long address = (unsigned long)vaddr;
-        int level;
+        unsigned int level;
 
         pte = lookup_address(address, &level);
         BUG_ON(pte == NULL);
@@ -86,7 +86,7 @@ void make_lowmem_page_readwrite(void *vaddr)
 {
         pte_t *pte, ptev;
         unsigned long address = (unsigned long)vaddr;
-        int level;
+        unsigned int level;
 
         pte = lookup_address(address, &level);
         BUG_ON(pte == NULL);
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
index b3721fd6877b..c39e1a5aa241 100644
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
@@ -217,17 +217,17 @@ unsigned long long xen_sched_clock(void)
 /* Get the CPU speed from Xen */
 unsigned long xen_cpu_khz(void)
 {
-        u64 cpu_khz = 1000000ULL << 32;
+        u64 xen_khz = 1000000ULL << 32;
         const struct vcpu_time_info *info =
                 &HYPERVISOR_shared_info->vcpu_info[0].time;
 
-        do_div(cpu_khz, info->tsc_to_system_mul);
+        do_div(xen_khz, info->tsc_to_system_mul);
         if (info->tsc_shift < 0)
-                cpu_khz <<= -info->tsc_shift;
+                xen_khz <<= -info->tsc_shift;
         else
-                cpu_khz >>= info->tsc_shift;
+                xen_khz >>= info->tsc_shift;
 
-        return cpu_khz;
+        return xen_khz;
 }
 
 /*