From 31ccc1f524b626abcf5e043ad32b881219223c34 Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Tue, 16 Oct 2007 01:27:24 -0700 Subject: uml: GENERIC_CLOCKEVENTS support Enable CONFIG_GENERIC_CLOCKEVENTS. timer_irq gets its name changed to timer_handler, and becomes the recipient of timer signals. The clock_event_device is set up to imitate the current ticking clock, i.e. CLOCK_EVT_FEAT_ONESHOT is not enabled yet. disable_timer now doesn't ignore SIGALRM and SIGVTALRM because that breaks delay calibration. Signed-off-by: Jeff Dike Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/um/os-Linux/time.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'arch/um/os-Linux/time.c') diff --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c index b156f03e1713..6ff3d98281ba 100644 --- a/arch/um/os-Linux/time.c +++ b/arch/um/os-Linux/time.c @@ -34,10 +34,6 @@ void disable_timer(void) (setitimer(ITIMER_REAL, &disable, NULL) < 0)) printk(UM_KERN_ERR "disable_timer - setitimer failed, " "errno = %d\n", errno); - - /* If there are signals already queued, after unblocking ignore them */ - signal(SIGALRM, SIG_IGN); - signal(SIGVTALRM, SIG_IGN); } int switch_timers(int to_real) -- cgit v1.2.3-59-g8ed1b