diff --git a/[refs] b/[refs] index 9535d085d1b1..178347e60d28 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6fc53bae3d5940f1b123afa5ad082359b1a376be +refs/heads/master: d3ab78560b9a244bdb2ba2ef0e53193832d311c2 diff --git a/trunk/arch/i386/mach-generic/es7000.c b/trunk/arch/i386/mach-generic/es7000.c index b47f951c0ec2..4742626f08c4 100644 --- a/trunk/arch/i386/mach-generic/es7000.c +++ b/trunk/arch/i386/mach-generic/es7000.c @@ -66,4 +66,4 @@ static int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id) } #endif -struct genapic apic_es7000 = APIC_INIT("es7000", probe_es7000); +struct genapic __initdata_refok apic_es7000 = APIC_INIT("es7000", probe_es7000); diff --git a/trunk/scripts/mod/modpost.c b/trunk/scripts/mod/modpost.c index 7f5ff7e0a0f3..1921c43f3a3e 100644 --- a/trunk/scripts/mod/modpost.c +++ b/trunk/scripts/mod/modpost.c @@ -647,7 +647,6 @@ static int secref_whitelist(const char *modname, const char *tosec, "_probe", "_probe_one", "_console", - "apic_es7000", NULL };