From: Greg Kroah-Hartman Date: Tue, 28 Sep 2010 18:26:42 +0000 (-0700) Subject: .32 patches X-Git-Tag: v2.6.35.7~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8043ab1a576e1fc695f1562883578e1f0ec19b4e;p=thirdparty%2Fkernel%2Fstable-queue.git .32 patches --- diff --git a/queue-2.6.32/series b/queue-2.6.32/series new file mode 100644 index 00000000000..fae65f3cd5c --- /dev/null +++ b/queue-2.6.32/series @@ -0,0 +1 @@ +xen-fix-typo-in-previous-patch.patch diff --git a/queue-2.6.32/xen-fix-typo-in-previous-patch.patch b/queue-2.6.32/xen-fix-typo-in-previous-patch.patch new file mode 100644 index 00000000000..cb800aedf67 --- /dev/null +++ b/queue-2.6.32/xen-fix-typo-in-previous-patch.patch @@ -0,0 +1,35 @@ +From james.dingwall@amdocs.com Tue Sep 28 11:20:59 2010 +From: James Dingwall +Date: Mon, 27 Sep 2010 09:37:17 +0100 +Subject: Xen: fix typo in previous patch +To: Kyle McMartin , Greg KH +Cc: Jeremy Fitzhardinge , "james@dingwall.me.uk" +Message-ID: <3B7AEC3C7FCC864282DFAC9A56A7BA363D81475979@UKLNDMAIL1.corp.amdocs.com> + + +Correctly name the irq_chip structure to fix an immediate failure when booting +as a xen pv_ops guest with a NULL pointer exception. The missing 'x' was +introduced in commit [fb412a178502dc498430723b082a932f797e4763] applied to +2.6.3[25]-stable trees. The commit to mainline was +[aaca49642b92c8a57d3ca5029a5a94019c7af69f] which did not have the problem. + +Signed-off-by: James Dingwall +Reported-by: Pawel Zuzelski +Tested-by: Pawel Zuzelski +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/xen/events.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/xen/events.c ++++ b/drivers/xen/events.c +@@ -930,7 +930,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,