lkml.org 
[lkml]   [2013]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 110/128] x86/Sandy Bridge: mark arrays in __init functions as __initconst
    3.2-stable review patch.  If anyone has any objections, please let me know.

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

    From: "H. Peter Anvin" <hpa@linux.intel.com>

    commit ab3cd8670e0b3fcde7f029e1503ed3c5138e9571 upstream.

    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>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    arch/x86/kernel/setup.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
    index 9dcb325..18182d1 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,



    \
     
     \ /
      Last update: 2013-02-03 17:01    [W:4.692 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site