gmane.linux.ports.mips.general

[PATCH] MIPS: Properly align the .data..init_task section.

David Daney — 2012-05-25T23:25:34

From: David Daney <david.daney< at >cavium.com>

Improper alignment can lead to unbootable systems and/or random
crashes.

Signed-off-by: David Daney <david.daney< at >cavium.com>
Cc: <stable< at >vger.kernel.org>
---
 arch/mips/include/asm/thread_info.h |    4 ++--
 arch/mips/kernel/vmlinux.lds.S      |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
index e2eca7d..ca97e0e 100644
--- a/arch/mips/include/asm/thread_info.h
+++ b/arch/mips/include/asm/thread_info.h
< at >< at > -60,6 +60,8 < at >< at > struct thread_info {
 register struct thread_info *__current_thread_info __asm__("$28");
 #define current_thread_info()  __current_thread_info
 
+#endif /* !__ASSEMBLY__ */
+
 /* thread information allocation */
 #if defined(CONFIG_PAGE_SIZE_4KB) && defined(CONFIG_32BIT)
 #define THREAD_SIZE_ORDER (1)
< at >< at > -85,8 +87,6 < at >< at > register struct thread_info *__current_thread_info __asm__("$28");
 
 #define STACK_WARN(THREAD_SIZE / 8)
 
-#endif /* !__ASSEMBLY_

Re: [PATCH v2] Update all configuration files for new features.

Ralf Baechle — 2012-05-25T15:50:26


Yep.  And Linus practically declared full size config files a shooting
offence.

  Ralf

Re: [PATCH v2] Update all configuration files for new features.

Sergei Shtylyov — 2012-05-25T11:19:53

Hello.

On 25-05-2012 1:03, Steven J. Hill wrote:




    I think you should use 'make savedefconfig' to save space on non-seleected 
items. At least 'malta_defconfig' was clearly generated that way before -- 
using that target has become a common practice nowadays.

WBR, Sergei

[PATCH v2] Update all configuration files for new features.

Steven J. Hill — 2012-05-24T21:03:23

From: "Steven J. Hill" <sjhill< at >mips.com>

Signed-off-by: Steven J. Hill <sjhill< at >mips.com>
---
 arch/mips/configs/malta_defconfig     | 1793 ++++++++++++++++++++++++++++++++-
 arch/mips/configs/maltaaprp_defconfig | 1739 ++++++++++++++++++++++++++++++++
 arch/mips/configs/maltasmtc_defconfig | 1746 ++++++++++++++++++++++++++++++++
 arch/mips/configs/maltasmvp_defconfig | 1750 ++++++++++++++++++++++++++++++++
 arch/mips/configs/maltaup_defconfig   | 1734 +++++++++++++++++++++++++++++++
 5 files changed, 8730 insertions(+), 32 deletions(-)
 create mode 100644 arch/mips/configs/maltaaprp_defconfig
 create mode 100644 arch/mips/configs/maltasmtc_defconfig
 create mode 100644 arch/mips/configs/maltasmvp_defconfig
 create mode 100644 arch/mips/configs/maltaup_defconfig

diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig
index 5527abb..d412195 100644
--- a/arch/mips/configs/malta_defconfig
+++ b/arch/mips/configs/malta_defconfig
< at >< at > -1,58 +1,465 < at >< at >
+#
+# Automatically generated file; D

[PATCH 4/4] MIPS: Optimise core library function 'strnlen' for microMIPS.

Steven J. Hill — 2012-05-24T20:55:42

From: "Steven J. Hill" <sjhill< at >mips.com>

Optimise 'strnlen' to use microMIPS instructions and/or optimisations
for binary size reduction. When the microMIPS ISA is not being used,
the library function compiles to the original binary code.

Signed-off-by: Steven J. Hill <sjhill< at >mips.com>
---
 arch/mips/lib/strnlen_user.S |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/lib/strnlen_user.S b/arch/mips/lib/strnlen_user.S
index 6445716..c5bdf8b 100644
--- a/arch/mips/lib/strnlen_user.S
+++ b/arch/mips/lib/strnlen_user.S
< at >< at > -35,7 +35,7 < at >< at > FEXPORT(__strnlen_user_nocheck_asm)
 PTR_ADDUa1, a0# stop pointer
 1:beqv0, a1, 1f# limit reached?
 EX(lb, t0, (v0), .Lfault)
-PTR_ADDUv0, 1
+PTR_ADDIUv0, 1
 bnezt0, 1b
 1:PTR_SUBUv0, a0
 jrra

[PATCH 3/4] MIPS: Optimise core library function 'strlen' for microMIPS.

Steven J. Hill — 2012-05-24T20:55:41

From: "Steven J. Hill" <sjhill< at >mips.com>

Optimise 'strlen' to use microMIPS instructions and/or optimisations
for binary size reduction. When the microMIPS ISA is not being used,
the library function compiles to the original binary code.

Signed-off-by: Steven J. Hill <sjhill< at >mips.com>
---
 arch/mips/lib/strlen_user.S |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/arch/mips/lib/strlen_user.S b/arch/mips/lib/strlen_user.S
index fdbb970..e362dcd 100644
--- a/arch/mips/lib/strlen_user.S
+++ b/arch/mips/lib/strlen_user.S
< at >< at > -3,8 +3,9 < at >< at >
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (c) 1996, 1998, 1999, 2004 by Ralf Baechle
- * Copyright (c) 1999 Silicon Graphics, Inc.
+ * Copyright (C) 1996, 1998, 1999, 2004 by Ralf Baechle
+ * Copyright (C) 1999 Silicon Graphics, Inc.
+ * Copyright (C) 2011 MIPS Technologies, Inc.
  */
 #include <asm/asm.h>
 #include <asm/asm-offsets.h>
< at >< at > -28,9 +29,9 < at >< at > LEAF(__strlen_user_as

[PATCH 2/4] MIPS: Optimise core library function 'strncpy' for microMIPS.

Steven J. Hill — 2012-05-24T20:55:40

From: "Steven J. Hill" <sjhill< at >mips.com>

Optimise 'strncpy' to use microMIPS instructions and/or optimisations
for binary size reduction. When the microMIPS ISA is not being used,
the library function compiles to the original binary code.

Signed-off-by: Steven J. Hill <sjhill< at >mips.com>
---
 arch/mips/lib/strncpy_user.S |   28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/arch/mips/lib/strncpy_user.S b/arch/mips/lib/strncpy_user.S
index 7201b2f..dea9304 100644
--- a/arch/mips/lib/strncpy_user.S
+++ b/arch/mips/lib/strncpy_user.S
< at >< at > -3,7 +3,8 < at >< at >
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (c) 1996, 1999 by Ralf Baechle
+ * Copyright (C) 1996, 1999 by Ralf Baechle
+ * Copyright (C) 2011 MIPS Technologies, Inc.
  */
 #include <linux/errno.h>
 #include <asm/asm.h>
< at >< at > -33,22 +34,23 < at >< at > LEAF(__strncpy_from_user_asm)
 bnezv0, .Lfault
 
 FEXPORT(__strncpy_from_user_nocheck_asm)
-movev0, zero
-

[PATCH 1/4] MIPS: Optimise core library function 'memset' for microMIPS.

Steven J. Hill — 2012-05-24T20:55:39

From: "Steven J. Hill" <sjhill< at >mips.com>

Optimise 'memset' to use microMIPS instructions and/or optimisations
for binary size reduction. When the microMIPS ISA is not being used,
the library function compiles to the original binary code.

Signed-off-by: Steven J. Hill <sjhill< at >mips.com>
---
 arch/mips/include/asm/asm.h |    2 ++
 arch/mips/lib/memset.S      |   84 +++++++++++++++++++++++++++----------------
 2 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/arch/mips/include/asm/asm.h b/arch/mips/include/asm/asm.h
index 608cfcf..604788f 100644
--- a/arch/mips/include/asm/asm.h
+++ b/arch/mips/include/asm/asm.h
< at >< at > -296,6 +296,7 < at >< at > symbol=value
 #define LONG_SUBUsubu
 #define LONG_Llw
 #define LONG_Ssw
+#define LONG_SPswp
 #define LONG_SLLsll
 #define LONG_SLLVsllv
 #define LONG_SRLsrl
< at >< at > -318,6 +319,7 < at >< at > symbol=value
 #define LONG_SUBUdsubu
 #define LONG_Lld
 #define LONG_Ssd
+#define LONG_SPsdp
 #define LONG_SLLdsll
 #define LONG_SLLVdsllv
 #define LONG_SRLdsrl
diff -

[PATCH 0/4] Optimise core MIPS library functions for microMIPS.

Steven J. Hill — 2012-05-24T20:55:38

From: "Steven J. Hill" <sjhill< at >mips.com>

Steven J. Hill (4):
  MIPS: Optimise core library function 'memset' for microMIPS.
  MIPS: Optimise core library function 'strncpy' for microMIPS.
  MIPS: Optimise core library function 'strlen' for microMIPS.
  MIPS: Optimise core library function 'strnlen' for microMIPS.

 arch/mips/include/asm/asm.h  |    2 +
 arch/mips/lib/memset.S       |   84 +++++++++++++++++++++++++++---------------
 arch/mips/lib/strlen_user.S  |    9 +++--
 arch/mips/lib/strncpy_user.S |   28 +++++++-------
 arch/mips/lib/strnlen_user.S |    2 +-
 5 files changed, 77 insertions(+), 48 deletions(-)

[PATCH 9/9] MIPS: Add microMIPS configuration option.

Steven J. Hill — 2012-05-24T20:46:06

From: "Steven J. Hill" <sjhill< at >mips.com>

This adds the option to build the Linux kernel using only the
microMIPS ISA. The resulting kernel binary is, at a minimum,
20% smaller than using the MIPS32R2 ISA.

Signed-off-by: Steven J. Hill <sjhill< at >mips.com>
---
 arch/mips/Kconfig                      |   10 +
 arch/mips/Makefile                     |    1 +
 arch/mips/configs/sead3_defconfig      |    5 +-
 arch/mips/configs/sead3micro_defconfig | 1771 ++++++++++++++++++++++++++++++++
 4 files changed, 1785 insertions(+), 2 deletions(-)
 create mode 100644 arch/mips/configs/sead3micro_defconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index a20d7ba..22a6f7f 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
< at >< at > -2077,6 +2077,13 < at >< at > config CPU_HAS_SMARTMIPS
   you don't know you probably don't have SmartMIPS and should say N
   here.
 
+config CPU_MICROMIPS
+depends on SYS_SUPPORTS_MICROMIPS
+bool "Build kernel using microMIPS ISA"
+help
+  When this option is enabled the kernel will be built

[PATCH 8/9] MIPS: Fixup ordering of micro assembler instructions.

Steven J. Hill — 2012-05-24T20:46:05

From: "Steven J. Hill" <sjhill< at >mips.com>

A number of new instructions have been added to the micro
assembler causing the list to no longer be in alphabetical
order. This patch fixes up the name ordering.

Signed-off-by: Steven J. Hill <sjhill< at >mips.com>
---
 arch/mips/include/asm/uasm.h |  103 +++++++++++++++++++++---------------------
 arch/mips/mm/uasm.c          |   75 +++++++++++++++---------------
 2 files changed, 88 insertions(+), 90 deletions(-)

diff --git a/arch/mips/include/asm/uasm.h b/arch/mips/include/asm/uasm.h
index 814bc9f..b068ea0 100644
--- a/arch/mips/include/asm/uasm.h
+++ b/arch/mips/include/asm/uasm.h
< at >< at > -6,6 +6,7 < at >< at >
  * Copyright (C) 2004, 2005, 2006, 2008  Thiemo Seufer
  * Copyright (C) 2005  Maciej W. Rozycki
  * Copyright (C) 2006  Ralf Baechle (ralf< at >linux-mips.org)
+ * Copyright (C) 2012  MIPS Technologies, Inc.
  */
 
 #include <linux/types.h>
< at >< at > -62,8 +63,10 < at >< at > void __uasminit uasm_i##op(u32 **buf, unsigned int a, signed int b)
 
 Ip_u2u1s3(_addiu);
 Ip_u3u1u2(_addu);
-Ip_u2u1u

[PATCH 7/9] MIPS: Work-around microMIPS GNU assembler bug.

Steven J. Hill — 2012-05-24T20:46:04

From: "Steven J. Hill" <sjhill< at >mips.com>

Work-around a microMIPS GNU assembler bug that thinks some
instructions are data, when they actually are not.

Signed-off-by: Steven J. Hill <sjhill< at >mips.com>
---
 arch/mips/include/asm/futex.h   |    4 ++++
 arch/mips/include/asm/paccess.h |    2 ++
 arch/mips/include/asm/uaccess.h |   14 ++++++++++++--
 arch/mips/kernel/scall32-o32.S  |    4 ++++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/arch/mips/include/asm/futex.h b/arch/mips/include/asm/futex.h
index 6ebf173..007adca 100644
--- a/arch/mips/include/asm/futex.h
+++ b/arch/mips/include/asm/futex.h
< at >< at > -31,6 +31,7 < at >< at >
 "beqzl$1, 1b\n"\
 __WEAK_LLSC_MB\
 "3:\n"\
+".insn\n"\
 ".setpop\n"\
 ".setmips0\n"\
 ".section .fixup,\"ax\"\n"\
< at >< at > -57,6 +58,7 < at >< at >
 "beqz$1, 1b\n"\
 __WEAK_LLSC_MB\
 "3:\n"\
+".insn\n"\
 ".setpop\n"\
 ".setmips0\n"\
 ".section .fixup,\"ax\"\n"\
< at >< at > -156,6 +158,7

[PATCH 6/9] MIPS: Support microMIPS/MIPS16e floating point.

Steven J. Hill — 2012-05-24T20:46:03

From: "Steven J. Hill" <sjhill< at >mips.com>

Add logic needed to do floating point emulation when in
microMIPS or MIPS16e mode.

Signed-off-by: Leonid Yegoshin <yegoshin< at >mips.com>
Signed-off-by: Steven J. Hill <sjhill< at >mips.com>
---
 arch/mips/include/asm/fpu_emulator.h |    7 +
 arch/mips/math-emu/cp1emu.c          |  766 ++++++++++++++++++++++++++++++----
 arch/mips/math-emu/dsemul.c          |   40 +-
 3 files changed, 717 insertions(+), 96 deletions(-)

diff --git a/arch/mips/include/asm/fpu_emulator.h b/arch/mips/include/asm/fpu_emulator.h
index 3b40927..67d5028 100644
--- a/arch/mips/include/asm/fpu_emulator.h
+++ b/arch/mips/include/asm/fpu_emulator.h
< at >< at > -54,6 +54,12 < at >< at > do {\
 extern int mips_dsemul(struct pt_regs *regs, mips_instruction ir,
 unsigned long cpc);
 extern int do_dsemulret(struct pt_regs *xcp);
+extern int fpu_emulator_cop1Handler(struct pt_regs *xcp,
+    struct mips_fpu_struct *ctx, int has_fpu,
+    void *__user *fault_addr);
+int process_fpemu_return(int sig, void __use

[PATCH 5/9] MIPS: Support microMIPS/MIPS16e unaligned accesses.

Steven J. Hill — 2012-05-24T20:46:02

From: "Steven J. Hill" <sjhill< at >mips.com>

Add logic needed to properly handle unaligned accesses when
in microMIPS or MIPS16e modes.

Signed-off-by: Leonid Yegoshin <yegoshin< at >mips.com>
Signed-off-by: Steven J. Hill <sjhill< at >mips.com>
---
 arch/mips/kernel/process.c   |  101 +++
 arch/mips/kernel/unaligned.c | 1496 ++++++++++++++++++++++++++++++++++++------
 2 files changed, 1391 insertions(+), 206 deletions(-)

diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index e9a5fd7..2f24d70 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
< at >< at > -7,6 +7,7 < at >< at >
  * Copyright (C) 2005, 2006 by Ralf Baechle (ralf< at >linux-mips.org)
  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
  * Copyright (C) 2004 Thiemo Seufer
+ * Copyright (C) 2011  MIPS Technologies, Inc.
  */
 #include <linux/errno.h>
 #include <linux/sched.h>
< at >< at > -262,34 +263,115 < at >< at > struct mips_frame_info {
 
 static inline int is_ra_save_ins(union mips_instruction *ip)
 {
+#ifdef CONFIG_CPU_MICROMIPS
+union mips_instructio

[PATCH 3/9] MIPS: Add support for microMIPS exception handling.

Steven J. Hill — 2012-05-24T20:46:00

From: "Steven J. Hill" <sjhill< at >mips.com>

All exceptions must be taken in microMIPS mode, never in MIPS32R2
mode or the kernel falls apart. A few 'nop' instructions are used
to maintain the correct alignment of microMIPS versions of the
exception vectors.

Signed-off-by: Steven J. Hill <sjhill< at >mips.com>
---
 arch/mips/include/asm/stackframe.h |   12 +-
 arch/mips/kernel/cpu-probe.c       |    3 +
 arch/mips/kernel/genex.S           |   82 +++++---
 arch/mips/kernel/scall32-o32.S     |   18 +-
 arch/mips/kernel/smtc-asm.S        |    3 +
 arch/mips/kernel/traps.c           |  375 +++++++++++++++++++++++++-----------
 arch/mips/mm/tlbex.c               |   21 ++
 arch/mips/mti-sead3/sead3-init.c   |   48 +++++
 8 files changed, 416 insertions(+), 146 deletions(-)

diff --git a/arch/mips/include/asm/stackframe.h b/arch/mips/include/asm/stackframe.h
index cb41af5..335ce06 100644
--- a/arch/mips/include/asm/stackframe.h
+++ b/arch/mips/include/asm/stackframe.h
< at >< at > -139,7 +139,7 < at >< at >
 1:movera, k0
 lik0, 3
 m

[PATCH 4/9] MIPS: Support microMIPS/MIPS16e handling of delay slots.

Steven J. Hill — 2012-05-24T20:46:01

From: "Steven J. Hill" <sjhill< at >mips.com>

Add logic needed to properly calculate exceptions for delay
slots when in microMIPS or MIPS16e mode.

Signed-off-by: Leonid Yegoshin <yegoshin< at >mips.com>
Signed-off-by: Steven J. Hill <sjhill< at >mips.com>
---
 arch/mips/include/asm/branch.h |   33 +++++++-
 arch/mips/kernel/branch.c      |  183 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 213 insertions(+), 3 deletions(-)

diff --git a/arch/mips/include/asm/branch.h b/arch/mips/include/asm/branch.h
index 888766a..ccc938a 100644
--- a/arch/mips/include/asm/branch.h
+++ b/arch/mips/include/asm/branch.h
< at >< at > -16,11 +16,16 < at >< at > static inline int delay_slot(struct pt_regs *regs)
 return regs->cp0_cause & CAUSEF_BD;
 }
 
+extern int __isa_exception_epc(struct pt_regs *regs);
+
 static inline unsigned long exception_epc(struct pt_regs *regs)
 {
-if (!delay_slot(regs))
+if (likely(!delay_slot(regs)))
 return regs->cp0_epc;
 
+if (is16mode(regs))
+return __isa_exception_epc(regs);
+
 return regs->cp0_epc + 4;

[PATCH 2/9] MIPS: Add support for microMIPS instructions.

Steven J. Hill — 2012-05-24T20:45:59

From: "Steven J. Hill" <sjhill< at >mips.com>

The MIPS micro-assembler needs to use microMIPS instructions
when building all of the core exception handlers.

Signed-off-by: Steven J. Hill <sjhill< at >mips.com>
---
 arch/mips/include/asm/inst.h     |  882 +++++++++++++++++++++++++++++++++++---
 arch/mips/include/asm/mipsregs.h |  359 +++++++---------
 arch/mips/mm/uasm.c              |  173 +++++++-
 3 files changed, 1133 insertions(+), 281 deletions(-)

diff --git a/arch/mips/include/asm/inst.h b/arch/mips/include/asm/inst.h
index 7ebfc39..7e8f793 100644
--- a/arch/mips/include/asm/inst.h
+++ b/arch/mips/include/asm/inst.h
< at >< at > -5,8 +5,9 < at >< at >
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1996, 2000 by Ralf Baechle
- * Copyright (C) 2006 by Thiemo Seufer
+ * Copyright (C) 1996, 2000  Ralf Baechle
+ * Copyright (C) 2006  Thiemo Seufer
+ * Copyright (C) 2011  MIPS Technologies, Inc.
  */
 #ifndef _ASM_INST_H
 #define _ASM_INST_H
< at >< at > -116,7 +117,7 < at >< at > en

[PATCH 1/9] MIPS: Add microMIPS breakpoints and DSP support.

Steven J. Hill — 2012-05-24T20:45:58

From: "Steven J. Hill" <sjhill< at >mips.com>

Signed-off-by: Steven J. Hill <sjhill< at >mips.com>
---
 arch/mips/include/asm/break.h |   11 +++++++++--
 arch/mips/include/asm/dsp.h   |    4 ++++
 arch/mips/kernel/proc.c       |    9 +++++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/arch/mips/include/asm/break.h b/arch/mips/include/asm/break.h
index 9161e68..4e4dc87 100644
--- a/arch/mips/include/asm/break.h
+++ b/arch/mips/include/asm/break.h
< at >< at > -3,8 +3,9 < at >< at >
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1995, 2003 by Ralf Baechle
  * Copyright (C) 1999 Silicon Graphics, Inc.
+ * Copyright (C) 1995, 2003 by Ralf Baechle
+ * Copyright (C) 2011, 2012 MIPS Technologies, Inc.
  */
 #ifndef __ASM_BREAK_H
 #define __ASM_BREAK_H
< at >< at > -27,11 +28,17 < at >< at >
 #define BRK_STACKOVERFLOW 9/* For Ada stackchecking */
 #define BRK_NORLD10/* No rld found - not used by Linux/MIPS */
 #define _BRK_THREADBP11/* For threads, user bp (used by

[PATCH 0/9] Add support for pure microMIPS kernel.

Steven J. Hill — 2012-05-24T20:45:57

From: "Steven J. Hill" <sjhill< at >mips.com>

This set of patches is to support building a pure microMIPS kernel
image using only instruction from the microMIPS ISA. The result is
a kernel binary reduction of more than 20% and an increase in the
speed of execution due to the smaller and faster instructions.

Steven J. Hill (9):
  MIPS: Add microMIPS breakpoints and DSP support.
  MIPS: Add support for microMIPS instructions.
  MIPS: Add support for microMIPS exception handling.
  MIPS: Support microMIPS/MIPS16e handling of delay slots.
  MIPS: Support microMIPS/MIPS16e unaligned accesses.
  MIPS: Support microMIPS/MIPS16e floating point.
  MIPS: Work-around microMIPS GNU assembler bug.
  MIPS: Fixup ordering of micro assembler instructions.
  MIPS: Add microMIPS configuration option.

 arch/mips/Kconfig                      |   10 +
 arch/mips/Makefile                     |    1 +
 arch/mips/configs/sead3_defconfig      |    5 +-
 arch/mips/configs/sead3micro_defconfig | 1771 ++++++++++++++++++++++++++++++++
 ar

[PATCH] MIPS: Refactor 'clear_page' and 'copy_page' functions.

Steven J. Hill — 2012-05-24T20:38:24

From: "Steven J. Hill" <sjhill< at >mips.com>

Remove usage of the '__attribute__((alias("...")))' hack that aliased
to integer arrays containing micro-assembled instructions. This hack
breaks when building a microMIPS kernel. It also makes the code much
easier to understand.

Signed-off-by: Steven J. Hill <sjhill< at >mips.com>
---
 arch/mips/mm/Makefile     |    4 +--
 arch/mips/mm/page-funcs.S |   49 +++++++++++++++++++++++++++++++++
 arch/mips/mm/page.c       |   67 ++++++++++++---------------------------------
 3 files changed, 69 insertions(+), 51 deletions(-)
 create mode 100644 arch/mips/mm/page-funcs.S

diff --git a/arch/mips/mm/Makefile b/arch/mips/mm/Makefile
index 4aa2028..fd6203f 100644
--- a/arch/mips/mm/Makefile
+++ b/arch/mips/mm/Makefile
< at >< at > -3,8 +3,8 < at >< at >
 #
 
 obj-y+= cache.o dma-default.o extable.o fault.o \
-   gup.o init.o mmap.o page.o tlbex.o \
-   tlbex-fault.o uasm.o
+   gup.o init.o mmap.o page.o page-funcs.o \
+   tlbex.o tlbex-fault.o uasm.o
 
 obj-$(CONFIG_32BIT)+= iore

Re: [PATCH] swiotlb: add "dma_attrs" argument to alloc and free, to match dma_map_ops

Konrad Rzeszutek Wilk — 2012-05-24T17:47:41

So .. what is this based on? I see in mainline  alloc_coherent and free_coherent
which are obviously changed here.

Don't you also need to change these two files:

 arch/x86/xen/pci-swiotlb-xen.c
 drivers/xen/swiotlb-xen.c