Skip to content

Commit 9f2a635

Browse files
committed
Merge tag 'mm-nonmm-stable-2024-01-09-10-33' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Pull non-MM updates from Andrew Morton: "Quite a lot of kexec work this time around. Many singleton patches in many places. The notable patch series are: - nilfs2 folio conversion from Matthew Wilcox in 'nilfs2: Folio conversions for file paths'. - Additional nilfs2 folio conversion from Ryusuke Konishi in 'nilfs2: Folio conversions for directory paths'. - IA64 remnant removal in Heiko Carstens's 'Remove unused code after IA-64 removal'. - Arnd Bergmann has enabled the -Wmissing-prototypes warning everywhere in 'Treewide: enable -Wmissing-prototypes'. This had some followup fixes: - Nathan Chancellor has cleaned up the hexagon build in the series 'hexagon: Fix up instances of -Wmissing-prototypes'. - Nathan also addressed some s390 warnings in 's390: A couple of fixes for -Wmissing-prototypes'. - Arnd Bergmann addresses the same warnings for MIPS in his series 'mips: address -Wmissing-prototypes warnings'. - Baoquan He has made kexec_file operate in a top-down-fitting manner similar to kexec_load in the series 'kexec_file: Load kernel at top of system RAM if required' - Baoquan He has also added the self-explanatory 'kexec_file: print out debugging message if required'. - Some checkstack maintenance work from Tiezhu Yang in the series 'Modify some code about checkstack'. - Douglas Anderson has disentangled the watchdog code's logging when multiple reports are occurring simultaneously. The series is 'watchdog: Better handling of concurrent lockups'. - Yuntao Wang has contributed some maintenance work on the crash code in 'crash: Some cleanups and fixes'" * tag 'mm-nonmm-stable-2024-01-09-10-33' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (157 commits) crash_core: fix and simplify the logic of crash_exclude_mem_range() x86/crash: use SZ_1M macro instead of hardcoded value x86/crash: remove the unused image parameter from prepare_elf_headers() kdump: remove redundant DEFAULT_CRASH_KERNEL_LOW_SIZE scripts/decode_stacktrace.sh: strip unexpected CR from lines watchdog: if panicking and we dumped everything, don't re-enable dumping watchdog/hardlockup: use printk_cpu_sync_get_irqsave() to serialize reporting watchdog/softlockup: use printk_cpu_sync_get_irqsave() to serialize reporting watchdog/hardlockup: adopt softlockup logic avoiding double-dumps kexec_core: fix the assignment to kimage->control_page x86/kexec: fix incorrect end address passed to kernel_ident_mapping_init() lib/trace_readwrite.c:: replace asm-generic/io with linux/io nilfs2: cpfile: fix some kernel-doc warnings stacktrace: fix kernel-doc typo scripts/checkstack.pl: fix no space expression between sp and offset x86/kexec: fix incorrect argument passed to kexec_dprintk() x86/kexec: use pr_err() instead of kexec_dprintk() when an error occurs nilfs2: add missing set_freezable() for freezable kthread kernel: relay: remove relay_file_splice_read dead code, doesn't work docs: submit-checklist: remove all of "make namespacecheck" ...
2 parents fb46e22 + 6dff315 commit 9f2a635

File tree

159 files changed

+1108
-1155
lines changed

Some content is hidden

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

159 files changed

+1108
-1155
lines changed

CREDITS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,9 @@ N: Ohad Ben Cohen
319319
E: ohad@wizery.com
320320
D: Remote Processor (remoteproc) subsystem
321321
D: Remote Processor Messaging (rpmsg) subsystem
322+
D: Hardware spinlock (hwspinlock) subsystem
323+
D: OMAP hwspinlock driver
324+
D: OMAP remoteproc driver
322325

323326
N: Krzysztof Benedyczak
324327
E: golbi@mat.uni.torun.pl

Documentation/driver-api/surface_aggregator/ssh.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Note that the standard disclaimer for this subsystem also applies to this
3939
document: All of this has been reverse-engineered and may thus be erroneous
4040
and/or incomplete.
4141

42-
All CRCs used in the following are two-byte ``crc_ccitt_false(0xffff, ...)``.
42+
All CRCs used in the following are two-byte ``crc_itu_t(0xffff, ...)``.
4343
All multi-byte values are little-endian, there is no implicit padding between
4444
values.
4545

Documentation/filesystems/squashfs.rst

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,66 @@ obtained from this site also.
6464
The squashfs-tools development tree is now located on kernel.org
6565
git://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git
6666

67+
2.1 Mount options
68+
-----------------
69+
=================== =========================================================
70+
errors=%s Specify whether squashfs errors trigger a kernel panic
71+
or not
72+
73+
========== =============================================
74+
continue errors don't trigger a panic (default)
75+
panic trigger a panic when errors are encountered,
76+
similar to several other filesystems (e.g.
77+
btrfs, ext4, f2fs, GFS2, jfs, ntfs, ubifs)
78+
79+
This allows a kernel dump to be saved,
80+
useful for analyzing and debugging the
81+
corruption.
82+
========== =============================================
83+
threads=%s Select the decompression mode or the number of threads
84+
85+
If SQUASHFS_CHOICE_DECOMP_BY_MOUNT is set:
86+
87+
========== =============================================
88+
single use single-threaded decompression (default)
89+
90+
Only one block (data or metadata) can be
91+
decompressed at any one time. This limits
92+
CPU and memory usage to a minimum, but it
93+
also gives poor performance on parallel I/O
94+
workloads when using multiple CPU machines
95+
due to waiting on decompressor availability.
96+
multi use up to two parallel decompressors per core
97+
98+
If you have a parallel I/O workload and your
99+
system has enough memory, using this option
100+
may improve overall I/O performance. It
101+
dynamically allocates decompressors on a
102+
demand basis.
103+
percpu use a maximum of one decompressor per core
104+
105+
It uses percpu variables to ensure
106+
decompression is load-balanced across the
107+
cores.
108+
1|2|3|... configure the number of threads used for
109+
decompression
110+
111+
The upper limit is num_online_cpus() * 2.
112+
========== =============================================
113+
114+
If SQUASHFS_CHOICE_DECOMP_BY_MOUNT is **not** set and
115+
SQUASHFS_DECOMP_MULTI, SQUASHFS_MOUNT_DECOMP_THREADS are
116+
both set:
117+
118+
========== =============================================
119+
2|3|... configure the number of threads used for
120+
decompression
121+
122+
The upper limit is num_online_cpus() * 2.
123+
========== =============================================
124+
125+
=================== =========================================================
126+
67127
3. Squashfs Filesystem Design
68128
-----------------------------
69129

Documentation/translations/ja_JP/SubmitChecklist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ Linux カーネルパッチ投稿者向けチェックリスト
5656

5757
9: sparseを利用してちゃんとしたコードチェックをしてください。
5858

59-
10: 'make checkstack' と 'make namespacecheck' を利用し、問題が発見されたら
60-
修正してください。'make checkstack' は明示的に問題を示しませんが、どれか
59+
10: 'make checkstack' を利用し、問題が発見されたら修正してください。
60+
'make checkstack' は明示的に問題を示しませんが、どれか
6161
1つの関数が512バイトより大きいスタックを使っていれば、修正すべき候補と
6262
なります。
6363

Documentation/translations/zh_CN/process/submit-checklist.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ Linux内核补丁提交检查单
5353
9) 通过 sparse 清查。
5454
(参见 Documentation/translations/zh_CN/dev-tools/sparse.rst )
5555

56-
10) 使用 ``make checkstack`` 和 ``make namespacecheck`` 并修复他们发现的任何
57-
问题。
56+
10) 使用 ``make checkstack`` 并修复他们发现的任何问题。
5857

5958
.. note::
6059

Documentation/translations/zh_TW/process/submit-checklist.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ Linux內核補丁提交檢查單
5656
9) 通過 sparse 清查。
5757
(參見 Documentation/translations/zh_CN/dev-tools/sparse.rst )
5858

59-
10) 使用 ``make checkstack`` 和 ``make namespacecheck`` 並修復他們發現的任何
60-
問題。
59+
10) 使用 ``make checkstack`` 並修復他們發現的任何問題。
6160

