Commit b43c7cec authored by Chuck Ebbert's avatar Chuck Ebbert Committed by Linus Torvalds

[PATCH] i386: system.h: remove extra semicolons and fix order

include/asm-i386/system.h has trailing semicolons in some of the
macros that cause legitimate code to fail compilation, so remove
them. Also remove extra blank lines within one group of macros.

And put stts() and clts() back together; they got separated somehow.
Signed-off-by: default avatarChuck Ebbert <76306.1226@compuserve.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e47f3178
...@@ -82,10 +82,6 @@ __asm__ __volatile__ ("movw %%dx,%1\n\t" \ ...@@ -82,10 +82,6 @@ __asm__ __volatile__ ("movw %%dx,%1\n\t" \
#define savesegment(seg, value) \ #define savesegment(seg, value) \
asm volatile("mov %%" #seg ",%0":"=rm" (value)) asm volatile("mov %%" #seg ",%0":"=rm" (value))
/*
* Clear and set 'TS' bit respectively
*/
#define clts() __asm__ __volatile__ ("clts")
#define read_cr0() ({ \ #define read_cr0() ({ \
unsigned int __dummy; \ unsigned int __dummy; \
__asm__ __volatile__( \ __asm__ __volatile__( \
...@@ -94,7 +90,7 @@ __asm__ __volatile__ ("movw %%dx,%1\n\t" \ ...@@ -94,7 +90,7 @@ __asm__ __volatile__ ("movw %%dx,%1\n\t" \
__dummy; \ __dummy; \
}) })
#define write_cr0(x) \ #define write_cr0(x) \
__asm__ __volatile__("movl %0,%%cr0": :"r" (x)); __asm__ __volatile__("movl %0,%%cr0": :"r" (x))
#define read_cr2() ({ \ #define read_cr2() ({ \
unsigned int __dummy; \ unsigned int __dummy; \
...@@ -104,7 +100,7 @@ __asm__ __volatile__ ("movw %%dx,%1\n\t" \ ...@@ -104,7 +100,7 @@ __asm__ __volatile__ ("movw %%dx,%1\n\t" \
__dummy; \ __dummy; \
}) })
#define write_cr2(x) \ #define write_cr2(x) \
__asm__ __volatile__("movl %0,%%cr2": :"r" (x)); __asm__ __volatile__("movl %0,%%cr2": :"r" (x))
#define read_cr3() ({ \ #define read_cr3() ({ \
unsigned int __dummy; \ unsigned int __dummy; \
...@@ -114,7 +110,7 @@ __asm__ __volatile__ ("movw %%dx,%1\n\t" \ ...@@ -114,7 +110,7 @@ __asm__ __volatile__ ("movw %%dx,%1\n\t" \
__dummy; \ __dummy; \
}) })
#define write_cr3(x) \ #define write_cr3(x) \
__asm__ __volatile__("movl %0,%%cr3": :"r" (x)); __asm__ __volatile__("movl %0,%%cr3": :"r" (x))
#define read_cr4() ({ \ #define read_cr4() ({ \
unsigned int __dummy; \ unsigned int __dummy; \
...@@ -123,7 +119,6 @@ __asm__ __volatile__ ("movw %%dx,%1\n\t" \ ...@@ -123,7 +119,6 @@ __asm__ __volatile__ ("movw %%dx,%1\n\t" \
:"=r" (__dummy)); \ :"=r" (__dummy)); \
__dummy; \ __dummy; \
}) })
#define read_cr4_safe() ({ \ #define read_cr4_safe() ({ \
unsigned int __dummy; \ unsigned int __dummy; \
/* This could fault if %cr4 does not exist */ \ /* This could fault if %cr4 does not exist */ \
...@@ -135,15 +130,19 @@ __asm__ __volatile__ ("movw %%dx,%1\n\t" \ ...@@ -135,15 +130,19 @@ __asm__ __volatile__ ("movw %%dx,%1\n\t" \
: "=r" (__dummy): "0" (0)); \ : "=r" (__dummy): "0" (0)); \
__dummy; \ __dummy; \
}) })
#define write_cr4(x) \ #define write_cr4(x) \
__asm__ __volatile__("movl %0,%%cr4": :"r" (x)); __asm__ __volatile__("movl %0,%%cr4": :"r" (x))
/*
* Clear and set 'TS' bit respectively
*/
#define clts() __asm__ __volatile__ ("clts")
#define stts() write_cr0(8 | read_cr0()) #define stts() write_cr0(8 | read_cr0())
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#define wbinvd() \ #define wbinvd() \
__asm__ __volatile__ ("wbinvd": : :"memory"); __asm__ __volatile__ ("wbinvd": : :"memory")
static inline unsigned long get_limit(unsigned long segment) static inline unsigned long get_limit(unsigned long segment)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment