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

Commit d8a8188d authored by Olaf Hering's avatar Olaf Hering Committed by Paul Mackerras
Browse files

[PATCH] powerpc: remove pointer/integer confusion in generic_calibrate_decr 



remove pointer/integer confusion

Signed-off-by: default avatarOlaf Hering <olh@suse.de>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent b68239ee

arch/powerpc/kernel/time.c

+4 −4
Original line number Diff line number Diff line
@@ -612,10 +612,10 @@ void __init generic_calibrate_decr(void) 


	ppc_tb_freq = DEFAULT_TB_FREQ;		/* hardcoded default */

	node_found = 0;

	if (cpu != 0) {

	if (cpu) {

		fp = (unsigned int *)get_property(cpu, "timebase-frequency",

						  NULL);

		if (fp != 0) {

		if (fp) {

			node_found = 1;

			ppc_tb_freq = *fp;

		}
@@ -626,10 +626,10 @@ void __init generic_calibrate_decr(void) 


	ppc_proc_freq = DEFAULT_PROC_FREQ;

	node_found = 0;

	if (cpu != 0) {

	if (cpu) {

		fp = (unsigned int *)get_property(cpu, "clock-frequency",

						  NULL);

		if (fp != 0) {

		if (fp) {

			node_found = 1;

			ppc_proc_freq = *fp;

		}