[folded-merged] rtc-ia64-allow-other-architectures-to-use-efi-rtc-v2.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: rtc-ia64-allow-other-architectures-to-use-efi-rtc-v2
has been removed from the -mm tree.  Its filename was
     rtc-ia64-allow-other-architectures-to-use-efi-rtc-v2.patch

This patch was dropped because it was folded into rtc-ia64-allow-other-architectures-to-use-efi-rtc.patch

------------------------------------------------------
From: Mark Salter <msalter@xxxxxxxxxx>
Subject: rtc-ia64-allow-other-architectures-to-use-efi-rtc-v2

This is v2 of the patch to fix a boot problem with kernels building in
rtc-efi but not being booted via EFI. In that case, runtime services are
not available so there is no point in registering the platform device.

Signed-off-by: Mark Salter <msalter@xxxxxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Cc: Tony Luck <tony.luck@xxxxxxxxx>
Cc: Fenghua Yu <fenghua.yu@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/rtc/rtc-efi-platform.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff -puN drivers/rtc/rtc-efi-platform.c~rtc-ia64-allow-other-architectures-to-use-efi-rtc-v2 drivers/rtc/rtc-efi-platform.c
--- a/drivers/rtc/rtc-efi-platform.c~rtc-ia64-allow-other-architectures-to-use-efi-rtc-v2
+++ a/drivers/rtc/rtc-efi-platform.c
@@ -21,8 +21,9 @@ static struct platform_device rtc_efi_de
 
 static int __init rtc_init(void)
 {
-	if (platform_device_register(&rtc_efi_dev) < 0)
-		pr_err("unable to register rtc device...\n");
+	if (efi_enabled(EFI_RUNTIME_SERVICES))
+		if (platform_device_register(&rtc_efi_dev) < 0)
+			pr_err("unable to register rtc device...\n");
 
 	/* not necessarily an error */
 	return 0;
_

Patches currently in -mm which might be from msalter@xxxxxxxxxx are

origin.patch
rtc-ia64-allow-other-architectures-to-use-efi-rtc.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux