From: H. Peter Anvin Date: Mon, 14 Jan 2013 04:36:39 +0000 (-0800) Subject: x86/Sandy Bridge: mark arrays in __init functions as __initconst X-Git-Tag: v3.2.38~19 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=91c90db1aa92a50fa1d7f289502b49ddb46a90d3;p=karo-tx-linux.git x86/Sandy Bridge: mark arrays in __init functions as __initconst commit ab3cd8670e0b3fcde7f029e1503ed3c5138e9571 upstream. Mark static arrays as __initconst so they get removed when the init sections are flushed. Reported-by: Mathias Krause Link: http://lkml.kernel.org/r/75F4BEE6-CB0E-4426-B40B-697451677738@googlemail.com Signed-off-by: H. Peter Anvin Signed-off-by: Ben Hutchings --- diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 7e547bf3b90f..4c2e927646b5 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -635,7 +635,7 @@ static bool __init snb_gfx_workaround_needed(void) { int i; u16 vendor, devid; - static const u16 snb_ids[] = { + static const __initconst u16 snb_ids[] = { 0x0102, 0x0112, 0x0122, @@ -667,7 +667,7 @@ static bool __init snb_gfx_workaround_needed(void) */ static void __init trim_snb_memory(void) { - static const unsigned long bad_pages[] = { + static const __initconst unsigned long bad_pages[] = { 0x20050000, 0x20110000, 0x20130000,