aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/os-Linux/time.c
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2007-10-16 01:27:24 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 09:43:08 -0700
commit31ccc1f524b626abcf5e043ad32b881219223c34 (patch)
tree419284a887fad9dab58969531cf6c53ca0402944 /arch/um/os-Linux/time.c
parentuml: GENERIC_TIME support (diff)
downloadlinux-dev-31ccc1f524b626abcf5e043ad32b881219223c34.tar.xz
linux-dev-31ccc1f524b626abcf5e043ad32b881219223c34.zip
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 <jdike@linux.intel.com> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
-rw-r--r--arch/um/os-Linux/time.c4
1 files changed, 0 insertions, 4 deletions
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)