Merge branch 'x86/urgent' into core/percpu
Conflicts: arch/x86/kernel/acpi/boot.c
No related branches found
No related tags found
Showing
- Documentation/kernel-parameters.txt 2 additions, 0 deletionsDocumentation/kernel-parameters.txt
- arch/x86/Kconfig 11 additions, 0 deletionsarch/x86/Kconfig
- arch/x86/Kconfig.cpu 15 additions, 13 deletionsarch/x86/Kconfig.cpu
- arch/x86/include/asm/a.out-core.h 1 addition, 3 deletionsarch/x86/include/asm/a.out-core.h
- arch/x86/include/asm/cpufeature.h 1 addition, 0 deletionsarch/x86/include/asm/cpufeature.h
- arch/x86/include/asm/math_emu.h 8 additions, 21 deletionsarch/x86/include/asm/math_emu.h
- arch/x86/include/asm/mpspec.h 6 additions, 0 deletionsarch/x86/include/asm/mpspec.h
- arch/x86/include/asm/pgtable.h 20 additions, 6 deletionsarch/x86/include/asm/pgtable.h
- arch/x86/include/asm/processor.h 1 addition, 1 deletionarch/x86/include/asm/processor.h
- arch/x86/include/asm/traps.h 2 additions, 2 deletionsarch/x86/include/asm/traps.h
- arch/x86/include/asm/xen/page.h 1 addition, 1 deletionarch/x86/include/asm/xen/page.h
- arch/x86/kernel/acpi/boot.c 23 additions, 0 deletionsarch/x86/kernel/acpi/boot.c
- arch/x86/kernel/cpu/intel.c 3 additions, 0 deletionsarch/x86/kernel/cpu/intel.c
- arch/x86/kernel/io_apic.c 15 additions, 5 deletionsarch/x86/kernel/io_apic.c
- arch/x86/kernel/process.c 6 additions, 0 deletionsarch/x86/kernel/process.c
- arch/x86/kernel/process_64.c 7 additions, 2 deletionsarch/x86/kernel/process_64.c
- arch/x86/kernel/setup.c 1 addition, 1 deletionarch/x86/kernel/setup.c
- arch/x86/kernel/traps.c 9 additions, 6 deletionsarch/x86/kernel/traps.c
- arch/x86/kernel/vmi_32.c 11 additions, 0 deletionsarch/x86/kernel/vmi_32.c
- arch/x86/math-emu/fpu_entry.c 3 additions, 3 deletionsarch/x86/math-emu/fpu_entry.c
Loading
Please register or sign in to comment