Skip to content

Commit

Permalink
x86, microcode, AMD: Remove useless get_ucode_data wrapper
Browse files Browse the repository at this point in the history
get_ucode_data was a trivial memcpy wrapper. Remove it so as not to
obfuscate code unnecessarily with no obvious gain.

No functional change.

Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Link: http://lkml.kernel.org/r/1344361461-10076-7-git-send-email-bp@amd64.org
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
  • Loading branch information
Borislav Petkov authored and H. Peter Anvin committed Aug 22, 2012
1 parent e43f6e6 commit e7e632f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
6 changes: 0 additions & 6 deletions arch/x86/include/asm/microcode.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@ static inline struct microcode_ops * __init init_intel_microcode(void)
#ifdef CONFIG_MICROCODE_AMD
extern struct microcode_ops * __init init_amd_microcode(void);
extern void __exit exit_amd_microcode(void);

static inline void get_ucode_data(void *to, const u8 *from, size_t n)
{
memcpy(to, from, n);
}

#else
static inline struct microcode_ops * __init init_amd_microcode(void)
{
Expand Down
4 changes: 2 additions & 2 deletions arch/x86/kernel/microcode_amd.c
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ static int get_matching_microcode(int cpu, const u8 *ucode_ptr,
memset(patch, 0, PAGE_SIZE);

/* all looks ok, get the binary patch */
get_ucode_data(patch, ucode_ptr + SECTION_HDR_SIZE, actual_size);
memcpy(patch, ucode_ptr + SECTION_HDR_SIZE, actual_size);

return actual_size;
}
Expand Down Expand Up @@ -238,7 +238,7 @@ static int install_equiv_cpu_table(const u8 *buf)
return -ENOMEM;
}

get_ucode_data(equiv_cpu_table, buf + CONTAINER_HDR_SZ, size);
memcpy(equiv_cpu_table, buf + CONTAINER_HDR_SZ, size);

/* add header length */
return size + CONTAINER_HDR_SZ;
Expand Down

0 comments on commit e7e632f

Please sign in to comment.