projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i386 mmzone: use __maybe_unused
[powerpc.git]
/
mm
/
truncate.c
diff --git
a/mm/truncate.c
b/mm/truncate.c
index
ebf3fcb
..
4fbe1a2
100644
(file)
--- a/
mm/truncate.c
+++ b/
mm/truncate.c
@@
-12,6
+12,7
@@
#include <linux/swap.h>
#include <linux/module.h>
#include <linux/pagemap.h>
#include <linux/swap.h>
#include <linux/module.h>
#include <linux/pagemap.h>
+#include <linux/highmem.h>
#include <linux/pagevec.h>
#include <linux/task_io_accounting_ops.h>
#include <linux/buffer_head.h> /* grr. try_to_release_page,
#include <linux/pagevec.h>
#include <linux/task_io_accounting_ops.h>
#include <linux/buffer_head.h> /* grr. try_to_release_page,
@@
-46,7
+47,7
@@
void do_invalidatepage(struct page *page, unsigned long offset)
static inline void truncate_partial_page(struct page *page, unsigned partial)
{
static inline void truncate_partial_page(struct page *page, unsigned partial)
{
-
memclear_highpage_flush(page, partial, PAGE_CACHE_SIZE-partial
);
+
zero_user_page(page, partial, PAGE_CACHE_SIZE - partial, KM_USER0
);
if (PagePrivate(page))
do_invalidatepage(page, partial);
}
if (PagePrivate(page))
do_invalidatepage(page, partial);
}
@@
-375,10
+376,10
@@
int invalidate_inode_pages2_range(struct address_space *mapping,
pagevec_init(&pvec, 0);
next = start;
pagevec_init(&pvec, 0);
next = start;
- while (next <= end && !
ret && !
wrapped &&
+ while (next <= end && !wrapped &&
pagevec_lookup(&pvec, mapping, next,
min(end - next, (pgoff_t)PAGEVEC_SIZE - 1) + 1)) {
pagevec_lookup(&pvec, mapping, next,
min(end - next, (pgoff_t)PAGEVEC_SIZE - 1) + 1)) {
- for (i = 0;
!ret &&
i < pagevec_count(&pvec); i++) {
+ for (i = 0; i < pagevec_count(&pvec); i++) {
struct page *page = pvec.pages[i];
pgoff_t page_index;
struct page *page = pvec.pages[i];
pgoff_t page_index;