summaryrefslogtreecommitdiffstats
path: root/fs/udf
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-04-28 17:38:49 +0200
committerJan Kara <jack@suse.cz>2008-04-28 18:44:26 +0200
commit22ba0317c81ba263172baaefd2cb38de78c4598f (patch)
treef65a6bc29a50d705d89f669e0662202cd3b6b72b /fs/udf
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 (diff)
downloadlinux-22ba0317c81ba263172baaefd2cb38de78c4598f.tar.xz
linux-22ba0317c81ba263172baaefd2cb38de78c4598f.zip
udf: fs/udf/partition.c:udf_get_pblock() mustn't be inline
This patch fixes the following build error with UML and gcc 4.3: <-- snip --> ... CC fs/udf/partition.o /home/bunk/linux/kernel-2.6/git/linux-2.6/fs/udf/partition.c: In function ‘udf_get_pblock_virt15’: /home/bunk/linux/kernel-2.6/git/linux-2.6/fs/udf/partition.c:32: sorry, unimplemented: inlining failed in call to ‘udf_get_pblock’: function body not available /home/bunk/linux/kernel-2.6/git/linux-2.6/fs/udf/partition.c:102: sorry, unimplemented: called from here make[3]: *** [fs/udf/partition.o] Error 1 <-- snip --> Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf')
-rw-r--r--fs/udf/partition.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/udf/partition.c b/fs/udf/partition.c
index 63610f026ae1..96dfd207c3d6 100644
--- a/fs/udf/partition.c
+++ b/fs/udf/partition.c
@@ -27,8 +27,8 @@
#include <linux/slab.h>
#include <linux/buffer_head.h>
-inline uint32_t udf_get_pblock(struct super_block *sb, uint32_t block,
- uint16_t partition, uint32_t offset)
+uint32_t udf_get_pblock(struct super_block *sb, uint32_t block,
+ uint16_t partition, uint32_t offset)
{
struct udf_sb_info *sbi = UDF_SB(sb);
struct udf_part_map *map;