diff options
author | Dave Airlie <airlied@redhat.com> | 2018-03-28 06:30:41 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-03-28 06:30:41 +0200 |
commit | 2b4f44eec2be2688511c2b617d0e1b4f94c45ba4 (patch) | |
tree | 533c03602f4ae6d6404db6fa56c88e6f83e1bebe /arch/x86/mm/pti.c | |
parent | Merge branch 'drm-next-4.17' of git://people.freedesktop.org/~agd5f/linux int... (diff) | |
parent | Linux 4.16-rc7 (diff) | |
download | linux-2b4f44eec2be2688511c2b617d0e1b4f94c45ba4.tar.xz linux-2b4f44eec2be2688511c2b617d0e1b4f94c45ba4.zip |
Backmerge tag 'v4.16-rc7' into drm-next
Linux 4.16-rc7
This was requested by Daniel, and things were getting
a bit hard to reconcile, most of the conflicts were
trivial though.
Diffstat (limited to 'arch/x86/mm/pti.c')
-rw-r--r-- | arch/x86/mm/pti.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c index ce38f165489b..631507f0c198 100644 --- a/arch/x86/mm/pti.c +++ b/arch/x86/mm/pti.c @@ -332,7 +332,7 @@ static void __init pti_clone_user_shared(void) } /* - * Clone the ESPFIX P4D into the user space visinble page table + * Clone the ESPFIX P4D into the user space visible page table */ static void __init pti_setup_espfix64(void) { |