lkml.org 
[lkml]   [2007]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 5/5] Move definition of hard_smp_processor_id to asm/smp.h - alpha, m32r, powerpc, s390, sparc, sparc64, um
    From
    Date
    Move definition of hard_smp_processor_id to asm/smp.h on alpha, m32r,
    powerpc, s390, sparc, sparc64, and um architectures.

    Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
    ---

    diff -urNp linux-2.6.21-rc2/include/asm-alpha/smp.h linux-2.6.21-rc2-hwcpuid/include/asm-alpha/smp.h
    --- linux-2.6.21-rc2/include/asm-alpha/smp.h 2007-02-05 03:44:54.000000000 +0900
    +++ linux-2.6.21-rc2-hwcpuid/include/asm-alpha/smp.h 2007-03-07 13:34:14.000000000 +0900
    @@ -51,6 +51,7 @@ int smp_call_function_on_cpu(void (*func

    #else /* CONFIG_SMP */

    +#define hard_smp_processor_id() 0
    #define smp_call_function_on_cpu(func,info,retry,wait,cpu) ({ 0; })

    #endif /* CONFIG_SMP */
    diff -urNp linux-2.6.21-rc2/include/asm-m32r/smp.h linux-2.6.21-rc2-hwcpuid/include/asm-m32r/smp.h
    --- linux-2.6.21-rc2/include/asm-m32r/smp.h 2007-03-07 12:04:26.000000000 +0900
    +++ linux-2.6.21-rc2-hwcpuid/include/asm-m32r/smp.h 2007-03-07 13:39:22.000000000 +0900
    @@ -108,6 +108,10 @@ extern unsigned long send_IPI_mask_phys(
    #define IPI_SHIFT (0)
    #define NR_IPIS (8)

    -#endif /* CONFIG_SMP */
    +#else /* CONFIG_SMP */
    +
    +#define hard_smp_processor_id() 0
    +
    +#endif /* CONFIG_SMP */

    #endif /* _ASM_M32R_SMP_H */
    diff -urNp linux-2.6.21-rc2/include/asm-powerpc/smp.h linux-2.6.21-rc2-hwcpuid/include/asm-powerpc/smp.h
    --- linux-2.6.21-rc2/include/asm-powerpc/smp.h 2007-03-07 12:04:26.000000000 +0900
    +++ linux-2.6.21-rc2-hwcpuid/include/asm-powerpc/smp.h 2007-03-07 13:54:18.000000000 +0900
    @@ -83,6 +83,7 @@ extern void __cpu_die(unsigned int cpu);

    #else
    /* for UP */
    +#define hard_smp_processor_id() 0
    #define smp_setup_cpu_maps()

    #endif /* CONFIG_SMP */
    diff -urNp linux-2.6.21-rc2/include/asm-s390/smp.h linux-2.6.21-rc2-hwcpuid/include/asm-s390/smp.h
    --- linux-2.6.21-rc2/include/asm-s390/smp.h 2007-03-07 12:04:26.000000000 +0900
    +++ linux-2.6.21-rc2-hwcpuid/include/asm-s390/smp.h 2007-03-07 13:43:31.000000000 +0900
    @@ -113,6 +113,7 @@ static inline void smp_send_stop(void)
    __load_psw_mask(psw_kernel_bits & ~PSW_MASK_MCHECK);
    }

    +#define hard_smp_processor_id() 0
    #define smp_cpu_not_running(cpu) 1
    #define smp_get_cpu(cpu) ({ 0; })
    #define smp_put_cpu(cpu) ({ 0; })
    diff -urNp linux-2.6.21-rc2/include/asm-sparc/smp.h linux-2.6.21-rc2-hwcpuid/include/asm-sparc/smp.h
    --- linux-2.6.21-rc2/include/asm-sparc/smp.h 2007-02-05 03:44:54.000000000 +0900
    +++ linux-2.6.21-rc2-hwcpuid/include/asm-sparc/smp.h 2007-03-07 13:36:27.000000000 +0900
    @@ -165,6 +165,7 @@ void smp_setup_cpu_possible_map(void);

    #else /* SMP */

    +#define hard_smp_processor_id() 0
    #define smp_setup_cpu_possible_map() do { } while (0)

    #endif /* !(SMP) */
    diff -urNp linux-2.6.21-rc2/include/asm-sparc64/smp.h linux-2.6.21-rc2-hwcpuid/include/asm-sparc64/smp.h
    --- linux-2.6.21-rc2/include/asm-sparc64/smp.h 2007-02-05 03:44:54.000000000 +0900
    +++ linux-2.6.21-rc2-hwcpuid/include/asm-sparc64/smp.h 2007-03-07 13:48:35.000000000 +0900
    @@ -47,6 +47,7 @@ extern void smp_setup_cpu_possible_map(v

    #else

    +#define hard_smp_processor_id() 0
    #define smp_setup_cpu_possible_map() do { } while (0)

    #endif /* !(CONFIG_SMP) */
    diff -urNp linux-2.6.21-rc2/include/asm-um/smp.h linux-2.6.21-rc2-hwcpuid/include/asm-um/smp.h
    --- linux-2.6.21-rc2/include/asm-um/smp.h 2007-02-05 03:44:54.000000000 +0900
    +++ linux-2.6.21-rc2-hwcpuid/include/asm-um/smp.h 2007-03-07 13:26:01.000000000 +0900
    @@ -24,6 +24,10 @@ extern inline void smp_cpus_done(unsigne

    extern struct task_struct *idle_threads[NR_CPUS];

    +#else
    +
    +#define hard_smp_processor_id() 0
    +
    #endif

    #endif

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-03-01 08:21    [W:0.021 / U:4.196 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site