Rev 6934 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 6934 | Rev 7143 | ||
---|---|---|---|
Line 26... | Line 26... | ||
26 | # define DISABLE_K6_MTRR 0 |
26 | # define DISABLE_K6_MTRR 0 |
27 | # define DISABLE_CYRIX_ARR 0 |
27 | # define DISABLE_CYRIX_ARR 0 |
28 | # define DISABLE_CENTAUR_MCR 0 |
28 | # define DISABLE_CENTAUR_MCR 0 |
29 | #endif /* CONFIG_X86_64 */ |
29 | #endif /* CONFIG_X86_64 */ |
Line -... | Line 30... | ||
- | 30 | ||
- | 31 | #ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS |
|
- | 32 | # define DISABLE_PKU 0 |
|
- | 33 | # define DISABLE_OSPKE 0 |
|
- | 34 | #else |
|
- | 35 | # define DISABLE_PKU (1<<(X86_FEATURE_PKU & 31)) |
|
- | 36 | # define DISABLE_OSPKE (1<<(X86_FEATURE_OSPKE & 31)) |
|
- | 37 | #endif /* CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS */ |
|
30 | 38 | ||
31 | /* |
39 | /* |
32 | * Make sure to add features to the correct mask |
40 | * Make sure to add features to the correct mask |
33 | */ |
41 | */ |
34 | #define DISABLED_MASK0 (DISABLE_VME) |
42 | #define DISABLED_MASK0 (DISABLE_VME) |
Line 39... | Line 47... | ||
39 | #define DISABLED_MASK5 0 |
47 | #define DISABLED_MASK5 0 |
40 | #define DISABLED_MASK6 0 |
48 | #define DISABLED_MASK6 0 |
41 | #define DISABLED_MASK7 0 |
49 | #define DISABLED_MASK7 0 |
42 | #define DISABLED_MASK8 0 |
50 | #define DISABLED_MASK8 0 |
43 | #define DISABLED_MASK9 (DISABLE_MPX) |
51 | #define DISABLED_MASK9 (DISABLE_MPX) |
- | 52 | #define DISABLED_MASK10 0 |
|
- | 53 | #define DISABLED_MASK11 0 |
|
- | 54 | #define DISABLED_MASK12 0 |
|
- | 55 | #define DISABLED_MASK13 0 |
|
- | 56 | #define DISABLED_MASK14 0 |
|
- | 57 | #define DISABLED_MASK15 0 |
|
- | 58 | #define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE) |
|
Line 44... | Line 59... | ||
44 | 59 |