Skip to content

Commit 020fca0

Browse files
committed
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()
2 parents 785cdec + f449bf9 commit 020fca0

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

arch/x86/kernel/cpu/amd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ static void init_amd_k8(struct cpuinfo_x86 *c)
650650
}
651651

652652
if (!c->x86_model_id[0])
653-
strcpy(c->x86_model_id, "Hammer");
653+
strscpy(c->x86_model_id, "Hammer");
654654

655655
#ifdef CONFIG_SMP
656656
/*

arch/x86/mm/pat/memtype.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -683,6 +683,7 @@ static enum page_cache_mode lookup_memtype(u64 paddr)
683683
/**
684684
* pat_pfn_immune_to_uc_mtrr - Check whether the PAT memory type
685685
* of @pfn cannot be overridden by UC MTRR memory type.
686+
* @pfn: The page frame number to check.
686687
*
687688
* Only to be called when PAT is enabled.
688689
*

arch/x86/power/hibernate.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ unsigned long relocated_restore_code __visible;
4242

4343
/**
4444
* pfn_is_nosave - check if given pfn is in the 'nosave' section
45+
* @pfn: the page frame number to check.
4546
*/
4647
int pfn_is_nosave(unsigned long pfn)
4748
{
@@ -86,7 +87,10 @@ static inline u32 compute_e820_crc32(struct e820_table *table)
8687
/**
8788
* arch_hibernation_header_save - populate the architecture specific part
8889
* of a hibernation image header
89-
* @addr: address to save the data at
90+
* @addr: address where architecture specific header data will be saved.
91+
* @max_size: maximum size of architecture specific data in hibernation header.
92+
*
93+
* Return: 0 on success, -EOVERFLOW if max_size is insufficient.
9094
*/
9195
int arch_hibernation_header_save(void *addr, unsigned int max_size)
9296
{

0 commit comments

Comments
 (0)