13 files changed, 146 insertions, 82 deletions

diff --git a/include/asm-arm/a.out-core.h b/include/asm-arm/a.out-core.h
new file mode 100644
index 000000000000..93d04acaa31f
--- /dev/null
+++ b/include/asm-arm/a.out-core.h
@@ -0,0 +1,49 @@
+/* a.out coredump register dumper
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#ifndef _ASM_A_OUT_CORE_H
+#define _ASM_A_OUT_CORE_H
+
+#ifdef __KERNEL__
+
+#include <linux/user.h>
+#include <linux/elfcore.h>
+
+/*
+ * fill in the user structure for an a.out core dump
+ */
+static inline void aout_dump_thread(struct pt_regs *regs, struct user *dump)
+{
+        struct task_struct *tsk = current;
+
+        dump->magic = CMAGIC;
+        dump->start_code = tsk->mm->start_code;
+        dump->start_stack = regs->ARM_sp & ~(PAGE_SIZE - 1);
+
+        dump->u_tsize = (tsk->mm->end_code - tsk->mm->start_code) >> PAGE_SHIFT;
+        dump->u_dsize = (tsk->mm->brk - tsk->mm->start_data + PAGE_SIZE - 1) >> PAGE_SHIFT;
+        dump->u_ssize = 0;
+
+        dump->u_debugreg[0] = tsk->thread.debug.bp[0].address;
+        dump->u_debugreg[1] = tsk->thread.debug.bp[1].address;
+        dump->u_debugreg[2] = tsk->thread.debug.bp[0].insn.arm;
+        dump->u_debugreg[3] = tsk->thread.debug.bp[1].insn.arm;
+        dump->u_debugreg[4] = tsk->thread.debug.nsaved;
+
+        if (dump->start_stack < 0x04000000)
+                dump->u_ssize = (0x04000000 - dump->start_stack) >> PAGE_SHIFT;
+
+        dump->regs = *regs;
+        dump->u_fpvalid = dump_fpu (regs, &dump->u_fp);
+}
+
+#endif /* __KERNEL__ */
+#endif /* _ASM_A_OUT_CORE_H */
diff --git a/include/asm-arm/a.out.h b/include/asm-arm/a.out.h
index d7165e86df25..79489fdcc8b8 100644
--- a/include/asm-arm/a.out.h
+++ b/include/asm-arm/a.out.h
@@ -27,12 +27,6 @@ struct exec
 
 #define M_ARM 103
 
-#ifdef __KERNEL__
-#define STACK_TOP       ((current->personality == PER_LINUX_32BIT) ? \
-                         TASK_SIZE : TASK_SIZE_26)
-#define STACK_TOP_MAX   TASK_SIZE
-#endif
-
 #ifndef LIBRARY_START_TEXT
 #define LIBRARY_START_TEXT      (0x00c00000)
 #endif
diff --git a/include/asm-arm/arch-orion/debug-macro.S b/include/asm-arm/arch-orion/debug-macro.S
index e2a80641f214..2746220f5d85 100644
--- a/include/asm-arm/arch-orion/debug-macro.S
+++ b/include/asm-arm/arch-orion/debug-macro.S
@@ -8,9 +8,14 @@
  * published by the Free Software Foundation.
 */
 
+#include <asm/arch/orion.h>
+
         .macro  addruart,rx
-        mov   \rx, #0xf1000000
-        orr   \rx, \rx, #0x00012000
+        mrc     p15, 0, \rx, c1, c0
+        tst     \rx, #1                                 @ MMU enabled?
+        ldreq   \rx, =ORION_REGS_PHYS_BASE
+        ldrne   \rx, =ORION_REGS_VIRT_BASE
+        orr     \rx, \rx, #0x00012000
         .endm
 
 #define UART_SHIFT      2
diff --git a/include/asm-arm/arch-orion/entry-macro.S b/include/asm-arm/arch-orion/entry-macro.S
index b76075a7e44b..cda096b2acfd 100644
--- a/include/asm-arm/arch-orion/entry-macro.S
+++ b/include/asm-arm/arch-orion/entry-macro.S
@@ -3,8 +3,8 @@
  *
  * Low-level IRQ helper macros for Orion platforms
  *
- * This file is licensed under  the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
 
