Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2508c08 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0f5a2c55 6ee4e28b

arch/sparc/kernel/pcic.c

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/sparc/kernel/process.c

+3 −4
Original line number Diff line number Diff line 
/*  $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)

{

arch/sparc/kernel/time.c

+4 −5
Original line number Diff line number Diff line 
/* $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;

arch/sparc/mm/btfixup.c

+2 −3
Original line number Diff line number Diff line 
/* $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;

}

arch/sparc/mm/io-unit.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}