]> git.baikalelectronics.ru Git - kernel.git/commit
fix undefined reference to user_shm_unlock
authorHugh Dickins <hugh.dickins@tiscali.co.uk>
Sat, 12 Sep 2009 11:21:27 +0000 (12:21 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Sep 2009 00:45:31 +0000 (17:45 -0700)
commit42cd79beff08e6784fb25b62473c2d02be5ff2f2
tree3b74a195c2b69d8390c67c7cd46139df0bdd69ec
parentaf8ad8a9243ff728e5ca19a45d827cb75660ff99
fix undefined reference to user_shm_unlock

My 05422ad5e815ddef7cacd797e9fced297068930f "mm: fix hugetlb bug due to
user_shm_unlock call" broke the CONFIG_SYSVIPC !CONFIG_MMU build of both
2.6.31 and 2.6.30.6: "undefined reference to `user_shm_unlock'".

gcc didn't understand my comment! so couldn't figure out to optimize
away user_shm_unlock() from the error path in the hugetlb-less case, as
it does elsewhere.  Help it to do so, in a language it understands.

Reported-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
ipc/shm.c