summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel.spec6
-rw-r--r--xen-fix-typo-in-xen-irq-fix.patch13
2 files changed, 19 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 2644130..93a05a9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -839,6 +839,8 @@ Patch14210: execve-improve-interactivity-with-large-arguments.patch
Patch14211: execve-make-responsive-to-sigkill-with-large-arguments.patch
Patch14212: setup_arg_pages-diagnose-excessive-argument-size.patch
+Patch14220: xen-fix-typo-in-xen-irq-fix.patch
+
# ==============================================================================
%endif
@@ -1546,6 +1548,9 @@ ApplyPatch execve-improve-interactivity-with-large-arguments.patch
ApplyPatch execve-make-responsive-to-sigkill-with-large-arguments.patch
ApplyPatch setup_arg_pages-diagnose-excessive-argument-size.patch
+# Fix typo in Xen patch from 2.6.22 that causes hang on boot.
+ApplyPatch xen-fix-typo-in-xen-irq-fix.patch
+
# END OF PATCH APPLICATIONS ====================================================
%endif
@@ -2207,6 +2212,7 @@ fi
irda-correctly-clean-up-self-ias_obj-on-irda_bind-failure.patch
keys-fix-bug-in-keyctl_session_to_parent-if-parent-has-no-session-keyring.patch
keys-fix-rcu-no-lock-warning-in-keyctl_session_to_parent.patch
+- Fix typo in Xen patch from 2.6.32.22.
* Mon Sep 20 2010 Chuck Ebbert <cebbert@redhat.com> 2.6.32.22-169
- Linux 2.6.32.22
diff --git a/xen-fix-typo-in-xen-irq-fix.patch b/xen-fix-typo-in-xen-irq-fix.patch
new file mode 100644
index 0000000..3a9fb62
--- /dev/null
+++ b/xen-fix-typo-in-xen-irq-fix.patch
@@ -0,0 +1,13 @@
+Fix typo in Xen patch from 2.6.35.5
+
+--- linux-2.6.35.noarch.orig/drivers/xen/events.c
++++ linux-2.6.35.noarch/drivers/xen/events.c
+@@ -935,7 +935,7 @@ static struct irq_chip xen_dynamic_chip
+ .retrigger = retrigger_dynirq,
+ };
+
+-static struct irq_chip en_percpu_chip __read_mostly = {
++static struct irq_chip xen_percpu_chip __read_mostly = {
+ .name = "xen-percpu",
+
+ .disable = disable_dynirq,