diff options
| author | Jeremy Fitzhardinge <jeremy@goop.org> | 2012-01-16 10:15:48 +1100 |
|---|---|---|
| committer | Jeremy Fitzhardinge <jeremy@goop.org> | 2012-01-16 10:15:48 +1100 |
| commit | b6442588f6a2aff3d53189d50771e8e4aae3d428 (patch) | |
| tree | 5ae4f6ef322906733f4f6cf03eeb7a337f84e332 | |
| parent | b00ced1e8f1550af73eae0169e1cd32f00a16dd9 (diff) | |
| parent | 7d48308162bd2b0ba927ff48d673e532c4f7ee7e (diff) | |
| download | xen-b6442588f6a2aff3d53189d50771e8e4aae3d428.tar.gz | |
Merge commit 'v2.6.32.52' into xen/next-2.6.32xen-2.6.32.52
* commit 'v2.6.32.52':
Linux 2.6.32.52
Revert "clockevents: Set noop handler in clockevents_exchange_device()"
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | kernel/time/clockevents.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile index 1c640ead14d3e..8f775f53de1bf 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 32 -EXTRAVERSION = .51 +EXTRAVERSION = .52 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION* diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c index b38baff61c04e..0d809ae02d609 100644 --- a/kernel/time/clockevents.c +++ b/kernel/time/clockevents.c @@ -221,7 +221,6 @@ void clockevents_exchange_device(struct clock_event_device *old, * released list and do a notify add later. */ if (old) { - old->event_handler = clockevents_handle_noop; clockevents_set_mode(old, CLOCK_EVT_MODE_UNUSED); list_del(&old->list); list_add(&old->list, &clockevents_released); |