diff options
author | Michael Ellerman | 2015-06-19 09:23:48 +0200 |
---|---|---|
committer | Michael Ellerman | 2015-06-19 09:23:48 +0200 |
commit | 6096f884515466f400864ad23d16f20b731a7ce7 (patch) | |
tree | 8d0c6863daf21aa48f30e615e49263eded8db642 /arch/powerpc/mm/mem.c | |
parent | cxl: Fix typo in debug print (diff) | |
parent | powerpc/85xx: Replace CONFIG_USB_ISP1760_HCD by CONFIG_USB_ISP1760 (diff) | |
download | kernel-qcow2-linux-6096f884515466f400864ad23d16f20b731a7ce7.tar.gz kernel-qcow2-linux-6096f884515466f400864ad23d16f20b731a7ce7.tar.xz kernel-qcow2-linux-6096f884515466f400864ad23d16f20b731a7ce7.zip |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include more 8xx optimizations, an e6500 hugetlb optimization,
QMan device tree nodes, t1024/t1023 support, and various fixes and
cleanup."
Diffstat (limited to 'arch/powerpc/mm/mem.c')
-rw-r--r-- | arch/powerpc/mm/mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 45fda71feb27..0f11819d8f1d 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -560,7 +560,7 @@ subsys_initcall(add_system_ram_resources); */ int devmem_is_allowed(unsigned long pfn) { - if (iomem_is_exclusive(pfn << PAGE_SHIFT)) + if (iomem_is_exclusive(PFN_PHYS(pfn))) return 0; if (!page_is_ram(pfn)) return 1; |