Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / firmware / efi / libstub / arm-stub.c

diff --git a/drivers/firmware/efi/libstub/arm-stub.c b/drivers/firmware/efi/libstub/arm-stub.c
index 4deb3e7faa0ea622bce16d9877bb445bb3246399..414deb85c2e5214d4dc3a4cb85f4f8a20eb2df05 100644 (file)
--- a/drivers/firmware/efi/libstub/arm-stub.c
+++ b/drivers/firmware/efi/libstub/arm-stub.c
@@ -192,6 +192,10 @@ unsigned long efi_entry(void *handle, efi_system_table_t *sys_table,
 
        pr_efi(sys_table, "Booting Linux Kernel...\n");
 
+       status = check_platform_features(sys_table);
+       if (status != EFI_SUCCESS)
+               goto fail;
+
        /*
         * Get a handle to the loaded image protocol.  This is used to get
         * information about the running image, such as size and the command