Merge tag 'sound-5.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[linux-2.6-microblaze.git] / drivers / char / mem.c

diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 9f58602..84ca98e 100644 (file)
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -101,7 +101,7 @@ static inline bool should_stop_iteration(void)
 {
        if (need_resched())
                cond_resched();
-       return fatal_signal_pending(current);
+       return signal_pending(current);
 }
 
 /*
@@ -707,7 +707,7 @@ static const struct memdev {
         [5] = { "zero", 0666, &zero_fops, FMODE_NOWAIT },
         [7] = { "full", 0666, &full_fops, 0 },
         [8] = { "random", 0666, &random_fops, 0 },
-        [9] = { "urandom", 0666, &random_fops, 0 },
+        [9] = { "urandom", 0666, &urandom_fops, 0 },
 #ifdef CONFIG_PRINTK
        [11] = { "kmsg", 0644, &kmsg_fops, 0 },
 #endif