Commit 691429e1 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>:
  dax: move writeback calls into the filesystems
  dax: give DAX clearing code correct bdev
  ext4: online defrag not supported with DAX
  ext2, ext4: only set S_DAX for regular inodes
  block: disable block device DAX by default
  ocfs2: unlock inode if deleting inode from orphan fails
  mm: ASLR: use get_random_long()
  drivers: char: random: add get_random_long()
  mm: numa: quickly fail allocations for NUMA balancing on full nodes
  mm: thp: fix SMP race condition between THP page fault and MADV_DONTNEED
parents 1c271479 7f6d5b52

arch/arm/mm/mmap.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ unsigned long arch_mmap_rnd(void) 
{

	unsigned long rnd;



	rnd = (unsigned long)get_random_int() & ((1 << mmap_rnd_bits) - 1);

	rnd = get_random_long() & ((1UL << mmap_rnd_bits) - 1);



	return rnd << PAGE_SHIFT;

}

arch/arm64/mm/mmap.c

+2 −2
Original line number Diff line number Diff line
@@ -53,10 +53,10 @@ unsigned long arch_mmap_rnd(void) 


#ifdef CONFIG_COMPAT

	if (test_thread_flag(TIF_32BIT))

		rnd = (unsigned long)get_random_int() & ((1 << mmap_rnd_compat_bits) - 1);

		rnd = get_random_long() & ((1UL << mmap_rnd_compat_bits) - 1);

	else

#endif

		rnd = (unsigned long)get_random_int() & ((1 << mmap_rnd_bits) - 1);

		rnd = get_random_long() & ((1UL << mmap_rnd_bits) - 1);

	return rnd << PAGE_SHIFT;

}

arch/mips/mm/mmap.c

+2 −2
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ unsigned long arch_mmap_rnd(void) 
{

	unsigned long rnd;



	rnd = (unsigned long)get_random_int();

	rnd = get_random_long();

	rnd <<= PAGE_SHIFT;

	if (TASK_IS_32BIT_ADDR)

		rnd &= 0xfffffful;
@@ -174,7 +174,7 @@ void arch_pick_mmap_layout(struct mm_struct *mm) 


static inline unsigned long brk_rnd(void)

{

	unsigned long rnd = get_random_int();

	unsigned long rnd = get_random_long();



	rnd = rnd << PAGE_SHIFT;

	/* 8MB for 32bit, 256MB for 64bit */

arch/powerpc/kernel/process.c

+2 −2
Original line number Diff line number Diff line
@@ -1768,9 +1768,9 @@ static inline unsigned long brk_rnd(void) 


	/* 8MB for 32bit, 1GB for 64bit */

	if (is_32bit_task())

		rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));

		rnd = (get_random_long() % (1UL<<(23-PAGE_SHIFT)));

	else

		rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));

		rnd = (get_random_long() % (1UL<<(30-PAGE_SHIFT)));



	return rnd << PAGE_SHIFT;

}

arch/powerpc/mm/mmap.c

+2 −2
Original line number Diff line number Diff line
@@ -59,9 +59,9 @@ unsigned long arch_mmap_rnd(void) 


	/* 8MB for 32bit, 1GB for 64bit */

	if (is_32bit_task())

		rnd = (unsigned long)get_random_int() % (1<<(23-PAGE_SHIFT));

		rnd = get_random_long() % (1<<(23-PAGE_SHIFT));

	else

		rnd = (unsigned long)get_random_int() % (1<<(30-PAGE_SHIFT));

		rnd = get_random_long() % (1UL<<(30-PAGE_SHIFT));



	return rnd << PAGE_SHIFT;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE