diff --git a/debian/changelog b/debian/changelog index 8af071709..2b6ab527a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux-2.6 (3.4.1-1~experimental.2) UNRELEASED; urgency=low + + [ Ben Hutchings ] + * [ia64] Export to userland (fixes FTBFS) + + -- Ben Hutchings Thu, 07 Jun 2012 04:45:03 +0100 + linux-2.6 (3.4.1-1~experimental.1) experimental; urgency=low * New upstream release: http://kernelnewbies.org/Linux_3.4 diff --git a/debian/patches/bugfix/ia64/IA64-Export-asm-cmpxchg.h-to-userland.patch b/debian/patches/bugfix/ia64/IA64-Export-asm-cmpxchg.h-to-userland.patch new file mode 100644 index 000000000..35dd667ce --- /dev/null +++ b/debian/patches/bugfix/ia64/IA64-Export-asm-cmpxchg.h-to-userland.patch @@ -0,0 +1,29 @@ +From: Ben Hutchings +Date: Thu, 7 Jun 2012 04:40:34 +0100 +Subject: [PATCH] IA64: Export to userland + +Parts of were moved to , and the +former now includes the latter. The former is exported to userland +so the latter must be too. + +Cc: stable@vger.kernel.org # v3.4 +Signed-off-by: Ben Hutchings +--- + arch/ia64/include/asm/Kbuild | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/ia64/include/asm/Kbuild b/arch/ia64/include/asm/Kbuild +index 241d1c5..c929a53 100644 +--- a/arch/ia64/include/asm/Kbuild ++++ b/arch/ia64/include/asm/Kbuild +@@ -6,6 +6,7 @@ header-y += gcc_intrin.h + header-y += ia64regs.h + header-y += intel_intrin.h + header-y += intrinsics.h ++header-y += cmpxchg.h + header-y += perfmon.h + header-y += perfmon_default_smpl.h + header-y += ptrace_offsets.h +-- +1.7.10 + diff --git a/debian/patches/series/base b/debian/patches/series/base index dde10cfc4..0a1e79b36 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -93,3 +93,4 @@ + bugfix/all/mm-fix-vma_resv_map-null-pointer.patch + bugfix/all/fix-scsi_wait_scan.patch ++ bugfix/ia64/IA64-Export-asm-cmpxchg.h-to-userland.patch