On 10/02/15 16:17, Luis R. Rodriguez wrote: > On Fri, Aug 28, 2015 at 07:13:08PM -0700, Randy Dunlap wrote: >> On 08/28/15 17:17, Luis R. Rodriguez wrote: >>> >>> arch/s390/Kconfig | 8 +++++ >>> arch/s390/include/asm/io.h | 11 ------- >>> arch/s390/include/asm/pci.h | 2 -- >>> arch/s390/include/asm/pci_iomap.h | 33 +++++++++++++++++++++ >>> arch/s390/pci/pci.c | 2 ++ >>> include/asm-generic/io.h | 12 -------- >>> include/asm-generic/iomap.h | 10 ------- >>> include/asm-generic/pci_iomap.h | 62 +++++++++++++++++++++++++++++++++++---- >>> lib/Kconfig | 1 + >>> lib/pci_iomap.c | 5 ++++ >>> 10 files changed, 105 insertions(+), 41 deletions(-) >>> create mode 100644 arch/s390/include/asm/pci_iomap.h >>> >>> diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig >>> index 1d57000b1b24..1217b7db4265 100644 >>> --- a/arch/s390/Kconfig >>> +++ b/arch/s390/Kconfig >>> @@ -614,6 +614,14 @@ endif # PCI >>> config PCI_DOMAINS >>> def_bool PCI >>> >>> +config ARCH_PCI_NON_DISJUNCTIVE >>> + def_bool PCI >>> + help >>> + On the S390 architecture PCI BAR spaces are not disjunctive, as such >> >> are not disjoint? may be overlapping? >> >>> + the PCI bar is required on a series of otherwise asm generic PCI >>> + routines, as such S390 requires itw own implemention for these >> >> its own implementation > > Thanks, I've re-written this as: > > mcgrof@ergon ~/linux-next (git::(no branch, rebasing 20150805-pend-all))$ git diff > diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig > index f4725d1af438..8ba5826ed13b 100644 > --- a/arch/s390/Kconfig > +++ b/arch/s390/Kconfig > @@ -618,10 +618,10 @@ config PCI_DOMAINS > config ARCH_PCI_NON_DISJUNCTIVE > def_bool PCI > help > - On the S390 architecture PCI BAR spaces are not disjunctive, as such > - the PCI bar is required on a series of otherwise asm generic PCI > - routines, as such S390 requires itw own implemention for these > - routines. > + On the S390 architecture PCI BAR spaces may overlap with each other, That "other," should not end with a comma. Either use a semi-colon or use a period and begin the next sentence with Because. > + because of this the PCI bar is required on a series of otherwise asm > + generic PCI routines and this in turn requires S390 to provide its > + own implementation for these routines. > > config HAS_IOMEM > def_bool PCI >> -- ~Randy -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
