[xtensa-cvscommit] linux/include/asm-xtensa a.out.h,1.1.1.1,1.2 assume.h,1.2,1.3 bootparam.h,1.1.1.1

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/xtensa/linux/include/asm-xtensa
In directory sc8-pr-cvs1:/tmp/cvs-serv28561/include/asm-xtensa

Modified Files:
	a.out.h assume.h bootparam.h bugs.h cache.h cpextra.h delay.h 
	div64.h errno.h hardirq.h hdreg.h hw_irq.h ide.h io.h ioctl.h 
	ioctls.h ipc.h ipcbuf.h keyboard.h linux_logo.h machvec.h 
	mmu.h mmu_context.h module.h msgbuf.h page.h pci-bridge.h 
	pci.h pgalloc.h pgtable.h poll.h resource.h scatterlist.h 
	segment.h semaphore-helper.h sembuf.h serial.h shmbuf.h 
	shmparam.h smp.h socket.h spinlock.h system.h 
Log Message:

A bug in assume.h (an incorrect #ifndef argument) prevented it from ever being processed.  This led to some code cleanup so I could automate the detection of other, similar bugs.  Meanwhile, I corrected filename omissions, GPL-statement omissions, and embarassing cut-and-paste errors in Xtensa code we derived from other architectures.

Index: a.out.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/a.out.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** a.out.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- a.out.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 2,5 ****
--- 2,13 ----
  #define __ASM_XTENSA_A_OUT_H

+ /*
+  * include/asm-xtensa/a.out.h
+  *
+  * This file is subject to the terms and conditions of the GNU General
+  * Public License.  See the file "COPYING" in the main directory of
+  * this archive for more details.
+  */
+ 
  struct exec
  {

Index: assume.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/assume.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** assume.h	13 Feb 2003 19:35:06 -0000	1.2
--- assume.h	15 Feb 2003 02:02:40 -0000	1.3
***************
*** 1,4 ****
! #ifndef __ASM_XTENSA_ATOMIC_H
! #define __ASM_XTENSA_ATOMIC_H

  /* 
--- 1,4 ----
! #ifndef __ASM_XTENSA_ASSUME_H
! #define __ASM_XTENSA_ASSUME_H

  /* 
***************
*** 18,21 ****
--- 18,22 ----
  #include <xtensa/config/core.h>
  #include <xtensa/config/system.h>
+ #include <asm/pgtable.h>

***************
*** 56,59 ****
  #endif

! #endif /* __ASM_XTENSA_ATOMIC_H */
--- 57,155 ----
  #endif

+ 
+ /* Verify instruction/data ram/rom and xlmi don't overlay vmalloc space. */
+ 
+ #define __IN_VMALLOC(addr) ( ((addr) >= VMALLOC_START) && ((addr) < VMALLOC_END) )
+ #define __SPAN_VMALLOC(start,end) ( ((start) < VMALLOC_START) && ((end) >= VMALLOC_END) )
+ #define INSIDE_VMALLOC(start,end) \
+ 	( __IN_VMALLOC((start)) || __IN_VMALLOC(end) || __SPAN_VMALLOC((start),(end)) )
+ 
+ #if XCHAL_NUM_INSTROM
+ 
+ # if XCHAL_NUM_INSTROM == 1
+ #  if INSIDE_VMALLOC(XCHAL_INSTROM0_VADDR,XCHAL_INSTROM0_VADDR+XCHAL_INSTROM0_SIZE)
+ #   error vmalloc range conflicts with instrom0
+ #  endif
+ # endif
+ 
+ # if XCHAL_NUM_INSTROM == 2
+ #  if INSIDE_VMALLOC(XCHAL_INSTROM1_VADDR,XCHAL_INSTROM1_VADDR+XCHAL_INSTROM1_SIZE)
+ #   error vmalloc range conflicts with instrom1
+ #  endif
+ # endif
+ 
+ #endif
+ 
+ #if XCHAL_NUM_INSTRAM
+ 
+ # if XCHAL_NUM_INSTRAM == 1
+ #  if INSIDE_VMALLOC(XCHAL_INSTRAM0_VADDR,XCHAL_INSTRAM0_VADDR+XCHAL_INSTRAM0_SIZE)
+ #   error vmalloc range conflicts with instram0
+ #  endif
+ # endif
+ 
+ # if XCHAL_NUM_INSTRAM == 2
+ #  if INSIDE_VMALLOC(XCHAL_INSTRAM1_VADDR,XCHAL_INSTRAM1_VADDR+XCHAL_INSTRAM1_SIZE)
+ #   error vmalloc range conflicts with instram1
+ #  endif
+ # endif
+ 
+ #endif
+ 
+ #if XCHAL_NUM_DATAROM
+ 
+ # if XCHAL_NUM_DATAROM == 1
+ #  if INSIDE_VMALLOC(XCHAL_DATAROM0_VADDR,XCHAL_DATAROM0_VADDR+XCHAL_DATAROM0_SIZE)
+ #   error vmalloc range conflicts with datarom0
+ #  endif
+ # endif
+ 
+ # if XCHAL_NUM_DATAROM == 2
+ #  if INSIDE_VMALLOC(XCHAL_DATAROM1_VADDR,XCHAL_DATAROM1_VADDR+XCHAL_DATAROM1_SIZE)
+ #   error vmalloc range conflicts with datarom1
+ #  endif
+ # endif
+ 
+ #endif
+ 
+ #if XCHAL_NUM_DATARAM
+ 
+ # if XCHAL_NUM_DATARAM == 1
+ #  if INSIDE_VMALLOC(XCHAL_DATARAM0_VADDR,XCHAL_DATARAM0_VADDR+XCHAL_DATARAM0_SIZE)
+ #   error vmalloc range conflicts with dataram0
+ #  endif
+ # endif
+ 
+ # if XCHAL_NUM_DATARAM == 2
+ #  if INSIDE_VMALLOC(XCHAL_DATARAM1_VADDR,XCHAL_DATARAM1_VADDR+XCHAL_DATARAM1_SIZE)
+ #   error vmalloc range conflicts with dataram1
+ #  endif
+ # endif
+ 
+ #endif
+ 
+ #if XCHAL_NUM_XLMI
+ 
+ # if XCHAL_NUM_XLMI == 1
+ #  if INSIDE_VMALLOC(XCHAL_XLMI0_VADDR,XCHAL_XLMI0_VADDR+XCHAL_XLMI0_SIZE)
+ #   error vmalloc range conflicts with xlmi0
+ #  endif
+ # endif
+ 
+ # if XCHAL_NUM_XLMI == 2
+ #  if INSIDE_VMALLOC(XCHAL_XLMI1_VADDR,XCHAL_XLMI1_VADDR+XCHAL_XLMI1_SIZE)
+ #   error vmalloc range conflicts with xlmi1
+ #  endif
+ # endif
+ 
+ #endif
+ 
+ #if (XCHAL_NUM_INSTROM > 2) || \
+     (XCHAL_NUM_INSTRAM > 2) || \
+     (XCHAL_NUM_DATARAM > 2) || \
+     (XCHAL_NUM_DATAROM > 2) || \
+     (XCHAL_NUM_XLMI    > 2)
+ #error Insufficient checks on vmalloc above for more than 2 devices
+ #endif

! #endif /* __ASM_XTENSA_ASSUME_H */

Index: bootparam.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/bootparam.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** bootparam.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- bootparam.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 1,2 ****
--- 1,5 ----
+ #ifndef __ASM_XTENSA_BOOTPARAM_H
+ #define __ASM_XTENSA_BOOTPARAM_H
+ 
  /*
   * include/asm-xtensa/bootparam.h
***************
*** 13,19 ****
   * Author:  Chris Zankel <za...@te..., ch...@za...>
   */
- 
- #ifndef __ASM_XTENSA_BOOTPARAM_H
- #define __ASM_XTENSA_BOOTPARAM_H

  #define BP_VERSION 0x0001
--- 16,19 ----

Index: bugs.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/bugs.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** bugs.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- bugs.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 3,15 ****

  /*
!  * This is included by init/main.c to check for architecture-dependent bugs.
   *
   * Needs:
   *	void check_bugs(void);
   */

- /*
-  * I don't know of any Xtensa Processor bugs yet.
-  */

  #include <asm/processor.h>
--- 3,21 ----

  /*
!  * include/asm-xtensa/bugs.h
!  *
!  * This is included by init/main.c to check for architecture-dependent
!  * bugs.
   *
   * Needs:
   *	void check_bugs(void);
+  *
+  * Xtensa processors don't have any bugs.  :)
+  *
+  * This file is subject to the terms and conditions of the GNU General
+  * Public License.  See the file "COPYING" in the main directory of
+  * this archive for more details.
   */

  #include <asm/processor.h>
***************
*** 18,20 ****
--- 24,27 ----
  {
  }
+ 
  #endif /* __ASM_XTENSA_BUGS_H */

Index: cache.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/cache.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** cache.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- cache.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 1,4 ****
! #ifndef _ASM_CACHE_H
! #define _ASM_CACHE_H

  /*
--- 1,4 ----
! #ifndef __ASM_XTENSA_CACHE_H
! #define __ASM_XTENSA_CACHE_H

  /*
***************
*** 18,20 ****
  #define SMP_CACHE_BYTES		L1_CACHE_BYTES

! #endif /* _ASM_CACHE_H */
--- 18,20 ----
  #define SMP_CACHE_BYTES		L1_CACHE_BYTES

! #endif /* __ASM_XTENSA_CACHE_H */

Index: cpextra.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/cpextra.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cpextra.h	7 Feb 2003 02:03:34 -0000	1.1
--- cpextra.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 1,4 ****
! #ifndef _ASM_CPEXTRA_H
! #define _ASM_CPEXTRA_H

  /*
--- 1,4 ----
! #ifndef __ASM_XTENSA_CPEXTRA_H
! #define __ASM_XTENSA_CPEXTRA_H

  /*
***************
*** 34,36 ****
  			)

! #endif /* _ASM_CPEXTRA_H */
--- 34,36 ----
  			)

! #endif /* __ASM_XTENSA_CPEXTRA_H */

Index: delay.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/delay.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** delay.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- delay.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 1,2 ****
--- 1,5 ----
+ #ifndef __ASM_XTENSA_DELAY_H
+ #define __ASM_XTENSA_DELAY_H
+ 
  /*
   * include/asm-xtensa/delay.h
***************
*** 10,16 ****
   */

- #ifndef _ASM_DELAY_H
- #define _ASM_DELAY_H
- 
  #include <linux/config.h>
  #include <asm/processor.h>
--- 13,16 ----
***************
*** 43,46 ****
  }

