提交 020bd9f1 编写于 作者: B Brian Gerst 提交者: Thomas Gleixner

x86: trivial header merges

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

[tglx: fixup Kbuild as well]
Signed-off-by: NBrian Gerst <bgerst@didntduck.org>
Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
上级 c65916fe
......@@ -22,8 +22,6 @@ unifdef-y += byteorder_32.h
unifdef-y += byteorder_64.h
unifdef-y += elf_32.h
unifdef-y += elf_64.h
unifdef-y += errno_32.h
unifdef-y += errno_64.h
unifdef-y += ioctls_32.h
unifdef-y += ioctls_64.h
unifdef-y += ipcbuf_32.h
......@@ -47,8 +45,6 @@ unifdef-y += posix_types_32.h
unifdef-y += posix_types_64.h
unifdef-y += ptrace_32.h
unifdef-y += ptrace_64.h
unifdef-y += resource_32.h
unifdef-y += resource_64.h
unifdef-y += sembuf_32.h
unifdef-y += sembuf_64.h
unifdef-y += setup_32.h
......
#ifdef CONFIG_X86_32
# include "cputime_32.h"
#else
# include "cputime_64.h"
#endif
#include <asm-generic/cputime.h>
#ifndef __I386_CPUTIME_H
#define __I386_CPUTIME_H
#include <asm-generic/cputime.h>
#endif /* __I386_CPUTIME_H */
#ifndef __X86_64_CPUTIME_H
#define __X86_64_CPUTIME_H
#include <asm-generic/cputime.h>
#endif /* __X86_64_CPUTIME_H */
#ifdef __KERNEL__
# 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
#include <asm-generic/errno.h>
#ifndef _I386_ERRNO_H
#define _I386_ERRNO_H
#include <asm-generic/errno.h>
#endif
#ifndef _X8664_ERRNO_H
#define _X8664_ERRNO_H
#include <asm-generic/errno.h>
#endif
#ifdef __KERNEL__
# ifdef CONFIG_X86_32
# include "resource_32.h"
# else
# include "resource_64.h"
# endif
#else
# ifdef __i386__
# include "resource_32.h"
# else
# include "resource_64.h"
# endif
#endif
#include <asm-generic/resource.h>
#ifndef _I386_RESOURCE_H
#define _I386_RESOURCE_H
#include <asm-generic/resource.h>
#endif
#ifndef _X8664_RESOURCE_H
#define _X8664_RESOURCE_H
#include <asm-generic/resource.h>
#endif
#ifdef CONFIG_X86_32
# include "rtc_32.h"
#else
# include "rtc_64.h"
#endif
#include <asm-generic/rtc.h>
#ifndef _I386_RTC_H
#define _I386_RTC_H
/*
* x86 uses the default access methods for the RTC.
*/
#include <asm-generic/rtc.h>
#endif
#ifndef _X86_64_RTC_H
#define _X86_64_RTC_H
/*
* x86 uses the default access methods for the RTC.
*/
#include <asm-generic/rtc.h>
#endif
#ifdef CONFIG_X86_32
# include "sections_32.h"
#else
# include "sections_64.h"
#endif
#include <asm-generic/sections.h>
#ifndef _I386_SECTIONS_H
#define _I386_SECTIONS_H
/* nothing to see, move along */
#include <asm-generic/sections.h>
#endif
#ifndef _X8664_SECTIONS_H
#define _X8664_SECTIONS_H
/* nothing to see, move along */
#include <asm-generic/sections.h>
#endif
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册