The patch titled
Subject: proc: fix BUILD_BUG_ON breakage on powerpc64-allyesconfig
has been removed from the -mm tree. Its filename was
proc-fixup-pde-allocation-bloat-fix.patch
This patch was dropped because it was folded into proc-fixup-pde-allocation-bloat.patch
------------------------------------------------------
From: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Subject: proc: fix BUILD_BUG_ON breakage on powerpc64-allyesconfig
Link: http://lkml.kernel.org/r/20180703191602.GA25521@avx2
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/proc/internal.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
--- a/fs/proc/internal.h~proc-fixup-pde-allocation-bloat-fix
+++ a/fs/proc/internal.h
@@ -65,12 +65,12 @@ struct proc_dir_entry {
char inline_name[];
} __randomize_layout;
-#ifdef CONFIG_64BIT
-#define SIZEOF_PDE (sizeof(spinlock_t) <= 4 ? 192 : 256)
-#else
-#define SIZEOF_PDE (sizeof(spinlock_t) <= 4 ? 128 : 192)
-#endif
-
+#define SIZEOF_PDE ( \
+ sizeof(struct proc_dir_entry) < 128 ? 128 : \
+ sizeof(struct proc_dir_entry) < 192 ? 192 : \
+ sizeof(struct proc_dir_entry) < 256 ? 256 : \
+ sizeof(struct proc_dir_entry) < 512 ? 512 : \
+ 0)
#define SIZEOF_PDE_INLINE_NAME (SIZEOF_PDE - sizeof(struct proc_dir_entry))
extern struct kmem_cache *proc_dir_entry_cache;
_
Patches currently in -mm which might be from adobriyan@xxxxxxxxx are
proc-fixup-pde-allocation-bloat.patch
proc-test-proc-self-symlink.patch
proc-test-proc-thread-self-symlink.patch
proc-smaller-readlock-section-in-readdir-proc.patch
proc-put-task-earlier-in-proc-fail-nth.patch
proc-save-2-atomic-ops-on-write-to-proc-attr.patch
proc-use-macro-in-proc-latency-hook.patch
proc-spread-const-a-bit.patch
proc-use-unsigned-int-in-proc-stat-hook.patch
