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

Commit f701d354 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'tracing/ftrace' and 'linus' into tracing/core

parents 1b49061d 64e71303

Documentation/kernel-parameters.txt

+4 −2
Original line number Diff line number Diff line
@@ -869,8 +869,10 @@ and is between 256 and 4096 characters. It is defined in the file 
	icn=		[HW,ISDN]

			Format: <io>[,<membase>[,<icn_id>[,<icn_id2>]]]



	ide=		[HW] (E)IDE subsystem

			Format: ide=nodma or ide=doubler

	ide-core.nodma=	[HW] (E)IDE subsystem

			Format: =0.0 to prevent dma on hda, =0.1 hdb =1.0 hdc

			.vlb_clock .pci_clock .noflush .noprobe .nowerr .cdrom

			.chs .ignore_cable are additional options

			See Documentation/ide/ide.txt.



	idebus=		[HW] (E)IDE subsystem - VLB/PCI bus speed

arch/ia64/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -641,6 +641,17 @@ config DMAR 
	  and include PCI device scope covered by these DMA

	  remapping devices.



config DMAR_DEFAULT_ON

	def_bool y

	prompt "Enable DMA Remapping Devices by default"

	depends on DMAR

	help

	  Selecting this option will enable a DMAR device at boot time if

	  one is found. If this option is not selected, DMAR support can

	  be enabled by passing intel_iommu=on to the kernel. It is

	  recommended you say N here while the DMAR code remains

	  experimental.



endmenu



endif

arch/ia64/kernel/iosapic.c

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ static int iosapic_find_sharable_irq(unsigned long trigger, unsigned long pol) 
	if (trigger == IOSAPIC_EDGE)

		return -EINVAL;



	for (i = 0; i <= NR_IRQS; i++) {

	for (i = 0; i < NR_IRQS; i++) {

		info = &iosapic_intr_info[i];

		if (info->trigger == trigger && info->polarity == pol &&

		    (info->dmode == IOSAPIC_FIXED ||

arch/ia64/kernel/unwind.c

+1 −1
Original line number Diff line number Diff line
@@ -2149,7 +2149,7 @@ unw_remove_unwind_table (void *handle) 


	/* next, remove hash table entries for this table */



	for (index = 0; index <= UNW_HASH_SIZE; ++index) {

	for (index = 0; index < UNW_HASH_SIZE; ++index) {

		tmp = unw.cache + unw.hash[index];

		if (unw.hash[index] >= UNW_CACHE_SIZE

		    || tmp->ip < table->start || tmp->ip >= table->end)

arch/powerpc/kernel/align.c

+13 −16
Original line number Diff line number Diff line
@@ -367,27 +367,24 @@ static int emulate_multiple(struct pt_regs *regs, unsigned char __user *addr, 
static int emulate_fp_pair(unsigned char __user *addr, unsigned int reg,

			   unsigned int flags)

{

	char *ptr = (char *) &current->thread.TS_FPR(reg);

	int i, ret;

	char *ptr0 = (char *) &current->thread.TS_FPR(reg);

	char *ptr1 = (char *) &current->thread.TS_FPR(reg+1);

	int i, ret, sw = 0;



	if (!(flags & F))

		return 0;

	if (reg & 1)

		return 0;	/* invalid form: FRS/FRT must be even */

	if (!(flags & SW)) {

		/* not byte-swapped - easy */

		if (!(flags & ST))

			ret = __copy_from_user(ptr, addr, 16);

		else

			ret = __copy_to_user(addr, ptr, 16);

	} else {

		/* each FPR value is byte-swapped separately */

	if (flags & SW)

		sw = 7;

	ret = 0;

		for (i = 0; i < 16; ++i) {

			if (!(flags & ST))

				ret |= __get_user(ptr[i^7], addr + i);

			else

				ret |= __put_user(ptr[i^7], addr + i);

	for (i = 0; i < 8; ++i) {

		if (!(flags & ST)) {

			ret |= __get_user(ptr0[i^sw], addr + i);

			ret |= __get_user(ptr1[i^sw], addr + i + 8);

		} else {

			ret |= __put_user(ptr0[i^sw], addr + i);

			ret |= __put_user(ptr1[i^sw], addr + i + 8);

		}

	}

	if (ret)