git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
arm26
/
kernel
/
semaphore.c
diff --git
a/arch/arm26/kernel/semaphore.c
b/arch/arm26/kernel/semaphore.c
index
60591a7
..
5447a06
100644
(file)
--- a/
arch/arm26/kernel/semaphore.c
+++ b/
arch/arm26/kernel/semaphore.c
@@
-12,7
+12,7
@@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-#include <linux/
config
.h>
+#include <linux/
module
.h>
#include <linux/sched.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/errno.h>
#include <linux/init.h>
@@
-55,7
+55,7
@@
void __up(struct semaphore *sem)
wake_up(&sem->wait);
}
wake_up(&sem->wait);
}
-static
spinlock_t semaphore_lock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(semaphore_lock)
;
void __sched __down(struct semaphore * sem)
{
void __sched __down(struct semaphore * sem)
{
@@
-179,7
+179,7
@@
int __down_trylock(struct semaphore * sem)
* registers (r0 to r3 and lr), but not ip, as we use it as a return
* value in some cases..
*/
* registers (r0 to r3 and lr), but not ip, as we use it as a return
* value in some cases..
*/
-asm(" .section .sched.text
\n\
+asm(" .section .sched.text
, #alloc, #execinstr
\n\
.align 5 \n\
.globl __down_failed \n\
__down_failed: \n\
.align 5 \n\
.globl __down_failed \n\
__down_failed: \n\
@@
-215,3
+215,8
@@
__up_wakeup: \n\
ldmfd sp!, {r0 - r3, pc}^ \n\
");
ldmfd sp!, {r0 - r3, pc}^ \n\
");
+EXPORT_SYMBOL(__down_failed);
+EXPORT_SYMBOL(__down_interruptible_failed);
+EXPORT_SYMBOL(__down_trylock_failed);
+EXPORT_SYMBOL(__up_wakeup);
+