summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>2004-10-19 18:30:01 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-10-19 18:30:01 -0700
commit26d784977a0a78038f934cd2fb3ce35975d0ebee (patch)
tree2c9de7ab74ff322fbb6122be78600eb788b2575a /include
parent054e23d303ddc0a712b03eb2988f1ec5f8af7faa (diff)
[PATCH] move struct k_itimer out of linux/sched.h
I don't know why struct k_itimer was ever declared in sched.h; perhaps at one time it was referenced by something else there. There is no need for it now. This patch moves the struct where it belongs, in linux/posix-timers.h. It has zero effect on anything except keeping the source easier to read. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/posix-timers.h20
-rw-r--r--include/linux/sched.h20
2 files changed, 20 insertions, 20 deletions
diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index ec4910e37c65..1e6c5e90089f 100644
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -4,6 +4,26 @@
#include <linux/spinlock.h>
#include <linux/list.h>
+/* POSIX.1b interval timer structure. */
+struct k_itimer {
+ struct list_head list; /* free/ allocate list */
+ spinlock_t it_lock;
+ clockid_t it_clock; /* which timer type */
+ timer_t it_id; /* timer id */
+ int it_overrun; /* overrun on pending signal */
+ int it_overrun_last; /* overrun on last delivered signal */
+ int it_requeue_pending; /* waiting to requeue this timer */
+ int it_sigev_notify; /* notify word of sigevent struct */
+ int it_sigev_signo; /* signo word of sigevent struct */
+ sigval_t it_sigev_value; /* value word of sigevent struct */
+ unsigned long it_incr; /* interval specified in jiffies */
+ struct task_struct *it_process; /* process to send signal to */
+ struct timer_list it_timer;
+ struct sigqueue *sigq; /* signal queue entry. */
+ struct list_head abs_timer_entry; /* clock abs_timer_list */
+ struct timespec wall_to_prev; /* wall_to_monotonic used when set */
+};
+
struct k_clock_abs {
struct list_head list;
spinlock_t lock;
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 1c556975b2dd..04c8d47e8654 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -375,26 +375,6 @@ typedef struct prio_array prio_array_t;
struct backing_dev_info;
struct reclaim_state;
-/* POSIX.1b interval timer structure. */
-struct k_itimer {
- struct list_head list; /* free/ allocate list */
- spinlock_t it_lock;
- clockid_t it_clock; /* which timer type */
- timer_t it_id; /* timer id */
- int it_overrun; /* overrun on pending signal */
- int it_overrun_last; /* overrun on last delivered signal */
- int it_requeue_pending; /* waiting to requeue this timer */
- int it_sigev_notify; /* notify word of sigevent struct */
- int it_sigev_signo; /* signo word of sigevent struct */
- sigval_t it_sigev_value; /* value word of sigevent struct */
- unsigned long it_incr; /* interval specified in jiffies */
- struct task_struct *it_process; /* process to send signal to */
- struct timer_list it_timer;
- struct sigqueue *sigq; /* signal queue entry. */
- struct list_head abs_timer_entry; /* clock abs_timer_list */
- struct timespec wall_to_prev; /* wall_to_monotonic used when set */
-};
-
#ifdef CONFIG_SCHEDSTATS
struct sched_info {
/* cumulative counters */