diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-12-19 18:27:25 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-12-19 18:27:25 +0300 |
| commit | 30d647f5ba9ebefa153ad2bc3f05e3a7c7d90d1c (patch) | |
| tree | 418c535ebc1a0001b7c448e1d7ff97cf79bff8fd /arch/x86/kernel/head64.c | |
| parent | 66dfc517e8ec530b1d8d4776c05e3f264f38ecb8 (diff) | |
| parent | aeba12b26c79fc35e07e511f692a8907037d95da (diff) | |
| download | linux-30d647f5ba9ebefa153ad2bc3f05e3a7c7d90d1c.tar.xz | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'arch/x86/kernel/head64.c')
| -rw-r--r-- | arch/x86/kernel/head64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index 6a3cfaf6b72a..387e4b12e823 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c @@ -203,7 +203,7 @@ unsigned long __head __startup_64(unsigned long physaddr, load_delta = physaddr - (unsigned long)(_text - __START_KERNEL_map); /* Is the address not 2M aligned? */ - if (load_delta & ~PMD_PAGE_MASK) + if (load_delta & ~PMD_MASK) for (;;); /* Include the SME encryption mask in the fixup value */ |