drm: radeon: Mark several functions static in mkregtable

[safe/jmp/linux-2.6] / drivers / acpi / system.c

diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c
index 3b88981..d112829 100644 (file)
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
@@ -31,17 +31,16 @@
 
 #include <acpi/acpi_drivers.h>
 
+#define PREFIX "ACPI: "
+
 #define _COMPONENT             ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME("system");
-#ifdef MODULE_PARAM_PREFIX
-#undef MODULE_PARAM_PREFIX
-#endif
-#define MODULE_PARAM_PREFIX "acpi."
 
 #define ACPI_SYSTEM_CLASS              "system"
 #define ACPI_SYSTEM_DEVICE_NAME                "System"
 
 u32 acpi_irq_handled;
+u32 acpi_irq_not_handled;
 
 /*
  * Make ACPICA version work as module param
@@ -62,6 +61,7 @@ module_param_call(acpica_version, NULL, param_get_acpica_version, NULL, 0444);
    -------------------------------------------------------------------------- */
 static LIST_HEAD(acpi_table_attr_list);
 static struct kobject *tables_kobj;
+static struct kobject *dynamic_tables_kobj;
 
 struct acpi_table_attr {
        struct bin_attribute attr;
@@ -123,11 +123,45 @@ static void acpi_table_attr_init(struct acpi_table_attr *table_attr,
        table_attr->attr.size = 0;
        table_attr->attr.read = acpi_table_show;
        table_attr->attr.attr.name = table_attr->name;
-       table_attr->attr.attr.mode = 0444;
+       table_attr->attr.attr.mode = 0400;
 
        return;
 }
 
+static acpi_status
+acpi_sysfs_table_handler(u32 event, void *table, void *context)
+{
+       struct acpi_table_attr *table_attr;
+
+       switch (event) {
+       case ACPI_TABLE_EVENT_LOAD:
+               table_attr =
+                       kzalloc(sizeof(struct acpi_table_attr), GFP_KERNEL);
+               if (!table_attr)
+                       return AE_NO_MEMORY;
+
+               acpi_table_attr_init(table_attr, table);
+               if (sysfs_create_bin_file(dynamic_tables_kobj,
+                                       &table_attr->attr)) {
+                       kfree(table_attr);
+                       return AE_ERROR;
+               } else
+                       list_add_tail(&table_attr->node,
+                                       &acpi_table_attr_list);
+               break;
+       case ACPI_TABLE_EVENT_UNLOAD:
+               /*
+                * we do not need to do anything right now
+                * because the table is not deleted from the
+                * global table list when unloading it.
+                */
+               break;
+       default:
+               return AE_BAD_PARAMETER;
+       }
+       return AE_OK;
+}
+
 static int acpi_system_sysfs_init(void)
 {
        struct acpi_table_attr *table_attr;
@@ -137,7 +171,11 @@ static int acpi_system_sysfs_init(void)
 
        tables_kobj = kobject_create_and_add("tables", acpi_kobj);
        if (!tables_kobj)
-               return -ENOMEM;
+               goto err;
+
+       dynamic_tables_kobj = kobject_create_and_add("dynamic", tables_kobj);
+       if (!dynamic_tables_kobj)
+               goto err_dynamic_tables;
 
        do {
                result = acpi_get_table_by_index(table_index, &table_header);
@@ -162,8 +200,14 @@ static int acpi_system_sysfs_init(void)
                }
        } while (!result);
        kobject_uevent(tables_kobj, KOBJ_ADD);
-
-       return 0;
+       kobject_uevent(dynamic_tables_kobj, KOBJ_ADD);
+       result = acpi_install_table_handler(acpi_sysfs_table_handler, NULL);
+
+       return result == AE_OK ? 0 : -EINVAL;
+err_dynamic_tables:
+       kobject_put(tables_kobj);
+err:
+       return -ENOMEM;
 }
 
 /*
@@ -173,8 +217,9 @@ static int acpi_system_sysfs_init(void)
 
 #define COUNT_GPE 0
 #define COUNT_SCI 1    /* acpi_irq_handled */
-#define COUNT_ERROR 2  /* other */
-#define NUM_COUNTERS_EXTRA 3
+#define COUNT_SCI_NOT 2        /* acpi_irq_not_handled */
+#define COUNT_ERROR 3  /* other */
+#define NUM_COUNTERS_EXTRA 4
 
 struct event_counter {
        u32 count;
@@ -276,6 +321,8 @@ static ssize_t counter_show(struct kobject *kobj,
 
        all_counters[num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_SCI].count =
                acpi_irq_handled;
+       all_counters[num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_SCI_NOT].count =
+               acpi_irq_not_handled;
        all_counters[num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_GPE].count =
                acpi_gpe_count;
 
@@ -322,6 +369,7 @@ static ssize_t counter_set(struct kobject *kobj,
                        all_counters[i].count = 0;
                acpi_gpe_count = 0;
                acpi_irq_handled = 0;
+               acpi_irq_not_handled = 0;
                goto end;
        }
 
@@ -415,6 +463,8 @@ void acpi_irq_stats_init(void)
                        sprintf(buffer, "gpe_all");
                else if (i == num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_SCI)
                        sprintf(buffer, "sci");
+               else if (i == num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_SCI_NOT)
+                       sprintf(buffer, "sci_not");
                else if (i == num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_ERROR)
                        sprintf(buffer, "error");
                else