From aac015e39f5d35e9a9d905f93935274c77e5fff2 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 5 Nov 2009 01:03:16 +0000 Subject: [PATCH] aufs2: Remove incorrect static assertion (Closes: #554120) svn path=/dists/sid/linux-2.6/; revision=14559 --- debian/changelog | 1 + .../aufs2-remove-incorrect-static-assertion.patch | 15 +++++++++++++++ debian/patches/series/2 | 1 + 3 files changed, 17 insertions(+) create mode 100644 debian/patches/bugfix/all/aufs2-remove-incorrect-static-assertion.patch diff --git a/debian/changelog b/debian/changelog index 9a13b13d0..966674684 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ linux-2.6 (2.6.31-2) UNRELEASED; urgency=low [ 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) diff --git a/debian/patches/bugfix/all/aufs2-remove-incorrect-static-assertion.patch b/debian/patches/bugfix/all/aufs2-remove-incorrect-static-assertion.patch new file mode 100644 index 000000000..06a9d0e94 --- /dev/null +++ b/debian/patches/bugfix/all/aufs2-remove-incorrect-static-assertion.patch @@ -0,0 +1,15 @@ +From: Ben Hutchings +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)); + } + diff --git a/debian/patches/series/2 b/debian/patches/series/2 index 3171a43a4..371bfafa6 100644 --- a/debian/patches/series/2 +++ b/debian/patches/series/2 @@ -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