diff options
| author | Ben Hutchings <benh@debian.org> | 2012-04-29 15:06:38 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2012-04-29 15:06:38 +0000 |
| commit | 3d3c896f192c5d9cfdb45d3535eaf8ae4327fb50 (patch) | |
| tree | ad15566743d7b3a1e6229d4d9e399cd2d0cd66a8 | |
| parent | 33398c2c8545238f7bc1b1b4756db187acef3269 (diff) | |
| download | kernel_replicant_linux-3d3c896f192c5d9cfdb45d3535eaf8ae4327fb50.tar.gz kernel_replicant_linux-3d3c896f192c5d9cfdb45d3535eaf8ae4327fb50.tar.bz2 kernel_replicant_linux-3d3c896f192c5d9cfdb45d3535eaf8ae4327fb50.zip | |
Avoid ABI change from EFI stub support
svn path=/dists/sid/linux-2.6/; revision=18961
| -rw-r--r-- | debian/patches/debian/efi-avoid-ABI-change.patch | 14 | ||||
| -rw-r--r-- | debian/patches/series/base | 9 |
2 files changed, 19 insertions, 4 deletions
diff --git a/debian/patches/debian/efi-avoid-ABI-change.patch b/debian/patches/debian/efi-avoid-ABI-change.patch new file mode 100644 index 000000000000..78c582080d23 --- /dev/null +++ b/debian/patches/debian/efi-avoid-ABI-change.patch @@ -0,0 +1,14 @@ +--- a/include/linux/efi.h ++++ b/include/linux/efi.h +@@ -312,7 +312,11 @@ + unsigned long stderr_handle; + unsigned long stderr; + efi_runtime_services_t *runtime; ++#ifdef __GENKSYMS__ ++ unsigned long boottime; ++#else + efi_boot_services_t *boottime; ++#endif + unsigned long nr_tables; + unsigned long tables; + } efi_system_table_t; diff --git a/debian/patches/series/base b/debian/patches/series/base index 0e5f6671a492..f52816bfe34e 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -166,10 +166,6 @@ + features/x86/hyperv/0076-net-hyperv-Fix-the-code-handling-tx-busy.patch + features/x86/hyperv/0077-hv-remove-the-second-argument-of-k-un-map_atomic.patch -# Temporary, until the next ABI bump -+ debian/revert-rtc-Provide-flag-for-rtc-devices-that-don-t-s.patch -+ debian/nls-Avoid-ABI-change-from-improvement-to-utf8s_to_ut.patch - + features/all/rt2x00-Identify-rt2800usb-chipsets.patch + features/x86/efi-stub/0001-x86-Add-missing-bzImage-fields-to-struct-setup_heade.patch @@ -197,3 +193,8 @@ + bugfix/x86/drm-i915-fix-integer-overflow-in-i915_gem_execbuffer2.patch + bugfix/x86/drm-i915-fix-integer-overflow-in-i915_gem_do_execbuffer.patch + bugfix/all/revert-autofs-work-around-unhappy-compat-problem-on-.patch + +# Temporary, until the next ABI bump ++ debian/revert-rtc-Provide-flag-for-rtc-devices-that-don-t-s.patch ++ debian/nls-Avoid-ABI-change-from-improvement-to-utf8s_to_ut.patch ++ debian/efi-avoid-ABI-change.patch |