summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2011-12-13 15:07:49 +0000
committerDavid Howells <dhowells@redhat.com>2011-12-13 15:07:49 +0000
commit989e986f5b1748fe3ff714954dc0d23780c43a9c (patch)
treed50198a809033b527bc79e012ebaf7a680ff1f96
parenta648bd0c9f613d8f9954eccff6009ecfb26e2722 (diff)
downloadlinux-3.10-989e986f5b1748fe3ff714954dc0d23780c43a9c.tar.gz
linux-3.10-989e986f5b1748fe3ff714954dc0d23780c43a9c.tar.bz2
linux-3.10-989e986f5b1748fe3ff714954dc0d23780c43a9c.zip
UAPI: Fix AHZ multiple inclusion when __KERNEL__ is removed
Fix AHZ multiple inclusion when __KERNEL__ is removed as part of the separation of the userspace headers from the kernel headers. Signed-off-by: David Howells <dhowells@redhat.com>
-rw-r--r--include/linux/acct.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/acct.h b/include/linux/acct.h
index 3e4737fa6cc..d537aa0ec41 100644
--- a/include/linux/acct.h
+++ b/include/linux/acct.h
@@ -146,6 +146,9 @@ extern void acct_exit_ns(struct pid_namespace *);
*
*/
+#undef ACCT_VERSION
+#undef AHZ
+
#ifdef CONFIG_BSD_PROCESS_ACCT_V3
#define ACCT_VERSION 3
#define AHZ 100