Fix 2.6.20 UP domU kernels, an unused file 'genapic-xen.c' was being compiled into the kernel.

svn path=/overlay/; revision=16

4 files changed, 161 insertions, 8 deletions

diff --git a/sys-kernel/xen-sources/Manifest b/sys-kernel/xen-sources/Manifest
index a24c13a..52bc5ee 100644
--- a/sys-kernel/xen-sources/Manifest
+++ b/sys-kernel/xen-sources/Manifest
@@ -10,6 +10,10 @@ AUX xen-sources-2.6.20-quirks-no-smp-fix.patch 616 RMD160 325394a4c2ce7d292d40e4
 MD5 b7c3a11aa99ac926a2a78c96c7fa32c1 files/xen-sources-2.6.20-quirks-no-smp-fix.patch 616
 RMD160 325394a4c2ce7d292d40e4e9548e41c78384ad72 files/xen-sources-2.6.20-quirks-no-smp-fix.patch 616
 SHA256 f4e95b79460c5ace124ef57f8af936243d8dffed71f6c00816bdeb975c959132 files/xen-sources-2.6.20-quirks-no-smp-fix.patch 616
+AUX xen-sources-2.6.20-remove-orphaned-genapic-xen.c.patch 4205 RMD160 0b947228e39fdcf03269c5041616eb75949be0fb SHA1 4c074aa8287586536854e7dab9d84dd116add479 SHA256 2592c67dbbebc29737ef6cf4a0960b8650e6e9504f7c60d5ea8f39eaeb8e5f39
+MD5 c48685d948ba1ea99cdb42d99ee01f9d files/xen-sources-2.6.20-remove-orphaned-genapic-xen.c.patch 4205
+RMD160 0b947228e39fdcf03269c5041616eb75949be0fb files/xen-sources-2.6.20-remove-orphaned-genapic-xen.c.patch 4205
+SHA256 2592c67dbbebc29737ef6cf4a0960b8650e6e9504f7c60d5ea8f39eaeb8e5f39 files/xen-sources-2.6.20-remove-orphaned-genapic-xen.c.patch 4205
 DIST debian-security-patches-2.6.18.1-12etch2.tar.bz2 8142 RMD160 5591a611ddf07f5ceb79694d0f388507bc6d1131 SHA1 c6fc99b9c8e412659e0f0eb86fad96622cba4319 SHA256 a2a8ddc7f0c74236af8862827520853868698aa24ed300949c59001a19c73318
 DIST fedora-xen-2.6.20-2925.11.fc7.tar.bz2 520695 RMD160 fe39a1f0e758d1e951e118ba4ac33ccf69163e40 SHA1 651a3bf6bcccb0d0e62d19b07d07605a89616689 SHA256 3ea3d3f316ab6315759efa5c8a754331f7792a3159c05c521db16d7ed97f20ed
 DIST fedora-xen-patches-2.6.20-2925.13.fc7.tar.bz2 4666 RMD160 13307c9a125d413b0b7520f03d98e5ce1b1ebe56 SHA1 e3d68cfe7352bf412cfcb2b613ddc9537bd9b00b SHA256 4ab97483af69732582f07640076e9d386212b544d479949f877e5f20df0abb89
@@ -32,14 +36,14 @@ EBUILD xen-sources-2.6.18.ebuild 967 RMD160 9c7030d41272192bffd453730fc1ea15aab6
 MD5 c029688996eb33695721d2edfe44dd2b xen-sources-2.6.18.ebuild 967
 RMD160 9c7030d41272192bffd453730fc1ea15aab6c782 xen-sources-2.6.18.ebuild 967
 SHA256 55ee5773dcf3254d78677d29d09d0b8d8daea6afeb09993e6bfbf3d97716b133 xen-sources-2.6.18.ebuild 967
