lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sparc32: added CONFIG_PCIC_PCI Kconfig setting

Browse Source 
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Daniel Hellstrom
2011-05-23 21:04:46 +00:00
committed by David S. Miller
parent 1fa7b6a29c
commit cfe3af5dde
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/sparc/Kconfig
View File

@@ -528,6 +528,11 @@ config PCI_DOMAINS
config PCI_SYSCALL config PCI_SYSCALL
def_bool PCI def_bool PCI
config PCIC_PCI
bool
depends on PCI && !SPARC_LEON
default y
source "drivers/pci/Kconfig" source "drivers/pci/Kconfig"
source "drivers/pcmcia/Kconfig" source "drivers/pcmcia/Kconfig"

2
arch/sparc/include/asm/pcic.h
View File

@@ -29,7 +29,7 @@ struct linux_pcic {
int pcic_imdim; int pcic_imdim;
}; };
#ifdef CONFIG_PCI #ifdef CONFIG_PCIC_PCI
extern int pcic_present(void); extern int pcic_present(void);
extern int pcic_probe(void); extern int pcic_probe(void);
extern void pci_time_init(void); extern void pci_time_init(void);

2
arch/sparc/kernel/Makefile
View File

@@ -73,7 +73,7 @@ obj-$(CONFIG_SPARC64_SMP) += cpumap.o
obj-y += dma.o obj-y += dma.o
obj-$(CONFIG_SPARC32_PCI) += pcic.o obj-$(CONFIG_PCIC_PCI) += pcic.o
obj-$(CONFIG_SMP) += trampoline_$(BITS).o smp_$(BITS).o obj-$(CONFIG_SMP) += trampoline_$(BITS).o smp_$(BITS).o
obj-$(CONFIG_SPARC32_SMP) += sun4m_smp.o sun4d_smp.o leon_smp.o obj-$(CONFIG_SPARC32_SMP) += sun4m_smp.o sun4d_smp.o leon_smp.o

4
arch/sparc/kernel/entry.S
View File

@@ -1604,7 +1604,7 @@ restore_current:
retl retl
nop nop
#ifdef CONFIG_PCI #ifdef CONFIG_PCIC_PCI
#include <asm/pcic.h> #include <asm/pcic.h>
.align 4 .align 4
@@ -1650,7 +1650,7 @@ pcic_nmi_trap_patch:
rd %psr, %l0 rd %psr, %l0
.word 0 .word 0
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCIC_PCI */
.globl flushw_all .globl flushw_all
flushw_all: flushw_all: