Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
c3eede8e
Commit
c3eede8e
authored
Nov 25, 2011
by
Cong Wang
Committed by
Cong Wang
Mar 20, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lib: remove the second argument of k[un]map_atomic()
Signed-off-by:
Cong Wang
<
amwang@redhat.com
>
parent
0de9a1e2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
lib/scatterlist.c
lib/scatterlist.c
+2
-2
lib/swiotlb.c
lib/swiotlb.c
+2
-3
No files found.
lib/scatterlist.c
View file @
c3eede8e
...
@@ -390,7 +390,7 @@ bool sg_miter_next(struct sg_mapping_iter *miter)
...
@@ -390,7 +390,7 @@ bool sg_miter_next(struct sg_mapping_iter *miter)
miter
->
consumed
=
miter
->
length
;
miter
->
consumed
=
miter
->
length
;
if
(
miter
->
__flags
&
SG_MITER_ATOMIC
)
if
(
miter
->
__flags
&
SG_MITER_ATOMIC
)
miter
->
addr
=
kmap_atomic
(
miter
->
page
,
KM_BIO_SRC_IRQ
)
+
off
;
miter
->
addr
=
kmap_atomic
(
miter
->
page
)
+
off
;
else
else
miter
->
addr
=
kmap
(
miter
->
page
)
+
off
;
miter
->
addr
=
kmap
(
miter
->
page
)
+
off
;
...
@@ -424,7 +424,7 @@ void sg_miter_stop(struct sg_mapping_iter *miter)
...
@@ -424,7 +424,7 @@ void sg_miter_stop(struct sg_mapping_iter *miter)
if
(
miter
->
__flags
&
SG_MITER_ATOMIC
)
{
if
(
miter
->
__flags
&
SG_MITER_ATOMIC
)
{
WARN_ON
(
!
irqs_disabled
());
WARN_ON
(
!
irqs_disabled
());
kunmap_atomic
(
miter
->
addr
,
KM_BIO_SRC_IRQ
);
kunmap_atomic
(
miter
->
addr
);
}
else
}
else
kunmap
(
miter
->
page
);
kunmap
(
miter
->
page
);
...
...
lib/swiotlb.c
View file @
c3eede8e
...
@@ -349,13 +349,12 @@ void swiotlb_bounce(phys_addr_t phys, char *dma_addr, size_t size,
...
@@ -349,13 +349,12 @@ void swiotlb_bounce(phys_addr_t phys, char *dma_addr, size_t size,
sz
=
min_t
(
size_t
,
PAGE_SIZE
-
offset
,
size
);
sz
=
min_t
(
size_t
,
PAGE_SIZE
-
offset
,
size
);
local_irq_save
(
flags
);
local_irq_save
(
flags
);
buffer
=
kmap_atomic
(
pfn_to_page
(
pfn
),
buffer
=
kmap_atomic
(
pfn_to_page
(
pfn
));
KM_BOUNCE_READ
);
if
(
dir
==
DMA_TO_DEVICE
)
if
(
dir
==
DMA_TO_DEVICE
)
memcpy
(
dma_addr
,
buffer
+
offset
,
sz
);
memcpy
(
dma_addr
,
buffer
+
offset
,
sz
);
else
else
memcpy
(
buffer
+
offset
,
dma_addr
,
sz
);
memcpy
(
buffer
+
offset
,
dma_addr
,
sz
);
kunmap_atomic
(
buffer
,
KM_BOUNCE_READ
);
kunmap_atomic
(
buffer
);
local_irq_restore
(
flags
);
local_irq_restore
(
flags
);
size
-=
sz
;
size
-=
sz
;
...
...
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