3 files changed, 18 insertions, 14 deletions

diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 9f42d7e9c158..f4c95aec5acb 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -42,6 +42,22 @@ int page_is_ram(unsigned long pagenr)
         unsigned long addr, end;
         int i;
 
+        /*
+         * A special case is the first 4Kb of memory;
+         * This is a BIOS owned area, not kernel ram, but generally
+         * not listed as such in the E820 table.
+         */
+        if (pagenr == 0)
+                return 0;
+
+        /*
+         * Second special case: Some BIOSen report the PC BIOS
+         * area (640->1Mb) as ram even though it is not.
+         */
+        if (pagenr >= (BIOS_BEGIN >> PAGE_SHIFT) &&
+                    pagenr < (BIOS_END >> PAGE_SHIFT))
+                return 0;
+
         for (i = 0; i < e820.nr_map; i++) {
                 /*
                  * Not usable memory:
@@ -51,14 +67,6 @@ int page_is_ram(unsigned long pagenr)
                 addr = (e820.map[i].addr + PAGE_SIZE-1) >> PAGE_SHIFT;
                 end = (e820.map[i].addr + e820.map[i].size) >> PAGE_SHIFT;
 
-                /*
-                 * Sanity check: Some BIOSen report areas as RAM that
-                 * are not. Notably the 640->1Mb area, which is the
-                 * PCI BIOS area.
-                 */
-                if (addr >= (BIOS_BEGIN >> PAGE_SHIFT) &&
-                    end < (BIOS_END >> PAGE_SHIFT))
-                        continue;
 
                 if ((pagenr >= addr) && (pagenr < end))
                         return 1;
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 3ee14996c829..e2a74ea11a53 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -513,7 +513,6 @@ static int __change_page_attr(struct cpa_data *cpa, int primary)
         unsigned long address = cpa->vaddr;
         int do_split, err;
         unsigned int level;
-        struct page *kpte_page;
         pte_t *kpte, old_pte;
 
 repeat:
@@ -532,10 +531,6 @@ repeat:
                 return -EINVAL;
         }
 
-        kpte_page = virt_to_page(kpte);
-        BUG_ON(PageLRU(kpte_page));
-        BUG_ON(PageCompound(kpte_page));
-
         if (level == PG_LEVEL_4K) {
                 pte_t new_pte;
                 pgprot_t new_prot = pte_pgprot(old_pte);
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c
index ecd91ea8a8ae..845001c617cc 100644
--- a/arch/x86/mm/srat_64.c
+++ b/arch/x86/mm/srat_64.c
@@ -166,7 +166,8 @@ static inline int save_add_info(void) {return 0;}
  * Both SPARSE and RESERVE need nodes_add information.
  * This code supports one contiguous hot add area per node.
  */
-static int reserve_hotadd(int node, unsigned long start, unsigned long end)
+static int __init
+reserve_hotadd(int node, unsigned long start, unsigned long end)
 {
         unsigned long s_pfn = start >> PAGE_SHIFT;
         unsigned long e_pfn = end >> PAGE_SHIFT;