From a6af6cc5ede79ddf5bbace4ac5ea85cf61ef5b72 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 5 Jan 2009 15:44:13 -0800
Subject: [PATCH] --- yaml --- r: 126764 b: refs/heads/master c:
 8501d21fd2d4ce5449ea0141db3d8a7766523438 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/staging/epl/TimerHighReskX86.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 39236b1693b7..5a84c4629c23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 833dfbe746f85898dcbcf421c1177c3fd5773ff2
+refs/heads/master: 8501d21fd2d4ce5449ea0141db3d8a7766523438
diff --git a/trunk/drivers/staging/epl/TimerHighReskX86.c b/trunk/drivers/staging/epl/TimerHighReskX86.c
index e1cb8238596c..82eee4702aa6 100644
--- a/trunk/drivers/staging/epl/TimerHighReskX86.c
+++ b/trunk/drivers/staging/epl/TimerHighReskX86.c
@@ -225,13 +225,6 @@ tEplKernel PUBLIC EplTimerHighReskAddInstance(void)
 		hrtimer_init(pTimer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
 
 		pTimer->function = EplTimerHighReskCallback;
-
-		/*
-		 * We use HRTIMER_CB_SOFTIRQ here.
-		 * HRTIMER_CB_IRQSAFE is critical as the callback function
-		 * would be called with IRQs disabled.
-		 */
-		pTimer->cb_mode = HRTIMER_CB_SOFTIRQ;
 	}
 
 	return Ret;