diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-24 07:59:07 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-24 07:59:07 -0700 |
commit | 05f0c553e2155b93a9b4edb96898458762bda867 (patch) | |
tree | 1e324d35774f87e45f18f73c76a62647d68a0b69 /arch/nios2/include/uapi/asm | |
parent | 668b54a1c2c25bde34cd9c077b1c5f03b46bcb49 (diff) | |
parent | 1a70db49a735350f221959bf26e9a12f63a743bc (diff) |
Merge tag 'nios2-v4.1-rc1' of git://git.rocketboards.org/linux-socfpga-next
Pull arch/nios2 updates from Ley Foon Tan:
- update cache management code
- rework trap handler with new define trap #.
- fix on check header warning.
* tag 'nios2-v4.1-rc1' of git://git.rocketboards.org/linux-socfpga-next:
nios2: rework cache
nios2: Add types.h header required for __u32 type
nios2: rework trap handler
nios2: remove end address checking for initda
Diffstat (limited to 'arch/nios2/include/uapi/asm')
-rw-r--r-- | arch/nios2/include/uapi/asm/ptrace.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/nios2/include/uapi/asm/ptrace.h b/arch/nios2/include/uapi/asm/ptrace.h index eff00e67c0a2..1d35de90a977 100644 --- a/arch/nios2/include/uapi/asm/ptrace.h +++ b/arch/nios2/include/uapi/asm/ptrace.h @@ -14,6 +14,8 @@ #ifndef __ASSEMBLY__ +#include <linux/types.h> + /* * Register numbers used by 'ptrace' system call interface. */ |