Merge tag 'for-linus-20191012' of git://git.kernel.dk/linux-block

[linux.git] / fs / proc / vmcore.c

diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
index 7bcc92add72c1f1559e48eed956a58ec91ac824e..7b13988796e173ac170af460d6f4de299443b5d3 100644 (file)
--- a/fs/proc/vmcore.c
+++ b/fs/proc/vmcore.c
@@ -104,9 +104,9 @@ static int pfn_is_ram(unsigned long pfn)
 }
 
 /* Reads a page from the oldmem device from given offset. */
-static ssize_t read_from_oldmem(char *buf, size_t count,
-                               u64 *ppos, int userbuf,
-                               bool encrypted)
+ssize_t read_from_oldmem(char *buf, size_t count,
+                        u64 *ppos, int userbuf,
+                        bool encrypted)
 {
        unsigned long pfn, offset;
        size_t nr_bytes;
@@ -170,7 +170,7 @@ void __weak elfcorehdr_free(unsigned long long addr)
  */
 ssize_t __weak elfcorehdr_read(char *buf, size_t count, u64 *ppos)
 {
-       return read_from_oldmem(buf, count, ppos, 0, sev_active());
+       return read_from_oldmem(buf, count, ppos, 0, false);
 }
 
 /*