diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-08 11:52:42 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-08 11:52:42 -0400 |
| commit | 88c3cdfdde3cf87e1831265ea4246430bef34fc9 (patch) | |
| tree | caea510ffb2f81a5ea13b00ecb8a4146ad462048 /arch/i386/kernel/time.c | |
| parent | 2b2c3750330325ae5071582b5c4dbdf1c8bc1e51 (diff) | |
| parent | a92b7b80579fe68fe229892815c750f6652eb6a9 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/i386/kernel/time.c')
| -rw-r--r-- | arch/i386/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c index 2854c357377f..0ee9dee8af06 100644 --- a/arch/i386/kernel/time.c +++ b/arch/i386/kernel/time.c | |||
| @@ -91,7 +91,7 @@ EXPORT_SYMBOL(rtc_lock); | |||
| 91 | DEFINE_SPINLOCK(i8253_lock); | 91 | DEFINE_SPINLOCK(i8253_lock); |
| 92 | EXPORT_SYMBOL(i8253_lock); | 92 | EXPORT_SYMBOL(i8253_lock); |
| 93 | 93 | ||
| 94 | struct timer_opts *cur_timer = &timer_none; | 94 | struct timer_opts *cur_timer __read_mostly = &timer_none; |
| 95 | 95 | ||
| 96 | /* | 96 | /* |
| 97 | * This is a special lock that is owned by the CPU and holds the index | 97 | * This is a special lock that is owned by the CPU and holds the index |