Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 947d0496cf3e12ebfa70b3eaf561c25403247ce9

Authored by Jeremy Fitzhardinge
Committed by Ingo Molnar
1 parent 600715dcdf
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

generic: make PFN_PHYS explicitly return phys_addr_t 

PFN_PHYS, as its name suggests, turns a pfn into a physical address.
However, it is a macro which just operates on its argument without
modifying its type.  pfns are typed unsigned long, but an unsigned
long may not be long enough to hold a physical address (32-bit systems
with more than 32 bits of physcial address).

Make sure we cast to phys_addr_t to return a complete result.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Showing 3 changed files with 9 additions and 5 deletions Side-by-side Diff

arch/m32r/mm/discontig.c
Diff comments   View file @ 947d049
... ... @@ -111,9 +111,9 @@
111 111 initrd_start, INITRD_SIZE);
112 112 } else {
113 113 printk("initrd extends beyond end of memory "
114   - "(0x%08lx > 0x%08lx)\ndisabling initrd\n",
  114 + "(0x%08lx > 0x%08llx)\ndisabling initrd\n",
115 115 INITRD_START + INITRD_SIZE,
116   - PFN_PHYS(max_low_pfn));
  116 + (unsigned long long)PFN_PHYS(max_low_pfn));
117 117  
118 118 initrd_start = 0;
119 119 }
include/asm-x86/xen/page.h
Diff comments   View file @ 947d049
... ... @@ -76,13 +76,13 @@
76 76 static inline xmaddr_t phys_to_machine(xpaddr_t phys)
77 77 {
78 78 unsigned offset = phys.paddr & ~PAGE_MASK;
79   - return XMADDR(PFN_PHYS((u64)pfn_to_mfn(PFN_DOWN(phys.paddr))) | offset);
  79 + return XMADDR(PFN_PHYS(pfn_to_mfn(PFN_DOWN(phys.paddr))) | offset);
80 80 }
81 81  
82 82 static inline xpaddr_t machine_to_phys(xmaddr_t machine)
83 83 {
84 84 unsigned offset = machine.maddr & ~PAGE_MASK;
85   - return XPADDR(PFN_PHYS((u64)mfn_to_pfn(PFN_DOWN(machine.maddr))) | offset);
  85 + return XPADDR(PFN_PHYS(mfn_to_pfn(PFN_DOWN(machine.maddr))) | offset);
86 86 }
87 87  
88 88 /*
1 1 #ifndef _LINUX_PFN_H_
2 2 #define _LINUX_PFN_H_
3 3  
  4 +#ifndef __ASSEMBLY__
  5 +#include <linux/types.h>
  6 +#endif
  7 +
4 8 #define PFN_ALIGN(x) (((unsigned long)(x) + (PAGE_SIZE - 1)) & PAGE_MASK)
5 9 #define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
6 10 #define PFN_DOWN(x) ((x) >> PAGE_SHIFT)
7   -#define PFN_PHYS(x) ((x) << PAGE_SHIFT)
  11 +#define PFN_PHYS(x) ((phys_addr_t)(x) << PAGE_SHIFT)
8 12  
9 13 #endif