Skip to contentSkip to conversation

mm-swap-remove-swap_flag_prio_shift.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Mar 17, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/swap: remove SWAP_FLAG_PRIO_SHIFT
has been removed from the -mm tree. Its filename was
mm-swap-remove-swap_flag_prio_shift.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Baoquan He <[email protected]>
Subject: mm/swap: remove SWAP_FLAG_PRIO_SHIFT
Date: Wed, 5 Feb 2025 17:27:12 +0800

It doesn't make sense to have a zero value of shift. Remove it to avoid confusion.

---

 include/linux/swap.h |    1 -
 mm/swapfile.c        |    3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)
include/linux/swap.h renamed from include/linux/swap.h~mm-swap-remove-swap_flag_prio_shift +0 -1
@@ -24,7 +24,6 @@ struct pagevec;
 
 #define SWAP_FLAG_PREFER	0x8000	/* set if swap priority specified */
 #define SWAP_FLAG_PRIO_MASK	0x7fff
-#define SWAP_FLAG_PRIO_SHIFT	0
 #define SWAP_FLAG_DISCARD	0x10000 /* enable discard for swap */
 #define SWAP_FLAG_DISCARD_ONCE	0x20000 /* discard swap area at swapon-time */
 #define SWAP_FLAG_DISCARD_PAGES 0x40000 /* discard page-clusters after use */
mm/swapfile.c renamed from mm/swapfile.c~mm-swap-remove-swap_flag_prio_shift +1 -2
@@ -3453,8 +3453,7 @@ SYSCALL_DEFINE2(swapon, const char __use
 	mutex_lock(&swapon_mutex);
 	prio = -1;
 	if (swap_flags & SWAP_FLAG_PREFER)
-		prio =
-		  (swap_flags & SWAP_FLAG_PRIO_MASK) >> SWAP_FLAG_PRIO_SHIFT;
+		prio = swap_flags & SWAP_FLAG_PRIO_MASK;
 	enable_swap_info(si, prio, swap_map, cluster_info, zeromap);
 
 	pr_info("Adding %uk swap on %s.  Priority:%d extents:%d across:%lluk %s%s%s%s\n",

_

Patches currently in -mm which might be from [email protected] are