diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-03-17 09:44:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-17 09:44:57 +0100 |
| commit | 00f526850151e91fdad0896a1436341687ad2582 (patch) | |
| tree | 67c28260020440ade83d6f4aa003ae4f0c683e67 /arch/x86/mm/pat.c | |
| parent | cbf8b5a2b649a501758291cb4d4ba1e5711771ba (diff) | |
| parent | d89abe2a1f0c92499eedc815e4a9b2881f4959a5 (diff) | |
Merge branch 'x86/cleanups' into x86/urgent
Pull in some merge window leftovers.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/mm/pat.c')
| -rw-r--r-- | arch/x86/mm/pat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index 04e2e7144bee..faec01e7a17d 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c @@ -149,7 +149,7 @@ enum { PAT_WT = 4, /* Write Through */ PAT_WP = 5, /* Write Protected */ PAT_WB = 6, /* Write Back (default) */ - PAT_UC_MINUS = 7, /* UC, but can be overriden by MTRR */ + PAT_UC_MINUS = 7, /* UC, but can be overridden by MTRR */ }; #define CM(c) (_PAGE_CACHE_MODE_ ## c) |