1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/linux/3.0.1/100-headers_install-fix-__packed-in-exported-kernel-head.patch Fri Nov 04 19:22:29 2011 +0100
1.3 @@ -0,0 +1,38 @@
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.2/100-headers_install-fix-__packed-in-exported-kernel-head.patch Fri Nov 04 19:22:29 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;
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/patches/linux/3.0.3/100-headers_install-fix-__packed-in-exported-kernel-head.patch Fri Nov 04 19:22:29 2011 +0100
3.3 @@ -0,0 +1,38 @@
3.4 +commit f210735fe2f17a6225432ee3d1239bcf23a8659c
3.5 +Author: Markus Trippelsdorf <markus@trippelsdorf.de>
3.6 +Date: Fri Jun 24 15:51:00 2011 +0200
3.7 +
3.8 + headers_install: fix __packed in exported kernel headers
3.9 +
3.10 + checkpatch.pl warns about using __attribute__((packed)) in kernel
3.11 + headers: "__packed is preferred over __attribute__((packed))". If one
3.12 + follows that advice it could cause problems in the exported header
3.13 + files, because the outside world doesn't know about this shortcut.
3.14 +
3.15 + For example busybox will fail to compile:
3.16 + CC miscutils/ubi_attach_detach.o
3.17 + In file included from miscutils/ubi_attach_detach.c:27:0:
3.18 + /usr/include/mtd/ubi-user.h:330:3: error: conflicting types for ‘__packed’
3.19 + /usr/include/mtd/ubi-user.h:314:3: note: previous declaration of ‘__packed’ was here
3.20 + ...
3.21 +
3.22 + Fix the problem by substituting __packed with __attribute__((packed)) in
3.23 + the header_install.pl script.
3.24 +
3.25 + Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
3.26 + CC: Joe Perches <joe@perches.com>
3.27 + Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
3.28 + Signed-off-by: Michal Marek <mmarek@suse.cz>
3.29 +
3.30 +diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
3.31 +index efb3be1..48462be 100644
3.32 +--- a/scripts/headers_install.pl
3.33 ++++ b/scripts/headers_install.pl
3.34 +@@ -35,6 +35,7 @@ foreach my $file (@files) {
3.35 + $line =~ s/([\s(])__iomem\s/$1/g;
3.36 + $line =~ s/\s__attribute_const__\s/ /g;
3.37 + $line =~ s/\s__attribute_const__$//g;
3.38 ++ $line =~ s/\b__packed\b/__attribute__((packed))/g;
3.39 + $line =~ s/^#include <linux\/compiler.h>//;
3.40 + $line =~ s/(^|\s)(inline)\b/$1__$2__/g;
3.41 + $line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g;
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
4.2 +++ b/patches/linux/3.0.4/100-headers_install-fix-__packed-in-exported-kernel-head.patch Fri Nov 04 19:22:29 2011 +0100
4.3 @@ -0,0 +1,38 @@
4.4 +commit f210735fe2f17a6225432ee3d1239bcf23a8659c
4.5 +Author: Markus Trippelsdorf <markus@trippelsdorf.de>
4.6 +Date: Fri Jun 24 15:51:00 2011 +0200
4.7 +
4.8 + headers_install: fix __packed in exported kernel headers
4.9 +
4.10 + checkpatch.pl warns about using __attribute__((packed)) in kernel
4.11 + headers: "__packed is preferred over __attribute__((packed))". If one
4.12 + follows that advice it could cause problems in the exported header
4.13 + files, because the outside world doesn't know about this shortcut.
4.14 +
4.15 + For example busybox will fail to compile:
4.16 + CC miscutils/ubi_attach_detach.o
4.17 + In file included from miscutils/ubi_attach_detach.c:27:0:
4.18 + /usr/include/mtd/ubi-user.h:330:3: error: conflicting types for ‘__packed’
4.19 + /usr/include/mtd/ubi-user.h:314:3: note: previous declaration of ‘__packed’ was here
4.20 + ...
4.21 +
4.22 + Fix the problem by substituting __packed with __attribute__((packed)) in
4.23 + the header_install.pl script.
4.24 +
4.25 + Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
4.26 + CC: Joe Perches <joe@perches.com>
4.27 + Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
4.28 + Signed-off-by: Michal Marek <mmarek@suse.cz>
4.29 +
4.30 +diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
4.31 +index efb3be1..48462be 100644
4.32 +--- a/scripts/headers_install.pl
4.33 ++++ b/scripts/headers_install.pl
4.34 +@@ -35,6 +35,7 @@ foreach my $file (@files) {
4.35 + $line =~ s/([\s(])__iomem\s/$1/g;
4.36 + $line =~ s/\s__attribute_const__\s/ /g;
4.37 + $line =~ s/\s__attribute_const__$//g;
4.38 ++ $line =~ s/\b__packed\b/__attribute__((packed))/g;
4.39 + $line =~ s/^#include <linux\/compiler.h>//;
4.40 + $line =~ s/(^|\s)(inline)\b/$1__$2__/g;
4.41 + $line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g;
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
5.2 +++ b/patches/linux/3.0/100-headers_install-fix-__packed-in-exported-kernel-head.patch Fri Nov 04 19:22:29 2011 +0100
5.3 @@ -0,0 +1,38 @@
5.4 +commit f210735fe2f17a6225432ee3d1239bcf23a8659c
5.5 +Author: Markus Trippelsdorf <markus@trippelsdorf.de>
5.6 +Date: Fri Jun 24 15:51:00 2011 +0200
5.7 +
5.8 + headers_install: fix __packed in exported kernel headers
5.9 +
5.10 + checkpatch.pl warns about using __attribute__((packed)) in kernel
5.11 + headers: "__packed is preferred over __attribute__((packed))". If one
5.12 + follows that advice it could cause problems in the exported header
5.13 + files, because the outside world doesn't know about this shortcut.
5.14 +
5.15 + For example busybox will fail to compile:
5.16 + CC miscutils/ubi_attach_detach.o
5.17 + In file included from miscutils/ubi_attach_detach.c:27:0:
5.18 + /usr/include/mtd/ubi-user.h:330:3: error: conflicting types for ‘__packed’
5.19 + /usr/include/mtd/ubi-user.h:314:3: note: previous declaration of ‘__packed’ was here
5.20 + ...
5.21 +
5.22 + Fix the problem by substituting __packed with __attribute__((packed)) in
5.23 + the header_install.pl script.
5.24 +
5.25 + Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
5.26 + CC: Joe Perches <joe@perches.com>
5.27 + Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
5.28 + Signed-off-by: Michal Marek <mmarek@suse.cz>
5.29 +
5.30 +diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
5.31 +index efb3be1..48462be 100644
5.32 +--- a/scripts/headers_install.pl
5.33 ++++ b/scripts/headers_install.pl
5.34 +@@ -35,6 +35,7 @@ foreach my $file (@files) {
5.35 + $line =~ s/([\s(])__iomem\s/$1/g;
5.36 + $line =~ s/\s__attribute_const__\s/ /g;
5.37 + $line =~ s/\s__attribute_const__$//g;
5.38 ++ $line =~ s/\b__packed\b/__attribute__((packed))/g;
5.39 + $line =~ s/^#include <linux\/compiler.h>//;
5.40 + $line =~ s/(^|\s)(inline)\b/$1__$2__/g;
5.41 + $line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g;