Skip to content

cloud-kernel
cloud-kernel

openanolis / cloud-kernel
1 年多 前同步成功

通知 160
Star 36
Fork 7
cloud-kernel
cloud-kernel
提交 ce816fa8 编写于 作者: U Uwe Kleine-König 提交者： Linus Torvalds
浏览文件
操作

Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP 

If the renamed symbol is defined lib/iomap.c implements ioport_map and
ioport_unmap and currently (nearly) all platforms define the port
accessor functions outb/inb and friend unconditionally.  So
HAS_IOPORT_MAP is the better name for this.

Consequently NO_IOPORT is renamed to NO_IOPORT_MAP.

The motivation for this change is to reintroduce a symbol HAS_IOPORT
that signals if outb/int et al are available.  I will address that at
least one merge window later though to keep surprises to a minimum and
catch new introductions of (HAS|NO)_IOPORT.

The changes in this commit were done using:

	$ git grep -l -E '(NO|HAS)_IOPORT' | xargs perl -p -i -e 's/\b((?:CONFIG_)?(?:NO|HAS)_IOPORT)\b/$1_MAP/'
Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: NArnd Bergmann <arnd@arndb.de>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 6d08a256
隐藏空白更改
内联 并排
Showing with 59 addition and 59 deletion
arch/arc/Kconfig
浏览文件 @ ce816fa8
......@@ -57,7 +57,7 @@ config ARCH_FLATMEM_ENABLE
config MMU
def_bool y
config NO_IOPORT
config NO_IOPORT_MAP
def_bool y
config GENERIC_CALIBRATE_DELAY
......
arch/arm/Kconfig
浏览文件 @ ce816fa8
......@@ -126,7 +126,7 @@ config HAVE_TCM
config HAVE_PROC_CPU
bool
config NO_IOPORT
config NO_IOPORT_MAP
bool
config EISA
......@@ -410,7 +410,7 @@ config ARCH_EBSA110
select ISA
select NEED_MACH_IO_H
select NEED_MACH_MEMORY_H
select NO_IOPORT
select NO_IOPORT_MAP
help
This is an evaluation board for the StrongARM processor available
from Digital. It has limited hardware on-board, including an
......@@ -428,7 +428,7 @@ config ARCH_EFM32
select CPU_V7M
select GENERIC_CLOCKEVENTS
select NO_DMA
select NO_IOPORT
select NO_IOPORT_MAP
select SPARSE_IRQ
select USE_OF
help
......@@ -677,7 +677,7 @@ config ARCH_SHMOBILE_LEGACY
select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
select MULTI_IRQ_HANDLER
select NO_IOPORT
select NO_IOPORT_MAP
select PINCTRL
select PM_GENERIC_DOMAINS if PM
select SPARSE_IRQ
......@@ -699,7 +699,7 @@ config ARCH_RPC
select ISA_DMA_API
select NEED_MACH_IO_H
select NEED_MACH_MEMORY_H
select NO_IOPORT
select NO_IOPORT_MAP
select VIRT_TO_BUS
help
On the Acorn Risc-PC, Linux can support the internal IDE disk and
......@@ -760,7 +760,7 @@ config ARCH_S3C64XX
select HAVE_S3C2410_I2C if I2C
select HAVE_S3C2410_WATCHDOG if WATCHDOG
select HAVE_TCM
select NO_IOPORT
select NO_IOPORT_MAP
select PLAT_SAMSUNG
select PM_GENERIC_DOMAINS if PM
select S3C_DEV_NAND
......
arch/arm/mach-picoxcell/Kconfig
浏览文件 @ ce816fa8
......@@ -4,4 +4,4 @@ config ARCH_PICOXCELL
select ARM_VIC
select DW_APB_TIMER_OF
select HAVE_TCM
select NO_IOPORT
select NO_IOPORT_MAP
arch/arm/mach-prima2/Kconfig
浏览文件 @ ce816fa8
......@@ -3,7 +3,7 @@ config ARCH_SIRF
select ARCH_HAS_RESET_CONTROLLER
select ARCH_REQUIRE_GPIOLIB
select GENERIC_IRQ_CHIP
select NO_IOPORT
select NO_IOPORT_MAP
select PINCTRL
select PINCTRL_SIRF
help
......
arch/arm/mach-s3c24xx/Kconfig
浏览文件 @ ce816fa8
......@@ -12,7 +12,7 @@ if ARCH_S3C24XX
config PLAT_S3C24XX
def_bool y
select ARCH_REQUIRE_GPIOLIB
select NO_IOPORT
select NO_IOPORT_MAP
select S3C_DEV_NAND
select IRQ_DOMAIN
help
......
arch/arm/mach-shmobile/Kconfig
浏览文件 @ ce816fa8
......@@ -10,7 +10,7 @@ config ARCH_SHMOBILE_MULTI
select ARM_GIC
select MIGHT_HAVE_PCI
select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
select NO_IOPORT
select NO_IOPORT_MAP
select PINCTRL
select ARCH_REQUIRE_GPIOLIB
......
arch/arm/mach-vexpress/Kconfig
浏览文件 @ ce816fa8
......@@ -10,7 +10,7 @@ config ARCH_VEXPRESS
select HAVE_ARM_TWD if SMP
select HAVE_PATA_PLATFORM
select ICST
select NO_IOPORT
select NO_IOPORT_MAP
select PLAT_VERSATILE
select PLAT_VERSATILE_CLCD
select POWER_RESET
......
arch/arm/plat-samsung/Kconfig
浏览文件 @ ce816fa8
......@@ -9,7 +9,7 @@ config PLAT_SAMSUNG
depends on PLAT_S3C24XX || ARCH_S3C64XX || PLAT_S5P || ARCH_EXYNOS
default y
select GENERIC_IRQ_CHIP
select NO_IOPORT
select NO_IOPORT_MAP
help
Base platform code for all Samsung SoC based systems
......@@ -19,7 +19,7 @@ config PLAT_S5P
default y
select ARCH_REQUIRE_GPIOLIB
select ARM_VIC
select NO_IOPORT
select NO_IOPORT_MAP
select PLAT_SAMSUNG
select S3C_GPIO_TRACK
select S5P_GPIO_DRVSTR
......
arch/arm64/Kconfig
浏览文件 @ ce816fa8
......@@ -66,7 +66,7 @@ config ARCH_PHYS_ADDR_T_64BIT
config MMU
def_bool y
config NO_IOPORT
config NO_IOPORT_MAP
def_bool y
config STACKTRACE_SUPPORT
......
arch/cris/Kconfig
浏览文件 @ ce816fa8
......@@ -29,7 +29,7 @@ config GENERIC_CALIBRATE_DELAY
bool
default y
config NO_IOPORT
config NO_IOPORT_MAP
def_bool y
config FORCE_MAX_ZONEORDER
......
arch/hexagon/Kconfig
浏览文件 @ ce816fa8
......@@ -19,7 +19,7 @@ config HEXAGON
select GENERIC_IRQ_SHOW
select HAVE_ARCH_KGDB
select HAVE_ARCH_TRACEHOOK
select NO_IOPORT
select NO_IOPORT_MAP
select GENERIC_IOMAP
select GENERIC_SMP_IDLE_THREAD
select STACKTRACE_SUPPORT
......
arch/m32r/Kconfig
浏览文件 @ ce816fa8
......@@ -28,7 +28,7 @@ config ZONE_DMA
bool
default y
config NO_IOPORT
config NO_IOPORT_MAP
def_bool y
config NO_DMA
......
arch/m68k/Kconfig
浏览文件 @ ce816fa8
......@@ -52,7 +52,7 @@ config TIME_LOW_RES
bool
default y
config NO_IOPORT
config NO_IOPORT_MAP
def_bool y
config NO_DMA
......
arch/metag/Kconfig
浏览文件 @ ce816fa8
......@@ -52,7 +52,7 @@ config GENERIC_HWEIGHT
config GENERIC_CALIBRATE_DELAY
def_bool y
config NO_IOPORT
config NO_IOPORT_MAP
def_bool y
source "init/Kconfig"
......
arch/mips/Kconfig
浏览文件 @ ce816fa8
......@@ -175,7 +175,7 @@ config MACH_DECSTATION
select CPU_R4000_WORKAROUNDS if 64BIT
select CPU_R4400_WORKAROUNDS if 64BIT
select DMA_NONCOHERENT
select NO_IOPORT
select NO_IOPORT_MAP
select IRQ_CPU
select SYS_HAS_CPU_R3000
select SYS_HAS_CPU_R4X00
......@@ -947,7 +947,7 @@ config SYNC_R4K
config MIPS_MACHINE
def_bool n
config NO_IOPORT
config NO_IOPORT_MAP
def_bool n
config GENERIC_ISA_DMA
......
arch/openrisc/Kconfig
浏览文件 @ ce816fa8
......@@ -41,7 +41,7 @@ config RWSEM_XCHGADD_ALGORITHM
config GENERIC_HWEIGHT
def_bool y
config NO_IOPORT
config NO_IOPORT_MAP
def_bool y
config TRACE_IRQFLAGS_SUPPORT
......
arch/s390/Kconfig
浏览文件 @ ce816fa8
......@@ -52,7 +52,7 @@ config KEXEC
config AUDIT_ARCH
def_bool y
config NO_IOPORT
config NO_IOPORT_MAP
def_bool y
config PCI_QUIRKS
......
arch/sh/Kconfig
浏览文件 @ ce816fa8
......@@ -3,7 +3,7 @@ config SUPERH
select ARCH_MIGHT_HAVE_PC_PARPORT
select EXPERT
select CLKDEV_LOOKUP
select HAVE_IDE if HAS_IOPORT
select HAVE_IDE if HAS_IOPORT_MAP
select HAVE_MEMBLOCK
select HAVE_MEMBLOCK_NODE_MAP
select ARCH_DISCARD_MEMBLOCK
......@@ -138,7 +138,7 @@ config ARCH_HAS_ILOG2_U32
config ARCH_HAS_ILOG2_U64
def_bool n
config NO_IOPORT
config NO_IOPORT_MAP
def_bool !PCI
depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN && \
!SH_HP6XX && !SH_SOLUTION_ENGINE
......
arch/sh/boards/Kconfig
浏览文件 @ ce816fa8
......@@ -158,7 +158,7 @@ config SH_SDK7786
bool "SDK7786"
depends on CPU_SUBTYPE_SH7786
select SYS_SUPPORTS_PCI
select NO_IOPORT if !PCI
select NO_IOPORT_MAP if !PCI
select ARCH_WANT_OPTIONAL_GPIOLIB
select HAVE_SRAM_POOL
select REGULATOR_FIXED_VOLTAGE if REGULATOR
......@@ -204,7 +204,7 @@ config SH_URQUELL
depends on CPU_SUBTYPE_SH7786
select ARCH_REQUIRE_GPIOLIB
select SYS_SUPPORTS_PCI
select NO_IOPORT if !PCI
select NO_IOPORT_MAP if !PCI
config SH_MIGOR
bool "Migo-R"
......@@ -306,7 +306,7 @@ config SH_LBOX_RE2
config SH_X3PROTO
bool "SH-X3 Prototype board"
depends on CPU_SUBTYPE_SHX3
select NO_IOPORT if !PCI
select NO_IOPORT_MAP if !PCI
select IRQ_DOMAIN
config SH_MAGIC_PANEL_R2
......@@ -333,7 +333,7 @@ config SH_POLARIS
config SH_SH2007
bool "SH-2007 board"
select NO_IOPORT
select NO_IOPORT_MAP
select REGULATOR_FIXED_VOLTAGE if REGULATOR
depends on CPU_SUBTYPE_SH7780
help
......
arch/sh/include/asm/io.h
浏览文件 @ ce816fa8
......@@ -122,7 +122,7 @@ __BUILD_MEMORY_STRING(__raw_, l, u32)
__BUILD_MEMORY_STRING(__raw_, q, u64)
#ifdef CONFIG_HAS_IOPORT
#ifdef CONFIG_HAS_IOPORT_MAP
/*
* Slowdown I/O port space accesses for antique hardware.
......@@ -218,7 +218,7 @@ __BUILD_IOPORT_STRING(w, u16)
__BUILD_IOPORT_STRING(l, u32)
__BUILD_IOPORT_STRING(q, u64)
#else /* !CONFIG_HAS_IOPORT */
#else /* !CONFIG_HAS_IOPORT_MAP */
#include <asm/io_noioport.h>
......
arch/sh/include/asm/io_trapped.h
浏览文件 @ ce816fa8
......@@ -36,7 +36,7 @@ __ioremap_trapped(unsigned long offset, unsigned long size)
#define __ioremap_trapped(offset, size) NULL
#endif
#ifdef CONFIG_HAS_IOPORT
#ifdef CONFIG_HAS_IOPORT_MAP
extern struct list_head trapped_io;
static inline void __iomem *
......
arch/sh/include/asm/machvec.h
浏览文件 @ ce816fa8
......@@ -21,7 +21,7 @@ struct sh_machine_vector {
int (*mv_irq_demux)(int irq);
void (*mv_init_irq)(void);
#ifdef CONFIG_HAS_IOPORT
#ifdef CONFIG_HAS_IOPORT_MAP
void __iomem *(*mv_ioport_map)(unsigned long port, unsigned int size);
void (*mv_ioport_unmap)(void __iomem *);
#endif
......
arch/sh/kernel/Makefile
浏览文件 @ ce816fa8
......@@ -22,7 +22,7 @@ obj-y := debugtraps.o dma-nommu.o dumpstack.o \
ifndef CONFIG_GENERIC_IOMAP
obj-y += iomap.o
obj-$(CONFIG_HAS_IOPORT) += ioport.o
obj-$(CONFIG_HAS_IOPORT_MAP) += ioport.o
endif
obj-$(CONFIG_SUPERH32) += sys_sh32.o
......
arch/sh/kernel/io_trapped.c
浏览文件 @ ce816fa8
......@@ -22,7 +22,7 @@
#define TRAPPED_PAGES_MAX 16
#ifdef CONFIG_HAS_IOPORT
#ifdef CONFIG_HAS_IOPORT_MAP
LIST_HEAD(trapped_io);
EXPORT_SYMBOL_GPL(trapped_io);
#endif
......@@ -90,7 +90,7 @@ int register_trapped_io(struct trapped_io *tiop)
tiop->magic = IO_TRAPPED_MAGIC;
INIT_LIST_HEAD(&tiop->list);
spin_lock_irq(&trapped_lock);
#ifdef CONFIG_HAS_IOPORT
#ifdef CONFIG_HAS_IOPORT_MAP
if (flags & IORESOURCE_IO)
list_add(&tiop->list, &trapped_io);
#endif
......
arch/tile/Kconfig
浏览文件 @ ce816fa8
......@@ -411,7 +411,7 @@ config PCI_DOMAINS
config NO_IOMEM
def_bool !PCI
config NO_IOPORT
config NO_IOPORT_MAP
def_bool !PCI
config TILE_PCI_IO
......
arch/unicore32/Kconfig
浏览文件 @ ce816fa8
......@@ -27,7 +27,7 @@ config UNICORE32
config GENERIC_CSUM
def_bool y
config NO_IOPORT
config NO_IOPORT_MAP
bool
config STACKTRACE_SUPPORT
......
arch/xtensa/Kconfig
浏览文件 @ ce816fa8
......@@ -41,7 +41,7 @@ config ARCH_HAS_ILOG2_U32
config ARCH_HAS_ILOG2_U64
def_bool n
config NO_IOPORT
config NO_IOPORT_MAP
def_bool n
config HZ
......@@ -239,7 +239,7 @@ config XTENSA_PLATFORM_XT2000
config XTENSA_PLATFORM_S6105
bool "S6105"
select SERIAL_CONSOLE
select NO_IOPORT
select NO_IOPORT_MAP
config XTENSA_PLATFORM_XTFPGA
bool "XTFPGA"
......
arch/xtensa/configs/iss_defconfig
浏览文件 @ ce816fa8
......@@ -11,7 +11,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_HWEIGHT=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_NO_IOPORT=y
CONFIG_NO_IOPORT_MAP=y
CONFIG_HZ=100
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
CONFIG_CONSTRUCTORS=y
......
arch/xtensa/configs/s6105_defconfig
浏览文件 @ ce816fa8
......@@ -11,7 +11,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_HWEIGHT=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_NO_IOPORT=y
CONFIG_NO_IOPORT_MAP=y
CONFIG_HZ=100
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
......
drivers/char/tpm/Kconfig
浏览文件 @ ce816fa8
......@@ -74,7 +74,7 @@ config TCG_NSC
config TCG_ATMEL
tristate "Atmel TPM Interface"
depends on PPC64 || HAS_IOPORT
depends on PPC64 || HAS_IOPORT_MAP
---help---
If you have a TPM security chip from Atmel say Yes and it
will be accessible from within Linux. To compile this driver
......
drivers/i2c/busses/Kconfig
浏览文件 @ ce816fa8
......@@ -936,7 +936,7 @@ config I2C_ACORN
config I2C_ELEKTOR
tristate "Elektor ISA card"
depends on ISA && HAS_IOPORT && BROKEN_ON_SMP
depends on ISA && HAS_IOPORT_MAP && BROKEN_ON_SMP
select I2C_ALGOPCF
help
This supports the PCF8584 ISA bus I2C adapter. Say Y if you own
......
drivers/net/can/sja1000/Kconfig
浏览文件 @ ce816fa8
......@@ -39,7 +39,7 @@ config CAN_EMS_PCI
config CAN_PEAK_PCMCIA
tristate "PEAK PCAN-PC Card"
depends on PCMCIA
depends on HAS_IOPORT
depends on HAS_IOPORT_MAP
---help---
This driver is for the PCAN-PC Card PCMCIA adapter (1 or 2 channels)
from PEAK-System (http://www.peak-system.com). To compile this
......
drivers/net/ethernet/3com/Kconfig
浏览文件 @ ce816fa8
......@@ -66,7 +66,7 @@ config PCMCIA_3C589
config VORTEX
tristate "3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" support"
depends on (PCI || EISA) && HAS_IOPORT
depends on (PCI || EISA) && HAS_IOPORT_MAP
select MII
---help---
This option enables driver support for a large number of 10Mbps and
......
include/asm-generic/io.h
浏览文件 @ ce816fa8
......@@ -327,7 +327,7 @@ static inline void iounmap(void __iomem *addr)
}
#endif /* CONFIG_MMU */
#ifdef CONFIG_HAS_IOPORT
#ifdef CONFIG_HAS_IOPORT_MAP
#ifndef CONFIG_GENERIC_IOMAP
static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
{
......@@ -341,7 +341,7 @@ static inline void ioport_unmap(void __iomem *p)
extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
extern void ioport_unmap(void __iomem *p);
#endif /* CONFIG_GENERIC_IOMAP */
#endif /* CONFIG_HAS_IOPORT */
#endif /* CONFIG_HAS_IOPORT_MAP */
#ifndef xlate_dev_kmem_ptr
#define xlate_dev_kmem_ptr(p) p
......
include/asm-generic/iomap.h
浏览文件 @ ce816fa8
......@@ -56,7 +56,7 @@ extern void iowrite8_rep(void __iomem *port, const void *buf, unsigned long coun
extern void iowrite16_rep(void __iomem *port, const void *buf, unsigned long count);
extern void iowrite32_rep(void __iomem *port, const void *buf, unsigned long count);
#ifdef CONFIG_HAS_IOPORT
#ifdef CONFIG_HAS_IOPORT_MAP
/* Create a virtual mapping cookie for an IO port range */
extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
extern void ioport_unmap(void __iomem *);
......
include/linux/io.h
浏览文件 @ ce816fa8
......@@ -41,7 +41,7 @@ static inline int ioremap_page_range(unsigned long addr, unsigned long end,
/*
* Managed iomap interface
*/
#ifdef CONFIG_HAS_IOPORT
#ifdef CONFIG_HAS_IOPORT_MAP
void __iomem * devm_ioport_map(struct device *dev, unsigned long port,
unsigned int nr);
void devm_ioport_unmap(struct device *dev, void __iomem *addr);
......
lib/Kconfig
浏览文件 @ ce816fa8
......@@ -342,9 +342,9 @@ config HAS_IOMEM
select GENERIC_IO
default y
config HAS_IOPORT
config HAS_IOPORT_MAP
boolean
depends on HAS_IOMEM && !NO_IOPORT
depends on HAS_IOMEM && !NO_IOPORT_MAP
default y
config HAS_DMA
......
lib/devres.c
浏览文件 @ ce816fa8
......@@ -170,7 +170,7 @@ void __iomem *devm_request_and_ioremap(struct device *device,
}
EXPORT_SYMBOL(devm_request_and_ioremap);
#ifdef CONFIG_HAS_IOPORT
#ifdef CONFIG_HAS_IOPORT_MAP
/*
* Generic iomap devres
*/
......@@ -229,7 +229,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
devm_ioport_map_match, (__force void *)addr));
}
EXPORT_SYMBOL(devm_ioport_unmap);
#endif /* CONFIG_HAS_IOPORT */
#endif /* CONFIG_HAS_IOPORT_MAP */
#ifdef CONFIG_PCI
/*
......
lib/iomap.c
浏览文件 @ ce816fa8
......@@ -224,7 +224,7 @@ EXPORT_SYMBOL(iowrite8_rep);
EXPORT_SYMBOL(iowrite16_rep);
EXPORT_SYMBOL(iowrite32_rep);
#ifdef CONFIG_HAS_IOPORT
#ifdef CONFIG_HAS_IOPORT_MAP
/* Create a virtual mapping cookie for an IO port range */
void __iomem *ioport_map(unsigned long port, unsigned int nr)
{
......@@ -239,7 +239,7 @@ void ioport_unmap(void __iomem *addr)
}
EXPORT_SYMBOL(ioport_map);
EXPORT_SYMBOL(ioport_unmap);
#endif /* CONFIG_HAS_IOPORT */
#endif /* CONFIG_HAS_IOPORT_MAP */
#ifdef CONFIG_PCI
/* Hide the details if this is a MMIO or PIO address space and just do what
......
sound/isa/Kconfig
浏览文件 @ ce816fa8
......@@ -191,7 +191,7 @@ config SND_ES18XX
config SND_SC6000
tristate "Gallant SC-6000/6600/7000 and Audio Excel DSP 16"
depends on HAS_IOPORT
depends on HAS_IOPORT_MAP
select SND_WSS_LIB
select SND_OPL3_LIB
select SND_MPU401_UART
......
sound/pci/Kconfig
浏览文件 @ ce816fa8
......@@ -688,7 +688,7 @@ config SND_LOLA
config SND_LX6464ES
tristate "Digigram LX6464ES"
depends on HAS_IOPORT
depends on HAS_IOPORT_MAP
select SND_PCM
help
Say Y here to include support for Digigram LX6464ES boards.
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或