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

Corrected spin_lock_irqsave() spin_unlock_irqrestore() definitions

Browse Source 
Conflicts:
	kernel/include/hfi1/ihk_hfi1_common.h
This commit is contained in:
Aram Santogidis
2017-08-08 18:26:41 +09:00
committed by Balazs Gerofi
parent 74a636a612
commit fa6db686b4
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
kernel/include/hfi1/ihk_hfi1_common.h
View File

@ -3,6 +3,7 @@
#include <ihk/atomic.h> #include <ihk/atomic.h>
#include <ihk/types.h> #include <ihk/types.h>
#include <ihk/cpu.h>
#include <kmalloc.h> #include <kmalloc.h>
#include <lwk/compiler.h> #include <lwk/compiler.h>
#include <arch-lock.h> #include <arch-lock.h>
@ -44,7 +45,6 @@
#define __le64_to_cpu(x) x #define __le64_to_cpu(x) x
#define __le32_to_cpu(x) x #define __le32_to_cpu(x) x
#define __le16_to_cpu(x) x #define __le16_to_cpu(x) x
//TODO: double-check
#define cpu_to_be16(x) __builtin_bswap16(x) #define cpu_to_be16(x) __builtin_bswap16(x)
#define cpu_to_be32(x) __builtin_bswap32(x) #define cpu_to_be32(x) __builtin_bswap32(x)
@ -68,19 +68,26 @@
#define atomic_t ihk_atomic_t #define atomic_t ihk_atomic_t
typedef ihk_spinlock_t spinlock_t; typedef ihk_spinlock_t spinlock_t;
/* TODO***********************************/ /* From: kernel-xppsl_1.5.2/include/linux/irqsave.h */
#define spin_lock_irqsave(lock, flags) do {} while(0) #define spin_lock_irqsave(lock, flags) \
#define spin_unlock_irqsave(lock, flags) do {} while(0) do { \
#define spin_unlock_irqrestore(lock, flags) do {} while(0) flags = ihk_mc_spinlock_lock(lock); \
#define ____cacheline_aligned_in_smp __attribute__((aligned(64))) } while (0)
#define __iomem
/* double check */ #define spin_unlock_irqrestore(lock, flags) \
do { \
ihk_mc_spinlock_unlock_noirq(lock); \
cpu_restore_interrupt(flags); \
} while (0)
#define spin_lock ihk_mc_spinlock_lock_noirq #define spin_lock ihk_mc_spinlock_lock_noirq
#define spin_unlock ihk_mc_spinlock_unlock_noirq #define spin_unlock ihk_mc_spinlock_unlock_noirq
/***********************************************/ /*****************************************************/
#define ____cacheline_aligned_in_smp __attribute__((aligned(64)))
#define smp_wmb() barrier() #define smp_wmb() barrier()
#define smp_rmb() barrier() #define smp_rmb() barrier()
#define __iomem
#define __rcu #define __rcu
#define __percpu #define __percpu
#define GFP_KERNEL 0 #define GFP_KERNEL 0