From e82a500c44d2183964fcb8a2988f53be9e9058ff Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 18 Jun 2012 05:16:18 +0000 Subject: [PATCH] Bump ABI to 3; drop patches needed to avoid earlier ABI changes svn path=/dists/sid/linux/; revision=19165 --- debian/changelog | 1 + debian/config/defines | 4 +- .../debian/avoid-ABI-change-for-hidepid.patch | 16 ----- .../patches/debian/efi-avoid-ABI-change.patch | 14 ----- .../fork-avoid-ABI-change-in-3.2.18.patch | 14 ----- .../mmc-Avoid-ABI-change-in-3.2.19.patch | 34 ----------- ...estore-skb_set_dev-removed-in-3.2.20.patch | 17 ------ ...ange-from-improvement-to-utf8s_to_ut.patch | 60 ------------------- ...de-flag-for-rtc-devices-that-don-t-s.patch | 60 ------------------- .../skbuff-avoid-ABI-change-in-3.2.17.patch | 14 ----- .../usb-hcd-avoid-ABI-change-in-3.2.17.patch | 15 ----- debian/patches/series | 12 ---- 12 files changed, 2 insertions(+), 259 deletions(-) delete mode 100644 debian/patches/debian/avoid-ABI-change-for-hidepid.patch delete mode 100644 debian/patches/debian/efi-avoid-ABI-change.patch delete mode 100644 debian/patches/debian/fork-avoid-ABI-change-in-3.2.18.patch delete mode 100644 debian/patches/debian/mmc-Avoid-ABI-change-in-3.2.19.patch delete mode 100644 debian/patches/debian/net-restore-skb_set_dev-removed-in-3.2.20.patch delete mode 100644 debian/patches/debian/nls-Avoid-ABI-change-from-improvement-to-utf8s_to_ut.patch delete mode 100644 debian/patches/debian/revert-rtc-Provide-flag-for-rtc-devices-that-don-t-s.patch delete mode 100644 debian/patches/debian/skbuff-avoid-ABI-change-in-3.2.17.patch delete mode 100644 debian/patches/debian/usb-hcd-avoid-ABI-change-in-3.2.17.patch diff --git a/debian/changelog b/debian/changelog index 4cf4e3c20..a1e352c44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ linux (3.2.20-2) UNRELEASED; urgency=low - HWMON: Convert via-cputemp to x86 cpuid autoprobing - cpufreq: Add support for x86 cpuinfo auto loading (Closes: #664813) * [x86] ACPI: Load acpi-cpufreq from processor driver automatically + * Bump ABI to 3 [ Aurelien Jarno ] * [mips,mipsel] udeb: Remove rivafb and nvidiafb. diff --git a/debian/config/defines b/debian/config/defines index 6459309a2..e5af24d8a 100644 --- a/debian/config/defines +++ b/debian/config/defines @@ -1,7 +1,5 @@ [abi] -abiname: 2 -ignore-changes: module:drivers/net/wireless/ath/ath9k/* - module:drivers/hv/* +abiname: 3 [base] arches: diff --git a/debian/patches/debian/avoid-ABI-change-for-hidepid.patch b/debian/patches/debian/avoid-ABI-change-for-hidepid.patch deleted file mode 100644 index f37aa9a2d..000000000 --- a/debian/patches/debian/avoid-ABI-change-for-hidepid.patch +++ /dev/null @@ -1,16 +0,0 @@ -From: Ben Hutchings -Subject: Avoid ABI change for hidepid - ---- a/include/linux/pid_namespace.h -+++ b/include/linux/pid_namespace.h -@@ -30,8 +30,10 @@ - #ifdef CONFIG_BSD_PROCESS_ACCT - struct bsd_acct_struct *bacct; - #endif -+#ifndef __GENKSYMS__ - gid_t pid_gid; - int hide_pid; -+#endif - }; - - extern struct pid_namespace init_pid_ns; diff --git a/debian/patches/debian/efi-avoid-ABI-change.patch b/debian/patches/debian/efi-avoid-ABI-change.patch deleted file mode 100644 index 78c582080..000000000 --- a/debian/patches/debian/efi-avoid-ABI-change.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/include/linux/efi.h -+++ b/include/linux/efi.h -@@ -312,7 +312,11 @@ - unsigned long stderr_handle; - unsigned long stderr; - efi_runtime_services_t *runtime; -+#ifdef __GENKSYMS__ -+ unsigned long boottime; -+#else - efi_boot_services_t *boottime; -+#endif - unsigned long nr_tables; - unsigned long tables; - } efi_system_table_t; diff --git a/debian/patches/debian/fork-avoid-ABI-change-in-3.2.18.patch b/debian/patches/debian/fork-avoid-ABI-change-in-3.2.18.patch deleted file mode 100644 index 061e3fad9..000000000 --- a/debian/patches/debian/fork-avoid-ABI-change-in-3.2.18.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/kernel/fork.c b/kernel/fork.c -index 26f1ab0..1291a50 100644 ---- a/kernel/fork.c -+++ b/kernel/fork.c -@@ -47,7 +47,9 @@ - #include - #include - #include -+#ifndef __GENKSYMS__ - #include -+#endif - #include - #include - #include diff --git a/debian/patches/debian/mmc-Avoid-ABI-change-in-3.2.19.patch b/debian/patches/debian/mmc-Avoid-ABI-change-in-3.2.19.patch deleted file mode 100644 index b6654de89..000000000 --- a/debian/patches/debian/mmc-Avoid-ABI-change-in-3.2.19.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Ben Hutchings -Date: Thu, 31 May 2012 04:04:55 +0100 -Subject: [PATCH] mmc: Avoid ABI change in 3.2.19 - ---- - include/linux/mmc/host.h | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h -index deb6282..20caeb0 100644 ---- a/include/linux/mmc/host.h -+++ b/include/linux/mmc/host.h -@@ -303,7 +303,6 @@ struct mmc_host { - - unsigned int sdio_irqs; - struct task_struct *sdio_irq_thread; -- bool sdio_irq_pending; - atomic_t sdio_irq_thread_abort; - - mmc_pm_flag_t pm_flags; /* requested pm features */ -@@ -315,6 +314,10 @@ struct mmc_host { - #ifdef CONFIG_REGULATOR - bool regulator_enabled; /* regulator state */ - #endif -+#if !(defined(__GENKSYMS__) && defined(CONFIG_REGULATOR)) -+ /* Use the hole after regulator_enabled to avoid an ABI change */ -+ bool sdio_irq_pending; -+#endif - - struct dentry *debugfs_root; - --- -1.7.10 - diff --git a/debian/patches/debian/net-restore-skb_set_dev-removed-in-3.2.20.patch b/debian/patches/debian/net-restore-skb_set_dev-removed-in-3.2.20.patch deleted file mode 100644 index f1f014eee..000000000 --- a/debian/patches/debian/net-restore-skb_set_dev-removed-in-3.2.20.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/net/core/dev.c -+++ b/net/core/dev.c -@@ -1869,6 +1869,14 @@ - } - EXPORT_SYMBOL(netif_device_attach); - -+/* This function was a bad idea and was removed in 3.2.20 */ -+void skb_set_dev(struct sk_buff *skb, struct net_device *dev) -+{ -+ WARN_ON_ONCE(!net_eq(dev_net(skb->dev), dev_net(dev))); -+ skb->dev = dev; -+} -+EXPORT_SYMBOL(skb_set_dev); -+ - /* - * Invalidate hardware checksum when packet is to be mangled, and - * complete checksum manually on outgoing path. diff --git a/debian/patches/debian/nls-Avoid-ABI-change-from-improvement-to-utf8s_to_ut.patch b/debian/patches/debian/nls-Avoid-ABI-change-from-improvement-to-utf8s_to_ut.patch deleted file mode 100644 index 9389aa233..000000000 --- a/debian/patches/debian/nls-Avoid-ABI-change-from-improvement-to-utf8s_to_ut.patch +++ /dev/null @@ -1,60 +0,0 @@ -From: Ben Hutchings -Date: Mon, 9 Apr 2012 00:51:37 +0100 -Subject: [PATCH] nls: Avoid ABI change from improvement to utf8s_to_utf16s - -It's easy to add a temporary wrapper for binary-compatibility. ---- - fs/nls/nls_base.c | 13 ++++++++++++- - include/linux/nls.h | 4 +++- - 2 files changed, 15 insertions(+), 2 deletions(-) - -diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c -index 0eb059e..91f145a 100644 ---- a/fs/nls/nls_base.c -+++ b/fs/nls/nls_base.c -@@ -129,7 +129,7 @@ static inline void put_utf16(wchar_t *s, unsigned c, enum utf16_endian endian) - } - } - --int utf8s_to_utf16s(const u8 *s, int len, enum utf16_endian endian, -+int utf8s_to_utf16s_new(const u8 *s, int len, enum utf16_endian endian, - wchar_t *pwcs, int maxlen) - { - u16 *op; -@@ -171,6 +171,17 @@ int utf8s_to_utf16s(const u8 *s, int len, enum utf16_endian endian, - } - EXPORT_SYMBOL(utf8s_to_utf16s); - -+/* Binary-compatibility wrapper */ -+#undef utf8s_to_utf16s -+int utf8s_to_utf16s(const u8 *s, int len, wchar_t *pwcs) -+{ -+ /* Output length in code units is never longer than input -+ * length in bytes, so we can trivially set maxlen = len. -+ */ -+ return utf8s_to_utf16s_new(s, len, UTF16_HOST_ENDIAN, pwcs, len); -+} -+EXPORT_SYMBOL(utf8s_to_utf16s); -+ - static inline unsigned long get_utf16(unsigned c, enum utf16_endian endian) - { - switch (endian) { -diff --git a/include/linux/nls.h b/include/linux/nls.h -index 5dc635f..6a2a00c 100644 ---- a/include/linux/nls.h -+++ b/include/linux/nls.h -@@ -52,8 +52,10 @@ extern struct nls_table *load_nls_default(void); - - extern int utf8_to_utf32(const u8 *s, int len, unicode_t *pu); - extern int utf32_to_utf8(unicode_t u, u8 *s, int maxlen); --extern int utf8s_to_utf16s(const u8 *s, int len, -+extern int utf8s_to_utf16s(const u8 *s, int len, wchar_t *pwcs); -+extern int utf8s_to_utf16s_new(const u8 *s, int len, - enum utf16_endian endian, wchar_t *pwcs, int maxlen); -+#define utf8s_to_utf16s utf8s_to_utf16s_new - extern int utf16s_to_utf8s(const wchar_t *pwcs, int len, - enum utf16_endian endian, u8 *s, int maxlen); - --- -1.7.9.5 - diff --git a/debian/patches/debian/revert-rtc-Provide-flag-for-rtc-devices-that-don-t-s.patch b/debian/patches/debian/revert-rtc-Provide-flag-for-rtc-devices-that-don-t-s.patch deleted file mode 100644 index 8117ab348..000000000 --- a/debian/patches/debian/revert-rtc-Provide-flag-for-rtc-devices-that-don-t-s.patch +++ /dev/null @@ -1,60 +0,0 @@ -From: Ben Hutchings -Date: Wed, 4 Apr 2012 05:32:11 +0100 -Subject: [PATCH] Revert "rtc: Provide flag for rtc devices that don't support - UIE" - -This reverts commit 61d38cd909ad35ff497bf1a84cd57b2baf6d9c49. -It changes ABI and is only needed for rtc-mpc5121 which we don't -enable. ---- - drivers/rtc/interface.c | 5 ----- - drivers/rtc/rtc-mpc5121.c | 2 -- - include/linux/rtc.h | 3 +-- - 3 files changed, 1 insertion(+), 9 deletions(-) - -diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c -index 565742b..c1edbf8 100644 ---- a/drivers/rtc/interface.c -+++ b/drivers/rtc/interface.c -@@ -445,11 +445,6 @@ int rtc_update_irq_enable(struct rtc_device *rtc, unsigned int enabled) - if (rtc->uie_rtctimer.enabled == enabled) - goto out; - -- if (rtc->uie_unsupported) { -- err = -EINVAL; -- goto out; -- } -- - if (enabled) { - struct rtc_time tm; - ktime_t now, onesec; -diff --git a/drivers/rtc/rtc-mpc5121.c b/drivers/rtc/rtc-mpc5121.c -index 0fc2d22..da60915 100644 ---- a/drivers/rtc/rtc-mpc5121.c -+++ b/drivers/rtc/rtc-mpc5121.c -@@ -360,8 +360,6 @@ static int __devinit mpc5121_rtc_probe(struct platform_device *op) - &mpc5200_rtc_ops, THIS_MODULE); - } - -- rtc->rtc->uie_unsupported = 1; -- - if (IS_ERR(rtc->rtc)) { - err = PTR_ERR(rtc->rtc); - goto out_free_irq; -diff --git a/include/linux/rtc.h b/include/linux/rtc.h -index fcabfb4..93f4d03 100644 ---- a/include/linux/rtc.h -+++ b/include/linux/rtc.h -@@ -202,8 +202,7 @@ struct rtc_device - struct hrtimer pie_timer; /* sub second exp, so needs hrtimer */ - int pie_enabled; - struct work_struct irqwork; -- /* Some hardware can't support UIE mode */ -- int uie_unsupported; -+ - - #ifdef CONFIG_RTC_INTF_DEV_UIE_EMUL - struct work_struct uie_task; --- -1.7.9.5 - diff --git a/debian/patches/debian/skbuff-avoid-ABI-change-in-3.2.17.patch b/debian/patches/debian/skbuff-avoid-ABI-change-in-3.2.17.patch deleted file mode 100644 index a1041dafb..000000000 --- a/debian/patches/debian/skbuff-avoid-ABI-change-in-3.2.17.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h -index e689b47..cc2eefd 100644 ---- a/include/linux/skbuff.h -+++ b/include/linux/skbuff.h -@@ -458,7 +458,9 @@ struct sk_buff { - union { - __u32 mark; - __u32 dropcount; -+#ifndef __GENKSYMS__ - __u32 avail_size; -+#endif - }; - - __u16 vlan_tci; diff --git a/debian/patches/debian/usb-hcd-avoid-ABI-change-in-3.2.17.patch b/debian/patches/debian/usb-hcd-avoid-ABI-change-in-3.2.17.patch deleted file mode 100644 index 7801297a7..000000000 --- a/debian/patches/debian/usb-hcd-avoid-ABI-change-in-3.2.17.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h -index 64cec8d..605092f 100644 ---- a/include/linux/usb/hcd.h -+++ b/include/linux/usb/hcd.h -@@ -128,8 +128,10 @@ struct usb_hcd { - unsigned wireless:1; /* Wireless USB HCD */ - unsigned authorized_default:1; - unsigned has_tt:1; /* Integrated TT in root hub */ -+#ifndef __GENKSYMS__ - unsigned broken_pci_sleep:1; /* Don't put the - controller in PCI-D3 for system sleep */ -+#endif - - int irq; /* irq allocated */ - void __iomem *regs; /* device memory/io */ diff --git a/debian/patches/series b/debian/patches/series index 84a30dfeb..42192ebe2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -178,16 +178,6 @@ features/x86/efi-stub/0017-x86-efi-Add-dedicated-EFI-stub-entry-point.patch bugfix/all/brcmsmac-INTERMEDIATE-but-not-AMPDU-only-when-tracin.patch bugfix/all/NFSv4-Rate-limit-the-state-manager-for-lock-reclaim-.patch -# Temporary, until the next ABI bump -debian/revert-rtc-Provide-flag-for-rtc-devices-that-don-t-s.patch -debian/nls-Avoid-ABI-change-from-improvement-to-utf8s_to_ut.patch -debian/efi-avoid-ABI-change.patch -debian/skbuff-avoid-ABI-change-in-3.2.17.patch -debian/usb-hcd-avoid-ABI-change-in-3.2.17.patch -debian/fork-avoid-ABI-change-in-3.2.18.patch -debian/mmc-Avoid-ABI-change-in-3.2.19.patch -debian/net-restore-skb_set_dev-removed-in-3.2.20.patch - bugfix/all/ext4-Report-max_batch_time-option-correctly.patch # Update wacom driver to 3.5ish @@ -309,8 +299,6 @@ features/all/hidepid/0001-procfs-parse-mount-options.patch features/all/hidepid/0002-procfs-add-hidepid-and-gid-mount-options.patch features/all/hidepid/0003-proc-fix-null-pointer-deref-in-proc_pid_permission.patch features/all/hidepid/0004-proc-fix-mount-t-proc-o-AAA.patch -# Temporary, until the next ABI bump -debian/avoid-ABI-change-for-hidepid.patch bugfix/all/NFSv4-Reduce-the-footprint-of-the-idmapper.patch bugfix/all/NFSv4-Further-reduce-the-footprint-of-the-idmapper.patch