Re: 2.5.74-mm3

Andrew Morton
2003-07-09T09:18:49Z

Thomas Schlichter <schlicht@uni-mannheim.de> wrote:
>
> This gives following compile error when compiling the kernel with APM support
> for UP:
>
> arch/i386/kernel/apm.c: In function `apm_bios_call':
> arch/i386/kernel/apm.c:600: error: incompatible types in assignment
> arch/i386/kernel/apm.c: In function `apm_bios_call_simple':
> arch/i386/kernel/apm.c:643: error: incompatible types in assignment
>
> The attached patch fixes this...

Seems complex. I just have this:

diff -puN arch/i386/kernel/apm.c~cpumask-apm-fix-2 arch/i386/kernel/apm.c
--- 25/arch/i386/kernel/apm.c~cpumask-apm-fix-2 2003-07-08 23:09:23.000000000 -0700
+++ 25-akpm/arch/i386/kernel/apm.c 2003-07-08 23:28:50.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() CPU_MASK_NONE
#define apm_restore_cpus(x) (void)(x)

#endif

_