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

Commit 35e28a05 authored by Richard Henderson's avatar Richard Henderson Committed by Greg Kroah-Hartman
Browse files

x86: Remove arch_has_random, arch_has_random_seed 



commit 5f2ed7f5b99b54389b74e53309677831ac9cb9d7 upstream.

Use the expansion of these macros directly in arch_get_random_*.

These symbols are currently part of the generic archrandom.h
interface, but are currently unused and can be removed.

Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20200110145422.49141-2-broonie@kernel.org


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 98f749e2

arch/x86/include/asm/archrandom.h

+4 −8
Original line number Diff line number Diff line
@@ -73,10 +73,6 @@ static inline bool rdseed_int(unsigned int *v) 
	return ok;

}



/* Conditional execution based on CPU type */

#define arch_has_random()	static_cpu_has(X86_FEATURE_RDRAND)

#define arch_has_random_seed()	static_cpu_has(X86_FEATURE_RDSEED)



/*

 * These are the generic interfaces; they must not be declared if the

 * stubs in <linux/random.h> are to be invoked,
@@ -86,22 +82,22 @@ static inline bool rdseed_int(unsigned int *v) 


static inline bool arch_get_random_long(unsigned long *v)

{

	return arch_has_random() ? rdrand_long(v) : false;

	return static_cpu_has(X86_FEATURE_RDRAND) ? rdrand_long(v) : false;

}



static inline bool arch_get_random_int(unsigned int *v)

{

	return arch_has_random() ? rdrand_int(v) : false;

	return static_cpu_has(X86_FEATURE_RDRAND) ? rdrand_int(v) : false;

}



static inline bool arch_get_random_seed_long(unsigned long *v)

{

	return arch_has_random_seed() ? rdseed_long(v) : false;

	return static_cpu_has(X86_FEATURE_RDSEED) ? rdseed_long(v) : false;

}



static inline bool arch_get_random_seed_int(unsigned int *v)

{

	return arch_has_random_seed() ? rdseed_int(v) : false;

	return static_cpu_has(X86_FEATURE_RDSEED) ? rdseed_int(v) : false;

}



extern void x86_init_rdrand(struct cpuinfo_x86 *c);