Commit 866be88a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "9 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm/vmstat: fix overflow in mod_zone_page_state()
  ocfs2/dlm: clear migration_pending when migration target goes down
  mm/memory_hotplug.c: check for missing sections in test_pages_in_a_zone()
  ocfs2: fix flock panic issue
  m32r: add io*_rep helpers
  m32r: fix build failure
  arch/x86/xen/suspend.c: include xen/xen.h
  mm: memcontrol: fix possible memcg leak due to interrupted reclaim
  ocfs2: fix BUG when calculate new backup super
parents e25bd6ca 6cdb18ad

arch/m32r/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ generic-y += clkdev.h 
generic-y += cputime.h

generic-y += exec.h

generic-y += irq_work.h

generic-y += kvm_para.h

generic-y += mcs_spinlock.h

generic-y += mm-arch-hooks.h

generic-y += module.h

arch/m32r/include/asm/io.h

+9 −1
Original line number Diff line number Diff line
@@ -168,13 +168,21 @@ static inline void _writel(unsigned long l, unsigned long addr) 
#define writew_relaxed writew

#define writel_relaxed writel



#define ioread8 read

#define ioread8 readb

#define ioread16 readw

#define ioread32 readl

#define iowrite8 writeb

#define iowrite16 writew

#define iowrite32 writel



#define ioread8_rep(p, dst, count) insb((unsigned long)(p), (dst), (count))

#define ioread16_rep(p, dst, count) insw((unsigned long)(p), (dst), (count))

#define ioread32_rep(p, dst, count) insl((unsigned long)(p), (dst), (count))



#define iowrite8_rep(p, src, count) outsb((unsigned long)(p), (src), (count))

#define iowrite16_rep(p, src, count) outsw((unsigned long)(p), (src), (count))

#define iowrite32_rep(p, src, count) outsl((unsigned long)(p), (src), (count))



#define ioread16be(addr)	be16_to_cpu(readw(addr))

#define ioread32be(addr)	be32_to_cpu(readl(addr))

#define iowrite16be(v, addr)	writew(cpu_to_be16(v), (addr))

arch/x86/xen/suspend.c

+1 −0
Original line number Diff line number Diff line 
#include <linux/types.h>

#include <linux/tick.h>



#include <xen/xen.h>

#include <xen/interface/xen.h>

#include <xen/grant_table.h>

#include <xen/events.h>

fs/ocfs2/dlm/dlmmaster.c

+2 −0
Original line number Diff line number Diff line
@@ -2843,6 +2843,8 @@ again: 
	res->state &= ~DLM_LOCK_RES_BLOCK_DIRTY;

	if (!ret)

		BUG_ON(!(res->state & DLM_LOCK_RES_MIGRATING));

	else

		res->migration_pending = 0;

	spin_unlock(&res->spinlock);



	/*

fs/ocfs2/locks.c

+4 −1
Original line number Diff line number Diff line
@@ -67,7 +67,10 @@ static int ocfs2_do_flock(struct file *file, struct inode *inode, 
		 */



		locks_lock_file_wait(file,

				     &(struct file_lock){.fl_type = F_UNLCK});

				&(struct file_lock) {

					.fl_type = F_UNLCK,

					.fl_flags = FL_FLOCK

				});



		ocfs2_file_unlock(file);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE