git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-arm
/
arch-ebsa285
/
uncompress.h
diff --git
a/include/asm-arm/arch-ebsa285/uncompress.h
b/include/asm-arm/arch-ebsa285/uncompress.h
index
351cc7b
..
86142c8
100644
(file)
--- a/
include/asm-arm/arch-ebsa285/uncompress.h
+++ b/
include/asm-arm/arch-ebsa285/uncompress.h
@@
-15,10
+15,11
@@
#define DC21285_BASE ((volatile unsigned int *)0x42000160)
#define SER0_BASE ((volatile unsigned char *)0x7c0003f8)
#define DC21285_BASE ((volatile unsigned int *)0x42000160)
#define SER0_BASE ((volatile unsigned char *)0x7c0003f8)
-static
__inline__
void putc(char c)
+static
inline
void putc(char c)
{
if (machine_is_netwinder()) {
{
if (machine_is_netwinder()) {
- while ((SER0_BASE[5] & 0x60) != 0x60);
+ while ((SER0_BASE[5] & 0x60) != 0x60)
+ barrier();
SER0_BASE[0] = c;
} else {
while (DC21285_BASE[6] & 8);
SER0_BASE[0] = c;
} else {
while (DC21285_BASE[6] & 8);
@@
-26,17
+27,8
@@
static __inline__ void putc(char c)
}
}
}
}
-/*
- * This does not append a newline
- */
-static void puts(const char *s)
+static inline void flush(void)
{
{
- while (*s) {
- putc(*s);
- if (*s == '\n')
- putc('\r');
- s++;
- }
}
/*
}
/*