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

Commit 6ee7e78e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] replace kmalloc+memset with kzalloc
  [IA64] resolve name clash by renaming is_available_memory()
  [IA64] Need export for csum_ipv6_magic
  [IA64] Fix DISCONTIGMEM without VIRTUAL_MEM_MAP
  [PATCH] Add support for type argument in PAL_GET_PSTATE
  [IA64] tidy up return value of ip_fast_csum
  [IA64] implement csum_ipv6_magic for ia64.
  [IA64] More Itanium PAL spec updates
  [IA64] Update processor_info features
  [IA64] Add se bit to Processor State Parameter structure
  [IA64] Add dp bit to cache and bus check structs
  [IA64] SN: Correctly update smp_affinty mask
  [IA64] sparse cleanups
  [IA64] IA64 Kexec/kdump
parents 7f3af60e 52fd9108

arch/ia64/Kconfig

+23 −0
Original line number Diff line number Diff line
@@ -434,6 +434,29 @@ config IA64_ESI 


source "drivers/sn/Kconfig"



config KEXEC

	bool "kexec system call (EXPERIMENTAL)"

	depends on EXPERIMENTAL && !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)

	help

	  kexec is a system call that implements the ability to shutdown your

	  current kernel, and to start another kernel.  It is like a reboot

	  but it is indepedent of the system firmware.   And like a reboot

	  you can start any kernel with it, not just Linux.



	  The name comes from the similiarity to the exec system call.



	  It is an ongoing process to be certain the hardware in a machine

	  is properly shutdown, so do not be surprised if this code does not

	  initially work for you.  It may help to enable device hotplugging

	  support.  As of this writing the exact hardware interface is

	  strongly in flux, so no good recommendation can be made.



config CRASH_DUMP

	  bool "kernel crash dumps (EXPERIMENTAL)"

	  depends on EXPERIMENTAL && IA64_MCA_RECOVERY && !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)

	  help

	    Generate crash dump after being started by kexec.



source "drivers/firmware/Kconfig"



source "fs/Kconfig.binfmt"

arch/ia64/hp/common/sba_iommu.c

+3 −7
Original line number Diff line number Diff line
@@ -1672,15 +1672,13 @@ ioc_sac_init(struct ioc *ioc) 
	 * SAC (single address cycle) addressable, so allocate a

	 * pseudo-device to enforce that.

	 */

	sac = kmalloc(sizeof(*sac), GFP_KERNEL);

	sac = kzalloc(sizeof(*sac), GFP_KERNEL);

	if (!sac)

		panic(PFX "Couldn't allocate struct pci_dev");

	memset(sac, 0, sizeof(*sac));



	controller = kmalloc(sizeof(*controller), GFP_KERNEL);

	controller = kzalloc(sizeof(*controller), GFP_KERNEL);

	if (!controller)

		panic(PFX "Couldn't allocate struct pci_controller");

	memset(controller, 0, sizeof(*controller));



	controller->iommu = ioc;

	sac->sysdata = controller;
@@ -1737,12 +1735,10 @@ ioc_init(u64 hpa, void *handle) 
	struct ioc *ioc;

	struct ioc_iommu *info;



	ioc = kmalloc(sizeof(*ioc), GFP_KERNEL);

	ioc = kzalloc(sizeof(*ioc), GFP_KERNEL);

	if (!ioc)

		return NULL;



	memset(ioc, 0, sizeof(*ioc));



	ioc->next = ioc_list;

	ioc_list = ioc;

arch/ia64/hp/sim/simserial.c

+1 −2
Original line number Diff line number Diff line
@@ -684,12 +684,11 @@ static int get_async_struct(int line, struct async_struct **ret_info) 
		*ret_info = sstate->info;

		return 0;

	}

	info = kmalloc(sizeof(struct async_struct), GFP_KERNEL);

	info = kzalloc(sizeof(struct async_struct), GFP_KERNEL);

	if (!info) {

		sstate->count--;

		return -ENOMEM;

	}

	memset(info, 0, sizeof(struct async_struct));

	init_waitqueue_head(&info->open_wait);

	init_waitqueue_head(&info->close_wait);

	init_waitqueue_head(&info->delta_msr_wait);

arch/ia64/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ obj-$(CONFIG_IA64_CYCLONE) += cyclone.o 
obj-$(CONFIG_CPU_FREQ)		+= cpufreq/

obj-$(CONFIG_IA64_MCA_RECOVERY)	+= mca_recovery.o

obj-$(CONFIG_KPROBES)		+= kprobes.o jprobes.o

obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o crash.o

obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR)	+= uncached.o

obj-$(CONFIG_AUDIT)		+= audit.o

obj-$(CONFIG_PCI_MSI)		+= msi_ia64.o

arch/ia64/kernel/cpufreq/acpi-cpufreq.c

+4 −7
Original line number Diff line number Diff line
@@ -68,7 +68,8 @@ processor_get_pstate ( 


	dprintk("processor_get_pstate\n");



	retval = ia64_pal_get_pstate(&pstate_index);

	retval = ia64_pal_get_pstate(&pstate_index,

	                             PAL_GET_PSTATE_TYPE_INSTANT);

	*value = (u32) pstate_index;



	if (retval)
@@ -91,7 +92,7 @@ extract_clock ( 
	dprintk("extract_clock\n");



	for (i = 0; i < data->acpi_data.state_count; i++) {

		if (value >= data->acpi_data.states[i].control)

		if (value == data->acpi_data.states[i].status)

			return data->acpi_data.states[i].core_frequency;

	}

	return data->acpi_data.states[i-1].core_frequency;
@@ -117,11 +118,7 @@ processor_get_freq ( 
		goto migrate_end;

	}



	/*

	 * processor_get_pstate gets the average frequency since the

	 * last get. So, do two PAL_get_freq()...

	 */

	ret = processor_get_pstate(&value);

	/* processor_get_pstate gets the instantaneous frequency */

	ret = processor_get_pstate(&value);



	if (ret) {