diff options
Diffstat (limited to 'pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch')
| -rw-r--r-- | pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch b/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch index 9f92a38bcc4..c01e2a4ef46 100644 --- a/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch +++ b/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch @@ -1,6 +1,6 @@ -diff -Naur ProCaptureForLinux_3589/src/sources/ospi/linux-file.c ProCaptureForLinux_3589_new/src/sources/ospi/linux-file.c ---- ProCaptureForLinux_3589/src/sources/ospi/linux-file.c 2017-08-17 02:46:07.000000000 -0700 -+++ ProCaptureForLinux_3589_new/src/sources/ospi/linux-file.c 2017-11-13 20:18:50.842947380 -0800 +diff -Naur ProCaptureForLinux_3773/src/sources/ospi/linux-file.c ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.c +--- ProCaptureForLinux_3773/src/sources/ospi/linux-file.c 2017-12-15 01:59:57.000000000 -0800 ++++ ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.c 2017-12-23 22:14:08.351092413 -0800 @@ -7,8 +7,8 @@ #include "linux-file.h" @@ -11,41 +11,51 @@ diff -Naur ProCaptureForLinux_3589/src/sources/ospi/linux-file.c ProCaptureForLi struct file *linux_file_open(const char *path, int flags, int mode) { -@@ -28,27 +28,27 @@ +@@ -28,29 +28,36 @@ filp_close(file, NULL); } -ssize_t linux_file_read(struct file *file, loff_t offset, unsigned char *data, size_t size) +ssize_t linux_file_read(struct file *file, loff_t offset, const void *data, size_t size) { ++#if defined(HAVE_KERNEL_WRITE_PPOS) ++ return(kernel_read(file, data, size, &offset)); ++#else mm_segment_t oldfs; ssize_t ret; oldfs = get_fs(); set_fs(get_ds()); - ret = vfs_read(file, data, size, &offset); -+ ret = kernel_read(file, data, size, &offset); ++ ret = vfs_read(file, (unsigned char *)data, size, &offset); set_fs(oldfs); return ret; ++#endif } -ssize_t linux_file_write(struct file *file, loff_t offset, unsigned char *data, size_t size) +ssize_t linux_file_write(struct file *file, loff_t offset, const void *data, size_t size) { ++#if defined(HAVE_KERNEL_WRITE_PPOS) ++ return(kernel_write(file, data, size, &offset)); ++#else mm_segment_t oldfs; ssize_t ret; oldfs = get_fs(); set_fs(get_ds()); - ret = vfs_write(file, data, size, &offset); -+ ret = kernel_write(file, data, size, &offset); ++ ret = vfs_write(file, (unsigned char *)data, size, &offset); set_fs(oldfs); return ret; -diff -Naur ProCaptureForLinux_3589/src/sources/ospi/linux-file.h ProCaptureForLinux_3589_new/src/sources/ospi/linux-file.h ---- ProCaptureForLinux_3589/src/sources/ospi/linux-file.h 2017-08-17 02:46:07.000000000 -0700 -+++ ProCaptureForLinux_3589_new/src/sources/ospi/linux-file.h 2017-11-13 20:24:20.979690346 -0800 ++#endif + } +- +diff -Naur ProCaptureForLinux_3773/src/sources/ospi/linux-file.h ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.h +--- ProCaptureForLinux_3773/src/sources/ospi/linux-file.h 2017-12-15 01:59:57.000000000 -0800 ++++ ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.h 2017-12-23 21:57:18.263237473 -0800 @@ -13,9 +13,9 @@ void linux_file_close(struct file *file); |