From: Joe Jin Date: Fri, 6 Jul 2012 10:59:17 +0000 (+0800) Subject: Revert "Fix clock_was_set so it is safe to call from atomic" X-Git-Tag: v2.6.39-400.9.0~499^2~4 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9c15f47a7228d4879d66b824d4ad38ee33b64002;p=users%2Fjedix%2Flinux-maple.git Revert "Fix clock_was_set so it is safe to call from atomic" This reverts commit f84af0ca7768cc12c300cfc42289706199a0c93c. To apply new patchset. Signed-off-by: Joe Jin --- diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index c5833ae994f6..2043c08d36c8 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -746,7 +746,7 @@ static inline void retrigger_next_event(void *arg) { } * resolution timer interrupts. On UP we just disable interrupts and * call the high resolution interrupt code. */ -static void do_clock_was_set(struct work_struct *work) +void clock_was_set(void) { #ifdef CONFIG_HIGH_RES_TIMERS /* Retrigger the CPU local events everywhere */ @@ -754,20 +754,6 @@ static void do_clock_was_set(struct work_struct *work) #endif timerfd_clock_was_set(); } -static DECLARE_WORK(clock_was_set_work, do_clock_was_set); - -void clock_was_set(void) -{ - /* - * We can't call on_each_cpu() from atomic context, - * so if we're in_atomic, schedule the clock_was_set - * for later. - */ - if (in_atomic()) - schedule_work(&clock_was_set_work); - else - do_clock_was_set(NULL); -} /* * During resume we might have to reprogram the high resolution timer