Skip to content
Snippets Groups Projects
Commit 9f8231e8 authored by Alexey Lyashkov's avatar Alexey Lyashkov
Browse files

Fix warnings with compile liblustre at sles10/rhel5 which have

__u64 as usingied long long type.
b=15517
i=johan
i=deen
parent e59595df
No related merge requests found
...@@ -1056,6 +1056,29 @@ AC_DEFINE(HAVE_SHOW_TASK, 1, [show_task is exported]) ...@@ -1056,6 +1056,29 @@ AC_DEFINE(HAVE_SHOW_TASK, 1, [show_task is exported])
]) ])
]) ])
# check userland __u64 type
AC_DEFUN([LN_U64_LONG_LONG],
[AC_MSG_CHECKING([check u64 is long long type])
tmp_flags="$CFLAGS"
CFLAGS="$CFLAGS -Werror"
AC_COMPILE_IFELSE([
#include <asm/types.h>
int main(void) {
unsigned long long *data1;
__u64 *data2;
data1 = data2;
return 0;
}
],[
AC_MSG_RESULT([yes])
AC_DEFINE(HAVE_U64_LONG_LONG, 1,
[__u64 is long long type])
],[
])
CFLAGS="$tmp_flags"
])
# LN_TASKLIST_LOCK # LN_TASKLIST_LOCK
# 2.6.18 remove tasklist_lock export # 2.6.18 remove tasklist_lock export
AC_DEFUN([LN_TASKLIST_LOCK], AC_DEFUN([LN_TASKLIST_LOCK],
...@@ -1205,6 +1228,7 @@ LN_CONFIG_MX ...@@ -1205,6 +1228,7 @@ LN_CONFIG_MX
LN_STRUCT_PAGE_LIST LN_STRUCT_PAGE_LIST
LN_STRUCT_SIGHAND LN_STRUCT_SIGHAND
LN_FUNC_SHOW_TASK LN_FUNC_SHOW_TASK
LN_U64_LONG_LONG
# 2.6.18 # 2.6.18
LN_TASKLIST_LOCK LN_TASKLIST_LOCK
# 2.6.19 # 2.6.19
......
...@@ -340,7 +340,7 @@ extern int lwt_snapshot (cycles_t *now, int *ncpu, int *total_size, ...@@ -340,7 +340,7 @@ extern int lwt_snapshot (cycles_t *now, int *ncpu, int *total_size,
#define _LWORDSIZE __WORDSIZE #define _LWORDSIZE __WORDSIZE
#endif #endif
#if (defined(__x86_64__) && (defined(__KERNEL__) || defined(CRAY_XT3))) #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 */ /* x86_64 defines __u64 as "long" in userspace, but "long long" in the kernel */
# define LPU64 "%Lu" # define LPU64 "%Lu"
# define LPD64 "%Ld" # define LPD64 "%Ld"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment