浏览代码

x86: consistent about warm_reset_vector for UN_NON_UNIQUE_APIC

Impact: cleanup

didn't set it for UV_NON_UNIQUE_APIC, so don't restore it

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <49D6A6B9.6060501@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Yinghai Lu 16 年之前
父节点
当前提交
02421f98ec
共有 1 个文件被更改,包括 6 次插入4 次删除
  1. 6 4
      arch/x86/kernel/smpboot.c

+ 6 - 4
arch/x86/kernel/smpboot.c

@@ -822,10 +822,12 @@ do_rest:
 	/* mark "stuck" area as not stuck */
 	/* mark "stuck" area as not stuck */
 	*((volatile unsigned long *)trampoline_base) = 0;
 	*((volatile unsigned long *)trampoline_base) = 0;
 
 
-	/*
-	 * Cleanup possible dangling ends...
-	 */
-	smpboot_restore_warm_reset_vector();
+	if (get_uv_system_type() != UV_NON_UNIQUE_APIC) {
+		/*
+		 * Cleanup possible dangling ends...
+		 */
+		smpboot_restore_warm_reset_vector();
+	}
 
 
 	return boot_error;
 	return boot_error;
 }
 }