From: girish <girish>
Date: Wed, 6 Aug 2008 19:12:06 +0000 (+0000)
Subject: Cleanup compile warnings. (Patch by Andreas)
X-Git-Tag: v1_7_72~1^2~1
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=d2ec94c2d64a12de1415a185a54078059bc06ca7;p=fs%2Flustre-release.git

Cleanup compile warnings. (Patch by Andreas)
b=15981
i=rread
i=girish
---

diff --git a/lnet/include/libcfs/linux/kp30.h b/lnet/include/libcfs/linux/kp30.h
index 116d49f..aa6e536497d 100644
--- a/lnet/include/libcfs/linux/kp30.h
+++ b/lnet/include/libcfs/linux/kp30.h
@@ -412,18 +412,12 @@ extern int  lwt_snapshot (cycles_t *now, int *ncpu, int *total_size,
  #define _LWORDSIZE __WORDSIZE
 #endif
 
-#if (defined(__x86_64__) && (defined(__KERNEL__) || defined(CRAY_XT3))) || defined(HAVE_U64_LONG_LONG)
-/* x86_64 defines __u64 as "long" in userspace, but "long long" in the kernel */
+#if defined(HAVE_U64_LONG_LONG)
 # define LPU64 "%Lu"
 # define LPD64 "%Ld"
 # define LPX64 "%#Lx"
 # define LPF64 "L"
-#elif (_LWORDSIZE == 32)
-# define LPU64 "%Lu"
-# define LPD64 "%Ld"
-# define LPX64 "%#Lx"
-# define LPF64 "L"
-#elif (_LWORDSIZE == 64)
+#else
 # define LPU64 "%lu"
 # define LPD64 "%ld"
 # define LPX64 "%#lx"