! #endif /* _ASM_DELAY_H */

--- 43,46 ----
  }

! #endif /* __ASM_XTENSA_DELAY_H */

Index: div64.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/div64.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** div64.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- div64.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 1,4 ****
! #ifndef __ASM_XTENSA_DIV64
! #define __ASM_XTENSA_DIV64

  /* 
--- 1,4 ----
! #ifndef __ASM_XTENSA_DIV64_H
! #define __ASM_XTENSA_DIV64_H

  /* 
***************
*** 18,20 ****
  	__res; })

! #endif /* __ASM_XTENSA_DIV64 */
--- 18,20 ----
  	__res; })

! #endif /* __ASM_XTENSA_DIV64_H */

Index: errno.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/errno.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** errno.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- errno.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 2,5 ****
--- 2,13 ----
  #define __ASM_XTENSA_ERRNO_H

+ /*
+  * include/asm-xtensa/errno.h
+  *
+  * This file is subject to the terms and conditions of the GNU General
+  * Public License.  See the file "COPYING" in the main directory of
+  * this archive for more details.
+  */
+ 
  #define	EPERM		 1	/* Operation not permitted */
  #define	ENOENT		 2	/* No such file or directory */

Index: hardirq.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/hardirq.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** hardirq.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- hardirq.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 1,4 ****
! #ifndef _ASM_HARDIRQ_H
! #define _ASM_HARDIRQ_H

  /*
--- 1,4 ----
! #ifndef __ASM_XTENSA_HARDIRQ_H
! #define __ASM_XTENSA_HARDIRQ_H

  /*
***************
*** 53,55 ****

  #endif /* CONFIG_SMP */
