Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 110717
b: refs/heads/master
c: 006c75f
h: refs/heads/master
i:
  110715: b47c379
v: v3
  • Loading branch information
Andrew Morton authored and Ingo Molnar committed Sep 23, 2008
1 parent bb9f18a commit 78c9014
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: caea8a03702c147e8ae90da0801e7ba8297b1d46
refs/heads/master: 006c75f146e58e080d2b2725a6664f71886e112b
6 changes: 3 additions & 3 deletions trunk/kernel/sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -1102,7 +1102,7 @@ static void hrtick_start(struct rq *rq, u64 delay)
hrtimer_start(&rq->hrtick_timer, ns_to_ktime(delay), HRTIMER_MODE_REL);
}

static void init_hrtick(void)
static inline void init_hrtick(void)
{
}
#endif /* CONFIG_SMP */
Expand All @@ -1121,7 +1121,7 @@ static void init_rq_hrtick(struct rq *rq)
rq->hrtick_timer.function = hrtick;
rq->hrtick_timer.cb_mode = HRTIMER_CB_IRQSAFE_NO_SOFTIRQ;
}
#else
#else /* CONFIG_SCHED_HRTICK */
static inline void hrtick_clear(struct rq *rq)
{
}
Expand All @@ -1133,7 +1133,7 @@ static inline void init_rq_hrtick(struct rq *rq)
static inline void init_hrtick(void)
{
}
#endif
#endif /* CONFIG_SCHED_HRTICK */

/*
* resched_task - mark a task 'to be rescheduled now'.
Expand Down

0 comments on commit 78c9014

Please sign in to comment.