summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-11-28 03:58:46 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-11-28 03:58:46 +0000
commitb63ad0882a16a5d28003e57f2b0b81dee3fb322b (patch)
tree0a343ce219e2b8b38a5d702d66032c57b83d9720 /arch/mips
parenta9d7bff9a84dba79609a0002e5321b74c4d64c64 (diff)
Merge with 2.4.0-test11.
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/config.in4
-rw-r--r--arch/mips/defconfig2
-rw-r--r--arch/mips/defconfig-atlas2
-rw-r--r--arch/mips/defconfig-ddb54767
-rw-r--r--arch/mips/defconfig-decstation2
-rw-r--r--arch/mips/defconfig-ev961009
-rw-r--r--arch/mips/defconfig-ip222
-rw-r--r--arch/mips/defconfig-malta2
-rw-r--r--arch/mips/defconfig-orion2
-rw-r--r--arch/mips/defconfig-rm2002
-rw-r--r--arch/mips/kernel/semaphore.c6
11 files changed, 31 insertions, 9 deletions
diff --git a/arch/mips/config.in b/arch/mips/config.in
index 65cb90b3d..a5486d93a 100644
--- a/arch/mips/config.in
+++ b/arch/mips/config.in
@@ -40,6 +40,7 @@ unset CONFIG_VIDEO_G364
unset CONFIG_PC_KEYB
unset CONFIG_I8259
+define_bool CONFIG_MCA n
define_bool CONFIG_SBUS n
if [ "$CONFIG_MIPS_EV96100" = "y" ]; then
@@ -103,6 +104,9 @@ fi
if [ "$CONFIG_ISA" != "y" ]; then
define_bool CONFIG_ISA n
+ define_bool CONFIG_EISA n
+else
+ define_bool CONFIG_EISA y
fi
if [ "$CONFIG_PCI" != "y" ]; then
diff --git a/arch/mips/defconfig b/arch/mips/defconfig
index 534d17b1d..6b9ae3b5b 100644
--- a/arch/mips/defconfig
+++ b/arch/mips/defconfig
@@ -24,12 +24,14 @@ CONFIG_EXPERIMENTAL=y
# CONFIG_OLIVETTI_M700 is not set
CONFIG_SGI_IP22=y
# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_MCA is not set
# CONFIG_SBUS is not set
CONFIG_ARC32=y
CONFIG_BOARD_SCACHE=y
CONFIG_PC_KEYB=y
CONFIG_SGI=y
# CONFIG_ISA is not set
+# CONFIG_EISA is not set
# CONFIG_PCI is not set
# CONFIG_I8259 is not set
diff --git a/arch/mips/defconfig-atlas b/arch/mips/defconfig-atlas
index b7c45f78c..af230e0c5 100644
--- a/arch/mips/defconfig-atlas
+++ b/arch/mips/defconfig-atlas
@@ -24,10 +24,12 @@ CONFIG_MIPS_ATLAS=y
# CONFIG_OLIVETTI_M700 is not set
# CONFIG_SGI_IP22 is not set
# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_MCA is not set
# CONFIG_SBUS is not set
CONFIG_PCI=y
# CONFIG_ISA is not set
# CONFIG_ISA is not set
+# CONFIG_EISA is not set
# CONFIG_I8259 is not set
#
diff --git a/arch/mips/defconfig-ddb5476 b/arch/mips/defconfig-ddb5476
index 77130d7da..b4aa2ccde 100644
--- a/arch/mips/defconfig-ddb5476
+++ b/arch/mips/defconfig-ddb5476
@@ -24,12 +24,14 @@ CONFIG_DDB5476=y
# CONFIG_OLIVETTI_M700 is not set
# CONFIG_SGI_IP22 is not set
# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_MCA is not set
# CONFIG_SBUS is not set
CONFIG_I8259=y
CONFIG_ISA=y
CONFIG_PCI=y
CONFIG_PC_KEYB=y
CONFIG_ROTTEN_IRQ=y
+CONFIG_EISA=y
#
# Loadable module support
@@ -283,8 +285,8 @@ CONFIG_NET_PCI=y
# CONFIG_AC3200 is not set
# CONFIG_APRICOT is not set
# CONFIG_CS89x0 is not set
-# CONFIG_DE4X5 is not set
CONFIG_TULIP=y
+# CONFIG_DE4X5 is not set
# CONFIG_DGRS is not set
# CONFIG_DM9102 is not set
CONFIG_EEPRO100=y
@@ -294,14 +296,15 @@ CONFIG_EEPRO100=y
CONFIG_NE2K_PCI=y
# CONFIG_NE3210 is not set
# CONFIG_ES3210 is not set
-# CONFIG_RTL8129 is not set
# CONFIG_8139TOO is not set
+# CONFIG_RTL8129 is not set
# CONFIG_SIS900 is not set
# CONFIG_EPIC100 is not set
# CONFIG_SUNDANCE is not set
# CONFIG_TLAN is not set
# CONFIG_VIA_RHINE is not set
# CONFIG_WINBOND_840 is not set
+# CONFIG_HAPPYMEAL is not set
# CONFIG_LAN_SAA9730 is not set
# CONFIG_NET_POCKET is not set
diff --git a/arch/mips/defconfig-decstation b/arch/mips/defconfig-decstation
index d264f047a..751bd10e3 100644
--- a/arch/mips/defconfig-decstation
+++ b/arch/mips/defconfig-decstation
@@ -24,8 +24,10 @@ CONFIG_DECSTATION=y
# CONFIG_OLIVETTI_M700 is not set
# CONFIG_SGI_IP22 is not set
# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_MCA is not set
# CONFIG_SBUS is not set
# CONFIG_ISA is not set
+# CONFIG_EISA is not set
# CONFIG_PCI is not set
# CONFIG_I8259 is not set
diff --git a/arch/mips/defconfig-ev96100 b/arch/mips/defconfig-ev96100
index 44eeaa0e1..acce83979 100644
--- a/arch/mips/defconfig-ev96100
+++ b/arch/mips/defconfig-ev96100
@@ -24,10 +24,12 @@ CONFIG_MIPS_EV96100=y
# CONFIG_OLIVETTI_M700 is not set
# CONFIG_SGI_IP22 is not set
# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_MCA is not set
# CONFIG_SBUS is not set
CONFIG_PCI=y
CONFIG_MIPS_GT96100=y
# CONFIG_ISA is not set
+# CONFIG_EISA is not set
# CONFIG_I8259 is not set
#
@@ -211,27 +213,28 @@ CONFIG_MIPS_GT96100ETH=y
CONFIG_NET_PCI=y
# CONFIG_PCNET32 is not set
# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_AC3200 is not set
# CONFIG_APRICOT is not set
# CONFIG_CS89x0 is not set
-# CONFIG_DE4X5 is not set
CONFIG_TULIP=y
+# CONFIG_DE4X5 is not set
# CONFIG_DGRS is not set
# CONFIG_DM9102 is not set
# CONFIG_EEPRO100 is not set
+# CONFIG_EEPRO100_PM is not set
# CONFIG_LNE390 is not set
# CONFIG_NATSEMI is not set
# CONFIG_NE2K_PCI is not set
# CONFIG_NE3210 is not set
# CONFIG_ES3210 is not set
-# CONFIG_RTL8129 is not set
# CONFIG_8139TOO is not set
+# CONFIG_RTL8129 is not set
# CONFIG_SIS900 is not set
# CONFIG_EPIC100 is not set
# CONFIG_SUNDANCE is not set
# CONFIG_TLAN is not set
# CONFIG_VIA_RHINE is not set
# CONFIG_WINBOND_840 is not set
+# CONFIG_HAPPYMEAL is not set
# CONFIG_LAN_SAA9730 is not set
# CONFIG_NET_POCKET is not set
diff --git a/arch/mips/defconfig-ip22 b/arch/mips/defconfig-ip22
index 534d17b1d..6b9ae3b5b 100644
--- a/arch/mips/defconfig-ip22
+++ b/arch/mips/defconfig-ip22
@@ -24,12 +24,14 @@ CONFIG_EXPERIMENTAL=y
# CONFIG_OLIVETTI_M700 is not set
CONFIG_SGI_IP22=y
# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_MCA is not set
# CONFIG_SBUS is not set
CONFIG_ARC32=y
CONFIG_BOARD_SCACHE=y
CONFIG_PC_KEYB=y
CONFIG_SGI=y
# CONFIG_ISA is not set
+# CONFIG_EISA is not set
# CONFIG_PCI is not set
# CONFIG_I8259 is not set
diff --git a/arch/mips/defconfig-malta b/arch/mips/defconfig-malta
index 1e9f8e70b..08ae459c5 100644
--- a/arch/mips/defconfig-malta
+++ b/arch/mips/defconfig-malta
@@ -24,11 +24,13 @@ CONFIG_MIPS_MALTA=y
# CONFIG_OLIVETTI_M700 is not set
# CONFIG_SGI_IP22 is not set
# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_MCA is not set
# CONFIG_SBUS is not set
CONFIG_I8259=y
CONFIG_PCI=y
# CONFIG_ISA is not set
# CONFIG_ISA is not set
+# CONFIG_EISA is not set
#
# Loadable module support
diff --git a/arch/mips/defconfig-orion b/arch/mips/defconfig-orion
index 967043363..11f9353cf 100644
--- a/arch/mips/defconfig-orion
+++ b/arch/mips/defconfig-orion
@@ -24,8 +24,10 @@ CONFIG_ORION=y
# CONFIG_OLIVETTI_M700 is not set
# CONFIG_SGI_IP22 is not set
# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_MCA is not set
# CONFIG_SBUS is not set
# CONFIG_ISA is not set
+# CONFIG_EISA is not set
# CONFIG_PCI is not set
# CONFIG_I8259 is not set
diff --git a/arch/mips/defconfig-rm200 b/arch/mips/defconfig-rm200
index 5eb83f270..4881669c0 100644
--- a/arch/mips/defconfig-rm200
+++ b/arch/mips/defconfig-rm200
@@ -24,6 +24,7 @@ CONFIG_EXPERIMENTAL=y
# CONFIG_OLIVETTI_M700 is not set
# CONFIG_SGI_IP22 is not set
CONFIG_SNI_RM200_PCI=y
+# CONFIG_MCA is not set
# CONFIG_SBUS is not set
CONFIG_ARC32=y
CONFIG_I8259=y
@@ -31,6 +32,7 @@ CONFIG_ISA=y
CONFIG_PC_KEYB=y
CONFIG_PCI=y
CONFIG_ROTTEN_IRQ=y
+CONFIG_EISA=y
#
# Loadable module support
diff --git a/arch/mips/kernel/semaphore.c b/arch/mips/kernel/semaphore.c
index 1f47bd929..5a9478f03 100644
--- a/arch/mips/kernel/semaphore.c
+++ b/arch/mips/kernel/semaphore.c
@@ -187,8 +187,7 @@ __down_write(struct rw_semaphore *sem, int count)
add_wait_queue_exclusive(&sem->wait, &wait);
while (atomic_read(&sem->count) < 0) {
- set_task_state(tsk, (TASK_UNINTERRUPTIBLE
- | TASK_EXCLUSIVE));
+ set_task_state(tsk, TASK_UNINTERRUPTIBLE);
if (atomic_read(&sem->count) >= RW_LOCK_BIAS)
break;
schedule();
@@ -208,8 +207,7 @@ __down_write(struct rw_semaphore *sem, int count)
while (1) {
if (test_and_clear_bit(1, &sem->granted))
break;
- set_task_state(tsk, (TASK_UNINTERRUPTIBLE
- | TASK_EXCLUSIVE));
+ set_task_state(tsk, TASK_UNINTERRUPTIBLE);
if ((sem->granted & 2) == 0)
schedule();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 02:32:37 +0000