forked from Minki/linux
40c50c1fec
The purgatory code defines global variables which are referenced via a
symbol lookup in the kexec code (core and arch).
A recent commit addressing sparse warnings made these static and thereby
broke kexec_file.
Why did this happen? Simply because the whole machinery is undocumented and
lacks any form of forward declarations. The variable names are unspecific
and lack a prefix, so adding forward declarations creates shadow variables
in the core code. Aside of that the code relies on magic constants and
duplicate struct definitions with no way to ensure that these things stay
in sync. The section placement of the purgatory variables happened by
chance and not by design.
Unbreak kexec and cleanup the mess:
- Add proper forward declarations and document the usage
- Use common struct definition
- Use the proper common defines instead of magic constants
- Add a purgatory_ prefix to have a proper name space
- Use ARRAY_SIZE() instead of a homebrewn reimplementation
- Add proper sections to the purgatory variables [ From Mike ]
Fixes: 72042a8c7b ("x86/purgatory: Make functions and variables static")
Reported-by: Mike Galbraith <<efault@gmx.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Nicholas Mc Guire <der.herr@hofr.at>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: "Tobin C. Harding" <me@tobin.cc>
Link: http://lkml.kernel.org/r/alpine.DEB.2.20.1703101315140.3681@nanos
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
21 lines
532 B
C
21 lines
532 B
C
#ifndef _ASM_X86_PURGATORY_H
|
|
#define _ASM_X86_PURGATORY_H
|
|
|
|
#ifndef __ASSEMBLY__
|
|
#include <linux/purgatory.h>
|
|
|
|
extern void purgatory(void);
|
|
/*
|
|
* These forward declarations serve two purposes:
|
|
*
|
|
* 1) Make sparse happy when checking arch/purgatory
|
|
* 2) Document that these are required to be global so the symbol
|
|
* lookup in kexec works
|
|
*/
|
|
extern unsigned long purgatory_backup_dest;
|
|
extern unsigned long purgatory_backup_src;
|
|
extern unsigned long purgatory_backup_sz;
|
|
#endif /* __ASSEMBLY__ */
|
|
|
|
#endif /* _ASM_PURGATORY_H */
|