lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64

Browse Source 
Pull arm64 fix from Catalin Marinas:
 "Fix IS_ENABLED() usage typo (missing CONFIG_ prefix)."

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
  ARM64: early_printk: Fix check for CONFIG_ARM64_64K_PAGES
This commit is contained in:
Linus Torvalds
2013-03-28 13:45:49 -07:00
parent 5e248509b6 d17cfb34dc
commit d3f72cfb7a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/mm/mmu.c
View File

@@ -261,7 +261,7 @@ static void __init create_mapping(phys_addr_t phys, unsigned long virt,
void __iomem * __init early_io_map(phys_addr_t phys, unsigned long virt) void __iomem * __init early_io_map(phys_addr_t phys, unsigned long virt)
{ {
unsigned long size, mask; unsigned long size, mask;
bool page64k = IS_ENABLED(ARM64_64K_PAGES); bool page64k = IS_ENABLED(CONFIG_ARM64_64K_PAGES);
pgd_t *pgd; pgd_t *pgd;
pud_t *pud; pud_t *pud;
pmd_t *pmd; pmd_t *pmd;