diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-08-04 19:39:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-08-04 19:39:02 -0700 |
| commit | 8834e16cfc75444a6b37cdbf35bd280abbab94d1 (patch) | |
| tree | 52ddf763b80a30f96f0d7a2485177b25d66eec86 /kernel/timer.c | |
| parent | d7d823ed760f18d23283a8bae222b3204a04cf6f (diff) | |
| parent | 08fc776404da15063b18fea4c2d3a16a058daedf (diff) | |
Merge http://gkernel.bkbits.net/janitor-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 3c7cbeaf957a..d4efe5823e94 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -194,7 +194,7 @@ void add_timer(struct timer_list *timer) return; bug: spin_unlock_irqrestore(&timerlist_lock, flags); - printk("bug: kernel timer added twice at %p.\n", + printk(KERN_ERR "BUG: kernel timer added twice at %p.\n", __builtin_return_address(0)); } |