← Back to branch summary

~ubuntu-branches/ubuntu/raring/linux-ti-omap4/raring-proposed

« back to all changes in this revision

Viewing changes to arch/x86/platform/efi/efi.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.5.0-26.42
  • Date: 2013-03-14 15:21:40 UTC
  • mfrom: (76.1.1 quantal-proposed)
  • Revision ID: package-import@ubuntu.com-20130314152140-tl4mkjmxa038tm3h
Tags: 3.5.0-221.31
https://launchpad.net/bugs/1153648
https://launchpad.net/bugs/1152715
https://launchpad.net/bugs/1122094
https://launchpad.net/bugs/1147678
* Release Tracking Bug
  - LP: #1153648

[ Paolo Pisati ]

* rebased on Ubuntu-3.5.0-26.42

[ Ubuntu: 3.5.0-26.42 ]

* Release Tracking Bug
  - LP: #1152715
* ubuntu: overlayfs -- fix missmerge of vfs_open changes
  - LP: #1122094, #1147678

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/x86/platform/efi/efi.c
86
86
 
87
87
static int __init setup_noefi(char *arg)
88
88
{
89
 
        clear_bit(EFI_BOOT, &x86_efi_facility);
 
89
        clear_bit(EFI_RUNTIME_SERVICES, &x86_efi_facility);
90
90
        return 0;
91
91
}
92
92
early_param("noefi", setup_noefi);
908
908
         *
909
909
         * Call EFI services through wrapper functions.
910
910
         */
911
 
        efi.runtime_version = efi_systab.fw_revision;
 
911
        efi.runtime_version = efi_systab.hdr.revision;
912
912
        efi.get_time = virt_efi_get_time;
913
913
        efi.set_time = virt_efi_set_time;
914
914
        efi.get_wakeup_time = virt_efi_get_wakeup_time;