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

debian/patches/features/all/xen/pvops.patch: Rebase patch to 2.6.32.13. 

svn path=/dists/sid/linux-2.6/; revision=15679
This commit is contained in:
Bastian Blank 2010-05-13 10:56:56 +00:00
parent 5916cfaff5
commit 4369cc817d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
debian/patches/features/all/xen/pvops.patch vendored
View File

@ -124,10 +124,10 @@ index 04f638d..df2c9e9 100644
paging_init();
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 4fdb669..fd612c0 100644
index fbc161d..2f6d482 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1875,6 +1875,10 @@ config PCI_OLPC
@@ -1880,6 +1880,10 @@ config PCI_OLPC
def_bool y
depends on PCI && OLPC && (PCI_GOOLPC || PCI_GOANY)
@ -1247,7 +1247,7 @@ index d85d1b2..8aabedd 100644
{
if (pr->pdc) {
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index ca93638..9eff23c 100644
index 8b85734..eb186ef 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -12,6 +12,8 @@
@ -2503,7 +2503,7 @@ index 6ac3931..3e57c58 100644
rootfs_initcall(pci_iommu_init);
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c
index c245b6a..d4a50e9 100644
index 1c76691..8c9dd05 100644
--- a/arch/x86/kernel/pci-gart_64.c
+++ b/arch/x86/kernel/pci-gart_64.c
@@ -39,6 +39,7 @@
@ -6180,7 +6180,7 @@ index 0000000..2f37c9c
+ acpi_bus_unregister_driver(&xen_acpi_processor_driver);
+}
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 5f2c379..930b870 100644
index 7c85265..882ed92 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -19,6 +19,8 @@
@ -6192,7 +6192,7 @@ index 5f2c379..930b870 100644
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
@@ -211,6 +213,21 @@ static int acpi_suspend_begin(suspend_state_t pm_state)
@@ -216,6 +218,21 @@ static int acpi_suspend_begin(suspend_state_t pm_state)
return error;
}
@ -6214,7 +6214,7 @@ index 5f2c379..930b870 100644
/**
* acpi_suspend_enter - Actually enter a sleep state.
* @pm_state: ignored
@@ -244,7 +261,7 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
@@ -249,7 +266,7 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
break;
case ACPI_STATE_S3: