Commit fffeeb41 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller

sparc: fix warnings in userspace header byteorder.h

Fix following warnings in byteorder.h:

byteorder.h:4: include of <linux/types.h> is preferred over <asm/types.h>
byteorder.h:9: leaks CONFIG_SPARC32 to userspace where it is not valid
byteorder.h:13: leaks CONFIG_SPARC64 to userspace where it is not valid
byteorder.h:14: found __[us]{8,16,32,64} type without #include <linux/types.h>
byteorder.h:47: leaks CONFIG_SPARC64 to userspace where it is not valid

- changed to use include <linux/types.h> as suggested
- use preprocessor defined symbols to distingush between 32 and 64 bit
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2ef4c01e
#ifndef _SPARC_BYTEORDER_H #ifndef _SPARC_BYTEORDER_H
#define _SPARC_BYTEORDER_H #define _SPARC_BYTEORDER_H
#include <asm/types.h> #include <linux/types.h>
#include <asm/asi.h> #include <asm/asi.h>
#define __BIG_ENDIAN #define __BIG_ENDIAN
#ifdef CONFIG_SPARC32 #if defined(__sparc__) && defined(__arch64__)
#define __SWAB_64_THRU_32__
#endif
#ifdef CONFIG_SPARC64
static inline __u16 __arch_swab16p(const __u16 *addr) static inline __u16 __arch_swab16p(const __u16 *addr)
{ {
__u16 ret; __u16 ret;
...@@ -44,7 +40,9 @@ static inline __u64 __arch_swab64p(const __u64 *addr) ...@@ -44,7 +40,9 @@ static inline __u64 __arch_swab64p(const __u64 *addr)
} }
#define __arch_swab64p __arch_swab64p #define __arch_swab64p __arch_swab64p
#endif /* CONFIG_SPARC64 */ #else
#define __SWAB_64_THRU_32__
#endif /* defined(__sparc__) && defined(__arch64__) */
#include <linux/byteorder.h> #include <linux/byteorder.h>
......
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