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

Merge branch 'akpm' (patches from Andrew) 

Merge fixes from Andrew Morton:
 "10 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  drivers/pinctrl/intel/pinctrl-baytrail.c: fix build with gcc-4.4
  update "mm/zsmalloc: don't fail if can't create debugfs info"
  dma-debug: avoid spinlock recursion when disabling dma-debug
  mm: oom_reaper: remove some bloat
  memcg: fix mem_cgroup_out_of_memory() return value.
  ocfs2: fix improper handling of return errno
  mm: slub: remove unused virt_to_obj()
  mm: kasan: remove unused 'reserved' field from struct kasan_alloc_meta
  mm: make CONFIG_DEFERRED_STRUCT_PAGE_INIT depends on !FLATMEM explicitly
  seqlock: fix raw_read_seqcount_latch()
parents 478a1469 bbccb9c7

drivers/pinctrl/intel/pinctrl-baytrail.c

+7 −3
Original line number Diff line number Diff line
@@ -154,7 +154,9 @@ struct byt_community { 
		.pins			= (p),			\

		.npins			= ARRAY_SIZE((p)),	\

		.has_simple_funcs	= 1,			\

		{						\

			.simple_funcs		= (f),		\

		},						\

		.nfuncs			= ARRAY_SIZE((f)),	\

	}

#define PIN_GROUP_MIXED(n, p, f)				\
@@ -163,7 +165,9 @@ struct byt_community { 
		.pins			= (p),			\

		.npins			= ARRAY_SIZE((p)),	\

		.has_simple_funcs	= 0,			\

		{						\

			.mixed_funcs		= (f),		\

		},						\

		.nfuncs			= ARRAY_SIZE((f)),	\

	}

fs/ocfs2/inode.c

+1 −6
Original line number Diff line number Diff line
@@ -176,12 +176,7 @@ struct inode *ocfs2_iget(struct ocfs2_super *osb, u64 blkno, unsigned flags, 
	}

	if (is_bad_inode(inode)) {

		iput(inode);

		if ((flags & OCFS2_FI_FLAG_FILECHECK_CHK) ||

		    (flags & OCFS2_FI_FLAG_FILECHECK_FIX))

			/* Return OCFS2_FILECHECK_ERR_XXX related errno */

		inode = ERR_PTR(rc);

		else

			inode = ERR_PTR(-ESTALE);

		goto bail;

	}

include/linux/mm_types.h

+2 −0
Original line number Diff line number Diff line
@@ -514,7 +514,9 @@ struct mm_struct { 
#ifdef CONFIG_HUGETLB_PAGE

	atomic_long_t hugetlb_usage;

#endif

#ifdef CONFIG_MMU

	struct work_struct async_put_work;

#endif

};



static inline void mm_init_cpumask(struct mm_struct *mm)

include/linux/sched.h

+3 −1
Original line number Diff line number Diff line
@@ -2745,10 +2745,12 @@ static inline bool mmget_not_zero(struct mm_struct *mm) 


/* mmput gets rid of the mappings and all user-space */

extern void mmput(struct mm_struct *);

/* same as above but performs the slow path from the async kontext. Can

#ifdef CONFIG_MMU

/* same as above but performs the slow path from the async context. Can

 * be called from the atomic context as well

 */

extern void mmput_async(struct mm_struct *);

#endif



/* Grab a reference to a task's mm, if it is not already going away */

extern struct mm_struct *get_task_mm(struct task_struct *task);

include/linux/seqlock.h

+2 −2
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static inline void raw_write_seqcount_barrier(seqcount_t *s) 


static inline int raw_read_seqcount_latch(seqcount_t *s)

{

	return lockless_dereference(s->sequence);

	return lockless_dereference(s)->sequence;

}



/**
@@ -331,7 +331,7 @@ static inline int raw_read_seqcount_latch(seqcount_t *s) 
 *	unsigned seq, idx;

 *

 *	do {

 *		seq = lockless_dereference(latch->seq);

 *		seq = lockless_dereference(latch)->seq;

 *

 *		idx = seq & 0x01;

 *		entry = data_query(latch->data[idx], ...);

CRA Git | Maintained and supported by SUSTech CRA and CCSE