Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Renninger <trenn@suse.de>2011-09-21 13:20:35 +0200
committerThomas Renninger <trenn@suse.de>2011-09-21 13:20:35 +0200
commit0ac4276a2e71a20cdbcb5f3dbaf45fb00e7703d5 (patch)
tree32780af787b9d59085e7aecd858cf3aca21c0710
parent000742c0650ebfb9d6ab9cb65efc3daa9f3b71df (diff)
Refresh
patches.arch/acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch. -> Fix build on ia64, by moving asm/e820.h into ifdef config protected region.
-rw-r--r--patches.arch/acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch16
1 files changed, 7 insertions, 9 deletions
diff --git a/patches.arch/acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch b/patches.arch/acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch
index 0b1628444f..57937865f1 100644
--- a/patches.arch/acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch
+++ b/patches.arch/acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch
@@ -57,10 +57,10 @@ CC: x86@kernel.org
arch/x86/kernel/setup.c | 18 ++-
arch/x86/mm/init.c | 6 +
drivers/acpi/Kconfig | 10 +
- drivers/acpi/osl.c | 149 ++++++++++++++++++++++++++-
+ drivers/acpi/osl.c | 150 ++++++++++++++++++++++++++-
include/linux/acpi.h | 4
include/linux/initrd.h | 3
- 7 files changed, 292 insertions(+), 8 deletions(-)
+ 7 files changed, 293 insertions(+), 8 deletions(-)
create mode 100644 Documentation/acpi/initrd_table_override.txt
Index: linux-3.1-rc6-master/Documentation/acpi/initrd_table_override.txt
@@ -250,7 +250,7 @@ Index: linux-3.1-rc6-master/drivers/acpi/osl.c
===================================================================
--- linux-3.1-rc6-master.orig/drivers/acpi/osl.c
+++ linux-3.1-rc6-master/drivers/acpi/osl.c
-@@ -44,9 +44,11 @@
+@@ -44,6 +44,7 @@
#include <linux/list.h>
#include <linux/jiffies.h>
#include <linux/semaphore.h>
@@ -258,15 +258,13 @@ Index: linux-3.1-rc6-master/drivers/acpi/osl.c
#include <asm/io.h>
#include <asm/uaccess.h>
-+#include <asm/e820.h>
-
- #include <acpi/acpi.h>
- #include <acpi/acpi_bus.h>
-@@ -499,6 +501,107 @@ acpi_os_predefined_override(const struct
+@@ -499,6 +500,109 @@ acpi_os_predefined_override(const struct
return AE_OK;
}
+#ifdef CONFIG_ACPI_INITRD_TABLE_OVERRIDE
++#include <asm/e820.h>
++
+#define ACPI_OVERRIDE_TABLES 10
+
+static unsigned long acpi_table_override_offset[ACPI_OVERRIDE_TABLES];
@@ -370,7 +368,7 @@ Index: linux-3.1-rc6-master/drivers/acpi/osl.c
acpi_status
acpi_os_table_override(struct acpi_table_header * existing_table,
struct acpi_table_header ** new_table)
-@@ -526,11 +629,51 @@ acpi_status
+@@ -526,11 +630,51 @@ acpi_status
acpi_os_phys_table_override(struct acpi_table_header *existing_table,
acpi_physical_address *address, u32 *table_length)
{