diff options
author | Helge Deller <deller@gmx.de> | 2014-01-31 15:33:17 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-06 14:08:17 -0500 |
commit | 64a0099626b2ab6403433ef25e458c4d553a81a1 (patch) | |
tree | 853ef652965d1df5404edbf593d9b887d17287c2 /arch/parisc/include | |
parent | 50920a1dd85602169df04e38248fa582d523c039 (diff) |
parisc: fix cache-flushing
commit 57737c49dd72c96cfbcd4f66559f3ffc399aeb4f upstream.
This commit:
f8dae00684d678afa13041ef170cecfd1297ed40: parisc: Ensure full cache coherency for kmap/kunmap
caused negative caching side-effects, e.g. hanging processes with expect and
too many inequivalent alias messages from flush_dcache_page() on Debian 5 systems.
This patch now partly reverts it and has been in production use on our debian buildd
makeservers since a week without any major problems.
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: John David Anglin <dave.anglin@bell.net>
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/parisc/include')
-rw-r--r-- | arch/parisc/include/asm/cacheflush.h | 2 | ||||
-rw-r--r-- | arch/parisc/include/asm/page.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/parisc/include/asm/cacheflush.h b/arch/parisc/include/asm/cacheflush.h index 2f9b751878ba..de65f66ea64e 100644 --- a/arch/parisc/include/asm/cacheflush.h +++ b/arch/parisc/include/asm/cacheflush.h | |||
@@ -132,7 +132,6 @@ void mark_rodata_ro(void); | |||
132 | static inline void *kmap(struct page *page) | 132 | static inline void *kmap(struct page *page) |
133 | { | 133 | { |
134 | might_sleep(); | 134 | might_sleep(); |
135 | flush_dcache_page(page); | ||
136 | return page_address(page); | 135 | return page_address(page); |
137 | } | 136 | } |
138 | 137 | ||
@@ -144,7 +143,6 @@ static inline void kunmap(struct page *page) | |||
144 | static inline void *kmap_atomic(struct page *page) | 143 | static inline void *kmap_atomic(struct page *page) |
145 | { | 144 | { |
146 | pagefault_disable(); | 145 | pagefault_disable(); |
147 | flush_dcache_page(page); | ||
148 | return page_address(page); | 146 | return page_address(page); |
149 | } | 147 | } |
150 | 148 | ||
diff --git a/arch/parisc/include/asm/page.h b/arch/parisc/include/asm/page.h index c53fc63149e8..637fe031aa84 100644 --- a/arch/parisc/include/asm/page.h +++ b/arch/parisc/include/asm/page.h | |||
@@ -29,7 +29,8 @@ struct page; | |||
29 | void clear_page_asm(void *page); | 29 | void clear_page_asm(void *page); |
30 | void copy_page_asm(void *to, void *from); | 30 | void copy_page_asm(void *to, void *from); |
31 | #define clear_user_page(vto, vaddr, page) clear_page_asm(vto) | 31 | #define clear_user_page(vto, vaddr, page) clear_page_asm(vto) |
32 | #define copy_user_page(vto, vfrom, vaddr, page) copy_page_asm(vto, vfrom) | 32 | void copy_user_page(void *vto, void *vfrom, unsigned long vaddr, |
33 | struct page *pg); | ||
33 | 34 | ||
34 | /* #define CONFIG_PARISC_TMPALIAS */ | 35 | /* #define CONFIG_PARISC_TMPALIAS */ |
35 | 36 | ||