projects / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 2cb7cef9 BS |
1 | From: SGI KDB Development <kdb@oss.sgi.com> |
| 2 | Subject: kdb-v4.4-2.6.27-rc8-x86-1 | |
| 3 | References: FATE#303971 | |
| 4 | X-URL: ftp://oss.sgi.com/www/projects/kdb/download/v4.4/ | |
| 5 | ||
| 6 | The KDB x86 code. | |
| 7 | ||
| 8 | Acked-by: Bernhard Walle <bwalle@suse.de> | |
| 9 | ||
| 10 | Automatically created from "patches.suse/kdb-x86" by xen-port-patches.py | |
| 11 | ||
| 12 | --- sle11-2009-06-04.orig/arch/x86/kdb/kdba_bt.c 2009-06-04 10:19:52.000000000 +0200 | |
| 13 | +++ sle11-2009-06-04/arch/x86/kdb/kdba_bt.c 2009-06-04 10:46:41.000000000 +0200 | |
| 14 | @@ -683,7 +683,7 @@ static const char *bb_spurious[] = { | |
| 15 | /* relocate_kernel */ | |
| 16 | "relocate_new_kernel", | |
| 17 | #endif /* CONFIG_KEXEC */ | |
| 18 | -#ifdef CONFIG_XEN | |
| 19 | +#ifdef CONFIG_PARAVIRT_XEN | |
| 20 | /* arch/i386/xen/xen-asm.S */ | |
| 21 | "xen_irq_enable_direct_end", | |
| 22 | "xen_irq_disable_direct_end", | |
| 23 | @@ -4757,7 +4757,7 @@ kdb_bb_all(int argc, const char **argv) | |
| 24 | #ifdef CONFIG_MATH_EMULATION | |
| 25 | " CONFIG_MATH_EMULATION" | |
| 26 | #endif | |
| 27 | -#ifdef CONFIG_XEN | |
| 28 | +#ifdef CONFIG_PARAVIRT_XEN | |
| 29 | " CONFIG_XEN" | |
| 30 | #endif | |
| 31 | #ifdef CONFIG_DEBUG_INFO | |
| 32 | --- sle11-2009-06-04.orig/arch/x86/kdb/kdba_support.c 2009-06-04 10:17:48.000000000 +0200 | |
| 33 | +++ sle11-2009-06-04/arch/x86/kdb/kdba_support.c 2009-06-04 10:46:41.000000000 +0200 | |
| 34 | @@ -49,7 +49,7 @@ extern void halt_current_cpu(struct pt_r | |
| 35 | ||
| 36 | void kdba_kdump_shutdown_slave(struct pt_regs *regs) | |
| 37 | { | |
| 38 | -#ifndef CONFIG_XEN | |
| 39 | +#ifndef CONFIG_PARAVIRT_XEN | |
| 40 | halt_current_cpu(regs); | |
| 41 | #endif /* CONFIG_XEN */ | |
| 42 | } | |
| 43 | --- sle11-2009-06-04.orig/arch/x86/kernel/crash.c 2009-06-04 10:17:48.000000000 +0200 | |
| 44 | +++ sle11-2009-06-04/arch/x86/kernel/crash.c 2009-06-04 10:46:41.000000000 +0200 | |
| 45 | @@ -224,14 +224,14 @@ void machine_crash_shutdown_begin(void) | |
| 46 | ||
| 47 | /* Make a note of crashing cpu. Will be used in NMI callback.*/ | |
| 48 | crashing_cpu = safe_smp_processor_id(); | |
| 49 | -#ifndef CONFIG_XEN | |
| 50 | +#ifndef CONFIG_PARAVIRT_XEN | |
| 51 | nmi_shootdown_cpus_init(); | |
| 52 | #endif /* CONFIG_XEN */ | |
| 53 | } | |
| 54 | ||
| 55 | void machine_crash_shutdown_end(struct pt_regs *regs) | |
| 56 | { | |
| 57 | -#ifndef CONFIG_XEN | |
| 58 | +#ifndef CONFIG_PARAVIRT_XEN | |
| 59 | wait_other_cpus(); | |
| 60 | ||
| 61 | local_irq_disable(); |