Merge master.kernel.org:/home/davem/BK/net-2.5

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

1 files changed, 9 insertions, 1 deletions

diff --git a/include/linux/pagevec.h b/include/linux/pagevec.h
index 0207270b0fe7..d149e0688b1e 100644
--- a/include/linux/pagevec.h
+++ b/include/linux/pagevec.h
@@ -12,6 +12,7 @@ struct address_space;
 
 struct pagevec {
 	unsigned nr;
+	int cold;
 	struct page *pages[PAGEVEC_SIZE];
 };
 
@@ -25,7 +26,13 @@ void pagevec_strip(struct pagevec *pvec);
 unsigned int pagevec_lookup(struct pagevec *pvec, struct address_space *mapping,
 		pgoff_t start, unsigned int nr_pages);
 
-static inline void pagevec_init(struct pagevec *pvec)
+static inline void pagevec_init(struct pagevec *pvec, int cold)
+{
+	pvec->nr = 0;
+	pvec->cold = cold;
+}
+
+static inline void pagevec_reinit(struct pagevec *pvec)
 {
 	pvec->nr = 0;
 }
@@ -49,6 +56,7 @@ static inline unsigned pagevec_add(struct pagevec *pvec, struct page *page)
 	return pagevec_space(pvec);
 }
 
+
 static inline void pagevec_release(struct pagevec *pvec)
 {
 	if (pagevec_count(pvec))