Commit fffeeb41 authored Jan 02, 2009 by Sam Ravnborg Committed by David S. Miller Jan 02, 2009

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: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 2ef4c01e

arch/sparc/include/asm/byteorder.h

+5 −7

Original line number	Diff line number	Diff line
		#ifndef _SPARC_BYTEORDER_H
		#define _SPARC_BYTEORDER_H

		#include <asm/types.h>
		#include <linux/types.h>
		#include <asm/asi.h>

		#define __BIG_ENDIAN

		#ifdef CONFIG_SPARC32
		#define __SWAB_64_THRU_32__
		#endif

		#ifdef CONFIG_SPARC64
		#if defined(__sparc__) && defined(__arch64__)
		static inline __u16 __arch_swab16p(const __u16 *addr)
		{
		__u16 ret;
		@@ -44,7 +40,9 @@ static inline __u64 __arch_swab64p(const __u64 *addr)
		}
		#define __arch_swab64p __arch_swab64p

		#endif /* CONFIG_SPARC64 */
		#else
		#define __SWAB_64_THRU_32__
		#endif /* defined(__sparc__) && defined(__arch64__) */

		#include <linux/byteorder.h>