github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-29 17:43:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge branch 'for-next/misc' into for-next/core

Browse Source 
* for-next/misc:
  arm64: mm: warn once for ioremap attempts on RAM mappings
  arm64: Disable branch profiling for all arm64 code
  arm64: kernel: initialize missing kexec_buf->random field
  arm64: simplify arch_uprobe_xol_was_trapped return
This commit is contained in:
Will Deacon 2026-01-29 12:05:40 +00:00
commit c96f95bca1
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/Kbuild
View File

@ -1,4 +1,8 @@
# SPDX-License-Identifier: GPL-2.0-only
# Branch profiling isn't noinstr-safe
subdir-ccflags-$(CONFIG_TRACE_BRANCH_PROFILING) += -DDISABLE_BRANCH_PROFILING
obj-y += kernel/ mm/ net/
obj-$(CONFIG_KVM) += kvm/
obj-$(CONFIG_XEN) += xen/

2
arch/arm64/kernel/kexec_image.c
View File

@ -41,7 +41,7 @@ static void *image_load(struct kimage *image,
struct arm64_image_header *h;
u64 flags, value;
bool be_image, be_kernel;
struct kexec_buf kbuf;
struct kexec_buf kbuf = {};
unsigned long text_offset, kernel_segment_number;
struct kexec_segment *kernel_segment;
int ret;

5
arch/arm64/kernel/probes/uprobes.c
View File

@ -103,10 +103,7 @@ bool arch_uprobe_xol_was_trapped(struct task_struct *t)
* insn itself is trapped, then detect the case with the help of
* invalid fault code which is being set in arch_uprobe_pre_xol
*/
if (t->thread.fault_code != UPROBE_INV_FAULT_CODE)
return true;
return false;
return t->thread.fault_code != UPROBE_INV_FAULT_CODE;
}
bool arch_uprobe_skip_sstep(struct arch_uprobe *auprobe, struct pt_regs *regs)

3
arch/arm64/mm/ioremap.c
View File

@ -24,7 +24,8 @@ void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size,
return NULL;
/* Don't allow RAM to be mapped. */
if (WARN_ON(pfn_is_map_memory(__phys_to_pfn(phys_addr))))
if (WARN_ONCE(pfn_is_map_memory(__phys_to_pfn(phys_addr)),
"ioremap attempted on RAM pfn\n"))
return NULL;
/*