Subject: [folded-merged] slub-use-sysfses-release-mechanism-for-kmem_cache-fix-fix.patch removed from -mm tree To: akpm@xxxxxxxxxxxxxxxxxxxx,bvanassche@xxxxxxx,cl@xxxxxxxxx,greg@xxxxxxxxx,penberg@xxxxxxxxxx,rmk@xxxxxxxxxxxxxxxx,sasha.levin@xxxxxxxxxx,tglx@xxxxxxxxxxxxx,viro@xxxxxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 05 May 2014 13:48:49 -0700 The patch titled Subject: slub-use-sysfses-release-mechanism-for-kmem_cache-fix-fix has been removed from the -mm tree. Its filename was slub-use-sysfses-release-mechanism-for-kmem_cache-fix-fix.patch This patch was dropped because it was folded into slub-use-sysfses-release-mechanism-for-kmem_cache.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: slub-use-sysfses-release-mechanism-for-kmem_cache-fix-fix fix CONFIG_SYSFS=n build even more Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Bart Van Assche <bvanassche@xxxxxxx> Cc: Christoph Lameter <cl@xxxxxxxxx> Cc: Greg KH <greg@xxxxxxxxx> Cc: Pekka Enberg <penberg@xxxxxxxxxx> Cc: Russell King <rmk@xxxxxxxxxxxxxxxx> Cc: Sasha Levin <sasha.levin@xxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/slub_def.h | 5 +++++ mm/slab.h | 1 - mm/slub.c | 2 -- 3 files changed, 5 insertions(+), 3 deletions(-) diff -puN include/linux/slub_def.h~slub-use-sysfses-release-mechanism-for-kmem_cache-fix-fix include/linux/slub_def.h --- a/include/linux/slub_def.h~slub-use-sysfses-release-mechanism-for-kmem_cache-fix-fix +++ a/include/linux/slub_def.h @@ -103,6 +103,11 @@ struct kmem_cache { #ifdef CONFIG_SYSFS #define SLAB_SUPPORTS_SYSFS +void sysfs_slab_remove(struct kmem_cache *); +#else +static inline void sysfs_slab_remove(struct kmem_cache *s) +{ +} #endif #endif /* _LINUX_SLUB_DEF_H */ diff -puN mm/slab.h~slub-use-sysfses-release-mechanism-for-kmem_cache-fix-fix mm/slab.h --- a/mm/slab.h~slub-use-sysfses-release-mechanism-for-kmem_cache-fix-fix +++ a/mm/slab.h @@ -57,7 +57,6 @@ struct mem_cgroup; struct kmem_cache * __kmem_cache_alias(const char *name, size_t size, size_t align, unsigned long flags, void (*ctor)(void *)); -void sysfs_slab_remove(struct kmem_cache *); #else static inline struct kmem_cache * __kmem_cache_alias(const char *name, size_t size, size_t align, diff -puN mm/slub.c~slub-use-sysfses-release-mechanism-for-kmem_cache-fix-fix mm/slub.c --- a/mm/slub.c~slub-use-sysfses-release-mechanism-for-kmem_cache-fix-fix +++ a/mm/slub.c @@ -215,8 +215,6 @@ static void memcg_propagate_slab_attrs(s static inline int sysfs_slab_add(struct kmem_cache *s) { return 0; } static inline int sysfs_slab_alias(struct kmem_cache *s, const char *p) { return 0; } -static inline void sysfs_slab_remove(struct kmem_cache *s) { } - static inline void memcg_propagate_slab_attrs(struct kmem_cache *s) { } #endif _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are arch-alpha-kernel-systblss-remove-debug-check.patch i-need-old-gcc.patch maintainers-akpm-maintenance.patch hugetlb-ensure-hugepage-access-is-denied-if-hugepages-are-not-supported-fix.patch hugetlb-ensure-hugepage-access-is-denied-if-hugepages-are-not-supported-fix-fix.patch slub-use-sysfses-release-mechanism-for-kmem_cache.patch input-route-kbd-leds-through-the-generic-leds-layer.patch ocfs2-limit-printk-when-journal-is-aborted-fix.patch ocfs2-do-not-return-dlm_migrate_response_mastery_ref-to-avoid-endlessloop-during-umount.patch mm.patch mm-hugetlbfs-fix-rmapping-for-anonymous-hugepages-with-page_pgoff-v3-fix.patch pagewalk-update-page-table-walker-core-fix-end-address-calculation-in-walk_page_range-fix.patch pagemap-redefine-callback-functions-for-page-table-walker-fix.patch pagewalk-remove-argument-hmask-from-hugetlb_entry-fix-fix.patch mm-introduce-do_shared_fault-and-drop-do_fault-fix-fix.patch mm-compactionc-isolate_freepages_block-small-tuneup.patch mm-huge_memoryc-complete-conversion-to-pr_foo.patch include-linux-mmdebugh-add-vm_warn_on-and-vm_warn_on_once.patch mm-mempool-warn-about-__gfp_zero-usage-fix.patch mm-pass-vm_bug_on-reason-to-dump_page-fix.patch hugetlb-add-support-for-gigantic-page-allocation-at-runtime-checkpatch-fixes.patch mm-page_alloc-do-not-cache-reclaim-distances-fix.patch fs-hugetlbfs-inodec-complete-conversion-to-pr_foo.patch mm-compaction-cleanup-isolate_freepages-fix.patch arc-call-find_vma-with-the-mmap_sem-held-fix.patch mm-vmscan-do-not-throttle-based-on-pfmemalloc-reserves-if-node-has-no-zone_normal-checkpatch-fixes.patch swap-use-bdev_read_page-bdev_write_page-fix.patch do_shared_fault-check-that-mmap_sem-is-held.patch printk-release-lockbuf_lock-before-calling-console_trylock_for_printk-fix.patch init-mainc-dont-use-pr_debug.patch init-mainc-add-initcall_blacklist-kernel-parameter-fix.patch rtc-rtc-cmos-drivers-char-rtcc-features-for-decstation-support-fix.patch hfsplus-fixes-worst-case-unicode-to-char-conversion-of-file-names-and-attributes-fix.patch hfsplus-correct-usage-of-hfsplus_attr_max_strlen-for-non-english-attributes-fix.patch hfsplus-correct-usage-of-hfsplus_attr_max_strlen-for-non-english-attributes-fix-2.patch fs-pstore-logging-clean-up-fix.patch linux-next.patch linux-next-rejects.patch drivers-gpio-gpio-zevioc-fix-build.patch mm-page_ioc-work-around-gcc-bug.patch kernel-watchdogc-print-traces-for-all-cpus-on-lockup-detection-fix.patch ufs-sb-mutex-merge-mutex_destroy.patch debugging-keep-track-of-page-owners.patch journal_add_journal_head-debug.patch journal_add_journal_head-debug-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch mutex-subsystem-synchro-test-module.patch slab-leaks3-default-y.patch put_bh-debug.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