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

Commit 78d9e934 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM64 fixes from Catalin Marinas:
 - !CONFIG_SMP build fix
 - pte bit testing macros conversion fix (int truncates top bits of
   long)
 - stack unwinding PC calculation fix

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: Fix !CONFIG_SMP kernel build
  arm64: mm: Add double logical invert to pte accessors
  ARM64: unwind: Fix PC calculation
parents f94def76 b57fc9e8

arch/arm64/include/asm/percpu.h

+8 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#ifndef __ASM_PERCPU_H

#define __ASM_PERCPU_H



#ifdef CONFIG_SMP



static inline void set_my_cpu_offset(unsigned long off)

{

	asm volatile("msr tpidr_el1, %0" :: "r" (off) : "memory");
@@ -36,6 +38,12 @@ static inline unsigned long __my_cpu_offset(void) 
}

#define __my_cpu_offset __my_cpu_offset()



#else	/* !CONFIG_SMP */



#define set_my_cpu_offset(x)	do { } while (0)



#endif /* CONFIG_SMP */



#include <asm-generic/percpu.h>



#endif /* __ASM_PERCPU_H */

arch/arm64/include/asm/pgtable.h

+5 −5
Original line number Diff line number Diff line
@@ -136,11 +136,11 @@ extern struct page *empty_zero_page; 
/*

 * The following only work if pte_present(). Undefined behaviour otherwise.

 */

#define pte_present(pte)	(pte_val(pte) & (PTE_VALID | PTE_PROT_NONE))

#define pte_dirty(pte)		(pte_val(pte) & PTE_DIRTY)

#define pte_young(pte)		(pte_val(pte) & PTE_AF)

#define pte_special(pte)	(pte_val(pte) & PTE_SPECIAL)

#define pte_write(pte)		(pte_val(pte) & PTE_WRITE)

#define pte_present(pte)	(!!(pte_val(pte) & (PTE_VALID | PTE_PROT_NONE)))

#define pte_dirty(pte)		(!!(pte_val(pte) & PTE_DIRTY))

#define pte_young(pte)		(!!(pte_val(pte) & PTE_AF))

#define pte_special(pte)	(!!(pte_val(pte) & PTE_SPECIAL))

#define pte_write(pte)		(!!(pte_val(pte) & PTE_WRITE))

#define pte_exec(pte)		(!(pte_val(pte) & PTE_UXN))



#define pte_valid_user(pte) \

arch/arm64/kernel/stacktrace.c

+5 −1
Original line number Diff line number Diff line
@@ -48,7 +48,11 @@ int unwind_frame(struct stackframe *frame) 


	frame->sp = fp + 0x10;

	frame->fp = *(unsigned long *)(fp);

	frame->pc = *(unsigned long *)(fp + 8);

	/*

	 * -4 here because we care about the PC at time of bl,

	 * not where the return will go.

	 */

	frame->pc = *(unsigned long *)(fp + 8) - 4;



	return 0;

}