10 files changed, 13 insertions, 172 deletions
diff --git a/include/asm-sparc/idprom.h b/include/asm-sparc/idprom.h
index 41adb417a4e..6976aa2439c 100644
--- a/include/asm-sparc/idprom.h
+++ b/include/asm-sparc/idprom.h
@@ -1,7 +1,7 @@
 /*
 * idprom.h: Macros and defines for idprom routines
 *
- * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
+ * Copyright (C) 1995,1996 David S. Miller (davem@caip.rutgers.edu)
 */
 #ifndef _SPARC_IDPROM_H
diff --git a/include/asm-sparc/kmap_types.h b/include/asm-sparc/kmap_types.h
index e215f710497..602f5e034f7 100644
--- a/include/asm-sparc/kmap_types.h
+++ b/include/asm-sparc/kmap_types.h
@@ -1,6 +1,10 @@
 #ifndef _ASM_KMAP_TYPES_H
 #define _ASM_KMAP_TYPES_H
+/* Dummy header just to define km_type.  None of this
+ * is actually used on sparc.  -DaveM
+ */
 enum km_type {
        KM_BOUNCE_READ,
        KM_SKB_SUNRPC_DATA,
diff --git a/include/asm-sparc/spinlock_types.h b/include/asm-sparc/spinlock_types.h
index 0a0fb116c4e..37cbe01c585 100644
--- a/include/asm-sparc/spinlock_types.h
+++ b/include/asm-sparc/spinlock_types.h
@@ -6,7 +6,7 @@
 #endif
 typedef struct {
-        unsigned char lock;
+        volatile unsigned char lock;
 } raw_spinlock_t;
 #define __RAW_SPIN_LOCK_UNLOCKED        { 0 }
diff --git a/include/asm-sparc64/hw_irq.h b/include/asm-sparc64/hw_irq.h
index 8e44a836082..16920a291f5 100644
--- a/include/asm-sparc64/hw_irq.h
+++ b/include/asm-sparc64/hw_irq.h
@@ -1,4 +1 @@
-#ifndef __ASM_SPARC64_HW_IRQ_H
+#include <asm-sparc/hw_irq.h>
-#define __ASM_SPARC64_HW_IRQ_H
-#endif
diff --git a/include/asm-sparc64/idprom.h b/include/asm-sparc64/idprom.h
index a363fa0a112..c22f9c30bc7 100644
--- a/include/asm-sparc64/idprom.h
+++ b/include/asm-sparc64/idprom.h
@@ -1,25 +1 @@
-/*
+#include <asm-sparc/idprom.h>
- * idprom.h: Macros and defines for idprom routines
- *
- * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
- */
-#ifndef _SPARC64_IDPROM_H
-#define _SPARC64_IDPROM_H
-#include <linux/types.h>
-struct idprom {
-        u8              id_format;      /* Format identifier (always 0x01) */
-        u8              id_machtype;    /* Machine type */
-        u8              id_ethaddr[6];  /* Hardware ethernet address */
-        s32             id_date;        /* Date of manufacture */
-        u32             id_sernum:24;   /* Unique serial number */
-        u8              id_cksum;       /* Checksum - xor of the data bytes */
-        u8              reserved[16];
-};
-extern struct idprom *idprom;
-extern void idprom_init(void);
-#endif /* !(_SPARC_IDPROM_H) */
diff --git a/include/asm-sparc64/kmap_types.h b/include/asm-sparc64/kmap_types.h
index 34c1d3d9a3b..276530cf539 100644
--- a/include/asm-sparc64/kmap_types.h
+++ b/include/asm-sparc64/kmap_types.h
@@ -1,25 +1 @@
-#ifndef _ASM_KMAP_TYPES_H
+#include <asm-sparc/kmap_types.h>
-#define _ASM_KMAP_TYPES_H
-/* Dummy header just to define km_type.  None of this
- * is actually used on sparc64.  -DaveM
- */
-enum km_type {
-        KM_BOUNCE_READ,
-        KM_SKB_SUNRPC_DATA,
-        KM_SKB_DATA_SOFTIRQ,
-        KM_USER0,
-        KM_USER1,
-        KM_BIO_SRC_IRQ,
-        KM_BIO_DST_IRQ,
-        KM_PTE0,
-        KM_PTE1,
-        KM_IRQ0,
-        KM_IRQ1,
-        KM_SOFTIRQ0,
-        KM_SOFTIRQ1,
-        KM_TYPE_NR
-};
-#endif
diff --git a/include/asm-sparc64/kvm.h b/include/asm-sparc64/kvm.h
index 380537a77bf..53564ad86b1 100644
--- a/include/asm-sparc64/kvm.h
+++ b/include/asm-sparc64/kvm.h
@@ -1,6 +1 @@
-#ifndef __LINUX_KVM_SPARC64_H
+#include <asm-sparc/kvm.h>
-#define __LINUX_KVM_SPARC64_H
-/* sparc64 does not support KVM */
-#endif
diff --git a/include/asm-sparc64/spinlock_types.h b/include/asm-sparc64/spinlock_types.h
index e128112a0d7..48d81c8734b 100644
--- a/include/asm-sparc64/spinlock_types.h
+++ b/include/asm-sparc64/spinlock_types.h
@@ -1,20 +1 @@
-#ifndef __SPARC64_SPINLOCK_TYPES_H
+#include <asm-sparc/spinlock_types.h>
-#define __SPARC64_SPINLOCK_TYPES_H
-#ifndef __LINUX_SPINLOCK_TYPES_H
-# error "please don't include this file directly"
-#endif
-typedef struct {
-        volatile unsigned char lock;
-} raw_spinlock_t;
-#define __RAW_SPIN_LOCK_UNLOCKED        { 0 }
-typedef struct {
-        volatile unsigned int lock;
-} raw_rwlock_t;
-#define __RAW_RW_LOCK_UNLOCKED          { 0 }
-#endif
diff --git a/include/asm-sparc64/sunbpp.h b/include/asm-sparc64/sunbpp.h
index 8e171b7a9f4..9632be290eb 100644
--- a/include/asm-sparc64/sunbpp.h
+++ b/include/asm-sparc64/sunbpp.h
@@ -1,80 +1 @@
-/*
+#include <asm-sparc/sunbpp.h>
- * include/asm-sparc64/sunbpp.h
- */
-#ifndef _ASM_SPARC64_SUNBPP_H
-#define _ASM_SPARC64_SUNBPP_H
-struct bpp_regs {
-  /* DMA registers */
-  __volatile__ __u32 p_csr;             /* DMA Control/Status Register */
-  __volatile__ __u32 p_addr;            /* Address Register */
-  __volatile__ __u32 p_bcnt;            /* Byte Count Register */
-  __volatile__ __u32 p_tst_csr;         /* Test Control/Status (DMA2 only) */
-  /* Parallel Port registers */
-  __volatile__ __u16 p_hcr;             /* Hardware Configuration Register */
-  __volatile__ __u16 p_ocr;             /* Operation Configuration Register */
-  __volatile__ __u8 p_dr;               /* Parallel Data Register */
-  __volatile__ __u8 p_tcr;              /* Transfer Control Register */
-  __volatile__ __u8 p_or;               /* Output Register */
-  __volatile__ __u8 p_ir;               /* Input Register */
-  __volatile__ __u16 p_icr;             /* Interrupt Control Register */
-};
-/* P_HCR. Time is in increments of SBus clock. */
-#define P_HCR_TEST      0x8000      /* Allows buried counters to be read */
-#define P_HCR_DSW       0x7f00      /* Data strobe width (in ticks) */
-#define P_HCR_DDS       0x007f      /* Data setup before strobe (in ticks) */
-/* P_OCR. */
-#define P_OCR_MEM_CLR   0x8000
-#define P_OCR_DATA_SRC  0x4000      /* )                  */
-#define P_OCR_DS_DSEL   0x2000      /* )  Bidirectional      */
-#define P_OCR_BUSY_DSEL 0x1000      /* )    selects            */
-#define P_OCR_ACK_DSEL  0x0800      /* )                  */
-#define P_OCR_EN_DIAG   0x0400
-#define P_OCR_BUSY_OP   0x0200      /* Busy operation */
-#define P_OCR_ACK_OP    0x0100      /* Ack operation */
-#define P_OCR_SRST      0x0080      /* Reset state machines. Not selfcleaning. */
-#define P_OCR_IDLE      0x0008      /* PP data transfer state machine is idle */
-#define P_OCR_V_ILCK    0x0002      /* Versatec faded. Zebra only. */
-#define P_OCR_EN_VER    0x0001      /* Enable Versatec (0 - enable). Zebra only. */
-/* P_TCR */
-#define P_TCR_DIR       0x08
-#define P_TCR_BUSY      0x04
-#define P_TCR_ACK       0x02
-#define P_TCR_DS        0x01        /* Strobe */
-/* P_OR */
-#define P_OR_V3         0x20        /* )                 */
-#define P_OR_V2         0x10        /* ) on Zebra only   */
-#define P_OR_V1         0x08        /* )                 */
-#define P_OR_INIT       0x04
-#define P_OR_AFXN       0x02        /* Auto Feed */
-#define P_OR_SLCT_IN    0x01
-/* P_IR */
-#define P_IR_PE         0x04
-#define P_IR_SLCT       0x02
-#define P_IR_ERR        0x01
-/* P_ICR */
-#define P_DS_IRQ        0x8000      /* RW1  */
-#define P_ACK_IRQ       0x4000      /* RW1  */
-#define P_BUSY_IRQ      0x2000      /* RW1  */
-#define P_PE_IRQ        0x1000      /* RW1  */
-#define P_SLCT_IRQ      0x0800      /* RW1  */
-#define P_ERR_IRQ       0x0400      /* RW1  */
-#define P_DS_IRQ_EN     0x0200      /* RW   Always on rising edge */
-#define P_ACK_IRQ_EN    0x0100      /* RW   Always on rising edge */
-#define P_BUSY_IRP      0x0080      /* RW   1= rising edge */
-#define P_BUSY_IRQ_EN   0x0040      /* RW   */
-#define P_PE_IRP        0x0020      /* RW   1= rising edge */
-#define P_PE_IRQ_EN     0x0010      /* RW   */
-#define P_SLCT_IRP      0x0008      /* RW   1= rising edge */
-#define P_SLCT_IRQ_EN   0x0004      /* RW   */
-#define P_ERR_IRP       0x0002      /* RW1  1= rising edge */
-#define P_ERR_IRQ_EN    0x0001      /* RW   */
-#endif /* !(_ASM_SPARC64_SUNBPP_H) */
diff --git a/include/asm-sparc64/unaligned.h b/include/asm-sparc64/unaligned.h
index edcebb09441..19fbf9508ac 100644
--- a/include/asm-sparc64/unaligned.h
+++ b/include/asm-sparc64/unaligned.h
@@ -1,10 +1 @@
-#ifndef _ASM_SPARC64_UNALIGNED_H
+#include <asm-sparc/unaligned.h>
-#define _ASM_SPARC64_UNALIGNED_H
-#include <linux/unaligned/be_struct.h>
-#include <linux/unaligned/le_byteshift.h>
-#include <linux/unaligned/generic.h>
-#define get_unaligned   __get_unaligned_be
-#define put_unaligned   __put_unaligned_be
-#endif /* _ASM_SPARC64_UNALIGNED_H */

diff --git a/include/asm-sparc/idprom.h b/include/asm-sparc/idprom.h index 41adb417a4e..6976aa2439c 100644 --- a/include/asm-sparc/idprom.h +++ b/include/asm-sparc/idprom.h
@@ -1,7 +1,7 @@
1	/*	1	/*
2	* idprom.h: Macros and defines for idprom routines	2	* idprom.h: Macros and defines for idprom routines
3	*	3	*
4	* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)	4	* Copyright (C) 1995,1996 David S. Miller (davem@caip.rutgers.edu)
5	*/	5	*/
6		6
7	#ifndef _SPARC_IDPROM_H	7	#ifndef _SPARC_IDPROM_H


diff --git a/include/asm-sparc/kmap_types.h b/include/asm-sparc/kmap_types.h index e215f710497..602f5e034f7 100644 --- a/include/asm-sparc/kmap_types.h +++ b/include/asm-sparc/kmap_types.h
@@ -1,6 +1,10 @@
1	#ifndef _ASM_KMAP_TYPES_H	1	#ifndef _ASM_KMAP_TYPES_H
2	#define _ASM_KMAP_TYPES_H	2	#define _ASM_KMAP_TYPES_H
3		3
		4	/* Dummy header just to define km_type. None of this
		5	* is actually used on sparc. -DaveM
		6	*/
		7
4	enum km_type {	8	enum km_type {
5	KM_BOUNCE_READ,	9	KM_BOUNCE_READ,
6	KM_SKB_SUNRPC_DATA,	10	KM_SKB_SUNRPC_DATA,


diff --git a/include/asm-sparc/spinlock_types.h b/include/asm-sparc/spinlock_types.h index 0a0fb116c4e..37cbe01c585 100644 --- a/include/asm-sparc/spinlock_types.h +++ b/include/asm-sparc/spinlock_types.h
@@ -6,7 +6,7 @@
6	#endif	6	#endif
7		7
8	typedef struct {	8	typedef struct {
9	unsigned char lock;	9	volatile unsigned char lock;
10	} raw_spinlock_t;	10	} raw_spinlock_t;
11		11
12	#define __RAW_SPIN_LOCK_UNLOCKED { 0 }	12	#define __RAW_SPIN_LOCK_UNLOCKED { 0 }


diff --git a/include/asm-sparc64/hw_irq.h b/include/asm-sparc64/hw_irq.h index 8e44a836082..16920a291f5 100644 --- a/include/asm-sparc64/hw_irq.h +++ b/include/asm-sparc64/hw_irq.h
@@ -1,4 +1 @@
1	#ifndef __ASM_SPARC64_HW_IRQ_H		#include <asm-sparc/hw_irq.h>
2	#define __ASM_SPARC64_HW_IRQ_H
3
4	#endif


diff --git a/include/asm-sparc64/idprom.h b/include/asm-sparc64/idprom.h index a363fa0a112..c22f9c30bc7 100644 --- a/include/asm-sparc64/idprom.h +++ b/include/asm-sparc64/idprom.h
@@ -1,25 +1 @@
1	/*		#include <asm-sparc/idprom.h>
2	* idprom.h: Macros and defines for idprom routines
3	*
4	* Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
5	*/
6
7	#ifndef _SPARC64_IDPROM_H
8	#define _SPARC64_IDPROM_H
9
10	#include <linux/types.h>
11
12	struct idprom {
13	u8 id_format; /* Format identifier (always 0x01) */
14	u8 id_machtype; /* Machine type */
15	u8 id_ethaddr[6]; /* Hardware ethernet address */
16	s32 id_date; /* Date of manufacture */
17	u32 id_sernum:24; /* Unique serial number */
18	u8 id_cksum; /* Checksum - xor of the data bytes */
19	u8 reserved[16];
20	};
21
22	extern struct idprom *idprom;
23	extern void idprom_init(void);
24
25	#endif /* !(_SPARC_IDPROM_H) */


diff --git a/include/asm-sparc64/kmap_types.h b/include/asm-sparc64/kmap_types.h index 34c1d3d9a3b..276530cf539 100644 --- a/include/asm-sparc64/kmap_types.h +++ b/include/asm-sparc64/kmap_types.h
@@ -1,25 +1 @@
1	#ifndef _ASM_KMAP_TYPES_H		#include <asm-sparc/kmap_types.h>
2	#define _ASM_KMAP_TYPES_H
3
4	/* Dummy header just to define km_type. None of this
5	* is actually used on sparc64. -DaveM
6	*/
7
8	enum km_type {
9	KM_BOUNCE_READ,
10	KM_SKB_SUNRPC_DATA,
11	KM_SKB_DATA_SOFTIRQ,
12	KM_USER0,
13	KM_USER1,
14	KM_BIO_SRC_IRQ,
15	KM_BIO_DST_IRQ,
16	KM_PTE0,
17	KM_PTE1,
18	KM_IRQ0,
19	KM_IRQ1,
20	KM_SOFTIRQ0,
21	KM_SOFTIRQ1,
22	KM_TYPE_NR
23	};
24
25	#endif


diff --git a/include/asm-sparc64/kvm.h b/include/asm-sparc64/kvm.h index 380537a77bf..53564ad86b1 100644 --- a/include/asm-sparc64/kvm.h +++ b/include/asm-sparc64/kvm.h
@@ -1,6 +1 @@
1	#ifndef __LINUX_KVM_SPARC64_H		#include <asm-sparc/kvm.h>
2	#define __LINUX_KVM_SPARC64_H
3
4	/* sparc64 does not support KVM */
5
6	#endif


diff --git a/include/asm-sparc64/spinlock_types.h b/include/asm-sparc64/spinlock_types.h index e128112a0d7..48d81c8734b 100644 --- a/include/asm-sparc64/spinlock_types.h +++ b/include/asm-sparc64/spinlock_types.h
@@ -1,20 +1 @@
1	#ifndef __SPARC64_SPINLOCK_TYPES_H		#include <asm-sparc/spinlock_types.h>
2	#define __SPARC64_SPINLOCK_TYPES_H
3
4	#ifndef __LINUX_SPINLOCK_TYPES_H
5	# error "please don't include this file directly"
6	#endif
7
8	typedef struct {
9	volatile unsigned char lock;
10	} raw_spinlock_t;
11
12	#define __RAW_SPIN_LOCK_UNLOCKED { 0 }
13
14	typedef struct {
15	volatile unsigned int lock;
16	} raw_rwlock_t;
17
18	#define __RAW_RW_LOCK_UNLOCKED { 0 }
19
20	#endif


diff --git a/include/asm-sparc64/sunbpp.h b/include/asm-sparc64/sunbpp.h index 8e171b7a9f4..9632be290eb 100644 --- a/include/asm-sparc64/sunbpp.h +++ b/include/asm-sparc64/sunbpp.h
@@ -1,80 +1 @@
1	/*		#include <asm-sparc/sunbpp.h>
2	* include/asm-sparc64/sunbpp.h
3	*/
4
5	#ifndef _ASM_SPARC64_SUNBPP_H
6	#define _ASM_SPARC64_SUNBPP_H
7
8	struct bpp_regs {
9	/* DMA registers */
10	__volatile__ __u32 p_csr; /* DMA Control/Status Register */
11	__volatile__ __u32 p_addr; /* Address Register */
12	__volatile__ __u32 p_bcnt; /* Byte Count Register */
13	__volatile__ __u32 p_tst_csr; /* Test Control/Status (DMA2 only) */
14	/* Parallel Port registers */
15	__volatile__ __u16 p_hcr; /* Hardware Configuration Register */
16	__volatile__ __u16 p_ocr; /* Operation Configuration Register */
17	__volatile__ __u8 p_dr; /* Parallel Data Register */
18	__volatile__ __u8 p_tcr; /* Transfer Control Register */
19	__volatile__ __u8 p_or; /* Output Register */
20	__volatile__ __u8 p_ir; /* Input Register */
21	__volatile__ __u16 p_icr; /* Interrupt Control Register */
22	};
23
24	/* P_HCR. Time is in increments of SBus clock. */
25	#define P_HCR_TEST 0x8000 /* Allows buried counters to be read */
26	#define P_HCR_DSW 0x7f00 /* Data strobe width (in ticks) */
27	#define P_HCR_DDS 0x007f /* Data setup before strobe (in ticks) */
28
29	/* P_OCR. */
30	#define P_OCR_MEM_CLR 0x8000
31	#define P_OCR_DATA_SRC 0x4000 /* ) */
32	#define P_OCR_DS_DSEL 0x2000 /* ) Bidirectional */
33	#define P_OCR_BUSY_DSEL 0x1000 /* ) selects */
34	#define P_OCR_ACK_DSEL 0x0800 /* ) */
35	#define P_OCR_EN_DIAG 0x0400
36	#define P_OCR_BUSY_OP 0x0200 /* Busy operation */
37	#define P_OCR_ACK_OP 0x0100 /* Ack operation */
38	#define P_OCR_SRST 0x0080 /* Reset state machines. Not selfcleaning. */
39	#define P_OCR_IDLE 0x0008 /* PP data transfer state machine is idle */
40	#define P_OCR_V_ILCK 0x0002 /* Versatec faded. Zebra only. */
41	#define P_OCR_EN_VER 0x0001 /* Enable Versatec (0 - enable). Zebra only. */
42
43	/* P_TCR */
44	#define P_TCR_DIR 0x08
45	#define P_TCR_BUSY 0x04
46	#define P_TCR_ACK 0x02
47	#define P_TCR_DS 0x01 /* Strobe */
48
49	/* P_OR */
50	#define P_OR_V3 0x20 /* ) */
51	#define P_OR_V2 0x10 /* ) on Zebra only */
52	#define P_OR_V1 0x08 /* ) */
53	#define P_OR_INIT 0x04
54	#define P_OR_AFXN 0x02 /* Auto Feed */
55	#define P_OR_SLCT_IN 0x01
56
57	/* P_IR */
58	#define P_IR_PE 0x04
59	#define P_IR_SLCT 0x02
60	#define P_IR_ERR 0x01
61
62	/* P_ICR */
63	#define P_DS_IRQ 0x8000 /* RW1 */
64	#define P_ACK_IRQ 0x4000 /* RW1 */
65	#define P_BUSY_IRQ 0x2000 /* RW1 */
66	#define P_PE_IRQ 0x1000 /* RW1 */
67	#define P_SLCT_IRQ 0x0800 /* RW1 */
68	#define P_ERR_IRQ 0x0400 /* RW1 */
69	#define P_DS_IRQ_EN 0x0200 /* RW Always on rising edge */
70	#define P_ACK_IRQ_EN 0x0100 /* RW Always on rising edge */
71	#define P_BUSY_IRP 0x0080 /* RW 1= rising edge */
72	#define P_BUSY_IRQ_EN 0x0040 /* RW */
73	#define P_PE_IRP 0x0020 /* RW 1= rising edge */
74	#define P_PE_IRQ_EN 0x0010 /* RW */
75	#define P_SLCT_IRP 0x0008 /* RW 1= rising edge */
76	#define P_SLCT_IRQ_EN 0x0004 /* RW */
77	#define P_ERR_IRP 0x0002 /* RW1 1= rising edge */
78	#define P_ERR_IRQ_EN 0x0001 /* RW */
79
80	#endif /* !(_ASM_SPARC64_SUNBPP_H) */


diff --git a/include/asm-sparc64/unaligned.h b/include/asm-sparc64/unaligned.h index edcebb09441..19fbf9508ac 100644 --- a/include/asm-sparc64/unaligned.h +++ b/include/asm-sparc64/unaligned.h
@@ -1,10 +1 @@
1	#ifndef _ASM_SPARC64_UNALIGNED_H		#include <asm-sparc/unaligned.h>
2	#define _ASM_SPARC64_UNALIGNED_H
3
4	#include <linux/unaligned/be_struct.h>
5	#include <linux/unaligned/le_byteshift.h>
6	#include <linux/unaligned/generic.h>
7	#define get_unaligned __get_unaligned_be
8	#define put_unaligned __put_unaligned_be
9
10	#endif /* _ASM_SPARC64_UNALIGNED_H */