From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 6/9] ARM: multi-cpu: remove arguments from CPU proc macros
Date: Wed, 15 Jun 2011 18:23:17 +0100 [thread overview]
Message-ID: <1308158600-7169-7-git-send-email-will.deacon@arm.com> (raw)
In-Reply-To: <1308158600-7169-1-git-send-email-will.deacon@arm.com>
The macros for invoking functions via the processor struct in the
MULTI_CPU case define the arguments as part of the macros, making it
impossible to take the address of those functions.
This patch removes the arguments from the macro definitions so that we
can take the address of these functions like we can for the !MULTI_CPU
case.
Reported-by: Frank Hofmann <frank.hofmann@tomtom.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
arch/arm/include/asm/proc-fns.h | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/include/asm/proc-fns.h b/arch/arm/include/asm/proc-fns.h
index 8ec535e..633d1cb 100644
--- a/arch/arm/include/asm/proc-fns.h
+++ b/arch/arm/include/asm/proc-fns.h
@@ -82,13 +82,13 @@ extern void cpu_do_switch_mm(unsigned long pgd_phys, struct mm_struct *mm);
extern void cpu_set_pte_ext(pte_t *ptep, pte_t pte, unsigned int ext);
extern void cpu_reset(unsigned long addr) __attribute__((noreturn));
#else
-#define cpu_proc_init() processor._proc_init()
-#define cpu_proc_fin() processor._proc_fin()
-#define cpu_reset(addr) processor.reset(addr)
-#define cpu_do_idle() processor._do_idle()
-#define cpu_dcache_clean_area(addr,sz) processor.dcache_clean_area(addr,sz)
-#define cpu_set_pte_ext(ptep,pte,ext) processor.set_pte_ext(ptep,pte,ext)
-#define cpu_do_switch_mm(pgd,mm) processor.switch_mm(pgd,mm)
+#define cpu_proc_init processor._proc_init
+#define cpu_proc_fin processor._proc_fin
+#define cpu_reset processor.reset
+#define cpu_do_idle processor._do_idle
+#define cpu_dcache_clean_area processor.dcache_clean_area
+#define cpu_set_pte_ext processor.set_pte_ext
+#define cpu_do_switch_mm processor.switch_mm
#endif
extern void cpu_resume(void);
--
1.7.0.4
next prev parent reply other threads:[~2011-06-15 17:23 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-15 17:23 [PATCH v3 0/9] MMU disabling code and kexec fixes Will Deacon
2011-06-15 17:23 ` [PATCH v3 1/9] ARM: l2x0: fix disabling function to avoid deadlock Will Deacon
2011-06-16 14:53 ` Catalin Marinas
2011-06-15 17:23 ` [PATCH v3 2/9] ARM: proc: add definition of cpu_reset for ARMv6 and ARMv7 cores Will Deacon
2011-06-15 17:23 ` [PATCH v3 3/9] ARM: lib: add switch_stack function for safely changing stack Will Deacon
2011-06-15 17:23 ` [PATCH v3 4/9] ARM: idmap: add header file for identity mapping functions Will Deacon
2011-06-15 17:23 ` [PATCH v3 5/9] ARM: reset: allow kernelspace mappings to be flat mapped during reset Will Deacon
2011-06-15 17:23 ` Will Deacon [this message]
2011-06-15 17:23 ` [PATCH v3 7/9] ARM: reset: add reset functionality for jumping to a physical address Will Deacon
2011-06-15 17:23 ` [PATCH v3 8/9] ARM: kexec: use arm_machine_reset for branching to the reboot buffer Will Deacon
2011-06-15 17:23 ` [PATCH v3 9/9] ARM: stop: execute platform callback from cpu_stop code Will Deacon
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=1308158600-7169-7-git-send-email-will.deacon@arm.com \
--to=will.deacon@arm.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.