powerpc: Remove the remaining CONFIG_PPC_ISERIES pieces

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index f6622e022364b50c96219f704604f82a61b3e9ea..e8461cb18d0435e5716ae0ef098116d82ecb242f 100644 (file)
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -184,7 +184,6 @@ image-$(CONFIG_PPC_EFIKA)           += zImage.chrp
 image-$(CONFIG_PPC_PMAC)               += zImage.pmac
 image-$(CONFIG_PPC_HOLLY)              += dtbImage.holly
 image-$(CONFIG_PPC_PRPMC2800)          += dtbImage.prpmc2800
 image-$(CONFIG_PPC_PMAC)               += zImage.pmac
 image-$(CONFIG_PPC_HOLLY)              += dtbImage.holly
 image-$(CONFIG_PPC_PRPMC2800)          += dtbImage.prpmc2800

-image-$(CONFIG_PPC_ISERIES)            += zImage.iseries

 image-$(CONFIG_DEFAULT_UIMAGE)         += uImage
 image-$(CONFIG_EPAPR_BOOT)             += zImage.epapr
 
 image-$(CONFIG_DEFAULT_UIMAGE)         += uImage
 image-$(CONFIG_EPAPR_BOOT)             += zImage.epapr
 


@@ -311,12 +310,6 @@ $(obj)/dtbImage.%: vmlinux $(wrapperbits) $(obj)/%.dtb
 $(obj)/vmlinux.strip: vmlinux
        $(STRIP) -s -R .comment $< -o $@
 
 $(obj)/vmlinux.strip: vmlinux
        $(STRIP) -s -R .comment $< -o $@
 

-# The iseries hypervisor won't take an ET_DYN executable, so this
-# changes the type (byte 17) in the file to ET_EXEC (2).
-$(obj)/zImage.iseries: vmlinux
-       $(STRIP) -s -R .comment $< -o $@
-       printf "\x02" | dd of=$@ conv=notrunc bs=1 seek=17
-

 $(obj)/uImage: vmlinux $(wrapperbits)
        $(call if_changed,wrap,uboot)
 
 $(obj)/uImage: vmlinux $(wrapperbits)
        $(call if_changed,wrap,uboot)
 


@@ -364,7 +357,7 @@ install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))
 # anything not in $(targets)
 clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \
        zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \
 # anything not in $(targets)
 clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \
        zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \

-       zImage.iseries zImage.miboot zImage.pmac zImage.pseries \
+       zImage.miboot zImage.pmac zImage.pseries \

        zImage.maple simpleImage.* otheros.bld *.dtb
 
 # clean up files cached by wrapper
        zImage.maple simpleImage.* otheros.bld *.dtb
 
 # clean up files cached by wrapper

diff --git a/arch/powerpc/include/asm/dma.h b/arch/powerpc/include/asm/dma.h
index a7e06e25c7083b6648109f66a4e04f551672cf86..adadb994361053ba22389e4c73aa64e42bc0f285 100644 (file)
--- a/arch/powerpc/include/asm/dma.h
+++ b/arch/powerpc/include/asm/dma.h
@@ -34,8 +34,6 @@
 /* Doesn't really apply... */
 #define MAX_DMA_ADDRESS                (~0UL)
 
 /* Doesn't really apply... */
 #define MAX_DMA_ADDRESS                (~0UL)
 

-#if !defined(CONFIG_PPC_ISERIES) || defined(CONFIG_PCI)
-

 #ifdef HAVE_REALLY_SLOW_DMA_CONTROLLER
 #define dma_outb       outb_p
 #else
 #ifdef HAVE_REALLY_SLOW_DMA_CONTROLLER
 #define dma_outb       outb_p
 #else


@@ -354,7 +352,5 @@ extern int isa_dma_bridge_buggy;
 #define isa_dma_bridge_buggy   (0)
 #endif
 
 #define isa_dma_bridge_buggy   (0)
 #endif
 

-#endif /* !defined(CONFIG_PPC_ISERIES) || defined(CONFIG_PCI) */
-

 #endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_DMA_H */
 #endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_DMA_H */

diff --git a/arch/powerpc/include/asm/lppaca.h b/arch/powerpc/include/asm/lppaca.h
index e0298d26ce5d9fba9ca7b772fcec6bf9fbbd671e..a76254af0aaa94024fcb999a923b04140ddd20d4 100644 (file)
--- a/arch/powerpc/include/asm/lppaca.h
+++ b/arch/powerpc/include/asm/lppaca.h
@@ -41,15 +41,7 @@
  * We only have to have statically allocated lppaca structs on
  * legacy iSeries, which supports at most 64 cpus.
  */
  * We only have to have statically allocated lppaca structs on
  * legacy iSeries, which supports at most 64 cpus.
  */

