diff options
| author | dann frazier <dannf@hp.com> | 2010-07-27 17:50:59 -0600 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2010-08-13 20:54:37 +0000 |
| commit | 6b7f3d5321fef4c050073ae08ed9db6c83bb85f1 (patch) | |
| tree | afae00a9ed05c860ec31e8688642207df39bf34d | |
| parent | 36e3ff44cebd7e46756dec88f30c982bebefdab7 (diff) | |
| download | linux-3.10-6b7f3d5321fef4c050073ae08ed9db6c83bb85f1.tar.gz linux-3.10-6b7f3d5321fef4c050073ae08ed9db6c83bb85f1.tar.bz2 linux-3.10-6b7f3d5321fef4c050073ae08ed9db6c83bb85f1.zip | |
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 <dannf@hp.com>
Acked-by: Thomas Mingarelli <Thomas.Mingarelli@hp.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| -rw-r--r-- | drivers/watchdog/hpwdt.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index e18f6b9f794..77ca72c0c6d 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -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 |