From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexandre Belloni Subject: Re: [PATCH 11/16] treewide: simplify Kconfig dependencies for removed archs Date: Tue, 20 Mar 2018 00:06:14 +0100 Message-ID: <20180319230614.GD4373@piout.net> References: <20180314143529.1456168-1-arnd@arndb.de> <20180314144614.1632190-1-arnd@arndb.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20180314144614.1632190-1-arnd@arndb.de> Sender: linux-kernel-owner@vger.kernel.org To: Arnd Bergmann Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-ide@vger.kernel.org, linux-input@vger.kernel.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, linux-pwm@vger.kernel.org, linux-rtc@vger.kernel.org, linux-spi@vger.kernel.org, linux-usb@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-watchdog@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org List-Id: linux-arch.vger.kernel.org On 14/03/2018 at 15:43:46 +0100, Arnd Bergmann wrote: > A lot of Kconfig symbols have architecture specific dependencies. > In those cases that depend on architectures we have already removed, > they can be omitted. > > Signed-off-by: Arnd Bergmann > --- > block/bounce.c | 2 +- > drivers/ide/Kconfig | 2 +- > drivers/ide/ide-generic.c | 12 +----------- > drivers/input/joystick/analog.c | 2 +- > drivers/isdn/hisax/Kconfig | 10 +++++----- > drivers/net/ethernet/davicom/Kconfig | 2 +- > drivers/net/ethernet/smsc/Kconfig | 6 +++--- > drivers/net/wireless/cisco/Kconfig | 2 +- > drivers/pwm/Kconfig | 2 +- > drivers/rtc/Kconfig | 2 +- Acked-by: Alexandre Belloni > drivers/spi/Kconfig | 4 ++-- > drivers/usb/musb/Kconfig | 2 +- > drivers/video/console/Kconfig | 3 +-- > drivers/watchdog/Kconfig | 6 ------ > drivers/watchdog/Makefile | 6 ------ > fs/Kconfig.binfmt | 5 ++--- > fs/minix/Kconfig | 2 +- > include/linux/ide.h | 7 +------ > init/Kconfig | 5 ++--- > lib/Kconfig.debug | 13 +++++-------- > lib/test_user_copy.c | 2 -- > mm/Kconfig | 7 ------- > mm/percpu.c | 4 ---- > 23 files changed, 31 insertions(+), 77 deletions(-) > > diff --git a/block/bounce.c b/block/bounce.c > index 6a3e68292273..dd0b93f2a871 100644 > --- a/block/bounce.c > +++ b/block/bounce.c > @@ -31,7 +31,7 @@ > static struct bio_set *bounce_bio_set, *bounce_bio_split; > static mempool_t *page_pool, *isa_page_pool; > > -#if defined(CONFIG_HIGHMEM) || defined(CONFIG_NEED_BOUNCE_POOL) > +#if defined(CONFIG_HIGHMEM) > static __init int init_emergency_pool(void) > { > #if defined(CONFIG_HIGHMEM) && !defined(CONFIG_MEMORY_HOTPLUG) > diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig > index cf1fb3fb5d26..901b8833847f 100644 > --- a/drivers/ide/Kconfig > +++ b/drivers/ide/Kconfig > @@ -200,7 +200,7 @@ comment "IDE chipset support/bugfixes" > > config IDE_GENERIC > tristate "generic/default IDE chipset support" > - depends on ALPHA || X86 || IA64 || M32R || MIPS || ARCH_RPC > + depends on ALPHA || X86 || IA64 || MIPS || ARCH_RPC > default ARM && ARCH_RPC > help > This is the generic IDE driver. This driver attaches to the > diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c > index 54d7c4685d23..80c0d69b83ac 100644 > --- a/drivers/ide/ide-generic.c > +++ b/drivers/ide/ide-generic.c > @@ -13,13 +13,10 @@ > #include > #include > > -/* FIXME: convert arm and m32r to use ide_platform host driver */ > +/* FIXME: convert arm to use ide_platform host driver */ > #ifdef CONFIG_ARM > #include > #endif > -#ifdef CONFIG_M32R > -#include > -#endif > > #define DRV_NAME "ide_generic" > > @@ -35,13 +32,6 @@ static const struct ide_port_info ide_generic_port_info = { > #ifdef CONFIG_ARM > static const u16 legacy_bases[] = { 0x1f0 }; > static const int legacy_irqs[] = { IRQ_HARDDISK }; > -#elif defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2) || \ > - defined(CONFIG_PLAT_OPSPUT) > -static const u16 legacy_bases[] = { 0x1f0 }; > -static const int legacy_irqs[] = { PLD_IRQ_CFIREQ }; > -#elif defined(CONFIG_PLAT_MAPPI3) > -static const u16 legacy_bases[] = { 0x1f0, 0x170 }; > -static const int legacy_irqs[] = { PLD_IRQ_CFIREQ, PLD_IRQ_IDEIREQ }; > #elif defined(CONFIG_ALPHA) > static const u16 legacy_bases[] = { 0x1f0, 0x170, 0x1e8, 0x168 }; > static const int legacy_irqs[] = { 14, 15, 11, 10 }; > diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c > index be1b4921f22a..eefac7978f93 100644 > --- a/drivers/input/joystick/analog.c > +++ b/drivers/input/joystick/analog.c > @@ -163,7 +163,7 @@ static unsigned int get_time_pit(void) > #define GET_TIME(x) do { x = (unsigned int)rdtsc(); } while (0) > #define DELTA(x,y) ((y)-(x)) > #define TIME_NAME "TSC" > -#elif defined(__alpha__) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_RISCV) || defined(CONFIG_TILE) > +#elif defined(__alpha__) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_RISCV) > #define GET_TIME(x) do { x = get_cycles(); } while (0) > #define DELTA(x,y) ((y)-(x)) > #define TIME_NAME "get_cycles" > diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig > index eb83d94ab4fe..38cfc8baae19 100644 > --- a/drivers/isdn/hisax/Kconfig > +++ b/drivers/isdn/hisax/Kconfig > @@ -109,7 +109,7 @@ config HISAX_16_3 > > config HISAX_TELESPCI > bool "Teles PCI" > - depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV || (XTENSA && !CPU_LITTLE_ENDIAN))) > + depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || (XTENSA && !CPU_LITTLE_ENDIAN))) > help > This enables HiSax support for the Teles PCI. > See on how to configure it. > @@ -237,7 +237,7 @@ config HISAX_MIC > > config HISAX_NETJET > bool "NETjet card" > - depends on PCI && (BROKEN || !(PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV || (XTENSA && !CPU_LITTLE_ENDIAN) || MICROBLAZE)) > + depends on PCI && (BROKEN || !(PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || (XTENSA && !CPU_LITTLE_ENDIAN) || MICROBLAZE)) > depends on VIRT_TO_BUS > help > This enables HiSax support for the NetJet from Traverse > @@ -249,7 +249,7 @@ config HISAX_NETJET > > config HISAX_NETJET_U > bool "NETspider U card" > - depends on PCI && (BROKEN || !(PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV || (XTENSA && !CPU_LITTLE_ENDIAN) || MICROBLAZE)) > + depends on PCI && (BROKEN || !(PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || (XTENSA && !CPU_LITTLE_ENDIAN) || MICROBLAZE)) > depends on VIRT_TO_BUS > help > This enables HiSax support for the Netspider U interface ISDN card > @@ -318,7 +318,7 @@ config HISAX_GAZEL > > config HISAX_HFC_PCI > bool "HFC PCI-Bus cards" > - depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV || (XTENSA && !CPU_LITTLE_ENDIAN))) > + depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || (XTENSA && !CPU_LITTLE_ENDIAN))) > help > This enables HiSax support for the HFC-S PCI 2BDS0 based cards. > > @@ -343,7 +343,7 @@ config HISAX_HFC_SX > > config HISAX_ENTERNOW_PCI > bool "Formula-n enter:now PCI card" > - depends on HISAX_NETJET && PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV || (XTENSA && !CPU_LITTLE_ENDIAN))) > + depends on HISAX_NETJET && PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || (XTENSA && !CPU_LITTLE_ENDIAN))) > help > This enables HiSax support for the Formula-n enter:now PCI > ISDN card. > diff --git a/drivers/net/ethernet/davicom/Kconfig b/drivers/net/ethernet/davicom/Kconfig > index 7ec2d74f94d3..680a6d983f37 100644 > --- a/drivers/net/ethernet/davicom/Kconfig > +++ b/drivers/net/ethernet/davicom/Kconfig > @@ -4,7 +4,7 @@ > > config DM9000 > tristate "DM9000 support" > - depends on ARM || BLACKFIN || MIPS || COLDFIRE || NIOS2 > + depends on ARM || MIPS || COLDFIRE || NIOS2 > select CRC32 > select MII > ---help--- > diff --git a/drivers/net/ethernet/smsc/Kconfig b/drivers/net/ethernet/smsc/Kconfig > index 948603e9b905..3da0c573d2ab 100644 > --- a/drivers/net/ethernet/smsc/Kconfig > +++ b/drivers/net/ethernet/smsc/Kconfig > @@ -5,8 +5,8 @@ > config NET_VENDOR_SMSC > bool "SMC (SMSC)/Western Digital devices" > default y > - depends on ARM || ARM64 || ATARI_ETHERNAT || BLACKFIN || COLDFIRE || \ > - ISA || M32R || MAC || MIPS || NIOS2 || PCI || \ > + depends on ARM || ARM64 || ATARI_ETHERNAT || COLDFIRE || \ > + ISA || MAC || MIPS || NIOS2 || PCI || \ > PCMCIA || SUPERH || XTENSA || H8300 > ---help--- > If you have a network (Ethernet) card belonging to this class, say Y. > @@ -37,7 +37,7 @@ config SMC91X > select CRC32 > select MII > depends on !OF || GPIOLIB > - depends on ARM || ARM64 || ATARI_ETHERNAT || BLACKFIN || COLDFIRE || \ > + depends on ARM || ARM64 || ATARI_ETHERNAT || COLDFIRE || \ > M32R || MIPS || NIOS2 || SUPERH || XTENSA || H8300 > ---help--- > This is a driver for SMC's 91x series of Ethernet chipsets, > diff --git a/drivers/net/wireless/cisco/Kconfig b/drivers/net/wireless/cisco/Kconfig > index b22567dff893..8ed0b154bb33 100644 > --- a/drivers/net/wireless/cisco/Kconfig > +++ b/drivers/net/wireless/cisco/Kconfig > @@ -33,7 +33,7 @@ config AIRO > > config AIRO_CS > tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards" > - depends on CFG80211 && PCMCIA && (BROKEN || !M32R) > + depends on CFG80211 && PCMCIA > select WIRELESS_EXT > select WEXT_SPY > select WEXT_PRIV > diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig > index 763ee50ea57d..f16aad3bf5d6 100644 > --- a/drivers/pwm/Kconfig > +++ b/drivers/pwm/Kconfig > @@ -43,7 +43,7 @@ config PWM_AB8500 > > config PWM_ATMEL > tristate "Atmel PWM support" > - depends on ARCH_AT91 || AVR32 > + depends on ARCH_AT91 > help > Generic PWM framework driver for Atmel SoC. > > diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig > index be5a3dc99c11..46af10ac45fc 100644 > --- a/drivers/rtc/Kconfig > +++ b/drivers/rtc/Kconfig > @@ -868,7 +868,7 @@ comment "Platform RTC drivers" > > config RTC_DRV_CMOS > tristate "PC-style 'CMOS'" > - depends on X86 || ARM || M32R || PPC || MIPS || SPARC64 > + depends on X86 || ARM || PPC || MIPS || SPARC64 > default y if X86 > select RTC_MC146818_LIB > help > diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig > index 603783976b81..103c13fcefa0 100644 > --- a/drivers/spi/Kconfig > +++ b/drivers/spi/Kconfig > @@ -72,10 +72,10 @@ config SPI_ARMADA_3700 > config SPI_ATMEL > tristate "Atmel SPI Controller" > depends on HAS_DMA > - depends on (ARCH_AT91 || AVR32 || COMPILE_TEST) > + depends on ARCH_AT91 || COMPILE_TEST > help > This selects a driver for the Atmel SPI Controller, present on > - many AT32 (AVR32) and AT91 (ARM) chips. > + many AT91 ARM chips. > > config SPI_AU1550 > tristate "Au1550/Au1200/Au1300 SPI Controller" > diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig > index 5506a9c03c1f..e757afc1cfd0 100644 > --- a/drivers/usb/musb/Kconfig > +++ b/drivers/usb/musb/Kconfig > @@ -87,7 +87,7 @@ config USB_MUSB_DA8XX > config USB_MUSB_TUSB6010 > tristate "TUSB6010" > depends on HAS_IOMEM > - depends on (ARCH_OMAP2PLUS || COMPILE_TEST) && !BLACKFIN > + depends on ARCH_OMAP2PLUS || COMPILE_TEST > depends on NOP_USB_XCEIV = USB_MUSB_HDRC # both built-in or both modules > > config USB_MUSB_OMAP2PLUS > diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig > index 005ed87c8216..a9e398c144f8 100644 > --- a/drivers/video/console/Kconfig > +++ b/drivers/video/console/Kconfig > @@ -6,8 +6,7 @@ menu "Console display driver support" > > config VGA_CONSOLE > bool "VGA text console" if EXPERT || !X86 > - depends on !4xx && !PPC_8xx && !SPARC && !M68K && !PARISC && !FRV && \ > - !SUPERH && !BLACKFIN && !AVR32 && !CRIS && \ > + depends on !4xx && !PPC_8xx && !SPARC && !M68K && !PARISC && !SUPERH && \ > (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \ > !ARM64 && !ARC && !MICROBLAZE && !OPENRISC > default y > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > index 0e19679348d1..79020ce95de2 100644 > --- a/drivers/watchdog/Kconfig > +++ b/drivers/watchdog/Kconfig > @@ -828,10 +828,6 @@ config BFIN_WDT > To compile this driver as a module, choose M here: the > module will be called bfin_wdt. > > -# CRIS Architecture > - > -# FRV Architecture > - > # X86 (i386 + ia64 + x86_64) Architecture > > config ACQUIRE_WDT > @@ -1431,8 +1427,6 @@ config NIC7018_WDT > To compile this driver as a module, choose M here: the module will be > called nic7018_wdt. > > -# M32R Architecture > - > # M68K Architecture > > config M54xx_WATCHDOG > diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile > index 0474d38aa854..1f9a0235f22c 100644 > --- a/drivers/watchdog/Makefile > +++ b/drivers/watchdog/Makefile > @@ -94,10 +94,6 @@ obj-$(CONFIG_SPRD_WATCHDOG) += sprd_wdt.o > # BLACKFIN Architecture > obj-$(CONFIG_BFIN_WDT) += bfin_wdt.o > > -# CRIS Architecture > - > -# FRV Architecture > - > # X86 (i386 + ia64 + x86_64) Architecture > obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o > obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o > @@ -146,8 +142,6 @@ obj-$(CONFIG_INTEL_MEI_WDT) += mei_wdt.o > obj-$(CONFIG_NI903X_WDT) += ni903x_wdt.o > obj-$(CONFIG_NIC7018_WDT) += nic7018_wdt.o > > -# M32R Architecture > - > # M68K Architecture > obj-$(CONFIG_M54xx_WATCHDOG) += m54xx_wdt.o > > diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt > index 58c2bbd385ad..57a27c42b5ac 100644 > --- a/fs/Kconfig.binfmt > +++ b/fs/Kconfig.binfmt > @@ -1,6 +1,6 @@ > config BINFMT_ELF > bool "Kernel support for ELF binaries" > - depends on MMU && (BROKEN || !FRV) > + depends on MMU > select ELFCORE > default y > ---help--- > @@ -35,7 +35,7 @@ config ARCH_BINFMT_ELF_STATE > config BINFMT_ELF_FDPIC > bool "Kernel support for FDPIC ELF binaries" > default y if !BINFMT_ELF > - depends on (ARM || FRV || BLACKFIN || (SUPERH32 && !MMU) || C6X) > + depends on (ARM || (SUPERH32 && !MMU) || C6X) > select ELFCORE > help > ELF FDPIC binaries are based on ELF, but allow the individual load > @@ -90,7 +90,6 @@ config BINFMT_SCRIPT > config BINFMT_FLAT > bool "Kernel support for flat binaries" > depends on !MMU || ARM || M68K > - depends on !FRV || BROKEN > help > Support uClinux FLAT format binaries. > > diff --git a/fs/minix/Kconfig b/fs/minix/Kconfig > index f2a0cfcef11d..bcd53a79156f 100644 > --- a/fs/minix/Kconfig > +++ b/fs/minix/Kconfig > @@ -18,7 +18,7 @@ config MINIX_FS > > config MINIX_FS_NATIVE_ENDIAN > def_bool MINIX_FS > - depends on M32R || MICROBLAZE || MIPS || S390 || SUPERH || SPARC || XTENSA || (M68K && !MMU) > + depends on MICROBLAZE || MIPS || S390 || SUPERH || SPARC || XTENSA || (M68K && !MMU) > > config MINIX_FS_BIG_ENDIAN_16BIT_INDEXED > def_bool MINIX_FS > diff --git a/include/linux/ide.h b/include/linux/ide.h > index 20d42c0d9fb6..1d6f16110eae 100644 > --- a/include/linux/ide.h > +++ b/include/linux/ide.h > @@ -25,15 +25,10 @@ > #include > #include > > -#if defined(CONFIG_CRIS) || defined(CONFIG_FRV) > -# define SUPPORT_VLB_SYNC 0 > -#else > -# define SUPPORT_VLB_SYNC 1 > -#endif > - > /* > * Probably not wise to fiddle with these > */ > +#define SUPPORT_VLB_SYNC 1 > #define IDE_DEFAULT_MAX_FAILURES 1 > #define ERROR_MAX 8 /* Max read/write errors per sector */ > #define ERROR_RESET 3 /* Reset controller every 4th retry */ > diff --git a/init/Kconfig b/init/Kconfig > index a14bcc9724a2..2852692d7c9c 100644 > --- a/init/Kconfig > +++ b/init/Kconfig > @@ -998,7 +998,6 @@ config RELAY > > config BLK_DEV_INITRD > bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support" > - depends on BROKEN || !FRV > help > The initial RAM filesystem is a ramfs which is loaded by the > boot loader (loadlin or lilo) and that is mounted as root > @@ -1108,7 +1107,7 @@ config MULTIUSER > > config SGETMASK_SYSCALL > bool "sgetmask/ssetmask syscalls support" if EXPERT > - def_bool PARISC || BLACKFIN || M68K || PPC || MIPS || X86 || SPARC || CRIS || MICROBLAZE || SUPERH > + def_bool PARISC || M68K || PPC || MIPS || X86 || SPARC || MICROBLAZE || SUPERH > ---help--- > sys_sgetmask and sys_ssetmask are obsolete system calls > no longer supported in libc but still enabled by default in some > @@ -1370,7 +1369,7 @@ config KALLSYMS_ABSOLUTE_PERCPU > config KALLSYMS_BASE_RELATIVE > bool > depends on KALLSYMS > - default !IA64 && !(TILE && 64BIT) > + default !IA64 > help > Instead of emitting them as absolute values in the native word size, > emit the symbol references in the kallsyms table as 32-bit entries, > diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug > index 41ac9d294245..6927c6d8d185 100644 > --- a/lib/Kconfig.debug > +++ b/lib/Kconfig.debug > @@ -165,7 +165,7 @@ config DEBUG_INFO_REDUCED > > config DEBUG_INFO_SPLIT > bool "Produce split debuginfo in .dwo files" > - depends on DEBUG_INFO && !FRV > + depends on DEBUG_INFO > help > Generate debug info into separate .dwo files. This significantly > reduces the build directory size for builds with DEBUG_INFO, > @@ -354,10 +354,7 @@ config ARCH_WANT_FRAME_POINTERS > > config FRAME_POINTER > bool "Compile the kernel with frame pointers" > - depends on DEBUG_KERNEL && \ > - (CRIS || M68K || FRV || UML || \ > - SUPERH || BLACKFIN) || \ > - ARCH_WANT_FRAME_POINTERS > + depends on DEBUG_KERNEL && (M68K || UML || SUPERH) || ARCH_WANT_FRAME_POINTERS > default y if (DEBUG_INFO && UML) || ARCH_WANT_FRAME_POINTERS > help > If you say Y here the resulting kernel image will be slightly > @@ -1138,7 +1135,7 @@ config LOCKDEP > bool > depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT > select STACKTRACE > - select FRAME_POINTER if !MIPS && !PPC && !ARM_UNWIND && !S390 && !MICROBLAZE && !ARC && !SCORE && !X86 > + select FRAME_POINTER if !MIPS && !PPC && !ARM_UNWIND && !S390 && !MICROBLAZE && !ARC && !X86 > select KALLSYMS > select KALLSYMS_ALL > > @@ -1571,7 +1568,7 @@ config FAULT_INJECTION_STACKTRACE_FILTER > depends on FAULT_INJECTION_DEBUG_FS && STACKTRACE_SUPPORT > depends on !X86_64 > select STACKTRACE > - select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC && !SCORE && !X86 > + select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC && !X86 > help > Provide stacktrace filter for fault-injection capabilities > > @@ -1969,7 +1966,7 @@ config STRICT_DEVMEM > bool "Filter access to /dev/mem" > depends on MMU && DEVMEM > depends on ARCH_HAS_DEVMEM_IS_ALLOWED > - default y if TILE || PPC || X86 || ARM64 > + default y if PPC || X86 || ARM64 > ---help--- > If this option is disabled, you allow userspace (root) access to all > of memory, including kernel and userspace memory. Accidental > diff --git a/lib/test_user_copy.c b/lib/test_user_copy.c > index a6556f3364d1..e161f0498f42 100644 > --- a/lib/test_user_copy.c > +++ b/lib/test_user_copy.c > @@ -31,8 +31,6 @@ > * their capability at compile-time, we just have to opt-out certain archs. > */ > #if BITS_PER_LONG == 64 || (!(defined(CONFIG_ARM) && !defined(MMU)) && \ > - !defined(CONFIG_BLACKFIN) && \ > - !defined(CONFIG_M32R) && \ > !defined(CONFIG_M68K) && \ > !defined(CONFIG_MICROBLAZE) && \ > !defined(CONFIG_NIOS2) && \ > diff --git a/mm/Kconfig b/mm/Kconfig > index abefa573bcd8..d5004d82a1d6 100644 > --- a/mm/Kconfig > +++ b/mm/Kconfig > @@ -278,13 +278,6 @@ config BOUNCE > by default when ZONE_DMA or HIGHMEM is selected, but you > may say n to override this. > > -# On the 'tile' arch, USB OHCI needs the bounce pool since tilegx will often > -# have more than 4GB of memory, but we don't currently use the IOTLB to present > -# a 32-bit address to OHCI. So we need to use a bounce pool instead. > -config NEED_BOUNCE_POOL > - bool > - default y if TILE && USB_OHCI_HCD > - > config NR_QUICK > int > depends on QUICKLIST > diff --git a/mm/percpu.c b/mm/percpu.c > index 50e7fdf84055..79e3549cab0f 100644 > --- a/mm/percpu.c > +++ b/mm/percpu.c > @@ -2719,11 +2719,7 @@ void __init setup_per_cpu_areas(void) > > if (pcpu_setup_first_chunk(ai, fc) < 0) > panic("Failed to initialize percpu areas."); > -#ifdef CONFIG_CRIS > -#warning "the CRIS architecture has physical and virtual addresses confused" > -#else > pcpu_free_alloc_info(ai); > -#endif > } > > #endif /* CONFIG_SMP */ > -- > 2.9.0 > -- Alexandre Belloni, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexandre Belloni Date: Mon, 19 Mar 2018 23:06:14 +0000 Subject: Re: [PATCH 11/16] treewide: simplify Kconfig dependencies for removed archs Message-Id: <20180319230614.GD4373@piout.net> List-Id: References: <20180314143529.1456168-1-arnd@arndb.de> <20180314144614.1632190-1-arnd@arndb.de> In-Reply-To: <20180314144614.1632190-1-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Arnd Bergmann Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-ide@vger.kernel.org, linux-input@vger.kernel.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, linux-pwm@vger.kernel.org, linux-rtc@vger.kernel.org, linux-spi@vger.kernel.org, linux-usb@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-watchdog@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org On 14/03/2018 at 15:43:46 +0100, Arnd Bergmann wrote: > A lot of Kconfig symbols have architecture specific dependencies. > In those cases that depend on architectures we have already removed, > they can be omitted. > > Signed-off-by: Arnd Bergmann > --- > block/bounce.c | 2 +- > drivers/ide/Kconfig | 2 +- > drivers/ide/ide-generic.c | 12 +----------- > drivers/input/joystick/analog.c | 2 +- > drivers/isdn/hisax/Kconfig | 10 +++++----- > drivers/net/ethernet/davicom/Kconfig | 2 +- > drivers/net/ethernet/smsc/Kconfig | 6 +++--- > drivers/net/wireless/cisco/Kconfig | 2 +- > drivers/pwm/Kconfig | 2 +- > drivers/rtc/Kconfig | 2 +- Acked-by: Alexandre Belloni > drivers/spi/Kconfig | 4 ++-- > drivers/usb/musb/Kconfig | 2 +- > drivers/video/console/Kconfig | 3 +-- > drivers/watchdog/Kconfig | 6 ------ > drivers/watchdog/Makefile | 6 ------ > fs/Kconfig.binfmt | 5 ++--- > fs/minix/Kconfig | 2 +- > include/linux/ide.h | 7 +------ > init/Kconfig | 5 ++--- > lib/Kconfig.debug | 13 +++++-------- > lib/test_user_copy.c | 2 -- > mm/Kconfig | 7 ------- > mm/percpu.c | 4 ---- > 23 files changed, 31 insertions(+), 77 deletions(-) > > diff --git a/block/bounce.c b/block/bounce.c > index 6a3e68292273..dd0b93f2a871 100644 > --- a/block/bounce.c > +++ b/block/bounce.c > @@ -31,7 +31,7 @@ > static struct bio_set *bounce_bio_set, *bounce_bio_split; > static mempool_t *page_pool, *isa_page_pool; > > -#if defined(CONFIG_HIGHMEM) || defined(CONFIG_NEED_BOUNCE_POOL) > +#if defined(CONFIG_HIGHMEM) > static __init int init_emergency_pool(void) > { > #if defined(CONFIG_HIGHMEM) && !defined(CONFIG_MEMORY_HOTPLUG) > diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig > index cf1fb3fb5d26..901b8833847f 100644 > --- a/drivers/ide/Kconfig > +++ b/drivers/ide/Kconfig > @@ -200,7 +200,7 @@ comment "IDE chipset support/bugfixes" > > config IDE_GENERIC > tristate "generic/default IDE chipset support" > - depends on ALPHA || X86 || IA64 || M32R || MIPS || ARCH_RPC > + depends on ALPHA || X86 || IA64 || MIPS || ARCH_RPC > default ARM && ARCH_RPC > help > This is the generic IDE driver. This driver attaches to the > diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c > index 54d7c4685d23..80c0d69b83ac 100644 > --- a/drivers/ide/ide-generic.c > +++ b/drivers/ide/ide-generic.c > @@ -13,13 +13,10 @@ > #include > #include > > -/* FIXME: convert arm and m32r to use ide_platform host driver */ > +/* FIXME: convert arm to use ide_platform host driver */ > #ifdef CONFIG_ARM > #include > #endif > -#ifdef CONFIG_M32R > -#include > -#endif > > #define DRV_NAME "ide_generic" > > @@ -35,13 +32,6 @@ static const struct ide_port_info ide_generic_port_info = { > #ifdef CONFIG_ARM > static const u16 legacy_bases[] = { 0x1f0 }; > static const int legacy_irqs[] = { IRQ_HARDDISK }; > -#elif defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2) || \ > - defined(CONFIG_PLAT_OPSPUT) > -static const u16 legacy_bases[] = { 0x1f0 }; > -static const int legacy_irqs[] = { PLD_IRQ_CFIREQ }; > -#elif defined(CONFIG_PLAT_MAPPI3) > -static const u16 legacy_bases[] = { 0x1f0, 0x170 }; > -static const int legacy_irqs[] = { PLD_IRQ_CFIREQ, PLD_IRQ_IDEIREQ }; > #elif defined(CONFIG_ALPHA) > static const u16 legacy_bases[] = { 0x1f0, 0x170, 0x1e8, 0x168 }; > static const int legacy_irqs[] = { 14, 15, 11, 10 }; > diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c > index be1b4921f22a..eefac7978f93 100644 > --- a/drivers/input/joystick/analog.c > +++ b/drivers/input/joystick/analog.c > @@ -163,7 +163,7 @@ static unsigned int get_time_pit(void) > #define GET_TIME(x) do { x = (unsigned int)rdtsc(); } while (0) > #define DELTA(x,y) ((y)-(x)) > #define TIME_NAME "TSC" > -#elif defined(__alpha__) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_RISCV) || defined(CONFIG_TILE) > +#elif defined(__alpha__) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_RISCV) > #define GET_TIME(x) do { x = get_cycles(); } while (0) > #define DELTA(x,y) ((y)-(x)) > #define TIME_NAME "get_cycles" > diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig > index eb83d94ab4fe..38cfc8baae19 100644 > --- a/drivers/isdn/hisax/Kconfig > +++ b/drivers/isdn/hisax/Kconfig > @@ -109,7 +109,7 @@ config HISAX_16_3 > > config HISAX_TELESPCI > bool "Teles PCI" > - depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV || (XTENSA && !CPU_LITTLE_ENDIAN))) > + depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || (XTENSA && !CPU_LITTLE_ENDIAN))) > help > This enables HiSax support for the Teles PCI. > See on how to configure it. > @@ -237,7 +237,7 @@ config HISAX_MIC > > config HISAX_NETJET > bool "NETjet card" > - depends on PCI && (BROKEN || !(PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV || (XTENSA && !CPU_LITTLE_ENDIAN) || MICROBLAZE)) > + depends on PCI && (BROKEN || !(PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || (XTENSA && !CPU_LITTLE_ENDIAN) || MICROBLAZE)) > depends on VIRT_TO_BUS > help > This enables HiSax support for the NetJet from Traverse > @@ -249,7 +249,7 @@ config HISAX_NETJET > > config HISAX_NETJET_U > bool "NETspider U card" > - depends on PCI && (BROKEN || !(PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV || (XTENSA && !CPU_LITTLE_ENDIAN) || MICROBLAZE)) > + depends on PCI && (BROKEN || !(PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || (XTENSA && !CPU_LITTLE_ENDIAN) || MICROBLAZE)) > depends on VIRT_TO_BUS > help > This enables HiSax support for the Netspider U interface ISDN card > @@ -318,7 +318,7 @@ config HISAX_GAZEL > > config HISAX_HFC_PCI > bool "HFC PCI-Bus cards" > - depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV || (XTENSA && !CPU_LITTLE_ENDIAN))) > + depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || (XTENSA && !CPU_LITTLE_ENDIAN))) > help > This enables HiSax support for the HFC-S PCI 2BDS0 based cards. > > @@ -343,7 +343,7 @@ config HISAX_HFC_SX > > config HISAX_ENTERNOW_PCI > bool "Formula-n enter:now PCI card" > - depends on HISAX_NETJET && PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV || (XTENSA && !CPU_LITTLE_ENDIAN))) > + depends on HISAX_NETJET && PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || (XTENSA && !CPU_LITTLE_ENDIAN))) > help > This enables HiSax support for the Formula-n enter:now PCI > ISDN card. > diff --git a/drivers/net/ethernet/davicom/Kconfig b/drivers/net/ethernet/davicom/Kconfig > index 7ec2d74f94d3..680a6d983f37 100644 > --- a/drivers/net/ethernet/davicom/Kconfig > +++ b/drivers/net/ethernet/davicom/Kconfig > @@ -4,7 +4,7 @@ > > config DM9000 > tristate "DM9000 support" > - depends on ARM || BLACKFIN || MIPS || COLDFIRE || NIOS2 > + depends on ARM || MIPS || COLDFIRE || NIOS2 > select CRC32 > select MII > ---help--- > diff --git a/drivers/net/ethernet/smsc/Kconfig b/drivers/net/ethernet/smsc/Kconfig > index 948603e9b905..3da0c573d2ab 100644 > --- a/drivers/net/ethernet/smsc/Kconfig > +++ b/drivers/net/ethernet/smsc/Kconfig > @@ -5,8 +5,8 @@ > config NET_VENDOR_SMSC > bool "SMC (SMSC)/Western Digital devices" > default y > - depends on ARM || ARM64 || ATARI_ETHERNAT || BLACKFIN || COLDFIRE || \ > - ISA || M32R || MAC || MIPS || NIOS2 || PCI || \ > + depends on ARM || ARM64 || ATARI_ETHERNAT || COLDFIRE || \ > + ISA || MAC || MIPS || NIOS2 || PCI || \ > PCMCIA || SUPERH || XTENSA || H8300 > ---help--- > If you have a network (Ethernet) card belonging to this class, say Y. > @@ -37,7 +37,7 @@ config SMC91X > select CRC32 > select MII > depends on !OF || GPIOLIB > - depends on ARM || ARM64 || ATARI_ETHERNAT || BLACKFIN || COLDFIRE || \ > + depends on ARM || ARM64 || ATARI_ETHERNAT || COLDFIRE || \ > M32R || MIPS || NIOS2 || SUPERH || XTENSA || H8300 > ---help--- > This is a driver for SMC's 91x series of Ethernet chipsets, > diff --git a/drivers/net/wireless/cisco/Kconfig b/drivers/net/wireless/cisco/Kconfig > index b22567dff893..8ed0b154bb33 100644 > --- a/drivers/net/wireless/cisco/Kconfig > +++ b/drivers/net/wireless/cisco/Kconfig > @@ -33,7 +33,7 @@ config AIRO > > config AIRO_CS > tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards" > - depends on CFG80211 && PCMCIA && (BROKEN || !M32R) > + depends on CFG80211 && PCMCIA > select WIRELESS_EXT > select WEXT_SPY > select WEXT_PRIV > diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig > index 763ee50ea57d..f16aad3bf5d6 100644 > --- a/drivers/pwm/Kconfig > +++ b/drivers/pwm/Kconfig > @@ -43,7 +43,7 @@ config PWM_AB8500 > > config PWM_ATMEL > tristate "Atmel PWM support" > - depends on ARCH_AT91 || AVR32 > + depends on ARCH_AT91 > help > Generic PWM framework driver for Atmel SoC. > > diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig > index be5a3dc99c11..46af10ac45fc 100644 > --- a/drivers/rtc/Kconfig > +++ b/drivers/rtc/Kconfig > @@ -868,7 +868,7 @@ comment "Platform RTC drivers" > > config RTC_DRV_CMOS > tristate "PC-style 'CMOS'" > - depends on X86 || ARM || M32R || PPC || MIPS || SPARC64 > + depends on X86 || ARM || PPC || MIPS || SPARC64 > default y if X86 > select RTC_MC146818_LIB > help > diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig > index 603783976b81..103c13fcefa0 100644 > --- a/drivers/spi/Kconfig > +++ b/drivers/spi/Kconfig > @@ -72,10 +72,10 @@ config SPI_ARMADA_3700 > config SPI_ATMEL > tristate "Atmel SPI Controller" > depends on HAS_DMA > - depends on (ARCH_AT91 || AVR32 || COMPILE_TEST) > + depends on ARCH_AT91 || COMPILE_TEST > help > This selects a driver for the Atmel SPI Controller, present on > - many AT32 (AVR32) and AT91 (ARM) chips. > + many AT91 ARM chips. > > config SPI_AU1550 > tristate "Au1550/Au1200/Au1300 SPI Controller" > diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig > index 5506a9c03c1f..e757afc1cfd0 100644 > --- a/drivers/usb/musb/Kconfig > +++ b/drivers/usb/musb/Kconfig > @@ -87,7 +87,7 @@ config USB_MUSB_DA8XX > config USB_MUSB_TUSB6010 > tristate "TUSB6010" > depends on HAS_IOMEM > - depends on (ARCH_OMAP2PLUS || COMPILE_TEST) && !BLACKFIN > + depends on ARCH_OMAP2PLUS || COMPILE_TEST > depends on NOP_USB_XCEIV = USB_MUSB_HDRC # both built-in or both modules > > config USB_MUSB_OMAP2PLUS > diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig > index 005ed87c8216..a9e398c144f8 100644 > --- a/drivers/video/console/Kconfig > +++ b/drivers/video/console/Kconfig > @@ -6,8 +6,7 @@ menu "Console display driver support" > > config VGA_CONSOLE > bool "VGA text console" if EXPERT || !X86 > - depends on !4xx && !PPC_8xx && !SPARC && !M68K && !PARISC && !FRV && \ > - !SUPERH && !BLACKFIN && !AVR32 && !CRIS && \ > + depends on !4xx && !PPC_8xx && !SPARC && !M68K && !PARISC && !SUPERH && \ > (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \ > !ARM64 && !ARC && !MICROBLAZE && !OPENRISC > default y > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > index 0e19679348d1..79020ce95de2 100644 > --- a/drivers/watchdog/Kconfig > +++ b/drivers/watchdog/Kconfig > @@ -828,10 +828,6 @@ config BFIN_WDT > To compile this driver as a module, choose M here: the > module will be called bfin_wdt. > > -# CRIS Architecture > - > -# FRV Architecture > - > # X86 (i386 + ia64 + x86_64) Architecture > > config ACQUIRE_WDT > @@ -1431,8 +1427,6 @@ config NIC7018_WDT > To compile this driver as a module, choose M here: the module will be > called nic7018_wdt. > > -# M32R Architecture > - > # M68K Architecture > > config M54xx_WATCHDOG > diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile > index 0474d38aa854..1f9a0235f22c 100644 > --- a/drivers/watchdog/Makefile > +++ b/drivers/watchdog/Makefile > @@ -94,10 +94,6 @@ obj-$(CONFIG_SPRD_WATCHDOG) += sprd_wdt.o > # BLACKFIN Architecture > obj-$(CONFIG_BFIN_WDT) += bfin_wdt.o > > -# CRIS Architecture > - > -# FRV Architecture > - > # X86 (i386 + ia64 + x86_64) Architecture > obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o > obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o > @@ -146,8 +142,6 @@ obj-$(CONFIG_INTEL_MEI_WDT) += mei_wdt.o > obj-$(CONFIG_NI903X_WDT) += ni903x_wdt.o > obj-$(CONFIG_NIC7018_WDT) += nic7018_wdt.o > > -# M32R Architecture > - > # M68K Architecture > obj-$(CONFIG_M54xx_WATCHDOG) += m54xx_wdt.o > > diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt > index 58c2bbd385ad..57a27c42b5ac 100644 > --- a/fs/Kconfig.binfmt > +++ b/fs/Kconfig.binfmt > @@ -1,6 +1,6 @@ > config BINFMT_ELF > bool "Kernel support for ELF binaries" > - depends on MMU && (BROKEN || !FRV) > + depends on MMU > select ELFCORE > default y > ---help--- > @@ -35,7 +35,7 @@ config ARCH_BINFMT_ELF_STATE > config BINFMT_ELF_FDPIC > bool "Kernel support for FDPIC ELF binaries" > default y if !BINFMT_ELF > - depends on (ARM || FRV || BLACKFIN || (SUPERH32 && !MMU) || C6X) > + depends on (ARM || (SUPERH32 && !MMU) || C6X) > select ELFCORE > help > ELF FDPIC binaries are based on ELF, but allow the individual load > @@ -90,7 +90,6 @@ config BINFMT_SCRIPT > config BINFMT_FLAT > bool "Kernel support for flat binaries" > depends on !MMU || ARM || M68K > - depends on !FRV || BROKEN > help > Support uClinux FLAT format binaries. > > diff --git a/fs/minix/Kconfig b/fs/minix/Kconfig > index f2a0cfcef11d..bcd53a79156f 100644 > --- a/fs/minix/Kconfig > +++ b/fs/minix/Kconfig > @@ -18,7 +18,7 @@ config MINIX_FS > > config MINIX_FS_NATIVE_ENDIAN > def_bool MINIX_FS > - depends on M32R || MICROBLAZE || MIPS || S390 || SUPERH || SPARC || XTENSA || (M68K && !MMU) > + depends on MICROBLAZE || MIPS || S390 || SUPERH || SPARC || XTENSA || (M68K && !MMU) > > config MINIX_FS_BIG_ENDIAN_16BIT_INDEXED > def_bool MINIX_FS > diff --git a/include/linux/ide.h b/include/linux/ide.h > index 20d42c0d9fb6..1d6f16110eae 100644 > --- a/include/linux/ide.h > +++ b/include/linux/ide.h > @@ -25,15 +25,10 @@ > #include > #include > > -#if defined(CONFIG_CRIS) || defined(CONFIG_FRV) > -# define SUPPORT_VLB_SYNC 0 > -#else > -# define SUPPORT_VLB_SYNC 1 > -#endif > - > /* > * Probably not wise to fiddle with these > */ > +#define SUPPORT_VLB_SYNC 1 > #define IDE_DEFAULT_MAX_FAILURES 1 > #define ERROR_MAX 8 /* Max read/write errors per sector */ > #define ERROR_RESET 3 /* Reset controller every 4th retry */ > diff --git a/init/Kconfig b/init/Kconfig > index a14bcc9724a2..2852692d7c9c 100644 > --- a/init/Kconfig > +++ b/init/Kconfig > @@ -998,7 +998,6 @@ config RELAY > > config BLK_DEV_INITRD > bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support" > - depends on BROKEN || !FRV > help > The initial RAM filesystem is a ramfs which is loaded by the > boot loader (loadlin or lilo) and that is mounted as root > @@ -1108,7 +1107,7 @@ config MULTIUSER > > config SGETMASK_SYSCALL > bool "sgetmask/ssetmask syscalls support" if EXPERT > - def_bool PARISC || BLACKFIN || M68K || PPC || MIPS || X86 || SPARC || CRIS || MICROBLAZE || SUPERH > + def_bool PARISC || M68K || PPC || MIPS || X86 || SPARC || MICROBLAZE || SUPERH > ---help--- > sys_sgetmask and sys_ssetmask are obsolete system calls > no longer supported in libc but still enabled by default in some > @@ -1370,7 +1369,7 @@ config KALLSYMS_ABSOLUTE_PERCPU > config KALLSYMS_BASE_RELATIVE > bool > depends on KALLSYMS > - default !IA64 && !(TILE && 64BIT) > + default !IA64 > help > Instead of emitting them as absolute values in the native word size, > emit the symbol references in the kallsyms table as 32-bit entries, > diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug > index 41ac9d294245..6927c6d8d185 100644 > --- a/lib/Kconfig.debug > +++ b/lib/Kconfig.debug > @@ -165,7 +165,7 @@ config DEBUG_INFO_REDUCED > > config DEBUG_INFO_SPLIT > bool "Produce split debuginfo in .dwo files" > - depends on DEBUG_INFO && !FRV > + depends on DEBUG_INFO > help > Generate debug info into separate .dwo files. This significantly > reduces the build directory size for builds with DEBUG_INFO, > @@ -354,10 +354,7 @@ config ARCH_WANT_FRAME_POINTERS > > config FRAME_POINTER > bool "Compile the kernel with frame pointers" > - depends on DEBUG_KERNEL && \ > - (CRIS || M68K || FRV || UML || \ > - SUPERH || BLACKFIN) || \ > - ARCH_WANT_FRAME_POINTERS > + depends on DEBUG_KERNEL && (M68K || UML || SUPERH) || ARCH_WANT_FRAME_POINTERS > default y if (DEBUG_INFO && UML) || ARCH_WANT_FRAME_POINTERS > help > If you say Y here the resulting kernel image will be slightly > @@ -1138,7 +1135,7 @@ config LOCKDEP > bool > depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT > select STACKTRACE > - select FRAME_POINTER if !MIPS && !PPC && !ARM_UNWIND && !S390 && !MICROBLAZE && !ARC && !SCORE && !X86 > + select FRAME_POINTER if !MIPS && !PPC && !ARM_UNWIND && !S390 && !MICROBLAZE && !ARC && !X86 > select KALLSYMS > select KALLSYMS_ALL > > @@ -1571,7 +1568,7 @@ config FAULT_INJECTION_STACKTRACE_FILTER > depends on FAULT_INJECTION_DEBUG_FS && STACKTRACE_SUPPORT > depends on !X86_64 > select STACKTRACE > - select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC && !SCORE && !X86 > + select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC && !X86 > help > Provide stacktrace filter for fault-injection capabilities > > @@ -1969,7 +1966,7 @@ config STRICT_DEVMEM > bool "Filter access to /dev/mem" > depends on MMU && DEVMEM > depends on ARCH_HAS_DEVMEM_IS_ALLOWED > - default y if TILE || PPC || X86 || ARM64 > + default y if PPC || X86 || ARM64 > ---help--- > If this option is disabled, you allow userspace (root) access to all > of memory, including kernel and userspace memory. Accidental > diff --git a/lib/test_user_copy.c b/lib/test_user_copy.c > index a6556f3364d1..e161f0498f42 100644 > --- a/lib/test_user_copy.c > +++ b/lib/test_user_copy.c > @@ -31,8 +31,6 @@ > * their capability at compile-time, we just have to opt-out certain archs. > */ > #if BITS_PER_LONG = 64 || (!(defined(CONFIG_ARM) && !defined(MMU)) && \ > - !defined(CONFIG_BLACKFIN) && \ > - !defined(CONFIG_M32R) && \ > !defined(CONFIG_M68K) && \ > !defined(CONFIG_MICROBLAZE) && \ > !defined(CONFIG_NIOS2) && \ > diff --git a/mm/Kconfig b/mm/Kconfig > index abefa573bcd8..d5004d82a1d6 100644 > --- a/mm/Kconfig > +++ b/mm/Kconfig > @@ -278,13 +278,6 @@ config BOUNCE > by default when ZONE_DMA or HIGHMEM is selected, but you > may say n to override this. > > -# On the 'tile' arch, USB OHCI needs the bounce pool since tilegx will often > -# have more than 4GB of memory, but we don't currently use the IOTLB to present > -# a 32-bit address to OHCI. So we need to use a bounce pool instead. > -config NEED_BOUNCE_POOL > - bool > - default y if TILE && USB_OHCI_HCD > - > config NR_QUICK > int > depends on QUICKLIST > diff --git a/mm/percpu.c b/mm/percpu.c > index 50e7fdf84055..79e3549cab0f 100644 > --- a/mm/percpu.c > +++ b/mm/percpu.c > @@ -2719,11 +2719,7 @@ void __init setup_per_cpu_areas(void) > > if (pcpu_setup_first_chunk(ai, fc) < 0) > panic("Failed to initialize percpu areas."); > -#ifdef CONFIG_CRIS > -#warning "the CRIS architecture has physical and virtual addresses confused" > -#else > pcpu_free_alloc_info(ai); > -#endif > } > > #endif /* CONFIG_SMP */ > -- > 2.9.0 > -- Alexandre Belloni, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [11/16] treewide: simplify Kconfig dependencies for removed archs From: Alexandre Belloni Message-Id: <20180319230614.GD4373@piout.net> Date: Tue, 20 Mar 2018 00:06:14 +0100 To: Arnd Bergmann Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-ide@vger.kernel.org, linux-input@vger.kernel.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, linux-pwm@vger.kernel.org, linux-rtc@vger.kernel.org, linux-spi@vger.kernel.org, linux-usb@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-watchdog@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org List-ID: T24gMTQvMDMvMjAxOCBhdCAxNTo0Mzo0NiArMDEwMCwgQXJuZCBCZXJnbWFubiB3cm90ZToKPiBB IGxvdCBvZiBLY29uZmlnIHN5bWJvbHMgaGF2ZSBhcmNoaXRlY3R1cmUgc3BlY2lmaWMgZGVwZW5k ZW5jaWVzLgo+IEluIHRob3NlIGNhc2VzIHRoYXQgZGVwZW5kIG9uIGFyY2hpdGVjdHVyZXMgd2Ug aGF2ZSBhbHJlYWR5IHJlbW92ZWQsCj4gdGhleSBjYW4gYmUgb21pdHRlZC4KPiAKPiBTaWduZWQt b2ZmLWJ5OiBBcm5kIEJlcmdtYW5uIDxhcm5kQGFybmRiLmRlPgo+IC0tLQo+ICBibG9jay9ib3Vu Y2UuYyAgICAgICAgICAgICAgICAgICAgICAgfCAgMiArLQo+ICBkcml2ZXJzL2lkZS9LY29uZmln ICAgICAgICAgICAgICAgICAgfCAgMiArLQo+ICBkcml2ZXJzL2lkZS9pZGUtZ2VuZXJpYy5jICAg ICAgICAgICAgfCAxMiArLS0tLS0tLS0tLS0KPiAgZHJpdmVycy9pbnB1dC9qb3lzdGljay9hbmFs b2cuYyAgICAgIHwgIDIgKy0KPiAgZHJpdmVycy9pc2RuL2hpc2F4L0tjb25maWcgICAgICAgICAg IHwgMTAgKysrKystLS0tLQo+ICBkcml2ZXJzL25ldC9ldGhlcm5ldC9kYXZpY29tL0tjb25maWcg fCAgMiArLQo+ICBkcml2ZXJzL25ldC9ldGhlcm5ldC9zbXNjL0tjb25maWcgICAgfCAgNiArKyst LS0KPiAgZHJpdmVycy9uZXQvd2lyZWxlc3MvY2lzY28vS2NvbmZpZyAgIHwgIDIgKy0KPiAgZHJp dmVycy9wd20vS2NvbmZpZyAgICAgICAgICAgICAgICAgIHwgIDIgKy0KPiAgZHJpdmVycy9ydGMv S2NvbmZpZyAgICAgICAgICAgICAgICAgIHwgIDIgKy0KCkFja2VkLWJ5OiBBbGV4YW5kcmUgQmVs bG9uaSA8YWxleGFuZHJlLmJlbGxvbmlAYm9vdGxpbi5jb20+Cgo+ICBkcml2ZXJzL3NwaS9LY29u ZmlnICAgICAgICAgICAgICAgICAgfCAgNCArKy0tCj4gIGRyaXZlcnMvdXNiL211c2IvS2NvbmZp ZyAgICAgICAgICAgICB8ICAyICstCj4gIGRyaXZlcnMvdmlkZW8vY29uc29sZS9LY29uZmlnICAg ICAgICB8ICAzICstLQo+ICBkcml2ZXJzL3dhdGNoZG9nL0tjb25maWcgICAgICAgICAgICAgfCAg NiAtLS0tLS0KPiAgZHJpdmVycy93YXRjaGRvZy9NYWtlZmlsZSAgICAgICAgICAgIHwgIDYgLS0t LS0tCj4gIGZzL0tjb25maWcuYmluZm10ICAgICAgICAgICAgICAgICAgICB8ICA1ICsrLS0tCj4g IGZzL21pbml4L0tjb25maWcgICAgICAgICAgICAgICAgICAgICB8ICAyICstCj4gIGluY2x1ZGUv bGludXgvaWRlLmggICAgICAgICAgICAgICAgICB8ICA3ICstLS0tLS0KPiAgaW5pdC9LY29uZmln ICAgICAgICAgICAgICAgICAgICAgICAgIHwgIDUgKystLS0KPiAgbGliL0tjb25maWcuZGVidWcg ICAgICAgICAgICAgICAgICAgIHwgMTMgKysrKystLS0tLS0tLQo+ICBsaWIvdGVzdF91c2VyX2Nv cHkuYyAgICAgICAgICAgICAgICAgfCAgMiAtLQo+ICBtbS9LY29uZmlnICAgICAgICAgICAgICAg ICAgICAgICAgICAgfCAgNyAtLS0tLS0tCj4gIG1tL3BlcmNwdS5jICAgICAgICAgICAgICAgICAg ICAgICAgICB8ICA0IC0tLS0KPiAgMjMgZmlsZXMgY2hhbmdlZCwgMzEgaW5zZXJ0aW9ucygrKSwg NzcgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2Jsb2NrL2JvdW5jZS5jIGIvYmxvY2sv Ym91bmNlLmMKPiBpbmRleCA2YTNlNjgyOTIyNzMuLmRkMGI5M2YyYTg3MSAxMDA2NDQKPiAtLS0g YS9ibG9jay9ib3VuY2UuYwo+ICsrKyBiL2Jsb2NrL2JvdW5jZS5jCj4gQEAgLTMxLDcgKzMxLDcg QEAKPiAgc3RhdGljIHN0cnVjdCBiaW9fc2V0ICpib3VuY2VfYmlvX3NldCwgKmJvdW5jZV9iaW9f c3BsaXQ7Cj4gIHN0YXRpYyBtZW1wb29sX3QgKnBhZ2VfcG9vbCwgKmlzYV9wYWdlX3Bvb2w7Cj4g IAo+IC0jaWYgZGVmaW5lZChDT05GSUdfSElHSE1FTSkgfHwgZGVmaW5lZChDT05GSUdfTkVFRF9C T1VOQ0VfUE9PTCkKPiArI2lmIGRlZmluZWQoQ09ORklHX0hJR0hNRU0pCj4gIHN0YXRpYyBfX2lu aXQgaW50IGluaXRfZW1lcmdlbmN5X3Bvb2wodm9pZCkKPiAgewo+ICAjaWYgZGVmaW5lZChDT05G SUdfSElHSE1FTSkgJiYgIWRlZmluZWQoQ09ORklHX01FTU9SWV9IT1RQTFVHKQo+IGRpZmYgLS1n aXQgYS9kcml2ZXJzL2lkZS9LY29uZmlnIGIvZHJpdmVycy9pZGUvS2NvbmZpZwo+IGluZGV4IGNm MWZiM2ZiNWQyNi4uOTAxYjg4MzM4NDdmIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvaWRlL0tjb25m aWcKPiArKysgYi9kcml2ZXJzL2lkZS9LY29uZmlnCj4gQEAgLTIwMCw3ICsyMDAsNyBAQCBjb21t ZW50ICJJREUgY2hpcHNldCBzdXBwb3J0L2J1Z2ZpeGVzIgo+ICAKPiAgY29uZmlnIElERV9HRU5F UklDCj4gIAl0cmlzdGF0ZSAiZ2VuZXJpYy9kZWZhdWx0IElERSBjaGlwc2V0IHN1cHBvcnQiCj4g LQlkZXBlbmRzIG9uIEFMUEhBIHx8IFg4NiB8fCBJQTY0IHx8IE0zMlIgfHwgTUlQUyB8fCBBUkNI X1JQQwo+ICsJZGVwZW5kcyBvbiBBTFBIQSB8fCBYODYgfHwgSUE2NCB8fCBNSVBTIHx8IEFSQ0hf UlBDCj4gIAlkZWZhdWx0IEFSTSAmJiBBUkNIX1JQQwo+ICAJaGVscAo+ICAJICBUaGlzIGlzIHRo ZSBnZW5lcmljIElERSBkcml2ZXIuICBUaGlzIGRyaXZlciBhdHRhY2hlcyB0byB0aGUKPiBkaWZm IC0tZ2l0IGEvZHJpdmVycy9pZGUvaWRlLWdlbmVyaWMuYyBiL2RyaXZlcnMvaWRlL2lkZS1nZW5l cmljLmMKPiBpbmRleCA1NGQ3YzQ2ODVkMjMuLjgwYzBkNjliODNhYyAxMDA2NDQKPiAtLS0gYS9k cml2ZXJzL2lkZS9pZGUtZ2VuZXJpYy5jCj4gKysrIGIvZHJpdmVycy9pZGUvaWRlLWdlbmVyaWMu Ywo+IEBAIC0xMywxMyArMTMsMTAgQEAKPiAgI2luY2x1ZGUgPGxpbnV4L2lkZS5oPgo+ICAjaW5j bHVkZSA8bGludXgvcGNpX2lkcy5oPgo+ICAKPiAtLyogRklYTUU6IGNvbnZlcnQgYXJtIGFuZCBt MzJyIHRvIHVzZSBpZGVfcGxhdGZvcm0gaG9zdCBkcml2ZXIgKi8KPiArLyogRklYTUU6IGNvbnZl cnQgYXJtIHRvIHVzZSBpZGVfcGxhdGZvcm0gaG9zdCBkcml2ZXIgKi8KPiAgI2lmZGVmIENPTkZJ R19BUk0KPiAgI2luY2x1ZGUgPGFzbS9pcnEuaD4KPiAgI2VuZGlmCj4gLSNpZmRlZiBDT05GSUdf TTMyUgo+IC0jaW5jbHVkZSA8YXNtL20zMnIuaD4KPiAtI2VuZGlmCj4gIAo+ICAjZGVmaW5lIERS Vl9OQU1FCSJpZGVfZ2VuZXJpYyIKPiAgCj4gQEAgLTM1LDEzICszMiw2IEBAIHN0YXRpYyBjb25z dCBzdHJ1Y3QgaWRlX3BvcnRfaW5mbyBpZGVfZ2VuZXJpY19wb3J0X2luZm8gPSB7Cj4gICNpZmRl ZiBDT05GSUdfQVJNCj4gIHN0YXRpYyBjb25zdCB1MTYgbGVnYWN5X2Jhc2VzW10gPSB7IDB4MWYw IH07Cj4gIHN0YXRpYyBjb25zdCBpbnQgbGVnYWN5X2lycXNbXSAgPSB7IElSUV9IQVJERElTSyB9 Owo+IC0jZWxpZiBkZWZpbmVkKENPTkZJR19QTEFUX00zMjcwMFVUKSB8fCBkZWZpbmVkKENPTkZJ R19QTEFUX01BUFBJMikgfHwgXAo+IC0gICAgICBkZWZpbmVkKENPTkZJR19QTEFUX09QU1BVVCkK PiAtc3RhdGljIGNvbnN0IHUxNiBsZWdhY3lfYmFzZXNbXSA9IHsgMHgxZjAgfTsKPiAtc3RhdGlj IGNvbnN0IGludCBsZWdhY3lfaXJxc1tdICA9IHsgUExEX0lSUV9DRklSRVEgfTsKPiAtI2VsaWYg ZGVmaW5lZChDT05GSUdfUExBVF9NQVBQSTMpCj4gLXN0YXRpYyBjb25zdCB1MTYgbGVnYWN5X2Jh c2VzW10gPSB7IDB4MWYwLCAweDE3MCB9Owo+IC1zdGF0aWMgY29uc3QgaW50IGxlZ2FjeV9pcnFz W10gID0geyBQTERfSVJRX0NGSVJFUSwgUExEX0lSUV9JREVJUkVRIH07Cj4gICNlbGlmIGRlZmlu ZWQoQ09ORklHX0FMUEhBKQo+ICBzdGF0aWMgY29uc3QgdTE2IGxlZ2FjeV9iYXNlc1tdID0geyAw eDFmMCwgMHgxNzAsIDB4MWU4LCAweDE2OCB9Owo+ICBzdGF0aWMgY29uc3QgaW50IGxlZ2FjeV9p cnFzW10gID0geyAxNCwgMTUsIDExLCAxMCB9Owo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2lucHV0 L2pveXN0aWNrL2FuYWxvZy5jIGIvZHJpdmVycy9pbnB1dC9qb3lzdGljay9hbmFsb2cuYwo+IGlu ZGV4IGJlMWI0OTIxZjIyYS4uZWVmYWM3OTc4ZjkzIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvaW5w dXQvam95c3RpY2svYW5hbG9nLmMKPiArKysgYi9kcml2ZXJzL2lucHV0L2pveXN0aWNrL2FuYWxv Zy5jCj4gQEAgLTE2Myw3ICsxNjMsNyBAQCBzdGF0aWMgdW5zaWduZWQgaW50IGdldF90aW1lX3Bp dCh2b2lkKQo+ICAjZGVmaW5lIEdFVF9USU1FKHgpCWRvIHsgeCA9ICh1bnNpZ25lZCBpbnQpcmR0 c2MoKTsgfSB3aGlsZSAoMCkKPiAgI2RlZmluZSBERUxUQSh4LHkpCSgoeSktKHgpKQo+ICAjZGVm aW5lIFRJTUVfTkFNRQkiVFNDIgo+IC0jZWxpZiBkZWZpbmVkKF9fYWxwaGFfXykgfHwgZGVmaW5l ZChDT05GSUdfQVJNKSB8fCBkZWZpbmVkKENPTkZJR19BUk02NCkgfHwgZGVmaW5lZChDT05GSUdf UklTQ1YpIHx8IGRlZmluZWQoQ09ORklHX1RJTEUpCj4gKyNlbGlmIGRlZmluZWQoX19hbHBoYV9f KSB8fCBkZWZpbmVkKENPTkZJR19BUk0pIHx8IGRlZmluZWQoQ09ORklHX0FSTTY0KSB8fCBkZWZp bmVkKENPTkZJR19SSVNDVikKPiAgI2RlZmluZSBHRVRfVElNRSh4KQlkbyB7IHggPSBnZXRfY3lj bGVzKCk7IH0gd2hpbGUgKDApCj4gICNkZWZpbmUgREVMVEEoeCx5KQkoKHkpLSh4KSkKPiAgI2Rl ZmluZSBUSU1FX05BTUUJImdldF9jeWNsZXMiCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvaXNkbi9o aXNheC9LY29uZmlnIGIvZHJpdmVycy9pc2RuL2hpc2F4L0tjb25maWcKPiBpbmRleCBlYjgzZDk0 YWI0ZmUuLjM4Y2ZjOGJhYWUxOSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2lzZG4vaGlzYXgvS2Nv bmZpZwo+ICsrKyBiL2RyaXZlcnMvaXNkbi9oaXNheC9LY29uZmlnCj4gQEAgLTEwOSw3ICsxMDks NyBAQCBjb25maWcgSElTQVhfMTZfMwo+ICAKPiAgY29uZmlnIEhJU0FYX1RFTEVTUENJCj4gIAli b29sICJUZWxlcyBQQ0kiCj4gLQlkZXBlbmRzIG9uIFBDSSAmJiAoQlJPS0VOIHx8ICEoU1BBUkMg fHwgUFBDIHx8IFBBUklTQyB8fCBNNjhLIHx8IChNSVBTICYmICFDUFVfTElUVExFX0VORElBTikg fHwgRlJWIHx8IChYVEVOU0EgJiYgIUNQVV9MSVRUTEVfRU5ESUFOKSkpCj4gKwlkZXBlbmRzIG9u IFBDSSAmJiAoQlJPS0VOIHx8ICEoU1BBUkMgfHwgUFBDIHx8IFBBUklTQyB8fCBNNjhLIHx8IChN SVBTICYmICFDUFVfTElUVExFX0VORElBTikgfHwgKFhURU5TQSAmJiAhQ1BVX0xJVFRMRV9FTkRJ QU4pKSkKPiAgCWhlbHAKPiAgCSAgVGhpcyBlbmFibGVzIEhpU2F4IHN1cHBvcnQgZm9yIHRoZSBU ZWxlcyBQQ0kuCj4gIAkgIFNlZSA8ZmlsZTpEb2N1bWVudGF0aW9uL2lzZG4vUkVBRE1FLkhpU2F4 PiBvbiBob3cgdG8gY29uZmlndXJlIGl0Lgo+IEBAIC0yMzcsNyArMjM3LDcgQEAgY29uZmlnIEhJ U0FYX01JQwo+ICAKPiAgY29uZmlnIEhJU0FYX05FVEpFVAo+ICAJYm9vbCAiTkVUamV0IGNhcmQi Cj4gLQlkZXBlbmRzIG9uIFBDSSAmJiAoQlJPS0VOIHx8ICEoUFBDIHx8IFBBUklTQyB8fCBNNjhL IHx8IChNSVBTICYmICFDUFVfTElUVExFX0VORElBTikgfHwgRlJWIHx8IChYVEVOU0EgJiYgIUNQ VV9MSVRUTEVfRU5ESUFOKSB8fCBNSUNST0JMQVpFKSkKPiArCWRlcGVuZHMgb24gUENJICYmIChC Uk9LRU4gfHwgIShQUEMgfHwgUEFSSVNDIHx8IE02OEsgfHwgKE1JUFMgJiYgIUNQVV9MSVRUTEVf RU5ESUFOKSB8fCAoWFRFTlNBICYmICFDUFVfTElUVExFX0VORElBTikgfHwgTUlDUk9CTEFaRSkp Cj4gIAlkZXBlbmRzIG9uIFZJUlRfVE9fQlVTCj4gIAloZWxwCj4gIAkgIFRoaXMgZW5hYmxlcyBI aVNheCBzdXBwb3J0IGZvciB0aGUgTmV0SmV0IGZyb20gVHJhdmVyc2UKPiBAQCAtMjQ5LDcgKzI0 OSw3IEBAIGNvbmZpZyBISVNBWF9ORVRKRVQKPiAgCj4gIGNvbmZpZyBISVNBWF9ORVRKRVRfVQo+ ICAJYm9vbCAiTkVUc3BpZGVyIFUgY2FyZCIKPiAtCWRlcGVuZHMgb24gUENJICYmIChCUk9LRU4g fHwgIShQUEMgfHwgUEFSSVNDIHx8IE02OEsgfHwgKE1JUFMgJiYgIUNQVV9MSVRUTEVfRU5ESUFO KSB8fCBGUlYgfHwgKFhURU5TQSAmJiAhQ1BVX0xJVFRMRV9FTkRJQU4pIHx8IE1JQ1JPQkxBWkUp KQo+ICsJZGVwZW5kcyBvbiBQQ0kgJiYgKEJST0tFTiB8fCAhKFBQQyB8fCBQQVJJU0MgfHwgTTY4 SyB8fCAoTUlQUyAmJiAhQ1BVX0xJVFRMRV9FTkRJQU4pIHx8IChYVEVOU0EgJiYgIUNQVV9MSVRU TEVfRU5ESUFOKSB8fCBNSUNST0JMQVpFKSkKPiAgCWRlcGVuZHMgb24gVklSVF9UT19CVVMKPiAg CWhlbHAKPiAgCSAgVGhpcyBlbmFibGVzIEhpU2F4IHN1cHBvcnQgZm9yIHRoZSBOZXRzcGlkZXIg VSBpbnRlcmZhY2UgSVNETiBjYXJkCj4gQEAgLTMxOCw3ICszMTgsNyBAQCBjb25maWcgSElTQVhf R0FaRUwKPiAgCj4gIGNvbmZpZyBISVNBWF9IRkNfUENJCj4gIAlib29sICJIRkMgUENJLUJ1cyBj YXJkcyIKPiAtCWRlcGVuZHMgb24gUENJICYmIChCUk9LRU4gfHwgIShTUEFSQyB8fCBQUEMgfHwg UEFSSVNDIHx8IE02OEsgfHwgKE1JUFMgJiYgIUNQVV9MSVRUTEVfRU5ESUFOKSB8fCBGUlYgfHwg KFhURU5TQSAmJiAhQ1BVX0xJVFRMRV9FTkRJQU4pKSkKPiArCWRlcGVuZHMgb24gUENJICYmIChC Uk9LRU4gfHwgIShTUEFSQyB8fCBQUEMgfHwgUEFSSVNDIHx8IE02OEsgfHwgKE1JUFMgJiYgIUNQ VV9MSVRUTEVfRU5ESUFOKSB8fCAoWFRFTlNBICYmICFDUFVfTElUVExFX0VORElBTikpKQo+ICAJ aGVscAo+ICAJICBUaGlzIGVuYWJsZXMgSGlTYXggc3VwcG9ydCBmb3IgdGhlIEhGQy1TIFBDSSAy QkRTMCBiYXNlZCBjYXJkcy4KPiAgCj4gQEAgLTM0Myw3ICszNDMsNyBAQCBjb25maWcgSElTQVhf SEZDX1NYCj4gIAo+ICBjb25maWcgSElTQVhfRU5URVJOT1dfUENJCj4gIAlib29sICJGb3JtdWxh LW4gZW50ZXI6bm93IFBDSSBjYXJkIgo+IC0JZGVwZW5kcyBvbiBISVNBWF9ORVRKRVQgJiYgUENJ ICYmIChCUk9LRU4gfHwgIShTUEFSQyB8fCBQUEMgfHwgUEFSSVNDIHx8IE02OEsgfHwgKE1JUFMg JiYgIUNQVV9MSVRUTEVfRU5ESUFOKSB8fCBGUlYgfHwgKFhURU5TQSAmJiAhQ1BVX0xJVFRMRV9F TkRJQU4pKSkKPiArCWRlcGVuZHMgb24gSElTQVhfTkVUSkVUICYmIFBDSSAmJiAoQlJPS0VOIHx8 ICEoU1BBUkMgfHwgUFBDIHx8IFBBUklTQyB8fCBNNjhLIHx8IChNSVBTICYmICFDUFVfTElUVExF X0VORElBTikgfHwgKFhURU5TQSAmJiAhQ1BVX0xJVFRMRV9FTkRJQU4pKSkKPiAgCWhlbHAKPiAg CSAgVGhpcyBlbmFibGVzIEhpU2F4IHN1cHBvcnQgZm9yIHRoZSBGb3JtdWxhLW4gZW50ZXI6bm93 IFBDSQo+ICAJICBJU0ROIGNhcmQuCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0L2V0aGVybmV0 L2Rhdmljb20vS2NvbmZpZyBiL2RyaXZlcnMvbmV0L2V0aGVybmV0L2Rhdmljb20vS2NvbmZpZwo+ IGluZGV4IDdlYzJkNzRmOTRkMy4uNjgwYTZkOTgzZjM3IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMv bmV0L2V0aGVybmV0L2Rhdmljb20vS2NvbmZpZwo+ICsrKyBiL2RyaXZlcnMvbmV0L2V0aGVybmV0 L2Rhdmljb20vS2NvbmZpZwo+IEBAIC00LDcgKzQsNyBAQAo+ICAKPiAgY29uZmlnIERNOTAwMAo+ ICAJdHJpc3RhdGUgIkRNOTAwMCBzdXBwb3J0Igo+IC0JZGVwZW5kcyBvbiBBUk0gfHwgQkxBQ0tG SU4gfHwgTUlQUyB8fCBDT0xERklSRSB8fCBOSU9TMgo+ICsJZGVwZW5kcyBvbiBBUk0gfHwgTUlQ UyB8fCBDT0xERklSRSB8fCBOSU9TMgo+ICAJc2VsZWN0IENSQzMyCj4gIAlzZWxlY3QgTUlJCj4g IAktLS1oZWxwLS0tCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0L2V0aGVybmV0L3Ntc2MvS2Nv bmZpZyBiL2RyaXZlcnMvbmV0L2V0aGVybmV0L3Ntc2MvS2NvbmZpZwo+IGluZGV4IDk0ODYwM2U5 YjkwNS4uM2RhMGM1NzNkMmFiIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvbmV0L2V0aGVybmV0L3Nt c2MvS2NvbmZpZwo+ICsrKyBiL2RyaXZlcnMvbmV0L2V0aGVybmV0L3Ntc2MvS2NvbmZpZwo+IEBA IC01LDggKzUsOCBAQAo+ICBjb25maWcgTkVUX1ZFTkRPUl9TTVNDCj4gIAlib29sICJTTUMgKFNN U0MpL1dlc3Rlcm4gRGlnaXRhbCBkZXZpY2VzIgo+ICAJZGVmYXVsdCB5Cj4gLQlkZXBlbmRzIG9u IEFSTSB8fCBBUk02NCB8fCBBVEFSSV9FVEhFUk5BVCB8fCBCTEFDS0ZJTiB8fCBDT0xERklSRSB8 fCBcCj4gLQkJICAgSVNBIHx8IE0zMlIgfHwgTUFDIHx8IE1JUFMgfHwgTklPUzIgfHwgUENJIHx8 IFwKPiArCWRlcGVuZHMgb24gQVJNIHx8IEFSTTY0IHx8IEFUQVJJX0VUSEVSTkFUIHx8IENPTERG SVJFIHx8IFwKPiArCQkgICBJU0EgfHwgTUFDIHx8IE1JUFMgfHwgTklPUzIgfHwgUENJIHx8IFwK PiAgCQkgICBQQ01DSUEgfHwgU1VQRVJIIHx8IFhURU5TQSB8fCBIODMwMAo+ICAJLS0taGVscC0t LQo+ICAJICBJZiB5b3UgaGF2ZSBhIG5ldHdvcmsgKEV0aGVybmV0KSBjYXJkIGJlbG9uZ2luZyB0 byB0aGlzIGNsYXNzLCBzYXkgWS4KPiBAQCAtMzcsNyArMzcsNyBAQCBjb25maWcgU01DOTFYCj4g IAlzZWxlY3QgQ1JDMzIKPiAgCXNlbGVjdCBNSUkKPiAgCWRlcGVuZHMgb24gIU9GIHx8IEdQSU9M SUIKPiAtCWRlcGVuZHMgb24gQVJNIHx8IEFSTTY0IHx8IEFUQVJJX0VUSEVSTkFUIHx8IEJMQUNL RklOIHx8IENPTERGSVJFIHx8IFwKPiArCWRlcGVuZHMgb24gQVJNIHx8IEFSTTY0IHx8IEFUQVJJ X0VUSEVSTkFUIHx8IENPTERGSVJFIHx8IFwKPiAgCQkgICBNMzJSIHx8IE1JUFMgfHwgTklPUzIg fHwgU1VQRVJIIHx8IFhURU5TQSB8fCBIODMwMAo+ICAJLS0taGVscC0tLQo+ICAJICBUaGlzIGlz IGEgZHJpdmVyIGZvciBTTUMncyA5MXggc2VyaWVzIG9mIEV0aGVybmV0IGNoaXBzZXRzLAo+IGRp ZmYgLS1naXQgYS9kcml2ZXJzL25ldC93aXJlbGVzcy9jaXNjby9LY29uZmlnIGIvZHJpdmVycy9u ZXQvd2lyZWxlc3MvY2lzY28vS2NvbmZpZwo+IGluZGV4IGIyMjU2N2RmZjg5My4uOGVkMGIxNTRi YjMzIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2Npc2NvL0tjb25maWcKPiAr KysgYi9kcml2ZXJzL25ldC93aXJlbGVzcy9jaXNjby9LY29uZmlnCj4gQEAgLTMzLDcgKzMzLDcg QEAgY29uZmlnIEFJUk8KPiAgCj4gIGNvbmZpZyBBSVJPX0NTCj4gIAl0cmlzdGF0ZSAiQ2lzY28v QWlyb25ldCAzNFgvMzVYLzQ1MDAvNDgwMCBQQ01DSUEgY2FyZHMiCj4gLQlkZXBlbmRzIG9uIENG RzgwMjExICYmIFBDTUNJQSAmJiAoQlJPS0VOIHx8ICFNMzJSKQo+ICsJZGVwZW5kcyBvbiBDRkc4 MDIxMSAmJiBQQ01DSUEKPiAgCXNlbGVjdCBXSVJFTEVTU19FWFQKPiAgCXNlbGVjdCBXRVhUX1NQ WQo+ICAJc2VsZWN0IFdFWFRfUFJJVgo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3B3bS9LY29uZmln IGIvZHJpdmVycy9wd20vS2NvbmZpZwo+IGluZGV4IDc2M2VlNTBlYTU3ZC4uZjE2YWFkM2JmNWQ2 IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvcHdtL0tjb25maWcKPiArKysgYi9kcml2ZXJzL3B3bS9L Y29uZmlnCj4gQEAgLTQzLDcgKzQzLDcgQEAgY29uZmlnIFBXTV9BQjg1MDAKPiAgCj4gIGNvbmZp ZyBQV01fQVRNRUwKPiAgCXRyaXN0YXRlICJBdG1lbCBQV00gc3VwcG9ydCIKPiAtCWRlcGVuZHMg b24gQVJDSF9BVDkxIHx8IEFWUjMyCj4gKwlkZXBlbmRzIG9uIEFSQ0hfQVQ5MQo+ICAJaGVscAo+ ICAJICBHZW5lcmljIFBXTSBmcmFtZXdvcmsgZHJpdmVyIGZvciBBdG1lbCBTb0MuCj4gIAo+IGRp ZmYgLS1naXQgYS9kcml2ZXJzL3J0Yy9LY29uZmlnIGIvZHJpdmVycy9ydGMvS2NvbmZpZwo+IGlu ZGV4IGJlNWEzZGM5OWMxMS4uNDZhZjEwYWM0NWZjIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvcnRj L0tjb25maWcKPiArKysgYi9kcml2ZXJzL3J0Yy9LY29uZmlnCj4gQEAgLTg2OCw3ICs4NjgsNyBA QCBjb21tZW50ICJQbGF0Zm9ybSBSVEMgZHJpdmVycyIKPiAgCj4gIGNvbmZpZyBSVENfRFJWX0NN T1MKPiAgCXRyaXN0YXRlICJQQy1zdHlsZSAnQ01PUyciCj4gLQlkZXBlbmRzIG9uIFg4NiB8fCBB Uk0gfHwgTTMyUiB8fCBQUEMgfHwgTUlQUyB8fCBTUEFSQzY0Cj4gKwlkZXBlbmRzIG9uIFg4NiB8 fCBBUk0gfHwgUFBDIHx8IE1JUFMgfHwgU1BBUkM2NAo+ICAJZGVmYXVsdCB5IGlmIFg4Ngo+ICAJ c2VsZWN0IFJUQ19NQzE0NjgxOF9MSUIKPiAgCWhlbHAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9z cGkvS2NvbmZpZyBiL2RyaXZlcnMvc3BpL0tjb25maWcKPiBpbmRleCA2MDM3ODM5NzZiODEuLjEw M2MxM2ZjZWZhMCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL3NwaS9LY29uZmlnCj4gKysrIGIvZHJp dmVycy9zcGkvS2NvbmZpZwo+IEBAIC03MiwxMCArNzIsMTAgQEAgY29uZmlnIFNQSV9BUk1BREFf MzcwMAo+ICBjb25maWcgU1BJX0FUTUVMCj4gIAl0cmlzdGF0ZSAiQXRtZWwgU1BJIENvbnRyb2xs ZXIiCj4gIAlkZXBlbmRzIG9uIEhBU19ETUEKPiAtCWRlcGVuZHMgb24gKEFSQ0hfQVQ5MSB8fCBB VlIzMiB8fCBDT01QSUxFX1RFU1QpCj4gKwlkZXBlbmRzIG9uIEFSQ0hfQVQ5MSB8fCBDT01QSUxF X1RFU1QKPiAgCWhlbHAKPiAgCSAgVGhpcyBzZWxlY3RzIGEgZHJpdmVyIGZvciB0aGUgQXRtZWwg U1BJIENvbnRyb2xsZXIsIHByZXNlbnQgb24KPiAtCSAgbWFueSBBVDMyIChBVlIzMikgYW5kIEFU OTEgKEFSTSkgY2hpcHMuCj4gKwkgIG1hbnkgQVQ5MSBBUk0gY2hpcHMuCj4gIAo+ICBjb25maWcg U1BJX0FVMTU1MAo+ICAJdHJpc3RhdGUgIkF1MTU1MC9BdTEyMDAvQXUxMzAwIFNQSSBDb250cm9s bGVyIgo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9tdXNiL0tjb25maWcgYi9kcml2ZXJzL3Vz Yi9tdXNiL0tjb25maWcKPiBpbmRleCA1NTA2YTljMDNjMWYuLmU3NTdhZmMxY2ZkMCAxMDA2NDQK PiAtLS0gYS9kcml2ZXJzL3VzYi9tdXNiL0tjb25maWcKPiArKysgYi9kcml2ZXJzL3VzYi9tdXNi L0tjb25maWcKPiBAQCAtODcsNyArODcsNyBAQCBjb25maWcgVVNCX01VU0JfREE4WFgKPiAgY29u ZmlnIFVTQl9NVVNCX1RVU0I2MDEwCj4gIAl0cmlzdGF0ZSAiVFVTQjYwMTAiCj4gIAlkZXBlbmRz IG9uIEhBU19JT01FTQo+IC0JZGVwZW5kcyBvbiAoQVJDSF9PTUFQMlBMVVMgfHwgQ09NUElMRV9U RVNUKSAmJiAhQkxBQ0tGSU4KPiArCWRlcGVuZHMgb24gQVJDSF9PTUFQMlBMVVMgfHwgQ09NUElM RV9URVNUCj4gIAlkZXBlbmRzIG9uIE5PUF9VU0JfWENFSVYgPSBVU0JfTVVTQl9IRFJDICMgYm90 aCBidWlsdC1pbiBvciBib3RoIG1vZHVsZXMKPiAgCj4gIGNvbmZpZyBVU0JfTVVTQl9PTUFQMlBM VVMKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy92aWRlby9jb25zb2xlL0tjb25maWcgYi9kcml2ZXJz L3ZpZGVvL2NvbnNvbGUvS2NvbmZpZwo+IGluZGV4IDAwNWVkODdjODIxNi4uYTllMzk4YzE0NGY4 IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvdmlkZW8vY29uc29sZS9LY29uZmlnCj4gKysrIGIvZHJp dmVycy92aWRlby9jb25zb2xlL0tjb25maWcKPiBAQCAtNiw4ICs2LDcgQEAgbWVudSAiQ29uc29s ZSBkaXNwbGF5IGRyaXZlciBzdXBwb3J0Igo+ICAKPiAgY29uZmlnIFZHQV9DT05TT0xFCj4gIAli b29sICJWR0EgdGV4dCBjb25zb2xlIiBpZiBFWFBFUlQgfHwgIVg4Ngo+IC0JZGVwZW5kcyBvbiAh NHh4ICYmICFQUENfOHh4ICYmICFTUEFSQyAmJiAhTTY4SyAmJiAhUEFSSVNDICYmICFGUlYgJiYg XAo+IC0JCSFTVVBFUkggJiYgIUJMQUNLRklOICYmICFBVlIzMiAmJiAhQ1JJUyAmJiBcCj4gKwlk ZXBlbmRzIG9uICE0eHggJiYgIVBQQ184eHggJiYgIVNQQVJDICYmICFNNjhLICYmICFQQVJJU0Mg JiYgICFTVVBFUkggJiYgXAo+ICAJCSghQVJNIHx8IEFSQ0hfRk9PVEJSSURHRSB8fCBBUkNIX0lO VEVHUkFUT1IgfHwgQVJDSF9ORVRXSU5ERVIpICYmIFwKPiAgCQkhQVJNNjQgJiYgIUFSQyAmJiAh TUlDUk9CTEFaRSAmJiAhT1BFTlJJU0MKPiAgCWRlZmF1bHQgeQo+IGRpZmYgLS1naXQgYS9kcml2 ZXJzL3dhdGNoZG9nL0tjb25maWcgYi9kcml2ZXJzL3dhdGNoZG9nL0tjb25maWcKPiBpbmRleCAw ZTE5Njc5MzQ4ZDEuLjc5MDIwY2U5NWRlMiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL3dhdGNoZG9n L0tjb25maWcKPiArKysgYi9kcml2ZXJzL3dhdGNoZG9nL0tjb25maWcKPiBAQCAtODI4LDEwICs4 MjgsNiBAQCBjb25maWcgQkZJTl9XRFQKPiAgCSAgVG8gY29tcGlsZSB0aGlzIGRyaXZlciBhcyBh IG1vZHVsZSwgY2hvb3NlIE0gaGVyZTogdGhlCj4gIAkgIG1vZHVsZSB3aWxsIGJlIGNhbGxlZCBi ZmluX3dkdC4KPiAgCj4gLSMgQ1JJUyBBcmNoaXRlY3R1cmUKPiAtCj4gLSMgRlJWIEFyY2hpdGVj dHVyZQo+IC0KPiAgIyBYODYgKGkzODYgKyBpYTY0ICsgeDg2XzY0KSBBcmNoaXRlY3R1cmUKPiAg Cj4gIGNvbmZpZyBBQ1FVSVJFX1dEVAo+IEBAIC0xNDMxLDggKzE0MjcsNiBAQCBjb25maWcgTklD NzAxOF9XRFQKPiAgCSAgVG8gY29tcGlsZSB0aGlzIGRyaXZlciBhcyBhIG1vZHVsZSwgY2hvb3Nl IE0gaGVyZTogdGhlIG1vZHVsZSB3aWxsIGJlCj4gIAkgIGNhbGxlZCBuaWM3MDE4X3dkdC4KPiAg Cj4gLSMgTTMyUiBBcmNoaXRlY3R1cmUKPiAtCj4gICMgTTY4SyBBcmNoaXRlY3R1cmUKPiAgCj4g IGNvbmZpZyBNNTR4eF9XQVRDSERPRwo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3dhdGNoZG9nL01h a2VmaWxlIGIvZHJpdmVycy93YXRjaGRvZy9NYWtlZmlsZQo+IGluZGV4IDA0NzRkMzhhYTg1NC4u MWY5YTAyMzVmMjJjIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvd2F0Y2hkb2cvTWFrZWZpbGUKPiAr KysgYi9kcml2ZXJzL3dhdGNoZG9nL01ha2VmaWxlCj4gQEAgLTk0LDEwICs5NCw2IEBAIG9iai0k KENPTkZJR19TUFJEX1dBVENIRE9HKSArPSBzcHJkX3dkdC5vCj4gICMgQkxBQ0tGSU4gQXJjaGl0 ZWN0dXJlCj4gIG9iai0kKENPTkZJR19CRklOX1dEVCkgKz0gYmZpbl93ZHQubwo+ICAKPiAtIyBD UklTIEFyY2hpdGVjdHVyZQo+IC0KPiAtIyBGUlYgQXJjaGl0ZWN0dXJlCj4gLQo+ICAjIFg4NiAo aTM4NiArIGlhNjQgKyB4ODZfNjQpIEFyY2hpdGVjdHVyZQo+ICBvYmotJChDT05GSUdfQUNRVUlS RV9XRFQpICs9IGFjcXVpcmV3ZHQubwo+ICBvYmotJChDT05GSUdfQURWQU5URUNIX1dEVCkgKz0g YWR2YW50ZWNod2R0Lm8KPiBAQCAtMTQ2LDggKzE0Miw2IEBAIG9iai0kKENPTkZJR19JTlRFTF9N RUlfV0RUKSArPSBtZWlfd2R0Lm8KPiAgb2JqLSQoQ09ORklHX05JOTAzWF9XRFQpICs9IG5pOTAz eF93ZHQubwo+ICBvYmotJChDT05GSUdfTklDNzAxOF9XRFQpICs9IG5pYzcwMThfd2R0Lm8KPiAg Cj4gLSMgTTMyUiBBcmNoaXRlY3R1cmUKPiAtCj4gICMgTTY4SyBBcmNoaXRlY3R1cmUKPiAgb2Jq LSQoQ09ORklHX001NHh4X1dBVENIRE9HKSArPSBtNTR4eF93ZHQubwo+ICAKPiBkaWZmIC0tZ2l0 IGEvZnMvS2NvbmZpZy5iaW5mbXQgYi9mcy9LY29uZmlnLmJpbmZtdAo+IGluZGV4IDU4YzJiYmQz ODVhZC4uNTdhMjdjNDJiNWFjIDEwMDY0NAo+IC0tLSBhL2ZzL0tjb25maWcuYmluZm10Cj4gKysr IGIvZnMvS2NvbmZpZy5iaW5mbXQKPiBAQCAtMSw2ICsxLDYgQEAKPiAgY29uZmlnIEJJTkZNVF9F TEYKPiAgCWJvb2wgIktlcm5lbCBzdXBwb3J0IGZvciBFTEYgYmluYXJpZXMiCj4gLQlkZXBlbmRz IG9uIE1NVSAmJiAoQlJPS0VOIHx8ICFGUlYpCj4gKwlkZXBlbmRzIG9uIE1NVQo+ICAJc2VsZWN0 IEVMRkNPUkUKPiAgCWRlZmF1bHQgeQo+ICAJLS0taGVscC0tLQo+IEBAIC0zNSw3ICszNSw3IEBA IGNvbmZpZyBBUkNIX0JJTkZNVF9FTEZfU1RBVEUKPiAgY29uZmlnIEJJTkZNVF9FTEZfRkRQSUMK PiAgCWJvb2wgIktlcm5lbCBzdXBwb3J0IGZvciBGRFBJQyBFTEYgYmluYXJpZXMiCj4gIAlkZWZh dWx0IHkgaWYgIUJJTkZNVF9FTEYKPiAtCWRlcGVuZHMgb24gKEFSTSB8fCBGUlYgfHwgQkxBQ0tG SU4gfHwgKFNVUEVSSDMyICYmICFNTVUpIHx8IEM2WCkKPiArCWRlcGVuZHMgb24gKEFSTSB8fCAo U1VQRVJIMzIgJiYgIU1NVSkgfHwgQzZYKQo+ICAJc2VsZWN0IEVMRkNPUkUKPiAgCWhlbHAKPiAg CSAgRUxGIEZEUElDIGJpbmFyaWVzIGFyZSBiYXNlZCBvbiBFTEYsIGJ1dCBhbGxvdyB0aGUgaW5k aXZpZHVhbCBsb2FkCj4gQEAgLTkwLDcgKzkwLDYgQEAgY29uZmlnIEJJTkZNVF9TQ1JJUFQKPiAg Y29uZmlnIEJJTkZNVF9GTEFUCj4gIAlib29sICJLZXJuZWwgc3VwcG9ydCBmb3IgZmxhdCBiaW5h cmllcyIKPiAgCWRlcGVuZHMgb24gIU1NVSB8fCBBUk0gfHwgTTY4Swo+IC0JZGVwZW5kcyBvbiAh RlJWIHx8IEJST0tFTgo+ICAJaGVscAo+ICAJICBTdXBwb3J0IHVDbGludXggRkxBVCBmb3JtYXQg YmluYXJpZXMuCj4gIAo+IGRpZmYgLS1naXQgYS9mcy9taW5peC9LY29uZmlnIGIvZnMvbWluaXgv S2NvbmZpZwo+IGluZGV4IGYyYTBjZmNlZjExZC4uYmNkNTNhNzkxNTZmIDEwMDY0NAo+IC0tLSBh L2ZzL21pbml4L0tjb25maWcKPiArKysgYi9mcy9taW5peC9LY29uZmlnCj4gQEAgLTE4LDcgKzE4 LDcgQEAgY29uZmlnIE1JTklYX0ZTCj4gIAo+ICBjb25maWcgTUlOSVhfRlNfTkFUSVZFX0VORElB Tgo+ICAJZGVmX2Jvb2wgTUlOSVhfRlMKPiAtCWRlcGVuZHMgb24gTTMyUiB8fCBNSUNST0JMQVpF IHx8IE1JUFMgfHwgUzM5MCB8fCBTVVBFUkggfHwgU1BBUkMgfHwgWFRFTlNBIHx8IChNNjhLICYm ICFNTVUpCj4gKwlkZXBlbmRzIG9uIE1JQ1JPQkxBWkUgfHwgTUlQUyB8fCBTMzkwIHx8IFNVUEVS SCB8fCBTUEFSQyB8fCBYVEVOU0EgfHwgKE02OEsgJiYgIU1NVSkKPiAgCj4gIGNvbmZpZyBNSU5J WF9GU19CSUdfRU5ESUFOXzE2QklUX0lOREVYRUQKPiAgCWRlZl9ib29sIE1JTklYX0ZTCj4gZGlm ZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvaWRlLmggYi9pbmNsdWRlL2xpbnV4L2lkZS5oCj4gaW5k ZXggMjBkNDJjMGQ5ZmI2Li4xZDZmMTYxMTBlYWUgMTAwNjQ0Cj4gLS0tIGEvaW5jbHVkZS9saW51 eC9pZGUuaAo+ICsrKyBiL2luY2x1ZGUvbGludXgvaWRlLmgKPiBAQCAtMjUsMTUgKzI1LDEwIEBA Cj4gICNpbmNsdWRlIDxhc20vYnl0ZW9yZGVyLmg+Cj4gICNpbmNsdWRlIDxhc20vaW8uaD4KPiAg Cj4gLSNpZiBkZWZpbmVkKENPTkZJR19DUklTKSB8fCBkZWZpbmVkKENPTkZJR19GUlYpCj4gLSMg ZGVmaW5lIFNVUFBPUlRfVkxCX1NZTkMgMAo+IC0jZWxzZQo+IC0jIGRlZmluZSBTVVBQT1JUX1ZM Ql9TWU5DIDEKPiAtI2VuZGlmCj4gLQo+ICAvKgo+ICAgKiBQcm9iYWJseSBub3Qgd2lzZSB0byBm aWRkbGUgd2l0aCB0aGVzZQo+ICAgKi8KPiArI2RlZmluZSBTVVBQT1JUX1ZMQl9TWU5DIDEKPiAg I2RlZmluZSBJREVfREVGQVVMVF9NQVhfRkFJTFVSRVMJMQo+ICAjZGVmaW5lIEVSUk9SX01BWAk4 CS8qIE1heCByZWFkL3dyaXRlIGVycm9ycyBwZXIgc2VjdG9yICovCj4gICNkZWZpbmUgRVJST1Jf UkVTRVQJMwkvKiBSZXNldCBjb250cm9sbGVyIGV2ZXJ5IDR0aCByZXRyeSAqLwo+IGRpZmYgLS1n aXQgYS9pbml0L0tjb25maWcgYi9pbml0L0tjb25maWcKPiBpbmRleCBhMTRiY2M5NzI0YTIuLjI4 NTI2OTJkN2M5YyAxMDA2NDQKPiAtLS0gYS9pbml0L0tjb25maWcKPiArKysgYi9pbml0L0tjb25m aWcKPiBAQCAtOTk4LDcgKzk5OCw2IEBAIGNvbmZpZyBSRUxBWQo+ICAKPiAgY29uZmlnIEJMS19E RVZfSU5JVFJECj4gIAlib29sICJJbml0aWFsIFJBTSBmaWxlc3lzdGVtIGFuZCBSQU0gZGlzayAo aW5pdHJhbWZzL2luaXRyZCkgc3VwcG9ydCIKPiAtCWRlcGVuZHMgb24gQlJPS0VOIHx8ICFGUlYK PiAgCWhlbHAKPiAgCSAgVGhlIGluaXRpYWwgUkFNIGZpbGVzeXN0ZW0gaXMgYSByYW1mcyB3aGlj aCBpcyBsb2FkZWQgYnkgdGhlCj4gIAkgIGJvb3QgbG9hZGVyIChsb2FkbGluIG9yIGxpbG8pIGFu ZCB0aGF0IGlzIG1vdW50ZWQgYXMgcm9vdAo+IEBAIC0xMTA4LDcgKzExMDcsNyBAQCBjb25maWcg TVVMVElVU0VSCj4gIAo+ICBjb25maWcgU0dFVE1BU0tfU1lTQ0FMTAo+ICAJYm9vbCAic2dldG1h c2svc3NldG1hc2sgc3lzY2FsbHMgc3VwcG9ydCIgaWYgRVhQRVJUCj4gLQlkZWZfYm9vbCBQQVJJ U0MgfHwgQkxBQ0tGSU4gfHwgTTY4SyB8fCBQUEMgfHwgTUlQUyB8fCBYODYgfHwgU1BBUkMgfHwg Q1JJUyB8fCBNSUNST0JMQVpFIHx8IFNVUEVSSAo+ICsJZGVmX2Jvb2wgUEFSSVNDIHx8IE02OEsg fHwgUFBDIHx8IE1JUFMgfHwgWDg2IHx8IFNQQVJDIHx8IE1JQ1JPQkxBWkUgfHwgU1VQRVJICj4g IAktLS1oZWxwLS0tCj4gIAkgIHN5c19zZ2V0bWFzayBhbmQgc3lzX3NzZXRtYXNrIGFyZSBvYnNv bGV0ZSBzeXN0ZW0gY2FsbHMKPiAgCSAgbm8gbG9uZ2VyIHN1cHBvcnRlZCBpbiBsaWJjIGJ1dCBz dGlsbCBlbmFibGVkIGJ5IGRlZmF1bHQgaW4gc29tZQo+IEBAIC0xMzcwLDcgKzEzNjksNyBAQCBj b25maWcgS0FMTFNZTVNfQUJTT0xVVEVfUEVSQ1BVCj4gIGNvbmZpZyBLQUxMU1lNU19CQVNFX1JF TEFUSVZFCj4gIAlib29sCj4gIAlkZXBlbmRzIG9uIEtBTExTWU1TCj4gLQlkZWZhdWx0ICFJQTY0 ICYmICEoVElMRSAmJiA2NEJJVCkKPiArCWRlZmF1bHQgIUlBNjQKPiAgCWhlbHAKPiAgCSAgSW5z dGVhZCBvZiBlbWl0dGluZyB0aGVtIGFzIGFic29sdXRlIHZhbHVlcyBpbiB0aGUgbmF0aXZlIHdv cmQgc2l6ZSwKPiAgCSAgZW1pdCB0aGUgc3ltYm9sIHJlZmVyZW5jZXMgaW4gdGhlIGthbGxzeW1z IHRhYmxlIGFzIDMyLWJpdCBlbnRyaWVzLAo+IGRpZmYgLS1naXQgYS9saWIvS2NvbmZpZy5kZWJ1 ZyBiL2xpYi9LY29uZmlnLmRlYnVnCj4gaW5kZXggNDFhYzlkMjk0MjQ1Li42OTI3YzZkOGQxODUg MTAwNjQ0Cj4gLS0tIGEvbGliL0tjb25maWcuZGVidWcKPiArKysgYi9saWIvS2NvbmZpZy5kZWJ1 Zwo+IEBAIC0xNjUsNyArMTY1LDcgQEAgY29uZmlnIERFQlVHX0lORk9fUkVEVUNFRAo+ICAKPiAg Y29uZmlnIERFQlVHX0lORk9fU1BMSVQKPiAgCWJvb2wgIlByb2R1Y2Ugc3BsaXQgZGVidWdpbmZv IGluIC5kd28gZmlsZXMiCj4gLQlkZXBlbmRzIG9uIERFQlVHX0lORk8gJiYgIUZSVgo+ICsJZGVw ZW5kcyBvbiBERUJVR19JTkZPCj4gIAloZWxwCj4gIAkgIEdlbmVyYXRlIGRlYnVnIGluZm8gaW50 byBzZXBhcmF0ZSAuZHdvIGZpbGVzLiBUaGlzIHNpZ25pZmljYW50bHkKPiAgCSAgcmVkdWNlcyB0 aGUgYnVpbGQgZGlyZWN0b3J5IHNpemUgZm9yIGJ1aWxkcyB3aXRoIERFQlVHX0lORk8sCj4gQEAg LTM1NCwxMCArMzU0LDcgQEAgY29uZmlnIEFSQ0hfV0FOVF9GUkFNRV9QT0lOVEVSUwo+ICAKPiAg Y29uZmlnIEZSQU1FX1BPSU5URVIKPiAgCWJvb2wgIkNvbXBpbGUgdGhlIGtlcm5lbCB3aXRoIGZy YW1lIHBvaW50ZXJzIgo+IC0JZGVwZW5kcyBvbiBERUJVR19LRVJORUwgJiYgXAo+IC0JCShDUklT IHx8IE02OEsgfHwgRlJWIHx8IFVNTCB8fCBcCj4gLQkJIFNVUEVSSCB8fCBCTEFDS0ZJTikgfHwg XAo+IC0JCUFSQ0hfV0FOVF9GUkFNRV9QT0lOVEVSUwo+ICsJZGVwZW5kcyBvbiBERUJVR19LRVJO RUwgJiYgKE02OEsgfHwgVU1MIHx8IFNVUEVSSCkgfHwgQVJDSF9XQU5UX0ZSQU1FX1BPSU5URVJT Cj4gIAlkZWZhdWx0IHkgaWYgKERFQlVHX0lORk8gJiYgVU1MKSB8fCBBUkNIX1dBTlRfRlJBTUVf UE9JTlRFUlMKPiAgCWhlbHAKPiAgCSAgSWYgeW91IHNheSBZIGhlcmUgdGhlIHJlc3VsdGluZyBr ZXJuZWwgaW1hZ2Ugd2lsbCBiZSBzbGlnaHRseQo+IEBAIC0xMTM4LDcgKzExMzUsNyBAQCBjb25m aWcgTE9DS0RFUAo+ICAJYm9vbAo+ICAJZGVwZW5kcyBvbiBERUJVR19LRVJORUwgJiYgVFJBQ0Vf SVJRRkxBR1NfU1VQUE9SVCAmJiBTVEFDS1RSQUNFX1NVUFBPUlQgJiYgTE9DS0RFUF9TVVBQT1JU Cj4gIAlzZWxlY3QgU1RBQ0tUUkFDRQo+IC0Jc2VsZWN0IEZSQU1FX1BPSU5URVIgaWYgIU1JUFMg JiYgIVBQQyAmJiAhQVJNX1VOV0lORCAmJiAhUzM5MCAmJiAhTUlDUk9CTEFaRSAmJiAhQVJDICYm ICFTQ09SRSAmJiAhWDg2Cj4gKwlzZWxlY3QgRlJBTUVfUE9JTlRFUiBpZiAhTUlQUyAmJiAhUFBD ICYmICFBUk1fVU5XSU5EICYmICFTMzkwICYmICFNSUNST0JMQVpFICYmICFBUkMgJiYgIVg4Ngo+ ICAJc2VsZWN0IEtBTExTWU1TCj4gIAlzZWxlY3QgS0FMTFNZTVNfQUxMCj4gIAo+IEBAIC0xNTcx LDcgKzE1NjgsNyBAQCBjb25maWcgRkFVTFRfSU5KRUNUSU9OX1NUQUNLVFJBQ0VfRklMVEVSCj4g IAlkZXBlbmRzIG9uIEZBVUxUX0lOSkVDVElPTl9ERUJVR19GUyAmJiBTVEFDS1RSQUNFX1NVUFBP UlQKPiAgCWRlcGVuZHMgb24gIVg4Nl82NAo+ICAJc2VsZWN0IFNUQUNLVFJBQ0UKPiAtCXNlbGVj dCBGUkFNRV9QT0lOVEVSIGlmICFNSVBTICYmICFQUEMgJiYgIVMzOTAgJiYgIU1JQ1JPQkxBWkUg JiYgIUFSTV9VTldJTkQgJiYgIUFSQyAmJiAhU0NPUkUgJiYgIVg4Ngo+ICsJc2VsZWN0IEZSQU1F X1BPSU5URVIgaWYgIU1JUFMgJiYgIVBQQyAmJiAhUzM5MCAmJiAhTUlDUk9CTEFaRSAmJiAhQVJN X1VOV0lORCAmJiAhQVJDICYmICFYODYKPiAgCWhlbHAKPiAgCSAgUHJvdmlkZSBzdGFja3RyYWNl IGZpbHRlciBmb3IgZmF1bHQtaW5qZWN0aW9uIGNhcGFiaWxpdGllcwo+ICAKPiBAQCAtMTk2OSw3 ICsxOTY2LDcgQEAgY29uZmlnIFNUUklDVF9ERVZNRU0KPiAgCWJvb2wgIkZpbHRlciBhY2Nlc3Mg dG8gL2Rldi9tZW0iCj4gIAlkZXBlbmRzIG9uIE1NVSAmJiBERVZNRU0KPiAgCWRlcGVuZHMgb24g QVJDSF9IQVNfREVWTUVNX0lTX0FMTE9XRUQKPiAtCWRlZmF1bHQgeSBpZiBUSUxFIHx8IFBQQyB8 fCBYODYgfHwgQVJNNjQKPiArCWRlZmF1bHQgeSBpZiBQUEMgfHwgWDg2IHx8IEFSTTY0Cj4gIAkt LS1oZWxwLS0tCj4gIAkgIElmIHRoaXMgb3B0aW9uIGlzIGRpc2FibGVkLCB5b3UgYWxsb3cgdXNl cnNwYWNlIChyb290KSBhY2Nlc3MgdG8gYWxsCj4gIAkgIG9mIG1lbW9yeSwgaW5jbHVkaW5nIGtl cm5lbCBhbmQgdXNlcnNwYWNlIG1lbW9yeS4gQWNjaWRlbnRhbAo+IGRpZmYgLS1naXQgYS9saWIv dGVzdF91c2VyX2NvcHkuYyBiL2xpYi90ZXN0X3VzZXJfY29weS5jCj4gaW5kZXggYTY1NTZmMzM2 NGQxLi5lMTYxZjA0OThmNDIgMTAwNjQ0Cj4gLS0tIGEvbGliL3Rlc3RfdXNlcl9jb3B5LmMKPiAr KysgYi9saWIvdGVzdF91c2VyX2NvcHkuYwo+IEBAIC0zMSw4ICszMSw2IEBACj4gICAqIHRoZWly IGNhcGFiaWxpdHkgYXQgY29tcGlsZS10aW1lLCB3ZSBqdXN0IGhhdmUgdG8gb3B0LW91dCBjZXJ0 YWluIGFyY2hzLgo+ICAgKi8KPiAgI2lmIEJJVFNfUEVSX0xPTkcgPT0gNjQgfHwgKCEoZGVmaW5l ZChDT05GSUdfQVJNKSAmJiAhZGVmaW5lZChNTVUpKSAmJiBcCj4gLQkJCSAgICAhZGVmaW5lZChD T05GSUdfQkxBQ0tGSU4pICYmCVwKPiAtCQkJICAgICFkZWZpbmVkKENPTkZJR19NMzJSKSAmJgkJ XAo+ICAJCQkgICAgIWRlZmluZWQoQ09ORklHX002OEspICYmCQlcCj4gIAkJCSAgICAhZGVmaW5l ZChDT05GSUdfTUlDUk9CTEFaRSkgJiYJXAo+ICAJCQkgICAgIWRlZmluZWQoQ09ORklHX05JT1My KSAmJgkJXAo+IGRpZmYgLS1naXQgYS9tbS9LY29uZmlnIGIvbW0vS2NvbmZpZwo+IGluZGV4IGFi ZWZhNTczYmNkOC4uZDUwMDRkODJhMWQ2IDEwMDY0NAo+IC0tLSBhL21tL0tjb25maWcKPiArKysg Yi9tbS9LY29uZmlnCj4gQEAgLTI3OCwxMyArMjc4LDYgQEAgY29uZmlnIEJPVU5DRQo+ICAJICBi eSBkZWZhdWx0IHdoZW4gWk9ORV9ETUEgb3IgSElHSE1FTSBpcyBzZWxlY3RlZCwgYnV0IHlvdQo+ ICAJICBtYXkgc2F5IG4gdG8gb3ZlcnJpZGUgdGhpcy4KPiAgCj4gLSMgT24gdGhlICd0aWxlJyBh cmNoLCBVU0IgT0hDSSBuZWVkcyB0aGUgYm91bmNlIHBvb2wgc2luY2UgdGlsZWd4IHdpbGwgb2Z0 ZW4KPiAtIyBoYXZlIG1vcmUgdGhhbiA0R0Igb2YgbWVtb3J5LCBidXQgd2UgZG9uJ3QgY3VycmVu dGx5IHVzZSB0aGUgSU9UTEIgdG8gcHJlc2VudAo+IC0jIGEgMzItYml0IGFkZHJlc3MgdG8gT0hD SS4gIFNvIHdlIG5lZWQgdG8gdXNlIGEgYm91bmNlIHBvb2wgaW5zdGVhZC4KPiAtY29uZmlnIE5F RURfQk9VTkNFX1BPT0wKPiAtCWJvb2wKPiAtCWRlZmF1bHQgeSBpZiBUSUxFICYmIFVTQl9PSENJ X0hDRAo+IC0KPiAgY29uZmlnIE5SX1FVSUNLCj4gIAlpbnQKPiAgCWRlcGVuZHMgb24gUVVJQ0tM SVNUCj4gZGlmZiAtLWdpdCBhL21tL3BlcmNwdS5jIGIvbW0vcGVyY3B1LmMKPiBpbmRleCA1MGU3 ZmRmODQwNTUuLjc5ZTM1NDljYWIwZiAxMDA2NDQKPiAtLS0gYS9tbS9wZXJjcHUuYwo+ICsrKyBi L21tL3BlcmNwdS5jCj4gQEAgLTI3MTksMTEgKzI3MTksNyBAQCB2b2lkIF9faW5pdCBzZXR1cF9w ZXJfY3B1X2FyZWFzKHZvaWQpCj4gIAo+ICAJaWYgKHBjcHVfc2V0dXBfZmlyc3RfY2h1bmsoYWks IGZjKSA8IDApCj4gIAkJcGFuaWMoIkZhaWxlZCB0byBpbml0aWFsaXplIHBlcmNwdSBhcmVhcy4i KTsKPiAtI2lmZGVmIENPTkZJR19DUklTCj4gLSN3YXJuaW5nICJ0aGUgQ1JJUyBhcmNoaXRlY3R1 cmUgaGFzIHBoeXNpY2FsIGFuZCB2aXJ0dWFsIGFkZHJlc3NlcyBjb25mdXNlZCIKPiAtI2Vsc2UK PiAgCXBjcHVfZnJlZV9hbGxvY19pbmZvKGFpKTsKPiAtI2VuZGlmCj4gIH0KPiAgCj4gICNlbmRp ZgkvKiBDT05GSUdfU01QICovCj4gLS0gCj4gMi45LjAKPgo=