Skip to content

Commit 0835b5e

Browse files
committed
Merge tag 'pstore-v6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull pstore update from Kees Cook: - Revert pmsg_lock back to a normal mutex (John Stultz) * tag 'pstore-v6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: pstore: Revert pmsg_lock back to a normal mutex
2 parents 900941b + 5239a89 commit 0835b5e

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

fs/pstore/pmsg.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
#include <linux/device.h>
88
#include <linux/fs.h>
99
#include <linux/uaccess.h>
10-
#include <linux/rtmutex.h>
1110
#include "internal.h"
1211

13-
static DEFINE_RT_MUTEX(pmsg_lock);
12+
static DEFINE_MUTEX(pmsg_lock);
1413

1514
static ssize_t write_pmsg(struct file *file, const char __user *buf,
1615
size_t count, loff_t *ppos)
@@ -29,9 +28,9 @@ static ssize_t write_pmsg(struct file *file, const char __user *buf,
2928
if (!access_ok(buf, count))
3029
return -EFAULT;
3130

32-
rt_mutex_lock(&pmsg_lock);
31+
mutex_lock(&pmsg_lock);
3332
ret = psinfo->write_user(&record, buf);
34-
rt_mutex_unlock(&pmsg_lock);
33+
mutex_unlock(&pmsg_lock);
3534
return ret ? ret : count;
3635
}
3736

0 commit comments

Comments
 (0)