Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
x86: merge setup_32/64.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-2
include/asm-x86/Kbuild
-2
include/asm-x86/Kbuild
+60
-11
include/asm-x86/setup.h
+60
-11
include/asm-x86/setup.h
···
1
+
#ifndef _ASM_X86_SETUP_H
2
+
#define _ASM_X86_SETUP_H
3
+
4
+
#define COMMAND_LINE_SIZE 2048
5
+
1
6
#ifdef __KERNEL__
2
-
# ifdef CONFIG_X86_32
3
-
# include "setup_32.h"
4
-
# else
5
-
# include "setup_64.h"
6
-
# endif
7
-
#else
8
-
# ifdef __i386__
9
-
# include "setup_32.h"
10
-
# else
11
-
# include "setup_64.h"
12
-
# endif
7
+
8
+
#ifdef __i386__
9
+
10
+
#include <linux/pfn.h>
11
+
/*
12
+
* Reserved space for vmalloc and iomap - defined in asm/page.h
13
+
*/
14
+
#define MAXMEM_PFN PFN_DOWN(MAXMEM)
15
+
#define MAX_NONPAE_PFN (1 << 20)
16
+
17
+
#define PARAM_SIZE 4096
18
+
19
+
#define OLD_CL_MAGIC_ADDR 0x90020
20
+
#define OLD_CL_MAGIC 0xA33F
21
+
#define OLD_CL_BASE_ADDR 0x90000
22
+
#define OLD_CL_OFFSET 0x90022
23
+
#define NEW_CL_POINTER 0x228 /* Relative to real mode data */
24
+
25
+
#endif /* __i386__ */
26
+
27
+
#ifndef __ASSEMBLY__
28
+
#include <asm/bootparam.h>
29
+
30
+
/*
31
+
* This is set up by the setup-routine at boot-time
32
+
*/
33
+
extern struct boot_params boot_params;
34
+
35
+
#ifdef __i386__
36
+
/*
37
+
* Do NOT EVER look at the BIOS memory size location.
38
+
* It does not work on many machines.
39
+
*/
40
+
#define LOWMEMSIZE() (0x9f000)
41
+
42
+
struct e820entry;
43
+
44
+
char * __init machine_specific_memory_setup(void);
45
+
char *memory_setup(void);
46
+
47
+
int __init copy_e820_map(struct e820entry * biosmap, int nr_map);
48
+
int __init sanitize_e820_map(struct e820entry * biosmap, char * pnr_map);
49
+
void __init add_memory_region(unsigned long long start,
50
+
unsigned long long size, int type);
51
+
52
+
extern unsigned long init_pg_tables_end;
53
+
54
+
#ifndef CONFIG_PARAVIRT
55
+
#define paravirt_post_allocator_init() do {} while (0)
13
56
#endif
57
+
58
+
#endif /* __i386__ */
59
+
#endif /* __ASSEMBLY__ */
60
+
#endif /* __KERNEL__ */
61
+
62
+
#endif /* _ASM_X86_SETUP_H */
-63
include/asm-x86/setup_32.h
-63
include/asm-x86/setup_32.h
···
1
-
/*
2
-
* Just a place holder. We don't want to have to test x86 before
3
-
* we include stuff
4
-
*/
5
-
6
-
#ifndef _i386_SETUP_H
7
-
#define _i386_SETUP_H
8
-
9
-
#define COMMAND_LINE_SIZE 2048
10
-
11
-
#ifdef __KERNEL__
12
-
#include <linux/pfn.h>
13
-
14
-
/*
15
-
* Reserved space for vmalloc and iomap - defined in asm/page.h
16
-
*/
17
-
#define MAXMEM_PFN PFN_DOWN(MAXMEM)
18
-
#define MAX_NONPAE_PFN (1 << 20)
19
-
20
-
#define PARAM_SIZE 4096
21
-
22
-
#define OLD_CL_MAGIC_ADDR 0x90020
23
-
#define OLD_CL_MAGIC 0xA33F
24
-
#define OLD_CL_BASE_ADDR 0x90000
25
-
#define OLD_CL_OFFSET 0x90022
26
-
#define NEW_CL_POINTER 0x228 /* Relative to real mode data */
27
-
28
-
#ifndef __ASSEMBLY__
29
-
30
-
#include <asm/bootparam.h>
31
-
32
-
/*
33
-
* This is set up by the setup-routine at boot-time
34
-
*/
35
-
extern struct boot_params boot_params;
36
-
37
-
/*
38
-
* Do NOT EVER look at the BIOS memory size location.
39
-
* It does not work on many machines.
40
-
*/
41
-
#define LOWMEMSIZE() (0x9f000)
42
-
43
-
struct e820entry;
44
-
45
-
char * __init machine_specific_memory_setup(void);
46
-
char *memory_setup(void);
47
-
48
-
int __init copy_e820_map(struct e820entry * biosmap, int nr_map);
49
-
int __init sanitize_e820_map(struct e820entry * biosmap, char * pnr_map);
50
-
void __init add_memory_region(unsigned long long start,
51
-
unsigned long long size, int type);
52
-
53
-
extern unsigned long init_pg_tables_end;
54
-
55
-
#ifndef CONFIG_PARAVIRT
56
-
#define paravirt_post_allocator_init() do {} while (0)
57
-
#endif
58
-
59
-
#endif /* __ASSEMBLY__ */
60
-
61
-
#endif /* __KERNEL__ */
62
-
63
-
#endif /* _i386_SETUP_H */
-19
include/asm-x86/setup_64.h
-19
include/asm-x86/setup_64.h
···
1
-
#ifndef _x8664_SETUP_H
2
-
#define _x8664_SETUP_H
3
-
4
-
#define COMMAND_LINE_SIZE 2048
5
-
6
-
#ifdef __KERNEL__
7
-
8
-
#ifndef __ASSEMBLY__
9
-
#include <asm/bootparam.h>
10
-
11
-
/*
12
-
* This is set up by the setup-routine at boot-time
13
-
*/
14
-
extern struct boot_params boot_params;
15
-
16
-
#endif /* not __ASSEMBLY__ */
17
-
#endif /* __KERNEL__ */
18
-
19
-
#endif