sparc64: Use the cond_syscall()s in kernel/sys_ni.c instead of home-grown copy.
This also allows arch/sparc64/kernel/pci.c to be properly CONFIG_PCI conditional compiled in the Makefile. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
85269eb554
commit
783c98b911
|
@ -10,13 +10,13 @@ extra-y := head.o init_task.o vmlinux.lds
|
||||||
obj-y := process.o setup.o cpu.o idprom.o \
|
obj-y := process.o setup.o cpu.o idprom.o \
|
||||||
traps.o auxio.o una_asm.o sysfs.o iommu.o \
|
traps.o auxio.o una_asm.o sysfs.o iommu.o \
|
||||||
irq.o ptrace.o time.o sys_sparc.o signal.o \
|
irq.o ptrace.o time.o sys_sparc.o signal.o \
|
||||||
unaligned.o central.o pci.o starfire.o \
|
unaligned.o central.o starfire.o \
|
||||||
power.o sbus.o sparc64_ksyms.o \
|
power.o sbus.o sparc64_ksyms.o \
|
||||||
visemul.o prom.o of_device.o hvapi.o sstate.o mdesc.o
|
visemul.o prom.o of_device.o hvapi.o sstate.o mdesc.o
|
||||||
|
|
||||||
obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o
|
obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o
|
||||||
obj-$(CONFIG_STACKTRACE) += stacktrace.o
|
obj-$(CONFIG_STACKTRACE) += stacktrace.o
|
||||||
obj-$(CONFIG_PCI) += ebus.o pci_common.o \
|
obj-$(CONFIG_PCI) += ebus.o pci.o pci_common.o \
|
||||||
pci_psycho.o pci_sabre.o pci_schizo.o \
|
pci_psycho.o pci_sabre.o pci_schizo.o \
|
||||||
pci_sun4v.o pci_sun4v_asm.o pci_fire.o
|
pci_sun4v.o pci_sun4v_asm.o pci_fire.o
|
||||||
obj-$(CONFIG_PCI_MSI) += pci_msi.o
|
obj-$(CONFIG_PCI_MSI) += pci_msi.o
|
||||||
|
|
|
@ -28,22 +28,6 @@
|
||||||
|
|
||||||
#include "pci_impl.h"
|
#include "pci_impl.h"
|
||||||
|
|
||||||
#ifndef CONFIG_PCI
|
|
||||||
/* A "nop" PCI implementation. */
|
|
||||||
asmlinkage int sys_pciconfig_read(unsigned long bus, unsigned long dfn,
|
|
||||||
unsigned long off, unsigned long len,
|
|
||||||
unsigned char *buf)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
asmlinkage int sys_pciconfig_write(unsigned long bus, unsigned long dfn,
|
|
||||||
unsigned long off, unsigned long len,
|
|
||||||
unsigned char *buf)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
|
|
||||||
/* List of all PCI controllers found in the system. */
|
/* List of all PCI controllers found in the system. */
|
||||||
struct pci_pbm_info *pci_pbm_root = NULL;
|
struct pci_pbm_info *pci_pbm_root = NULL;
|
||||||
|
|
||||||
|
@ -1215,5 +1199,3 @@ void pci_resource_to_user(const struct pci_dev *pdev, int bar,
|
||||||
*start = rp->start - offset;
|
*start = rp->start - offset;
|
||||||
*end = rp->end - offset;
|
*end = rp->end - offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* !(CONFIG_PCI) */
|
|
||||||
|
|
Loading…
Reference in a new issue