diff options
| author | Thierry Reding <treding@nvidia.com> | 2014-11-26 09:41:09 +0100 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2014-11-26 09:42:11 +0100 |
| commit | 7f06dd61248a75668bbb39b6fcca6ff407745df8 (patch) | |
| tree | 30cefbd6f503d20557e24a1765a027687170a7da /arch/arc/kernel/disasm.c | |
| parent | f114040e3ea6e07372334ade75d1ee0775c355e1 (diff) | |
| parent | 0690cbd2e55a72a8eae557c389d1a136ed9fa142 (diff) | |
| download | op-kernel-dev-7f06dd61248a75668bbb39b6fcca6ff407745df8.zip op-kernel-dev-7f06dd61248a75668bbb39b6fcca6ff407745df8.tar.gz | |
Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
This branch contains a couple of changes that will conflict with the
Tegra SMMU driver rewrite. Since the driver is largely rewritten the
conflict resolution is non-trivial.
Diffstat (limited to 'arch/arc/kernel/disasm.c')
| -rw-r--r-- | arch/arc/kernel/disasm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arc/kernel/disasm.c b/arch/arc/kernel/disasm.c index b8a549c..3b7cd48 100644 --- a/arch/arc/kernel/disasm.c +++ b/arch/arc/kernel/disasm.c @@ -15,7 +15,7 @@ #include <linux/uaccess.h> #include <asm/disasm.h> -#if defined(CONFIG_KGDB) || defined(CONFIG_ARC_MISALIGN_ACCESS) || \ +#if defined(CONFIG_KGDB) || defined(CONFIG_ARC_EMUL_UNALIGNED) || \ defined(CONFIG_KPROBES) /* disasm_instr: Analyses instruction at addr, stores @@ -535,4 +535,4 @@ int __kprobes disasm_next_pc(unsigned long pc, struct pt_regs *regs, return instr.is_branch; } -#endif /* CONFIG_KGDB || CONFIG_ARC_MISALIGN_ACCESS || CONFIG_KPROBES */ +#endif /* CONFIG_KGDB || CONFIG_ARC_EMUL_UNALIGNED || CONFIG_KPROBES */ |