! #endif /* _ASM_HARDIRQ_H */
--- 53,55 ----

  #endif /* CONFIG_SMP */
! #endif /* __ASM_XTENSA_HARDIRQ_H */

Index: hdreg.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/hdreg.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** hdreg.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- hdreg.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 1,2 ****
--- 1,5 ----
+ #ifndef __ASM_XTENSA_HDREG_H
+ #define __ASM_XTENSA_HDREG_H
+ 
  /*
   *  linux/include/asm-xtensa/hdreg.h
***************
*** 4,10 ****
   *  Copyright (C) 1994-1996  Linus Torvalds & authors
   */
- 
- #ifndef __ASM_XTENSA_HDREG_H
- #define __ASM_XTENSA_HDREG_H

  typedef unsigned int ide_ioreg_t;
--- 7,10 ----

Index: hw_irq.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/hw_irq.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** hw_irq.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- hw_irq.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 1,16 ****
  /*
!  * This file is subject to the terms and conditions of the GNU General Public
!  * License.  See the file "COPYING" in the main directory of this archive
!  * for more details.
   *
!  * Copyright (C) 2000, 2001 by Ralf Baechle
   */
- #ifndef _ASM_HW_IRQ_H
- #define _ASM_HW_IRQ_H

! /* This may not be apropriate for all machines, we'll see ...  */
  static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i)
  {
  }

! #endif /* _ASM_HW_IRQ_H */
--- 1,17 ----
+ #ifndef __ASM_XTENSA_HW_IRQ_H
+ #define __ASM_XTENSA_HW_IRQ_H
+ 
  /*
!  * include/asm-xtensa/hw_irq.h
   *
!  * This file is subject to the terms and conditions of the GNU General
!  * Public License.  See the file "COPYING" in the main directory of
!  * this archive for more details.
   */

! 
  static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i)
  {
  }

! #endif /* __ASM_XTENSA_HW_IRQ_H */

