diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-17 23:32:45 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-17 23:32:45 +0000 |
| commit | bb382d1cd598a97151a0edf5ac26e36afb0a64ce (patch) | |
| tree | fd9f0ca1b31e5af2faa0d7165e6fd0fbb5524ebf /arch/mips64/kernel/scall_64.S | |
| parent | af38bda129551834653720f277a920d7d284bd3d (diff) | |
- IOC3 driver now will panic when encountering a RX/TX PCI DMA error.
- IOC3 driver does no longer use GFP_DMA which given the _very_ small
number of available GFP_DMA pages might have deadlocked the system.
- First cut of Origin support. Last minute change: Do no longer use
ARC memory / MD hub memory configuration information but klconfig.h
stuff. Simpler, faster, shorter.
- Zillions of MIPS64 fixes.
Diffstat (limited to 'arch/mips64/kernel/scall_64.S')
| -rw-r--r-- | arch/mips64/kernel/scall_64.S | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/mips64/kernel/scall_64.S b/arch/mips64/kernel/scall_64.S index 27ce842e9..3d49cbe07 100644 --- a/arch/mips64/kernel/scall_64.S +++ b/arch/mips64/kernel/scall_64.S @@ -7,6 +7,7 @@ * Copyright (C) 1995, 1996, 1997, 1998, 1999 by Ralf Baechle * Copyright (C) 1999 Silicon Graphics, Inc. */ +#include <linux/config.h> #include <asm/asm.h> #include <linux/errno.h> #include <asm/current.h> @@ -24,6 +25,10 @@ /* Highest syscall handled here. */ #define MAX_SYSCALL_NO __NR_Linux + __NR_Linux_syscalls +#ifndef CONFIG_MIPS32_COMPAT +#define handle_sys64 handle_sys +#endif + .align 5 NESTED(handle_sys64, PT_SIZE, sp) @@ -55,8 +60,7 @@ NESTED(handle_sys64, PT_SIZE, sp) sd v0, PT_R0(sp) # set flag for syscall restarting 1: sd v0, PT_R2(sp) # result -EXPORT(ret_from_sys_call_64) - .type ret_from_sys_call_64,@function +FEXPORT(ret_from_sys_call_64) ld t0, bh_mask ld t1, bh_active # unused delay slot and t0, t1 |