projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
include
/
asm-generic
/
memory_model.h
diff --git
a/include/asm-generic/memory_model.h
b/include/asm-generic/memory_model.h
index
52226e1
..
ae060c6
100644
(file)
--- a/
include/asm-generic/memory_model.h
+++ b/
include/asm-generic/memory_model.h
@@
-1,7
+1,6
@@
#ifndef __ASM_MEMORY_MODEL_H
#define __ASM_MEMORY_MODEL_H
-#ifdef __KERNEL__
#ifndef __ASSEMBLY__
#if defined(CONFIG_FLATMEM)
@@
-81,6
+80,5
@@
extern unsigned long page_to_pfn(struct page *page);
#endif /* CONFIG_OUT_OF_LINE_PFN_TO_PAGE */
#endif /* __ASSEMBLY__ */
-#endif /* __KERNEL__ */
#endif