mirror of
https://github.com/torvalds/linux.git
synced 2024-11-01 04:53:36 +01:00
Merge 5c06a4ddce
into 0fc810ae3a
This commit is contained in:
commit
ba73cd3fd0
1 changed files with 6 additions and 0 deletions
|
@ -5,6 +5,12 @@
|
||||||
#include <asm/processor.h>
|
#include <asm/processor.h>
|
||||||
#include <asm/tsc.h>
|
#include <asm/tsc.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Fix for vmware installer failure to build vmmon and vmnet kernel modules
|
||||||
|
* as random_get_entropy_fallback() is not found in this unit.
|
||||||
|
*/
|
||||||
|
extern unsigned long random_get_entropy_fallback(void);
|
||||||
|
|
||||||
static inline unsigned long random_get_entropy(void)
|
static inline unsigned long random_get_entropy(void)
|
||||||
{
|
{
|
||||||
if (!IS_ENABLED(CONFIG_X86_TSC) &&
|
if (!IS_ENABLED(CONFIG_X86_TSC) &&
|
||||||
|
|
Loading…
Reference in a new issue