diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-12 14:18:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-12 14:18:49 -0700 |
| commit | 5a45a5a881aeb82ce31dd1886afe04146965df23 (patch) | |
| tree | 54bae39fab09a64cf6b07ac241ab7afbeb7f6ef2 /kernel | |
| parent | ecade114250555720aa8a6232b09a2ce2e47ea99 (diff) | |
| parent | 2c4ea6e28dbf15ab93632c5c189f3948366b8885 (diff) | |
| download | linux-0-day-5a45a5a881aeb82ce31dd1886afe04146965df23.tar.gz linux-0-day-5a45a5a881aeb82ce31dd1886afe04146965df23.tar.xz | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner:
- a fix for the kexec/purgatory regression which was introduced in the
merge window via an innocent sparse fix. We could have reverted that
commit, but on deeper inspection it turned out that the whole
machinery is neither documented nor robust. So a proper cleanup was
done instead
- the fix for the TLB flush issue which was discovered recently
- a simple typo fix for a reboot quirk
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/tlb: Fix tlb flushing when lguest clears PGE
kexec, x86/purgatory: Unbreak it and clean it up
x86/reboot/quirks: Fix typo in ASUS EeeBook X205TA reboot quirk
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/kexec_file.c | 8 | ||||
| -rw-r--r-- | kernel/kexec_internal.h | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index b56a558e406db..b118735fea9da 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -614,13 +614,13 @@ static int kexec_calculate_store_digests(struct kimage *image) ret = crypto_shash_final(desc, digest); if (ret) goto out_free_digest; - ret = kexec_purgatory_get_set_symbol(image, "sha_regions", - sha_regions, sha_region_sz, 0); + ret = kexec_purgatory_get_set_symbol(image, "purgatory_sha_regions", + sha_regions, sha_region_sz, 0); if (ret) goto out_free_digest; - ret = kexec_purgatory_get_set_symbol(image, "sha256_digest", - digest, SHA256_DIGEST_SIZE, 0); + ret = kexec_purgatory_get_set_symbol(image, "purgatory_sha256_digest", + digest, SHA256_DIGEST_SIZE, 0); if (ret) goto out_free_digest; } diff --git a/kernel/kexec_internal.h b/kernel/kexec_internal.h index 4cef7e4706b09..799a8a4521870 100644 --- a/kernel/kexec_internal.h +++ b/kernel/kexec_internal.h @@ -15,11 +15,7 @@ int kimage_is_destination_range(struct kimage *image, extern struct mutex kexec_mutex; #ifdef CONFIG_KEXEC_FILE -struct kexec_sha_region { - unsigned long start; - unsigned long len; -}; - +#include <linux/purgatory.h> void kimage_file_post_load_cleanup(struct kimage *image); #else /* CONFIG_KEXEC_FILE */ static inline void kimage_file_post_load_cleanup(struct kimage *image) { } |