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

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

Merge branch 'akpm' (patches from Andrew) 

Merge misc updates from Andrew Morton:

 - a few misc things

 - most of MM

 - KASAN updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (102 commits)
  kasan: separate report parts by empty lines
  kasan: improve double-free report format
  kasan: print page description after stacks
  kasan: improve slab object description
  kasan: change report header
  kasan: simplify address description logic
  kasan: change allocation and freeing stack traces headers
  kasan: unify report headers
  kasan: introduce helper functions for determining bug type
  mm: hwpoison: call shake_page() after try_to_unmap() for mlocked page
  mm: hwpoison: call shake_page() unconditionally
  mm/swapfile.c: fix swap space leak in error path of swap_free_entries()
  mm/gup.c: fix access_ok() argument type
  mm/truncate: avoid pointless cleancache_invalidate_inode() calls.
  mm/truncate: bail out early from invalidate_inode_pages2_range() if mapping is empty
  fs/block_dev: always invalidate cleancache in invalidate_bdev()
  fs: fix data invalidation in the cleancache during direct IO
  zram: reduce load operation in page_same_filled
  zram: use zram_free_page instead of open-coded
  zram: introduce zram data accessor
  ...
parents 1684096b b1938599

Documentation/cgroup-v2.txt

+5 −0
Original line number Original line Diff line number Diff line
@@ -871,6 +871,11 @@ PAGE_SIZE multiple when read back. 




		Amount of memory used in network transmission buffers

		Amount of memory used in network transmission buffers





	  shmem



		Amount of cached filesystem data that is swap-backed,

		such as tmpfs, shm segments, shared anonymous mmap()s



	  file_mapped

	  file_mapped





		Amount of cached filesystem data mapped with mmap()

		Amount of cached filesystem data mapped with mmap()

Documentation/filesystems/proc.txt

+6 −0
Original line number Original line Diff line number Diff line
@@ -413,6 +413,7 @@ Private_Clean: 0 kB 
Private_Dirty:         0 kB

Private_Dirty:         0 kB

Referenced:          892 kB

Referenced:          892 kB

Anonymous:             0 kB

Anonymous:             0 kB

LazyFree:              0 kB

AnonHugePages:         0 kB

AnonHugePages:         0 kB

ShmemPmdMapped:        0 kB

ShmemPmdMapped:        0 kB

Shared_Hugetlb:        0 kB

Shared_Hugetlb:        0 kB
@@ -442,6 +443,11 @@ accessed. 
"Anonymous" shows the amount of memory that does not belong to any file.  Even

"Anonymous" shows the amount of memory that does not belong to any file.  Even

a mapping associated with a file may contain anonymous pages: when MAP_PRIVATE

a mapping associated with a file may contain anonymous pages: when MAP_PRIVATE

and a page is modified, the file page is replaced by a private anonymous copy.

and a page is modified, the file page is replaced by a private anonymous copy.

"LazyFree" shows the amount of memory which is marked by madvise(MADV_FREE).

The memory isn't freed immediately with madvise(). It's freed in memory

pressure if the memory is clean. Please note that the printed value might

be lower than the real value due to optimizations used in the current

implementation. If this is not desirable please file a bug report.

"AnonHugePages" shows the ammount of memory backed by transparent hugepage.

"AnonHugePages" shows the ammount of memory backed by transparent hugepage.

"ShmemPmdMapped" shows the ammount of shared (shmem/tmpfs) memory backed by

"ShmemPmdMapped" shows the ammount of shared (shmem/tmpfs) memory backed by

huge pages.

huge pages.

Documentation/vm/00-INDEX

+2 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,8 @@ highmem.txt 
	- Outline of highmem and common issues.

	- Outline of highmem and common issues.

hugetlbpage.txt

hugetlbpage.txt

	- a brief summary of hugetlbpage support in the Linux kernel.

	- a brief summary of hugetlbpage support in the Linux kernel.

hugetlbfs_reserv.txt

	- A brief overview of hugetlbfs reservation design/implementation.

hwpoison.txt

hwpoison.txt

	- explains what hwpoison is

	- explains what hwpoison is

idle_page_tracking.txt

idle_page_tracking.txt

Documentation/vm/hugetlbfs_reserv.txt

0 → 100644
+529 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/blackfin/mach-bf609/clock.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -97,6 +97,9 @@ EXPORT_SYMBOL(clk_enable); 




void clk_disable(struct clk *clk)

void clk_disable(struct clk *clk)

{

{

	if (!clk)

		return;



	if (clk->ops && clk->ops->disable)

	if (clk->ops && clk->ops->disable)

		clk->ops->disable(clk);

		clk->ops->disable(clk);

}

}