lkml.org 
[lkml]   [2009]   [Feb]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] x86: only set warm_reset_vector for NMI
please discard this one. it doesn't consider system with integrated apic.

YH

Yinghai Lu wrote:
> Impact: cleanup
>
> don't need to set that for INIT etc
>
> Signed-off-by: Yinghai Lu <yinghai@kernel.org>
>
> ---
> arch/x86/kernel/smpboot.c | 17 +++++++++++------
> 1 file changed, 11 insertions(+), 6 deletions(-)
>
> Index: linux-2.6/arch/x86/kernel/smpboot.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/kernel/smpboot.c
> +++ linux-2.6/arch/x86/kernel/smpboot.c
> @@ -609,7 +609,7 @@ wakeup_secondary_cpu_via_nmi(int logical
> return (send_status | accept_status);
> }
>
> -int __devinit
> +static int __devinit
> wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip)
> {
> unsigned long send_status, accept_status = 0;
> @@ -816,11 +816,14 @@ do_rest:
>
> atomic_set(&init_deasserted, 0);
>
> - if (get_uv_system_type() != UV_NON_UNIQUE_APIC) {
> + if (apic->wakeup_secondary_cpu == wakeup_secondary_cpu_via_nmi) {
>
> pr_debug("Setting warm reset code and vector.\n");
>
> smpboot_setup_warm_reset_vector(start_ip);
> + }
> +
> + if (get_uv_system_type() != UV_NON_UNIQUE_APIC) {
> /*
> * Be paranoid about clearing APIC errors.
> */
> @@ -893,10 +896,12 @@ do_rest:
> /* mark "stuck" area as not stuck */
> *((volatile unsigned long *)trampoline_base) = 0;
>
> - /*
> - * Cleanup possible dangling ends...
> - */
> - smpboot_restore_warm_reset_vector();
> + if (apic->wakeup_secondary_cpu == wakeup_secondary_cpu_via_nmi) {
> + /*
> + * Cleanup possible dangling ends...
> + */
> + smpboot_restore_warm_reset_vector();
> + }
>
> return boot_error;
> }
>



\
 
 \ /
  Last update: 2009-02-27 04:41    [W:0.037 / U:0.112 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site