aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2014-02-04 00:04:35 -0500
committerAnton Blanchard <anton@samba.org>2014-04-22 20:05:16 -0400
commitb1576fec7f4dd4657694fefc97fda4cf28ec68e9 (patch)
tree5cb6a303ba74429260ecb200f454172e385b8593 /arch/powerpc/include/asm
parent58aedccb1907f05f702f0f6d8f8a57e8efe485b7 (diff)
powerpc: No need to use dot symbols when branching to a function
binutils is smart enough to know that a branch to a function descriptor is actually a branch to the functions text address. Alan tells me that binutils has been doing this for 9 years. Signed-off-by: Anton Blanchard <anton@samba.org>
Diffstat (limited to 'arch/powerpc/include/asm')
-rw-r--r--arch/powerpc/include/asm/context_tracking.h4
-rw-r--r--arch/powerpc/include/asm/exception-64e.h6
-rw-r--r--arch/powerpc/include/asm/exception-64s.h2
-rw-r--r--arch/powerpc/include/asm/irqflags.h4
-rw-r--r--arch/powerpc/include/asm/ppc_asm.h2
5 files changed, 9 insertions, 9 deletions
diff --git a/arch/powerpc/include/asm/context_tracking.h b/arch/powerpc/include/asm/context_tracking.h
index b6f5a33b8ee2..40014921ffff 100644
--- a/arch/powerpc/include/asm/context_tracking.h
+++ b/arch/powerpc/include/asm/context_tracking.h
@@ -2,9 +2,9 @@
2#define _ASM_POWERPC_CONTEXT_TRACKING_H 2#define _ASM_POWERPC_CONTEXT_TRACKING_H
3 3
4#ifdef CONFIG_CONTEXT_TRACKING 4#ifdef CONFIG_CONTEXT_TRACKING
5#define SCHEDULE_USER bl .schedule_user 5#define SCHEDULE_USER bl schedule_user
6#else 6#else
7#define SCHEDULE_USER bl .schedule 7#define SCHEDULE_USER bl schedule
8#endif 8#endif
9 9
10#endif 10#endif
diff --git a/arch/powerpc/include/asm/exception-64e.h b/arch/powerpc/include/asm/exception-64e.h
index a563d9afd179..a8b52b61043f 100644
--- a/arch/powerpc/include/asm/exception-64e.h
+++ b/arch/powerpc/include/asm/exception-64e.h
@@ -174,10 +174,10 @@ exc_##label##_book3e:
174 mtlr r16; 174 mtlr r16;
175#define TLB_MISS_STATS_D(name) \ 175#define TLB_MISS_STATS_D(name) \
176 addi r9,r13,MMSTAT_DSTATS+name; \ 176 addi r9,r13,MMSTAT_DSTATS+name; \
177 bl .tlb_stat_inc; 177 bl tlb_stat_inc;
178#define TLB_MISS_STATS_I(name) \ 178#define TLB_MISS_STATS_I(name) \
179 addi r9,r13,MMSTAT_ISTATS+name; \ 179 addi r9,r13,MMSTAT_ISTATS+name; \
180 bl .tlb_stat_inc; 180 bl tlb_stat_inc;
181#define TLB_MISS_STATS_X(name) \ 181#define TLB_MISS_STATS_X(name) \
182 ld r8,PACA_EXTLB+EX_TLB_ESR(r13); \ 182 ld r8,PACA_EXTLB+EX_TLB_ESR(r13); \
183 cmpdi cr2,r8,-1; \ 183 cmpdi cr2,r8,-1; \
@@ -185,7 +185,7 @@ exc_##label##_book3e:
185 addi r9,r13,MMSTAT_DSTATS+name; \ 185 addi r9,r13,MMSTAT_DSTATS+name; \
186 b 62f; \ 186 b 62f; \
18761: addi r9,r13,MMSTAT_ISTATS+name; \ 18761: addi r9,r13,MMSTAT_ISTATS+name; \
18862: bl .tlb_stat_inc; 18862: bl tlb_stat_inc;
189#define TLB_MISS_STATS_SAVE_INFO \ 189#define TLB_MISS_STATS_SAVE_INFO \
190 std r14,EX_TLB_ESR(r12); /* save ESR */ 190 std r14,EX_TLB_ESR(r12); /* save ESR */
191#define TLB_MISS_STATS_SAVE_INFO_BOLTED \ 191#define TLB_MISS_STATS_SAVE_INFO_BOLTED \
diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index aeaa56cd9b54..8f35cd7d59cc 100644
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -517,7 +517,7 @@ label##_relon_hv: \
517#define DISABLE_INTS RECONCILE_IRQ_STATE(r10,r11) 517#define DISABLE_INTS RECONCILE_IRQ_STATE(r10,r11)
518 518
519#define ADD_NVGPRS \ 519#define ADD_NVGPRS \
520 bl .save_nvgprs 520 bl save_nvgprs
521 521
522#define RUNLATCH_ON \ 522#define RUNLATCH_ON \
523BEGIN_FTR_SECTION \ 523BEGIN_FTR_SECTION \
diff --git a/arch/powerpc/include/asm/irqflags.h b/arch/powerpc/include/asm/irqflags.h
index f51a5580bfd0..f62c056e75bf 100644
--- a/arch/powerpc/include/asm/irqflags.h
+++ b/arch/powerpc/include/asm/irqflags.h
@@ -36,8 +36,8 @@
36 * have to call a C function so call a wrapper that saves all the 36 * have to call a C function so call a wrapper that saves all the
37 * C-clobbered registers. 37 * C-clobbered registers.
38 */ 38 */
39#define TRACE_ENABLE_INTS TRACE_WITH_FRAME_BUFFER(.trace_hardirqs_on) 39#define TRACE_ENABLE_INTS TRACE_WITH_FRAME_BUFFER(trace_hardirqs_on)
40#define TRACE_DISABLE_INTS TRACE_WITH_FRAME_BUFFER(.trace_hardirqs_off) 40#define TRACE_DISABLE_INTS TRACE_WITH_FRAME_BUFFER(trace_hardirqs_off)
41 41
42/* 42/*
43 * This is used by assembly code to soft-disable interrupts first and 43 * This is used by assembly code to soft-disable interrupts first and
diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h
index 6586a40a46ce..3128ba3ba7a0 100644
--- a/arch/powerpc/include/asm/ppc_asm.h
+++ b/arch/powerpc/include/asm/ppc_asm.h
@@ -57,7 +57,7 @@ BEGIN_FW_FTR_SECTION; \
57 LDX_BE r10,0,r10; /* get log write index */ \ 57 LDX_BE r10,0,r10; /* get log write index */ \
58 cmpd cr1,r11,r10; \ 58 cmpd cr1,r11,r10; \
59 beq+ cr1,33f; \ 59 beq+ cr1,33f; \
60 bl .accumulate_stolen_time; \ 60 bl accumulate_stolen_time; \
61 ld r12,_MSR(r1); \ 61 ld r12,_MSR(r1); \
62 andi. r10,r12,MSR_PR; /* Restore cr0 (coming from user) */ \ 62 andi. r10,r12,MSR_PR; /* Restore cr0 (coming from user) */ \
6333: \ 6333: \