mtd/include/linux/mtd compatmac.h,1.60,1.61

David Woodhouse dwmw2 at infradead.org
Mon Oct 13 16:56:50 EDT 2003


Update of /home/cvs/mtd/include/linux/mtd
In directory phoenix.infradead.org:/tmp/cvs-serv4831/mtd

Modified Files:
	compatmac.h 
Log Message:
Remove disallow_signal() and dequeue_signal_lock() for the 2.6 case.
Add suspend.h compat.


Index: compatmac.h
===================================================================
RCS file: /home/cvs/mtd/include/linux/mtd/compatmac.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- compatmac.h	11 Oct 2003 11:46:59 -0000	1.60
+++ compatmac.h	13 Oct 2003 20:56:48 -0000	1.61
@@ -126,49 +126,8 @@
 #undef sighand
 #undef sigmask_lock
 
-#else /* for 2.6... */
-static inline int dequeue_signal_lock(struct task_struct *tsk, sigset_t *mask, siginfo_t *info)
-{
-	unsigned long flags;
-	unsigned long ret;
-
-	spin_lock_irqsave(&current->sighand->siglock, flags);
-	ret = dequeue_signal(tsk, mask, info);
-	spin_unlock_irqrestore(&current->sighand->siglock, flags);
-
-	return ret;
-}
-
-
-static inline int allow_signal_fixed(int sig)
-{
-	if (sig < 1 || sig > _NSIG)
-		return -EINVAL;
-
-	spin_lock_irq(&current->sighand->siglock);
-	sigdelset(&current->blocked, sig);
-	recalc_sigpending();
-	/* Make sure the kernel neither eats it now converts to SIGKILL */
-	current->sig->action[sig-1].sa.sa_handler = 2;
-	spin_unlock_irq(&current->sighand->siglock);
-	return 0;
-}
-
-static inline int disallow_signal(int sig)
-{
-	if (sig < 1 || sig > _NSIG)
-		return -EINVAL;
-
-	spin_lock_irq(&current->sighand->siglock);
-	sigaddset(&current->blocked, sig);
-	recalc_sigpending();
-
-	current->sig->action[sig-1].sa.sa_handler = SIG_DFL;
-	spin_unlock_irq(&current->sighand->siglock);
-	return 0;
-
-}
-
+#define PF_FREEZE 0
+#define refrigerator(x) do { ; } while(0)
 #endif
 
 	/* Module bits */




More information about the linux-mtd-cvs mailing list