diff options
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/kernel/pcic.c | 8 | ||||
-rw-r--r-- | arch/sparc/kernel/sparc_ksyms.c | 1 | ||||
-rw-r--r-- | arch/sparc/kernel/sun4c_irq.c | 3 | ||||
-rw-r--r-- | arch/sparc/kernel/sun4d_irq.c | 12 | ||||
-rw-r--r-- | arch/sparc/kernel/sun4m_irq.c | 8 |
5 files changed, 0 insertions, 32 deletions
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c index 42002b742deb..bcdf5ad0f035 100644 --- a/arch/sparc/kernel/pcic.c +++ b/arch/sparc/kernel/pcic.c | |||
@@ -896,13 +896,6 @@ static inline unsigned long get_irqmask(int irq_nr) | |||
896 | return 1 << irq_nr; | 896 | return 1 << irq_nr; |
897 | } | 897 | } |
898 | 898 | ||
899 | static inline char *pcic_irq_itoa(unsigned int irq) | ||
900 | { | ||
901 | static char buff[16]; | ||
902 | sprintf(buff, "%d", irq); | ||
903 | return buff; | ||
904 | } | ||
905 | |||
906 | static void pcic_disable_irq(unsigned int irq_nr) | 899 | static void pcic_disable_irq(unsigned int irq_nr) |
907 | { | 900 | { |
908 | unsigned long mask, flags; | 901 | unsigned long mask, flags; |
@@ -955,7 +948,6 @@ void __init sun4m_pci_init_IRQ(void) | |||
955 | BTFIXUPSET_CALL(clear_clock_irq, pcic_clear_clock_irq, BTFIXUPCALL_NORM); | 948 | BTFIXUPSET_CALL(clear_clock_irq, pcic_clear_clock_irq, BTFIXUPCALL_NORM); |
956 | BTFIXUPSET_CALL(clear_profile_irq, pcic_clear_profile_irq, BTFIXUPCALL_NORM); | 949 | BTFIXUPSET_CALL(clear_profile_irq, pcic_clear_profile_irq, BTFIXUPCALL_NORM); |
957 | BTFIXUPSET_CALL(load_profile_irq, pcic_load_profile_irq, BTFIXUPCALL_NORM); | 950 | BTFIXUPSET_CALL(load_profile_irq, pcic_load_profile_irq, BTFIXUPCALL_NORM); |
958 | BTFIXUPSET_CALL(__irq_itoa, pcic_irq_itoa, BTFIXUPCALL_NORM); | ||
959 | } | 951 | } |
960 | 952 | ||
961 | int pcibios_assign_resource(struct pci_dev *pdev, int resource) | 953 | int pcibios_assign_resource(struct pci_dev *pdev, int resource) |
diff --git a/arch/sparc/kernel/sparc_ksyms.c b/arch/sparc/kernel/sparc_ksyms.c index 4b376fae752c..fd7deabf9982 100644 --- a/arch/sparc/kernel/sparc_ksyms.c +++ b/arch/sparc/kernel/sparc_ksyms.c | |||
@@ -163,7 +163,6 @@ EXPORT_SYMBOL(BTFIXUP_CALL(__hard_smp_processor_id)); | |||
163 | #endif | 163 | #endif |
164 | EXPORT_SYMBOL(BTFIXUP_CALL(enable_irq)); | 164 | EXPORT_SYMBOL(BTFIXUP_CALL(enable_irq)); |
165 | EXPORT_SYMBOL(BTFIXUP_CALL(disable_irq)); | 165 | EXPORT_SYMBOL(BTFIXUP_CALL(disable_irq)); |
166 | EXPORT_SYMBOL(BTFIXUP_CALL(__irq_itoa)); | ||
167 | EXPORT_SYMBOL(BTFIXUP_CALL(mmu_unlockarea)); | 166 | EXPORT_SYMBOL(BTFIXUP_CALL(mmu_unlockarea)); |
168 | EXPORT_SYMBOL(BTFIXUP_CALL(mmu_lockarea)); | 167 | EXPORT_SYMBOL(BTFIXUP_CALL(mmu_lockarea)); |
169 | EXPORT_SYMBOL(BTFIXUP_CALL(mmu_get_scsi_sgl)); | 168 | EXPORT_SYMBOL(BTFIXUP_CALL(mmu_get_scsi_sgl)); |
diff --git a/arch/sparc/kernel/sun4c_irq.c b/arch/sparc/kernel/sun4c_irq.c index 3d6a99073c42..0f2d8d9cbdba 100644 --- a/arch/sparc/kernel/sun4c_irq.c +++ b/arch/sparc/kernel/sun4c_irq.c | |||
@@ -198,8 +198,6 @@ static void __init sun4c_init_timers(irqreturn_t (*counter_fn)(int, void *, stru | |||
198 | static void sun4c_nop(void) {} | 198 | static void sun4c_nop(void) {} |
199 | #endif | 199 | #endif |
200 | 200 | ||
201 | extern char *sun4m_irq_itoa(unsigned int irq); | ||
202 | |||
203 | void __init sun4c_init_IRQ(void) | 201 | void __init sun4c_init_IRQ(void) |
204 | { | 202 | { |
205 | struct linux_prom_registers int_regs[2]; | 203 | struct linux_prom_registers int_regs[2]; |
@@ -238,7 +236,6 @@ void __init sun4c_init_IRQ(void) | |||
238 | BTFIXUPSET_CALL(clear_clock_irq, sun4c_clear_clock_irq, BTFIXUPCALL_NORM); | 236 | BTFIXUPSET_CALL(clear_clock_irq, sun4c_clear_clock_irq, BTFIXUPCALL_NORM); |
239 | BTFIXUPSET_CALL(clear_profile_irq, sun4c_clear_profile_irq, BTFIXUPCALL_NOP); | 237 | BTFIXUPSET_CALL(clear_profile_irq, sun4c_clear_profile_irq, BTFIXUPCALL_NOP); |
240 | BTFIXUPSET_CALL(load_profile_irq, sun4c_load_profile_irq, BTFIXUPCALL_NOP); | 238 | BTFIXUPSET_CALL(load_profile_irq, sun4c_load_profile_irq, BTFIXUPCALL_NOP); |
241 | BTFIXUPSET_CALL(__irq_itoa, sun4m_irq_itoa, BTFIXUPCALL_NORM); | ||
242 | sparc_init_timers = sun4c_init_timers; | 239 | sparc_init_timers = sun4c_init_timers; |
243 | #ifdef CONFIG_SMP | 240 | #ifdef CONFIG_SMP |
244 | BTFIXUPSET_CALL(set_cpu_int, sun4c_nop, BTFIXUPCALL_NOP); | 241 | BTFIXUPSET_CALL(set_cpu_int, sun4c_nop, BTFIXUPCALL_NOP); |
diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c index ca656d9bd6fd..9c30e35c88f7 100644 --- a/arch/sparc/kernel/sun4d_irq.c +++ b/arch/sparc/kernel/sun4d_irq.c | |||
@@ -560,17 +560,6 @@ void __init sun4d_init_sbi_irq(void) | |||
560 | } | 560 | } |
561 | } | 561 | } |
562 | 562 | ||
563 | static char *sun4d_irq_itoa(unsigned int irq) | ||
564 | { | ||
565 | static char buff[16]; | ||
566 | |||
567 | if (irq < (1 << 5)) | ||
568 | sprintf(buff, "%d", irq); | ||
569 | else | ||
570 | sprintf(buff, "%d,%x", sbus_to_pil[(irq >> 2) & 7], irq); | ||
571 | return buff; | ||
572 | } | ||
573 | |||
574 | void __init sun4d_init_IRQ(void) | 563 | void __init sun4d_init_IRQ(void) |
575 | { | 564 | { |
576 | local_irq_disable(); | 565 | local_irq_disable(); |
@@ -581,7 +570,6 @@ void __init sun4d_init_IRQ(void) | |||
581 | BTFIXUPSET_CALL(clear_clock_irq, sun4d_clear_clock_irq, BTFIXUPCALL_NORM); | 570 | BTFIXUPSET_CALL(clear_clock_irq, sun4d_clear_clock_irq, BTFIXUPCALL_NORM); |
582 | BTFIXUPSET_CALL(clear_profile_irq, sun4d_clear_profile_irq, BTFIXUPCALL_NORM); | 571 | BTFIXUPSET_CALL(clear_profile_irq, sun4d_clear_profile_irq, BTFIXUPCALL_NORM); |
583 | BTFIXUPSET_CALL(load_profile_irq, sun4d_load_profile_irq, BTFIXUPCALL_NORM); | 572 | BTFIXUPSET_CALL(load_profile_irq, sun4d_load_profile_irq, BTFIXUPCALL_NORM); |
584 | BTFIXUPSET_CALL(__irq_itoa, sun4d_irq_itoa, BTFIXUPCALL_NORM); | ||
585 | sparc_init_timers = sun4d_init_timers; | 573 | sparc_init_timers = sun4d_init_timers; |
586 | #ifdef CONFIG_SMP | 574 | #ifdef CONFIG_SMP |
587 | BTFIXUPSET_CALL(set_cpu_int, sun4d_set_cpu_int, BTFIXUPCALL_NORM); | 575 | BTFIXUPSET_CALL(set_cpu_int, sun4d_set_cpu_int, BTFIXUPCALL_NORM); |
diff --git a/arch/sparc/kernel/sun4m_irq.c b/arch/sparc/kernel/sun4m_irq.c index 39d712c3c809..a296c13ac18f 100644 --- a/arch/sparc/kernel/sun4m_irq.c +++ b/arch/sparc/kernel/sun4m_irq.c | |||
@@ -229,13 +229,6 @@ static void sun4m_load_profile_irq(int cpu, unsigned int limit) | |||
229 | sun4m_timers->cpu_timers[cpu].l14_timer_limit = limit; | 229 | sun4m_timers->cpu_timers[cpu].l14_timer_limit = limit; |
230 | } | 230 | } |
231 | 231 | ||
232 | char *sun4m_irq_itoa(unsigned int irq) | ||
233 | { | ||
234 | static char buff[16]; | ||
235 | sprintf(buff, "%d", irq); | ||
236 | return buff; | ||
237 | } | ||
238 | |||
239 | static void __init sun4m_init_timers(irqreturn_t (*counter_fn)(int, void *, struct pt_regs *)) | 232 | static void __init sun4m_init_timers(irqreturn_t (*counter_fn)(int, void *, struct pt_regs *)) |
240 | { | 233 | { |
241 | int reg_count, irq, cpu; | 234 | int reg_count, irq, cpu; |
@@ -388,7 +381,6 @@ void __init sun4m_init_IRQ(void) | |||
388 | BTFIXUPSET_CALL(clear_clock_irq, sun4m_clear_clock_irq, BTFIXUPCALL_NORM); | 381 | BTFIXUPSET_CALL(clear_clock_irq, sun4m_clear_clock_irq, BTFIXUPCALL_NORM); |
389 | BTFIXUPSET_CALL(clear_profile_irq, sun4m_clear_profile_irq, BTFIXUPCALL_NORM); | 382 | BTFIXUPSET_CALL(clear_profile_irq, sun4m_clear_profile_irq, BTFIXUPCALL_NORM); |
390 | BTFIXUPSET_CALL(load_profile_irq, sun4m_load_profile_irq, BTFIXUPCALL_NORM); | 383 | BTFIXUPSET_CALL(load_profile_irq, sun4m_load_profile_irq, BTFIXUPCALL_NORM); |
391 | BTFIXUPSET_CALL(__irq_itoa, sun4m_irq_itoa, BTFIXUPCALL_NORM); | ||
392 | sparc_init_timers = sun4m_init_timers; | 384 | sparc_init_timers = sun4m_init_timers; |
393 | #ifdef CONFIG_SMP | 385 | #ifdef CONFIG_SMP |
394 | BTFIXUPSET_CALL(set_cpu_int, sun4m_send_ipi, BTFIXUPCALL_NORM); | 386 | BTFIXUPSET_CALL(set_cpu_int, sun4m_send_ipi, BTFIXUPCALL_NORM); |