watchdog: hpwdt (5/12): Make x86 assembly ifdef guard more strict
commit fe66f8898210175a13fb553b95b1db2d3a898cf0
Author: dann frazier <[email protected]> Date: Tue Jul 27 17:50:59 2010 -0600
watchdog: hpwdt (5/12): Make x86 assembly ifdef guard more strict
The 32-bit assembly is guarded by an #ifndef CONFIG_X86_64. Kconfig prevents us from building this driver on !X86, so that happens to suffice - but we should really lock it down to #ifdef CONFIG_X86_32.
Signed-off-by dann frazier <[email protected]>
Signed-off-by Wim Van Sebroeck <[email protected]>
drivers/watchdog/hpwdt.c +5 -6
@@ -133,7 +133,7 @@ static struct cmn_registers cmn_regs; extern asmlinkage void asminline_call(struct cmn_registers *pi86Regs,unsigned long *pRomEntry); -#ifndef CONFIG_X86_64 +#ifdef CONFIG_X86_32 /* --32 Bit Bios------------------------------------------------------------ */ #define HPWDT_ARCH 32
@@ -322,8 +322,9 @@ static int __devinit detect_cru_service(void)iounmap (p); return rc; } - -#else +/* ------------------------------------------------------------------------- */ +#endif /* CONFIG_X86_32 */ +#ifdef CONFIG_X86_64 /* --64 Bit Bios------------------------------------------------------------ */ #define HPWDT_ARCH 64
@@ -401,10 +402,8 @@ static int __devinit detect_cru_service(void)/* if cru_rom_addr has been set then we found a CRU service */ return ((cru_rom_addr != NULL) ? 0 : -ENODEV); } -/* ------------------------------------------------------------------------- */ - -#endif +#endif /* CONFIG_X86_64 */ /* * Watchdog operations