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

Commit 2a383c63 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] Quicklist support for IA64
  [IA64] fix Kprobes reentrancy
  [IA64] SN: validate smp_affinity mask on intr redirect
  [IA64] drivers/char/snsc_event.c:206: warning: unused variable `p'
  [IA64] mca.c:121: warning: 'cpe_poll_timer' defined but not used
  [IA64] Fix - Section mismatch: reference to .init.data:mvec_name
  [IA64] more warning cleanups
  [IA64] Wire up epoll_pwait and utimensat
  [IA64] Fix warnings resulting from type-checking in dev_dbg()
  [IA64] typo s/kenrel/kernel/
parents 8bd99481 2bd62a40

arch/ia64/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ config ZONE_DMA 
	def_bool y

	depends on !IA64_SGI_SN2



config QUICKLIST

	bool

	default y



config MMU

	bool

	default y

arch/ia64/hp/common/hwsw_iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ use_swiotlb (struct device *dev) 
	return dev && dev->dma_mask && !hwiommu_dma_supported(dev, *dev->dma_mask);

}



void

void __init

hwsw_init (void)

{

	/* default to a smallish 2MB sw I/O TLB */

arch/ia64/kernel/entry.S

+2 −0
Original line number Diff line number Diff line
@@ -1583,5 +1583,7 @@ sys_call_table: 
	data8 sys_vmsplice

	data8 sys_ni_syscall			// reserved for move_pages

	data8 sys_getcpu

	data8 sys_epoll_pwait			// 1305

	data8 sys_utimensat



	.org sys_call_table + 8*NR_syscalls	// guard against failures to increase NR_syscalls

arch/ia64/kernel/err_inject.c

+1 −1
Original line number Diff line number Diff line
@@ -291,5 +291,5 @@ module_init(err_inject_init); 
module_exit(err_inject_exit);



MODULE_AUTHOR("Fenghua Yu <fenghua.yu@intel.com>");

MODULE_DESCRIPTION("MC error injection kenrel sysfs interface");

MODULE_DESCRIPTION("MC error injection kernel sysfs interface");

MODULE_LICENSE("GPL");

arch/ia64/kernel/irq.c

+11 −0
Original line number Diff line number Diff line
@@ -104,6 +104,17 @@ void set_irq_affinity_info (unsigned int irq, int hwid, int redir) 
		irq_redir[irq] = (char) (redir & 0xff);

	}

}



bool is_affinity_mask_valid(cpumask_t cpumask)

{

	if (ia64_platform_is("sn2")) {

		/* Only allow one CPU to be specified in the smp_affinity mask */

		if (cpus_weight(cpumask) != 1)

			return false;

	}

	return true;

}



#endif /* CONFIG_SMP */



#ifdef CONFIG_HOTPLUG_CPU