Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "13 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  memcg: disable hierarchy support if bound to the legacy cgroup hierarchy
  mm: reorder can_do_mlock to fix audit denial
  kasan, module: move MODULE_ALIGN macro into <linux/moduleloader.h>
  kasan, module, vmalloc: rework shadow allocation for modules
  fanotify: fix event filtering with FAN_ONDIR set
  mm/nommu.c: export symbol max_mapnr
  arch/c6x/include/asm/pgtable.h: define dummy pgprot_writecombine for !MMU
  nilfs2: fix deadlock of segment constructor during recovery
  mm: cma: fix CMA aligned offset calculation
  mm, hugetlb: close race when setting PageTail for gigantic pages
  mm, oom: do not fail __GFP_NOFAIL allocation if oom killer is disabled
  drivers/rtc/rtc-s3c.c: add .needs_src_clk to s3c6410 RTC data
  ocfs2: make append_dio an incompat feature
parents ba68bc01 7feee590

arch/c6x/include/asm/pgtable.h

+5 −0
Original line number Diff line number Diff line
@@ -67,6 +67,11 @@ extern unsigned long empty_zero_page; 
 */

#define pgtable_cache_init()   do { } while (0)



/*

 * c6x is !MMU, so define the simpliest implementation

 */

#define pgprot_writecombine pgprot_noncached



#include <asm-generic/pgtable.h>



#endif /* _ASM_C6X_PGTABLE_H */

drivers/rtc/rtc-s3c.c

+1 −0
Original line number Diff line number Diff line
@@ -849,6 +849,7 @@ static struct s3c_rtc_data const s3c2443_rtc_data = { 


static struct s3c_rtc_data const s3c6410_rtc_data = {

	.max_user_freq		= 32768,

	.needs_src_clk		= true,

	.irq_handler		= s3c6410_rtc_irq,

	.set_freq		= s3c6410_rtc_setfreq,

	.enable_tick		= s3c6410_rtc_enable_tick,

fs/nilfs2/segment.c

+4 −3
Original line number Diff line number Diff line
@@ -1907,6 +1907,7 @@ static void nilfs_segctor_drop_written_files(struct nilfs_sc_info *sci, 
					     struct the_nilfs *nilfs)

{

	struct nilfs_inode_info *ii, *n;

	int during_mount = !(sci->sc_super->s_flags & MS_ACTIVE);

	int defer_iput = false;



	spin_lock(&nilfs->ns_inode_lock);
@@ -1919,10 +1920,10 @@ static void nilfs_segctor_drop_written_files(struct nilfs_sc_info *sci, 
		brelse(ii->i_bh);

		ii->i_bh = NULL;

		list_del_init(&ii->i_dirty);

		if (!ii->vfs_inode.i_nlink) {

		if (!ii->vfs_inode.i_nlink || during_mount) {

			/*

			 * Defer calling iput() to avoid a deadlock

			 * over I_SYNC flag for inodes with i_nlink == 0

			 * Defer calling iput() to avoid deadlocks if

			 * i_nlink == 0 or mount is not yet finished.

			 */

			list_add_tail(&ii->i_dirty, &sci->sc_iput_queue);

			defer_iput = true;

fs/notify/fanotify/fanotify.c

+2 −1
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@ static bool fanotify_should_send_event(struct fsnotify_mark *inode_mark, 
	    !(marks_mask & FS_ISDIR & ~marks_ignored_mask))

		return false;



	if (event_mask & marks_mask & ~marks_ignored_mask)

	if (event_mask & FAN_ALL_OUTGOING_EVENTS & marks_mask &

				 ~marks_ignored_mask)

		return true;



	return false;

fs/ocfs2/ocfs2.h

+1 −1
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ static inline int ocfs2_writes_unwritten_extents(struct ocfs2_super *osb) 


static inline int ocfs2_supports_append_dio(struct ocfs2_super *osb)

{

	if (osb->s_feature_ro_compat & OCFS2_FEATURE_RO_COMPAT_APPEND_DIO)

	if (osb->s_feature_incompat & OCFS2_FEATURE_INCOMPAT_APPEND_DIO)

		return 1;

	return 0;

}