diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-18 14:15:05 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-18 14:15:05 -0500 |
| commit | 4092762aebfe55c1f8e31440b80a053c2dbe519b (patch) | |
| tree | 8fb9fd14131194174c12daf5d8195afd3b62bc3e /arch/x86/include/asm/mtrr.h | |
| parent | 745b1626dd71ce9661a05ea4db57859ed5c773d2 (diff) | |
| parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core
Diffstat (limited to 'arch/x86/include/asm/mtrr.h')
| -rw-r--r-- | arch/x86/include/asm/mtrr.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/include/asm/mtrr.h b/arch/x86/include/asm/mtrr.h index cb988aab716d..14080d22edb3 100644 --- a/arch/x86/include/asm/mtrr.h +++ b/arch/x86/include/asm/mtrr.h | |||
| @@ -58,15 +58,15 @@ struct mtrr_gentry { | |||
| 58 | #endif /* !__i386__ */ | 58 | #endif /* !__i386__ */ |
| 59 | 59 | ||
| 60 | struct mtrr_var_range { | 60 | struct mtrr_var_range { |
| 61 | u32 base_lo; | 61 | __u32 base_lo; |
| 62 | u32 base_hi; | 62 | __u32 base_hi; |
| 63 | u32 mask_lo; | 63 | __u32 mask_lo; |
| 64 | u32 mask_hi; | 64 | __u32 mask_hi; |
| 65 | }; | 65 | }; |
| 66 | 66 | ||
| 67 | /* In the Intel processor's MTRR interface, the MTRR type is always held in | 67 | /* In the Intel processor's MTRR interface, the MTRR type is always held in |
| 68 | an 8 bit field: */ | 68 | an 8 bit field: */ |
| 69 | typedef u8 mtrr_type; | 69 | typedef __u8 mtrr_type; |
| 70 | 70 | ||
| 71 | #define MTRR_NUM_FIXED_RANGES 88 | 71 | #define MTRR_NUM_FIXED_RANGES 88 |
| 72 | #define MTRR_MAX_VAR_RANGES 256 | 72 | #define MTRR_MAX_VAR_RANGES 256 |