Re: 2.5.74-mm3 - apm_save_cpus() Macro still bombs out

[William Lee Irwin III]

On Wed, Jul 09, 2003 at 10:44:50PM -0700, Piet Delaney wrote:
>> I'll settle for Matt Mackall <[e-mail]> fix for now:
>>     +#define apm_save_cpus()        (current->cpus_allowed)
>> I wonder why other, like Thomas Schlichter <[e-mail]>,
>> had no problem with the CPU_MASK_NONE fix.
>> I tried adding the #include <linux/cpumask.h> that Marc-Christian
>> Petersen <[e-mail]> sugested but it didn't help. Looks
>> like Jan De Luyck <[e-mail]> had a similar result. 

On Wed, Jul 09, 2003 at 11:08:41PM -0700, William Lee Irwin III wrote:
> Ugh. Fixing.

diff -prauN mm3-2.5.74-1/arch/i386/kernel/apm.c mm3-2.5.74-apm-1/arch/i386/kernel/apm.c
--- mm3-2.5.74-1/arch/i386/kernel/apm.c	2003-07-09 00:03:25.000000000 -0700
+++ mm3-2.5.74-apm-1/arch/i386/kernel/apm.c	2003-07-10 00:03:31.000000000 -0700
@@ -528,7 +528,7 @@ static inline void apm_restore_cpus(cpum
  *	No CPU lockdown needed on a uniprocessor
  */
  
-#define apm_save_cpus()	0
+#define apm_save_cpus()	({ cpumask_t __mask__ = CPU_MASK_NONE; __mask__; })
 #define apm_restore_cpus(x)	(void)(x)
 
 #endif