From 529c593ece216e4aaffd36bd940cb94f1fa63129 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 23 Feb 2000 00:40:54 +0000 Subject: Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c driver due to the Origin A64 hacks. --- arch/mips64/defconfig | 4 +++- arch/mips64/defconfig-ip22 | 1 - arch/mips64/defconfig-ip27 | 4 +++- arch/mips64/kernel/entry.S | 25 +++++++++++++------------ arch/mips64/kernel/scall_64.S | 12 ++++++------ arch/mips64/kernel/scall_o32.S | 14 +++++++------- arch/mips64/mm/init.c | 9 ++------- 7 files changed, 34 insertions(+), 35 deletions(-) (limited to 'arch/mips64') diff --git a/arch/mips64/defconfig b/arch/mips64/defconfig index 971b6aae6..039ffd84f 100644 --- a/arch/mips64/defconfig +++ b/arch/mips64/defconfig @@ -127,7 +127,9 @@ CONFIG_SCSI=y # SCSI support type (disk, tape, CD-ROM) # CONFIG_BLK_DEV_SD=y +CONFIG_SD_EXTRA_DEVS=40 # CONFIG_CHR_DEV_ST is not set +CONFIG_ST_EXTRA_DEVS=2 # CONFIG_BLK_DEV_SR is not set # CONFIG_CHR_DEV_SG is not set @@ -178,6 +180,7 @@ CONFIG_BLK_DEV_SD=y # CONFIG_SCSI_QLOGIC_FAS is not set CONFIG_SCSI_QLOGIC_ISP=y # CONFIG_SCSI_QLOGIC_FC is not set +# CONFIG_SCSI_QLOGIC_1280 is not set # CONFIG_SCSI_SEAGATE is not set # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_T128 is not set @@ -333,7 +336,6 @@ CONFIG_SERIAL_CONSOLE=y # CONFIG_AFFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_BFS_FS is not set -# CONFIG_BFS_FS_WRITE is not set # CONFIG_FAT_FS is not set # CONFIG_MSDOS_FS is not set # CONFIG_UMSDOS_FS is not set diff --git a/arch/mips64/defconfig-ip22 b/arch/mips64/defconfig-ip22 index 43206114d..1d8f9c8f6 100644 --- a/arch/mips64/defconfig-ip22 +++ b/arch/mips64/defconfig-ip22 @@ -255,7 +255,6 @@ CONFIG_VT_CONSOLE=y # CONFIG_AFFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_BFS_FS is not set -# CONFIG_BFS_FS_WRITE is not set # CONFIG_FAT_FS is not set # CONFIG_MSDOS_FS is not set # CONFIG_UMSDOS_FS is not set diff --git a/arch/mips64/defconfig-ip27 b/arch/mips64/defconfig-ip27 index 971b6aae6..039ffd84f 100644 --- a/arch/mips64/defconfig-ip27 +++ b/arch/mips64/defconfig-ip27 @@ -127,7 +127,9 @@ CONFIG_SCSI=y # SCSI support type (disk, tape, CD-ROM) # CONFIG_BLK_DEV_SD=y +CONFIG_SD_EXTRA_DEVS=40 # CONFIG_CHR_DEV_ST is not set +CONFIG_ST_EXTRA_DEVS=2 # CONFIG_BLK_DEV_SR is not set # CONFIG_CHR_DEV_SG is not set @@ -178,6 +180,7 @@ CONFIG_BLK_DEV_SD=y # CONFIG_SCSI_QLOGIC_FAS is not set CONFIG_SCSI_QLOGIC_ISP=y # CONFIG_SCSI_QLOGIC_FC is not set +# CONFIG_SCSI_QLOGIC_1280 is not set # CONFIG_SCSI_SEAGATE is not set # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_T128 is not set @@ -333,7 +336,6 @@ CONFIG_SERIAL_CONSOLE=y # CONFIG_AFFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_BFS_FS is not set -# CONFIG_BFS_FS_WRITE is not set # CONFIG_FAT_FS is not set # CONFIG_MSDOS_FS is not set # CONFIG_UMSDOS_FS is not set diff --git a/arch/mips64/kernel/entry.S b/arch/mips64/kernel/entry.S index 1206a68c3..b869ed96b 100644 --- a/arch/mips64/kernel/entry.S +++ b/arch/mips64/kernel/entry.S @@ -1,4 +1,4 @@ -/* $Id: entry.S,v 1.6 1999/11/23 17:12:49 ralf Exp $ +/* $Id: entry.S,v 1.4 2000/01/17 23:32:46 ralf Exp $ * * 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 @@ -6,18 +6,14 @@ * * Low level exception handling * - * Copyright (C) 1994 - 1999 by Ralf Baechle - * Copyright (C) 1999 Silicon Graphics + * Copyright (C) 1994 - 2000 by Ralf Baechle + * Copyright (C) 1999, 2000 Silicon Graphics */ #include #include #include #include -/* - * Heia ... The %lo, %hi and %HI stuff is too strong for the ELF assembler - * and the ABI to cope with ... - */ .text .set noreorder .align 4 @@ -26,8 +22,8 @@ FEXPORT(ret_from_fork) move a0, v0 # prev j ret_from_sys_call nop -FEXPORT(handle_bottom_half) - jal do_bottom_half +FEXPORT(handle_softirq) + jal do_softirq nop b 9f nop @@ -37,10 +33,15 @@ reschedule: jal schedule FEXPORT(ret_from_sys_call) FEXPORT(ret_from_irq) - ld t0, bh_mask - ld t1, bh_active # unused delay slot +#ifdef __SMP__ +#error Barffff... +#else + la t1, softirq_state +#endif + lw t0, 0 (t1) + lw t1, 4 (t1) # unused delay slot and t0, t1 - bnez t0, handle_bottom_half + bnez t0, handle_softirq 9: ld t0, PT_STATUS(sp) # returning to kernel mode? andi t1, t0, 0x10 diff --git a/arch/mips64/kernel/scall_64.S b/arch/mips64/kernel/scall_64.S index 34ff47b4d..d739e50c1 100644 --- a/arch/mips64/kernel/scall_64.S +++ b/arch/mips64/kernel/scall_64.S @@ -1,4 +1,4 @@ -/* $Id: scall_64.S,v 1.5 2000/01/24 01:34:16 ralf Exp $ +/* $Id: scall_64.S,v 1.6 2000/02/18 00:24:30 ralf Exp $ * * 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 @@ -66,10 +66,10 @@ NESTED(handle_sys64, PT_SIZE, sp) 1: sd v0, PT_R2(sp) # result FEXPORT(ret_from_sys_call_64) - ld t0, bh_mask - ld t1, bh_active # unused delay slot + lw t0, softirq_state + lw t1, softirq_state+4 # unused delay slot and t0, t1 - bnez t0, handle_bottom_half_64 + bnez t0, handle_softirq_64 9: ld t0, PT_STATUS(sp) # returning to kernel mode? andi t1, t0, 0x10 @@ -90,8 +90,8 @@ return_64: eret .set mips0 -handle_bottom_half_64: - jal do_bottom_half +handle_softirq_64: + jal do_softirq b 9b reschedule_64: SAVE_STATIC diff --git a/arch/mips64/kernel/scall_o32.S b/arch/mips64/kernel/scall_o32.S index 57ec8bd53..4ee2cbace 100644 --- a/arch/mips64/kernel/scall_o32.S +++ b/arch/mips64/kernel/scall_o32.S @@ -1,4 +1,4 @@ -/* $Id: scall_o32.S,v 1.6 2000/02/05 06:47:09 ralf Exp $ +/* $Id: scall_o32.S,v 1.7 2000/02/18 00:24:30 ralf Exp $ * * 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 @@ -74,10 +74,10 @@ stack_done: 1: sd v0, PT_R2(sp) # result FEXPORT(o32_ret_from_sys_call) - ld t0,bh_mask - ld t1,bh_active # unused delay slot - and t0,t1 - bnez t0,o32_handle_bottom_half + lw t0, softirq_state + lw t1, softirq_state+4 # unused delay slot + and t0, t1 + bnez t0, o32_handle_softirq 9: ld t0,PT_STATUS(sp) # returning to kernel mode? andi t1, t0, 0x10 @@ -98,8 +98,8 @@ o32_return: eret .set mips0 -o32_handle_bottom_half: - jal do_bottom_half +o32_handle_softirq: + jal do_softirq b 9b o32_reschedule: SAVE_STATIC diff --git a/arch/mips64/mm/init.c b/arch/mips64/mm/init.c index 000ba906f..2ff7865ad 100644 --- a/arch/mips64/mm/init.c +++ b/arch/mips64/mm/init.c @@ -1,4 +1,4 @@ -/* $Id: init.c,v 1.11 2000/02/04 07:40:24 ralf Exp $ +/* $Id: init.c,v 1.12 2000/02/10 02:03:59 kanoj Exp $ * * 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 @@ -40,8 +40,6 @@ unsigned long totalram_pages = 0; -extern void show_net_buffers(void); - void __bad_pte_kernel(pmd_t *pmd) { printk("Bad pmd in pte_alloc_kernel: %08lx\n", pmd_val(*pmd)); @@ -332,9 +330,6 @@ void show_mem(void) printk("%ld pages in page table cache\n", pgtable_cache_size); printk("%d free pages\n", free); show_buffers(); -#ifdef CONFIG_NET - show_net_buffers(); -#endif } #ifndef CONFIG_DISCONTIGMEM @@ -345,7 +340,7 @@ extern char __init_begin, __init_end; void __init paging_init(void) { - unsigned int zones_size[MAX_NR_ZONES] = {0, 0, 0}; + unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0}; unsigned long max_dma, low; /* Initialize the entire pgd. */ -- cgit v1.2.3