diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2013-01-14 05:36:39 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-01-14 05:36:39 +0100 |
| commit | ab3cd8670e0b3fcde7f029e1503ed3c5138e9571 (patch) | |
| tree | 188b16e6509c8732cccbdeda2ffbbc6c36fa74b0 /arch/x86 | |
| parent | x86/Sandy Bridge: reserve pages when integrated graphics is present (diff) | |
| download | linux-ab3cd8670e0b3fcde7f029e1503ed3c5138e9571.tar.xz linux-ab3cd8670e0b3fcde7f029e1503ed3c5138e9571.zip | |
x86/Sandy Bridge: mark arrays in __init functions as __initconst
Mark static arrays as __initconst so they get removed when the init
sections are flushed.
Reported-by: Mathias Krause <minipli@googlemail.com>
Link: http://lkml.kernel.org/r/75F4BEE6-CB0E-4426-B40B-697451677738@googlemail.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 9dcb32545032..18182d19b71b 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -614,7 +614,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, @@ -646,7 +646,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, |