--- zzzz-none-000/linux-2.6.19.2/include/asm-parisc/semaphore.h	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/include/asm-parisc/semaphore.h	2007-01-11 07:38:19.000000000 +0000
@@ -115,8 +115,7 @@
  */
 extern __inline__ int down_trylock(struct semaphore * sem)
 {
-	unsigned long flags;
-	int count;
+	int flags, count;
 
 	spin_lock_irqsave(&sem->sentry, flags);
 	count = sem->count - 1;
@@ -132,8 +131,7 @@
  */
 extern __inline__ void up(struct semaphore * sem)
 {
-	unsigned long flags;
-
+	int flags;
 	spin_lock_irqsave(&sem->sentry, flags);
 	if (sem->count < 0) {
 		__up(sem);