diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-20 12:04:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-20 12:04:45 -0800 |
| commit | 5d4863e4cc4dc12d1d5e42da3cb5d38c535e4ad6 (patch) | |
| tree | 77625396ef3e1399a32a2c119388024829bb3b32 /arch/x86/include | |
| parent | 2a0fede97fd52a5c9789d1d54ebd3b46878151c3 (diff) | |
| parent | dd360393f4d948eb518372316e52101cf3b44212 (diff) | |
| download | linux-5d4863e4cc4dc12d1d5e42da3cb5d38c535e4ad6.tar.bz2 | |
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 TLB detection update from Ingo Molnar:
"A single change that extends our TLB cache size detection+reporting
code"
* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, cpu: Detect more TLB configuration
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/processor.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 613899651b02..a61b0717da32 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -71,6 +71,7 @@ extern u16 __read_mostly tlb_lli_4m[NR_INFO]; extern u16 __read_mostly tlb_lld_4k[NR_INFO]; extern u16 __read_mostly tlb_lld_2m[NR_INFO]; extern u16 __read_mostly tlb_lld_4m[NR_INFO]; +extern u16 __read_mostly tlb_lld_1g[NR_INFO]; extern s8 __read_mostly tlb_flushall_shift; /* |