diff options
| author | David Mosberger <davidm@tiger.hpl.hp.com> | 2003-12-31 07:27:20 -0800 |
|---|---|---|
| committer | David Mosberger <davidm@tiger.hpl.hp.com> | 2003-12-31 07:27:20 -0800 |
| commit | 77ab58e58cf247892b525612054569b5646fe14d (patch) | |
| tree | 99248d014698ebf0bc91840cc6c7e37ad6423ee8 /include | |
| parent | 4da120fa5e227572a9bd42ab34f340ef6c4494b3 (diff) | |
| parent | 30ee59d7b2df6b6798a320b4dcff8c9022734130 (diff) | |
Merge tiger.hpl.hp.com:/data1/bk/vanilla/linux-2.5
into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/ia32.h | 10 | ||||
| -rw-r--r-- | include/asm-ia64/processor.h | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/include/asm-ia64/ia32.h b/include/asm-ia64/ia32.h index 4c8fd32b8b78..da5a1f22c566 100644 --- a/include/asm-ia64/ia32.h +++ b/include/asm-ia64/ia32.h @@ -6,7 +6,11 @@ #include <asm/ptrace.h> #include <asm/signal.h> -#ifdef CONFIG_IA32_SUPPORT +#define IA32_NR_syscalls 270 /* length of syscall table */ + +#ifndef __ASSEMBLY__ + +# ifdef CONFIG_IA32_SUPPORT extern void ia32_cpu_init (void); extern void ia32_boot_gdt_init (void); @@ -15,10 +19,12 @@ extern int ia32_exception (struct pt_regs *regs, unsigned long isr); extern int ia32_intercept (struct pt_regs *regs, unsigned long isr); extern int ia32_clone_tls (struct task_struct *child, struct pt_regs *childregs); -#endif /* !CONFIG_IA32_SUPPORT */ +# endif /* !CONFIG_IA32_SUPPORT */ /* Declare this unconditionally, so we don't get warnings for unreachable code. */ extern int ia32_setup_frame1 (int sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *set, struct pt_regs *regs); +#endif /* !__ASSEMBLY__ */ + #endif /* _ASM_IA64_IA32_H */ diff --git a/include/asm-ia64/processor.h b/include/asm-ia64/processor.h index 5948902ae28b..91ca5ec53c9c 100644 --- a/include/asm-ia64/processor.h +++ b/include/asm-ia64/processor.h @@ -64,7 +64,7 @@ #define IA64_THREAD_PM_VALID (__IA64_UL(1) << 2) /* performance registers valid? */ #define IA64_THREAD_UAC_NOPRINT (__IA64_UL(1) << 3) /* don't log unaligned accesses */ #define IA64_THREAD_UAC_SIGBUS (__IA64_UL(1) << 4) /* generate SIGBUS on unaligned acc. */ -#define IA64_THREAD_KRBS_SYNCED (__IA64_UL(1) << 5) /* krbs synced with process vm? */ + /* bit 5 is currently unused */ #define IA64_THREAD_FPEMU_NOPRINT (__IA64_UL(1) << 6) /* don't log any fpswa faults */ #define IA64_THREAD_FPEMU_SIGFPE (__IA64_UL(1) << 7) /* send a SIGFPE for fpswa faults */ #define IA64_THREAD_XSTACK (__IA64_UL(1) << 8) /* stack executable by default? */ |