diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-03-21 06:03:10 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-03-21 06:03:10 -0400 |
| commit | 3bf2391729822e591dcfbbd1e9dd2f450968cdcb (patch) | |
| tree | 80a0499e57a4cc95b6caea559400b5226ebe606f /drivers/oprofile | |
| parent | 86e213e1d901fbeaf6e57d13c5edd925fadddcbe (diff) | |
| parent | fd4a5aef002bb57e8a35ed34d8a878034b9bde94 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge in all pending fixes, before pulling the latest development
bits from Arnaldo - which will involve merge conflicts.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/oprofile')
| -rw-r--r-- | drivers/oprofile/oprofilefs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c index 445ffda715ad..7c12d9c2b230 100644 --- a/drivers/oprofile/oprofilefs.c +++ b/drivers/oprofile/oprofilefs.c | |||
| @@ -276,6 +276,7 @@ static struct file_system_type oprofilefs_type = { | |||
| 276 | .mount = oprofilefs_mount, | 276 | .mount = oprofilefs_mount, |
| 277 | .kill_sb = kill_litter_super, | 277 | .kill_sb = kill_litter_super, |
| 278 | }; | 278 | }; |
| 279 | MODULE_ALIAS_FS("oprofilefs"); | ||
| 279 | 280 | ||
| 280 | 281 | ||
| 281 | int __init oprofilefs_register(void) | 282 | int __init oprofilefs_register(void) |