const: constify remaining file_operations

[safe/jmp/linux-2.6] / drivers / misc / sgi-gru / grufile.c

diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c
index bfc88d1..41c8fe2 100644 (file)
--- a/drivers/misc/sgi-gru/grufile.c
+++ b/drivers/misc/sgi-gru/grufile.c
@@ -29,7 +29,6 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/io.h>
-#include <linux/smp_lock.h>
 #include <linux/spinlock.h>
 #include <linux/device.h>
 #include <linux/miscdevice.h>
@@ -54,7 +53,6 @@ struct gru_stats_s gru_stats;
 /* Guaranteed user available resources on each node */
 static int max_user_cbrs, max_user_dsr_bytes;
 
-static struct file_operations gru_fops;
 static struct miscdevice gru_miscdev;
 
 
@@ -183,41 +181,6 @@ static long gru_get_config_info(unsigned long arg)
 }
 
 /*
- * Get GRU chiplet status
- */
-static long gru_get_chiplet_status(unsigned long arg)
-{
-       struct gru_state *gru;
-       struct gru_chiplet_info info;
-
-       if (copy_from_user(&info, (void __user *)arg, sizeof(info)))
-               return -EFAULT;
-
-       if (info.node == -1)
-               info.node = numa_node_id();
-       if (info.node >= num_possible_nodes() ||
-                       info.chiplet >= GRU_CHIPLETS_PER_HUB ||
-                       info.node < 0 || info.chiplet < 0)
-               return -EINVAL;
-
-       info.blade = uv_node_to_blade_id(info.node);
-       gru = get_gru(info.blade, info.chiplet);
-
-       info.total_dsr_bytes = GRU_NUM_DSR_BYTES;
-       info.total_cbr = GRU_NUM_CB;
-       info.total_user_dsr_bytes = GRU_NUM_DSR_BYTES -
-               gru->gs_reserved_dsr_bytes;
-       info.total_user_cbr = GRU_NUM_CB - gru->gs_reserved_cbrs;
-       info.free_user_dsr_bytes = hweight64(gru->gs_dsr_map) *
-                       GRU_DSR_AU_BYTES;
-       info.free_user_cbr = hweight64(gru->gs_cbr_map) * GRU_CBR_AU_SIZE;
-
-       if (copy_to_user((void __user *)arg, &info, sizeof(info)))
-               return -EFAULT;
-       return 0;
-}
-
-/*
  * gru_file_unlocked_ioctl
  *
  * Called to update file attributes via IOCTL calls.
@@ -233,8 +196,8 @@ static long gru_file_unlocked_ioctl(struct file *file, unsigned int req,
        case GRU_CREATE_CONTEXT:
                err = gru_create_new_context(arg);
                break;
-       case GRU_SET_TASK_SLICE:
-               err = gru_set_task_slice(arg);
+       case GRU_SET_CONTEXT_OPTION:
+               err = gru_set_context_option(arg);
                break;
        case GRU_USER_GET_EXCEPTION_DETAIL:
                err = gru_get_exception_detail(arg);
@@ -242,15 +205,15 @@ static long gru_file_unlocked_ioctl(struct file *file, unsigned int req,
        case GRU_USER_UNLOAD_CONTEXT:
                err = gru_user_unload_context(arg);
                break;
-       case GRU_GET_CHIPLET_STATUS:
-               err = gru_get_chiplet_status(arg);
-               break;
        case GRU_USER_FLUSH_TLB:
                err = gru_user_flush_tlb(arg);
                break;
        case GRU_USER_CALL_OS:
                err = gru_handle_user_call_os(arg);
                break;
+       case GRU_GET_GSEG_STATISTICS:
+               err = gru_get_gseg_statistics(arg);
+               break;
        case GRU_KTEST:
                err = gru_ktest(arg);
                break;
@@ -287,7 +250,6 @@ static void gru_init_chiplet(struct gru_state *gru, unsigned long paddr,
        gru_dbg(grudev, "bid %d, nid %d, gid %d, vaddr %p (0x%lx)\n",
                bid, nid, gru->gs_gid, gru->gs_gru_base_vaddr,
                gru->gs_gru_base_paddr);
-       gru_kservices_init(gru);
 }
 
 static int gru_init_tables(unsigned long gru_base_paddr, void *gru_base_vaddr)
@@ -314,6 +276,7 @@ static int gru_init_tables(unsigned long gru_base_paddr, void *gru_base_vaddr)
                memset(gru_base[bid], 0, sizeof(struct gru_blade_state));
                gru_base[bid]->bs_lru_gru = &gru_base[bid]->bs_grus[0];
                spin_lock_init(&gru_base[bid]->bs_lock);
+               init_rwsem(&gru_base[bid]->bs_kgts_sema);
 
                dsrbytes = 0;
                cbrs = 0;
@@ -426,6 +389,7 @@ static int __init gru_init(void)
                printk(KERN_ERR "%s: init tables failed\n", GRU_DRIVER_ID_STR);
                goto exit3;
        }
+       gru_kservices_init();
 
        printk(KERN_INFO "%s: v%s\n", GRU_DRIVER_ID_STR,
               GRU_DRIVER_VERSION_STR);
@@ -444,7 +408,7 @@ exit1:
 
 static void __exit gru_exit(void)
 {
-       int i, bid, gid;
+       int i, bid;
        int order = get_order(sizeof(struct gru_state) *
                              GRU_CHIPLETS_PER_BLADE);
 
@@ -453,10 +417,7 @@ static void __exit gru_exit(void)
 
        for (i = 0; i < GRU_CHIPLETS_PER_BLADE; i++)
                free_irq(IRQ_GRU + i, NULL);
-
-       foreach_gid(gid)
-               gru_kservices_exit(GID_TO_GRU(gid));
-
+       gru_kservices_exit();
        for (bid = 0; bid < GRU_MAX_BLADES; bid++)
                free_pages((unsigned long)gru_base[bid], order);
 
@@ -464,7 +425,7 @@ static void __exit gru_exit(void)
        gru_proc_exit();
 }
 
-static struct file_operations gru_fops = {
+static const struct file_operations gru_fops = {
        .owner          = THIS_MODULE,
        .unlocked_ioctl = gru_file_unlocked_ioctl,
        .mmap           = gru_file_mmap,
@@ -476,7 +437,7 @@ static struct miscdevice gru_miscdev = {
        .fops           = &gru_fops,
 };
 
-struct vm_operations_struct gru_vm_ops = {
+const struct vm_operations_struct gru_vm_ops = {
        .close          = gru_vma_close,
        .fault          = gru_fault,
 };