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

Commit c1b84144 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 

Pull arm64 fixes from Catalin Marinas:
 - ELF coredump fix (more registers dumped than what user space expects)
 - SUBARCH name generation (s/aarch64/arm64/)

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
  arm64: makefile: fix uname munging when setting ARCH on native machine
  arm64: elf: fix core dumping to match what glibc expects
parents db233669 f1b99392

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ 
				  -e s/arm.*/arm/ -e s/sa110/arm/ \

				  -e s/s390x/s390/ -e s/parisc64/parisc/ \

				  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \

				  -e s/sh[234].*/sh/ )

				  -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ )



# Cross compiling and selecting different set of gcc/bin-utils

# ---------------------------------------------------------------------------

arch/arm64/include/asm/elf.h

+4 −1
Original line number Diff line number Diff line
@@ -26,7 +26,10 @@ 


typedef unsigned long elf_greg_t;



#define ELF_NGREG (sizeof (struct pt_regs) / sizeof(elf_greg_t))

#define ELF_NGREG (sizeof(struct user_pt_regs) / sizeof(elf_greg_t))

#define ELF_CORE_COPY_REGS(dest, regs)	\

	*(struct user_pt_regs *)&(dest) = (regs)->user_regs;



typedef elf_greg_t elf_gregset_t[ELF_NGREG];

typedef struct user_fpsimd_state elf_fpregset_t;

tools/perf/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ 
				  -e s/arm.*/arm/ -e s/sa110/arm/ \

				  -e s/s390x/s390/ -e s/parisc64/parisc/ \

				  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \

				  -e s/sh[234].*/sh/ )

				  -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ )

NO_PERF_REGS := 1



CC = $(CROSS_COMPILE)gcc