Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5bdfefb authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/microcode: Remove one #ifdef clause 



Move the function declaration to the other #ifdef CONFIG_MICROCODE
together with the other functions.

No functionality change.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20161025095522.11964-5-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent f61337d9

arch/x86/include/asm/microcode.h

+2 −6
Original line number Diff line number Diff line
@@ -56,12 +56,6 @@ struct ucode_cpu_info { 
};

extern struct ucode_cpu_info ucode_cpu_info[];



#ifdef CONFIG_MICROCODE

int __init microcode_init(void);

#else

static inline int __init microcode_init(void)	{ return 0; };

#endif



#ifdef CONFIG_MICROCODE_INTEL

extern struct microcode_ops * __init init_intel_microcode(void);

#else
@@ -131,11 +125,13 @@ static inline unsigned int x86_cpuid_family(void) 
}



#ifdef CONFIG_MICROCODE

int __init microcode_init(void);

extern void __init load_ucode_bsp(void);

extern void load_ucode_ap(void);

void reload_early_microcode(void);

extern bool get_builtin_firmware(struct cpio_data *cd, const char *name);

#else

static inline int __init microcode_init(void)			{ return 0; };

static inline void __init load_ucode_bsp(void)			{ }

static inline void load_ucode_ap(void)				{ }

static inline void reload_early_microcode(void)			{ }