summaryrefslogtreecommitdiffstats
path: root/include/linux/timer.h
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-10-30 15:02:03 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-30 17:37:18 -0800
commitdfc4f94d2ff95fc92127d3e512c1df7cab274fb8 (patch)
treec9ed4d74147a3674816f59cf9fbeb69e2cb6afe4 /include/linux/timer.h
parent89ada67917f516212452443a56b9fd3b65b74dc7 (diff)
downloadlinux-dfc4f94d2ff95fc92127d3e512c1df7cab274fb8.tar.gz
linux-dfc4f94d2ff95fc92127d3e512c1df7cab274fb8.tar.bz2
linux-dfc4f94d2ff95fc92127d3e512c1df7cab274fb8.zip
[PATCH] remove timer debug field
Remove timer_list.magic and associated debugging code. I originally added this when a spinlock was added to timer_list - this meant that an all-zeroes timer became illegal and init_timer() was required. That spinlock isn't even there any more, although timer.base must now be initialised. I'll keep this debugging code in -mm. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/timer.h')
-rw-r--r--include/linux/timer.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h
index ddd5bbe1fc8e..b1dc583bb4d4 100644
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -12,16 +12,12 @@ struct timer_list {
struct list_head entry;
unsigned long expires;
- unsigned long magic;
-
void (*function)(unsigned long);
unsigned long data;
struct timer_base_s *base;
};
-#define TIMER_MAGIC 0x4b87ad6e
-
extern struct timer_base_s __init_timer_base;
#define TIMER_INITIALIZER(_function, _expires, _data) { \
@@ -29,7 +25,6 @@ extern struct timer_base_s __init_timer_base;
.expires = (_expires), \
.data = (_data), \
.base = &__init_timer_base, \
- .magic = TIMER_MAGIC, \
}
#define DEFINE_TIMER(_name, _function, _expires, _data) \