forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git

Browse source
This commit is contained in:
Linus Torvalds 2005-04-25 07:42:22 -07:00
commit cf025109e8
12 changed files with 101 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/asm-sparc/mxcc.h
View file

@ -115,8 +115,8 @@ extern __inline__ unsigned long mxcc_get_creg(void)
{
unsigned long mxcc_control;
__asm__ __volatile__("set -1, %%g2\n\t"
"set -1, %%g3\n\t"
__asm__ __volatile__("set 0xffffffff, %%g2\n\t"
"set 0xffffffff, %%g3\n\t"
"stda %%g2, [%1] %2\n\t"
"lda [%3] %2, %0\n\t" :
"=r" (mxcc_control) :

4
include/asm-sparc64/spinlock.h
View file

@ -44,7 +44,7 @@ typedef struct {
#define spin_unlock_wait(lp) \
do { membar("#LoadLoad"); \
} while(lp->lock)
} while((lp)->lock)
static inline void _raw_spin_lock(spinlock_t *lock)
{
@ -149,7 +149,7 @@ typedef struct {
unsigned int break_lock;
#endif
} rwlock_t;
#define RW_LOCK_UNLOCKED {0,}
#define RW_LOCK_UNLOCKED (rwlock_t) {0,}
#define rwlock_init(lp) do { *(lp) = RW_LOCK_UNLOCKED; } while(0)
static void inline __read_lock(rwlock_t *lock)