1.1 --- a/patches/linux/3.0.8/100-headers_install-fix-__packed-in-exported-kernel-head.patch Sun Nov 13 12:38:58 2011 +0100
1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
1.3 @@ -1,38 +0,0 @@
1.4 -commit f210735fe2f17a6225432ee3d1239bcf23a8659c
1.5 -Author: Markus Trippelsdorf <markus@trippelsdorf.de>
1.6 -Date: Fri Jun 24 15:51:00 2011 +0200
1.7 -
1.8 - headers_install: fix __packed in exported kernel headers
1.9 -
1.10 - checkpatch.pl warns about using __attribute__((packed)) in kernel
1.11 - headers: "__packed is preferred over __attribute__((packed))". If one
1.12 - follows that advice it could cause problems in the exported header
1.13 - files, because the outside world doesn't know about this shortcut.
1.14 -
1.15 - For example busybox will fail to compile:
1.16 - CC miscutils/ubi_attach_detach.o
1.17 - In file included from miscutils/ubi_attach_detach.c:27:0:
1.18 - /usr/include/mtd/ubi-user.h:330:3: error: conflicting types for ‘__packed’
1.19 - /usr/include/mtd/ubi-user.h:314:3: note: previous declaration of ‘__packed’ was here
1.20 - ...
1.21 -
1.22 - Fix the problem by substituting __packed with __attribute__((packed)) in
1.23 - the header_install.pl script.
1.24 -
1.25 - Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
1.26 - CC: Joe Perches <joe@perches.com>
1.27 - Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
1.28 - Signed-off-by: Michal Marek <mmarek@suse.cz>
1.29 -
1.30 -diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
1.31 -index efb3be1..48462be 100644
1.32 ---- a/scripts/headers_install.pl
1.33 -+++ b/scripts/headers_install.pl
1.34 -@@ -35,6 +35,7 @@ foreach my $file (@files) {
1.35 - $line =~ s/([\s(])__iomem\s/$1/g;
1.36 - $line =~ s/\s__attribute_const__\s/ /g;
1.37 - $line =~ s/\s__attribute_const__$//g;
1.38 -+ $line =~ s/\b__packed\b/__attribute__((packed))/g;
1.39 - $line =~ s/^#include <linux\/compiler.h>//;
1.40 - $line =~ s/(^|\s)(inline)\b/$1__$2__/g;
1.41 - $line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g;
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2 +++ b/patches/linux/3.0.9/100-headers_install-fix-__packed-in-exported-kernel-head.patch Sun Nov 13 15:46:33 2011 +0100
2.3 @@ -0,0 +1,38 @@
2.4 +commit f210735fe2f17a6225432ee3d1239bcf23a8659c
2.5 +Author: Markus Trippelsdorf <markus@trippelsdorf.de>
2.6 +Date: Fri Jun 24 15:51:00 2011 +0200
2.7 +
2.8 + headers_install: fix __packed in exported kernel headers
2.9 +
2.10 + checkpatch.pl warns about using __attribute__((packed)) in kernel
2.11 + headers: "__packed is preferred over __attribute__((packed))". If one
2.12 + follows that advice it could cause problems in the exported header
2.13 + files, because the outside world doesn't know about this shortcut.
2.14 +
2.15 + For example busybox will fail to compile:
2.16 + CC miscutils/ubi_attach_detach.o
2.17 + In file included from miscutils/ubi_attach_detach.c:27:0:
2.18 + /usr/include/mtd/ubi-user.h:330:3: error: conflicting types for ‘__packed’
2.19 + /usr/include/mtd/ubi-user.h:314:3: note: previous declaration of ‘__packed’ was here
2.20 + ...
2.21 +
2.22 + Fix the problem by substituting __packed with __attribute__((packed)) in
2.23 + the header_install.pl script.
2.24 +
2.25 + Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
2.26 + CC: Joe Perches <joe@perches.com>
2.27 + Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
2.28 + Signed-off-by: Michal Marek <mmarek@suse.cz>
2.29 +
2.30 +diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
2.31 +index efb3be1..48462be 100644
2.32 +--- a/scripts/headers_install.pl
2.33 ++++ b/scripts/headers_install.pl
2.34 +@@ -35,6 +35,7 @@ foreach my $file (@files) {
2.35 + $line =~ s/([\s(])__iomem\s/$1/g;
2.36 + $line =~ s/\s__attribute_const__\s/ /g;
2.37 + $line =~ s/\s__attribute_const__$//g;
2.38 ++ $line =~ s/\b__packed\b/__attribute__((packed))/g;
2.39 + $line =~ s/^#include <linux\/compiler.h>//;
2.40 + $line =~ s/(^|\s)(inline)\b/$1__$2__/g;
2.41 + $line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g;