← Back to branch summary

~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-precise.sid-merge1

« back to all changes in this revision

Viewing changes to lib/include/x86cpuid.h

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Baumann
  • Date: 2009-12-06 07:45:05 UTC
  • mfrom: (1.1.8 upstream) (2.4.10 sid)
  • Revision ID: james.westby@ubuntu.com-20091206074505-43rp7oejjgp0y2re
Tags: 2009.11.16-210370-1
http://bugs.debian.org/545222
http://bugs.debian.org/549044
http://bugs.debian.org/551626
* Merging upstream version 2009.11.16-210370.
* Moving vmusr plugins from open-vm-tools to open-vm-toolbox (Closes:
  #539282, #557215).
* Correcting plugin location (Closes: #545222, #549044).
* Dropping la files (Closes: #551626).
* Adding open-vm-toolbox lintian overrides.
* Removing test plugin.
* Removing unused plugin symlinks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/include/x86cpuid.h
40
40
#define INCLUDE_ALLOW_VMMEXT
41
41
#define INCLUDE_ALLOW_VMKERNEL
42
42
#define INCLUDE_ALLOW_MODULE
43
 
#define INCLUDE_ALLOW_VMNIXMOD
44
43
#define INCLUDE_ALLOW_DISTRIBUTE
45
44
#define INCLUDE_ALLOW_VMK_MODULE
46
45
#define INCLUDE_ALLOW_VMCORE
376
375
FLAGDEF(   6, EAX, INTEL,   0,  1, THERMAL_SENSOR,      NA,  FALSE)     \
377
376
FLAGDEF(   6, EAX, INTEL,   1,  1, TURBO_MODE,          NA,  FALSE)     \
378
377
FIELDDEF(  6, EBX, INTEL,   0,  4, NUM_INTR_THRESHOLDS, NA,  FALSE)     \
379
 
FLAGDEF(   6, ECX, INTEL,   0,  1, HW_COORD_FEEDBACK,   NA,  FALSE)
 
378
FLAGDEF(   6, ECX, INTEL,   0,  1, HW_COORD_FEEDBACK,   NA,  FALSE)     \
 
379
FLAGDEF(   6, ECX, INTEL,   3,  1, ENERGY_PERF_BIAS,    NA,  FALSE)
380
380
 
381
381
/*    LEVEL, REG, VENDOR, POS, SIZE, NAME,       MON SUPP, CPL3, [FUNC] */
382
382
#define CPUID_FIELD_DATA_LEVEL_A                                               \
495
495
FLAGDEF(  8A, EDX, AMD,     1,  1, SVM_LBR,             NO,  FALSE)            \
496
496
FLAGDEF(  8A, EDX, AMD,     2,  1, SVM_LOCK,            NO,  FALSE)            \
497
497
FLAGDEF(  8A, EDX, AMD,     3,  1, SVM_NRIP,            NO,  FALSE)            \
498
 
FIELDDEF( 8A, EDX, AMD,     4, 28, SVMEDX_RSVD,         NO,  FALSE)
 
498
FLAGDEF(  8A, EDX, AMD,    10,  1, SVM_PAUSE_FILTER,    NO,  FALSE)
 
499
 
 
500
 
 
501
 
 
502
#define CPUID_FIELD_DATA_LEVEL_8A_BD                                           \
 
503
FIELDDEF( 8A, EDX, AMD,     4,  6, SVMEDX_RSVD0,        NO,  FALSE)            \
 
504
FIELDDEF( 8A, EDX, AMD,    11, 21, SVMEDX_RSVD1,        NO,  FALSE)
 
505
 
 
506
 
499
507
 
500
508
 
501
509
#define CPUID_FIELD_DATA                                              \
508
516
   CPUID_FIELD_DATA_LEVEL_B                                           \
509
517
   CPUID_FIELD_DATA_LEVEL_80                                          \
510
518
   CPUID_FIELD_DATA_LEVEL_81                                          \
511
 
   CPUID_FIELD_DATA_LEVEL_8x
 
519
   CPUID_FIELD_DATA_LEVEL_8x                                          \
 
520
   CPUID_FIELD_DATA_LEVEL_8A_BD
512
521
 
513
522
 
514
523
/*