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

Commit 454459b0 authored by Pete Zaitcev's avatar Pete Zaitcev Committed by Greg Kroah-Hartman
Browse files

usbmon: restore mmap 



Paolo asked to enable the mmap. I kept it off because I'm do not
entirely understand how it workse these days after ->nopage etc.
But it seems like working somewhat at least.

Signed-Off-By: default avatarPete Zaitcev <zaitcev@gmail.com>
Cc: Paolo Abeni <paolo.abeni@email.it>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d43a05fd

drivers/usb/mon/mon_bin.c

+3 −6
Original line number Diff line number Diff line
@@ -1026,8 +1026,6 @@ mon_bin_poll(struct file *file, struct poll_table_struct *wait) 
	return mask;

}



#if 0



/*

 * open and close: just keep track of how many times the device is

 * mapped, to use the proper memory allocation function.
@@ -1063,13 +1061,13 @@ static int mon_bin_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
	return 0;

}



struct vm_operations_struct mon_bin_vm_ops = {

static struct vm_operations_struct mon_bin_vm_ops = {

	.open =     mon_bin_vma_open,

	.close =    mon_bin_vma_close,

	.fault =    mon_bin_vma_fault,

};



int mon_bin_mmap(struct file *filp, struct vm_area_struct *vma)

static int mon_bin_mmap(struct file *filp, struct vm_area_struct *vma)

{

	/* don't do anything here: "fault" will set up page table entries */

	vma->vm_ops = &mon_bin_vm_ops;
@@ -1079,8 +1077,6 @@ int mon_bin_mmap(struct file *filp, struct vm_area_struct *vma) 
	return 0;

}



#endif  /*  0  */



static const struct file_operations mon_fops_binary = {

	.owner =	THIS_MODULE,

	.open =		mon_bin_open,
@@ -1090,6 +1086,7 @@ static const struct file_operations mon_fops_binary = { 
	.poll =		mon_bin_poll,

	.ioctl =	mon_bin_ioctl,

	.release =	mon_bin_release,

	.mmap =		mon_bin_mmap,

};



static int mon_bin_wait_event(struct file *file, struct mon_reader_bin *rp)

drivers/usb/mon/mon_main.c

+1 −2
Original line number Diff line number Diff line
@@ -129,8 +129,7 @@ static void mon_submit_error(struct usb_bus *ubus, struct urb *urb, int error) 


/*

 */

static void mon_bus_complete(struct mon_bus *mbus, struct urb *urb,

		int status)

static void mon_bus_complete(struct mon_bus *mbus, struct urb *urb, int status)

{

	unsigned long flags;

	struct list_head *pos;