Skip to content

Commit 59a2cee

Browse files
committed
Merge branch 'akpm' (patches from Andrew)
Merge more updates from Andrew Morton: "87 patches. Subsystems affected by this patch series: mm (pagecache and hugetlb), procfs, misc, MAINTAINERS, lib, checkpatch, binfmt, kallsyms, ramfs, init, codafs, nilfs2, hfs, crash_dump, signals, seq_file, fork, sysvfs, kcov, gdb, resource, selftests, and ipc" * emailed patches from Andrew Morton <[email protected]>: (87 commits) ipc/ipc_sysctl.c: remove fallback for !CONFIG_PROC_SYSCTL ipc: check checkpoint_restore_ns_capable() to modify C/R proc files selftests/kselftest/runner/run_one(): allow running non-executable files virtio-mem: disallow mapping virtio-mem memory via /dev/mem kernel/resource: disallow access to exclusive system RAM regions kernel/resource: clean up and optimize iomem_is_exclusive() scripts/gdb: handle split debug for vmlinux kcov: replace local_irq_save() with a local_lock_t kcov: avoid enable+disable interrupts if !in_task() kcov: allocate per-CPU memory on the relevant node Documentation/kcov: define `ip' in the example Documentation/kcov: include types.h in the example sysv: use BUILD_BUG_ON instead of runtime check kernel/fork.c: unshare(): use swap() to make code cleaner seq_file: fix passing wrong private data seq_file: move seq_escape() to a header signal: remove duplicate include in signal.h crash_dump: remove duplicate include in crash_dump.h crash_dump: fix boolreturn.cocci warning hfs/hfsplus: use WARN_ON for sanity check ...
2 parents d2f38a3 + 0e9beb8 commit 59a2cee

File tree

131 files changed

+1174
-650
lines changed

Some content is hidden

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

131 files changed

+1174
-650
lines changed

.mailmap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ Chris Chiu <[email protected]> <[email protected]>
7373
7474
Christophe Ricard <[email protected]>
7575
Christoph Hellwig <[email protected]>
76+
77+
7678
Corey Minyard <[email protected]>
7779
Damian Hobson-Garcia <[email protected]>
7880

Documentation/dev-tools/kcov.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ program using kcov:
5050
#include <sys/mman.h>
5151
#include <unistd.h>
5252
#include <fcntl.h>
53+
#include <linux/types.h>
5354
5455
#define KCOV_INIT_TRACE _IOR('c', 1, unsigned long)
5556
#define KCOV_ENABLE _IO('c', 100)
@@ -177,6 +178,8 @@ Comparison operands collection is similar to coverage collection:
177178
/* Read number of comparisons collected. */
178179
n = __atomic_load_n(&cover[0], __ATOMIC_RELAXED);
179180
for (i = 0; i < n; i++) {
181+
uint64_t ip;
182+
180183
type = cover[i * KCOV_WORDS_PER_CMP + 1];
181184
/* arg1 and arg2 - operands of the comparison. */
182185
arg1 = cover[i * KCOV_WORDS_PER_CMP + 2];
@@ -251,6 +254,8 @@ selectively from different subsystems.
251254

252255
.. code-block:: c
253256
257+
/* Same includes and defines as above. */
258+
254259
struct kcov_remote_arg {
255260
__u32 trace_mode;
256261
__u32 area_size;

MAINTAINERS

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ F: drivers/crypto/allwinner/
767767
ALLWINNER HARDWARE SPINLOCK SUPPORT
768768
M: Wilken Gottwalt <[email protected]>
769769
S: Maintained
770-
F: Documentation/devicetree/bindings/hwlock/allwinner,sun6i-hwspinlock.yaml
770+
F: Documentation/devicetree/bindings/hwlock/allwinner,sun6i-a31-hwspinlock.yaml
771771
F: drivers/hwspinlock/sun6i_hwspinlock.c
772772

773773
ALLWINNER THERMAL DRIVER
@@ -2783,7 +2783,7 @@ F: Documentation/devicetree/bindings/arm/toshiba.yaml
27832783
F: Documentation/devicetree/bindings/net/toshiba,visconti-dwmac.yaml
27842784
F: Documentation/devicetree/bindings/gpio/toshiba,gpio-visconti.yaml
27852785
F: Documentation/devicetree/bindings/pci/toshiba,visconti-pcie.yaml
2786-
F: Documentation/devicetree/bindings/pinctrl/toshiba,tmpv7700-pinctrl.yaml
2786+
F: Documentation/devicetree/bindings/pinctrl/toshiba,visconti-pinctrl.yaml
27872787
F: Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml
27882788
F: arch/arm64/boot/dts/toshiba/
27892789
F: drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
@@ -7119,6 +7119,20 @@ F: include/uapi/linux/mdio.h
71197119
F: include/uapi/linux/mii.h
71207120
F: net/core/of_net.c
71217121

7122+
EXEC & BINFMT API
7123+
R: Eric Biederman <[email protected]>
7124+
R: Kees Cook <[email protected]>
7125+
F: arch/alpha/kernel/binfmt_loader.c
7126+
F: arch/x86/ia32/ia32_aout.c
7127+
F: fs/*binfmt_*.c
7128+
F: fs/exec.c
7129+
F: include/linux/binfmts.h
7130+
F: include/linux/elf.h
7131+
F: include/uapi/linux/binfmts.h
7132+
F: tools/testing/selftests/exec/
7133+
N: asm/elf.h
7134+
N: binfmt
7135+
71227136
EXFAT FILE SYSTEM
71237137
M: Namjae Jeon <[email protected]>
71247138
M: Sungjong Seo <[email protected]>
@@ -8562,7 +8576,6 @@ M: John Stultz <[email protected]>
85628576
85638577
S: Maintained
85648578
F: drivers/misc/hisi_hikey_usb.c
8565-
F: Documentation/devicetree/bindings/misc/hisilicon-hikey-usb.yaml
85668579

85678580
HISILICON PMU DRIVER
85688581
M: Shaokun Zhang <[email protected]>
@@ -9621,7 +9634,7 @@ INTEL KEEM BAY DRM DRIVER
96219634
M: Anitha Chrisanthus <[email protected]>
96229635
M: Edmund Dea <[email protected]>
96239636
S: Maintained
9624-
F: Documentation/devicetree/bindings/display/intel,kmb_display.yaml
9637+
F: Documentation/devicetree/bindings/display/intel,keembay-display.yaml
96259638
F: drivers/gpu/drm/kmb/
96269639

96279640
INTEL KEEM BAY OCS AES/SM4 CRYPTO DRIVER

arch/alpha/kernel/traps.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,7 @@ dik_show_trace(unsigned long *sp, const char *loglvl)
129129
extern char _stext[], _etext[];
130130
unsigned long tmp = *sp;
131131
sp++;
132-
if (tmp < (unsigned long) &_stext)
133-
continue;
134-
if (tmp >= (unsigned long) &_etext)
132+
if (!is_kernel_text(tmp))
135133
continue;
136134
printk("%s[<%lx>] %pSR\n", loglvl, tmp, (void *)tmp);
137135
if (i > 40) {

arch/microblaze/mm/pgtable.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include <linux/mm_types.h>
3535
#include <linux/pgtable.h>
3636
#include <linux/memblock.h>
37+
#include <linux/kallsyms.h>
3738

3839
#include <asm/pgalloc.h>
3940
#include <linux/io.h>
@@ -171,7 +172,7 @@ void __init mapin_ram(void)
171172
for (s = 0; s < lowmem_size; s += PAGE_SIZE) {
172173
f = _PAGE_PRESENT | _PAGE_ACCESSED |
173174
_PAGE_SHARED | _PAGE_HWEXEC;
174-
if ((char *) v < _stext || (char *) v >= _etext)
175+
if (!is_kernel_text(v))
175176
f |= _PAGE_WRENABLE;
176177
else
177178
/* On the MicroBlaze, no user access

arch/powerpc/mm/pgtable_32.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333

3434
#include <mm/mmu_decl.h>
3535

36-
extern char etext[], _stext[], _sinittext[], _einittext[];
37-
3836
static u8 early_fixmap_pagetable[FIXMAP_PTE_SIZE] __page_aligned_data;
3937

4038
notrace void __init early_ioremap_init(void)
@@ -104,14 +102,13 @@ static void __init __mapin_ram_chunk(unsigned long offset, unsigned long top)
104102
{
105103
unsigned long v, s;
106104
phys_addr_t p;
107-
int ktext;
105+
bool ktext;
108106

109107
s = offset;
110108
v = PAGE_OFFSET + s;
111109
p = memstart_addr + s;
112110
for (; s < top; s += PAGE_SIZE) {
113-
ktext = ((char *)v >= _stext && (char *)v < etext) ||
114-
((char *)v >= _sinittext && (char *)v < _einittext);
111+
ktext = core_kernel_text(v);
115112
map_kernel_page(v, p, ktext ? PAGE_KERNEL_TEXT : PAGE_KERNEL);
116113
v += PAGE_SIZE;
117114
p += PAGE_SIZE;

arch/riscv/lib/delay.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@
44
*/
55

66
#include <linux/delay.h>
7+
#include <linux/math.h>
78
#include <linux/param.h>
89
#include <linux/timex.h>
10+
#include <linux/types.h>
911
#include <linux/export.h>
1012

13+
#include <asm/processor.h>
14+
1115
/*
1216
* This is copies from arch/arm/include/asm/delay.h
1317
*

arch/s390/include/asm/facility.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@
99
#define __ASM_FACILITY_H
1010

1111
#include <asm/facility-defs.h>
12+
13+
#include <linux/minmax.h>
1214
#include <linux/string.h>
15+
#include <linux/types.h>
1316
#include <linux/preempt.h>
17+
1418
#include <asm/lowcore.h>
1519

1620
#define MAX_FACILITY_BIT (sizeof(stfle_fac_list) * 8)

arch/x86/kernel/aperture_64.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,23 @@ static int gart_mem_pfn_is_ram(unsigned long pfn)
7373
(pfn >= aperture_pfn_start + aperture_page_count));
7474
}
7575

76+
#ifdef CONFIG_PROC_VMCORE
77+
static bool gart_oldmem_pfn_is_ram(struct vmcore_cb *cb, unsigned long pfn)
78+
{
79+
return !!gart_mem_pfn_is_ram(pfn);
80+
}
81+
82+
static struct vmcore_cb gart_vmcore_cb = {
83+
.pfn_is_ram = gart_oldmem_pfn_is_ram,
84+
};
85+
#endif
86+
7687
static void __init exclude_from_core(u64 aper_base, u32 aper_order)
7788
{
7889
aperture_pfn_start = aper_base >> PAGE_SHIFT;
7990
aperture_page_count = (32 * 1024 * 1024) << aper_order >> PAGE_SHIFT;
8091
#ifdef CONFIG_PROC_VMCORE
81-
WARN_ON(register_oldmem_pfn_is_ram(&gart_mem_pfn_is_ram));
92+
register_vmcore_cb(&gart_vmcore_cb);
8293
#endif
8394
#ifdef CONFIG_PROC_KCORE
8495
WARN_ON(register_mem_pfn_is_ram(&gart_mem_pfn_is_ram));

arch/x86/kernel/unwind_orc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ static struct orc_entry *orc_find(unsigned long ip)
175175
}
176176

177177
/* vmlinux .init slow lookup: */
178-
if (init_kernel_text(ip))
178+
if (is_kernel_inittext(ip))
179179
return __orc_find(__start_orc_unwind_ip, __start_orc_unwind,
180180
__stop_orc_unwind_ip - __start_orc_unwind_ip, ip);
181181

0 commit comments

Comments
 (0)