| 1 |
vapier 08/12/27 08:25:35 |
| 2 |
|
| 3 |
Modified: 00_all_linux-uio.h-cleanup-for-userspace.patch |
| 4 |
Added: |
| 5 |
00_all_headers_install.pl-autoconvert-asm-inline-volatile.patch |
| 6 |
Removed: |
| 7 |
00_all_linux-byteorder-headers-convert-to-__inline__-for-u.patch |
| 8 |
00_all_linux-map_to_7segment.h-convert-to-__inline__-for-u.patch |
| 9 |
00_all_x86-byteorder.h-use-__asm__-__inline__-for-userspac.patch |
| 10 |
Log: |
| 11 |
convert asm/inline/volatile automatically based on lkml feedback |
| 12 |
|
| 13 |
Revision Changes Path |
| 14 |
1.2 src/patchsets/gentoo-headers/2.6.28/00_all_linux-uio.h-cleanup-for-userspace.patch |
| 15 |
|
| 16 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/00_all_linux-uio.h-cleanup-for-userspace.patch?rev=1.2&view=markup |
| 17 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/00_all_linux-uio.h-cleanup-for-userspace.patch?rev=1.2&content-type=text/plain |
| 18 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/00_all_linux-uio.h-cleanup-for-userspace.patch?r1=1.1&r2=1.2 |
| 19 |
|
| 20 |
Index: 00_all_linux-uio.h-cleanup-for-userspace.patch |
| 21 |
=================================================================== |
| 22 |
RCS file: /var/cvsroot/gentoo/src/patchsets/gentoo-headers/2.6.28/00_all_linux-uio.h-cleanup-for-userspace.patch,v |
| 23 |
retrieving revision 1.1 |
| 24 |
retrieving revision 1.2 |
| 25 |
diff -u -r1.1 -r1.2 |
| 26 |
--- 00_all_linux-uio.h-cleanup-for-userspace.patch 27 Dec 2008 07:07:33 -0000 1.1 |
| 27 |
+++ 00_all_linux-uio.h-cleanup-for-userspace.patch 27 Dec 2008 08:25:35 -0000 1.2 |
| 28 |
@@ -15,15 +15,6 @@ |
| 29 |
index b7fe138..2faeea6 100644 |
| 30 |
--- a/include/linux/uio.h |
| 31 |
+++ b/include/linux/uio.h |
| 32 |
-@@ -42,7 +42,7 @@ struct kvec { |
| 33 |
- * segment lengths have been validated. Because the individual lengths can |
| 34 |
- * overflow a size_t when added together. |
| 35 |
- */ |
| 36 |
--static inline size_t iov_length(const struct iovec *iov, unsigned long nr_segs) |
| 37 |
-+static __inline__ size_t iov_length(const struct iovec *iov, unsigned long nr_segs) |
| 38 |
- { |
| 39 |
- unsigned long seg; |
| 40 |
- size_t ret = 0; |
| 41 |
@@ -52,6 +52,8 @@ static inline size_t iov_length(const struct iovec *iov, unsigned long nr_segs) |
| 42 |
return ret; |
| 43 |
} |
| 44 |
|
| 45 |
|
| 46 |
|
| 47 |
1.1 src/patchsets/gentoo-headers/2.6.28/00_all_headers_install.pl-autoconvert-asm-inline-volatile.patch |
| 48 |
|
| 49 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/00_all_headers_install.pl-autoconvert-asm-inline-volatile.patch?rev=1.1&view=markup |
| 50 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/00_all_headers_install.pl-autoconvert-asm-inline-volatile.patch?rev=1.1&content-type=text/plain |
| 51 |
|
| 52 |
Index: 00_all_headers_install.pl-autoconvert-asm-inline-volatile.patch |
| 53 |
=================================================================== |
| 54 |
From 0f10ba9ecfc474b611d4b9109a2e8deb2644ae08 Mon Sep 17 00:00:00 2001 |
| 55 |
From: Mike Frysinger <vapier@g.o> |
| 56 |
Date: Sat, 27 Dec 2008 02:51:32 -0500 |
| 57 |
Subject: [PATCH v2] headers_install.pl: autoconvert asm/inline/volatile to __xxx__ |
| 58 |
|
| 59 |
Headers in userspace should be using the __xxx__ form of the asm, inline, |
| 60 |
and volatile keywords. Since people like to revert these things without |
| 61 |
realizing what's going on, have the headers install step autoconvert these |
| 62 |
keywords. |
| 63 |
|
| 64 |
Signed-off-by: Mike Frysinger <vapier@g.o> |
| 65 |
--- |
| 66 |
v2 |
| 67 |
- get asm/volatile to actually work ... i missed this due to other |
| 68 |
local patches. "asm volatile" should get fixed now. |
| 69 |
|
| 70 |
scripts/headers_install.pl | 3 +++ |
| 71 |
1 files changed, 3 insertions(+), 0 deletions(-) |
| 72 |
|
| 73 |
diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl |
| 74 |
index 7d2b414..c6ae405 100644 |
| 75 |
--- a/scripts/headers_install.pl |
| 76 |
+++ b/scripts/headers_install.pl |
| 77 |
@@ -36,6 +36,9 @@ foreach my $file (@files) { |
| 78 |
$line =~ s/\s__attribute_const__\s/ /g; |
| 79 |
$line =~ s/\s__attribute_const__$//g; |
| 80 |
$line =~ s/^#include <linux\/compiler.h>//; |
| 81 |
+ $line =~ s/(^|\s)(inline)\b/$1__$2__/g; |
| 82 |
+ $line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g; |
| 83 |
+ $line =~ s/(^|\s|[(])(volatile)\b(\s|[(]|$)/$1__$2__$3/g; |
| 84 |
printf OUTFILE "%s", $line; |
| 85 |
} |
| 86 |
close OUTFILE; |
| 87 |
-- |
| 88 |
1.6.0.6 |
Archives