Commit 198190a1 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:
 "Main changes:
   - AArch64 Linux compilation fixes following 3.7-rc1 changes
     (MODULES_USE_ELF_RELA, update_vsyscall() prototype)
   - Unnecessary register setting in start_thread() (thanks to Al Viro)
   - ptrace fixes"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
  arm64: fix alignment padding in assembly code
  arm64: ptrace: use HW_BREAKPOINT_EMPTY type for disabled breakpoints
  arm64: ptrace: make structure padding explicit for debug registers
  arm64: No need to set the x0-x2 registers in start_thread()
  arm64: Ignore memory blocks below PHYS_OFFSET
  arm64: Fix the update_vsyscall() prototype
  arm64: Select MODULES_USE_ELF_RELA
  arm64: Remove duplicate inclusion of mmu_context.h in smp.c
parents 31fd84b9 aeed41a9

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ config ARM64 
	select HAVE_PERF_EVENTS

	select HAVE_SPARSE_IRQ

	select IRQ_DOMAIN

	select MODULES_USE_ELF_RELA

	select NO_BOOTMEM

	select OF

	select OF_EARLY_FLATTREE

arch/arm64/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ generic-y += ipcbuf.h 
generic-y += irq_regs.h

generic-y += kdebug.h

generic-y += kmap_types.h

generic-y += linkage.h

generic-y += local.h

generic-y += local64.h

generic-y += mman.h

arch/arm64/include/asm/linkage.h

0 → 100644
+7 −0
Original line number Diff line number Diff line 
#ifndef __ASM_LINKAGE_H

#define __ASM_LINKAGE_H



#define __ALIGN		.align 4

#define __ALIGN_STR	".align 4"



#endif

arch/arm64/include/asm/processor.h

+0 −10
Original line number Diff line number Diff line
@@ -92,30 +92,20 @@ static inline void start_thread_common(struct pt_regs *regs, unsigned long pc) 
static inline void start_thread(struct pt_regs *regs, unsigned long pc,

				unsigned long sp)

{

	unsigned long *stack = (unsigned long *)sp;



	start_thread_common(regs, pc);

	regs->pstate = PSR_MODE_EL0t;

	regs->sp = sp;

	regs->regs[2] = stack[2];	/* x2 (envp) */

	regs->regs[1] = stack[1];	/* x1 (argv) */

	regs->regs[0] = stack[0];	/* x0 (argc) */

}



#ifdef CONFIG_COMPAT

static inline void compat_start_thread(struct pt_regs *regs, unsigned long pc,

				       unsigned long sp)

{

	unsigned int *stack = (unsigned int *)sp;



	start_thread_common(regs, pc);

	regs->pstate = COMPAT_PSR_MODE_USR;

	if (pc & 1)

		regs->pstate |= COMPAT_PSR_T_BIT;

	regs->compat_sp = sp;

	regs->regs[2] = stack[2];	/* x2 (envp) */

	regs->regs[1] = stack[1];	/* x1 (argv) */

	regs->regs[0] = stack[0];	/* x0 (argc) */

}

#endif

arch/arm64/include/uapi/asm/ptrace.h

+2 −1
Original line number Diff line number Diff line
@@ -79,13 +79,14 @@ struct user_fpsimd_state { 


struct user_hwdebug_state {

	__u32		dbg_info;

	__u32		pad;

	struct {

		__u64	addr;

		__u32	ctrl;

		__u32	pad;

	}		dbg_regs[16];

};





#endif /* __ASSEMBLY__ */



#endif /* _UAPI__ASM_PTRACE_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE