3.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: "H. Peter Anvin" <[email protected]>

commit 91c90db1aa92a50fa1d7f289502b49ddb46a90d3 upstream.

commit ab3cd8670e0b3fcde7f029e1503ed3c5138e9571 upstream.

Mark static arrays as __initconst so they get removed when the init
sections are flushed.

Reported-by: Mathias Krause <[email protected]>
Link: 
http://lkml.kernel.org/r/[email protected]
Signed-off-by: H. Peter Anvin <[email protected]>
Signed-off-by: Ben Hutchings <[email protected]>
Cc: Rui Xiang <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 arch/x86/kernel/setup.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -625,7 +625,7 @@ static bool __init snb_gfx_workaround_ne
 #ifdef CONFIG_PCI
        int i;
        u16 vendor, devid;
-       static const u16 snb_ids[] = {
+       static const __initconst u16 snb_ids[] = {
                0x0102,
                0x0112,
                0x0122,
@@ -658,7 +658,7 @@ static bool __init snb_gfx_workaround_ne
  */
 static void __init trim_snb_memory(void)
 {
-       static const unsigned long bad_pages[] = {
+       static const __initconst unsigned long bad_pages[] = {
                0x20050000,
                0x20110000,
                0x20130000,


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to