Skip to content

L
linux
Commit 228a65d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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
parents ef7b1a0e b89bc060
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 77 deletions
arch/sh/Kconfig
View file @ 228a65d4
...@@ -29,7 +29,6 @@ config SUPERH ...@@ -29,7 +29,6 @@ config SUPERH
select HAVE_ARCH_KGDB select HAVE_ARCH_KGDB
select HAVE_ARCH_SECCOMP_FILTER select HAVE_ARCH_SECCOMP_FILTER
select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_TRACEHOOK
select HAVE_COPY_THREAD_TLS
select HAVE_DEBUG_BUGVERBOSE select HAVE_DEBUG_BUGVERBOSE
select HAVE_DEBUG_KMEMLEAK select HAVE_DEBUG_KMEMLEAK
select HAVE_DYNAMIC_FTRACE select HAVE_DYNAMIC_FTRACE
......
arch/sh/boards/mach-sh03/rtc.c
View file @ 228a65d4
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/bcd.h> #include <linux/bcd.h>
#include <linux/rtc.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/rtc.h> #include <linux/rtc.h>
......
arch/sh/configs/landisk_defconfig
View file @ 228a65d4
...@@ -27,13 +27,12 @@ CONFIG_NETFILTER=y ...@@ -27,13 +27,12 @@ CONFIG_NETFILTER=y
CONFIG_ATALK=m CONFIG_ATALK=m
CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_IDE=y CONFIG_ATA=y
CONFIG_BLK_DEV_IDECD=y CONFIG_ATA_GENERIC=y
CONFIG_BLK_DEV_OFFBOARD=y CONFIG_PATA_ATP867X=y
CONFIG_BLK_DEV_GENERIC=y
CONFIG_BLK_DEV_AEC62XX=y
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_BLK_DEV_SR=y
CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_MULTI_LUN=y
CONFIG_MD=y CONFIG_MD=y
CONFIG_BLK_DEV_MD=m CONFIG_BLK_DEV_MD=m
......
arch/sh/configs/microdev_defconfig
View file @ 228a65d4
...@@ -20,8 +20,6 @@ CONFIG_IP_PNP=y ...@@ -20,8 +20,6 @@ CONFIG_IP_PNP=y
# CONFIG_IPV6 is not set # CONFIG_IPV6 is not set
# CONFIG_FW_LOADER is not set # CONFIG_FW_LOADER is not set
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_IDE=y
CONFIG_BLK_DEV_IDECD=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_NET_ETHERNET=y CONFIG_NET_ETHERNET=y
CONFIG_SMC91X=y CONFIG_SMC91X=y
......
arch/sh/configs/sdk7780_defconfig
View file @ 228a65d4
...@@ -44,16 +44,14 @@ CONFIG_NET_SCHED=y ...@@ -44,16 +44,14 @@ CONFIG_NET_SCHED=y
CONFIG_PARPORT=y CONFIG_PARPORT=y
CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_IDE=y
CONFIG_BLK_DEV_IDECD=y
CONFIG_BLK_DEV_PLATFORM=y
CONFIG_BLK_DEV_GENERIC=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR=y
CONFIG_CHR_DEV_SG=y CONFIG_CHR_DEV_SG=y
CONFIG_SCSI_SPI_ATTRS=y CONFIG_SCSI_SPI_ATTRS=y
CONFIG_SCSI_FC_ATTRS=y CONFIG_SCSI_FC_ATTRS=y
CONFIG_ATA=y CONFIG_ATA=y
CONFIG_ATA_GENERIC=y
CONFIG_PATA_PLATFORM=y
CONFIG_MD=y CONFIG_MD=y
CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DM=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
......
arch/sh/configs/sdk7786_defconfig
View file @ 228a65d4
...@@ -116,9 +116,6 @@ CONFIG_MTD_UBI_GLUEBI=m ...@@ -116,9 +116,6 @@ CONFIG_MTD_UBI_GLUEBI=m
CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_CRYPTOLOOP=y CONFIG_BLK_DEV_CRYPTOLOOP=y
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_IDE=y
CONFIG_BLK_DEV_IDECD=y
CONFIG_BLK_DEV_PLATFORM=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR=y
CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_MULTI_LUN=y
......
arch/sh/configs/se7750_defconfig
View file @ 228a65d4
...@@ -29,7 +29,6 @@ CONFIG_MTD_BLOCK=y ...@@ -29,7 +29,6 @@ CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=y CONFIG_MTD_CFI=y
CONFIG_MTD_CFI_AMDSTD=y CONFIG_MTD_CFI_AMDSTD=y
CONFIG_MTD_ROM=y CONFIG_MTD_ROM=y
CONFIG_IDE=y
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_NET_ETHERNET=y CONFIG_NET_ETHERNET=y
......
arch/sh/configs/sh03_defconfig
View file @ 228a65d4
...@@ -39,9 +39,6 @@ CONFIG_IP_PNP_RARP=y ...@@ -39,9 +39,6 @@ CONFIG_IP_PNP_RARP=y
CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_NBD=y CONFIG_BLK_DEV_NBD=y
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_IDE=y
CONFIG_BLK_DEV_IDECD=m
CONFIG_BLK_DEV_IDETAPE=m
CONFIG_SCSI=m CONFIG_SCSI=m
CONFIG_BLK_DEV_SD=m CONFIG_BLK_DEV_SD=m
CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR=m
......
arch/sh/drivers/dma/Kconfig
View file @ 228a65d4
...@@ -63,8 +63,7 @@ config PVR2_DMA ...@@ -63,8 +63,7 @@ config PVR2_DMA
config G2_DMA config G2_DMA
tristate "G2 Bus DMA support" tristate "G2 Bus DMA support"
depends on SH_DREAMCAST depends on SH_DREAMCAST && SH_DMA_API
select SH_DMA_API
help help
This enables support for the DMA controller for the Dreamcast's This enables support for the DMA controller for the Dreamcast's
G2 bus. Drivers that want this will generally enable this on G2 bus. Drivers that want this will generally enable this on
......
arch/sh/include/asm/gpio.h
View file @ 228a65d4
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include <cpu/gpio.h> #include <cpu/gpio.h>
#endif #endif
#define ARCH_NR_GPIOS 512
#include <asm-generic/gpio.h> #include <asm-generic/gpio.h>
#ifdef CONFIG_GPIOLIB #ifdef CONFIG_GPIOLIB
......
arch/sh/kernel/cpu/sh3/entry.S
View file @ 228a65d4
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include <cpu/mmu_context.h> #include <cpu/mmu_context.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/cache.h> #include <asm/cache.h>
#include <asm/thread_info.h>
! NOTE: ! NOTE:
! GNU as (as of 2.9.1) changes bf/s into bt/s and bra, when the address ! GNU as (as of 2.9.1) changes bf/s into bt/s and bra, when the address
......
arch/sh/mm/Kconfig
View file @ 228a65d4
...@@ -105,7 +105,7 @@ config VSYSCALL ...@@ -105,7 +105,7 @@ config VSYSCALL
(the default value) say Y. (the default value) say Y.
config NUMA config NUMA
bool "Non Uniform Memory Access (NUMA) Support" bool "Non-Uniform Memory Access (NUMA) Support"
depends on MMU && SYS_SUPPORTS_NUMA depends on MMU && SYS_SUPPORTS_NUMA
select ARCH_WANT_NUMA_VARIABLE_LOCALITY select ARCH_WANT_NUMA_VARIABLE_LOCALITY
default n default n
......
arch/sh/mm/asids-debugfs.c
View file @ 228a65d4
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
static int asids_seq_show(struct seq_file *file, void *iter) static int asids_debugfs_show(struct seq_file *file, void *iter)
{ {
struct task_struct *p; struct task_struct *p;
...@@ -48,18 +48,7 @@ static int asids_seq_show(struct seq_file *file, void *iter) ...@@ -48,18 +48,7 @@ static int asids_seq_show(struct seq_file *file, void *iter)
return 0; return 0;
} }
static int asids_debugfs_open(struct inode *inode, struct file *file) DEFINE_SHOW_ATTRIBUTE(asids_debugfs);
{
return single_open(file, asids_seq_show, inode->i_private);
}
static const struct file_operations asids_debugfs_fops = {
.owner = THIS_MODULE,
.open = asids_debugfs_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
static int __init asids_debugfs_init(void) static int __init asids_debugfs_init(void)
{ {
......
arch/sh/mm/cache-debugfs.c
View file @ 228a65d4
...@@ -22,7 +22,7 @@ enum cache_type { ...@@ -22,7 +22,7 @@ enum cache_type {
CACHE_TYPE_UNIFIED, CACHE_TYPE_UNIFIED,
}; };
static int cache_seq_show(struct seq_file *file, void *iter) static int cache_debugfs_show(struct seq_file *file, void *iter)
{ {
unsigned int cache_type = (unsigned int)file->private; unsigned int cache_type = (unsigned int)file->private;
struct cache_info *cache; struct cache_info *cache;
...@@ -94,18 +94,7 @@ static int cache_seq_show(struct seq_file *file, void *iter) ...@@ -94,18 +94,7 @@ static int cache_seq_show(struct seq_file *file, void *iter)
return 0; return 0;
} }
static int cache_debugfs_open(struct inode *inode, struct file *file) DEFINE_SHOW_ATTRIBUTE(cache_debugfs);
{
return single_open(file, cache_seq_show, inode->i_private);
}
static const struct file_operations cache_debugfs_fops = {
.owner = THIS_MODULE,
.open = cache_debugfs_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
static int __init cache_debugfs_init(void) static int __init cache_debugfs_init(void)
{ {
......
arch/sh/mm/pmb.c
View file @ 228a65d4
...@@ -812,7 +812,7 @@ bool __in_29bit_mode(void) ...@@ -812,7 +812,7 @@ bool __in_29bit_mode(void)
return (__raw_readl(PMB_PASCR) & PASCR_SE) == 0; return (__raw_readl(PMB_PASCR) & PASCR_SE) == 0;
} }
static int pmb_seq_show(struct seq_file *file, void *iter) static int pmb_debugfs_show(struct seq_file *file, void *iter)
{ {
int i; int i;
...@@ -846,18 +846,7 @@ static int pmb_seq_show(struct seq_file *file, void *iter) ...@@ -846,18 +846,7 @@ static int pmb_seq_show(struct seq_file *file, void *iter)
return 0; return 0;
} }
static int pmb_debugfs_open(struct inode *inode, struct file *file) DEFINE_SHOW_ATTRIBUTE(pmb_debugfs);
{
return single_open(file, pmb_seq_show, NULL);
}
static const struct file_operations pmb_debugfs_fops = {
.owner = THIS_MODULE,
.open = pmb_debugfs_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
static int __init pmb_debugfs_init(void) static int __init pmb_debugfs_init(void)
{ {
......
drivers/sh/intc/core.c
View file @ 228a65d4
...@@ -214,7 +214,7 @@ int __init register_intc_controller(struct intc_desc *desc) ...@@ -214,7 +214,7 @@ int __init register_intc_controller(struct intc_desc *desc)
d->window[k].phys = res->start; d->window[k].phys = res->start;
d->window[k].size = resource_size(res); d->window[k].size = resource_size(res);
d->window[k].virt = ioremap(res->start, d->window[k].virt = ioremap(res->start,
resource_size(res)); resource_size(res));
if (!d->window[k].virt) if (!d->window[k].virt)
goto err2; goto err2;
} }
......
drivers/sh/intc/virq-debugfs.c
View file @ 228a65d4
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include "internals.h" #include "internals.h"
static int intc_irq_xlate_debug(struct seq_file *m, void *priv) static int intc_irq_xlate_show(struct seq_file *m, void *priv)
{ {
int i; int i;
...@@ -37,17 +37,7 @@ static int intc_irq_xlate_debug(struct seq_file *m, void *priv) ...@@ -37,17 +37,7 @@ static int intc_irq_xlate_debug(struct seq_file *m, void *priv)
return 0; return 0;
} }
static int intc_irq_xlate_open(struct inode *inode, struct file *file) DEFINE_SHOW_ATTRIBUTE(intc_irq_xlate);
{
return single_open(file, intc_irq_xlate_debug, inode->i_private);
}
static const struct file_operations intc_irq_xlate_fops = {
.open = intc_irq_xlate_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
static int __init intc_irq_xlate_init(void) static int __init intc_irq_xlate_init(void)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7