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/mpx.c | |
| parent | x86/mm, x86/mce: Fix return type/value for memcpy_mcsafe() (diff) | |
| parent | arch/x86/irq: Purge useless handler declarations from hw_irq.h (diff) | |
| download | linux-00f526850151e91fdad0896a1436341687ad2582.tar.xz linux-00f526850151e91fdad0896a1436341687ad2582.zip | |
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/mpx.c')
| -rw-r--r-- | arch/x86/mm/mpx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mm/mpx.c b/arch/x86/mm/mpx.c index ef05755a1900..009679ae5065 100644 --- a/arch/x86/mm/mpx.c +++ b/arch/x86/mm/mpx.c @@ -728,14 +728,14 @@ static inline unsigned long bd_entry_virt_space(struct mm_struct *mm) /* * This covers 32-bit emulation as well as 32-bit kernels - * running on 64-bit harware. + * running on 64-bit hardware. */ if (!is_64bit_mm(mm)) return (4ULL * GB) / MPX_BD_NR_ENTRIES_32; /* * 'x86_virt_bits' returns what the hardware is capable - * of, and returns the full >32-bit adddress space when + * of, and returns the full >32-bit address space when * running 32-bit kernels on 64-bit hardware. */ virt_space = (1ULL << boot_cpu_data.x86_virt_bits); |