mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 00:20:32 +00:00
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>
This commit is contained in:
parent
bc58450b02
commit
1b041885ae
5 changed files with 3 additions and 37 deletions
|
@ -184,7 +184,6 @@ image-$(CONFIG_PPC_EFIKA) += zImage.chrp
|
||||||
image-$(CONFIG_PPC_PMAC) += zImage.pmac
|
image-$(CONFIG_PPC_PMAC) += zImage.pmac
|
||||||
image-$(CONFIG_PPC_HOLLY) += dtbImage.holly
|
image-$(CONFIG_PPC_HOLLY) += dtbImage.holly
|
||||||
image-$(CONFIG_PPC_PRPMC2800) += dtbImage.prpmc2800
|
image-$(CONFIG_PPC_PRPMC2800) += dtbImage.prpmc2800
|
||||||
image-$(CONFIG_PPC_ISERIES) += zImage.iseries
|
|
||||||
image-$(CONFIG_DEFAULT_UIMAGE) += uImage
|
image-$(CONFIG_DEFAULT_UIMAGE) += uImage
|
||||||
image-$(CONFIG_EPAPR_BOOT) += zImage.epapr
|
image-$(CONFIG_EPAPR_BOOT) += zImage.epapr
|
||||||
|
|
||||||
|
@ -311,12 +310,6 @@ $(obj)/dtbImage.%: vmlinux $(wrapperbits) $(obj)/%.dtb
|
||||||
$(obj)/vmlinux.strip: vmlinux
|
$(obj)/vmlinux.strip: vmlinux
|
||||||
$(STRIP) -s -R .comment $< -o $@
|
$(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)
|
$(obj)/uImage: vmlinux $(wrapperbits)
|
||||||
$(call if_changed,wrap,uboot)
|
$(call if_changed,wrap,uboot)
|
||||||
|
|
||||||
|
@ -364,7 +357,7 @@ install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))
|
||||||
# anything not in $(targets)
|
# anything not in $(targets)
|
||||||
clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \
|
clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \
|
||||||
zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \
|
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
|
zImage.maple simpleImage.* otheros.bld *.dtb
|
||||||
|
|
||||||
# clean up files cached by wrapper
|
# clean up files cached by wrapper
|
||||||
|
|
|
@ -34,8 +34,6 @@
|
||||||
/* Doesn't really apply... */
|
/* Doesn't really apply... */
|
||||||
#define MAX_DMA_ADDRESS (~0UL)
|
#define MAX_DMA_ADDRESS (~0UL)
|
||||||
|
|
||||||
#if !defined(CONFIG_PPC_ISERIES) || defined(CONFIG_PCI)
|
|
||||||
|
|
||||||
#ifdef HAVE_REALLY_SLOW_DMA_CONTROLLER
|
#ifdef HAVE_REALLY_SLOW_DMA_CONTROLLER
|
||||||
#define dma_outb outb_p
|
#define dma_outb outb_p
|
||||||
#else
|
#else
|
||||||
|
@ -354,7 +352,5 @@ extern int isa_dma_bridge_buggy;
|
||||||
#define isa_dma_bridge_buggy (0)
|
#define isa_dma_bridge_buggy (0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* !defined(CONFIG_PPC_ISERIES) || defined(CONFIG_PCI) */
|
|
||||||
|
|
||||||
#endif /* __KERNEL__ */
|
#endif /* __KERNEL__ */
|
||||||
#endif /* _ASM_POWERPC_DMA_H */
|
#endif /* _ASM_POWERPC_DMA_H */
|
||||||
|
|
|
@ -41,15 +41,7 @@
|
||||||
* We only have to have statically allocated lppaca structs on
|
* We only have to have statically allocated lppaca structs on
|
||||||
* legacy iSeries, which supports at most 64 cpus.
|
* 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
|
||||||
|
|
|
@ -23,7 +23,6 @@
|
||||||
#ifdef CONFIG_PPC64
|
#ifdef CONFIG_PPC64
|
||||||
#include <asm/paca.h>
|
#include <asm/paca.h>
|
||||||
#include <asm/hvcall.h>
|
#include <asm/hvcall.h>
|
||||||
#include <asm/iseries/hv_call.h>
|
|
||||||
#endif
|
#endif
|
||||||
#include <asm/asm-compat.h>
|
#include <asm/asm-compat.h>
|
||||||
#include <asm/synch.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 */
|
/* We only yield to the hypervisor if we are in shared processor mode */
|
||||||
#define SHARED_PROCESSOR (get_lppaca()->shared_proc)
|
#define SHARED_PROCESSOR (get_lppaca()->shared_proc)
|
||||||
extern void __spin_yield(arch_spinlock_t *lock);
|
extern void __spin_yield(arch_spinlock_t *lock);
|
||||||
extern void __rw_yield(arch_rwlock_t *lock);
|
extern void __rw_yield(arch_rwlock_t *lock);
|
||||||
#else /* SPLPAR || ISERIES */
|
#else /* SPLPAR */
|
||||||
#define __spin_yield(x) barrier()
|
#define __spin_yield(x) barrier()
|
||||||
#define __rw_yield(x) barrier()
|
#define __rw_yield(x) barrier()
|
||||||
#define SHARED_PROCESSOR 0
|
#define SHARED_PROCESSOR 0
|
||||||
|
|
|
@ -46,9 +46,6 @@
|
||||||
#include <asm/hvcall.h>
|
#include <asm/hvcall.h>
|
||||||
#include <asm/xics.h>
|
#include <asm/xics.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_PPC_ISERIES
|
|
||||||
#include <asm/iseries/alpaca.h>
|
|
||||||
#endif
|
|
||||||
#ifdef CONFIG_PPC_POWERNV
|
#ifdef CONFIG_PPC_POWERNV
|
||||||
#include <asm/opal.h>
|
#include <asm/opal.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -384,17 +381,6 @@ int main(void)
|
||||||
DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry));
|
DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry));
|
||||||
#endif
|
#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(PGD_TABLE_SIZE, PGD_TABLE_SIZE);
|
||||||
DEFINE(PTE_SIZE, sizeof(pte_t));
|
DEFINE(PTE_SIZE, sizeof(pte_t));
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue