Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit e86f949667127509d95b6c678fdd928b93128d9d

Authored by Juergen Gross
Committed by David Vrabel
1 parent f241b0b891
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

xen: use correct type for physical addresses 

When converting a pfn to a physical address be sure to use 64 bit
wide types or convert the physical address to a pfn if possible.

Signed-off-by: Juergen Gross <jgross@suse.com>
Tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

arch/x86/xen/setup.c
Diff comments   View file @ e86f949
... ... @@ -140,7 +140,7 @@
140 140 unsigned long __ref xen_chk_extra_mem(unsigned long pfn)
141 141 {
142 142 int i;
143   - unsigned long addr = PFN_PHYS(pfn);
  143 + phys_addr_t addr = PFN_PHYS(pfn);
144 144  
145 145 for (i = 0; i < XEN_EXTRA_MEM_MAX_REGIONS; i++) {
146 146 if (addr >= xen_extra_mem[i].start &&
... ... @@ -284,7 +284,7 @@
284 284 }
285 285  
286 286 /* Update kernel mapping, but not for highmem. */
287   - if ((pfn << PAGE_SHIFT) >= __pa(high_memory))
  287 + if (pfn >= PFN_UP(__pa(high_memory - 1)))
288 288 return;
289 289  
290 290 if (HYPERVISOR_update_va_mapping((unsigned long)__va(pfn << PAGE_SHIFT),