[kernel] r15172 - in dists/lenny/linux-2.6/debian: . patches/features/all/xen patches/series

[Ben Hutchings]

Author: benh
Date: Tue Feb 16 05:10:14 2010
New Revision: 15172

Log:
[xen][i386] Fix kernel logging via userspace (Closes: #568561)

Added:
   dists/lenny/linux-2.6/debian/patches/features/all/xen/printk-robustify-printk-xen.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/22-extra

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Tue Feb 16 04:49:22 2010	(r15171)
+++ dists/lenny/linux-2.6/debian/changelog	Tue Feb 16 05:10:14 2010	(r15172)
@@ -25,6 +25,8 @@
     controllers (Closes: #547183)
   * postinst: Fix pattern-matching for 'do_bootloader' configuration option
     (Closes: #568317)
+  * [xen][i386] Fix kernel logging via userspace (Closes: #568561)
+    (regression due to fix for #510478)
 
  -- maximilian attems <maks at debian.org>  Mon, 28 Dec 2009 23:44:19 +0100
 

Added: dists/lenny/linux-2.6/debian/patches/features/all/xen/printk-robustify-printk-xen.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/features/all/xen/printk-robustify-printk-xen.patch	Tue Feb 16 05:10:14 2010	(r15172)
@@ -0,0 +1,16 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: [PATCH] [xen][i386] Fix kernel logging via userspace
+
+Xen has its own private copy of update_process_times() for i386.
+As part of the fix for #510478 this needs to call printk_tick() too.
+
+--- a/arch/x86/kernel/time_32-xen.c
++++ b/arch/x86/kernel/time_32-xen.c
+@@ -585,6 +585,7 @@
+ 	run_local_timers();
+ 	if (rcu_pending(cpu))
+ 		rcu_check_callbacks(cpu, user_mode_vm(get_irq_regs()));
++	printk_tick();
+ 	scheduler_tick();
+ 	run_posix_cpu_timers(current);
+ 	profile_tick(CPU_PROFILING);

Modified: dists/lenny/linux-2.6/debian/patches/series/22-extra
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/22-extra	Tue Feb 16 04:49:22 2010	(r15171)
+++ dists/lenny/linux-2.6/debian/patches/series/22-extra	Tue Feb 16 05:10:14 2010	(r15172)
@@ -1,3 +1,4 @@
 + features/all/openvz/0087-cpt-dump-inode-content-for-shm_file_operations.patch featureset=openvz
 + features/all/openvz/0088-cfq-unlink-queues-at-bc-destroy.patch featureset=openvz
 + features/all/openvz/0089-inotify-unblock-umounting.patch featureset=openvz
++ features/all/xen/printk-robustify-printk-xen.patch featureset=xen