lkml.org 
[lkml]   [2007]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH 2/4] Save the MTRRs of the BSP before booting an AP
    On Tue, 3 Apr 2007 16:00:36 +0200 (CEST) Bernhard Kaindl <bk@suse.de> wrote:

    > --- linux-2.6.20.orig/arch/i386/kernel/smpboot.c
    > +++ linux-2.6.20/arch/i386/kernel/smpboot.c
    > @@ -59,6 +59,7 @@
    > #include <asm/nmi.h>
    > #include <asm/pda.h>
    > #include <asm/genapic.h>
    > +#include <asm/mtrr.h>
    >

    This inclusion breaks `make headers_check'.

    Please always at least test allmodconfig builds before releasing a
    patchset. Additional hints are in Documentation/SubmitChecklist.

    +static __inline__ void mtrr_save_state (void)
    +{
    + if (smp_processor_id() == 0)
    + mtrr_save_fixed_ranges(NULL);
    + else
    + smp_call_function_single(0, mtrr_save_fixed_ranges, NULL, 1, 1);
    +}

    - Please use inline, not __inline__

    - No space before the (

    - We should uninline this function

    - It is not performance critical

    - It is probably too large to be inlined anwyay

    - It uses a lot of tricky stuff which requires a lot of header files.


    From: Andrew Morton <akpm@linux-foundation.org>

    Fix `make headers_check'.

    Cc: Andi Kleen <ak@suse.de>
    Cc: Bernhard Kaindl <bk@suse.de>
    Cc: Dave Jones <davej@codemonkey.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    ---

    arch/i386/kernel/cpu/mtrr/main.c | 11 +++++++++++
    include/asm-i386/mtrr.h | 12 +-----------
    include/asm-x86_64/proto.h | 12 +-----------
    3 files changed, 13 insertions(+), 22 deletions(-)

    diff -puN arch/i386/kernel/smpboot.c~mtrr-save-the-mtrrs-of-the-bsp-before-booting-an-ap-fix arch/i386/kernel/smpboot.c
    diff -puN arch/x86_64/kernel/smpboot.c~mtrr-save-the-mtrrs-of-the-bsp-before-booting-an-ap-fix arch/x86_64/kernel/smpboot.c
    diff -puN include/asm-i386/mtrr.h~mtrr-save-the-mtrrs-of-the-bsp-before-booting-an-ap-fix include/asm-i386/mtrr.h
    --- a/include/asm-i386/mtrr.h~mtrr-save-the-mtrrs-of-the-bsp-before-booting-an-ap-fix
    +++ a/include/asm-i386/mtrr.h
    @@ -25,7 +25,6 @@

    #include <linux/ioctl.h>
    #include <linux/errno.h>
    -#include <linux/smp.h>

    #define MTRR_IOCTL_BASE 'M'

    @@ -71,16 +70,7 @@ struct mtrr_gentry
    /* The following functions are for use by other drivers */
    # ifdef CONFIG_MTRR
    extern void mtrr_save_fixed_ranges(void *);
    -/**
    - * Save current fixed-range MTRR state of the BSP
    - */
    -static __inline__ void mtrr_save_state (void)
    -{
    - if (smp_processor_id() == 0)
    - mtrr_save_fixed_ranges(NULL);
    - else
    - smp_call_function_single(0, mtrr_save_fixed_ranges, NULL, 1, 1);
    -}
    +extern void mtrr_save_state(void);
    extern int mtrr_add (unsigned long base, unsigned long size,
    unsigned int type, char increment);
    extern int mtrr_add_page (unsigned long base, unsigned long size,
    diff -puN include/asm-x86_64/proto.h~mtrr-save-the-mtrrs-of-the-bsp-before-booting-an-ap-fix include/asm-x86_64/proto.h
    --- a/include/asm-x86_64/proto.h~mtrr-save-the-mtrrs-of-the-bsp-before-booting-an-ap-fix
    +++ a/include/asm-x86_64/proto.h
    @@ -2,7 +2,6 @@
    #define _ASM_X8664_PROTO_H 1

    #include <asm/ldt.h>
    -#include <linux/smp.h>

    /* misc architecture specific prototypes */

    @@ -19,16 +18,7 @@ extern void mcheck_init(struct cpuinfo_x
    extern void mtrr_ap_init(void);
    extern void mtrr_bp_init(void);
    extern void mtrr_save_fixed_ranges(void *);
    -static __inline__ void mtrr_save_state (void)
    -{
    - /*
    - * Save current fixed-range MTRR state of the BSP:
    - */
    - if (smp_processor_id() == 0)
    - mtrr_save_fixed_ranges(NULL);
    - else
    - smp_call_function_single(0, mtrr_save_fixed_ranges, NULL, 1, 1);
    -}
    +extern void mtrr_save_state(void);
    #else
    #define mtrr_ap_init() do {} while (0)
    #define mtrr_bp_init() do {} while (0)
    diff -puN arch/i386/kernel/cpu/mtrr/main.c~mtrr-save-the-mtrrs-of-the-bsp-before-booting-an-ap-fix arch/i386/kernel/cpu/mtrr/main.c
    --- a/arch/i386/kernel/cpu/mtrr/main.c~mtrr-save-the-mtrrs-of-the-bsp-before-booting-an-ap-fix
    +++ a/arch/i386/kernel/cpu/mtrr/main.c
    @@ -729,6 +729,17 @@ void mtrr_ap_init(void)
    local_irq_restore(flags);
    }

    +/**
    + * Save current fixed-range MTRR state of the BSP
    + */
    +void mtrr_save_state(void)
    +{
    + if (smp_processor_id() == 0)
    + mtrr_save_fixed_ranges(NULL);
    + else
    + smp_call_function_single(0, mtrr_save_fixed_ranges, NULL, 1, 1);
    +}
    +
    static int __init mtrr_init_finialize(void)
    {
    if (!mtrr_if)
    _
    -
    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-04-08 22:13    [W:0.033 / U:2.952 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site