Author: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
AuthorDate: Thu, 26 Feb 2009 11:23:52 +0200
Commit: Vegard Nossum <vegard.nossum@xxxxxxxxx>
CommitDate: Thu, 26 Feb 2009 14:09:16 +0100
kmemcheck: move 64-bit ifdef out of kmemcheck_opcode_decode()
Impact: cleanup
This patch moves the CONFIG_X86_64 ifdef out of kmemcheck_opcode_decode() by
introducing a version of the function that always returns false for
CONFIG_X86_32.
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
Signed-off-by: Vegard Nossum <vegard.nossum@xxxxxxxxx>
---
arch/x86/mm/kmemcheck/opcode.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/arch/x86/mm/kmemcheck/opcode.c b/arch/x86/mm/kmemcheck/opcode.c
index 3dff500..5283f0b 100644
--- a/arch/x86/mm/kmemcheck/opcode.c
+++ b/arch/x86/mm/kmemcheck/opcode.c
@@ -16,10 +16,17 @@ static bool opcode_is_prefix(uint8_t b)
|| b == 0x67;
}
+#ifdef CONFIG_X86_64
static bool opcode_is_rex_prefix(uint8_t b)
{
return (b & 0xf0) == 0x40;
}
+#else
+static bool opcode_is_rex_prefix(uint8_t b)
+{
+ return false;
+}
+#endif
/*
* This is a VERY crude opcode decoder. We only need to find the size of the
@@ -38,7 +45,6 @@ void kmemcheck_opcode_decode(const uint8_t *op, unsigned int *size)
operand_size_override = 2;
}
-#ifdef CONFIG_X86_64
/* REX prefix */
if (opcode_is_rex_prefix(*op)) {
if (*op & 0x08) {
@@ -48,7 +54,6 @@ void kmemcheck_opcode_decode(const uint8_t *op, unsigned int *size)
++op;
}
-#endif
/* escape opcode */
if (*op == 0x0f) {
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|