diff options
| author | Borislav Petkov <bp@suse.de> | 2016-06-06 17:10:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-06-08 11:04:19 +0200 |
| commit | 852ad5b94524fd76d49944b9db0a93f7c9ee5814 (patch) | |
| tree | 39e1c945bcf25d34100e485853f4f19091b345d2 /arch/x86/kernel/cpu/microcode/intel.c | |
| parent | 7557933e6b99d381c19b196901ed537b00f6d121 (diff) | |
x86/microcode: Get rid of find_cpio_data()'s dummy offset arg
The microcode loader doesn't use it and now that that arg has been made
optional in find_cpio_data(), get rid of it here.
No functionality change.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
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: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1465225850-7352-5-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/microcode/intel.c')
| -rw-r--r-- | arch/x86/kernel/cpu/microcode/intel.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c index 5835d5b0db81..2ad40b73c8df 100644 --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -685,7 +685,6 @@ static __init enum ucode_state __scan_microcode_initrd(struct cpio_data *cd, struct ucode_blobs *blbp) { #ifdef CONFIG_BLK_DEV_INITRD - long offset = 0; static __initdata char ucode_name[] = "kernel/x86/microcode/GenuineIntel.bin"; char *p = IS_ENABLED(CONFIG_X86_32) ? (char *)__pa_nodebug(ucode_name) : ucode_name; @@ -716,7 +715,7 @@ __scan_microcode_initrd(struct cpio_data *cd, struct ucode_blobs *blbp) } # endif - *cd = find_cpio_data(p, (void *)start, size, &offset); + *cd = find_cpio_data(p, (void *)start, size, NULL); if (cd->data) { blbp->start = start; blbp->valid = true; |