Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2197649 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "15 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  scripts/gdb: make lx-dmesg command work (reliably)
  mm: consider memblock reservations for deferred memory initialization sizing
  mm/hugetlb: report -EHWPOISON not -EFAULT when FOLL_HWPOISON is specified
  mlock: fix mlock count can not decrease in race condition
  mm/migrate: fix refcount handling when !hugepage_migration_supported()
  dax: fix race between colliding PMD & PTE entries
  mm: avoid spurious 'bad pmd' warning messages
  mm/page_alloc.c: make sure OOM victim can try allocations with no watermarks once
  pcmcia: remove left-over %Z format
  slub/memcg: cure the brainless abuse of sysfs attributes
  initramfs: fix disabling of initramfs (and its compression)
  mm: clarify why we want kmalloc before falling backto vmallock
  frv: declare jiffies to be located in the .data section
  include/linux/gfp.h: fix ___GFP_NOLOCKDEP value
  ksm: prevent crash after write_protect_page fails
parents e6e6d074 d6c97087

arch/frv/include/asm/timex.h

+6 −0
Original line number Diff line number Diff line
@@ -16,5 +16,11 @@ static inline cycles_t get_cycles(void) 
#define vxtime_lock()		do {} while (0)

#define vxtime_unlock()		do {} while (0)



/* This attribute is used in include/linux/jiffies.h alongside with

 * __cacheline_aligned_in_smp. It is assumed that __cacheline_aligned_in_smp

 * for frv does not contain another section specification.

 */

#define __jiffy_arch_data	__attribute__((__section__(".data")))



#endif

drivers/char/pcmcia/cm4040_cs.c

+3 −3
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ static ssize_t cm4040_write(struct file *filp, const char __user *buf, 


	rc = write_sync_reg(SCR_HOST_TO_READER_START, dev);

	if (rc <= 0) {

		DEBUGP(5, dev, "write_sync_reg c=%.2Zx\n", rc);

		DEBUGP(5, dev, "write_sync_reg c=%.2zx\n", rc);

		DEBUGP(2, dev, "<- cm4040_write (failed)\n");

		if (rc == -ERESTARTSYS)

			return rc;
@@ -387,7 +387,7 @@ static ssize_t cm4040_write(struct file *filp, const char __user *buf, 
	for (i = 0; i < bytes_to_write; i++) {

		rc = wait_for_bulk_out_ready(dev);

		if (rc <= 0) {

			DEBUGP(5, dev, "wait_for_bulk_out_ready rc=%.2Zx\n",

			DEBUGP(5, dev, "wait_for_bulk_out_ready rc=%.2zx\n",

			       rc);

			DEBUGP(2, dev, "<- cm4040_write (failed)\n");

			if (rc == -ERESTARTSYS)
@@ -403,7 +403,7 @@ static ssize_t cm4040_write(struct file *filp, const char __user *buf, 
	rc = write_sync_reg(SCR_HOST_TO_READER_DONE, dev);



	if (rc <= 0) {

		DEBUGP(5, dev, "write_sync_reg c=%.2Zx\n", rc);

		DEBUGP(5, dev, "write_sync_reg c=%.2zx\n", rc);

		DEBUGP(2, dev, "<- cm4040_write (failed)\n");

		if (rc == -ERESTARTSYS)

			return rc;

fs/dax.c

+23 −0
Original line number Diff line number Diff line
@@ -1154,6 +1154,17 @@ static int dax_iomap_pte_fault(struct vm_fault *vmf, 
		goto out;

	}



	/*

	 * It is possible, particularly with mixed reads & writes to private

	 * mappings, that we have raced with a PMD fault that overlaps with

	 * the PTE we need to set up.  If so just return and the fault will be

	 * retried.

	 */

	if (pmd_trans_huge(*vmf->pmd) || pmd_devmap(*vmf->pmd)) {

		vmf_ret = VM_FAULT_NOPAGE;

		goto unlock_entry;

	}



	/*

	 * Note that we don't bother to use iomap_apply here: DAX required

	 * the file system block size to be equal the page size, which means
@@ -1397,6 +1408,18 @@ static int dax_iomap_pmd_fault(struct vm_fault *vmf, 
	if (IS_ERR(entry))

		goto fallback;



	/*

	 * It is possible, particularly with mixed reads & writes to private

	 * mappings, that we have raced with a PTE fault that overlaps with

	 * the PMD we need to set up.  If so just return and the fault will be

	 * retried.

	 */

	if (!pmd_none(*vmf->pmd) && !pmd_trans_huge(*vmf->pmd) &&

			!pmd_devmap(*vmf->pmd)) {

		result = 0;

		goto unlock_entry;

	}



	/*

	 * Note that we don't use iomap_apply here.  We aren't doing I/O, only

	 * setting up a mapping, so really we're using iomap_begin() as a way

include/linux/gfp.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ struct vm_area_struct; 
#define ___GFP_WRITE		0x800000u

#define ___GFP_KSWAPD_RECLAIM	0x1000000u

#ifdef CONFIG_LOCKDEP

#define ___GFP_NOLOCKDEP	0x4000000u

#define ___GFP_NOLOCKDEP	0x2000000u

#else

#define ___GFP_NOLOCKDEP	0

#endif

include/linux/jiffies.h

+5 −1
Original line number Diff line number Diff line
@@ -64,13 +64,17 @@ extern int register_refined_jiffies(long clock_tick_rate); 
/* TICK_USEC is the time between ticks in usec assuming fake USER_HZ */

#define TICK_USEC ((1000000UL + USER_HZ/2) / USER_HZ)



#ifndef __jiffy_arch_data

#define __jiffy_arch_data

#endif



/*

 * The 64-bit value is not atomic - you MUST NOT read it

 * without sampling the sequence number in jiffies_lock.

 * get_jiffies_64() will do this for you as appropriate.

 */

extern u64 __cacheline_aligned_in_smp jiffies_64;

extern unsigned long volatile __cacheline_aligned_in_smp jiffies;

extern unsigned long volatile __cacheline_aligned_in_smp __jiffy_arch_data jiffies;



#if (BITS_PER_LONG < 64)

u64 get_jiffies_64(void);