1 From: Greg Kroah-Hartman <gregkh@suse.de>
2 Subject: Linux 2.6.27.20
4 Upstream 2.6.27.20 release from kernel.org
6 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
8 Automatically created from "patches.kernel.org/patch-2.6.27.19-20" by xen-port-patches.py
10 --- sle11-2009-03-24.orig/arch/x86/ia32/ia32entry-xen.S 2009-03-24 10:19:55.000000000 +0100
11 +++ sle11-2009-03-24/arch/x86/ia32/ia32entry-xen.S 2009-03-24 10:19:57.000000000 +0100
12 @@ -373,9 +373,9 @@ ENTRY(ia32_syscall)
13 orl $TS_COMPAT,TI_status(%r10)
14 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
17 cmpl $(IA32_NR_syscalls-1),%eax
18 - ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
22 call *ia32_sys_call_table(,%rax,8) # xxx: rip relative
24 @@ -390,7 +390,9 @@ ia32_tracesys:
25 call syscall_trace_enter
26 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
29 + cmpl $(IA32_NR_syscalls-1),%eax
30 + ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
35 --- sle11-2009-03-24.orig/arch/x86/kernel/io_apic_64-xen.c 2009-03-24 10:19:55.000000000 +0100
36 +++ sle11-2009-03-24/arch/x86/kernel/io_apic_64-xen.c 2009-03-24 10:19:57.000000000 +0100
37 @@ -1737,7 +1737,7 @@ static inline void __init check_timer(vo
38 setup_timer_IRQ0_pin(apic1, pin1, cfg->vector);
40 unmask_IO_APIC_irq(0);
41 - if (!no_timer_check && timer_irq_works()) {
42 + if (no_timer_check || timer_irq_works()) {
43 if (nmi_watchdog == NMI_IO_APIC) {