-EBUILD xen-sources-2.6.20-r1.ebuild 1339 RMD160 2d1df1f9b1d5a6574e613a18cea3d58dad93128d SHA1 ec56b451042cb6aea1315a527cc3954dcaf41647 SHA256 cf822cddc5d8a215f3364abb3b804f12e2a3b33aef14c79d7152eb3347e3621b
-MD5 446b5e432e3c2bf51fd014d5a3223fd7 xen-sources-2.6.20-r1.ebuild 1339
-RMD160 2d1df1f9b1d5a6574e613a18cea3d58dad93128d xen-sources-2.6.20-r1.ebuild 1339
-SHA256 cf822cddc5d8a215f3364abb3b804f12e2a3b33aef14c79d7152eb3347e3621b xen-sources-2.6.20-r1.ebuild 1339
-EBUILD xen-sources-2.6.20.ebuild 1050 RMD160 83dd36bd6153c85b8fe7a50a07d631a51612c39a SHA1 5b8764766c87be408ca805518d52f851dfa9e44f SHA256 4c090cda8f084bf096cee41c5073e1c5c0c914de0e1cc5a05f883200037067e4
-MD5 b0d7a01b77fcf723569a814ad652d702 xen-sources-2.6.20.ebuild 1050
-RMD160 83dd36bd6153c85b8fe7a50a07d631a51612c39a xen-sources-2.6.20.ebuild 1050
-SHA256 4c090cda8f084bf096cee41c5073e1c5c0c914de0e1cc5a05f883200037067e4 xen-sources-2.6.20.ebuild 1050
+EBUILD xen-sources-2.6.20-r1.ebuild 1395 RMD160 df2e700f4f948458c76065f8a3322516dddf71ba SHA1 0e60c7cd44fa1dbea5a0bcafacc7c2cec05766eb SHA256 9e4b5ed572dd34679bd32f8f39e08fb9edf0bfdf57564b946fc2a644ff80c37a
+MD5 2edea904174e35ea7cf30dc7522ea43e xen-sources-2.6.20-r1.ebuild 1395
+RMD160 df2e700f4f948458c76065f8a3322516dddf71ba xen-sources-2.6.20-r1.ebuild 1395
+SHA256 9e4b5ed572dd34679bd32f8f39e08fb9edf0bfdf57564b946fc2a644ff80c37a xen-sources-2.6.20-r1.ebuild 1395
+EBUILD xen-sources-2.6.20.ebuild 1106 RMD160 815313d4a535a37fb809712d2adc316cc2acbf4a SHA1 27894c9f0511a84fde0254c7bd2b70334baf7e95 SHA256 24df969d18678dc55535dccd4a32af6e2593b73b02c91cace14cdded0194cb66
+MD5 cb334f2857e00e506a2746e9b1cd6f89 xen-sources-2.6.20.ebuild 1106
+RMD160 815313d4a535a37fb809712d2adc316cc2acbf4a xen-sources-2.6.20.ebuild 1106
+SHA256 24df969d18678dc55535dccd4a32af6e2593b73b02c91cace14cdded0194cb66 xen-sources-2.6.20.ebuild 1106
 MISC ChangeLog 1430 RMD160 b360303e4b1591c98cca20fce40fa85cee150376 SHA1 f5c1ebed3415d34bf2ba3b89df284fe53f724acc SHA256 888eed2b5ab014195eb4cf9c8a481a252b73c1f2cf80c9d6cb4a4d6eacb705cb
 MD5 98f34d0f7115f43b73a9ffbc80966334 ChangeLog 1430
 RMD160 b360303e4b1591c98cca20fce40fa85cee150376 ChangeLog 1430
