lkml.org 
[lkml]   [2008]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 36/79] [PATCH] include mach_wakecpu.h in smpboot_64
    Date
    From: Glauber Costa <gcosta@redhat.com>

    Do it and also fix conflicts, which automatically makes
    x86_64 look closer to i386

    Signed-off-by: Glauber Costa <gcosta@redhat.com>
    ---
    arch/x86/kernel/smpboot_64.c | 11 +++--------
    1 files changed, 3 insertions(+), 8 deletions(-)

    diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c
    index c3e770b..c6c993f 100644
    --- a/arch/x86/kernel/smpboot_64.c
    +++ b/arch/x86/kernel/smpboot_64.c
    @@ -60,6 +60,8 @@
    #include <asm/hw_irq.h>
    #include <asm/numa.h>

    +#include <mach_wakecpu.h>
    +
    /* Set when the idlers are all forked */
    int smp_threads_ready;

    @@ -85,13 +87,6 @@ struct task_struct *idle_thread_array[NR_CPUS] __cpuinitdata ;
    #define set_idle_for_cpu(x,p) (idle_thread_array[(x)] = (p))
    #endif

    -static inline void wait_for_init_deassert(atomic_t *deassert)
    -{
    - while (!atomic_read(deassert))
    - cpu_relax();
    - return;
    -}
    -
    static atomic_t init_deasserted __cpuinitdata;

    /*
    @@ -247,7 +242,7 @@ extern volatile unsigned long init_rsp;
    extern void (*initial_code)(void);

    #ifdef APIC_DEBUG
    -static void inquire_remote_apic(int apicid)
    +static void __inquire_remote_apic(int apicid)
    {
    unsigned i, regs[] = { APIC_ID >> 4, APIC_LVR >> 4, APIC_SPIV >> 4 };
    char *names[] = { "ID", "VERSION", "SPIV" };
    --
    1.5.0.6


    \
     
     \ /
      Last update: 2008-03-19 21:29    [W:0.021 / U:1.836 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site