OK Ingo,
This one is the last. Of the compat_semaphores in drivers that I looked
at, these were the trivial ones. The other ones I would not touch
unless I had hardware to test with, or the time to look deeper into it.
-- Steve
Index: linux-2.6.14-rt15/drivers/char/watchdog/cpu5wdt.c
===================================================================
--- linux-2.6.14-rt15.orig/drivers/char/watchdog/cpu5wdt.c 2005-11-25 10:14:09.000000000 -0500
+++ linux-2.6.14-rt15/drivers/char/watchdog/cpu5wdt.c 2005-11-25 16:57:31.000000000 -0500
@@ -28,6 +28,7 @@
#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/timer.h>
+#include <linux/completion.h>
#include <asm/io.h>
#include <asm/uaccess.h>
@@ -56,7 +57,7 @@
/* some device data */
static struct {
- struct compat_semaphore stop;
+ struct completion stop;
volatile int running;
struct timer_list timer;
volatile int queue;
@@ -84,7 +85,7 @@
}
else {
/* ticks doesn't matter anyway */
- up(&cpu5wdt_device.stop);
+ complete(&cpu5wdt_device.stop);
}
}
@@ -238,7 +239,7 @@
if ( !val )
printk(KERN_INFO PFX "sorry, was my fault\n");
- init_MUTEX_LOCKED(&cpu5wdt_device.stop);
+ init_completion(&cpu5wdt_device.stop);
cpu5wdt_device.queue = 0;
clear_bit(0, &cpu5wdt_device.inuse);
@@ -268,7 +269,7 @@
{
if ( cpu5wdt_device.queue ) {
cpu5wdt_device.queue = 0;
- down(&cpu5wdt_device.stop);
+ wait_for_completion(&cpu5wdt_device.stop);
}
misc_deregister(&cpu5wdt_misc);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
