diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/mips/include/asm/compat.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/mips/include/asm/compat.h')
| -rw-r--r-- | arch/mips/include/asm/compat.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/include/asm/compat.h b/arch/mips/include/asm/compat.h index f58aed354bfd..613f6912dfc1 100644 --- a/arch/mips/include/asm/compat.h +++ b/arch/mips/include/asm/compat.h | |||
| @@ -8,7 +8,8 @@ | |||
| 8 | #include <asm/page.h> | 8 | #include <asm/page.h> |
| 9 | #include <asm/ptrace.h> | 9 | #include <asm/ptrace.h> |
| 10 | 10 | ||
| 11 | #define COMPAT_USER_HZ 100 | 11 | #define COMPAT_USER_HZ 100 |
| 12 | #define COMPAT_UTS_MACHINE "mips\0\0\0" | ||
| 12 | 13 | ||
| 13 | typedef u32 compat_size_t; | 14 | typedef u32 compat_size_t; |
| 14 | typedef s32 compat_ssize_t; | 15 | typedef s32 compat_ssize_t; |