[PATCH] 2.5.29 fix for undef num_possible_cpus

From: Albert Cranford (ac9410@attbi.com)
Date: Sat Jul 27 2002 - 22:16:40 EST

Hello Linus,
APM changes in 2.5.29 replaced num_online_cpus with
num_possible_cpus. I cannot find num_possible_cpus
defined anywhere.
Please revert back to num_online_cpus to link successfully.
Thanks,
Albert
--- linux/arch/i386/kernel/apm.c.orig 2002-07-27 14:31:23.000000000 -0400
+++ linux/arch/i386/kernel/apm.c 2002-07-27 14:32:27.000000000 -0400
@@ -1589,7 +1589,7 @@
 
        p = buf;
 
- if ((num_possible_cpus() == 1) &&
+ if ((num_online_cpus() == 1) &&
            !(error = apm_get_power_status(&bx, &cx, &dx))) {
                ac_line_status = (bx >> 8) & 0xff;
                battery_status = bx & 0xff;
@@ -1720,7 +1720,7 @@
                }
        }
 
- if (debug && (num_possible_cpus() == 1)) {
+ if (debug && (num_online_cpus() == 1)) {
                error = apm_get_power_status(&bx, &cx, &dx);
                if (error)
                        printk(KERN_INFO "apm: power status not available\n");
@@ -1764,7 +1764,7 @@
                pm_power_off = apm_power_off;
        register_sysrq_key('o', &sysrq_poweroff_op);
 
- if (num_possible_cpus() == 1) {
+ if (num_online_cpus() == 1) {
 #if defined(CONFIG_APM_DISPLAY_BLANK) && defined(CONFIG_VT)
                console_blank_hook = apm_console_blank;
 #endif
@@ -1907,7 +1907,7 @@
                printk(KERN_NOTICE "apm: disabled on user request.\n");
                return -ENODEV;
        }
- if ((num_possible_cpus() > 1) && !power_off) {
+ if ((num_online_cpus() > 1) && !power_off) {
                printk(KERN_NOTICE "apm: disabled - APM is not SMP safe.\n");
                return -ENODEV;
        }
@@ -1964,7 +1964,7 @@
 
        kernel_thread(apm, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGHAND | SIGCHLD);
 
- if (num_possible_cpus() > 1) {
+ if (num_online_cpus() > 1) {
                printk(KERN_NOTICE
                   "apm: disabled - APM is not SMP safe (power off active).\n");
                return 0; 

-- 
Albert Cranford Deerfield Beach FL USA
ac9410@bellsouth.net

--- linux/arch/i386/kernel/apm.c.orig 2002-07-27 14:31:23.000000000 -0400 +++ linux/arch/i386/kernel/apm.c 2002-07-27 14:32:27.000000000 -0400 @@ -1589,7 +1589,7 @@ p = buf; - if ((num_possible_cpus() == 1) && + if ((num_online_cpus() == 1) && !(error = apm_get_power_status(&bx, &cx, &dx))) { ac_line_status = (bx >> 8) & 0xff; battery_status = bx & 0xff; @@ -1720,7 +1720,7 @@ } } - if (debug && (num_possible_cpus() == 1)) { + if (debug && (num_online_cpus() == 1)) { error = apm_get_power_status(&bx, &cx, &dx); if (error) printk(KERN_INFO "apm: power status not available\n"); @@ -1764,7 +1764,7 @@ pm_power_off = apm_power_off; register_sysrq_key('o', &sysrq_poweroff_op); - if (num_possible_cpus() == 1) { + if (num_online_cpus() == 1) { #if defined(CONFIG_APM_DISPLAY_BLANK) && defined(CONFIG_VT) console_blank_hook = apm_console_blank; #endif @@ -1907,7 +1907,7 @@ printk(KERN_NOTICE "apm: disabled on user request.\n"); return -ENODEV; } - if ((num_possible_cpus() > 1) && !power_off) { + if ((num_online_cpus() > 1) && !power_off) { printk(KERN_NOTICE "apm: disabled - APM is not SMP safe.\n"); return -ENODEV; } @@ -1964,7 +1964,7 @@ kernel_thread(apm, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGHAND | SIGCHLD); - if (num_possible_cpus() > 1) { + if (num_online_cpus() > 1) { printk(KERN_NOTICE "apm: disabled - APM is not SMP safe (power off active).\n"); return 0;

- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Tue Jul 30 2002 - 14:00:27 EST