debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

debian/patches/xen-tree-merge-21966.patch: Update to get i386 compile again. 

svn path=/dists/trunk/linux-2.6/; revision=6208
This commit is contained in:
Bastian Blank 2006-03-18 11:16:55 +00:00
parent c45d57e65b
commit e714141d38
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
debian/patches/xen-tree-merge-21966.patch vendored
View File

@ -4001,10 +4001,10 @@ index 0000000..c4da1cc
+
diff --git a/arch/i386/kernel/io_apic-xen.c b/arch/i386/kernel/io_apic-xen.c
new file mode 100644
index 0000000..53704a5
index 0000000..5ef6513
--- /dev/null
+++ b/arch/i386/kernel/io_apic-xen.c
@@ -0,0 +1,2730 @@
@@ -0,0 +1,2746 @@
+/*
+ * Intel IO-APIC support for multi-Pentium hosts.
+ *
@ -4100,6 +4100,8 @@ index 0000000..53704a5
+
+static DEFINE_SPINLOCK(ioapic_lock);
+
+int timer_over_8254 __initdata = 1;
+
+/*
+ * Is the SiS APIC rmw bug present ?
+ * -1 = don't know, 0 = no, 1 = yes
@ -6466,6 +6468,20 @@ index 0000000..53704a5
+ print_IO_APIC();
+}
+
+static int __init setup_disable_8254_timer(char *s)
+{
+ timer_over_8254 = -1;
+ return 1;
+}
+static int __init setup_enable_8254_timer(char *s)
+{
+ timer_over_8254 = 2;
+ return 1;
+}
+
+__setup("disable_8254_timer", setup_disable_8254_timer);
+__setup("enable_8254_timer", setup_enable_8254_timer);
+
+/*
+ * Called after all the initialization is done. If we didnt find any
+ * APIC bugs then we can allow the modify fast path