[folded-merged] mm-compaction-introduce-kcompactd-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: mm, compaction: fix build errors with kcompactd
has been removed from the -mm tree.  Its filename was
     mm-compaction-introduce-kcompactd-fix.patch

This patch was dropped because it was folded into mm-compaction-introduce-kcompactd.patch

------------------------------------------------------
From: Arnd Bergmann <arnd@xxxxxxxx>
Subject: mm, compaction: fix build errors with kcompactd

The newly added kcompactd code introduces multiple build errors:

include/linux/compaction.h:91:12: error: 'kcompactd_run' defined but not used [-Werror=unused-function]
mm/compaction.c:1953:2: error: implicit declaration of function 'hotcpu_notifier' [-Werror=implicit-function-declaration]

This marks the new empty wrapper functions as 'inline' to avoid unused-function warnings,
and includes linux/cpu.h to get the hotcpu_notifier declaration.

Fixes: 8364acdfa45a ("mm, compaction: introduce kcompactd")
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 include/linux/compaction.h |    6 +++---
 mm/compaction.c            |    1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff -puN include/linux/compaction.h~mm-compaction-introduce-kcompactd-fix include/linux/compaction.h
--- a/include/linux/compaction.h~mm-compaction-introduce-kcompactd-fix
+++ a/include/linux/compaction.h
@@ -88,15 +88,15 @@ static inline bool compaction_deferred(s
 	return true;
 }
 
-static int kcompactd_run(int nid)
+static inline int kcompactd_run(int nid)
 {
 	return 0;
 }
-static void kcompactd_stop(int nid)
+static inline void kcompactd_stop(int nid)
 {
 }
 
-static void wakeup_kcompactd(pg_data_t *pgdat, int order, int classzone_idx)
+static inline void wakeup_kcompactd(pg_data_t *pgdat, int order, int classzone_idx)
 {
 }
 
diff -puN mm/compaction.c~mm-compaction-introduce-kcompactd-fix mm/compaction.c
--- a/mm/compaction.c~mm-compaction-introduce-kcompactd-fix
+++ a/mm/compaction.c
@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corp. 2007-2010 Mel Gorman <mel@xxxxxxxxx>
  */
+#include <linux/cpu.h>
 #include <linux/swap.h>
 #include <linux/migrate.h>
 #include <linux/compaction.h>
_

Patches currently in -mm which might be from arnd@xxxxxxxx are

mm-compaction-introduce-kcompactd.patch
mm-page_ref-add-tracepoint-to-track-down-page-reference-manipulation-fix-2.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux