Index: Makefile
===================================================================
RCS file: /home/cvs/linux/Makefile,v
retrieving revision 1.209
diff -u -r1.209 Makefile
--- Makefile	18 Dec 2003 11:33:24 -0000	1.209
+++ Makefile	6 Jan 2004 08:00:02 -0000
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 0
-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.157
diff -u -r1.157 Makefile
--- arch/mips/Makefile	3 Jan 2004 03:09:11 -0000	1.157
+++ arch/mips/Makefile	6 Jan 2004 08:00:10 -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)
 
@@ -613,7 +614,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.14
diff -u -r1.14 ip32-setup.c
--- arch/mips/sgi-ip32/ip32-setup.c	5 Jan 2004 21:12:37 -0000	1.14
+++ arch/mips/sgi-ip32/ip32-setup.c	6 Jan 2004 08:00:11 -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/console.h>
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	6 Jan 2004 08:00:31 -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