summaryrefslogtreecommitdiff
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorRoland Dreier <rdreier@cisco.com>2008-02-28 09:38:44 -0800
committerWim Van Sebroeck <wim@iguana.be>2008-03-06 11:10:35 +0000
commit103018aca2e4ba0d0e230efa864231c59228f419 (patch)
treebc31aec77db886f23f26fca97ef341cc15d19a72 /drivers/watchdog
parent5e69960865ab6033a129f9ee35264adb2a1cfc94 (diff)
downloadlinux-3.10-103018aca2e4ba0d0e230efa864231c59228f419.tar.gz
linux-3.10-103018aca2e4ba0d0e230efa864231c59228f419.tar.bz2
linux-3.10-103018aca2e4ba0d0e230efa864231c59228f419.zip
[WATCHDOG] Fix declaration of struct smbios_entry_point in hpwdt
On my HP DL380 G5 system running a 64-bit kernel, loading the hpwdt driver causes a crash because the driver attempts to ioremap an invalid physical address. This is because the driver has an incorrect definition of the SMBIOS table entry point structure: the table address is only a 32-bit quantity, and making it a u64 means that the high-order 32 bits end up containing garbage. Correcting the structure definition fixes the driver so that it loads without any problems on my system. Signed-off-by: Roland Dreier <rolandd@cisco.com> Acked-by: Thomas Mingarelli <Thomas.Mingarelli@hp.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/hpwdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index a2e174b09fe..cd1cc2dacee 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -88,7 +88,7 @@ struct smbios_entry_point {
u8 intermediate_anchor[5];
u8 intermediate_checksum;
u16 table_length;
- u64 table_address;
+ u32 table_address;
u16 table_num_structs;
u8 bcd_revision;
};