[kernel] r22134 - in dists/sid/linux/debian/patches/features: all x86/apple-tb

[Ben Hutchings]

Author: benh
Date: Mon Dec  8 01:54:22 2014
New Revision: 22134

Log:
Fix ABI changes introduced by backported features

Modified:
   dists/sid/linux/debian/patches/features/all/of-Enable-console-on-serial-ports-specified-by-chose.patch
   dists/sid/linux/debian/patches/features/x86/apple-tb/pci-suspend-resume-quirks-for-apple-thunderbolt.patch

Modified: dists/sid/linux/debian/patches/features/all/of-Enable-console-on-serial-ports-specified-by-chose.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/all/of-Enable-console-on-serial-ports-specified-by-chose.patch	Mon Dec  8 01:47:13 2014	(r22133)
+++ dists/sid/linux/debian/patches/features/all/of-Enable-console-on-serial-ports-specified-by-chose.patch	Mon Dec  8 01:54:22 2014	(r22134)
@@ -19,23 +19,24 @@
 
 Signed-off-by: Grant Likely <grant.likely at linaro.org>
 Tested-by: Sascha Hauer <s.hauer at pengutronix.de>
+[bwh: Avoid ABI change]
 ---
  drivers/tty/serial/serial_core.c | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
-index fbf6c5a..3ce68f9 100644
 --- a/drivers/tty/serial/serial_core.c
 +++ b/drivers/tty/serial/serial_core.c
-@@ -26,6 +26,7 @@
+@@ -26,6 +26,9 @@
  #include <linux/slab.h>
  #include <linux/init.h>
  #include <linux/console.h>
++#ifndef __GENKSYMS__
 +#include <linux/of.h>
++#endif
  #include <linux/proc_fs.h>
  #include <linux/seq_file.h>
  #include <linux/device.h>
-@@ -2615,6 +2616,8 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport)
+@@ -2618,6 +2621,8 @@ int uart_add_one_port(struct uart_driver
  		spin_lock_init(&uport->lock);
  		lockdep_set_class(&uport->lock, &port_lock_key);
  	}
@@ -44,6 +45,3 @@
  
  	uart_configure_port(drv, state, uport);
  
--- 
-2.1.0
-

Modified: dists/sid/linux/debian/patches/features/x86/apple-tb/pci-suspend-resume-quirks-for-apple-thunderbolt.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/x86/apple-tb/pci-suspend-resume-quirks-for-apple-thunderbolt.patch	Mon Dec  8 01:47:13 2014	(r22133)
+++ dists/sid/linux/debian/patches/features/x86/apple-tb/pci-suspend-resume-quirks-for-apple-thunderbolt.patch	Mon Dec  8 01:54:22 2014	(r22134)
@@ -23,6 +23,7 @@
 
 Signed-off-by: Andreas Noever <andreas.noever at gmail.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
+[bwh: Avoid ABI change]
 ---
  drivers/pci/quirks.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 97 insertions(+)
@@ -133,3 +134,15 @@
  static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f,
  			  struct pci_fixup *end)
  {
+--- a/include/linux/pci.h
++++ b/include/linux/pci.h
+@@ -1485,7 +1485,9 @@ enum pci_fixup_pass {
+ 	pci_fixup_resume,	/* pci_device_resume() */
+ 	pci_fixup_suspend,	/* pci_device_suspend() */
+ 	pci_fixup_resume_early, /* pci_device_resume_early() */
++#ifndef __GENKSYMS__
+ 	pci_fixup_suspend_late,	/* pci_device_suspend_late() */
++#endif
+ };
+ 
+ /* Anonymous variables would be nice... */