Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 647802d6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

Merge branch 'x86-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: APIC: enable workaround on AMD Fam10h CPUs
  xen: disable interrupts before saving in percpu
  x86: add x86@kernel.org to MAINTAINERS
  x86: push old stack address on irqstack for unwinder
  irq, x86: fix lock status with numa_migrate_irq_desc
  x86: add cache descriptors for Intel Core i7
  x86/Voyager: make it build and boot
parents 3e561f97 bb960a1e

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -4841,6 +4841,7 @@ P: Ingo Molnar 
M:	mingo@redhat.com

P:	H. Peter Anvin

M:	hpa@zytor.com

M:	x86@kernel.org

L:	linux-kernel@vger.kernel.org

T:	git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git

S:	Maintained

arch/x86/kernel/apic.c

+1 −1
Original line number Diff line number Diff line
@@ -1436,7 +1436,7 @@ static int __init detect_init_APIC(void) 
	switch (boot_cpu_data.x86_vendor) {

	case X86_VENDOR_AMD:

		if ((boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model > 1) ||

		    (boot_cpu_data.x86 == 15))

		    (boot_cpu_data.x86 >= 15))

			break;

		goto no_apic;

	case X86_VENDOR_INTEL:

arch/x86/kernel/cpu/intel_cacheinfo.c

+15 −0
Original line number Diff line number Diff line
@@ -36,8 +36,11 @@ static struct _cache_table cache_table[] __cpuinitdata = 
{

	{ 0x06, LVL_1_INST, 8 },	/* 4-way set assoc, 32 byte line size */

	{ 0x08, LVL_1_INST, 16 },	/* 4-way set assoc, 32 byte line size */

	{ 0x09, LVL_1_INST, 32 },	/* 4-way set assoc, 64 byte line size */

	{ 0x0a, LVL_1_DATA, 8 },	/* 2 way set assoc, 32 byte line size */

	{ 0x0c, LVL_1_DATA, 16 },	/* 4-way set assoc, 32 byte line size */

	{ 0x0d, LVL_1_DATA, 16 },	/* 4-way set assoc, 64 byte line size */

	{ 0x21, LVL_2,      256 },	/* 8-way set assoc, 64 byte line size */

	{ 0x22, LVL_3,      512 },	/* 4-way set assoc, sectored cache, 64 byte line size */

	{ 0x23, LVL_3,      1024 },	/* 8-way set assoc, sectored cache, 64 byte line size */

	{ 0x25, LVL_3,      2048 },	/* 8-way set assoc, sectored cache, 64 byte line size */
@@ -85,6 +88,18 @@ static struct _cache_table cache_table[] __cpuinitdata = 
	{ 0x85, LVL_2,    2048 },	/* 8-way set assoc, 32 byte line size */

	{ 0x86, LVL_2,     512 },	/* 4-way set assoc, 64 byte line size */

	{ 0x87, LVL_2,    1024 },	/* 8-way set assoc, 64 byte line size */

	{ 0xd0, LVL_3,     512 },	/* 4-way set assoc, 64 byte line size */

	{ 0xd1, LVL_3,    1024 },	/* 4-way set assoc, 64 byte line size */

	{ 0xd2, LVL_3,    2048 },	/* 4-way set assoc, 64 byte line size */

	{ 0xd6, LVL_3,    1024 },	/* 8-way set assoc, 64 byte line size */

	{ 0xd7, LVL_3,    2038 },	/* 8-way set assoc, 64 byte line size */

	{ 0xd8, LVL_3,    4096 },	/* 12-way set assoc, 64 byte line size */

	{ 0xdc, LVL_3,    2048 },	/* 12-way set assoc, 64 byte line size */

	{ 0xdd, LVL_3,    4096 },	/* 12-way set assoc, 64 byte line size */

	{ 0xde, LVL_3,    8192 },	/* 12-way set assoc, 64 byte line size */

	{ 0xe2, LVL_3,    2048 },	/* 16-way set assoc, 64 byte line size */

	{ 0xe3, LVL_3,    4096 },	/* 16-way set assoc, 64 byte line size */

	{ 0xe4, LVL_3,    8192 },	/* 16-way set assoc, 64 byte line size */

	{ 0x00, 0, 0}

};

arch/x86/kernel/entry_64.S

+1 −0
Original line number Diff line number Diff line
@@ -346,6 +346,7 @@ ENTRY(save_args) 
	popq_cfi %rax			/* move return address... */

	mov %gs:pda_irqstackptr,%rsp

	EMPTY_FRAME 0

	pushq_cfi %rbp			/* backlink for unwinder */

	pushq_cfi %rax			/* ... to the new stack */

	/*

	 * We entered an interrupt context - irqs are off:

arch/x86/kernel/io_apic.c

+3 −2
Original line number Diff line number Diff line
@@ -2528,15 +2528,16 @@ static void irq_complete_move(struct irq_desc **descp) 


	vector = ~get_irq_regs()->orig_ax;

	me = smp_processor_id();



	if (vector == cfg->vector && cpumask_test_cpu(me, cfg->domain)) {

#ifdef CONFIG_NUMA_MIGRATE_IRQ_DESC

		*descp = desc = move_irq_desc(desc, me);

		/* get the new one */

		cfg = desc->chip_data;

#endif



	if (vector == cfg->vector && cpumask_test_cpu(me, cfg->domain))

		send_cleanup_vector(cfg);

	}

}

#else

static inline void irq_complete_move(struct irq_desc **descp) {}

#endif