tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

Browse Source 
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Fixup __raw_read_trylock().
  sh: Kill off remaining config.h references.
  sh: Initial gitignore list
  sh: build fixes for defconfigs.
  sh: Kill off more dead headers.
  sh: Set pclk default for SH7705.
  sh: defconfig updates.
This commit is contained in:
Linus Torvalds
2006-10-03 08:54:28 -07:00
parent 1e9abb5b1d fac99d9746
commit 6ebfc0e20b
63 changed files with 5717 additions and 3432 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/asm-sh/.gitignore
+3
View File
@@ -0,0 +1,3 @@
cpu
mach
machtypes.h
include/asm-sh/cpu-sh3/rtc.h
-25
View File
@@ -1,25 +0,0 @@
#ifndef __ASM_CPU_SH3_RTC_H
#define __ASM_CPU_SH3_RTC_H
/* SH-3 RTC */
#define R64CNT 0xfffffec0
#define RSECCNT 0xfffffec2
#define RMINCNT 0xfffffec4
#define RHRCNT 0xfffffec6
#define RWKCNT 0xfffffec8
#define RDAYCNT 0xfffffeca
#define RMONCNT 0xfffffecc
#define RYRCNT 0xfffffece
#define RSECAR 0xfffffed0
#define RMINAR 0xfffffed2
#define RHRAR 0xfffffed4
#define RWKAR 0xfffffed6
#define RDAYAR 0xfffffed8
#define RMONAR 0xfffffeda
#define RCR1 0xfffffedc
#define RCR2 0xfffffede
#define RTC_BIT_INVERTED 0 /* No bug on SH7708, SH7709A */
#endif /* __ASM_CPU_SH3_RTC_H */
include/asm-sh/cpu-sh4/rtc.h
-25
View File
@@ -1,25 +0,0 @@
#ifndef __ASM_CPU_SH4_RTC_H
#define __ASM_CPU_SH4_RTC_H
/* SH-4 RTC */
#define R64CNT 0xffc80000
#define RSECCNT 0xffc80004
#define RMINCNT 0xffc80008
#define RHRCNT 0xffc8000c
#define RWKCNT 0xffc80010
#define RDAYCNT 0xffc80014
#define RMONCNT 0xffc80018
#define RYRCNT 0xffc8001c /* 16bit */
#define RSECAR 0xffc80020
#define RMINAR 0xffc80024
#define RHRAR 0xffc80028
#define RWKAR 0xffc8002c
#define RDAYAR 0xffc80030
#define RMONAR 0xffc80034
#define RCR1 0xffc80038
#define RCR2 0xffc8003c
#define RTC_BIT_INVERTED 0x40 /* bug on SH7750, SH7750S */
#endif /* __ASM_CPU_SH4_RTC_H */
include/asm-sh/elf.h
-1
View File
@@ -1,7 +1,6 @@
#ifndef __ASM_SH_ELF_H
#define __ASM_SH_ELF_H
#include <asm/processor.h>
#include <asm/auxvec.h>
#include <asm/ptrace.h>
#include <asm/user.h>
include/asm-sh/hs7751rvoip/io.h
-39
View File
@@ -1,39 +0,0 @@
/*
* include/asm-sh/hs7751rvoip/hs7751rvoip.h
*
* Modified version of io_se.h for the hs7751rvoip-specific functions.
*
* May be copied or modified under the terms of the GNU General Public
* License. See linux/COPYING for more information.
*
* IO functions for an Renesas Technology sales HS7751RVOIP
*/
#ifndef _ASM_SH_IO_HS7751RVOIP_H
#define _ASM_SH_IO_HS7751RVOIP_H
#include <asm/io_generic.h>
extern unsigned char hs7751rvoip_inb(unsigned long port);
extern unsigned short hs7751rvoip_inw(unsigned long port);
extern unsigned int hs7751rvoip_inl(unsigned long port);
extern void hs7751rvoip_outb(unsigned char value, unsigned long port);
extern void hs7751rvoip_outw(unsigned short value, unsigned long port);
extern void hs7751rvoip_outl(unsigned int value, unsigned long port);
extern unsigned char hs7751rvoip_inb_p(unsigned long port);
extern void hs7751rvoip_outb_p(unsigned char value, unsigned long port);
extern void hs7751rvoip_insb(unsigned long port, void *addr, unsigned long count);
extern void hs7751rvoip_insw(unsigned long port, void *addr, unsigned long count);
extern void hs7751rvoip_insl(unsigned long port, void *addr, unsigned long count);
extern void hs7751rvoip_outsb(unsigned long port, const void *addr, unsigned long count);
extern void hs7751rvoip_outsw(unsigned long port, const void *addr, unsigned long count);
extern void hs7751rvoip_outsl(unsigned long port, const void *addr, unsigned long count);
extern void *hs7751rvoip_ioremap(unsigned long offset, unsigned long size);
extern unsigned long hs7751rvoip_isa_port2addr(unsigned long offset);
#endif /* _ASM_SH_IO_HS7751RVOIP_H */
include/asm-sh/rts7751r2d/io.h
-37
View File
@@ -1,37 +0,0 @@
/*
* include/asm-sh/io_rts7751r2d.h
*
* Modified version of io_se.h for the rts7751r2d-specific functions.
*
* May be copied or modified under the terms of the GNU General Public
* License. See linux/COPYING for more information.
*
* IO functions for an Renesas Technology sales RTS7751R2D
*/
#ifndef _ASM_SH_IO_RTS7751R2D_H
#define _ASM_SH_IO_RTS7751R2D_H
extern unsigned char rts7751r2d_inb(unsigned long port);
extern unsigned short rts7751r2d_inw(unsigned long port);
extern unsigned int rts7751r2d_inl(unsigned long port);
extern void rts7751r2d_outb(unsigned char value, unsigned long port);
extern void rts7751r2d_outw(unsigned short value, unsigned long port);
extern void rts7751r2d_outl(unsigned int value, unsigned long port);
extern unsigned char rts7751r2d_inb_p(unsigned long port);
extern void rts7751r2d_outb_p(unsigned char value, unsigned long port);
extern void rts7751r2d_insb(unsigned long port, void *addr, unsigned long count);
extern void rts7751r2d_insw(unsigned long port, void *addr, unsigned long count);
extern void rts7751r2d_insl(unsigned long port, void *addr, unsigned long count);
extern void rts7751r2d_outsb(unsigned long port, const void *addr, unsigned long count);
extern void rts7751r2d_outsw(unsigned long port, const void *addr, unsigned long count);
extern void rts7751r2d_outsl(unsigned long port, const void *addr, unsigned long count);
extern void *rts7751r2d_ioremap(unsigned long offset, unsigned long size);
extern unsigned long rts7751r2d_isa_port2addr(unsigned long offset);
#endif /* _ASM_SH_IO_RTS7751R2D_H */
include/asm-sh/rts7751r2d/rts7751r2d.h
+3
View File
@@ -68,4 +68,7 @@
#define IRQ_PCISLOT2 10 /* PCI Slot #2 IRQ */
#define IRQ_EXTENTION 11 /* EXTn IRQ */
#define __IO_PREFIX rts7751r2d
#include <asm/io_generic.h>
#endif /* __ASM_SH_RENESAS_RTS7751R2D */
include/asm-sh/sfp-machine.h
-2
View File
@@ -25,8 +25,6 @@
#ifndef _SFP_MACHINE_H
#define _SFP_MACHINE_H
#include <linux/config.h>
#define _FP_W_TYPE_SIZE 32
#define _FP_W_TYPE unsigned long
#define _FP_WS_TYPE signed long
include/asm-sh/spinlock.h
+8 -1
View File
@@ -88,7 +88,14 @@ static inline void __raw_write_unlock(raw_rwlock_t *rw)
__raw_spin_unlock(&rw->lock);
}
#define __raw_read_trylock(lock) generic__raw_read_trylock(lock)
static inline int __raw_read_trylock(raw_rwlock_t *lock)
{
atomic_t *count = (atomic_t*)lock;
if (atomic_dec_return(count) >= 0)
return 1;
atomic_inc(count);
return 0;
}
static inline int __raw_write_trylock(raw_rwlock_t *rw)
{
include/asm-sh/string.h
+11 -4
View File
@@ -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 */