rpms/kernel-xen/devel linux-2.6-xen-acpi.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 kernel-xen.spec, 1.39, 1.40 sources, 1.12, 1.13
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Feb 3 19:26:06 UTC 2006
Author: sct
Update of /cvs/dist/rpms/kernel-xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21903
Modified Files:
.cvsignore kernel-xen.spec sources
Added Files:
linux-2.6-xen-acpi.patch
Log Message:
Undo ACPI_DEBUG config option for Xen
Rebase to xen-unstable hypervisor cset 8737
Fix merge of davej's acpi changes to xen
linux-2.6-xen-acpi.patch:
acpi/boot-xen.c | 6 +++---
mpparse-xen.c | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
--- NEW FILE linux-2.6-xen-acpi.patch ---
--- a/arch/i386/kernel/acpi/boot-xen.c~ 2006-02-02 15:24:54.000000000 -0500
+++ b/arch/i386/kernel/acpi/boot-xen.c 2006-02-02 18:07:39.000000000 -0500
@@ -466,7 +466,7 @@
* success: return IRQ number (>=0)
* failure: return < 0
*/
-int acpi_register_gsi(u32 gsi, int edge_level, int active_high_low)
+int acpi_register_gsi(u32 gsi, int triggering, int polarity)
{
unsigned int irq;
unsigned int plat_gsi = gsi;
@@ -478,14 +478,14 @@
if (acpi_irq_model == ACPI_IRQ_MODEL_PIC) {
extern void eisa_set_level_irq(unsigned int irq);
- if (edge_level == ACPI_LEVEL_SENSITIVE)
+ if (triggering == ACPI_LEVEL_SENSITIVE)
eisa_set_level_irq(gsi);
}
#endif
#ifdef CONFIG_X86_IO_APIC
if (acpi_irq_model == ACPI_IRQ_MODEL_IOAPIC) {
- plat_gsi = mp_register_gsi(gsi, edge_level, active_high_low);
+ plat_gsi = mp_register_gsi(gsi, triggering, polarity);
}
#endif
acpi_gsi_to_irq(plat_gsi, &irq);
--- a/arch/i386/kernel/mpparse-xen.c~ 2006-02-02 18:08:53.000000000 -0500
+++ b/arch/i386/kernel/mpparse-xen.c 2006-02-02 18:08:58.000000000 -0500
@@ -1097,7 +1097,7 @@
#define MAX_GSI_NUM 4096
-int mp_register_gsi (u32 gsi, int edge_level, int active_high_low)
+int mp_register_gsi (u32 gsi, int triggering, int polarity)
{
int ioapic = -1;
int ioapic_pin = 0;
@@ -1146,7 +1146,7 @@
mp_ioapic_routing[ioapic].pin_programmed[idx] |= (1<<bit);
- if (edge_level) {
+ if (triggering == ACPI_LEVEL_SENSITIVE) {
/*
* For PCI devices assign IRQs in order, avoiding gaps
* due to unused I/O APIC pins.
@@ -1168,8 +1168,8 @@
}
io_apic_set_pci_routing(ioapic, ioapic_pin, gsi,
- edge_level == ACPI_EDGE_SENSITIVE ? 0 : 1,
- active_high_low == ACPI_ACTIVE_HIGH ? 0 : 1);
+ triggering == ACPI_EDGE_SENSITIVE ? 0 : 1,
+ polarity == ACPI_ACTIVE_HIGH ? 0 : 1);
return gsi;
}
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 2 Feb 2006 14:04:14 -0000 1.12
+++ .cvsignore 3 Feb 2006 19:26:03 -0000 1.13
@@ -5,5 +5,5 @@
patch-2.6.16-rc1.bz2
bcm43xx-20060114.tar.bz2
acpi-release-20060113-2.6.16-rc1.diff.bz2
-xen-20060127a.tar.bz2
patch-2.6.16-rc1-git5.bz2
+xen-20060202.tar.bz2
Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- kernel-xen.spec 3 Feb 2006 16:20:17 -0000 1.39
+++ kernel-xen.spec 3 Feb 2006 19:26:03 -0000 1.40
@@ -189,7 +189,7 @@
Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
-Source1: xen-20060127a.tar.bz2
+Source1: xen-20060202.tar.bz2
Source2: Config.mk
Source10: COPYING.modules
@@ -265,6 +265,7 @@
Patch704: linux-2.6.14-xen-guest-enable-char-devices.patch
Patch705: linux-2.6.14-xen_net_read_mac_export.patch
Patch706: linux-2.6.14-xen_remap_vma_flags.patch
+Patch707: linux-2.6-xen-acpi.patch
#
# Patches 800 through 899 are reserved for bugfixes to the core system
@@ -766,6 +767,7 @@
%patch704 -p1
%patch705 -p1
%patch706 -p1
+%patch707 -p1
%endif
#
@@ -1576,7 +1578,8 @@
%changelog
* Fri Feb 3 2006 Stephen Tweedie <sct at redhat.com>
- Rebase to chrisw's latest merge tree (fix skbuff conflicts)
-- Enable ACPI debugging for now as a workaround for the ACPI heisenbug
+- Rebase to xen-unstable hypervisor cset 8737
+- Fix merge of davej's acpi changes to xen
* Thu Feb 2 2006 Stephen Tweedie <sct at redhat.com>
- Rebase to linux-2.6-merge.hg cset 19892
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 2 Feb 2006 14:04:16 -0000 1.12
+++ sources 3 Feb 2006 19:26:04 -0000 1.13
@@ -1,6 +1,6 @@
cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2
ce5867f7e98d39c0e0e1ee102213b4c9 bcm43xx-20060114.tar.bz2
fbc343e7737654226fd4b5b205378393 patch-2.6.16-rc1.bz2
-07de3270c9a5c63915a209cd36def02e xen-20060127a.tar.bz2
3c236ca700ac76f28c2c4e25682541a4 acpi-release-20060113-2.6.16-rc1.diff.bz2
38954e4fe6dbf902e854f456b675f60f patch-2.6.16-rc1-git5.bz2
+9a0a0e3c3ad5d049fcd29fb913d6c3a6 xen-20060202.tar.bz2
More information about the fedora-cvs-commits
mailing list