From c42501b7e5dfb48d1971a26297783bbfb7b31a77 Mon Sep 17 00:00:00 2001
From: Will Drewry <wad@chromium.org>
Date: Thu, 15 Nov 2012 22:11:29 +0100
Subject: [PATCH] --- yaml --- r: 339513 b: refs/heads/master c:
 1f59d13bee172945ccdfbc5018477ba94a0ac28e h: refs/heads/master i:   339511:
 41e71b71f4d7c2a370c7bee15ac0821983b0530f v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/include/asm/syscall.h | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e967b9c880a0..27d55b1ecfe9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ecb47de3490b8f2d4b818568935da9ca2c22398
+refs/heads/master: 1f59d13bee172945ccdfbc5018477ba94a0ac28e
diff --git a/trunk/arch/arm/include/asm/syscall.h b/trunk/arch/arm/include/asm/syscall.h
index 9fdded6b1089..f1d96d4e8092 100644
--- a/trunk/arch/arm/include/asm/syscall.h
+++ b/trunk/arch/arm/include/asm/syscall.h
@@ -7,6 +7,8 @@
 #ifndef _ASM_ARM_SYSCALL_H
 #define _ASM_ARM_SYSCALL_H
 
+#include <linux/audit.h> /* for AUDIT_ARCH_* */
+#include <linux/elf.h> /* for ELF_EM */
 #include <linux/err.h>
 #include <linux/sched.h>
 
@@ -95,4 +97,11 @@ static inline void syscall_set_arguments(struct task_struct *task,
 	memcpy(&regs->ARM_r0 + i, args, n * sizeof(args[0]));
 }
 
+static inline int syscall_get_arch(struct task_struct *task,
+				   struct pt_regs *regs)
+{
+	/* ARM tasks don't change audit architectures on the fly. */
+	return AUDIT_ARCH_ARM;
+}
+
 #endif /* _ASM_ARM_SYSCALL_H */