sh: trivial build cleanups.

Several errors were spotted during building for custom config (SMP
included). Although SMP still does not compile (no ipi and
__smp_call_function) and does not work, this looks a bit cleaner.
Some other errors obtained via gcc-4.1.0 build.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Evgeniy Polyakov 2007-05-31 13:46:21 +09:00 committed by Paul Mundt
parent f75522cea1
commit 66c5227ecd
9 changed files with 27 additions and 6 deletions

View File

@ -12,6 +12,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/interrupt.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
@ -149,6 +150,11 @@ static int __init cf_init_se(void)
ctrl_outb(0x42, PA_MRSHPC_MW2 + 0x200); ctrl_outb(0x42, PA_MRSHPC_MW2 + 0x200);
return 0; return 0;
} }
#else
static int __init cf_init_se(void)
{
return -1;
}
#endif #endif
int __init cf_init(void) int __init cf_init(void)

View File

@ -12,6 +12,7 @@
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/smp.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/cache.h> #include <asm/cache.h>

View File

@ -10,6 +10,8 @@
* Free Software Foundation; either version 2 of the License, or (at your * Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. * option) any later version.
*/ */
#include <linux/err.h>
#include <linux/cache.h> #include <linux/cache.h>
#include <linux/cpumask.h> #include <linux/cpumask.h>
#include <linux/delay.h> #include <linux/delay.h>

View File

@ -24,6 +24,9 @@
#define FRQMR1 0xffc80014 #define FRQMR1 0xffc80014
#else #else
#define FRQCR 0xffc00000 #define FRQCR 0xffc00000
#define FRQCR_PSTBY 0x0200
#define FRQCR_PLLEN 0x0400
#define FRQCR_CKOEN 0x0800
#endif #endif
#define MIN_DIVISOR_NR 0 #define MIN_DIVISOR_NR 0
#define MAX_DIVISOR_NR 3 #define MAX_DIVISOR_NR 3

View File

@ -13,6 +13,7 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/sched.h>
#include <linux/sysdev.h> #include <linux/sysdev.h>
#include <asm/cpu/dma.h> #include <asm/cpu/dma.h>

View File

@ -116,13 +116,13 @@ void __raw_readsl(unsigned long addr, void *data, int longlen);
* redefined by userlevel programs. * redefined by userlevel programs.
*/ */
#ifdef __readb #ifdef __readb
# define readb(a) ({ unsigned long r_ = __raw_readb(a); mb(); r_; }) # define readb(a) ({ unsigned int r_ = __raw_readb(a); mb(); r_; })
#endif #endif
#ifdef __raw_readw #ifdef __raw_readw
# define readw(a) ({ unsigned long r_ = __raw_readw(a); mb(); r_; }) # define readw(a) ({ unsigned int r_ = __raw_readw(a); mb(); r_; })
#endif #endif
#ifdef __raw_readl #ifdef __raw_readl
# define readl(a) ({ unsigned long r_ = __raw_readl(a); mb(); r_; }) # define readl(a) ({ unsigned int r_ = __raw_readl(a); mb(); r_; })
#endif #endif
#ifdef __raw_writeb #ifdef __raw_writeb

View File

@ -15,7 +15,7 @@
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
#include <asm/spinlock.h> #include <linux/spinlock.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/current.h> #include <asm/current.h>

View File

@ -11,6 +11,7 @@
#define __ASM_SH_SPINLOCK_H #define __ASM_SH_SPINLOCK_H
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/spinlock_types.h>
/* /*
* Your basic SMP spinlocks, allowing only a single CPU anywhere * Your basic SMP spinlocks, allowing only a single CPU anywhere
@ -42,7 +43,7 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock)
static inline void __raw_spin_unlock(raw_spinlock_t *lock) static inline void __raw_spin_unlock(raw_spinlock_t *lock)
{ {
assert_spin_locked(lock); //assert_spin_locked(lock);
lock->lock = 0; lock->lock = 0;
} }
@ -88,6 +89,11 @@ static inline void __raw_write_unlock(raw_rwlock_t *rw)
__raw_spin_unlock(&rw->lock); __raw_spin_unlock(&rw->lock);
} }
static inline int __raw_write_can_lock(raw_rwlock_t *rw)
{
return (atomic_read(&rw->counter) == RW_LOCK_BIAS);
}
static inline int __raw_read_trylock(raw_rwlock_t *lock) static inline int __raw_read_trylock(raw_rwlock_t *lock)
{ {
atomic_t *count = (atomic_t*)lock; atomic_t *count = (atomic_t*)lock;

View File

@ -9,7 +9,9 @@ typedef struct {
volatile unsigned long lock; volatile unsigned long lock;
} raw_spinlock_t; } raw_spinlock_t;
#define __SPIN_LOCK_UNLOCKED { 0 } #define __RAW_SPIN_LOCK_UNLOCKED { 1 }
#include <asm/atomic.h>
typedef struct { typedef struct {
raw_spinlock_t lock; raw_spinlock_t lock;