The patch titled
Subject: compaction-fix-build-error-in-cma-compaction-fix
has been removed from the -mm tree. Its filename was
compaction-fix-build-error-in-cma-compaction-fix.patch
This patch was dropped because it was folded into compaction-fix-build-error-in-cma-compaction.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: compaction-fix-build-error-in-cma-compaction-fix
add "do { } while (0)", per Mel.
Cc: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
Cc: Mel Gorman <mgorman@xxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/compaction.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN mm/compaction.c~compaction-fix-build-error-in-cma-compaction-fix mm/compaction.c
--- a/mm/compaction.c~compaction-fix-build-error-in-cma-compaction-fix
+++ a/mm/compaction.c
@@ -28,8 +28,8 @@ static inline void count_compact_events(
count_vm_events(item, delta);
}
#else
-#define count_compact_event(item)
-#define count_compact_events(item, delta)
+#define count_compact_event(item) do { } while (0)
+#define count_compact_events(item, delta) do { } while (0)
#endif
#if defined CONFIG_COMPACTION || defined CONFIG_CMA
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
compaction-fix-build-error-in-cma-compaction.patch
drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid.patch
drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists.patch
hfsplus-rework-processing-of-hfs_btree_write-returned-error.patch
revert-rtc-recycle-id-when-unloading-a-rtc-driver.patch
sgi-xp-handle-non-fatal-traps-fix.patch
sendfile-allows-bypassing-of-notifier-events.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
