SOURCES (LINUX_2_6): kernel-suspend2-headers.patch, linux-2.6-suspend2.patc...

[arekm]

Author: arekm                        Date: Mon Jul 14 17:54:27 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- up for 2.6.26

---- Files affected:
SOURCES:
   kernel-suspend2-headers.patch (1.1.2.5 -> 1.1.2.6) , linux-2.6-suspend2.patch (1.1.2.2.2.6 -> 1.1.2.2.2.7) 

---- Diffs:

================================================================
Index: SOURCES/kernel-suspend2-headers.patch
diff -u SOURCES/kernel-suspend2-headers.patch:1.1.2.5 SOURCES/kernel-suspend2-headers.patch:1.1.2.6
--- SOURCES/kernel-suspend2-headers.patch:1.1.2.5	Thu May  8 01:44:38 2008
+++ SOURCES/kernel-suspend2-headers.patch	Mon Jul 14 19:54:20 2008
@@ -1,19 +1,20 @@
 --- a/init/main.c	2007-10-02 14:01:04.772023000 +0200
 +++ b/init/main.c	2007-10-02 14:07:34.520380750 +0200
-@@ -51,12 +51,12 @@
+@@ -51,13 +51,13 @@
  #include <linux/key.h>
  #include <linux/unwind.h>
  #include <linux/buffer_head.h>
 +#include <linux/dyn_pageflags.h>
  #include <linux/debug_locks.h>
+ #include <linux/debugobjects.h>
  #include <linux/lockdep.h>
  #include <linux/pid_namespace.h>
  #include <linux/device.h>
  #include <linux/kthread.h>
 -#include <linux/dyn_pageflags.h>
  #include <linux/sched.h>
- 
- #include <asm/io.h>
+ #include <linux/signal.h>
+ #include <linux/idr.h>
 --- a/kernel/printk.c	2007-10-02 14:01:04.780023500 +0200
 +++ b/kernel/printk.c	2007-10-02 14:09:40.140231500 +0200
 @@ -28,9 +28,9 @@

================================================================
Index: SOURCES/linux-2.6-suspend2.patch
diff -u SOURCES/linux-2.6-suspend2.patch:1.1.2.2.2.6 SOURCES/linux-2.6-suspend2.patch:1.1.2.2.2.7
--- SOURCES/linux-2.6-suspend2.patch:1.1.2.2.2.6	Thu May  8 01:35:48 2008
+++ SOURCES/linux-2.6-suspend2.patch	Mon Jul 14 19:54:21 2008
@@ -2489,22 +2489,22 @@
  #include <linux/sched.h>
  #include <linux/signal.h>
  
-@@ -572,6 +573,7 @@ asmlinkage void __init start_kernel(void)
+@@ -603,6 +603,7 @@
  	softirq_init();
  	timekeeping_init();
  	time_init();
 +	dyn_pageflags_init();
+ 	sched_clock_init();
  	profile_init();
  	if (!irqs_disabled())
- 		printk("start_kernel(): bug: interrupts were enabled early\n");
 @@ -610,6 +612,7 @@ asmlinkage void __init start_kernel(void)
  	enable_debug_pagealloc();
  	cpu_hotplug_init();
  	kmem_cache_init();
 +	dyn_pageflags_use_kzalloc();
+ 	debug_objects_mem_init();
+	idr_init_cache();
  	setup_per_cpu_pageset();
- 	numa_policy_init();
- 	if (late_time_init)
 diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
 index 6233f3b..8bd74dc 100644
 --- a/kernel/power/Kconfig
@@ -2791,10 +2791,12 @@
 index f7dfff2..8ea53fa 100644
 --- a/kernel/power/Makefile
 +++ b/kernel/power/Makefile
-@@ -5,6 +5,37 @@ endif
+@@ -8,3 +8,36 @@
+ obj-$(CONFIG_HIBERNATION)	+= swsusp.o disk.o snapshot.o swap.o user.o
  
- obj-y				:= main.o
- obj-$(CONFIG_PM_LEGACY)		+= pm.o
+ obj-$(CONFIG_MAGIC_SYSRQ)	+= poweroff.o
++
++
 +
 +tuxonice_core-objs := tuxonice_modules.o tuxonice_sysfs.o tuxonice_highlevel.o \
 +		tuxonice_io.o tuxonice_pagedir.o tuxonice_prepare_image.o \
@@ -2826,9 +2828,6 @@
 +
 +obj-$(CONFIG_TOI_PAGEFLAGS_TEST)	+= toi_pageflags_test.o
 +
- obj-$(CONFIG_PM_SLEEP)		+= process.o console.o
- obj-$(CONFIG_HIBERNATION)	+= swsusp.o disk.o snapshot.o swap.o user.o
- 
 diff --git a/kernel/power/disk.c b/kernel/power/disk.c
 index 14a656c..141606e 100644
 --- a/kernel/power/disk.c
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-suspend2-headers.patch?r1=1.1.2.5&r2=1.1.2.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-suspend2.patch?r1=1.1.2.2.2.6&r2=1.1.2.2.2.7&f=u