diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2013-01-30 17:43:05 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-01-30 17:43:05 -0500 |
commit | becbd6608026c15afd88fd3d0c893dfb7b8c7845 (patch) | |
tree | b4b18ac62163ec2b782da876f344af93d3a4ccef /drivers | |
parent | 99f857db8857aff691c51302f93648263ed07eb1 (diff) | |
parent | 739701888f5d98010a8960b2d974d74c77c830a2 (diff) |
Merge tag 'efi-for-3.8' into x86/efi
Various urgent EFI fixes and some warning cleanups for v3.8
* EFI boot stub fix for Macbook Pro's from Maarten Lankhorst
* Fix an oops in efivarfs from Lingzhu Xiang
* 32-bit warning cleanups from Jan Beulich
* Patch to Boot on >512GB RAM systems from Nathan Zimmer
* Set efi.runtime_version correctly
* efivarfs updates
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/firmware/efivars.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c index 7b1c37497c9a..2ed59dc1c48a 100644 --- a/drivers/firmware/efivars.c +++ b/drivers/firmware/efivars.c | |||
@@ -674,7 +674,7 @@ static int efi_status_to_err(efi_status_t status) | |||
674 | err = -EACCES; | 674 | err = -EACCES; |
675 | break; | 675 | break; |
676 | case EFI_NOT_FOUND: | 676 | case EFI_NOT_FOUND: |
677 | err = -ENOENT; | 677 | err = -EIO; |
678 | break; | 678 | break; |
679 | default: | 679 | default: |
680 | err = -EINVAL; | 680 | err = -EINVAL; |
@@ -793,6 +793,7 @@ static ssize_t efivarfs_file_write(struct file *file, | |||
793 | spin_unlock(&efivars->lock); | 793 | spin_unlock(&efivars->lock); |
794 | efivar_unregister(var); | 794 | efivar_unregister(var); |
795 | drop_nlink(inode); | 795 | drop_nlink(inode); |
796 | d_delete(file->f_dentry); | ||
796 | dput(file->f_dentry); | 797 | dput(file->f_dentry); |
797 | 798 | ||
798 | } else { | 799 | } else { |
@@ -994,7 +995,7 @@ static int efivarfs_unlink(struct inode *dir, struct dentry *dentry) | |||
994 | list_del(&var->list); | 995 | list_del(&var->list); |
995 | spin_unlock(&efivars->lock); | 996 | spin_unlock(&efivars->lock); |
996 | efivar_unregister(var); | 997 | efivar_unregister(var); |
997 | drop_nlink(dir); | 998 | drop_nlink(dentry->d_inode); |
998 | dput(dentry); | 999 | dput(dentry); |
999 | return 0; | 1000 | return 0; |
1000 | } | 1001 | } |