From: "N.P.S." <napohybelskurwysynom2010@gmail.com>
To: linux-kernel@vger.kernel.org,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
linuxppc-dev@lists.ozlabs.org
Subject: [RFC][PATCH 7/8] Removal of dead code from arch/powerpc/mm/tlb_low_64e.S and arch/powerpc/include/asm/exception-64e.h
Date: Fri, 22 Oct 2010 20:25:04 +0200 [thread overview]
Message-ID: <4CC1D700.7030007@gmail.com> (raw)
In-Reply-To: <4CC1D2D5.9050009@gmail.com>
commit bca5655fdfd3ad0a4891914bd88b28f78e5cec16
Author: N.P.S <napohybelskurwysynom2010@gmail.com>
Date: Thu Oct 21 23:26:48 2010 +0200
Removal of dead code from
arch/powerpc/mm/tlb_low_64e.S
arch/powerpc/include/asm/exception-64e.h
Signed-off-by: Zimny Lech <napohybelskurwysynom2010@gmail.com>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: Paul Mackerras <paulus@samba.org>
CC: <linuxppc-dev@lists.ozlabs.org>
CC: <linux-kernel@vger.kernel.org>
diff --git a/arch/powerpc/include/asm/exception-64e.h b/arch/powerpc/include/asm/exception-64e.h
index 6d53f31..db74814 100644
--- a/arch/powerpc/include/asm/exception-64e.h
+++ b/arch/powerpc/include/asm/exception-64e.h
@@ -65,14 +65,7 @@
#define EX_TLB_MMUCR0 (12 * 8) /* Level 0 */
#define EX_TLB_MAS1 (12 * 8) /* Level 0 */
#define EX_TLB_MAS2 (13 * 8) /* Level 0 */
-#ifdef CONFIG_BOOK3E_MMU_TLB_STATS
-#define EX_TLB_R8 (14 * 8)
-#define EX_TLB_R9 (15 * 8)
-#define EX_TLB_LR (16 * 8)
-#define EX_TLB_SIZE (17 * 8)
-#else
#define EX_TLB_SIZE (14 * 8)
-#endif
#define START_EXCEPTION(label) \
.globl exc_##label##_book3e; \
@@ -157,36 +150,6 @@ exc_##label##_book3e:
addi r11,r13,PACA_EXTLB; \
TLB_MISS_RESTORE(r11)
-#ifdef CONFIG_BOOK3E_MMU_TLB_STATS
-#define TLB_MISS_PROLOG_STATS \
- mflr r10; \
- std r8,EX_TLB_R8(r12); \
- std r9,EX_TLB_R9(r12); \
- std r10,EX_TLB_LR(r12);
-#define TLB_MISS_RESTORE_STATS \
- ld r16,EX_TLB_LR(r12); \
- ld r9,EX_TLB_R9(r12); \
- ld r8,EX_TLB_R8(r12); \
- mtlr r16;
-#define TLB_MISS_STATS_D(name) \
- addi r9,r13,MMSTAT_DSTATS+name; \
- bl .tlb_stat_inc;
-#define TLB_MISS_STATS_I(name) \
- addi r9,r13,MMSTAT_ISTATS+name; \
- bl .tlb_stat_inc;
-#define TLB_MISS_STATS_X(name) \
- ld r8,PACA_EXTLB+EX_TLB_ESR(r13); \
- cmpdi cr2,r8,-1; \
- beq cr2,61f; \
- addi r9,r13,MMSTAT_DSTATS+name; \
- b 62f; \
-61: addi r9,r13,MMSTAT_ISTATS+name; \
-62: bl .tlb_stat_inc;
-#define TLB_MISS_STATS_SAVE_INFO \
- std r14,EX_TLB_ESR(r12); /* save ESR */ \
-
-
-#else
#define TLB_MISS_PROLOG_STATS
#define TLB_MISS_RESTORE_STATS
#define TLB_MISS_STATS_D(name)
@@ -194,7 +157,6 @@ exc_##label##_book3e:
#define TLB_MISS_STATS_X(name)
#define TLB_MISS_STATS_Y(name)
#define TLB_MISS_STATS_SAVE_INFO
-#endif
#define SET_IVOR(vector_number, vector_offset) \
li r3,vector_offset@l; \
diff --git a/arch/powerpc/mm/tlb_low_64e.S b/arch/powerpc/mm/tlb_low_64e.S
index 8b04c54..fc87217 100644
--- a/arch/powerpc/mm/tlb_low_64e.S
+++ b/arch/powerpc/mm/tlb_low_64e.S
@@ -757,13 +757,3 @@ tlb_load_linear_fault:
b exc_data_storage_book3e
1: TLB_MISS_EPILOG_ERROR_SPECIAL
b exc_instruction_storage_book3e
-
-
-#ifdef CONFIG_BOOK3E_MMU_TLB_STATS
-.tlb_stat_inc:
-1: ldarx r8,0,r9
- addi r8,r8,1
- stdcx. r8,0,r9
- bne- 1b
- blr
-#endif
next prev parent reply other threads:[~2010-10-22 18:25 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <4CC1D2D5.9050009@gmail.com>
2010-10-22 18:23 ` [RFC][PATCH 1/8] Removal of dead code from arch/blackfin/kernel/traps.c N.P.S.
2010-10-22 19:43 ` Mike Frysinger
2010-10-22 20:32 ` Zimny Lech
2010-10-22 18:24 ` [RFC][PATCH 2/8] Removal of dead code from arch/blackfin/kernel/ipipe.c N.P.S.
2010-10-22 19:42 ` Mike Frysinger
2010-10-22 18:24 ` [RFC][PATCH 3/8] Removal of dead code from arch/blackfin/include/asm/irqflags.h N.P.S.
2010-10-22 19:43 ` Mike Frysinger
2010-10-22 20:39 ` Zimny Lech
2010-10-22 20:48 ` Mike Frysinger
2010-10-22 18:24 ` [RFC][PATCH 4/8] Removal of dead code from arch/m68knommu/kernel/setup.c N.P.S.
2010-10-22 18:24 ` [RFC][PATCH 5/8] Removal of dead code from arch/m68knommu/platform/68VZ328/config.c N.P.S.
2010-10-22 18:24 ` [RFC][PATCH 6/8] Removal of dead code from arch/powerpc/kernel/process.c N.P.S.
2010-10-22 18:25 ` N.P.S. [this message]
2010-10-22 18:25 ` [RFC][PATCH 8/8] Removal of dead code from arch/h8300/kernel/time.c N.P.S.
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=4CC1D700.7030007@gmail.com \
--to=napohybelskurwysynom2010@gmail.com \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulus@samba.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.