Commit 6b7f3d53 authored by dann frazier's avatar dann frazier Committed by Wim Van Sebroeck

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: default avatardann frazier <dannf@hp.com>
Acked-by: default avatarThomas Mingarelli <Thomas.Mingarelli@hp.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 36e3ff44
...@@ -133,7 +133,7 @@ static struct cmn_registers cmn_regs; ...@@ -133,7 +133,7 @@ static struct cmn_registers cmn_regs;
extern asmlinkage void asminline_call(struct cmn_registers *pi86Regs, extern asmlinkage void asminline_call(struct cmn_registers *pi86Regs,
unsigned long *pRomEntry); unsigned long *pRomEntry);
#ifndef CONFIG_X86_64 #ifdef CONFIG_X86_32
/* --32 Bit Bios------------------------------------------------------------ */ /* --32 Bit Bios------------------------------------------------------------ */
#define HPWDT_ARCH 32 #define HPWDT_ARCH 32
...@@ -322,8 +322,9 @@ static int __devinit detect_cru_service(void) ...@@ -322,8 +322,9 @@ static int __devinit detect_cru_service(void)
iounmap(p); iounmap(p);
return rc; return rc;
} }
/* ------------------------------------------------------------------------- */
#else #endif /* CONFIG_X86_32 */
#ifdef CONFIG_X86_64
/* --64 Bit Bios------------------------------------------------------------ */ /* --64 Bit Bios------------------------------------------------------------ */
#define HPWDT_ARCH 64 #define HPWDT_ARCH 64
...@@ -401,10 +402,8 @@ static int __devinit detect_cru_service(void) ...@@ -401,10 +402,8 @@ static int __devinit detect_cru_service(void)
/* if cru_rom_addr has been set then we found a CRU service */ /* if cru_rom_addr has been set then we found a CRU service */
return ((cru_rom_addr != NULL) ? 0 : -ENODEV); return ((cru_rom_addr != NULL) ? 0 : -ENODEV);
} }
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
#endif /* CONFIG_X86_64 */
#endif
/* /*
* Watchdog operations * Watchdog operations
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment