Re: Linux 2.5.44-ac3

From: Jurriaan (thunder7@xs4all.nl)
Date: Fri Oct 25 2002 - 09:39:01 EST


From: Alan Cox <alan@redhat.com>
Date: Fri, Oct 25, 2002 at 06:19:08AM -0400
>
> This one builds, its not yet had any measurable testing

I disagree :-)

>
> Linux 2.5.44-ac3
> o Fix APM BUG() on SMP boxes, port forward 2.4 (me)
> changes

I have such a box. 2.5.44-ac3 introduces cpu_logical_map() in apm.c,
which isn't defined for i386 anywhere. It is in other architectures; I
don't know what's going on with it.

I used this patch from Manfred Spraul up till now, which works fine.

Kind regards,
Jurriaan

--- a/arch/i386/kernel/apm.c 2002-10-12 06:21:05.000000000 +0200
+++ b/arch/i386/kernel/apm.new 2002-10-20 19:48:30.000000000 +0200
@@ -912,10 +911,10 @@
 #ifdef CONFIG_SMP
         /* Some bioses don't like being called from CPU != 0 */
         if (smp_processor_id() != 0) {
- current->cpus_allowed = 1;
- schedule();
- if (unlikely(smp_processor_id() != 0))
- BUG();
+ if (cpu_online(0))
+ set_cpus_allowed(current, 1);
+ else
+ printk(KERN_INFO "apm: CPU 0 is offline, trying apm shutdown from cpu %d\n", smp_processor_id());
         }
 #endif
         if (apm_info.realmode_power_off)
@@ -1693,10 +1692,10 @@
          * Method suggested by Ingo Molnar.
          */
         if (smp_processor_id() != 0) {
- current->cpus_allowed = 1;
- schedule();
- if (unlikely(smp_processor_id() != 0))
- BUG();
+ if (cpu_online(0))
+ set_cpus_allowed(current, 1);
+ else
+ printk(KERN_INFO "apm: CPU 0 is offline, trying apm shutdown from cpu %d\n", smp_processor_id());
         }
 #endif
 

-- 
Endora is where we are, and you need to know that describing this place is
like dancing to no music.
	Peter Hedges - What's eating Gilbert Grape
GNU/Linux 2.5.44-ac2 SMP/ReiserFS 2x1380 bogomips load av: 7.31 2.92 1.19
-
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 : Thu Oct 31 2002 - 22:00:27 EST