tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branches 'x86-fixes-for-linus' and 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, reboot: Fix relocations in reboot_32.S
x86, NUMA: Fix empty memblk detection in numa_cleanup_meminfo()
x86, AMD: Fix APIC timer erratum 400 affecting K8 Rev.A-E processors

* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
genirq: Fix typo CONFIG_GENIRC_IRQ_SHOW_LEVEL

Linus Torvalds bab0dcc7 497ff034

+9 -9
+1 -1
arch/x86/kernel/cpu/amd.c
··· 698 698 */ 699 699 700 700 const int amd_erratum_400[] = 701 - AMD_OSVW_ERRATUM(1, AMD_MODEL_RANGE(0xf, 0x41, 0x2, 0xff, 0xf), 701 + AMD_OSVW_ERRATUM(1, AMD_MODEL_RANGE(0x0f, 0x4, 0x2, 0xff, 0xf), 702 702 AMD_MODEL_RANGE(0x10, 0x2, 0x1, 0xff, 0xf)); 703 703 EXPORT_SYMBOL_GPL(amd_erratum_400); 704 704
+6 -6
arch/x86/kernel/reboot_32.S
··· 21 21 /* Get our own relocated address */ 22 22 call 1f 23 23 1: popl %ebx 24 - subl $1b, %ebx 24 + subl $(1b - r_base), %ebx 25 25 26 26 /* Compute the equivalent real-mode segment */ 27 27 movl %ebx, %ecx 28 28 shrl $4, %ecx 29 29 30 30 /* Patch post-real-mode segment jump */ 31 - movw dispatch_table(%ebx,%eax,2),%ax 32 - movw %ax, 101f(%ebx) 33 - movw %cx, 102f(%ebx) 31 + movw (dispatch_table - r_base)(%ebx,%eax,2),%ax 32 + movw %ax, (101f - r_base)(%ebx) 33 + movw %cx, (102f - r_base)(%ebx) 34 34 35 35 /* Set up the IDT for real mode. */ 36 - lidtl machine_real_restart_idt(%ebx) 36 + lidtl (machine_real_restart_idt - r_base)(%ebx) 37 37 38 38 /* 39 39 * Set up a GDT from which we can load segment descriptors for real 40 40 * mode. The GDT is not used in real mode; it is just needed here to 41 41 * prepare the descriptors. 42 42 */ 43 - lgdtl machine_real_restart_gdt(%ebx) 43 + lgdtl (machine_real_restart_gdt - r_base)(%ebx) 44 44 45 45 /* 46 46 * Load the data segment registers with 16-bit compatible values
+1 -1
arch/x86/mm/numa_64.c
··· 306 306 bi->end = min(bi->end, high); 307 307 308 308 /* and there's no empty block */ 309 - if (bi->start == bi->end) { 309 + if (bi->start >= bi->end) { 310 310 numa_remove_memblk_from(i--, mi); 311 311 continue; 312 312 }
+1 -1
kernel/irq/proc.c
··· 419 419 } else { 420 420 seq_printf(p, " %8s", "None"); 421 421 } 422 - #ifdef CONFIG_GENIRC_IRQ_SHOW_LEVEL 422 + #ifdef CONFIG_GENERIC_IRQ_SHOW_LEVEL 423 423 seq_printf(p, " %-8s", irqd_is_level_type(&desc->irq_data) ? "Level" : "Edge"); 424 424 #endif 425 425 if (desc->name)