The patch titled
Subject: linux-next-rejects
has been removed from the -mm tree. Its filename was
linux-next-rejects.patch
This patch was dropped because it is obsolete
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/md/bcache/Kconfig | 2 +-
fs/proc/kcore.c | 4 +++-
include/linux/kcore.h | 10 ++++++++++
3 files changed, 14 insertions(+), 2 deletions(-)
diff -puN drivers/md/bcache/Kconfig~linux-next-rejects drivers/md/bcache/Kconfig
--- a/drivers/md/bcache/Kconfig~linux-next-rejects
+++ a/drivers/md/bcache/Kconfig
@@ -2,7 +2,7 @@
config BCACHE
tristate "Block device as cache"
select CRC64
- ---help---
+ help
Allows a block device to be used as cache for other devices; uses
a btree for indexing and the layout is optimized for SSDs.
diff -puN fs/proc/kcore.c~linux-next-rejects fs/proc/kcore.c
--- a/fs/proc/kcore.c~linux-next-rejects
+++ a/fs/proc/kcore.c
@@ -360,7 +360,9 @@ read_kcore(struct file *file, char __use
phdr->p_flags = PF_R | PF_W | PF_X;
phdr->p_offset = kc_vaddr_to_offset(m->addr) + data_offset;
phdr->p_vaddr = (size_t)m->addr;
- if (m->type == KCORE_RAM)
+ if (m->type == KCORE_REMAP)
+ phdr->p_vaddr = (size_t)m->vaddr;
+ else if (m->type == KCORE_RAM)
phdr->p_paddr = __pa(m->addr);
else if (m->type == KCORE_TEXT)
phdr->p_paddr = __pa_symbol(m->addr);
diff -puN include/linux/kcore.h~linux-next-rejects include/linux/kcore.h
--- a/include/linux/kcore.h~linux-next-rejects
+++ a/include/linux/kcore.h
@@ -38,11 +38,21 @@ struct vmcoredd_node {
#ifdef CONFIG_PROC_KCORE
void __init kclist_add(struct kcore_list *, void *, size_t, int type);
+static inline
+void kclist_add_remap(struct kcore_list *m, void *addr, void *vaddr, size_t sz)
+{
+ m->vaddr = (unsigned long)vaddr;
+ kclist_add(m, addr, sz, KCORE_REMAP);
+}
#else
static inline
void kclist_add(struct kcore_list *new, void *addr, size_t size, int type)
{
}
+static inline
+void kclist_add_remap(struct kcore_list *m, void *addr, void *vaddr, size_t sz)
+{
+}
#endif
#endif /* _LINUX_KCORE_H */
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
mm-page_alloc-reduce-unnecessary-binary-search-in-memblock_next_valid_pfn-fix.patch
mm-page_alloc-reduce-unnecessary-binary-search-in-memblock_next_valid_pfn-fix-fix.patch
mm-memblock-introduce-memblock_search_pfn_regions-fix.patch
mm-soft-offline-close-the-race-against-page-allocation-fix.patch
mm-calculate-deferred-pages-after-skipping-mirrored-memory-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
linux-next-git-rejects.patch
mm-change-return-type-int-to-vm_fault_t-for-fault-handlers-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
