diff options
| author | Will Deacon <will.deacon@arm.com> | 2014-05-28 18:29:23 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2014-05-28 18:29:23 +0100 |
| commit | 2eb8b396dc6ecf797925cc6bad4c0c6dfbdf4d44 (patch) | |
| tree | de062b67715e1eb0321032ad2a87f12cb664643b /fs/fuse/control.c | |
| parent | af885f4022622331f17227dfcfbb2dafdee25a43 (diff) | |
| parent | eed542d6962ba33a689b4007a389f466e407bd74 (diff) | |
Merge branch 'ftrace/arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into for-next/core
Core ftrace changes from Steve Rostedt, required by the arm64 support
code.
Diffstat (limited to 'fs/fuse/control.c')
| -rw-r--r-- | fs/fuse/control.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/control.c b/fs/fuse/control.c index a0b0855d00a9..205e0d5d5307 100644 --- a/fs/fuse/control.c +++ b/fs/fuse/control.c @@ -348,7 +348,7 @@ int __init fuse_ctl_init(void) return register_filesystem(&fuse_ctl_fs_type); } -void fuse_ctl_cleanup(void) +void __exit fuse_ctl_cleanup(void) { unregister_filesystem(&fuse_ctl_fs_type); } |