Date: Sat, 3 Jun 2017 16:24:17 +0000 (UTC) From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r319541 - in head/sys/arm: annapurna/alpine arm versatile Message-ID: <201706031624.v53GOH5x009333@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Sat Jun 3 16:24:17 2017 New Revision: 319541 URL: https://svnweb.freebsd.org/changeset/base/319541 Log: Stop making cpu_initclocks weak when using event timers. A weak symbol could be overridden in the SoC specific code, but this would break GENERIC as it is likely to be incorrect. Remove the versatile implementation of cpu_initclocks as it's unneeded. Deleted: head/sys/arm/versatile/versatile_timer.c Modified: head/sys/arm/annapurna/alpine/files.alpine head/sys/arm/arm/machdep.c head/sys/arm/versatile/files.versatile Modified: head/sys/arm/annapurna/alpine/files.alpine ============================================================================== --- head/sys/arm/annapurna/alpine/files.alpine Sat Jun 3 16:19:33 2017 (r319540) +++ head/sys/arm/annapurna/alpine/files.alpine Sat Jun 3 16:24:17 2017 (r319541) @@ -3,7 +3,6 @@ kern/kern_clocksource.c standard arm/versatile/sp804.c standard -arm/versatile/versatile_timer.c standard dev/uart/uart_dev_ns8250.c optional uart arm/annapurna/alpine/common.c standard Modified: head/sys/arm/arm/machdep.c ============================================================================== --- head/sys/arm/arm/machdep.c Sat Jun 3 16:19:33 2017 (r319540) +++ head/sys/arm/arm/machdep.c Sat Jun 3 16:24:17 2017 (r319541) @@ -301,6 +301,7 @@ cpu_idle_wakeup(int cpu) return (0); } +#ifdef NO_EVENTTIMERS /* * Most ARM platforms don't need to do anything special to init their clocks * (they get intialized during normal device attachment), and by not defining a @@ -311,8 +312,14 @@ cpu_idle_wakeup(int cpu) void arm_generic_initclocks(void) { +} +__weak_reference(arm_generic_initclocks, cpu_initclocks); -#ifndef NO_EVENTTIMERS +#else +void +cpu_initclocks(void) +{ + #ifdef SMP if (PCPU_GET(cpuid) == 0) cpu_initclocks_bsp(); @@ -321,9 +328,8 @@ arm_generic_initclocks(void) #else cpu_initclocks_bsp(); #endif -#endif } -__weak_reference(arm_generic_initclocks, cpu_initclocks); +#endif #ifdef MULTIDELAY void Modified: head/sys/arm/versatile/files.versatile ============================================================================== --- head/sys/arm/versatile/files.versatile Sat Jun 3 16:19:33 2017 (r319540) +++ head/sys/arm/versatile/files.versatile Sat Jun 3 16:24:17 2017 (r319541) @@ -8,6 +8,5 @@ arm/versatile/versatile_common.c standard arm/versatile/versatile_pci.c optional pci arm/versatile/versatile_scm.c standard arm/versatile/versatile_sic.c standard -arm/versatile/versatile_timer.c standard kern/kern_clocksource.c standard
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706031624.v53GOH5x009333>