lkml.org 
[lkml]   [2009]   [Apr]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[git-pull -tip] x86: fix section mismatch warnings
    From
    Date
    The following changes since commit 88dc4c8e38d64db32907e0bd605f8c1ec4c4d1bd:
    Ingo Molnar (1):
    Merge branch 'tracing/ftrace'

    are available in the git repository at:

    git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip.git master

    Jaswinder Singh Rajput (3):
    x86: mm/numa_32.c calculate_numa_remap_pages should use __init
    x86: apic/es7000_32.c find_unisys_acpi_oem_table and es7000_acpi_madt_oem_check should use __init
    x86: smpboot.c wakeup_secondary_cpu_via_nmi do not required __devinit

    arch/x86/kernel/apic/es7000_32.c | 6 +++---
    arch/x86/kernel/smpboot.c | 3 +--
    arch/x86/mm/numa_32.c | 2 +-
    3 files changed, 5 insertions(+), 6 deletions(-)

    Complete diff:
    diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
    index 1c11b81..a7a7bbe 100644
    --- a/arch/x86/kernel/apic/es7000_32.c
    +++ b/arch/x86/kernel/apic/es7000_32.c
    @@ -254,7 +254,7 @@ static int parse_unisys_oem(char *oemptr)
    }

    #ifdef CONFIG_ACPI
    -static int find_unisys_acpi_oem_table(unsigned long *oem_addr)
    +static int __init find_unisys_acpi_oem_table(unsigned long *oem_addr)
    {
    struct acpi_table_header *header = NULL;
    struct es7000_oem_table *table;
    @@ -306,7 +306,7 @@ static int es7000_check_dsdt(void)
    static int es7000_acpi_ret;

    /* Hook from generic ACPI tables.c */
    -static int es7000_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
    +static int __init es7000_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
    {
    unsigned long oem_addr = 0;
    int check_dsdt;
    @@ -717,7 +717,7 @@ struct apic apic_es7000_cluster = {
    .safe_wait_icr_idle = native_safe_apic_wait_icr_idle,
    };

    -struct apic apic_es7000 = {
    +struct apic __initdata apic_es7000 = {

    .name = "es7000",
    .probe = probe_es7000,
    diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
    index bf8ad63..483c2d3 100644
    --- a/arch/x86/kernel/smpboot.c
    +++ b/arch/x86/kernel/smpboot.c
    @@ -504,8 +504,7 @@ void __inquire_remote_apic(int apicid)
    * INIT, INIT, STARTUP sequence will reset the chip hard for us, and this
    * won't ... remember to clear down the APIC, etc later.
    */
    -int __devinit
    -wakeup_secondary_cpu_via_nmi(int logical_apicid, unsigned long start_eip)
    +int wakeup_secondary_cpu_via_nmi(int logical_apicid, unsigned long start_eip)
    {
    unsigned long send_status, accept_status = 0;
    int maxlvt;
    diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c
    index 3daefa0..d253006 100644
    --- a/arch/x86/mm/numa_32.c
    +++ b/arch/x86/mm/numa_32.c
    @@ -257,7 +257,7 @@ void resume_map_numa_kva(pgd_t *pgd_base)
    }
    #endif

    -static unsigned long calculate_numa_remap_pages(void)
    +static __init unsigned long calculate_numa_remap_pages(void)
    {
    int nid;
    unsigned long size, reserve_pages = 0;



    \
     
     \ /
      Last update: 2009-04-16 23:59    [W:0.023 / U:4.420 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site