[PATCH] 2.6.10-rc1 pfmon broken by bad merge?

From: Grant Grundler <iod00d_at_hp.com>
Date: 2004-11-19 10:01:18
Tony,

Just pulled/rebuilt from the bk linux-ia64-release-2.6.10 tree
and it failed to build with :
arch/ia64/kernel/perfmon.c: In function `pfm_handle_work':
arch/ia64/kernel/perfmon.c:5068: error: parse error before '/' token

Following trivial patch fixes what looks like a merge bug.

Signed-off-by: Grant Grundler <iod00d@hp.com>

grant

===== arch/ia64/kernel/perfmon.c 1.100 vs edited =====
--- 1.100/arch/ia64/kernel/perfmon.c	2004-11-18 10:43:37 -08:00
+++ edited/arch/ia64/kernel/perfmon.c	2004-11-18 14:58:03 -08:00
@@ -5065,7 +5065,7 @@
 	  * when returning to user level (PUStk=1), in which case
 	  * there is no risk of kernel stack overflow due to deep
 	  * interrupt nesting.
-	  */                                                                         */
+	  */
 	BUG_ON(flags & IA64_PSR_I);
 	local_irq_enable();
 
-
To unsubscribe from this list: send the line "unsubscribe linux-ia64" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Received on Thu Nov 18 18:08:06 2004

This archive was generated by hypermail 2.1.8 : 2005-08-02 09:20:32 EST