Re: 2.6.15-rc2-git3 build fails at mtrr/ipi_handler undeclared

[Bob Gill]

Hugh Dickins wrote:

> That's one of the things fixed by Andrew's patch below
> (though Linus fixed it differently in the end).
> Or you could just wait for 2.6.15-rc2-git4, should be along soon.
>
> Hugh
>
> diff -puN include/linux/smp.h~smp_call_function-must-be-a-macro include/linux/smp.h
> --- devel/include/linux/smp.h~smp_call_function-must-be-a-macro	2005-11-23 00:14:19.000000000 -0800
> +++ devel-akpm/include/linux/smp.h	2005-11-23 00:20:54.000000000 -0800
> @@ -94,13 +94,7 @@ void smp_prepare_boot_cpu(void);
>  */
> #define raw_smp_processor_id()			0
> #define hard_smp_processor_id()			0
> -
> -static inline int smp_call_function(void (*func) (void *info), void *info,
> -				    int retry, int wait)
> -{
> -	return 0;
> -}
> -
> +#define smp_call_function(func,info,retry,wait)	({ 0; })
> #define on_each_cpu(func,info,retry,wait)	({ func(info); 0; })
> static inline void smp_send_reschedule(int cpu) { }
> #define num_booting_cpus()			1
> diff -puN net/core/flow.c~smp_call_function-must-be-a-macro net/core/flow.c
> --- devel/net/core/flow.c~smp_call_function-must-be-a-macro	2005-11-23 00:17:40.000000000 -0800
> +++ devel-akpm/net/core/flow.c	2005-11-23 00:17:47.000000000 -0800
> @@ -292,7 +292,7 @@ void flow_cache_flush(void)
> 	init_completion(&info.completion);
>
> 	local_bh_disable();
> -	smp_call_function(flow_cache_flush_per_cpu, &info, 1, 0);
> +	(void)smp_call_function(flow_cache_flush_per_cpu, &info, 1, 0);
> 	flow_cache_flush_tasklet((unsigned long)&info);
> 	local_bh_enable();
>
>
>  
Done!  Thanks for your reply.  I built 2.6.15-rc2-git4 and its running 
it as I type this.  Linus' final looks very much like the patch above, 
except for the void typecast in smp_call_funciton.
Thanks again,
Bob
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/