From: robherring2@gmail.com (Rob Herring)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 1/4] ARM: make arch_ret_to_user macro optional
Date: Wed, 8 Feb 2012 19:33:36 -0600 [thread overview]
Message-ID: <1328751219-2552-2-git-send-email-robherring2@gmail.com> (raw)
In-Reply-To: <1328751219-2552-1-git-send-email-robherring2@gmail.com>
From: Rob Herring <rob.herring@calxeda.com>
Only 3 platforms need arch_ret_to_user macro, so add NEED_RET_TO_USER
kconfig option and make iop13xx, iop32x and iop33x select it.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---
arch/arm/Kconfig | 6 ++++++
arch/arm/kernel/entry-common.S | 8 +++++++-
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a48aecc..7d809b7 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -186,6 +186,9 @@ config GENERIC_ISA_DMA
config FIQ
bool
+config NEED_RET_TO_USER
+ bool
+
config ARCH_MTD_XIP
bool
@@ -479,6 +482,7 @@ config ARCH_IOP13XX
select ARCH_SUPPORTS_MSI
select VMSPLIT_1G
select NEED_MACH_MEMORY_H
+ select NEED_RET_TO_USER
help
Support for Intel's IOP13XX (XScale) family of processors.
@@ -486,6 +490,7 @@ config ARCH_IOP32X
bool "IOP32x-based"
depends on MMU
select CPU_XSCALE
+ select NEED_RET_TO_USER
select PLAT_IOP
select PCI
select ARCH_REQUIRE_GPIOLIB
@@ -497,6 +502,7 @@ config ARCH_IOP33X
bool "IOP33x-based"
depends on MMU
select CPU_XSCALE
+ select NEED_RET_TO_USER
select PLAT_IOP
select PCI
select ARCH_REQUIRE_GPIOLIB
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index 9fd0ba9..54ee265 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -10,9 +10,15 @@
#include <asm/unistd.h>
#include <asm/ftrace.h>
-#include <mach/entry-macro.S>
#include <asm/unwind.h>
+#ifdef CONFIG_NEED_RET_TO_USER
+#include <mach/entry-macro.S>
+#else
+ .macro arch_ret_to_user, tmp1, tmp2
+ .endm
+#endif
+
#include "entry-header.S"
--
1.7.5.4
next prev parent reply other threads:[~2012-02-09 1:33 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-09 1:33 [PATCH v2 0/4] entry-macro.S clean-up Rob Herring
2012-02-09 1:33 ` Rob Herring [this message]
2012-02-09 6:12 ` [PATCH v2 1/4] ARM: make arch_ret_to_user macro optional Nicolas Pitre
2012-02-09 1:33 ` [PATCH v2 2/4] ARM: rpc: make default fiq handler run-time installed Rob Herring
2012-02-09 6:33 ` Nicolas Pitre
2012-02-14 14:50 ` [PATCH v3] " Rob Herring
2012-02-14 17:37 ` Nicolas Pitre
2012-02-14 19:12 ` Rob Herring
2012-02-09 1:33 ` [PATCH v2 3/4] ARM: make entry-macro.S depend on !MULTI_IRQ_HANDLER Rob Herring
2012-02-09 6:28 ` Nicolas Pitre
2012-02-09 23:04 ` H Hartley Sweeten
2012-02-09 1:33 ` [PATCH v2 4/4] ARM: remove empty disable_fiq and arch_ret_to_user macros Rob Herring
2012-02-09 23:03 ` H Hartley Sweeten
2012-02-11 6:58 ` Shawn Guo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1328751219-2552-2-git-send-email-robherring2@gmail.com \
--to=robherring2@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).