git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Replace extern inline with static inline in asm-x86_64/*
[pandora-kernel.git]
/
include
/
asm-x86_64
/
processor.h
diff --git
a/include/asm-x86_64/processor.h
b/include/asm-x86_64/processor.h
index
106f666
..
c6461c1
100644
(file)
--- a/
include/asm-x86_64/processor.h
+++ b/
include/asm-x86_64/processor.h
@@
-32,7
+32,7
@@
#define ID_MASK 0x00200000
#define desc_empty(desc) \
#define ID_MASK 0x00200000
#define desc_empty(desc) \
- (!((desc)->a
+
(desc)->b))
+ (!((desc)->a
|
(desc)->b))
#define desc_equal(desc1, desc2) \
(((desc1)->a == (desc2)->a) && ((desc1)->b == (desc2)->b))
#define desc_equal(desc1, desc2) \
(((desc1)->a == (desc2)->a) && ((desc1)->b == (desc2)->b))
@@
-375,13
+375,13
@@
struct extended_sigtable {
#define ASM_NOP_MAX 8
/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */
#define ASM_NOP_MAX 8
/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */
-
extern
inline void rep_nop(void)
+
static
inline void rep_nop(void)
{
__asm__ __volatile__("rep;nop": : :"memory");
}
/* Stop speculative execution */
{
__asm__ __volatile__("rep;nop": : :"memory");
}
/* Stop speculative execution */
-
extern
inline void sync_core(void)
+
static
inline void sync_core(void)
{
int tmp;
asm volatile("cpuid" : "=a" (tmp) : "0" (1) : "ebx","ecx","edx","memory");
{
int tmp;
asm volatile("cpuid" : "=a" (tmp) : "0" (1) : "ebx","ecx","edx","memory");
@@
-398,7
+398,7
@@
static inline void prefetch(void *x)
#define ARCH_HAS_PREFETCHW 1
static inline void prefetchw(void *x)
{
#define ARCH_HAS_PREFETCHW 1
static inline void prefetchw(void *x)
{
- alternative_input(
ASM_NOP5
,
+ alternative_input(
"prefetcht0 (%1)"
,
"prefetchw (%1)",
X86_FEATURE_3DNOW,
"r" (x));
"prefetchw (%1)",
X86_FEATURE_3DNOW,
"r" (x));
@@
-437,6
+437,11
@@
static inline void prefetchw(void *x)
outb((data), 0x23); \
} while (0)
outb((data), 0x23); \
} while (0)
+static inline void serialize_cpu(void)
+{
+ __asm__ __volatile__ ("cpuid" : : : "ax", "bx", "cx", "dx");
+}
+
static inline void __monitor(const void *eax, unsigned long ecx,
unsigned long edx)
{
static inline void __monitor(const void *eax, unsigned long ecx,
unsigned long edx)
{