More merging. Chainsaw style.

7 files changed, 94 insertions, 103 deletions

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 28d204e30..799fd7fb6 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -459,12 +459,8 @@ static void scan_scsis (struct Scsi_Host *shpnt,
 
 
   /* Make sure we have something that is valid for DMA purposes */
-#ifndef CONFIG_SGI
   scsi_result = ( ( !shpnt->unchecked_isa_dma )
                  ? &scsi_result0[0] : scsi_init_malloc (512, GFP_DMA));
-#else
-  scsi_result = (scsi_init_malloc (512, GFP_DMA));
-#endif
 
   if (scsi_result == NULL) 
   {
diff --git a/include/linux/console.h b/include/linux/console.h
index 6df950101..efb0003ea 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -48,12 +48,11 @@ struct consw {
 
 extern struct consw *conswitchp;
 
-extern struct consw dummy_con;		/* dummy console buffer */
-extern struct consw fb_con;		/* frame buffer based console */
-extern struct consw vga_con;		/* VGA text console */
+extern struct consw dummy_con;	/* dummy console buffer */
+extern struct consw fb_con;	/* frame buffer based console */
+extern struct consw vga_con;	/* VGA text console */
 extern struct consw newport_con;	/* SGI Newport console  */
-extern struct consw compat_con;		/* console wrapper */
-extern struct consw prom_con;		/* SPARC PROM console */
+extern struct consw prom_con;	/* SPARC PROM console */
 
 void take_over_console(struct consw *sw, int first, int last, int deflt);
 void give_up_console(struct consw *sw);
diff --git a/include/linux/elf.h b/include/linux/elf.h
index b6883c1c5..8e88496a6 100644
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@ -20,15 +20,15 @@ typedef __s64	Elf64_Sword;
 typedef __u64	Elf64_Word;
 
 /* These constants are for the segment types stored in the image headers */
-#define PT_NULL			0
-#define PT_LOAD			1
-#define PT_DYNAMIC		2
-#define PT_INTERP		3
-#define PT_NOTE 		4
-#define PT_SHLIB		5
-#define PT_PHDR			6
-#define PT_LOPROC		0x70000000
-#define PT_HIPROC		0x7fffffff
+#define PT_NULL    0
+#define PT_LOAD    1
+#define PT_DYNAMIC 2
+#define PT_INTERP  3
+#define PT_NOTE    4
+#define PT_SHLIB   5
+#define PT_PHDR    6
+#define PT_LOPROC  0x70000000
+#define PT_HIPROC  0x7fffffff
 #define PT_MIPS_REGINFO		0x70000000
 
 /* Flags in the e_flags field of the header */
@@ -43,31 +43,30 @@ typedef __u64	Elf64_Word;
 #define ET_EXEC   2
 #define ET_DYN    3
 #define ET_CORE   4
-#if 0
-/* These seem to be wrong ... */
-#define ET_LOPROC 5
-#define ET_HIPROC 6
-#else
 #define ET_LOPROC 0xff00
 #define ET_HIPROC 0xffff
-#endif
 
 /* These constants define the various ELF target machines */
-#define EM_NONE         0
-#define EM_M32          1
-#define EM_SPARC        2
-#define EM_386          3
-#define EM_68K          4
-#define EM_88K          5
-#define EM_486          6	/* Perhaps disused */
-#define EM_860          7
-#define EM_MIPS         8	/* MIPS R3000 (officially, big-endian only) */
+#define EM_NONE  0
+#define EM_M32   1
+#define EM_SPARC 2
+#define EM_386   3
+#define EM_68K   4
+#define EM_88K   5
+#define EM_486   6   /* Perhaps disused */
+#define EM_860   7
+
+#define EM_MIPS		8	/* MIPS R3000 (officially, big-endian only) */
+
 #define EM_MIPS_RS4_BE 10	/* MIPS R4000 big-endian */
+
 #define EM_PARISC      15	/* HPPA */
+
 #define EM_SPARC32PLUS 18	/* Sun's "v8plus" */
+
 #define EM_PPC	       20	/* PowerPC */
-#define EM_SPARCV9     43	/* SPARC v9 64-bit */
 
+#define EM_SPARCV9     43	/* SPARC v9 64-bit */
 
 /*
  * This is an interim value that we will use until the committee comes
@@ -77,32 +76,32 @@ typedef __u64	Elf64_Word;
 
 
 /* This is the info that is needed to parse the dynamic section of the file */
-#define DT_NULL			0
-#define DT_NEEDED		1
-#define DT_PLTRELSZ		2
-#define DT_PLTGOT		3
-#define DT_HASH			4
-#define DT_STRTAB		5
-#define DT_SYMTAB		6
-#define DT_RELA			7
-#define DT_RELASZ		8
-#define DT_RELAENT		9
-#define DT_STRSZ		10
-#define DT_SYMENT		11
-#define DT_INIT			12
-#define DT_FINI			13
-#define DT_SONAME		14
-#define DT_RPATH 		15
-#define DT_SYMBOLIC		16
-#define DT_REL			17
-#define DT_RELSZ		18
-#define DT_RELENT		19
-#define DT_PLTREL		20
-#define DT_DEBUG		21
-#define DT_TEXTREL		22
-#define DT_JMPREL		23
-#define DT_LOPROC		0x70000000
-#define DT_HIPROC		0x7fffffff
+#define DT_NULL		0
+#define DT_NEEDED	1
+#define DT_PLTRELSZ	2
+#define DT_PLTGOT	3
+#define DT_HASH		4
+#define DT_STRTAB	5
+#define DT_SYMTAB	6
+#define DT_RELA		7
+#define DT_RELASZ	8
+#define DT_RELAENT	9
+#define DT_STRSZ	10
+#define DT_SYMENT	11
+#define DT_INIT		12
+#define DT_FINI		13
+#define DT_SONAME	14
+#define DT_RPATH 	15
+#define DT_SYMBOLIC	16
+#define DT_REL	        17
+#define DT_RELSZ	18
+#define DT_RELENT	19
+#define DT_PLTREL	20
+#define DT_DEBUG	21
+#define DT_TEXTREL	22
+#define DT_JMPREL	23
+#define DT_LOPROC	0x70000000
+#define DT_HIPROC	0x7fffffff
 #define DT_MIPS_RLD_VERSION	0x70000001
 #define DT_MIPS_TIME_STAMP	0x70000002
 #define DT_MIPS_ICHECKSUM	0x70000003
@@ -177,18 +176,18 @@ typedef struct {
 #define ELF32_R_SYM(x) ((x) >> 8)
 #define ELF32_R_TYPE(x) ((x) & 0xff)
 
-#define R_386_NONE		0
-#define R_386_32		1
-#define R_386_PC32		2
-#define R_386_GOT32		3
-#define R_386_PLT32		4
-#define R_386_COPY		5
-#define R_386_GLOB_DAT		6
-#define R_386_JMP_SLOT		7
-#define R_386_RELATIVE		8
-#define R_386_GOTOFF		9
-#define R_386_GOTPC		10
-#define R_386_NUM		11
+#define R_386_NONE	0
+#define R_386_32	1
+#define R_386_PC32	2
+#define R_386_GOT32	3
+#define R_386_PLT32	4
+#define R_386_COPY	5
+#define R_386_GLOB_DAT	6
+#define R_386_JMP_SLOT	7
+#define R_386_RELATIVE	8
+#define R_386_GOTOFF	9
+#define R_386_GOTPC	10
+#define R_386_NUM	11
 
 #define R_MIPS_NONE		0
 #define R_MIPS_16		1
@@ -459,23 +458,23 @@ typedef struct elf64_phdr {
 } Elf64_Phdr;
 
 /* sh_type */
-#define SHT_NULL		0
-#define SHT_PROGBITS		1
-#define SHT_SYMTAB		2
-#define SHT_STRTAB		3
-#define SHT_RELA		4
-#define SHT_HASH		5
-#define SHT_DYNAMIC		6
-#define SHT_NOTE		7
-#define SHT_NOBITS		8
-#define SHT_REL			9
-#define SHT_SHLIB		10
-#define SHT_DYNSYM		11
-#define SHT_NUM			12
-#define SHT_LOPROC		0x70000000
-#define SHT_HIPROC		0x7fffffff
-#define SHT_LOUSER		0x80000000
-#define SHT_HIUSER		0xffffffff
+#define SHT_NULL	0
+#define SHT_PROGBITS	1
+#define SHT_SYMTAB	2
+#define SHT_STRTAB	3
+#define SHT_RELA	4
+#define SHT_HASH	5
+#define SHT_DYNAMIC	6
+#define SHT_NOTE	7
+#define SHT_NOBITS	8
+#define SHT_REL		9
+#define SHT_SHLIB	10
+#define SHT_DYNSYM	11
+#define SHT_NUM		12
+#define SHT_LOPROC	0x70000000
+#define SHT_HIPROC	0x7fffffff
+#define SHT_LOUSER	0x80000000
+#define SHT_HIUSER	0xffffffff
 #define SHT_MIPS_LIST		0x70000000
 #define SHT_MIPS_CONFLICT	0x70000002
 #define SHT_MIPS_GPTAB		0x70000003
@@ -489,13 +488,13 @@ typedef struct elf64_phdr {
 #define SHF_MIPS_GPREL	0x10000000
 
 /* special section indexes */
-#define SHN_UNDEF		0
-#define SHN_LORESERVE		0xff00
-#define SHN_LOPROC		0xff00
-#define SHN_HIPROC		0xff1f
-#define SHN_ABS			0xfff1
-#define SHN_COMMON		0xfff2
-#define SHN_HIRESERVE		0xffff
+#define SHN_UNDEF	0
+#define SHN_LORESERVE	0xff00
+#define SHN_LOPROC	0xff00
+#define SHN_HIPROC	0xff1f
+#define SHN_ABS		0xfff1
+#define SHN_COMMON	0xfff2
+#define SHN_HIRESERVE	0xffff
 #define SHN_MIPS_ACCOMON	0xff00
  
 typedef struct {
diff --git a/include/linux/major.h b/include/linux/major.h
index cfefdf0ac..e98dc9903 100644
--- a/include/linux/major.h
+++ b/include/linux/major.h
@@ -63,7 +63,7 @@
 #define ACSI_MAJOR	28
 #define AZTECH_CDROM_MAJOR 29
 #define GRAPHDEV_MAJOR	29	/* SparcLinux & Linux/68k /dev/fb */
-#define SHMIQ_MAJOR	85	/* Linux/mips, SGI /dev/shmiq */
+#define SHMIQ_MAJOR	85	/* Linux/MIPS, SGI /dev/shmiq */
 #define USEMA_MAJOR	86	/* Linux/MIPS, SGI /dev/usema */
 #define CM206_CDROM_MAJOR 32
 #define IDE2_MAJOR	33
diff --git a/include/linux/serial.h b/include/linux/serial.h
index 766222e7a..929618dd5 100644
--- a/include/linux/serial.h
+++ b/include/linux/serial.h
@@ -13,7 +13,7 @@
 struct serial_struct {
 	int	type;
 	int	line;
-	unsigned int	port;
+	int	port;
 	int	irq;
 	int	flags;
 	int	xmit_fifo_size;
diff --git a/include/linux/time.h b/include/linux/time.h
index d14feaaad..53a125a08 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -65,13 +65,11 @@ extern void get_fast_time(struct timeval *tv);
 extern void (*do_get_fast_time)(struct timeval *);
 #endif
 
-#ifdef __KERNEL__
 #define FD_SETSIZE		__FD_SETSIZE
 #define FD_SET(fd,fdsetp)	__FD_SET(fd,fdsetp)
 #define FD_CLR(fd,fdsetp)	__FD_CLR(fd,fdsetp)
 #define FD_ISSET(fd,fdsetp)	__FD_ISSET(fd,fdsetp)
 #define FD_ZERO(fdsetp)		__FD_ZERO(fdsetp)
-#endif
 
 /*
  * Names of the interval timers, and structure
diff --git a/kernel/panic.c b/kernel/panic.c
index 35289454a..51ee692b5 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -50,12 +50,12 @@ NORET_TYPE void panic(const char * fmt, ...)
 	else
 		sys_sync();
 
+	unblank_console();
+
 #ifdef __SMP__
 	smp_send_stop();
 #endif
 
-	unblank_console();
-
 	notifier_call_chain(&panic_notifier_list, 0, NULL);
 
 	if (panic_timeout > 0)
@@ -85,4 +85,3 @@ NORET_TYPE void panic(const char * fmt, ...)
 		CHECK_EMERGENCY_SYNC
 	}
 }
-