diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-30 13:01:28 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-30 13:01:28 -0400 |
| commit | 6a50f368784f29b0772f265a05b9e395bb2c23ff (patch) | |
| tree | 80faccf654cbbaae2a0a74686db514f663623bb2 /Add-EFI-signature-data-types.patch | |
| parent | 498236e304bc3f3c936ef937b2a101b9e22f6544 (diff) | |
| download | kernel-6a50f368784f29b0772f265a05b9e395bb2c23ff.tar.gz kernel-6a50f368784f29b0772f265a05b9e395bb2c23ff.tar.xz kernel-6a50f368784f29b0772f265a05b9e395bb2c23ff.zip | |
Linux v4.1-11355-g6aaf0da8728c
- Add patch to fix KVM sleeping in atomic issue (rhbz 1237143)
- Fix errant with_perf disable that removed perf entirely (rhbz 1237266)
Diffstat (limited to 'Add-EFI-signature-data-types.patch')
| -rw-r--r-- | Add-EFI-signature-data-types.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Add-EFI-signature-data-types.patch b/Add-EFI-signature-data-types.patch index 953eb02ad..f24473d44 100644 --- a/Add-EFI-signature-data-types.patch +++ b/Add-EFI-signature-data-types.patch @@ -14,10 +14,10 @@ Signed-off-by: David Howells <dhowells@redhat.com> 1 file changed, 20 insertions(+) diff --git a/include/linux/efi.h b/include/linux/efi.h -index 13a3a411c65f..1d54caed7ae8 100644 +index de3e45088d4a..fac43c611614 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h -@@ -594,6 +594,12 @@ void efi_native_runtime_setup(void); +@@ -595,6 +595,12 @@ void efi_native_runtime_setup(void); #define DEVICE_TREE_GUID \ EFI_GUID( 0xb1b621d5, 0xf19c, 0x41a5, 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 ) @@ -30,7 +30,7 @@ index 13a3a411c65f..1d54caed7ae8 100644 typedef struct { efi_guid_t guid; u64 table; -@@ -809,6 +815,20 @@ typedef struct _efi_file_io_interface { +@@ -810,6 +816,20 @@ typedef struct _efi_file_io_interface { #define EFI_INVALID_TABLE_ADDR (~0UL) |