← Back to branch summary

~ubuntu-branches/ubuntu/trusty/virtualbox-ose/trusty

« back to all changes in this revision

Viewing changes to src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-12-18 16:44:29 UTC
  • mfrom: (0.3.3 upstream) (0.4.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091218164429-jd34ccexpv5na11a
Tags: 3.1.2-dfsg-1ubuntu1
https://launchpad.net/bugs/498219
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/474625
https://launchpad.net/bugs/495935
https://launchpad.net/bugs/473334
* Merge from Debian unstable (LP: #498219), remaining changes:
  - Disable update action
    - debian/patches/u01-disable-update-action.dpatch
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
* Fixes the following bugs:
  - Kernel module fails to build with Linux >= 2.6.32 (LP: #474625)
  - X.Org drivers need to be rebuilt against X-Server 1.7 (LP: #495935)
  - The *-source packages try to build the kernel modules even though the
    kernel headers aren't available (LP: #473334)
* Replace *-source packages with transitional packages for *-dkms.
* Adapt u01-disable-update-action.dpatch and u02-lp-integration.dpatch for
  new upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h
55
55
#include <sys/callout.h>
56
56
#include <sys/cpu.h>
57
57
#include <sys/smp.h>
 
58
#include <sys/sleepqueue.h>
 
59
#include <sys/sx.h>
58
60
#include <vm/vm.h>
59
61
#include <vm/pmap.h>            /* for vtophys */
60
62
#include <vm/vm_map.h>
63
65
#include <vm/vm_param.h>        /* KERN_SUCCESS ++ */
64
66
#include <vm/vm_page.h>
65
67
#include <sys/resourcevar.h>
 
68
#include <machine/cpu.h>
66
69
 
67
70
/*#ifdef __cplusplus
68
71
# error "This header doesn't work for C++ code. Sorry, typical kernel crap."
69
72
#endif*/
70
73
 
 
74
#if __FreeBSD_version >= 800026
 
75
# define SLEEPQ_TIMEDWAIT(EventInt) sleepq_timedwait(EventInt, 0)
 
76
# define SLEEPQ_TIMEDWAIT_SIG(EventInt) sleepq_timedwait_sig(EventInt, 0)
 
77
# define SLEEPQ_WAIT(EventInt) sleepq_wait(EventInt, 0)
 
78
# define SLEEPQ_WAIT_SIG(EventInt) sleepq_wait_sig(EventInt, 0)
 
79
#else
 
80
# define SLEEPQ_TIMEDWAIT(EventInt) sleepq_timedwait(EventInt)
 
81
# define SLEEPQ_TIMEDWAIT_SIG(EventInt) sleepq_timedwait_sig(EventInt)
 
82
# define SLEEPQ_WAIT(EventInt) sleepq_wait(EventInt)
 
83
# define SLEEPQ_WAIT_SIG(EventInt) sleepq_wait_sig(EventInt)
 
84
#endif
 
85
 
71
86
#endif