Index: ide.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/ide.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ide.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- ide.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 1,4 ****
  /*
!  *  linux/include/asm-sh/ide.h
   *
   *  Copyright (C) 1994-1996  Linus Torvalds & authors
--- 1,7 ----
+ #ifndef __ASM_XTENSA_IDE_H
+ #define __ASM_XTENSA_IDE_H
+ 
  /*
!  *  linux/include/asm-xtensa/ide.h
   *
   *  Copyright (C) 1994-1996  Linus Torvalds & authors
***************
*** 9,15 ****
   *  In future, Xtensa code.
   */
- 
- #ifndef __ASM_XTENSA_IDE_H
- #define __ASM_XTENSA_IDE_H

  #ifdef __KERNEL__
--- 12,15 ----

Index: io.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/io.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** io.h	8 Jan 2003 23:32:28 -0000	1.2
--- io.h	15 Feb 2003 02:02:40 -0000	1.3
***************
*** 1,2 ****
--- 1,5 ----
+ #ifndef __ASM_XTENSA_IO_H
+ #define __ASM_XTENSA_IO_H
+ 
  /*
   *  linux/include/asm-xtensa/io.h
***************
*** 12,18 ****

  #ifdef __KERNEL__
- #ifndef __ASM_XTENSA_IO_H
- #define __ASM_XTENSA_IO_H
- 
  #include <linux/config.h>
  #include <asm/byteorder.h>
--- 15,18 ----
***************
*** 144,150 ****
  #endif

! 
! 
! #endif
! #endif
--- 144,148 ----
  #endif

+ #endif /* __KERNEL__ */

! #endif /* __ASM_XTENSA_IO_H */

Index: ioctl.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/ioctl.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ioctl.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- ioctl.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 1,9 ****
- /* $Id$
-  *
-  * linux/ioctl.h for Linux by H.H. Bergman.
-  */
- 
  #ifndef __ASM_XTENSA_IOCTL_H
  #define __ASM_XTENSA_IOCTL_H

  /* ioctl command encoding: 32 bits total, command in lower 16 bits,
--- 1,14 ----
  #ifndef __ASM_XTENSA_IOCTL_H
  #define __ASM_XTENSA_IOCTL_H
+ 
+ /*
+  * include/asm-xtensa/ioctl.h
+  *
+  *    by H.H. Bergman
+  *
+  * This file is subject to the terms and conditions of the GNU General
+  * Public License.  See the file "COPYING" in the main directory of
+  * this archive for more details.
+  */

  /* ioctl command encoding: 32 bits total, command in lower 16 bits,

Index: ioctls.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/ioctls.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ioctls.h	13 Sep 2002 22:44:39 -0000	1.2
--- ioctls.h	15 Feb 2003 02:02:40 -0000	1.3
***************
*** 2,5 ****
--- 2,14 ----
  #define __ASM_XTENSA_IOCTLS_H

+ /*
+  * include/asm-xtensa/ioctls.h
+  *
+  * This file is subject to the terms and conditions of the GNU General
+  * Public License.  See the file "COPYING" in the main directory of
+  * this archive for more details.
+  */
+ 
+ 
  #include <asm/ioctl.h>

Index: ipc.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/ipc.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ipc.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- ipc.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 2,10 ****
  #define __ASM_XTENSA_IPC_H

