Updated xen patches taken from suse.

[people/teissler/ipfire-2.x.git] / src / patches / suse-2.6.27.25 / patches.suse / perfmon2-remove_get_base_syscall_attr.patch

From: Tony Jones <tonyj@suse.de>
Subject: remove perfmon syscall_base attribyute
Patch-mainline: never

Syscalls were removed, delete the old sysfs attribute that reported the 
syscall base.

Signed-off-by: Tony Jones <tonyj@suse.de>

---
--- linux-2.6.27.orig/arch/ia64/include/asm/perfmon_kern.h
+++ linux-2.6.27/arch/ia64/include/asm/perfmon_kern.h
@@ -333,11 +333,6 @@ static inline void pfm_release_dbregs(st
 
 #define pfm_use_dbregs(_t)     __pfm_use_dbregs(_t)
 
-static inline int pfm_arch_get_base_syscall(void)
-{
-	return __NR_pfm_create_context;
-}
-
 struct pfm_arch_pmu_info {
 	unsigned long mask_pmcs[PFM_PMC_BV]; /* modify on when masking */
 };
--- linux-2.6.27.orig/arch/powerpc/include/asm/perfmon_kern.h
+++ linux-2.6.27/arch/powerpc/include/asm/perfmon_kern.h
@@ -359,11 +359,6 @@ static inline void pfm_arch_arm_handle_w
 static inline void pfm_arch_disarm_handle_work(struct task_struct *task)
 {}
 
-static inline int pfm_arch_get_base_syscall(void)
-{
-	return __NR_pfm_create_context;
-}
-
 struct pfm_arch_context {
 	/* Cell: Most recent value of the pm_status
 	 * register read by the interrupt handler.
--- linux-2.6.27.orig/arch/sparc/include/asm/perfmon_kern.h
+++ linux-2.6.27/arch/sparc/include/asm/perfmon_kern.h
@@ -260,11 +260,6 @@ static inline int pfm_arch_pmu_config_in
 	return 0;
 }
 
-static inline int pfm_arch_get_base_syscall(void)
-{
-	return __NR_pfm_create_context;
-}
-
 struct pfm_arch_context {
 	/* empty */
 };
--- linux-2.6.27.orig/include/asm-x86/perfmon_kern.h
+++ linux-2.6.27/include/asm-x86/perfmon_kern.h
@@ -525,16 +525,6 @@ static inline void pfm_arch_arm_handle_w
 static inline void pfm_arch_disarm_handle_work(struct task_struct *task)
 {}
 
-static inline int pfm_arch_get_base_syscall(void)
-{
-#ifdef __x86_64__
-	/* 32-bit syscall definition coming from ia32_unistd.h */
-	if (test_thread_flag(TIF_IA32))
-		return __NR_ia32_pfm_create_context;
-#endif
-	return __NR_pfm_create_context;
-}
-
 #define PFM_ARCH_CTX_SIZE	(sizeof(struct pfm_arch_context))
 /*
  * x86 does not need extra alignment requirements for the sampling buffer
--- linux-2.6.27.orig/perfmon/perfmon_sysfs.c
+++ linux-2.6.27/perfmon/perfmon_sysfs.c
@@ -96,8 +96,6 @@ static struct kobj_type pfm_fmt_ktype = 
 
 static ssize_t pfm_controls_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
 {
-	int base;
-
 	if (is_attr_name(attr, "version"))
 		return snprintf(buf, PAGE_SIZE, "%u.%u\n",  PFM_VERSION_MAJ, PFM_VERSION_MIN);
 
@@ -115,12 +113,6 @@ static ssize_t pfm_controls_show(struct
 
 	if (is_attr_name(attr, "arg_mem_max"))
 		return snprintf(buf, PAGE_SIZE, "%zu\n", pfm_controls.arg_mem_max);
-
-	if (is_attr_name(attr, "syscall")) {
-		base = pfm_arch_get_base_syscall();
-		return snprintf(buf, PAGE_SIZE, "%d\n",  base);
-	}
-
 	if (is_attr_name(attr, "sys_sessions_count"))
 		return pfm_sysfs_res_show(buf, PAGE_SIZE, 1);
 
@@ -192,7 +184,6 @@ skip:
  */
 static PFM_RO_ATTR(version, pfm_controls_show);
 static PFM_RO_ATTR(task_sessions_count, pfm_controls_show);
-static PFM_RO_ATTR(syscall, pfm_controls_show);
 static PFM_RO_ATTR(sys_sessions_count, pfm_controls_show);
 static PFM_RO_ATTR(smpl_buffer_mem_cur, pfm_controls_show);
 
@@ -206,7 +199,6 @@ static PFM_RW_ATTR(reset_stats, pfm_cont
 
 static struct attribute *pfm_kernel_attrs[] = {
 	&attr_version.attr,
-	&attr_syscall.attr,
 	&attr_task_sessions_count.attr,
 	&attr_sys_sessions_count.attr,
 	&attr_smpl_buffer_mem_cur.attr,