From 257521aeb6eb5663976b8588d58d7edcb5b91940 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Tue, 2 Oct 2012 18:01:56 +0100
Subject: [PATCH] --- yaml --- r: 329220 b: refs/heads/master c:
 c0522b6cc1237c935b2cead3fa7b45465df2f839 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/arch/x86/lib/insn.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ac6f1a3ef2cf..a5b5d004d605 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 584c5ef813c63354ed9e03b732048240c09b86af
+refs/heads/master: c0522b6cc1237c935b2cead3fa7b45465df2f839
diff --git a/trunk/arch/x86/lib/insn.c b/trunk/arch/x86/lib/insn.c
index b1e6c4b2e8eb..54fcffed28ed 100644
--- a/trunk/arch/x86/lib/insn.c
+++ b/trunk/arch/x86/lib/insn.c
@@ -18,7 +18,11 @@
  * Copyright (C) IBM Corporation, 2002, 2004, 2009
  */
 
+#ifdef __KERNEL__
 #include <linux/string.h>
+#else
+#include <string.h>
+#endif
 #include <asm/inat.h>
 #include <asm/insn.h>