Attachment 303534 Details for Bug 443853 – RHEL5 fix for this issue [2/2]

[patch] RHEL5 fix for this issue [2/2]

diff2 (text/plain), 2.59 KB, created by Prarit Bhargava on 2008-04-23 18:25:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Prarit Bhargava

Created: 2008-04-23 18:25:04 UTC

Size: 2.59 KB

patch

obsolete

>Rework powernowk8_init function so that it bails immediately if
>supported_cpus != num_online_cpus.
>
>Upstream code is very simple and does not perform the blacklist check.
>
>Resolves BZ 443853.
>
>diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
>index f2e17da..e478246 100644
>--- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
>+++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
>@@ -1421,6 +1421,9 @@ static int __cpuinit powernowk8_init(void)
> 			supported_cpus++;
> 	}
> 
>+	if (supported_cpus != num_online_cpus())
>+		return -ENODEV;
>+
> 	/* AMD provides AGESA library modules for use in their BIOS. The
> 	   default AGESA code creates the _PSD with the assumption the APICs
> 	   are numbered per the BKDG HOWEVER, there is a callback
>@@ -1454,34 +1457,29 @@ static int __cpuinit powernowk8_init(void)
> 	tscsync = 0;
> #endif
> 
>-	if (supported_cpus == num_online_cpus()) {
>-		if (tscsync) {
>-			req_state = kzalloc(sizeof(int)*NR_CPUS, GFP_KERNEL);
>-			if (!req_state) {
>-				printk(KERN_ERR PFX "Unable to allocate memory!\n");
>-				return -ENOMEM;
>-			}
>-			/* necessary for dual-cores (99=just a large number) */
>-			for(i=0; i < num_possible_cpus(); i++)
>-				req_state[i] = 99;
>+	if (tscsync) {
>+		req_state = kzalloc(sizeof(int)*NR_CPUS, GFP_KERNEL);
>+		if (!req_state) {
>+			printk(KERN_ERR PFX "Unable to allocate memory!\n");
>+			return -ENOMEM;
> 		}
>-		if (powernow_k8_cpu_preinit_acpi())
>-			printk(KERN_ERR PFX "Pre-initialization of ACPI failed"
>-			       "\n");
>+		/* necessary for dual-cores (99=just a large number) */
>+		for(i=0; i < num_possible_cpus(); i++)
>+			req_state[i] = 99;
>+	}
>+	if (powernow_k8_cpu_preinit_acpi())
>+		printk(KERN_ERR PFX "Pre-initialization of ACPI failed\n");
> #ifdef CONFIG_SMP
>-		printk(KERN_INFO PFX "Found %d %s "
>-		       "processors (%d cpu cores) (" VERSION ")\n",
>-		       supported_cpus/cpu_data[0].booted_cores,
>-		       boot_cpu_data.x86_model_id, supported_cpus);
>+	printk(KERN_INFO PFX "Found %d %s "
>+	       "processors (%d cpu cores) (" VERSION ")\n",
>+	       supported_cpus/cpu_data[0].booted_cores,
>+	       boot_cpu_data.x86_model_id, supported_cpus);
> #else
>-		printk(KERN_INFO PFX "Found 1 %s "
>-		       "processors (%d cpu cores) (" VERSION ")\n",
>-		       boot_cpu_data.x86_model_id, supported_cpus);
>+	printk(KERN_INFO PFX "Found 1 %s "
>+	       "processors (%d cpu cores) (" VERSION ")\n",
>+	       boot_cpu_data.x86_model_id, supported_cpus);
> #endif
>-		return cpufreq_register_driver(&cpufreq_amd64_driver);
>-	}
>-
>-	return -ENODEV;
>+	return cpufreq_register_driver(&cpufreq_amd64_driver);
> }
> 
> /* driver entry point for term */

Actions: View | Diff

Attachments on bug 443853: 303533 | 303534 | 311493