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

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "16 patches.

  Subsystems affected by this patch series: xtensa, sh, ocfs2, scripts,
  lib, and mm (memory-failure, kasan, damon, shmem, tools, pagecache,
  debug, and pagemap)"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: fix uninitialized use in overcommit_policy_handler
  mm/memory_failure: fix the missing pte_unmap() call
  kasan: always respect CONFIG_KASAN_STACK
  sh: pgtable-3level: fix cast to pointer from integer of different size
  mm/debug: sync up latest migrate_reason to migrate_reason_names
  mm/debug: sync up MR_CONTIG_RANGE and MR_LONGTERM_PIN
  mm: fs: invalidate bh_lrus for only cold path
  lib/zlib_inflate/inffast: check config in C to avoid unused function warning
  tools/vm/page-types: remove dependency on opt_file for idle page tracking
  scripts/sorttable: riscv: fix undeclared identifier 'EM_RISCV' error
  ocfs2: drop acl cache for directories too
  mm/shmem.c: fix judgment error in shmem_is_huge()
  xtensa: increase size of gcc stack frame check
  mm/damon: don't use strnlen() with known-bogus source length
  kasan: fix Kconfig check of CC_HAS_WORKING_NOSANITIZE_ADDRESS
  mm, hwpoison: add is_free_buddy_page() in HWPoisonHandlable()
parents bb19237b bcbda810

arch/sh/include/asm/pgtable-3level.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ typedef struct { unsigned long long pmd; } pmd_t; 


static inline pmd_t *pud_pgtable(pud_t pud)

{

	return (pmd_t *)pud_val(pud);

	return (pmd_t *)(unsigned long)pud_val(pud);

}



/* only used by the stubbed out hugetlb gup code, should never be called */

fs/buffer.c

+6 −2
Original line number Diff line number Diff line
@@ -1425,12 +1425,16 @@ void invalidate_bh_lrus(void) 
}

EXPORT_SYMBOL_GPL(invalidate_bh_lrus);



void invalidate_bh_lrus_cpu(int cpu)

/*

 * It's called from workqueue context so we need a bh_lru_lock to close

 * the race with preemption/irq.

 */

void invalidate_bh_lrus_cpu(void)

{

	struct bh_lru *b;



	bh_lru_lock();

	b = per_cpu_ptr(&bh_lrus, cpu);

	b = this_cpu_ptr(&bh_lrus);

	__invalidate_bh_lrus(b);

	bh_lru_unlock();

}

fs/ocfs2/dlmglue.c

+2 −1
Original line number Diff line number Diff line
@@ -3951,7 +3951,7 @@ static int ocfs2_data_convert_worker(struct ocfs2_lock_res *lockres, 
		oi = OCFS2_I(inode);

		oi->ip_dir_lock_gen++;

		mlog(0, "generation: %u\n", oi->ip_dir_lock_gen);

		goto out;

		goto out_forget;

	}



	if (!S_ISREG(inode->i_mode))
@@ -3982,6 +3982,7 @@ static int ocfs2_data_convert_worker(struct ocfs2_lock_res *lockres, 
		filemap_fdatawait(mapping);

	}



out_forget:

	forget_all_cached_acls(inode);



out:

include/linux/buffer_head.h

+2 −2
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ void __breadahead_gfp(struct block_device *, sector_t block, unsigned int size, 
struct buffer_head *__bread_gfp(struct block_device *,

				sector_t block, unsigned size, gfp_t gfp);

void invalidate_bh_lrus(void);

void invalidate_bh_lrus_cpu(int cpu);

void invalidate_bh_lrus_cpu(void);

bool has_bh_in_lru(int cpu, void *dummy);

struct buffer_head *alloc_buffer_head(gfp_t gfp_flags);

void free_buffer_head(struct buffer_head * bh);
@@ -408,7 +408,7 @@ static inline int inode_has_buffers(struct inode *inode) { return 0; } 
static inline void invalidate_inode_buffers(struct inode *inode) {}

static inline int remove_inode_buffers(struct inode *inode) { return 1; }

static inline int sync_mapping_buffers(struct address_space *mapping) { return 0; }

static inline void invalidate_bh_lrus_cpu(int cpu) {}

static inline void invalidate_bh_lrus_cpu(void) {}

static inline bool has_bh_in_lru(int cpu, void *dummy) { return false; }

#define buffer_heads_over_limit 0

include/linux/migrate.h

+5 −1
Original line number Diff line number Diff line
@@ -19,6 +19,11 @@ struct migration_target_control; 
 */

#define MIGRATEPAGE_SUCCESS		0



/*

 * Keep sync with:

 * - macro MIGRATE_REASON in include/trace/events/migrate.h

 * - migrate_reason_names[MR_TYPES] in mm/debug.c

 */

enum migrate_reason {

	MR_COMPACTION,

	MR_MEMORY_FAILURE,
@@ -32,7 +37,6 @@ enum migrate_reason { 
	MR_TYPES

};



/* In mm/debug.c; also keep sync with include/trace/events/migrate.h */

extern const char *migrate_reason_names[MR_TYPES];



#ifdef CONFIG_MIGRATION