Commit 917ea9a3 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Greg Kroah-Hartman

staging: lustre: Use proper constant types for L*_POISON values

On 32-bit m68k, I get lots of warnings like:

    warning: integer constant is too large for ‘long’ type

Switch the L*_POISON definitions from too-large constants and casts
to the proper constant types to fix this.
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4e7fb829
...@@ -187,9 +187,13 @@ extern int lwt_snapshot (cfs_cycles_t *now, int *ncpu, int *total_size, ...@@ -187,9 +187,13 @@ extern int lwt_snapshot (cfs_cycles_t *now, int *ncpu, int *total_size,
# endif # endif
#endif #endif
# define LI_POISON ((int)0x5a5a5a5a5a5a5a5a) # define LI_POISON 0x5a5a5a5a
# define LL_POISON ((long)0x5a5a5a5a5a5a5a5a) #if BITS_PER_LONG > 32
# define LP_POISON ((void *)(long)0x5a5a5a5a5a5a5a5a) # define LL_POISON 0x5a5a5a5a5a5a5a5aL
#else
# define LL_POISON 0x5a5a5a5aL
#endif
# define LP_POISON ((void *)LL_POISON)
/* this is a bit chunky */ /* this is a bit chunky */
......
...@@ -53,15 +53,13 @@ ...@@ -53,15 +53,13 @@
# include <linux/lustre_common.h> # include <linux/lustre_common.h>
#ifndef LP_POISON #ifndef LP_POISON
# define LI_POISON 0x5a5a5a5a
#if BITS_PER_LONG > 32 #if BITS_PER_LONG > 32
# define LI_POISON ((int)0x5a5a5a5a5a5a5a5a) # define LL_POISON 0x5a5a5a5a5a5a5a5aL
# define LL_POISON ((long)0x5a5a5a5a5a5a5a5a)
# define LP_POISON ((void *)(long)0x5a5a5a5a5a5a5a5a)
#else #else
# define LI_POISON ((int)0x5a5a5a5a) # define LL_POISON 0x5a5a5a5aL
# define LL_POISON ((long)0x5a5a5a5a)
# define LP_POISON ((void *)(long)0x5a5a5a5a)
#endif #endif
# define LP_POISON ((void *)LL_POISON)
#endif #endif
/* This macro is only for compatibility reasons with older Linux Lustre user /* This macro is only for compatibility reasons with older Linux Lustre user
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment