]> git.proxmox.com Git - mirror_ubuntu-kernels.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)
commit2195d2818c37bdf263865f1e9effccdd9fc5f9d4
tree3b74a195c2b69d8390c67c7cd46139df0bdd69ec
parent69def9f05dfce3281bb06599057e6b8097385d39
fix undefined reference to user_shm_unlock

My 353d5c30c666580347515da609dd74a2b8e9b828 "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