-#ifdef CONFIG_PPC_ISERIES
-#if NR_CPUS < 64
-#define NR_LPPACAS     NR_CPUS
-#else
-#define NR_LPPACAS     64
-#endif
-#else /* not iSeries */

 #define NR_LPPACAS     1
 #define NR_LPPACAS     1

-#endif

 
 
 /* The Hypervisor barfs if the lppaca crosses a page boundary.  A 1k
 
 
 /* The Hypervisor barfs if the lppaca crosses a page boundary.  A 1k

diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
index f9611bd69ed2a102b38e67da0451be7694c70a5b..7124fc06ad47d304303b93e725f0c4a1f822d0eb 100644 (file)
--- a/arch/powerpc/include/asm/spinlock.h
+++ b/arch/powerpc/include/asm/spinlock.h
@@ -23,7 +23,6 @@
 #ifdef CONFIG_PPC64
 #include <asm/paca.h>
 #include <asm/hvcall.h>
 #ifdef CONFIG_PPC64
 #include <asm/paca.h>
 #include <asm/hvcall.h>

-#include <asm/iseries/hv_call.h>

 #endif
 #include <asm/asm-compat.h>
 #include <asm/synch.h>
 #endif
 #include <asm/asm-compat.h>
 #include <asm/synch.h>


@@ -95,12 +94,12 @@ static inline int arch_spin_trylock(arch_spinlock_t *lock)
  * value.
  */
 
  * value.
  */
 

-#if defined(CONFIG_PPC_SPLPAR) || defined(CONFIG_PPC_ISERIES)
+#if defined(CONFIG_PPC_SPLPAR)

 /* We only yield to the hypervisor if we are in shared processor mode */
 #define SHARED_PROCESSOR (get_lppaca()->shared_proc)
 extern void __spin_yield(arch_spinlock_t *lock);
 extern void __rw_yield(arch_rwlock_t *lock);
 /* We only yield to the hypervisor if we are in shared processor mode */
 #define SHARED_PROCESSOR (get_lppaca()->shared_proc)
 extern void __spin_yield(arch_spinlock_t *lock);
 extern void __rw_yield(arch_rwlock_t *lock);

-#else /* SPLPAR || ISERIES */
+#else /* SPLPAR */

 #define __spin_yield(x)        barrier()
 #define __rw_yield(x)  barrier()
 #define SHARED_PROCESSOR       0
 #define __spin_yield(x)        barrier()
 #define __rw_yield(x)  barrier()
 #define SHARED_PROCESSOR       0

diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index cdd0d264415fdfc6bb51ccbd17543b42d5aac15e..cc492e48ddfac1bf1db71b16b739799a7f929111 100644 (file)
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -46,9 +46,6 @@
 #include <asm/hvcall.h>
 #include <asm/xics.h>
 #endif
 #include <asm/hvcall.h>
 #include <asm/xics.h>
 #endif

-#ifdef CONFIG_PPC_ISERIES
-#include <asm/iseries/alpaca.h>
-#endif

 #ifdef CONFIG_PPC_POWERNV
 #include <asm/opal.h>
 #endif
 #ifdef CONFIG_PPC_POWERNV
 #include <asm/opal.h>
 #endif


@@ -384,17 +381,6 @@ int main(void)
        DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry));
 #endif
 
        DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry));
 #endif
 

-#ifdef CONFIG_PPC_ISERIES
-       /* the assembler miscalculates the VSID values */
-       DEFINE(PAGE_OFFSET_ESID, GET_ESID(PAGE_OFFSET));
-       DEFINE(PAGE_OFFSET_VSID, KERNEL_VSID(PAGE_OFFSET));
-       DEFINE(VMALLOC_START_ESID, GET_ESID(VMALLOC_START));
-       DEFINE(VMALLOC_START_VSID, KERNEL_VSID(VMALLOC_START));
-
-       /* alpaca */
-       DEFINE(ALPACA_SIZE, sizeof(struct alpaca));
-#endif
-

        DEFINE(PGD_TABLE_SIZE, PGD_TABLE_SIZE);
        DEFINE(PTE_SIZE, sizeof(pte_t));
 
        DEFINE(PGD_TABLE_SIZE, PGD_TABLE_SIZE);
        DEFINE(PTE_SIZE, sizeof(pte_t));