diff options
| author | Wei Liu <wei.liu@kernel.org> | 2021-10-28 13:45:57 +0300 |
|---|---|---|
| committer | Wei Liu <wei.liu@kernel.org> | 2021-10-28 13:46:03 +0300 |
| commit | e82f2069b52fb350f4ea568957dcc5c9f3649999 (patch) | |
| tree | 218b976bfb985380a301c0317e08124d1e2cc39c /arch/s390 | |
| parent | 7117dccaa014415c1c21e6b13d4b7c8880fb218e (diff) | |
| parent | e9d1d2bb75b2d5d4b426769c5aae0ce8cef3558f (diff) | |
| download | linux-e82f2069b52fb350f4ea568957dcc5c9f3649999.tar.xz | |
Merge remote-tracking branch 'tip/x86/cc' into hyperv-next
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/include/asm/mem_encrypt.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/s390/include/asm/mem_encrypt.h b/arch/s390/include/asm/mem_encrypt.h index 2542cbf7e2d1..08a8b96606d7 100644 --- a/arch/s390/include/asm/mem_encrypt.h +++ b/arch/s390/include/asm/mem_encrypt.h @@ -4,8 +4,6 @@ #ifndef __ASSEMBLY__ -static inline bool mem_encrypt_active(void) { return false; } - int set_memory_encrypted(unsigned long addr, int numpages); int set_memory_decrypted(unsigned long addr, int numpages); |