diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2014-03-26 19:21:20 +0000 |
|---|---|---|
| committer | <> | 2014-05-08 15:03:54 +0000 |
| commit | fb123f93f9f5ce42c8e5785d2f8e0edaf951740e (patch) | |
| tree | c2103d76aec5f1f10892cd1d3a38e24f665ae5db /src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c | |
| parent | 58ed4748338f9466599adfc8a9171280ed99e23f (diff) | |
| download | VirtualBox-master.tar.gz | |
Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.HEADVirtualBox-4.3.10master
Diffstat (limited to 'src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c')
| -rw-r--r-- | src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c index b4270bae..a4824893 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c @@ -1,4 +1,4 @@ -/* $Rev: 80789 $ */ +/* $Rev: 88900 $ */ /** @file * VBoxGuest - Linux specifics. * @@ -7,7 +7,7 @@ */ /* - * Copyright (C) 2006-2012 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -196,7 +196,11 @@ static struct miscdevice g_MiscDeviceUser = /** PCI hotplug structure. */ -static const struct pci_device_id __devinitdata g_VBoxGuestPciId[] = +static const struct pci_device_id +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) +__devinitdata +#endif +g_VBoxGuestPciId[] = { { vendor: VMMDEV_VENDORID, @@ -936,9 +940,9 @@ void VBoxGuestNativeISRMousePollEvent(PVBOXGUESTDEVEXT pDevExt) * Wake up everyone that's in a poll() and post anyone that has * subscribed to async notifications. */ - Log(("VBoxGuestNativeISRMousePollEvent: wake_up_all\n")); + Log3(("VBoxGuestNativeISRMousePollEvent: wake_up_all\n")); wake_up_all(&g_PollEventQueue); - Log(("VBoxGuestNativeISRMousePollEvent: kill_fasync\n")); + Log3(("VBoxGuestNativeISRMousePollEvent: kill_fasync\n")); kill_fasync(&g_pFAsyncQueue, SIGIO, POLL_IN); #ifdef VBOXGUEST_WITH_INPUT_DRIVER /* Report events to the kernel input device */ @@ -957,7 +961,7 @@ void VBoxGuestNativeISRMousePollEvent(PVBOXGUESTDEVEXT pDevExt) # endif } #endif - Log(("VBoxGuestNativeISRMousePollEvent: done\n")); + Log3(("VBoxGuestNativeISRMousePollEvent: done\n")); } |