summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2006-02-21 11:57:30 -0500
committerMark Fasheh <mark.fasheh@oracle.com>2006-03-01 11:15:49 -0800
commit6b7a6c94c9c15b2664b568ead83e6b3aaf60d65c (patch)
tree4df54f212e9fce05125929f6da25f1661f0d2246 /fs
parent96789ac4b3943fec27fb6bf2713633b01a3903ad (diff)
downloadop-kernel-dev-6b7a6c94c9c15b2664b568ead83e6b3aaf60d65c.zip
op-kernel-dev-6b7a6c94c9c15b2664b568ead83e6b3aaf60d65c.tar.gz
[PATCH] ocfs2: fix -Wformat warnings when building UML on x86-64
The check to determine which format string is appopriate for u64 and friends works in most cases, but UML on x86_64 doesn't define CONFIG_X86_64, so it results in screen fulls of compile-time warnings. This patch fixes it to handle that case. fs/ocfs2/cluster/masklog.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/ocfs2/cluster/masklog.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/cluster/masklog.h b/fs/ocfs2/cluster/masklog.h
index e8c56a3..2cadc30 100644
--- a/fs/ocfs2/cluster/masklog.h
+++ b/fs/ocfs2/cluster/masklog.h
@@ -256,7 +256,7 @@ extern struct mlog_bits mlog_and_bits, mlog_not_bits;
} \
} while (0)
-#if (BITS_PER_LONG == 32) || defined(CONFIG_X86_64)
+#if (BITS_PER_LONG == 32) || defined(CONFIG_X86_64) || (defined(CONFIG_UML_X86) && defined(CONFIG_64BIT))
#define MLFi64 "lld"
#define MLFu64 "llu"
#define MLFx64 "llx"
OpenPOWER on IntegriCloud