mm-damon-move-damon_rand-definition-into-damonh.patch removed from -mm tree
The patch titled
Subject: mm/damon: move damon_rand() definition into damon.h
has been removed from the -mm tree. Its filename was
mm-damon-move-damon_rand-definition-into-damonh.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Xin Hao <[email protected]>
Subject: mm/damon: move damon_rand() definition into damon.h
damon_rand() is called in three files:damon/core.c, damon/ paddr.c, damon/vaddr.c, i think there is no need to redefine this twice, So move it to damon.h will be a good choice.
Signed-off-by Xin Hao <[email protected]>
Reviewed-by SeongJae Park <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
include/linux/damon.h | 4 ++++ mm/damon/core.c | 4 ---- mm/damon/prmtv-common.h | 4 ---- 3 files changed, 4 insertions(+), 8 deletions(-)
include/linux/damon.h renamed from include/linux/damon.h~mm-damon-move-damon_rand-definition-into-damonh +4 -0
@@ -11,12 +11,16 @@#include <linux/mutex.h> #include <linux/time64.h> #include <linux/types.h> +#include <linux/random.h> /* Minimal region size. Every damon_region is aligned by this. */ #define DAMON_MIN_REGION PAGE_SIZE/* Max priority score for DAMON-based operation schemes */ #define DAMOS_MAX_SCORE (99) +/* Get a random number in [l, r) */ +#define damon_rand (l, r) (l + prandom_u32_max(r - l)) +/** * struct damon_addr_range - Represents an address region of [@start, @end). * @start: Start address of the region (inclusive).
mm/damon/core.c renamed from mm/damon/core.c~mm-damon-move-damon_rand-definition-into-damonh +0 -4
@@ -11,7 +11,6 @@#include <linux/delay.h> #include <linux/kthread.h> #include <linux/mm.h> -#include <linux/random.h> #include <linux/slab.h> #include <linux/string.h>
@@ -23,9 +22,6 @@#define DAMON_MIN_REGION 1#endif -/* Get a random number in [l, r) */ -#define damon_rand (l, r) (l + prandom_u32_max(r - l)) -static DEFINE_MUTEX (damon_lock);static int nr_running_ctxs;
mm/damon/prmtv-common.h renamed from mm/damon/prmtv-common.h~mm-damon-move-damon_rand-definition-into-damonh +0 -4
@@ -6,10 +6,6 @@*/ #include <linux/damon.h> -#include <linux/random.h> - -/* Get a random number in [l, r) */ -#define damon_rand (l, r) (l + prandom_u32_max(r - l))struct page *damon_get_page (unsigned long pfn);
_
Patches currently in -mm which might be from [email protected] are