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

Commit 33f795b2 authored by Ashwini Muduganti's avatar Ashwini Muduganti
Browse files

Merge commit 'refs/changes/97/2512097/1' of ssh://git.quicinc.com:29418/kernel/msm-4.14 



Change-Id: I801581b1daa97a2ee509f70ac17a490c9c6250e8
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
Signed-off-by: default avatarAshwini Muduganti <amudug@codeaurora.org>
parents b66e4d36 2f4158f9

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 79

SUBLEVEL = 80

EXTRAVERSION =

NAME = Petit Gorille

arch/arm/boot/dts/tegra20.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ 
		phy_type = "ulpi";

		clocks = <&tegra_car TEGRA20_CLK_USB2>,

			 <&tegra_car TEGRA20_CLK_PLL_U>,

			 <&tegra_car TEGRA20_CLK_PLL_P_OUT4>;

			 <&tegra_car TEGRA20_CLK_CDEV2>;

		clock-names = "reg", "pll_u", "ulpi-link";

		resets = <&tegra_car 58>, <&tegra_car 22>;

		reset-names = "usb", "utmi-pads";

arch/x86/include/asm/fpu/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ static inline void fpregs_activate(struct fpu *fpu) 
static inline void

switch_fpu_prepare(struct fpu *old_fpu, int cpu)

{

	if (old_fpu->initialized) {

	if (static_cpu_has(X86_FEATURE_FPU) && old_fpu->initialized) {

		if (!copy_fpregs_to_fpstate(old_fpu))

			old_fpu->last_cpu = -1;

		else

arch/x86/include/asm/percpu.h

+4 −4
Original line number Diff line number Diff line
@@ -185,22 +185,22 @@ do { \ 
	typeof(var) pfo_ret__;				\

	switch (sizeof(var)) {				\

	case 1:						\

		asm(op "b "__percpu_arg(1)",%0"		\

		asm volatile(op "b "__percpu_arg(1)",%0"\

		    : "=q" (pfo_ret__)			\

		    : "m" (var));			\

		break;					\

	case 2:						\

		asm(op "w "__percpu_arg(1)",%0"		\

		asm volatile(op "w "__percpu_arg(1)",%0"\

		    : "=r" (pfo_ret__)			\

		    : "m" (var));			\

		break;					\

	case 4:						\

		asm(op "l "__percpu_arg(1)",%0"		\

		asm volatile(op "l "__percpu_arg(1)",%0"\

		    : "=r" (pfo_ret__)			\

		    : "m" (var));			\

		break;					\

	case 8:						\

		asm(op "q "__percpu_arg(1)",%0"		\

		asm volatile(op "q "__percpu_arg(1)",%0"\

		    : "=r" (pfo_ret__)			\

		    : "m" (var));			\

		break;					\

arch/x86/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -1287,7 +1287,7 @@ void __init setup_arch(char **cmdline_p) 
	kvm_guest_init();



	e820__reserve_resources();

	e820__register_nosave_regions(max_low_pfn);

	e820__register_nosave_regions(max_pfn);



	x86_init.resources.reserve_resources();