diff options
Diffstat (limited to 'arch/x86/kernel/setup.c')
-rw-r--r-- | arch/x86/kernel/setup.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index b74e7bfed6ab..d494b9bfe618 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
@@ -1280,23 +1280,6 @@ void __init setup_arch(char **cmdline_p) | |||
1280 | unwind_init(); | 1280 | unwind_init(); |
1281 | } | 1281 | } |
1282 | 1282 | ||
1283 | /* | ||
1284 | * From boot protocol 2.14 onwards we expect the bootloader to set the | ||
1285 | * version to "0x8000 | <used version>". In case we find a version >= 2.14 | ||
1286 | * without the 0x8000 we assume the boot loader supports 2.13 only and | ||
1287 | * reset the version accordingly. The 0x8000 flag is removed in any case. | ||
1288 | */ | ||
1289 | void __init x86_verify_bootdata_version(void) | ||
1290 | { | ||
1291 | if (boot_params.hdr.version & VERSION_WRITTEN) | ||
1292 | boot_params.hdr.version &= ~VERSION_WRITTEN; | ||
1293 | else if (boot_params.hdr.version >= 0x020e) | ||
1294 | boot_params.hdr.version = 0x020d; | ||
1295 | |||
1296 | if (boot_params.hdr.version < 0x020e) | ||
1297 | boot_params.hdr.acpi_rsdp_addr = 0; | ||
1298 | } | ||
1299 | |||
1300 | #ifdef CONFIG_X86_32 | 1283 | #ifdef CONFIG_X86_32 |
1301 | 1284 | ||
1302 | static struct resource video_ram_resource = { | 1285 | static struct resource video_ram_resource = { |