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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-x86_64
/
page.h
diff --git
a/include/asm-x86_64/page.h
b/include/asm-x86_64/page.h
index
ece50e0
..
ec836f7
100644
(file)
--- a/
include/asm-x86_64/page.h
+++ b/
include/asm-x86_64/page.h
@@
-1,7
+1,6
@@
#ifndef _X86_64_PAGE_H
#define _X86_64_PAGE_H
#ifndef _X86_64_PAGE_H
#define _X86_64_PAGE_H
-#include <linux/config.h>
/* PAGE_SHIFT determines the page size */
#define PAGE_SHIFT 12
/* PAGE_SHIFT determines the page size */
#define PAGE_SHIFT 12
@@
-20,7
+19,7
@@
#define EXCEPTION_STACK_ORDER 0
#define EXCEPTION_STKSZ (PAGE_SIZE << EXCEPTION_STACK_ORDER)
#define EXCEPTION_STACK_ORDER 0
#define EXCEPTION_STKSZ (PAGE_SIZE << EXCEPTION_STACK_ORDER)
-#define DEBUG_STACK_ORDER
EXCEPTION_STACK_ORDER
+#define DEBUG_STACK_ORDER
(EXCEPTION_STACK_ORDER + 1)
#define DEBUG_STKSZ (PAGE_SIZE << DEBUG_STACK_ORDER)
#define IRQSTACK_ORDER 2
#define DEBUG_STKSZ (PAGE_SIZE << DEBUG_STACK_ORDER)
#define IRQSTACK_ORDER 2
@@
-136,13
+135,13
@@
typedef struct { unsigned long pgprot; } pgprot_t;
#define __HAVE_ARCH_GATE_AREA 1
#define __HAVE_ARCH_GATE_AREA 1
+#include <asm-generic/memory_model.h>
+#include <asm-generic/page.h>
+
#ifndef __ASSEMBLY__
extern int devmem_is_allowed(unsigned long pagenr);
#endif
#endif /* __KERNEL__ */
#ifndef __ASSEMBLY__
extern int devmem_is_allowed(unsigned long pagenr);
#endif
#endif /* __KERNEL__ */
-#include <asm-generic/memory_model.h>
-#include <asm-generic/page.h>
-
#endif /* _X86_64_PAGE_H */
#endif /* _X86_64_PAGE_H */