[2.6 patch] i386 semaphore.c: make 4 functions static

From: Adrian Bunk
Date: Sat Dec 11 2004 - 17:09:12 EST


The patch below makes four needlessly global functions static.


diffstat output:
arch/i386/kernel/semaphore.c | 8 ++++----
include/asm-i386/semaphore.h | 5 -----
2 files changed, 4 insertions(+), 9 deletions(-)


Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

--- linux-2.6.10-rc2-mm4-full/include/asm-i386/semaphore.h.old 2004-12-11 20:49:58.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/include/asm-i386/semaphore.h 2004-12-11 20:50:12.000000000 +0100
@@ -92,11 +92,6 @@
fastcall int __down_failed_trylock(void /* params in registers */);
fastcall void __up_wakeup(void /* special register calling convention */);

-fastcall void __down(struct semaphore * sem);
-fastcall int __down_interruptible(struct semaphore * sem);
-fastcall int __down_trylock(struct semaphore * sem);
-fastcall void __up(struct semaphore * sem);
-
/*
* This is ugly, but we want the default case to fall through.
* "__down_failed" is a special asm handler that calls the C
--- linux-2.6.10-rc2-mm4-full/arch/i386/kernel/semaphore.c.old 2004-12-07 02:30:44.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/arch/i386/kernel/semaphore.c 2004-12-11 21:47:26.000000000 +0100
@@ -49,12 +49,12 @@
* we cannot lose wakeup events.
*/

-fastcall void __up(struct semaphore *sem)
+static fastcall void __attribute_used__ __up(struct semaphore *sem)
{
wake_up(&sem->wait);
}

-fastcall void __sched __down(struct semaphore * sem)
+static fastcall void __attribute_used__ __sched __down(struct semaphore * sem)
{
struct task_struct *tsk = current;
DECLARE_WAITQUEUE(wait, tsk);
@@ -91,7 +91,7 @@
tsk->state = TASK_RUNNING;
}

-fastcall int __sched __down_interruptible(struct semaphore * sem)
+static fastcall int __attribute_used__ __sched __down_interruptible(struct semaphore * sem)
{
int retval = 0;
struct task_struct *tsk = current;
@@ -154,7 +154,7 @@
* single "cmpxchg" without failure cases,
* but then it wouldn't work on a 386.
*/
-fastcall int __down_trylock(struct semaphore * sem)
+static fastcall int __attribute_used__ __down_trylock(struct semaphore * sem)
{
int sleepers;
unsigned long flags;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/