From 1eb4f6f68a416a4db43fbd460d81b5c6d90dc758 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 7 Jul 2014 10:11:03 +0000 Subject: [PATCH] Avoid ABI change due to added #include in svn path=/dists/sid/linux/; revision=21510 --- .../ptrace-avoid-abi-change-in-3.14.10.patch | 20 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 21 insertions(+) create mode 100644 debian/patches/debian/ptrace-avoid-abi-change-in-3.14.10.patch diff --git a/debian/patches/debian/ptrace-avoid-abi-change-in-3.14.10.patch b/debian/patches/debian/ptrace-avoid-abi-change-in-3.14.10.patch new file mode 100644 index 000000000..6a36a0b42 --- /dev/null +++ b/debian/patches/debian/ptrace-avoid-abi-change-in-3.14.10.patch @@ -0,0 +1,20 @@ +From: Ben Hutchings +Date: Mon, 07 Jul 2014 09:52:12 +0100 +Subject: ptrace: Avoid ABI change in 3.14.10 +Forwarded: not-needed + +Hide a new #include from genksyms, which changed the symbol hashes for +most of networking. + +--- a/include/linux/ptrace.h ++++ b/include/linux/ptrace.h +@@ -5,7 +5,9 @@ + #include /* For struct task_struct. */ + #include /* for IS_ERR_VALUE */ + #include /* For BUG_ON. */ ++#ifndef __GENKSYMS__ + #include /* For task_active_pid_ns. */ ++#endif + #include + + /* diff --git a/debian/patches/series b/debian/patches/series index 1fa781164..dd621771e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -94,3 +94,4 @@ debian/alsa-avoid-abi-change-for-cve-2014-4652-fix.patch bugfix/all/ptrace-x86-force-IRET-path-after-a-ptrace_stop.patch bugfix/all/shmem-fix-faulting-into-a-hole-while-it-s-punched.patch debian/irq-avoid-abi-change-in-3.14.10.patch +debian/ptrace-avoid-abi-change-in-3.14.10.patch