projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
[powerpc.git]
/
include
/
asm-sparc64
/
page.h
diff --git
a/include/asm-sparc64/page.h
b/include/asm-sparc64/page.h
index
aabb219
..
7af1077
100644
(file)
--- a/
include/asm-sparc64/page.h
+++ b/
include/asm-sparc64/page.h
@@
-3,8
+3,9
@@
#ifndef _SPARC64_PAGE_H
#define _SPARC64_PAGE_H
#ifndef _SPARC64_PAGE_H
#define _SPARC64_PAGE_H
-#include <linux/config.h>
-#include <asm/const.h>
+#ifdef __KERNEL__
+
+#include <linux/const.h>
#if defined(CONFIG_SPARC64_PAGE_SIZE_8KB)
#define PAGE_SHIFT 13
#if defined(CONFIG_SPARC64_PAGE_SIZE_8KB)
#define PAGE_SHIFT 13
@@
-28,8
+29,6
@@
#define DCACHE_ALIASING_POSSIBLE
#endif
#define DCACHE_ALIASING_POSSIBLE
#endif
-#ifdef __KERNEL__
-
#if defined(CONFIG_HUGETLB_PAGE_SIZE_4MB)
#define HPAGE_SHIFT 22
#elif defined(CONFIG_HUGETLB_PAGE_SIZE_512K)
#if defined(CONFIG_HUGETLB_PAGE_SIZE_4MB)
#define HPAGE_SHIFT 22
#elif defined(CONFIG_HUGETLB_PAGE_SIZE_512K)
@@
-142,8
+141,7
@@
typedef unsigned long pgprot_t;
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-#endif /* !(__KERNEL__) */
-
#include <asm-generic/page.h>
#include <asm-generic/page.h>
-#endif /* !(_SPARC64_PAGE_H) */
+#endif /* __KERNEL__ */
+#endif /* _SPARC64_PAGE_H */