Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Two FPU rewrite related fixes. This addresses all known x86
regressions at this stage. Also some other misc fixes"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/fpu: Fix boot crash in the early FPU code
x86/asm/entry/64: Update path names
x86/fpu: Fix FPU related boot regression when CPUID masking BIOS feature is enabled
x86/boot/setup: Clean up the e820_reserve_setup_data() code
x86/kaslr: Fix typo in the KASLR_FLAG documentation
+13
-13
+1
-1
Documentation/x86/boot.txt
+1
-1
Documentation/x86/boot.txt
···
406
406
- If 0, the protected-mode code is loaded at 0x10000.
407
407
- If 1, the protected-mode code is loaded at 0x100000.
408
408
409
-
Bit 1 (kernel internal): ALSR_FLAG
409
+
Bit 1 (kernel internal): KASLR_FLAG
410
410
- Used internally by the compressed kernel to communicate
411
411
KASLR status to kernel proper.
412
412
If 1, KASLR enabled.
+4
-4
Documentation/x86/entry_64.txt
+4
-4
Documentation/x86/entry_64.txt
···
1
1
This file documents some of the kernel entries in
2
-
arch/x86/kernel/entry_64.S. A lot of this explanation is adapted from
2
+
arch/x86/entry/entry_64.S. A lot of this explanation is adapted from
3
3
an email from Ingo Molnar:
4
4
5
5
http://lkml.kernel.org/r/<20110529191055.GC9835%40elte.hu>
6
6
7
7
The x86 architecture has quite a few different ways to jump into
8
8
kernel code. Most of these entry points are registered in
9
-
arch/x86/kernel/traps.c and implemented in arch/x86/kernel/entry_64.S
10
-
for 64-bit, arch/x86/kernel/entry_32.S for 32-bit and finally
11
-
arch/x86/ia32/ia32entry.S which implements the 32-bit compatibility
9
+
arch/x86/kernel/traps.c and implemented in arch/x86/entry/entry_64.S
10
+
for 64-bit, arch/x86/entry/entry_32.S for 32-bit and finally
11
+
arch/x86/entry/entry_64_compat.S which implements the 32-bit compatibility
12
12
syscall entry points and thus provides for 32-bit processes the
13
13
ability to execute syscalls when running on 64-bit kernels.
14
14
+1
-1
arch/x86/kernel/cpu/common.c
+1
-1
arch/x86/kernel/cpu/common.c
···
742
742
cpu_detect(c);
743
743
get_cpu_vendor(c);
744
744
get_cpu_cap(c);
745
-
fpu__init_system(c);
746
745
747
746
if (this_cpu->c_early_init)
748
747
this_cpu->c_early_init(c);
···
753
754
this_cpu->c_bsp_init(c);
754
755
755
756
setup_force_cpu_cap(X86_FEATURE_ALWAYS);
757
+
fpu__init_system(c);
756
758
}
757
759
758
760
void __init early_cpu_init(void)
+4
-3
arch/x86/kernel/fpu/init.c
+4
-3
arch/x86/kernel/fpu/init.c
···
95
95
unsigned int mask = 0;
96
96
97
97
if (cpu_has_fxsr) {
98
-
struct fxregs_state fx_tmp __aligned(32) = { };
98
+
/* Static because GCC does not get 16-byte stack alignment right: */
99
+
static struct fxregs_state fxregs __initdata;
99
100
100
-
asm volatile("fxsave %0" : "+m" (fx_tmp));
101
+
asm volatile("fxsave %0" : "+m" (fxregs));
101
102
102
-
mask = fx_tmp.mxcsr_mask;
103
+
mask = fxregs.mxcsr_mask;
103
104
104
105
/*
105
106
* If zero then use the default features mask,
+3
-4
arch/x86/kernel/setup.c
+3
-4
arch/x86/kernel/setup.c
···
461
461
{
462
462
struct setup_data *data;
463
463
u64 pa_data;
464
-
int found = 0;
465
464
466
465
pa_data = boot_params.hdr.setup_data;
466
+
if (!pa_data)
467
+
return;
468
+
467
469
while (pa_data) {
468
470
data = early_memremap(pa_data, sizeof(*data));
469
471
e820_update_range(pa_data, sizeof(*data)+data->len,
470
472
E820_RAM, E820_RESERVED_KERN);
471
-
found = 1;
472
473
pa_data = data->next;
473
474
early_memunmap(data, sizeof(*data));
474
475
}
475
-
if (!found)
476
-
return;
477
476
478
477
sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
479
478
memcpy(&e820_saved, &e820, sizeof(struct e820map));