[kernel] r18524 - in dists/squeeze/linux-2.6/debian/patches: debian series

[Ben Hutchings]

Author: benh
Date: Sat Jan 14 14:31:54 2012
New Revision: 18524

Log:
Simplify 'firmware: Avoid ABI change in 2.6.32.17'; avoid conflict with 2.6.32.54

Added:
   dists/squeeze/linux-2.6/debian/patches/debian/firmware-Avoid-ABI-change-in-2.6.32.17-2.patch
Modified:
   dists/squeeze/linux-2.6/debian/patches/series/41

Added: dists/squeeze/linux-2.6/debian/patches/debian/firmware-Avoid-ABI-change-in-2.6.32.17-2.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/debian/firmware-Avoid-ABI-change-in-2.6.32.17-2.patch	Sat Jan 14 14:31:54 2012	(r18524)
@@ -0,0 +1,20 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 14 Jan 2012 14:07:30 +0000
+Subject: [PATCH] firmware: Avoid ABI change in 2.6.32.17
+
+Only request_firmware() should ever allocate struct firmware, so we
+can safely add fields without callers knowing about them.
+
+---
+--- a/include/linux/firmware.h
++++ b/include/linux/firmware.h
+@@ -11,7 +11,9 @@
+ struct firmware {
+ 	size_t size;
+ 	const u8 *data;
++#ifndef __GENKSYMS__
+ 	struct page **pages;
++#endif
+ };
+ 
+ struct device;

Modified: dists/squeeze/linux-2.6/debian/patches/series/41
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/41	Fri Jan 13 19:35:29 2012	(r18523)
+++ dists/squeeze/linux-2.6/debian/patches/series/41	Sat Jan 14 14:31:54 2012	(r18524)
@@ -4,3 +4,7 @@
 + bugfix/all/stable/2.6.32.53.patch
 + bugfix/x86/ACPI-invoke-DSDT-corruption-workaround-on-all-Toshiba-.patch
 + features/arm/ARM-kirkwood-6282A1.patch
+
+- debian/firmware-Avoid-ABI-change-in-2.6.32.17.patch
++ debian/firmware-Avoid-ABI-change-in-2.6.32.17-2.patch
+