diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-17 00:35:27 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-17 00:35:27 +0100 |
| commit | 05e34754518b6a90d5c392790c032575fab12d66 (patch) | |
| tree | 318d321262269eff585573ab2acf04a2ff2b65f4 /arch/arm/kernel/armksyms.c | |
| parent | Merge branch 'v6v7' into devel (diff) | |
| parent | ARM: 6747/1: P2V: Thumb2 support (diff) | |
| download | linux-05e34754518b6a90d5c392790c032575fab12d66.tar.xz linux-05e34754518b6a90d5c392790c032575fab12d66.zip | |
Merge branch 'p2v' into devel
Conflicts:
arch/arm/kernel/module.c
arch/arm/mach-s5pv210/sleep.S
Diffstat (limited to 'arch/arm/kernel/armksyms.c')
| -rw-r--r-- | arch/arm/kernel/armksyms.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c index d5d4185f0c24..acca35aebe28 100644 --- a/arch/arm/kernel/armksyms.c +++ b/arch/arm/kernel/armksyms.c @@ -164,3 +164,7 @@ EXPORT_SYMBOL(mcount); #endif EXPORT_SYMBOL(__gnu_mcount_nc); #endif + +#ifdef CONFIG_ARM_PATCH_PHYS_VIRT +EXPORT_SYMBOL(__pv_phys_offset); +#endif |