mirror of
https://github.com/adulau/aha.git
synced 2024-12-29 04:06:22 +00:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC32]: Fix build-warning in io-unit.c [SPARC64]: Fix BACKOFF_SPIN on non-SMP. [SPARC32]: __inline__ --> inline [SPARC64]: __inline__ --> inline
This commit is contained in:
Linus Torvalds
commit
a2508c0814
35 changed files with 169 additions and 205 deletions
|
|
@ -753,7 +753,7 @@ void __init pci_time_init(void)
|
|||
local_irq_enable();
|
||||
}
|
||||
|
||||
static __inline__ unsigned long do_gettimeoffset(void)
|
||||
static inline unsigned long do_gettimeoffset(void)
|
||||
{
|
||||
/*
|
||||
* We divide all by 100
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
/* $Id: process.c,v 1.161 2002/01/23 11:27:32 davem Exp $
|
||||
* linux/arch/sparc/kernel/process.c
|
||||
/* linux/arch/sparc/kernel/process.c
|
||||
*
|
||||
* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
|
||||
* Copyright (C) 1995 David S. Miller (davem@davemloft.net)
|
||||
* Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be)
|
||||
*/
|
||||
|
||||
|
|
@ -397,7 +396,7 @@ void flush_thread(void)
|
|||
}
|
||||
}
|
||||
|
||||
static __inline__ struct sparc_stackf __user *
|
||||
static inline struct sparc_stackf __user *
|
||||
clone_stackframe(struct sparc_stackf __user *dst,
|
||||
struct sparc_stackf __user *src)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
/* $Id: time.c,v 1.60 2002/01/23 14:33:55 davem Exp $
|
||||
* linux/arch/sparc/kernel/time.c
|
||||
/* linux/arch/sparc/kernel/time.c
|
||||
*
|
||||
* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
|
||||
* Copyright (C) 1995 David S. Miller (davem@davemloft.net)
|
||||
* Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu)
|
||||
*
|
||||
* Chris Davis (cdavis@cois.on.ca) 03/27/1998
|
||||
|
|
@ -210,7 +209,7 @@ static void __devinit kick_start_clock(void)
|
|||
}
|
||||
|
||||
/* Return nonzero if the clock chip battery is low. */
|
||||
static __inline__ int has_low_battery(void)
|
||||
static inline int has_low_battery(void)
|
||||
{
|
||||
struct mostek48t02 *regs = (struct mostek48t02 *)mstk48t02_regs;
|
||||
unsigned char data1, data2;
|
||||
|
|
@ -252,7 +251,7 @@ static void __devinit mostek_set_system_time(void)
|
|||
}
|
||||
|
||||
/* Probe for the real time clock chip on Sun4 */
|
||||
static __inline__ void sun4_clock_probe(void)
|
||||
static inline void sun4_clock_probe(void)
|
||||
{
|
||||
#ifdef CONFIG_SUN4
|
||||
int temp;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
/* $Id: btfixup.c,v 1.10 2000/05/09 17:40:13 davem Exp $
|
||||
* btfixup.c: Boot time code fixup and relocator, so that
|
||||
/* btfixup.c: Boot time code fixup and relocator, so that
|
||||
* we can get rid of most indirect calls to achieve single
|
||||
* image sun4c and srmmu kernel.
|
||||
*
|
||||
|
|
@ -69,7 +68,7 @@ static void __init set_addr(unsigned int *addr, unsigned int q1, int fmangled, u
|
|||
}
|
||||
}
|
||||
#else
|
||||
static __inline__ void set_addr(unsigned int *addr, unsigned int q1, int fmangled, unsigned int value)
|
||||
static inline void set_addr(unsigned int *addr, unsigned int q1, int fmangled, unsigned int value)
|
||||
{
|
||||
*addr = value;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ static void iounit_get_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_bus
|
|||
spin_lock_irqsave(&iounit->lock, flags);
|
||||
while (sz != 0) {
|
||||
--sz;
|
||||
sg->dvma_address = iounit_get_area(iounit, sg_virt(sg), sg->length);
|
||||
sg->dvma_address = iounit_get_area(iounit, (unsigned long) sg_virt(sg), sg->length);
|
||||
sg->dvma_length = sg->length;
|
||||
sg = sg_next(sg);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
/* $Id: sun4c.c,v 1.212 2001/12/21 04:56:15 davem Exp $
|
||||
* sun4c.c: Doing in software what should be done in hardware.
|
||||
/* sun4c.c: Doing in software what should be done in hardware.
|
||||
*
|
||||
* Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
|
||||
* Copyright (C) 1996 David S. Miller (davem@davemloft.net)
|
||||
* Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be)
|
||||
* Copyright (C) 1996 Andrew Tridgell (Andrew.Tridgell@anu.edu.au)
|
||||
* Copyright (C) 1997-2000 Anton Blanchard (anton@samba.org)
|
||||
|
|
@ -719,7 +718,7 @@ static void add_ring(struct sun4c_mmu_ring *ring,
|
|||
ring->num_entries++;
|
||||
}
|
||||
|
||||
static __inline__ void add_lru(struct sun4c_mmu_entry *entry)
|
||||
static inline void add_lru(struct sun4c_mmu_entry *entry)
|
||||
{
|
||||
struct sun4c_mmu_ring *ring = &sun4c_ulru_ring;
|
||||
struct sun4c_mmu_entry *head = &ring->ringhd;
|
||||
|
|
@ -746,7 +745,7 @@ static void add_ring_ordered(struct sun4c_mmu_ring *ring,
|
|||
add_lru(entry);
|
||||
}
|
||||
|
||||
static __inline__ void remove_ring(struct sun4c_mmu_ring *ring,
|
||||
static inline void remove_ring(struct sun4c_mmu_ring *ring,
|
||||
struct sun4c_mmu_entry *entry)
|
||||
{
|
||||
struct sun4c_mmu_entry *next = entry->next;
|
||||
|
|
@ -1836,7 +1835,7 @@ static unsigned long sun4c_pte_to_pgoff(pte_t pte)
|
|||
}
|
||||
|
||||
|
||||
static __inline__ unsigned long sun4c_pmd_page_v(pmd_t pmd)
|
||||
static inline unsigned long sun4c_pmd_page_v(pmd_t pmd)
|
||||
{
|
||||
return (pmd_val(pmd) & PAGE_MASK);
|
||||
}
|
||||
|
|
@ -1922,7 +1921,7 @@ static void sun4c_free_pgd_fast(pgd_t *pgd)
|
|||
}
|
||||
|
||||
|
||||
static __inline__ pte_t *
|
||||
static inline pte_t *
|
||||
sun4c_pte_alloc_one_fast(struct mm_struct *mm, unsigned long address)
|
||||
{
|
||||
unsigned long *ret;
|
||||
|
|
@ -1956,7 +1955,7 @@ static struct page *sun4c_pte_alloc_one(struct mm_struct *mm, unsigned long addr
|
|||
return virt_to_page(pte);
|
||||
}
|
||||
|
||||
static __inline__ void sun4c_free_pte_fast(pte_t *pte)
|
||||
static inline void sun4c_free_pte_fast(pte_t *pte)
|
||||
{
|
||||
*(unsigned long *)pte = (unsigned long) pte_quicklist;
|
||||
pte_quicklist = (unsigned long *) pte;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* binfmt_elf32.c: Support 32-bit Sparc ELF binaries on Ultra.
|
||||
*
|
||||
* Copyright (C) 1995, 1996, 1997, 1998 David S. Miller (davem@redhat.com)
|
||||
* Copyright (C) 1995, 1996, 1997, 1998 David S. Miller (davem@davemloft.net)
|
||||
* Copyright (C) 1995, 1996, 1997, 1998 Jakub Jelinek (jj@ultra.linux.cz)
|
||||
*/
|
||||
|
||||
|
|
@ -133,7 +133,7 @@ struct elf_prpsinfo32
|
|||
|
||||
#undef cputime_to_timeval
|
||||
#define cputime_to_timeval cputime_to_compat_timeval
|
||||
static __inline__ void
|
||||
static inline void
|
||||
cputime_to_compat_timeval(const cputime_t cputime, struct compat_timeval *value)
|
||||
{
|
||||
unsigned long jiffies = cputime_to_jiffies(cputime);
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
/* $Id: central.c,v 1.15 2001/12/19 00:29:51 davem Exp $
|
||||
* central.c: Central FHC driver for Sunfire/Starfire/Wildfire.
|
||||
/* central.c: Central FHC driver for Sunfire/Starfire/Wildfire.
|
||||
*
|
||||
* Copyright (C) 1997, 1999 David S. Miller (davem@redhat.com)
|
||||
* Copyright (C) 1997, 1999 David S. Miller (davem@davemloft.net)
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
|
|
@ -385,7 +384,7 @@ void __init central_probe(void)
|
|||
init_all_fhc_hw();
|
||||
}
|
||||
|
||||
static __inline__ void fhc_ledblink(struct linux_fhc *fhc, int on)
|
||||
static inline void fhc_ledblink(struct linux_fhc *fhc, int on)
|
||||
{
|
||||
u32 tmp;
|
||||
|
||||
|
|
@ -402,7 +401,7 @@ static __inline__ void fhc_ledblink(struct linux_fhc *fhc, int on)
|
|||
upa_readl(fhc->fhc_regs.pregs + FHC_PREGS_CTRL);
|
||||
}
|
||||
|
||||
static __inline__ void central_ledblink(struct linux_central *central, int on)
|
||||
static inline void central_ledblink(struct linux_central *central, int on)
|
||||
{
|
||||
u8 tmp;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
/* $Id: semaphore.c,v 1.9 2001/11/18 00:12:56 davem Exp $
|
||||
* semaphore.c: Sparc64 semaphore implementation.
|
||||
/* semaphore.c: Sparc64 semaphore implementation.
|
||||
*
|
||||
* This is basically the PPC semaphore scheme ported to use
|
||||
* the sparc64 atomic instructions, so see the PPC code for
|
||||
|
|
@ -19,7 +18,7 @@
|
|||
* sem->count = tmp;
|
||||
* return old_count;
|
||||
*/
|
||||
static __inline__ int __sem_update_count(struct semaphore *sem, int incr)
|
||||
static inline int __sem_update_count(struct semaphore *sem, int incr)
|
||||
{
|
||||
int old_count, tmp;
|
||||
|
||||
|
|
|
|||
|
|
@ -459,7 +459,7 @@ again:
|
|||
}
|
||||
}
|
||||
|
||||
static __inline__ void spitfire_xcall_deliver(u64 data0, u64 data1, u64 data2, cpumask_t mask)
|
||||
static inline void spitfire_xcall_deliver(u64 data0, u64 data1, u64 data2, cpumask_t mask)
|
||||
{
|
||||
u64 pstate;
|
||||
int i;
|
||||
|
|
@ -906,7 +906,7 @@ extern atomic_t dcpage_flushes;
|
|||
extern atomic_t dcpage_flushes_xcall;
|
||||
#endif
|
||||
|
||||
static __inline__ void __local_flush_dcache_page(struct page *page)
|
||||
static inline void __local_flush_dcache_page(struct page *page)
|
||||
{
|
||||
#ifdef DCACHE_ALIASING_POSSIBLE
|
||||
__flush_dcache_page(page_address(page),
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
/* $Id: traps.c,v 1.85 2002/02/09 19:49:31 davem Exp $
|
||||
* arch/sparc64/kernel/traps.c
|
||||
/* arch/sparc64/kernel/traps.c
|
||||
*
|
||||
* Copyright (C) 1995,1997 David S. Miller (davem@caip.rutgers.edu)
|
||||
* Copyright (C) 1995,1997 David S. Miller (davem@davemloft.net)
|
||||
* Copyright (C) 1997,1999,2000 Jakub Jelinek (jakub@redhat.com)
|
||||
*/
|
||||
|
||||
|
|
@ -765,7 +764,7 @@ static unsigned long cheetah_afsr_errors;
|
|||
*/
|
||||
struct cheetah_err_info *cheetah_error_log;
|
||||
|
||||
static __inline__ struct cheetah_err_info *cheetah_get_error_log(unsigned long afsr)
|
||||
static inline struct cheetah_err_info *cheetah_get_error_log(unsigned long afsr)
|
||||
{
|
||||
struct cheetah_err_info *p;
|
||||
int cpu = smp_processor_id();
|
||||
|
|
@ -1085,7 +1084,7 @@ static unsigned char cheetah_mtag_syntab[] = {
|
|||
};
|
||||
|
||||
/* Return the highest priority error conditon mentioned. */
|
||||
static __inline__ unsigned long cheetah_get_hipri(unsigned long afsr)
|
||||
static inline unsigned long cheetah_get_hipri(unsigned long afsr)
|
||||
{
|
||||
unsigned long tmp = 0;
|
||||
int i;
|
||||
|
|
|
|||
|
|
@ -201,7 +201,7 @@ inline void flush_dcache_page_impl(struct page *page)
|
|||
#define dcache_dirty_cpu(page) \
|
||||
(((page)->flags >> PG_dcache_cpu_shift) & PG_dcache_cpu_mask)
|
||||
|
||||
static __inline__ void set_dcache_dirty(struct page *page, int this_cpu)
|
||||
static inline void set_dcache_dirty(struct page *page, int this_cpu)
|
||||
{
|
||||
unsigned long mask = this_cpu;
|
||||
unsigned long non_cpu_bits;
|
||||
|
|
@ -223,7 +223,7 @@ static __inline__ void set_dcache_dirty(struct page *page, int this_cpu)
|
|||
: "g1", "g7");
|
||||
}
|
||||
|
||||
static __inline__ void clear_dcache_dirty_cpu(struct page *page, unsigned long cpu)
|
||||
static inline void clear_dcache_dirty_cpu(struct page *page, unsigned long cpu)
|
||||
{
|
||||
unsigned long mask = (1UL << PG_dcache_dirty);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
/* $Id: console.c,v 1.9 1997/10/29 07:41:43 ecd Exp $
|
||||
* console.c: Routines that deal with sending and receiving IO
|
||||
/* console.c: Routines that deal with sending and receiving IO
|
||||
* to/from the current console device using the PROM.
|
||||
*
|
||||
* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
|
||||
* Copyright (C) 1995 David S. Miller (davem@davemloft.net)
|
||||
* Copyright (C) 1996,1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
|
||||
*/
|
||||
|
||||
|
|
@ -19,7 +18,7 @@ extern int prom_stdin, prom_stdout;
|
|||
/* Non blocking get character from console input device, returns -1
|
||||
* if no input was taken. This can be used for polling.
|
||||
*/
|
||||
__inline__ int
|
||||
inline int
|
||||
prom_nbgetchar(void)
|
||||
{
|
||||
char inc;
|
||||
|
|
@ -35,7 +34,7 @@ prom_nbgetchar(void)
|
|||
/* Non blocking put character to console device, returns -1 if
|
||||
* unsuccessful.
|
||||
*/
|
||||
__inline__ int
|
||||
inline int
|
||||
prom_nbputchar(char c)
|
||||
{
|
||||
char outc;
|
||||
|
|
|
|||
|
|
@ -18,14 +18,12 @@
|
|||
/* Return the child of node 'node' or zero if no this node has no
|
||||
* direct descendent.
|
||||
*/
|
||||
__inline__ int
|
||||
__prom_getchild(int node)
|
||||
inline int __prom_getchild(int node)
|
||||
{
|
||||
return p1275_cmd ("child", P1275_INOUT(1, 1), node);
|
||||
}
|
||||
|
||||
__inline__ int
|
||||
prom_getchild(int node)
|
||||
inline int prom_getchild(int node)
|
||||
{
|
||||
int cnode;
|
||||
|
||||
|
|
@ -35,8 +33,7 @@ prom_getchild(int node)
|
|||
return (int)cnode;
|
||||
}
|
||||
|
||||
__inline__ int
|
||||
prom_getparent(int node)
|
||||
inline int prom_getparent(int node)
|
||||
{
|
||||
int cnode;
|
||||
|
||||
|
|
@ -49,14 +46,12 @@ prom_getparent(int node)
|
|||
/* Return the next sibling of node 'node' or zero if no more siblings
|
||||
* at this level of depth in the tree.
|
||||
*/
|
||||
__inline__ int
|
||||
__prom_getsibling(int node)
|
||||
inline int __prom_getsibling(int node)
|
||||
{
|
||||
return p1275_cmd(prom_peer_name, P1275_INOUT(1, 1), node);
|
||||
}
|
||||
|
||||
__inline__ int
|
||||
prom_getsibling(int node)
|
||||
inline int prom_getsibling(int node)
|
||||
{
|
||||
int sibnode;
|
||||
|
||||
|
|
@ -72,8 +67,7 @@ prom_getsibling(int node)
|
|||
/* Return the length in bytes of property 'prop' at node 'node'.
|
||||
* Return -1 on error.
|
||||
*/
|
||||
__inline__ int
|
||||
prom_getproplen(int node, const char *prop)
|
||||
inline int prom_getproplen(int node, const char *prop)
|
||||
{
|
||||
if((!node) || (!prop)) return -1;
|
||||
return p1275_cmd ("getproplen",
|
||||
|
|
@ -86,8 +80,8 @@ prom_getproplen(int node, const char *prop)
|
|||
* 'buffer' which has a size of 'bufsize'. If the acquisition
|
||||
* was successful the length will be returned, else -1 is returned.
|
||||
*/
|
||||
__inline__ int
|
||||
prom_getproperty(int node, const char *prop, char *buffer, int bufsize)
|
||||
inline int prom_getproperty(int node, const char *prop,
|
||||
char *buffer, int bufsize)
|
||||
{
|
||||
int plen;
|
||||
|
||||
|
|
@ -107,8 +101,7 @@ prom_getproperty(int node, const char *prop, char *buffer, int bufsize)
|
|||
/* Acquire an integer property and return its value. Returns -1
|
||||
* on failure.
|
||||
*/
|
||||
__inline__ int
|
||||
prom_getint(int node, const char *prop)
|
||||
inline int prom_getint(int node, const char *prop)
|
||||
{
|
||||
int intprop;
|
||||
|
||||
|
|
@ -122,8 +115,7 @@ prom_getint(int node, const char *prop)
|
|||
* integer.
|
||||
*/
|
||||
|
||||
int
|
||||
prom_getintdefault(int node, const char *property, int deflt)
|
||||
int prom_getintdefault(int node, const char *property, int deflt)
|
||||
{
|
||||
int retval;
|
||||
|
||||
|
|
@ -134,8 +126,7 @@ prom_getintdefault(int node, const char *property, int deflt)
|
|||
}
|
||||
|
||||
/* Acquire a boolean property, 1=TRUE 0=FALSE. */
|
||||
int
|
||||
prom_getbool(int node, const char *prop)
|
||||
int prom_getbool(int node, const char *prop)
|
||||
{
|
||||
int retval;
|
||||
|
||||
|
|
@ -148,8 +139,7 @@ prom_getbool(int node, const char *prop)
|
|||
* string on error. The char pointer is the user supplied string
|
||||
* buffer.
|
||||
*/
|
||||
void
|
||||
prom_getstring(int node, const char *prop, char *user_buf, int ubuf_size)
|
||||
void prom_getstring(int node, const char *prop, char *user_buf, int ubuf_size)
|
||||
{
|
||||
int len;
|
||||
|
||||
|
|
@ -163,8 +153,7 @@ prom_getstring(int node, const char *prop, char *user_buf, int ubuf_size)
|
|||
/* Does the device at node 'node' have name 'name'?
|
||||
* YES = 1 NO = 0
|
||||
*/
|
||||
int
|
||||
prom_nodematch(int node, const char *name)
|
||||
int prom_nodematch(int node, const char *name)
|
||||
{
|
||||
char namebuf[128];
|
||||
prom_getproperty(node, "name", namebuf, sizeof(namebuf));
|
||||
|
|
@ -175,8 +164,7 @@ prom_nodematch(int node, const char *name)
|
|||
/* Search siblings at 'node_start' for a node with name
|
||||
* 'nodename'. Return node if successful, zero if not.
|
||||
*/
|
||||
int
|
||||
prom_searchsiblings(int node_start, const char *nodename)
|
||||
int prom_searchsiblings(int node_start, const char *nodename)
|
||||
{
|
||||
|
||||
int thisnode, error;
|
||||
|
|
@ -197,8 +185,7 @@ prom_searchsiblings(int node_start, const char *nodename)
|
|||
/* Return the first property type for node 'node'.
|
||||
* buffer should be at least 32B in length
|
||||
*/
|
||||
__inline__ char *
|
||||
prom_firstprop(int node, char *buffer)
|
||||
inline char *prom_firstprop(int node, char *buffer)
|
||||
{
|
||||
*buffer = 0;
|
||||
if(node == -1) return buffer;
|
||||
|
|
@ -212,8 +199,7 @@ prom_firstprop(int node, char *buffer)
|
|||
* at node 'node' . Returns NULL string if no more
|
||||
* property types for this node.
|
||||
*/
|
||||
__inline__ char *
|
||||
prom_nextprop(int node, const char *oprop, char *buffer)
|
||||
inline char *prom_nextprop(int node, const char *oprop, char *buffer)
|
||||
{
|
||||
char buf[32];
|
||||
|
||||
|
|
@ -279,8 +265,7 @@ prom_setprop(int node, const char *pname, char *value, int size)
|
|||
node, pname, value, P1275_SIZE(size));
|
||||
}
|
||||
|
||||
__inline__ int
|
||||
prom_inst2pkg(int inst)
|
||||
inline int prom_inst2pkg(int inst)
|
||||
{
|
||||
int node;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* atomic.h: These still suck, but the I-cache hit rate is higher.
|
||||
*
|
||||
* Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
|
||||
* Copyright (C) 1996 David S. Miller (davem@davemloft.net)
|
||||
* Copyright (C) 2000 Anton Blanchard (anton@linuxcare.com.au)
|
||||
* Copyright (C) 2007 Kyle McMartin (kyle@parisc-linux.org)
|
||||
*
|
||||
|
|
@ -33,7 +33,7 @@ extern void __cmpxchg_called_with_bad_pointer(void);
|
|||
extern unsigned long __cmpxchg_u32(volatile u32 *m, u32 old, u32 new_);
|
||||
|
||||
/* don't worry...optimizer will get rid of most of this */
|
||||
static __inline__ unsigned long
|
||||
static inline unsigned long
|
||||
__cmpxchg(volatile void *ptr, unsigned long old, unsigned long new_, int size)
|
||||
{
|
||||
switch(size) {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
/* $Id: dma.h,v 1.35 1999/12/27 06:37:09 anton Exp $
|
||||
* include/asm-sparc/dma.h
|
||||
/* include/asm-sparc/dma.h
|
||||
*
|
||||
* Copyright 1995 (C) David S. Miller (davem@caip.rutgers.edu)
|
||||
* Copyright 1995 (C) David S. Miller (davem@davemloft.net)
|
||||
*/
|
||||
|
||||
#ifndef _ASM_SPARC_DMA_H
|
||||
|
|
@ -21,14 +20,14 @@
|
|||
struct page;
|
||||
extern spinlock_t dma_spin_lock;
|
||||
|
||||
static __inline__ unsigned long claim_dma_lock(void)
|
||||
static inline unsigned long claim_dma_lock(void)
|
||||
{
|
||||
unsigned long flags;
|
||||
spin_lock_irqsave(&dma_spin_lock, flags);
|
||||
return flags;
|
||||
}
|
||||
|
||||
static __inline__ void release_dma_lock(unsigned long flags)
|
||||
static inline void release_dma_lock(unsigned long flags)
|
||||
{
|
||||
spin_unlock_irqrestore(&dma_spin_lock, flags);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* asm-sparc/floppy.h: Sparc specific parts of the Floppy driver.
|
||||
*
|
||||
* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
|
||||
* Copyright (C) 1995 David S. Miller (davem@davemloft.net)
|
||||
*/
|
||||
|
||||
#ifndef __ASM_SPARC_FLOPPY_H
|
||||
|
|
@ -232,12 +232,12 @@ extern char *pdma_base;
|
|||
extern unsigned long pdma_areasize;
|
||||
|
||||
/* Common routines to all controller types on the Sparc. */
|
||||
static __inline__ void virtual_dma_init(void)
|
||||
static inline void virtual_dma_init(void)
|
||||
{
|
||||
/* nothing... */
|
||||
}
|
||||
|
||||
static __inline__ void sun_fd_disable_dma(void)
|
||||
static inline void sun_fd_disable_dma(void)
|
||||
{
|
||||
doing_pdma = 0;
|
||||
if (pdma_base) {
|
||||
|
|
@ -246,7 +246,7 @@ static __inline__ void sun_fd_disable_dma(void)
|
|||
}
|
||||
}
|
||||
|
||||
static __inline__ void sun_fd_set_dma_mode(int mode)
|
||||
static inline void sun_fd_set_dma_mode(int mode)
|
||||
{
|
||||
switch(mode) {
|
||||
case DMA_MODE_READ:
|
||||
|
|
@ -261,17 +261,17 @@ static __inline__ void sun_fd_set_dma_mode(int mode)
|
|||
}
|
||||
}
|
||||
|
||||
static __inline__ void sun_fd_set_dma_addr(char *buffer)
|
||||
static inline void sun_fd_set_dma_addr(char *buffer)
|
||||
{
|
||||
pdma_vaddr = buffer;
|
||||
}
|
||||
|
||||
static __inline__ void sun_fd_set_dma_count(int length)
|
||||
static inline void sun_fd_set_dma_count(int length)
|
||||
{
|
||||
pdma_size = length;
|
||||
}
|
||||
|
||||
static __inline__ void sun_fd_enable_dma(void)
|
||||
static inline void sun_fd_enable_dma(void)
|
||||
{
|
||||
pdma_vaddr = mmu_lockarea(pdma_vaddr, pdma_size);
|
||||
pdma_base = pdma_vaddr;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
/* $Id: ide.h,v 1.7 2002/01/16 20:58:40 davem Exp $
|
||||
* ide.h: SPARC PCI specific IDE glue.
|
||||
/* ide.h: SPARC PCI specific IDE glue.
|
||||
*
|
||||
* Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu)
|
||||
* Copyright (C) 1997 David S. Miller (davem@davemloft.net)
|
||||
* Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be)
|
||||
* Adaptation from sparc64 version to sparc by Pete Zaitcev.
|
||||
*/
|
||||
|
|
@ -31,7 +30,7 @@
|
|||
#define __ide_mm_outsw __ide_outsw
|
||||
#define __ide_mm_outsl __ide_outsl
|
||||
|
||||
static __inline__ void __ide_insw(unsigned long port,
|
||||
static inline void __ide_insw(unsigned long port,
|
||||
void *dst,
|
||||
unsigned long count)
|
||||
{
|
||||
|
|
@ -62,7 +61,7 @@ static __inline__ void __ide_insw(unsigned long port,
|
|||
/* __flush_dcache_range((unsigned long)dst, end); */ /* P3 see hme */
|
||||
}
|
||||
|
||||
static __inline__ void __ide_outsw(unsigned long port,
|
||||
static inline void __ide_outsw(unsigned long port,
|
||||
const void *src,
|
||||
unsigned long count)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ typedef struct {
|
|||
#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
|
||||
|
||||
#undef __FD_SET
|
||||
static __inline__ void __FD_SET(unsigned long fd, __kernel_fd_set *fdsetp)
|
||||
static inline void __FD_SET(unsigned long fd, __kernel_fd_set *fdsetp)
|
||||
{
|
||||
unsigned long _tmp = fd / __NFDBITS;
|
||||
unsigned long _rem = fd % __NFDBITS;
|
||||
|
|
@ -57,7 +57,7 @@ static __inline__ void __FD_SET(unsigned long fd, __kernel_fd_set *fdsetp)
|
|||
}
|
||||
|
||||
#undef __FD_CLR
|
||||
static __inline__ void __FD_CLR(unsigned long fd, __kernel_fd_set *fdsetp)
|
||||
static inline void __FD_CLR(unsigned long fd, __kernel_fd_set *fdsetp)
|
||||
{
|
||||
unsigned long _tmp = fd / __NFDBITS;
|
||||
unsigned long _rem = fd % __NFDBITS;
|
||||
|
|
@ -65,7 +65,7 @@ static __inline__ void __FD_CLR(unsigned long fd, __kernel_fd_set *fdsetp)
|
|||
}
|
||||
|
||||
#undef __FD_ISSET
|
||||
static __inline__ int __FD_ISSET(unsigned long fd, __const__ __kernel_fd_set *p)
|
||||
static inline int __FD_ISSET(unsigned long fd, __const__ __kernel_fd_set *p)
|
||||
{
|
||||
unsigned long _tmp = fd / __NFDBITS;
|
||||
unsigned long _rem = fd % __NFDBITS;
|
||||
|
|
@ -77,7 +77,7 @@ static __inline__ int __FD_ISSET(unsigned long fd, __const__ __kernel_fd_set *p)
|
|||
* for 256 and 1024-bit fd_sets respectively)
|
||||
*/
|
||||
#undef __FD_ZERO
|
||||
static __inline__ void __FD_ZERO(__kernel_fd_set *p)
|
||||
static inline void __FD_ZERO(__kernel_fd_set *p)
|
||||
{
|
||||
unsigned long *tmp = p->fds_bits;
|
||||
int i;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
/* $Id: system.h,v 1.86 2001/10/30 04:57:10 davem Exp $ */
|
||||
|
||||
#ifndef __SPARC_SYSTEM_H
|
||||
#define __SPARC_SYSTEM_H
|
||||
|
||||
|
|
@ -56,7 +54,7 @@ extern void sun_do_break(void);
|
|||
extern int serial_console;
|
||||
extern int stop_a_enabled;
|
||||
|
||||
static __inline__ int con_is_present(void)
|
||||
static inline int con_is_present(void)
|
||||
{
|
||||
return serial_console ? 0 : 1;
|
||||
}
|
||||
|
|
@ -217,7 +215,7 @@ static inline unsigned long xchg_u32(__volatile__ unsigned long *m, unsigned lon
|
|||
|
||||
extern void __xchg_called_with_bad_pointer(void);
|
||||
|
||||
static __inline__ unsigned long __xchg(unsigned long x, __volatile__ void * ptr, int size)
|
||||
static inline unsigned long __xchg(unsigned long x, __volatile__ void * ptr, int size)
|
||||
{
|
||||
switch (size) {
|
||||
case 4:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
/* $Id: atomic.h,v 1.22 2001/07/11 23:56:07 davem Exp $
|
||||
* atomic.h: Thankfully the V9 is at least reasonable for this
|
||||
/* atomic.h: Thankfully the V9 is at least reasonable for this
|
||||
* stuff.
|
||||
*
|
||||
* Copyright (C) 1996, 1997, 2000 David S. Miller (davem@redhat.com)
|
||||
|
|
@ -74,7 +73,7 @@ extern int atomic64_sub_ret(int, atomic64_t *);
|
|||
#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
|
||||
#define atomic_xchg(v, new) (xchg(&((v)->counter), new))
|
||||
|
||||
static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
|
||||
static inline int atomic_add_unless(atomic_t *v, int a, int u)
|
||||
{
|
||||
int c, old;
|
||||
c = atomic_read(v);
|
||||
|
|
@ -95,7 +94,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
|
|||
((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
|
||||
#define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
|
||||
|
||||
static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
|
||||
static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
|
||||
{
|
||||
long c, old;
|
||||
c = atomic64_read(v);
|
||||
|
|
|
|||
|
|
@ -21,7 +21,9 @@
|
|||
#else
|
||||
|
||||
#define BACKOFF_SETUP(reg)
|
||||
#define BACKOFF_SPIN(reg, tmp, label)
|
||||
#define BACKOFF_SPIN(reg, tmp, label) \
|
||||
ba,pt %xcc, label; \
|
||||
nop;
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
/* $Id: byteorder.h,v 1.8 1997/12/18 02:44:14 ecd Exp $ */
|
||||
#ifndef _SPARC64_BYTEORDER_H
|
||||
#define _SPARC64_BYTEORDER_H
|
||||
|
||||
|
|
@ -7,7 +6,7 @@
|
|||
|
||||
#ifdef __GNUC__
|
||||
|
||||
static __inline__ __u16 ___arch__swab16p(const __u16 *addr)
|
||||
static inline __u16 ___arch__swab16p(const __u16 *addr)
|
||||
{
|
||||
__u16 ret;
|
||||
|
||||
|
|
@ -17,7 +16,7 @@ static __inline__ __u16 ___arch__swab16p(const __u16 *addr)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static __inline__ __u32 ___arch__swab32p(const __u32 *addr)
|
||||
static inline __u32 ___arch__swab32p(const __u32 *addr)
|
||||
{
|
||||
__u32 ret;
|
||||
|
||||
|
|
@ -27,7 +26,7 @@ static __inline__ __u32 ___arch__swab32p(const __u32 *addr)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static __inline__ __u64 ___arch__swab64p(const __u64 *addr)
|
||||
static inline __u64 ___arch__swab64p(const __u64 *addr)
|
||||
{
|
||||
__u64 ret;
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ struct fpustate {
|
|||
|
||||
#define FPUSTATE (struct fpustate *)(current_thread_info()->fpregs)
|
||||
|
||||
static __inline__ unsigned long fprs_read(void)
|
||||
static inline unsigned long fprs_read(void)
|
||||
{
|
||||
unsigned long retval;
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ static __inline__ unsigned long fprs_read(void)
|
|||
return retval;
|
||||
}
|
||||
|
||||
static __inline__ void fprs_write(unsigned long val)
|
||||
static inline void fprs_write(unsigned long val)
|
||||
{
|
||||
__asm__ __volatile__("wr %0, 0x0, %%fprs" : : "r" (val));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
/* $Id: io.h,v 1.47 2001/12/13 10:36:02 davem Exp $ */
|
||||
#ifndef __SPARC64_IO_H
|
||||
#define __SPARC64_IO_H
|
||||
|
||||
|
|
@ -19,7 +18,7 @@ extern unsigned long kern_base, kern_size;
|
|||
#define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT)
|
||||
#define BIO_VMERGE_BOUNDARY 8192
|
||||
|
||||
static __inline__ u8 _inb(unsigned long addr)
|
||||
static inline u8 _inb(unsigned long addr)
|
||||
{
|
||||
u8 ret;
|
||||
|
||||
|
|
@ -30,7 +29,7 @@ static __inline__ u8 _inb(unsigned long addr)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static __inline__ u16 _inw(unsigned long addr)
|
||||
static inline u16 _inw(unsigned long addr)
|
||||
{
|
||||
u16 ret;
|
||||
|
||||
|
|
@ -41,7 +40,7 @@ static __inline__ u16 _inw(unsigned long addr)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static __inline__ u32 _inl(unsigned long addr)
|
||||
static inline u32 _inl(unsigned long addr)
|
||||
{
|
||||
u32 ret;
|
||||
|
||||
|
|
@ -52,21 +51,21 @@ static __inline__ u32 _inl(unsigned long addr)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static __inline__ void _outb(u8 b, unsigned long addr)
|
||||
static inline void _outb(u8 b, unsigned long addr)
|
||||
{
|
||||
__asm__ __volatile__("stba\t%r0, [%1] %2\t/* pci_outb */"
|
||||
: /* no outputs */
|
||||
: "Jr" (b), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E_L));
|
||||
}
|
||||
|
||||
static __inline__ void _outw(u16 w, unsigned long addr)
|
||||
static inline void _outw(u16 w, unsigned long addr)
|
||||
{
|
||||
__asm__ __volatile__("stha\t%r0, [%1] %2\t/* pci_outw */"
|
||||
: /* no outputs */
|
||||
: "Jr" (w), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E_L));
|
||||
}
|
||||
|
||||
static __inline__ void _outl(u32 l, unsigned long addr)
|
||||
static inline void _outl(u32 l, unsigned long addr)
|
||||
{
|
||||
__asm__ __volatile__("stwa\t%r0, [%1] %2\t/* pci_outl */"
|
||||
: /* no outputs */
|
||||
|
|
@ -205,7 +204,7 @@ static inline void _writeq(u64 q, volatile void __iomem *addr)
|
|||
#define writeq(__q, __addr) _writeq(__q, __addr)
|
||||
|
||||
/* Now versions without byte-swapping. */
|
||||
static __inline__ u8 _raw_readb(unsigned long addr)
|
||||
static inline u8 _raw_readb(unsigned long addr)
|
||||
{
|
||||
u8 ret;
|
||||
|
||||
|
|
@ -216,7 +215,7 @@ static __inline__ u8 _raw_readb(unsigned long addr)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static __inline__ u16 _raw_readw(unsigned long addr)
|
||||
static inline u16 _raw_readw(unsigned long addr)
|
||||
{
|
||||
u16 ret;
|
||||
|
||||
|
|
@ -227,7 +226,7 @@ static __inline__ u16 _raw_readw(unsigned long addr)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static __inline__ u32 _raw_readl(unsigned long addr)
|
||||
static inline u32 _raw_readl(unsigned long addr)
|
||||
{
|
||||
u32 ret;
|
||||
|
||||
|
|
@ -238,7 +237,7 @@ static __inline__ u32 _raw_readl(unsigned long addr)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static __inline__ u64 _raw_readq(unsigned long addr)
|
||||
static inline u64 _raw_readq(unsigned long addr)
|
||||
{
|
||||
u64 ret;
|
||||
|
||||
|
|
@ -249,28 +248,28 @@ static __inline__ u64 _raw_readq(unsigned long addr)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static __inline__ void _raw_writeb(u8 b, unsigned long addr)
|
||||
static inline void _raw_writeb(u8 b, unsigned long addr)
|
||||
{
|
||||
__asm__ __volatile__("stba\t%r0, [%1] %2\t/* pci_raw_writeb */"
|
||||
: /* no outputs */
|
||||
: "Jr" (b), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
|
||||
}
|
||||
|
||||
static __inline__ void _raw_writew(u16 w, unsigned long addr)
|
||||
static inline void _raw_writew(u16 w, unsigned long addr)
|
||||
{
|
||||
__asm__ __volatile__("stha\t%r0, [%1] %2\t/* pci_raw_writew */"
|
||||
: /* no outputs */
|
||||
: "Jr" (w), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
|
||||
}
|
||||
|
||||
static __inline__ void _raw_writel(u32 l, unsigned long addr)
|
||||
static inline void _raw_writel(u32 l, unsigned long addr)
|
||||
{
|
||||
__asm__ __volatile__("stwa\t%r0, [%1] %2\t/* pci_raw_writel */"
|
||||
: /* no outputs */
|
||||
: "Jr" (l), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
|
||||
}
|
||||
|
||||
static __inline__ void _raw_writeq(u64 q, unsigned long addr)
|
||||
static inline void _raw_writeq(u64 q, unsigned long addr)
|
||||
{
|
||||
__asm__ __volatile__("stxa\t%r0, [%1] %2\t/* pci_raw_writeq */"
|
||||
: /* no outputs */
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
/* $Id: irq.h,v 1.21 2002/01/23 11:27:36 davem Exp $
|
||||
* irq.h: IRQ registers on the 64-bit Sparc.
|
||||
/* irq.h: IRQ registers on the 64-bit Sparc.
|
||||
*
|
||||
* Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
|
||||
* Copyright (C) 1996 David S. Miller (davem@davemloft.net)
|
||||
* Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz)
|
||||
*/
|
||||
|
||||
|
|
@ -67,21 +66,21 @@ extern void virt_irq_free(unsigned int virt_irq);
|
|||
|
||||
extern void fixup_irqs(void);
|
||||
|
||||
static __inline__ void set_softint(unsigned long bits)
|
||||
static inline void set_softint(unsigned long bits)
|
||||
{
|
||||
__asm__ __volatile__("wr %0, 0x0, %%set_softint"
|
||||
: /* No outputs */
|
||||
: "r" (bits));
|
||||
}
|
||||
|
||||
static __inline__ void clear_softint(unsigned long bits)
|
||||
static inline void clear_softint(unsigned long bits)
|
||||
{
|
||||
__asm__ __volatile__("wr %0, 0x0, %%clear_softint"
|
||||
: /* No outputs */
|
||||
: "r" (bits));
|
||||
}
|
||||
|
||||
static __inline__ unsigned long get_softint(void)
|
||||
static inline unsigned long get_softint(void)
|
||||
{
|
||||
unsigned long retval;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
/* $Id: mostek.h,v 1.4 2001/01/11 15:07:09 davem Exp $
|
||||
* mostek.h: Describes the various Mostek time of day clock registers.
|
||||
/* mostek.h: Describes the various Mostek time of day clock registers.
|
||||
*
|
||||
* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
|
||||
* Copyright (C) 1995 David S. Miller (davem@davemloft.net)
|
||||
* Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu)
|
||||
*/
|
||||
|
||||
|
|
@ -38,7 +37,7 @@
|
|||
*
|
||||
* We now deal with physical addresses for I/O to the chip. -DaveM
|
||||
*/
|
||||
static __inline__ u8 mostek_read(void __iomem *addr)
|
||||
static inline u8 mostek_read(void __iomem *addr)
|
||||
{
|
||||
u8 ret;
|
||||
|
||||
|
|
@ -48,7 +47,7 @@ static __inline__ u8 mostek_read(void __iomem *addr)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static __inline__ void mostek_write(void __iomem *addr, u8 val)
|
||||
static inline void mostek_write(void __iomem *addr, u8 val)
|
||||
{
|
||||
__asm__ __volatile__("stba %0, [%1] %2"
|
||||
: /* no outputs */
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
/* $Id: ns87303.h,v 1.3 2000/01/09 15:16:34 ecd Exp $
|
||||
* ns87303.h: Configuration Register Description for the
|
||||
/* ns87303.h: Configuration Register Description for the
|
||||
* National Semiconductor PC87303 (SuperIO).
|
||||
*
|
||||
* Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be)
|
||||
|
|
@ -85,7 +84,7 @@
|
|||
|
||||
extern spinlock_t ns87303_lock;
|
||||
|
||||
static __inline__ int ns87303_modify(unsigned long port, unsigned int index,
|
||||
static inline int ns87303_modify(unsigned long port, unsigned int index,
|
||||
unsigned char clr, unsigned char set)
|
||||
{
|
||||
static unsigned char reserved[] = {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
/* $Id: parport.h,v 1.11 2001/05/11 07:54:24 davem Exp $
|
||||
* parport.h: sparc64 specific parport initialization and dma.
|
||||
/* parport.h: sparc64 specific parport initialization and dma.
|
||||
*
|
||||
* Copyright (C) 1999 Eddie C. Dost (ecd@skynet.be)
|
||||
*/
|
||||
|
|
@ -42,7 +41,7 @@ static struct sparc_ebus_info {
|
|||
|
||||
static DECLARE_BITMAP(dma_slot_map, PARPORT_PC_MAX_PORTS);
|
||||
|
||||
static __inline__ int request_dma(unsigned int dmanr, const char *device_id)
|
||||
static inline int request_dma(unsigned int dmanr, const char *device_id)
|
||||
{
|
||||
if (dmanr >= PARPORT_PC_MAX_PORTS)
|
||||
return -EINVAL;
|
||||
|
|
@ -51,7 +50,7 @@ static __inline__ int request_dma(unsigned int dmanr, const char *device_id)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static __inline__ void free_dma(unsigned int dmanr)
|
||||
static inline void free_dma(unsigned int dmanr)
|
||||
{
|
||||
if (dmanr >= PARPORT_PC_MAX_PORTS) {
|
||||
printk(KERN_WARNING "Trying to free DMA%d\n", dmanr);
|
||||
|
|
@ -63,7 +62,7 @@ static __inline__ void free_dma(unsigned int dmanr)
|
|||
}
|
||||
}
|
||||
|
||||
static __inline__ void enable_dma(unsigned int dmanr)
|
||||
static inline void enable_dma(unsigned int dmanr)
|
||||
{
|
||||
ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1);
|
||||
|
||||
|
|
@ -73,32 +72,32 @@ static __inline__ void enable_dma(unsigned int dmanr)
|
|||
BUG();
|
||||
}
|
||||
|
||||
static __inline__ void disable_dma(unsigned int dmanr)
|
||||
static inline void disable_dma(unsigned int dmanr)
|
||||
{
|
||||
ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 0);
|
||||
}
|
||||
|
||||
static __inline__ void clear_dma_ff(unsigned int dmanr)
|
||||
static inline void clear_dma_ff(unsigned int dmanr)
|
||||
{
|
||||
/* nothing */
|
||||
}
|
||||
|
||||
static __inline__ void set_dma_mode(unsigned int dmanr, char mode)
|
||||
static inline void set_dma_mode(unsigned int dmanr, char mode)
|
||||
{
|
||||
ebus_dma_prepare(&sparc_ebus_dmas[dmanr].info, (mode != DMA_MODE_WRITE));
|
||||
}
|
||||
|
||||
static __inline__ void set_dma_addr(unsigned int dmanr, unsigned int addr)
|
||||
static inline void set_dma_addr(unsigned int dmanr, unsigned int addr)
|
||||
{
|
||||
sparc_ebus_dmas[dmanr].addr = addr;
|
||||
}
|
||||
|
||||
static __inline__ void set_dma_count(unsigned int dmanr, unsigned int count)
|
||||
static inline void set_dma_count(unsigned int dmanr, unsigned int count)
|
||||
{
|
||||
sparc_ebus_dmas[dmanr].count = count;
|
||||
}
|
||||
|
||||
static __inline__ unsigned int get_dma_residue(unsigned int dmanr)
|
||||
static inline unsigned int get_dma_residue(unsigned int dmanr)
|
||||
{
|
||||
return ebus_dma_residue(&sparc_ebus_dmas[dmanr].info);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ typedef struct {
|
|||
#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
|
||||
|
||||
#undef __FD_SET
|
||||
static __inline__ void __FD_SET(unsigned long fd, __kernel_fd_set *fdsetp)
|
||||
static inline void __FD_SET(unsigned long fd, __kernel_fd_set *fdsetp)
|
||||
{
|
||||
unsigned long _tmp = fd / __NFDBITS;
|
||||
unsigned long _rem = fd % __NFDBITS;
|
||||
|
|
@ -61,7 +61,7 @@ static __inline__ void __FD_SET(unsigned long fd, __kernel_fd_set *fdsetp)
|
|||
}
|
||||
|
||||
#undef __FD_CLR
|
||||
static __inline__ void __FD_CLR(unsigned long fd, __kernel_fd_set *fdsetp)
|
||||
static inline void __FD_CLR(unsigned long fd, __kernel_fd_set *fdsetp)
|
||||
{
|
||||
unsigned long _tmp = fd / __NFDBITS;
|
||||
unsigned long _rem = fd % __NFDBITS;
|
||||
|
|
@ -69,7 +69,7 @@ static __inline__ void __FD_CLR(unsigned long fd, __kernel_fd_set *fdsetp)
|
|||
}
|
||||
|
||||
#undef __FD_ISSET
|
||||
static __inline__ int __FD_ISSET(unsigned long fd, __const__ __kernel_fd_set *p)
|
||||
static inline int __FD_ISSET(unsigned long fd, __const__ __kernel_fd_set *p)
|
||||
{
|
||||
unsigned long _tmp = fd / __NFDBITS;
|
||||
unsigned long _rem = fd % __NFDBITS;
|
||||
|
|
@ -81,7 +81,7 @@ static __inline__ int __FD_ISSET(unsigned long fd, __const__ __kernel_fd_set *p)
|
|||
* for 256 and 1024-bit fd_sets respectively)
|
||||
*/
|
||||
#undef __FD_ZERO
|
||||
static __inline__ void __FD_ZERO(__kernel_fd_set *p)
|
||||
static inline void __FD_ZERO(__kernel_fd_set *p)
|
||||
{
|
||||
unsigned long *tmp = p->fds_bits;
|
||||
int i;
|
||||
|
|
|
|||
|
|
@ -29,12 +29,12 @@
|
|||
* numbers + offsets, and vice versa.
|
||||
*/
|
||||
|
||||
static __inline__ unsigned long sbus_devaddr(int slotnum, unsigned long offset)
|
||||
static inline unsigned long sbus_devaddr(int slotnum, unsigned long offset)
|
||||
{
|
||||
return (unsigned long) (SUN_SBUS_BVADDR+((slotnum)<<28)+(offset));
|
||||
}
|
||||
|
||||
static __inline__ int sbus_dev_slot(unsigned long dev_addr)
|
||||
static inline int sbus_dev_slot(unsigned long dev_addr)
|
||||
{
|
||||
return (int) (((dev_addr)-SUN_SBUS_BVADDR)>>28);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
/* $Id: spitfire.h,v 1.18 2001/11/29 16:42:10 kanoj Exp $
|
||||
* spitfire.h: SpitFire/BlackBird/Cheetah inline MMU operations.
|
||||
/* spitfire.h: SpitFire/BlackBird/Cheetah inline MMU operations.
|
||||
*
|
||||
* Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
|
||||
* Copyright (C) 1996 David S. Miller (davem@davemloft.net)
|
||||
*/
|
||||
|
||||
#ifndef _SPARC64_SPITFIRE_H
|
||||
|
|
@ -67,7 +66,7 @@ extern void cheetah_enable_pcache(void);
|
|||
/* The data cache is write through, so this just invalidates the
|
||||
* specified line.
|
||||
*/
|
||||
static __inline__ void spitfire_put_dcache_tag(unsigned long addr, unsigned long tag)
|
||||
static inline void spitfire_put_dcache_tag(unsigned long addr, unsigned long tag)
|
||||
{
|
||||
__asm__ __volatile__("stxa %0, [%1] %2\n\t"
|
||||
"membar #Sync"
|
||||
|
|
@ -81,7 +80,7 @@ static __inline__ void spitfire_put_dcache_tag(unsigned long addr, unsigned long
|
|||
* a flush instruction (to any address) is sufficient to handle
|
||||
* this issue after the line is invalidated.
|
||||
*/
|
||||
static __inline__ void spitfire_put_icache_tag(unsigned long addr, unsigned long tag)
|
||||
static inline void spitfire_put_icache_tag(unsigned long addr, unsigned long tag)
|
||||
{
|
||||
__asm__ __volatile__("stxa %0, [%1] %2\n\t"
|
||||
"membar #Sync"
|
||||
|
|
@ -89,7 +88,7 @@ static __inline__ void spitfire_put_icache_tag(unsigned long addr, unsigned long
|
|||
: "r" (tag), "r" (addr), "i" (ASI_IC_TAG));
|
||||
}
|
||||
|
||||
static __inline__ unsigned long spitfire_get_dtlb_data(int entry)
|
||||
static inline unsigned long spitfire_get_dtlb_data(int entry)
|
||||
{
|
||||
unsigned long data;
|
||||
|
||||
|
|
@ -103,7 +102,7 @@ static __inline__ unsigned long spitfire_get_dtlb_data(int entry)
|
|||
return data;
|
||||
}
|
||||
|
||||
static __inline__ unsigned long spitfire_get_dtlb_tag(int entry)
|
||||
static inline unsigned long spitfire_get_dtlb_tag(int entry)
|
||||
{
|
||||
unsigned long tag;
|
||||
|
||||
|
|
@ -113,7 +112,7 @@ static __inline__ unsigned long spitfire_get_dtlb_tag(int entry)
|
|||
return tag;
|
||||
}
|
||||
|
||||
static __inline__ void spitfire_put_dtlb_data(int entry, unsigned long data)
|
||||
static inline void spitfire_put_dtlb_data(int entry, unsigned long data)
|
||||
{
|
||||
__asm__ __volatile__("stxa %0, [%1] %2\n\t"
|
||||
"membar #Sync"
|
||||
|
|
@ -122,7 +121,7 @@ static __inline__ void spitfire_put_dtlb_data(int entry, unsigned long data)
|
|||
"i" (ASI_DTLB_DATA_ACCESS));
|
||||
}
|
||||
|
||||
static __inline__ unsigned long spitfire_get_itlb_data(int entry)
|
||||
static inline unsigned long spitfire_get_itlb_data(int entry)
|
||||
{
|
||||
unsigned long data;
|
||||
|
||||
|
|
@ -136,7 +135,7 @@ static __inline__ unsigned long spitfire_get_itlb_data(int entry)
|
|||
return data;
|
||||
}
|
||||
|
||||
static __inline__ unsigned long spitfire_get_itlb_tag(int entry)
|
||||
static inline unsigned long spitfire_get_itlb_tag(int entry)
|
||||
{
|
||||
unsigned long tag;
|
||||
|
||||
|
|
@ -146,7 +145,7 @@ static __inline__ unsigned long spitfire_get_itlb_tag(int entry)
|
|||
return tag;
|
||||
}
|
||||
|
||||
static __inline__ void spitfire_put_itlb_data(int entry, unsigned long data)
|
||||
static inline void spitfire_put_itlb_data(int entry, unsigned long data)
|
||||
{
|
||||
__asm__ __volatile__("stxa %0, [%1] %2\n\t"
|
||||
"membar #Sync"
|
||||
|
|
@ -155,7 +154,7 @@ static __inline__ void spitfire_put_itlb_data(int entry, unsigned long data)
|
|||
"i" (ASI_ITLB_DATA_ACCESS));
|
||||
}
|
||||
|
||||
static __inline__ void spitfire_flush_dtlb_nucleus_page(unsigned long page)
|
||||
static inline void spitfire_flush_dtlb_nucleus_page(unsigned long page)
|
||||
{
|
||||
__asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
|
||||
"membar #Sync"
|
||||
|
|
@ -163,7 +162,7 @@ static __inline__ void spitfire_flush_dtlb_nucleus_page(unsigned long page)
|
|||
: "r" (page | 0x20), "i" (ASI_DMMU_DEMAP));
|
||||
}
|
||||
|
||||
static __inline__ void spitfire_flush_itlb_nucleus_page(unsigned long page)
|
||||
static inline void spitfire_flush_itlb_nucleus_page(unsigned long page)
|
||||
{
|
||||
__asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
|
||||
"membar #Sync"
|
||||
|
|
@ -172,7 +171,7 @@ static __inline__ void spitfire_flush_itlb_nucleus_page(unsigned long page)
|
|||
}
|
||||
|
||||
/* Cheetah has "all non-locked" tlb flushes. */
|
||||
static __inline__ void cheetah_flush_dtlb_all(void)
|
||||
static inline void cheetah_flush_dtlb_all(void)
|
||||
{
|
||||
__asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
|
||||
"membar #Sync"
|
||||
|
|
@ -180,7 +179,7 @@ static __inline__ void cheetah_flush_dtlb_all(void)
|
|||
: "r" (0x80), "i" (ASI_DMMU_DEMAP));
|
||||
}
|
||||
|
||||
static __inline__ void cheetah_flush_itlb_all(void)
|
||||
static inline void cheetah_flush_itlb_all(void)
|
||||
{
|
||||
__asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
|
||||
"membar #Sync"
|
||||
|
|
@ -202,7 +201,7 @@ static __inline__ void cheetah_flush_itlb_all(void)
|
|||
* ASI_{D,I}TLB_DATA_ACCESS loads, doing the load twice fixes
|
||||
* the problem for me. -DaveM
|
||||
*/
|
||||
static __inline__ unsigned long cheetah_get_ldtlb_data(int entry)
|
||||
static inline unsigned long cheetah_get_ldtlb_data(int entry)
|
||||
{
|
||||
unsigned long data;
|
||||
|
||||
|
|
@ -215,7 +214,7 @@ static __inline__ unsigned long cheetah_get_ldtlb_data(int entry)
|
|||
return data;
|
||||
}
|
||||
|
||||
static __inline__ unsigned long cheetah_get_litlb_data(int entry)
|
||||
static inline unsigned long cheetah_get_litlb_data(int entry)
|
||||
{
|
||||
unsigned long data;
|
||||
|
||||
|
|
@ -228,7 +227,7 @@ static __inline__ unsigned long cheetah_get_litlb_data(int entry)
|
|||
return data;
|
||||
}
|
||||
|
||||
static __inline__ unsigned long cheetah_get_ldtlb_tag(int entry)
|
||||
static inline unsigned long cheetah_get_ldtlb_tag(int entry)
|
||||
{
|
||||
unsigned long tag;
|
||||
|
||||
|
|
@ -240,7 +239,7 @@ static __inline__ unsigned long cheetah_get_ldtlb_tag(int entry)
|
|||
return tag;
|
||||
}
|
||||
|
||||
static __inline__ unsigned long cheetah_get_litlb_tag(int entry)
|
||||
static inline unsigned long cheetah_get_litlb_tag(int entry)
|
||||
{
|
||||
unsigned long tag;
|
||||
|
||||
|
|
@ -252,7 +251,7 @@ static __inline__ unsigned long cheetah_get_litlb_tag(int entry)
|
|||
return tag;
|
||||
}
|
||||
|
||||
static __inline__ void cheetah_put_ldtlb_data(int entry, unsigned long data)
|
||||
static inline void cheetah_put_ldtlb_data(int entry, unsigned long data)
|
||||
{
|
||||
__asm__ __volatile__("stxa %0, [%1] %2\n\t"
|
||||
"membar #Sync"
|
||||
|
|
@ -262,7 +261,7 @@ static __inline__ void cheetah_put_ldtlb_data(int entry, unsigned long data)
|
|||
"i" (ASI_DTLB_DATA_ACCESS));
|
||||
}
|
||||
|
||||
static __inline__ void cheetah_put_litlb_data(int entry, unsigned long data)
|
||||
static inline void cheetah_put_litlb_data(int entry, unsigned long data)
|
||||
{
|
||||
__asm__ __volatile__("stxa %0, [%1] %2\n\t"
|
||||
"membar #Sync"
|
||||
|
|
@ -272,7 +271,7 @@ static __inline__ void cheetah_put_litlb_data(int entry, unsigned long data)
|
|||
"i" (ASI_ITLB_DATA_ACCESS));
|
||||
}
|
||||
|
||||
static __inline__ unsigned long cheetah_get_dtlb_data(int entry, int tlb)
|
||||
static inline unsigned long cheetah_get_dtlb_data(int entry, int tlb)
|
||||
{
|
||||
unsigned long data;
|
||||
|
||||
|
|
@ -284,7 +283,7 @@ static __inline__ unsigned long cheetah_get_dtlb_data(int entry, int tlb)
|
|||
return data;
|
||||
}
|
||||
|
||||
static __inline__ unsigned long cheetah_get_dtlb_tag(int entry, int tlb)
|
||||
static inline unsigned long cheetah_get_dtlb_tag(int entry, int tlb)
|
||||
{
|
||||
unsigned long tag;
|
||||
|
||||
|
|
@ -294,7 +293,7 @@ static __inline__ unsigned long cheetah_get_dtlb_tag(int entry, int tlb)
|
|||
return tag;
|
||||
}
|
||||
|
||||
static __inline__ void cheetah_put_dtlb_data(int entry, unsigned long data, int tlb)
|
||||
static inline void cheetah_put_dtlb_data(int entry, unsigned long data, int tlb)
|
||||
{
|
||||
__asm__ __volatile__("stxa %0, [%1] %2\n\t"
|
||||
"membar #Sync"
|
||||
|
|
@ -304,7 +303,7 @@ static __inline__ void cheetah_put_dtlb_data(int entry, unsigned long data, int
|
|||
"i" (ASI_DTLB_DATA_ACCESS));
|
||||
}
|
||||
|
||||
static __inline__ unsigned long cheetah_get_itlb_data(int entry)
|
||||
static inline unsigned long cheetah_get_itlb_data(int entry)
|
||||
{
|
||||
unsigned long data;
|
||||
|
||||
|
|
@ -317,7 +316,7 @@ static __inline__ unsigned long cheetah_get_itlb_data(int entry)
|
|||
return data;
|
||||
}
|
||||
|
||||
static __inline__ unsigned long cheetah_get_itlb_tag(int entry)
|
||||
static inline unsigned long cheetah_get_itlb_tag(int entry)
|
||||
{
|
||||
unsigned long tag;
|
||||
|
||||
|
|
@ -327,7 +326,7 @@ static __inline__ unsigned long cheetah_get_itlb_tag(int entry)
|
|||
return tag;
|
||||
}
|
||||
|
||||
static __inline__ void cheetah_put_itlb_data(int entry, unsigned long data)
|
||||
static inline void cheetah_put_itlb_data(int entry, unsigned long data)
|
||||
{
|
||||
__asm__ __volatile__("stxa %0, [%1] %2\n\t"
|
||||
"membar #Sync"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
/* $Id: system.h,v 1.69 2002/02/09 19:49:31 davem Exp $ */
|
||||
#ifndef __SPARC64_SYSTEM_H
|
||||
#define __SPARC64_SYSTEM_H
|
||||
|
||||
|
|
@ -240,7 +239,7 @@ static inline unsigned long xchg64(__volatile__ unsigned long *m, unsigned long
|
|||
|
||||
extern void __xchg_called_with_bad_pointer(void);
|
||||
|
||||
static __inline__ unsigned long __xchg(unsigned long x, __volatile__ void * ptr,
|
||||
static inline unsigned long __xchg(unsigned long x, __volatile__ void * ptr,
|
||||
int size)
|
||||
{
|
||||
switch (size) {
|
||||
|
|
@ -263,7 +262,7 @@ extern void die_if_kernel(char *str, struct pt_regs *regs) __attribute__ ((noret
|
|||
|
||||
#define __HAVE_ARCH_CMPXCHG 1
|
||||
|
||||
static __inline__ unsigned long
|
||||
static inline unsigned long
|
||||
__cmpxchg_u32(volatile int *m, int old, int new)
|
||||
{
|
||||
__asm__ __volatile__("membar #StoreLoad | #LoadLoad\n"
|
||||
|
|
@ -276,7 +275,7 @@ __cmpxchg_u32(volatile int *m, int old, int new)
|
|||
return new;
|
||||
}
|
||||
|
||||
static __inline__ unsigned long
|
||||
static inline unsigned long
|
||||
__cmpxchg_u64(volatile long *m, unsigned long old, unsigned long new)
|
||||
{
|
||||
__asm__ __volatile__("membar #StoreLoad | #LoadLoad\n"
|
||||
|
|
@ -293,7 +292,7 @@ __cmpxchg_u64(volatile long *m, unsigned long old, unsigned long new)
|
|||
if something tries to do an invalid cmpxchg(). */
|
||||
extern void __cmpxchg_called_with_bad_pointer(void);
|
||||
|
||||
static __inline__ unsigned long
|
||||
static inline unsigned long
|
||||
__cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
|
||||
{
|
||||
switch (size) {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
/* $Id: upa.h,v 1.3 1999/09/21 14:39:47 davem Exp $ */
|
||||
#ifndef _SPARC64_UPA_H
|
||||
#define _SPARC64_UPA_H
|
||||
|
||||
|
|
@ -25,7 +24,7 @@
|
|||
|
||||
/* UPA I/O space accessors */
|
||||
#if defined(__KERNEL__) && !defined(__ASSEMBLY__)
|
||||
static __inline__ unsigned char _upa_readb(unsigned long addr)
|
||||
static inline unsigned char _upa_readb(unsigned long addr)
|
||||
{
|
||||
unsigned char ret;
|
||||
|
||||
|
|
@ -36,7 +35,7 @@ static __inline__ unsigned char _upa_readb(unsigned long addr)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static __inline__ unsigned short _upa_readw(unsigned long addr)
|
||||
static inline unsigned short _upa_readw(unsigned long addr)
|
||||
{
|
||||
unsigned short ret;
|
||||
|
||||
|
|
@ -47,7 +46,7 @@ static __inline__ unsigned short _upa_readw(unsigned long addr)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static __inline__ unsigned int _upa_readl(unsigned long addr)
|
||||
static inline unsigned int _upa_readl(unsigned long addr)
|
||||
{
|
||||
unsigned int ret;
|
||||
|
||||
|
|
@ -58,7 +57,7 @@ static __inline__ unsigned int _upa_readl(unsigned long addr)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static __inline__ unsigned long _upa_readq(unsigned long addr)
|
||||
static inline unsigned long _upa_readq(unsigned long addr)
|
||||
{
|
||||
unsigned long ret;
|
||||
|
||||
|
|
@ -69,28 +68,28 @@ static __inline__ unsigned long _upa_readq(unsigned long addr)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static __inline__ void _upa_writeb(unsigned char b, unsigned long addr)
|
||||
static inline void _upa_writeb(unsigned char b, unsigned long addr)
|
||||
{
|
||||
__asm__ __volatile__("stba\t%0, [%1] %2\t/* upa_writeb */"
|
||||
: /* no outputs */
|
||||
: "r" (b), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
|
||||
}
|
||||
|
||||
static __inline__ void _upa_writew(unsigned short w, unsigned long addr)
|
||||
static inline void _upa_writew(unsigned short w, unsigned long addr)
|
||||
{
|
||||
__asm__ __volatile__("stha\t%0, [%1] %2\t/* upa_writew */"
|
||||
: /* no outputs */
|
||||
: "r" (w), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
|
||||
}
|
||||
|
||||
static __inline__ void _upa_writel(unsigned int l, unsigned long addr)
|
||||
static inline void _upa_writel(unsigned int l, unsigned long addr)
|
||||
{
|
||||
__asm__ __volatile__("stwa\t%0, [%1] %2\t/* upa_writel */"
|
||||
: /* no outputs */
|
||||
: "r" (l), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
|
||||
}
|
||||
|
||||
static __inline__ void _upa_writeq(unsigned long q, unsigned long addr)
|
||||
static inline void _upa_writeq(unsigned long q, unsigned long addr)
|
||||
{
|
||||
__asm__ __volatile__("stxa\t%0, [%1] %2\t/* upa_writeq */"
|
||||
: /* no outputs */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
/* $Id: visasm.h,v 1.5 2001/04/24 01:09:12 davem Exp $ */
|
||||
#ifndef _SPARC64_VISASM_H
|
||||
#define _SPARC64_VISASM_H
|
||||
|
||||
|
|
@ -44,7 +43,7 @@
|
|||
wr %o5, 0, %fprs;
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
static __inline__ void save_and_clear_fpu(void) {
|
||||
static inline void save_and_clear_fpu(void) {
|
||||
__asm__ __volatile__ (
|
||||
" rd %%fprs, %%o5\n"
|
||||
" andcc %%o5, %0, %%g0\n"
|
||||
|
|
|
|||
Loading…
Reference in a new issue