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

Commit 5852958c authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm: Add weak function definition for random pool intialization" into msm-4.8

parents b808965c 84832d67

arch/arm/kernel/setup.c

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

}



void __init __weak init_random_pool(void) { }



void __init setup_arch(char **cmdline_p)

{

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


	if (mdesc->init_early)

		mdesc->init_early();



	init_random_pool();

}

arch/arm64/kernel/setup.c

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


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)

{

	pr_info("Boot CPU: AArch64 Processor [%08x]\n", read_cpuid_id());
@@ -326,6 +328,8 @@ void __init setup_arch(char **cmdline_p) 
			"This indicates a broken bootloader or old kernel\n",

			boot_args[1], boot_args[2], boot_args[3]);

	}



	init_random_pool();

}



static int __init topology_init(void)