[kernel] r16754 - in dists/trunk/linux-2.6/debian: . patches/features/all patches/series

[Ben Hutchings]

Author: benh
Date: Mon Jan  3 20:36:24 2011
New Revision: 16754

Log:
watchdog: Improve failure message and documentation (Closes: #608138)

Added:
   dists/trunk/linux-2.6/debian/patches/features/all/watchdog-Improve-failure-message-and-documentation.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon Jan  3 16:11:43 2011	(r16753)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Jan  3 20:36:24 2011	(r16754)
@@ -5,6 +5,7 @@
   [ Ben Hutchings ]
   * i2c-i801: Include <linux/slab.h> (fixes FTBFS on alpha)
   * starfire: Fix dma_addr_t size test for MIPS (fixes FTBFS)
+  * watchdog: Improve failure message and documentation (Closes: #608138)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 28 Dec 2010 03:15:05 +0000
 

Added: dists/trunk/linux-2.6/debian/patches/features/all/watchdog-Improve-failure-message-and-documentation.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/watchdog-Improve-failure-message-and-documentation.patch	Mon Jan  3 20:36:24 2011	(r16754)
@@ -0,0 +1,48 @@
+From 2e6e90d7a3336c6e04426190bac6067c6e4f241d Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 2 Jan 2011 21:36:13 +0000
+Subject: [PATCH] watchdog: Improve failure message and documentation
+
+The error message 'NMI watchdog failed to create perf event...'
+currently prints the error value as a pointer, rather than extracting
+the error code with PTR_ERR().  Fix that.
+
+Add a note about the 'nowatchdog' kernel parameter to associate it
+with this message.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ Documentation/kernel-parameters.txt |    2 +-
+ kernel/watchdog.c                   |    3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
+index 7d0cead..6fc0cf4 100644
+--- a/Documentation/kernel-parameters.txt
++++ b/Documentation/kernel-parameters.txt
+@@ -1764,7 +1764,7 @@ and is between 256 and 4096 characters. It is defined in the file
+ 
+ 	nousb		[USB] Disable the USB subsystem
+ 
+-	nowatchdog	[KNL] Disable the lockup detector.
++	nowatchdog	[KNL] Disable the lockup detector (NMI watchdog).
+ 
+ 	nowb		[ARM]
+ 
+diff --git a/kernel/watchdog.c b/kernel/watchdog.c
+index d74e866..5b44d2c 100644
+--- a/kernel/watchdog.c
++++ b/kernel/watchdog.c
+@@ -366,7 +366,8 @@ static int watchdog_nmi_enable(int cpu)
+ 		goto out_save;
+ 	}
+ 
+-	printk(KERN_ERR "NMI watchdog failed to create perf event on cpu%i: %p\n", cpu, event);
++	printk(KERN_ERR "NMI watchdog failed to create perf event on cpu%i: %ld\n",
++	       cpu, PTR_ERR(event));
+ 	return PTR_ERR(event);
+ 
+ 	/* success path */
+-- 
+1.7.2.3
+

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Mon Jan  3 16:11:43 2011	(r16753)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Mon Jan  3 20:36:24 2011	(r16754)
@@ -46,3 +46,4 @@
 + bugfix/all/drm-nouveau-Only-select-ACPI_VIDEO-if-its-dependenci.patch
 + bugfix/all/i2c-i801-Include-linux-slab.h.patch
 + bugfix/mips/starfire-Fix-dma_addr_t-size-test-for-MIPS.patch
++ features/all/watchdog-Improve-failure-message-and-documentation.patch