diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-03-16 10:07:00 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-03-16 10:07:00 -0400 |
| commit | 9608f11d20f9c69ff4c624dcf421721221599255 (patch) | |
| tree | e4ee1f9536259e294f860ed0a371b82e823e6c0f /kernel-arm64.patch | |
| parent | cd37906b18022c72b4599cb0af3cfbd1c001499c (diff) | |
| download | kernel-9608f11d20f9c69ff4c624dcf421721221599255.tar.gz kernel-9608f11d20f9c69ff4c624dcf421721221599255.tar.xz kernel-9608f11d20f9c69ff4c624dcf421721221599255.zip | |
Linux v4.0-rc4
- Drop arm64 RCU revert patch. Should be fixed properly upstream now.
- Disable debugging options.
Diffstat (limited to 'kernel-arm64.patch')
| -rw-r--r-- | kernel-arm64.patch | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/kernel-arm64.patch b/kernel-arm64.patch index 51529ac12..6c618105b 100644 --- a/kernel-arm64.patch +++ b/kernel-arm64.patch @@ -3595,14 +3595,15 @@ index cce9524..c50ca8f 100644 const struct cpu_operations **ops = supported_cpu_ops; diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c -index b42c7b4..a92be8e 100644 +index 2b8d70164428..f5808cee51a2 100644 --- a/arch/arm64/kernel/efi.c +++ b/arch/arm64/kernel/efi.c -@@ -354,3 +354,40 @@ void efi_virtmap_unload(void) - efi_set_pgd(current->active_mm); - preempt_enable(); +@@ -363,3 +363,42 @@ bool efi_poweroff_required(void) + { + return efi_enabled(EFI_RUNTIME_SERVICES); } + ++ +/* + * If nothing else is handling pm_power_off, use EFI + * @@ -3639,6 +3640,7 @@ index b42c7b4..a92be8e 100644 + return ret; +} +late_initcall(arm64_register_efi_restart); ++ diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c index 6f93c24..c870fa4 100644 --- a/arch/arm64/kernel/pci.c |