diff options
Diffstat (limited to 'arch/ia64/kernel/perfmon.c')
-rw-r--r-- | arch/ia64/kernel/perfmon.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index 077f21216b65..6d7bc8ff7b3a 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c | |||
@@ -532,7 +532,6 @@ static ctl_table pfm_sysctl_root[] = { | |||
532 | static struct ctl_table_header *pfm_sysctl_header; | 532 | static struct ctl_table_header *pfm_sysctl_header; |
533 | 533 | ||
534 | static int pfm_context_unload(pfm_context_t *ctx, void *arg, int count, struct pt_regs *regs); | 534 | static int pfm_context_unload(pfm_context_t *ctx, void *arg, int count, struct pt_regs *regs); |
535 | static int pfm_flush(struct file *filp); | ||
536 | 535 | ||
537 | #define pfm_get_cpu_var(v) __ia64_per_cpu_var(v) | 536 | #define pfm_get_cpu_var(v) __ia64_per_cpu_var(v) |
538 | #define pfm_get_cpu_data(a,b) per_cpu(a, b) | 537 | #define pfm_get_cpu_data(a,b) per_cpu(a, b) |
@@ -595,10 +594,11 @@ pfm_get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, | |||
595 | } | 594 | } |
596 | 595 | ||
597 | 596 | ||
598 | static struct super_block * | 597 | static int |
599 | pfmfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) | 598 | pfmfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, |
599 | struct vfsmount *mnt) | ||
600 | { | 600 | { |
601 | return get_sb_pseudo(fs_type, "pfm:", NULL, PFMFS_MAGIC); | 601 | return get_sb_pseudo(fs_type, "pfm:", NULL, PFMFS_MAGIC, mnt); |
602 | } | 602 | } |
603 | 603 | ||
604 | static struct file_system_type pfm_fs_type = { | 604 | static struct file_system_type pfm_fs_type = { |
@@ -1773,7 +1773,7 @@ pfm_syswide_cleanup_other_cpu(pfm_context_t *ctx) | |||
1773 | * When caller is self-monitoring, the context is unloaded. | 1773 | * When caller is self-monitoring, the context is unloaded. |
1774 | */ | 1774 | */ |
1775 | static int | 1775 | static int |
1776 | pfm_flush(struct file *filp) | 1776 | pfm_flush(struct file *filp, fl_owner_t id) |
1777 | { | 1777 | { |
1778 | pfm_context_t *ctx; | 1778 | pfm_context_t *ctx; |
1779 | struct task_struct *task; | 1779 | struct task_struct *task; |