Skip to contentSkip to conversation

mm/migrate.c: cleanups

PATCH In review Adrian Bunk 4 participants 4 messages Jul 29, 2007 – Aug 3, 2007

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mm/migrate.c: cleanups

This patch contains the following cleanups:
- every file should include the headers containing the prototypes for its global functions
- make the needlessly global putback_lru_pages() static

---

This patch has been sent on:
- 6 Jul 2007

 include/linux/migrate.h |    2 --
 mm/migrate.c            |    3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)
include/linux/migrate.h renamed from include/linux/migrate.h.old +0 -2
@@ -26,7 +26,6 @@
 }
 
 extern int isolate_lru_page(struct page *p, struct list_head *pagelist);
-extern int putback_lru_pages(struct list_head *l);
 extern int migrate_page(struct address_space *,
 			struct page *, struct page *);
 extern int migrate_pages(struct list_head *l, new_page_t x, unsigned long);
@@ -44,7 +43,6 @@
 
 static inline int isolate_lru_page(struct page *p, struct list_head *list)
 					{ return -ENOSYS; }
-static inline int putback_lru_pages(struct list_head *l) { return 0; }
 static inline int migrate_pages(struct list_head *l, new_page_t x,
 		unsigned long private) { return -ENOSYS; }
 
mm/migrate.c renamed from mm/migrate.c.old +2 -1
@@ -28,6 +28,7 @@
 #include <linux/mempolicy.h>
 #include <linux/vmalloc.h>
 #include <linux/security.h>
+#include <linux/syscalls.h>
 
 #include "internal.h"
 
@@ -101,7 +102,7 @@
  *
  * returns the number of pages put back.
  */
-int putback_lru_pages(struct list_head *l)
+static int putback_lru_pages(struct list_head *l)
 {
 	struct page *page;
 	struct page *page2;
#1 lore raw

Sorry for late response.

But, this patch is the cause of compile error of memory unplug code of 2.6.23-rc1-mm2. It uses putback_lru_pages().
Don't make it static please... :-(

Bye.

----
CC mm/memory_hotplug.o
mm/memory_hotplug.c: In function ‘do_migrate_range’:
mm/memory_hotplug.c:402: error: implicit declaration of function ‘putback_lru_pages’ make[1]: *** [mm/memory_hotplug.o] Error 1

----

Quoted 60 lines

This patch contains the following cleanups:
- every file should include the headers containing the prototypes for its global functions
- make the needlessly global putback_lru_pages() static

---

This patch has been sent on:
- 6 Jul 2007

 include/linux/migrate.h |    2 --
 mm/migrate.c            |    3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)
include/linux/migrate.h renamed from include/linux/migrate.h.old +0 -2
@@ -26,7 +26,6 @@
 }
 
 extern int isolate_lru_page(struct page *p, struct list_head *pagelist);
-extern int putback_lru_pages(struct list_head *l);
 extern int migrate_page(struct address_space *,
 			struct page *, struct page *);
 extern int migrate_pages(struct list_head *l, new_page_t x, unsigned long);
@@ -44,7 +43,6 @@
 
 static inline int isolate_lru_page(struct page *p, struct list_head *list)
 					{ return -ENOSYS; }
-static inline int putback_lru_pages(struct list_head *l) { return 0; }
 static inline int migrate_pages(struct list_head *l, new_page_t x,
 		unsigned long private) { return -ENOSYS; }
 
mm/migrate.c renamed from mm/migrate.c.old +2 -2
@@ -28,6 +28,7 @@
 #include <linux/mempolicy.h>
 #include <linux/vmalloc.h>
 #include <linux/security.h>
+#include <linux/syscalls.h>
 
 #include "internal.h"
 
@@ -101,7 +102,7 @@
  *
  * returns the number of pages put back.
  */
-int putback_lru_pages(struct list_head *l)
+static int putback_lru_pages(struct list_head *l)
 {
 	struct page *page;
 	struct page *page2;
 
-

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Signature · 1 line
Yasunori Goto 
#2 lore raw
Quoted 3 lines · Yasunori Goto

But, this patch is the cause of compile error of memory unplug code of 2.6.23-rc1-mm2. It uses putback_lru_pages().
Don't make it static please... :-(

Right. But Adrian insisted since it was currently not used upstream.

So I guess you will have to revert this piece in your unplug code.

#3 lore raw
Quoted 10 lines · On Thu, 2 Aug 2007 11:43:21 -0700 (PDT) Christoph Lameter <[email protected]>…
Quoted 3 lines · Yasunori Goto

But, this patch is the cause of compile error of memory unplug code of 2.6.23-rc1-mm2. It uses putback_lru_pages().
Don't make it static please... :-(

Right. But Adrian insisted since it was currently not used upstream.

So I guess you will have to revert this piece in your unplug code.

Okay, I'll take are.
But I'm too busy in these days.

Andrew, If you have to drop unplug patch set, please do. I'll rework all when I find time.

Thanks,
-Kame