evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

This is the 4.4.142 stable release

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAltQk74ACgkQONu9yGCS
 aT5nCg/8DfqvQgljahgvf2GnF/XD/0pvLFAFWYG81Dmgf247c8ZoELD2VF06CWsJ
 6r7C2yLmO+TO1TZw07OJOWaqyepA3ae06G0ZSXuMVojG6yV5BaYnXPjLJwp2LXVO
 glxxjuwinu0NWW5YjgnV/DL8T7aRI+0hKecmDJJ+6yp3H8Jk9Q1Oc5g2wyNQLY6v
 agwtTUgpHt9sd5+TZmyKhzyiqFTESPmLUScpam0UCM8gyMS31Sk5UyezlFB4+/sD
 UdlsXmCcXpxx/s51OlkMiTTB/ErRbik19FShohx5MmwjHRiSGX4RYn/b0fj/LeL1
 PUFyfzg4xzn8Ff8F2G0NO8LRiF5zjOrPSTcA96raoaRxjBnd2GvGAG7MZV1YxuP0
 rpeUrjwspZgmtGKJK2A99y9il7pVcWhyruZieEO8jYoUWB4wv+JqRherDeUjq7Xm
 xcEszKKzOduOPVlRVbyPyUKxnlFz9+FwLmZug1aMDdKgmCIZWSLgMorQOjlGDasu
 zYbvLoC3feVusAu1orMqYbb/sYsk5QaN6ytsM4Fp+dRA2F6DZ9j2xnKd16fL9B8y
 rNpdLEjS/JvjZMhRP8/SPOxBndz6u2bm5gVrabo4UydlQwM5PWjGvSNmWcM4+PBz
 A7ZbQviTdCL2M1NwPI2L/HYMXHcNTxNuchRnvDmIbsEZlYzl4JM=
 =aV1k
 -----END PGP SIGNATURE-----

Merge 4.4.142 into android-4.4

Changes in 4.4.142
	Kbuild: fix # escaping in .cmd files for future Make
	x86/cpu: Probe CPUID leaf 6 even when cpuid_level == 6
	perf tools: Move syscall number fallbacks from perf-sys.h to tools/arch/x86/include/asm/
	Linux 4.4.142

Change-Id: If45535d0aeb1ad6f7239d3bc15aa4d3d60754da7
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2018-07-31 20:08:13 +02:00
commit 8ec9fd8936
11 changed files with 32 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,6 +1,6 @@
VERSION = 4
PATCHLEVEL = 4
SUBLEVEL = 141
SUBLEVEL = 142
EXTRAVERSION =
NAME = Blurry Fish Butt

7
arch/x86/kernel/cpu/common.c
View file

@ -686,13 +686,14 @@ void get_cpu_cap(struct cpuinfo_x86 *c)
c->x86_capability[CPUID_1_EDX] = edx;
}
/* Thermal and Power Management Leaf: level 0x00000006 (eax) */
if (c->cpuid_level >= 0x00000006)
c->x86_capability[CPUID_6_EAX] = cpuid_eax(0x00000006);
/* Additional Intel-defined flags: level 0x00000007 */
if (c->cpuid_level >= 0x00000007) {
cpuid_count(0x00000007, 0, &eax, &ebx, &ecx, &edx);
c->x86_capability[CPUID_7_0_EBX] = ebx;
c->x86_capability[CPUID_6_EAX] = cpuid_eax(0x00000006);
c->x86_capability[CPUID_7_ECX] = ecx;
}

5
scripts/Kbuild.include
View file

