From: shijie.huang@arm.com (Huang Shijie)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/9] arm64: entry: remove the duplicated code for tracing the IRQ flags
Date: Mon, 30 May 2016 10:52:25 +0800 [thread overview]
Message-ID: <1464576750-25160-5-git-send-email-shijie.huang@arm.com> (raw)
In-Reply-To: <1464576750-25160-1-git-send-email-shijie.huang@arm.com>
We record the hardirq flags changes in the entry/exit code now,
So the code becomes duplicated, just remove it.
Signed-off-by: Huang Shijie <shijie.huang@arm.com>
---
arch/arm64/kernel/entry.S | 12 ------------
arch/arm64/mm/fault.c | 10 ----------
2 files changed, 22 deletions(-)
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index 4c67c56..102fd8b 100644
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -428,9 +428,6 @@ ENDPROC(el1_sync)
el1_irq:
kernel_entry 1
enable_dbg
-#ifdef CONFIG_TRACE_IRQFLAGS
- bl trace_hardirqs_off
-#endif
get_thread_info tsk
irq_handler
@@ -443,9 +440,6 @@ el1_irq:
bl el1_preempt
1:
#endif
-#ifdef CONFIG_TRACE_IRQFLAGS
- bl trace_hardirqs_on
-#endif
kernel_exit 1
ENDPROC(el1_irq)
@@ -632,16 +626,10 @@ el0_irq:
kernel_entry 0
el0_irq_naked:
enable_dbg
-#ifdef CONFIG_TRACE_IRQFLAGS
- bl trace_hardirqs_off
-#endif
ct_user_exit
irq_handler
-#ifdef CONFIG_TRACE_IRQFLAGS
- bl trace_hardirqs_on
-#endif
b ret_to_user
ENDPROC(el0_irq)
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index 5954881..f94e598 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -603,13 +603,6 @@ asmlinkage int __exception do_debug_exception(unsigned long addr,
struct siginfo info;
int rv;
- /*
- * Tell lockdep we disabled irqs in entry.S. Do nothing if they were
- * already disabled to preserve the last enabled/disabled addresses.
- */
- if (interrupts_enabled(regs))
- trace_hardirqs_off();
-
if (!inf->fn(addr, esr, regs)) {
rv = 1;
} else {
@@ -624,9 +617,6 @@ asmlinkage int __exception do_debug_exception(unsigned long addr,
rv = 0;
}
- if (interrupts_enabled(regs))
- trace_hardirqs_on();
-
return rv;
}
--
2.5.5
next prev parent reply other threads:[~2016-05-30 2:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-30 2:52 [PATCH 0/9] arm64: add more accurate code for tracing the hardirq flags changes Huang Shijie
2016-05-30 2:52 ` [PATCH 1/9] arm64: entry: use the callee-saved registers to save some registers Huang Shijie
2016-05-30 2:52 ` [PATCH 2/9] arm64: entry: add a new macro to restore the registers for syscall Huang Shijie
2016-05-30 2:52 ` [PATCH 3/9] arm64: entry: record the hardirq changes on the entry/exit code Huang Shijie
2016-05-30 2:52 ` Huang Shijie [this message]
2016-05-30 2:52 ` [PATCH 5/9] arm64: entry: only restore the syscall registers once Huang Shijie
2016-05-30 2:52 ` [PATCH 6/9] arm64: entry: adjust el1_sync so that a function can be called Huang Shijie
2016-05-30 2:52 ` [PATCH 7/9] arm64: entry: save the x0 back into the stack before disabling the interrupt Huang Shijie
2016-05-30 2:52 ` [PATCH 8/9] arm64: add the hardirq flags trace code for irq macros Huang Shijie
2016-05-30 2:52 ` [PATCH 9/9] arm64: entry: remove the duplicated hardirq flags trace code Huang Shijie
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=1464576750-25160-5-git-send-email-shijie.huang@arm.com \
--to=shijie.huang@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 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).