diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/ia32.h | 2 | ||||
| -rw-r--r-- | include/asm-ia64/machvec_hpsim.h | 1 | ||||
| -rw-r--r-- | include/asm-ia64/offsets.h | 16 | ||||
| -rw-r--r-- | include/asm-ia64/pgtable.h | 16 | ||||
| -rw-r--r-- | include/asm-ia64/string.h | 9 | ||||
| -rw-r--r-- | include/asm-ia64/unistd.h | 5 | ||||
| -rw-r--r-- | include/linux/fddidevice.h | 1 | ||||
| -rw-r--r-- | include/linux/mm.h | 4 |
8 files changed, 39 insertions, 15 deletions
diff --git a/include/asm-ia64/ia32.h b/include/asm-ia64/ia32.h index 884f1314a..2ad69e3e7 100644 --- a/include/asm-ia64/ia32.h +++ b/include/asm-ia64/ia32.h @@ -241,7 +241,7 @@ typedef struct siginfo32 { #define IA32_PAGE_OFFSET 0xc0000000 #define USE_ELF_CORE_DUMP -#define ELF_EXEC_PAGESIZE PAGE_SIZE +#define ELF_EXEC_PAGESIZE IA32_PAGE_SIZE /* * This is the location that an ET_DYN program is loaded if exec'ed. diff --git a/include/asm-ia64/machvec_hpsim.h b/include/asm-ia64/machvec_hpsim.h index 9afb30cb5..d36383fb7 100644 --- a/include/asm-ia64/machvec_hpsim.h +++ b/include/asm-ia64/machvec_hpsim.h @@ -15,6 +15,7 @@ extern ia64_mv_map_nr_t map_nr_dense; #define platform_name "hpsim" #define platform_setup hpsim_setup #define platform_irq_init hpsim_irq_init +#define platform_pci_fixup hpsim_pci_fixup #define platform_map_nr map_nr_dense #endif /* _ASM_IA64_MACHVEC_HPSIM_h */ diff --git a/include/asm-ia64/offsets.h b/include/asm-ia64/offsets.h index 25cf32c44..c5c02dedf 100644 --- a/include/asm-ia64/offsets.h +++ b/include/asm-ia64/offsets.h @@ -8,20 +8,22 @@ * */ -#define PF_PTRACED_BIT 4 +#define PT_PTRACED_BIT 0 +#define PT_TRACESYS_BIT 1 -#define IA64_TASK_SIZE 2816 /* 0xb00 */ +#define IA64_TASK_SIZE 2768 /* 0xad0 */ #define IA64_PT_REGS_SIZE 400 /* 0x190 */ #define IA64_SWITCH_STACK_SIZE 560 /* 0x230 */ #define IA64_SIGINFO_SIZE 136 /* 0x88 */ +#define UNW_FRAME_INFO_SIZE 448 /* 0x1c0 */ -#define IA64_TASK_FLAGS_OFFSET 8 /* 0x8 */ +#define IA64_TASK_PTRACE_OFFSET 48 /* 0x30 */ #define IA64_TASK_SIGPENDING_OFFSET 16 /* 0x10 */ #define IA64_TASK_NEED_RESCHED_OFFSET 40 /* 0x28 */ -#define IA64_TASK_PROCESSOR_OFFSET 108 /* 0x6c */ -#define IA64_TASK_THREAD_OFFSET 928 /* 0x3a0 */ -#define IA64_TASK_THREAD_KSP_OFFSET 928 /* 0x3a0 */ -#define IA64_TASK_THREAD_SIGMASK_OFFSET 2656 /* 0xa60 */ +#define IA64_TASK_PROCESSOR_OFFSET 100 /* 0x64 */ +#define IA64_TASK_THREAD_OFFSET 896 /* 0x380 */ +#define IA64_TASK_THREAD_KSP_OFFSET 896 /* 0x380 */ +#define IA64_TASK_THREAD_SIGMASK_OFFSET 2648 /* 0xa58 */ #define IA64_TASK_PID_OFFSET 188 /* 0xbc */ #define IA64_TASK_MM_OFFSET 88 /* 0x58 */ #define IA64_PT_REGS_CR_IPSR_OFFSET 0 /* 0x0 */ diff --git a/include/asm-ia64/pgtable.h b/include/asm-ia64/pgtable.h index ce0dea3fe..7f4b4efaa 100644 --- a/include/asm-ia64/pgtable.h +++ b/include/asm-ia64/pgtable.h @@ -111,6 +111,7 @@ #include <asm/bitops.h> #include <asm/mmu_context.h> +#include <asm/processor.h> #include <asm/system.h> /* @@ -305,6 +306,21 @@ rgn_index (unsigned long address) return a.f.reg; } +/* + * Return the region offset for virtual address ADDRESS. + */ +extern __inline__ unsigned long +rgn_offset (unsigned long address) +{ + ia64_va a; + + a.l = address; + return a.f.off; +} + +#define RGN_SIZE (1UL << 61) +#define RGN_KERNEL 7 + extern __inline__ unsigned long pgd_index (unsigned long address) { diff --git a/include/asm-ia64/string.h b/include/asm-ia64/string.h index 2b7292067..56bd64327 100644 --- a/include/asm-ia64/string.h +++ b/include/asm-ia64/string.h @@ -5,14 +5,17 @@ * Here is where we want to put optimized versions of the string * routines. * - * Copyright (C) 1998, 1999 Hewlett-Packard Co - * Copyright (C) 1998, 1999 David Mosberger-Tang <davidm@hpl.hp.com> + * Copyright (C) 1998-2000 Hewlett-Packard Co + * Copyright (C) 1998-2000 David Mosberger-Tang <davidm@hpl.hp.com> */ #define __HAVE_ARCH_STRLEN 1 /* see arch/ia64/lib/strlen.S */ #define __HAVE_ARCH_MEMSET 1 /* see arch/ia64/lib/memset.S */ +#define __HAVE_ARCH_MEMCPY 1 /* see arch/ia64/lib/memcpy.S */ +#define __HAVE_ARCH_BCOPY 1 /* see arch/ia64/lib/memcpy.S */ extern __kernel_size_t strlen (const char *); -extern void *memset (void *,int,__kernel_size_t); +extern void *memset (void *, int, __kernel_size_t); +extern void *memcpy (void *, const void *, __kernel_size_t); #endif /* _ASM_IA64_STRING_H */ diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h index 41ffaaf2d..82de77440 100644 --- a/include/asm-ia64/unistd.h +++ b/include/asm-ia64/unistd.h @@ -4,8 +4,8 @@ /* * IA-64 Linux syscall numbers and inline-functions. * - * Copyright (C) 1998, 1999 Hewlett-Packard Co - * Copyright (C) 1998, 1999 David Mosberger-Tang <davidm@hpl.hp.com> + * Copyright (C) 1998-2000 Hewlett-Packard Co + * Copyright (C) 1998-2000 David Mosberger-Tang <davidm@hpl.hp.com> */ #include <asm/break.h> @@ -202,6 +202,7 @@ #define __NR_stat 1210 #define __NR_lstat 1211 #define __NR_fstat 1212 +#define __NR_clone2 1213 #if !defined(__ASSEMBLY__) && !defined(ASSEMBLER) diff --git a/include/linux/fddidevice.h b/include/linux/fddidevice.h index 8821bbdb1..79f92ff17 100644 --- a/include/linux/fddidevice.h +++ b/include/linux/fddidevice.h @@ -34,6 +34,7 @@ extern int fddi_header(struct sk_buff *skb, extern int fddi_rebuild_header(struct sk_buff *skb); extern unsigned short fddi_type_trans(struct sk_buff *skb, struct net_device *dev); +extern struct net_device * init_fddidev(struct net_device *, int); #endif #endif /* _LINUX_FDDIDEVICE_H */ diff --git a/include/linux/mm.h b/include/linux/mm.h index f418100a9..70f57f770 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -52,8 +52,8 @@ struct vm_area_struct { struct vm_area_struct * vm_avl_left; struct vm_area_struct * vm_avl_right; - /* For areas with inode, the list inode->i_mmap, for shm areas, - * the list of attaches, otherwise unused. + /* For areas with inode, the list inode->i_mapping->i_mmap, + * for shm areas, the list of attaches, otherwise unused. */ struct vm_area_struct *vm_next_share; struct vm_area_struct **vm_pprev_share; |