Resolve ABI changes in 3.9.6
The musb, usb-serial and snd-hda-intel changes can all be ignored. The powerpc machdep_calls change adds a function pointer that's neither used or implemented by modules, so move it to the end of the struct and hide it from genksyms. svn path=/dists/sid/linux/; revision=20252
This commit is contained in:
parent
df6206a096
commit
516012c235
|
@ -1,3 +1,8 @@
|
|||
[abi]
|
||||
ignore-changes:
|
||||
musb_*
|
||||
tusb_*
|
||||
|
||||
[base]
|
||||
flavours:
|
||||
armmp
|
||||
|
|
|
@ -3,6 +3,8 @@ abiname: 1
|
|||
ignore-changes:
|
||||
module:drivers/scsi/qla2xxx/qla2xxx
|
||||
module:drivers/target/*
|
||||
module:drivers/usb/serial/*
|
||||
module:sound/pci/hda/*
|
||||
|
||||
[base]
|
||||
arches:
|
||||
|
|
|
@ -0,0 +1,27 @@
|
|||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Subject: powerpc/machdep: Avoid ABI change in 3.9.6
|
||||
Forwarded: not-needed
|
||||
|
||||
--- a/arch/powerpc/include/asm/machdep.h
|
||||
+++ b/arch/powerpc/include/asm/machdep.h
|
||||
@@ -108,8 +108,6 @@ struct machdep_calls {
|
||||
void (*pcibios_fixup)(void);
|
||||
int (*pci_probe_mode)(struct pci_bus *);
|
||||
void (*pci_irq_fixup)(struct pci_dev *dev);
|
||||
- int (*pcibios_root_bridge_prepare)(struct pci_host_bridge
|
||||
- *bridge);
|
||||
|
||||
/* To setup PHBs when using automatic OF platform driver for PCI */
|
||||
int (*pci_setup_phb)(struct pci_controller *host);
|
||||
@@ -259,6 +257,11 @@ struct machdep_calls {
|
||||
ssize_t (*cpu_probe)(const char *, size_t);
|
||||
ssize_t (*cpu_release)(const char *, size_t);
|
||||
#endif
|
||||
+
|
||||
+#ifndef __GENKSYMS__
|
||||
+ int (*pcibios_root_bridge_prepare)(struct pci_host_bridge
|
||||
+ *bridge);
|
||||
+#endif
|
||||
};
|
||||
|
||||
extern void e500_idle(void);
|
|
@ -106,3 +106,4 @@ features/arm/0001-ARM-mvebu-Add-thermal-support-to-Armada-XP-device-tr.patch
|
|||
|
||||
bugfix/all/ath9k-Disable-PowerSave-by-default.patch
|
||||
bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch
|
||||
debian/powerpc-machdep-avoid-abi-change-in-3.9.6.patch
|
||||
|
|
Loading…
Reference in New Issue