diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-01 15:02:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-01 15:02:41 -0700 |
| commit | f4a3330d76b17239fb34a99d54692248c2d0468c (patch) | |
| tree | 0a01c408fc2d58fbab7b6bcb0ce93933e4862f31 /arch/x86/kernel/hpet.c | |
| parent | 57cf4f78c6266d5a6e5de5485065d4015b84bb30 (diff) | |
| parent | 021989622810b02aab4b24f91e1f5ada2b654579 (diff) | |
| download | op-kernel-dev-f4a3330d76b17239fb34a99d54692248c2d0468c.zip op-kernel-dev-f4a3330d76b17239fb34a99d54692248c2d0468c.tar.gz | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, hpet: Fix bogus error check in hpet_assign_irq()
x86, irq: Plug memory leak in sparse irq
x86, cpu: After uncapping CPUID, re-run CPU feature detection
Diffstat (limited to 'arch/x86/kernel/hpet.c')
| -rw-r--r-- | 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 410fdb3..7494999 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c @@ -506,7 +506,7 @@ static int hpet_assign_irq(struct hpet_dev *dev) { unsigned int irq; - irq = create_irq(); + irq = create_irq_nr(0, -1); if (!irq) return -EINVAL; |
