SOURCES (LINUX_2_6): linux-2.6-suspend2.patch - http://www.tuxonic...
mguevara
mguevara at pld-linux.org
Thu Aug 2 11:45:07 CEST 2007
Author: mguevara Date: Thu Aug 2 09:45:07 2007 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- http://www.tuxonice.net/downloads/all/suspend2-2.2.10-for-2.6.22.patch.bz2
---- Files affected:
SOURCES:
linux-2.6-suspend2.patch (1.1.2.2.2.2 -> 1.1.2.2.2.3)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-suspend2.patch
diff -u SOURCES/linux-2.6-suspend2.patch:1.1.2.2.2.2 SOURCES/linux-2.6-suspend2.patch:1.1.2.2.2.3
--- SOURCES/linux-2.6-suspend2.patch:1.1.2.2.2.2 Tue May 29 15:36:05 2007
+++ SOURCES/linux-2.6-suspend2.patch Thu Aug 2 11:45:02 2007
@@ -1,8 +1,7 @@
-diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index 12533a9..68e902e 100644
---- a/Documentation/kernel-parameters.txt
-+++ b/Documentation/kernel-parameters.txt
-@@ -82,6 +82,7 @@ parameter is applicable:
+diff -ruN linux-2.6.22/Documentation/kernel-parameters.txt suspend2-2.2.10-for-2.6.22/Documentation/kernel-parameters.txt
+--- linux-2.6.22/Documentation/kernel-parameters.txt 2007-07-11 22:18:38.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/Documentation/kernel-parameters.txt 2007-07-11 22:25:42.000000000 +1000
+@@ -83,6 +83,7 @@
SH SuperH architecture is enabled.
SMP The kernel is an SMP kernel.
SPARC Sparc architecture is enabled.
@@ -10,7 +9,7 @@
SWSUSP Software suspend is enabled.
TS Appropriate touchscreen support is enabled.
USB USB support is enabled.
-@@ -1140,6 +1141,8 @@ and is between 256 and 4096 characters. It is defined in the file
+@@ -1214,6 +1215,8 @@
noresume [SWSUSP] Disables resume and restores original swap
space.
@@ -19,7 +18,7 @@
no-scroll [VGA] Disables scrollback.
This is required for the Braillex ib80-piezo Braille
reader made by F.H. Papenmeier (Germany).
-@@ -1445,6 +1448,11 @@ and is between 256 and 4096 characters. It is defined in the file
+@@ -1519,6 +1522,11 @@
retain_initrd [RAM] Keep initrd memory after extraction
@@ -31,11 +30,9 @@
rhash_entries= [KNL,NET]
Set number of hash buckets for route cache
-diff --git a/Documentation/power/suspend2-internals.txt b/Documentation/power/suspend2-internals.txt
-new file mode 100644
-index 0000000..ba4e1e5
---- /dev/null
-+++ b/Documentation/power/suspend2-internals.txt
+diff -ruN linux-2.6.22/Documentation/power/suspend2-internals.txt suspend2-2.2.10-for-2.6.22/Documentation/power/suspend2-internals.txt
+--- linux-2.6.22/Documentation/power/suspend2-internals.txt 1970-01-01 10:00:00.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/Documentation/power/suspend2-internals.txt 2007-07-11 22:25:42.000000000 +1000
@@ -0,0 +1,473 @@
+ Software Suspend 2.2 Internal Documentation.
+ Version 1
@@ -510,11 +507,9 @@
+ Sysfs entries are registered under /sys/power/suspend2, and entries for
+ modules are located in a subdirectory named after the module.
+
-diff --git a/Documentation/power/suspend2.txt b/Documentation/power/suspend2.txt
-new file mode 100644
-index 0000000..b5a8edb
---- /dev/null
-+++ b/Documentation/power/suspend2.txt
+diff -ruN linux-2.6.22/Documentation/power/suspend2.txt suspend2-2.2.10-for-2.6.22/Documentation/power/suspend2.txt
+--- linux-2.6.22/Documentation/power/suspend2.txt 1970-01-01 10:00:00.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/Documentation/power/suspend2.txt 2007-07-11 22:25:42.000000000 +1000
@@ -0,0 +1,713 @@
+ --- Suspend2, version 2.2 ---
+
@@ -1229,11 +1224,10 @@
+ scripts to stress the system and test Suspend2 far beyond the point
+ most of us (Nigel included!) would consider testing. His efforts have
+ contributed as much to Suspend2 as any of the names above.
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 277877a..f1adba1 100644
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -3218,6 +3218,13 @@ M: sammy at sammy.net
+diff -ruN linux-2.6.22/MAINTAINERS suspend2-2.2.10-for-2.6.22/MAINTAINERS
+--- linux-2.6.22/MAINTAINERS 2007-07-11 22:18:39.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/MAINTAINERS 2007-07-11 22:25:42.000000000 +1000
+@@ -3440,6 +3440,13 @@
W: http://sammy.net/sun3/
S: Maintained
@@ -1247,19 +1241,18 @@
SVGA HANDLING
P: Martin Mares
M: mj at ucw.cz
-diff --git a/arch/i386/mm/fault.c b/arch/i386/mm/fault.c
-index b8c4e25..21982d9 100644
---- a/arch/i386/mm/fault.c
-+++ b/arch/i386/mm/fault.c
-@@ -23,6 +23,7 @@
- #include <linux/module.h>
+diff -ruN linux-2.6.22/arch/i386/mm/fault.c suspend2-2.2.10-for-2.6.22/arch/i386/mm/fault.c
+--- linux-2.6.22/arch/i386/mm/fault.c 2007-07-11 22:18:41.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/arch/i386/mm/fault.c 2007-07-11 22:25:42.000000000 +1000
+@@ -25,6 +25,7 @@
#include <linux/kprobes.h>
#include <linux/uaccess.h>
+ #include <linux/kdebug.h>
+#include <linux/suspend.h>
#include <asm/system.h>
#include <asm/desc.h>
-@@ -33,6 +34,9 @@ extern void die(const char *,struct pt_regs *,long);
+@@ -34,6 +35,9 @@
static ATOMIC_NOTIFIER_HEAD(notify_page_fault_chain);
@@ -1269,7 +1262,7 @@
int register_page_fault_notifier(struct notifier_block *nb)
{
vmalloc_sync_all();
-@@ -311,6 +315,20 @@ fastcall void __kprobes do_page_fault(struct pt_regs *regs,
+@@ -311,6 +315,20 @@
si_code = SEGV_MAPERR;
@@ -1290,12 +1283,11 @@
/*
* We fault-in kernel-space virtual memory on-demand. The
* 'reference' page table is init_mm.pgd.
-diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
-index ae43688..a180d21 100644
---- a/arch/i386/mm/init.c
-+++ b/arch/i386/mm/init.c
-@@ -387,7 +387,7 @@ static void __init pagetable_init (void)
- #endif
+diff -ruN linux-2.6.22/arch/i386/mm/init.c suspend2-2.2.10-for-2.6.22/arch/i386/mm/init.c
+--- linux-2.6.22/arch/i386/mm/init.c 2007-07-11 22:18:41.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/arch/i386/mm/init.c 2007-07-11 22:25:42.000000000 +1000
+@@ -432,7 +432,7 @@
+ paravirt_pagetable_setup_done(pgd_base);
}
-#if defined(CONFIG_SOFTWARE_SUSPEND) || defined(CONFIG_ACPI_SLEEP)
@@ -1303,7 +1295,7 @@
/*
* Swap suspend & friends need this for resume because things like the intel-agp
* driver might have split up a kernel 4MB mapping.
-@@ -774,13 +774,13 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
+@@ -832,13 +832,13 @@
unsigned long addr;
for (addr = begin; addr < end; addr += PAGE_SIZE) {
@@ -1317,16 +1309,15 @@
+ //free_page(addr);
+ //totalram_pages++;
}
-- printk(KERN_INFO "Freeing %s: %ldk freed\n", what, (end - begin) >> 10);
-+ //printk(KERN_INFO "Freeing %s: %ldk freed\n", what, (end - begin) >> 10);
+- printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);
++ //printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);
}
void free_initmem(void)
-diff --git a/arch/i386/mm/pageattr.c b/arch/i386/mm/pageattr.c
-index 412ebbd..dded2e1 100644
---- a/arch/i386/mm/pageattr.c
-+++ b/arch/i386/mm/pageattr.c
-@@ -252,7 +252,27 @@ void kernel_map_pages(struct page *page, int numpages, int enable)
+diff -ruN linux-2.6.22/arch/i386/mm/pageattr.c suspend2-2.2.10-for-2.6.22/arch/i386/mm/pageattr.c
+--- linux-2.6.22/arch/i386/mm/pageattr.c 2007-07-11 22:18:41.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/arch/i386/mm/pageattr.c 2007-07-11 22:25:42.000000000 +1000
+@@ -258,7 +258,27 @@
*/
__flush_tlb_all();
}
@@ -1354,65 +1345,33 @@
EXPORT_SYMBOL(change_page_attr);
EXPORT_SYMBOL(global_flush_tlb);
+EXPORT_SYMBOL(page_is_mapped);
-diff --git a/arch/i386/power/Makefile b/arch/i386/power/Makefile
-index 2de7bbf..72a6169 100644
---- a/arch/i386/power/Makefile
-+++ b/arch/i386/power/Makefile
+diff -ruN linux-2.6.22/arch/i386/power/Makefile suspend2-2.2.10-for-2.6.22/arch/i386/power/Makefile
+--- linux-2.6.22/arch/i386/power/Makefile 2007-07-11 22:18:41.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/arch/i386/power/Makefile 2007-07-11 22:25:42.000000000 +1000
@@ -1,2 +1,2 @@
obj-$(CONFIG_PM) += cpu.o
-obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o suspend.o
+obj-$(CONFIG_SUSPEND_SHARED) += swsusp.o suspend.o
-diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
-index 8120d42..5d57f0c 100644
---- a/arch/powerpc/kernel/Makefile
-+++ b/arch/powerpc/kernel/Makefile
-@@ -36,7 +36,7 @@ obj-$(CONFIG_GENERIC_TBSYNC) += smp-tbsync.o
+diff -ruN linux-2.6.22/arch/powerpc/kernel/Makefile suspend2-2.2.10-for-2.6.22/arch/powerpc/kernel/Makefile
+--- linux-2.6.22/arch/powerpc/kernel/Makefile 2007-07-11 22:18:44.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/arch/powerpc/kernel/Makefile 2007-07-11 22:25:42.000000000 +1000
+@@ -36,9 +36,9 @@
obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
obj-$(CONFIG_6xx) += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o
obj-$(CONFIG_TAU) += tau_6xx.o
+-obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o suspend.o
-obj32-$(CONFIG_SOFTWARE_SUSPEND) += swsusp_32.o
-+obj32-$(CONFIG_SUSPEND_SHARED) += swsusp_32.o
+-obj64-$(CONFIG_SOFTWARE_SUSPEND) += swsusp_64.o swsusp_asm64.o
++obj-$(CONFIG_SUSPEND_SHARED) += swsusp.o suspend.o
++obj32-$(CONFIG_SUSPEND_SHARED) += swsusp_32.o
++obj64-$(CONFIG_SUSPEND_SHARED) += swsusp_64.o swsusp_asm64.o
obj32-$(CONFIG_MODULES) += module_32.o
ifeq ($(CONFIG_PPC_MERGE),y)
-diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
-index 651fa42..243e5f4 100644
---- a/arch/powerpc/platforms/powermac/setup.c
-+++ b/arch/powerpc/platforms/powermac/setup.c
-@@ -425,7 +425,7 @@ static void __init find_boot_device(void)
- * only
- */
-
--#ifdef CONFIG_SOFTWARE_SUSPEND
-+#ifdef CONFIG_SUSPEND_SHARED
-
- static int pmac_pm_prepare(suspend_state_t state)
- {
-@@ -480,16 +480,16 @@ static struct pm_ops pmac_pm_ops = {
- .valid = pmac_pm_valid,
- };
-
--#endif /* CONFIG_SOFTWARE_SUSPEND */
-+#endif /* CONFIG_SUSPEND_SHARED */
-
- static int initializing = 1;
-
- static int pmac_late_init(void)
- {
- initializing = 0;
--#ifdef CONFIG_SOFTWARE_SUSPEND
-+#ifdef CONFIG_SUSPEND_SHARED
- pm_set_ops(&pmac_pm_ops);
--#endif /* CONFIG_SOFTWARE_SUSPEND */
-+#endif /* CONFIG_SUSPEND_SHARED */
- return 0;
- }
-
-diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
-index bb47e86..9943190 100644
---- a/arch/x86_64/kernel/Makefile
-+++ b/arch/x86_64/kernel/Makefile
-@@ -26,7 +26,7 @@ obj-y += io_apic.o mpparse.o \
+diff -ruN linux-2.6.22/arch/x86_64/kernel/Makefile suspend2-2.2.10-for-2.6.22/arch/x86_64/kernel/Makefile
+--- linux-2.6.22/arch/x86_64/kernel/Makefile 2007-07-11 22:18:48.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/arch/x86_64/kernel/Makefile 2007-07-11 22:25:42.000000000 +1000
+@@ -26,7 +26,7 @@
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o crash.o
obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
obj-$(CONFIG_PM) += suspend.o
@@ -1421,11 +1380,10 @@
obj-$(CONFIG_CPU_FREQ) += cpufreq/
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
obj-$(CONFIG_IOMMU) += pci-gart.o aperture.o
-diff --git a/arch/x86_64/kernel/suspend.c b/arch/x86_64/kernel/suspend.c
-index 91f7e67..983f16f 100644
---- a/arch/x86_64/kernel/suspend.c
-+++ b/arch/x86_64/kernel/suspend.c
-@@ -140,7 +140,7 @@ void fix_processor_context(void)
+diff -ruN linux-2.6.22/arch/x86_64/kernel/suspend.c suspend2-2.2.10-for-2.6.22/arch/x86_64/kernel/suspend.c
+--- linux-2.6.22/arch/x86_64/kernel/suspend.c 2007-07-11 22:18:48.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/arch/x86_64/kernel/suspend.c 2007-07-11 22:25:42.000000000 +1000
+@@ -146,7 +146,7 @@
}
@@ -1434,17 +1392,16 @@
/* Defined in arch/x86_64/kernel/suspend_asm.S */
extern int restore_image(void);
-@@ -219,4 +219,4 @@ int swsusp_arch_resume(void)
- restore_image();
- return 0;
+@@ -236,4 +236,4 @@
+ unsigned long nosave_end_pfn = PAGE_ALIGN(__pa_symbol(&__nosave_end)) >> PAGE_SHIFT;
+ return (pfn >= nosave_begin_pfn) && (pfn < nosave_end_pfn);
}
-#endif /* CONFIG_SOFTWARE_SUSPEND */
+#endif /* CONFIG_SUSPEND_SHARED */
-diff --git a/crypto/Kconfig b/crypto/Kconfig
-index 086fcec..efde46c 100644
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -406,6 +406,14 @@ config CRYPTO_DEFLATE
+diff -ruN linux-2.6.22/crypto/Kconfig suspend2-2.2.10-for-2.6.22/crypto/Kconfig
+--- linux-2.6.22/crypto/Kconfig 2007-07-11 22:18:48.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/crypto/Kconfig 2007-07-11 22:25:42.000000000 +1000
+@@ -419,6 +419,14 @@
You will most probably want this if using IPSec.
@@ -1459,22 +1416,19 @@
config CRYPTO_MICHAEL_MIC
tristate "Michael MIC keyed digest algorithm"
select CRYPTO_ALGAPI
-diff --git a/crypto/Makefile b/crypto/Makefile
-index 12f93f5..69a8af3 100644
---- a/crypto/Makefile
-+++ b/crypto/Makefile
-@@ -46,5 +46,6 @@ obj-$(CONFIG_CRYPTO_ANUBIS) += anubis.o
+diff -ruN linux-2.6.22/crypto/Makefile suspend2-2.2.10-for-2.6.22/crypto/Makefile
+--- linux-2.6.22/crypto/Makefile 2007-07-11 22:18:48.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/crypto/Makefile 2007-07-11 22:25:42.000000000 +1000
+@@ -48,5 +48,6 @@
obj-$(CONFIG_CRYPTO_DEFLATE) += deflate.o
obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o
obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o
+obj-$(CONFIG_CRYPTO_LZF) += lzf.o
obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
-diff --git a/crypto/lzf.c b/crypto/lzf.c
-new file mode 100644
-index 0000000..7c74784
---- /dev/null
-+++ b/crypto/lzf.c
+diff -ruN linux-2.6.22/crypto/lzf.c suspend2-2.2.10-for-2.6.22/crypto/lzf.c
+--- linux-2.6.22/crypto/lzf.c 1970-01-01 10:00:00.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/crypto/lzf.c 2007-07-11 22:25:42.000000000 +1000
@@ -0,0 +1,325 @@
+/*
+ * Cryptoapi LZF compression module.
@@ -1801,10 +1755,51 @@
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("LZF Compression Algorithm");
+MODULE_AUTHOR("Marc Alexander Lehmann & Nigel Cunningham");
-diff --git a/drivers/base/core.c b/drivers/base/core.c
-index d7fcf82..edbbf76 100644
---- a/drivers/base/core.c
-+++ b/drivers/base/core.c
+diff -ruN linux-2.6.22/drivers/acpi/sleep/main.c suspend2-2.2.10-for-2.6.22/drivers/acpi/sleep/main.c
+--- linux-2.6.22/drivers/acpi/sleep/main.c 2007-07-11 22:18:49.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/drivers/acpi/sleep/main.c 2007-07-11 22:25:42.000000000 +1000
+@@ -181,7 +181,7 @@
+ .finish = acpi_pm_finish,
+ };
+
+-#ifdef CONFIG_SOFTWARE_SUSPEND
++#ifdef CONFIG_SUSPEND_SHARED
+ static int acpi_hibernation_prepare(void)
+ {
+ return acpi_sleep_prepare(ACPI_STATE_S4);
+@@ -222,7 +222,7 @@
+ .enter = acpi_hibernation_enter,
+ .finish = acpi_hibernation_finish,
+ };
+-#endif /* CONFIG_SOFTWARE_SUSPEND */
++#endif /* CONFIG_SUSPEND_SHARED */
+
+ /*
+ * Toshiba fails to preserve interrupts over S1, reinitialization
+@@ -267,7 +267,7 @@
+
+ pm_set_ops(&acpi_pm_ops);
+
+-#ifdef CONFIG_SOFTWARE_SUSPEND
++#ifdef CONFIG_SUSPEND_SHARED
+ if (sleep_states[ACPI_STATE_S4])
+ hibernation_set_ops(&acpi_hibernation_ops);
+ #else
+diff -ruN linux-2.6.22/drivers/acpi/sleep/proc.c suspend2-2.2.10-for-2.6.22/drivers/acpi/sleep/proc.c
+--- linux-2.6.22/drivers/acpi/sleep/proc.c 2007-07-11 22:18:49.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/drivers/acpi/sleep/proc.c 2007-07-11 22:25:42.000000000 +1000
+@@ -58,7 +58,7 @@
+ goto Done;
+ }
+ state = simple_strtoul(str, NULL, 0);
+-#ifdef CONFIG_SOFTWARE_SUSPEND
++#ifdef CONFIG_SUSPEND_SHARED
+ if (state == 4) {
+ error = hibernate();
+ goto Done;
+diff -ruN linux-2.6.22/drivers/base/core.c suspend2-2.2.10-for-2.6.22/drivers/base/core.c
+--- linux-2.6.22/drivers/base/core.c 2007-07-11 22:18:49.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/drivers/base/core.c 2007-07-11 22:25:42.000000000 +1000
@@ -27,6 +27,8 @@
int (*platform_notify)(struct device * dev) = NULL;
int (*platform_notify_remove)(struct device * dev) = NULL;
@@ -1814,7 +1809,7 @@
/*
* sysfs bindings for devices.
*/
-@@ -638,6 +640,18 @@ int device_add(struct device *dev)
+@@ -755,6 +757,18 @@
class_intf->add_dev(dev, class_intf);
up(&dev->class->sem);
}
@@ -1831,9 +1826,9 @@
+#endif
+
Done:
- kfree(class_name);
+ kfree(class_name);
put_device(dev);
-@@ -975,6 +989,7 @@ struct device *device_create(struct class *class, struct device *parent,
+@@ -1103,6 +1117,7 @@
dev->class = class;
dev->parent = parent;
dev->release = device_create_release;
@@ -1841,7 +1836,7 @@
va_start(args, fmt);
vsnprintf(dev->bus_id, BUS_ID_SIZE, fmt, args);
-@@ -1183,3 +1198,11 @@ out:
+@@ -1311,3 +1326,11 @@
}
EXPORT_SYMBOL_GPL(device_move);
@@ -1853,10 +1848,9 @@
+}
+
+__setup("pm_debug_dump_stack", pm_debug_dump_stack);
-diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
-index b6073bd..32bd423 100644
---- a/drivers/macintosh/via-pmu.c
-+++ b/drivers/macintosh/via-pmu.c
+diff -ruN linux-2.6.22/drivers/macintosh/via-pmu.c suspend2-2.2.10-for-2.6.22/drivers/macintosh/via-pmu.c
+--- linux-2.6.22/drivers/macintosh/via-pmu.c 2007-07-11 22:19:03.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/drivers/macintosh/via-pmu.c 2007-07-11 22:25:42.000000000 +1000
@@ -42,7 +42,6 @@
#include <linux/interrupt.h>
#include <linux/device.h>
@@ -1865,11 +1859,10 @@
#include <linux/syscalls.h>
#include <linux/suspend.h>
#include <linux/cpu.h>
-diff --git a/drivers/md/md.c b/drivers/md/md.c
-index 509171c..76e5ac8 100644
---- a/drivers/md/md.c
-+++ b/drivers/md/md.c
-@@ -5309,6 +5309,8 @@ void md_do_sync(mddev_t *mddev)
+diff -ruN linux-2.6.22/drivers/md/md.c suspend2-2.2.10-for-2.6.22/drivers/md/md.c
+--- linux-2.6.22/drivers/md/md.c 2007-07-11 22:19:04.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/drivers/md/md.c 2007-07-11 22:25:42.000000000 +1000
+@@ -5401,6 +5401,8 @@
last_mark = next;
}
@@ -1878,11 +1871,10 @@
if (kthread_should_stop()) {
/*
-diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
-index a3c1755..171be82 100644
---- a/drivers/pci/pci-driver.c
-+++ b/drivers/pci/pci-driver.c
-@@ -451,6 +451,10 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner,
+diff -ruN linux-2.6.22/drivers/pci/pci-driver.c suspend2-2.2.10-for-2.6.22/drivers/pci/pci-driver.c
+--- linux-2.6.22/drivers/pci/pci-driver.c 2007-07-11 22:19:27.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/drivers/pci/pci-driver.c 2007-07-11 22:25:42.000000000 +1000
+@@ -432,6 +432,10 @@
if (error)
driver_unregister(&drv->driver);
@@ -1893,11 +1885,10 @@
return error;
}
-diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
-index 9e3e943..e91fdef 100644
---- a/drivers/usb/core/driver.c
-+++ b/drivers/usb/core/driver.c
-@@ -788,6 +788,9 @@ int usb_register_driver(struct usb_driver *new_driver, struct module *owner,
+diff -ruN linux-2.6.22/drivers/usb/core/driver.c suspend2-2.2.10-for-2.6.22/drivers/usb/core/driver.c
+--- linux-2.6.22/drivers/usb/core/driver.c 2007-07-11 22:19:28.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/drivers/usb/core/driver.c 2007-07-11 22:25:42.000000000 +1000
+@@ -756,6 +756,9 @@
usbcore_name, new_driver->name);
usbfs_update_special();
usb_create_newid_file(new_driver);
@@ -1907,21 +1898,19 @@
} else {
printk(KERN_ERR "%s: error %d registering interface "
" driver %s\n",
-diff --git a/include/asm-i386/cacheflush.h b/include/asm-i386/cacheflush.h
-index 74e03c8..3bb8575 100644
---- a/include/asm-i386/cacheflush.h
-+++ b/include/asm-i386/cacheflush.h
-@@ -36,4 +36,6 @@ void kernel_map_pages(struct page *page, int numpages, int enable);
+diff -ruN linux-2.6.22/include/asm-i386/cacheflush.h suspend2-2.2.10-for-2.6.22/include/asm-i386/cacheflush.h
+--- linux-2.6.22/include/asm-i386/cacheflush.h 2007-07-11 22:19:34.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/include/asm-i386/cacheflush.h 2007-07-11 22:25:42.000000000 +1000
+@@ -36,4 +36,6 @@
void mark_rodata_ro(void);
#endif
+extern int page_is_mapped(struct page *page);
+
#endif /* _I386_CACHEFLUSH_H */
-diff --git a/include/asm-i386/suspend.h b/include/asm-i386/suspend.h
-index 8dbaafe..e23fd20 100644
---- a/include/asm-i386/suspend.h
-+++ b/include/asm-i386/suspend.h
+diff -ruN linux-2.6.22/include/asm-i386/suspend.h suspend2-2.2.10-for-2.6.22/include/asm-i386/suspend.h
+--- linux-2.6.22/include/asm-i386/suspend.h 2007-07-11 22:19:34.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/include/asm-i386/suspend.h 2007-07-11 22:25:42.000000000 +1000
@@ -8,6 +8,9 @@
static inline int arch_prepare_suspend(void) { return 0; }
@@ -1932,22 +1921,20 @@
/* image of the saved processor state */
struct saved_context {
u16 es, fs, gs, ss;
-diff --git a/include/asm-ppc/suspend.h b/include/asm-ppc/suspend.h
-index 3df9f32..9d5db0e 100644
---- a/include/asm-ppc/suspend.h
-+++ b/include/asm-ppc/suspend.h
-@@ -10,3 +10,6 @@ static inline void save_processor_state(void)
+diff -ruN linux-2.6.22/include/asm-ppc/suspend.h suspend2-2.2.10-for-2.6.22/include/asm-ppc/suspend.h
+--- linux-2.6.22/include/asm-ppc/suspend.h 2007-07-11 22:19:36.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/include/asm-ppc/suspend.h 2007-07-11 22:25:42.000000000 +1000
+@@ -10,3 +10,6 @@
static inline void restore_processor_state(void)
{
}
+
+#define suspend2_faulted (0)
+#define clear_suspend2_fault() do { } while(0)
-diff --git a/include/asm-x86_64/cacheflush.h b/include/asm-x86_64/cacheflush.h
-index ab1cb5c..b8e7def 100644
---- a/include/asm-x86_64/cacheflush.h
-+++ b/include/asm-x86_64/cacheflush.h
-@@ -32,4 +32,9 @@ int change_page_attr_addr(unsigned long addr, int numpages, pgprot_t prot);
+diff -ruN linux-2.6.22/include/asm-x86_64/cacheflush.h suspend2-2.2.10-for-2.6.22/include/asm-x86_64/cacheflush.h
+--- linux-2.6.22/include/asm-x86_64/cacheflush.h 2007-07-11 22:19:38.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/include/asm-x86_64/cacheflush.h 2007-07-11 22:25:42.000000000 +1000
+@@ -32,4 +32,9 @@
void mark_rodata_ro(void);
#endif
@@ -1957,11 +1944,10 @@
+}
+
#endif /* _X8664_CACHEFLUSH_H */
-diff --git a/include/asm-x86_64/suspend.h b/include/asm-x86_64/suspend.h
-index bc7f817..2f18e1b 100644
---- a/include/asm-x86_64/suspend.h
-+++ b/include/asm-x86_64/suspend.h
-@@ -12,6 +12,9 @@ arch_prepare_suspend(void)
+diff -ruN linux-2.6.22/include/asm-x86_64/suspend.h suspend2-2.2.10-for-2.6.22/include/asm-x86_64/suspend.h
+--- linux-2.6.22/include/asm-x86_64/suspend.h 2007-07-11 22:19:38.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/include/asm-x86_64/suspend.h 2007-07-11 22:25:42.000000000 +1000
+@@ -12,6 +12,9 @@
return 0;
}
@@ -1971,23 +1957,20 @@
/* Image of the saved processor state. If you touch this, fix acpi_wakeup.S. */
struct saved_context {
u16 ds, es, fs, gs, ss;
-diff --git a/include/linux/device.h b/include/linux/device.h
-index 5cf30e9..69122c1 100644
---- a/include/linux/device.h
-+++ b/include/linux/device.h
-@@ -402,6 +402,7 @@ struct device {
+diff -ruN linux-2.6.22/include/linux/device.h suspend2-2.2.10-for-2.6.22/include/linux/device.h
+--- linux-2.6.22/include/linux/device.h 2007-07-11 22:19:38.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/include/linux/device.h 2007-07-11 22:25:42.000000000 +1000
+@@ -418,6 +418,7 @@
char bus_id[BUS_ID_SIZE]; /* position on parent bus */
struct device_type *type;
unsigned is_registered:1;
+ unsigned pm_safe:1; /* No resume fn is ok? */
+ unsigned uevent_suppress:1;
struct device_attribute uevent_attr;
struct device_attribute *devt_attr;
-
-diff --git a/include/linux/dyn_pageflags.h b/include/linux/dyn_pageflags.h
-new file mode 100644
-index 0000000..23d9127
---- /dev/null
-+++ b/include/linux/dyn_pageflags.h
+diff -ruN linux-2.6.22/include/linux/dyn_pageflags.h suspend2-2.2.10-for-2.6.22/include/linux/dyn_pageflags.h
+--- linux-2.6.22/include/linux/dyn_pageflags.h 1970-01-01 10:00:00.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/include/linux/dyn_pageflags.h 2007-07-11 22:25:42.000000000 +1000
@@ -0,0 +1,68 @@
+/*
+ * include/linux/dyn_pageflags.h
@@ -2057,25 +2040,19 @@
+ * #define ClearPagePageset1(page) (clear_dynpageflag(&pageset1_map, page))
+ */
+
-diff --git a/include/linux/freezer.h b/include/linux/freezer.h
-index 5e75e26..f49c9be 100644
---- a/include/linux/freezer.h
-+++ b/include/linux/freezer.h
-@@ -1,7 +1,10 @@
--/* Freezer declarations */
+diff -ruN linux-2.6.22/include/linux/freezer.h suspend2-2.2.10-for-2.6.22/include/linux/freezer.h
+--- linux-2.6.22/include/linux/freezer.h 2007-07-11 22:19:38.000000000 +1000
++++ suspend2-2.2.10-for-2.6.22/include/linux/freezer.h 2007-07-11 22:25:42.000000000 +1000
+@@ -1,4 +1,6 @@
+ /* Freezer declarations */
+#ifndef LINUX_FREEZER_H
+#define LINUX_FREEZER_H
#include <linux/sched.h>
-+/* Freezer declarations */
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.6-suspend2.patch?r1=1.1.2.2.2.2&r2=1.1.2.2.2.3&f=u
More information about the pld-cvs-commit
mailing list