Commit 0e65ae09 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ia64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux 

Pull miscellaneous Itanium patches from Tony Luck.

The conflicts in arch/ia64/hp/sim/simserial.c were due to patches to
simserial that had alredy been included (with lots of further cleanups)
in the serial tree.

* tag 'ia64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  Documentation/kernel-parameters: remove inttest parameter
  [IA64] Fix ISA IRQ trigger model and polarity setting
  [IA64] Fix a couple of warnings for EXPORT_SYMBOL
  [IA64] Check return from device_register() in cx_device_register()
  [IA64] Fix warning from machine_kexec.c
  [IA64] simserial, bail out when request_irq fails
  [IA64] hpsim, initialize chip for assigned irqs
  [IA64] simserial, include some headers
  [IA64] hpsim, fix SAL handling in fw-emu
  [IA64] genirq fixup for SGI/SN
  [IA64] disable interrupts when exiting from ia64_mca_cmc_int_handler()
parents 2fb9e96c b86c4782

Documentation/kernel-parameters.txt

+0 −2
Original line number Diff line number Diff line
@@ -1086,8 +1086,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			no_x2apic_optout

				BIOS x2APIC opt-out request will be ignored



	inttest=	[IA-64]



	iomem=		Disable strict checking of access to MMIO memory

		strict	regions from userspace.

		relaxed

arch/ia64/kernel/acpi.c

+4 −4
Original line number Diff line number Diff line
@@ -349,11 +349,11 @@ acpi_parse_int_src_ovr(struct acpi_subtable_header * header, 


	iosapic_override_isa_irq(p->source_irq, p->global_irq,

				 ((p->inti_flags & ACPI_MADT_POLARITY_MASK) ==

				  ACPI_MADT_POLARITY_ACTIVE_HIGH) ?

				 IOSAPIC_POL_HIGH : IOSAPIC_POL_LOW,

				  ACPI_MADT_POLARITY_ACTIVE_LOW) ?

				 IOSAPIC_POL_LOW : IOSAPIC_POL_HIGH,

				 ((p->inti_flags & ACPI_MADT_TRIGGER_MASK) ==

				 ACPI_MADT_TRIGGER_EDGE) ?

				 IOSAPIC_EDGE : IOSAPIC_LEVEL);

				 ACPI_MADT_TRIGGER_LEVEL) ?

				 IOSAPIC_LEVEL : IOSAPIC_EDGE);

	return 0;

}

arch/ia64/kernel/machine_kexec.c

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ void arch_crash_save_vmcoreinfo(void) 
#endif

#ifdef CONFIG_PGTABLE_3

	VMCOREINFO_CONFIG(PGTABLE_3);

#elif  CONFIG_PGTABLE_4

#elif defined(CONFIG_PGTABLE_4)

	VMCOREINFO_CONFIG(PGTABLE_4);

#endif

}

arch/ia64/kernel/mca.c

+2 −0
Original line number Diff line number Diff line
@@ -1447,6 +1447,8 @@ ia64_mca_cmc_int_handler(int cmc_irq, void *arg) 
	/* Get the CMC error record and log it */

	ia64_mca_log_sal_error_record(SAL_INFO_TYPE_CMC);



	local_irq_disable();



	return IRQ_HANDLED;

}

arch/ia64/sn/kernel/huberror.c

+2 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ void hub_error_init(struct hubdev_info *hubdev_info) 
		    hubdev_info);

		return;

	}

	irq_set_handler(SGI_II_ERROR, handle_level_irq);

	sn_set_err_irq_affinity(SGI_II_ERROR);

}
@@ -213,6 +214,7 @@ void ice_error_init(struct hubdev_info *hubdev_info) 
                       hubdev_info);

		return;

	}

	irq_set_handler(SGI_TIO_ERROR, handle_level_irq);

	sn_set_err_irq_affinity(SGI_TIO_ERROR);

}