diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-25 19:30:53 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-25 19:30:53 +0300 |
| commit | 0b9e31e9264f1bad89856afb96da1688292f13b4 (patch) | |
| tree | 7a9e9b6456dce993efeed8734de0a15a1f16ae94 /arch/sh/include/asm/types.h | |
| parent | cf82ff7ea7695b0e82ba07bc5e9f1bd03a74e1aa (diff) | |
| parent | 964fe080d94db82a3268443e9b9ece4c60246414 (diff) | |
| download | linux-0b9e31e9264f1bad89856afb96da1688292f13b4.tar.xz | |
Merge branch 'linus' into sched/core
Conflicts:
fs/proc/array.c
Merge reason: resolve conflict and queue up dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sh/include/asm/types.h')
| -rw-r--r-- | arch/sh/include/asm/types.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/include/asm/types.h b/arch/sh/include/asm/types.h index c7f3c94837dd..f8421f7ad63a 100644 --- a/arch/sh/include/asm/types.h +++ b/arch/sh/include/asm/types.h @@ -11,8 +11,10 @@ #ifdef CONFIG_SUPERH32 typedef u16 insn_size_t; +typedef u32 reg_size_t; #else typedef u32 insn_size_t; +typedef u64 reg_size_t; #endif #endif /* __ASSEMBLY__ */ |