[PATCH 2/3] HPET: Enter hpet_interrupt_handler with interrupts disabled

[Matt Fleming]

Some functions that may be called from this handler require that
interrupts are disabled. Also, combining IRQF_DISABLED and
IRQF_SHARED does not reliably disable interrupts in a handler, so
remove IRQF_SHARED from the irq flags (this irq is not shared anyway).

Signed-off-by: Matt Fleming <mjf@xxxxxxxxxx>
---
 arch/x86/kernel/hpet.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index f10f946..bfb17f4 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -445,7 +445,7 @@ static int hpet_setup_irq(struct hpet_dev *dev)
 {

        if (request_irq(dev->irq, hpet_interrupt_handler,
-                       IRQF_SHARED|IRQF_NOBALANCING, dev->name, dev))
+                       IRQF_DISABLED|IRQF_NOBALANCING, dev->name, dev))
                return -1;

        disable_irq(dev->irq);
--
1.5.6.4

------=_Part_34419_30611101.1225664593350
Content-Type: application/octet-stream;
 name=0002-HPET-Enter-hpet_interrupt_handler-with-interrupts-d.patch
Content-Transfer-Encoding: base64
X-Attachment-Id: f_fn290xlx0
Content-Disposition: attachment;
 filename=0002-HPET-Enter-hpet_interrupt_handler-with-interrupts-d.patch

RnJvbSBjNDQ1NzI4ZjM2ZGU1OTk3NzAwODhlMzQ1ZmMwM2VmOWZhZmQ4NDcwIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXR0IEZsZW1pbmcgPG1qZkBnZW50b28ub3JnPgpEYXRlOiBT
dW4sIDIgTm92IDIwMDggMTQ6MDA6MjMgKzAwMDAKU3ViamVjdDogW1BBVENIIDIvM10gSFBFVDog
RW50ZXIgaHBldF9pbnRlcnJ1cHRfaGFuZGxlciB3aXRoIGludGVycnVwdHMgZGlzYWJsZWQKClNv
bWUgZnVuY3Rpb25zIHRoYXQgbWF5IGJlIGNhbGxlZCBmcm9tIHRoaXMgaGFuZGxlciByZXF1aXJl
IHRoYXQKaW50ZXJydXB0cyBhcmUgZGlzYWJsZWQuIEFsc28sIGNvbWJpbmluZyBJUlFGX0RJU0FC
TEVEIGFuZApJUlFGX1NIQVJFRCBkb2VzIG5vdCByZWxpYWJseSBkaXNhYmxlIGludGVycnVwdHMg
aW4gYSBoYW5kbGVyLCBzbwpyZW1vdmUgSVJRRl9TSEFSRUQgZnJvbSB0aGUgaXJxIGZsYWdzICh0
aGlzIGlycSBpcyBub3Qgc2hhcmVkIGFueXdheSkuCgpTaWduZWQtb2ZmLWJ5OiBNYXR0IEZsZW1p
bmcgPG1qZkBnZW50b28ub3JnPgotLS0KIGFyY2gveDg2L2tlcm5lbC9ocGV0LmMgfCAgICAyICst
CiAxIGZpbGVzIGNoYW5nZWQsIDEgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbnMoLSkKCmRpZmYg
LS1naXQgYS9hcmNoL3g4Ni9rZXJuZWwvaHBldC5jIGIvYXJjaC94ODYva2VybmVsL2hwZXQuYwpp
bmRleCBmMTBmOTQ2Li5iZmIxN2Y0IDEwMDY0NAotLS0gYS9hcmNoL3g4Ni9rZXJuZWwvaHBldC5j
CisrKyBiL2FyY2gveDg2L2tlcm5lbC9ocGV0LmMKQEAgLTQ0NSw3ICs0NDUsNyBAQCBzdGF0aWMg
aW50IGhwZXRfc2V0dXBfaXJxKHN0cnVjdCBocGV0X2RldiAqZGV2KQogewogCiAJaWYgKHJlcXVl
c3RfaXJxKGRldi0+aXJxLCBocGV0X2ludGVycnVwdF9oYW5kbGVyLAotCQkJSVJRRl9TSEFSRUR8
SVJRRl9OT0JBTEFOQ0lORywgZGV2LT5uYW1lLCBkZXYpKQorCQkJSVJRRl9ESVNBQkxFRHxJUlFG
X05PQkFMQU5DSU5HLCBkZXYtPm5hbWUsIGRldikpCiAJCXJldHVybiAtMTsKIAogCWRpc2FibGVf
aXJxKGRldi0+aXJxKTsKLS0gCjEuNS42LjQKCg==
------=_Part_34419_30611101.1225664593350--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/