git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
firmware
/
efivars.c
diff --git
a/drivers/firmware/efivars.c
b/drivers/firmware/efivars.c
index
429070c
..
9dc51ff
100644
(file)
--- a/
drivers/firmware/efivars.c
+++ b/
drivers/firmware/efivars.c
@@
-97,7
+97,7
@@
MODULE_VERSION(EFIVARS_VERSION);
* efi.get_next_variable() is only called from efivars_init(),
* which is protected by the BKL, so that path is safe.
*/
* efi.get_next_variable() is only called from efivars_init(),
* which is protected by the BKL, so that path is safe.
*/
-static
spinlock_t efivars_lock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(efivars_lock)
;
static LIST_HEAD(efivar_list);
/*
static LIST_HEAD(efivar_list);
/*
@@
-134,7
+134,7
@@
struct efivar_attribute {
#define EFI_ATTR(_name, _mode, _show, _store) \
struct subsys_attribute efi_attr_##_name = { \
#define EFI_ATTR(_name, _mode, _show, _store) \
struct subsys_attribute efi_attr_##_name = { \
- .attr {.name = __stringify(_name), .mode = _mode, .owner = THIS_MODULE}, \
+ .attr
=
{.name = __stringify(_name), .mode = _mode, .owner = THIS_MODULE}, \
.show = _show, \
.store = _store, \
};
.show = _show, \
.store = _store, \
};
@@
-640,7
+640,7
@@
efivar_create_sysfs_entry(unsigned long variable_name_size,
*(short_name + strlen(short_name)) = '-';
efi_guid_unparse(vendor_guid, short_name + strlen(short_name));
*(short_name + strlen(short_name)) = '-';
efi_guid_unparse(vendor_guid, short_name + strlen(short_name));
- kobject_set_name(&new_efivar->kobj, short_name);
+ kobject_set_name(&new_efivar->kobj,
"%s",
short_name);
kobj_set_kset_s(new_efivar, vars_subsys);
kobject_register(&new_efivar->kobj);
kobj_set_kset_s(new_efivar, vars_subsys);
kobject_register(&new_efivar->kobj);