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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
include
/
asm-arm
/
proc-fns.h
diff --git
a/include/asm-arm/proc-fns.h
b/include/asm-arm/proc-fns.h
index
1bde92c
..
7bef2bf
100644
(file)
--- a/
include/asm-arm/proc-fns.h
+++ b/
include/asm-arm/proc-fns.h
@@
-13,6
+13,7
@@
#ifdef __KERNEL__
#ifdef __KERNEL__
+#include <linux/config.h>
/*
* Work out if we need multiple CPU support
/*
* Work out if we need multiple CPU support
@@
-137,14
+138,6
@@
# define CPU_NAME cpu_xscale
# endif
# endif
# define CPU_NAME cpu_xscale
# endif
# endif
-# ifdef CONFIG_CPU_XSC3
-# ifdef CPU_NAME
-# undef MULTI_CPU
-# define MULTI_CPU
-# else
-# define CPU_NAME cpu_xsc3
-# endif
-# endif
# ifdef CONFIG_CPU_V6
# ifdef CPU_NAME
# undef MULTI_CPU
# ifdef CONFIG_CPU_V6
# ifdef CPU_NAME
# undef MULTI_CPU
@@
-165,8
+158,6
@@
#include <asm/memory.h>
#include <asm/memory.h>
-#ifdef CONFIG_MMU
-
#define cpu_switch_mm(pgd,mm) cpu_do_switch_mm(virt_to_phys(pgd),mm)
#define cpu_get_pgd() \
#define cpu_switch_mm(pgd,mm) cpu_do_switch_mm(virt_to_phys(pgd),mm)
#define cpu_get_pgd() \
@@
-178,8
+169,6
@@
(pgd_t *)phys_to_virt(pg); \
})
(pgd_t *)phys_to_virt(pg); \
})
-#endif
-
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* __ASM_PROCFNS_H */
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* __ASM_PROCFNS_H */