From: Paul M. <le...@us...> - 2001-11-06 00:31:15
|
Update of /cvsroot/linux-mips/linux/include/asm-mips In directory usw-pr-cvs1:/tmp/cvs-serv388/include/asm-mips Modified Files: io.h irq.h processor.h unistd.h Log Message: Sync with OSS 2.4.11. Index: io.h =================================================================== RCS file: /cvsroot/linux-mips/linux/include/asm-mips/io.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- io.h 2001/10/31 18:26:52 1.7 +++ io.h 2001/11/06 00:30:47 1.8 @@ -61,6 +61,8 @@ * mistake somewhere. */ +#define IO_SPACE_LIMIT 0xffff + /* * On MIPS I/O ports are memory mapped, so we access them using normal * load/store instructions. mips_io_port_base is the virtual address to Index: irq.h =================================================================== RCS file: /cvsroot/linux-mips/linux/include/asm-mips/irq.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- irq.h 2001/10/28 23:04:19 1.4 +++ irq.h 2001/11/06 00:30:47 1.5 @@ -11,7 +11,7 @@ #include <linux/config.h> -#define NR_IRQS 128 /* Largest number of ints of all machines. */ +#define NR_IRQS 64 /* Largest number of ints of all machines. */ #define TIMER_IRQ 0 Index: processor.h =================================================================== RCS file: /cvsroot/linux-mips/linux/include/asm-mips/processor.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- processor.h 2001/10/31 18:26:52 1.8 +++ processor.h 2001/11/06 00:30:47 1.9 @@ -258,6 +258,8 @@ #define init_task (init_task_union.task) #define init_stack (init_task_union.stack) +#define cpu_relax() do { } while (0) + #endif /* !defined (_LANGUAGE_ASSEMBLY) */ #endif /* __KERNEL__ */ Index: unistd.h =================================================================== RCS file: /cvsroot/linux-mips/linux/include/asm-mips/unistd.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- unistd.h 2001/11/05 19:17:56 1.4 +++ unistd.h 2001/11/06 00:30:47 1.5 @@ -230,11 +230,13 @@ #define __NR_madvise (__NR_Linux + 218) #define __NR_getdents64 (__NR_Linux + 219) #define __NR_fcntl64 (__NR_Linux + 220) +#define __NR_security (__NR_Linux + 221) +#define __NR_gettid (__NR_Linux + 222) /* * Offset of the last Linux flavoured syscall */ -#define __NR_Linux_syscalls 220 +#define __NR_Linux_syscalls 222 #ifndef _LANGUAGE_ASSEMBLY |