renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-13 16:14:26 +08:00
Code

[PATCH] Use early CPU identify before early command line parsing

Browse Source 
This makes it possible to modify CPU flags in command line
options without hacks.

And remove another copy in head64.c

Signed-off-by: Andi Kleen <ak@suse.de>
This commit is contained in:
Andi Kleen 2006-09-26 10:52:32 +02:00 committed by Andi Kleen
parent d4d35854a1
commit 9ca33eb698
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/x86_64/kernel/head64.c
View File

@ -56,24 +56,6 @@ static void __init copy_bootdata(char *real_mode_data)
printk("Bootdata ok (command line is %s)\n", saved_command_line);
}
static void __init setup_boot_cpu_data(void)
{
unsigned int dummy, eax;
/* get vendor info */
cpuid(0, (unsigned int *)&boot_cpu_data.cpuid_level,
(unsigned int *)&boot_cpu_data.x86_vendor_id[0],
(unsigned int *)&boot_cpu_data.x86_vendor_id[8],
(unsigned int *)&boot_cpu_data.x86_vendor_id[4]);
/* get cpu type */
cpuid(1, &eax, &dummy, &dummy,
(unsigned int *) &boot_cpu_data.x86_capability);
boot_cpu_data.x86 = (eax >> 8) & 0xf;
boot_cpu_data.x86_model = (eax >> 4) & 0xf;
boot_cpu_data.x86_mask = eax & 0xf;
}
void __init x86_64_start_kernel(char * real_mode_data)
{
char *s;
@ -117,6 +99,5 @@ void __init x86_64_start_kernel(char * real_mode_data)
if (__pa_symbol(&_end) >= KERNEL_TEXT_SIZE)
panic("Kernel too big for kernel mapping\n");
setup_boot_cpu_data();
start_kernel();
}

4
arch/x86_64/kernel/setup.c
View File

@ -545,10 +545,10 @@ void __init setup_arch(char **cmdline_p)
data_resource.start = virt_to_phys(&_etext);
data_resource.end = virt_to_phys(&_edata)-1;
parse_cmdline_early(cmdline_p);
early_identify_cpu(&boot_cpu_data);
parse_cmdline_early(cmdline_p);
/*
* partially used pages are not usable - thus
* we are rounding upwards: