1 files changed, 68 insertions, 68 deletions
diff --git a/arch/mips/include/asm/sgiarcs.h b/arch/mips/include/asm/sgiarcs.h
index 3dce7c788b3e..26ddfff28c8e 100644
--- a/arch/mips/include/asm/sgiarcs.h
+++ b/arch/mips/include/asm/sgiarcs.h
@@ -16,33 +16,33 @@
 #include <asm/fw/arc/types.h>
 /* Various ARCS error codes. */
-#define PROM_ESUCCESS                   0x00
+#define PROM_ESUCCESS                   0x00
-#define PROM_E2BIG                      0x01
+#define PROM_E2BIG                      0x01
-#define PROM_EACCESS                    0x02
+#define PROM_EACCESS                    0x02
-#define PROM_EAGAIN                     0x03
+#define PROM_EAGAIN                     0x03
-#define PROM_EBADF                      0x04
+#define PROM_EBADF                      0x04
-#define PROM_EBUSY                      0x05
+#define PROM_EBUSY                      0x05
-#define PROM_EFAULT                     0x06
+#define PROM_EFAULT                     0x06
-#define PROM_EINVAL                     0x07
+#define PROM_EINVAL                     0x07
-#define PROM_EIO                        0x08
+#define PROM_EIO                        0x08
-#define PROM_EISDIR                     0x09
+#define PROM_EISDIR                     0x09
-#define PROM_EMFILE                     0x0a
+#define PROM_EMFILE                     0x0a
-#define PROM_EMLINK                     0x0b
+#define PROM_EMLINK                     0x0b
-#define PROM_ENAMETOOLONG               0x0c
+#define PROM_ENAMETOOLONG               0x0c
-#define PROM_ENODEV                     0x0d
+#define PROM_ENODEV                     0x0d
-#define PROM_ENOENT                     0x0e
+#define PROM_ENOENT                     0x0e
-#define PROM_ENOEXEC                    0x0f
+#define PROM_ENOEXEC                    0x0f
-#define PROM_ENOMEM                     0x10
+#define PROM_ENOMEM                     0x10
-#define PROM_ENOSPC                     0x11
+#define PROM_ENOSPC                     0x11
-#define PROM_ENOTDIR                    0x12
+#define PROM_ENOTDIR                    0x12
-#define PROM_ENOTTY                     0x13
+#define PROM_ENOTTY                     0x13
-#define PROM_ENXIO                      0x14
+#define PROM_ENXIO                      0x14
-#define PROM_EROFS                      0x15
+#define PROM_EROFS                      0x15
 /* SGI ARCS specific errno's. */
-#define PROM_EADDRNOTAVAIL              0x1f
+#define PROM_EADDRNOTAVAIL              0x1f
-#define PROM_ETIMEDOUT                  0x20
+#define PROM_ETIMEDOUT                  0x20
-#define PROM_ECONNABORTED               0x21
+#define PROM_ECONNABORTED               0x21
-#define PROM_ENOCONNECT                 0x22
+#define PROM_ENOCONNECT                 0x22
 /* Device classes, types, and identifiers for prom
 * device inventory queries.
@@ -77,14 +77,14 @@ enum linux_identifier {
 /* A prom device tree component. */
 struct linux_component {
-        enum linux_devclass     class;  /* node class */
+        enum linux_devclass     class;  /* node class */
-        enum linux_devtypes     type;   /* node type */
+        enum linux_devtypes     type;   /* node type */
-        enum linux_identifier   iflags; /* node flags */
+        enum linux_identifier   iflags; /* node flags */
-        USHORT                  vers;   /* node version */
+        USHORT                  vers;   /* node version */
-        USHORT                  rev;    /* node revision */
+        USHORT                  rev;    /* node revision */
-        ULONG                   key;    /* completely magic */
+        ULONG                   key;    /* completely magic */
-        ULONG                   amask;  /* XXX affinity mask??? */
+        ULONG                   amask;  /* XXX affinity mask??? */
-        ULONG                   cdsize; /* size of configuration data */
+        ULONG                   cdsize; /* size of configuration data */
        ULONG                   ilen;   /* length of string identifier */
        _PULONG                 iname;  /* string identifier */
 };
@@ -177,13 +177,13 @@ struct linux_finfo {
        struct linux_bigint   end;
        struct linux_bigint   cur;
        enum linux_devtypes   dtype;
-        unsigned long         namelen;
+        unsigned long         namelen;
-        unsigned char         attr;
+        unsigned char         attr;
-        char                  name[32]; /* XXX imperical, should be define */
+        char                  name[32]; /* XXX imperical, should be define */
 };
 /* This describes the vector containing function pointers to the ARC
-   firmware functions.  */
+   firmware functions.  */
 struct linux_romvec {
        LONG    load;                   /* Load an executable image. */
        LONG    invoke;                 /* Invoke a standalong image. */
@@ -244,7 +244,7 @@ struct linux_romvec {
 */
 typedef struct _SYSTEM_PARAMETER_BLOCK {
        ULONG                   magic;          /* magic cookie */
-#define PROMBLOCK_MAGIC      0x53435241
+#define PROMBLOCK_MAGIC      0x53435241
        ULONG                   len;            /* length of parm block */
        USHORT                  ver;            /* ARCS firmware version */
@@ -294,16 +294,16 @@ struct linux_cdata {
 };
 /* Common SGI ARCS firmware file descriptors. */
-#define SGIPROM_STDIN     0
+#define SGIPROM_STDIN     0
-#define SGIPROM_STDOUT    1
+#define SGIPROM_STDOUT    1
 /* Common SGI ARCS firmware file types. */
-#define SGIPROM_ROFILE    0x01  /* read-only file */
+#define SGIPROM_ROFILE    0x01  /* read-only file */
-#define SGIPROM_HFILE     0x02  /* hidden file */
+#define SGIPROM_HFILE     0x02  /* hidden file */
-#define SGIPROM_SFILE     0x04  /* System file */
+#define SGIPROM_SFILE     0x04  /* System file */
-#define SGIPROM_AFILE     0x08  /* Archive file */
+#define SGIPROM_AFILE     0x08  /* Archive file */
-#define SGIPROM_DFILE     0x10  /* Directory file */
+#define SGIPROM_DFILE     0x10  /* Directory file */
-#define SGIPROM_DELFILE   0x20  /* Deleted file */
+#define SGIPROM_DELFILE   0x20  /* Deleted file */
 /* SGI ARCS boot record information. */
 struct sgi_partition {
@@ -318,7 +318,7 @@ struct sgi_partition {
        unsigned char tsect0, tsect1, tsect2, tsect3;
 };
-#define SGIBBLOCK_MAGIC   0xaa55
+#define SGIBBLOCK_MAGIC   0xaa55
 #define SGIBBLOCK_MAXPART 0x0004
 struct sgi_bootblock {
@@ -332,34 +332,34 @@ struct sgi_bparm_block {
        unsigned short bytes_sect;    /* bytes per sector */
        unsigned char  sect_clust;    /* sectors per cluster */
        unsigned short sect_resv;     /* reserved sectors */
-        unsigned char  nfats;         /* # of allocation tables */
+        unsigned char  nfats;         /* # of allocation tables */
        unsigned short nroot_dirents; /* # of root directory entries */
        unsigned short sect_volume;   /* sectors in volume */
        unsigned char  media_type;    /* media descriptor */
        unsigned short sect_fat;      /* sectors per allocation table */
        unsigned short sect_track;    /* sectors per track */
-        unsigned short nheads;        /* # of heads */
+        unsigned short nheads;        /* # of heads */
-        unsigned short nhsects;       /* # of hidden sectors */
+        unsigned short nhsects;       /* # of hidden sectors */
 };
 struct sgi_bsector {
-        unsigned char   jmpinfo[3];
+        unsigned char   jmpinfo[3];
-        unsigned char   manuf_name[8];
+        unsigned char   manuf_name[8];
        struct sgi_bparm_block info;
 };
 /* Debugging block used with SGI symmon symbolic debugger. */
-#define SMB_DEBUG_MAGIC   0xfeeddead
+#define SMB_DEBUG_MAGIC   0xfeeddead
 struct linux_smonblock {
-        unsigned long   magic;
+        unsigned long   magic;
-        void            (*handler)(void);  /* Breakpoint routine. */
+        void            (*handler)(void);  /* Breakpoint routine. */
-        unsigned long   dtable_base;       /* Base addr of dbg table. */
+        unsigned long   dtable_base;       /* Base addr of dbg table. */
-        int             (*printf)(const char *fmt, ...);
+        int             (*printf)(const char *fmt, ...);
-        unsigned long   btable_base;       /* Breakpoint table. */
+        unsigned long   btable_base;       /* Breakpoint table. */
-        unsigned long   mpflushreqs;       /* SMP cache flush request list. */
+        unsigned long   mpflushreqs;       /* SMP cache flush request list. */
-        unsigned long   ntab;              /* Name table. */
+        unsigned long   ntab;              /* Name table. */
-        unsigned long   stab;              /* Symbol table. */
+        unsigned long   stab;              /* Symbol table. */
-        int             smax;              /* Max # of symbols. */
+        int             smax;              /* Max # of symbols. */
 };
 /*
@@ -369,7 +369,7 @@ struct linux_smonblock {
 #if defined(CONFIG_64BIT) && defined(CONFIG_FW_ARC32)
 #define __arc_clobbers                                                  \
-        "$2", "$3" /* ... */, "$8", "$9", "$10", "$11",                         \
+        "$2", "$3" /* ... */, "$8", "$9", "$10", "$11",                         \
        "$12", "$13", "$14", "$15", "$16", "$24", "$25", "$31"
 #define ARC_CALL0(dest)                                                 \
@@ -447,7 +447,7 @@ struct linux_smonblock {
        "daddu\t$29, 32\n\t"                                            \
        "move\t%0, $2"                                                  \
        : "=r" (__res), "=r" (__vec)                                    \
-        : "1" (__vec), "r" (__a1), "r" (__a2), "r" (__a3),              \
+        : "1" (__vec), "r" (__a1), "r" (__a2), "r" (__a3),              \
          "r" (__a4)                                                    \
        : __arc_clobbers);                                              \
        __res;                                                          \
@@ -468,8 +468,8 @@ struct linux_smonblock {
        "daddu\t$29, 32\n\t"                                            \
        "move\t%0, $2"                                                  \
        : "=r" (__res), "=r" (__vec)                                    \
-        : "1" (__vec),                                                  \
+        : "1" (__vec),                                                  \
-          "r" (__a1), "r" (__a2), "r" (__a3), "r" (__a4),               \
+          "r" (__a1), "r" (__a2), "r" (__a3), "r" (__a4),               \
          "r" (__a5)                                                    \
        : __arc_clobbers);                                              \
        __res;                                                          \
@@ -512,7 +512,7 @@ struct linux_smonblock {
        long __a1 = (long) (a1);                                        \
        long __a2 = (long) (a2);                                        \
        long __a3 = (long) (a3);                                        \
-        long (*__vec)(long, long, long) = (void *) romvec->dest;        \
+        long (*__vec)(long, long, long) = (void *) romvec->dest;        \
                                                                        \
        __res = __vec(__a1, __a2, __a3);                                \
        __res;                                                          \

diff --git a/arch/mips/include/asm/sgiarcs.h b/arch/mips/include/asm/sgiarcs.h index 3dce7c788b3e..26ddfff28c8e 100644 --- a/arch/mips/include/asm/sgiarcs.h +++ b/arch/mips/include/asm/sgiarcs.h
@@ -16,33 +16,33 @@
16	#include <asm/fw/arc/types.h>	16	#include <asm/fw/arc/types.h>
17		17
18	/* Various ARCS error codes. */	18	/* Various ARCS error codes. */
19	#define PROM_ESUCCESS 0x00	19	#define PROM_ESUCCESS 0x00
20	#define PROM_E2BIG 0x01	20	#define PROM_E2BIG 0x01
21	#define PROM_EACCESS 0x02	21	#define PROM_EACCESS 0x02
22	#define PROM_EAGAIN 0x03	22	#define PROM_EAGAIN 0x03
23	#define PROM_EBADF 0x04	23	#define PROM_EBADF 0x04
24	#define PROM_EBUSY 0x05	24	#define PROM_EBUSY 0x05
25	#define PROM_EFAULT 0x06	25	#define PROM_EFAULT 0x06
26	#define PROM_EINVAL 0x07	26	#define PROM_EINVAL 0x07
27	#define PROM_EIO 0x08	27	#define PROM_EIO 0x08
28	#define PROM_EISDIR 0x09	28	#define PROM_EISDIR 0x09
29	#define PROM_EMFILE 0x0a	29	#define PROM_EMFILE 0x0a
30	#define PROM_EMLINK 0x0b	30	#define PROM_EMLINK 0x0b
31	#define PROM_ENAMETOOLONG 0x0c	31	#define PROM_ENAMETOOLONG 0x0c
32	#define PROM_ENODEV 0x0d	32	#define PROM_ENODEV 0x0d
33	#define PROM_ENOENT 0x0e	33	#define PROM_ENOENT 0x0e
34	#define PROM_ENOEXEC 0x0f	34	#define PROM_ENOEXEC 0x0f
35	#define PROM_ENOMEM 0x10	35	#define PROM_ENOMEM 0x10
36	#define PROM_ENOSPC 0x11	36	#define PROM_ENOSPC 0x11
37	#define PROM_ENOTDIR 0x12	37	#define PROM_ENOTDIR 0x12
38	#define PROM_ENOTTY 0x13	38	#define PROM_ENOTTY 0x13
39	#define PROM_ENXIO 0x14	39	#define PROM_ENXIO 0x14
40	#define PROM_EROFS 0x15	40	#define PROM_EROFS 0x15
41	/* SGI ARCS specific errno's. */	41	/* SGI ARCS specific errno's. */
42	#define PROM_EADDRNOTAVAIL 0x1f	42	#define PROM_EADDRNOTAVAIL 0x1f
43	#define PROM_ETIMEDOUT 0x20	43	#define PROM_ETIMEDOUT 0x20
44	#define PROM_ECONNABORTED 0x21	44	#define PROM_ECONNABORTED 0x21
45	#define PROM_ENOCONNECT 0x22	45	#define PROM_ENOCONNECT 0x22
46		46
47	/* Device classes, types, and identifiers for prom	47	/* Device classes, types, and identifiers for prom
48	* device inventory queries.	48	* device inventory queries.
@@ -77,14 +77,14 @@ enum linux_identifier {
77		77
78	/* A prom device tree component. */	78	/* A prom device tree component. */
79	struct linux_component {	79	struct linux_component {
80	enum linux_devclass class; /* node class */	80	enum linux_devclass class; /* node class */
81	enum linux_devtypes type; /* node type */	81	enum linux_devtypes type; /* node type */
82	enum linux_identifier iflags; /* node flags */	82	enum linux_identifier iflags; /* node flags */
83	USHORT vers; /* node version */	83	USHORT vers; /* node version */
84	USHORT rev; /* node revision */	84	USHORT rev; /* node revision */
85	ULONG key; /* completely magic */	85	ULONG key; /* completely magic */
86	ULONG amask; /* XXX affinity mask??? */	86	ULONG amask; /* XXX affinity mask??? */
87	ULONG cdsize; /* size of configuration data */	87	ULONG cdsize; /* size of configuration data */
88	ULONG ilen; /* length of string identifier */	88	ULONG ilen; /* length of string identifier */
89	_PULONG iname; /* string identifier */	89	_PULONG iname; /* string identifier */
90	};	90	};
@@ -177,13 +177,13 @@ struct linux_finfo {
177	struct linux_bigint end;	177	struct linux_bigint end;
178	struct linux_bigint cur;	178	struct linux_bigint cur;
179	enum linux_devtypes dtype;	179	enum linux_devtypes dtype;
180	unsigned long namelen;	180	unsigned long namelen;
181	unsigned char attr;	181	unsigned char attr;
182	char name[32]; /* XXX imperical, should be define */	182	char name[32]; /* XXX imperical, should be define */
183	};	183	};
184		184
185	/* This describes the vector containing function pointers to the ARC	185	/* This describes the vector containing function pointers to the ARC
186	firmware functions. */	186	firmware functions. */
187	struct linux_romvec {	187	struct linux_romvec {
188	LONG load; /* Load an executable image. */	188	LONG load; /* Load an executable image. */
189	LONG invoke; /* Invoke a standalong image. */	189	LONG invoke; /* Invoke a standalong image. */
@@ -244,7 +244,7 @@ struct linux_romvec {
244	*/	244	*/
245	typedef struct _SYSTEM_PARAMETER_BLOCK {	245	typedef struct _SYSTEM_PARAMETER_BLOCK {
246	ULONG magic; /* magic cookie */	246	ULONG magic; /* magic cookie */
247	#define PROMBLOCK_MAGIC 0x53435241	247	#define PROMBLOCK_MAGIC 0x53435241
248		248
249	ULONG len; /* length of parm block */	249	ULONG len; /* length of parm block */
250	USHORT ver; /* ARCS firmware version */	250	USHORT ver; /* ARCS firmware version */
@@ -294,16 +294,16 @@ struct linux_cdata {
294	};	294	};
295		295
296	/* Common SGI ARCS firmware file descriptors. */	296	/* Common SGI ARCS firmware file descriptors. */
297	#define SGIPROM_STDIN 0	297	#define SGIPROM_STDIN 0
298	#define SGIPROM_STDOUT 1	298	#define SGIPROM_STDOUT 1
299		299
300	/* Common SGI ARCS firmware file types. */	300	/* Common SGI ARCS firmware file types. */
301	#define SGIPROM_ROFILE 0x01 /* read-only file */	301	#define SGIPROM_ROFILE 0x01 /* read-only file */
302	#define SGIPROM_HFILE 0x02 /* hidden file */	302	#define SGIPROM_HFILE 0x02 /* hidden file */
303	#define SGIPROM_SFILE 0x04 /* System file */	303	#define SGIPROM_SFILE 0x04 /* System file */
304	#define SGIPROM_AFILE 0x08 /* Archive file */	304	#define SGIPROM_AFILE 0x08 /* Archive file */
305	#define SGIPROM_DFILE 0x10 /* Directory file */	305	#define SGIPROM_DFILE 0x10 /* Directory file */
306	#define SGIPROM_DELFILE 0x20 /* Deleted file */	306	#define SGIPROM_DELFILE 0x20 /* Deleted file */
307		307
308	/* SGI ARCS boot record information. */	308	/* SGI ARCS boot record information. */
309	struct sgi_partition {	309	struct sgi_partition {
@@ -318,7 +318,7 @@ struct sgi_partition {
318	unsigned char tsect0, tsect1, tsect2, tsect3;	318	unsigned char tsect0, tsect1, tsect2, tsect3;
319	};	319	};
320		320
321	#define SGIBBLOCK_MAGIC 0xaa55	321	#define SGIBBLOCK_MAGIC 0xaa55
322	#define SGIBBLOCK_MAXPART 0x0004	322	#define SGIBBLOCK_MAXPART 0x0004
323		323
324	struct sgi_bootblock {	324	struct sgi_bootblock {
@@ -332,34 +332,34 @@ struct sgi_bparm_block {
332	unsigned short bytes_sect; /* bytes per sector */	332	unsigned short bytes_sect; /* bytes per sector */
333	unsigned char sect_clust; /* sectors per cluster */	333	unsigned char sect_clust; /* sectors per cluster */
334	unsigned short sect_resv; /* reserved sectors */	334	unsigned short sect_resv; /* reserved sectors */
335	unsigned char nfats; /* # of allocation tables */	335	unsigned char nfats; /* # of allocation tables */
336	unsigned short nroot_dirents; /* # of root directory entries */	336	unsigned short nroot_dirents; /* # of root directory entries */
337	unsigned short sect_volume; /* sectors in volume */	337	unsigned short sect_volume; /* sectors in volume */
338	unsigned char media_type; /* media descriptor */	338	unsigned char media_type; /* media descriptor */
339	unsigned short sect_fat; /* sectors per allocation table */	339	unsigned short sect_fat; /* sectors per allocation table */
340	unsigned short sect_track; /* sectors per track */	340	unsigned short sect_track; /* sectors per track */
341	unsigned short nheads; /* # of heads */	341	unsigned short nheads; /* # of heads */
342	unsigned short nhsects; /* # of hidden sectors */	342	unsigned short nhsects; /* # of hidden sectors */
343	};	343	};
344		344
345	struct sgi_bsector {	345	struct sgi_bsector {
346	unsigned char jmpinfo[3];	346	unsigned char jmpinfo[3];
347	unsigned char manuf_name[8];	347	unsigned char manuf_name[8];
348	struct sgi_bparm_block info;	348	struct sgi_bparm_block info;
349	};	349	};
350		350
351	/* Debugging block used with SGI symmon symbolic debugger. */	351	/* Debugging block used with SGI symmon symbolic debugger. */
352	#define SMB_DEBUG_MAGIC 0xfeeddead	352	#define SMB_DEBUG_MAGIC 0xfeeddead
353	struct linux_smonblock {	353	struct linux_smonblock {
354	unsigned long magic;	354	unsigned long magic;
355	void (handler)(void); / Breakpoint routine. */	355	void (handler)(void); / Breakpoint routine. */
356	unsigned long dtable_base; /* Base addr of dbg table. */	356	unsigned long dtable_base; /* Base addr of dbg table. */
357	int (printf)(const char fmt, ...);	357	int (printf)(const char fmt, ...);
358	unsigned long btable_base; /* Breakpoint table. */	358	unsigned long btable_base; /* Breakpoint table. */
359	unsigned long mpflushreqs; /* SMP cache flush request list. */	359	unsigned long mpflushreqs; /* SMP cache flush request list. */
360	unsigned long ntab; /* Name table. */	360	unsigned long ntab; /* Name table. */
361	unsigned long stab; /* Symbol table. */	361	unsigned long stab; /* Symbol table. */
362	int smax; /* Max # of symbols. */	362	int smax; /* Max # of symbols. */
363	};	363	};
364		364
365	/*	365	/*
@@ -369,7 +369,7 @@ struct linux_smonblock {
369	#if defined(CONFIG_64BIT) && defined(CONFIG_FW_ARC32)	369	#if defined(CONFIG_64BIT) && defined(CONFIG_FW_ARC32)
370		370
371	#define __arc_clobbers \	371	#define __arc_clobbers \
372	"$2", "$3" /* ... */, "$8", "$9", "$10", "$11", \	372	"$2", "$3" /* ... */, "$8", "$9", "$10", "$11", \
373	"$12", "$13", "$14", "$15", "$16", "$24", "$25", "$31"	373	"$12", "$13", "$14", "$15", "$16", "$24", "$25", "$31"
374		374
375	#define ARC_CALL0(dest) \	375	#define ARC_CALL0(dest) \
@@ -447,7 +447,7 @@ struct linux_smonblock {
447	"daddu\t$29, 32\n\t" \	447	"daddu\t$29, 32\n\t" \
448	"move\t%0, $2" \	448	"move\t%0, $2" \
449	: "=r" (__res), "=r" (__vec) \	449	: "=r" (__res), "=r" (__vec) \
450	: "1" (__vec), "r" (__a1), "r" (__a2), "r" (__a3), \	450	: "1" (__vec), "r" (__a1), "r" (__a2), "r" (__a3), \
451	"r" (__a4) \	451	"r" (__a4) \
452	: __arc_clobbers); \	452	: __arc_clobbers); \
453	__res; \	453	__res; \
@@ -468,8 +468,8 @@ struct linux_smonblock {
468	"daddu\t$29, 32\n\t" \	468	"daddu\t$29, 32\n\t" \
469	"move\t%0, $2" \	469	"move\t%0, $2" \
470	: "=r" (__res), "=r" (__vec) \	470	: "=r" (__res), "=r" (__vec) \
471	: "1" (__vec), \	471	: "1" (__vec), \
472	"r" (__a1), "r" (__a2), "r" (__a3), "r" (__a4), \	472	"r" (__a1), "r" (__a2), "r" (__a3), "r" (__a4), \
473	"r" (__a5) \	473	"r" (__a5) \
474	: __arc_clobbers); \	474	: __arc_clobbers); \
475	__res; \	475	__res; \
@@ -512,7 +512,7 @@ struct linux_smonblock {
512	long __a1 = (long) (a1); \	512	long __a1 = (long) (a1); \
513	long __a2 = (long) (a2); \	513	long __a2 = (long) (a2); \
514	long __a3 = (long) (a3); \	514	long __a3 = (long) (a3); \
515	long (__vec)(long, long, long) = (void ) romvec->dest; \	515	long (__vec)(long, long, long) = (void ) romvec->dest; \
516	\	516	\
517	__res = __vec(__a1, __a2, __a3); \	517	__res = __vec(__a1, __a2, __a3); \
518	__res; \	518	__res; \