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

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

Merge "Merge android11-5.4.147+ (dc8c919c) into msm-5.4"

parents 115920ef 828abb51

Documentation/arm64/tagged-address-abi.rst

+18 −8
Original line number Diff line number Diff line
@@ -45,8 +45,9 @@ how the user addresses are used by the kernel: 


1. User addresses not accessed by the kernel but used for address space

   management (e.g. ``mprotect()``, ``madvise()``). The use of valid

   tagged pointers in this context is allowed with the exception of

   ``brk()``, ``mmap()`` and the ``new_address`` argument to

   tagged pointers in this context is allowed with these exceptions:



   - ``brk()``, ``mmap()`` and the ``new_address`` argument to

     ``mremap()`` as these have the potential to alias with existing

      user addresses.
@@ -54,6 +55,15 @@ how the user addresses are used by the kernel: 
     incorrectly accept valid tagged pointers for the ``brk()``,

     ``mmap()`` and ``mremap()`` system calls.



   - The ``range.start``, ``start`` and ``dst`` arguments to the

     ``UFFDIO_*`` ``ioctl()``s used on a file descriptor obtained from

     ``userfaultfd()``, as fault addresses subsequently obtained by reading

     the file descriptor will be untagged, which may otherwise confuse

     tag-unaware programs.



     NOTE: This behaviour changed in v5.14 and so some earlier kernels may

     incorrectly accept valid tagged pointers for this system call.



2. User addresses accessed by the kernel (e.g. ``write()``). This ABI

   relaxation is disabled by default and the application thread needs to

   explicitly enable it via ``prctl()`` as follows:

Documentation/trace/histogram.rst

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ Documentation written by Tom Zanussi 
                                with the event, in nanoseconds.  May be

			        modified by .usecs to have timestamps

			        interpreted as microseconds.

    cpu                    int  the cpu on which the event occurred.

    common_cpu             int  the cpu on which the event occurred.

    ====================== ==== =======================================



Extended error information

Documentation/virt/kvm/mmu.txt

+2 −2
Original line number Diff line number Diff line
@@ -152,8 +152,8 @@ Shadow pages contain the following information: 
    shadow pages) so role.quadrant takes values in the range 0..3.  Each

    quadrant maps 1GB virtual address space.

  role.access:

    Inherited guest access permissions in the form uwx.  Note execute

    permission is positive, not negative.

    Inherited guest access permissions from the parent ptes in the form uwx.

    Note execute permission is positive, not negative.

  role.invalid:

    The page is invalid and should not be used.  It is a root page that is

    currently pinned (by a cpu hardware register pointing to it); once it is

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 134

SUBLEVEL = 147

EXTRAVERSION =

NAME = Kleptomaniac Octopus

android/GKI_VERSION

+1 −1
Original line number Diff line number Diff line 
LTS_5.4.134_2385b6cc59cf
 
LTS_5.4.147_dc8c919ca616