diff options
| author | Patrick Mochel <mochel@osdl.org> | 2002-09-24 03:26:44 -0700 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2002-09-24 03:26:44 -0700 |
| commit | cd585d2fff68c7295e524fb540a91cb4318394dc (patch) | |
| tree | 1e86e79f27df65b163f1861b69142df93affaea8 /include | |
| parent | f6bec0e641f80b097536fc4f8a1d8e7d2cc5c30b (diff) | |
| parent | a9ee74e7051a423db2f5c76723106d12fb756365 (diff) | |
Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-alpha/ide.h | 11 | ||||
| -rw-r--r-- | include/asm-alpha/rwsem.h | 10 | ||||
| -rw-r--r-- | include/asm-alpha/unistd.h | 12 |
3 files changed, 18 insertions, 15 deletions
diff --git a/include/asm-alpha/ide.h b/include/asm-alpha/ide.h index 0ca863142cf5..63bb9f785498 100644 --- a/include/asm-alpha/ide.h +++ b/include/asm-alpha/ide.h @@ -80,17 +80,6 @@ static __inline__ void ide_init_default_hwifs(void) #endif } -#define ide_request_irq(irq,hand,flg,dev,id) request_irq((irq),(hand),(flg),(dev),(id)) -#define ide_free_irq(irq,dev_id) free_irq((irq), (dev_id)) -#define ide_check_region(from,extent) check_region((from), (extent)) -#define ide_request_region(from,extent,name) request_region((from), (extent), (name)) -#define ide_release_region(from,extent) release_region((from), (extent)) - -#define ide_ack_intr(hwif) (1) -#define ide_fix_driveid(id) do {} while (0) -#define ide_release_lock(lock) do {} while (0) -#define ide_get_lock(lock, hdlr, data) do {} while (0) - #endif /* __KERNEL__ */ #endif /* __ASMalpha_IDE_H */ diff --git a/include/asm-alpha/rwsem.h b/include/asm-alpha/rwsem.h index d98ba565ecb4..c3abe5d2d41b 100644 --- a/include/asm-alpha/rwsem.h +++ b/include/asm-alpha/rwsem.h @@ -93,14 +93,16 @@ static inline void __down_read(struct rw_semaphore *sem) */ static inline int __down_read_trylock(struct rw_semaphore *sem) { - long res, tmp; + long old, new, res; res = sem->count; do { - tmp = res + RWSEM_ACTIVE_READ_BIAS; - if (tmp <= 0) + new = res + RWSEM_ACTIVE_READ_BIAS; + if (new <= 0) break; - } while (cmpxchg(&sem->count, res, tmp) != res); + old = res; + res = cmpxchg(&sem->count, old, new); + } while (res != old); return res >= 0 ? 1 : 0; } diff --git a/include/asm-alpha/unistd.h b/include/asm-alpha/unistd.h index 33abc3bd434a..23eb6d2eb42d 100644 --- a/include/asm-alpha/unistd.h +++ b/include/asm-alpha/unistd.h @@ -331,6 +331,18 @@ #define __NR_removexattr 391 #define __NR_lremovexattr 392 #define __NR_fremovexattr 393 +#define __NR_futex 394 +#define __NR_sched_setaffinity 395 +#define __NR_sched_getaffinity 396 +#define __NR_tuxcall 397 +#define __NR_io_setup 398 +#define __NR_io_destroy 399 +#define __NR_io_getevents 400 +#define __NR_io_submit 401 +#define __NR_io_cancel 402 +#define __NR_alloc_hugepages 403 +#define __NR_free_hugepages 404 +#define __NR_exit_group 405 #if defined(__GNUC__) |