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

Commit bd618d9d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.9-o.82 (2d34d459) into msm-4.9"

parents 94b8c520 82ccf838

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 81

SUBLEVEL = 82

EXTRAVERSION =

NAME = Roaring Lionus

arch/alpha/kernel/pci_impl.h

+2 −1
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@ struct pci_iommu_arena 
};



#if defined(CONFIG_ALPHA_SRM) && \

    (defined(CONFIG_ALPHA_CIA) || defined(CONFIG_ALPHA_LCA))

    (defined(CONFIG_ALPHA_CIA) || defined(CONFIG_ALPHA_LCA) || \

     defined(CONFIG_ALPHA_AVANTI))

# define NEED_SRM_SAVE_RESTORE

#else

# undef NEED_SRM_SAVE_RESTORE

arch/alpha/kernel/process.c

+2 −1
Original line number Diff line number Diff line
@@ -265,12 +265,13 @@ copy_thread(unsigned long clone_flags, unsigned long usp, 
	   application calling fork.  */

	if (clone_flags & CLONE_SETTLS)

		childti->pcb.unique = regs->r20;

	else

		regs->r20 = 0;	/* OSF/1 has some strange fork() semantics.  */

	childti->pcb.usp = usp ?: rdusp();

	*childregs = *regs;

	childregs->r0 = 0;

	childregs->r19 = 0;

	childregs->r20 = 1;	/* OSF/1 has some strange fork() semantics.  */

	regs->r20 = 0;

	stack = ((struct switch_stack *) regs) - 1;

	*childstack = *stack;

	childstack->r26 = (unsigned long) ret_from_fork;

arch/alpha/kernel/traps.c

+9 −4
Original line number Diff line number Diff line
@@ -158,11 +158,16 @@ void show_stack(struct task_struct *task, unsigned long *sp) 
	for(i=0; i < kstack_depth_to_print; i++) {

		if (((long) stack & (THREAD_SIZE-1)) == 0)

			break;

		if (i && ((i % 4) == 0))

			printk("\n       ");

		printk("%016lx ", *stack++);

		if ((i % 4) == 0) {

			if (i)

				pr_cont("\n");

			printk("       ");

		} else {

			pr_cont(" ");

		}

	printk("\n");

		pr_cont("%016lx", *stack++);

	}

	pr_cont("\n");

	dik_show_trace(sp);

}

arch/arm/kvm/arm.c

+1 −0
Original line number Diff line number Diff line
@@ -1165,6 +1165,7 @@ static int hyp_init_cpu_pm_notifier(struct notifier_block *self, 
			cpu_hyp_reset();



		return NOTIFY_OK;

	case CPU_PM_ENTER_FAILED:

	case CPU_PM_EXIT:

		if (__this_cpu_read(kvm_arm_hardware_enabled))

			/* The hardware was enabled before suspend. */