direct-io.hg

changeset 9380:815758308556

[IA64] Removed unnecessary header files

Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
author awilliam@xenbuild.aw
date Mon Mar 20 09:04:51 2006 -0700 (2006-03-20)
parents 25003dd43a92
children 58a3ed82eee4
files xen/arch/ia64/linux-xen/entry.S xen/arch/ia64/xen/ivt.S xen/arch/ia64/xen/mm_init.c xen/include/asm-ia64/linux-null/asm/mman.h xen/include/asm-ia64/linux-null/asm/ptrace_offsets.h xen/include/asm-ia64/linux-null/asm/semaphore.h xen/include/asm-ia64/linux-null/asm/ustack.h xen/include/asm-ia64/linux/README.origin xen/include/asm-ia64/linux/asm-generic/README.origin xen/include/asm-ia64/linux/asm-generic/bug.h xen/include/asm-ia64/linux/asm-generic/errno-base.h xen/include/asm-ia64/linux/asm-generic/errno.h xen/include/asm-ia64/linux/asm/README.origin xen/include/asm-ia64/linux/asm/bug.h xen/include/asm-ia64/linux/asm/dma-mapping.h xen/include/asm-ia64/linux/asm/errno.h xen/include/asm-ia64/linux/asm/mman.h xen/include/asm-ia64/linux/asm/ptrace_offsets.h xen/include/asm-ia64/linux/asm/rwsem.h xen/include/asm-ia64/linux/asm/semaphore.h xen/include/asm-ia64/linux/asm/ustack.h xen/include/asm-ia64/linux/dma-mapping.h xen/include/asm-ia64/linux/err.h xen/include/asm-ia64/linux/rwsem.h
line diff
     1.1 --- a/xen/arch/ia64/linux-xen/entry.S	Fri Mar 17 15:37:28 2006 -0700
     1.2 +++ b/xen/arch/ia64/linux-xen/entry.S	Mon Mar 20 09:04:51 2006 -0700
     1.3 @@ -35,7 +35,11 @@
     1.4  
     1.5  #include <asm/asmmacro.h>
     1.6  #include <asm/cache.h>
     1.7 +#ifdef XEN
     1.8 +#include <xen/errno.h>
     1.9 +#else
    1.10  #include <asm/errno.h>
    1.11 +#endif
    1.12  #include <asm/kregs.h>
    1.13  #include <asm/offsets.h>
    1.14  #include <asm/pgtable.h>
     2.1 --- a/xen/arch/ia64/xen/ivt.S	Fri Mar 17 15:37:28 2006 -0700
     2.2 +++ b/xen/arch/ia64/xen/ivt.S	Mon Mar 20 09:04:51 2006 -0700
     2.3 @@ -70,7 +70,11 @@
     2.4  #include <asm/system.h>
     2.5  #include <asm/thread_info.h>
     2.6  #include <asm/unistd.h>
     2.7 +#ifdef XEN
     2.8 +#include <xen/errno.h>
     2.9 +#else
    2.10  #include <asm/errno.h>
    2.11 +#endif
    2.12  
    2.13  #if 1
    2.14  # define PSR_DEFAULT_BITS	psr.ac
     3.1 --- a/xen/arch/ia64/xen/mm_init.c	Fri Mar 17 15:37:28 2006 -0700
     3.2 +++ b/xen/arch/ia64/xen/mm_init.c	Mon Mar 20 09:04:51 2006 -0700
     3.3 @@ -219,6 +219,7 @@ update_mmu_cache (struct vm_area_struct 
     3.4  }
     3.5  #endif
     3.6  
     3.7 +#if 0
     3.8  inline void
     3.9  ia64_set_rbs_bot (void)
    3.10  {
    3.11 @@ -232,6 +233,7 @@ ia64_set_rbs_bot (void)
    3.12  		stack_size = MAX_USER_STACK_SIZE;
    3.13  	current->arch._thread.rbs_bot = STACK_TOP - stack_size;
    3.14  }
    3.15 +#endif
    3.16  
    3.17  /*
    3.18   * This performs some platform-dependent address space initialization.
    3.19 @@ -239,6 +241,7 @@ ia64_set_rbs_bot (void)
    3.20   * store (which grows upwards) and install the gateway page which is
    3.21   * used for signal trampolines, etc.
    3.22   */
    3.23 +#if 0
    3.24  void
    3.25  ia64_init_addr_space (void)
    3.26  {
    3.27 @@ -279,6 +282,7 @@ printf("ia64_init_addr_space: called, no
    3.28  	}
    3.29  #endif
    3.30  }
    3.31 +#endif
    3.32  
    3.33  void setup_gate (void)
    3.34  {
     8.1 --- a/xen/include/asm-ia64/linux/README.origin	Fri Mar 17 15:37:28 2006 -0700
     8.2 +++ b/xen/include/asm-ia64/linux/README.origin	Mon Mar 20 09:04:51 2006 -0700
     8.3 @@ -7,9 +7,7 @@
     8.4  bcd.h			-> linux/include/linux/bcd.h
     8.5  bitmap.h		-> linux/include/linux/bitmap.h
     8.6  bitops.h		-> linux/include/linux/bitops.h
     8.7 -dma-mapping.h		-> linux/include/linux/dma-mapping.h
     8.8  efi.h			-> linux/include/linux/efi.h
     8.9 -err.h			-> linux/include/linux/err.h
    8.10  initrd.h		-> linux/include/linux/initrd.h
    8.11  jiffies.h		-> linux/include/linux/jiffies.h
    8.12  kmalloc_sizes.h		-> linux/include/linux/kmalloc_sizes.h
    8.13 @@ -18,7 +16,6 @@ notifier.h		-> linux/include/linux/notif
    8.14  numa.h			-> linux/include/linux/numa.h
    8.15  percpu.h		-> linux/include/linux/percpu.h
    8.16  preempt.h		-> linux/include/linux/preempt.h
    8.17 -rwsem.h			-> linux/include/linux/rwsem.h
    8.18  seqlock.h		-> linux/include/linux/seqlock.h
    8.19  sort.h			-> linux/include/linux/sort.h
    8.20  stddef.h		-> linux/include/linux/stddef.h
     9.1 --- a/xen/include/asm-ia64/linux/asm-generic/README.origin	Fri Mar 17 15:37:28 2006 -0700
     9.2 +++ b/xen/include/asm-ia64/linux/asm-generic/README.origin	Mon Mar 20 09:04:51 2006 -0700
     9.3 @@ -4,10 +4,7 @@
     9.4  # needs to be changed, move it to ../linux-xen and follow
     9.5  # the instructions in the README there.
     9.6  
     9.7 -bug.h			-> linux/include/asm-generic/bug.h
     9.8  div64.h			-> linux/include/asm-generic/div64.h
     9.9 -errno-base.h		-> linux/include/asm-generic/errno-base.h
    9.10 -errno.h			-> linux/include/asm-generic/errno.h
    9.11  ide_iops.h		-> linux/include/asm-generic/ide_iops.h
    9.12  iomap.h			-> linux/include/asm-generic/iomap.h
    9.13  pci.h			-> linux/include/asm-generic/pci.h
    10.1 --- a/xen/include/asm-ia64/linux/asm-generic/bug.h	Fri Mar 17 15:37:28 2006 -0700
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,42 +0,0 @@
    10.4 -#ifndef _ASM_GENERIC_BUG_H
    10.5 -#define _ASM_GENERIC_BUG_H
    10.6 -
    10.7 -#include <linux/compiler.h>
    10.8 -#include <linux/config.h>
    10.9 -
   10.10 -#ifdef CONFIG_BUG
   10.11 -#ifndef HAVE_ARCH_BUG
   10.12 -#define BUG() do { \
   10.13 -	printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
   10.14 -	panic("BUG!"); \
   10.15 -} while (0)
   10.16 -#endif
   10.17 -
   10.18 -#ifndef HAVE_ARCH_BUG_ON
   10.19 -#define BUG_ON(condition) do { if (unlikely((condition)!=0)) BUG(); } while(0)
   10.20 -#endif
   10.21 -
   10.22 -#ifndef HAVE_ARCH_WARN_ON
   10.23 -#define WARN_ON(condition) do { \
   10.24 -	if (unlikely((condition)!=0)) { \
   10.25 -		printk("Badness in %s at %s:%d\n", __FUNCTION__, __FILE__, __LINE__); \
   10.26 -		dump_stack(); \
   10.27 -	} \
   10.28 -} while (0)
   10.29 -#endif
   10.30 -
   10.31 -#else /* !CONFIG_BUG */
   10.32 -#ifndef HAVE_ARCH_BUG
   10.33 -#define BUG()
   10.34 -#endif
   10.35 -
   10.36 -#ifndef HAVE_ARCH_BUG_ON
   10.37 -#define BUG_ON(condition) do { if (condition) ; } while(0)
   10.38 -#endif
   10.39 -
   10.40 -#ifndef HAVE_ARCH_WARN_ON
   10.41 -#define WARN_ON(condition) do { if (condition) ; } while(0)
   10.42 -#endif
   10.43 -#endif
   10.44 -
   10.45 -#endif
    11.1 --- a/xen/include/asm-ia64/linux/asm-generic/errno-base.h	Fri Mar 17 15:37:28 2006 -0700
    11.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.3 @@ -1,39 +0,0 @@
    11.4 -#ifndef _ASM_GENERIC_ERRNO_BASE_H
    11.5 -#define _ASM_GENERIC_ERRNO_BASE_H
    11.6 -
    11.7 -#define	EPERM		 1	/* Operation not permitted */
    11.8 -#define	ENOENT		 2	/* No such file or directory */
    11.9 -#define	ESRCH		 3	/* No such process */
   11.10 -#define	EINTR		 4	/* Interrupted system call */
   11.11 -#define	EIO		 5	/* I/O error */
   11.12 -#define	ENXIO		 6	/* No such device or address */
   11.13 -#define	E2BIG		 7	/* Argument list too long */
   11.14 -#define	ENOEXEC		 8	/* Exec format error */
   11.15 -#define	EBADF		 9	/* Bad file number */
   11.16 -#define	ECHILD		10	/* No child processes */
   11.17 -#define	EAGAIN		11	/* Try again */
   11.18 -#define	ENOMEM		12	/* Out of memory */
   11.19 -#define	EACCES		13	/* Permission denied */
   11.20 -#define	EFAULT		14	/* Bad address */
   11.21 -#define	ENOTBLK		15	/* Block device required */
   11.22 -#define	EBUSY		16	/* Device or resource busy */
   11.23 -#define	EEXIST		17	/* File exists */
   11.24 -#define	EXDEV		18	/* Cross-device link */
   11.25 -#define	ENODEV		19	/* No such device */
   11.26 -#define	ENOTDIR		20	/* Not a directory */
   11.27 -#define	EISDIR		21	/* Is a directory */
   11.28 -#define	EINVAL		22	/* Invalid argument */
   11.29 -#define	ENFILE		23	/* File table overflow */
   11.30 -#define	EMFILE		24	/* Too many open files */
   11.31 -#define	ENOTTY		25	/* Not a typewriter */
   11.32 -#define	ETXTBSY		26	/* Text file busy */
   11.33 -#define	EFBIG		27	/* File too large */
   11.34 -#define	ENOSPC		28	/* No space left on device */
   11.35 -#define	ESPIPE		29	/* Illegal seek */
   11.36 -#define	EROFS		30	/* Read-only file system */
   11.37 -#define	EMLINK		31	/* Too many links */
   11.38 -#define	EPIPE		32	/* Broken pipe */
   11.39 -#define	EDOM		33	/* Math argument out of domain of func */
   11.40 -#define	ERANGE		34	/* Math result not representable */
   11.41 -
   11.42 -#endif
    12.1 --- a/xen/include/asm-ia64/linux/asm-generic/errno.h	Fri Mar 17 15:37:28 2006 -0700
    12.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.3 @@ -1,109 +0,0 @@
    12.4 -#ifndef _ASM_GENERIC_ERRNO_H
    12.5 -#define _ASM_GENERIC_ERRNO_H
    12.6 -
    12.7 -#include <asm-generic/errno-base.h>
    12.8 -
    12.9 -#define	EDEADLK		35	/* Resource deadlock would occur */
   12.10 -#define	ENAMETOOLONG	36	/* File name too long */
   12.11 -#define	ENOLCK		37	/* No record locks available */
   12.12 -#define	ENOSYS		38	/* Function not implemented */
   12.13 -#define	ENOTEMPTY	39	/* Directory not empty */
   12.14 -#define	ELOOP		40	/* Too many symbolic links encountered */
   12.15 -#define	EWOULDBLOCK	EAGAIN	/* Operation would block */
   12.16 -#define	ENOMSG		42	/* No message of desired type */
   12.17 -#define	EIDRM		43	/* Identifier removed */
   12.18 -#define	ECHRNG		44	/* Channel number out of range */
   12.19 -#define	EL2NSYNC	45	/* Level 2 not synchronized */
   12.20 -#define	EL3HLT		46	/* Level 3 halted */
   12.21 -#define	EL3RST		47	/* Level 3 reset */
   12.22 -#define	ELNRNG		48	/* Link number out of range */
   12.23 -#define	EUNATCH		49	/* Protocol driver not attached */
   12.24 -#define	ENOCSI		50	/* No CSI structure available */
   12.25 -#define	EL2HLT		51	/* Level 2 halted */
   12.26 -#define	EBADE		52	/* Invalid exchange */
   12.27 -#define	EBADR		53	/* Invalid request descriptor */
   12.28 -#define	EXFULL		54	/* Exchange full */
   12.29 -#define	ENOANO		55	/* No anode */
   12.30 -#define	EBADRQC		56	/* Invalid request code */
   12.31 -#define	EBADSLT		57	/* Invalid slot */
   12.32 -
   12.33 -#define	EDEADLOCK	EDEADLK
   12.34 -
   12.35 -#define	EBFONT		59	/* Bad font file format */
   12.36 -#define	ENOSTR		60	/* Device not a stream */
   12.37 -#define	ENODATA		61	/* No data available */
   12.38 -#define	ETIME		62	/* Timer expired */
   12.39 -#define	ENOSR		63	/* Out of streams resources */
   12.40 -#define	ENONET		64	/* Machine is not on the network */
   12.41 -#define	ENOPKG		65	/* Package not installed */
   12.42 -#define	EREMOTE		66	/* Object is remote */
   12.43 -#define	ENOLINK		67	/* Link has been severed */
   12.44 -#define	EADV		68	/* Advertise error */
   12.45 -#define	ESRMNT		69	/* Srmount error */
   12.46 -#define	ECOMM		70	/* Communication error on send */
   12.47 -#define	EPROTO		71	/* Protocol error */
   12.48 -#define	EMULTIHOP	72	/* Multihop attempted */
   12.49 -#define	EDOTDOT		73	/* RFS specific error */
   12.50 -#define	EBADMSG		74	/* Not a data message */
   12.51 -#define	EOVERFLOW	75	/* Value too large for defined data type */
   12.52 -#define	ENOTUNIQ	76	/* Name not unique on network */
   12.53 -#define	EBADFD		77	/* File descriptor in bad state */
   12.54 -#define	EREMCHG		78	/* Remote address changed */
   12.55 -#define	ELIBACC		79	/* Can not access a needed shared library */
   12.56 -#define	ELIBBAD		80	/* Accessing a corrupted shared library */
   12.57 -#define	ELIBSCN		81	/* .lib section in a.out corrupted */
   12.58 -#define	ELIBMAX		82	/* Attempting to link in too many shared libraries */
   12.59 -#define	ELIBEXEC	83	/* Cannot exec a shared library directly */
   12.60 -#define	EILSEQ		84	/* Illegal byte sequence */
   12.61 -#define	ERESTART	85	/* Interrupted system call should be restarted */
   12.62 -#define	ESTRPIPE	86	/* Streams pipe error */
   12.63 -#define	EUSERS		87	/* Too many users */
   12.64 -#define	ENOTSOCK	88	/* Socket operation on non-socket */
   12.65 -#define	EDESTADDRREQ	89	/* Destination address required */
   12.66 -#define	EMSGSIZE	90	/* Message too long */
   12.67 -#define	EPROTOTYPE	91	/* Protocol wrong type for socket */
   12.68 -#define	ENOPROTOOPT	92	/* Protocol not available */
   12.69 -#define	EPROTONOSUPPORT	93	/* Protocol not supported */
   12.70 -#define	ESOCKTNOSUPPORT	94	/* Socket type not supported */
   12.71 -#define	EOPNOTSUPP	95	/* Operation not supported on transport endpoint */
   12.72 -#define	EPFNOSUPPORT	96	/* Protocol family not supported */
   12.73 -#define	EAFNOSUPPORT	97	/* Address family not supported by protocol */
   12.74 -#define	EADDRINUSE	98	/* Address already in use */
   12.75 -#define	EADDRNOTAVAIL	99	/* Cannot assign requested address */
   12.76 -#define	ENETDOWN	100	/* Network is down */
   12.77 -#define	ENETUNREACH	101	/* Network is unreachable */
   12.78 -#define	ENETRESET	102	/* Network dropped connection because of reset */
   12.79 -#define	ECONNABORTED	103	/* Software caused connection abort */
   12.80 -#define	ECONNRESET	104	/* Connection reset by peer */
   12.81 -#define	ENOBUFS		105	/* No buffer space available */
   12.82 -#define	EISCONN		106	/* Transport endpoint is already connected */
   12.83 -#define	ENOTCONN	107	/* Transport endpoint is not connected */
   12.84 -#define	ESHUTDOWN	108	/* Cannot send after transport endpoint shutdown */
   12.85 -#define	ETOOMANYREFS	109	/* Too many references: cannot splice */
   12.86 -#define	ETIMEDOUT	110	/* Connection timed out */
   12.87 -#define	ECONNREFUSED	111	/* Connection refused */
   12.88 -#define	EHOSTDOWN	112	/* Host is down */
   12.89 -#define	EHOSTUNREACH	113	/* No route to host */
   12.90 -#define	EALREADY	114	/* Operation already in progress */
   12.91 -#define	EINPROGRESS	115	/* Operation now in progress */
   12.92 -#define	ESTALE		116	/* Stale NFS file handle */
   12.93 -#define	EUCLEAN		117	/* Structure needs cleaning */
   12.94 -#define	ENOTNAM		118	/* Not a XENIX named type file */
   12.95 -#define	ENAVAIL		119	/* No XENIX semaphores available */
   12.96 -#define	EISNAM		120	/* Is a named type file */
   12.97 -#define	EREMOTEIO	121	/* Remote I/O error */
   12.98 -#define	EDQUOT		122	/* Quota exceeded */
   12.99 -
  12.100 -#define	ENOMEDIUM	123	/* No medium found */
  12.101 -#define	EMEDIUMTYPE	124	/* Wrong medium type */
  12.102 -#define	ECANCELED	125	/* Operation Canceled */
  12.103 -#define	ENOKEY		126	/* Required key not available */
  12.104 -#define	EKEYEXPIRED	127	/* Key has expired */
  12.105 -#define	EKEYREVOKED	128	/* Key has been revoked */
  12.106 -#define	EKEYREJECTED	129	/* Key was rejected by service */
  12.107 -
  12.108 -/* for robust mutexes */
  12.109 -#define	EOWNERDEAD	130	/* Owner died */
  12.110 -#define	ENOTRECOVERABLE	131	/* State not recoverable */
  12.111 -
  12.112 -#endif
    13.1 --- a/xen/include/asm-ia64/linux/asm/README.origin	Fri Mar 17 15:37:28 2006 -0700
    13.2 +++ b/xen/include/asm-ia64/linux/asm/README.origin	Mon Mar 20 09:04:51 2006 -0700
    13.3 @@ -9,7 +9,6 @@ asmmacro.h		-> linux/include/asm-ia64/as
    13.4  atomic.h		-> linux/include/asm-ia64/atomic.h
    13.5  bitops.h		-> linux/include/asm-ia64/bitops.h
    13.6  break.h			-> linux/include/asm-ia64/break.h
    13.7 -bug.h			-> linux/include/asm-ia64/bug.h
    13.8  byteorder.h		-> linux/include/asm-ia64/byteorder.h
    13.9  cacheflush.h		-> linux/include/asm-ia64/cacheflush.h
   13.10  checksum.h		-> linux/include/asm-ia64/checksum.h
   13.11 @@ -17,8 +16,6 @@ current.h		-> linux/include/asm-ia64/cur
   13.12  delay.h			-> linux/include/asm-ia64/delay.h
   13.13  div64.h			-> linux/include/asm-ia64/div64.h
   13.14  dma.h			-> linux/include/asm-ia64/dma.h
   13.15 -dma-mapping.h		-> linux/include/asm-ia64/dma-mapping.h
   13.16 -errno.h			-> linux/include/asm-ia64/errno.h
   13.17  fpu.h			-> linux/include/asm-ia64/fpu.h
   13.18  hardirq.h		-> linux/include/asm-ia64/hardirq.h
   13.19  hdreg.h			-> linux/include/asm-ia64/hdreg.h
   13.20 @@ -31,19 +28,15 @@ machvec.h		-> linux/include/asm-ia64/mac
   13.21  machvec_hpsim.h		-> linux/include/asm-ia64/machvec_hpsim.h
   13.22  mca.h			-> linux/include/asm-ia64/mca.h
   13.23  meminit.h		-> linux/include/asm-ia64/meminit.h
   13.24 -mman.h			-> linux/include/asm-ia64/mman.h
   13.25  numa.h			-> linux/include/asm-ia64/numa.h
   13.26  numnodes.h		-> linux/include/asm-ia64/numnodes.h
   13.27  param.h			-> linux/include/asm-ia64/param.h
   13.28  patch.h			-> linux/include/asm-ia64/patch.h
   13.29  pci.h			-> linux/include/asm-ia64/pci.h
   13.30  percpu.h		-> linux/include/asm-ia64/percpu.h
   13.31 -ptrace_offsets.h	-> linux/include/asm-ia64/ptrace_offsets.h
   13.32  rse.h			-> linux/include/asm-ia64/rse.h
   13.33 -rwsem.h			-> linux/include/asm-ia64/rwsem.h
   13.34  sal.h			-> linux/include/asm-ia64/sal.h
   13.35  sections.h		-> linux/include/asm-ia64/sections.h
   13.36 -semaphore.h		-> linux/include/asm-ia64/semaphore.h
   13.37  setup.h			-> linux/include/asm-ia64/setup.h
   13.38  string.h		-> linux/include/asm-ia64/string.h
   13.39  thread_info.h		-> linux/include/asm-ia64/thread_info.h
   13.40 @@ -52,4 +45,3 @@ topology.h		-> linux/include/asm-ia64/to
   13.41  unaligned.h		-> linux/include/asm-ia64/unaligned.h
   13.42  unistd.h		-> linux/include/asm-ia64/unistd.h
   13.43  unwind.h		-> linux/include/asm-ia64/unwind.h
   13.44 -ustack.h		-> linux/include/asm-ia64/ustack.h
    14.1 --- a/xen/include/asm-ia64/linux/asm/bug.h	Fri Mar 17 15:37:28 2006 -0700
    14.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.3 @@ -1,18 +0,0 @@
    14.4 -#ifndef _ASM_IA64_BUG_H
    14.5 -#define _ASM_IA64_BUG_H
    14.6 -
    14.7 -#ifdef CONFIG_BUG
    14.8 -#if (__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
    14.9 -# define ia64_abort()	__builtin_trap()
   14.10 -#else
   14.11 -# define ia64_abort()	(*(volatile int *) 0 = 0)
   14.12 -#endif
   14.13 -#define BUG() do { printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); ia64_abort(); } while (0)
   14.14 -
   14.15 -/* should this BUG be made generic? */
   14.16 -#define HAVE_ARCH_BUG
   14.17 -#endif
   14.18 -
   14.19 -#include <asm-generic/bug.h>
   14.20 -
   14.21 -#endif
    15.1 --- a/xen/include/asm-ia64/linux/asm/dma-mapping.h	Fri Mar 17 15:37:28 2006 -0700
    15.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.3 @@ -1,70 +0,0 @@
    15.4 -#ifndef _ASM_IA64_DMA_MAPPING_H
    15.5 -#define _ASM_IA64_DMA_MAPPING_H
    15.6 -
    15.7 -/*
    15.8 - * Copyright (C) 2003-2004 Hewlett-Packard Co
    15.9 - *	David Mosberger-Tang <davidm@hpl.hp.com>
   15.10 - */
   15.11 -#include <linux/config.h>
   15.12 -#include <asm/machvec.h>
   15.13 -
   15.14 -#define dma_alloc_coherent	platform_dma_alloc_coherent
   15.15 -#define dma_alloc_noncoherent	platform_dma_alloc_coherent	/* coherent mem. is cheap */
   15.16 -#define dma_free_coherent	platform_dma_free_coherent
   15.17 -#define dma_free_noncoherent	platform_dma_free_coherent
   15.18 -#define dma_map_single		platform_dma_map_single
   15.19 -#define dma_map_sg		platform_dma_map_sg
   15.20 -#define dma_unmap_single	platform_dma_unmap_single
   15.21 -#define dma_unmap_sg		platform_dma_unmap_sg
   15.22 -#define dma_sync_single_for_cpu	platform_dma_sync_single_for_cpu
   15.23 -#define dma_sync_sg_for_cpu	platform_dma_sync_sg_for_cpu
   15.24 -#define dma_sync_single_for_device platform_dma_sync_single_for_device
   15.25 -#define dma_sync_sg_for_device	platform_dma_sync_sg_for_device
   15.26 -#define dma_mapping_error	platform_dma_mapping_error
   15.27 -
   15.28 -#define dma_map_page(dev, pg, off, size, dir)				\
   15.29 -	dma_map_single(dev, page_address(pg) + (off), (size), (dir))
   15.30 -#define dma_unmap_page(dev, dma_addr, size, dir)			\
   15.31 -	dma_unmap_single(dev, dma_addr, size, dir)
   15.32 -
   15.33 -/*
   15.34 - * Rest of this file is part of the "Advanced DMA API".  Use at your own risk.
   15.35 - * See Documentation/DMA-API.txt for details.
   15.36 - */
   15.37 -
   15.38 -#define dma_sync_single_range_for_cpu(dev, dma_handle, offset, size, dir)	\
   15.39 -	dma_sync_single_for_cpu(dev, dma_handle, size, dir)
   15.40 -#define dma_sync_single_range_for_device(dev, dma_handle, offset, size, dir)	\
   15.41 -	dma_sync_single_for_device(dev, dma_handle, size, dir)
   15.42 -
   15.43 -#define dma_supported		platform_dma_supported
   15.44 -
   15.45 -static inline int
   15.46 -dma_set_mask (struct device *dev, u64 mask)
   15.47 -{
   15.48 -	if (!dev->dma_mask || !dma_supported(dev, mask))
   15.49 -		return -EIO;
   15.50 -	*dev->dma_mask = mask;
   15.51 -	return 0;
   15.52 -}
   15.53 -
   15.54 -static inline int
   15.55 -dma_get_cache_alignment (void)
   15.56 -{
   15.57 -	extern int ia64_max_cacheline_size;
   15.58 -	return ia64_max_cacheline_size;
   15.59 -}
   15.60 -
   15.61 -static inline void
   15.62 -dma_cache_sync (void *vaddr, size_t size, enum dma_data_direction dir)
   15.63 -{
   15.64 -	/*
   15.65 -	 * IA-64 is cache-coherent, so this is mostly a no-op.  However, we do need to
   15.66 -	 * ensure that dma_cache_sync() enforces order, hence the mb().
   15.67 -	 */
   15.68 -	mb();
   15.69 -}
   15.70 -
   15.71 -#define dma_is_consistent(dma_handle)	(1)	/* all we do is coherent memory... */
   15.72 -
   15.73 -#endif /* _ASM_IA64_DMA_MAPPING_H */
    16.1 --- a/xen/include/asm-ia64/linux/asm/errno.h	Fri Mar 17 15:37:28 2006 -0700
    16.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.3 @@ -1,1 +0,0 @@
    16.4 -#include <asm-generic/errno.h>
    17.1 --- a/xen/include/asm-ia64/linux/asm/mman.h	Fri Mar 17 15:37:28 2006 -0700
    17.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.3 @@ -1,51 +0,0 @@
    17.4 -#ifndef _ASM_IA64_MMAN_H
    17.5 -#define _ASM_IA64_MMAN_H
    17.6 -
    17.7 -/*
    17.8 - * Based on <asm-i386/mman.h>.
    17.9 - *
   17.10 - * Modified 1998-2000, 2002
   17.11 - *	David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
   17.12 - */
   17.13 -
   17.14 -#define PROT_READ	0x1		/* page can be read */
   17.15 -#define PROT_WRITE	0x2		/* page can be written */
   17.16 -#define PROT_EXEC	0x4		/* page can be executed */
   17.17 -#define PROT_SEM	0x8		/* page may be used for atomic ops */
   17.18 -#define PROT_NONE	0x0		/* page can not be accessed */
   17.19 -#define PROT_GROWSDOWN	0x01000000	/* mprotect flag: extend change to start of growsdown vma */
   17.20 -#define PROT_GROWSUP	0x02000000	/* mprotect flag: extend change to end of growsup vma */
   17.21 -
   17.22 -#define MAP_SHARED	0x01		/* Share changes */
   17.23 -#define MAP_PRIVATE	0x02		/* Changes are private */
   17.24 -#define MAP_TYPE	0x0f		/* Mask for type of mapping */
   17.25 -#define MAP_FIXED	0x10		/* Interpret addr exactly */
   17.26 -#define MAP_ANONYMOUS	0x20		/* don't use a file */
   17.27 -
   17.28 -#define MAP_GROWSDOWN	0x00100		/* stack-like segment */
   17.29 -#define MAP_GROWSUP	0x00200		/* register stack-like segment */
   17.30 -#define MAP_DENYWRITE	0x00800		/* ETXTBSY */
   17.31 -#define MAP_EXECUTABLE	0x01000		/* mark it as an executable */
   17.32 -#define MAP_LOCKED	0x02000		/* pages are locked */
   17.33 -#define MAP_NORESERVE	0x04000		/* don't check for reservations */
   17.34 -#define MAP_POPULATE	0x08000		/* populate (prefault) pagetables */
   17.35 -#define MAP_NONBLOCK	0x10000		/* do not block on IO */
   17.36 -
   17.37 -#define MS_ASYNC	1		/* sync memory asynchronously */
   17.38 -#define MS_INVALIDATE	2		/* invalidate the caches */
   17.39 -#define MS_SYNC		4		/* synchronous memory sync */
   17.40 -
   17.41 -#define MCL_CURRENT	1		/* lock all current mappings */
   17.42 -#define MCL_FUTURE	2		/* lock all future mappings */
   17.43 -
   17.44 -#define MADV_NORMAL	0x0		/* default page-in behavior */
   17.45 -#define MADV_RANDOM	0x1		/* page-in minimum required */
   17.46 -#define MADV_SEQUENTIAL	0x2		/* read-ahead aggressively */
   17.47 -#define MADV_WILLNEED	0x3		/* pre-fault pages */
   17.48 -#define MADV_DONTNEED	0x4		/* discard these pages */
   17.49 -
   17.50 -/* compatibility flags */
   17.51 -#define MAP_ANON	MAP_ANONYMOUS
   17.52 -#define MAP_FILE	0
   17.53 -
   17.54 -#endif /* _ASM_IA64_MMAN_H */
    18.1 --- a/xen/include/asm-ia64/linux/asm/ptrace_offsets.h	Fri Mar 17 15:37:28 2006 -0700
    18.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.3 @@ -1,268 +0,0 @@
    18.4 -#ifndef _ASM_IA64_PTRACE_OFFSETS_H
    18.5 -#define _ASM_IA64_PTRACE_OFFSETS_H
    18.6 -
    18.7 -/*
    18.8 - * Copyright (C) 1999, 2003 Hewlett-Packard Co
    18.9 - *	David Mosberger-Tang <davidm@hpl.hp.com>
   18.10 - */
   18.11 -/*
   18.12 - * The "uarea" that can be accessed via PEEKUSER and POKEUSER is a
   18.13 - * virtual structure that would have the following definition:
   18.14 - *
   18.15 - *	struct uarea {
   18.16 - *		struct ia64_fpreg fph[96];		// f32-f127
   18.17 - *		unsigned long nat_bits;
   18.18 - *		unsigned long empty1;
   18.19 - *		struct ia64_fpreg f2;			// f2-f5
   18.20 - *			:
   18.21 - *		struct ia64_fpreg f5;
   18.22 - *		struct ia64_fpreg f10;			// f10-f31
   18.23 - *			:
   18.24 - *		struct ia64_fpreg f31;
   18.25 - *		unsigned long r4;			// r4-r7
   18.26 - *			:
   18.27 - *		unsigned long r7;
   18.28 - *		unsigned long b1;			// b1-b5
   18.29 - *			:
   18.30 - *		unsigned long b5;
   18.31 - *		unsigned long ar_ec;
   18.32 - *		unsigned long ar_lc;
   18.33 - *		unsigned long empty2[5];
   18.34 - *		unsigned long cr_ipsr;
   18.35 - *		unsigned long cr_iip;
   18.36 - *		unsigned long cfm;
   18.37 - *		unsigned long ar_unat;
   18.38 - *		unsigned long ar_pfs;
   18.39 - *		unsigned long ar_rsc;
   18.40 - *		unsigned long ar_rnat;
   18.41 - *		unsigned long ar_bspstore;
   18.42 - *		unsigned long pr;
   18.43 - *		unsigned long b6;
   18.44 - *		unsigned long ar_bsp;
   18.45 - *		unsigned long r1;
   18.46 - *		unsigned long r2;
   18.47 - *		unsigned long r3;
   18.48 - *		unsigned long r12;
   18.49 - *		unsigned long r13;
   18.50 - *		unsigned long r14;
   18.51 - *		unsigned long r15;
   18.52 - *		unsigned long r8;
   18.53 - *		unsigned long r9;
   18.54 - *		unsigned long r10;
   18.55 - *		unsigned long r11;
   18.56 - *		unsigned long r16;
   18.57 - *			:
   18.58 - *		unsigned long r31;
   18.59 - *		unsigned long ar_ccv;
   18.60 - *		unsigned long ar_fpsr;
   18.61 - *		unsigned long b0;
   18.62 - *		unsigned long b7;
   18.63 - *		unsigned long f6;
   18.64 - *		unsigned long f7;
   18.65 - *		unsigned long f8;
   18.66 - *		unsigned long f9;
   18.67 - *		unsigned long ar_csd;
   18.68 - *		unsigned long ar_ssd;
   18.69 - *		unsigned long rsvd1[710];
   18.70 - *		unsigned long dbr[8];
   18.71 - *		unsigned long rsvd2[504];
   18.72 - *		unsigned long ibr[8];
   18.73 - *		unsigned long rsvd3[504];
   18.74 - *		unsigned long pmd[4];
   18.75 - *	}
   18.76 - */
   18.77 -
   18.78 -/* fph: */
   18.79 -#define PT_F32			0x0000
   18.80 -#define PT_F33			0x0010
   18.81 -#define PT_F34			0x0020
   18.82 -#define PT_F35			0x0030
   18.83 -#define PT_F36			0x0040
   18.84 -#define PT_F37			0x0050
   18.85 -#define PT_F38			0x0060
   18.86 -#define PT_F39			0x0070
   18.87 -#define PT_F40			0x0080
   18.88 -#define PT_F41			0x0090
   18.89 -#define PT_F42			0x00a0
   18.90 -#define PT_F43			0x00b0
   18.91 -#define PT_F44			0x00c0
   18.92 -#define PT_F45			0x00d0
   18.93 -#define PT_F46			0x00e0
   18.94 -#define PT_F47			0x00f0
   18.95 -#define PT_F48			0x0100
   18.96 -#define PT_F49			0x0110
   18.97 -#define PT_F50			0x0120
   18.98 -#define PT_F51			0x0130
   18.99 -#define PT_F52			0x0140
  18.100 -#define PT_F53			0x0150
  18.101 -#define PT_F54			0x0160
  18.102 -#define PT_F55			0x0170
  18.103 -#define PT_F56			0x0180
  18.104 -#define PT_F57			0x0190
  18.105 -#define PT_F58			0x01a0
  18.106 -#define PT_F59			0x01b0
  18.107 -#define PT_F60			0x01c0
  18.108 -#define PT_F61			0x01d0
  18.109 -#define PT_F62			0x01e0
  18.110 -#define PT_F63			0x01f0
  18.111 -#define PT_F64			0x0200
  18.112 -#define PT_F65			0x0210
  18.113 -#define PT_F66			0x0220
  18.114 -#define PT_F67			0x0230
  18.115 -#define PT_F68			0x0240
  18.116 -#define PT_F69			0x0250
  18.117 -#define PT_F70			0x0260
  18.118 -#define PT_F71			0x0270
  18.119 -#define PT_F72			0x0280
  18.120 -#define PT_F73			0x0290
  18.121 -#define PT_F74			0x02a0
  18.122 -#define PT_F75			0x02b0
  18.123 -#define PT_F76			0x02c0
  18.124 -#define PT_F77			0x02d0
  18.125 -#define PT_F78			0x02e0
  18.126 -#define PT_F79			0x02f0
  18.127 -#define PT_F80			0x0300
  18.128 -#define PT_F81			0x0310
  18.129 -#define PT_F82			0x0320
  18.130 -#define PT_F83			0x0330
  18.131 -#define PT_F84			0x0340
  18.132 -#define PT_F85			0x0350
  18.133 -#define PT_F86			0x0360
  18.134 -#define PT_F87			0x0370
  18.135 -#define PT_F88			0x0380
  18.136 -#define PT_F89			0x0390
  18.137 -#define PT_F90			0x03a0
  18.138 -#define PT_F91			0x03b0
  18.139 -#define PT_F92			0x03c0
  18.140 -#define PT_F93			0x03d0
  18.141 -#define PT_F94			0x03e0
  18.142 -#define PT_F95			0x03f0
  18.143 -#define PT_F96			0x0400
  18.144 -#define PT_F97			0x0410
  18.145 -#define PT_F98			0x0420
  18.146 -#define PT_F99			0x0430
  18.147 -#define PT_F100			0x0440
  18.148 -#define PT_F101			0x0450
  18.149 -#define PT_F102			0x0460
  18.150 -#define PT_F103			0x0470
  18.151 -#define PT_F104			0x0480
  18.152 -#define PT_F105			0x0490
  18.153 -#define PT_F106			0x04a0
  18.154 -#define PT_F107			0x04b0
  18.155 -#define PT_F108			0x04c0
  18.156 -#define PT_F109			0x04d0
  18.157 -#define PT_F110			0x04e0
  18.158 -#define PT_F111			0x04f0
  18.159 -#define PT_F112			0x0500
  18.160 -#define PT_F113			0x0510
  18.161 -#define PT_F114			0x0520
  18.162 -#define PT_F115			0x0530
  18.163 -#define PT_F116			0x0540
  18.164 -#define PT_F117			0x0550
  18.165 -#define PT_F118			0x0560
  18.166 -#define PT_F119			0x0570
  18.167 -#define PT_F120			0x0580
  18.168 -#define PT_F121			0x0590
  18.169 -#define PT_F122			0x05a0
  18.170 -#define PT_F123			0x05b0
  18.171 -#define PT_F124			0x05c0
  18.172 -#define PT_F125			0x05d0
  18.173 -#define PT_F126			0x05e0
  18.174 -#define PT_F127			0x05f0
  18.175 -
  18.176 -#define PT_NAT_BITS		0x0600
  18.177 -
  18.178 -#define PT_F2			0x0610
  18.179 -#define PT_F3			0x0620
  18.180 -#define PT_F4			0x0630
  18.181 -#define PT_F5			0x0640
  18.182 -#define PT_F10			0x0650
  18.183 -#define PT_F11			0x0660
  18.184 -#define PT_F12			0x0670
  18.185 -#define PT_F13			0x0680
  18.186 -#define PT_F14			0x0690
  18.187 -#define PT_F15			0x06a0
  18.188 -#define PT_F16			0x06b0
  18.189 -#define PT_F17			0x06c0
  18.190 -#define PT_F18			0x06d0
  18.191 -#define PT_F19			0x06e0
  18.192 -#define PT_F20			0x06f0
  18.193 -#define PT_F21			0x0700
  18.194 -#define PT_F22			0x0710
  18.195 -#define PT_F23			0x0720
  18.196 -#define PT_F24			0x0730
  18.197 -#define PT_F25			0x0740
  18.198 -#define PT_F26			0x0750
  18.199 -#define PT_F27			0x0760
  18.200 -#define PT_F28			0x0770
  18.201 -#define PT_F29			0x0780
  18.202 -#define PT_F30			0x0790
  18.203 -#define PT_F31			0x07a0
  18.204 -#define PT_R4			0x07b0
  18.205 -#define PT_R5			0x07b8
  18.206 -#define PT_R6			0x07c0
  18.207 -#define PT_R7			0x07c8
  18.208 -
  18.209 -#define PT_B1			0x07d8
  18.210 -#define PT_B2			0x07e0
  18.211 -#define PT_B3			0x07e8
  18.212 -#define PT_B4			0x07f0
  18.213 -#define PT_B5			0x07f8
  18.214 -
  18.215 -#define PT_AR_EC		0x0800
  18.216 -#define PT_AR_LC		0x0808
  18.217 -
  18.218 -#define PT_CR_IPSR		0x0830
  18.219 -#define PT_CR_IIP		0x0838
  18.220 -#define PT_CFM			0x0840
  18.221 -#define PT_AR_UNAT		0x0848
  18.222 -#define PT_AR_PFS		0x0850
  18.223 -#define PT_AR_RSC		0x0858
  18.224 -#define PT_AR_RNAT		0x0860
  18.225 -#define PT_AR_BSPSTORE		0x0868
  18.226 -#define PT_PR			0x0870
  18.227 -#define PT_B6			0x0878
  18.228 -#define PT_AR_BSP		0x0880	/* note: this points to the *end* of the backing store! */
  18.229 -#define PT_R1			0x0888
  18.230 -#define PT_R2			0x0890
  18.231 -#define PT_R3			0x0898
  18.232 -#define PT_R12			0x08a0
  18.233 -#define PT_R13			0x08a8
  18.234 -#define PT_R14			0x08b0
  18.235 -#define PT_R15			0x08b8
  18.236 -#define PT_R8 			0x08c0
  18.237 -#define PT_R9			0x08c8
  18.238 -#define PT_R10			0x08d0
  18.239 -#define PT_R11			0x08d8
  18.240 -#define PT_R16			0x08e0
  18.241 -#define PT_R17			0x08e8
  18.242 -#define PT_R18			0x08f0
  18.243 -#define PT_R19			0x08f8
  18.244 -#define PT_R20			0x0900
  18.245 -#define PT_R21			0x0908
  18.246 -#define PT_R22			0x0910
  18.247 -#define PT_R23			0x0918
  18.248 -#define PT_R24			0x0920
  18.249 -#define PT_R25			0x0928
  18.250 -#define PT_R26			0x0930
  18.251 -#define PT_R27			0x0938
  18.252 -#define PT_R28			0x0940
  18.253 -#define PT_R29			0x0948
  18.254 -#define PT_R30			0x0950
  18.255 -#define PT_R31			0x0958
  18.256 -#define PT_AR_CCV		0x0960
  18.257 -#define PT_AR_FPSR		0x0968
  18.258 -#define PT_B0			0x0970
  18.259 -#define PT_B7			0x0978
  18.260 -#define PT_F6			0x0980
  18.261 -#define PT_F7			0x0990
  18.262 -#define PT_F8			0x09a0
  18.263 -#define PT_F9			0x09b0
  18.264 -#define PT_AR_CSD		0x09c0
  18.265 -#define PT_AR_SSD		0x09c8
  18.266 -
  18.267 -#define PT_DBR			0x2000	/* data breakpoint registers */
  18.268 -#define PT_IBR			0x3000	/* instruction breakpoint registers */
  18.269 -#define PT_PMD			0x4000	/* performance monitoring counters */
  18.270 -
  18.271 -#endif /* _ASM_IA64_PTRACE_OFFSETS_H */
    19.1 --- a/xen/include/asm-ia64/linux/asm/rwsem.h	Fri Mar 17 15:37:28 2006 -0700
    19.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.3 @@ -1,188 +0,0 @@
    19.4 -/*
    19.5 - * asm-ia64/rwsem.h: R/W semaphores for ia64
    19.6 - *
    19.7 - * Copyright (C) 2003 Ken Chen <kenneth.w.chen@intel.com>
    19.8 - * Copyright (C) 2003 Asit Mallick <asit.k.mallick@intel.com>
    19.9 - *
   19.10 - * Based on asm-i386/rwsem.h and other architecture implementation.
   19.11 - *
   19.12 - * The MSW of the count is the negated number of active writers and
   19.13 - * waiting lockers, and the LSW is the total number of active locks.
   19.14 - *
   19.15 - * The lock count is initialized to 0 (no active and no waiting lockers).
   19.16 - *
   19.17 - * When a writer subtracts WRITE_BIAS, it'll get 0xffff0001 for the case
   19.18 - * of an uncontended lock. Readers increment by 1 and see a positive value
   19.19 - * when uncontended, negative if there are writers (and maybe) readers
   19.20 - * waiting (in which case it goes to sleep).
   19.21 - */
   19.22 -
   19.23 -#ifndef _ASM_IA64_RWSEM_H
   19.24 -#define _ASM_IA64_RWSEM_H
   19.25 -
   19.26 -#include <linux/list.h>
   19.27 -#include <linux/spinlock.h>
   19.28 -
   19.29 -#include <asm/intrinsics.h>
   19.30 -
   19.31 -/*
   19.32 - * the semaphore definition
   19.33 - */
   19.34 -struct rw_semaphore {
   19.35 -	signed int		count;
   19.36 -	spinlock_t		wait_lock;
   19.37 -	struct list_head	wait_list;
   19.38 -#if RWSEM_DEBUG
   19.39 -	int			debug;
   19.40 -#endif
   19.41 -};
   19.42 -
   19.43 -#define RWSEM_UNLOCKED_VALUE		0x00000000
   19.44 -#define RWSEM_ACTIVE_BIAS		0x00000001
   19.45 -#define RWSEM_ACTIVE_MASK		0x0000ffff
   19.46 -#define RWSEM_WAITING_BIAS		(-0x00010000)
   19.47 -#define RWSEM_ACTIVE_READ_BIAS		RWSEM_ACTIVE_BIAS
   19.48 -#define RWSEM_ACTIVE_WRITE_BIAS		(RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)
   19.49 -
   19.50 -/*
   19.51 - * initialization
   19.52 - */
   19.53 -#if RWSEM_DEBUG
   19.54 -#define __RWSEM_DEBUG_INIT      , 0
   19.55 -#else
   19.56 -#define __RWSEM_DEBUG_INIT	/* */
   19.57 -#endif
   19.58 -
   19.59 -#define __RWSEM_INITIALIZER(name) \
   19.60 -	{ RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, \
   19.61 -	  LIST_HEAD_INIT((name).wait_list) \
   19.62 -	  __RWSEM_DEBUG_INIT }
   19.63 -
   19.64 -#define DECLARE_RWSEM(name) \
   19.65 -	struct rw_semaphore name = __RWSEM_INITIALIZER(name)
   19.66 -
   19.67 -extern struct rw_semaphore *rwsem_down_read_failed(struct rw_semaphore *sem);
   19.68 -extern struct rw_semaphore *rwsem_down_write_failed(struct rw_semaphore *sem);
   19.69 -extern struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem);
   19.70 -extern struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *sem);
   19.71 -
   19.72 -static inline void
   19.73 -init_rwsem (struct rw_semaphore *sem)
   19.74 -{
   19.75 -	sem->count = RWSEM_UNLOCKED_VALUE;
   19.76 -	spin_lock_init(&sem->wait_lock);
   19.77 -	INIT_LIST_HEAD(&sem->wait_list);
   19.78 -#if RWSEM_DEBUG
   19.79 -	sem->debug = 0;
   19.80 -#endif
   19.81 -}
   19.82 -
   19.83 -/*
   19.84 - * lock for reading
   19.85 - */
   19.86 -static inline void
   19.87 -__down_read (struct rw_semaphore *sem)
   19.88 -{
   19.89 -	int result = ia64_fetchadd4_acq((unsigned int *)&sem->count, 1);
   19.90 -
   19.91 -	if (result < 0)
   19.92 -		rwsem_down_read_failed(sem);
   19.93 -}
   19.94 -
   19.95 -/*
   19.96 - * lock for writing
   19.97 - */
   19.98 -static inline void
   19.99 -__down_write (struct rw_semaphore *sem)
  19.100 -{
  19.101 -	int old, new;
  19.102 -
  19.103 -	do {
  19.104 -		old = sem->count;
  19.105 -		new = old + RWSEM_ACTIVE_WRITE_BIAS;
  19.106 -	} while (cmpxchg_acq(&sem->count, old, new) != old);
  19.107 -
  19.108 -	if (old != 0)
  19.109 -		rwsem_down_write_failed(sem);
  19.110 -}
  19.111 -
  19.112 -/*
  19.113 - * unlock after reading
  19.114 - */
  19.115 -static inline void
  19.116 -__up_read (struct rw_semaphore *sem)
  19.117 -{
  19.118 -	int result = ia64_fetchadd4_rel((unsigned int *)&sem->count, -1);
  19.119 -
  19.120 -	if (result < 0 && (--result & RWSEM_ACTIVE_MASK) == 0)
  19.121 -		rwsem_wake(sem);
  19.122 -}
  19.123 -
  19.124 -/*
  19.125 - * unlock after writing
  19.126 - */
  19.127 -static inline void
  19.128 -__up_write (struct rw_semaphore *sem)
  19.129 -{
  19.130 -	int old, new;
  19.131 -
  19.132 -	do {
  19.133 -		old = sem->count;
  19.134 -		new = old - RWSEM_ACTIVE_WRITE_BIAS;
  19.135 -	} while (cmpxchg_rel(&sem->count, old, new) != old);
  19.136 -
  19.137 -	if (new < 0 && (new & RWSEM_ACTIVE_MASK) == 0)
  19.138 -		rwsem_wake(sem);
  19.139 -}
  19.140 -
  19.141 -/*
  19.142 - * trylock for reading -- returns 1 if successful, 0 if contention
  19.143 - */
  19.144 -static inline int
  19.145 -__down_read_trylock (struct rw_semaphore *sem)
  19.146 -{
  19.147 -	int tmp;
  19.148 -	while ((tmp = sem->count) >= 0) {
  19.149 -		if (tmp == cmpxchg_acq(&sem->count, tmp, tmp+1)) {
  19.150 -			return 1;
  19.151 -		}
  19.152 -	}
  19.153 -	return 0;
  19.154 -}
  19.155 -
  19.156 -/*
  19.157 - * trylock for writing -- returns 1 if successful, 0 if contention
  19.158 - */
  19.159 -static inline int
  19.160 -__down_write_trylock (struct rw_semaphore *sem)
  19.161 -{
  19.162 -	int tmp = cmpxchg_acq(&sem->count, RWSEM_UNLOCKED_VALUE,
  19.163 -			      RWSEM_ACTIVE_WRITE_BIAS);
  19.164 -	return tmp == RWSEM_UNLOCKED_VALUE;
  19.165 -}
  19.166 -
  19.167 -/*
  19.168 - * downgrade write lock to read lock
  19.169 - */
  19.170 -static inline void
  19.171 -__downgrade_write (struct rw_semaphore *sem)
  19.172 -{
  19.173 -	int old, new;
  19.174 -
  19.175 -	do {
  19.176 -		old = sem->count;
  19.177 -		new = old - RWSEM_WAITING_BIAS;
  19.178 -	} while (cmpxchg_rel(&sem->count, old, new) != old);
  19.179 -
  19.180 -	if (old < 0)
  19.181 -		rwsem_downgrade_wake(sem);
  19.182 -}
  19.183 -
  19.184 -/*
  19.185 - * Implement atomic add functionality.  These used to be "inline" functions, but GCC v3.1
  19.186 - * doesn't quite optimize this stuff right and ends up with bad calls to fetchandadd.
  19.187 - */
  19.188 -#define rwsem_atomic_add(delta, sem)	atomic_add(delta, (atomic_t *)(&(sem)->count))
  19.189 -#define rwsem_atomic_update(delta, sem)	atomic_add_return(delta, (atomic_t *)(&(sem)->count))
  19.190 -
  19.191 -#endif /* _ASM_IA64_RWSEM_H */
    20.1 --- a/xen/include/asm-ia64/linux/asm/semaphore.h	Fri Mar 17 15:37:28 2006 -0700
    20.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    20.3 @@ -1,102 +0,0 @@
    20.4 -#ifndef _ASM_IA64_SEMAPHORE_H
    20.5 -#define _ASM_IA64_SEMAPHORE_H
    20.6 -
    20.7 -/*
    20.8 - * Copyright (C) 1998-2000 Hewlett-Packard Co
    20.9 - * Copyright (C) 1998-2000 David Mosberger-Tang <davidm@hpl.hp.com>
   20.10 - */
   20.11 -
   20.12 -#include <linux/wait.h>
   20.13 -#include <linux/rwsem.h>
   20.14 -
   20.15 -#include <asm/atomic.h>
   20.16 -
   20.17 -struct semaphore {
   20.18 -	atomic_t count;
   20.19 -	int sleepers;
   20.20 -	wait_queue_head_t wait;
   20.21 -};
   20.22 -
   20.23 -#define __SEMAPHORE_INITIALIZER(name, n)				\
   20.24 -{									\
   20.25 -	.count		= ATOMIC_INIT(n),				\
   20.26 -	.sleepers	= 0,						\
   20.27 -	.wait		= __WAIT_QUEUE_HEAD_INITIALIZER((name).wait)	\
   20.28 -}
   20.29 -
   20.30 -#define __MUTEX_INITIALIZER(name)	__SEMAPHORE_INITIALIZER(name,1)
   20.31 -
   20.32 -#define __DECLARE_SEMAPHORE_GENERIC(name,count)					\
   20.33 -	struct semaphore name = __SEMAPHORE_INITIALIZER(name, count)
   20.34 -
   20.35 -#define DECLARE_MUTEX(name)		__DECLARE_SEMAPHORE_GENERIC(name, 1)
   20.36 -#define DECLARE_MUTEX_LOCKED(name)	__DECLARE_SEMAPHORE_GENERIC(name, 0)
   20.37 -
   20.38 -static inline void
   20.39 -sema_init (struct semaphore *sem, int val)
   20.40 -{
   20.41 -	*sem = (struct semaphore) __SEMAPHORE_INITIALIZER(*sem, val);
   20.42 -}
   20.43 -
   20.44 -static inline void
   20.45 -init_MUTEX (struct semaphore *sem)
   20.46 -{
   20.47 -	sema_init(sem, 1);
   20.48 -}
   20.49 -
   20.50 -static inline void
   20.51 -init_MUTEX_LOCKED (struct semaphore *sem)
   20.52 -{
   20.53 -	sema_init(sem, 0);
   20.54 -}
   20.55 -
   20.56 -extern void __down (struct semaphore * sem);
   20.57 -extern int  __down_interruptible (struct semaphore * sem);
   20.58 -extern int  __down_trylock (struct semaphore * sem);
   20.59 -extern void __up (struct semaphore * sem);
   20.60 -
   20.61 -/*
   20.62 - * Atomically decrement the semaphore's count.  If it goes negative,
   20.63 - * block the calling thread in the TASK_UNINTERRUPTIBLE state.
   20.64 - */
   20.65 -static inline void
   20.66 -down (struct semaphore *sem)
   20.67 -{
   20.68 -	might_sleep();
   20.69 -	if (atomic_dec_return(&sem->count) < 0)
   20.70 -		__down(sem);
   20.71 -}
   20.72 -
   20.73 -/*
   20.74 - * Atomically decrement the semaphore's count.  If it goes negative,
   20.75 - * block the calling thread in the TASK_INTERRUPTIBLE state.
   20.76 - */
   20.77 -static inline int
   20.78 -down_interruptible (struct semaphore * sem)
   20.79 -{
   20.80 -	int ret = 0;
   20.81 -
   20.82 -	might_sleep();
   20.83 -	if (atomic_dec_return(&sem->count) < 0)
   20.84 -		ret = __down_interruptible(sem);
   20.85 -	return ret;
   20.86 -}
   20.87 -
   20.88 -static inline int
   20.89 -down_trylock (struct semaphore *sem)
   20.90 -{
   20.91 -	int ret = 0;
   20.92 -
   20.93 -	if (atomic_dec_return(&sem->count) < 0)
   20.94 -		ret = __down_trylock(sem);
   20.95 -	return ret;
   20.96 -}
   20.97 -
   20.98 -static inline void
   20.99 -up (struct semaphore * sem)
  20.100 -{
  20.101 -	if (atomic_inc_return(&sem->count) <= 0)
  20.102 -		__up(sem);
  20.103 -}
  20.104 -
  20.105 -#endif /* _ASM_IA64_SEMAPHORE_H */
    21.1 --- a/xen/include/asm-ia64/linux/asm/ustack.h	Fri Mar 17 15:37:28 2006 -0700
    21.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    21.3 @@ -1,16 +0,0 @@
    21.4 -#ifndef _ASM_IA64_USTACK_H
    21.5 -#define _ASM_IA64_USTACK_H
    21.6 -
    21.7 -/*
    21.8 - * Constants for the user stack size
    21.9 - */
   21.10 -
   21.11 -#include <asm/page.h>
   21.12 -
   21.13 -/* The absolute hard limit for stack size is 1/2 of the mappable space in the region */
   21.14 -#define MAX_USER_STACK_SIZE	(RGN_MAP_LIMIT/2)
   21.15 -/* Make a default stack size of 2GB */
   21.16 -#define DEFAULT_USER_STACK_SIZE	(1UL << 31)
   21.17 -#define STACK_TOP		(0x6000000000000000UL + RGN_MAP_LIMIT)
   21.18 -
   21.19 -#endif /* _ASM_IA64_USTACK_H */
    22.1 --- a/xen/include/asm-ia64/linux/dma-mapping.h	Fri Mar 17 15:37:28 2006 -0700
    22.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    22.3 @@ -1,61 +0,0 @@
    22.4 -#ifndef _ASM_LINUX_DMA_MAPPING_H
    22.5 -#define _ASM_LINUX_DMA_MAPPING_H
    22.6 -
    22.7 -#include <linux/device.h>
    22.8 -#include <linux/err.h>
    22.9 -
   22.10 -/* These definitions mirror those in pci.h, so they can be used
   22.11 - * interchangeably with their PCI_ counterparts */
   22.12 -enum dma_data_direction {
   22.13 -	DMA_BIDIRECTIONAL = 0,
   22.14 -	DMA_TO_DEVICE = 1,
   22.15 -	DMA_FROM_DEVICE = 2,
   22.16 -	DMA_NONE = 3,
   22.17 -};
   22.18 -
   22.19 -#define DMA_64BIT_MASK	0xffffffffffffffffULL
   22.20 -#define DMA_40BIT_MASK	0x000000ffffffffffULL
   22.21 -#define DMA_39BIT_MASK	0x0000007fffffffffULL
   22.22 -#define DMA_32BIT_MASK	0x00000000ffffffffULL
   22.23 -#define DMA_31BIT_MASK	0x000000007fffffffULL
   22.24 -#define DMA_30BIT_MASK	0x000000003fffffffULL
   22.25 -#define DMA_29BIT_MASK	0x000000001fffffffULL
   22.26 -
   22.27 -#include <asm/dma-mapping.h>
   22.28 -
   22.29 -/* Backwards compat, remove in 2.7.x */
   22.30 -#define dma_sync_single		dma_sync_single_for_cpu
   22.31 -#define dma_sync_sg		dma_sync_sg_for_cpu
   22.32 -
   22.33 -extern u64 dma_get_required_mask(struct device *dev);
   22.34 -
   22.35 -/* flags for the coherent memory api */
   22.36 -#define	DMA_MEMORY_MAP			0x01
   22.37 -#define DMA_MEMORY_IO			0x02
   22.38 -#define DMA_MEMORY_INCLUDES_CHILDREN	0x04
   22.39 -#define DMA_MEMORY_EXCLUSIVE		0x08
   22.40 -
   22.41 -#ifndef ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY
   22.42 -static inline int
   22.43 -dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
   22.44 -			    dma_addr_t device_addr, size_t size, int flags)
   22.45 -{
   22.46 -	return 0;
   22.47 -}
   22.48 -
   22.49 -static inline void
   22.50 -dma_release_declared_memory(struct device *dev)
   22.51 -{
   22.52 -}
   22.53 -
   22.54 -static inline void *
   22.55 -dma_mark_declared_memory_occupied(struct device *dev,
   22.56 -				  dma_addr_t device_addr, size_t size)
   22.57 -{
   22.58 -	return ERR_PTR(-EBUSY);
   22.59 -}
   22.60 -#endif
   22.61 -
   22.62 -#endif
   22.63 -
   22.64 -
    23.1 --- a/xen/include/asm-ia64/linux/err.h	Fri Mar 17 15:37:28 2006 -0700
    23.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    23.3 @@ -1,33 +0,0 @@
    23.4 -#ifndef _LINUX_ERR_H
    23.5 -#define _LINUX_ERR_H
    23.6 -
    23.7 -#include <linux/compiler.h>
    23.8 -
    23.9 -#include <asm/errno.h>
   23.10 -
   23.11 -/*
   23.12 - * Kernel pointers have redundant information, so we can use a
   23.13 - * scheme where we can return either an error code or a dentry
   23.14 - * pointer with the same return value.
   23.15 - *
   23.16 - * This should be a per-architecture thing, to allow different
   23.17 - * error and pointer decisions.
   23.18 - */
   23.19 -#define IS_ERR_VALUE(x) unlikely((x) > (unsigned long)-1000L)
   23.20 -
   23.21 -static inline void *ERR_PTR(long error)
   23.22 -{
   23.23 -	return (void *) error;
   23.24 -}
   23.25 -
   23.26 -static inline long PTR_ERR(const void *ptr)
   23.27 -{
   23.28 -	return (long) ptr;
   23.29 -}
   23.30 -
   23.31 -static inline long IS_ERR(const void *ptr)
   23.32 -{
   23.33 -	return IS_ERR_VALUE((unsigned long)ptr);
   23.34 -}
   23.35 -
   23.36 -#endif /* _LINUX_ERR_H */
    24.1 --- a/xen/include/asm-ia64/linux/rwsem.h	Fri Mar 17 15:37:28 2006 -0700
    24.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    24.3 @@ -1,115 +0,0 @@
    24.4 -/* rwsem.h: R/W semaphores, public interface
    24.5 - *
    24.6 - * Written by David Howells (dhowells@redhat.com).
    24.7 - * Derived from asm-i386/semaphore.h
    24.8 - */
    24.9 -
   24.10 -#ifndef _LINUX_RWSEM_H
   24.11 -#define _LINUX_RWSEM_H
   24.12 -
   24.13 -#include <linux/linkage.h>
   24.14 -
   24.15 -#define RWSEM_DEBUG 0
   24.16 -
   24.17 -#ifdef __KERNEL__
   24.18 -
   24.19 -#include <linux/config.h>
   24.20 -#include <linux/types.h>
   24.21 -#include <linux/kernel.h>
   24.22 -#include <asm/system.h>
   24.23 -#include <asm/atomic.h>
   24.24 -
   24.25 -struct rw_semaphore;
   24.26 -
   24.27 -#ifdef CONFIG_RWSEM_GENERIC_SPINLOCK
   24.28 -#include <linux/rwsem-spinlock.h> /* use a generic implementation */
   24.29 -#else
   24.30 -#include <asm/rwsem.h> /* use an arch-specific implementation */
   24.31 -#endif
   24.32 -
   24.33 -#ifndef rwsemtrace
   24.34 -#if RWSEM_DEBUG
   24.35 -extern void FASTCALL(rwsemtrace(struct rw_semaphore *sem, const char *str));
   24.36 -#else
   24.37 -#define rwsemtrace(SEM,FMT)
   24.38 -#endif
   24.39 -#endif
   24.40 -
   24.41 -/*
   24.42 - * lock for reading
   24.43 - */
   24.44 -static inline void down_read(struct rw_semaphore *sem)
   24.45 -{
   24.46 -	might_sleep();
   24.47 -	rwsemtrace(sem,"Entering down_read");
   24.48 -	__down_read(sem);
   24.49 -	rwsemtrace(sem,"Leaving down_read");
   24.50 -}
   24.51 -
   24.52 -/*
   24.53 - * trylock for reading -- returns 1 if successful, 0 if contention
   24.54 - */
   24.55 -static inline int down_read_trylock(struct rw_semaphore *sem)
   24.56 -{
   24.57 -	int ret;
   24.58 -	rwsemtrace(sem,"Entering down_read_trylock");
   24.59 -	ret = __down_read_trylock(sem);
   24.60 -	rwsemtrace(sem,"Leaving down_read_trylock");
   24.61 -	return ret;
   24.62 -}
   24.63 -
   24.64 -/*
   24.65 - * lock for writing
   24.66 - */
   24.67 -static inline void down_write(struct rw_semaphore *sem)
   24.68 -{
   24.69 -	might_sleep();
   24.70 -	rwsemtrace(sem,"Entering down_write");
   24.71 -	__down_write(sem);
   24.72 -	rwsemtrace(sem,"Leaving down_write");
   24.73 -}
   24.74 -
   24.75 -/*
   24.76 - * trylock for writing -- returns 1 if successful, 0 if contention
   24.77 - */
   24.78 -static inline int down_write_trylock(struct rw_semaphore *sem)
   24.79 -{
   24.80 -	int ret;
   24.81 -	rwsemtrace(sem,"Entering down_write_trylock");
   24.82 -	ret = __down_write_trylock(sem);
   24.83 -	rwsemtrace(sem,"Leaving down_write_trylock");
   24.84 -	return ret;
   24.85 -}
   24.86 -
   24.87 -/*
   24.88 - * release a read lock
   24.89 - */
   24.90 -static inline void up_read(struct rw_semaphore *sem)
   24.91 -{
   24.92 -	rwsemtrace(sem,"Entering up_read");
   24.93 -	__up_read(sem);
   24.94 -	rwsemtrace(sem,"Leaving up_read");
   24.95 -}
   24.96 -
   24.97 -/*
   24.98 - * release a write lock
   24.99 - */
  24.100 -static inline void up_write(struct rw_semaphore *sem)
  24.101 -{
  24.102 -	rwsemtrace(sem,"Entering up_write");
  24.103 -	__up_write(sem);
  24.104 -	rwsemtrace(sem,"Leaving up_write");
  24.105 -}
  24.106 -
  24.107 -/*
  24.108 - * downgrade write lock to read lock
  24.109 - */
  24.110 -static inline void downgrade_write(struct rw_semaphore *sem)
  24.111 -{
  24.112 -	rwsemtrace(sem,"Entering downgrade_write");
  24.113 -	__downgrade_write(sem);
  24.114 -	rwsemtrace(sem,"Leaving downgrade_write");
  24.115 -}
  24.116 -
  24.117 -#endif /* __KERNEL__ */
  24.118 -#endif /* _LINUX_RWSEM_H */