diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 13:32:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 13:32:02 -0400 |
commit | b91cba52e9b7b3f1c0037908a192d93a869ca9e5 (patch) | |
tree | bbce7f323c8f52b308af5a152673a75b3e445360 /arch/sh/kernel/sh_ksyms.c | |
parent | 98283bb49c6c8c070ebde9f47489d3e9a83c1323 (diff) | |
parent | e509ac4bbc661052dc73a2e8138800ba77d4ecb9 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: (68 commits)
sh: sh-rtc support for SH7709.
sh: Revert __xdiv64_32 size change.
sh: Update r7785rp defconfig.
sh: Export div symbols for GCC 4.2 and ST GCC.
sh: fix race in parallel out-of-tree build
sh: Kill off dead mach.c for hp6xx.
sh: hd64461.h cleanup and added comments.
sh: Update the alignment when 4K stacks are used.
sh: Add a .bss.page_aligned section for 4K stacks.
sh: Don't let SH-4A clobber SH-4 CFLAGS.
sh: Add parport stub for SuperIO ports.
sh: Drop -Wa,-dsp for DSP tuning.
sh: Update dreamcast defconfig.
fb: pvr2fb: A few more __devinit annotations for PCI.
fb: pvr2fb: Fix up section mismatch warnings.
sh: Select IPR-IRQ for SH7091.
sh: Correct __xdiv64_32/div64_32 return value size.
sh: Fix timer-tmu build for SH-3.
sh: Add cpu and mach links to CLEAN_FILES.
sh: Preliminary support for the SH-X3 CPU.
...
Diffstat (limited to 'arch/sh/kernel/sh_ksyms.c')
-rw-r--r-- | arch/sh/kernel/sh_ksyms.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/sh/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms.c index c1cfcb9f047c..c968dcf09eee 100644 --- a/arch/sh/kernel/sh_ksyms.c +++ b/arch/sh/kernel/sh_ksyms.c | |||
@@ -78,6 +78,16 @@ DECLARE_EXPORT(__movstr); | |||
78 | DECLARE_EXPORT(__movmem_i4_even); | 78 | DECLARE_EXPORT(__movmem_i4_even); |
79 | DECLARE_EXPORT(__movmem_i4_odd); | 79 | DECLARE_EXPORT(__movmem_i4_odd); |
80 | DECLARE_EXPORT(__movmemSI12_i4); | 80 | DECLARE_EXPORT(__movmemSI12_i4); |
81 | |||
82 | #if (__GNUC_MINOR__ == 2 || defined(__GNUC_STM_RELEASE__)) | ||
83 | /* | ||
84 | * GCC 4.2 emits these for division, as do GCC 4.1.x versions of the ST | ||
85 | * compiler which include backported patches. | ||
86 | */ | ||
87 | DECLARE_EXPORT(__sdivsi3_i4i); | ||
88 | DECLARE_EXPORT(__udiv_qrnnd_16); | ||
89 | DECLARE_EXPORT(__udivsi3_i4i); | ||
90 | #endif | ||
81 | #else /* GCC 3.x */ | 91 | #else /* GCC 3.x */ |
82 | DECLARE_EXPORT(__movstr_i4_even); | 92 | DECLARE_EXPORT(__movstr_i4_even); |
83 | DECLARE_EXPORT(__movstr_i4_odd); | 93 | DECLARE_EXPORT(__movstr_i4_odd); |