aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-23 16:37:24 -0400
committerThomas Gleixner <tglx@linutronix.de>2007-10-23 16:37:24 -0400
commitef685298b4b3dead1efa1d47cd27ced0f2673254 (patch)
treebbe06b1ee9ce677b0062313bc8130a432589b70c
parent33185c504f8e521b398536b5a8d415779a24593c (diff)
x86: merge setup_32/64.h
Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat
-rw-r--r--include/asm-x86/Kbuild2
-rw-r--r--include/asm-x86/setup.h71
-rw-r--r--include/asm-x86/setup_32.h63
-rw-r--r--include/asm-x86/setup_64.h19
4 files changed, 60 insertions, 95 deletions
diff --git a/include/asm-x86/Kbuild b/include/asm-x86/Kbuild
index 294781c0e604..12db5a1cdd74 100644
--- a/include/asm-x86/Kbuild
+++ b/include/asm-x86/Kbuild
@@ -21,8 +21,6 @@ unifdef-y += page_64.h
21unifdef-y += posix_types_32.h 21unifdef-y += posix_types_32.h
22unifdef-y += posix_types_64.h 22unifdef-y += posix_types_64.h
23unifdef-y += ptrace.h 23unifdef-y += ptrace.h
24unifdef-y += setup_32.h
25unifdef-y += setup_64.h
26unifdef-y += unistd_32.h 24unifdef-y += unistd_32.h
27unifdef-y += unistd_64.h 25unifdef-y += unistd_64.h
28unifdef-y += user_32.h 26unifdef-y += user_32.h
diff --git a/include/asm-x86/setup.h b/include/asm-x86/setup.h
index 81c0d98bb1c8..7e5698f7d242 100644
--- a/include/asm-x86/setup.h
+++ b/include/asm-x86/setup.h
@@ -1,13 +1,62 @@
1#ifndef _ASM_X86_SETUP_H
2#define _ASM_X86_SETUP_H
3
4#define COMMAND_LINE_SIZE 2048
5
1#ifdef __KERNEL__ 6#ifdef __KERNEL__
2# ifdef CONFIG_X86_32 7
3# include "setup_32.h" 8#ifdef __i386__
4# else 9
5# include "setup_64.h" 10#include <linux/pfn.h>
6# endif 11/*
7#else 12 * Reserved space for vmalloc and iomap - defined in asm/page.h
8# ifdef __i386__ 13 */
9# include "setup_32.h" 14#define MAXMEM_PFN PFN_DOWN(MAXMEM)
10# else 15#define MAX_NONPAE_PFN (1 << 20)
11# include "setup_64.h" 16
12# endif 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 */
33extern 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
42struct e820entry;
43
44char * __init machine_specific_memory_setup(void);
45char *memory_setup(void);
46
47int __init copy_e820_map(struct e820entry * biosmap, int nr_map);
48int __init sanitize_e820_map(struct e820entry * biosmap, char * pnr_map);
49void __init add_memory_region(unsigned long long start,
50 unsigned long long size, int type);
51
52extern unsigned long init_pg_tables_end;
53
54#ifndef CONFIG_PARAVIRT
55#define paravirt_post_allocator_init() do {} while (0)
13#endif 56#endif
57
58#endif /* __i386__ */
59#endif /* __ASSEMBLY__ */
60#endif /* __KERNEL__ */
61
62#endif /* _ASM_X86_SETUP_H */
diff --git a/include/asm-x86/setup_32.h b/include/asm-x86/setup_32.h
deleted file mode 100644
index 7a57ca8a1793..000000000000
--- a/include/asm-x86/setup_32.h
+++ /dev/null
@@ -1,63 +0,0 @@
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 */
35extern 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
43struct e820entry;
44
45char * __init machine_specific_memory_setup(void);
46char *memory_setup(void);
47
48int __init copy_e820_map(struct e820entry * biosmap, int nr_map);
49int __init sanitize_e820_map(struct e820entry * biosmap, char * pnr_map);
50void __init add_memory_region(unsigned long long start,
51 unsigned long long size, int type);
52
53extern 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 */
diff --git a/include/asm-x86/setup_64.h b/include/asm-x86/setup_64.h
deleted file mode 100644
index a04aadcccf67..000000000000
--- a/include/asm-x86/setup_64.h
+++ /dev/null
@@ -1,19 +0,0 @@
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 */
14extern struct boot_params boot_params;
15
16#endif /* not __ASSEMBLY__ */
17#endif /* __KERNEL__ */
18
19#endif
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-10 18:03:06 -0500