diff --git a/sys-kernel/xen-sources/files/xen-sources-2.6.20-remove-orphaned-genapic-xen.c.patch b/sys-kernel/xen-sources/files/xen-sources-2.6.20-remove-orphaned-genapic-xen.c.patch
new file mode 100644
index 0000000..0178e92
--- /dev/null
+++ b/sys-kernel/xen-sources/files/xen-sources-2.6.20-remove-orphaned-genapic-xen.c.patch
@@ -0,0 +1,147 @@
+diff -rupN linux-2.6.20-xen.orig/arch/x86_64/kernel/genapic-xen.c linux-2.6.20-xen/arch/x86_64/kernel/genapic-xen.c
+--- linux-2.6.20-xen.orig/arch/x86_64/kernel/genapic-xen.c	2007-07-24 16:12:55.000000000 -0700
++++ linux-2.6.20-xen/arch/x86_64/kernel/genapic-xen.c	1969-12-31 16:00:00.000000000 -0800
+@@ -1,143 +0,0 @@
+-/*
+- * Copyright 2004 James Cleverdon, IBM.
+- * Subject to the GNU Public License, v.2
+- *
+- * Generic APIC sub-arch probe layer.
+- *
+- * Hacked for x86-64 by James Cleverdon from i386 architecture code by
+- * Martin Bligh, Andi Kleen, James Bottomley, John Stultz, and
+- * James Cleverdon.
+- */
+-#include <linux/threads.h>
+-#include <linux/cpumask.h>
+-#include <linux/string.h>
+-#include <linux/kernel.h>
+-#include <linux/ctype.h>
+-#include <linux/init.h>
+-#include <linux/module.h>
+-
+-#include <asm/smp.h>
+-#include <asm/ipi.h>
+-
+-#if defined(CONFIG_ACPI)
+-#include <acpi/acpi_bus.h>
+-#endif
+-
+-/* which logical CPU number maps to which CPU (physical APIC ID) */
+-u8 x86_cpu_to_apicid[NR_CPUS] __read_mostly = { [0 ... NR_CPUS-1] = BAD_APICID };
+-EXPORT_SYMBOL(x86_cpu_to_apicid);
+-u8 x86_cpu_to_log_apicid[NR_CPUS] = { [0 ... NR_CPUS-1] = BAD_APICID };
+-
+-extern struct genapic apic_cluster;
+-extern struct genapic apic_flat;
+-extern struct genapic apic_physflat;
+-
+-#ifndef CONFIG_XEN
+-struct genapic *genapic = &apic_flat;
+-#else
+-extern struct genapic apic_xen;
+-struct genapic *genapic = &apic_xen;
+-#endif
+-
+-
+-/*
+- * Check the APIC IDs in bios_cpu_apicid and choose the APIC mode.
+- */
+-void __init clustered_apic_check(void)
+-{
+-#ifndef CONFIG_XEN
+-	long i;
+-	u8 clusters, max_cluster;
+-	u8 id;
+-	u8 cluster_cnt[NUM_APIC_CLUSTERS];
+-	int max_apic = 0;
+-
+-#if defined(CONFIG_ACPI)
+-	/*
+-	 * Some x86_64 machines use physical APIC mode regardless of how many
+-	 * procs/clusters are present (x86_64 ES7000 is an example).
+-	 */
+-	if (acpi_fadt.revision > FADT2_REVISION_ID)
+-		if (acpi_fadt.force_apic_physical_destination_mode) {
+-			genapic = &apic_cluster;
+-			goto print;
+-		}
+-#endif
+-
+-	memset(cluster_cnt, 0, sizeof(cluster_cnt));
+-	for (i = 0; i < NR_CPUS; i++) {
+-		id = bios_cpu_apicid[i];
+-		if (id == BAD_APICID)
+-			continue;
+-		if (id > max_apic)
+-			max_apic = id;
+-		cluster_cnt[APIC_CLUSTERID(id)]++;
+-	}
+-
+-	/* Don't use clustered mode on AMD platforms. */
+- 	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) {
+-		genapic = &apic_physflat;
+-#ifndef CONFIG_HOTPLUG_CPU
+-		/* In the CPU hotplug case we cannot use broadcast mode
+-		   because that opens a race when a CPU is removed.
+-		   Stay at physflat mode in this case.
+-		   It is bad to do this unconditionally though. Once
+-		   we have ACPI platform support for CPU hotplug
+-		   we should detect hotplug capablity from ACPI tables and
+-		   only do this when really needed. -AK */
+-		if (max_apic <= 8)
+-			genapic = &apic_flat;
+-#endif
+- 		goto print;
+- 	}
+-
+-	clusters = 0;
+-	max_cluster = 0;
+-
+-	for (i = 0; i < NUM_APIC_CLUSTERS; i++) {
+-		if (cluster_cnt[i] > 0) {
+-			++clusters;
+-			if (cluster_cnt[i] > max_cluster)
+-				max_cluster = cluster_cnt[i];
+-		}
+-	}
+-
+-	/*
+-	 * If we have clusters <= 1 and CPUs <= 8 in cluster 0, then flat mode,
+-	 * else if max_cluster <= 4 and cluster_cnt[15] == 0, clustered logical
+-	 * else physical mode.
+-	 * (We don't use lowest priority delivery + HW APIC IRQ steering, so
+-	 * can ignore the clustered logical case and go straight to physical.)
+-	 */
+-	if (clusters <= 1 && max_cluster <= 8 && cluster_cnt[0] == max_cluster) {
+-#ifdef CONFIG_HOTPLUG_CPU
+-		/* Don't use APIC shortcuts in CPU hotplug to avoid races */
+-		genapic = &apic_physflat;
+-#else
+-		genapic = &apic_flat;
+-#endif
+-	} else
+-		genapic = &apic_cluster;
+-
+-print:
+-#else
+-	/* hardcode to xen apic functions */
+-	genapic = &apic_xen;
+-#endif
+-	printk(KERN_INFO "Setting APIC routing to %s\n", genapic->name);
+-}
+-
+-/* Same for both flat and clustered. */
+-
+-#ifdef CONFIG_XEN
+-extern void xen_send_IPI_shortcut(unsigned int shortcut, int vector, unsigned int dest);
+-#endif
+-
+-void send_IPI_self(int vector)
+-{
+-#ifndef CONFIG_XEN
+-	__send_IPI_shortcut(APIC_DEST_SELF, vector, APIC_DEST_PHYSICAL);
+-#else
+-	xen_send_IPI_shortcut(APIC_DEST_SELF, vector, APIC_DEST_PHYSICAL);
+-#endif
+-}
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.20-r1.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.20-r1.ebuild
index 0da61c8..76817c4 100644
--- a/sys-kernel/xen-sources/xen-sources-2.6.20-r1.ebuild
+++ b/sys-kernel/xen-sources/xen-sources-2.6.20-r1.ebuild
@@ -29,6 +29,7 @@ UNIPATCH_LIST="${DISTDIR}/${XEN_PATCH}
 			${DISTDIR}/${XEN_BUGFIXES}
 			${FILESDIR}/${P}-console-tty-fix.patch
 			${FILESDIR}/${P}-quirks-no-smp-fix.patch
+			${FILESDIR}/${P}-remove-orphaned-genapic-xen.c.patch
 			${FILESDIR}/${PN}-2.6.18-make-install.patch"
 
 KEYWORDS="~x86 ~amd64"
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.20.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.20.ebuild
index 8222161..b3e8a69 100644
--- a/sys-kernel/xen-sources/xen-sources-2.6.20.ebuild
+++ b/sys-kernel/xen-sources/xen-sources-2.6.20.ebuild
@@ -20,6 +20,7 @@ SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${PATCH_URI}"
 UNIPATCH_LIST="${DISTDIR}/${XEN_PATCH}
 			${FILESDIR}/${P}-console-tty-fix.patch
 			${FILESDIR}/${P}-quirks-no-smp-fix.patch
+			${FILESDIR}/${P}-remove-orphaned-genapic-xen.c.patch
 			${FILESDIR}/${PN}-2.6.18-make-install.patch"
 
 KEYWORDS="~x86 ~amd64"