! /* 
!  * These are used to wrap system calls on x86.
   *
!  * See arch/i386/kernel/sys_i386.c for ugly details..
   */
  struct ipc_kludge {
  	struct msgbuf *msgp;
--- 2,16 ----
  #define __ASM_XTENSA_IPC_H

! /*
!  * include/asm-xtensa/ipc.h
   *
!  * These are used to wrap system calls on Xtensa.  See
!  * arch/xtensa/kernel/ipc.c for ugly details..
!  *
!  * This file is subject to the terms and conditions of the GNU General
!  * Public License.  See the file "COPYING" in the main directory of
!  * this archive for more details.
   */
+ 
  struct ipc_kludge {
  	struct msgbuf *msgp;

Index: ipcbuf.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/ipcbuf.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ipcbuf.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- ipcbuf.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 1,7 ****
! #ifndef __ASM_XTENSA_IPCBUF_H__
! #define __ASM_XTENSA_IPCBUF_H__

  /*
!  * The ipc64_perm structure for i386 architecture.
   * Note extra padding because this structure is passed back and forth
   * between kernel and user space.
--- 1,9 ----
! #ifndef __ASM_XTENSA_IPCBUF_H
! #define __ASM_XTENSA_IPCBUF_H

  /*
!  * include/asm-xtensa/ipcbuf.h
!  *
!  * The ipc64_perm structure for the Xtensa architecture.
   * Note extra padding because this structure is passed back and forth
   * between kernel and user space.
***************
*** 10,15 ****
--- 12,22 ----
   * - 32-bit mode_t and seq
   * - 2 miscellaneous 32-bit values
+  *
+  * This file is subject to the terms and conditions of the GNU General
+  * Public License.  See the file "COPYING" in the main directory of
+  * this archive for more details.
   */

+ 
  struct ipc64_perm
  {
***************
*** 27,29 ****
  };

! #endif /* __ASM_XTENSA_IPCBUF_H__ */
--- 34,36 ----
  };

! #endif /* __ASM_XTENSA_IPCBUF_H */

Index: keyboard.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/keyboard.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** keyboard.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- keyboard.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 1,2 ****
--- 1,5 ----
+ #ifndef __ASM_XTENSA_KEYBOARD_H
+ #define __ASM_XTENSA_KEYBOARD_H
+ 
  /*
   *  linux/include/asm-xtensa/keyboard.h
***************
*** 4,10 ****
   */

- #ifndef __ASM_XTENSA_KEYBOARD_H
- #define __ASM_XTENSA_KEYBOARD_H
- 
  #ifdef __KERNEL__

--- 7,10 ----
***************
*** 84,86 ****
  #endif /* __KERNEL__ */

! #endif /* __ASMPPC_KEYBOARD_H */
--- 84,86 ----
  #endif /* __KERNEL__ */

! #endif /* __ASM_XTENSA_KEYBOARD_H */

Index: linux_logo.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/linux_logo.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** linux_logo.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- linux_logo.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 1,5 ****
! /* $Id$
!  * include/asm-Xtensa/linux_logo.h: This is a linux logo
!  *                                to be displayed on boot.
   *
   * Copyright (C) 1996 Larry Ewing (le...@is...)
--- 1,9 ----
! #ifndef __ASM_XTENSA_LINUX_LOGO_H
! #define __ASM_XTENSA_LINUX_LOGO_H
! 
! /*
!  * include/asm-xtensa/linux_logo.h
!  *
!  * This is a linux logo to be displayed on boot.
   *
   * Copyright (C) 1996 Larry Ewing (le...@is...)
***************
*** 17,20 ****
--- 21,28 ----
   * Serial_console ascii image can be any size,
   * but should contain %s to display the version
+  *
+  * This file is subject to the terms and conditions of the GNU General
+  * Public License.  See the file "COPYING" in the main directory of
+  * this archive for more details.
   */

***************
*** 47,48 ****
--- 55,58 ----

  #endif
+ 
+ #endif /* __ASM_XTENSA_LINUX_LOGO_H */

Index: machvec.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/machvec.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** machvec.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- machvec.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 1,13 ****
  /*
   * (Virtual) Mach-Vectors for Xtensa
   *
!  * Copyright (C) 2001 Tensilica, Inc.
   * 
   * Author:  Christian Zankel <za...@te...> <ch...@za...>
-  *
   */
- 
- #ifndef __ASM_XTENSA_MACHVEC_H
- #define __ASM_XTENSA_MACHVEC_H

  #include <linux/config.h>
--- 1,18 ----
+ #ifndef __ASM_XTENSA_MACHVEC_H
+ #define __ASM_XTENSA_MACHVEC_H
+ 
  /*
+  * include/asm-xtensa/machvec.h
+  *
   * (Virtual) Mach-Vectors for Xtensa
   *
!  * This file is subject to the terms and conditions of the GNU General
!  * Public License.  See the file "COPYING" in the main directory of
!  * this archive for more details.
!  *
!  * Copyright (C) 2001 - 2003 Tensilica, Inc.
   * 
   * Author:  Christian Zankel <za...@te...> <ch...@za...>
   */

  #include <linux/config.h>

Index: mmu.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/mmu.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** mmu.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- mmu.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 1,4 ****
! #ifndef __MMU_H
! #define __MMU_H

  /* Default "unsigned long" context */
--- 1,12 ----
! #ifndef __ASM_XTENSA_MMU_H
! #define __ASM_XTENSA_MMU_H
! 
! /*
!  * include/asm-xtensa/mmu.h
!  *
!  * This file is subject to the terms and conditions of the GNU General
!  * Public License.  See the file "COPYING" in the main directory of
!  * this archive for more details.
!  */

  /* Default "unsigned long" context */

Index: mmu_context.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/mmu_context.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mmu_context.h	13 Feb 2003 19:35:06 -0000	1.3
--- mmu_context.h	15 Feb 2003 02:02:40 -0000	1.4
***************
*** 1,4 ****
! #ifndef _ASM_MMU_CONTEXT_H
! #define _ASM_MMU_CONTEXT_H

  /*
--- 1,4 ----
! #ifndef __ASM_XTENSA_MMU_CONTEXT_H
! #define __ASM_XTENSA_MMU_CONTEXT_H

  /*
***************
*** 259,261 ****
  }

! #endif /* _ASM_MMU_CONTEXT_H */
--- 259,261 ----
  }

! #endif /* __ASM_XTENSA_MMU_CONTEXT_H */

