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

Commit 55ec86f8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'x86-fixes-for-linus' and 'perf-fixes-for-linus' of... 

Merge branches 'x86-fixes-for-linus' and 'perf-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-32: Make sure we can map all of lowmem if we need to
  x86, vt-d: Handle previous faults after enabling fault handling
  x86: Enable the intr-remap fault handling after local APIC setup
  x86, vt-d: Fix the vt-d fault handling irq migration in the x2apic mode
  x86, vt-d: Quirk for masking vtd spec errors to platform error handling logic
  x86, xsave: Use alloc_bootmem_align() instead of alloc_bootmem()
  bootmem: Add alloc_bootmem_align()
  x86, gcc-4.6: Use gcc -m options when building vdso
  x86: HPET: Chose a paranoid safe value for the ETIME check
  x86: io_apic: Avoid unused variable warning when CONFIG_GENERIC_PENDING_IRQ=n

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf: Fix off by one in perf_swevent_init()
  perf: Fix duplicate events with multiple-pmu vs software events
  ftrace: Have recordmcount honor endianness in fn_ELF_R_INFO
  scripts/tags.sh: Add magic for trace-events
  tracing: Fix panic when lseek() called on "trace" opened for writing
parents 21228e45 147dd561 d949750f

arch/x86/boot/compressed/misc.c

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap, 
	if (heap > 0x3fffffffffffUL)

		error("Destination address too large");

#else

	if (heap > ((-__PAGE_OFFSET-(512<<20)-1) & 0x7fffffff))

	if (heap > ((-__PAGE_OFFSET-(128<<20)-1) & 0x7fffffff))

		error("Destination address too large");

#endif

#ifndef CONFIG_RELOCATABLE

arch/x86/kernel/apic/apic.c

+8 −0
Original line number Diff line number Diff line
@@ -1389,6 +1389,14 @@ void __cpuinit end_local_APIC_setup(void) 


	setup_apic_nmi_watchdog(NULL);

	apic_pm_activate();



	/*

	 * Now that local APIC setup is completed for BP, configure the fault

	 * handling for interrupt remapping.

	 */

	if (!smp_processor_id() && intr_remapping_enabled)

		enable_drhd_fault_handling();



}



#ifdef CONFIG_X86_X2APIC

arch/x86/kernel/apic/io_apic.c

+2 −2
Original line number Diff line number Diff line
@@ -2430,13 +2430,12 @@ static void ack_apic_level(struct irq_data *data) 
{

	struct irq_cfg *cfg = data->chip_data;

	int i, do_unmask_irq = 0, irq = data->irq;

	struct irq_desc *desc = irq_to_desc(irq);

	unsigned long v;



	irq_complete_move(cfg);

#ifdef CONFIG_GENERIC_PENDING_IRQ

	/* If we are moving the irq we need to mask it */

	if (unlikely(desc->status & IRQ_MOVE_PENDING)) {

	if (unlikely(irq_to_desc(irq)->status & IRQ_MOVE_PENDING)) {

		do_unmask_irq = 1;

		mask_ioapic(cfg);

	}
@@ -3413,6 +3412,7 @@ dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask, 
	msg.data |= MSI_DATA_VECTOR(cfg->vector);

	msg.address_lo &= ~MSI_ADDR_DEST_ID_MASK;

	msg.address_lo |= MSI_ADDR_DEST_ID(dest);

	msg.address_hi = MSI_ADDR_BASE_HI | MSI_ADDR_EXT_DEST_ID(dest);



	dmar_msi_write(irq, &msg);

arch/x86/kernel/apic/probe_64.c

+0 −7
Original line number Diff line number Diff line
@@ -79,13 +79,6 @@ void __init default_setup_apic_routing(void) 
		/* need to update phys_pkg_id */

		apic->phys_pkg_id = apicid_phys_pkg_id;

	}



	/*

	 * Now that apic routing model is selected, configure the

	 * fault handling for intr remapping.

	 */

	if (intr_remapping_enabled)

		enable_drhd_fault_handling();

}



/* Same for both flat and physical. */

arch/x86/kernel/head_32.S

+7 −5
Original line number Diff line number Diff line
@@ -60,16 +60,18 @@ 
#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)

#endif



/* Number of possible pages in the lowmem region */

LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)

	

/* Enough space to fit pagetables for the low memory linear map */

MAPPING_BEYOND_END = \

	PAGE_TABLE_SIZE(((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT) << PAGE_SHIFT

MAPPING_BEYOND_END = PAGE_TABLE_SIZE(LOWMEM_PAGES) << PAGE_SHIFT



/*

 * Worst-case size of the kernel mapping we need to make:

 * the worst-case size of the kernel itself, plus the extra we need

 * to map for the linear map.

 * a relocatable kernel can live anywhere in lowmem, so we need to be able

 * to map all of lowmem.

 */

KERNEL_PAGES = (KERNEL_IMAGE_SIZE + MAPPING_BEYOND_END)>>PAGE_SHIFT

KERNEL_PAGES = LOWMEM_PAGES



INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE_asm

RESERVE_BRK(pagetables, INIT_MAP_SIZE)