diff options
Diffstat (limited to 'arch/ia64/include/asm')
-rw-r--r-- | arch/ia64/include/asm/intrinsics.h | 21 | ||||
-rw-r--r-- | arch/ia64/include/asm/unistd.h | 3 |
2 files changed, 15 insertions, 9 deletions
diff --git a/arch/ia64/include/asm/intrinsics.h b/arch/ia64/include/asm/intrinsics.h index 111ed5222892..e4076b511829 100644 --- a/arch/ia64/include/asm/intrinsics.h +++ b/arch/ia64/include/asm/intrinsics.h | |||
@@ -201,16 +201,21 @@ extern long ia64_cmpxchg_called_with_bad_pointer (void); | |||
201 | #endif | 201 | #endif |
202 | 202 | ||
203 | #ifndef __ASSEMBLY__ | 203 | #ifndef __ASSEMBLY__ |
204 | #if defined(CONFIG_PARAVIRT) && defined(__KERNEL__) | 204 | |
205 | #ifdef ASM_SUPPORTED | ||
206 | # define IA64_INTRINSIC_API(name) paravirt_ ## name | ||
207 | #else | ||
208 | # define IA64_INTRINSIC_API(name) pv_cpu_ops.name | ||
209 | #endif | ||
210 | #define IA64_INTRINSIC_MACRO(name) paravirt_ ## name | ||
211 | #else | ||
212 | #define IA64_INTRINSIC_API(name) ia64_native_ ## name | 205 | #define IA64_INTRINSIC_API(name) ia64_native_ ## name |
213 | #define IA64_INTRINSIC_MACRO(name) ia64_native_ ## name | 206 | #define IA64_INTRINSIC_MACRO(name) ia64_native_ ## name |
207 | |||
208 | #if defined(__KERNEL__) | ||
209 | #if defined(CONFIG_PARAVIRT) | ||
210 | # undef IA64_INTRINSIC_API | ||
211 | # undef IA64_INTRINSIC_MACRO | ||
212 | # ifdef ASM_SUPPORTED | ||
213 | # define IA64_INTRINSIC_API(name) paravirt_ ## name | ||
214 | # else | ||
215 | # define IA64_INTRINSIC_API(name) pv_cpu_ops.name | ||
216 | # endif | ||
217 | #define IA64_INTRINSIC_MACRO(name) paravirt_ ## name | ||
218 | #endif | ||
214 | #endif | 219 | #endif |
215 | 220 | ||
216 | /************************************************/ | 221 | /************************************************/ |
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h index 7617248f0d11..7a3bd2524944 100644 --- a/arch/ia64/include/asm/unistd.h +++ b/arch/ia64/include/asm/unistd.h | |||
@@ -323,11 +323,12 @@ | |||
323 | #define __NR_sendmmsg 1331 | 323 | #define __NR_sendmmsg 1331 |
324 | #define __NR_process_vm_readv 1332 | 324 | #define __NR_process_vm_readv 1332 |
325 | #define __NR_process_vm_writev 1333 | 325 | #define __NR_process_vm_writev 1333 |
326 | #define __NR_accept4 1334 | ||
326 | 327 | ||
327 | #ifdef __KERNEL__ | 328 | #ifdef __KERNEL__ |
328 | 329 | ||
329 | 330 | ||
330 | #define NR_syscalls 310 /* length of syscall table */ | 331 | #define NR_syscalls 311 /* length of syscall table */ |
331 | 332 | ||
332 | /* | 333 | /* |
333 | * The following defines stop scripts/checksyscalls.sh from complaining about | 334 | * The following defines stop scripts/checksyscalls.sh from complaining about |