Index: module.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/module.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** module.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- module.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 1,4 ****
! #ifndef _ASM_XTENSA_MODULE_H
! #define _ASM_XTENSA_MODULE_H

  /*
--- 1,4 ----
! #ifndef __ASM_XTENSA_MODULE_H
! #define __ASM_XTENSA_MODULE_H

  /*
***************
*** 19,21 ****
  #define arch_init_modules(x)	do { } while (0)

! #endif /* _ASM_XTENSA_MODULE_H */
--- 19,21 ----
  #define arch_init_modules(x)	do { } while (0)

! #endif /* __ASM_XTENSA_MODULE_H */

Index: msgbuf.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/msgbuf.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** msgbuf.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- msgbuf.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 2,7 ****
  #define __ASM_XTENSA_MSGBUF_H

! /* 
!  * The msqid64_ds structure for i386 architecture.
   * Note extra padding because this structure is passed back and forth
   * between kernel and user space.
--- 2,9 ----
  #define __ASM_XTENSA_MSGBUF_H

! /*
!  * include/asm-xtensa/msgbuf.h
!  *
!  * The msqid64_ds structure for the Xtensa architecture.
   * Note extra padding because this structure is passed back and forth
   * between kernel and user space.
***************
*** 10,13 ****
--- 12,19 ----
   * - 64-bit time_t to solve y2038 problem
   * - 2 miscellaneous 32-bit values
+  *
+  * This file is subject to the terms and conditions of the GNU General
+  * Public License.  See the file "COPYING" in the main directory of
+  * this archive for more details.
   */

Index: page.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/page.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** page.h	29 Oct 2002 01:20:33 -0000	1.2
--- page.h	15 Feb 2003 02:02:40 -0000	1.3
***************
*** 1,2 ****
--- 1,5 ----
+ #ifndef __ASM_XTENSA_PAGE_H
+ #define __ASM_XTENSA_PAGE_H
+ 
  /*
   * include/asm-xtensa/page.h
***************
*** 15,21 ****
   */

- #ifndef __ASM_PAGE_H
- #define __ASM_PAGE_H
- 
  #include <xtensa/config/core.h>

--- 18,21 ----
***************
*** 102,104 ****
  #endif /* defined (__KERNEL__) */

! #endif /* __ASM_PAGE_H */
--- 102,104 ----
  #endif /* defined (__KERNEL__) */

! #endif /* __ASM_XTENSA_PAGE_H */

Index: pci-bridge.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/pci-bridge.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** pci-bridge.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- pci-bridge.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 1,8 ****
  /*
!  * BK Id: SCCS/s.pci-bridge.h 1.13 06/05/01 22:20:49 paulus
   */
  #ifdef __KERNEL__
- #ifndef _ASM_PCI_BRIDGE_H
- #define _ASM_PCI_BRIDGE_H

  struct device_node;
--- 1,15 ----
+ #ifndef __ASM_XTENSA_PCI_BRIDGE_H
+ #define __ASM_XTENSA_PCI_BRIDGE_H
+ 
  /*
!  * include/asm-xtensa/pci-bridge.h
!  *
!  * This file is subject to the terms and conditions of the GNU General
!  * Public License.  See the file "COPYING" in the main directory of
!  * this archive for more details.
   */
+ 
+ 
  #ifdef __KERNEL__

  struct device_node;
***************
*** 72,75 ****
  int early_write_config_dword(struct pci_controller *hose, int bus, int dev_fn, int where, u32 val);

- #endif
  #endif /* __KERNEL__ */
--- 79,83 ----
  int early_write_config_dword(struct pci_controller *hose, int bus, int dev_fn, int where, u32 val);

  #endif /* __KERNEL__ */
+ 
+ #endif /* __ASM_XTENSA_PCI_BRIDGE_H */

Index: pci.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/pci.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** pci.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- pci.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 1,2 ****
--- 1,5 ----
+ #ifndef __ASM_XTENSA_PCI_H
+ #define __ASM_XTENSA_PCI_H
+ 
  /*
   *  linux/include/asm-xtensa/pci.h
***************
*** 11,17 ****
   */                                                                             

- #ifndef __ASM_XTENSA_PCI_H
- #define __ASM_XTENSA_PCI_H
- 
  #ifdef __KERNEL__

--- 14,17 ----
***************
*** 210,214 ****
  #endif /* __KERNEL__ */

- 
  #endif /* __ASM_XTENSA_PCI_H */
- 
--- 210,212 ----

Index: pgalloc.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/pgalloc.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** pgalloc.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- pgalloc.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 1,4 ****
! #ifndef _ASM_PGALLOC_H
! #define _ASM_PGALLOC_H

  /*
--- 1,4 ----
! #ifndef __ASM_XTENSA_PGALLOC_H
! #define __ASM_XTENSA_PGALLOC_H

  /*
***************
*** 211,213 ****
  }

! #endif /* _ASM_PGALLOC_H */
--- 211,213 ----
  }

! #endif /* __ASM_XTENSA_PGALLOC_H */

