Merge branch 'hugepage-fallbacks' (hugepatch patches from David Rientjes)

[linux.git] / drivers / acpi / sysfs.c

diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index fa76f5e41b5ca419978c804e8df8d8b2b714e329..75948a3f1a20e7dffe04958e6905305afd12df96 100644 (file)
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -327,9 +327,9 @@ static struct kobject *hotplug_kobj;
 
 struct acpi_table_attr {
        struct bin_attribute attr;
-       char name[ACPI_NAME_SIZE];
+       char name[ACPI_NAMESEG_SIZE];
        int instance;
-       char filename[ACPI_NAME_SIZE+ACPI_INST_SIZE];
+       char filename[ACPI_NAMESEG_SIZE+ACPI_INST_SIZE];
        struct list_head node;
 };
 
@@ -368,10 +368,10 @@ static int acpi_table_attr_init(struct kobject *tables_obj,
        char instance_str[ACPI_INST_SIZE];
 
        sysfs_attr_init(&table_attr->attr.attr);
-       ACPI_MOVE_NAME(table_attr->name, table_header->signature);
+       ACPI_COPY_NAMESEG(table_attr->name, table_header->signature);
 
        list_for_each_entry(attr, &acpi_table_attr_list, node) {
-               if (ACPI_COMPARE_NAME(table_attr->name, attr->name))
+               if (ACPI_COMPARE_NAMESEG(table_attr->name, attr->name))
                        if (table_attr->instance < attr->instance)
                                table_attr->instance = attr->instance;
        }
@@ -382,8 +382,8 @@ static int acpi_table_attr_init(struct kobject *tables_obj,
                return -ERANGE;
        }
 
-       ACPI_MOVE_NAME(table_attr->filename, table_header->signature);
-       table_attr->filename[ACPI_NAME_SIZE] = '\0';
+       ACPI_COPY_NAMESEG(table_attr->filename, table_header->signature);
+       table_attr->filename[ACPI_NAMESEG_SIZE] = '\0';
        if (table_attr->instance > 1 || (table_attr->instance == 1 &&
                                         !acpi_get_table
                                         (table_header->signature, 2, &header))) {
@@ -484,7 +484,7 @@ static int acpi_table_data_init(struct acpi_table_header *th)
        int i;
 
        for (i = 0; i < NUM_ACPI_DATA_OBJS; i++) {
-               if (ACPI_COMPARE_NAME(th->signature, acpi_data_objs[i].name)) {
+               if (ACPI_COMPARE_NAMESEG(th->signature, acpi_data_objs[i].name)) {
                        data_attr = kzalloc(sizeof(*data_attr), GFP_KERNEL);
                        if (!data_attr)
                                return -ENOMEM;