v2.6.33-rc5 fixes
Hi Linus,
Please pull from 'master' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
or if master.kernel.org hasn't synced up yet:
master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
This will update the following files:
drivers/watchdog/Kconfig | 4 ++-- drivers/watchdog/ixp2000_wdt.c | 1 + drivers/watchdog/sbc_fitpc2_wdt.c | 11 +++++------ 3 files changed, 8 insertions(+), 8 deletions(-)
with these Changes:
Author: Denis Turischev <[email protected]> Date: Thu Jan 21 16:10:07 2010 +0200
[WATCHDOG] sbc_fitpc2_wdt: fix I/O space access technique.
The mdelay function was used between I/O access commands, that causes peak in CPU usage. Fix it by substitution mdelay to msleep.
Expand usage on fitPC2 compatible boards according to DMI identification.
Author: Peter Huewe <[email protected]> Date: Thu Jan 7 03:35:49 2010 +0100
[WATCHDOG] ixp2000: Fix build failure caused by missing include
This patch fixes a build failure[1] caused by the missing include of timer.h and thus fixes the build failure.
Notably the build failure existed since October 2009! [2]
References:
[1] http://kisskb.ellerman.id.au/kisskb/buildresult/1983339/
[2] http://kisskb.ellerman.id.au/kisskb/buildresult/1351737/
The Changes can also be looked at on:
http://www.kernel.org/git/?p=linux/kernel/git/wim/linux-2.6-watchdog.git;a=summary
For completeness, I added the overal diff below.
Greetings,
Wim.
================================================================================
drivers/watchdog/Kconfig +2 -2
@@ -396,8 +396,8 @@ config SBC_FITPC2_WATCHDOG tristate "Compulab SBC-FITPC2 watchdog" depends on X86 ---help--- - This is the driver for the built-in watchdog timer on the fit-PC2 - Single-board computer made by Compulab. + This is the driver for the built-in watchdog timer on the fit-PC2, + fit-PC2i, CM-iAM single-board computers made by Compulab. It`s possible to enable watchdog timer either from BIOS (F2) or from booted Linux. When "Watchdog Timer Value" enabled one can set 31-255 s operational range.
drivers/watchdog/ixp2000_wdt.c +1 -0
@@ -19,6 +19,7 @@#include <linux/module.h> #include <linux/moduleparam.h> #include <linux/types.h> +#include <linux/timer.h> #include <linux/kernel.h> #include <linux/fs.h> #include <linux/miscdevice.h>
drivers/watchdog/sbc_fitpc2_wdt.c +5 -6
@@ -46,9 +46,9 @@ static DEFINE_SPINLOCK(wdt_lock);static void wdt_send_data (unsigned char command,unsigned char data) {outb (command,COMMAND_PORT ); -mdelay (100 ); +msleep (100 );outb (data,DATA_PORT ); -mdelay (200 ); +msleep (200 ); }static void wdt_enable (void )
@@ -202,11 +202,10 @@ static int __init fitpc2_wdt_init(void) {int err; -if (strcmp ("SBC-FITPC2" ,dmi_get_system_info (DMI_BOARD_NAME ))) { -pr_info ("board name is: %s. Should be SBC-FITPC2\n" , -dmi_get_system_info (DMI_BOARD_NAME )); +if (!strstr (dmi_get_system_info (DMI_BOARD_NAME ),"SBC-FITPC2" ))return -ENODEV ; - } + +pr_info ("%s found\n" ,dmi_get_system_info (DMI_BOARD_NAME ));if (!request_region (COMMAND_PORT ,1 ,WATCHDOG_NAME )) {pr_err ("I/O address 0x%04x already in use\n" ,COMMAND_PORT );