git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86: move i387 definitions to processor.h
[sfrench/cifs-2.6.git]
/
include
/
asm-x86
/
io_32.h
diff --git
a/include/asm-x86/io_32.h
b/include/asm-x86/io_32.h
index e8e0bd64112052dd82fc9723e7695d17940dedc4..2a04bd17eac57064adc686eb2cd69a2f3301f017 100644
(file)
--- a/
include/asm-x86/io_32.h
+++ b/
include/asm-x86/io_32.h
@@
-199,17
+199,22
@@
static inline void writel(unsigned int b, volatile void __iomem *addr)
#define mmiowb()
#define mmiowb()
-static inline void memset_io(volatile void __iomem *addr, unsigned char val, int count)
+static inline void
+memset_io(volatile void __iomem *addr, unsigned char val, int count)
{
{
- memset((void __force *)
addr, val, count);
+ memset((void __force *)addr, val, count);
}
}
-static inline void memcpy_fromio(void *dst, const volatile void __iomem *src, int count)
+
+static inline void
+memcpy_fromio(void *dst, const volatile void __iomem *src, int count)
{
{
- __memcpy(dst, (
void __force *)
src, count);
+ __memcpy(dst, (
const void __force *)
src, count);
}
}
-static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int count)
+
+static inline void
+memcpy_toio(volatile void __iomem *dst, const void *src, int count)
{
{
- __memcpy((void __force *)
dst, src, count);
+ __memcpy((void __force *)dst, src, count);
}
/*
}
/*
@@
-237,27
+242,18
@@
static inline void flush_write_buffers(void)
__asm__ __volatile__ ("lock; addl $0,0(%%esp)": : :"memory");
}
__asm__ __volatile__ ("lock; addl $0,0(%%esp)": : :"memory");
}
-#define dma_cache_inv(_start,_size) flush_write_buffers()
-#define dma_cache_wback(_start,_size) flush_write_buffers()
-#define dma_cache_wback_inv(_start,_size) flush_write_buffers()
-
#else
#else
-/* Nothing to do */
-
-#define dma_cache_inv(_start,_size) do { } while (0)
-#define dma_cache_wback(_start,_size) do { } while (0)
-#define dma_cache_wback_inv(_start,_size) do { } while (0)
-#define flush_write_buffers()
+#define flush_write_buffers() do { } while (0)
#endif
#endif /* __KERNEL__ */
#endif
#endif /* __KERNEL__ */
-static inline void native_io_delay(void)
-{
-
asm volatile("outb %%al,$0x80" : : : "memory")
;
-}
+extern void native_io_delay(void);
+
+
extern int io_delay_type
;
+extern void io_delay_init(void);
#if defined(CONFIG_PARAVIRT)
#include <asm/paravirt.h>
#if defined(CONFIG_PARAVIRT)
#include <asm/paravirt.h>