summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-01 06:45:08 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-01 06:45:08 +0900
commite12ca23d41bd157354a5d1aadff30211a410c53a (patch)
treee195ce5b9cf9d83fdef9fa5c8bcef132b9ade567 /arch/x86
parent850761b2b13aec5d4f9935199e917f9a4ae00cce (diff)
parent7a66f784375c5922315bbe879b789ee50b924d26 (diff)
downloadlinux-3.10-e12ca23d41bd157354a5d1aadff30211a410c53a.tar.gz
linux-3.10-e12ca23d41bd157354a5d1aadff30211a410c53a.tar.bz2
linux-3.10-e12ca23d41bd157354a5d1aadff30211a410c53a.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: virtio_net: delay TX callbacks virtio: add api for delayed callbacks virtio_test: support event index vhost: support event index virtio_ring: support event idx feature virtio ring: inline function to check for events virtio: event index interface virtio: add full three-clause BSD text to headers. virtio balloon: kill tell-host-first logic virtio console: don't manually set or finalize VIRTIO_CONSOLE_F_MULTIPORT. drivers, block: virtio_blk: Replace cryptic number with the macro virtio_blk: allow re-reading config space at runtime lguest: remove support for VIRTIO_F_NOTIFY_ON_EMPTY. lguest: fix up compilation after move lguest: fix timer interrupt setup
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/lguest/boot.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
index e191c096ab9..db832fd65ec 100644
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
@@ -993,6 +993,7 @@ static void lguest_time_irq(unsigned int irq, struct irq_desc *desc)
static void lguest_time_init(void)
{
/* Set up the timer interrupt (0) to go to our simple timer routine */
+ lguest_setup_irq(0);
irq_set_handler(0, lguest_time_irq);
clocksource_register_hz(&lguest_clock, NSEC_PER_SEC);