diff options
| author | Harald Koerfgen <hkoerfg@web.de> | 2000-05-16 14:00:47 +0000 |
|---|---|---|
| committer | Harald Koerfgen <hkoerfg@web.de> | 2000-05-16 14:00:47 +0000 |
| commit | f9055aeda90fec2eb7ce0c49382e51b87f6a4fc9 (patch) | |
| tree | 1150c561a37fcb28c79d1b9d3288e6aea05d64d9 /include | |
| parent | 840ea4e54f944971741e0bf4b1b9d9f6f417634d (diff) | |
Some small fixes and cleanups:
o superfluidous #ifdef __KERNEL__ in include/asm-mips/socket.h removed
o we don't need a little endian version of waking_non_zero_interruptible()
o arch/mips/config.in fixes and improvements
o compile floppy/kbd/ide support only when the CONFIG options are set
o IP22s aren't the only MIPS boxes without a PC speaker
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/semaphore-helper.h | 42 | ||||
| -rw-r--r-- | include/asm-mips/socket.h | 2 |
2 files changed, 0 insertions, 44 deletions
diff --git a/include/asm-mips/semaphore-helper.h b/include/asm-mips/semaphore-helper.h index 6b9c6ba3f..b6eb8e4f9 100644 --- a/include/asm-mips/semaphore-helper.h +++ b/include/asm-mips/semaphore-helper.h @@ -133,8 +133,6 @@ waking_non_zero_interruptible(struct semaphore *sem, struct task_struct *tsk) { long ret, tmp; -#ifdef __MIPSEB__ - __asm__ __volatile__(" .set push .set mips3 @@ -159,46 +157,6 @@ waking_non_zero_interruptible(struct semaphore *sem, struct task_struct *tsk) : "=&r"(ret), "=&r"(tmp), "=m"(*sem) : "r"(signal_pending(tsk)), "i"(-EINTR)); -#elif defined(__MIPSEL__) - - __asm__ __volatile__(" - .set mips3 - .set push - .set noat -0: - lld %1, %2 - li %0, 0 - blez %1, 1f - dli $1, 0x0000000100000000 - dsubu %1, %1, $1 - li %0, 1 - b 2f -1: - beqz %3, 2f - li %0, %4 - /* - * It would be nice to assume that sem->count - * is != -1, but we will guard against that case - */ - daddiu $1, %1, 1 - dsll32 $1, $1, 0 - dsrl32 $1, $1, 0 - dsrl32 %1, %1, 0 - dsll32 %1, %1, 0 - or %1, %1, $1 -2: - scd %1, %2 - beqz %1, 0b - - .set pop - .set mips0" - : "=&r"(ret), "=&r"(tmp), "=m"(*sem) - : "r"(signal_pending(tsk)), "i"(-EINTR)); - -#else -#error "MIPS but neither __MIPSEL__ nor __MIPSEB__?" -#endif - return ret; } diff --git a/include/asm-mips/socket.h b/include/asm-mips/socket.h index b98107cfe..c39e0d294 100644 --- a/include/asm-mips/socket.h +++ b/include/asm-mips/socket.h @@ -56,8 +56,6 @@ To add: #define SO_REUSEPORT 0x0200 /* Allow local address and port reuse. */ #define SO_ATTACH_FILTER 26 #define SO_DETACH_FILTER 27 -#ifdef __KERNEL__ - #define SO_PEERNAME 28 /* Nast libc5 fixup - bletch */ |