aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/os-Linux/signal.c
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2007-10-16 04:27:22 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 12:43:08 -0400
commit181bde801afae4304843ce95c868d4419ae87310 (patch)
treef33e6c88e36cda7699fc2dfe2b6ac9ccb3c6963f /arch/um/os-Linux/signal.c
parent532d0fa4d104ca3e37dd38bc5073376fcc3c2712 (diff)
uml: fix timer switching
Fix up the switching between virtual and real timers. The idle loop sleeps, so the timer at that point must be real time. At all other times, the timer must be virtual. Even when userspace is running, and the kernel is asleep, the virtual timer is correct because the process timer will be running and the process timer will be firing. The timer switch used to be in the context switch and timer handler code. This is moved to the idle loop and the signal handler, making it much more clear why it is happening. switch_timers now returns the old timer type so that it may be restored. The signal handler uses this in order to restore the previous timer type when it returns. 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 'arch/um/os-Linux/signal.c')
-rw-r--r--arch/um/os-Linux/signal.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c
index 49c113b576b7..1c5267ec13b0 100644
--- a/arch/um/os-Linux/signal.c
+++ b/arch/um/os-Linux/signal.c
@@ -59,17 +59,11 @@ static void real_alarm_handler(int sig, struct sigcontext *sc)
59{ 59{
60 struct uml_pt_regs regs; 60 struct uml_pt_regs regs;
61 61
62 if (sig == SIGALRM)
63 switch_timers(0);
64
65 if (sc != NULL) 62 if (sc != NULL)
66 copy_sc(&regs, sc); 63 copy_sc(&regs, sc);
67 regs.is_user = 0; 64 regs.is_user = 0;
68 unblock_signals(); 65 unblock_signals();
69 timer_handler(sig, &regs); 66 timer_handler(sig, &regs);
70
71 if (sig == SIGALRM)
72 switch_timers(1);
73} 67}
74 68
75void alarm_handler(int sig, struct sigcontext *sc) 69void alarm_handler(int sig, struct sigcontext *sc)
@@ -116,6 +110,7 @@ void (*handlers[_NSIG])(int sig, struct sigcontext *sc);
116void handle_signal(int sig, struct sigcontext *sc) 110void handle_signal(int sig, struct sigcontext *sc)
117{ 111{
118 unsigned long pending = 1UL << sig; 112 unsigned long pending = 1UL << sig;
113 int timer = switch_timers(0);
119 114
120 do { 115 do {
121 int nested, bail; 116 int nested, bail;
@@ -152,6 +147,8 @@ void handle_signal(int sig, struct sigcontext *sc)
152 if (!nested) 147 if (!nested)
153 pending = from_irq_stack(nested); 148 pending = from_irq_stack(nested);
154 } while (pending); 149 } while (pending);
150
151 switch_timers(timer);
155} 152}
156 153
157extern void hard_handler(int sig); 154extern void hard_handler(int sig);