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

Commit cf77e988 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] Drop duplicated "config IOMMU_HELPER"
  [IA64] invoke oom-killer from page fault
  [IA64] use __ratelimit
  [IA64] Use set_cpus_allowed_ptr
  [IA64] Use set_cpus_allowed_ptr
  [IA64] arch/ia64/hp/common/sba_iommu.c: Rename dev_info to adi
  [IA64] removing redundant ifdef
parents 1d3c6ff4 2a2ae242

arch/ia64/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -59,9 +59,6 @@ config NEED_DMA_MAP_STATE 
config SWIOTLB

       bool



config IOMMU_HELPER

       bool



config GENERIC_LOCKBREAK

	def_bool n

arch/ia64/hp/common/sba_iommu.c

+4 −4
Original line number Diff line number Diff line
@@ -2046,13 +2046,13 @@ acpi_sba_ioc_add(struct acpi_device *device) 
	struct ioc *ioc;

	acpi_status status;

	u64 hpa, length;

	struct acpi_device_info *dev_info;

	struct acpi_device_info *adi;



	status = hp_acpi_csr_space(device->handle, &hpa, &length);

	if (ACPI_FAILURE(status))

		return 1;



	status = acpi_get_object_info(device->handle, &dev_info);

	status = acpi_get_object_info(device->handle, &adi);

	if (ACPI_FAILURE(status))

		return 1;
@@ -2060,13 +2060,13 @@ acpi_sba_ioc_add(struct acpi_device *device) 
	 * For HWP0001, only SBA appears in ACPI namespace.  It encloses the PCI

	 * root bridges, and its CSR space includes the IOC function.

	 */

	if (strncmp("HWP0001", dev_info->hardware_id.string, 7) == 0) {

	if (strncmp("HWP0001", adi->hardware_id.string, 7) == 0) {

		hpa += ZX1_IOC_OFFSET;

		/* zx1 based systems default to kernel page size iommu pages */

		if (!iovp_shift)

			iovp_shift = min(PAGE_SHIFT, 16);

	}

	kfree(dev_info);

	kfree(adi);



	/*

	 * default anything not caught above or specified on cmdline to 4k

arch/ia64/include/asm/mmzone.h

+0 −4
Original line number Diff line number Diff line
@@ -19,16 +19,12 @@ 


static inline int pfn_to_nid(unsigned long pfn)

{

#ifdef CONFIG_NUMA

	extern int paddr_to_nid(unsigned long);

	int nid = paddr_to_nid(pfn << PAGE_SHIFT);

	if (nid < 0)

		return 0;

	else

		return nid;

#else

	return 0;

#endif

}



#ifdef CONFIG_IA64_DIG /* DIG systems are small */

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

+5 −5
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ processor_get_freq ( 
	dprintk("processor_get_freq\n");



	saved_mask = current->cpus_allowed;

	set_cpus_allowed(current, cpumask_of_cpu(cpu));

	set_cpus_allowed_ptr(current, cpumask_of(cpu));

	if (smp_processor_id() != cpu)

		goto migrate_end;
@@ -121,7 +121,7 @@ processor_get_freq ( 
	ret = processor_get_pstate(&value);



	if (ret) {

		set_cpus_allowed(current, saved_mask);

		set_cpus_allowed_ptr(current, &saved_mask);

		printk(KERN_WARNING "get performance failed with error %d\n",

		       ret);

		ret = 0;
@@ -131,7 +131,7 @@ processor_get_freq ( 
	ret = (clock_freq*1000);



migrate_end:

	set_cpus_allowed(current, saved_mask);

	set_cpus_allowed_ptr(current, &saved_mask);

	return ret;

}
@@ -151,7 +151,7 @@ processor_set_freq ( 
	dprintk("processor_set_freq\n");



	saved_mask = current->cpus_allowed;

	set_cpus_allowed(current, cpumask_of_cpu(cpu));

	set_cpus_allowed_ptr(current, cpumask_of(cpu));

	if (smp_processor_id() != cpu) {

		retval = -EAGAIN;

		goto migrate_end;
@@ -208,7 +208,7 @@ processor_set_freq ( 
	retval = 0;



migrate_end:

	set_cpus_allowed(current, saved_mask);

	set_cpus_allowed_ptr(current, &saved_mask);

	return (retval);

}

arch/ia64/kernel/irq_ia64.c

+3 −6
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/threads.h>

#include <linux/bitops.h>

#include <linux/irq.h>

#include <linux/ratelimit.h>



#include <asm/delay.h>

#include <asm/intrinsics.h>
@@ -467,13 +468,9 @@ ia64_handle_irq (ia64_vector vector, struct pt_regs *regs) 
		sp = ia64_getreg(_IA64_REG_SP);



		if ((sp - bsp) < 1024) {

			static unsigned char count;

			static long last_time;

			static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);



			if (time_after(jiffies, last_time + 5 * HZ))

				count = 0;

			if (++count < 5) {

				last_time = jiffies;

			if (__ratelimit(&ratelimit)) {

				printk("ia64_handle_irq: DANGER: less than "

				       "1KB of free stack space!!\n"

				       "(bsp=0x%lx, sp=%lx)\n", bsp, sp);