Index: pgtable.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/pgtable.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pgtable.h	13 Feb 2003 19:35:06 -0000	1.6
--- pgtable.h	15 Feb 2003 02:02:40 -0000	1.7
***************
*** 1,4 ****
! #ifndef _ASM_PGTABLE_H
! #define _ASM_PGTABLE_H

  /*
--- 1,4 ----
! #ifndef __ASM_XTENSA_PGTABLE_H
! #define __ASM_XTENSA_PGTABLE_H

  /*
***************
*** 773,775 ****
  #define pgtable_cache_init()	do { } while (0)

! #endif /* _ASM_PGTABLE_H */
--- 773,775 ----
  #define pgtable_cache_init()	do { } while (0)

! #endif /* __ASM_XTENSA_PGTABLE_H */

Index: poll.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/poll.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** poll.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- poll.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 2,5 ****
--- 2,14 ----
  #define __ASM_XTENSA_POLL_H

+ /*
+  * include/asm-xtensa/poll.h
+  *
+  * This file is subject to the terms and conditions of the GNU General
+  * Public License.  See the file "COPYING" in the main directory of
+  * this archive for more details.
+  */
+ 
+ 
  #define POLLIN		0x0001
  #define POLLPRI		0x0002

Index: resource.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/resource.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** resource.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- resource.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 1,4 ****
! #ifndef _ASM_RESOURCE_H
! #define _ASM_RESOURCE_H

  /*
--- 1,4 ----
! #ifndef __ASM_XTENSA_RESOURCE_H
! #define __ASM_XTENSA_RESOURCE_H

  /*
***************
*** 57,59 ****
  #endif /* __KERNEL__ */

! #endif /* _ASM_RESOURCE_H */
--- 57,59 ----
  #endif /* __KERNEL__ */

! #endif /* __ASM_XTENSA_RESOURCE_H */

Index: scatterlist.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/scatterlist.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** scatterlist.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- scatterlist.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 2,5 ****
--- 2,14 ----
  #define __ASM_XTENSA_SCATTERLIST_H

+ /*
+  * include/asm-xtensa/scatterlist.h
+  *
+  * This file is subject to the terms and conditions of the GNU General
+  * Public License.  See the file "COPYING" in the main directory of
+  * this archive for more details.
+  */
+ 
+ 
  struct scatterlist {
      char *  address;    /* Location data is to be transferred to */

Index: segment.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/segment.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** segment.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- segment.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 1,6 ****
! #ifndef _ASM_XTENSA_SEGMENT_H
! #define _ASM_XTENSA_SEGMENT_H

  /* Only here because we have some old header files that expect it.. */

! #endif /* _ASM_XTENSA_SEGMENT_H */
--- 1,15 ----
! #ifndef __ASM_XTENSA_SEGMENT_H
! #define __ASM_XTENSA_SEGMENT_H
! 
! /*
!  * include/asm-xtensa/segment.h
!  *
!  * This file is subject to the terms and conditions of the GNU General
!  * Public License.  See the file "COPYING" in the main directory of
!  * this archive for more details.
!  */
! 

  /* Only here because we have some old header files that expect it.. */

! #endif

Index: semaphore-helper.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/semaphore-helper.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** semaphore-helper.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- semaphore-helper.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 1,4 ****
! #ifndef __ASM_SH_SEMAPHORE_HELPER_H
! #define __ASM_SH_SEMAPHORE_HELPER_H

  /*
--- 1,4 ----
! #ifndef __ASM_XTENSA_SEMAPHORE_HELPER_H
! #define __ASM_XTENSA_SEMAPHORE_HELPER_H

  /*
***************
*** 92,94 ****
  }

! #endif /* __ASM_SH_SEMAPHORE_HELPER_H */
--- 92,94 ----
  }

! #endif /* __ASM_XTENSA_SEMAPHORE_HELPER_H */

Index: sembuf.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/sembuf.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** sembuf.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- sembuf.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 2,7 ****
  #define __ASM_XTENSA_SEMBUF_H

! /* 
!  * The semid64_ds structure for i386 architecture.
   * Note extra padding because this structure is passed back and forth
   * between kernel and user space.
--- 2,9 ----
  #define __ASM_XTENSA_SEMBUF_H

! /*
!  * include/asm-xtensa/sembuf.h
!  *
!  * The semid64_ds structure for Xtensa architecture.
   * Note extra padding because this structure is passed back and forth
   * between kernel and user space.
***************
*** 10,14 ****
--- 12,21 ----
   * - 64-bit time_t to solve y2038 problem
   * - 2 miscellaneous 32-bit values
+  *
+  * This file is subject to the terms and conditions of the GNU General
+  * Public License.  See the file "COPYING" in the main directory of
+  * this archive for more details.
   */