diff --git a/include/asm-arm/arch-orion/hardware.h b/include/asm-arm/arch-orion/hardware.h
index 8a12d213fbdc..65da374de735 100644
--- a/include/asm-arm/arch-orion/hardware.h
+++ b/include/asm-arm/arch-orion/hardware.h
@@ -4,7 +4,6 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
  */
 
 #ifndef __ASM_ARCH_HARDWARE_H__
@@ -12,13 +11,11 @@
 
 #include "orion.h"
 
-#define PCI_MEMORY_VADDR        ORION_PCI_SYS_MEM_BASE
-#define PCI_IO_VADDR            ORION_PCI_SYS_IO_BASE
+#define pcibios_assign_all_busses()     1
 
-#define pcibios_assign_all_busses()  1
+#define PCIBIOS_MIN_IO          0x00001000
+#define PCIBIOS_MIN_MEM         0x01000000
+#define PCIMEM_BASE             ORION_PCIE_MEM_PHYS_BASE
 
-#define PCIBIOS_MIN_IO  0x1000
-#define PCIBIOS_MIN_MEM 0x01000000
-#define PCIMEM_BASE     PCI_MEMORY_VADDR /* mem base for VGA */
 
-#endif  /* _ASM_ARCH_HARDWARE_H */
+#endif
diff --git a/include/asm-arm/arch-orion/orion.h b/include/asm-arm/arch-orion/orion.h
index f787f752e58c..673a418a7419 100644
--- a/include/asm-arm/arch-orion/orion.h
+++ b/include/asm-arm/arch-orion/orion.h
@@ -14,32 +14,40 @@
 #ifndef __ASM_ARCH_ORION_H__
 #define __ASM_ARCH_ORION_H__
 
-/*******************************************************************************
+/*****************************************************************************
  * Orion Address Map
- * Use the same mapping (1:1 virtual:physical) of internal registers and
- * PCI system (PCI+PCIE) for all machines.
- * Each machine defines the rest of its mapping (e.g. device bus flashes)
- ******************************************************************************/
-#define ORION_REGS_BASE         0xf1000000
+ *
+ * virt         phys            size
+ * fdd00000     f1000000        1M      on-chip peripheral registers
+ * fde00000     f2000000        1M      PCIe I/O space
+ * fdf00000     f2100000        1M      PCI I/O space
+ * fe000000     f0000000        16M     PCIe WA space (Orion-NAS only)
+ ****************************************************************************/
+#define ORION_REGS_PHYS_BASE    0xf1000000
+#define ORION_REGS_VIRT_BASE    0xfdd00000
 #define ORION_REGS_SIZE         SZ_1M
 
-#define ORION_PCI_SYS_MEM_BASE  0xe0000000
-#define ORION_PCIE_MEM_BASE     ORION_PCI_SYS_MEM_BASE
-#define ORION_PCIE_MEM_SIZE     SZ_128M
-#define ORION_PCI_MEM_BASE      (ORION_PCIE_MEM_BASE + ORION_PCIE_MEM_SIZE)
-#define ORION_PCI_MEM_SIZE      SZ_128M
-
-#define ORION_PCI_SYS_IO_BASE   0xf2000000
-#define ORION_PCIE_IO_BASE      ORION_PCI_SYS_IO_BASE
+#define ORION_PCIE_IO_PHYS_BASE 0xf2000000
+#define ORION_PCIE_IO_VIRT_BASE 0xfde00000
+#define ORION_PCIE_IO_BUS_BASE  0x00000000
 #define ORION_PCIE_IO_SIZE      SZ_1M
-#define ORION_PCIE_IO_REMAP     (ORION_PCIE_IO_BASE - ORION_PCI_SYS_IO_BASE)
-#define ORION_PCI_IO_BASE       (ORION_PCIE_IO_BASE + ORION_PCIE_IO_SIZE)
+
+#define ORION_PCI_IO_PHYS_BASE  0xf2100000
+#define ORION_PCI_IO_VIRT_BASE  0xfdf00000
+#define ORION_PCI_IO_BUS_BASE   0x00100000
 #define ORION_PCI_IO_SIZE       SZ_1M
-#define ORION_PCI_IO_REMAP      (ORION_PCI_IO_BASE - ORION_PCI_SYS_IO_BASE)
+
 /* Relevant only for Orion-NAS */
-#define ORION_PCIE_WA_BASE      0xf0000000
+#define ORION_PCIE_WA_PHYS_BASE 0xf0000000
+#define ORION_PCIE_WA_VIRT_BASE 0xfe000000
 #define ORION_PCIE_WA_SIZE      SZ_16M
 
+#define ORION_PCIE_MEM_PHYS_BASE        0xe0000000
+#define ORION_PCIE_MEM_SIZE             SZ_128M
+
+#define ORION_PCI_MEM_PHYS_BASE         0xe8000000
+#define ORION_PCI_MEM_SIZE              SZ_128M
+
 /*******************************************************************************
  * Supported Devices & Revisions
  ******************************************************************************/
@@ -57,25 +65,42 @@
 /*******************************************************************************
  * Orion Registers Map
  ******************************************************************************/
-#define ORION_DDR_REG_BASE      (ORION_REGS_BASE | 0x00000)
-#define ORION_DEV_BUS_REG_BASE  (ORION_REGS_BASE | 0x10000)
-#define ORION_BRIDGE_REG_BASE   (ORION_REGS_BASE | 0x20000)
-#define ORION_PCI_REG_BASE      (ORION_REGS_BASE | 0x30000)
-#define ORION_PCIE_REG_BASE     (ORION_REGS_BASE | 0x40000)
-#define ORION_USB0_REG_BASE     (ORION_REGS_BASE | 0x50000)
-#define ORION_ETH_REG_BASE      (ORION_REGS_BASE | 0x70000)
-#define ORION_SATA_REG_BASE     (ORION_REGS_BASE | 0x80000)
-#define ORION_USB1_REG_BASE     (ORION_REGS_BASE | 0xa0000)
-
-#define ORION_DDR_REG(x)        (ORION_DDR_REG_BASE | (x))
-#define ORION_DEV_BUS_REG(x)    (ORION_DEV_BUS_REG_BASE | (x))
-#define ORION_BRIDGE_REG(x)     (ORION_BRIDGE_REG_BASE | (x))
-#define ORION_PCI_REG(x)        (ORION_PCI_REG_BASE | (x))
-#define ORION_PCIE_REG(x)       (ORION_PCIE_REG_BASE | (x))
-#define ORION_USB0_REG(x)       (ORION_USB0_REG_BASE | (x))
-#define ORION_USB1_REG(x)       (ORION_USB1_REG_BASE | (x))
-#define ORION_ETH_REG(x)        (ORION_ETH_REG_BASE | (x))
-#define ORION_SATA_REG(x)       (ORION_SATA_REG_BASE | (x))
+#define ORION_DDR_VIRT_BASE             (ORION_REGS_VIRT_BASE | 0x00000)
+#define ORION_DDR_REG(x)                (ORION_DDR_VIRT_BASE | (x))
+
+#define ORION_DEV_BUS_PHYS_BASE         (ORION_REGS_PHYS_BASE | 0x10000)
+#define ORION_DEV_BUS_VIRT_BASE         (ORION_REGS_VIRT_BASE | 0x10000)
+#define ORION_DEV_BUS_REG(x)            (ORION_DEV_BUS_VIRT_BASE | (x))
+#define  I2C_PHYS_BASE                  (ORION_DEV_BUS_PHYS_BASE | 0x1000)
+#define  UART0_PHYS_BASE                (ORION_DEV_BUS_PHYS_BASE | 0x2000)
+#define  UART0_VIRT_BASE                (ORION_DEV_BUS_VIRT_BASE | 0x2000)
+#define  UART1_PHYS_BASE                (ORION_DEV_BUS_PHYS_BASE | 0x2100)
+#define  UART1_VIRT_BASE                (ORION_DEV_BUS_VIRT_BASE | 0x2100)
+
+#define ORION_BRIDGE_VIRT_BASE          (ORION_REGS_VIRT_BASE | 0x20000)
+#define ORION_BRIDGE_REG(x)             (ORION_BRIDGE_VIRT_BASE | (x))
+
+#define ORION_PCI_VIRT_BASE             (ORION_REGS_VIRT_BASE | 0x30000)
+#define ORION_PCI_REG(x)                (ORION_PCI_VIRT_BASE | (x))
+
+#define ORION_PCIE_VIRT_BASE            (ORION_REGS_VIRT_BASE | 0x40000)
+#define ORION_PCIE_REG(x)               (ORION_PCIE_VIRT_BASE | (x))
+
+#define ORION_USB0_PHYS_BASE            (ORION_REGS_PHYS_BASE | 0x50000)
+#define ORION_USB0_VIRT_BASE            (ORION_REGS_VIRT_BASE | 0x50000)
+#define ORION_USB0_REG(x)               (ORION_USB0_VIRT_BASE | (x))
+
+#define ORION_ETH_PHYS_BASE             (ORION_REGS_PHYS_BASE | 0x70000)
+#define ORION_ETH_VIRT_BASE             (ORION_REGS_VIRT_BASE | 0x70000)
+#define ORION_ETH_REG(x)                (ORION_ETH_VIRT_BASE | (x))
+
+#define ORION_SATA_PHYS_BASE            (ORION_REGS_PHYS_BASE | 0x80000)
+#define ORION_SATA_VIRT_BASE            (ORION_REGS_VIRT_BASE | 0x80000)
+#define ORION_SATA_REG(x)               (ORION_SATA_VIRT_BASE | (x))
+
+#define ORION_USB1_PHYS_BASE            (ORION_REGS_PHYS_BASE | 0xa0000)
+#define ORION_USB1_VIRT_BASE            (ORION_REGS_VIRT_BASE | 0xa0000)
+#define ORION_USB1_REG(x)               (ORION_USB1_VIRT_BASE | (x))
 
 /*******************************************************************************
  * Device Bus Registers
@@ -100,9 +125,6 @@
 #define DEV_BUS_CTRL            ORION_DEV_BUS_REG(0x4c0)
 #define DEV_BUS_INT_CAUSE       ORION_DEV_BUS_REG(0x4d0)
 #define DEV_BUS_INT_MASK        ORION_DEV_BUS_REG(0x4d4)
-#define I2C_BASE                ORION_DEV_BUS_REG(0x1000)
-#define UART0_BASE              ORION_DEV_BUS_REG(0x2000)
-#define UART1_BASE              ORION_DEV_BUS_REG(0x2100)
 #define GPIO_MAX                32
 
 /***************************************************************************
diff --git a/include/asm-arm/arch-orion/uncompress.h b/include/asm-arm/arch-orion/uncompress.h
index a1a222fb438c..59f44039909a 100644
--- a/include/asm-arm/arch-orion/uncompress.h
+++ b/include/asm-arm/arch-orion/uncompress.h
@@ -10,8 +10,8 @@
 
 #include <asm/arch/orion.h>
 
-#define MV_UART_LSR     ((volatile unsigned char *)(UART0_BASE + 0x14))
-#define MV_UART_THR     ((volatile unsigned char *)(UART0_BASE + 0x0))
+#define MV_UART_THR     ((volatile unsigned char *)(UART0_PHYS_BASE + 0x0))
+#define MV_UART_LSR     ((volatile unsigned char *)(UART0_PHYS_BASE + 0x14))
 
 #define LSR_THRE        0x20
 
@@ -27,16 +27,6 @@ static void flush(void)
 {
 }
 
-static void orion_early_putstr(const char *ptr)
-{
-        char c;
-        while ((c = *ptr++) != '\0') {
-                if (c == '\n')
-                        putc('\r');
-                putc(c);
-        }
-}
-
 /*
  * nothing to do
  */
