Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FPGA Configuration Space
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Projects
FPGA Configuration Space
Commits
3ccd8975
Commit
3ccd8975
authored
1 year ago
by
A. Hahn
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/rubi-test'
parents
cd0bd184
0434a533
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
pcie-wb/wishbone.c
+25
-1
25 additions, 1 deletion
pcie-wb/wishbone.c
with
25 additions
and
1 deletion
pcie-wb/wishbone.c
+
25
−
1
View file @
3ccd8975
...
...
@@ -609,7 +609,31 @@ static int char_master_fasync(int fd, struct file *file, int on)
return
fasync_helper
(
fd
,
file
,
on
,
&
context
->
fasync
);
}
#if LINUX_VERSION_CODE > KERNEL_VERSION(4,1,0)
#if LINUX_VERSION_CODE > KERNEL_VERSION(5,19,0)
/*
* Commit v5.19-10288-g3e20a751aff0, implementing read(2), removed
* initialization of iter->iov (and thus iter->nr_segs). Put it back.
* This is a hack, as I imagine there was a reason for the change (ARub).
*/
static
ssize_t
char_master_aio_read_iter
(
struct
kiocb
*
iocb
,
struct
iov_iter
*
iter
)
{
/* From new_sync_read before v5.19-10288-g3e20a751aff0 */
struct
iovec
iov
=
{
.
iov_base
=
iter
->
ubuf
,
.
iov_len
=
iter
->
count
};
return
char_master_aio_read
(
iocb
,
&
iov
,
1
,
0
);
}
static
ssize_t
char_master_aio_write_iter
(
struct
kiocb
*
iocb
,
struct
iov_iter
*
iter
)
{
/* From new_sync_write before v5.19-10288-g3e20a751aff0 */
struct
iovec
iov
=
{
.
iov_base
=
iter
->
ubuf
,
.
iov_len
=
iter
->
count
};
return
char_master_aio_write
(
iocb
,
&
iov
,
1
,
0
);
}
#elif LINUX_VERSION_CODE > KERNEL_VERSION(4,1,0)
static
ssize_t
char_master_aio_read_iter
(
struct
kiocb
*
iocb
,
struct
iov_iter
*
iter
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment