x86: merge setup_32/64.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner 2007-10-23 22:37:24 +02:00
parent 33185c504f
commit ef685298b4
4 changed files with 60 additions and 95 deletions

View file

@ -21,8 +21,6 @@ unifdef-y += page_64.h
unifdef-y += posix_types_32.h
unifdef-y += posix_types_64.h
unifdef-y += ptrace.h
unifdef-y += setup_32.h
unifdef-y += setup_64.h
unifdef-y += unistd_32.h
unifdef-y += unistd_64.h
unifdef-y += user_32.h

View file

@ -1,13 +1,62 @@
#ifndef _ASM_X86_SETUP_H
#define _ASM_X86_SETUP_H
#define COMMAND_LINE_SIZE 2048
#ifdef __KERNEL__
# ifdef CONFIG_X86_32
# include "setup_32.h"
# else
# include "setup_64.h"
# endif
#else
# ifdef __i386__
# include "setup_32.h"
# else
# include "setup_64.h"
# endif
#ifdef __i386__
#include <linux/pfn.h>
/*
* Reserved space for vmalloc and iomap - defined in asm/page.h
*/
#define MAXMEM_PFN PFN_DOWN(MAXMEM)
#define MAX_NONPAE_PFN (1 << 20)
#define PARAM_SIZE 4096
#define OLD_CL_MAGIC_ADDR 0x90020
#define OLD_CL_MAGIC 0xA33F
#define OLD_CL_BASE_ADDR 0x90000
#define OLD_CL_OFFSET 0x90022
#define NEW_CL_POINTER 0x228 /* Relative to real mode data */
#endif /* __i386__ */
#ifndef __ASSEMBLY__
#include <asm/bootparam.h>
/*
* This is set up by the setup-routine at boot-time
*/
extern struct boot_params boot_params;
#ifdef __i386__
/*
* Do NOT EVER look at the BIOS memory size location.
* It does not work on many machines.
*/
#define LOWMEMSIZE() (0x9f000)
struct e820entry;
char * __init machine_specific_memory_setup(void);
char *memory_setup(void);
int __init copy_e820_map(struct e820entry * biosmap, int nr_map);
int __init sanitize_e820_map(struct e820entry * biosmap, char * pnr_map);
void __init add_memory_region(unsigned long long start,
unsigned long long size, int type);
extern unsigned long init_pg_tables_end;
#ifndef CONFIG_PARAVIRT
#define paravirt_post_allocator_init() do {} while (0)
#endif
#endif /* __i386__ */
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* _ASM_X86_SETUP_H */

View file

@ -1,63 +0,0 @@
/*
* Just a place holder. We don't want to have to test x86 before
* we include stuff
*/
#ifndef _i386_SETUP_H
#define _i386_SETUP_H
#define COMMAND_LINE_SIZE 2048
#ifdef __KERNEL__
#include <linux/pfn.h>
/*
* Reserved space for vmalloc and iomap - defined in asm/page.h
*/
#define MAXMEM_PFN PFN_DOWN(MAXMEM)
#define MAX_NONPAE_PFN (1 << 20)
#define PARAM_SIZE 4096
#define OLD_CL_MAGIC_ADDR 0x90020
#define OLD_CL_MAGIC 0xA33F
#define OLD_CL_BASE_ADDR 0x90000
#define OLD_CL_OFFSET 0x90022
#define NEW_CL_POINTER 0x228 /* Relative to real mode data */
#ifndef __ASSEMBLY__
#include <asm/bootparam.h>
/*
* This is set up by the setup-routine at boot-time
*/
extern struct boot_params boot_params;
/*
* Do NOT EVER look at the BIOS memory size location.
* It does not work on many machines.
*/
#define LOWMEMSIZE() (0x9f000)
struct e820entry;
char * __init machine_specific_memory_setup(void);
char *memory_setup(void);
int __init copy_e820_map(struct e820entry * biosmap, int nr_map);
int __init sanitize_e820_map(struct e820entry * biosmap, char * pnr_map);
void __init add_memory_region(unsigned long long start,
unsigned long long size, int type);
extern unsigned long init_pg_tables_end;
#ifndef CONFIG_PARAVIRT
#define paravirt_post_allocator_init() do {} while (0)
#endif
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* _i386_SETUP_H */

View file

@ -1,19 +0,0 @@
#ifndef _x8664_SETUP_H
#define _x8664_SETUP_H
#define COMMAND_LINE_SIZE 2048
#ifdef __KERNEL__
#ifndef __ASSEMBLY__
#include <asm/bootparam.h>
/*
* This is set up by the setup-routine at boot-time
*/
extern struct boot_params boot_params;
#endif /* not __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif