ia64/xen-unstable

changeset 8421:68d72ac55fe5

Remove automatic I/O-fault handling in XenLinux. It's now
handled by Xen itself.

Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Tue Dec 20 18:34:58 2005 +0100 (2005-12-20)
parents d3b10a2a82d4
children 6e24488a89f7
files linux-2.6-xen-sparse/include/asm-xen/asm-i386/io.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/io.h	Tue Dec 20 17:16:24 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/io.h	Tue Dec 20 18:34:58 2005 +0100
     1.3 @@ -309,15 +309,8 @@ static inline void flush_write_buffers(v
     1.4  
     1.5  #ifdef SLOW_IO_BY_JUMPING
     1.6  #define __SLOW_DOWN_IO "jmp 1f; 1: jmp 1f; 1:"
     1.7 -#elif defined(__UNSAFE_IO__)
     1.8 -#define __SLOW_DOWN_IO "outb %%al,$0x80;"
     1.9  #else
    1.10 -#define __SLOW_DOWN_IO "\n1: outb %%al,$0x80\n"		\
    1.11 -		       "2:\n"				\
    1.12 -		       ".section __ex_table,\"a\"\n\t"	\
    1.13 -		       ".align 4\n\t"			\
    1.14 -		       ".long 1b,2b\n"			\
    1.15 -		       ".previous"
    1.16 +#define __SLOW_DOWN_IO "outb %%al,$0x80;"
    1.17  #endif
    1.18  
    1.19  static inline void slow_down_io(void) {
    1.20 @@ -362,8 +355,7 @@ static inline unsigned type in##bwl(int 
    1.21  #endif
    1.22  
    1.23  
    1.24 -#if __UNSAFE_IO__
    1.25 -#define ____BUILDIO(bwl,bw,type) \
    1.26 +#define BUILDIO(bwl,bw,type) \
    1.27  static inline void out##bwl##_local(unsigned type value, int port) { \
    1.28  	__asm__ __volatile__("out" #bwl " %" #bw "0, %w1" : : "a"(value), "Nd"(port)); \
    1.29  } \
    1.30 @@ -371,35 +363,7 @@ static inline unsigned type in##bwl##_lo
    1.31  	unsigned type value; \
    1.32  	__asm__ __volatile__("in" #bwl " %w1, %" #bw "0" : "=a"(value) : "Nd"(port)); \
    1.33  	return value; \
    1.34 -}
    1.35 -#else
    1.36 -#define ____BUILDIO(bwl,bw,type) \
    1.37 -static inline void out##bwl##_local(unsigned type value, int port) { \
    1.38 -	__asm__ __volatile__("1: out" #bwl " %" #bw "0, %w1\n"		\
    1.39 -			     "2:\n"					\
    1.40 -			     ".section __ex_table,\"a\"\n\t"		\
    1.41 -			     ".align 4\n\t"				\
    1.42 -			     ".long 1b,2b\n"				\
    1.43 -			     ".previous" : : "a"(value), "Nd"(port));	\
    1.44  } \
    1.45 -static inline unsigned type in##bwl##_local(int port) { \
    1.46 -	unsigned type value; \
    1.47 -	__asm__ __volatile__("1:in" #bwl " %w1, %" #bw "0\n"		\
    1.48 -			     "2:\n"					\
    1.49 -			     ".section .fixup,\"ax\"\n"			\
    1.50 -			     "3: mov" #bwl " $~0,%" #bw "0\n\t"		\
    1.51 -			     "jmp 2b\n"					\
    1.52 -			     ".previous\n"				\
    1.53 -			     ".section __ex_table,\"a\"\n\t"		\
    1.54 -			     ".align 4\n\t"				\
    1.55 -			     ".long 1b,3b\n"				\
    1.56 -			     ".previous" : "=a"(value) : "Nd"(port));	\
    1.57 -	return value; \
    1.58 -}
    1.59 -#endif
    1.60 -
    1.61 -#define BUILDIO(bwl,bw,type) \
    1.62 -____BUILDIO(bwl,bw,type) \
    1.63  static inline void out##bwl##_local_p(unsigned type value, int port) { \
    1.64  	out##bwl##_local(value, port); \
    1.65  	slow_down_io(); \