diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-20 08:38:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-20 08:38:55 -0400 |
| commit | dfacc4d6c98b89609250269f518c1f54c30454ef (patch) | |
| tree | e7effbee7bdc85d18f7b26ab9cb5c9f700d1481a /drivers/block/hd.c | |
| parent | f869097e884d8cb65b2bb7831ca57b7dffb66fdd (diff) | |
| parent | 85cb68b27c428d477169f3aa46c72dba103a17bd (diff) | |
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
Diffstat (limited to 'drivers/block/hd.c')
| -rw-r--r-- | drivers/block/hd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/hd.c b/drivers/block/hd.c index 034e6dfc878c..81c78b3ce2df 100644 --- a/drivers/block/hd.c +++ b/drivers/block/hd.c | |||
| @@ -164,12 +164,12 @@ unsigned long read_timer(void) | |||
| 164 | unsigned long t, flags; | 164 | unsigned long t, flags; |
| 165 | int i; | 165 | int i; |
| 166 | 166 | ||
| 167 | spin_lock_irqsave(&i8253_lock, flags); | 167 | raw_spin_lock_irqsave(&i8253_lock, flags); |
| 168 | t = jiffies * 11932; | 168 | t = jiffies * 11932; |
| 169 | outb_p(0, 0x43); | 169 | outb_p(0, 0x43); |
| 170 | i = inb_p(0x40); | 170 | i = inb_p(0x40); |
| 171 | i |= inb(0x40) << 8; | 171 | i |= inb(0x40) << 8; |
| 172 | spin_unlock_irqrestore(&i8253_lock, flags); | 172 | raw_spin_unlock_irqrestore(&i8253_lock, flags); |
| 173 | return(t - i); | 173 | return(t - i); |
| 174 | } | 174 | } |
| 175 | #endif | 175 | #endif |