From: dann frazier <dannf@hp.com>
To: Wim Van Sebroeck <wim@iguana.be>
Cc: linux-kernel@vger.kernel.org,
Thomas Mingarelli <thomas.mingarelli@hp.com>,
dann frazier <dannf@hp.com>
Subject: [PATCH 11/15] Make x86 assembly ifdef guard more strict
Date: Tue, 27 Jul 2010 17:50:59 -0600 [thread overview]
Message-ID: <1280274663-9160-12-git-send-email-dannf@hp.com> (raw)
In-Reply-To: <1280274663-9160-1-git-send-email-dannf@hp.com>
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>
---
drivers/watchdog/hpwdt.c | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index a6b37fe..f46e4f2 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -136,7 +136,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
@@ -325,8 +325,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
@@ -404,10 +405,7 @@ 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
--
1.7.1
next prev parent reply other threads:[~2010-07-27 23:53 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-27 23:50 [PATCH 00/15] hpwdt: make NMI code a config option (+ other cleanup) dann frazier
2010-07-27 23:50 ` [PATCH 01/15] hpwdt_pretimeout reorganization dann frazier
2010-07-27 23:50 ` [PATCH 02/15] remove unnecessary includes dann frazier
2010-07-27 23:50 ` [PATCH 03/15] include spinlock.h dann frazier
2010-07-27 23:50 ` [PATCH 04/15] add include for linux/bitops.h dann frazier
2010-07-27 23:50 ` [PATCH 05/15] Group together includes specific to NMI sourcing dann frazier
2010-07-27 23:50 ` [PATCH 06/15] Group options that affect watchdog behavior together dann frazier
2010-07-27 23:50 ` [PATCH 07/15] Group defines only used by NMI sourcing together dann frazier
2010-07-27 23:50 ` [PATCH 08/15] Group declarations specific to " dann frazier
2010-07-27 23:50 ` [PATCH 09/15] Despecificate driver from iLO2 dann frazier
2010-08-04 20:13 ` Wim Van Sebroeck
2010-08-04 20:18 ` Mingarelli, Thomas
2010-08-05 5:10 ` dann frazier
2010-07-27 23:50 ` [PATCH 10/15] Fix a typo dann frazier
2010-07-27 23:50 ` dann frazier [this message]
2010-07-27 23:51 ` [PATCH 12/15] Construct status message w/ kasprintf and emit it with dev_info dann frazier
2010-07-28 18:38 ` dann frazier
2010-07-27 23:51 ` [PATCH 13/15] Use "decoding" instead of "sourcing" dann frazier
2010-07-27 23:51 ` [PATCH 14/15] Make NMI decoding a compile-time option dann frazier
2010-07-27 23:51 ` [PATCH 15/15] Bump version to 1.2.0 dann frazier
2010-07-28 13:10 ` [PATCH 00/15] hpwdt: make NMI code a config option (+ other cleanup) Mingarelli, Thomas
2010-08-05 21:41 ` Wim Van Sebroeck
2010-08-06 21:26 ` Wim Van Sebroeck
2010-08-06 21:29 ` dann frazier
2010-08-11 12:49 ` Wim Van Sebroeck
2010-08-13 7:29 ` dann frazier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1280274663-9160-12-git-send-email-dannf@hp.com \
--to=dannf@hp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=thomas.mingarelli@hp.com \
--cc=wim@iguana.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome