rpms/kernel/devel linux-2.6-defaults-unicode-vt.patch, 1.1, 1.2 linux-2.6-mm-suspend-improvements.patch, 1.1, 1.2

Mon Aug 7 19:19:56 UTC 2006

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32750

Modified Files:
	linux-2.6-defaults-unicode-vt.patch 
	linux-2.6-mm-suspend-improvements.patch 
Log Message:
fix rejects

linux-2.6-defaults-unicode-vt.patch:
 linux-2.6.11/drivers/char/vt.c              |    2 +-
 linux-2.6.17.noarch/drivers/char/keyboard.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6-defaults-unicode-vt.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-defaults-unicode-vt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- linux-2.6-defaults-unicode-vt.patch	19 Apr 2006 21:24:16 -0000	1.1
+++ linux-2.6-defaults-unicode-vt.patch	7 Aug 2006 19:19:53 -0000	1.2
@@ -12,14 +12,14 @@
  	vc->vc_utf_count	= 0;
  
  	vc->vc_disp_ctrl	= 0;
---- linux-2.6.11/drivers/char/keyboard.c.foo	2005-06-06 23:35:07.000000000 -0400
-+++ linux-2.6.11/drivers/char/keyboard.c	2005-06-06 23:36:28.000000000 -0400
-@@ -1241,7 +1241,7 @@
-         kbd0.lockstate = KBD_DEFLOCK;
-         kbd0.slockstate = 0;
-         kbd0.modeflags = KBD_DEFMODE;
--        kbd0.kbdmode = VC_XLATE;
-+        kbd0.kbdmode = VC_UNICODE;
+--- linux-2.6.17.noarch/drivers/char/keyboard.c~	2006-08-07 15:15:48.000000000 -0400
++++ linux-2.6.17.noarch/drivers/char/keyboard.c	2006-08-07 15:15:59.000000000 -0400
+@@ -1370,7 +1370,7 @@ int __init kbd_init(void)
+ 		kbd_table[i].lockstate = KBD_DEFLOCK;
+ 		kbd_table[i].slockstate = 0;
+ 		kbd_table[i].modeflags = KBD_DEFMODE;
+-		kbd_table[i].kbdmode = VC_XLATE;
++		kbd_table[i].kbdmode = VC_UNICODE;
+ 	}
  
-         for (i = 0 ; i < MAX_NR_CONSOLES ; i++)
-                 kbd_table[i] = kbd0;
+ 	input_register_handler(&kbd_handler);

linux-2.6-mm-suspend-improvements.patch:
 /dev/null                    |   62 ---------
 a/arch/x86_64/kernel/e820.c  |   48 ++++++
 a/arch/x86_64/kernel/setup.c |    1 
 a/fs/cifs/connect.c          |    1 
 a/include/asm-x86_64/e820.h  |    1 
 a/include/linux/cpu.h        |    8 +
 a/include/linux/suspend.h    |    8 -
 a/include/linux/swap.h       |    6 
 a/kernel/cpu.c               |  138 +++++++++++++++++---
 a/kernel/power/Makefile      |    2 
 a/kernel/power/disk.c        |    7 -
 a/kernel/power/main.c        |   10 -
 a/kernel/power/power.h       |   65 ++++++++-
 a/kernel/power/snapshot.c    |  113 ++++++++--------
 a/kernel/power/swap.c        |  295 ++++++++++++++++++++++++++++---------------
 a/kernel/power/user.c        |   14 +-
 a/mm/page_io.c               |   25 ++-
 17 files changed, 530 insertions(+), 274 deletions(-)

Index: linux-2.6-mm-suspend-improvements.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-mm-suspend-improvements.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-mm-suspend-improvements.patch	1 Aug 2006 23:25:03 -0000	1.1
+++ linux-2.6-mm-suspend-improvements.patch	7 Aug 2006 19:19:54 -0000	1.2
@@ -8,7 +8,6 @@
 swsusp-clean-up-browsing-of-pfns.patch
 swsusp-struct-snapshot_handle-cleanup.patch
 make-swsusp-avoid-memory-holes-and-reserved-memory-regions-on-x86_64.patch
-make-suspend-possible-with-a-traced-process-at-a-breakpoint.patch
 allow-cifsd-to-suspend-if-connection-is-lost.patch
 disable-cpu-hotplug-during-suspend-2.patch
 From: Andrew Morton <akpm at osdl.org>
@@ -1390,100 +1389,6 @@
 _
 From: "Rafael J. Wysocki" <rjw at sisk.pl>
 
-It should be possible to suspend, either to RAM or to disk, if there's a
-traced process that has just reached a breakpoint.  However, this is a
-special case, because its parent process might have been frozen already and
-then we are unable to deliver the "freeze" signal to the traced process. 
-If this happens, it's better to cancel the freezing of the traced process.
-
-Ref. http://bugzilla.kernel.org/show_bug.cgi?id=6787
-
-Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
-Acked-by: Pavel Machek <pavel at ucw.cz>
-Signed-off-by: Andrew Morton <akpm at osdl.org>
----
-
- include/linux/sched.h  |    8 ++++++++
- kernel/power/process.c |   26 ++++++++++++++++++--------
- 2 files changed, 26 insertions(+), 8 deletions(-)
-
-diff -puN include/linux/sched.h~make-suspend-possible-with-a-traced-process-at-a-breakpoint include/linux/sched.h
---- a/include/linux/sched.h~make-suspend-possible-with-a-traced-process-at-a-breakpoint
-+++ a/include/linux/sched.h
-@@ -1567,6 +1567,14 @@ static inline void freeze(struct task_st
- }
- 
- /*
-+ * Sometimes we may need to cancel the previous 'freeze' request
-+ */
-+static inline void do_not_freeze(struct task_struct *p)
-+{
-+	p->flags &= ~PF_FREEZE;
-+}
-+
-+/*
-  * Wake up a frozen process
-  */
- static inline int thaw_process(struct task_struct *p)
-diff -puN kernel/power/process.c~make-suspend-possible-with-a-traced-process-at-a-breakpoint kernel/power/process.c
---- a/kernel/power/process.c~make-suspend-possible-with-a-traced-process-at-a-breakpoint
-+++ a/kernel/power/process.c
-@@ -66,13 +66,25 @@ static inline void freeze_process(struct
- 	}
- }
- 
-+static void cancel_freezing(struct task_struct *p)
-+{
-+	unsigned long flags;
-+
-+	if (freezing(p)) {
-+		pr_debug("  clean up: %s\n", p->comm);
-+		do_not_freeze(p);
-+		spin_lock_irqsave(&p->sighand->siglock, flags);
-+		recalc_sigpending_tsk(p);
-+		spin_unlock_irqrestore(&p->sighand->siglock, flags);
-+	}
-+}
-+
- /* 0 = success, else # of processes that we failed to stop */
- int freeze_processes(void)
- {
- 	int todo, nr_user, user_frozen;
- 	unsigned long start_time;
- 	struct task_struct *g, *p;
--	unsigned long flags;
- 
- 	printk( "Stopping tasks: " );
- 	start_time = jiffies;
-@@ -85,6 +97,10 @@ int freeze_processes(void)
- 				continue;
- 			if (frozen(p))
- 				continue;
-+			if (p->state == TASK_TRACED && frozen(p->parent)) {
-+				cancel_freezing(p);
-+				continue;
-+			}
- 			if (p->mm && !(p->flags & PF_BORROWED_MM)) {
- 				/* The task is a user-space one.
- 				 * Freeze it unless there's a vfork completion
-@@ -126,13 +142,7 @@ int freeze_processes(void)
- 		do_each_thread(g, p) {
- 			if (freezeable(p) && !frozen(p))
- 				printk(KERN_ERR "  %s\n", p->comm);
--			if (freezing(p)) {
--				pr_debug("  clean up: %s\n", p->comm);
--				p->flags &= ~PF_FREEZE;
--				spin_lock_irqsave(&p->sighand->siglock, flags);
--				recalc_sigpending_tsk(p);
--				spin_unlock_irqrestore(&p->sighand->siglock, flags);
--			}
-+			cancel_freezing(p);
- 		} while_each_thread(g, p);
- 		read_unlock(&tasklist_lock);
- 		return todo;
-_
-From: "Rafael J. Wysocki" <rjw at sisk.pl>
-
 Make cifsd allow us to suspend if it has lost the connection with the server.
 
 Ref. http://bugzilla.kernel.org/show_bug.cgi?id=6811


