Skip to content

Commit 0eee0a3

Browse files
nashifandrewboie
authored andcommitted
drivers: apic_timer: fix include of system_timer.h
Fix path for system_timer.h and loapic.h, we moved it to include/drivers/timer/ and include/drivers/interrupt_controller/ Signed-off-by: Anas Nashif <anas.nashif@intel.com>
1 parent a438e71 commit 0eee0a3

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

drivers/timer/apic_timer.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
#include <drivers/system_timer.h>
6+
#include <drivers/timer/system_timer.h>
77
#include <sys_clock.h>
88
#include <spinlock.h>
9-
#include <drivers/loapic.h>
9+
#include <drivers/interrupt_controller/loapic.h>
1010

1111
BUILD_ASSERT_MSG(!IS_ENABLED(CONFIG_SMP), "APIC timer doesn't support SMP");
1212

@@ -40,7 +40,7 @@ BUILD_ASSERT_MSG(!IS_ENABLED(CONFIG_SMP), "APIC timer doesn't support SMP");
4040
* found via CPUID 0x15 (n = EBX, m = EAX) on most CPUs.
4141
*/
4242

43-
/* These should be merged into include/drivers/loapic.h. */
43+
/* These should be merged into include/drivers/interrupt_controller/loapic.h. */
4444

4545
#define DCR_DIVIDER_MASK 0x0000000F /* divider bits */
4646
#define DCR_DIVIDER 0x0000000B /* divide by 1 */

include/arch/x86/msr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@
241241
* MSRs 0x0800 to 0x0BFF are reserved for x2APIC access.
242242
*
243243
* We only record the base address here, as the local APIC code
244-
* knows how to find the registers, see include/drivers/loapic.h.
244+
* knows how to find the registers, see include/drivers/interrupt_controller/loapic.h.
245245
*/
246246

247247
#define X86_X2APIC_BASE_MSR 0x0800

0 commit comments

Comments
 (0)