Skip to contentSkip to conversation

shmem_quota-build-the-object-file-conditionally-to-the-config-option.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Sep 2, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: shmem_quota: build the object file conditionally to the config option
has been removed from the -mm tree. Its filename was
shmem_quota-build-the-object-file-conditionally-to-the-config-option.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: Carlos Maiolino <[email protected]>
Subject: shmem_quota: build the object file conditionally to the config option
Date: Wed, 17 Jul 2024 08:37:27 +0200

Initially I added shmem-quota to obj-y, move it to the correct place and remove the unneeded full file #ifdef

---

 mm/Makefile      |    3 ++-
 mm/shmem_quota.c |    3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)
mm/Makefile renamed from mm/Makefile~shmem_quota-build-the-object-file-conditionally-to-the-config-option +2 -1
@@ -53,7 +53,7 @@ obj-y			:= filemap.o mempool.o oom_kill.
 			   readahead.o swap.o truncate.o vmscan.o shrinker.o \
 			   shmem.o util.o mmzone.o vmstat.o backing-dev.o \
 			   mm_init.o percpu.o slab_common.o \
-			   compaction.o show_mem.o shmem_quota.o\
+			   compaction.o show_mem.o \
 			   interval_tree.o list_lru.o workingset.o \
 			   debug.o gup.o mmap_lock.o $(mmu-y)
 
@@ -141,3 +141,4 @@ obj-$(CONFIG_HAVE_BOOTMEM_INFO_NODE) +=
 obj-$(CONFIG_GENERIC_IOREMAP) += ioremap.o
 obj-$(CONFIG_SHRINKER_DEBUG) += shrinker_debug.o
 obj-$(CONFIG_EXECMEM) += execmem.o
+obj-$(CONFIG_TMPFS_QUOTA) += shmem_quota.o
mm/shmem_quota.c renamed from mm/shmem_quota.c~shmem_quota-build-the-object-file-conditionally-to-the-config-option +0 -3
@@ -34,8 +34,6 @@
 #include <linux/quotaops.h>
 #include <linux/quota.h>
 
-#ifdef CONFIG_TMPFS_QUOTA
-
 /*
  * The following constants define the amount of time given a user
  * before the soft limits are treated as hard limits (usually resulting
@@ -351,4 +349,3 @@ const struct dquot_operations shmem_quot
 	.mark_dirty		= shmem_mark_dquot_dirty,
 	.get_next_id		= shmem_get_next_id,
 };
-#endif /* CONFIG_TMPFS_QUOTA */

_

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