← Back to branch summary

~ubuntu-branches/ubuntu/raring/virtualbox-ose/raring

« back to all changes in this revision

Viewing changes to src/VBox/VMM/VMMR0/CPUMR0A.asm

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-01-30 23:27:25 UTC
  • mfrom: (0.3.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20110130232725-2ouajjd2ggdet0zd
Tags: 4.0.2-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Drop ubuntu-01-fix-build-gcc45.patch, fixed upstream.
* Drop ubuntu-02-as-needed.patch, added to the Debian package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/VMM/VMMR0/CPUMR0A.asm
1
 
; $Id: CPUMR0A.asm $
 
1
; $Id: CPUMR0A.asm 35346 2010-12-27 16:13:13Z vboxsync $
2
2
;; @file
3
3
; CPUM - Guest Context Assembly Routines.
4
4
;
19
19
;* Header Files                                                                *
20
20
;*******************************************************************************
21
21
%include "VBox/asmdefs.mac"
22
 
%include "VBox/vm.mac"
 
22
%include "VBox/vmm/vm.mac"
23
23
%include "VBox/err.mac"
24
 
%include "VBox/stam.mac"
 
24
%include "VBox/vmm/stam.mac"
25
25
%include "CPUMInternal.mac"
26
26
%include "VBox/x86.mac"
27
 
%include "VBox/cpum.mac"
 
27
%include "VBox/vmm/cpum.mac"
28
28
 
29
29
%ifdef IN_RING3
30
30
 %error "The jump table doesn't link on leopard."