Index: arch/mips/Kconfig =================================================================== RCS file: /home/cvs/linux/arch/mips/Kconfig,v retrieving revision 1.126 diff -u -r1.126 Kconfig --- arch/mips/Kconfig 27 Dec 2004 18:23:53 -0000 1.126 +++ arch/mips/Kconfig 1 Jan 2005 07:00:09 -0000 @@ -544,7 +544,7 @@ select DMA_NONCOHERENT select HW_HAS_PCI select R5000_CPU_SCACHE - select RM7000_CPU_SCACHE + #select RM7000_CPU_SCACHE help If you want this kernel to run on SGI O2 workstation, say Y here. Index: arch/mips/Makefile =================================================================== RCS file: /home/cvs/linux/arch/mips/Makefile,v retrieving revision 1.186 diff -u -r1.186 Makefile --- arch/mips/Makefile 18 Dec 2004 01:15:52 -0000 1.186 +++ arch/mips/Makefile 1 Jan 2005 07:00:09 -0000 @@ -49,7 +49,7 @@ endif ifdef CONFIG_CROSSCOMPILE -CROSS_COMPILE := $(tool-prefix) +CROSS_COMPILE := /crossdev/$(UTS_MACHINE)/bin/$(tool-prefix) endif ifdef CONFIG_BUILD_ELF64 @@ -58,7 +58,7 @@ vmlinux-32 = vmlinux.32 vmlinux-64 = vmlinux else -gas-abi = 32 +gas-abi = o64 ld-emul = $(32bit-emul) vmlinux-32 = vmlinux vmlinux-64 = vmlinux.64 @@ -118,7 +118,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 \ @@ -129,7 +129,7 @@ break; \ done; \ if test "$(gcc-abi)" != "$(gas-abi)"; then \ - gas_abi="-Wa,-$(gas-abi) -Wa,-mgp$(gcc-abi)"; \ + gas_abi="-Wa,-mabi=$(gas-abi) -Wa,-mgp$(gcc-abi)"; \ fi; \ if test "$$gcc_opt" = -march= && test -n "$$gcc_abi"; then \ $(CC) $$gcc_abi $$gcc_opt$$gcc_cpu -S -o /dev/null \ Index: arch/mips/kernel/signal_n32.c =================================================================== RCS file: /home/cvs/linux/arch/mips/kernel/signal_n32.c,v retrieving revision 1.11 diff -u -r1.11 signal_n32.c --- arch/mips/kernel/signal_n32.c 10 Dec 2004 12:43:09 -0000 1.11 +++ arch/mips/kernel/signal_n32.c 1 Jan 2005 07:00:10 -0000 @@ -73,8 +73,8 @@ struct ucontextn32 rs_uc; }; -extern int restore_sigcontext(struct pt_regs *regs, struct sigcontext *sc); -extern int inline setup_sigcontext(struct pt_regs *regs, struct sigcontext *sc); +//extern int restore_sigcontext(struct pt_regs *regs, struct sigcontext *sc); +//extern int inline setup_sigcontext(struct pt_regs *regs, struct sigcontext *sc); save_static_function(sysn32_rt_sigreturn); __attribute_used__ noinline static void Index: arch/mips/sgi-ip32/ip32-reset.c =================================================================== RCS file: /home/cvs/linux/arch/mips/sgi-ip32/ip32-reset.c,v retrieving revision 1.8 diff -u -r1.8 ip32-reset.c --- arch/mips/sgi-ip32/ip32-reset.c 31 Aug 2004 16:49:32 -0000 1.8 +++ arch/mips/sgi-ip32/ip32-reset.c 1 Jan 2005 07:00:11 -0000 @@ -189,6 +189,7 @@ _machine_restart = ip32_machine_restart; _machine_halt = ip32_machine_halt; _machine_power_off = ip32_machine_power_off; + return 0; request_irq(MACEISA_RTC_IRQ, ip32_rtc_int, 0, "rtc", NULL); init_timer(&blink_timer); blink_timer.function = blink_timeout; Index: drivers/scsi/aic7xxx/aic7xxx_osm_pci.c =================================================================== RCS file: /home/cvs/linux/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c,v retrieving revision 1.13 diff -u -r1.13 aic7xxx_osm_pci.c --- drivers/scsi/aic7xxx/aic7xxx_osm_pci.c 27 Dec 2004 02:16:00 -0000 1.13 +++ drivers/scsi/aic7xxx/aic7xxx_osm_pci.c 1 Jan 2005 07:00:21 -0000 @@ -367,7 +367,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: drivers/video/gbefb.c =================================================================== RCS file: /home/cvs/linux/drivers/video/gbefb.c,v retrieving revision 1.13 diff -u -r1.13 gbefb.c --- drivers/video/gbefb.c 21 Nov 2004 17:13:11 -0000 1.13 +++ drivers/video/gbefb.c 1 Jan 2005 07:00:23 -0000 @@ -18,7 +18,6 @@ #include #include #include -#include #include #ifdef CONFIG_X86 @@ -1133,6 +1132,7 @@ } gbe = (struct sgi_gbe *) ioremap(GBE_BASE, sizeof(struct sgi_gbe)); + printk("GBE INIT\n"); if (!gbe) { printk(KERN_ERR "gbefb: couldn't map mmio region\n"); ret = -ENXIO; Index: kernel/kallsyms.c =================================================================== RCS file: /home/cvs/linux/kernel/kallsyms.c,v retrieving revision 1.18 diff -u -r1.18 kallsyms.c --- kernel/kallsyms.c 25 Oct 2004 20:44:47 -0000 1.18 +++ kernel/kallsyms.c 1 Jan 2005 07:00:33 -0000 @@ -149,7 +149,7 @@ if (is_kernel_text(addr) || is_kernel_inittext(addr)) { unsigned long symbol_end=0; - +addr&=0xffffffffUL; /* do a binary search on the sorted kallsyms_addresses array */ low = 0; high = kallsyms_num_syms; --- /dev/null 1969-12-31 16:00:00.000000000 -0800 +++ include/asm-mips/mach-ip32/spaces.h 2004-10-14 19:09:12.000000000 -0700 @@ -0,0 +1,42 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + * + * Copyright (C) 1994 - 1999, 2000, 03, 04 Ralf Baechle + * Copyright (C) 2000, 2002 Maciej W. Rozycki + * Copyright (C) 1990, 1999, 2000 Silicon Graphics, Inc. + */ +#ifndef _ASM_MACH_IP32_SPACES_H +#define _ASM_MACH_IP32_SPACES_H + +#include + +/* + * This handles the memory map. + */ +#define PAGE_OFFSET 0xffffffff80000000 + +/* + * Memory above this physical address will be considered highmem. + * Fixme: 59 bits is a fictive number and makes assumptions about processors + * in the distant future. Nobody will care for a few years :-) + */ +#ifndef HIGHMEM_START +#define HIGHMEM_START (1UL << 59UL) +#endif + +#ifdef CONFIG_DMA_NONCOHERENT +#define CAC_BASE 0x9800000000000000 +#else +#define CAC_BASE 0xa800000000000000 +#endif +#define IO_BASE 0x9000000000000000 +#define UNCAC_BASE 0x9000000000000000 +#define MAP_BASE 0xc000000000000000 + +#define TO_PHYS(x) ( ((x) & TO_PHYS_MASK)) +#define TO_CAC(x) (CAC_BASE | ((x) & TO_PHYS_MASK)) +#define TO_UNCAC(x) (UNCAC_BASE | ((x) & TO_PHYS_MASK)) + +#endif /* __ASM_MACH_IP32_SPACES_H */