commit 46159f6e9d9a41a0ec1914f983e7ca6e416330c1
Author: Ben Hutchings <ben@decadent.org.uk>
Date:   Sat Aug 4 16:31:19 2012 +0100

    Linux 3.2.26

commit a788f7a5fced5e586b7cf85fd3152e41182bba15
Author: Kevin Winchester <kjwinchester@gmail.com>
Date:   Tue Dec 20 20:52:22 2011 -0400

    x86: Simplify code by removing a !SMP #ifdefs from 'struct cpuinfo_x86'
    
    commit 141168c36cdee3ff23d9c7700b0edc47cb65479f and
    commit 3f806e50981825fa56a7f1938f24c0680816be45 upstream.
    
    Several fields in struct cpuinfo_x86 were not defined for the
    !SMP case, likely to save space.  However, those fields still
    have some meaning for UP, and keeping them allows some #ifdef
    removal from other files.  The additional size of the UP kernel
    from this change is not significant enough to worry about
    keeping up the distinction:
    
    	   text    data     bss     dec     hex filename
    	4737168	 506459	 972040	6215667	 5ed7f3	vmlinux.o.before
    	4737444	 506459	 972040	6215943	 5ed907	vmlinux.o.after
    
    for a difference of 276 bytes for an example UP config.
    
    If someone wants those 276 bytes back badly then it should
    be implemented in a cleaner way.
    
    Signed-off-by: Kevin Winchester <kjwinchester@gmail.com>
    Cc: Steffen Persvold <sp@numascale.com>
    Link: http://lkml.kernel.org/r/1324428742-12498-1-git-send-email-kjwinchester@gmail.com
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>