Commit b1a9d7b0 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo-4.20-20181121' of... 

Merge tag 'perf-urgent-for-mingo-4.20-20181121' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes:

- Update kernel ABI headers, one of them lead to a small change in
  the ioctl 'cmd' beautifier in 'perf trace' to support the new ISO7816
  commands. (Arnaldo Carvalho de Melo)

- Restore proper cwd on return from mnt namespace (Jiri Olsa)

- Add feature check for the get_current_dir_name() function used in the
  namespace fix from Jiri, that is not available in systems such as
  Alpine Linux, which uses the  musl libc (Arnaldo Carvalho de Melo)

- Fix crash in 'perf record' when synthesizing the unit for events such
  as 'cpu-clock' (Jiri Olsa)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 2a5bf23d a4243e14

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

+2 −0
Original line number Diff line number Diff line
@@ -331,6 +331,8 @@ 
#define X86_FEATURE_LA57		(16*32+16) /* 5-level page tables */

#define X86_FEATURE_RDPID		(16*32+22) /* RDPID instruction */

#define X86_FEATURE_CLDEMOTE		(16*32+25) /* CLDEMOTE instruction */

#define X86_FEATURE_MOVDIRI		(16*32+27) /* MOVDIRI instruction */

#define X86_FEATURE_MOVDIR64B		(16*32+28) /* MOVDIR64B instruction */



/* AMD-defined CPU features, CPUID level 0x80000007 (EBX), word 17 */

#define X86_FEATURE_OVERFLOW_RECOV	(17*32+ 0) /* MCA overflow recovery support */

tools/build/Makefile.feature

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ FEATURE_TESTS_BASIC := \ 
        dwarf_getlocations              \

        fortify-source                  \

        sync-compare-and-swap           \

        get_current_dir_name            \

        glibc                           \

        gtk2                            \

        gtk2-infobar                    \

tools/build/feature/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ FILES= \ 
         test-dwarf_getlocations.bin            \

         test-fortify-source.bin                \

         test-sync-compare-and-swap.bin         \

         test-get_current_dir_name.bin          \

         test-glibc.bin                         \

         test-gtk2.bin                          \

         test-gtk2-infobar.bin                  \
@@ -101,6 +102,9 @@ $(OUTPUT)test-bionic.bin: 
$(OUTPUT)test-libelf.bin:

	$(BUILD) -lelf



$(OUTPUT)test-get_current_dir_name.bin:

	$(BUILD)



$(OUTPUT)test-glibc.bin:

	$(BUILD)

tools/build/feature/test-all.c

+5 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ 
# include "test-libelf-mmap.c"

#undef main



#define main main_test_get_current_dir_name

# include "test-get_current_dir_name.c"

#undef main



#define main main_test_glibc

# include "test-glibc.c"

#undef main
@@ -174,6 +178,7 @@ int main(int argc, char *argv[]) 
	main_test_hello();

	main_test_libelf();

	main_test_libelf_mmap();

	main_test_get_current_dir_name();

	main_test_glibc();

	main_test_dwarf();

	main_test_dwarf_getlocations();

tools/build/feature/test-get_current_dir_name.c

0 → 100644
+10 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#define _GNU_SOURCE

#include <unistd.h>

#include <stdlib.h>



int main(void)

{

	free(get_current_dir_name());

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE