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.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
firmware
/
efivars.c
diff --git
a/drivers/firmware/efivars.c
b/drivers/firmware/efivars.c
index
ddaf82f
..
4f92849
100644
(file)
--- a/
drivers/firmware/efivars.c
+++ b/
drivers/firmware/efivars.c
@@
-23,6
+23,10
@@
*
* Changelog:
*
*
* Changelog:
*
+ * 17 May 2004 - Matt Domsch <Matt_Domsch@dell.com>
+ * remove check for efi_enabled in exit
+ * add MODULE_VERSION
+ *
* 26 Apr 2004 - Matt Domsch <Matt_Domsch@dell.com>
* minor bug fixes
*
* 26 Apr 2004 - Matt Domsch <Matt_Domsch@dell.com>
* minor bug fixes
*
@@
-77,11
+81,13
@@
#include <asm/uaccess.h>
#include <asm/uaccess.h>
+#define EFIVARS_VERSION "0.08"
+#define EFIVARS_DATE "2004-May-17"
+
MODULE_AUTHOR("Matt Domsch <Matt_Domsch@Dell.com>");
MODULE_DESCRIPTION("sysfs interface to EFI Variables");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Matt Domsch <Matt_Domsch@Dell.com>");
MODULE_DESCRIPTION("sysfs interface to EFI Variables");
MODULE_LICENSE("GPL");
-
-#define EFIVARS_VERSION "0.07 2004-Apr-26"
+MODULE_VERSION(EFIVARS_VERSION);
/*
* efivars_lock protects two things:
/*
* efivars_lock protects two things:
@@
-128,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, \
};
@@
-664,7
+670,11
@@
efivars_init(void)
unsigned long variable_name_size = 1024;
int i, rc = 0, error = 0;
unsigned long variable_name_size = 1024;
int i, rc = 0, error = 0;
- printk(KERN_INFO "EFI Variables Facility v%s\n", EFIVARS_VERSION);
+ if (!efi_enabled)
+ return -ENODEV;
+
+ printk(KERN_INFO "EFI Variables Facility v%s %s\n", EFIVARS_VERSION,
+ EFIVARS_DATE);
/*
* For now we'll register the efi subsys within this driver
/*
* For now we'll register the efi subsys within this driver