[Linux-mips-commits]CVS: linux/include/asm-mips64 pci.h,1.10,1.11 unistd.h,1.4,1.5

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/include/asm-mips64
In directory usw-pr-cvs1:/tmp/cvs-serv17983/include/asm-mips64

Modified Files:
	pci.h unistd.h 
Log Message:
Synced to 2.4.18

Index: pci.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/pci.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- pci.h	28 Jan 2002 20:32:05 -0000	1.10
+++ pci.h	26 Feb 2002 19:03:33 -0000	1.11
@@ -95,6 +95,20 @@
 extern void pci_dma_sync_sg(struct pci_dev *hwdev, struct scatterlist *sg,
                             int nelems, int direction);
 
+/* pci_unmap_{single,page} is not a nop, thus... */
+#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)	\
+	dma_addr_t ADDR_NAME;
+#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)		\
+	__u32 LEN_NAME;
+#define pci_unmap_addr(PTR, ADDR_NAME)			\
+	((PTR)->ADDR_NAME)
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)		\
+	(((PTR)->ADDR_NAME) = (VAL))
+#define pci_unmap_len(PTR, LEN_NAME)			\
+	((PTR)->LEN_NAME)
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL)		\
+	(((PTR)->LEN_NAME) = (VAL))
+
 #else /* CONFIG_MAPPED_PCI_IO  */
 
 /*
@@ -132,6 +146,14 @@
 
 	/* Nothing to do */
 }
+
+/* pci_unmap_{page,single} is a nop so... */
+#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
+#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)
+#define pci_unmap_addr(PTR, ADDR_NAME)		(0)
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)	do { } while (0)
+#define pci_unmap_len(PTR, LEN_NAME)		(0)
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL)	do { } while (0)
 
 /*
  * pci_{map,unmap}_single_page maps a kernel page to a dma_addr_t. identical

Index: unistd.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/unistd.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- unistd.h	6 Nov 2001 02:57:38 -0000	1.4
+++ unistd.h	26 Feb 2002 19:03:33 -0000	1.5
@@ -240,11 +240,23 @@
 #define __NR_Linux32_security		(__NR_Linux32 + 221)
 #define __NR_Linux32_gettid		(__NR_Linux32 + 222)
 #define __NR_Linux32_readahead		(__NR_Linux32 + 223)
+#define __NR_Linux32_setxattr		(__NR_Linux32 + 224)
+#define __NR_Linux32_lsetxattr		(__NR_Linux32 + 225)
+#define __NR_Linux32_fsetxattr		(__NR_Linux32 + 226)
+#define __NR_Linux32_getxattr		(__NR_Linux32 + 227)
+#define __NR_Linux32_lgetxattr		(__NR_Linux32 + 228)
+#define __NR_Linux32_fgetxattr		(__NR_Linux32 + 229)
+#define __NR_Linux32_listxattr		(__NR_Linux32 + 230)
+#define __NR_Linux32_llistxattr		(__NR_Linux32 + 231)
+#define __NR_Linux32_flistxattr		(__NR_Linux32 + 232)
+#define __NR_Linux32_removexattr	(__NR_Linux32 + 233)
+#define __NR_Linux32_lremovexattr	(__NR_Linux32 + 234)
+#define __NR_Linux32_fremovexattr	(__NR_Linux32 + 235)
 
 /*
  * Offset of the last Linux o32 flavoured syscall
  */
-#define __NR_Linux32_syscalls		223
+#define __NR_Linux32_syscalls		235
 
 /*
  * Linux 64-bit syscalls are in the range from 5000 to 5999.
@@ -467,11 +479,23 @@
 #define __NR__security			(__NR_Linux + 214)
 #define __NR__gettid			(__NR_Linux + 215)
 #define __NR__readahead			(__NR_Linux + 216)
+#define __NR_setxattr			(__NR_Linux + 217)
+#define __NR_lsetxattr			(__NR_Linux + 218)
+#define __NR_fsetxattr			(__NR_Linux + 219)
+#define __NR_getxattr			(__NR_Linux + 220)
+#define __NR_lgetxattr			(__NR_Linux + 221)
+#define __NR_fgetxattr			(__NR_Linux + 222)
+#define __NR_listxattr			(__NR_Linux + 223)
+#define __NR_llistxattr			(__NR_Linux + 224)
+#define __NR_flistxattr			(__NR_Linux + 225)
+#define __NR_removexattr		(__NR_Linux + 226)
+#define __NR_lremovexattr		(__NR_Linux + 227)
+#define __NR_fremovexattr		(__NR_Linux + 228)
 
 /*
  * Offset of the last Linux flavoured syscall
  */
-#define __NR_Linux_syscalls		216
+#define __NR_Linux_syscalls		228
 
 #ifndef _LANGUAGE_ASSEMBLY