Merge git://oak/home/sfr/kernels/iseries/work

3 files changed, 30 insertions, 34 deletions

diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 4b7940693f3d..5a71ed9612fe 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -71,6 +71,11 @@
 #include <asm/paca.h>
 #endif
 
+int __irq_offset_value;
+#ifdef CONFIG_PPC32
+EXPORT_SYMBOL(__irq_offset_value);
+#endif
+
 static int ppc_spurious_interrupts;
 
 #if defined(CONFIG_PPC_ISERIES) && defined(CONFIG_SMP)
@@ -98,7 +103,6 @@ extern atomic_t ipi_sent;
 EXPORT_SYMBOL(irq_desc);
 
 int distribute_irqs = 1;
-int __irq_offset_value;
 u64 ppc64_interrupt_controller;
 #endif /* CONFIG_PPC64 */
 
@@ -311,7 +315,6 @@ void __init init_IRQ(void)
 }
 
 #ifdef CONFIG_PPC64
-#ifndef CONFIG_PPC_ISERIES
 /*
  * Virtual IRQ mapping code, used on systems with XICS interrupt controllers.
  */
@@ -420,8 +423,6 @@ unsigned int real_irq_to_virt_slowpath(unsigned int real_irq)
 
 }
 
-#endif /* CONFIG_PPC_ISERIES */
-
 #ifdef CONFIG_IRQSTACKS
 struct thread_info *softirq_ctx[NR_CPUS];
 struct thread_info *hardirq_ctx[NR_CPUS];
diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c
index 1b3ba8a440a6..9dda16ccde78 100644
--- a/arch/powerpc/kernel/lparcfg.c
+++ b/arch/powerpc/kernel/lparcfg.c
@@ -42,32 +42,6 @@
 
 /* #define LPARCFG_DEBUG */
 
-/* find a better place for this function... */
-static void log_plpar_hcall_return(unsigned long rc, char *tag)
-{
-        if (rc == 0)            /* success, return */
-                return;
-/* check for null tag ? */
-        if (rc == H_Hardware)
-                printk(KERN_INFO
-                       "plpar-hcall (%s) failed with hardware fault\n", tag);
-        else if (rc == H_Function)
-                printk(KERN_INFO
-                       "plpar-hcall (%s) failed; function not allowed\n", tag);
-        else if (rc == H_Authority)
-                printk(KERN_INFO
-                       "plpar-hcall (%s) failed; not authorized to this function\n",
-                       tag);
-        else if (rc == H_Parameter)
-                printk(KERN_INFO "plpar-hcall (%s) failed; Bad parameter(s)\n",
-                       tag);
-        else
-                printk(KERN_INFO
-                       "plpar-hcall (%s) failed with unexpected rc(0x%lx)\n",
-                       tag, rc);
-
-}
-
 static struct proc_dir_entry *proc_ppc64_lparcfg;
 #define LPARCFG_BUFF_SIZE 4096
 
@@ -172,6 +146,31 @@ static int lparcfg_data(struct seq_file *m, void *v)
 /*
  * Methods used to fetch LPAR data when running on a pSeries platform.
  */
+/* find a better place for this function... */
+static void log_plpar_hcall_return(unsigned long rc, char *tag)
+{
+        if (rc == 0)            /* success, return */
+                return;
+/* check for null tag ? */
+        if (rc == H_Hardware)
+                printk(KERN_INFO
+                       "plpar-hcall (%s) failed with hardware fault\n", tag);
+        else if (rc == H_Function)
+                printk(KERN_INFO
+                       "plpar-hcall (%s) failed; function not allowed\n", tag);
+        else if (rc == H_Authority)
+                printk(KERN_INFO
+                       "plpar-hcall (%s) failed; not authorized to this function\n",
+                       tag);
+        else if (rc == H_Parameter)
+                printk(KERN_INFO "plpar-hcall (%s) failed; Bad parameter(s)\n",
+                       tag);
+        else
+                printk(KERN_INFO
+                       "plpar-hcall (%s) failed with unexpected rc(0x%lx)\n",
+                       tag, rc);
+
+}
 
 /*
  * H_GET_PPP hcall returns info in 4 parms.
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index c98cfcc9cd9a..e5694335bf10 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -57,10 +57,6 @@ extern void power4_idle(void);
 boot_infos_t *boot_infos;
 struct ide_machdep_calls ppc_ide_md;
 
-/* XXX should go elsewhere */
-int __irq_offset_value;
-EXPORT_SYMBOL(__irq_offset_value);
-
 int boot_cpuid;
 EXPORT_SYMBOL_GPL(boot_cpuid);
 int boot_cpuid_phys;