Index: Makefile
===================================================================
RCS file: /home/cvs/linux/Makefile,v
retrieving revision 1.210
diff -u -r1.210 Makefile
--- Makefile	10 Jan 2004 04:59:48 -0000	1.210
+++ Makefile	26 Jan 2004 08:00:04 -0000
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 1
-EXTRAVERSION =
+EXTRAVERSION = iluxa_minimal
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"
Index: arch/mips/Makefile
===================================================================
RCS file: /home/cvs/linux/arch/mips/Makefile,v
retrieving revision 1.162
diff -u -r1.162 Makefile
--- arch/mips/Makefile	21 Jan 2004 16:19:19 -0000	1.162
+++ arch/mips/Makefile	26 Jan 2004 08:00:20 -0000
@@ -35,13 +35,14 @@
 endif
 ifdef CONFIG_MIPS64
 gcc-abi			= 64
-gas-abi			= 32
+#gas-abi		= 32
+gas-abi			= o64
 tool-prefix		= $(64bit-tool-prefix)
 UTS_MACHINE		:= mips64
 endif
 
 ifdef CONFIG_CROSSCOMPILE
-CROSS_COMPILE		:= $(tool-prefix)
+CROSS_COMPILE		:= /crossdev/$(UTS_MACHINE)/bin/$(tool-prefix)
 endif
 
 #
@@ -98,7 +99,7 @@
 else \
 	gcc_abi=; gcc_isa=-$(5); \
 fi; \
-gas_abi=-Wa,-$(gcc-abi); gas_cpu=$$cpu; gas_isa=-Wa,$$isa; \
+gas_abi=-Wa,-mabi=$(gcc-abi); gas_cpu=$$cpu; gas_isa=-Wa,$$isa; \
 while :; do \
 	for gas_opt in -Wa,-march= -Wa,-mcpu=; do \
 		$(CC) $$gas_abi $$gas_opt$$cpu $$gas_isa -Wa,-Z -c \
@@ -109,7 +110,7 @@
 	break; \
 done; \
 if test x$(gcc-abi) != x$(gas-abi); then \
-	gas_abi="-Wa,-$(gas-abi) -Wa,-mgp$(gcc-abi)"; \
+	gas_abi="-Wa,-mabi=$(gas-abi) -Wa,-mgp$(gcc-abi)"; \
 fi; \
 echo $$gcc_abi $$gcc_opt$$gcc_cpu $$gcc_isa $$gas_abi $$gas_opt$$gas_cpu $$gas_isa)
 
@@ -617,7 +618,7 @@
 # ELF files from 32-bit files by conversion.
 #
 #AS += -64
-#LDFLAGS += -m elf64bmip
+LDFLAGS += -m elf64btsmip
 
 #
 # Choosing incompatible machines durings configuration will result in
Index: arch/mips/sgi-ip32/ip32-setup.c
===================================================================
RCS file: /home/cvs/linux/arch/mips/sgi-ip32/ip32-setup.c,v
retrieving revision 1.17
diff -u -r1.17 ip32-setup.c
--- arch/mips/sgi-ip32/ip32-setup.c	22 Jan 2004 22:04:05 -0000	1.17
+++ arch/mips/sgi-ip32/ip32-setup.c	26 Jan 2004 08:00:25 -0000
@@ -6,6 +6,8 @@
  * for more details.
  *
  * Copyright (C) 2000 Harald Koerfgen
+ *
+ * Modified by Ilya A. Volynets. 2002-2003
  */
 #include <linux/config.h>
 #include <linux/sched.h>
Index: drivers/scsi/aic7xxx/aic7xxx_osm.h
===================================================================
RCS file: /home/cvs/linux/drivers/scsi/aic7xxx/aic7xxx_osm.h,v
retrieving revision 1.22
diff -u -r1.22 aic7xxx_osm.h
--- drivers/scsi/aic7xxx/aic7xxx_osm.h	10 Jan 2004 04:59:54 -0000	1.22
+++ drivers/scsi/aic7xxx/aic7xxx_osm.h	26 Jan 2004 08:00:49 -0000
@@ -607,11 +607,11 @@
 {
 	uint8_t x;
 
-	if (ahc->tag == BUS_SPACE_MEMIO) {
-		x = readb(ahc->bsh.maddr + port);
-	} else {
+	//if (ahc->tag == BUS_SPACE_MEMIO) {
+	//x = readb(ahc->bsh.maddr + port);
+	//} else {
 		x = inb(ahc->bsh.ioport + port);
-	}
+		//}
 	mb();
 	return (x);
 }
@@ -619,11 +619,11 @@
 static __inline void
 ahc_outb(struct ahc_softc * ahc, long port, uint8_t val)
 {
-	if (ahc->tag == BUS_SPACE_MEMIO) {
-		writeb(val, ahc->bsh.maddr + port);
-	} else {
+	//if (ahc->tag == BUS_SPACE_MEMIO) {
+	//writeb(val, ahc->bsh.maddr + port);
+	//} else {
 		outb(val, ahc->bsh.ioport + port);
-	}
+		//}
 	mb();
 }
 
Index: drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
===================================================================
RCS file: /home/cvs/linux/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c,v
retrieving revision 1.9
diff -u -r1.9 aic7xxx_osm_pci.c
--- drivers/scsi/aic7xxx/aic7xxx_osm_pci.c	10 Jan 2004 04:59:54 -0000	1.9
+++ drivers/scsi/aic7xxx/aic7xxx_osm_pci.c	26 Jan 2004 08:00:50 -0000
@@ -309,7 +309,7 @@
 	command &= ~(PCIM_CMD_PORTEN|PCIM_CMD_MEMEN);
 	base = 0;
 	maddr = NULL;
-	error = ahc_linux_pci_reserve_mem_region(ahc, &base, &maddr);
+	error = -EBUSY;//ahc_linux_pci_reserve_mem_region(ahc, &base, &maddr);
 	if (error == 0) {
 		ahc->platform_data->mem_busaddr = base;
 		ahc->tag = BUS_SPACE_MEMIO;
Index: include/asm-mips/page-64.h
===================================================================
RCS file: /home/cvs/linux/include/asm-mips/page-64.h,v
retrieving revision 1.3
diff -u -r1.3 page-64.h
--- include/asm-mips/page-64.h	30 Nov 2003 01:52:25 -0000	1.3
+++ include/asm-mips/page-64.h	26 Jan 2004 08:01:03 -0000
@@ -15,7 +15,8 @@
  * This handles the memory map.
  */
 #ifdef CONFIG_DMA_NONCOHERENT
-#define PAGE_OFFSET	0x9800000000000000UL
+//#define PAGE_OFFSET	0x9800000000000000UL
+#define PAGE_OFFSET     0xffffffff80000000UL
 #else
 #define PAGE_OFFSET	0xa800000000000000UL
 #endif