diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-19 08:55:50 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-27 11:12:52 -0400 |
commit | 8fee697d990c54976c8dc167270633299e2515d2 (patch) | |
tree | 2236f4907bf6586892df8412224c415581311948 /arch/x86/include | |
parent | f7cf5a5b8c0e59eac8d30b62271cb0fa52e53ebc (diff) |
x86: Add request_standard_resources to x86_init
The 32bit and the 64bit code are slighty different in the reservation
of standard resources. Also the upcoming Moorestown support needs its
own version of that.
Add it to x86_init_ops and initialize it with the 64bit default. 32bit
overrides it in early boot. Now moorestown can add it's own override
w/o sprinkling the code with more #ifdefs
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/include')
-rw-r--r-- | arch/x86/include/asm/setup.h | 3 | ||||
-rw-r--r-- | arch/x86/include/asm/x86_init.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index 741e2956f3cf..19769ac60616 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h | |||
@@ -88,6 +88,9 @@ extern unsigned long saved_video_mode; | |||
88 | #define paravirt_post_allocator_init() do {} while (0) | 88 | #define paravirt_post_allocator_init() do {} while (0) |
89 | #endif | 89 | #endif |
90 | 90 | ||
91 | extern void reserve_standard_io_resources(void); | ||
92 | extern void i386_reserve_resources(void); | ||
93 | |||
91 | #ifndef _SETUP | 94 | #ifndef _SETUP |
92 | 95 | ||
93 | /* | 96 | /* |
diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h index 75e9e68d635f..d0d9be25ed93 100644 --- a/arch/x86/include/asm/x86_init.h +++ b/arch/x86/include/asm/x86_init.h | |||
@@ -4,10 +4,13 @@ | |||
4 | /** | 4 | /** |
5 | * struct x86_init_resources - platform specific resource related ops | 5 | * struct x86_init_resources - platform specific resource related ops |
6 | * @probe_roms: probe BIOS roms | 6 | * @probe_roms: probe BIOS roms |
7 | * @reserve_resources: reserve the standard resources for the | ||
8 | * platform | ||
7 | * | 9 | * |
8 | */ | 10 | */ |
9 | struct x86_init_resources { | 11 | struct x86_init_resources { |
10 | void (*probe_roms)(void); | 12 | void (*probe_roms)(void); |
13 | void (*reserve_resources)(void); | ||
11 | }; | 14 | }; |
12 | 15 | ||
13 | /** | 16 | /** |