diff options
| author | Linus Torvalds | 2013-06-20 08:07:42 -1000 |
|---|---|---|
| committer | Linus Torvalds | 2013-06-20 08:07:42 -1000 |
| commit | f92d0dc95d137c0abe7d1478d6e7d2cf4ca5fce8 (patch) | |
| tree | 4229aa4d6a69ecb7b7b6798ad836bb1250bd695a /arch | |
| parent | fd58b517e593ed4f54d8c8b47613928c2066c046 (diff) | |
| parent | 3cb3f839d306443f3d1e79b0bde1a2ad2c12b555 (diff) | |
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull tilepro fix from Chris Metcalf:
"This change allows the older tilepro architecture to be correctly
built by newer gccs, despite a change that caused gcc to start trying
to use an out-of-line implementation for __builtin_ffsll().
This should be inline again starting with gcc 4.7.4 and 4.8.2 or so,
but meanwhile this change keeps things from breaking, with the only
cost being a few bytes of code in the kernel to provide __ffsdi2 even
for compilers that do inline it"
* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
tilepro: work around module link error with gcc 4.7
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/tile/lib/exports.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/tile/lib/exports.c b/arch/tile/lib/exports.c index 4385cb6fa00a..a93b02a25222 100644 --- a/arch/tile/lib/exports.c +++ b/arch/tile/lib/exports.c @@ -84,4 +84,6 @@ uint64_t __ashrdi3(uint64_t, unsigned int); EXPORT_SYMBOL(__ashrdi3); uint64_t __ashldi3(uint64_t, unsigned int); EXPORT_SYMBOL(__ashldi3); +int __ffsdi2(uint64_t); +EXPORT_SYMBOL(__ffsdi2); #endif |