This branch has some cross-arch patches that are a prequisite for the SVM work. They're in a topic branch in case any of the other arch maintainers want to merge them to resolve conflicts.
Showing the changes to include/linux (2 of 13 files). Show all
Unified · Split
| @@ -115,4 +115,18 @@ static inline int vmcore_add_device_dump(struct vmcoredd_data *data) · 114 unmodified lines | ||
| 115 | 115 | return -EOPNOTSUPP; |
| 116 | 116 | } |
| 117 | 117 | #endif /* CONFIG_PROC_VMCORE_DEVICE_DUMP */ |
| 118 | + | |
| 119 | +#ifdef CONFIG_PROC_VMCORE | |
| 120 | +ssize_t read_from_oldmem(char *buf, size_t count, | |
| 121 | + u64 *ppos, int userbuf, | |
| 122 | + bool encrypted); | |
| 123 | +#else | |
| 124 | +static inline ssize_t read_from_oldmem(char *buf, size_t count, | |
| 125 | + u64 *ppos, int userbuf, | |
| 126 | + bool encrypted) | |
| 127 | +{ | |
| 128 | + return -EOPNOTSUPP; | |
| 129 | +} | |
| 130 | +#endif /* CONFIG_PROC_VMCORE */ | |
| 131 | + | |
| 118 | 132 | #endif /* LINUX_CRASHDUMP_H */ |
| @@ -18,23 +18,10 @@ · 17 unmodified lines | ||
| 18 | 18 | |
| 19 | 19 | #else /* !CONFIG_ARCH_HAS_MEM_ENCRYPT */ |
| 20 | 20 | |
| 21 | −#define sme_me_mask 0ULL | |
| 22 | − | |
| 23 | −static inline bool sme_active(void) { return false; } | |
| 24 | −static inline bool sev_active(void) { return false; } | |
| 21 | +static inline bool mem_encrypt_active(void) { return false; } | |
| 25 | 22 | |
| 26 | 23 | #endif /* CONFIG_ARCH_HAS_MEM_ENCRYPT */ |
| 27 | 24 | |
| 28 | −static inline bool mem_encrypt_active(void) | |
| 29 | −{ | |
| 30 | − return sme_me_mask; | |
| 31 | −} | |
| 32 | − | |
| 33 | −static inline u64 sme_get_me_mask(void) | |
| 34 | −{ | |
| 35 | − return sme_me_mask; | |
| 36 | −} | |
| 37 | − | |
| 38 | 25 | #ifdef CONFIG_AMD_MEM_ENCRYPT |
| 39 | 26 | /* |
| 40 | 27 | * The __sme_set() and __sme_clr() macros are useful for adding or removing |