[PATCH 01/13] Remove #ifdef CONFIG_64BIT from all asm-generic/fcntl.h

From: Palmer Dabbelt
Date: Tue Nov 03 2015 - 14:47:10 EST

When working on the RISC-V port I noticed that F_SETLK64 was being
defined on our 64-bit platform, despite our port being so new that
we've only ever had the 64-bit file ops. Since there's not compat
layer for these, this causes fcntl to bail out.

It turns out that one of the ways in with F_SETLK64 was being defined
(there's some more in glibc, but that's a whole different story... :))
is the result of CONFIG_64BIT showing up in this user-visible header.
<asm-generic/bitsperlong.h> confirms this isn't sane, so I replaced it
with a __BITS_PER_LONG check.

Signed-off-by: Palmer Dabbelt <palmer@xxxxxxxxxxx>
Reviewed-by: Andrew Waterman <waterman@xxxxxxxxxxxxxxxxx>
Reviewed-by: Albert Ou <aou@xxxxxxxxxxxxxxxxx>
include/uapi/asm-generic/fcntl.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h
index e063eff..14a5c82 100644
--- a/include/uapi/asm-generic/fcntl.h
+++ b/include/uapi/asm-generic/fcntl.h
@@ -1,6 +1,7 @@

+#include <asm/bitsperlong.h>
#include <linux/types.h>

@@ -115,7 +116,7 @@
#define F_GETSIG 11 /* for sockets. */

-#ifndef CONFIG_64BIT
+#if (__BITS_PER_LONG == 32)
#ifndef F_GETLK64
#define F_GETLK64 12 /* using 'struct flock64' */
#define F_SETLK64 13

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/