diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-08 17:25:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-08 17:25:53 -0700 |
| commit | 6cfcdad7630de2b2eb09740bdc6ee921de8c785e (patch) | |
| tree | fb6f16f55dec1e6164bff60c8d19e2d787819388 /arch/x86/kernel/cpu/resctrl/pseudo_lock.c | |
| parent | c83b5d321b58794b8469d57990dc3884cbcd289e (diff) | |
| parent | 2ef085bd110c5723ca08a522608ac3468dc304bd (diff) | |
Merge branch 'x86-cache-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cache resource control update from Ingo Molnar:
"Two cleanup patches"
* 'x86-cache-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/resctrl: Cleanup cbm_ensure_valid()
x86/resctrl: Use _ASM_BX to avoid ifdeffery
Diffstat (limited to 'arch/x86/kernel/cpu/resctrl/pseudo_lock.c')
| -rw-r--r-- | arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/kernel/cpu/resctrl/pseudo_lock.c b/arch/x86/kernel/cpu/resctrl/pseudo_lock.c index f68baccc69f0..d7623e1b927d 100644 --- a/arch/x86/kernel/cpu/resctrl/pseudo_lock.c +++ b/arch/x86/kernel/cpu/resctrl/pseudo_lock.c @@ -431,11 +431,7 @@ static int pseudo_lock_fn(void *_rdtgrp) #else register unsigned int line_size asm("esi"); register unsigned int size asm("edi"); -#ifdef CONFIG_X86_64 - register void *mem_r asm("rbx"); -#else - register void *mem_r asm("ebx"); -#endif /* CONFIG_X86_64 */ + register void *mem_r asm(_ASM_BX); #endif /* CONFIG_KASAN */ /* |