diff options
author | Len Brown | 2005-07-30 07:55:32 +0200 |
---|---|---|
committer | Len Brown | 2005-07-30 07:55:32 +0200 |
commit | adbedd34244e2b054557002817f979a9b004a405 (patch) | |
tree | 78e4a524e84f8b3e23ae8b49ac689048584e4668 /arch/um/kernel/time_kern.c | |
parent | /home/lenb/src/to-linus branch 'acpi-2.6.12' (diff) | |
parent | [PATCH] agp: restore APBASE after setting APSIZE (diff) | |
download | kernel-qcow2-linux-adbedd34244e2b054557002817f979a9b004a405.tar.gz kernel-qcow2-linux-adbedd34244e2b054557002817f979a9b004a405.tar.xz kernel-qcow2-linux-adbedd34244e2b054557002817f979a9b004a405.zip |
merge 2.6.13-rc4 with ACPI's to-linus tree
Diffstat (limited to 'arch/um/kernel/time_kern.c')
-rw-r--r-- | arch/um/kernel/time_kern.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/um/kernel/time_kern.c b/arch/um/kernel/time_kern.c index a8b4ef601f59..4e08f7545d63 100644 --- a/arch/um/kernel/time_kern.c +++ b/arch/um/kernel/time_kern.c @@ -137,7 +137,10 @@ long um_stime(int __user *tptr) void timer_handler(int sig, union uml_pt_regs *regs) { local_irq_disable(); - update_process_times(CHOOSE_MODE(user_context(UPT_SP(regs)), (regs)->skas.is_user)); + irq_enter(); + update_process_times(CHOOSE_MODE(user_context(UPT_SP(regs)), + (regs)->skas.is_user)); + irq_exit(); local_irq_enable(); if(current_thread->cpu == 0) timer_irq(regs); |