gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spinlock: make increment compatible with XPPSL Linux (v3.10)

Browse Source
This commit is contained in:
Balazs Gerofi
2017-08-03 11:59:31 +09:00
parent 5cf884ef41
commit b875b5186f
1 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
arch/x86_64/kernel/include/arch-lock.h
View File

@@ -37,25 +37,12 @@ __kprintf("[%d] ret ihk_mc_spinlock_lock_noirq\n", ihk_mc_get_processor_id()); \
#define ihk_mc_spinlock_lock_noirq __ihk_mc_spinlock_lock_noirq #define ihk_mc_spinlock_lock_noirq __ihk_mc_spinlock_lock_noirq
#endif #endif
static void __ihk_mc_spinlock_lock_noirq(ihk_spinlock_t *lock) static void __ihk_mc_spinlock_lock_noirq(ihk_spinlock_t *lock)
{ {
int inc = 0x00010000; int inc = 0x00020000;
int tmp; int tmp;
#if 0
asm volatile("lock ; xaddl %0, %1\n"
"movzwl %w0, %2\n\t"
"shrl $16, %0\n\t"
"1:\t"
"cmpl %0, %2\n\t"
"je 2f\n\t"
"rep ; nop\n\t"
"movzwl %1, %2\n\t"
"jmp 1b\n"
"2:"
: "+Q" (inc), "+m" (*lock), "=r" (tmp) : : "memory", "cc");
#endif
preempt_disable(); preempt_disable();
asm volatile("lock; xaddl %0, %1\n" asm volatile("lock; xaddl %0, %1\n"
@@ -106,8 +93,11 @@ __kprintf("[%d] ret ihk_mc_spinlock_unlock_noirq\n", ihk_mc_get_processor_id());
#endif #endif
static void __ihk_mc_spinlock_unlock_noirq(ihk_spinlock_t *lock) static void __ihk_mc_spinlock_unlock_noirq(ihk_spinlock_t *lock)
{ {
asm volatile ("lock incw %0" : "+m"(*lock) : : "memory", "cc"); int inc = 0x0002;
asm volatile ("lock addw %1, %0\n"
: "+m" (*(lock)) : "ri" (inc) : "memory", "cc");
preempt_enable(); preempt_enable();
} }