diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2016-09-19 18:10:01 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-09-19 18:10:01 +0100 |
| commit | 5a8adae35bac0292b70183eb54bf6fb8b6ed94de (patch) | |
| tree | 9b91ef4435284a8b12d69a491c09f5497abbf49d | |
| parent | aaa85335e131f09efe0b30e9fafb69719b8bfce8 (diff) | |
| download | kernel_replicant_linux-5a8adae35bac0292b70183eb54bf6fb8b6ed94de.tar.gz kernel_replicant_linux-5a8adae35bac0292b70183eb54bf6fb8b6ed94de.tar.bz2 kernel_replicant_linux-5a8adae35bac0292b70183eb54bf6fb8b6ed94de.zip | |
[arm64] Revert "arm64: Define AT_VECTOR_SIZE_ARCH for ARCH_DLINFO" (fixes FTBFS)
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/debian/revert-arm64-define-at_vector_size_arch-for-arch_dlinfo.patch | 30 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 38 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 034d344035f2..c4e835dda666 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux (4.7.4-2) UNRELEASED; urgency=medium + + * [arm64] Revert "arm64: Define AT_VECTOR_SIZE_ARCH for ARCH_DLINFO" + (fixes FTBFS) + + -- Ben Hutchings <ben@decadent.org.uk> Mon, 19 Sep 2016 18:05:52 +0100 + linux (4.7.4-1) unstable; urgency=medium * New upstream stable update: diff --git a/debian/patches/debian/revert-arm64-define-at_vector_size_arch-for-arch_dlinfo.patch b/debian/patches/debian/revert-arm64-define-at_vector_size_arch-for-arch_dlinfo.patch new file mode 100644 index 000000000000..087cf4f9a70a --- /dev/null +++ b/debian/patches/debian/revert-arm64-define-at_vector_size_arch-for-arch_dlinfo.patch @@ -0,0 +1,30 @@ +From: Ben Hutchings <ben@decadent.org.uk> +Date: Mon, 19 Sep 2016 18:07:24 +0100 +Subject: Revert "arm64: Define AT_VECTOR_SIZE_ARCH for ARCH_DLINFO" +Forwarded: not-needed + +This reverts commit a7408eca94745c441acb1c6b55ebeb08b735bf1f which +was commit 3146bc64d12377a74dbda12b96ea32da3774ae07 upstream. +The bug doesn't cause a real problem yet and the fix changes +struct mm_struct which breaks the module ABI. + +--- +--- a/arch/arm64/include/asm/elf.h ++++ b/arch/arm64/include/asm/elf.h +@@ -140,7 +140,6 @@ typedef struct user_fpsimd_state elf_fpr + + #define SET_PERSONALITY(ex) clear_thread_flag(TIF_32BIT); + +-/* update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT entries changes */ + #define ARCH_DLINFO \ + do { \ + NEW_AUX_ENT(AT_SYSINFO_EHDR, \ +--- a/arch/arm64/include/uapi/asm/auxvec.h ++++ b/arch/arm64/include/uapi/asm/auxvec.h +@@ -19,6 +19,4 @@ + /* vDSO location */ + #define AT_SYSINFO_EHDR 33 + +-#define AT_VECTOR_SIZE_ARCH 1 /* entries in ARCH_DLINFO */ +- + #endif diff --git a/debian/patches/series b/debian/patches/series index 973e027fdb99..cf33a7b768be 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -114,6 +114,7 @@ debian/i386-686-pae-pci-set-pci-nobios-by-default.patch bugfix/all/tcp-fix-use-after-free-in-tcp_xmit_retransmit_queue.patch # ABI maintenance +debian/revert-arm64-define-at_vector_size_arch-for-arch_dlinfo.patch # Tools bug fixes bugfix/all/usbip-document-tcp-wrappers.patch |