patch-2.4.23 linux-2.4.23/arch/ia64/kernel/efivars.c
Next file: linux-2.4.23/arch/ia64/kernel/entry.S
Previous file: linux-2.4.23/arch/ia64/kernel/efi_stub.S
Back to the patch index
Back to the overall index
- Lines: 56
- Date:
2003-11-28 10:26:19.000000000 -0800
- Orig file:
linux-2.4.22/arch/ia64/kernel/efivars.c
- Orig date:
2003-08-25 04:44:39.000000000 -0700
diff -urN linux-2.4.22/arch/ia64/kernel/efivars.c linux-2.4.23/arch/ia64/kernel/efivars.c
@@ -119,7 +119,7 @@
*/
static spinlock_t efivars_lock = SPIN_LOCK_UNLOCKED;
static LIST_HEAD(efivar_list);
-static struct proc_dir_entry *efi_vars_dir = NULL;
+static struct proc_dir_entry *efi_vars_dir;
#define efivar_entry(n) list_entry(n, efivar_entry_t, list)
@@ -138,8 +138,7 @@
static inline unsigned long
utf8_strsize(efi_char16_t *data, unsigned long maxlength)
{
- return utf8_strlen(data, maxlength/sizeof(efi_char16_t)) *
- sizeof(efi_char16_t);
+ return utf8_strlen(data, maxlength/sizeof(efi_char16_t)) * sizeof(efi_char16_t);
}
@@ -169,8 +168,7 @@
efi_char16_t *variable_name,
efi_guid_t *vendor_guid)
{
- int i, short_name_size = variable_name_size /
- sizeof(efi_char16_t) + 38;
+ int i, short_name_size = variable_name_size / sizeof(efi_char16_t) + 38;
char *short_name;
efivar_entry_t *new_efivar;
@@ -191,7 +189,7 @@
/* Convert Unicode to normal chars (assume top bits are 0),
ala UTF-8 */
- for (i=0; i<variable_name_size / sizeof(efi_char16_t); i++) {
+ for (i=0; i< (int) (variable_name_size / sizeof(efi_char16_t)); i++) {
short_name[i] = variable_name[i] & 0xFF;
}
@@ -290,7 +288,7 @@
}
if (copy_from_user(var_data, buffer, size)) {
MOD_DEC_USE_COUNT;
- kfree(var_data);
+ kfree(var_data);
return -EFAULT;
}
@@ -433,7 +431,7 @@
to do this.
*/
if (!efi_dir)
- efi_dir = proc_mkdir("efi", NULL);
+ efi_dir = proc_mkdir("efi", NULL);
efi_systab_entry = create_proc_entry("systab", S_IRUSR | S_IRGRP, efi_dir);
if (efi_systab_entry)
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)