[PATCH 1/1] linux/audit.h: move ptrace.h include to kernel header

From: Mike Frysinger
Date: Sun Dec 23 2012 - 20:57:11 EST

While the kernel internals want pt_regs (and so it includes
linux/ptrace.h), the user version of audit.h does not need
it. So move the include out of the uapi version.

This avoids issues where people want the audit defines and
userland ptrace api. Including both the kernel ptrace and
the userland ptrace headers can easily lead to failure.

Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
include/linux/audit.h | 1 +
include/uapi/linux/audit.h | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/audit.h b/include/linux/audit.h
index bce729a..9929785 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -24,6 +24,7 @@
#define _LINUX_AUDIT_H_

#include <linux/sched.h>
+#include <linux/ptrace.h>
#include <uapi/linux/audit.h>

struct audit_sig_info {
diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h
index 76352ac..ab8663f 100644
--- a/include/uapi/linux/audit.h
+++ b/include/uapi/linux/audit.h
@@ -26,7 +26,6 @@

#include <linux/types.h>
#include <linux/elf-em.h>
-#include <linux/ptrace.h>

/* The netlink messages for the audit system is divided into blocks:
* 1000 - 1099 are for commanding the audit system

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/