+ 

  struct semid64_ds {

Index: serial.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/serial.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** serial.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- serial.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 1,2 ****
--- 1,5 ----
+ #ifndef __ASM_XTENSA_SERIAL_H
+ #define __ASM_XTENSA_SERIAL_H
+ 
  /*
   * include/asm-xtensa/serial.h
***************
*** 5,12 ****
   */

- #ifndef _ASM_SERIAL_H
- #define _ASM_SERIAL_H
- 
  #include <asm/platform/serial.h>

! #endif /* _ASM_SERIAL_H */
--- 8,12 ----
   */

  #include <asm/platform/serial.h>

! #endif /* __ASM_XTENSA_SERIAL_H */

Index: shmbuf.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/shmbuf.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** shmbuf.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- shmbuf.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 2,7 ****
  #define __ASM_XTENSA_SHMBUF_H

! /* 
!  * The shmid64_ds structure for i386 architecture.
   * Note extra padding because this structure is passed back and forth
   * between kernel and user space.
--- 2,9 ----
  #define __ASM_XTENSA_SHMBUF_H

! /*
!  * include/asm-xtensa/shmbuf.h
!  *
!  * The shmid64_ds structure for Xtensa architecture.
   * Note extra padding because this structure is passed back and forth
   * between kernel and user space.
***************
*** 10,14 ****
--- 12,21 ----
   * - 64-bit time_t to solve y2038 problem
   * - 2 miscellaneous 32-bit values
+  *
+  * This file is subject to the terms and conditions of the GNU General
+  * Public License.  See the file "COPYING" in the main directory of
+  * this archive for more details.
   */
+ 

  struct shmid64_ds {

Index: shmparam.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/shmparam.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** shmparam.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- shmparam.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 2,5 ****
--- 2,14 ----
  #define __ASM_XTENSA_SHMPARAM_H

+ /*
+  * include/asm-xtensa/shmparam.h
+  *
+  * This file is subject to the terms and conditions of the GNU General
+  * Public License.  See the file "COPYING" in the main directory of
+  * this archive for more details.
+  */
+ 
+ 
  #define	SHMLBA PAGE_SIZE		 /* attach addr a multiple of this */

Index: smp.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/smp.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** smp.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- smp.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 2,5 ****
--- 2,14 ----
  #define __ASM_XTENSA_SMP_H

+ /*
+  * include/asm-xtensa/smp.h
+  *
+  * This file is subject to the terms and conditions of the GNU General
+  * Public License.  See the file "COPYING" in the main directory of
+  * this archive for more details.
+  */
+ 
+ 
  #define cpu_logical_map(cpu)	(cpu)

Index: socket.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/socket.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** socket.h	26 Sep 2002 20:45:16 -0000	1.2
--- socket.h	15 Feb 2003 02:02:40 -0000	1.3
***************
*** 1,4 ****
! #ifndef _ASM_SOCKET_H
! #define _ASM_SOCKET_H

  /*
--- 1,4 ----
! #ifndef __ASM_XTENSA_SOCKET_H
! #define __ASM_XTENSA_SOCKET_H

  /*
***************
*** 72,74 ****
  #endif

! #endif /* _ASM_SOCKET_H */
--- 72,74 ----
  #endif

! #endif /* __ASM_XTENSA_SOCKET_H */

Index: spinlock.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/spinlock.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** spinlock.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- spinlock.h	15 Feb 2003 02:02:40 -0000	1.2
***************
*** 1,6 ****
! #ifndef _ASM_SPINLOCK_H
! #define _ASM_SPINLOCK_H

! #error Xtensa architecture port does not support SMP spin locks

! #endif /* _ASM_SPINLOCK_H */
--- 1,15 ----
! #ifndef __ASM_XTENSA_SPINLOCK_H
! #define __ASM_XTENSA_SPINLOCK_H

! /*
!  * include/asm-xtensa/spinlock.h
!  *
!  * This file is subject to the terms and conditions of the GNU General
!  * Public License.  See the file "COPYING" in the main directory of
!  * this archive for more details.
!  */

! 
! #error Xtensa port does not support SMP spin locks yet
! 
! #endif

Index: system.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/system.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** system.h	13 Feb 2003 18:19:24 -0000	1.2
--- system.h	15 Feb 2003 02:02:40 -0000	1.3
***************
*** 1,4 ****
! #ifndef _ASM_SYSTEM_H
! #define _ASM_SYSTEM_H

  /*
--- 1,4 ----
! #ifndef __ASM_XTENSA_SYSTEM_H
! #define __ASM_XTENSA_SYSTEM_H

  /*
***************
*** 195,197 ****
  	__die_if_kernel(msg, regs, __FILE__ ":"__FUNCTION__, __LINE__)

! #endif /* _ASM_SYSTEM_H */
--- 195,197 ----
  	__die_if_kernel(msg, regs, __FILE__ ":"__FUNCTION__, __LINE__)

! #endif /* __ASM_XTENSA_SYSTEM_H */