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	21 Jan 2004 08:00:02 -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.161
diff -u -r1.161 Makefile
--- arch/mips/Makefile	19 Jan 2004 21:27:55 -0000	1.161
+++ arch/mips/Makefile	21 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)
 
@@ -616,7 +617,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.16
diff -u -r1.16 ip32-setup.c
--- arch/mips/sgi-ip32/ip32-setup.c	19 Jan 2004 22:16:26 -0000	1.16
+++ arch/mips/sgi-ip32/ip32-setup.c	21 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	21 Jan 2004 08:00:26 -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
Index: include/asm-mips/ip32/mace.h
===================================================================
RCS file: /home/cvs/linux/include/asm-mips/ip32/mace.h,v
retrieving revision 1.7
diff -u -r1.7 mace.h
--- include/asm-mips/ip32/mace.h	20 Jan 2004 20:17:15 -0000	1.7
+++ include/asm-mips/ip32/mace.h	21 Jan 2004 08:00:26 -0000
@@ -21,7 +21,7 @@
 #define MACE_BASE	0x1f000000	/* physical */
 
 #undef BIT
-#define BIT(x)	(1 << (x))
+#define BIT(x) (1ULL << (x))
 
 #ifdef CONFIG_MIPS32
 typedef struct {
@@ -44,9 +44,9 @@
 #endif
 
 #define mace_read(r)	\
-	(sizeof(##r.reg) == 4 ? readl(&##r.reg) : readq(&##r.reg))
+	(sizeof(r.reg) == 4 ? readl(&r.reg) : readq(&r.reg))
 #define mace_write(v,r)	\
-	(sizeof(##r.reg) == 4 ? writel(v,&##r.reg) : writeq(v,&##r.reg))
+	(sizeof(r.reg) == 4 ? writel(v,&r.reg) : writeq(v,&r.reg))
 
 /*
  * PCI interface
@@ -157,9 +157,9 @@
 	mace32_t rx_fifo;
 };
 #define mace_eth_read(r)	\
-	mace_read(mace->eth.##r)
+	mace_read(mace->eth.r)
 #define mace_eth_write(v,r)	\
-	mace_write(v,mace->eth.##r)
+	mace_write(v,mace->eth.r)
 
 
 /* 
@@ -171,9 +171,9 @@
 	mace32_t xxx;	/* later... */
 };
 #define mace_perif_audio_read(r)	\
-	mace_read(mace->perif.audio.##r)
+	mace_read(mace->perif.audio.r)
 #define mace_perif_audio_write(v,r)	\
-	mace_write(v,mace->perif.audio.##r)
+	mace_write(v,mace->perif.audio.r)
 
 /* ISA Control and DMA registers */
 struct mace_isactrl {
@@ -229,9 +229,9 @@
 	mace64_t dp_ram[0x400];
 };
 #define mace_perif_ctrl_read(r)		\
-	mace_read(mace->perif.ctrl.##r)
+	mace_read(mace->perif.ctrl.r)
 #define mace_perif_ctrl_write(v,r)	\
-	mace_write(v,mace->perif.ctrl.##r)
+	mace_write(v,mace->perif.ctrl.r)
 
 /* Keyboard & Mouse registers
  * -> drivers/input/serio/maceps2.c */
@@ -267,7 +267,7 @@
 	struct reg {
 		volatile unsigned int ust;
 		volatile unsigned int msc;
-	};
+	} reg;
 } timer_reg;
 
 struct mace_timers {