Attachment 311895 Details for Bug 455430 – RHEL5 fix for this issue

[patch] RHEL5 fix for this issue

455430.patch (text/plain), 1.58 KB, created by Prarit Bhargava on 2008-07-15 23:54:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Prarit Bhargava

Created: 2008-07-15 23:54:30 UTC

Size: 1.58 KB

patch

obsolete

>Backport of 6107a7c4e2a871c37bb6c49e5e8286079f0968f9
>
>    x86: use cpu_online()
>
>    Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
>    Signed-off-by: Ingo Molnar <mingo@elte.hu>
>
>Successfully tested by me.
>
>Resolves BZ 455430
>
>diff -urNp -X linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/arch/i386/kernel/reboot.c linux-2.6.18.i386/arch/i386/kernel/reboot.c
>--- linux-2.6.18.i386.orig/arch/i386/kernel/reboot.c	2008-07-15 15:53:21.000000000 -0400
>+++ linux-2.6.18.i386/arch/i386/kernel/reboot.c	2008-07-15 19:33:57.000000000 -0400
>@@ -293,12 +293,12 @@ void machine_shutdown(void)
> 
> 	/* See if there has been given a command line override */
> 	if ((reboot_cpu != -1) && (reboot_cpu < NR_CPUS) &&
>-		cpu_isset(reboot_cpu, cpu_online_map)) {
>+		cpu_online(reboot_cpu_id)) {
> 		reboot_cpu_id = reboot_cpu;
> 	}
> 
> 	/* Make certain the cpu I'm rebooting on is online */
>-	if (!cpu_isset(reboot_cpu_id, cpu_online_map)) {
>+	if (cpu_online(reboot_cpu_id)) {
> 		reboot_cpu_id = smp_processor_id();
> 	}
> 
>diff -urNp -X linux-2.6.18.x86_64/Documentation/dontdiff linux-2.6.18.x86_64.orig/arch/x86_64/kernel/reboot.c linux-2.6.18.x86_64/arch/x86_64/kernel/reboot.c
>--- linux-2.6.18.x86_64.orig/arch/x86_64/kernel/reboot.c	2008-07-15 14:11:55.000000000 -0400
>+++ linux-2.6.18.x86_64/arch/x86_64/kernel/reboot.c	2008-07-15 19:34:20.000000000 -0400
>@@ -90,7 +90,7 @@ void machine_shutdown(void)
> 	reboot_cpu_id = 0;
> 
> 	/* Make certain the cpu I'm about to reboot on is online */
>-	if (!cpu_isset(reboot_cpu_id, cpu_online_map)) {
>+	if (cpu_online(reboot_cpu_id)) {
> 		reboot_cpu_id = smp_processor_id();
> 	}
>

Actions: View | Diff

Attachments on bug 455430: 311834 | 311895