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

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

Merge "Merge android-4.19.33 (0b065cd5) into msm-4.19"

parents 1ca62488 42e38008

Documentation/virtual/kvm/api.txt

+11 −5
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ of a virtual machine. The ioctls belong to three classes 


 - VM ioctls: These query and set attributes that affect an entire virtual

   machine, for example memory layout.  In addition a VM ioctl is used to

   create virtual cpus (vcpus).

   create virtual cpus (vcpus) and devices.



   Only run VM ioctls from the same process (address space) that was used

   to create the VM.
@@ -24,6 +24,11 @@ of a virtual machine. The ioctls belong to three classes 
   Only run vcpu ioctls from the same thread that was used to create the

   vcpu.



 - device ioctls: These query and set attributes that control the operation

   of a single device.



   device ioctls must be issued from the same process (address space) that

   was used to create the VM.



2. File descriptors

-------------------
@@ -32,10 +37,11 @@ The kvm API is centered around file descriptors. An initial 
open("/dev/kvm") obtains a handle to the kvm subsystem; this handle

can be used to issue system ioctls.  A KVM_CREATE_VM ioctl on this

handle will create a VM file descriptor which can be used to issue VM

ioctls.  A KVM_CREATE_VCPU ioctl on a VM fd will create a virtual cpu

and return a file descriptor pointing to it.  Finally, ioctls on a vcpu

fd can be used to control the vcpu, including the important task of

actually running guest code.

ioctls.  A KVM_CREATE_VCPU or KVM_CREATE_DEVICE ioctl on a VM fd will

create a virtual cpu or device and return a file descriptor pointing to

the new resource.  Finally, ioctls on a vcpu or device fd can be used

to control the vcpu or device.  For vcpus, this includes the important

task of actually running guest code.



In general file descriptors can be migrated among processes by means

of fork() and the SCM_RIGHTS facility of unix domain socket.  These

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 32

SUBLEVEL = 33

EXTRAVERSION =

NAME = "People's Front"
@@ -999,9 +999,11 @@ mod_sign_cmd = true 
endif

export mod_sign_cmd



HOST_LIBELF_LIBS = $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf)



ifdef CONFIG_STACK_VALIDATION

  has_libelf := $(call try-run,\

		echo "int main() {}" | $(HOSTCC) -xc -o /dev/null -lelf -,1,0)

		echo "int main() {}" | $(HOSTCC) -xc -o /dev/null $(HOST_LIBELF_LIBS) -,1,0)

  ifeq ($(has_libelf),1)

    objtool_target := tools/objtool FORCE

  else

arch/arm/mach-imx/cpuidle-imx6q.c

+10 −17
Original line number Diff line number Diff line
@@ -16,30 +16,23 @@ 
#include "cpuidle.h"

#include "hardware.h"



static atomic_t master = ATOMIC_INIT(0);

static DEFINE_SPINLOCK(master_lock);

static int num_idle_cpus = 0;

static DEFINE_SPINLOCK(cpuidle_lock);



static int imx6q_enter_wait(struct cpuidle_device *dev,

			    struct cpuidle_driver *drv, int index)

{

	if (atomic_inc_return(&master) == num_online_cpus()) {

		/*

		 * With this lock, we prevent other cpu to exit and enter

		 * this function again and become the master.

		 */

		if (!spin_trylock(&master_lock))

			goto idle;

	spin_lock(&cpuidle_lock);

	if (++num_idle_cpus == num_online_cpus())

		imx6_set_lpm(WAIT_UNCLOCKED);

		cpu_do_idle();

		imx6_set_lpm(WAIT_CLOCKED);

		spin_unlock(&master_lock);

		goto done;

	}

	spin_unlock(&cpuidle_lock);



idle:

	cpu_do_idle();

done:

	atomic_dec(&master);



	spin_lock(&cpuidle_lock);

	if (num_idle_cpus-- == num_online_cpus())

		imx6_set_lpm(WAIT_CLOCKED);

	spin_unlock(&cpuidle_lock);



	return index;

}

arch/powerpc/include/asm/feature-fixups.h

+12 −0
Original line number Diff line number Diff line
@@ -221,6 +221,17 @@ label##3: \ 
	FTR_ENTRY_OFFSET 953b-954b;			\

	.popsection;



#define START_BTB_FLUSH_SECTION			\

955:							\



#define END_BTB_FLUSH_SECTION			\

956:							\

	.pushsection __btb_flush_fixup,"a";	\

	.align 2;							\

957:						\

	FTR_ENTRY_OFFSET 955b-957b;			\

	FTR_ENTRY_OFFSET 956b-957b;			\

	.popsection;



#ifndef __ASSEMBLY__

#include <linux/types.h>
@@ -230,6 +241,7 @@ extern long __start___stf_entry_barrier_fixup, __stop___stf_entry_barrier_fixup; 
extern long __start___stf_exit_barrier_fixup, __stop___stf_exit_barrier_fixup;

extern long __start___rfi_flush_fixup, __stop___rfi_flush_fixup;

extern long __start___barrier_nospec_fixup, __stop___barrier_nospec_fixup;

extern long __start__btb_flush_fixup, __stop__btb_flush_fixup;



void apply_feature_fixups(void);

void setup_feature_keys(void);

arch/powerpc/include/asm/ppc-opcode.h

+2 −0
Original line number Diff line number Diff line
@@ -300,6 +300,7 @@ 
/* Misc instructions for BPF compiler */

#define PPC_INST_LBZ			0x88000000

#define PPC_INST_LD			0xe8000000

#define PPC_INST_LDX			0x7c00002a

#define PPC_INST_LHZ			0xa0000000

#define PPC_INST_LWZ			0x80000000

#define PPC_INST_LHBRX			0x7c00062c
@@ -307,6 +308,7 @@ 
#define PPC_INST_STB			0x98000000

#define PPC_INST_STH			0xb0000000

#define PPC_INST_STD			0xf8000000

#define PPC_INST_STDX			0x7c00012a

#define PPC_INST_STDU			0xf8000001

#define PPC_INST_STW			0x90000000

#define PPC_INST_STWU			0x94000000