summaryrefslogtreecommitdiffstats
path: root/arch/mips64
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips64')
-rw-r--r--arch/mips64/config.in4
-rw-r--r--arch/mips64/defconfig21
-rw-r--r--arch/mips64/defconfig-ip2214
-rw-r--r--arch/mips64/defconfig-ip2721
-rw-r--r--arch/mips64/kernel/scall_o32.S8
-rw-r--r--arch/mips64/lib/csum_partial_copy.c19
6 files changed, 62 insertions, 25 deletions
diff --git a/arch/mips64/config.in b/arch/mips64/config.in
index c1c3d59cf..e8833c51a 100644
--- a/arch/mips64/config.in
+++ b/arch/mips64/config.in
@@ -1,4 +1,4 @@
-# $Id: config.in,v 1.10 2000/01/31 21:57:09 kanoj Exp $
+# $Id: config.in,v 1.11 2000/02/04 07:40:23 ralf Exp $
#
# For a description of the syntax of this configuration file,
# see the Configure script.
@@ -108,6 +108,8 @@ if [ "$CONFIG_NET" = "y" ]; then
source net/Config.in
fi
+source drivers/telephony/Config.in
+
mainmenu_option next_comment
comment 'SCSI support'
diff --git a/arch/mips64/defconfig b/arch/mips64/defconfig
index 5d6d9f3d5..3fd8237b7 100644
--- a/arch/mips64/defconfig
+++ b/arch/mips64/defconfig
@@ -112,6 +112,12 @@ CONFIG_SKB_LARGE=y
# CONFIG_ATALK is not set
#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+# CONFIG_PHONE_IXJ is not set
+
+#
# SCSI support
#
CONFIG_SCSI=y
@@ -127,6 +133,7 @@ CONFIG_BLK_DEV_SD=y
#
# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
#
+# CONFIG_SCSI_DEBUG_QUEUES is not set
# CONFIG_SCSI_MULTI_LUN is not set
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
@@ -272,10 +279,20 @@ CONFIG_SERIAL_CONSOLE=y
# CONFIG_PPDEV is not set
#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
# Mice
#
# CONFIG_BUSMOUSE is not set
# CONFIG_MOUSE is not set
+
+#
+# Joysticks
+#
+# CONFIG_JOYSTICK is not set
# CONFIG_QIC02_TAPE is not set
#
@@ -301,7 +318,7 @@ CONFIG_SERIAL_CONSOLE=y
# CONFIG_DRM_TDFX is not set
#
-# Support for USB
+# USB support
#
# CONFIG_USB is not set
@@ -315,6 +332,7 @@ CONFIG_SERIAL_CONSOLE=y
# CONFIG_MSDOS_FS is not set
# CONFIG_UMSDOS_FS is not set
# CONFIG_VFAT_FS is not set
+# CONFIG_CRAMFS is not set
# CONFIG_ISO9660_FS is not set
# CONFIG_JOLIET is not set
# CONFIG_MINIX_FS is not set
@@ -345,6 +363,7 @@ CONFIG_LOCKD=y
# CONFIG_PARTITION_ADVANCED is not set
CONFIG_MSDOS_PARTITION=y
CONFIG_SGI_PARTITION=y
+# CONFIG_ULTRIX_PARTITION is not set
# CONFIG_SUN_PARTITION is not set
# CONFIG_NLS is not set
CONFIG_KCORE_ELF=y
diff --git a/arch/mips64/defconfig-ip22 b/arch/mips64/defconfig-ip22
index ebd6cb9d1..88f4eecd1 100644
--- a/arch/mips64/defconfig-ip22
+++ b/arch/mips64/defconfig-ip22
@@ -104,6 +104,12 @@ CONFIG_SKB_LARGE=y
# CONFIG_ATALK is not set
#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+# CONFIG_PHONE_IXJ is not set
+
+#
# SCSI support
#
# CONFIG_SCSI is not set
@@ -196,6 +202,11 @@ CONFIG_VT_CONSOLE=y
# CONFIG_PPDEV is not set
#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
# Mice
#
# CONFIG_BUSMOUSE is not set
@@ -230,7 +241,7 @@ CONFIG_VT_CONSOLE=y
# CONFIG_DRM_TDFX is not set
#
-# Support for USB
+# USB support
#
# CONFIG_USB is not set
@@ -244,6 +255,7 @@ CONFIG_VT_CONSOLE=y
# CONFIG_MSDOS_FS is not set
# CONFIG_UMSDOS_FS is not set
# CONFIG_VFAT_FS is not set
+# CONFIG_CRAMFS is not set
# CONFIG_ISO9660_FS is not set
# CONFIG_JOLIET is not set
# CONFIG_MINIX_FS is not set
diff --git a/arch/mips64/defconfig-ip27 b/arch/mips64/defconfig-ip27
index 5d6d9f3d5..3fd8237b7 100644
--- a/arch/mips64/defconfig-ip27
+++ b/arch/mips64/defconfig-ip27
@@ -112,6 +112,12 @@ CONFIG_SKB_LARGE=y
# CONFIG_ATALK is not set
#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+# CONFIG_PHONE_IXJ is not set
+
+#
# SCSI support
#
CONFIG_SCSI=y
@@ -127,6 +133,7 @@ CONFIG_BLK_DEV_SD=y
#
# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
#
+# CONFIG_SCSI_DEBUG_QUEUES is not set
# CONFIG_SCSI_MULTI_LUN is not set
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
@@ -272,10 +279,20 @@ CONFIG_SERIAL_CONSOLE=y
# CONFIG_PPDEV is not set
#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
# Mice
#
# CONFIG_BUSMOUSE is not set
# CONFIG_MOUSE is not set
+
+#
+# Joysticks
+#
+# CONFIG_JOYSTICK is not set
# CONFIG_QIC02_TAPE is not set
#
@@ -301,7 +318,7 @@ CONFIG_SERIAL_CONSOLE=y
# CONFIG_DRM_TDFX is not set
#
-# Support for USB
+# USB support
#
# CONFIG_USB is not set
@@ -315,6 +332,7 @@ CONFIG_SERIAL_CONSOLE=y
# CONFIG_MSDOS_FS is not set
# CONFIG_UMSDOS_FS is not set
# CONFIG_VFAT_FS is not set
+# CONFIG_CRAMFS is not set
# CONFIG_ISO9660_FS is not set
# CONFIG_JOLIET is not set
# CONFIG_MINIX_FS is not set
@@ -345,6 +363,7 @@ CONFIG_LOCKD=y
# CONFIG_PARTITION_ADVANCED is not set
CONFIG_MSDOS_PARTITION=y
CONFIG_SGI_PARTITION=y
+# CONFIG_ULTRIX_PARTITION is not set
# CONFIG_SUN_PARTITION is not set
# CONFIG_NLS is not set
CONFIG_KCORE_ELF=y
diff --git a/arch/mips64/kernel/scall_o32.S b/arch/mips64/kernel/scall_o32.S
index f7490a4be..7906258d2 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.4 2000/01/29 01:41:59 ralf Exp $
+/* $Id: scall_o32.S,v 1.5 2000/02/04 07:40:24 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
@@ -401,10 +401,12 @@ illegal_syscall:
sys sys_sendfile 3
sys sys_ni_syscall 0
sys sys_ni_syscall 0
- sys sys_getrlimit 2 /* 4210 */
- sys sys_mmap2 6
+ sys sys_mmap2 6 /* 4210 */
sys sys_truncate64 2
sys sys_ftruncate64 2
+ sys sys_stat64 3
+ sys sys_lstat64 3
+ sys sys_fstat64 3 /* 4210 */
.endm
.macro sys function, nargs
diff --git a/arch/mips64/lib/csum_partial_copy.c b/arch/mips64/lib/csum_partial_copy.c
index 9f08f405a..49607c466 100644
--- a/arch/mips64/lib/csum_partial_copy.c
+++ b/arch/mips64/lib/csum_partial_copy.c
@@ -1,4 +1,4 @@
-/* $Id: csum_partial_copy.c,v 1.1 1999/08/21 21:43:00 ralf Exp $
+/* $Id: csum_partial_copy.c,v 1.2 1999/12/04 03:59:00 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
@@ -48,20 +48,3 @@ unsigned int csum_partial_copy_from_user (const char *src, char *dst,
return csum_partial(dst, len, sum);
}
-
-/*
- * Copy to userspace and compute checksum.
- */
-unsigned int csum_partial_copy_to_user (const char *src, char *dst,
- int len, unsigned int sum,
- int *err_ptr)
-{
- sum = csum_partial(src, len, sum);
-
- if (copy_to_user(dst, src, len)) {
- *err_ptr = -EFAULT;
- return sum;
- }
-
- return sum;
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 08:50:42 +0000