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-powerpc
/
page.h
diff --git
a/include/asm-powerpc/page.h
b/include/asm-powerpc/page.h
index
eaf0812
..
42d17ac
100644
(file)
--- a/
include/asm-powerpc/page.h
+++ b/
include/asm-powerpc/page.h
@@
-11,8
+11,8
@@
*/
#ifdef __KERNEL__
*/
#ifdef __KERNEL__
-#include <linux/config.h>
#include <asm/asm-compat.h>
#include <asm/asm-compat.h>
+#include <asm/kdump.h>
/*
* On PPC32 page size is 4K. For PPC64 we support either 4K or 64K software
/*
* On PPC32 page size is 4K. For PPC64 we support either 4K or 64K software
@@
-52,13
+52,6
@@
* If you want to test if something's a kernel address, use is_kernel_addr().
*/
* If you want to test if something's a kernel address, use is_kernel_addr().
*/
-#ifdef CONFIG_CRASH_DUMP
-/* Kdump kernel runs at 32 MB, change at your peril. */
-#define PHYSICAL_START 0x2000000
-#else
-#define PHYSICAL_START 0x0
-#endif
-
#define PAGE_OFFSET ASM_CONST(CONFIG_KERNEL_START)
#define KERNELBASE (PAGE_OFFSET + PHYSICAL_START)
#define PAGE_OFFSET ASM_CONST(CONFIG_KERNEL_START)
#define KERNELBASE (PAGE_OFFSET + PHYSICAL_START)
@@
-198,6
+191,9
@@
extern void copy_user_page(void *to, void *from, unsigned long vaddr,
struct page *p);
extern int page_is_ram(unsigned long pfn);
struct page *p);
extern int page_is_ram(unsigned long pfn);
+struct vm_area_struct;
+extern const char *arch_vma_name(struct vm_area_struct *vma);
+
#include <asm-generic/memory_model.h>
#endif /* __ASSEMBLY__ */
#include <asm-generic/memory_model.h>
#endif /* __ASSEMBLY__ */