Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
Z
ZIO
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
ZIO
Commits
0a34de6a
Commit
0a34de6a
authored
Dec 19, 2018
by
Federico Vaga
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'kernel-compatibility-update'
It makes the code compiling and running on modern kernels
parents
72e7fe42
f925faf8
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
82 additions
and
7 deletions
+82
-7
zio-buf-vmalloc.c
buffers/zio-buf-vmalloc.c
+20
-2
chardev.c
chardev.c
+5
-0
zio-loop.c
drivers/zio-loop.c
+9
-0
zio-vmk8055.c
drivers/zio-vmk8055.c
+23
-3
sniff-dev.c
sniff-dev.c
+5
-0
zio-trig-timer.c
triggers/zio-trig-timer.c
+20
-2
No files found.
buffers/zio-buf-vmalloc.c
View file @
0a34de6a
...
...
@@ -448,9 +448,8 @@ static void zbk_close(struct vm_area_struct *vma)
atomic_dec
(
&
zbki
->
map_count
);
}
static
int
zbk_fault
(
struct
vm_area_struct
*
vma
,
struct
vm_fault
*
vm
f
)
static
int
__zbk_fault
(
struct
vm_fault
*
vmf
,
struct
file
*
f
)
{
struct
file
*
f
=
vma
->
vm_file
;
struct
zio_f_priv
*
priv
=
f
->
private_data
;
struct
zio_bi
*
bi
=
priv
->
chan
->
bi
;
struct
zbk_instance
*
zbki
=
to_zbki
(
bi
);
...
...
@@ -474,6 +473,25 @@ static int zbk_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
return
0
;
}
#if KERNEL_VERSION(4, 11, 0) > LINUX_VERSION_CODE
static
int
zbk_fault
(
struct
vm_area_struct
*
vma
,
struct
vm_fault
*
vmf
)
{
return
__zbk_fault
(
vmf
,
vma
->
vm_file
);
}
#else
#if KERNEL_VERSION(4, 17, 0) > LINUX_VERSION_CODE
static
int
zbk_fault
(
struct
vm_fault
*
vmf
)
{
return
__zbk_fault
(
vmf
,
vmf
->
vma
->
vm_file
);
}
#else
static
vm_fault_t
zbk_fault
(
struct
vm_fault
*
vmf
)
{
return
__zbk_fault
(
vmf
,
vmf
->
vma
->
vm_file
);
}
#endif
#endif
static
struct
vm_operations_struct
zbk_vma_ops
=
{
.
open
=
zbk_open
,
.
close
=
zbk_close
,
...
...
chardev.c
View file @
0a34de6a
...
...
@@ -13,7 +13,12 @@
#include <linux/mm.h>
#include <linux/mutex.h>
#include <linux/poll.h>
#include <linux/version.h>
#if KERNEL_VERSION(4, 11, 0) > LINUX_VERSION_CODE
#include <linux/sched.h>
#else
#include <linux/sched/signal.h>
#endif
#include <linux/uaccess.h>
#include <linux/zio.h>
...
...
drivers/zio-loop.c
View file @
0a34de6a
...
...
@@ -15,12 +15,21 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/version.h>
#if KERNEL_VERSION(4, 11, 0) > LINUX_VERSION_CODE
#include <linux/sched.h>
#else
#include <linux/sched/signal.h>
#endif
#include <linux/slab.h>
#include <linux/fs.h>
#include <linux/miscdevice.h>
#include <linux/stringify.h>
#if KERNEL_VERSION(4, 14, 0) > LINUX_VERSION_CODE
#include <asm/uaccess.h>
#else
#include <linux/uaccess.h>
#endif
#include <linux/zio.h>
#include <linux/zio-buffer.h>
...
...
drivers/zio-vmk8055.c
View file @
0a34de6a
...
...
@@ -10,6 +10,7 @@
#include <linux/usb.h>
#include <linux/timer.h>
#include <linux/jiffies.h>
#include <linux/version.h>
#include <linux/zio.h>
#include <linux/zio-buffer.h>
...
...
@@ -144,9 +145,8 @@ static void zvmk80xx_start_timer(struct zvmk80xx_cset *zvmk80xx_cset)
*
* This runs when the timer expires and on raw_io
*/
static
void
zvmk80xx_send_urb
(
unsigned
long
arg
)
static
void
__zvmk80xx_send_urb
(
struct
zvmk80xx_cset
*
zvmk80xx_cset
)
{
struct
zvmk80xx_cset
*
zvmk80xx_cset
=
(
void
*
)
arg
;
struct
zio_channel
*
chan
;
uint8_t
*
data
,
*
buf
;
unsigned
int
sent
,
nsample
;
...
...
@@ -195,6 +195,22 @@ static void zvmk80xx_send_urb(unsigned long arg)
zvmk80xx_start_timer
(
zvmk80xx_cset
);
}
#if KERNEL_VERSION(4, 15, 0) > LINUX_VERSION_CODE
static
void
zvmk80xx_send_urb
(
unsigned
long
arg
)
{
struct
zvmk80xx_cset
*
zvmk80xx_cset
=
(
void
*
)
arg
;
__zvmk80xx_send_urb
(
zvmk80xx_cset
);
}
#else
static
void
zvmk80xx_send_urb
(
struct
timer_list
*
t
)
{
struct
zvmk80xx_cset
*
zvmk80xx_cset
=
from_timer
(
zvmk80xx_cset
,
t
,
timer
);
__zvmk80xx_send_urb
(
zvmk80xx_cset
);
}
#endif
/* * * * * * * * * * * * * * * * * * * ZIO * * * * * * * * * * * * * * * * */
...
...
@@ -215,7 +231,7 @@ static int zvmk80xx_generic_raw_io(struct zio_cset *cset)
zvmk80xx_cset
->
period
=
msecs_to_jiffies
(
cset
->
zattr_set
.
ext_zattr
[
0
].
value
);
/* Program the next usb transfer */
zvmk80xx_send_urb
((
unsigned
long
)
zvmk80xx_cset
);
__zvmk80xx_send_urb
(
zvmk80xx_cset
);
return
-
EAGAIN
;
}
...
...
@@ -241,8 +257,12 @@ static int zvmk80xx_init_cset(struct zio_cset *cset)
return
-
ENOMEM
;
}
#if KERNEL_VERSION(4, 15, 0) > LINUX_VERSION_CODE
setup_timer
(
&
zvmk80xx_cset
->
timer
,
zvmk80xx_send_urb
,
(
unsigned
long
)
zvmk80xx_cset
);
#else
timer_setup
(
&
zvmk80xx_cset
->
timer
,
zvmk80xx_send_urb
,
0
);
#endif
switch
(
cset
->
index
)
{
case
0
:
/* digital input */
...
...
sniff-dev.c
View file @
0a34de6a
...
...
@@ -8,7 +8,12 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/version.h>
#if KERNEL_VERSION(4, 11, 0) > LINUX_VERSION_CODE
#include <linux/sched.h>
#else
#include <linux/sched/signal.h>
#endif
#include <linux/list.h>
#include <linux/fs.h>
#include <linux/poll.h>
...
...
triggers/zio-trig-timer.c
View file @
0a34de6a
...
...
@@ -13,6 +13,7 @@
#include <linux/slab.h>
#include <linux/timer.h>
#include <linux/jiffies.h>
#include <linux/version.h>
#include <linux/zio.h>
#include <linux/zio-sysfs.h>
...
...
@@ -111,9 +112,8 @@ static struct zio_sysfs_operations ztt_s_ops = {
};
/* This runs when the timer expires */
static
void
ztt_fn
(
unsigned
long
arg
)
static
void
__ztt_fn
(
struct
zio_ti
*
ti
)
{
struct
zio_ti
*
ti
=
(
void
*
)
arg
;
struct
ztt_instance
*
ztt
;
zio_arm_trigger
(
ti
);
...
...
@@ -126,6 +126,20 @@ static void ztt_fn(unsigned long arg)
mod_timer
(
&
ztt
->
timer
,
ztt
->
next_run
);
}
#if KERNEL_VERSION(4, 15, 0) > LINUX_VERSION_CODE
static
void
ztt_fn
(
unsigned
long
arg
)
{
struct
zio_ti
*
ti
=
(
void
*
)
arg
;
__ztt_fn
(
ti
);
}
#else
static
void
ztt_fn
(
struct
timer_list
*
t
)
{
struct
ztt_instance
*
ztt
=
from_timer
(
ztt
,
t
,
timer
);
__ztt_fn
(
&
ztt
->
ti
);
}
#endif
/*
* The trigger operations are the core of a trigger type
*/
...
...
@@ -159,8 +173,12 @@ static struct zio_ti *ztt_create(struct zio_trigger_type *trig,
ti
->
cset
=
cset
;
/* Fill own fields */
#if KERNEL_VERSION(4, 15, 0) > LINUX_VERSION_CODE
setup_timer
(
&
ztt
->
timer
,
ztt_fn
,
(
unsigned
long
)(
&
ztt
->
ti
));
#else
timer_setup
(
&
ztt
->
timer
,
ztt_fn
,
0
);
#endif
ztt
->
period
=
msecs_to_jiffies
(
ztt_ext_attr
[
0
].
value
);
ztt
->
phase
=
msecs_to_jiffies
(
ztt_ext_attr
[
1
].
value
);
ztt_start_timer
(
ztt
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment