diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /include/asm-i386/semaphore.h | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'include/asm-i386/semaphore.h')
| -rw-r--r-- | include/asm-i386/semaphore.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-i386/semaphore.h b/include/asm-i386/semaphore.h index 6a42b2142fd6..f7a0f310c524 100644 --- a/include/asm-i386/semaphore.h +++ b/include/asm-i386/semaphore.h | |||
| @@ -99,7 +99,7 @@ static inline void down(struct semaphore * sem) | |||
| 99 | might_sleep(); | 99 | might_sleep(); |
| 100 | __asm__ __volatile__( | 100 | __asm__ __volatile__( |
| 101 | "# atomic down operation\n\t" | 101 | "# atomic down operation\n\t" |
| 102 | LOCK "decl %0\n\t" /* --sem->count */ | 102 | LOCK_PREFIX "decl %0\n\t" /* --sem->count */ |
| 103 | "js 2f\n" | 103 | "js 2f\n" |
| 104 | "1:\n" | 104 | "1:\n" |
| 105 | LOCK_SECTION_START("") | 105 | LOCK_SECTION_START("") |
| @@ -123,7 +123,7 @@ static inline int down_interruptible(struct semaphore * sem) | |||
| 123 | might_sleep(); | 123 | might_sleep(); |
| 124 | __asm__ __volatile__( | 124 | __asm__ __volatile__( |
| 125 | "# atomic interruptible down operation\n\t" | 125 | "# atomic interruptible down operation\n\t" |
| 126 | LOCK "decl %1\n\t" /* --sem->count */ | 126 | LOCK_PREFIX "decl %1\n\t" /* --sem->count */ |
| 127 | "js 2f\n\t" | 127 | "js 2f\n\t" |
| 128 | "xorl %0,%0\n" | 128 | "xorl %0,%0\n" |
| 129 | "1:\n" | 129 | "1:\n" |
| @@ -148,7 +148,7 @@ static inline int down_trylock(struct semaphore * sem) | |||
| 148 | 148 | ||
| 149 | __asm__ __volatile__( | 149 | __asm__ __volatile__( |
| 150 | "# atomic interruptible down operation\n\t" | 150 | "# atomic interruptible down operation\n\t" |
| 151 | LOCK "decl %1\n\t" /* --sem->count */ | 151 | LOCK_PREFIX "decl %1\n\t" /* --sem->count */ |
| 152 | "js 2f\n\t" | 152 | "js 2f\n\t" |
| 153 | "xorl %0,%0\n" | 153 | "xorl %0,%0\n" |
| 154 | "1:\n" | 154 | "1:\n" |
| @@ -173,7 +173,7 @@ static inline void up(struct semaphore * sem) | |||
| 173 | { | 173 | { |
| 174 | __asm__ __volatile__( | 174 | __asm__ __volatile__( |
| 175 | "# atomic up operation\n\t" | 175 | "# atomic up operation\n\t" |
| 176 | LOCK "incl %0\n\t" /* ++sem->count */ | 176 | LOCK_PREFIX "incl %0\n\t" /* ++sem->count */ |
| 177 | "jle 2f\n" | 177 | "jle 2f\n" |
| 178 | "1:\n" | 178 | "1:\n" |
| 179 | LOCK_SECTION_START("") | 179 | LOCK_SECTION_START("") |