Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / fs / xfs / support / uuid.c

diff --git a/fs/xfs/support/uuid.c b/fs/xfs/support/uuid.c
index e157015c70ffcad4ed7ee0e989e4714fb55db526..493a6ecf8590c5e697bcf7fe116875ae14ce90e3 100644 (file)
--- a/fs/xfs/support/uuid.c
+++ b/fs/xfs/support/uuid.c
@@ -133,7 +133,7 @@ uuid_table_remove(uuid_t *uuid)
        mutex_unlock(&uuid_monitor);
 }
 
-void
+void __init
 uuid_init(void)
 {
        mutex_init(&uuid_monitor);