2 files changed, 0 insertions, 201 deletions

diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index 6c1639836e06..6bef9273733e 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -48,7 +48,6 @@
 #include <linux/crash_dump.h>
 #include <linux/dmi.h>
 #include <linux/pfn.h>
-#include <linux/suspend.h>
 
 #include <video/edid.h>
 
@@ -1427,111 +1426,6 @@ static void set_mca_bus(int x)
 static void set_mca_bus(int x) { }
 #endif
 
-#ifdef CONFIG_SOFTWARE_SUSPEND
-static void __init mark_nosave_page_range(unsigned long start, unsigned long end)
-{
-        struct page *page;
-        while (start <= end) {
-                page = pfn_to_page(start);
-                SetPageNosave(page);
-                start++;
-        }
-}
-
-static void __init e820_nosave_reserved_pages(void)
-{
-        int i;
-        unsigned long r_start = 0, r_end = 0;
-
-        /* Assume e820 map is sorted */
-        for (i = 0; i < e820.nr_map; i++) {
-                struct e820entry *ei = &e820.map[i];
-                unsigned long start, end;
-
-                start = PFN_DOWN(ei->addr);
-                end = PFN_UP(ei->addr + ei->size);
-                if (start >= end)
-                        continue;
-                if (ei->type == E820_RESERVED)
-                        continue;
-                r_end = start;
-                /*
-                 * Highmem 'Reserved' pages are marked as reserved, swsusp
-                 * will not save/restore them, so we ignore these pages here.
-                 */
-                if (r_end > max_low_pfn)
-                        r_end = max_low_pfn;
-                if (r_end > r_start)
-                        mark_nosave_page_range(r_start, r_end-1);
-                if (r_end >= max_low_pfn)
-                        break;
-                r_start = end;
-        }
-}
-
-static void __init e820_save_acpi_pages(void)
-{
-        int i;
-
-        /* Assume e820 map is sorted */
-        for (i = 0; i < e820.nr_map; i++) {
-                struct e820entry *ei = &e820.map[i];
-                unsigned long start, end;
-
-                start = ei->addr;
-                end = ei->addr + ei->size;
-                if (start >= end)
-                        continue;
-                if (ei->type != E820_ACPI && ei->type != E820_NVS)
-                        continue;
-                /*
-                 * If the region is below max_low_pfn, it will be
-                 * saved/restored by swsusp follow 'RAM' type.
-                 */
-                if (start < (max_low_pfn << PAGE_SHIFT))
-                        start = max_low_pfn << PAGE_SHIFT;
-                /*
-                 * Highmem pages (ACPI NVS/Data) are reserved, but swsusp
-                 * highmem save/restore will not save/restore them. We marked
-                 * them as arch saveable pages here
-                 */
-                if (end > start)
-                        swsusp_add_arch_pages(start, end);
-        }
-}
-
-extern char __start_rodata, __end_rodata;
-/*
- * BIOS reserved region/hole - no save/restore
- * ACPI NVS - save/restore
- * ACPI Data - this is a little tricky, the mem could be used by OS after OS
- * reads tables from the region, but anyway save/restore the memory hasn't any
- * side effect and Linux runtime module load/unload might use it.
- * kernel rodata - no save/restore (kernel rodata isn't changed)
- */
-static int __init mark_nosave_pages(void)
-{
-        unsigned long pfn_start, pfn_end;
-
-        /* FIXME: provide a version for efi BIOS */
-        if (efi_enabled)
-                return 0;
-        /* BIOS reserved regions & holes */
-        e820_nosave_reserved_pages();
-
-        /* kernel rodata */
-        pfn_start = PFN_UP(virt_to_phys(&__start_rodata));
-        pfn_end = PFN_DOWN(virt_to_phys(&__end_rodata));
-        mark_nosave_page_range(pfn_start, pfn_end-1);
-
-        /* record ACPI Data/NVS as saveable */
-        e820_save_acpi_pages();
-
-        return 0;
-}
-core_initcall(mark_nosave_pages);
-#endif
-
 /*
  * Determine if we were loaded by an EFI loader.  If so, then we have also been
  * passed the efi memmap, systab, etc., so we should use these data structures
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index fdb82658b1a1..fb850b52b4da 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -47,7 +47,6 @@
 #include <linux/dmi.h>
 #include <linux/dma-mapping.h>
 #include <linux/ctype.h>
-#include <linux/suspend.h>
 
 #include <asm/mtrr.h>
 #include <asm/uaccess.h>
@@ -596,100 +595,6 @@ static void discover_ebda(void)
                 ebda_size = 64*1024;
 }
 
-#ifdef CONFIG_SOFTWARE_SUSPEND
-static void __init mark_nosave_page_range(unsigned long start, unsigned long end)
-{
-        struct page *page;
-        while (start <= end) {
-                page = pfn_to_page(start);
-                SetPageNosave(page);
-                start++;
-        }
-}
-
-static void __init e820_nosave_reserved_pages(void)
-{
-        int i;
-        unsigned long r_start = 0, r_end = 0;
-
-        /* Assume e820 map is sorted */
-        for (i = 0; i < e820.nr_map; i++) {
-                struct e820entry *ei = &e820.map[i];
-                unsigned long start, end;
-
-                start = round_down(ei->addr, PAGE_SIZE);
-                end = round_up(ei->addr + ei->size, PAGE_SIZE);
-                if (start >= end)
-                        continue;
-                if (ei->type == E820_RESERVED)
-                        continue;
-                r_end = start>>PAGE_SHIFT;
-                /* swsusp ignores invalid pfn, ignore these pages here */
-                if (r_end > end_pfn)
-                        r_end = end_pfn;
-                if (r_end > r_start)
-                        mark_nosave_page_range(r_start, r_end-1);
-                if (r_end >= end_pfn)
-                        break;
-                r_start = end>>PAGE_SHIFT;
-        }
-}
-
-static void __init e820_save_acpi_pages(void)
-{
-        int i;
-
-        /* Assume e820 map is sorted */
-        for (i = 0; i < e820.nr_map; i++) {
-                struct e820entry *ei = &e820.map[i];
-                unsigned long start, end;
-
-                start = ei->addr, PAGE_SIZE;
-                end = ei->addr + ei->size;
-                if (start >= end)
-                        continue;
-                if (ei->type != E820_ACPI && ei->type != E820_NVS)
-                        continue;
-                /*
-                 * If the region is below end_pfn, it will be
-                 * saved/restored by swsusp follow 'RAM' type.
-                 */
-                if (start < (end_pfn << PAGE_SHIFT))
-                        start = end_pfn << PAGE_SHIFT;
-                if (end > start)
-                        swsusp_add_arch_pages(start, end);
-        }
-}
-
-extern char __start_rodata, __end_rodata;
-/*
- * BIOS reserved region/hole - no save/restore
- * ACPI NVS - save/restore
- * ACPI Data - this is a little tricky, the mem could be used by OS after OS
- * reads tables from the region, but anyway save/restore the memory hasn't any
- * side effect and Linux runtime module load/unload might use it.
- * kernel rodata - no save/restore (kernel rodata isn't changed)
- */
-static int __init mark_nosave_pages(void)
-{
-        unsigned long pfn_start, pfn_end;
-
-        /* BIOS reserved regions & holes */
-        e820_nosave_reserved_pages();
-
-        /* kernel rodata */
-        pfn_start = round_up(__pa_symbol(&__start_rodata), PAGE_SIZE) >> PAGE_SHIFT;
-        pfn_end = round_down(__pa_symbol(&__end_rodata), PAGE_SIZE) >> PAGE_SHIFT;
-        mark_nosave_page_range(pfn_start, pfn_end-1);
-
-        /* record ACPI Data/NVS as saveable */
-        e820_save_acpi_pages();
-
-        return 0;
-}
-core_initcall(mark_nosave_pages);
-#endif
-
 void __init setup_arch(char **cmdline_p)
 {
         unsigned long kernel_end;