diff options
Diffstat (limited to 'include/asm-arm26')
| -rw-r--r-- | include/asm-arm26/socket.h | 2 | ||||
| -rw-r--r-- | include/asm-arm26/sockios.h | 3 | ||||
| -rw-r--r-- | include/asm-arm26/uaccess.h | 10 |
3 files changed, 9 insertions, 6 deletions
diff --git a/include/asm-arm26/socket.h b/include/asm-arm26/socket.h index 19f7df702b06..65a1a64bf934 100644 --- a/include/asm-arm26/socket.h +++ b/include/asm-arm26/socket.h | |||
| @@ -49,5 +49,7 @@ | |||
| 49 | 49 | ||
| 50 | #define SO_PEERSEC 31 | 50 | #define SO_PEERSEC 31 |
| 51 | #define SO_PASSSEC 34 | 51 | #define SO_PASSSEC 34 |
| 52 | #define SO_TIMESTAMPNS 35 | ||
| 53 | #define SCM_TIMESTAMPNS SO_TIMESTAMPNS | ||
| 52 | 54 | ||
| 53 | #endif /* _ASM_SOCKET_H */ | 55 | #endif /* _ASM_SOCKET_H */ |
diff --git a/include/asm-arm26/sockios.h b/include/asm-arm26/sockios.h index 77c34087d513..a2588a2512df 100644 --- a/include/asm-arm26/sockios.h +++ b/include/asm-arm26/sockios.h | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #define FIOGETOWN 0x8903 | 7 | #define FIOGETOWN 0x8903 |
| 8 | #define SIOCGPGRP 0x8904 | 8 | #define SIOCGPGRP 0x8904 |
| 9 | #define SIOCATMARK 0x8905 | 9 | #define SIOCATMARK 0x8905 |
| 10 | #define SIOCGSTAMP 0x8906 /* Get stamp */ | 10 | #define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ |
| 11 | #define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ | ||
| 11 | 12 | ||
| 12 | #endif | 13 | #endif |
diff --git a/include/asm-arm26/uaccess.h b/include/asm-arm26/uaccess.h index 3f2dd1093e58..d64ed84cb2d3 100644 --- a/include/asm-arm26/uaccess.h +++ b/include/asm-arm26/uaccess.h | |||
| @@ -74,7 +74,7 @@ extern int __get_user_bad(void); | |||
| 74 | 74 | ||
| 75 | #define get_user(x,p) \ | 75 | #define get_user(x,p) \ |
| 76 | ({ \ | 76 | ({ \ |
| 77 | const register typeof(*(p)) *__p asm("r0") = (p); \ | 77 | register const typeof(*(p)) *__p asm("r0") = (p); \ |
| 78 | register typeof(*(p)) __r1 asm("r1"); \ | 78 | register typeof(*(p)) __r1 asm("r1"); \ |
| 79 | register int __e asm("r0"); \ | 79 | register int __e asm("r0"); \ |
| 80 | switch (sizeof(*(p))) { \ | 80 | switch (sizeof(*(p))) { \ |
| @@ -139,8 +139,8 @@ extern int __put_user_bad(void); | |||
| 139 | 139 | ||
| 140 | #define put_user(x,p) \ | 140 | #define put_user(x,p) \ |
| 141 | ({ \ | 141 | ({ \ |
| 142 | const register typeof(*(p)) __r1 asm("r1") = (x); \ | 142 | register const typeof(*(p)) __r1 asm("r1") = (x); \ |
| 143 | const register typeof(*(p)) *__p asm("r0") = (p); \ | 143 | register const typeof(*(p)) *__p asm("r0") = (p); \ |
| 144 | register int __e asm("r0"); \ | 144 | register int __e asm("r0"); \ |
| 145 | switch (sizeof(*(__p))) { \ | 145 | switch (sizeof(*(__p))) { \ |
| 146 | case 1: \ | 146 | case 1: \ |
| @@ -170,8 +170,8 @@ extern int __put_user_bad(void); | |||
| 170 | 170 | ||
| 171 | #define put_user(x,p) \ | 171 | #define put_user(x,p) \ |
| 172 | ({ \ | 172 | ({ \ |
| 173 | const register typeof(*(p)) __r1 asm("r1") = (x); \ | 173 | register const typeof(*(p)) __r1 asm("r1") = (x); \ |
| 174 | const register typeof(*(p)) *__p asm("r0") = (p); \ | 174 | register const typeof(*(p)) *__p asm("r0") = (p); \ |
| 175 | register int __e asm("r0"); \ | 175 | register int __e asm("r0"); \ |
| 176 | switch (sizeof(*(p))) { \ | 176 | switch (sizeof(*(p))) { \ |
| 177 | case 1: \ | 177 | case 1: \ |