@ -7,6 +7,7 @@ quote := "
squote := '
empty :=
space := $(empty) $(empty)
pound := \#
###
# Name of target with a '.' as filename prefix. foo/bar.o => foo/.bar.o
@ -250,11 +251,11 @@ endif
# Replace >$< with >$$< to preserve $ when reloading the .cmd file
# (needed for make)
# Replace >#< with >\#< to avoid starting a comment in the .cmd file
# Replace >#< with >$(pound)< to avoid starting a comment in the .cmd file
# (needed for make)
# Replace >'< with >'\''< to be able to enclose the whole string in '...'
# (needed for the shell)
make-cmd = $(call escsq,$(subst \#,\\\#,$(subst $$,$$$$,$(cmd_$(1)))))
make-cmd = $(call escsq,$(subst $(pound),$$(pound),$(subst $$,$$$$,$(cmd_$(1)))))
# Find any prerequisites that is newer than target or that does not exist.
# PHONY targets skipped in both cases.

9
tools/arch/x86/include/asm/unistd_32.h Normal file
View file

@ -0,0 +1,9 @@
#ifndef __NR_perf_event_open
# define __NR_perf_event_open 336
#endif
#ifndef __NR_futex
# define __NR_futex 240
#endif
#ifndef __NR_gettid
# define __NR_gettid 224
#endif

9
tools/arch/x86/include/asm/unistd_64.h Normal file
View file

@ -0,0 +1,9 @@
#ifndef __NR_perf_event_open
# define __NR_perf_event_open 298
#endif
#ifndef __NR_futex
# define __NR_futex 202
#endif
#ifndef __NR_gettid
# define __NR_gettid 186
#endif

5
tools/build/Build.include
View file

@ -12,6 +12,7 @@
# Convenient variables
comma := ,
squote := '
pound := \#
###
# Name of target with a '.' as filename prefix. foo/bar.o => foo/.bar.o
@ -43,11 +44,11 @@ echo-cmd = $(if $($(quiet)cmd_$(1)),\
###
# Replace >$< with >$$< to preserve $ when reloading the .cmd file
# (needed for make)
# Replace >#< with >\#< to avoid starting a comment in the .cmd file
# Replace >#< with >$(pound)< to avoid starting a comment in the .cmd file
# (needed for make)
# Replace >'< with >'\''< to be able to enclose the whole string in '...'
# (needed for the shell)
make-cmd = $(call escsq,$(subst \#,\\\#,$(subst $$,$$$$,$(cmd_$(1)))))
make-cmd = $(call escsq,$(subst $(pound),$$(pound),$(subst $$,$$$$,$(cmd_$(1)))))
###
# Find any prerequisites that is newer than target or that does not exist.

1
tools/perf/config/Makefile
View file

@ -200,6 +200,7 @@ CFLAGS += -I$(src-perf)/arch/$(ARCH)/include
CFLAGS += -I$(srctree)/tools/include/
CFLAGS += -I$(srctree)/arch/$(ARCH)/include/uapi
CFLAGS += -I$(srctree)/arch/$(ARCH)/include
CFLAGS += -I$(srctree)/tools/arch/$(ARCH)/include
CFLAGS += -I$(srctree)/include/uapi
CFLAGS += -I$(srctree)/include

18
tools/perf/perf-sys.h
View file

@ -11,29 +11,11 @@
#if defined(__i386__)
#define cpu_relax() asm volatile("rep; nop" ::: "memory");
#define CPUINFO_PROC {"model name"}
#ifndef __NR_perf_event_open
# define __NR_perf_event_open 336
#endif
#ifndef __NR_futex
# define __NR_futex 240
#endif
#ifndef __NR_gettid
# define __NR_gettid 224
#endif
#endif
#if defined(__x86_64__)
#define cpu_relax() asm volatile("rep; nop" ::: "memory");
#define CPUINFO_PROC {"model name"}
#ifndef __NR_perf_event_open
# define __NR_perf_event_open 298
#endif
#ifndef __NR_futex
# define __NR_futex 202
#endif
#ifndef __NR_gettid
# define __NR_gettid 186
#endif
#endif
#ifdef __powerpc__

1
tools/perf/util/include/asm/unistd_32.h
View file

@ -1 +0,0 @@

1
tools/perf/util/include/asm/unistd_64.h
View file

@ -1 +0,0 @@

2
tools/scripts/Makefile.include
View file

@ -92,3 +92,5 @@ ifneq ($(silent),1)
QUIET_INSTALL = @printf ' INSTALL %s\n' $1;
endif
endif
pound := \#