[patch 34/67] Fix v850 exported headers

Greg KH
2006-10-11T21:23:47Z

[-- Attachment #1: 0012-Fix-v850-exported-headers.patch --]
[-- Type: text/plain, Size: 1414 bytes --]

-stable review patch. If anyone has any objections, please let us know.

------------------
From: David Woodhouse <dwmw2@infradead.org>

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
include/asm-v850/page.h | 7 ++++---
include/asm-v850/param.h | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)

--- linux-2.6.18.orig/include/asm-v850/page.h
+++ linux-2.6.18/include/asm-v850/page.h
@@ -14,6 +14,8 @@
#ifndef __V850_PAGE_H__
#define __V850_PAGE_H__

+#ifdef __KERNEL__
+
#include <asm/machdep.h>

@@ -32,7 +34,6 @@
#endif

-#ifdef __KERNEL__
#ifndef __ASSEMBLY__

#define STRICT_MM_TYPECHECKS
@@ -122,9 +123,9 @@ typedef unsigned long pgprot_t;
#define __va(x) ((void *)__phys_to_virt ((unsigned long)(x)))

-#endif /* KERNEL */
-
#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>

+#endif /* KERNEL */
+
#endif /* __V850_PAGE_H__ */
--- linux-2.6.18.orig/include/asm-v850/param.h
+++ linux-2.6.18/include/asm-v850/param.h
@@ -14,8 +14,6 @@
#ifndef __V850_PARAM_H__
#define __V850_PARAM_H__

-#include <asm/machdep.h> /* For HZ */
-
#define EXEC_PAGESIZE 4096

#ifndef NOGROUP
@@ -25,6 +23,8 @@
#define MAXHOSTNAMELEN 64 /* max length of hostname */

#ifdef __KERNEL__
+#include <asm/machdep.h> /* For HZ */
+
# define USER_HZ 100
# define CLOCKS_PER_SEC USER_HZ
#endif

--