From 91e080633221cadece6c1c37786ef8a18a9d1a5e Mon Sep 17 00:00:00 2001
From: Chris Zankel <chris@zankel.net>
Date: Sat, 1 May 2010 22:55:21 -0700
Subject: xtensa: Fix FLUSH_DCACHE macro for some variants.

Define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE also for processor configurations
that don't have cache-aliasing.

Signed-off-by: Chris Zankel <chris@zankel.net>
---
 arch/xtensa/include/asm/cacheflush.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'arch/xtensa/include')

diff --git a/arch/xtensa/include/asm/cacheflush.h b/arch/xtensa/include/asm/cacheflush.h
index a508f2f73bd..376cd9d5f45 100644
--- a/arch/xtensa/include/asm/cacheflush.h
+++ b/arch/xtensa/include/asm/cacheflush.h
@@ -115,6 +115,7 @@ extern void flush_cache_page(struct vm_area_struct*, unsigned long, unsigned lon
 #define flush_cache_vmap(start,end)			do { } while (0)
 #define flush_cache_vunmap(start,end)			do { } while (0)
 
+#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 0
 #define flush_dcache_page(page)				do { } while (0)
 
 #define flush_cache_page(vma,addr,pfn)			do { } while (0)
-- 
cgit v1.2.3-70-g09d2


From 4573e398d591a2fe6c600908578fd31401746529 Mon Sep 17 00:00:00 2001
From: Chris Zankel <chris@zankel.net>
Date: Sun, 2 May 2010 01:05:13 -0700
Subject: xtensa: Shuffle include statements to fix linker script

The linker script was including assembly macros from the coprocessor
header file that is not otherwise used by the script.

Signed-off-by: Chris Zankel <chris@zankel.net>
---
 arch/xtensa/include/asm/elf.h       | 1 +
 arch/xtensa/include/asm/pgalloc.h   | 1 +
 arch/xtensa/include/asm/processor.h | 1 -
 arch/xtensa/include/asm/ptrace.h    | 2 ++
 arch/xtensa/kernel/asm-offsets.c    | 1 +
 arch/xtensa/kernel/entry.S          | 1 +
 6 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'arch/xtensa/include')

diff --git a/arch/xtensa/include/asm/elf.h b/arch/xtensa/include/asm/elf.h
index 5eb6d695e98..6e65eadaae1 100644
--- a/arch/xtensa/include/asm/elf.h
+++ b/arch/xtensa/include/asm/elf.h
@@ -14,6 +14,7 @@
 #define _XTENSA_ELF_H
 
 #include <asm/ptrace.h>
+#include <asm/coprocessor.h>
 
 /* Xtensa processor ELF architecture-magic number */
 
diff --git a/arch/xtensa/include/asm/pgalloc.h b/arch/xtensa/include/asm/pgalloc.h
index 4f4a7987ede..40cf9bceda2 100644
--- a/arch/xtensa/include/asm/pgalloc.h
+++ b/arch/xtensa/include/asm/pgalloc.h
@@ -14,6 +14,7 @@
 #ifdef __KERNEL__
 
 #include <linux/highmem.h>
+#include <linux/slab.h>
 
 /*
  * Allocating and freeing a pmd is trivial: the 1-entry pmd is
diff --git a/arch/xtensa/include/asm/processor.h b/arch/xtensa/include/asm/processor.h
index 0ea4937c0b6..3acb26e8dea 100644
--- a/arch/xtensa/include/asm/processor.h
+++ b/arch/xtensa/include/asm/processor.h
@@ -12,7 +12,6 @@
 #define _XTENSA_PROCESSOR_H
 
 #include <variant/core.h>
-#include <asm/coprocessor.h>
 #include <platform/hardware.h>
 
 #include <linux/compiler.h>
diff --git a/arch/xtensa/include/asm/ptrace.h b/arch/xtensa/include/asm/ptrace.h
index 3c549f79872..0d42c934b66 100644
--- a/arch/xtensa/include/asm/ptrace.h
+++ b/arch/xtensa/include/asm/ptrace.h
@@ -77,6 +77,8 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/coprocessor.h>
+
 /*
  * This struct defines the way the registers are stored on the
  * kernel stack during a system call or other kernel entry.
diff --git a/arch/xtensa/kernel/asm-offsets.c b/arch/xtensa/kernel/asm-offsets.c
index 070ff8af3a2..7dc3f915718 100644
--- a/arch/xtensa/kernel/asm-offsets.c
+++ b/arch/xtensa/kernel/asm-offsets.c
@@ -13,6 +13,7 @@
  */
 
 #include <asm/processor.h>
+#include <asm/coprocessor.h>
 
 #include <linux/types.h>
 #include <linux/stddef.h>
diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S
index 77fc9f6dc01..5fd01f6aaf3 100644
--- a/arch/xtensa/kernel/entry.S
+++ b/arch/xtensa/kernel/entry.S
@@ -16,6 +16,7 @@
 #include <linux/linkage.h>
 #include <asm/asm-offsets.h>
 #include <asm/processor.h>
+#include <asm/coprocessor.h>
 #include <asm/thread_info.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
-- 
cgit v1.2.3-70-g09d2


From d1eca29e7adc5e50165b9856cbb00014c274c5c7 Mon Sep 17 00:00:00 2001
From: Chris Zankel <chris@zankel.net>
Date: Mon, 3 May 2010 01:06:43 -0700
Subject: xtensa: Add missing include in coprocessor.h

Coprocessor.h depends on variant settings.

Signed-off-by: Chris Zankel <chris@zankel.net>
---
 arch/xtensa/include/asm/coprocessor.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'arch/xtensa/include')

diff --git a/arch/xtensa/include/asm/coprocessor.h b/arch/xtensa/include/asm/coprocessor.h
index 65a285d8d3f..75c94a1658b 100644
--- a/arch/xtensa/include/asm/coprocessor.h
+++ b/arch/xtensa/include/asm/coprocessor.h
@@ -13,6 +13,7 @@
 #define _XTENSA_COPROCESSOR_H
 
 #include <linux/stringify.h>
+#include <variant/core.h>
 #include <variant/tie.h>
 #include <asm/types.h>
 
-- 
cgit v1.2.3-70-g09d2