Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 020bd9f1 authored Oct 15, 2007 by Brian Gerst Committed by Thomas Gleixner Oct 17, 2007

x86: trivial header merges



Merge 32/64-bit headers that simply redirect to asm-generic

[tglx: fixup Kbuild as well]

Signed-off-by: Brian Gerst <bgerst@didntduck.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent c65916fe

include/asm-x86/Kbuild

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -22,8 +22,6 @@ unifdef-y += byteorder_32.h
	unifdef-y += byteorder_64.h		unifdef-y += byteorder_64.h
	unifdef-y += elf_32.h		unifdef-y += elf_32.h
	unifdef-y += elf_64.h		unifdef-y += elf_64.h
	unifdef-y += errno_32.h
	unifdef-y += errno_64.h
	unifdef-y += ioctls_32.h		unifdef-y += ioctls_32.h
	unifdef-y += ioctls_64.h		unifdef-y += ioctls_64.h
	unifdef-y += ipcbuf_32.h		unifdef-y += ipcbuf_32.h
	@@ -47,8 +45,6 @@ unifdef-y += posix_types_32.h
	unifdef-y += posix_types_64.h		unifdef-y += posix_types_64.h
	unifdef-y += ptrace_32.h		unifdef-y += ptrace_32.h
	unifdef-y += ptrace_64.h		unifdef-y += ptrace_64.h
	unifdef-y += resource_32.h
	unifdef-y += resource_64.h
	unifdef-y += sembuf_32.h		unifdef-y += sembuf_32.h
	unifdef-y += sembuf_64.h		unifdef-y += sembuf_64.h
	unifdef-y += setup_32.h		unifdef-y += setup_32.h

include/asm-x86/cputime.h

+1 −5

Original line number	Original line	Diff line number	Diff line
	#ifdef CONFIG_X86_32		#include <asm-generic/cputime.h>
	# include "cputime_32.h"
	#else
	# include "cputime_64.h"
	#endif

include/asm-x86/cputime_32.h

deleted100644 → 0

+0 −6

Original line number	Original line	Diff line number	Diff line
	#ifndef __I386_CPUTIME_H
	#define __I386_CPUTIME_H

	#include <asm-generic/cputime.h>

	#endif /* __I386_CPUTIME_H */

include/asm-x86/cputime_64.h

deleted100644 → 0

+0 −6

Original line number	Original line	Diff line number	Diff line
	#ifndef __X86_64_CPUTIME_H
	#define __X86_64_CPUTIME_H

	#include <asm-generic/cputime.h>

	#endif /* __X86_64_CPUTIME_H */

include/asm-x86/errno.h

+1 −13

Original line number	Original line	Diff line number	Diff line
	#ifdef __KERNEL__		#include <asm-generic/errno.h>
	# ifdef CONFIG_X86_32
	# include "errno_32.h"
	# else
	# include "errno_64.h"
	# endif
	#else
	# ifdef __i386__
	# include "errno_32.h"
	# else
	# include "errno_64.h"
	# endif
	#endif