diff --git a/include/asm-arm/arch-orion/vmalloc.h b/include/asm-arm/arch-orion/vmalloc.h
index 23e2a102fe0c..9d580278d2bc 100644
--- a/include/asm-arm/arch-orion/vmalloc.h
+++ b/include/asm-arm/arch-orion/vmalloc.h
@@ -2,4 +2,4 @@
  * include/asm-arm/arch-orion/vmalloc.h
  */
 
-#define VMALLOC_END       0xf0000000
+#define VMALLOC_END       0xfd800000
diff --git a/include/asm-arm/mutex.h b/include/asm-arm/mutex.h
index cb29d84e690d..020bd98710a1 100644
--- a/include/asm-arm/mutex.h
+++ b/include/asm-arm/mutex.h
@@ -24,7 +24,7 @@
  * reattempted until it succeeds.
  */
 static inline void
-__mutex_fastpath_lock(atomic_t *count, fastcall void (*fail_fn)(atomic_t *))
+__mutex_fastpath_lock(atomic_t *count, void (*fail_fn)(atomic_t *))
 {
         int __ex_flag, __res;
 
@@ -44,7 +44,7 @@ __mutex_fastpath_lock(atomic_t *count, fastcall void (*fail_fn)(atomic_t *))
 }
 
 static inline int
