diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-09-23 10:52:03 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-09-23 10:52:03 +0300 |
| commit | 4bbffe718fe1bfae6176a6fb783c1576b69338e5 (patch) | |
| tree | e4d25102f0d2fa2a3480e03ba7bde45c9958511e /include/asm-generic | |
| parent | ac742d37180bee83bc433be087b66a17af2883b9 (diff) | |
| parent | 21199f27b430576552b26210b3194a363d7f05cd (diff) | |
| download | linux-4bbffe718fe1bfae6176a6fb783c1576b69338e5.tar.xz | |
Merge branch 'locking/urgent' into locking/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/memory_model.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memory_model.h index f20f407ce45d..4b4b056a6eb0 100644 --- a/include/asm-generic/memory_model.h +++ b/include/asm-generic/memory_model.h @@ -73,7 +73,7 @@ * Convert a physical address to a Page Frame Number and back */ #define __phys_to_pfn(paddr) ((unsigned long)((paddr) >> PAGE_SHIFT)) -#define __pfn_to_phys(pfn) ((pfn) << PAGE_SHIFT) +#define __pfn_to_phys(pfn) PFN_PHYS(pfn) #define page_to_pfn __page_to_pfn #define pfn_to_page __pfn_to_page |