patch-2.4.19 linux-2.4.19/drivers/char/softdog.c

• Lines: 40
• Date: Fri Aug 2 17:39:43 2002
• Orig file: linux-2.4.18/drivers/char/softdog.c
• Orig date: Mon Feb 25 11:37:57 2002

diff -urN linux-2.4.18/drivers/char/softdog.c linux-2.4.19/drivers/char/softdog.c
@@ -68,7 +68,7 @@
 static struct timer_list watchdog_ticktock = {
 	function:	watchdog_fire,
 };
-static int timer_alive;
+static unsigned long timer_alive;
 
 
 /*
@@ -93,7 +93,7 @@
  
 static int softdog_open(struct inode *inode, struct file *file)
 {
-	if(timer_alive)
+	if(test_and_set_bit(0, &timer_alive))
 		return -EBUSY;
 #ifdef CONFIG_WATCHDOG_NOWAYOUT	 
 	MOD_INC_USE_COUNT;
@@ -102,7 +102,6 @@
 	 *	Activate timer
 	 */
 	mod_timer(&watchdog_ticktock, jiffies+(soft_margin*HZ));
-	timer_alive=1;
 	return 0;
 }
 
@@ -112,12 +111,10 @@
 	 *	Shut off the timer.
 	 * 	Lock it in if it's a module and we defined ...NOWAYOUT
 	 */
-	 lock_kernel();
 #ifndef CONFIG_WATCHDOG_NOWAYOUT	 
 	del_timer(&watchdog_ticktock);
 #endif	
-	timer_alive=0;
-	unlock_kernel();
+	clear_bit(0, &timer_alive);
 	return 0;
 }