Re: [-mm patch] x86_64: kill obsolete check_nmi_watchdog prototype

[Mickael Marchand <marchand@kde.org>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Adrian Bunk a écrit :
> On Thu, Apr 07, 2005 at 09:14:19AM +0200, Mickael Marchand wrote:
> 
>>...
>>-> compiling 2.6.12-rc2-mm1 on amd64 :
>>
>>arch/x86_64/kernel/nmi.c:116: error: static declaration of
>>'check_nmi_watchdog' follows non-static declaration
>>include/asm/apic.h:102: error: previous declaration of
>>'check_nmi_watchdog' was here
> 
> 
> Is this with gcc 4.0?

yes :)

> 
> 
>>I guess the fix is easy enough :)
>>...
> 
> 
> Yup, fix below.
yes, I realize that I should just have just posted it.
thanks for doing it.

Cheers,
Mik



> 
> 
>>Cheers,
>>Mik
> 
> 
> cu
> Adrian
> 
> 
> <--  snip  -->
> 
> 
> This patch kills an obsolete check_nmi_watchdog prototype 
> (check_nmi_watchdog is now static) found by
> Mickael Marchand <marchand@kde.org>.
> 
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
> 
> --- linux-2.6.12-rc2-mm1-full/include/asm-x86_64/apic.h.old	2005-04-08 20:12:01.000000000 +0200
> +++ linux-2.6.12-rc2-mm1-full/include/asm-x86_64/apic.h	2005-04-08 20:12:11.000000000 +0200
> @@ -99,7 +99,6 @@
>  extern void enable_APIC_timer(void);
>  extern void clustered_apic_check(void);
>  
> -extern int check_nmi_watchdog(void);
>  extern void nmi_watchdog_default(void);
>  extern int setup_nmi_watchdog(char *);
>  
> 

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCVsubyOYzc4nQ8j0RAooBAJ9wnRNrhAVmRM6VUuqLY7Bms/uxTgCgml3R
OezYa56tE0cw6GBn0BYO2Qo=
=aK0h
-----END PGP SIGNATURE-----