From 2d9c726c7bdc3cf4e0c0096c90e8cbd9e16acb10 Mon Sep 17 00:00:00 2001 From: Yonattan Louise Date: Fri, 8 May 2015 17:12:53 -0500 Subject: [PATCH] Rename _loApicTimerIntStub to _loapic_timer_irq_stub Updating global variable's name to follow a consistent naming convention. Change accomplished with the following script: #!/bin/bash echo "Searching for ${1} to replace with ${2}" find ./ \( -name "*.[chs]" -o -name "sysgen.py" -o -name "*.kconf" -o -name "*.arch" \) \ ! -path "./host/src/genIdt/*" \ ! -path "*/outdir/*" | xargs sed -i 's/\b'${1}'\b/'${2}'/g'; Change-Id: I8d54b60a2300421bf4c19ff4f64769606d4e9966 Signed-off-by: Yonattan Louise --- arch/x86/bsp/driver_static_irq_stubs.s | 4 ++-- arch/x86/timer/loApicTimer.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/bsp/driver_static_irq_stubs.s b/arch/x86/bsp/driver_static_irq_stubs.s index b2a827b6194..b03127f0008 100644 --- a/arch/x86/bsp/driver_static_irq_stubs.s +++ b/arch/x86/bsp/driver_static_irq_stubs.s @@ -48,7 +48,7 @@ by x86 BSPs. /* exports (internal APIs) */ #if defined(CONFIG_LOAPIC_TIMER) - GTEXT(_loApicTimerIntStub) + GTEXT(_loapic_timer_irq_stub) #endif #if defined(CONFIG_HPET_TIMER) @@ -78,7 +78,7 @@ by x86 BSPs. GTEXT(_IntExit) #if defined(CONFIG_LOAPIC_TIMER) -SECTION_FUNC (TEXT, _loApicTimerIntStub) +SECTION_FUNC (TEXT, _loapic_timer_irq_stub) call _IntEnt /* Inform kernel interrupt has begun */ pushl $0 /* Push dummy parameter */ call _timer_int_handler /* Call actual interrupt handler */ diff --git a/arch/x86/timer/loApicTimer.c b/arch/x86/timer/loApicTimer.c index f48d4249386..6ed67fff8d4 100644 --- a/arch/x86/timer/loApicTimer.c +++ b/arch/x86/timer/loApicTimer.c @@ -121,11 +121,11 @@ extern int32_t _sys_idle_elapsed_ticks; /* locals */ #ifdef CONFIG_DYNAMIC_INT_STUBS static NANO_CPU_INT_STUB_DECL( - _loApicTimerIntStub); /* interrupt stub memory for */ + _loapic_timer_irq_stub); /* interrupt stub memory for */ /* irq_connect() */ #else /* !CONFIG_DYNAMIC_INT_STUBS */ -extern void *_loApicTimerIntStub; -SYS_INT_REGISTER(_loApicTimerIntStub, LOAPIC_TIMER_IRQ, LOAPIC_TIMER_INT_PRI); +extern void *_loapic_timer_irq_stub; +SYS_INT_REGISTER(_loapic_timer_irq_stub, LOAPIC_TIMER_IRQ, LOAPIC_TIMER_INT_PRI); #endif /* CONFIG_DYNAMIC_INT_STUBS */ static uint32_t __noinit counterLoadVal; /* computed counter 0 @@ -596,7 +596,7 @@ void timer_driver(int priority /* priority parameter ignored by this driver */ LOAPIC_TIMER_INT_PRI, _loApicTimerIntHandler, 0, - _loApicTimerIntStub); + _loapic_timer_irq_stub); #else /* !CONFIG_DYNAMIC_INT_STUBS */ /* * Although the stub has already been "connected", the vector number