[kernel] r15815 - in dists/sid/linux-2.6/debian: . patches/debian patches/series

[Ben Hutchings]

Author: benh
Date: Mon May 31 17:59:54 2010
New Revision: 15815

Log:
[powerpc] Fix unnecessary ABI change

Added:
   dists/sid/linux-2.6/debian/patches/debian/powerpc-Restore-header-inclusion-to-maintain-ABI.patch
   dists/sid/linux-2.6/debian/patches/series/15
Modified:
   dists/sid/linux-2.6/debian/changelog

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon May 31 17:57:08 2010	(r15814)
+++ dists/sid/linux-2.6/debian/changelog	Mon May 31 17:59:54 2010	(r15815)
@@ -2,6 +2,7 @@
 
   [ Ben Hutchings ]
   * [hppa] Ignore ABI change caused by disabling CONFIG_IDE_TIMINGS
+  * [powerpc] Fix unnecessary ABI change
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 31 May 2010 18:46:34 +0100
 

Added: dists/sid/linux-2.6/debian/patches/debian/powerpc-Restore-header-inclusion-to-maintain-ABI.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/debian/powerpc-Restore-header-inclusion-to-maintain-ABI.patch	Mon May 31 17:59:54 2010	(r15815)
@@ -0,0 +1,29 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Mon, 31 May 2010 18:42:26 +0100
+Subject: [PATCH] [powerpc] Restore header inclusion to maintain ABI
+
+commit 73ef533de7533fcf514403125a0d4747d3390317 "powerpc/perf_event:
+Fix oops due to perf_event_do_pending call" removed use of the
+perf_event API from arch/powerpc/kernel/irq.c and also removed the
+now-redundant inclusion of <linux/perf_event.h>.  Unfortunately this
+changed the symbol magic for several functions exported from this
+file.  Restore the header inclusion for now.
+---
+ arch/powerpc/kernel/irq.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
+index 8564a41..a7018de 100644
+--- a/arch/powerpc/kernel/irq.c
++++ b/arch/powerpc/kernel/irq.c
+@@ -53,6 +53,7 @@
+ #include <linux/bootmem.h>
+ #include <linux/pci.h>
+ #include <linux/debugfs.h>
++#include <linux/perf_event.h>
+ 
+ #include <asm/uaccess.h>
+ #include <asm/system.h>
+-- 
+1.7.1
+

Added: dists/sid/linux-2.6/debian/patches/series/15
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/series/15	Mon May 31 17:59:54 2010	(r15815)
@@ -0,0 +1 @@
++ debian/powerpc-Restore-header-inclusion-to-maintain-ABI.patch