[kernel] r14559 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Thu Nov  5 01:03:16 2009
New Revision: 14559

Log:
aufs2: Remove incorrect static assertion (Closes: #554120)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/aufs2-remove-incorrect-static-assertion.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/2

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Wed Nov  4 22:36:41 2009	(r14558)
+++ dists/sid/linux-2.6/debian/changelog	Thu Nov  5 01:03:16 2009	(r14559)
@@ -12,6 +12,7 @@
   [ Ben Hutchings ]
   * postinst: Accept absolute paths in modules.dep generated by the
     lenny version of module-init-tools (Closes: #552610)
+  * aufs2: Remove incorrect static assertion (Closes: #554120)
   
   [ Bastian Blank ]
   * [powerpc] Remove SMP warning from PowerMac cpufreq (Closes: #554124)

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/aufs2-remove-incorrect-static-assertion.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/aufs2-remove-incorrect-static-assertion.patch	Thu Nov  5 01:03:16 2009	(r14559)
@@ -0,0 +1,15 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: [PATCH] aufs2: Remove incorrect static assertion
+
+This should allow aufs2 to build on alpha.
+
+--- a/fs/aufs/vdir.c
++++ b/fs/aufs/vdir.c
+@@ -25,7 +25,6 @@
+ 
+ static unsigned int calc_size(int nlen)
+ {
+-	BUILD_BUG_ON(sizeof(ino_t) != sizeof(long));
+ 	return ALIGN(sizeof(struct au_vdir_de) + nlen, sizeof(ino_t));
+ }
+ 

Modified: dists/sid/linux-2.6/debian/patches/series/2
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/2	Wed Nov  4 22:36:41 2009	(r14558)
+++ dists/sid/linux-2.6/debian/patches/series/2	Thu Nov  5 01:03:16 2009	(r14559)
@@ -1,3 +1,4 @@
 + bugfix/mips/fix-build-vmlinuxlds.patch
 + features/arm/openrd-client.patch
 + bugfix/powerpc/Remove-SMP-warning-from-PowerMac-cpufreq.patch
++ bugfix/all/aufs2-remove-incorrect-static-assertion.patch