6261
.. note::
6362

MAINTAINERS

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9283,7 +9283,6 @@ F: drivers/char/hw_random/
92839283
F: include/linux/hw_random.h
92849284

92859285
HARDWARE SPINLOCK CORE
9286-
M: Ohad Ben-Cohen <ohad@wizery.com>
92879286
M: Bjorn Andersson <andersson@kernel.org>
92889287
R: Baolin Wang <baolin.wang7@gmail.com>
92899288
L: linux-remoteproc@vger.kernel.org
@@ -15715,9 +15714,8 @@ F: Documentation/devicetree/bindings/gpio/ti,omap-gpio.yaml
1571515714
F: drivers/gpio/gpio-omap.c
1571615715

1571715716
OMAP HARDWARE SPINLOCK SUPPORT
15718-
M: Ohad Ben-Cohen <ohad@wizery.com>
1571915717
L: linux-omap@vger.kernel.org
15720-
S: Maintained
15718+
S: Orphan
1572115719
F: drivers/hwspinlock/omap_hwspinlock.c
1572215720

1572315721
OMAP HS MMC SUPPORT

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1576,7 +1576,8 @@ help:
15761576
echo ' (default: $(INSTALL_HDR_PATH))'; \
15771577
echo ''
15781578
@echo 'Static analysers:'
1579-
@echo ' checkstack - Generate a list of stack hogs'
1579+
@echo ' checkstack - Generate a list of stack hogs and consider all functions'
1580+
@echo ' with a stack size larger than MINSTACKSIZE (default: 100)'
15801581
@echo ' versioncheck - Sanity check on version.h usage'
15811582
@echo ' includecheck - Check for duplicate included header files'
15821583
@echo ' export_report - List the usages of all exported symbols'
@@ -2016,9 +2017,10 @@ CHECKSTACK_ARCH := $(SUBARCH)
20162017
else
20172018
CHECKSTACK_ARCH := $(ARCH)
20182019
endif
2020+
MINSTACKSIZE ?= 100
20192021
checkstack:
20202022
$(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \
2021-
$(PERL) $(srctree)/scripts/checkstack.pl $(CHECKSTACK_ARCH)
2023+
$(PERL) $(srctree)/scripts/checkstack.pl $(CHECKSTACK_ARCH) $(MINSTACKSIZE)
20222024

20232025
kernelrelease:
20242026
@$(filechk_kernel.release)

arch/Kconfig

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -301,17 +301,8 @@ config ARCH_HAS_DMA_CLEAR_UNCACHED
301301
config ARCH_HAS_CPU_FINALIZE_INIT
302302
bool
303303

304-
# Select if arch init_task must go in the __init_task_data section
305-
config ARCH_TASK_STRUCT_ON_STACK
306-
bool
307-
308-
# Select if arch has its private alloc_task_struct() function
309-
config ARCH_TASK_STRUCT_ALLOCATOR
310-
bool
311-
312304
config HAVE_ARCH_THREAD_STRUCT_WHITELIST
313305
bool
314-
depends on !ARCH_TASK_STRUCT_ALLOCATOR
315306
help
316307
An architecture should select this to provide hardened usercopy
317308
knowledge about what region of the thread_struct should be
@@ -320,10 +311,6 @@ config HAVE_ARCH_THREAD_STRUCT_WHITELIST
320311
should be implemented. Without this, the entire thread_struct
321312
field in task_struct will be left whitelisted.
322313

323-
# Select if arch has its private alloc_thread_stack() function
324-
config ARCH_THREAD_STACK_ALLOCATOR
325-
bool
326-
327314
# Select if arch wants to size task_struct dynamically via arch_task_struct_size:
328315
config ARCH_WANTS_DYNAMIC_TASK_STRUCT
329316
bool

arch/alpha/lib/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#
55

66
asflags-y := $(KBUILD_CFLAGS)
7-
ccflags-y := -Werror
87

98
# Many of these routines have implementations tuned for ev6.
109
# Choose them iff we're targeting ev6 specifically.

0 commit comments

Comments
 (0)