Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 163074
b: refs/heads/master
c: 8cab02d
h: refs/heads/master
v: v3
  • Loading branch information
Thomas Gleixner committed Aug 21, 2009
1 parent c01fecd commit 5fd78d5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 20 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 01548f4d3e8e94caf323a4f664eb347fd34a34ab
refs/heads/master: 8cab02dc3c58a12235c6d463ce684dded9696848
19 changes: 0 additions & 19 deletions trunk/arch/x86/kernel/i8253.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@
DEFINE_SPINLOCK(i8253_lock);
EXPORT_SYMBOL(i8253_lock);

#ifdef CONFIG_X86_32
static void pit_disable_clocksource(void);
#else
static inline void pit_disable_clocksource(void) { }
#endif

/*
* HPET replaces the PIT, when enabled. So we need to know, which of
* the two timers is used
Expand Down Expand Up @@ -57,12 +51,10 @@ static void init_pit_timer(enum clock_event_mode mode,
outb_pit(0, PIT_CH0);
outb_pit(0, PIT_CH0);
}
pit_disable_clocksource();
break;

case CLOCK_EVT_MODE_ONESHOT:
/* One shot setup */
pit_disable_clocksource();
outb_pit(0x38, PIT_MODE);
break;

Expand Down Expand Up @@ -200,17 +192,6 @@ static struct clocksource pit_cs = {
.shift = 20,
};

static void pit_disable_clocksource(void)
{
/*
* Use mult to check whether it is registered or not
*/
if (pit_cs.mult) {
clocksource_unregister(&pit_cs);
pit_cs.mult = 0;
}
}

static int __init init_pit_clocksource(void)
{
/*
Expand Down

0 comments on commit 5fd78d5

Please sign in to comment.