From 2adb1ed6f0312300ec6e90d4dc11c49703367cea Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 26 Feb 2012 09:44:55 -0800
Subject: [PATCH] --- yaml --- r: 287946 b: refs/heads/master c:
 3c761ea05a8900a907f32b628611873f6bef24b2 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d648110a93f2..0dcfb3b05610 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b21d18ed50c7d145220b0724ea7f2613abf0f95
+refs/heads/master: 3c761ea05a8900a907f32b628611873f6bef24b2
diff --git a/trunk/include/linux/compat.h b/trunk/include/linux/compat.h
index 41c9f6515f46..7e05fcee75a1 100644
--- a/trunk/include/linux/compat.h
+++ b/trunk/include/linux/compat.h
@@ -561,5 +561,9 @@ asmlinkage ssize_t compat_sys_process_vm_writev(compat_pid_t pid,
 		unsigned long liovcnt, const struct compat_iovec __user *rvec,
 		unsigned long riovcnt, unsigned long flags);
 
+#else
+
+#define is_compat_task() (0)
+
 #endif /* CONFIG_COMPAT */
 #endif /* _LINUX_COMPAT_H */