Commit 50a53bbe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (Fixes from Andrew) 

Merge misc fixes from Andrew Morton:
 "Seven fixes, some of them fingers-crossed :("

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (7 patches)
  drivers/rtc/rtc-tps65910.c: fix invalid pointer access on _remove()
  mm: soft offline: split thp at the beginning of soft_offline_page()
  mm: avoid waking kswapd for THP allocations when compaction is deferred or contended
  revert "Revert "mm: remove __GFP_NO_KSWAPD""
  mm: vmscan: fix endless loop in kswapd balancing
  mm/vmemmap: fix wrong use of virt_to_page
  mm: compaction: fix return value of capture_free_page()
parents 73efd00d 1430e178

drivers/mtd/mtdcore.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -1077,8 +1077,7 @@ EXPORT_SYMBOL_GPL(mtd_writev); 
 * until the request succeeds or until the allocation size falls below

 * until the request succeeds or until the allocation size falls below

 * the system page size. This attempts to make sure it does not adversely

 * the system page size. This attempts to make sure it does not adversely

 * impact system performance, so when allocating more than one page, we

 * impact system performance, so when allocating more than one page, we

 * ask the memory allocator to avoid re-trying, swapping, writing back

 * ask the memory allocator to avoid re-trying.

 * or performing I/O.

 *

 *

 * Note, this function also makes sure that the allocated buffer is aligned to

 * Note, this function also makes sure that the allocated buffer is aligned to

 * the MTD device's min. I/O unit, i.e. the "mtd->writesize" value.

 * the MTD device's min. I/O unit, i.e. the "mtd->writesize" value.
@@ -1092,8 +1091,7 @@ EXPORT_SYMBOL_GPL(mtd_writev); 
 */

 */

void *mtd_kmalloc_up_to(const struct mtd_info *mtd, size_t *size)

void *mtd_kmalloc_up_to(const struct mtd_info *mtd, size_t *size)

{

{

	gfp_t flags = __GFP_NOWARN | __GFP_WAIT |

	gfp_t flags = __GFP_NOWARN | __GFP_WAIT | __GFP_NORETRY;

		       __GFP_NORETRY | __GFP_NO_KSWAPD;

	size_t min_alloc = max_t(size_t, mtd->writesize, PAGE_SIZE);

	size_t min_alloc = max_t(size_t, mtd->writesize, PAGE_SIZE);

	void *kbuf;

	void *kbuf;

drivers/rtc/rtc-tps65910.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -288,11 +288,11 @@ static int __devinit tps65910_rtc_probe(struct platform_device *pdev) 
static int __devexit tps65910_rtc_remove(struct platform_device *pdev)

static int __devexit tps65910_rtc_remove(struct platform_device *pdev)

{

{

	/* leave rtc running, but disable irqs */

	/* leave rtc running, but disable irqs */

	struct rtc_device *rtc = platform_get_drvdata(pdev);

	struct tps65910_rtc *tps_rtc = platform_get_drvdata(pdev);





	tps65910_rtc_alarm_irq_enable(&rtc->dev, 0);

	tps65910_rtc_alarm_irq_enable(&pdev->dev, 0);





	rtc_device_unregister(rtc);

	rtc_device_unregister(tps_rtc->rtc);

	return 0;

	return 0;

}

}

include/linux/gfp.h

+5 −8
Original line number Original line Diff line number Diff line
@@ -30,10 +30,9 @@ struct vm_area_struct; 
#define ___GFP_HARDWALL		0x20000u

#define ___GFP_HARDWALL		0x20000u

#define ___GFP_THISNODE		0x40000u

#define ___GFP_THISNODE		0x40000u

#define ___GFP_RECLAIMABLE	0x80000u

#define ___GFP_RECLAIMABLE	0x80000u

#define ___GFP_NOTRACK		0x200000u

#define ___GFP_NOTRACK		0x100000u

#define ___GFP_NO_KSWAPD	0x400000u

#define ___GFP_OTHER_NODE	0x200000u

#define ___GFP_OTHER_NODE	0x800000u

#define ___GFP_WRITE		0x400000u

#define ___GFP_WRITE		0x1000000u





/*

/*

 * GFP bitmasks..

 * GFP bitmasks..
@@ -86,7 +85,6 @@ struct vm_area_struct; 
#define __GFP_RECLAIMABLE ((__force gfp_t)___GFP_RECLAIMABLE) /* Page is reclaimable */

#define __GFP_RECLAIMABLE ((__force gfp_t)___GFP_RECLAIMABLE) /* Page is reclaimable */

#define __GFP_NOTRACK	((__force gfp_t)___GFP_NOTRACK)  /* Don't track with kmemcheck */

#define __GFP_NOTRACK	((__force gfp_t)___GFP_NOTRACK)  /* Don't track with kmemcheck */





#define __GFP_NO_KSWAPD	((__force gfp_t)___GFP_NO_KSWAPD)

#define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */

#define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */

#define __GFP_WRITE	((__force gfp_t)___GFP_WRITE)	/* Allocator intends to dirty page */

#define __GFP_WRITE	((__force gfp_t)___GFP_WRITE)	/* Allocator intends to dirty page */
@@ -96,7 +94,7 @@ struct vm_area_struct; 
 */

 */

#define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)

#define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)





#define __GFP_BITS_SHIFT 25	/* Room for N __GFP_FOO bits */

#define __GFP_BITS_SHIFT 23	/* Room for N __GFP_FOO bits */

#define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))

#define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))





/* This equals 0, but use constants in case they ever change */

/* This equals 0, but use constants in case they ever change */
@@ -116,8 +114,7 @@ struct vm_area_struct; 
				 __GFP_MOVABLE)

				 __GFP_MOVABLE)

