From 711fa8096863e4b50bb97f9ebc44606dc2182ac3 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Tue, 3 Oct 2006 13:14:04 +0900 Subject: [PATCH] sh: build fixes for defconfigs. Get all of the defconfigs building again. Signed-off-by: Paul Mundt --- arch/sh/boards/landisk/irq.c | 2 +- arch/sh/boards/renesas/r7780rp/irq.c | 2 +- arch/sh/boards/renesas/systemh/setup.c | 2 +- arch/sh/boards/se/7343/irq.c | 2 +- arch/sh/boards/se/770x/setup.c | 7 ++----- arch/sh/boards/se/7751/setup.c | 6 ++---- arch/sh/boards/sh03/setup.c | 1 + arch/sh/drivers/dma/dma-sysfs.c | 8 +++----- arch/sh/drivers/pci/ops-sh03.c | 4 ++-- arch/sh/kernel/entry.S | 6 +----- arch/sh/kernel/setup.c | 4 ++-- arch/sh/kernel/sh_ksyms.c | 1 + arch/sh/mm/cache-debugfs.c | 2 +- include/asm-sh/elf.h | 1 - include/asm-sh/rts7751r2d/rts7751r2d.h | 3 +++ include/asm-sh/string.h | 15 +++++++++++---- 16 files changed, 33 insertions(+), 33 deletions(-) diff --git a/arch/sh/boards/landisk/irq.c b/arch/sh/boards/landisk/irq.c index a006d64432..5891fcd804 100644 --- a/arch/sh/boards/landisk/irq.c +++ b/arch/sh/boards/landisk/irq.c @@ -83,7 +83,7 @@ static struct hw_interrupt_type landisk_irq_type = { static void make_landisk_irq(unsigned int irq) { disable_irq_nosync(irq); - irq_desc[irq].handler = &landisk_irq_type; + irq_desc[irq].chip = &landisk_irq_type; disable_landisk_irq(irq); } diff --git a/arch/sh/boards/renesas/r7780rp/irq.c b/arch/sh/boards/renesas/r7780rp/irq.c index 61d5e5d3c2..769ae6b651 100644 --- a/arch/sh/boards/renesas/r7780rp/irq.c +++ b/arch/sh/boards/renesas/r7780rp/irq.c @@ -83,7 +83,7 @@ static struct hw_interrupt_type r7780rp_irq_type = { static void make_r7780rp_irq(unsigned int irq) { disable_irq_nosync(irq); - irq_desc[irq].handler = &r7780rp_irq_type; + irq_desc[irq].chip = &r7780rp_irq_type; disable_r7780rp_irq(irq); } diff --git a/arch/sh/boards/renesas/systemh/setup.c b/arch/sh/boards/renesas/systemh/setup.c index a8467bf90c..bab7d3cdc8 100644 --- a/arch/sh/boards/renesas/systemh/setup.c +++ b/arch/sh/boards/renesas/systemh/setup.c @@ -53,6 +53,6 @@ struct sh_machine_vector mv_7751systemh __initmv = { .mv_outsw = sh7751systemh_outsw, .mv_outsl = sh7751systemh_outsl, - .mv_init_irq = sh7751system_init_irq, + .mv_init_irq = sh7751systemh_init_irq, }; ALIAS_MV(7751systemh) diff --git a/arch/sh/boards/se/7343/irq.c b/arch/sh/boards/se/7343/irq.c index b41e3d4ea3..739a7b001b 100644 --- a/arch/sh/boards/se/7343/irq.c +++ b/arch/sh/boards/se/7343/irq.c @@ -73,7 +73,7 @@ static void make_intreq_irq(unsigned int irq) { disable_irq_nosync(irq); - irq_desc[irq].handler = &intreq_irq_type; + irq_desc[irq].chip = &intreq_irq_type; disable_intreq_irq(irq); } diff --git a/arch/sh/boards/se/770x/setup.c b/arch/sh/boards/se/770x/setup.c index f3f82b7c82..a1d51d5fa9 100644 --- a/arch/sh/boards/se/770x/setup.c +++ b/arch/sh/boards/se/770x/setup.c @@ -8,13 +8,10 @@ * */ #include -#include -#include -#include -#include +#include #include +#include #include -#include void heartbeat_se(void); void init_se_IRQ(void); diff --git a/arch/sh/boards/se/7751/setup.c b/arch/sh/boards/se/7751/setup.c index 73e826310b..f7e1dd39c8 100644 --- a/arch/sh/boards/se/7751/setup.c +++ b/arch/sh/boards/se/7751/setup.c @@ -8,12 +8,10 @@ * Modified for 7751 Solution Engine by * Ian da Silva and Jeremy Siegel, 2001. */ - #include -#include -#include -#include +#include #include +#include void heartbeat_7751se(void); void init_7751se_IRQ(void); diff --git a/arch/sh/boards/sh03/setup.c b/arch/sh/boards/sh03/setup.c index 6c310587dd..137e2ba924 100644 --- a/arch/sh/boards/sh03/setup.c +++ b/arch/sh/boards/sh03/setup.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/arch/sh/drivers/dma/dma-sysfs.c b/arch/sh/drivers/dma/dma-sysfs.c index 70a5d82eb2..29b8ef9873 100644 --- a/arch/sh/drivers/dma/dma-sysfs.c +++ b/arch/sh/drivers/dma/dma-sysfs.c @@ -48,12 +48,11 @@ static int __init dma_sysclass_init(void) int ret; ret = sysdev_class_register(&dma_sysclass); - if (ret == 0) - sysfs_create_file(&dma_sysclass.kset.kobj, &attr_devices.attr); + if (unlikely(ret)) + return ret; - return ret; + return sysfs_create_file(&dma_sysclass.kset.kobj, &attr_devices.attr); } - postcore_initcall(dma_sysclass_init); static ssize_t dma_show_dev_id(struct sys_device *dev, char *buf) @@ -152,4 +151,3 @@ void dma_remove_sysfs_files(struct dma_channel *chan, struct dma_info *info) sysdev_unregister(dev); } - diff --git a/arch/sh/drivers/pci/ops-sh03.c b/arch/sh/drivers/pci/ops-sh03.c index e58d556e5f..ebb58e605d 100644 --- a/arch/sh/drivers/pci/ops-sh03.c +++ b/arch/sh/drivers/pci/ops-sh03.c @@ -35,10 +35,10 @@ static struct resource sh7751_mem_resource = { .flags = IORESOURCE_MEM }; -extern struct pci_ops sh7751_pci_ops; +extern struct pci_ops sh4_pci_ops; struct pci_channel board_pci_channels[] = { - { &sh7751_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff }, + { &sh4_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff }, { NULL, NULL, NULL, 0, 0 }, }; diff --git a/arch/sh/kernel/entry.S b/arch/sh/kernel/entry.S index fe8221855b..97c571fbcd 100644 --- a/arch/sh/kernel/entry.S +++ b/arch/sh/kernel/entry.S @@ -10,8 +10,8 @@ * for more details. * */ - #include +#include #include #include #include @@ -53,10 +53,6 @@ * syscall # * */ - -ENOSYS = 38 -EINVAL = 22 - #if defined(CONFIG_KGDB_NMI) NMI_VEC = 0x1c0 ! Must catch early for debounce #endif diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 77491cf9b2..36d86f9ac3 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -1,5 +1,4 @@ -/* $Id: setup.c,v 1.30 2003/10/13 07:21:19 lethal Exp $ - * +/* * linux/arch/sh/kernel/setup.c * * Copyright (C) 1999 Niibe Yutaka @@ -21,6 +20,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/sh/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms.c index d3cbfa2ad4..9daad70bc3 100644 --- a/arch/sh/kernel/sh_ksyms.c +++ b/arch/sh/kernel/sh_ksyms.c @@ -72,6 +72,7 @@ DECLARE_EXPORT(__ashrdi3); DECLARE_EXPORT(__ashldi3); DECLARE_EXPORT(__lshrdi3); DECLARE_EXPORT(__movstr); +DECLARE_EXPORT(__movstrSI16); EXPORT_SYMBOL(strcpy); diff --git a/arch/sh/mm/cache-debugfs.c b/arch/sh/mm/cache-debugfs.c index a22d914e4d..e0122bd33d 100644 --- a/arch/sh/mm/cache-debugfs.c +++ b/arch/sh/mm/cache-debugfs.c @@ -111,7 +111,7 @@ static int cache_seq_show(struct seq_file *file, void *iter) static int cache_debugfs_open(struct inode *inode, struct file *file) { - return single_open(file, cache_seq_show, inode->u.generic_ip); + return single_open(file, cache_seq_show, inode->i_private); } static struct file_operations cache_debugfs_fops = { diff --git a/include/asm-sh/elf.h b/include/asm-sh/elf.h index 3a07ab40ac..fc050fd764 100644 --- a/include/asm-sh/elf.h +++ b/include/asm-sh/elf.h @@ -1,7 +1,6 @@ #ifndef __ASM_SH_ELF_H #define __ASM_SH_ELF_H -#include #include #include #include diff --git a/include/asm-sh/rts7751r2d/rts7751r2d.h b/include/asm-sh/rts7751r2d/rts7751r2d.h index b112ae221f..796b8fcb81 100644 --- a/include/asm-sh/rts7751r2d/rts7751r2d.h +++ b/include/asm-sh/rts7751r2d/rts7751r2d.h @@ -68,4 +68,7 @@ #define IRQ_PCISLOT2 10 /* PCI Slot #2 IRQ */ #define IRQ_EXTENTION 11 /* EXTn IRQ */ +#define __IO_PREFIX rts7751r2d +#include + #endif /* __ASM_SH_RENESAS_RTS7751R2D */ diff --git a/include/asm-sh/string.h b/include/asm-sh/string.h index 3e0cff04ca..95bc7db006 100644 --- a/include/asm-sh/string.h +++ b/include/asm-sh/string.h @@ -1,13 +1,15 @@ #ifndef __ASM_SH_STRING_H #define __ASM_SH_STRING_H +#ifdef __KERNEL__ + /* * Copyright (C) 1999 Niibe Yutaka * But consider these trivial functions to be public domain. */ #define __HAVE_ARCH_STRCPY -static __inline__ char *strcpy(char *__dest, const char *__src) +static inline char *strcpy(char *__dest, const char *__src) { register char *__xdest = __dest; unsigned long __dummy; @@ -26,7 +28,7 @@ static __inline__ char *strcpy(char *__dest, const char *__src) } #define __HAVE_ARCH_STRNCPY -static __inline__ char *strncpy(char *__dest, const char *__src, size_t __n) +static inline char *strncpy(char *__dest, const char *__src, size_t __n) { register char *__xdest = __dest; unsigned long __dummy; @@ -52,7 +54,7 @@ static __inline__ char *strncpy(char *__dest, const char *__src, size_t __n) } #define __HAVE_ARCH_STRCMP -static __inline__ int strcmp(const char *__cs, const char *__ct) +static inline int strcmp(const char *__cs, const char *__ct) { register int __res; unsigned long __dummy; @@ -78,7 +80,7 @@ static __inline__ int strcmp(const char *__cs, const char *__ct) } #define __HAVE_ARCH_STRNCMP -static __inline__ int strncmp(const char *__cs, const char *__ct, size_t __n) +static inline int strncmp(const char *__cs, const char *__ct, size_t __n) { register int __res; unsigned long __dummy; @@ -124,4 +126,9 @@ extern void *memchr(const void *__s, int __c, size_t __n); #define __HAVE_ARCH_STRLEN extern size_t strlen(const char *); +/* arch/sh/lib/strcasecmp.c */ +extern int strcasecmp(const char *, const char *); + +#endif /* __KERNEL__ */ + #endif /* __ASM_SH_STRING_H */ -- 2.39.5