[kernel] r18961 - in dists/sid/linux-2.6/debian/patches: debian series

[Ben Hutchings]

Author: benh
Date: Sun Apr 29 15:06:38 2012
New Revision: 18961

Log:
Avoid ABI change from EFI stub support

Added:
   dists/sid/linux-2.6/debian/patches/debian/efi-avoid-ABI-change.patch
Modified:
   dists/sid/linux-2.6/debian/patches/series/base

Added: dists/sid/linux-2.6/debian/patches/debian/efi-avoid-ABI-change.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/debian/efi-avoid-ABI-change.patch	Sun Apr 29 15:06:38 2012	(r18961)
@@ -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;

Modified: dists/sid/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/base	Sun Apr 29 06:58:16 2012	(r18960)
+++ dists/sid/linux-2.6/debian/patches/series/base	Sun Apr 29 15:06:38 2012	(r18961)
@@ -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