sched: privatizes the sibling inlines to sched.c, the sole caller of them.

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 9c9717dd1cc1d207f8d2ed0f4e708158882c84de..afc7c0462ccd743a59c6a461bdfe7145177365a7 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -524,36 +524,6 @@ extern int kill_proc(pid_t, int, int);
 extern int do_sigaction(int, const struct k_sigaction *, struct k_sigaction *);
 extern int do_sigaltstack(const stack_t *, stack_t *, unsigned long);
 
-/*
- * Re-calculate pending state from the set of locally pending
- * signals, globally pending signals, and blocked signals.
- */
-static inline int has_pending_signals(sigset_t *signal, sigset_t *blocked)
-{
-       unsigned long ready;
-       long i;
-
-       switch (_NSIG_WORDS) {
-       default:
-               for (i = _NSIG_WORDS, ready = 0; --i >= 0 ;)
-                       ready |= signal->sig[i] &~ blocked->sig[i];
-               break;
-
-       case 4: ready  = signal->sig[3] &~ blocked->sig[3];
-               ready |= signal->sig[2] &~ blocked->sig[2];
-               ready |= signal->sig[1] &~ blocked->sig[1];
-               ready |= signal->sig[0] &~ blocked->sig[0];
-               break;
-
-       case 2: ready  = signal->sig[1] &~ blocked->sig[1];
-               ready |= signal->sig[0] &~ blocked->sig[0];
-               break;
-
-       case 1: ready  = signal->sig[0] &~ blocked->sig[0];
-       }
-       return ready != 0;
-}
-
 /* True if we are on the alternate signal stack.  */
 
 static inline int on_sig_stack(unsigned long sp)
@@ -639,30 +609,6 @@ extern void kick_if_running(task_t * p);
        add_parent(p, (p)->parent);                             \
        } while (0)
 
-static inline struct task_struct *eldest_child(struct task_struct *p)
-{
-       if (list_empty(&p->children)) return NULL;
-       return list_entry(p->children.next,struct task_struct,sibling);
-}
-
-static inline struct task_struct *youngest_child(struct task_struct *p)
-{
-       if (list_empty(&p->children)) return NULL;
-       return list_entry(p->children.prev,struct task_struct,sibling);
-}
-
-static inline struct task_struct *older_sibling(struct task_struct *p)
-{
-       if (p->sibling.prev==&p->parent->children) return NULL;
-       return list_entry(p->sibling.prev,struct task_struct,sibling);
-}
-
-static inline struct task_struct *younger_sibling(struct task_struct *p)
-{
-       if (p->sibling.next==&p->parent->children) return NULL;
-       return list_entry(p->sibling.next,struct task_struct,sibling);
-}
-
 #define next_task(p)   list_entry((p)->tasks.next, struct task_struct, tasks)
 #define prev_task(p)   list_entry((p)->tasks.prev, struct task_struct, tasks)
 

diff --git a/kernel/sched.c b/kernel/sched.c
index 35373ad017f56cfc2ba1ff049e38d76049ab3e26..6d0ac320bcbc86eb2e9bab3e4202f75503381601 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -1837,6 +1837,24 @@ out_unlock:
        return retval;
 }
 
+static inline struct task_struct *eldest_child(struct task_struct *p)
+{
+       if (list_empty(&p->children)) return NULL;
+       return list_entry(p->children.next,struct task_struct,sibling);
+}
+
+static inline struct task_struct *older_sibling(struct task_struct *p)
+{
+       if (p->sibling.prev==&p->parent->children) return NULL;
+       return list_entry(p->sibling.prev,struct task_struct,sibling);
+}
+
+static inline struct task_struct *younger_sibling(struct task_struct *p)
+{
+       if (p->sibling.next==&p->parent->children) return NULL;
+       return list_entry(p->sibling.next,struct task_struct,sibling);
+}
+
 static void show_task(task_t * p)
 {
        unsigned long free = 0;

diff --git a/kernel/signal.c b/kernel/signal.c
index 961596dd16b2aa8ec48b21ebec5d9b3eed5bf82c..1379e559bbf471185616ad4448468e92e655e8ea 100644 (file)
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -160,6 +160,36 @@ int max_queued_signals = 1024;
 static int
 __send_sig_info(int sig, struct siginfo *info, struct task_struct *p);
 
+/*
+ * Re-calculate pending state from the set of locally pending
+ * signals, globally pending signals, and blocked signals.
+ */
+static inline int has_pending_signals(sigset_t *signal, sigset_t *blocked)
+{
+       unsigned long ready;
+       long i;
+
+       switch (_NSIG_WORDS) {
+       default:
+               for (i = _NSIG_WORDS, ready = 0; --i >= 0 ;)
+                       ready |= signal->sig[i] &~ blocked->sig[i];
+               break;
+
+       case 4: ready  = signal->sig[3] &~ blocked->sig[3];
+               ready |= signal->sig[2] &~ blocked->sig[2];
+               ready |= signal->sig[1] &~ blocked->sig[1];
+               ready |= signal->sig[0] &~ blocked->sig[0];
+               break;
+
+       case 2: ready  = signal->sig[1] &~ blocked->sig[1];
+               ready |= signal->sig[0] &~ blocked->sig[0];
+               break;
+
+       case 1: ready  = signal->sig[0] &~ blocked->sig[0];
+       }
+       return ready != 0;
+}
+
 #define PENDING(p,b) has_pending_signals(&(p)->signal, (b))
 
 void recalc_sigpending_tsk(struct task_struct *t)