[Xen-devel] [PATCH] acpi: mark several more items __init/__initdata

["Jan Beulich" <jbeulich@xxxxxxxxxx>]

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

Index: 2008-09-01/xen/drivers/acpi/tables/tbfadt.c
===================================================================
--- 2008-09-01.orig/xen/drivers/acpi/tables/tbfadt.c    2008-09-05 
16:48:22.000000000 +0200
+++ 2008-09-01/xen/drivers/acpi/tables/tbfadt.c 2008-09-05 16:25:07.000000000 
+0200
@@ -72,7 +72,7 @@ typedef struct acpi_fadt_info {
 #define ACPI_FADT_REQUIRED          1
 #define ACPI_FADT_SEPARATE_LENGTH   2
 
-static struct acpi_fadt_info fadt_info_table[] = {
+static struct acpi_fadt_info __initdata fadt_info_table[] = {
        {"Pm1aEventBlock", ACPI_FADT_OFFSET(xpm1a_event_block),
         ACPI_FADT_OFFSET(pm1a_event_block),
         ACPI_FADT_OFFSET(pm1_event_length), ACPI_FADT_REQUIRED},
@@ -157,7 +157,7 @@ acpi_tb_init_generic_address(struct acpi
  *
  
******************************************************************************/
 
-void acpi_tb_parse_fadt(acpi_native_uint table_index, u8 flags)
+void __init acpi_tb_parse_fadt(acpi_native_uint table_index, u8 flags)
 {
        u32 length;
        struct acpi_table_header *table;
@@ -217,7 +217,7 @@ void acpi_tb_parse_fadt(acpi_native_uint
  *
  
******************************************************************************/
 
-void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
+void __init acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 
length)
 {
 
        /*
@@ -278,7 +278,7 @@ void acpi_tb_create_local_fadt(struct ac
  *
  
******************************************************************************/
 
-static void acpi_tb_convert_fadt(void)
+static void __init acpi_tb_convert_fadt(void)
 {
        u8 pm1_register_length;
        struct acpi_generic_address *target;
@@ -393,7 +393,7 @@ static void acpi_tb_convert_fadt(void)
  *
  
******************************************************************************/
 
-static void acpi_tb_validate_fadt(void)
+static void __init acpi_tb_validate_fadt(void)
 {
        u32 *address32;
        struct acpi_generic_address *address64;
Index: 2008-09-01/xen/drivers/acpi/tables/tbinstal.c
===================================================================
--- 2008-09-01.orig/xen/drivers/acpi/tables/tbinstal.c  2008-09-05 
16:48:22.000000000 +0200
+++ 2008-09-01/xen/drivers/acpi/tables/tbinstal.c       2008-09-05 
16:44:45.000000000 +0200
@@ -41,6 +41,7 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
+#include <xen/init.h>
 #include <acpi/acpi.h>
 #include <acpi/acnamesp.h>
 #include <acpi/actables.h>
@@ -105,7 +106,7 @@ acpi_status acpi_tb_verify_table(struct 
  *
  
******************************************************************************/
 
-acpi_status acpi_tb_resize_root_table_list(void)
+acpi_status __init acpi_tb_resize_root_table_list(void)
 {
        struct acpi_table_desc *tables;
 
Index: 2008-09-01/xen/drivers/acpi/tables/tbutils.c
===================================================================
--- 2008-09-01.orig/xen/drivers/acpi/tables/tbutils.c   2008-09-05 
16:48:22.000000000 +0200
+++ 2008-09-01/xen/drivers/acpi/tables/tbutils.c        2008-09-05 
16:30:28.000000000 +0200
@@ -149,7 +149,7 @@ u8 acpi_tb_tables_loaded(void)
  *
  
******************************************************************************/
 
-void
+void __init
 acpi_tb_print_table_header(acpi_physical_address address,
                           struct acpi_table_header *header)
 {
@@ -268,7 +268,7 @@ u8 acpi_tb_checksum(u8 * buffer, acpi_na
  *
  
******************************************************************************/
 
-void
+void __init
 acpi_tb_install_table(acpi_physical_address address,
                      u8 flags, char *signature, acpi_native_uint table_index)
 {
Index: 2008-09-01/xen/drivers/acpi/tables/tbxface.c
===================================================================
--- 2008-09-01.orig/xen/drivers/acpi/tables/tbxface.c   2008-09-05 
16:48:22.000000000 +0200
+++ 2008-09-01/xen/drivers/acpi/tables/tbxface.c        2008-09-05 
16:40:42.000000000 +0200
@@ -65,7 +65,7 @@ ACPI_MODULE_NAME("tbxface")
  *
  
******************************************************************************/
 
-acpi_status acpi_allocate_root_table(u32 initial_table_count)
+acpi_status __init acpi_allocate_root_table(u32 initial_table_count)
 {
 
        acpi_gbl_root_table_list.size = initial_table_count;
@@ -151,6 +151,7 @@ acpi_initialize_tables(struct acpi_table
        return_ACPI_STATUS(status);
 }
 
+#ifndef __XEN__
 
/*******************************************************************************
  *
  * FUNCTION:    acpi_reallocate_root_table
@@ -200,6 +201,7 @@ acpi_status acpi_reallocate_root_table(v
 
        return_ACPI_STATUS(AE_OK);
 }
+#endif
 
 
/*******************************************************************************
  *
Index: 2008-09-01/xen/drivers/acpi/tables/tbxfroot.c
===================================================================
--- 2008-09-01.orig/xen/drivers/acpi/tables/tbxfroot.c  2008-09-05 
16:48:22.000000000 +0200
+++ 2008-09-01/xen/drivers/acpi/tables/tbxfroot.c       2008-09-05 
16:36:41.000000000 +0200
@@ -120,7 +120,7 @@ static acpi_status acpi_tb_validate_rsdp
  *
  
******************************************************************************/
 
-acpi_status acpi_find_root_pointer(acpi_native_uint * table_address)
+acpi_status __init acpi_find_root_pointer(acpi_native_uint * table_address)
 {
        u8 *table_ptr;
        u8 *mem_rover;
@@ -233,7 +233,7 @@ acpi_status acpi_find_root_pointer(acpi_
  * DESCRIPTION: Search a block of memory for the RSDP signature
  *
  
******************************************************************************/
-static u8 *acpi_tb_scan_memory_for_rsdp(u8 * start_address, u32 length)
+static u8 *__init acpi_tb_scan_memory_for_rsdp(u8 * start_address, u32 length)
 {
        acpi_status status;
        u8 *mem_rover;
Index: 2008-09-01/xen/drivers/acpi/tables.c
===================================================================
--- 2008-09-01.orig/xen/drivers/acpi/tables.c   2008-06-10 18:00:41.000000000 
+0200
+++ 2008-09-01/xen/drivers/acpi/tables.c        2008-09-05 16:49:56.000000000 
+0200
@@ -36,14 +36,16 @@
 
 #define ACPI_MAX_TABLES                128
 
-static char *mps_inti_flags_polarity[] = { "dfl", "high", "res", "low" };
-static char *mps_inti_flags_trigger[] = { "dfl", "edge", "res", "level" };
+static const char *__initdata
+mps_inti_flags_polarity[] = { "dfl", "high", "res", "low" };
+static const char *__initdata
+mps_inti_flags_trigger[] = { "dfl", "edge", "res", "level" };
 
 static struct acpi_table_desc initial_tables[ACPI_MAX_TABLES] __initdata;
 
 static int acpi_apic_instance __initdata;
 
-void acpi_table_print_madt_entry(struct acpi_subtable_header *header)
+void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header)
 {
        if (!header)
                return;



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel