From: Greg Kroah-Hartman Date: Mon, 19 Apr 2010 16:36:28 +0000 (-0700) Subject: whitespace fixes for a .32 patch X-Git-Tag: v2.6.32.12~38 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64aee0214d325830ace5a28f6bfddbc922f8f917;p=thirdparty%2Fkernel%2Fstable-queue.git whitespace fixes for a .32 patch --- diff --git a/queue-2.6.32/x86-hpet-make-warn_on-understandable.patch b/queue-2.6.32/x86-hpet-make-warn_on-understandable.patch index 64f5707a09d..173e582d461 100644 --- a/queue-2.6.32/x86-hpet-make-warn_on-understandable.patch +++ b/queue-2.6.32/x86-hpet-make-warn_on-understandable.patch @@ -19,22 +19,18 @@ Cc: Venki Pallipadi Signed-off-by: Greg Kroah-Hartman --- - arch/x86/kernel/hpet.c | 23 +++++++++++++++++------ - 1 file changed, 17 insertions(+), 6 deletions(-) + arch/x86/kernel/hpet.c | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c -@@ -384,12 +384,23 @@ static int hpet_next_event(unsigned long - cnt += (u32) delta; +@@ -385,11 +385,22 @@ static int hpet_next_event(unsigned long hpet_writel(cnt, HPET_Tn_CMP(timer)); -- /* + /* - * We need to read back the CMP register to make sure that - * what we wrote hit the chip before we compare it to the - * counter. -- */ -- WARN_ON_ONCE((u32)hpet_readl(HPET_Tn_CMP(timer)) != cnt); -+ /* + * We need to read back the CMP register on certain HPET + * implementations (ATI chipsets) which seem to delay the + * transfer of the compare register into the internal compare @@ -48,7 +44,8 @@ Signed-off-by: Greg Kroah-Hartman + * then we might have a real hardware problem. We can not do + * much about it here, but at least alert the user/admin with + * a prominent warning. -+ */ + */ +- WARN_ON_ONCE((u32)hpet_readl(HPET_Tn_CMP(timer)) != cnt); + WARN_ONCE((u32)hpet_readl(HPET_Tn_CMP(timer)) != cnt, + KERN_WARNING "hpet: compare register read back failed.\n");