diff options
| author | Mathias Krause <minipli@googlemail.com> | 2014-09-07 21:42:17 +0400 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2014-10-03 21:41:03 +0400 |
| commit | 4e78eb056136b002ecdfbbf61436fedfb8a3c76b (patch) | |
| tree | 7e54b0cc762ebb12ae3d79830803f21be205383c /arch/x86/platform/efi/efi_stub_32.S | |
| parent | 0ce4605c9aa7b9c25bb4d117eb07db67cd7f1991 (diff) | |
| download | linux-4e78eb056136b002ecdfbbf61436fedfb8a3c76b.tar.xz | |
x86/efi: Mark initialization code as such
The 32 bit and 64 bit implementations differ in their __init annotations
for some functions referenced from the common EFI code. Namely, the 32
bit variant is missing some of the __init annotations the 64 bit variant
has.
To solve the colliding annotations, mark the corresponding functions in
efi_32.c as initialization code, too -- as it is such.
Actually, quite a few more functions are only used during initialization
and therefore can be marked __init. They are therefore annotated, too.
Also add the __init annotation to the prototypes in the efi.h header so
users of those functions will see it's meant as initialization code
only.
This patch also fixes the "prelog" typo. ("prologue" / "epilogue" might
be more appropriate but this is C code after all, not an opera! :D)
Signed-off-by: Mathias Krause <minipli@googlemail.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'arch/x86/platform/efi/efi_stub_32.S')
| -rw-r--r-- | arch/x86/platform/efi/efi_stub_32.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S index fbe66e626c09..040192b50d02 100644 --- a/arch/x86/platform/efi/efi_stub_32.S +++ b/arch/x86/platform/efi/efi_stub_32.S @@ -27,13 +27,13 @@ ENTRY(efi_call_phys) * set to 0x0010, DS and SS have been set to 0x0018. In EFI, I found * the values of these registers are the same. And, the corresponding * GDT entries are identical. So I will do nothing about segment reg - * and GDT, but change GDT base register in prelog and epilog. + * and GDT, but change GDT base register in prolog and epilog. */ /* * 1. Now I am running with EIP = <physical address> + PAGE_OFFSET. * But to make it smoothly switch from virtual mode to flat mode. - * The mapping of lower virtual memory has been created in prelog and + * The mapping of lower virtual memory has been created in prolog and * epilog. */ movl $1f, %edx |