diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-16 04:41:51 -0500 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-16 04:41:51 -0500 |
| commit | 3c3dd225819112e56554162c6b37e61a31924e0c (patch) | |
| tree | 5bcd3a63010af2cd5bb946b5af21ef27f1dcfe3c /arch/arm64/include/uapi/asm/ptrace.h | |
| parent | a915d4ca24b814daee9cddbc42cd41f59fe4fa8f (diff) | |
| parent | 3d70f8c617a436c7146ecb81df2265b4626dfe89 (diff) | |
Merge tag 'v3.7-rc4'
Merge Linux 3.7-rc4 to get fixes for CMA.
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 { | |||
| 79 | 79 | ||
| 80 | struct user_hwdebug_state { | 80 | struct user_hwdebug_state { |
| 81 | __u32 dbg_info; | 81 | __u32 dbg_info; |
| 82 | __u32 pad; | ||
| 82 | struct { | 83 | struct { |
| 83 | __u64 addr; | 84 | __u64 addr; |
| 84 | __u32 ctrl; | 85 | __u32 ctrl; |
| 86 | __u32 pad; | ||
| 85 | } dbg_regs[16]; | 87 | } dbg_regs[16]; |
| 86 | }; | 88 | }; |
| 87 | 89 | ||
| 88 | |||
| 89 | #endif /* __ASSEMBLY__ */ | 90 | #endif /* __ASSEMBLY__ */ |
| 90 | 91 | ||
| 91 | #endif /* _UAPI__ASM_PTRACE_H */ | 92 | #endif /* _UAPI__ASM_PTRACE_H */ |