summaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-02-09 17:53:53 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-09 17:53:53 -0800
commit072bc448cc796c4d2d3519795f38e13a6c2a14a5 (patch)
tree94055e9fde7bf20b6bdc242dc670c112bb03ca00 /drivers/rtc
parent80f33a5fdf66d4338789e8aa80589bda088cb35d (diff)
parent3c01b74e818a7a3b2ee9b0d584cca0bc154a031c (diff)
downloadop-kernel-dev-072bc448cc796c4d2d3519795f38e13a6c2a14a5.zip
op-kernel-dev-072bc448cc796c4d2d3519795f38e13a6c2a14a5.tar.gz
Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI updates from Ingo Molnar: "Main changes: - Move efivarfs from the misc filesystem section to pseudo filesystem - Expose firmware platform size in sysfs - Improve robustness of get_memory_map() by removing assumptions on the size of efi_memory_desc_t. - various cleanups and fixes The biggest risk is the get_memory_map() change, which changes the way that both the arm64 and x86 EFI boot stub build the early memory map. There are no known regressions with it at the moment, BYMMV" * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: efi: Don't look for chosen@0 node on DT platforms firmware: efi: Remove unneeded guid unparse efi/libstub: Call get_memory_map() to obtain map and desc sizes efi: Small leak on error in runtime map code efi: rtc-efi: Mark UIE as unsupported arm64/efi: efistub: Apply __init annotation efi: Expose underlying UEFI firmware platform size to userland efi: Rename efi_guid_unparse to efi_guid_to_str efi: Update the URLs for efibootmgr fs: Make efivarfs a pseudo filesystem, built by default with EFI
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/rtc-efi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-efi.c b/drivers/rtc/rtc-efi.c
index b37b0c8..cb989cd 100644
--- a/drivers/rtc/rtc-efi.c
+++ b/drivers/rtc/rtc-efi.c
@@ -218,6 +218,7 @@ static int __init efi_rtc_probe(struct platform_device *dev)
if (IS_ERR(rtc))
return PTR_ERR(rtc);
+ rtc->uie_unsupported = 1;
platform_set_drvdata(dev, rtc);
return 0;
OpenPOWER on IntegriCloud