From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 26 Feb 2012 17:44:55 +0000 (-0800)
Subject: Fix autofs compile without CONFIG_COMPAT
X-Git-Tag: firefly_0821_release~7541^2~1664
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a3ea6c14ec93e67c08de43bdf8ce7d701835152f;p=firefly-linux-kernel-4.4.55.git

Fix autofs compile without CONFIG_COMPAT

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>
---

diff --git a/include/linux/compat.h b/include/linux/compat.h
index 846bb1792572..edaf3900f6bc 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -561,5 +561,9 @@ extern ssize_t compat_rw_copy_check_uvector(int type,
 
 extern void __user *compat_alloc_user_space(unsigned long len);
 
+#else
+
+#define is_compat_task() (0)
+
 #endif /* CONFIG_COMPAT */
 #endif /* _LINUX_COMPAT_H */