Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d9a4731 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Benjamin Herrenschmidt
Browse files

powerpc: Random little legacy iSeries removal tidy ups 



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 7ba3e4f5

arch/powerpc/boot/.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ zImage.bin.* 
zImage.chrp

zImage.coff

zImage.holly

zImage.iseries

zImage.*lds

zImage.miboot

zImage.pmac

arch/powerpc/include/asm/iommu.h

+0 −1
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ extern void iommu_unmap_page(struct iommu_table *tbl, dma_addr_t dma_handle, 
			     struct dma_attrs *attrs);



extern void iommu_init_early_pSeries(void);

extern void iommu_init_early_iSeries(void);

extern void iommu_init_early_dart(void);

extern void iommu_init_early_pasemi(void);

arch/powerpc/include/asm/mmu-hash64.h

+0 −12
Original line number Diff line number Diff line
@@ -267,7 +267,6 @@ extern void demote_segment_4k(struct mm_struct *mm, unsigned long addr); 


extern void hpte_init_native(void);

extern void hpte_init_lpar(void);

extern void hpte_init_iSeries(void);

extern void hpte_init_beat(void);

extern void hpte_init_beat_v3(void);
@@ -325,9 +324,6 @@ extern void slb_set_size(u16 size); 
 * WARNING - If you change these you must make sure the asm

 * implementations in slb_allocate (slb_low.S), do_stab_bolted

 * (head.S) and ASM_VSID_SCRAMBLE (below) are changed accordingly.

 *

 * You'll also need to change the precomputed VSID values in head.S

 * which are used by the iSeries firmware.

 */



#define VSID_MULTIPLIER_256M	ASM_CONST(200730139)	/* 28-bit prime */
@@ -484,14 +480,6 @@ static inline unsigned long get_vsid(unsigned long context, unsigned long ea, 
			     | (ea >> SID_SHIFT_1T), 1T);

}



/*

 * This is only used on legacy iSeries in lparmap.c,

 * hence the 256MB segment assumption.

 */

#define VSID_SCRAMBLE(pvsid)	(((pvsid) * VSID_MULTIPLIER_256M) %	\

				 VSID_MODULUS_256M)

#define KERNEL_VSID(ea)		VSID_SCRAMBLE(GET_ESID(ea))



#endif /* __ASSEMBLY__ */



#endif /* _ASM_POWERPC_MMU_HASH64_H_ */

arch/powerpc/include/asm/smp.h

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ extern void smp_muxed_ipi_set_data(int cpu, unsigned long data); 
extern void smp_muxed_ipi_message_pass(int cpu, int msg);

extern irqreturn_t smp_ipi_demux(void);



void smp_init_iSeries(void);

void smp_init_pSeries(void);

void smp_init_cell(void);

void smp_init_celleb(void);

arch/powerpc/include/asm/udbg.h

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ extern void __init udbg_init_debug_lpar_hvsi(void); 
extern void __init udbg_init_pmac_realmode(void);

extern void __init udbg_init_maple_realmode(void);

extern void __init udbg_init_pas_realmode(void);

extern void __init udbg_init_iseries(void);

extern void __init udbg_init_rtas_panel(void);

extern void __init udbg_init_rtas_console(void);

extern void __init udbg_init_debug_beat(void);