Skip to content

Commit dd23f27

Browse files
torvaldstorvalds
committed
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 ...
2 parents 1684096 + b193859 commit dd23f27

79 files changed

Lines changed: 2141 additions & 1484 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/cgroup-v2.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -871,6 +871,11 @@ PAGE_SIZE multiple when read back.
871871

872872
Amount of memory used in network transmission buffers
873873

874+
shmem
875+
876+
Amount of cached filesystem data that is swap-backed,
877+
such as tmpfs, shm segments, shared anonymous mmap()s
878+
874879
file_mapped
875880

876881
Amount of cached filesystem data mapped with mmap()

‎Documentation/filesystems/proc.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,7 @@ Private_Clean: 0 kB
413413
Private_Dirty: 0 kB
414414
Referenced: 892 kB
415415
Anonymous: 0 kB
416+
LazyFree: 0 kB
416417
AnonHugePages: 0 kB
417418
ShmemPmdMapped: 0 kB
418419
Shared_Hugetlb: 0 kB
@@ -442,6 +443,11 @@ accessed.
442443
"Anonymous" shows the amount of memory that does not belong to any file. Even
443444
a mapping associated with a file may contain anonymous pages: when MAP_PRIVATE
444445
and a page is modified, the file page is replaced by a private anonymous copy.
446+
"LazyFree" shows the amount of memory which is marked by madvise(MADV_FREE).
447+
The memory isn't freed immediately with madvise(). It's freed in memory
448+
pressure if the memory is clean. Please note that the printed value might
449+
be lower than the real value due to optimizations used in the current
450+
implementation. If this is not desirable please file a bug report.
445451
"AnonHugePages" shows the ammount of memory backed by transparent hugepage.
446452
"ShmemPmdMapped" shows the ammount of shared (shmem/tmpfs) memory backed by
447453
huge pages.

‎Documentation/vm/00-INDEX‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ highmem.txt
1212
- Outline of highmem and common issues.
1313
hugetlbpage.txt
1414
- a brief summary of hugetlbpage support in the Linux kernel.
15+
hugetlbfs_reserv.txt
16+
- A brief overview of hugetlbfs reservation design/implementation.
1517
hwpoison.txt
1618
- explains what hwpoison is
1719
idle_page_tracking.txt

‎Documentation/vm/hugetlbfs_reserv.txt‎

Lines changed: 529 additions & 0 deletions
Large diffs are not rendered by default.

‎arch/blackfin/mach-bf609/clock.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@ EXPORT_SYMBOL(clk_enable);
9797

9898
void clk_disable(struct clk *clk)
9999
{
100+
if (!clk)
101+
return;
102+
100103
if (clk->ops && clk->ops->disable)
101104
clk->ops->disable(clk);
102105
}

0 commit comments

Comments
 (0)