Index: Makefile =================================================================== RCS file: /home/cvs/linux/Makefile,v retrieving revision 1.212 diff -u -r1.212 Makefile --- Makefile 19 Feb 2004 03:06:20 -0000 1.212 +++ Makefile 22 Feb 2004 08:00:02 -0000 @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 3 -EXTRAVERSION = +EXTRAVERSION = iluxa_minsetIP32 NAME=Feisty Dunnart # *DOCUMENTATION* Index: arch/mips/Makefile =================================================================== RCS file: /home/cvs/linux/arch/mips/Makefile,v retrieving revision 1.164 diff -u -r1.164 Makefile --- arch/mips/Makefile 22 Feb 2004 02:17:52 -0000 1.164 +++ arch/mips/Makefile 22 Feb 2004 08:00:16 -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) @@ -621,7 +622,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/kernel/ioctl32.c =================================================================== RCS file: /home/cvs/linux/arch/mips/kernel/ioctl32.c,v retrieving revision 1.16 diff -u -r1.16 ioctl32.c --- arch/mips/kernel/ioctl32.c 6 Feb 2004 13:15:48 -0000 1.16 +++ arch/mips/kernel/ioctl32.c 22 Feb 2004 08:00:19 -0000 @@ -937,7 +937,7 @@ }; IOCTL_TABLE_START -#include +//#include COMPATIBLE_IOCTL(TCGETA) COMPATIBLE_IOCTL(TCSETA) COMPATIBLE_IOCTL(TCSETAW) Index: drivers/scsi/aic7xxx/aic7xxx_osm_pci.c =================================================================== RCS file: /home/cvs/linux/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c,v retrieving revision 1.10 diff -u -r1.10 aic7xxx_osm_pci.c --- drivers/scsi/aic7xxx/aic7xxx_osm_pci.c 5 Feb 2004 02:40:03 -0000 1.10 +++ drivers/scsi/aic7xxx/aic7xxx_osm_pci.c 22 Feb 2004 08:00:33 -0000 @@ -312,7 +312,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 22 Feb 2004 08:00:39 -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