summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Wilcox <willy@parisc-linux.org>2005-03-11 17:16:13 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-03-11 17:16:13 -0800
commite1842ab56bb98bb3f4bef96e6222512993d932d8 (patch)
treee21d9184af3d2c3ce42d1d25960c35a853b1549f
parente18898f00a7d8431e812b5ac44c8487cca106341 (diff)
[PATCH] Fix PA-RISC for older compilers
Fix declaration-after-code From: Grant Grundler <grundler@parisc-linux.org> From: Randolph Chung <tausq@parisc-linux.org> Signed-off-by: Matthew Wilcox <willy@parisc-linux.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/parisc/kernel/irq.c4
-rw-r--r--arch/parisc/kernel/setup.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
index 04febd66b0ea..006385dbee66 100644
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@ -102,8 +102,10 @@ int show_interrupts(struct seq_file *p, void *v)
}
if (i < NR_IRQS) {
+ struct irqaction *action;
+
spin_lock_irqsave(&irq_desc[i].lock, flags);
- struct irqaction *action = irq_desc[i].action;
+ action = irq_desc[i].action;
if (!action)
goto skip;
seq_printf(p, "%3d: ", i);
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c
index 3379a08628e0..73e9c34b0948 100644
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@ -121,6 +121,10 @@ extern void collect_boot_cpu_data(void);
void __init setup_arch(char **cmdline_p)
{
+#ifdef __LP64__
+ extern int parisc_narrow_firmware;
+#endif
+
init_per_cpu(smp_processor_id()); /* Set Modes & Enable FP */
#ifdef __LP64__
@@ -132,7 +136,6 @@ void __init setup_arch(char **cmdline_p)
pdc_console_init();
#ifdef __LP64__
- extern int parisc_narrow_firmware;
if(parisc_narrow_firmware) {
printk(KERN_INFO "Kernel is using PDC in 32-bit mode.\n");
}