From 9f616f7c85306066494af9f92c15e400d4190d60 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 20 Sep 2006 03:27:17 +0900
Subject: [PATCH] --- yaml --- r: 35463 b: refs/heads/master c:
 029669da25efa18ee4b8911e694fdcf4a11c8cbe h: refs/heads/master i:   35461:
 8ac3490134469838e6fae8d4948e1ec1d8a714b0   35459:
 1486cbe3d985650f250555cc1132509dce15337c   35455:
 f45dec14451b76c88404003a6940123172329a65 v: v3

---
 [refs]                            |  2 +-
 trunk/include/asm-sh64/page.h     |  3 +--
 trunk/include/asm-sh64/shmparam.h | 16 ++++------------
 trunk/include/asm-sh64/signal.h   |  1 -
 trunk/include/asm-sh64/user.h     |  1 -
 5 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index f9d3798c3e6b..91951019fce7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5233d0704c9a6147ebbfabc576d1638b3ac5274
+refs/heads/master: 029669da25efa18ee4b8911e694fdcf4a11c8cbe
diff --git a/trunk/include/asm-sh64/page.h b/trunk/include/asm-sh64/page.h
index 34fb34754ae6..472089aefc60 100644
--- a/trunk/include/asm-sh64/page.h
+++ b/trunk/include/asm-sh64/page.h
@@ -112,9 +112,8 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 #define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \
 				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
 
-#endif /* __KERNEL__ */
-
 #include <asm-generic/memory_model.h>
 #include <asm-generic/page.h>
 
+#endif /* __KERNEL__ */
 #endif /* __ASM_SH64_PAGE_H */
diff --git a/trunk/include/asm-sh64/shmparam.h b/trunk/include/asm-sh64/shmparam.h
index d3a99a4dc0e3..1bb820c833ee 100644
--- a/trunk/include/asm-sh64/shmparam.h
+++ b/trunk/include/asm-sh64/shmparam.h
@@ -2,19 +2,11 @@
 #define __ASM_SH64_SHMPARAM_H
 
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * include/asm-sh64/shmparam.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
+ * Set this to a sensible safe default, we'll work out the specifics for the
+ * align mask from the cache descriptor at run-time.
  */
+#define	SHMLBA	0x4000
 
-#include <asm/cache.h>
-
-/* attach addr a multiple of this */
-#define	SHMLBA	(cpu_data->dcache.sets * L1_CACHE_BYTES)
+#define __ARCH_FORCE_SHMLBA
 
 #endif /* __ASM_SH64_SHMPARAM_H */
diff --git a/trunk/include/asm-sh64/signal.h b/trunk/include/asm-sh64/signal.h
index a5a28203cb3b..244e134730d9 100644
--- a/trunk/include/asm-sh64/signal.h
+++ b/trunk/include/asm-sh64/signal.h
@@ -13,7 +13,6 @@
  */
 
 #include <linux/types.h>
-#include <asm/processor.h>
 
 /* Avoid too many header ordering problems.  */
 struct siginfo;
diff --git a/trunk/include/asm-sh64/user.h b/trunk/include/asm-sh64/user.h
index 8f32f39a8ca9..eb3b33edd73e 100644
--- a/trunk/include/asm-sh64/user.h
+++ b/trunk/include/asm-sh64/user.h
@@ -13,7 +13,6 @@
  */
 
 #include <linux/types.h>
-#include <asm/processor.h>
 #include <asm/ptrace.h>
 #include <asm/page.h>