x86/boot/e820: Rename e820_any_mapped()/e820_all_mapped() to e820__mapped_any()/e820_...

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>

diff --git a/arch/x86/include/asm/e820/api.h b/arch/x86/include/asm/e820/api.h
index 9f3917805fc6765b015781d64dbc2cf02be3e85d..3ba95d462bbc1ad9600a427d4a80206b234633e1 100644 (file)
--- a/arch/x86/include/asm/e820/api.h
+++ b/arch/x86/include/asm/e820/api.h
@@ -8,8 +8,8 @@ extern struct e820_table *e820_table_firmware;
 
 extern unsigned long pci_mem_start;
 
-extern int  e820_any_mapped(u64 start, u64 end, unsigned type);
-extern int  e820_all_mapped(u64 start, u64 end, unsigned type);
+extern int  e820__mapped_any(u64 start, u64 end, unsigned type);
+extern int  e820__mapped_all(u64 start, u64 end, unsigned type);
 extern void e820_add_region(u64 start, u64 size, int type);
 extern void e820_print_map(char *who);
 extern int  e820__update_table(struct e820_entry *biosmap, int max_nr_map, u32 *pnr_map);

diff --git a/arch/x86/include/asm/gart.h b/arch/x86/include/asm/gart.h
index e26a5d7fc36856bc052ab552d8b9b46e44cf8d46..2a3ff2ac4686e6b955ff24f4aa4da3eb5ad9fc93 100644 (file)
--- a/arch/x86/include/asm/gart.h
+++ b/arch/x86/include/asm/gart.h
@@ -97,7 +97,7 @@ static inline int aperture_valid(u64 aper_base, u32 aper_size, u32 min_size)
                printk(KERN_INFO "Aperture beyond 4GB. Ignoring.\n");
                return 0;
        }
-       if (e820_any_mapped(aper_base, aper_base + aper_size, E820_RAM)) {
+       if (e820__mapped_any(aper_base, aper_base + aper_size, E820_RAM)) {
                printk(KERN_INFO "Aperture pointing to e820 RAM. Ignoring.\n");
                return 0;
        }

diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c
index e21d012c557b5cc081715c675b98ebe705568e84..d027858a306eb8e2450ac57b5ec6b41a20de8b6a 100644 (file)
--- a/arch/x86/kernel/aperture_64.c
+++ b/arch/x86/kernel/aperture_64.c
@@ -306,7 +306,7 @@ void __init early_gart_iommu_check(void)
                fix = 1;
 
        if (gart_fix_e820 && !fix && aper_enabled) {
-               if (e820_any_mapped(aper_base, aper_base + aper_size,
+               if (e820__mapped_any(aper_base, aper_base + aper_size,
                                    E820_RAM)) {
                        /* reserve it, so we can reuse it in second kernel */
                        pr_info("e820: reserve [mem %#010Lx-%#010Lx] for GART\n",

diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 0053c9f1f6e2fde455e94c4d34e781c71a897570..804acee76acaae9cff4f2694b4c4a06223cd5e39 100644 (file)
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -68,7 +68,7 @@ EXPORT_SYMBOL(pci_mem_start);
  * This function checks if any part of the range <start,end> is mapped
  * with type.
  */
-int e820_any_mapped(u64 start, u64 end, unsigned type)
+int e820__mapped_any(u64 start, u64 end, unsigned type)
 {
        int i;
 
@@ -83,7 +83,7 @@ int e820_any_mapped(u64 start, u64 end, unsigned type)
        }
        return 0;
 }
-EXPORT_SYMBOL_GPL(e820_any_mapped);
+EXPORT_SYMBOL_GPL(e820__mapped_any);
 
 /*
  * This function checks if the entire <start,end> range is mapped with 'type'.
@@ -91,7 +91,7 @@ EXPORT_SYMBOL_GPL(e820_any_mapped);
  * Note: this function only works correctly once the E820 table is sorted and
  * not-overlapping (at least for the range specified), which is the case normally.
  */
-int __init e820_all_mapped(u64 start, u64 end, unsigned type)
+int __init e820__mapped_all(u64 start, u64 end, unsigned type)
 {
        int i;
 

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index e8ec0c693a7767308fef42d174cf29c6dc396434..5ea90a2b37093176f380e25c36f24ebf8745ad32 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -756,7 +756,7 @@ static void __init e820_add_kernel_range(void)
         * exclude kernel range. If we really are running on top non-RAM,
         * we will crash later anyways.
         */
-       if (e820_all_mapped(start, start + size, E820_RAM))
+       if (e820__mapped_all(start, start + size, E820_RAM))
                return;
 
        pr_warn(".text .data .bss are not marked as E820_RAM!\n");

diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
index f7cba42d78077871bc0380bc863821dcf2ee843f..0e2dc38319703d8971bf6659545fc05b6dbc838a 100644 (file)
--- a/arch/x86/kernel/tboot.c
+++ b/arch/x86/kernel/tboot.c
@@ -68,7 +68,7 @@ void __init tboot_probe(void)
         * also verify that it is mapped as we expect it before calling
         * set_fixmap(), to reduce chance of garbage value causing crash
         */
-       if (!e820_any_mapped(boot_params.tboot_addr,
+       if (!e820__mapped_any(boot_params.tboot_addr,
                             boot_params.tboot_addr, E820_RESERVED)) {
                pr_warning("non-0 tboot_addr but it is not of type E820_RESERVED\n");
                return;

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index ad7a477f34231ea12096da6060c998fa39e9c977..cfb119e4c4d1ac7782c61ace6c0e38ae0dbb8073 100644 (file)
--- 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;

diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index 767199edef74e7393e698852cf2d2c8e161aa3ff..696b050bdc45b5b6393c135ab2653d2eed02680f 100644 (file)
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -514,7 +514,7 @@ static int __ref pci_mmcfg_check_reserved(struct device *dev,
        }
 
        /*
-        * e820_all_mapped() is marked as __init.
+        * e820__mapped_all() is marked as __init.
         * All entries from ACPI MCFG table have been checked at boot time.
         * For MCFG information constructed from hotpluggable host bridge's
         * _CBA method, just assume it's reserved.
@@ -525,7 +525,7 @@ static int __ref pci_mmcfg_check_reserved(struct device *dev,
        /* Don't try to do this check unless configuration
           type 1 is available. how about type 2 ?*/
        if (raw_pci_ops)
-               return is_mmconf_reserved(e820_all_mapped, cfg, dev, 1);
+               return is_mmconf_reserved(e820__mapped_all, cfg, dev, 1);
 
        return 0;
 }

diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c
index c6a14b11f496c1b89beb4808d7eeeff4130d9897..d4acd1668d366c6e47a1dd357ddbc226de4e0777 100644 (file)
--- a/arch/x86/platform/efi/quirks.c
+++ b/arch/x86/platform/efi/quirks.c
@@ -249,7 +249,7 @@ static bool can_free_region(u64 start, u64 size)
        if (start + size > __pa_symbol(_text) && start <= __pa_symbol(_end))
                return false;
 
-       if (!e820_all_mapped(start, start+size, E820_RAM))
+       if (!e820__mapped_all(start, start+size, E820_RAM))
                return false;
 
        return true;