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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
asm-arm
/
arch-clps711x
/
uncompress.h
diff --git
a/include/asm-arm/arch-clps711x/uncompress.h
b/include/asm-arm/arch-clps711x/uncompress.h
index
7d0ab79
..
07157b7
100644
(file)
--- a/
include/asm-arm/arch-clps711x/uncompress.h
+++ b/
include/asm-arm/arch-clps711x/uncompress.h
@@
-19,13
+19,12
@@
*/
#include <linux/config.h>
#include <asm/arch/io.h>
*/
#include <linux/config.h>
#include <asm/arch/io.h>
-#include <asm/
arch/
hardware.h>
+#include <asm/hardware.h>
#include <asm/hardware/clps7111.h>
#undef CLPS7111_BASE
#define CLPS7111_BASE CLPS7111_PHYS_BASE
#include <asm/hardware/clps7111.h>
#undef CLPS7111_BASE
#define CLPS7111_BASE CLPS7111_PHYS_BASE
-#define barrier() __asm__ __volatile__("": : :"memory")
#define __raw_readl(p) (*(unsigned long *)(p))
#define __raw_writel(v,p) (*(unsigned long *)(p) = (v))
#define __raw_readl(p) (*(unsigned long *)(p))
#define __raw_writel(v,p) (*(unsigned long *)(p) = (v))
@@
-40,21
+39,15
@@
/*
* This does not append a newline
*/
/*
* This does not append a newline
*/
-static
void putstr(const char *s
)
+static
inline void putc(int c
)
{
{
- char c;
-
- while ((c = *s++) != '\0') {
- while (clps_readl(SYSFLGx) & SYSFLG_UTXFF)
- barrier();
- clps_writel(c, UARTDRx);
+ while (clps_readl(SYSFLGx) & SYSFLG_UTXFF)
+ barrier();
+ clps_writel(c, UARTDRx);
+}
- if (c == '\n') {
- while (clps_readl(SYSFLGx) & SYSFLG_UTXFF)
- barrier();
- clps_writel('\r', UARTDRx);
- }
- }
+static inline void flush(void)
+{
while (clps_readl(SYSFLGx) & SYSFLG_UBUSY)
barrier();
}
while (clps_readl(SYSFLGx) & SYSFLG_UBUSY)
barrier();
}