[kernel] r19089 - in dists/trunk/linux-2.6/debian: . patches/bugfix/ia64 patches/series

[Ben Hutchings]

Author: benh
Date: Thu Jun  7 03:49:10 2012
New Revision: 19089

Log:
[ia64] Export <asm/cmpxchg.h> to userland (fixes FTBFS)

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/ia64/IA64-Export-asm-cmpxchg.h-to-userland.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	Wed Jun  6 12:15:57 2012	(r19088)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Jun  7 03:49:10 2012	(r19089)
@@ -1,3 +1,10 @@
+linux-2.6 (3.4.1-1~experimental.2) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * [ia64] Export <asm/cmpxchg.h> to userland (fixes FTBFS)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  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

Added: dists/trunk/linux-2.6/debian/patches/bugfix/ia64/IA64-Export-asm-cmpxchg.h-to-userland.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/ia64/IA64-Export-asm-cmpxchg.h-to-userland.patch	Thu Jun  7 03:49:10 2012	(r19089)
@@ -0,0 +1,29 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Thu, 7 Jun 2012 04:40:34 +0100
+Subject: [PATCH] IA64: Export <asm/cmpxchg.h> to userland
+
+Parts of <asm/intrinsics.h> were moved to <asm/cmpxchg.h>, and the
+former now includes the latter.  The former is exported to userland
+so the latter must be too.
+
+Cc: stable at vger.kernel.org # v3.4
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ 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
+

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Wed Jun  6 12:15:57 2012	(r19088)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Thu Jun  7 03:49:10 2012	(r19089)
@@ -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