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

Commit 4937ce87 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] update sn2_defconfig
  [IA64] Fix kernel hangup in kdump on INIT
  [IA64] Fix kernel panic in kdump on INIT
  [IA64] Remove vector from ia64_machine_kexec()
  [IA64] Fix race when multiple cpus go through MCA
  [IA64] Remove needless delay in MCA rendezvous
  [IA64] add driver for ACPI methods to call native firmware
  [IA64] abstract SAL_CALL wrapper to allow other firmware entry points
  [IA64] perfmon: Remove exit_pfm_fs()
  [IA64] tree-wide: Misc __cpu{initdata, init, exit} annotations
parents 4271e0f7 432a7d65

arch/ia64/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -461,6 +461,16 @@ config IA64_ESI 
	  firmware extensions, such as the ability to inject memory-errors

	  for test-purposes.  If you're unsure, say N.



config IA64_HP_AML_NFW

	bool "Support ACPI AML calls to native firmware"

	help

	  This driver installs a global ACPI Operation Region handler for

	  region 0xA1.  AML methods can use this OpRegion to call arbitrary

	  native firmware functions.  The driver installs the OpRegion

	  handler if there is an HPQ5001 device or if the user supplies

	  the "force" module parameter, e.g., with the "aml_nfw.force"

	  kernel command line option.



source "drivers/sn/Kconfig"



config KEXEC

arch/ia64/configs/sn2_defconfig

+189 −254

File changed.

Preview size limit exceeded, changes collapsed.

arch/ia64/hp/common/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -8,3 +8,4 @@ 
obj-y := sba_iommu.o

obj-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += hwsw_iommu.o

obj-$(CONFIG_IA64_GENERIC) += hwsw_iommu.o

obj-$(CONFIG_IA64_HP_AML_NFW) += aml_nfw.o

arch/ia64/hp/common/aml_nfw.c

0 → 100644
+236 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/ia64/kernel/crash.c

+8 −5
Original line number Diff line number Diff line
@@ -118,11 +118,6 @@ machine_crash_shutdown(struct pt_regs *pt) 
static void

machine_kdump_on_init(void)

{

	if (!ia64_kimage) {

		printk(KERN_NOTICE "machine_kdump_on_init(): "

				"kdump not configured\n");

		return;

	}

	local_irq_disable();

	kexec_disable_iosapic();

	machine_kexec(ia64_kimage);
@@ -156,6 +151,14 @@ kdump_init_notifier(struct notifier_block *self, unsigned long val, void *data) 
	if (!kdump_on_init)

		return NOTIFY_DONE;



	if (!ia64_kimage) {

		if (val == DIE_INIT_MONARCH_LEAVE)

			ia64_mca_printk(KERN_NOTICE

					"%s: kdump not configured\n",

					__FUNCTION__);

		return NOTIFY_DONE;

	}



	if (val != DIE_INIT_MONARCH_LEAVE &&

	    val != DIE_INIT_SLAVE_LEAVE &&

	    val != DIE_INIT_MONARCH_PROCESS &&