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
Kirill Smelkov
linux
Commits
2480b208
Commit
2480b208
authored
Nov 25, 2011
by
Cong Wang
Committed by
Cong Wang
Mar 20, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
powerpc: remove the second argument of k[un]map_atomic()
Signed-off-by:
Cong Wang
<
amwang@redhat.com
>
parent
9c02048f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
9 deletions
+8
-9
arch/powerpc/kvm/book3s_pr.c
arch/powerpc/kvm/book3s_pr.c
+2
-2
arch/powerpc/mm/dma-noncoherent.c
arch/powerpc/mm/dma-noncoherent.c
+2
-3
arch/powerpc/mm/hugetlbpage.c
arch/powerpc/mm/hugetlbpage.c
+2
-2
arch/powerpc/mm/mem.c
arch/powerpc/mm/mem.c
+2
-2
No files found.
arch/powerpc/kvm/book3s_pr.c
View file @
2480b208
...
@@ -227,14 +227,14 @@ static void kvmppc_patch_dcbz(struct kvm_vcpu *vcpu, struct kvmppc_pte *pte)
...
@@ -227,14 +227,14 @@ static void kvmppc_patch_dcbz(struct kvm_vcpu *vcpu, struct kvmppc_pte *pte)
hpage_offset
/=
4
;
hpage_offset
/=
4
;
get_page
(
hpage
);
get_page
(
hpage
);
page
=
kmap_atomic
(
hpage
,
KM_USER0
);
page
=
kmap_atomic
(
hpage
);
/* patch dcbz into reserved instruction, so we trap */
/* patch dcbz into reserved instruction, so we trap */
for
(
i
=
hpage_offset
;
i
<
hpage_offset
+
(
HW_PAGE_SIZE
/
4
);
i
++
)
for
(
i
=
hpage_offset
;
i
<
hpage_offset
+
(
HW_PAGE_SIZE
/
4
);
i
++
)
if
((
page
[
i
]
&
0xff0007ff
)
==
INS_DCBZ
)
if
((
page
[
i
]
&
0xff0007ff
)
==
INS_DCBZ
)
page
[
i
]
&=
0xfffffff7
;
page
[
i
]
&=
0xfffffff7
;
kunmap_atomic
(
page
,
KM_USER0
);
kunmap_atomic
(
page
);
put_page
(
hpage
);
put_page
(
hpage
);
}
}
...
...
arch/powerpc/mm/dma-noncoherent.c
View file @
2480b208
...
@@ -365,12 +365,11 @@ static inline void __dma_sync_page_highmem(struct page *page,
...
@@ -365,12 +365,11 @@ static inline void __dma_sync_page_highmem(struct page *page,
local_irq_save
(
flags
);
local_irq_save
(
flags
);
do
{
do
{
start
=
(
unsigned
long
)
kmap_atomic
(
page
+
seg_nr
,
start
=
(
unsigned
long
)
kmap_atomic
(
page
+
seg_nr
)
+
seg_offset
;
KM_PPC_SYNC_PAGE
)
+
seg_offset
;
/* Sync this buffer segment */
/* Sync this buffer segment */
__dma_sync
((
void
*
)
start
,
seg_size
,
direction
);
__dma_sync
((
void
*
)
start
,
seg_size
,
direction
);
kunmap_atomic
((
void
*
)
start
,
KM_PPC_SYNC_PAGE
);
kunmap_atomic
((
void
*
)
start
);
seg_nr
++
;
seg_nr
++
;
/* Calculate next buffer segment size */
/* Calculate next buffer segment size */
...
...
arch/powerpc/mm/hugetlbpage.c
View file @
2480b208
...
@@ -910,9 +910,9 @@ void flush_dcache_icache_hugepage(struct page *page)
...
@@ -910,9 +910,9 @@ void flush_dcache_icache_hugepage(struct page *page)
if
(
!
PageHighMem
(
page
))
{
if
(
!
PageHighMem
(
page
))
{
__flush_dcache_icache
(
page_address
(
page
+
i
));
__flush_dcache_icache
(
page_address
(
page
+
i
));
}
else
{
}
else
{
start
=
kmap_atomic
(
page
+
i
,
KM_PPC_SYNC_ICACHE
);
start
=
kmap_atomic
(
page
+
i
);
__flush_dcache_icache
(
start
);
__flush_dcache_icache
(
start
);
kunmap_atomic
(
start
,
KM_PPC_SYNC_ICACHE
);
kunmap_atomic
(
start
);
}
}
}
}
}
}
arch/powerpc/mm/mem.c
View file @
2480b208
...
@@ -458,9 +458,9 @@ void flush_dcache_icache_page(struct page *page)
...
@@ -458,9 +458,9 @@ void flush_dcache_icache_page(struct page *page)
#endif
#endif
#ifdef CONFIG_BOOKE
#ifdef CONFIG_BOOKE
{
{
void
*
start
=
kmap_atomic
(
page
,
KM_PPC_SYNC_ICACHE
);
void
*
start
=
kmap_atomic
(
page
);
__flush_dcache_icache
(
start
);
__flush_dcache_icache
(
start
);
kunmap_atomic
(
start
,
KM_PPC_SYNC_ICACHE
);
kunmap_atomic
(
start
);
}
}
#elif defined(CONFIG_8xx) || defined(CONFIG_PPC64)
#elif defined(CONFIG_8xx) || defined(CONFIG_PPC64)
/* On 8xx there is no need to kmap since highmem is not supported */
/* On 8xx there is no need to kmap since highmem is not supported */
...
...
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