diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-05 07:53:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-05 07:53:39 -0500 |
| commit | 5359c32eb7402124abc9964d5d53639fe0739cea (patch) | |
| tree | d77b6967fe8420678bb9d1d936855ac0699c196a /arch/um/kernel/time.c | |
| parent | 8916edef5888c5d8fe283714416a9ca95b4c3431 (diff) | |
| parent | fe0bdec68b77020281dc814805edfe594ae89e0f (diff) | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'arch/um/kernel/time.c')
| -rw-r--r-- | arch/um/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c index 47f04f4a3464..b13a87a3ec95 100644 --- a/arch/um/kernel/time.c +++ b/arch/um/kernel/time.c | |||
| @@ -50,7 +50,7 @@ static int itimer_next_event(unsigned long delta, | |||
| 50 | static struct clock_event_device itimer_clockevent = { | 50 | static struct clock_event_device itimer_clockevent = { |
| 51 | .name = "itimer", | 51 | .name = "itimer", |
| 52 | .rating = 250, | 52 | .rating = 250, |
| 53 | .cpumask = CPU_MASK_ALL, | 53 | .cpumask = cpu_all_mask, |
| 54 | .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, | 54 | .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, |
| 55 | .set_mode = itimer_set_mode, | 55 | .set_mode = itimer_set_mode, |
| 56 | .set_next_event = itimer_next_event, | 56 | .set_next_event = itimer_next_event, |