diff options
author | Frank Li <Frank.Li@freescale.com> | 2011-11-11 10:29:48 +0800 |
---|---|---|
committer | Frank Li <Frank.Li@freescale.com> | 2011-11-11 15:51:08 +0800 |
commit | 32ced99420a3c997d0a7e8edd2a48a49c80c0701 (patch) | |
tree | 72705189cc1fd2de13742ba9c21d80d280834f2e /arch | |
parent | b67505c88d086fde975750db63666426b9785322 (diff) |
ENGR00160525 MX6: fix mmu.c and cryptodev warning
skip build cryptodev because no one use it now.
Signed-off-by: Frank Li <Frank.Li@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/configs/imx6_defconfig | 4 | ||||
-rw-r--r-- | arch/arm/mm/mmu.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig index cc21f4500af0..ff4a4648a698 100644 --- a/arch/arm/configs/imx6_defconfig +++ b/arch/arm/configs/imx6_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/arm 2.6.38 Kernel Configuration -# Wed Nov 9 15:44:43 2011 +# Fri Nov 11 09:57:21 2011 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -2249,7 +2249,7 @@ CONFIG_CRYPTO_WORKQUEUE=y # CONFIG_CRYPTO_CRYPTD is not set # CONFIG_CRYPTO_AUTHENC is not set CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_CRYPTODEV=y +# CONFIG_CRYPTO_CRYPTODEV is not set # # Authenticated Encryption with Associated Data diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 3c67e92f7d59..fc9154f97b78 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -598,7 +598,7 @@ static void __init create_36bit_mapping(struct map_desc *md, if (!(cpu_architecture() >= CPU_ARCH_ARMv6 || cpu_is_xsc3())) { printk(KERN_ERR "MM: CPU does not support supersection " "mapping for 0x%08llx at 0x%08lx\n", - __pfn_to_phys((u64)md->pfn), addr); + (uint64_t) __pfn_to_phys((u64)md->pfn), addr); return; } @@ -611,14 +611,14 @@ static void __init create_36bit_mapping(struct map_desc *md, if (type->domain) { printk(KERN_ERR "MM: invalid domain in supersection " "mapping for 0x%08llx at 0x%08lx\n", - __pfn_to_phys((u64)md->pfn), addr); + (uint64_t) __pfn_to_phys((u64)md->pfn), addr); return; } if ((addr | length | __pfn_to_phys(md->pfn)) & ~SUPERSECTION_MASK) { printk(KERN_ERR "MM: cannot create mapping for " "0x%08llx at 0x%08lx invalid alignment\n", - __pfn_to_phys((u64)md->pfn), addr); + (uint64_t) __pfn_to_phys((u64)md->pfn), addr); return; } @@ -659,7 +659,7 @@ static void __init create_mapping(struct map_desc *md) if (md->virtual != vectors_base() && md->virtual < TASK_SIZE) { printk(KERN_WARNING "BUG: not creating mapping for " "0x%08llx at 0x%08lx in user region\n", - __pfn_to_phys((u64)md->pfn), md->virtual); + (uint64_t) __pfn_to_phys((u64)md->pfn), md->virtual); return; } @@ -667,7 +667,7 @@ static void __init create_mapping(struct map_desc *md) md->virtual >= PAGE_OFFSET && md->virtual < VMALLOC_END) { printk(KERN_WARNING "BUG: mapping for 0x%08llx at 0x%08lx " "overlaps vmalloc space\n", - __pfn_to_phys((u64)md->pfn), md->virtual); + (uint64_t) __pfn_to_phys((u64)md->pfn), md->virtual); } type = &mem_types[md->type]; @@ -687,7 +687,7 @@ static void __init create_mapping(struct map_desc *md) if (type->prot_l1 == 0 && ((addr | phys | length) & ~SECTION_MASK)) { printk(KERN_WARNING "BUG: map for 0x%08lx at 0x%08lx can not " "be mapped using pages, ignoring.\n", - __pfn_to_phys(md->pfn), addr); + (uint64_t) __pfn_to_phys(md->pfn), addr); return; } |