sparc: use asm-generic version of types.h (cbf1ef6b) · Commits · 戴 / test

In sparc headers we use the following pattern: #if defined(__sparc__) && defined(__arch64__) sparc64 specific stuff #else sparc32 specific stuff #endif In types.h this pattern was not followed and here we only checked for __sparc__ for no good reason. It was a left-over from long time ago. I checked other architectures - and most of them do not have any such checks. And all the recently merged versions uses the asm-generic version. Signed-off-by:

Sam Ravnborg <sam@ravnborg.org> Signed-off-by:

David S. Miller <davem@davemloft.net>

arch/sparc/include/asm/Kbuild

+1 −0

Original line number	Diff line number	Diff line
		@@ -13,4 +13,5 @@ generic-y += local.h
		generic-y += module.h
		generic-y += serial.h
		generic-y += trace_clock.h
		generic-y += types.h
		generic-y += word-at-a-time.h

arch/sparc/include/uapi/asm/Kbuild

+0 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,6 @@ header-y += swab.h
		header-y += termbits.h
		header-y += termios.h
		header-y += traps.h
		header-y += types.h
		header-y += uctx.h
		header-y += unistd.h
		header-y += utrap.h

arch/sparc/include/uapi/asm/types.h

deleted100644 → 0

+0 −17

Original line number	Diff line number	Diff line
		#ifndef _SPARC_TYPES_H
		#define _SPARC_TYPES_H
		/*
		* This file is never included by application software unless
		* explicitly requested (e.g., via linux/types.h) in which case the
		* application is Linux specific so (user-) name space pollution is
		* not a major issue. However, for interoperability, libraries still
		* need to be careful to avoid a name clashes.
		*/

		#if defined(__sparc__)

		#include <asm-generic/int-ll64.h>

		#endif /* defined(__sparc__) */

		#endif /* defined(_SPARC_TYPES_H) */

Admin message