diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-20 20:48:10 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-20 20:48:10 +0400 |
| commit | 198190a188b9cefff22b51c0be5f0f70b6f9b618 (patch) | |
| tree | 333216304026afaf12bd765f814014ceb6673e45 /arch/arm64/include/uapi/asm/ptrace.h | |
| parent | 31fd84b95eb211d5db460a1dda85e004800a7b52 (diff) | |
| parent | aeed41a9371ee02257b608eb06a9058507a7d0f4 (diff) | |
| download | linux-198190a188b9cefff22b51c0be5f0f70b6f9b618.tar.xz | |
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
Diffstat (limited to 'arch/arm64/include/uapi/asm/ptrace.h')
| -rw-r--r-- | arch/arm64/include/uapi/asm/ptrace.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/include/uapi/asm/ptrace.h b/arch/arm64/include/uapi/asm/ptrace.h index 9b131b4efa0b..6913643bbe54 100644 --- a/arch/arm64/include/uapi/asm/ptrace.h +++ b/arch/arm64/include/uapi/asm/ptrace.h @@ -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 */ |