linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git] / drivers / oprofile / oprofile_files.c
index 3bb1e6f..a72006c 100644 (file)
@@ -5,21 +5,15 @@
  * @remark Read the file COPYING
  *
  * @author John Levon <levon@movementarian.org>
- *
- * Modified by Aravind Menon for Xen
- * These modifications are:
- * Copyright (C) 2005 Hewlett-Packard Co.      
  */
 
 #include <linux/fs.h>
 #include <linux/oprofile.h>
-#include <asm/uaccess.h>
-#include <linux/ctype.h>
 
 #include "event_buffer.h"
 #include "oprofile_stats.h"
 #include "oprof.h"
-
 unsigned long fs_buffer_size = 131072;
 unsigned long fs_cpu_buffer_size = 8192;
 unsigned long fs_buffer_watershed = 32768; /* FIXME: tune */
@@ -123,208 +117,11 @@ static ssize_t dump_write(struct file * file, char const __user * buf, size_t co
 static struct file_operations dump_fops = {
        .write          = dump_write,
 };
-
-#ifdef CONFIG_XEN
-
-#define TMPBUFSIZE 512
-
-static unsigned int adomains = 0;
-static int active_domains[MAX_OPROF_DOMAINS + 1];
-static DEFINE_MUTEX(adom_mutex);
-
-static ssize_t adomain_write(struct file * file, char const __user * buf, 
-                            size_t count, loff_t * offset)
-{
-       char *tmpbuf;
-       char *startp, *endp;
-       int i;
-       unsigned long val;
-       ssize_t retval = count;
-       
-       if (*offset)
-               return -EINVAL; 
-       if (count > TMPBUFSIZE - 1)
-               return -EINVAL;
-
-       if (!(tmpbuf = kmalloc(TMPBUFSIZE, GFP_KERNEL)))
-               return -ENOMEM;
-
-       if (copy_from_user(tmpbuf, buf, count)) {
-               kfree(tmpbuf);
-               return -EFAULT;
-       }
-       tmpbuf[count] = 0;
-
-       mutex_lock(&adom_mutex);
-
-       startp = tmpbuf;
-       /* Parse one more than MAX_OPROF_DOMAINS, for easy error checking */
-       for (i = 0; i <= MAX_OPROF_DOMAINS; i++) {
-               val = simple_strtoul(startp, &endp, 0);
-               if (endp == startp)
-                       break;
-               while (ispunct(*endp) || isspace(*endp))
-                       endp++;
-               active_domains[i] = val;
-               if (active_domains[i] != val)
-                       /* Overflow, force error below */
-                       i = MAX_OPROF_DOMAINS + 1;
-               startp = endp;
-       }
-       /* Force error on trailing junk */
-       adomains = *startp ? MAX_OPROF_DOMAINS + 1 : i;
-
-       kfree(tmpbuf);
-
-       if (adomains > MAX_OPROF_DOMAINS
-           || oprofile_set_active(active_domains, adomains)) {
-               adomains = 0;
-               retval = -EINVAL;
-       }
-
-       mutex_unlock(&adom_mutex);
-       return retval;
-}
-
-static ssize_t adomain_read(struct file * file, char __user * buf, 
-                           size_t count, loff_t * offset)
-{
-       char * tmpbuf;
-       size_t len;
-       int i;
-       ssize_t retval;
-
-       if (!(tmpbuf = kmalloc(TMPBUFSIZE, GFP_KERNEL)))
-               return -ENOMEM;
-
-       mutex_lock(&adom_mutex);
-
-       len = 0;
-       for (i = 0; i < adomains; i++)
-               len += snprintf(tmpbuf + len,
-                               len < TMPBUFSIZE ? TMPBUFSIZE - len : 0,
-                               "%u ", active_domains[i]);
-       WARN_ON(len > TMPBUFSIZE);
-       if (len != 0 && len <= TMPBUFSIZE)
-               tmpbuf[len-1] = '\n';
-
-       mutex_unlock(&adom_mutex);
-
-       retval = simple_read_from_buffer(buf, count, offset, tmpbuf, len);
-
-       kfree(tmpbuf);
-       return retval;
-}
-
-
-static struct file_operations active_domain_ops = {
-       .read           = adomain_read,
-       .write          = adomain_write,
-};
-
-static unsigned int pdomains = 0;
-static int passive_domains[MAX_OPROF_DOMAINS];
-static DEFINE_MUTEX(pdom_mutex);
-
-static ssize_t pdomain_write(struct file * file, char const __user * buf, 
-                            size_t count, loff_t * offset)
-{
-       char *tmpbuf;
-       char *startp, *endp;
-       int i;
-       unsigned long val;
-       ssize_t retval = count;
-       
-       if (*offset)
-               return -EINVAL; 
-       if (count > TMPBUFSIZE - 1)
-               return -EINVAL;
-
-       if (!(tmpbuf = kmalloc(TMPBUFSIZE, GFP_KERNEL)))
-               return -ENOMEM;
-
-       if (copy_from_user(tmpbuf, buf, count)) {
-               kfree(tmpbuf);
-               return -EFAULT;
-       }
-       tmpbuf[count] = 0;
-
-       mutex_lock(&pdom_mutex);
-
-       startp = tmpbuf;
-       /* Parse one more than MAX_OPROF_DOMAINS, for easy error checking */
-       for (i = 0; i <= MAX_OPROF_DOMAINS; i++) {
-               val = simple_strtoul(startp, &endp, 0);
-               if (endp == startp)
-                       break;
-               while (ispunct(*endp) || isspace(*endp))
-                       endp++;
-               passive_domains[i] = val;
-               if (passive_domains[i] != val)
-                       /* Overflow, force error below */
-                       i = MAX_OPROF_DOMAINS + 1;
-               startp = endp;
-       }
-       /* Force error on trailing junk */
-       pdomains = *startp ? MAX_OPROF_DOMAINS + 1 : i;
-
-       kfree(tmpbuf);
-
-       if (pdomains > MAX_OPROF_DOMAINS
-           || oprofile_set_passive(passive_domains, pdomains)) {
-               pdomains = 0;
-               retval = -EINVAL;
-       }
-
-       mutex_unlock(&pdom_mutex);
-       return retval;
-}
-
-static ssize_t pdomain_read(struct file * file, char __user * buf, 
-                           size_t count, loff_t * offset)
-{
-       char * tmpbuf;
-       size_t len;
-       int i;
-       ssize_t retval;
-
-       if (!(tmpbuf = kmalloc(TMPBUFSIZE, GFP_KERNEL)))
-               return -ENOMEM;
-
-       mutex_lock(&pdom_mutex);
-
-       len = 0;
-       for (i = 0; i < pdomains; i++)
-               len += snprintf(tmpbuf + len,
-                               len < TMPBUFSIZE ? TMPBUFSIZE - len : 0,
-                               "%u ", passive_domains[i]);
-       WARN_ON(len > TMPBUFSIZE);
-       if (len != 0 && len <= TMPBUFSIZE)
-               tmpbuf[len-1] = '\n';
-
-       mutex_unlock(&pdom_mutex);
-
-       retval = simple_read_from_buffer(buf, count, offset, tmpbuf, len);
-
-       kfree(tmpbuf);
-       return retval;
-}
-
-static struct file_operations passive_domain_ops = {
-       .read           = pdomain_read,
-       .write          = pdomain_write,
-};
-
-#endif /* CONFIG_XEN */
-
 void oprofile_create_files(struct super_block * sb, struct dentry * root)
 {
        oprofilefs_create_file(sb, root, "enable", &enable_fops);
        oprofilefs_create_file_perm(sb, root, "dump", &dump_fops, 0666);
-#ifdef CONFIG_XEN
-       oprofilefs_create_file(sb, root, "active_domains", &active_domain_ops);
-       oprofilefs_create_file(sb, root, "passive_domains", &passive_domain_ops);
-#endif
        oprofilefs_create_file(sb, root, "buffer", &event_buffer_fops);
        oprofilefs_create_ulong(sb, root, "buffer_size", &fs_buffer_size);
        oprofilefs_create_ulong(sb, root, "buffer_watershed", &fs_buffer_watershed);