Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 22:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

A fix for auxdisplay:

Browse Source 
- Remove in_interrupt() usage (Sebastian Andrzej Siewior)
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEPjU5OPd5QIZ9jqqOGXyLc2htIW0FAmBgsz4ACgkQGXyLc2ht
 IW3BJQ//VWasG/juyQD9CHgZCJoXYBlRzv5JUp6Fo+JWwf8JUpnsZdGaf4mBQgoC
 60NIo/8S2luuA/bAlwFeNDo9g7SZeFS4mLJnZmT0zNyPKnnmhpUGLo+HwKzOwaC6
 8e2Vf/PVvAmF4WhsG8bpnAUhgD4GxFzWdWYyGzdGdDVP+y7i7LciG+WHrgr6Kk8R
 71I3Ie/u9aTRAsDRIieAmXHFxckAjgvekphbjRRg/lUdDhIzk6Lf+Uj28TRhuubK
 VellOw4GtTE0foa5Gw7UELs5TBJyOPMVfgk9VER1xvjMj8I4g26BiFm4lBZTJcgy
 Ewc3yMCPDRd3aB2gS84bVG+7nov+iXy4bA0L7+BAVCSnj8cqDl7XD3EnLJjWmqTE
 38/4NRKLsuz2uX+VvKVFL9cx86OpHk0rwOybB+sLw4qzI/ABRipN/mJ8hut9i32j
 MOLgVYCsj28r7ZS4aijtpL3AV+UOBy9LGF6BT4Y5ztIQf8Es93EYr177jhgPimZT
 2O2a+qhyUw3zu7sa5g9qqRrGFb93wHfj6WFHWuxMDHKG0OcZuES2QBg3445C281k
 kY4iTZT7BDUoPZb21RZIG3ssi0KMeVL+EivIYpu1bNbwNH1vsvol8lr60befqVSu
 vbfRw661nU093bDVPsLoWjnvNW/Hx9XaXYJgfWzee5MgWCt+vRM=
 =SQ/B
 -----END PGP SIGNATURE-----

Merge tag 'auxdisplay-for-linus-v5.12-rc6' of git://github.com/ojeda/linux

Pull auxdisplay fix from Miguel Ojeda:
 "Remove in_interrupt() usage (Sebastian Andrzej Siewior)"

* tag 'auxdisplay-for-linus-v5.12-rc6' of git://github.com/ojeda/linux:
  auxdisplay: Remove in_interrupt() usage.
This commit is contained in:
Linus Torvalds 2021-03-28 13:20:38 -07:00
commit 3fef15f872
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/auxdisplay/charlcd.c
View File

@ -470,12 +470,14 @@ static ssize_t charlcd_write(struct file *file, const char __user *buf,
char c;
for (; count-- > 0; (*ppos)++, tmp++) {
if (!in_interrupt() && (((count + 1) & 0x1f) == 0))
if (((count + 1) & 0x1f) == 0) {
/*
* let's be a little nice with other processes
* that need some CPU
* charlcd_write() is invoked as a VFS->write() callback
* and as such it is always invoked from preemptible
* context and may sleep.
*/
schedule();
cond_resched();
}
if (get_user(c, tmp))
return -EFAULT;
@ -537,12 +539,8 @@ static void charlcd_puts(struct charlcd *lcd, const char *s)
int count = strlen(s);
for (; count-- > 0; tmp++) {
if (!in_interrupt() && (((count + 1) & 0x1f) == 0))
/*
* let's be a little nice with other processes
* that need some CPU
*/
schedule();
if (((count + 1) & 0x1f) == 0)
cond_resched();
charlcd_write_char(lcd, *tmp);
}