summaryrefslogtreecommitdiffstats
path: root/releases/2.6.32.58/fix-autofs-compile-without-config_compat.patch
diff options
context:
space:
mode:
Diffstat (limited to 'releases/2.6.32.58/fix-autofs-compile-without-config_compat.patch')
-rw-r--r--releases/2.6.32.58/fix-autofs-compile-without-config_compat.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/releases/2.6.32.58/fix-autofs-compile-without-config_compat.patch b/releases/2.6.32.58/fix-autofs-compile-without-config_compat.patch
new file mode 100644
index 0000000..1a02f8d
--- /dev/null
+++ b/releases/2.6.32.58/fix-autofs-compile-without-config_compat.patch
@@ -0,0 +1,40 @@
+From 3c761ea05a8900a907f32b628611873f6bef24b2 Mon Sep 17 00:00:00 2001
+From: Linus Torvalds <torvalds@linux-foundation.org>
+Date: Sun, 26 Feb 2012 09:44:55 -0800
+Subject: Fix autofs compile without CONFIG_COMPAT
+
+From: Linus Torvalds <torvalds@linux-foundation.org>
+
+commit 3c761ea05a8900a907f32b628611873f6bef24b2 upstream.
+
+The autofs compat handling fix caused a compile failure when
+CONFIG_COMPAT isn't defined.
+
+Instead of adding random #ifdef'fery in autofs, let's just make the
+compat helpers earlier to use: without CONFIG_COMPAT, is_compat_task()
+just hardcodes to zero.
+
+We could probably do something similar for a number of other cases where
+we have #ifdef's in code, but this is the low-hanging fruit.
+
+Reported-and-tested-by: Andreas Schwab <schwab@linux-m68k.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Jonathan Nieder <jrnieder@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/linux/compat.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/include/linux/compat.h
++++ b/include/linux/compat.h
+@@ -311,5 +311,9 @@ asmlinkage long compat_sys_openat(unsign
+
+ extern void __user *compat_alloc_user_space(unsigned long len);
+
++#else
++
++#define is_compat_task() (0)
++
+ #endif /* CONFIG_COMPAT */
+ #endif /* _LINUX_COMPAT_H */