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

Commit 8ec9fd89 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 8ddb600e ecb99897

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 141

SUBLEVEL = 142

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/x86/kernel/cpu/common.c

+4 −3
Original line number Diff line number Diff line
@@ -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;

	}

scripts/Kbuild.include

+3 −2
Original line number Diff line number Diff line
@@ -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.

tools/arch/x86/include/asm/unistd_32.h

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#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

tools/arch/x86/include/asm/unistd_64.h

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#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