[kernel] r18449 - in dists/trunk/linux-2.6/debian: . patches/debian patches/series
Ben Hutchings
benh at alioth.debian.org
Mon Jan 2 13:24:08 UTC 2012
Author: benh
Date: Mon Jan 2 13:24:06 2012
New Revision: 18449
Log:
[arm] Remove use of possibly undefined BUILD_BUG_ON in <asm/bug.h> (fixes FTBFS)
Added:
dists/trunk/linux-2.6/debian/patches/debian/ARM-Remove-use-of-possibly-undefined-BUILD_BUG_ON-in.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/series/base
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Mon Jan 2 02:57:50 2012 (r18448)
+++ dists/trunk/linux-2.6/debian/changelog Mon Jan 2 13:24:06 2012 (r18449)
@@ -1,6 +1,8 @@
linux-2.6 (3.2~rc7-1~experimental.2) UNRELEASED; urgency=low
* media/dvb: Enable DVB_USB_IT913X as module (Closes: #653776)
+ * [arm] Remove use of possibly undefined BUILD_BUG_ON in <asm/bug.h>
+ (fixes FTBFS)
-- Ben Hutchings <ben at decadent.org.uk> Mon, 02 Jan 2012 02:55:28 +0000
Added: dists/trunk/linux-2.6/debian/patches/debian/ARM-Remove-use-of-possibly-undefined-BUILD_BUG_ON-in.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/debian/ARM-Remove-use-of-possibly-undefined-BUILD_BUG_ON-in.patch Mon Jan 2 13:24:06 2012 (r18449)
@@ -0,0 +1,27 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Mon, 2 Jan 2012 02:50:42 +0000
+Subject: [PATCH] ARM: Remove use of possibly-undefined BUILD_BUG_ON in
+ <asm/bug.h>
+
+<asm/bug.h> may be included by either <linux/bug.h> or
+<linux/kernel.h> but only the latter will define BUILD_BUG_ON.
+Bodge it until there is a proper upstream fix.
+---
+ arch/arm/include/asm/bug.h | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/arch/arm/include/asm/bug.h b/arch/arm/include/asm/bug.h
+index 9abe7a0..fac79dc 100644
+--- a/arch/arm/include/asm/bug.h
++++ b/arch/arm/include/asm/bug.h
+@@ -32,7 +32,6 @@
+
+ #define __BUG(__file, __line, __value) \
+ do { \
+- BUILD_BUG_ON(sizeof(struct bug_entry) != 12); \
+ asm volatile("1:\t" BUG_INSTR_TYPE #__value "\n" \
+ ".pushsection .rodata.str, \"aMS\", %progbits, 1\n" \
+ "2:\t.asciz " #__file "\n" \
+--
+1.7.7.3
+
Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base Mon Jan 2 02:57:50 2012 (r18448)
+++ dists/trunk/linux-2.6/debian/patches/series/base Mon Jan 2 13:24:06 2012 (r18449)
@@ -57,3 +57,4 @@
+ features/all/topology-Provide-CPU-topology-in-sysfs-in-SMP-configura.patch
+ debian/x86-memtest-WARN-if-bad-RAM-found.patch
++ debian/ARM-Remove-use-of-possibly-undefined-BUILD_BUG_ON-in.patch
More information about the Kernel-svn-changes
mailing list