From: "Jan Beulich" Subject: [PATCH] acpi: mark several more items __init/__initdata Date: Fri, 19 Sep 2008 14:11:42 +0100 Message-ID: <48D3C12E.76E4.0078.0@novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org Signed-off-by: Jan Beulich Index: 2008-09-01/xen/drivers/acpi/tables/tbfadt.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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.0000000= 00 +0200 @@ -72,7 +72,7 @@ typedef struct acpi_fadt_info { #define ACPI_FADT_REQUIRED 1 #define ACPI_FADT_SEPARATE_LENGTH 2 =20 -static struct acpi_fadt_info fadt_info_table[] =3D { +static struct acpi_fadt_info __initdata fadt_info_table[] =3D { {"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 * *************************************************************************= *****/ =20 -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 * *************************************************************************= *****/ =20 -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) { =20 /* @@ -278,7 +278,7 @@ void acpi_tb_create_local_fadt(struct ac * *************************************************************************= *****/ =20 -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) * *************************************************************************= *****/ =20 -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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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. */ =20 +#include #include #include #include @@ -105,7 +106,7 @@ acpi_status acpi_tb_verify_table(struct=20 * *************************************************************************= *****/ =20 -acpi_status acpi_tb_resize_root_table_list(void) +acpi_status __init acpi_tb_resize_root_table_list(void) { struct acpi_table_desc *tables; =20 Index: 2008-09-01/xen/drivers/acpi/tables/tbutils.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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) * *************************************************************************= *****/ =20 -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 * *************************************************************************= *****/ =20 -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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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") * *************************************************************************= *****/ =20 -acpi_status acpi_allocate_root_table(u32 initial_table_count) +acpi_status __init acpi_allocate_root_table(u32 initial_table_count) { =20 acpi_gbl_root_table_list.size =3D initial_table_count; @@ -151,6 +151,7 @@ acpi_initialize_tables(struct acpi_table return_ACPI_STATUS(status); } =20 +#ifndef __XEN__ /*************************************************************************= ****** * * FUNCTION: acpi_reallocate_root_table @@ -200,6 +201,7 @@ acpi_status acpi_reallocate_root_table(v =20 return_ACPI_STATUS(AE_OK); } +#endif =20 /*************************************************************************= ****** * Index: 2008-09-01/xen/drivers/acpi/tables/tbxfroot.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 * *************************************************************************= *****/ =20 -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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 2008-09-01.orig/xen/drivers/acpi/tables.c 2008-06-10 18:00:41.0000000= 00 +0200 +++ 2008-09-01/xen/drivers/acpi/tables.c 2008-09-05 16:49:56.0000000= 00 +0200 @@ -36,14 +36,16 @@ =20 #define ACPI_MAX_TABLES 128 =20 -static char *mps_inti_flags_polarity[] =3D { "dfl", "high", "res", "low" = }; -static char *mps_inti_flags_trigger[] =3D { "dfl", "edge", "res", "level" = }; +static const char *__initdata +mps_inti_flags_polarity[] =3D { "dfl", "high", "res", "low" }; +static const char *__initdata +mps_inti_flags_trigger[] =3D { "dfl", "edge", "res", "level" }; =20 static struct acpi_table_desc initial_tables[ACPI_MAX_TABLES] __initdata; =20 static int acpi_apic_instance __initdata; =20 -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;