On Mon, 25 Jun 2007 13:48:51 -0700
Randy Dunlap <[EMAIL PROTECTED]> wrote:
> From: Randy Dunlap <[EMAIL PROTECTED]>
>
> Are there peculiarities about Cyrix that mean this isn't needed?
>
> main.c::mtrr_add() or mtrr_del() [exported]
> calls main.c::mtrr_add_page() or mtrr_del_page() or mtrr_restore() [resume]
> calls main.c::set_mtrr()
> calls main.c::ipi_handler()
> calls main.c::mtrr_if->set_all() == which can be cyrix_set_all
>
> WARNING: arch/i386/kernel/built-in.o(.text+0x8657): Section mismatch:
> reference to .init.data: (between 'cyrix_set_all' and
> 'centaur_get_free_region')
> WARNING: arch/i386/kernel/built-in.o(.text+0x866b): Section mismatch:
> reference to .init.data: (between 'cyrix_set_all' and
> 'centaur_get_free_region')
> WARNING: arch/i386/kernel/built-in.o(.text+0x867e): Section mismatch:
> reference to .init.data: (between 'cyrix_set_all' and
> 'centaur_get_free_region')
> WARNING: arch/i386/kernel/built-in.o(.text+0x8684): Section mismatch:
> reference to .init.data: (between 'cyrix_set_all' and
> 'centaur_get_free_region')
> WARNING: arch/i386/kernel/built-in.o(.text+0x868a): Section mismatch:
> reference to .init.data: (between 'cyrix_set_all' and
> 'centaur_get_free_region')
>
> Signed-off-by: Randy Dunlap <[EMAIL PROTECTED]>
> ---
> arch/i386/kernel/cpu/mtrr/cyrix.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> --- linux-2.6.22-rc6.orig/arch/i386/kernel/cpu/mtrr/cyrix.c
> +++ linux-2.6.22-rc6/arch/i386/kernel/cpu/mtrr/cyrix.c
> @@ -233,12 +233,12 @@ typedef struct {
> mtrr_type type;
> } arr_state_t;
>
> -static arr_state_t arr_state[8] __devinitdata = {
> +static arr_state_t arr_state[8] = {
> {0UL, 0UL, 0UL}, {0UL, 0UL, 0UL}, {0UL, 0UL, 0UL}, {0UL, 0UL, 0UL},
> {0UL, 0UL, 0UL}, {0UL, 0UL, 0UL}, {0UL, 0UL, 0UL}, {0UL, 0UL, 0UL}
> };
>
> -static unsigned char ccr_state[7] __devinitdata = { 0, 0, 0, 0, 0, 0, 0 };
> +static unsigned char ccr_state[7] = { 0, 0, 0, 0, 0, 0, 0 };
>
> static void cyrix_set_all(void)
> {
Looks right to me. Certainly it's safe.
Now, possibly mtrr_ops.set_all _should_ point at __init functions, but we
dont' have a way of expressing that, and
arch/i386/kernel/cpu/mtrr/main.c:ipi_handler() looks like it's called at
non-initcall time.
So I'll plan on merging this fix as-is, for 2.6.22.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
