FROMLIST: drm: Add HDMI 2.0 VIC support for AVI info-frames

[firefly-linux-kernel-4.4.55.git] / fs / signalfd.c

diff --git a/fs/signalfd.c b/fs/signalfd.c
index 424b7b65321fecbe2afff24cb3f3f69dfa81bc26..270221fcef42cc42fcfdbc098b587b571be65a12 100644 (file)
--- a/fs/signalfd.c
+++ b/fs/signalfd.c
@@ -121,8 +121,9 @@ static int signalfd_copyinfo(struct signalfd_siginfo __user *uinfo,
                 * Other callers might not initialize the si_lsb field,
                 * so check explicitly for the right codes here.
                 */
-               if (kinfo->si_code == BUS_MCEERR_AR ||
-                   kinfo->si_code == BUS_MCEERR_AO)
+               if (kinfo->si_signo == SIGBUS &&
+                   (kinfo->si_code == BUS_MCEERR_AR ||
+                    kinfo->si_code == BUS_MCEERR_AO))
                        err |= __put_user((short) kinfo->si_addr_lsb,
                                          &uinfo->ssi_addr_lsb);
 #endif
@@ -230,7 +231,7 @@ static ssize_t signalfd_read(struct file *file, char __user *buf, size_t count,
 }
 
 #ifdef CONFIG_PROC_FS
-static int signalfd_show_fdinfo(struct seq_file *m, struct file *f)
+static void signalfd_show_fdinfo(struct seq_file *m, struct file *f)
 {
        struct signalfd_ctx *ctx = f->private_data;
        sigset_t sigmask;
@@ -238,8 +239,6 @@ static int signalfd_show_fdinfo(struct seq_file *m, struct file *f)
        sigmask = ctx->sigmask;
        signotset(&sigmask);
        render_sigset_t(m, "sigmask:\t", &sigmask);
-
-       return 0;
 }
 #endif