]>
Commit | Line | Data |
---|---|---|
2cb7cef9 BS |
1 | From: Tony Jones <tonyj@suse.de> |
2 | Subject: remove perfmon syscall_base attribyute | |
3 | Patch-mainline: never | |
4 | ||
5 | Syscalls were removed, delete the old sysfs attribute that reported the | |
6 | syscall base. | |
7 | ||
8 | Signed-off-by: Tony Jones <tonyj@suse.de> | |
9 | ||
10 | --- | |
11 | --- linux-2.6.27.orig/arch/ia64/include/asm/perfmon_kern.h | |
12 | +++ linux-2.6.27/arch/ia64/include/asm/perfmon_kern.h | |
13 | @@ -333,11 +333,6 @@ static inline void pfm_release_dbregs(st | |
14 | ||
15 | #define pfm_use_dbregs(_t) __pfm_use_dbregs(_t) | |
16 | ||
17 | -static inline int pfm_arch_get_base_syscall(void) | |
18 | -{ | |
19 | - return __NR_pfm_create_context; | |
20 | -} | |
21 | - | |
22 | struct pfm_arch_pmu_info { | |
23 | unsigned long mask_pmcs[PFM_PMC_BV]; /* modify on when masking */ | |
24 | }; | |
25 | --- linux-2.6.27.orig/arch/powerpc/include/asm/perfmon_kern.h | |
26 | +++ linux-2.6.27/arch/powerpc/include/asm/perfmon_kern.h | |
27 | @@ -359,11 +359,6 @@ static inline void pfm_arch_arm_handle_w | |
28 | static inline void pfm_arch_disarm_handle_work(struct task_struct *task) | |
29 | {} | |
30 | ||
31 | -static inline int pfm_arch_get_base_syscall(void) | |
32 | -{ | |
33 | - return __NR_pfm_create_context; | |
34 | -} | |
35 | - | |
36 | struct pfm_arch_context { | |
37 | /* Cell: Most recent value of the pm_status | |
38 | * register read by the interrupt handler. | |
39 | --- linux-2.6.27.orig/arch/sparc/include/asm/perfmon_kern.h | |
40 | +++ linux-2.6.27/arch/sparc/include/asm/perfmon_kern.h | |
41 | @@ -260,11 +260,6 @@ static inline int pfm_arch_pmu_config_in | |
42 | return 0; | |
43 | } | |
44 | ||
45 | -static inline int pfm_arch_get_base_syscall(void) | |
46 | -{ | |
47 | - return __NR_pfm_create_context; | |
48 | -} | |
49 | - | |
50 | struct pfm_arch_context { | |
51 | /* empty */ | |
52 | }; | |
53 | --- linux-2.6.27.orig/include/asm-x86/perfmon_kern.h | |
54 | +++ linux-2.6.27/include/asm-x86/perfmon_kern.h | |
55 | @@ -525,16 +525,6 @@ static inline void pfm_arch_arm_handle_w | |
56 | static inline void pfm_arch_disarm_handle_work(struct task_struct *task) | |
57 | {} | |
58 | ||
59 | -static inline int pfm_arch_get_base_syscall(void) | |
60 | -{ | |
61 | -#ifdef __x86_64__ | |
62 | - /* 32-bit syscall definition coming from ia32_unistd.h */ | |
63 | - if (test_thread_flag(TIF_IA32)) | |
64 | - return __NR_ia32_pfm_create_context; | |
65 | -#endif | |
66 | - return __NR_pfm_create_context; | |
67 | -} | |
68 | - | |
69 | #define PFM_ARCH_CTX_SIZE (sizeof(struct pfm_arch_context)) | |
70 | /* | |
71 | * x86 does not need extra alignment requirements for the sampling buffer | |
72 | --- linux-2.6.27.orig/perfmon/perfmon_sysfs.c | |
73 | +++ linux-2.6.27/perfmon/perfmon_sysfs.c | |
74 | @@ -96,8 +96,6 @@ static struct kobj_type pfm_fmt_ktype = | |
75 | ||
76 | static ssize_t pfm_controls_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) | |
77 | { | |
78 | - int base; | |
79 | - | |
80 | if (is_attr_name(attr, "version")) | |
81 | return snprintf(buf, PAGE_SIZE, "%u.%u\n", PFM_VERSION_MAJ, PFM_VERSION_MIN); | |
82 | ||
83 | @@ -115,12 +113,6 @@ static ssize_t pfm_controls_show(struct | |
84 | ||
85 | if (is_attr_name(attr, "arg_mem_max")) | |
86 | return snprintf(buf, PAGE_SIZE, "%zu\n", pfm_controls.arg_mem_max); | |
87 | - | |
88 | - if (is_attr_name(attr, "syscall")) { | |
89 | - base = pfm_arch_get_base_syscall(); | |
90 | - return snprintf(buf, PAGE_SIZE, "%d\n", base); | |
91 | - } | |
92 | - | |
93 | if (is_attr_name(attr, "sys_sessions_count")) | |
94 | return pfm_sysfs_res_show(buf, PAGE_SIZE, 1); | |
95 | ||
96 | @@ -192,7 +184,6 @@ skip: | |
97 | */ | |
98 | static PFM_RO_ATTR(version, pfm_controls_show); | |
99 | static PFM_RO_ATTR(task_sessions_count, pfm_controls_show); | |
100 | -static PFM_RO_ATTR(syscall, pfm_controls_show); | |
101 | static PFM_RO_ATTR(sys_sessions_count, pfm_controls_show); | |
102 | static PFM_RO_ATTR(smpl_buffer_mem_cur, pfm_controls_show); | |
103 | ||
104 | @@ -206,7 +199,6 @@ static PFM_RW_ATTR(reset_stats, pfm_cont | |
105 | ||
106 | static struct attribute *pfm_kernel_attrs[] = { | |
107 | &attr_version.attr, | |
108 | - &attr_syscall.attr, | |
109 | &attr_task_sessions_count.attr, | |
110 | &attr_sys_sessions_count.attr, | |
111 | &attr_smpl_buffer_mem_cur.attr, |