powerpc/xmon: Drop the valid variable completely in dump_segments() (8218a303) · Commits · 戴 / test

The value of 'valid' is always zero when 'esid' is zero, and if 'esid' is non-zero then the value of 'valid' is irrelevant because we are using logical or in the if expression. In fact 'valid' can be dropped completely from dump_segments() by simply doing the check with SLB_ESID_V directly in the if. Signed-off-by:

Anshuman Khandual <khandual@linux.vnet.ibm.com> [mpe: Rewrite change log] Signed-off-by:

Michael Ellerman <mpe@ellerman.id.au>

arch/powerpc/xmon/xmon.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -2730,7 +2730,7 @@ static void xmon_print_symbol(unsigned long address, const char *mid,
		void dump_segments(void)
		{
		int i;
		unsigned long esid,vsid,valid;
		unsigned long esid,vsid;
		unsigned long llp;

		printf("SLB contents of cpu 0x%x\n", smp_processor_id());
		@@ -2738,10 +2738,9 @@ void dump_segments(void)
		for (i = 0; i < mmu_slb_size; i++) {
		asm volatile("slbmfee %0,%1" : "=r" (esid) : "r" (i));
		asm volatile("slbmfev %0,%1" : "=r" (vsid) : "r" (i));
		valid = (esid & SLB_ESID_V);
		if (valid \| esid \| vsid) {
		if (esid \|\| vsid) {
		printf("%02d %016lx %016lx", i, esid, vsid);
		if (valid) {
		if (esid & SLB_ESID_V) {
		llp = vsid & SLB_VSID_LLP;
		if (vsid & SLB_VSID_B_1T) {
		printf(" 1T ESID=%9lx VSID=%13lx LLP:%3lx \n",

Admin message