Merge tag 'x86_sev_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit 88f30ac22733 · 2022-03-21T11:35:10.000-07:00
Pull x86 SEV fix from Borislav Petkov:

 - Add a missing function section annotation

* tag 'x86_sev_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/head64: Add missing __head annotation to sme_postprocess_startup()
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
@@ -126,7 +126,7 @@ static bool __head check_la57_support(unsigned long physaddr)
 }
 #endif
 
-static unsigned long sme_postprocess_startup(struct boot_params *bp, pmdval_t *pmd)
+static unsigned long __head sme_postprocess_startup(struct boot_params *bp, pmdval_t *pmd)
 {
 	unsigned long vaddr, vaddr_end;
 	int i;

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ static bool __head check_la57_support(unsigned long physaddr)`
`126`	`126`	`}`
`127`	`127`	`#endif`
`128`	`128`
`129`		`-static unsigned long sme_postprocess_startup(struct boot_params bp, pmdval_t pmd)`
	`129`	`+static unsigned long __head sme_postprocess_startup(struct boot_params bp, pmdval_t pmd)`
`130`	`130`	`{`
`131`	`131`	`unsigned long vaddr, vaddr_end;`
`132`	`132`	`int i;`