Commit 2821e26f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM fixes from Russell King:

 - fix ftrace relocation type filtering

 - relax arch timer version check

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8955/1: virt: Relax arch timer version check during early boot
  ARM: 8950/1: ftrace/recordmcount: filter relocation types
parents 84809aaf 6849b5eb

arch/arm/kernel/hyp-stub.S

+3 −4
Original line number Diff line number Diff line
@@ -146,10 +146,9 @@ ARM_BE8(orr r7, r7, #(1 << 25)) @ HSCTLR.EE 
#if !defined(ZIMAGE) && defined(CONFIG_ARM_ARCH_TIMER)

	@ make CNTP_* and CNTPCT accessible from PL1

	mrc	p15, 0, r7, c0, c1, 1	@ ID_PFR1

	lsr	r7, #16

	and	r7, #0xf

	cmp	r7, #1

	bne	1f

	ubfx	r7, r7, #16, #4

	teq	r7, #0

	beq	1f

	mrc	p15, 4, r7, c14, c1, 0	@ CNTHCTL

	orr	r7, r7, #3		@ PL1PCEN | PL1PCTEN

	mcr	p15, 4, r7, c14, c1, 0	@ CNTHCTL

scripts/recordmcount.c

+17 −0
Original line number Diff line number Diff line
@@ -38,6 +38,10 @@ 
#define R_AARCH64_ABS64	257

#endif



#define R_ARM_PC24		1

#define R_ARM_THM_CALL		10

#define R_ARM_CALL		28



static int fd_map;	/* File descriptor for file being modified. */

static int mmap_failed; /* Boolean flag. */

static char gpfx;	/* prefix for global symbol name (sometimes '_') */
@@ -418,6 +422,18 @@ static char const *already_has_rel_mcount = "success"; /* our work here is done! 
#define RECORD_MCOUNT_64

#include "recordmcount.h"



static int arm_is_fake_mcount(Elf32_Rel const *rp)

{

	switch (ELF32_R_TYPE(w(rp->r_info))) {

	case R_ARM_THM_CALL:

	case R_ARM_CALL:

	case R_ARM_PC24:

		return 0;

	}



	return 1;

}



/* 64-bit EM_MIPS has weird ELF64_Rela.r_info.

 * http://techpubs.sgi.com/library/manuals/4000/007-4658-001/pdf/007-4658-001.pdf

 * We interpret Table 29 Relocation Operation (Elf64_Rel, Elf64_Rela) [p.40]
@@ -523,6 +539,7 @@ static int do_file(char const *const fname) 
		altmcount = "__gnu_mcount_nc";

		make_nop = make_nop_arm;

		rel_type_nop = R_ARM_NONE;

		is_fake_mcount32 = arm_is_fake_mcount;

		gpfx = 0;

		break;

	case EM_AARCH64:

CRA Git | Maintained and supported by SUSTech CRA and CCSE