diff options
| author | Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> | 2008-04-30 16:50:43 +0900 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2008-04-30 14:08:01 -0700 |
| commit | 751fc7849d623bcd5e77fd494b01662599a8dccf (patch) | |
| tree | d349de877e9b6cc5265a8af1cc9f1c2c78031b6a /arch/ia64 | |
| parent | c5b5a5993234d4db2079e57e456bda5278ef59cf (diff) | |
| download | kernel_samsung_espresso10-751fc7849d623bcd5e77fd494b01662599a8dccf.zip kernel_samsung_espresso10-751fc7849d623bcd5e77fd494b01662599a8dccf.tar.gz kernel_samsung_espresso10-751fc7849d623bcd5e77fd494b01662599a8dccf.tar.bz2 | |
[IA64] fix section mismatch in arch/ia64/kernel/irq.c
This patch shuts up the following:
WARNING: vmlinux.o(.text+0x7102): Section mismatch in
reference from the function fixup_irqs() to the function
.devinit.text:ia64_disable_timer()
Removing ia64_disable_timer() is safe because there are no functions
calling it other than the fixup_irqs(),
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/kernel/irq.c | 4 | ||||
| -rw-r--r-- | arch/ia64/kernel/time.c | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c index 6dee579..7fd18f5 100644 --- a/arch/ia64/kernel/irq.c +++ b/arch/ia64/kernel/irq.c @@ -183,10 +183,10 @@ void fixup_irqs(void) { unsigned int irq; extern void ia64_process_pending_intr(void); - extern void ia64_disable_timer(void); extern volatile int time_keeper_id; - ia64_disable_timer(); + /* Mask ITV to disable timer */ + ia64_set_itv(1 << 16); /* * Find a new timesync master diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index 48e15a5..8c73643 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c @@ -379,11 +379,6 @@ static struct irqaction timer_irqaction = { .name = "timer" }; -void __devinit ia64_disable_timer(void) -{ - ia64_set_itv(1 << 16); -} - void __init time_init (void) { |