Re: 2.5.74-mm3

Marc-Christian Petersen
2003-07-09T09:38:07Z

[-- Attachment #1: Type: text/plain, Size: 939 bytes --]

On Wednesday 09 July 2003 11:18, Andrew Morton wrote:

Hi Andrew,

> > 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
>
better use the attached one ;)

ciao, Marc

[-- Attachment #2: 15_fixup-apm-small.patch --]
[-- Type: text/x-diff, Size: 640 bytes --]

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
@@ -222,6 +222,7 @@
#include <linux/kernel.h>
#include <linux/smp.h>
#include <linux/smp_lock.h>
+#include <linux/cpumask.h>

#include <asm/system.h>
#include <asm/uaccess.h>
@@ -528,7 +529,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