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

Commit 4aab8a54 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm: Add weak function definition for random pool intialization"

parents 177e6160 18230c5b

arch/arm/kernel/setup.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -841,6 +841,8 @@ void __init hyp_mode_check(void) 
#endif

#endif

}

}





void __init __weak init_random_pool(void) { }



void __init setup_arch(char **cmdline_p)

void __init setup_arch(char **cmdline_p)

{

{

	const struct machine_desc *mdesc;

	const struct machine_desc *mdesc;
@@ -912,6 +914,8 @@ void __init setup_arch(char **cmdline_p) 




	if (mdesc->init_early)

	if (mdesc->init_early)

		mdesc->init_early();

		mdesc->init_early();



	init_random_pool();

}

}

arch/arm64/kernel/setup.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -372,6 +372,8 @@ static void __init request_standard_resources(void) 




u64 __cpu_logical_map[NR_CPUS] = { [0 ... NR_CPUS-1] = INVALID_HWID };

u64 __cpu_logical_map[NR_CPUS] = { [0 ... NR_CPUS-1] = INVALID_HWID };





void __init __weak init_random_pool(void) { }



void __init setup_arch(char **cmdline_p)

void __init setup_arch(char **cmdline_p)

{

{

	/*

	/*
@@ -421,6 +423,7 @@ void __init setup_arch(char **cmdline_p) 
	conswitchp = &dummy_con;

	conswitchp = &dummy_con;

#endif

#endif

#endif

#endif

	init_random_pool();

}

}





static int __init arm64_device_init(void)

static int __init arm64_device_init(void)