From 62d994c31ad6182d57c3e8e1214fa3b9d15cbc6a Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 24 Jul 2009 08:34:59 +0200 Subject: [PATCH] --- yaml --- r: 155824 b: refs/heads/master c: d6c585a4342a2ff627a29f9aea77c5ed4cd76023 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/mfgpt_32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1b0fbaa683ba..4b06c0b92a11 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2cb078603abb612e3bcd428fb8122c3d39e08832 +refs/heads/master: d6c585a4342a2ff627a29f9aea77c5ed4cd76023 diff --git a/trunk/arch/x86/kernel/mfgpt_32.c b/trunk/arch/x86/kernel/mfgpt_32.c index 846510b78a09..2a62d843f015 100644 --- a/trunk/arch/x86/kernel/mfgpt_32.c +++ b/trunk/arch/x86/kernel/mfgpt_32.c @@ -347,7 +347,7 @@ static irqreturn_t mfgpt_tick(int irq, void *dev_id) static struct irqaction mfgptirq = { .handler = mfgpt_tick, - .flags = IRQF_DISABLED | IRQF_NOBALANCING, + .flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_TIMER, .name = "mfgpt-timer" };