x86 fixes
Linus,
Please pull the latest x86-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus
out-of-topic modifications in x86-fixes-for-linus:
--------------------------------------------------MAINTAINERS # 8d433c4: x86: MAINTAINERS change for AMD m
Thanks,
Ingo
------------------>
Andi Kleen (1):
MCE: Don't run 32bit machine checks with interrupts on
Andreas Herrmann (2):
x86: SB600: skip IRQ0 override if it is not routed to INT2 of IOAPIC
x86: call dmi-quirks for HP Laptops after early-quirks are executed
Cyrill Gorcunov (1):
x86: do_boot_cpu - check if we have ESR register
Daniele Calore (1):
x86: memtest fix use of reserve_early()
Gustavo F. Padovan (1):
x86: remove redundant KERN_DEBUG on pr_debug
Jeremy Fitzhardinge (1):
x86/tlb_uv: remove strange mc146818rtc include
Lai Jiangshan (1):
x86/proc: fix /proc/cpuinfo cpu offline bug
Marcin Slusarz (5):
x86: fix section mismatch warning - apic_flat
x86: fix section mismatch warning - apic_physflat
x86: fix section mismatch warning - apic_x2apic_uv_x
x86: fix section mismatch warning - apic_x2apic_cluster
x86: fix section mismatch warning - apic_x2apic_phys
Neil Horman (1):
x86, kexec: fix hang on i386 when panic occurs while console_sem is held
Peter Oruba (1):
x86: MAINTAINERS change for AMD microcode patch loader
Roland McGrath (1):
x86 syscall.h: fix argument order
roel kluin (1):
x86: make variables static
MAINTAINERS | 5 +- arch/x86/boot/video-bios.c | 4 +- arch/x86/boot/video-vesa.c | 4 +- arch/x86/kernel/acpi/boot.c | 10 +++- arch/x86/kernel/cpu/proc.c | 6 +- arch/x86/kernel/dumpstack_32.c | 2 +- arch/x86/kernel/early-quirks.c | 55 +++++++++++++++++- arch/x86/kernel/entry_32.S | 2 +- arch/x86/kernel/genapic_flat_64.c | 4 +- arch/x86/kernel/genx2apic_cluster.c | 2 +- arch/x86/kernel/genx2apic_phys.c | 2 +- arch/x86/kernel/genx2apic_uv_x.c | 2 +- arch/x86/kernel/setup_percpu.c | 2 +- arch/x86/kernel/smpboot.c | 8 ++- arch/x86/kernel/tlb_uv.c | 2 +- arch/x86/kernel/traps.c | 8 --- arch/x86/kernel/xsave.c | 2 +- arch/x86/mm/memtest.c | 7 +- include/asm-x86/syscall.h | 106 ++++++++++++++++++----------------- 19 files changed, 144 insertions(+), 89 deletions(-)
MAINTAINERS +3 -2
@@ -378,8 +378,9 @@ T: git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git S: Supported AMD MICROCODE UPDATE SUPPORT -P: Peter Oruba -M: [email protected] +P: Andreas Herrmann +M: [email protected] +L: [email protected] S: Supported AMS (Apple Motion Sensor) DRIVER
arch/x86/boot/video-bios.c +2 -2
@@ -17,7 +17,7 @@#include "boot.h" #include "video.h" -__videocard video_bios; +static __videocard video_bios;/* Set a conventional BIOS mode */ static int set_bios_mode (u8 mode);
@@ -119,7 +119,7 @@ static int bios_probe(void)return nmodes; } -__videocard video_bios = +static __videocard video_bios = { .card_name ="BIOS" , .probe = bios_probe,
arch/x86/boot/video-vesa.c +2 -2
@@ -20,7 +20,7 @@static struct vesa_general_info vginfo;static struct vesa_mode_info vminfo; -__videocard video_vesa; +static __videocard video_vesa;#ifndef _WAKEUPstatic void vesa_store_mode_params_graphics (void );
@@ -293,7 +293,7 @@ void vesa_store_edid(void)#endif /* not _WAKEUP */ -__videocard video_vesa = +static __videocard video_vesa = { .card_name ="VESA" , .probe = vesa_probe,
arch/x86/kernel/acpi/boot.c +9 -1
@@ -1136,7 +1136,7 @@ int mp_register_gsi(u32 gsi, int triggering, int polarity)return gsi; }if (test_bit (ioapic_pin, mp_ioapic_routing[ioapic].pin_programmed)) { -pr_debug (KERN_DEBUG "Pin %d-%d already programmed\n" , +pr_debug ("Pin %d-%d already programmed\n" , mp_ioapic_routing[ioapic].apic_id, ioapic_pin);#ifdef CONFIG_X86_32 return (gsi <IRQ_COMPRESSION_START ? gsi : gsi_to_irq[gsi]);
@@ -1598,6 +1598,11 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"), }, }, + {} +}; + +/* second table for DMI checks that should run after early-quirks */ +static struct dmi_system_id __initdata acpi_dmi_table_late[] = {/* * HP laptops which use a DSDT reporting as HP/SB400/10000, * which includes some code which overrides all temperature
@@ -1726,6 +1731,9 @@ int __init early_acpi_boot_init(void)int __init acpi_boot_init (void ) { +/* those are executed after early-quirks are executed */ +dmi_check_system (acpi_dmi_table_late); +/* * If acpi_disabled, bail out * One exception: acpi=ht continues far enough to enumerate LAPICs
arch/x86/kernel/cpu/proc.c +4 -2
@@ -160,14 +160,16 @@ static void *c_start(struct seq_file *m, loff_t *pos) {if (*pos ==0 )/* just in case, cpu 0 is not the first */ *pos =first_cpu (cpu_online_map); -if ((*pos) < nr_cpu_ids &&cpu_online (*pos)) +else + *pos =next_cpu_nr (*pos -1 , cpu_online_map); +if ((*pos) < nr_cpu_ids)return &cpu_data (*pos);return NULL ; }static void *c_next (struct seq_file *m,void *v,loff_t *pos) { - *pos =next_cpu (*pos, cpu_online_map); + (*pos)++;return c_start (m, pos); }
arch/x86/kernel/dumpstack_32.c +1 -1
@@ -405,7 +405,6 @@ die_nmi(char *str, struct pt_regs *regs, int do_panic)panic ("Non maskable interrupt" );console_silent ();spin_unlock (&nmi_print_lock); -bust_spinlocks (0 );/* * If we are in kernel we are probably nested up pretty bad
@@ -416,6 +415,7 @@ die_nmi(char *str, struct pt_regs *regs, int do_panic)crash_kexec (regs); } +bust_spinlocks (0 );do_exit (SIGSEGV ); }
arch/x86/kernel/early-quirks.c +52 -3
81 lines not on this page · raw message
arch/x86/kernel/entry_32.S +1 -1
@@ -1024,7 +1024,7 @@ ENTRY(machine_check) RING0_INT_FRAME pushl $0 CFI_ADJUST_CFA_OFFSET 4 - pushl $do_machine_check + pushl machine_check_vector CFI_ADJUST_CFA_OFFSET 4 jmp error_code CFI_ENDPROC
arch/x86/kernel/genapic_flat_64.c +2 -2
@@ -25,7 +25,7 @@#include <acpi/acpi_bus.h> #endif -static int __init flat_acpi_madt_oem_check (char *oem_id,char *oem_table_id) +static int flat_acpi_madt_oem_check (char *oem_id,char *oem_table_id) {return 1 ; }
@@ -170,7 +170,7 @@ struct genapic apic_flat = {* We cannot use logical delivery in this case because the mask * overflows, so use physical mode. */ -static int __init physflat_acpi_madt_oem_check (char *oem_id,char *oem_table_id) +static int physflat_acpi_madt_oem_check (char *oem_id,char *oem_table_id) {#ifdef CONFIG_ACPI /*
arch/x86/kernel/genx2apic_cluster.c +1 -1
@@ -12,7 +12,7 @@DEFINE_PER_CPU (u32, x86_cpu_to_logical_apicid); -static int __init x2apic_acpi_madt_oem_check (char *oem_id,char *oem_table_id) +static int x2apic_acpi_madt_oem_check (char *oem_id,char *oem_table_id) {if (cpu_has_x2apic)return 1 ;
arch/x86/kernel/genx2apic_phys.c +1 -1
@@ -19,7 +19,7 @@ static int set_x2apic_phys_mode(char *arg) }early_param ("x2apic_phys" , set_x2apic_phys_mode); -static int __init x2apic_acpi_madt_oem_check (char *oem_id,char *oem_table_id) +static int x2apic_acpi_madt_oem_check (char *oem_id,char *oem_table_id) {if (cpu_has_x2apic && x2apic_phys)return 1 ;
arch/x86/kernel/genx2apic_uv_x.c +1 -1
@@ -30,7 +30,7 @@ DEFINE_PER_CPU(int, x2apic_extra_bits);static enum uv_system_type uv_system_type; -static int __init uv_acpi_madt_oem_check (char *oem_id,char *oem_table_id) +static int uv_acpi_madt_oem_check (char *oem_id,char *oem_table_id) {if (!strcmp (oem_id,"SGI" )) {if (!strcmp (oem_table_id,"UVL" ))
arch/x86/kernel/setup_percpu.c +1 -1
@@ -218,7 +218,7 @@ static void __init setup_node_to_cpumask_map(void)/* allocate the map */ map =alloc_bootmem_low (nr_node_ids *sizeof (cpumask_t)); -pr_debug (KERN_DEBUG "Node to cpumask map at %p for %d nodes\n" , +pr_debug ("Node to cpumask map at %p for %d nodes\n" , map, nr_node_ids);/* node_to_cpumask() will now work */
arch/x86/kernel/smpboot.c +5 -3
@@ -893,9 +893,11 @@ do_rest:smpboot_setup_warm_reset_vector (start_ip);/* * Be paranoid about clearing APIC errors. -*/ -apic_write (APIC_ESR ,0 ); -apic_read (APIC_ESR ); +*/ +if (APIC_INTEGRATED (apic_version[boot_cpu_physical_apicid])) { +apic_write (APIC_ESR ,0 ); +apic_read (APIC_ESR ); + } }/*
arch/x86/kernel/tlb_uv.c +1 -1
@@ -6,7 +6,7 @@* This code is released under the GNU General Public License version 2 or * later. */ -#include <linux/mc146818rtc.h> +#include <linux/seq_file.h> #include <linux/proc_fs.h> #include <linux/kernel.h>
arch/x86/kernel/traps.c +0 -8
@@ -931,14 +931,6 @@ do_device_not_available(struct pt_regs *regs, long error) }#ifdef CONFIG_X86_32 -#ifdef CONFIG_X86_MCE -dotraplinkage void __kprobes do_machine_check(struct pt_regs *regs, long error) -{ -conditional_sti (regs); -machine_check_vector (regs, error); -} -#endif - dotraplinkage void do_iret_error(struct pt_regs *regs, long error_code) {siginfo_t info;
arch/x86/kernel/xsave.c +1 -1
@@ -248,7 +248,7 @@ clear:* This will be saved when ever the FP and extended state context is * saved on the user stack during the signal handler delivery to the user. */ -void prepare_fx_sw_frame (void ) +static void prepare_fx_sw_frame (void ) {int size_extended = (xstate_size -sizeof (struct i387_fxsave_struct )) +FP_XSTATE_MAGIC2_SIZE ;
arch/x86/mm/memtest.c +3 -4
@@ -61,9 +61,9 @@ static void __init memtest(unsigned long start_phys, unsigned long size, last_bad += incr; }else {if (start_bad) { -printk (KERN_CONT "\n %010lx bad mem addr %010lx - %010lx reserved" , +printk (KERN_CONT "\n %016lx bad mem addr %010lx - %010lx reserved" , val, start_bad, last_bad + incr); -reserve_early (start_bad, last_bad - start_bad,"BAD RAM" ); +reserve_early (start_bad, last_bad + incr,"BAD RAM" ); } start_bad = last_bad = start_phys_aligned; }
@@ -72,9 +72,8 @@ static void __init memtest(unsigned long start_phys, unsigned long size,if (start_bad) {printk (KERN_CONT "\n %016lx bad mem addr %010lx - %010lx reserved" , val, start_bad, last_bad + incr); -reserve_early (start_bad, last_bad - start_bad,"BAD RAM" ); +reserve_early (start_bad, last_bad + incr,"BAD RAM" ); } - }/* default is disabled */
include/asm-x86/syscall.h +54 -52
161 lines not on this page · raw message