Commit 12aee278 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (fixes from Andrew Morton) 

Merge three fixes from Andrew Morton.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  memcg: use __this_cpu_sub() to dec stats to avoid incorrect subtrahend casting
  percpu: fix this_cpu_sub() subtrahend casting for unsigneds
  mm/pagewalk.c: fix walk_page_range() access of wrong PTEs
parents c56b097a 5e8cfc3c

arch/x86/include/asm/percpu.h

+2 −1
Original line number Diff line number Diff line
@@ -128,7 +128,8 @@ do { \ 
do {									\

	typedef typeof(var) pao_T__;					\

	const int pao_ID__ = (__builtin_constant_p(val) &&		\

			      ((val) == 1 || (val) == -1)) ? (val) : 0;	\

			      ((val) == 1 || (val) == -1)) ?		\

				(int)(val) : 0;				\

	if (0) {							\

		pao_T__ pao_tmp__;					\

		pao_tmp__ = (val);					\

include/linux/percpu.h

+4 −4
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ do { \ 
#endif



#ifndef this_cpu_sub

# define this_cpu_sub(pcp, val)		this_cpu_add((pcp), -(val))

# define this_cpu_sub(pcp, val)		this_cpu_add((pcp), -(typeof(pcp))(val))

#endif



#ifndef this_cpu_inc
@@ -418,7 +418,7 @@ do { \ 
# define this_cpu_add_return(pcp, val)	__pcpu_size_call_return2(this_cpu_add_return_, pcp, val)

#endif



#define this_cpu_sub_return(pcp, val)	this_cpu_add_return(pcp, -(val))

#define this_cpu_sub_return(pcp, val)	this_cpu_add_return(pcp, -(typeof(pcp))(val))

#define this_cpu_inc_return(pcp)	this_cpu_add_return(pcp, 1)

#define this_cpu_dec_return(pcp)	this_cpu_add_return(pcp, -1)
@@ -586,7 +586,7 @@ do { \ 
#endif



#ifndef __this_cpu_sub

# define __this_cpu_sub(pcp, val)	__this_cpu_add((pcp), -(val))

# define __this_cpu_sub(pcp, val)	__this_cpu_add((pcp), -(typeof(pcp))(val))

#endif



#ifndef __this_cpu_inc
@@ -668,7 +668,7 @@ do { \ 
	__pcpu_size_call_return2(__this_cpu_add_return_, pcp, val)

#endif



#define __this_cpu_sub_return(pcp, val)	__this_cpu_add_return(pcp, -(val))

#define __this_cpu_sub_return(pcp, val)	__this_cpu_add_return(pcp, -(typeof(pcp))(val))

#define __this_cpu_inc_return(pcp)	__this_cpu_add_return(pcp, 1)

#define __this_cpu_dec_return(pcp)	__this_cpu_add_return(pcp, -1)

mm/memcontrol.c

+1 −1
Original line number Diff line number Diff line
@@ -3774,7 +3774,7 @@ void mem_cgroup_move_account_page_stat(struct mem_cgroup *from, 
	/* Update stat data for mem_cgroup */

	preempt_disable();

	WARN_ON_ONCE(from->stat->count[idx] < nr_pages);

	__this_cpu_add(from->stat->count[idx], -nr_pages);

	__this_cpu_sub(from->stat->count[idx], nr_pages);

	__this_cpu_add(to->stat->count[idx], nr_pages);

	preempt_enable();

}

mm/pagewalk.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ int walk_page_range(unsigned long addr, unsigned long end, 
		if (err)

			break;

		pgd++;

	} while (addr = next, addr != end);

	} while (addr = next, addr < end);



	return err;

}