diff options
| author | Eugene Surovegin <ebs@ebshome.net> | 2013-09-20 14:42:21 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-10-11 01:53:26 -0400 |
| commit | 306474304fdfe3723562a02226c0a44e8078d3a0 (patch) | |
| tree | 3aa334e366f98994ee3a085c3379bf19371ed744 | |
| parent | fed8393ef9f779e51c3e0c844e549e0bbc8d6dd4 (diff) | |
powerpc: Make ftrace endian-safe.
Signed-off-by: Eugene Surovegin <surovegin@google.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
| -rw-r--r-- | arch/powerpc/kernel/ftrace.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c index 1fb78561096a..9b27b293a922 100644 --- a/arch/powerpc/kernel/ftrace.c +++ b/arch/powerpc/kernel/ftrace.c | |||
| @@ -174,7 +174,11 @@ __ftrace_make_nop(struct module *mod, | |||
| 174 | 174 | ||
| 175 | pr_devel(" %08x %08x\n", jmp[0], jmp[1]); | 175 | pr_devel(" %08x %08x\n", jmp[0], jmp[1]); |
| 176 | 176 | ||
| 177 | #ifdef __LITTLE_ENDIAN__ | ||
| 178 | ptr = ((unsigned long)jmp[1] << 32) + jmp[0]; | ||
| 179 | #else | ||
| 177 | ptr = ((unsigned long)jmp[0] << 32) + jmp[1]; | 180 | ptr = ((unsigned long)jmp[0] << 32) + jmp[1]; |
| 181 | #endif | ||
| 178 | 182 | ||
| 179 | /* This should match what was called */ | 183 | /* This should match what was called */ |
| 180 | if (ptr != ppc_function_entry((void *)addr)) { | 184 | if (ptr != ppc_function_entry((void *)addr)) { |