Merge tag 'x86-cleanups-2025-05-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 cleanups from Ingo Molnar:
 "Misc x86 cleanups: kernel-doc updates and a string API transition
  patch"

* tag 'x86-cleanups-2025-05-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/power: hibernate: Fix W=1 build kernel-doc warnings
  x86/mm/pat: Fix W=1 build kernel-doc warning
  x86/CPU/AMD: Replace strcpy() with strscpy()
This commit is contained in:
Linus Torvalds
2025-05-26 21:15:06 -07:00
3 changed files with 7 additions and 2 deletions
+1 -1
View File
@@ -650,7 +650,7 @@ static void init_amd_k8(struct cpuinfo_x86 *c)
}
if (!c->x86_model_id[0])
strcpy(c->x86_model_id, "Hammer");
strscpy(c->x86_model_id, "Hammer");
#ifdef CONFIG_SMP
/*
+1
View File
@@ -683,6 +683,7 @@ static enum page_cache_mode lookup_memtype(u64 paddr)
/**
* pat_pfn_immune_to_uc_mtrr - Check whether the PAT memory type
* of @pfn cannot be overridden by UC MTRR memory type.
* @pfn: The page frame number to check.
*
* Only to be called when PAT is enabled.
*
+5 -1
View File
@@ -42,6 +42,7 @@ unsigned long relocated_restore_code __visible;
/**
* pfn_is_nosave - check if given pfn is in the 'nosave' section
* @pfn: the page frame number to check.
*/
int pfn_is_nosave(unsigned long pfn)
{
@@ -86,7 +87,10 @@ static inline u32 compute_e820_crc32(struct e820_table *table)
/**
* arch_hibernation_header_save - populate the architecture specific part
* of a hibernation image header
* @addr: address to save the data at
* @addr: address where architecture specific header data will be saved.
* @max_size: maximum size of architecture specific data in hibernation header.
*
* Return: 0 on success, -EOVERFLOW if max_size is insufficient.
*/
int arch_hibernation_header_save(void *addr, unsigned int max_size)
{