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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[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
106045e
..
1bde92c
100644
(file)
--- a/
include/asm-arm/proc-fns.h
+++ b/
include/asm-arm/proc-fns.h
@@
-13,7
+13,6
@@
#ifdef __KERNEL__
#ifdef __KERNEL__
-#include <linux/config.h>
/*
* Work out if we need multiple CPU support
/*
* Work out if we need multiple CPU support
@@
-166,6
+165,8
@@
#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() \
@@
-177,6
+178,8
@@
(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 */