diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-01-28 14:14:25 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-01-28 14:42:31 +0100 |
| commit | 3bce64f019a801f526cc38523c77ffda4e846155 (patch) | |
| tree | 72124bfabc1c83fba86fe90e3bdad8321d9b3c0a /arch/x86/mm/init_64.c | |
| parent | f52355a99fc06f609ca6a61098d78e476d56f526 (diff) | |
x86/boot/e820: Rename e820_any_mapped()/e820_all_mapped() to e820__mapped_any()/e820__mapped_all()
The 'any' and 'all' are modified to the 'mapped' concept, so move them last in the name.
No change in functionality.
Cc: Alex Thorlton <athorlton@sgi.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Huang, Ying <ying.huang@intel.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul Jackson <pj@sgi.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Tejun Heo <tj@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wei Yang <richard.weiyang@gmail.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/mm/init_64.c')
| -rw-r--r-- | arch/x86/mm/init_64.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index ad7a477f3423..cfb119e4c4d1 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -337,9 +337,9 @@ phys_pte_init(pte_t *pte_page, unsigned long paddr, unsigned long paddr_end, paddr_next = (paddr & PAGE_MASK) + PAGE_SIZE; if (paddr >= paddr_end) { if (!after_bootmem && - !e820_any_mapped(paddr & PAGE_MASK, paddr_next, + !e820__mapped_any(paddr & PAGE_MASK, paddr_next, E820_RAM) && - !e820_any_mapped(paddr & PAGE_MASK, paddr_next, + !e820__mapped_any(paddr & PAGE_MASK, paddr_next, E820_RESERVED_KERN)) set_pte(pte, __pte(0)); continue; @@ -392,9 +392,9 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long paddr, unsigned long paddr_end, paddr_next = (paddr & PMD_MASK) + PMD_SIZE; if (paddr >= paddr_end) { if (!after_bootmem && - !e820_any_mapped(paddr & PMD_MASK, paddr_next, + !e820__mapped_any(paddr & PMD_MASK, paddr_next, E820_RAM) && - !e820_any_mapped(paddr & PMD_MASK, paddr_next, + !e820__mapped_any(paddr & PMD_MASK, paddr_next, E820_RESERVED_KERN)) set_pmd(pmd, __pmd(0)); continue; @@ -478,9 +478,9 @@ phys_pud_init(pud_t *pud_page, unsigned long paddr, unsigned long paddr_end, if (paddr >= paddr_end) { if (!after_bootmem && - !e820_any_mapped(paddr & PUD_MASK, paddr_next, + !e820__mapped_any(paddr & PUD_MASK, paddr_next, E820_RAM) && - !e820_any_mapped(paddr & PUD_MASK, paddr_next, + !e820__mapped_any(paddr & PUD_MASK, paddr_next, E820_RESERVED_KERN)) set_pud(pud, __pud(0)); continue; |