Title: [8740] trunk/arch/blackfin/kernel/trace.c: bfin: fix off-by-one-ish in invalid addr checks and drop useless int casts
Revision
8740
Author
vapier
Date
2010-05-21 07:11:20 -0400 (Fri, 21 May 2010)

Log Message

bfin: fix off-by-one-ish in invalid addr checks and drop useless int casts

Modified Paths

Diff

Modified: trunk/arch/blackfin/kernel/trace.c (8739 => 8740)


--- trunk/arch/blackfin/kernel/trace.c	2010-05-21 10:52:05 UTC (rev 8739)
+++ trunk/arch/blackfin/kernel/trace.c	2010-05-21 11:11:20 UTC (rev 8740)
@@ -80,11 +80,11 @@
 		strcat(buf, "/* on-chip scratchpad */");
 		return;
 
-	} else if (address > physical_mem_end && address < ASYNC_BANK0_BASE) {
+	} else if (address >= physical_mem_end && address < ASYNC_BANK0_BASE) {
 		strcat(buf, "/* unconnected memory */");
 		return;
 
-	} else if (address > ASYNC_BANK3_BASE + ASYNC_BANK3_SIZE && address < BOOT_ROM_START) {
+	} else if (address >= ASYNC_BANK3_BASE + ASYNC_BANK3_SIZE && address < BOOT_ROM_START) {
 		strcat(buf, "/* reserved memory */");
 		return;
 
@@ -235,7 +235,7 @@
 		return false;
 
 	/* Data banks will never have instructions */
-	if (addr > BOOT_ROM_START + BOOT_ROM_LENGTH && addr < L1_CODE_START)
+	if (addr >= BOOT_ROM_START + BOOT_ROM_LENGTH && addr < L1_CODE_START)
 		return false;
 
 	if (!get_mem16(&opcode0, address))
@@ -245,9 +245,9 @@
 	if ((opcode0 & 0xc000) == 0xc000) {
 		if (!get_mem16(&opcode1, address + 1))
 			return false;
-		*val = (unsigned int)((opcode0 << 16) + opcode1);
+		*val = (opcode0 << 16) + opcode1;
 	} else
-		*val = (unsigned int)opcode0;
+		*val = opcode0;
 
 	return true;
 }
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to