From: Mathias Krause <minipli@googlemail.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org, Mathias Krause <minipli@googlemail.com>
Subject: [PATCH 3/5] x86/PCI: Mark constants of pci_mmcfg_nvidia_mcp55() as __initconst
Date: Mon, 25 Aug 2014 23:26:37 +0200 [thread overview]
Message-ID: <1409001999-23161-4-git-send-email-minipli@googlemail.com> (raw)
In-Reply-To: <1409001999-23161-1-git-send-email-minipli@googlemail.com>
The constants in pci_mmcfg_nvidia_mcp55() need to be marked as
__initconst or they will remain in memory after init memory was
released.
Signed-off-by: Mathias Krause <minipli@googlemail.com>
---
arch/x86/pci/mmconfig-shared.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index 163ef6bf16..63fc0d4d58 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -240,16 +240,20 @@ static const char *__init pci_mmcfg_nvidia_mcp55(void)
int bus;
int mcp55_mmconf_found = 0;
- static const u32 extcfg_regnum = 0x90;
- static const u32 extcfg_regsize = 4;
- static const u32 extcfg_enable_mask = 1<<31;
- static const u32 extcfg_start_mask = 0xff<<16;
- static const int extcfg_start_shift = 16;
- static const u32 extcfg_size_mask = 0x3<<28;
- static const int extcfg_size_shift = 28;
- static const int extcfg_sizebus[] = {0x100, 0x80, 0x40, 0x20};
- static const u32 extcfg_base_mask[] = {0x7ff8, 0x7ffc, 0x7ffe, 0x7fff};
- static const int extcfg_base_lshift = 25;
+ static const u32 extcfg_regnum __initconst = 0x90;
+ static const u32 extcfg_regsize __initconst = 4;
+ static const u32 extcfg_enable_mask __initconst = 1 << 31;
+ static const u32 extcfg_start_mask __initconst = 0xff << 16;
+ static const int extcfg_start_shift __initconst = 16;
+ static const u32 extcfg_size_mask __initconst = 0x3 << 28;
+ static const int extcfg_size_shift __initconst = 28;
+ static const int extcfg_sizebus[] __initconst = {
+ 0x100, 0x80, 0x40, 0x20
+ };
+ static const u32 extcfg_base_mask[] __initconst = {
+ 0x7ff8, 0x7ffc, 0x7ffe, 0x7fff
+ };
+ static const int extcfg_base_lshift __initconst = 25;
/*
* do check if amd fam10h already took over
--
1.7.10.4
next prev parent reply other threads:[~2014-08-25 21:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-25 21:26 [PATCH 0/5] x86/PCI: Minor size reduction by marking init code and data as such Mathias Krause
2014-08-25 21:26 ` [PATCH 1/5] x86/PCI: Mark DMI tables as initialization data Mathias Krause
2014-08-25 21:26 ` [PATCH 2/5] x86/PCI: Move __init annotation were it belongs to Mathias Krause
2014-08-25 21:26 ` Mathias Krause [this message]
2014-08-25 21:26 ` [PATCH 4/5] x86/PCI: Constify pci_mmcfg_probes[] array Mathias Krause
2014-08-25 21:26 ` [PATCH 5/5] x86/PCI: Mark PCI BIOS initialization code as such Mathias Krause
2014-09-22 20:27 ` [PATCH 0/5] x86/PCI: Minor size reduction by marking init code and data " Bjorn Helgaas
2014-09-22 20:34 ` Bjorn Helgaas
2014-09-23 15:43 ` Mathias Krause
2014-09-24 7:28 ` Ingo Molnar
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=1409001999-23161-4-git-send-email-minipli@googlemail.com \
--to=minipli@googlemail.com \
--cc=bhelgaas@google.com \
--cc=linux-pci@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).