Author: sparky Date: Mon Jun 12 17:01:03 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated and fixed for preemptrt-patched kernel
---- Files affected:
SOURCES:
kernel-desktop-suspend2.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/kernel-desktop-suspend2.patch
diff -u SOURCES/kernel-desktop-suspend2.patch:1.1
SOURCES/kernel-desktop-suspend2.patch:1.2
--- SOURCES/kernel-desktop-suspend2.patch:1.1 Mon May 1 17:20:49 2006
+++ SOURCES/kernel-desktop-suspend2.patch Mon Jun 12 19:00:58 2006
@@ -1,7 +1,7 @@
-diff -Nur linux-2.6.16.11/Documentation/kernel-parameters.txt
linux-2.6.16.11.suspend2/Documentation/kernel-parameters.txt
---- linux-2.6.16.11/Documentation/kernel-parameters.txt 2006-05-01
00:10:59.000000000 +0000
-+++ linux-2.6.16.11.suspend2/Documentation/kernel-parameters.txt
2006-05-01 00:12:25.000000000 +0000
-@@ -72,6 +72,7 @@
+diff -Nur linux-2.6.17-rc6/Documentation/kernel-parameters.txt
linux-2.6.17-rc6.suspend2/Documentation/kernel-parameters.txt
+--- linux-2.6.17-rc6/Documentation/kernel-parameters.txt 2006-06-12
16:22:31.000000000 +0000
++++ linux-2.6.17-rc6.suspend2/Documentation/kernel-parameters.txt
2006-06-12 16:42:02.000000000 +0000
+@@ -81,6 +81,7 @@
SERIAL Serial support is enabled.
SMP The kernel is an SMP kernel.
SPARC Sparc architecture is enabled.
@@ -9,7 +9,7 @@
SWSUSP Software suspend is enabled.
TS Appropriate touchscreen support is enabled.
USB USB support is enabled.
-@@ -1049,6 +1050,8 @@
+@@ -1070,6 +1071,8 @@
noresume [SWSUSP] Disables resume and restores original swap
space.
@@ -18,7 +18,7 @@
no-scroll [VGA] Disables scrollback.
This is required for the Braillex ib80-piezo Braille
reader made by F.H. Papenmeier (Germany).
-@@ -1319,6 +1322,11 @@
+@@ -1350,6 +1353,11 @@
resume= [SWSUSP]
Specify the partition device for software suspend
@@ -30,9 +30,9 @@
rhash_entries= [KNL,NET]
Set number of hash buckets for route cache
-diff -Nur linux-2.6.16.11/Documentation/power/internals.txt
linux-2.6.16.11.suspend2/Documentation/power/internals.txt
---- linux-2.6.16.11/Documentation/power/internals.txt 1970-01-01
00:00:00.000000000 +0000
-+++ linux-2.6.16.11.suspend2/Documentation/power/internals.txt 2006-05-01
00:12:25.000000000 +0000
+diff -Nur linux-2.6.17-rc6/Documentation/power/internals.txt
linux-2.6.17-rc6.suspend2/Documentation/power/internals.txt
+--- linux-2.6.17-rc6/Documentation/power/internals.txt 1970-01-01
00:00:00.000000000 +0000
++++ linux-2.6.17-rc6.suspend2/Documentation/power/internals.txt
2006-06-12 16:42:02.000000000 +0000
@@ -0,0 +1,362 @@
+ Software Suspend 2.2 Internal Documentation.
+ Version 1
@@ -396,9 +396,9 @@
+ transformer_list links together page transformers, in the order in
+ which they register, which is in turn determined by order in the
+ Makefile.
-diff -Nur linux-2.6.16.11/Documentation/power/suspend2.txt
linux-2.6.16.11.suspend2/Documentation/power/suspend2.txt
---- linux-2.6.16.11/Documentation/power/suspend2.txt 1970-01-01
00:00:00.000000000 +0000
-+++ linux-2.6.16.11.suspend2/Documentation/power/suspend2.txt 2006-05-01
00:12:25.000000000 +0000
+diff -Nur linux-2.6.17-rc6/Documentation/power/suspend2.txt
linux-2.6.17-rc6.suspend2/Documentation/power/suspend2.txt
+--- linux-2.6.17-rc6/Documentation/power/suspend2.txt 1970-01-01
00:00:00.000000000 +0000
++++ linux-2.6.17-rc6.suspend2/Documentation/power/suspend2.txt 2006-06-12
16:42:02.000000000 +0000
@@ -0,0 +1,663 @@
+ --- Suspend2, version 2.2 ---
+
@@ -1063,9 +1063,9 @@
+ 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 -Nur linux-2.6.16.11/arch/arm/mm/init.c
linux-2.6.16.11.suspend2/arch/arm/mm/init.c
---- linux-2.6.16.11/arch/arm/mm/init.c 2006-05-01 00:10:59.000000000 +0000
-+++ linux-2.6.16.11.suspend2/arch/arm/mm/init.c 2006-05-01
00:12:25.000000000 +0000
+diff -Nur linux-2.6.17-rc6/arch/arm/mm/init.c
linux-2.6.17-rc6.suspend2/arch/arm/mm/init.c
+--- linux-2.6.17-rc6/arch/arm/mm/init.c 2006-06-12 16:22:31.000000000
+0000
++++ linux-2.6.17-rc6.suspend2/arch/arm/mm/init.c 2006-06-12
16:42:01.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/mman.h>
#include <linux/nodemask.h>
@@ -1073,7 +1073,7 @@
+#include <linux/suspend.h>
#include <asm/mach-types.h>
- #include <asm/hardware.h>
+ #include <asm/setup.h>
@@ -86,6 +87,11 @@
printk("%d pages swap cached\n", cached);
}
@@ -1102,9 +1102,9 @@
}
void free_initmem(void)
-diff -Nur linux-2.6.16.11/arch/i386/mm/init.c
linux-2.6.16.11.suspend2/arch/i386/mm/init.c
---- linux-2.6.16.11/arch/i386/mm/init.c 2006-05-01 00:11:00.000000000
+0000
-+++ linux-2.6.16.11.suspend2/arch/i386/mm/init.c 2006-05-01
00:12:25.000000000 +0000
+diff -Nur linux-2.6.17-rc6/arch/i386/mm/init.c
linux-2.6.17-rc6.suspend2/arch/i386/mm/init.c
+--- linux-2.6.17-rc6/arch/i386/mm/init.c 2006-06-12 16:22:31.000000000
+0000
++++ linux-2.6.17-rc6.suspend2/arch/i386/mm/init.c 2006-06-12
16:42:01.000000000 +0000
@@ -29,6 +29,7 @@
#include <linux/efi.h>
#include <linux/memory_hotplug.h>
@@ -1191,44 +1191,36 @@
set_highmem_pages_init(bad_ppro);
-@@ -727,6 +744,7 @@
- addr = (unsigned long)(&__init_begin);
- for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
+@@ -751,6 +768,7 @@
+
+ for (addr = begin; addr < end; addr += PAGE_SIZE) {
ClearPageReserved(virt_to_page(addr));
+ ClearPageNosave(virt_to_page(addr));
- set_page_count(virt_to_page(addr), 1);
+ init_page_count(virt_to_page(addr));
memset((void *)addr, 0xcc, PAGE_SIZE);
free_page(addr);
-@@ -766,6 +784,7 @@
- printk (KERN_INFO "Freeing initrd memory: %ldk freed\n", (end -
start) >> 10);
- for (; start < end; start += PAGE_SIZE) {
- ClearPageReserved(virt_to_page(start));
-+ ClearPageNosave(virt_to_page(start));
- set_page_count(virt_to_page(start), 1);
- free_page(start);
- totalram_pages++;
-diff -Nur linux-2.6.16.11/arch/i386/power/Makefile
linux-2.6.16.11.suspend2/arch/i386/power/Makefile
---- linux-2.6.16.11/arch/i386/power/Makefile 2006-04-24 20:20:24.000000000
+0000
-+++ linux-2.6.16.11.suspend2/arch/i386/power/Makefile 2006-05-01
00:12:25.000000000 +0000
+diff -Nur linux-2.6.17-rc6/arch/i386/power/Makefile
linux-2.6.17-rc6.suspend2/arch/i386/power/Makefile
+--- linux-2.6.17-rc6/arch/i386/power/Makefile 2006-06-06 00:57:02.000000000
+0000
++++ linux-2.6.17-rc6.suspend2/arch/i386/power/Makefile 2006-06-12
16:42:01.000000000 +0000
@@ -1,2 +1,2 @@
obj-$(CONFIG_PM) += cpu.o
-obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o
+obj-$(CONFIG_SUSPEND_SHARED) += swsusp.o
-diff -Nur linux-2.6.16.11/arch/ppc/kernel/Makefile
linux-2.6.16.11.suspend2/arch/ppc/kernel/Makefile
---- linux-2.6.16.11/arch/ppc/kernel/Makefile 2006-04-24 20:20:24.000000000
+0000
-+++ linux-2.6.16.11.suspend2/arch/ppc/kernel/Makefile 2006-05-01
00:12:25.000000000 +0000
-@@ -15,7 +15,7 @@
- setup.o \
- ppc_htab.o
- obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o
--obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o
-+obj-$(CONFIG_SUSPEND_SHARED) += swsusp.o
- obj-$(CONFIG_MODULES) += module.o ppc_ksyms.o
- obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o
- obj-$(CONFIG_PCI) += pci.o
-diff -Nur linux-2.6.16.11/arch/ppc/mm/init.c
linux-2.6.16.11.suspend2/arch/ppc/mm/init.c
---- linux-2.6.16.11/arch/ppc/mm/init.c 2006-05-01 00:11:00.000000000 +0000
-+++ linux-2.6.16.11.suspend2/arch/ppc/mm/init.c 2006-05-01
00:12:25.000000000 +0000
+diff -Nur linux-2.6.17-rc6/arch/powerpc/kernel/Makefile
linux-2.6.17-rc6.suspend2/arch/powerpc/kernel/Makefile
+--- linux-2.6.17-rc6/arch/powerpc/kernel/Makefile 2006-06-12
16:22:31.000000000 +0000
++++ linux-2.6.17-rc6.suspend2/arch/powerpc/kernel/Makefile 2006-06-12
16:42:01.000000000 +0000
+@@ -37,7 +37,7 @@
+ 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
+-obj32-$(CONFIG_SOFTWARE_SUSPEND) += swsusp_32.o
++obj32-$(CONFIG_SUSPEND_SHARED) += swsusp_32.o
+ obj32-$(CONFIG_MODULES) += module_32.o
+ obj-$(CONFIG_E500) += perfmon_fsl_booke.o
+
+diff -Nur linux-2.6.17-rc6/arch/ppc/mm/init.c
linux-2.6.17-rc6.suspend2/arch/ppc/mm/init.c
+--- linux-2.6.17-rc6/arch/ppc/mm/init.c 2006-06-12 16:22:31.000000000
+0000
++++ linux-2.6.17-rc6.suspend2/arch/ppc/mm/init.c 2006-06-12
16:42:02.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/highmem.h>
#include <linux/initrd.h>
@@ -1242,7 +1234,7 @@
while (start < end) {
ClearPageReserved(virt_to_page(start));
+ ClearPageNosave(virt_to_page(start));
- set_page_count(virt_to_page(start), 1);
+ init_page_count(virt_to_page(start));
free_page(start);
cnt++;
@@ -172,6 +174,7 @@
@@ -1250,7 +1242,7 @@
for (; start < end; start += PAGE_SIZE) {
ClearPageReserved(virt_to_page(start));
+ ClearPageNosave(virt_to_page(start));
- set_page_count(virt_to_page(start), 1);
+ init_page_count(virt_to_page(start));
free_page(start);
totalram_pages++;
@@ -407,8 +410,10 @@
@@ -1265,17 +1257,7 @@
}
#endif /* CONFIG_BLK_DEV_INITRD */
-@@ -417,13 +422,22 @@
- if ( rtas_data )
- for (addr = (ulong)__va(rtas_data);
- addr < PAGE_ALIGN((ulong)__va(rtas_data)+rtas_size) ;
-- addr += PAGE_SIZE)
-+ addr += PAGE_SIZE) {
- SetPageReserved(virt_to_page(addr));
-+ SetPageNosave(virt_to_page(addr));
-+ }
- #endif
- for (addr = PAGE_OFFSET; addr < (unsigned long)high_memory;
+@@ -416,6 +421,13 @@
addr += PAGE_SIZE) {
if (!PageReserved(virt_to_page(addr)))
continue;
@@ -1289,17 +1271,17 @@
if (addr < (ulong) etext)
codepages++;
else if (addr >= (unsigned long)&__init_begin
-@@ -441,6 +455,7 @@
+@@ -433,6 +445,7 @@
struct page *page = mem_map + pfn;
ClearPageReserved(page);
+ ClearPageNosave(page);
- set_page_count(page, 1);
+ init_page_count(page);
__free_page(page);
totalhigh_pages++;
-diff -Nur linux-2.6.16.11/arch/x86_64/kernel/Makefile
linux-2.6.16.11.suspend2/arch/x86_64/kernel/Makefile
---- linux-2.6.16.11/arch/x86_64/kernel/Makefile 2006-05-01
00:11:07.000000000 +0000
-+++ linux-2.6.16.11.suspend2/arch/x86_64/kernel/Makefile 2006-05-01
00:12:25.000000000 +0000
+diff -Nur linux-2.6.17-rc6/arch/x86_64/kernel/Makefile
linux-2.6.17-rc6.suspend2/arch/x86_64/kernel/Makefile
+--- linux-2.6.17-rc6/arch/x86_64/kernel/Makefile 2006-06-12
16:22:31.000000000 +0000
++++ linux-2.6.17-rc6.suspend2/arch/x86_64/kernel/Makefile 2006-06-12
16:42:02.000000000 +0000
@@ -25,7 +25,7 @@
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o crash.o
obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
@@ -1309,22 +1291,22 @@
obj-$(CONFIG_CPU_FREQ) += cpufreq/
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
obj-$(CONFIG_GART_IOMMU) += pci-gart.o aperture.o
-diff -Nur linux-2.6.16.11/arch/x86_64/kernel/e820.c
linux-2.6.16.11.suspend2/arch/x86_64/kernel/e820.c
---- linux-2.6.16.11/arch/x86_64/kernel/e820.c 2006-04-24 20:20:24.000000000
+0000
-+++ linux-2.6.16.11.suspend2/arch/x86_64/kernel/e820.c 2006-05-01
00:12:25.000000000 +0000
-@@ -186,6 +186,23 @@
+diff -Nur linux-2.6.17-rc6/arch/x86_64/kernel/e820.c
linux-2.6.17-rc6.suspend2/arch/x86_64/kernel/e820.c
+--- linux-2.6.17-rc6/arch/x86_64/kernel/e820.c 2006-06-06 00:57:02.000000000
+0000
++++ linux-2.6.17-rc6.suspend2/arch/x86_64/kernel/e820.c 2006-06-12
16:42:02.000000000 +0000
+@@ -226,6 +226,23 @@
return end_pfn;
}
+int page_is_ram(unsigned long pagenr)
+{
-+ unsigned long start = pagenr << PAGE_SHIFT;
+ int i;
+ for (i = 0; i < e820.nr_map; i++) {
+ struct e820entry *ei = &e820.map[i];
++ unsigned long start = (ei->addr+PAGE_SIZE-1) >> PAGE_SHIFT;
++ unsigned long end = (ei->addr+ei->size) >> PAGE_SHIFT;
+
-+ if (ei->addr+ei->size <= start ||
-+ ei->addr >= (start + PAGE_SIZE))
++ if (pagenr < start || pagenr >= end)
+ continue;
+
+ return (ei->type == E820_RAM);
@@ -1336,9 +1318,9 @@
/*
* Compute how much memory is missing in a range.
* Unlike the other functions in this file the arguments are in page numbers.
-diff -Nur linux-2.6.16.11/arch/x86_64/kernel/suspend.c
linux-2.6.16.11.suspend2/arch/x86_64/kernel/suspend.c
---- linux-2.6.16.11/arch/x86_64/kernel/suspend.c 2006-04-24
20:20:24.000000000 +0000
-+++ linux-2.6.16.11.suspend2/arch/x86_64/kernel/suspend.c 2006-05-01
00:12:25.000000000 +0000
+diff -Nur linux-2.6.17-rc6/arch/x86_64/kernel/suspend.c
linux-2.6.17-rc6.suspend2/arch/x86_64/kernel/suspend.c
+--- linux-2.6.17-rc6/arch/x86_64/kernel/suspend.c 2006-06-06
00:57:02.000000000 +0000
++++ linux-2.6.17-rc6.suspend2/arch/x86_64/kernel/suspend.c 2006-06-12
16:42:02.000000000 +0000
@@ -141,7 +141,7 @@
}
@@ -1354,34 +1336,34 @@
}
-#endif /* CONFIG_SOFTWARE_SUSPEND */
+#endif /* CONFIG_SUSPEND_SHARED */
-diff -Nur linux-2.6.16.11/arch/x86_64/mm/init.c
linux-2.6.16.11.suspend2/arch/x86_64/mm/init.c
---- linux-2.6.16.11/arch/x86_64/mm/init.c 2006-05-01 00:11:07.000000000
+0000
-+++ linux-2.6.16.11.suspend2/arch/x86_64/mm/init.c 2006-05-01
00:12:25.000000000 +0000
-@@ -486,6 +486,7 @@
+diff -Nur linux-2.6.17-rc6/arch/x86_64/mm/init.c
linux-2.6.17-rc6.suspend2/arch/x86_64/mm/init.c
+--- linux-2.6.17-rc6/arch/x86_64/mm/init.c 2006-06-12 16:22:31.000000000
+0000
++++ linux-2.6.17-rc6.suspend2/arch/x86_64/mm/init.c 2006-06-12
16:42:02.000000000 +0000
+@@ -513,6 +513,7 @@
void online_page(struct page *page)
{
ClearPageReserved(page);
+ ClearPageNosave(page);
- set_page_count(page, 1);
+ init_page_count(page);
__free_page(page);
totalram_pages++;
-@@ -592,6 +593,7 @@
+@@ -651,6 +652,7 @@
addr = (unsigned long)(&__init_begin);
for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
ClearPageReserved(virt_to_page(addr));
+ ClearPageNosave(virt_to_page(addr));
- set_page_count(virt_to_page(addr), 1);
+ init_page_count(virt_to_page(addr));
memset((void *)(addr & ~(PAGE_SIZE-1)), 0xcc, PAGE_SIZE);
free_page(addr);
-@@ -632,6 +634,7 @@
+@@ -691,6 +693,7 @@
printk ("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
for (; start < end; start += PAGE_SIZE) {
ClearPageReserved(virt_to_page(start));
+ ClearPageNosave(virt_to_page(start));
- set_page_count(virt_to_page(start), 1);
+ init_page_count(virt_to_page(start));
free_page(start);
totalram_pages++;
-@@ -743,3 +746,22 @@
+@@ -802,3 +805,22 @@
{
return (addr >= VSYSCALL_START) && (addr < VSYSCALL_END);
}
@@ -1404,20 +1386,20 @@
+}
+#endif
+
-diff -Nur linux-2.6.16.11/block/ll_rw_blk.c
linux-2.6.16.11.suspend2/block/ll_rw_blk.c
---- linux-2.6.16.11/block/ll_rw_blk.c 2006-05-01 00:11:07.000000000 +0000
-+++ linux-2.6.16.11.suspend2/block/ll_rw_blk.c 2006-05-01 00:12:25.000000000
+0000
-@@ -28,6 +28,9 @@
- #include <linux/writeback.h>
+diff -Nur linux-2.6.17-rc6/block/ll_rw_blk.c
linux-2.6.17-rc6.suspend2/block/ll_rw_blk.c
+--- linux-2.6.17-rc6/block/ll_rw_blk.c 2006-06-12 16:22:31.000000000 +0000
++++ linux-2.6.17-rc6.suspend2/block/ll_rw_blk.c 2006-06-12
16:42:02.000000000 +0000
+@@ -29,6 +29,9 @@
#include <linux/interrupt.h>
#include <linux/cpu.h>
+ #include <linux/blktrace_api.h>
+#include <linux/freezer.h>
+#include <linux/mount.h>
+#include <linux/suspend2.h>
/*
* for max sense size
-@@ -3042,12 +3045,26 @@
+@@ -3115,12 +3118,26 @@
else
mod_page_state(pgpgin, count);
@@ -1445,7 +1427,7 @@
bdevname(bio->bi_bdev,b));
}
-@@ -3439,7 +3456,7 @@
+@@ -3519,7 +3536,7 @@
{
int i;
@@ -1454,9 +1436,9 @@
if (!kblockd_workqueue)
panic("Failed to create kblockd\n");
-diff -Nur linux-2.6.16.11/crypto/Kconfig
linux-2.6.16.11.suspend2/crypto/Kconfig
---- linux-2.6.16.11/crypto/Kconfig 2006-04-24 20:20:24.000000000 +0000
-+++ linux-2.6.16.11.suspend2/crypto/Kconfig 2006-05-01 00:12:25.000000000
+0000
+diff -Nur linux-2.6.17-rc6/crypto/Kconfig
linux-2.6.17-rc6.suspend2/crypto/Kconfig
+--- linux-2.6.17-rc6/crypto/Kconfig 2006-06-06 00:57:02.000000000 +0000
++++ linux-2.6.17-rc6.suspend2/crypto/Kconfig 2006-06-12 16:41:19.000000000
+0000
@@ -316,6 +316,13 @@
You will most probably want this if using IPSec.
@@ -1471,9 +1453,9 @@
config CRYPTO_MICHAEL_MIC
tristate "Michael MIC keyed digest algorithm"
depends on CRYPTO
-diff -Nur linux-2.6.16.11/crypto/Makefile
linux-2.6.16.11.suspend2/crypto/Makefile
---- linux-2.6.16.11/crypto/Makefile 2006-04-24 20:20:24.000000000 +0000
-+++ linux-2.6.16.11.suspend2/crypto/Makefile 2006-05-01 00:12:25.000000000
+0000
+diff -Nur linux-2.6.17-rc6/crypto/Makefile
linux-2.6.17-rc6.suspend2/crypto/Makefile
+--- linux-2.6.17-rc6/crypto/Makefile 2006-06-06 00:57:02.000000000 +0000
++++ linux-2.6.17-rc6.suspend2/crypto/Makefile 2006-06-12 16:41:19.000000000
+0000
@@ -30,5 +30,6 @@
obj-$(CONFIG_CRYPTO_DEFLATE) += deflate.o
obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o
@@ -1481,10 +1463,10 @@
+obj-$(CONFIG_CRYPTO_LZF) += lzf.o
obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
-diff -Nur linux-2.6.16.11/crypto/deflate.c
linux-2.6.16.11.suspend2/crypto/deflate.c
---- linux-2.6.16.11/crypto/deflate.c 2006-04-24 20:20:24.000000000 +0000
-+++ linux-2.6.16.11.suspend2/crypto/deflate.c 2006-05-01 00:12:25.000000000
+0000
-@@ -143,8 +143,15 @@
+diff -Nur linux-2.6.17-rc6/crypto/deflate.c
linux-2.6.17-rc6.suspend2/crypto/deflate.c
+--- linux-2.6.17-rc6/crypto/deflate.c 2006-06-06 00:57:02.000000000 +0000
++++ linux-2.6.17-rc6.suspend2/crypto/deflate.c 2006-06-12 16:41:26.000000000
+0000
+@@ -142,8 +142,15 @@
ret = zlib_deflate(stream, Z_FINISH);
if (ret != Z_STREAM_END) {
@@ -1502,9 +1484,9 @@
}
ret = 0;
*dlen = stream->total_out;
-diff -Nur linux-2.6.16.11/crypto/lzf.c linux-2.6.16.11.suspend2/crypto/lzf.c
---- linux-2.6.16.11/crypto/lzf.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.16.11.suspend2/crypto/lzf.c 2006-05-01 00:12:25.000000000
+0000
+diff -Nur linux-2.6.17-rc6/crypto/lzf.c linux-2.6.17-rc6.suspend2/crypto/lzf.c
+--- linux-2.6.17-rc6/crypto/lzf.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.17-rc6.suspend2/crypto/lzf.c 2006-06-12 16:41:19.000000000
+0000
@@ -0,0 +1,335 @@
+/*
+ * Cryptoapi LZF compression module.
@@ -1841,9 +1823,9 @@
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("LZF Compression Algorithm");
+MODULE_AUTHOR("Marc Alexander Lehmann & Nigel Cunningham");
-diff -Nur linux-2.6.16.11/drivers/acpi/osl.c
linux-2.6.16.11.suspend2/drivers/acpi/osl.c
---- linux-2.6.16.11/drivers/acpi/osl.c 2006-05-01 00:11:07.000000000 +0000
-+++ linux-2.6.16.11.suspend2/drivers/acpi/osl.c 2006-05-01
00:12:25.000000000 +0000
+diff -Nur linux-2.6.17-rc6/drivers/acpi/osl.c
linux-2.6.17-rc6.suspend2/drivers/acpi/osl.c
+--- linux-2.6.17-rc6/drivers/acpi/osl.c 2006-06-12 16:22:31.000000000
+0000
++++ linux-2.6.17-rc6.suspend2/drivers/acpi/osl.c 2006-06-12
16:34:46.000000000 +0000
@@ -91,7 +91,7 @@
"Access to PCI configuration space unavailable\n");
return AE_NULL_ENTRY;
@@ -1853,9 +1835,9 @@
BUG_ON(!kacpid_wq);
return AE_OK;
-diff -Nur linux-2.6.16.11/drivers/acpi/sleep/proc.c
linux-2.6.16.11.suspend2/drivers/acpi/sleep/proc.c
---- linux-2.6.16.11/drivers/acpi/sleep/proc.c 2006-04-24 20:20:24.000000000
+0000
-+++ linux-2.6.16.11.suspend2/drivers/acpi/sleep/proc.c 2006-05-01
00:12:25.000000000 +0000
+diff -Nur linux-2.6.17-rc6/drivers/acpi/sleep/proc.c
linux-2.6.17-rc6.suspend2/drivers/acpi/sleep/proc.c
+--- linux-2.6.17-rc6/drivers/acpi/sleep/proc.c 2006-06-06 00:57:02.000000000
+0000
++++ linux-2.6.17-rc6.suspend2/drivers/acpi/sleep/proc.c 2006-06-12
16:41:35.000000000 +0000
@@ -58,6 +58,15 @@
goto Done;
}
@@ -1872,10 +1854,10 @@
#ifdef CONFIG_SOFTWARE_SUSPEND
if (state == 4) {
error = software_suspend();
-diff -Nur linux-2.6.16.11/drivers/char/hvc_console.c
linux-2.6.16.11.suspend2/drivers/char/hvc_console.c
---- linux-2.6.16.11/drivers/char/hvc_console.c 2006-04-24 20:20:24.000000000
+0000
-+++ linux-2.6.16.11.suspend2/drivers/char/hvc_console.c 2006-05-01
00:12:25.000000000 +0000
-@@ -841,7 +841,7 @@
+diff -Nur linux-2.6.17-rc6/drivers/char/hvc_console.c
linux-2.6.17-rc6.suspend2/drivers/char/hvc_console.c
+--- linux-2.6.17-rc6/drivers/char/hvc_console.c 2006-06-06
00:57:02.000000000 +0000
++++ linux-2.6.17-rc6.suspend2/drivers/char/hvc_console.c 2006-06-12
16:34:46.000000000 +0000
+@@ -832,7 +832,7 @@
/* Always start the kthread because there can be hotplug vty adapters
* added later. */
@@ -1883,10 +1865,10 @@
+ hvc_task = kthread_nofreeze_run(khvcd, NULL, "khvcd");
if (IS_ERR(hvc_task)) {
panic("Couldn't create kthread for console.\n");
- put_tty_driver(hvc_driver);
-diff -Nur linux-2.6.16.11/drivers/char/hvcs.c
linux-2.6.16.11.suspend2/drivers/char/hvcs.c
---- linux-2.6.16.11/drivers/char/hvcs.c 2006-04-24 20:20:24.000000000
+0000
-+++ linux-2.6.16.11.suspend2/drivers/char/hvcs.c 2006-05-01
00:12:25.000000000 +0000
+ put_tty_driver(drv);
+diff -Nur linux-2.6.17-rc6/drivers/char/hvcs.c
linux-2.6.17-rc6.suspend2/drivers/char/hvcs.c
+--- linux-2.6.17-rc6/drivers/char/hvcs.c 2006-06-06 00:57:02.000000000
+0000
++++ linux-2.6.17-rc6.suspend2/drivers/char/hvcs.c 2006-06-12
16:34:46.000000000 +0000
@@ -1404,7 +1404,7 @@
return -ENOMEM;
}
@@ -1896,10 +1878,10 @@
if (IS_ERR(hvcs_task)) {
printk(KERN_ERR "HVCS: khvcsd creation failed. Driver not
loaded.\n");
kfree(hvcs_pi_buff);
-diff -Nur linux-2.6.16.11/drivers/input/serio/serio.c
linux-2.6.16.11.suspend2/drivers/input/serio/serio.c
---- linux-2.6.16.11/drivers/input/serio/serio.c 2006-04-24
20:20:24.000000000 +0000
-+++ linux-2.6.16.11.suspend2/drivers/input/serio/serio.c 2006-05-01
00:12:25.000000000 +0000
-@@ -901,7 +901,7 @@
+diff -Nur linux-2.6.17-rc6/drivers/input/serio/serio.c
linux-2.6.17-rc6.suspend2/drivers/input/serio/serio.c
+--- linux-2.6.17-rc6/drivers/input/serio/serio.c 2006-06-06
00:57:02.000000000 +0000
++++ linux-2.6.17-rc6.suspend2/drivers/input/serio/serio.c 2006-06-12
16:34:46.000000000 +0000
+@@ -903,7 +903,7 @@
static int __init serio_init(void)
{
@@ -1908,9 +1890,9 @@
if (IS_ERR(serio_task)) {
printk(KERN_ERR "serio: Failed to start kseriod\n");
return PTR_ERR(serio_task);
-diff -Nur linux-2.6.16.11/drivers/macintosh/Kconfig
linux-2.6.16.11.suspend2/drivers/macintosh/Kconfig
---- linux-2.6.16.11/drivers/macintosh/Kconfig 2006-04-24 20:20:24.000000000
+0000
-+++ linux-2.6.16.11.suspend2/drivers/macintosh/Kconfig 2006-05-01
00:12:25.000000000 +0000
+diff -Nur linux-2.6.17-rc6/drivers/macintosh/Kconfig
linux-2.6.17-rc6.suspend2/drivers/macintosh/Kconfig
+--- linux-2.6.17-rc6/drivers/macintosh/Kconfig 2006-06-06 00:57:02.000000000
+0000
++++ linux-2.6.17-rc6.suspend2/drivers/macintosh/Kconfig 2006-06-12
16:42:02.000000000 +0000
@@ -200,4 +200,8 @@
tristate "Support for ANS LCD display"
depends on ADB_CUDA && PPC_PMAC
@@ -1920,10 +1902,10 @@
+ depends on SUSPEND2
+
endmenu
-diff -Nur linux-2.6.16.11/drivers/macintosh/via-pmu.c
linux-2.6.16.11.suspend2/drivers/macintosh/via-pmu.c
---- linux-2.6.16.11/drivers/macintosh/via-pmu.c 2006-04-24
20:20:24.000000000 +0000
-+++ linux-2.6.16.11.suspend2/drivers/macintosh/via-pmu.c 2006-05-01
00:12:25.000000000 +0000
-@@ -2653,6 +2653,13 @@
+diff -Nur linux-2.6.17-rc6/drivers/macintosh/via-pmu.c
linux-2.6.17-rc6.suspend2/drivers/macintosh/via-pmu.c
+--- linux-2.6.17-rc6/drivers/macintosh/via-pmu.c 2006-06-06
00:57:02.000000000 +0000
++++ linux-2.6.17-rc6.suspend2/drivers/macintosh/via-pmu.c 2006-06-12
16:42:02.000000000 +0000
+@@ -2654,6 +2654,13 @@
return -EACCES;
if (sleep_in_progress)
return -EBUSY;
@@ -1937,10 +1919,10 @@
sleep_in_progress = 1;
switch (pmu_kind) {
case PMU_OHARE_BASED:
-diff -Nur linux-2.6.16.11/drivers/md/dm-crypt.c
linux-2.6.16.11.suspend2/drivers/md/dm-crypt.c
---- linux-2.6.16.11/drivers/md/dm-crypt.c 2006-04-24 20:20:24.000000000
+0000
-+++ linux-2.6.16.11.suspend2/drivers/md/dm-crypt.c 2006-05-01
00:12:25.000000000 +0000
-@@ -928,7 +928,7 @@
+diff -Nur linux-2.6.17-rc6/drivers/md/dm-crypt.c
linux-2.6.17-rc6.suspend2/drivers/md/dm-crypt.c
+--- linux-2.6.17-rc6/drivers/md/dm-crypt.c 2006-06-06 00:57:02.000000000
+0000
++++ linux-2.6.17-rc6.suspend2/drivers/md/dm-crypt.c 2006-06-12
16:34:46.000000000 +0000
+@@ -915,7 +915,7 @@
if (!_crypt_io_pool)
return -ENOMEM;
@@ -1949,18 +1931,18 @@
if (!_kcryptd_workqueue) {
r = -ENOMEM;
DMERR(PFX "couldn't create kcryptd");
-diff -Nur linux-2.6.16.11/drivers/md/md.c
linux-2.6.16.11.suspend2/drivers/md/md.c
---- linux-2.6.16.11/drivers/md/md.c 2006-04-24 20:20:24.000000000 +0000
-+++ linux-2.6.16.11.suspend2/drivers/md/md.c 2006-05-01 00:12:25.000000000
+0000
+diff -Nur linux-2.6.17-rc6/drivers/md/md.c
linux-2.6.17-rc6.suspend2/drivers/md/md.c
+--- linux-2.6.17-rc6/drivers/md/md.c 2006-06-06 00:57:02.000000000 +0000
++++ linux-2.6.17-rc6.suspend2/drivers/md/md.c 2006-06-12 16:34:46.000000000
+0000
@@ -41,7 +41,6 @@
#include <linux/sysctl.h>
#include <linux/devfs_fs_kernel.h>
#include <linux/buffer_head.h> /* for invalidate_bdev */
-#include <linux/suspend.h>
#include <linux/poll.h>
+ #include <linux/mutex.h>
- #include <linux/init.h>
-@@ -3972,7 +3971,8 @@
+@@ -4120,7 +4119,8 @@
thread->run = run;
thread->mddev = mddev;
thread->timeout = MAX_SCHEDULE_TIMEOUT;
@@ -1970,9 +1952,9 @@
if (IS_ERR(thread->tsk)) {
kfree(thread);
return NULL;
-diff -Nur linux-2.6.16.11/drivers/scsi/hosts.c
linux-2.6.16.11.suspend2/drivers/scsi/hosts.c
---- linux-2.6.16.11/drivers/scsi/hosts.c 2006-04-24 20:20:24.000000000
+0000
-+++ linux-2.6.16.11.suspend2/drivers/scsi/hosts.c 2006-05-01
00:12:25.000000000 +0000
+diff -Nur linux-2.6.17-rc6/drivers/scsi/hosts.c
linux-2.6.17-rc6.suspend2/drivers/scsi/hosts.c
+--- linux-2.6.17-rc6/drivers/scsi/hosts.c 2006-06-06 00:57:02.000000000
+0000
++++ linux-2.6.17-rc6.suspend2/drivers/scsi/hosts.c 2006-06-12
16:34:46.000000000 +0000
@@ -227,7 +227,7 @@
if (shost->transportt->create_work_queue) {
snprintf(shost->work_q_name, KOBJ_NAME_LEN, "scsi_wq_%d",
@@ -1982,10 +1964,10 @@
shost->work_q_name);
if (!shost->work_q)
goto out_free_shost_data;
-diff -Nur linux-2.6.16.11/drivers/scsi/lpfc/lpfc_init.c
linux-2.6.16.11.suspend2/drivers/scsi/lpfc/lpfc_init.c
---- linux-2.6.16.11/drivers/scsi/lpfc/lpfc_init.c 2006-04-24
20:20:24.000000000 +0000
-+++ linux-2.6.16.11.suspend2/drivers/scsi/lpfc/lpfc_init.c 2006-05-01
00:12:25.000000000 +0000
-@@ -1521,7 +1521,7 @@
+diff -Nur linux-2.6.17-rc6/drivers/scsi/lpfc/lpfc_init.c
linux-2.6.17-rc6.suspend2/drivers/scsi/lpfc/lpfc_init.c
+--- linux-2.6.17-rc6/drivers/scsi/lpfc/lpfc_init.c 2006-06-06
00:57:02.000000000 +0000
++++ linux-2.6.17-rc6.suspend2/drivers/scsi/lpfc/lpfc_init.c 2006-06-12
16:34:46.000000000 +0000
+@@ -1593,7 +1593,7 @@
phba->work_ha_mask |= (HA_RXMASK << (LPFC_ELS_RING * 4));
/* Startup the kernel thread for this host adapter. */
@@ -1994,10 +1976,10 @@
"lpfc_worker_%d", phba->brd_no);
if (IS_ERR(phba->worker_thread)) {
error = PTR_ERR(phba->worker_thread);
-diff -Nur linux-2.6.16.11/drivers/usb/net/pegasus.c
linux-2.6.16.11.suspend2/drivers/usb/net/pegasus.c
---- linux-2.6.16.11/drivers/usb/net/pegasus.c 2006-04-24 20:20:24.000000000
+0000
-+++ linux-2.6.16.11.suspend2/drivers/usb/net/pegasus.c 2006-05-01
00:12:25.000000000 +0000
-@@ -1451,7 +1451,7 @@
+diff -Nur linux-2.6.17-rc6/drivers/usb/net/pegasus.c
linux-2.6.17-rc6.suspend2/drivers/usb/net/pegasus.c
+--- linux-2.6.17-rc6/drivers/usb/net/pegasus.c 2006-06-06 00:57:02.000000000
+0000
++++ linux-2.6.17-rc6.suspend2/drivers/usb/net/pegasus.c 2006-06-12
16:34:46.000000000 +0000
+@@ -1462,7 +1462,7 @@
pr_info("%s: %s, " DRIVER_DESC "\n", driver_name, DRIVER_VERSION);
if (devid)
parse_id(devid);
@@ -2006,9 +1988,9 @@
if (!pegasus_workqueue)
return -ENOMEM;
return usb_register(&pegasus_driver);
-diff -Nur linux-2.6.16.11/include/asm-arm/hw_irq.h
linux-2.6.16.11.suspend2/include/asm-arm/hw_irq.h
---- linux-2.6.16.11/include/asm-arm/hw_irq.h 2006-05-01 00:11:08.000000000
+0000
-+++ linux-2.6.16.11.suspend2/include/asm-arm/hw_irq.h 2006-05-01
00:13:27.000000000 +0000
+diff -Nur linux-2.6.17-rc6/include/asm-arm/hw_irq.h
linux-2.6.17-rc6.suspend2/include/asm-arm/hw_irq.h
+--- linux-2.6.17-rc6/include/asm-arm/hw_irq.h 2006-06-12 16:22:32.000000000
+0000
++++ linux-2.6.17-rc6.suspend2/include/asm-arm/hw_irq.h 2006-06-12
16:43:34.000000000 +0000
@@ -5,5 +5,6 @@
#define _ARCH_ARM_HW_IRQ_H
@@ -2016,9 +1998,9 @@
+#include <asm/hardirq.h>
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kernel-desktop-suspend2.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
