diff options
| author | Richard Henderson <rth@fidel.sfbay.redhat.com> | 2002-02-21 01:52:42 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@fidel.sfbay.redhat.com> | 2002-02-21 01:52:42 -0800 |
| commit | 61a9bb47641d32a0842ac84651a85c9c48639356 (patch) | |
| tree | 60e3ddac219ad3ecacf4b50a3521073a2e04b516 /include/linux | |
| parent | eac94688e46e081de1c3b516ee3595d5d8a7c400 (diff) | |
| parent | 8d645041bd8f736e2a5e9bfb604ef42a18a9deeb (diff) | |
Merge ssh://are.twiddle.net/BK/axp-2.5
into fidel.sfbay.redhat.com:/fidel/ity/rth/linux/linus-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/highmem.h | 1 | ||||
| -rw-r--r-- | include/linux/spinlock.h | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/linux/highmem.h b/include/linux/highmem.h index bffa75c6ee5f..13f2c3e14172 100644 --- a/include/linux/highmem.h +++ b/include/linux/highmem.h @@ -4,6 +4,7 @@ #include <linux/config.h> #include <linux/bio.h> #include <linux/fs.h> +#include <asm/pgalloc.h> #ifdef CONFIG_HIGHMEM diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h index f2c5e5e99909..cd7428798399 100644 --- a/include/linux/spinlock.h +++ b/include/linux/spinlock.h @@ -84,12 +84,12 @@ #define SPIN_LOCK_UNLOCKED (spinlock_t) { 0 } #endif -#define spin_lock_init(lock) do { } while(0) +#define spin_lock_init(lock) do { (void)(lock); } while(0) #define _raw_spin_lock(lock) (void)(lock) /* Not "unused variable". */ -#define spin_is_locked(lock) (0) -#define _raw_spin_trylock(lock) ({1; }) -#define spin_unlock_wait(lock) do { } while(0) -#define _raw_spin_unlock(lock) do { } while(0) +#define spin_is_locked(lock) ((void)(lock), 0) +#define _raw_spin_trylock(lock) ((void)(lock), 1) +#define spin_unlock_wait(lock) do { (void)(lock); } while(0) +#define _raw_spin_unlock(lock) do { (void)(lock); } while(0) #elif (DEBUG_SPINLOCKS < 2) |