summaryrefslogtreecommitdiffstats
path: root/arch/nios2
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-02-04 15:49:00 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2013-02-04 15:49:00 +0100
commitda5fe0ba470283b384760c4976815fc20c1d45bd (patch)
tree11f2a08de885570d5d8c453f0c8b384427c666c0 /arch/nios2
parentaacd51bfd2d20138b6f9c549fb4f1aa66e88243b (diff)
parent195310fd7b48e2c1198f216f9b4122d8f63e620e (diff)
downloadbarebox-da5fe0ba470283b384760c4976815fc20c1d45bd.tar.gz
Merge branch 'for-next/misc'
Diffstat (limited to 'arch/nios2')
-rw-r--r--arch/nios2/cpu/barebox.lds.S1
-rw-r--r--arch/nios2/include/asm/mmu.h18
2 files changed, 19 insertions, 0 deletions
diff --git a/arch/nios2/cpu/barebox.lds.S b/arch/nios2/cpu/barebox.lds.S
index af7be4d..943c507 100644
--- a/arch/nios2/cpu/barebox.lds.S
+++ b/arch/nios2/cpu/barebox.lds.S
@@ -74,6 +74,7 @@ SECTIONS
* adjacent to simplify the startup code -- and provide
* the global pointer for gp-relative access.
*/
+ _sdata = .;
_data = .;
.data :
{
diff --git a/arch/nios2/include/asm/mmu.h b/arch/nios2/include/asm/mmu.h
new file mode 100644
index 0000000..bf65420
--- /dev/null
+++ b/arch/nios2/include/asm/mmu.h
@@ -0,0 +1,18 @@
+#ifndef __ASM_MMU_H
+#define __ASM_MMU_H
+
+static inline void remap_range(void *_start, size_t size, uint32_t flags)
+{
+}
+
+static inline uint32_t mmu_get_pte_cached_flags(void)
+{
+ return 0;
+}
+
+static inline uint32_t mmu_get_pte_uncached_flags(void)
+{
+ return 0;
+}
+
+#endif /* __ASM_MMU_H */