summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/proc-armo/system.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-01-27 01:05:20 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-01-27 01:05:20 +0000
commit546db14ee74118296f425f3b91634fb767d67290 (patch)
tree22b613a3da8d4bf663eec5e155af01b87fdf9094 /include/asm-arm/proc-armo/system.h
parent1e25e41c4f5474e14452094492dbc169b800e4c8 (diff)
Merge with Linux 2.3.23. The new bootmem stuff has broken various
platforms. At this time I've only verified that IP22 support compiles and IP27 actually works.
Diffstat (limited to 'include/asm-arm/proc-armo/system.h')
-rw-r--r--include/asm-arm/proc-armo/system.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/asm-arm/proc-armo/system.h b/include/asm-arm/proc-armo/system.h
index 3d6ba7554..1cc3fc606 100644
--- a/include/asm-arm/proc-armo/system.h
+++ b/include/asm-arm/proc-armo/system.h
@@ -13,6 +13,8 @@ extern const char xchg_str[];
extern __inline__ unsigned long __xchg(unsigned long x, volatile void *ptr, int size)
{
+ extern void arm_invalidptr(const char *, int);
+
switch (size) {
case 1: return cpu_xchg_1(x, ptr);
case 2: return cpu_xchg_2(x, ptr);
@@ -29,11 +31,6 @@ extern __inline__ unsigned long __xchg(unsigned long x, volatile void *ptr, int
#define proc_hard_reset() cpu_proc_fin()
/*
- * This processor does not idle
- */
-#define proc_idle()
-
-/*
* A couple of speedups for the ARM
*/