#define GFP_IOFS	(__GFP_IO | __GFP_FS)

#define GFP_IOFS	(__GFP_IO | __GFP_FS)

#define GFP_TRANSHUGE	(GFP_HIGHUSER_MOVABLE | __GFP_COMP | \

#define GFP_TRANSHUGE	(GFP_HIGHUSER_MOVABLE | __GFP_COMP | \

			 __GFP_NOMEMALLOC | __GFP_NORETRY | __GFP_NOWARN | \

			 __GFP_NOMEMALLOC | __GFP_NORETRY | __GFP_NOWARN)

			 __GFP_NO_KSWAPD)





#ifdef CONFIG_NUMA

#ifdef CONFIG_NUMA

#define GFP_THISNODE	(__GFP_THISNODE | __GFP_NOWARN | __GFP_NORETRY)

#define GFP_THISNODE	(__GFP_THISNODE | __GFP_NOWARN | __GFP_NORETRY)

include/trace/events/gfpflags.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,6 @@ 
	{(unsigned long)__GFP_RECLAIMABLE,	"GFP_RECLAIMABLE"},	\

	{(unsigned long)__GFP_RECLAIMABLE,	"GFP_RECLAIMABLE"},	\

	{(unsigned long)__GFP_MOVABLE,		"GFP_MOVABLE"},		\

	{(unsigned long)__GFP_MOVABLE,		"GFP_MOVABLE"},		\

	{(unsigned long)__GFP_NOTRACK,		"GFP_NOTRACK"},		\

	{(unsigned long)__GFP_NOTRACK,		"GFP_NOTRACK"},		\

	{(unsigned long)__GFP_NO_KSWAPD,	"GFP_NO_KSWAPD"},	\

	{(unsigned long)__GFP_OTHER_NODE,	"GFP_OTHER_NODE"}	\

	{(unsigned long)__GFP_OTHER_NODE,	"GFP_OTHER_NODE"}	\

	) : "GFP_NOWAIT"

	) : "GFP_NOWAIT"

mm/memory-failure.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -1476,9 +1476,17 @@ int soft_offline_page(struct page *page, int flags) 
{

{

	int ret;

	int ret;

	unsigned long pfn = page_to_pfn(page);

	unsigned long pfn = page_to_pfn(page);

	struct page *hpage = compound_trans_head(page);





	if (PageHuge(page))

	if (PageHuge(page))

		return soft_offline_huge_page(page, flags);

		return soft_offline_huge_page(page, flags);

	if (PageTransHuge(hpage)) {

		if (PageAnon(hpage) && unlikely(split_huge_page(hpage))) {

			pr_info("soft offline: %#lx: failed to split THP\n",

				pfn);

			return -EBUSY;

		}

	}





	ret = get_any_page(page, pfn, flags);

	ret = get_any_page(page, pfn, flags);

	if (ret < 0)

	if (ret < 0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE