summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2012-10-23 21:10:25 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2012-10-23 21:14:49 -0400
commit0bb680234e98940bd368bea57428a15206b7d70d (patch)
tree355b317fab501cf90984ba032c16c49679740b4d
parent2eeb043cc70d0006cb986ac500c19e6f1d56ea44 (diff)
download3.6-rt-patches-0bb680234e98940bd368bea57428a15206b7d70d.tar.gz
patches-3.6.3-rt6.tar.xzv3.6.3-rt6
Trivial refresh of kgb-serial-hackaround.patch to allow for the added line of context: "int colcount;" Aside from that, only the localversion change, since baseline now is the v3.6.3 stable release. Announce: ----------- Dear RT Folks, I'm pleased to announce the 3.6.3-rt6 release. rt6 is just an update to 3.6.3. The not announced 3.6.2-rt5 is an intermediate release with a single change. Changes since 3.6.2-rt4: * Make the early printk changes work (hopefully) everywhere The new patch queue also contains a non code change (according to Pauls) which adds a missing subject line to a powerpc patch. The delta patch against 3.6.2-rt4 is appended below and can be found here: http://www.kernel.org/pub/linux/kernel/projects/rt/3.6/incr/patch-3.6.2-rt4-rt5.patch.xz The RT patch against 3.6.3 can be found here: http://www.kernel.org/pub/linux/kernel/projects/rt/3.6/patch-3.6.3-rt6.patch.xz The split quilt queue is available at: http://www.kernel.org/pub/linux/kernel/projects/rt/3.6/patches-3.6.3-rt6.tar.xz Enjoy, tglx [delta patch snipped] ----------- http://marc.info/?l=linux-rt-users&m=135102640230417&w=2 md5sum: 277ede427424bc881d08c12a1d6b0aa1 patches-3.6.3-rt6.tar.xz Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--kgb-serial-hackaround.patch10
-rw-r--r--localversion.patch2
2 files changed, 6 insertions, 6 deletions
diff --git a/kgb-serial-hackaround.patch b/kgb-serial-hackaround.patch
index 732cd5b..2793aa1 100644
--- a/kgb-serial-hackaround.patch
+++ b/kgb-serial-hackaround.patch
@@ -67,15 +67,15 @@ Index: linux-stable/kernel/debug/kdb/kdb_io.c
===================================================================
--- linux-stable.orig/kernel/debug/kdb/kdb_io.c
+++ linux-stable/kernel/debug/kdb/kdb_io.c
-@@ -553,7 +553,6 @@ int vkdb_printf(const char *fmt, va_list
- int diag;
+@@ -554,7 +554,6 @@ int vkdb_printf(const char *fmt, va_list
int linecount;
+ int colcount;
int logging, saved_loglevel = 0;
- int saved_trap_printk;
int got_printf_lock = 0;
int retlen = 0;
int fnd, len;
-@@ -564,8 +563,6 @@ int vkdb_printf(const char *fmt, va_list
+@@ -565,8 +564,6 @@ int vkdb_printf(const char *fmt, va_list
unsigned long uninitialized_var(flags);
preempt_disable();
@@ -84,7 +84,7 @@ Index: linux-stable/kernel/debug/kdb/kdb_io.c
/* Serialize kdb_printf if multiple cpus try to write at once.
* But if any cpu goes recursive in kdb, just print the output,
-@@ -810,7 +807,6 @@ kdb_print_out:
+@@ -833,7 +830,6 @@ kdb_print_out:
} else {
__release(kdb_printf_lock);
}
@@ -92,7 +92,7 @@ Index: linux-stable/kernel/debug/kdb/kdb_io.c
preempt_enable();
return retlen;
}
-@@ -820,9 +816,11 @@ int kdb_printf(const char *fmt, ...)
+@@ -843,9 +839,11 @@ int kdb_printf(const char *fmt, ...)
va_list ap;
int r;
diff --git a/localversion.patch b/localversion.patch
index 7296000..04bbef2 100644
--- a/localversion.patch
+++ b/localversion.patch
@@ -14,4 +14,4 @@ Index: linux-stable/localversion-rt
--- /dev/null
+++ linux-stable/localversion-rt
@@ -0,0 +1 @@
-+-rt5
++-rt6