diff options
| author | Ben Hutchings <benh@debian.org> | 2013-06-15 02:45:26 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2013-06-15 02:45:26 +0000 |
| commit | 516012c2356adffe250329f54454af84bd4b03ac (patch) | |
| tree | 3995cbd428fdb6fb4eacd6b8e48403365be77fb3 | |
| parent | df6206a096483db827b5d45c9db576d169b5884e (diff) | |
| download | kernel_replicant_linux-516012c2356adffe250329f54454af84bd4b03ac.tar.gz kernel_replicant_linux-516012c2356adffe250329f54454af84bd4b03ac.tar.bz2 kernel_replicant_linux-516012c2356adffe250329f54454af84bd4b03ac.zip | |
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
| -rw-r--r-- | debian/config/armhf/defines | 5 | ||||
| -rw-r--r-- | debian/config/defines | 2 | ||||
| -rw-r--r-- | debian/patches/debian/powerpc-machdep-avoid-abi-change-in-3.9.6.patch | 27 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 35 insertions, 0 deletions
diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines index 643a4d30e249..f5d248bbd377 100644 --- a/debian/config/armhf/defines +++ b/debian/config/armhf/defines @@ -1,3 +1,8 @@ +[abi] +ignore-changes: + musb_* + tusb_* + [base] flavours: armmp diff --git a/debian/config/defines b/debian/config/defines index 3281f5f22d5d..90501914e4bf 100644 --- a/debian/config/defines +++ b/debian/config/defines @@ -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: diff --git a/debian/patches/debian/powerpc-machdep-avoid-abi-change-in-3.9.6.patch b/debian/patches/debian/powerpc-machdep-avoid-abi-change-in-3.9.6.patch new file mode 100644 index 000000000000..eadda4beadc6 --- /dev/null +++ b/debian/patches/debian/powerpc-machdep-avoid-abi-change-in-3.9.6.patch @@ -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); diff --git a/debian/patches/series b/debian/patches/series index d30db611ce0d..ab40246a528c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -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 |