public inbox for linux-efi@vger.kernel.org
 help / color / mirror / Atom feed
From: Mathias Krause <minipli-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>
To: Matt Fleming <matt.fleming-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Cc: linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Mathias Krause <minipli-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>,
	Paul Jackson <pj-sJ/iWh9BUns@public.gmane.org>
Subject: [PATCH 2/4] x86/efi: Unexport add_efi_memmap variable
Date: Sun,  7 Sep 2014 19:42:15 +0200	[thread overview]
Message-ID: <1410111737-5220-3-git-send-email-minipli@googlemail.com> (raw)
In-Reply-To: <1410111737-5220-1-git-send-email-minipli-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>

This variable was accidentally exported, even though it's only used in
this compilation unit and only during initialization.

Remove the bogus export, make the variable static instead and mark it
as __initdata.

Fixes: 200001eb140e ("x86 boot: only pick up additional EFI memmap...")
Cc: Paul Jackson <pj-sJ/iWh9BUns@public.gmane.org>
Signed-off-by: Mathias Krause <minipli-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>
---
 arch/x86/include/asm/efi.h  |    1 -
 arch/x86/platform/efi/efi.c |    4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
index 8aee01536c6c..b07ecf332bdf 100644
--- a/arch/x86/include/asm/efi.h
+++ b/arch/x86/include/asm/efi.h
@@ -86,7 +86,6 @@ extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size,
 
 #endif /* CONFIG_X86_32 */
 
-extern int add_efi_memmap;
 extern struct efi_scratch efi_scratch;
 extern void efi_set_executable(efi_memory_desc_t *md, bool executable);
 extern int efi_memblock_x86_reserve_range(void);
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 850da94fef30..9e43b0f3d891 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -78,9 +78,7 @@ static int __init setup_noefi(char *arg)
 }
 early_param("noefi", setup_noefi);
 
-int add_efi_memmap;
-EXPORT_SYMBOL(add_efi_memmap);
-
+static int add_efi_memmap __initdata;
 static int __init setup_add_efi_memmap(char *arg)
 {
 	add_efi_memmap = 1;
-- 
1.7.10.4

  parent reply	other threads:[~2014-09-07 17:42 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-07 17:42 [PATCH 0/4] x86/efi: Minor cleanup patches Mathias Krause
     [not found] ` <1410111737-5220-1-git-send-email-minipli-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>
2014-09-07 17:42   ` [PATCH 1/4] x86/efi: Remove unused efi_call* macros Mathias Krause
2014-09-07 17:42   ` Mathias Krause [this message]
2014-09-07 17:42   ` [PATCH 3/4] x86/efi: Update comment regarding required phys mapped EFI services Mathias Krause
2014-09-07 17:42   ` [PATCH 4/4] x86/efi: Mark initialization code as such Mathias Krause
2014-09-08 19:41   ` [PATCH 0/4] x86/efi: Minor cleanup patches Matt Fleming
     [not found]     ` <20140908194105.GA18582-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
2014-09-09  7:03       ` Mathias Krause
     [not found]         ` <CA+rthh8RWz1OhspgqrnX1uYq-Sc=WARx16AgxWBOoZrAD6-D_A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-09-09  7:27           ` Matt Fleming
     [not found]             ` <20140909072716.GF18582-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
2014-09-09  7:49               ` Mathias Krause

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1410111737-5220-3-git-send-email-minipli@googlemail.com \
    --to=minipli-gm/ye1e23mwn+bqq9rbeug@public.gmane.org \
    --cc=linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=matt.fleming-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
    --cc=pj-sJ/iWh9BUns@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox