1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
Subject: xen3 i386 build fixes.
From: jbeulich@novell.com
Patch-mainline: obsolete
$subject says all.
Index: 10.3-2007-11-26/arch/i386/kernel/Makefile
===================================================================
--- 10.3-2007-11-26.orig/arch/i386/kernel/Makefile 2007-11-26 14:16:17.000000000 +0100
+++ 10.3-2007-11-26/arch/i386/kernel/Makefile 2007-11-26 14:17:13.000000000 +0100
@@ -58,7 +58,7 @@ endif
# Note: kbuild does not track this dependency due to usage of .incbin
$(obj)/vsyscall.o: $(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so
targets += $(foreach F,int80 sysenter,vsyscall-$F.o vsyscall-$F.so)
-targets += vsyscall-note.o vsyscall.lds
+targets += $(vsyscall_note) vsyscall.lds
# The DSO images are built using a special linker script.
quiet_cmd_syscall = SYSCALL $@
Index: 10.3-2007-11-26/arch/i386/kernel/crash.c
===================================================================
--- 10.3-2007-11-26.orig/arch/i386/kernel/crash.c 2007-11-26 14:16:17.000000000 +0100
+++ 10.3-2007-11-26/arch/i386/kernel/crash.c 2007-11-26 14:17:13.000000000 +0100
@@ -27,11 +27,10 @@
#include <mach_ipi.h>
-
+#ifndef CONFIG_XEN
/* This keeps a track of which one is crashing cpu. */
static int crashing_cpu;
-#ifndef CONFIG_XEN
#if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC)
static atomic_t waiting_for_crash_ipi;
@@ -128,9 +127,9 @@ void machine_crash_shutdown(struct pt_re
/* The kernel is broken so disable interrupts */
local_irq_disable();
+#ifndef CONFIG_XEN
/* Make a note of crashing cpu. Will be used in NMI callback.*/
crashing_cpu = safe_smp_processor_id();
-#ifndef CONFIG_XEN
nmi_shootdown_cpus();
lapic_shutdown();
#if defined(CONFIG_X86_IO_APIC)
Index: 10.3-2007-11-26/arch/i386/power/Makefile
===================================================================
--- 10.3-2007-11-26.orig/arch/i386/power/Makefile 2007-08-07 09:34:51.000000000 +0200
+++ 10.3-2007-11-26/arch/i386/power/Makefile 2007-11-26 14:17:13.000000000 +0100
@@ -1,4 +1,4 @@
-obj-$(CONFIG_PM_LEGACY) += cpu.o
+obj-$(subst m,y,$(CONFIG_APM)) += cpu.o
obj-$(CONFIG_SOFTWARE_SUSPEND) += cpu.o
obj-$(CONFIG_ACPI_SLEEP) += cpu.o
obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o suspend.o
Index: 10.3-2007-11-26/include/asm-i386/mach-xen/asm/page.h
===================================================================
--- 10.3-2007-11-26.orig/include/asm-i386/mach-xen/asm/page.h 2007-11-26 14:16:17.000000000 +0100
+++ 10.3-2007-11-26/include/asm-i386/mach-xen/asm/page.h 2007-11-26 14:17:13.000000000 +0100
@@ -37,14 +37,6 @@
#include <xen/interface/xen.h>
#include <xen/features.h>
-#define arch_free_page(_page,_order) \
-({ int foreign = PageForeign(_page); \
- if (foreign) \
- PageForeignDestructor(_page); \
- foreign; \
-})
-#define HAVE_ARCH_FREE_PAGE
-
#ifdef CONFIG_X86_USE_3DNOW
#include <asm/mmx.h>
|
GitWeb
