Skip to contentSkip to conversation

m68k-mm-remove-dummy-__swp-definitions-for-nommu.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Feb 3, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: m68k/mm: remove dummy __swp definitions for nommu
has been removed from the -mm tree. Its filename was
m68k-mm-remove-dummy-__swp-definitions-for-nommu.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: David Hildenbrand <[email protected]>
Subject: m68k/mm: remove dummy __swp definitions for nommu
Date: Fri, 13 Jan 2023 18:10:09 +0100

The definitions are not required, let's remove them.

---

arch/m68k/include/asm/pgtable_no.h renamed from arch/m68k/include/asm/pgtable_no.h~m68k-mm-remove-dummy-__swp-definitions-for-nommu +0 -6
@@ -31,12 +31,6 @@
 extern void paging_init(void);
 #define swapper_pg_dir ((pgd_t *) 0)
 
-#define __swp_type(x)		(0)
-#define __swp_offset(x)		(0)
-#define __swp_entry(typ,off)	((swp_entry_t) { ((typ) | ((off) << 7)) })
-#define __pte_to_swp_entry(pte)	((swp_entry_t) { pte_val(pte) })
-#define __swp_entry_to_pte(x)	((pte_t) { (x).val })
-
 /*
  * ZERO_PAGE is a global shared page that is always zero: used
  * for zero-mapped memory areas etc..

_

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