Avoid ABI change due to added #include in <linux/ptrace.h>

svn path=/dists/sid/linux/; revision=21510
This commit is contained in:
Ben Hutchings 2014-07-07 10:11:03 +00:00
parent 54c5cfaaf7
commit 1eb4f6f68a
2 changed files with 21 additions and 0 deletions

View File

@ -0,0 +1,20 @@
From: Ben Hutchings <ben@decadent.org.uk>
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 <linux/sched.h> /* For struct task_struct. */
#include <linux/err.h> /* for IS_ERR_VALUE */
#include <linux/bug.h> /* For BUG_ON. */
+#ifndef __GENKSYMS__
#include <linux/pid_namespace.h> /* For task_active_pid_ns. */
+#endif
#include <uapi/linux/ptrace.h>
/*

View File

@ -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