diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-19 06:49:35 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-19 06:49:35 -0500 |
| commit | 9e18e1869f5ebac69f0d881fe97a198ebc0834db (patch) | |
| tree | 18c5b5c185d39cbb50fa652b5e08d047c8cf06e1 /arch/powerpc/kernel/kvm.c | |
| parent | 04af964f9cb666caa7c1436d003f8fac0f1fedcc (diff) | |
| parent | 460ed699f4c943e1ec4a8458869eb532fe31fd16 (diff) | |
Merge branch 'next-samsung-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into for-2.6.38
Diffstat (limited to 'arch/powerpc/kernel/kvm.c')
| -rw-r--r-- | arch/powerpc/kernel/kvm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/kvm.c b/arch/powerpc/kernel/kvm.c index 428d0e538ae..b06bdae0406 100644 --- a/arch/powerpc/kernel/kvm.c +++ b/arch/powerpc/kernel/kvm.c | |||
| @@ -127,7 +127,7 @@ static void kvm_patch_ins_nop(u32 *inst) | |||
| 127 | 127 | ||
| 128 | static void kvm_patch_ins_b(u32 *inst, int addr) | 128 | static void kvm_patch_ins_b(u32 *inst, int addr) |
| 129 | { | 129 | { |
| 130 | #ifdef CONFIG_RELOCATABLE | 130 | #if defined(CONFIG_RELOCATABLE) && defined(CONFIG_PPC_BOOK3S) |
| 131 | /* On relocatable kernels interrupts handlers and our code | 131 | /* On relocatable kernels interrupts handlers and our code |
| 132 | can be in different regions, so we don't patch them */ | 132 | can be in different regions, so we don't patch them */ |
| 133 | 133 | ||