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

Commit f3ed73ff authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.19.48 (01f5de3f) into msm-4.19"

parents 9eea2464 d7864ac2

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 47

SUBLEVEL = 48

EXTRAVERSION =

NAME = "People's Front"

arch/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ config KPROBES 
config JUMP_LABEL

       bool "Optimize very unlikely/likely branches"

       depends on HAVE_ARCH_JUMP_LABEL

       depends on CC_HAS_ASM_GOTO

       help

         This option enables a transparent branch optimization that

	 makes certain almost-always-true or almost-always-false branch

arch/arm/kernel/jump_label.c

+0 −4
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ 
#include <asm/patch.h>

#include <asm/insn.h>



#ifdef HAVE_JUMP_LABEL



static void __arch_jump_label_transform(struct jump_entry *entry,

					enum jump_label_type type,

					bool is_static)
@@ -35,5 +33,3 @@ void arch_jump_label_transform_static(struct jump_entry *entry, 
{

	__arch_jump_label_transform(entry, type, true);

}
 


#endif

arch/arm64/kernel/jump_label.c

+0 −4
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 
#include <linux/jump_label.h>

#include <asm/insn.h>



#ifdef HAVE_JUMP_LABEL



void arch_jump_label_transform(struct jump_entry *entry,

			       enum jump_label_type type)

{
@@ -49,5 +47,3 @@ void arch_jump_label_transform_static(struct jump_entry *entry, 
	 * NOP needs to be replaced by a branch.

	 */

}
 


#endif	/* HAVE_JUMP_LABEL */

arch/mips/kernel/jump_label.c

+0 −4
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 
#include <asm/cacheflush.h>

#include <asm/inst.h>



#ifdef HAVE_JUMP_LABEL



/*

 * Define parameters for the standard MIPS and the microMIPS jump

 * instruction encoding respectively:
@@ -70,5 +68,3 @@ void arch_jump_label_transform(struct jump_entry *e, 


	mutex_unlock(&text_mutex);

}
 


#endif /* HAVE_JUMP_LABEL */