The patch titled
scx200_hrt: fix precedence bug manifesting as 27x clock in 1 MHz mode
has been added to the -mm tree. Its filename is
scx200_hrt-fix-precedence-bug-manifesting-as-27x-clock-in-1-mhz-mode.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: scx200_hrt: fix precedence bug manifesting as 27x clock in 1 MHz mode
From: Jim Cromie <jim.cromie@xxxxxxxxx>
Fix paren-placement / precedence bug breaking initialization for 1 MHz
clock mode.
Also fix comment spelling error, and fence-post (off-by-one) error on
symbol used in request_region.
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=7242
Thanks alexander.krause@xxxxxxxxxxxxxx, dzpost@xxxxxxxxxxxx, for the
reports and patch test, and phelps@xxxxxxxxxxx for the independent patch
and verification.
Signed-off-by: Jim Cromie <jim.cromie@xxxxxxxxx>
Cc: <alexander.krause@xxxxxxxxxxxxxx>
Cc: <dzpost@xxxxxxxxxxxx>
Cc: <phelps@xxxxxxxxxxx>
Acked-by: John Stultz <johnstul@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/clocksource/scx200_hrt.c | 4 ++--
include/linux/scx200.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff -puN drivers/clocksource/scx200_hrt.c~scx200_hrt-fix-precedence-bug-manifesting-as-27x-clock-in-1-mhz-mode drivers/clocksource/scx200_hrt.c
--- a/drivers/clocksource/scx200_hrt.c~scx200_hrt-fix-precedence-bug-manifesting-as-27x-clock-in-1-mhz-mode
+++ a/drivers/clocksource/scx200_hrt.c
@@ -63,7 +63,7 @@ static struct clocksource cs_hrt = {
static int __init init_hrt_clocksource(void)
{
- /* Make sure scx200 has initializedd the configuration block */
+ /* Make sure scx200 has initialized the configuration block */
if (!scx200_cb_present())
return -ENODEV;
@@ -76,7 +76,7 @@ static int __init init_hrt_clocksource(v
}
/* write timer config */
- outb(HR_TMEN | (mhz27) ? HR_TMCLKSEL : 0,
+ outb(HR_TMEN | (mhz27 ? HR_TMCLKSEL : 0),
scx200_cb_base + SCx200_TMCNFG_OFFSET);
if (mhz27) {
diff -puN include/linux/scx200.h~scx200_hrt-fix-precedence-bug-manifesting-as-27x-clock-in-1-mhz-mode include/linux/scx200.h
--- a/include/linux/scx200.h~scx200_hrt-fix-precedence-bug-manifesting-as-27x-clock-in-1-mhz-mode
+++ a/include/linux/scx200.h
@@ -32,7 +32,7 @@ extern unsigned scx200_cb_base;
/* High Resolution Timer */
#define SCx200_TIMER_OFFSET 0x08
-#define SCx200_TIMER_SIZE 0x05
+#define SCx200_TIMER_SIZE 0x06
/* Clock Generators */
#define SCx200_CLOCKGEN_OFFSET 0x10
_
Patches currently in -mm which might be from jim.cromie@xxxxxxxxx are
origin.patch
scx200_hrt-fix-precedence-bug-manifesting-as-27x-clock-in-1-mhz-mode.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