-__mutex_fastpath_lock_retval(atomic_t *count, fastcall int (*fail_fn)(atomic_t *))
+__mutex_fastpath_lock_retval(atomic_t *count, int (*fail_fn)(atomic_t *))
 {
         int __ex_flag, __res;
 
@@ -70,7 +70,7 @@ __mutex_fastpath_lock_retval(atomic_t *count, fastcall int (*fail_fn)(atomic_t *
  * better generated assembly.
  */
 static inline void
-__mutex_fastpath_unlock(atomic_t *count, fastcall void (*fail_fn)(atomic_t *))
+__mutex_fastpath_unlock(atomic_t *count, void (*fail_fn)(atomic_t *))
 {
         int __ex_flag, __res, __orig;
 
diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h
index 31ff12f4ffb7..c86f68ee6511 100644
--- a/include/asm-arm/page.h
+++ b/include/asm-arm/page.h
@@ -171,6 +171,8 @@ typedef unsigned long pgprot_t;
 
 #endif /* STRICT_MM_TYPECHECKS */
 
+typedef struct page *pgtable_t;
+
 #endif /* CONFIG_MMU */
 
 #include <asm/memory.h>
diff --git a/include/asm-arm/pgalloc.h b/include/asm-arm/pgalloc.h
index fb6c6e3222bd..163b0305dd76 100644
--- a/include/asm-arm/pgalloc.h
+++ b/include/asm-arm/pgalloc.h
@@ -66,7 +66,7 @@ pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr)
         return pte;
 }
 
-static inline struct page *
+static inline pgtable_t
 pte_alloc_one(struct mm_struct *mm, unsigned long addr)
 {
         struct page *pte;
@@ -75,6 +75,7 @@ pte_alloc_one(struct mm_struct *mm, unsigned long addr)
         if (pte) {
                 void *page = page_address(pte);
                 clean_dcache_area(page, sizeof(pte_t) * PTRS_PER_PTE);
+                pgtable_page_ctor(pte);
         }
 
         return pte;
@@ -91,8 +92,9 @@ static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
         }
 }
 
-static inline void pte_free(struct mm_struct *mm, struct page *pte)
+static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
 {
+        pgtable_page_dtor(pte);
         __free_page(pte);
 }
 
@@ -123,10 +125,11 @@ pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp, pte_t *ptep)
 }
 
 static inline void
-pmd_populate(struct mm_struct *mm, pmd_t *pmdp, struct page *ptep)
+pmd_populate(struct mm_struct *mm, pmd_t *pmdp, pgtable_t ptep)
 {
         __pmd_populate(pmdp, page_to_pfn(ptep) << PAGE_SHIFT | _PAGE_USER_TABLE);
 }
+#define pmd_pgtable(pmd) pmd_page(pmd)
 
 #endif /* CONFIG_MMU */
 
diff --git a/include/asm-arm/posix_types.h b/include/asm-arm/posix_types.h
index e142a2a016ca..c37379dadcb2 100644
--- a/include/asm-arm/posix_types.h
+++ b/include/asm-arm/posix_types.h
@@ -51,14 +51,10 @@ typedef long long		__kernel_loff_t;
 #endif
 
 typedef struct {
-#if defined(__KERNEL__) || defined(__USE_ALL)
         int     val[2];
-#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
-        int     __val[2];
-#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
 } __kernel_fsid_t;
 
-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
+#if defined(__KERNEL__)
 
 #undef  __FD_SET
 #define __FD_SET(fd, fdsetp) \
diff --git a/include/asm-arm/processor.h b/include/asm-arm/processor.h
index 1bbf16182d62..bd8029e8dc67 100644
--- a/include/asm-arm/processor.h
+++ b/include/asm-arm/processor.h
@@ -22,6 +22,12 @@
 #include <asm/ptrace.h>
 #include <asm/types.h>
 
+#ifdef __KERNEL__
+#define STACK_TOP       ((current->personality == PER_LINUX_32BIT) ? \
+                         TASK_SIZE : TASK_SIZE_26)
+#define STACK_TOP_MAX   TASK_SIZE
+#endif
+
 union debug_insn {
         u32     arm;
         u16     thumb;