Commit 5e608a02 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge fixes from Andrew Morton:
 "11 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: silently skip readahead for DAX inodes
  dax: fix device-dax region base
  fs/seq_file: fix out-of-bounds read
  mm: memcontrol: avoid unused function warning
  mm: clarify COMPACTION Kconfig text
  treewide: replace config_enabled() with IS_ENABLED() (2nd round)
  printk: fix parsing of "brl=" option
  soft_dirty: fix soft_dirty during THP split
  sysctl: handle error writing UINT_MAX to u32 fields
  get_maintainer: quiet noisy implicit -f vcs_file_exists checking
  byteswap: don't use __builtin_bswap*() with sparse
parents 65fc7d54 11bd969f

arch/mips/include/asm/page.h

+2 −2
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ typedef struct { unsigned long pgprot; } pgprot_t; 
 */

static inline unsigned long ___pa(unsigned long x)

{

	if (config_enabled(CONFIG_64BIT)) {

	if (IS_ENABLED(CONFIG_64BIT)) {

		/*

		 * For MIPS64 the virtual address may either be in one of

		 * the compatibility segements ckseg0 or ckseg1, or it may
@@ -173,7 +173,7 @@ static inline unsigned long ___pa(unsigned long x) 
		return x < CKSEG0 ? XPHYSADDR(x) : CPHYSADDR(x);

	}



	if (!config_enabled(CONFIG_EVA)) {

	if (!IS_ENABLED(CONFIG_EVA)) {

		/*

		 * We're using the standard MIPS32 legacy memory map, ie.

		 * the address x is going to be in kseg0 or kseg1. We can

arch/s390/kernel/setup.c

+2 −4
Original line number Diff line number Diff line
@@ -204,11 +204,9 @@ static void __init conmode_default(void) 
#endif

		}

	} else if (MACHINE_IS_KVM) {

		if (sclp.has_vt220 &&

		    config_enabled(CONFIG_SCLP_VT220_CONSOLE))

		if (sclp.has_vt220 && IS_ENABLED(CONFIG_SCLP_VT220_CONSOLE))

			SET_CONSOLE_VT220;

		else if (sclp.has_linemode &&

			 config_enabled(CONFIG_SCLP_CONSOLE))

		else if (sclp.has_linemode && IS_ENABLED(CONFIG_SCLP_CONSOLE))

			SET_CONSOLE_SCLP;

		else

			SET_CONSOLE_HVC;

arch/x86/mm/kaslr.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static inline unsigned long get_padding(struct kaslr_memory_region *region) 
 */

static inline bool kaslr_memory_enabled(void)

{

	return kaslr_enabled() && !config_enabled(CONFIG_KASAN);

	return kaslr_enabled() && !IS_ENABLED(CONFIG_KASAN);

}



/* Initialize base and padding for each memory region randomized with KASLR */

drivers/dax/pmem.c

+3 −0
Original line number Diff line number Diff line
@@ -116,6 +116,9 @@ static int dax_pmem_probe(struct device *dev) 
	if (rc)

		return rc;



	/* adjust the dax_region resource to the start of data */

	res.start += le64_to_cpu(pfn_sb->dataoff);



	nd_region = to_nd_region(dev->parent);

	dax_region = alloc_dax_region(dev, nd_region->id, &res,

			le32_to_cpu(pfn_sb->align), addr, PFN_DEV|PFN_MAP);

fs/seq_file.c

+3 −1
Original line number Diff line number Diff line
@@ -223,8 +223,10 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos) 
		size -= n;

		buf += n;

		copied += n;

		if (!m->count)

		if (!m->count) {

			m->from = 0;

			m->index++;

		}

		if (!size)

			goto Done;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE