Commit 6b7a6c94 authored Feb 21, 2006 by Jeff Mahoney Committed by Mark Fasheh Mar 01, 2006

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

parent 96789ac4

fs/ocfs2/cluster/masklog.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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"