tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'sh-for-5.11' of git://git.libc.org/linux-sh

Pull arch/sh updates from Rich Felker:
"Cleanup and warning fixes"

* tag 'sh-for-5.11' of git://git.libc.org/linux-sh:
sh/intc: Restore devm_ioremap() alignment
sh: mach-sh03: remove duplicate include
arch: sh: remove duplicate include
sh: Drop ARCH_NR_GPIOS definition
sh: Remove unused HAVE_COPY_THREAD_TLS macro
sh: remove CONFIG_IDE from most defconfig
sh: mm: Convert to DEFINE_SHOW_ATTRIBUTE
sh: intc: Convert to DEFINE_SHOW_ATTRIBUTE
arch/sh: hyphenate Non-Uniform in Kconfig prompt
sh: dma: fix kconfig dependency for G2_DMA

Linus Torvalds 228a65d4 ef7b1a0e

+17 -77
-1
arch/sh/Kconfig
··· 29 29 select HAVE_ARCH_KGDB 30 30 select HAVE_ARCH_SECCOMP_FILTER 31 31 select HAVE_ARCH_TRACEHOOK 32 - select HAVE_COPY_THREAD_TLS 33 32 select HAVE_DEBUG_BUGVERBOSE 34 33 select HAVE_DEBUG_KMEMLEAK 35 34 select HAVE_DYNAMIC_FTRACE
-1
arch/sh/boards/mach-sh03/rtc.c
··· 11 11 #include <linux/sched.h> 12 12 #include <linux/time.h> 13 13 #include <linux/bcd.h> 14 - #include <linux/rtc.h> 15 14 #include <linux/spinlock.h> 16 15 #include <linux/io.h> 17 16 #include <linux/rtc.h>
+4 -5
arch/sh/configs/landisk_defconfig
··· 27 27 CONFIG_ATALK=m 28 28 CONFIG_BLK_DEV_LOOP=y 29 29 CONFIG_BLK_DEV_RAM=y 30 - CONFIG_IDE=y 31 - CONFIG_BLK_DEV_IDECD=y 32 - CONFIG_BLK_DEV_OFFBOARD=y 33 - CONFIG_BLK_DEV_GENERIC=y 34 - CONFIG_BLK_DEV_AEC62XX=y 30 + CONFIG_ATA=y 31 + CONFIG_ATA_GENERIC=y 32 + CONFIG_PATA_ATP867X=y 35 33 CONFIG_SCSI=y 36 34 CONFIG_BLK_DEV_SD=y 35 + CONFIG_BLK_DEV_SR=y 37 36 CONFIG_SCSI_MULTI_LUN=y 38 37 CONFIG_MD=y 39 38 CONFIG_BLK_DEV_MD=m
-2
arch/sh/configs/microdev_defconfig
··· 20 20 # CONFIG_IPV6 is not set 21 21 # CONFIG_FW_LOADER is not set 22 22 CONFIG_BLK_DEV_RAM=y 23 - CONFIG_IDE=y 24 - CONFIG_BLK_DEV_IDECD=y 25 23 CONFIG_NETDEVICES=y 26 24 CONFIG_NET_ETHERNET=y 27 25 CONFIG_SMC91X=y
+2 -4
arch/sh/configs/sdk7780_defconfig
··· 44 44 CONFIG_PARPORT=y 45 45 CONFIG_BLK_DEV_LOOP=y 46 46 CONFIG_BLK_DEV_RAM=y 47 - CONFIG_IDE=y 48 - CONFIG_BLK_DEV_IDECD=y 49 - CONFIG_BLK_DEV_PLATFORM=y 50 - CONFIG_BLK_DEV_GENERIC=y 51 47 CONFIG_BLK_DEV_SD=y 52 48 CONFIG_BLK_DEV_SR=y 53 49 CONFIG_CHR_DEV_SG=y 54 50 CONFIG_SCSI_SPI_ATTRS=y 55 51 CONFIG_SCSI_FC_ATTRS=y 56 52 CONFIG_ATA=y 53 + CONFIG_ATA_GENERIC=y 54 + CONFIG_PATA_PLATFORM=y 57 55 CONFIG_MD=y 58 56 CONFIG_BLK_DEV_DM=y 59 57 CONFIG_NETDEVICES=y
-3
arch/sh/configs/sdk7786_defconfig
··· 116 116 CONFIG_BLK_DEV_LOOP=y 117 117 CONFIG_BLK_DEV_CRYPTOLOOP=y 118 118 CONFIG_BLK_DEV_RAM=y 119 - CONFIG_IDE=y 120 - CONFIG_BLK_DEV_IDECD=y 121 - CONFIG_BLK_DEV_PLATFORM=y 122 119 CONFIG_BLK_DEV_SD=y 123 120 CONFIG_BLK_DEV_SR=y 124 121 CONFIG_SCSI_MULTI_LUN=y
-1
arch/sh/configs/se7750_defconfig
··· 29 29 CONFIG_MTD_CFI=y 30 30 CONFIG_MTD_CFI_AMDSTD=y 31 31 CONFIG_MTD_ROM=y 32 - CONFIG_IDE=y 33 32 CONFIG_SCSI=y 34 33 CONFIG_NETDEVICES=y 35 34 CONFIG_NET_ETHERNET=y
-3
arch/sh/configs/sh03_defconfig
··· 39 39 CONFIG_BLK_DEV_LOOP=y 40 40 CONFIG_BLK_DEV_NBD=y 41 41 CONFIG_BLK_DEV_RAM=y 42 - CONFIG_IDE=y 43 - CONFIG_BLK_DEV_IDECD=m 44 - CONFIG_BLK_DEV_IDETAPE=m 45 42 CONFIG_SCSI=m 46 43 CONFIG_BLK_DEV_SD=m 47 44 CONFIG_BLK_DEV_SR=m
+1 -2
arch/sh/drivers/dma/Kconfig
··· 63 63 64 64 config G2_DMA 65 65 tristate "G2 Bus DMA support" 66 - depends on SH_DREAMCAST 67 - select SH_DMA_API 66 + depends on SH_DREAMCAST && SH_DMA_API 68 67 help 69 68 This enables support for the DMA controller for the Dreamcast's 70 69 G2 bus. Drivers that want this will generally enable this on
-1
arch/sh/include/asm/gpio.h
··· 16 16 #include <cpu/gpio.h> 17 17 #endif 18 18 19 - #define ARCH_NR_GPIOS 512 20 19 #include <asm-generic/gpio.h> 21 20 22 21 #ifdef CONFIG_GPIOLIB
-1
arch/sh/kernel/cpu/sh3/entry.S
··· 14 14 #include <cpu/mmu_context.h> 15 15 #include <asm/page.h> 16 16 #include <asm/cache.h> 17 - #include <asm/thread_info.h> 18 17 19 18 ! NOTE: 20 19 ! GNU as (as of 2.9.1) changes bf/s into bt/s and bra, when the address
+1 -1
arch/sh/mm/Kconfig
··· 105 105 (the default value) say Y. 106 106 107 107 config NUMA 108 - bool "Non Uniform Memory Access (NUMA) Support" 108 + bool "Non-Uniform Memory Access (NUMA) Support" 109 109 depends on MMU && SYS_SUPPORTS_NUMA 110 110 select ARCH_WANT_NUMA_VARIABLE_LOCALITY 111 111 default n
+2 -13
arch/sh/mm/asids-debugfs.c
··· 26 26 #include <asm/processor.h> 27 27 #include <asm/mmu_context.h> 28 28 29 - static int asids_seq_show(struct seq_file *file, void *iter) 29 + static int asids_debugfs_show(struct seq_file *file, void *iter) 30 30 { 31 31 struct task_struct *p; 32 32 ··· 48 48 return 0; 49 49 } 50 50 51 - static int asids_debugfs_open(struct inode *inode, struct file *file) 52 - { 53 - return single_open(file, asids_seq_show, inode->i_private); 54 - } 55 - 56 - static const struct file_operations asids_debugfs_fops = { 57 - .owner = THIS_MODULE, 58 - .open = asids_debugfs_open, 59 - .read = seq_read, 60 - .llseek = seq_lseek, 61 - .release = single_release, 62 - }; 51 + DEFINE_SHOW_ATTRIBUTE(asids_debugfs); 63 52 64 53 static int __init asids_debugfs_init(void) 65 54 {
+2 -13
arch/sh/mm/cache-debugfs.c
··· 22 22 CACHE_TYPE_UNIFIED, 23 23 }; 24 24 25 - static int cache_seq_show(struct seq_file *file, void *iter) 25 + static int cache_debugfs_show(struct seq_file *file, void *iter) 26 26 { 27 27 unsigned int cache_type = (unsigned int)file->private; 28 28 struct cache_info *cache; ··· 94 94 return 0; 95 95 } 96 96 97 - static int cache_debugfs_open(struct inode *inode, struct file *file) 98 - { 99 - return single_open(file, cache_seq_show, inode->i_private); 100 - } 101 - 102 - static const struct file_operations cache_debugfs_fops = { 103 - .owner = THIS_MODULE, 104 - .open = cache_debugfs_open, 105 - .read = seq_read, 106 - .llseek = seq_lseek, 107 - .release = single_release, 108 - }; 97 + DEFINE_SHOW_ATTRIBUTE(cache_debugfs); 109 98 110 99 static int __init cache_debugfs_init(void) 111 100 {
+2 -13
arch/sh/mm/pmb.c
··· 812 812 return (__raw_readl(PMB_PASCR) & PASCR_SE) == 0; 813 813 } 814 814 815 - static int pmb_seq_show(struct seq_file *file, void *iter) 815 + static int pmb_debugfs_show(struct seq_file *file, void *iter) 816 816 { 817 817 int i; 818 818 ··· 846 846 return 0; 847 847 } 848 848 849 - static int pmb_debugfs_open(struct inode *inode, struct file *file) 850 - { 851 - return single_open(file, pmb_seq_show, NULL); 852 - } 853 - 854 - static const struct file_operations pmb_debugfs_fops = { 855 - .owner = THIS_MODULE, 856 - .open = pmb_debugfs_open, 857 - .read = seq_read, 858 - .llseek = seq_lseek, 859 - .release = single_release, 860 - }; 849 + DEFINE_SHOW_ATTRIBUTE(pmb_debugfs); 861 850 862 851 static int __init pmb_debugfs_init(void) 863 852 {
+1 -1
drivers/sh/intc/core.c
··· 214 214 d->window[k].phys = res->start; 215 215 d->window[k].size = resource_size(res); 216 216 d->window[k].virt = ioremap(res->start, 217 - resource_size(res)); 217 + resource_size(res)); 218 218 if (!d->window[k].virt) 219 219 goto err2; 220 220 }
+2 -12
drivers/sh/intc/virq-debugfs.c
··· 16 16 #include <linux/debugfs.h> 17 17 #include "internals.h" 18 18 19 - static int intc_irq_xlate_debug(struct seq_file *m, void *priv) 19 + static int intc_irq_xlate_show(struct seq_file *m, void *priv) 20 20 { 21 21 int i; 22 22 ··· 37 37 return 0; 38 38 } 39 39 40 - static int intc_irq_xlate_open(struct inode *inode, struct file *file) 41 - { 42 - return single_open(file, intc_irq_xlate_debug, inode->i_private); 43 - } 44 - 45 - static const struct file_operations intc_irq_xlate_fops = { 46 - .open = intc_irq_xlate_open, 47 - .read = seq_read, 48 - .llseek = seq_lseek, 49 - .release = single_release, 50 - }; 40 + DEFINE_SHOW_ATTRIBUTE(intc_irq_xlate); 51 41 52 42 static int __init intc_irq_xlate_init(void) 53 43 {