From 69ba187e2e05db1421921da60e16200888c2e7f5 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Tue, 13 Dec 2011 15:07:49 +0000
Subject: [PATCH] --- yaml --- r: 285012 b: refs/heads/master c:
 989e986f5b1748fe3ff714954dc0d23780c43a9c h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/acct.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7000e2948f2b..3b5d47f8bc88 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a648bd0c9f613d8f9954eccff6009ecfb26e2722
+refs/heads/master: 989e986f5b1748fe3ff714954dc0d23780c43a9c
diff --git a/trunk/include/linux/acct.h b/trunk/include/linux/acct.h
index 3e4737fa6cce..d537aa0ec414 100644
--- a/trunk/include/linux/acct.h
+++ b/trunk/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