Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c58e8134 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Wim Van Sebroeck
Browse files

watchdog: cpwd: fix build regression 



The compat_ptr_ioctl() infrastructure did not make it into
linux-5.4, so cpwd now fails to build.

Fix it by using an open-coded version.

Fixes: 68f28b01 ("watchdog: cpwd: use generic compat_ptr_ioctl")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent a99d8080

drivers/watchdog/cpwd.c

+7 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/interrupt.h>

#include <linux/ioport.h>

#include <linux/timer.h>

#include <linux/compat.h>

#include <linux/slab.h>

#include <linux/mutex.h>

#include <linux/io.h>
@@ -473,6 +474,11 @@ static long cpwd_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	return 0;

}



static long cpwd_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

{

	return cpwd_ioctl(file, cmd, (unsigned long)compat_ptr(arg));

}



static ssize_t cpwd_write(struct file *file, const char __user *buf,

			  size_t count, loff_t *ppos)

{
@@ -497,7 +503,7 @@ static ssize_t cpwd_read(struct file *file, char __user *buffer, 
static const struct file_operations cpwd_fops = {

	.owner =		THIS_MODULE,

	.unlocked_ioctl =	cpwd_ioctl,

	.compat_ioctl =		compat_ptr_ioctl,

	.compat_ioctl =		cpwd_compat_ioctl,

	.open =			cpwd_open,

	.write =		cpwd_write,

	.read =			cpwd_read,