diff options
author | Andrew Manison <amanison@anselsystems.com> | 2010-06-19 09:02:05 +0000 |
---|---|---|
committer | Andrew Manison <amanison@anselsystems.com> | 2010-06-19 09:02:05 +0000 |
commit | 85fd77589be2f6c970ca6895afa1520e0a2fda04 (patch) | |
tree | 6b9d172b005b2657e541424da71009dcd2a1f3c4 | |
parent | 8fdcdf953f865c691b01d546a0baea1a1143deeb (diff) | |
parent | 253afa4a86bcb0959ca8b7fb269f482058847a9b (diff) | |
download | alpine_aports-85fd77589be2f6c970ca6895afa1520e0a2fda04.tar.bz2 alpine_aports-85fd77589be2f6c970ca6895afa1520e0a2fda04.tar.xz alpine_aports-85fd77589be2f6c970ca6895afa1520e0a2fda04.zip |
Merge remote branch 'alpine/master'
Conflicts:
main/openssl/APKBUILD
253 files changed, 17262 insertions, 10393 deletions
diff --git a/main/acf-opennhrp/APKBUILD b/main/acf-opennhrp/APKBUILD index d8055582fd..fcbe4f0266 100644 --- a/main/acf-opennhrp/APKBUILD +++ b/main/acf-opennhrp/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=acf-opennhrp | 2 | pkgname=acf-opennhrp |
3 | pkgver=0.6.0 | 3 | pkgver=0.6.1 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="A web-based system administration interface for opennhrp" | 5 | pkgdesc="A web-based system administration interface for opennhrp" |
6 | url="http://git.alpinelinux.org/cgit/acf-opennhrp" | 6 | url="http://git.alpinelinux.org/cgit/acf-opennhrp" |
@@ -12,4 +12,4 @@ build() { | |||
12 | cd "$srcdir/$pkgname-$pkgver" | 12 | cd "$srcdir/$pkgname-$pkgver" |
13 | make DESTDIR="$pkgdir" install | 13 | make DESTDIR="$pkgdir" install |
14 | } | 14 | } |
15 | md5sums="09e06a2d9f767811dc9334bc6ca59b4c acf-opennhrp-0.6.0.tar.bz2" | 15 | md5sums="c4b876489cc9b75edce7793f9f50af79 acf-opennhrp-0.6.1.tar.bz2" |
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 239a9f6ae8..64333a38c4 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD | |||
@@ -1,18 +1,16 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=alpine-conf | 2 | pkgname=alpine-conf |
3 | pkgver=2.3 | 3 | pkgver=2.4 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="Alpine configuration management scripts" | 5 | pkgdesc="Alpine configuration management scripts" |
6 | url=http://git.alpinelinux.org/cgit/$pkgname | 6 | url=http://git.alpinelinux.org/cgit/$pkgname |
7 | depends="openrc" | 7 | depends="openrc" |
8 | source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 | 8 | source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" |
9 | setup-disk-fix.patch" | ||
10 | license="GPL-2" | 9 | license="GPL-2" |
11 | 10 | ||
12 | _builddir="$srcdir"/$pkgname-$pkgver | 11 | _builddir="$srcdir"/$pkgname-$pkgver |
13 | prepare() { | 12 | prepare() { |
14 | cd "$_builddir" | 13 | cd "$_builddir" |
15 | patch -p1 -i "$srcdir"/setup-disk-fix.patch | ||
16 | } | 14 | } |
17 | 15 | ||
18 | build() { | 16 | build() { |
@@ -27,5 +25,4 @@ package() { | |||
27 | ln -s lbu "$pkgdir"/sbin/lbu_$i | 25 | ln -s lbu "$pkgdir"/sbin/lbu_$i |
28 | done | 26 | done |
29 | } | 27 | } |
30 | md5sums="9e7b7602a16fb64a10ded850c508d412 alpine-conf-2.3.tar.bz2 | 28 | md5sums="4c8db8948a21b0435f577d1e0f8d7c8e alpine-conf-2.4.tar.bz2" |
31 | 27b009c1193e396ee145f59cd3844a2c setup-disk-fix.patch" | ||
diff --git a/main/alpine-conf/setup-disk-fix.patch b/main/alpine-conf/setup-disk-fix.patch deleted file mode 100644 index 2fa7aec461..0000000000 --- a/main/alpine-conf/setup-disk-fix.patch +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | commit e149170d4736017c76b09625fa9a4b6a90b5e3a3 | ||
2 | Author: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Wed May 26 13:59:25 2010 +0000 | ||
4 | |||
5 | setup-disk: fix typo in the option handling | ||
6 | |||
7 | diff --git a/setup-disk.in b/setup-disk.in | ||
8 | index 7a485b8..aa4a92f 100644 | ||
9 | --- a/setup-disk.in | ||
10 | +++ b/setup-disk.in | ||
11 | @@ -401,7 +401,7 @@ while getopts "hk:o:r" opt; do | ||
12 | *) usage;; | ||
13 | esac | ||
14 | done | ||
15 | -shift $(( OPTIND - 1)) | ||
16 | +shift $(( $OPTIND - 1)) | ||
17 | |||
18 | if [ -d "$1" ]; then | ||
19 | # install to given mounted root | ||
diff --git a/testing/alsa-utils/APKBUILD b/main/alsa-utils/APKBUILD index 8894a9cb72..8894a9cb72 100644 --- a/testing/alsa-utils/APKBUILD +++ b/main/alsa-utils/APKBUILD | |||
diff --git a/testing/alsa-utils/alsa.confd b/main/alsa-utils/alsa.confd index 0a5d58fc1f..0a5d58fc1f 100644 --- a/testing/alsa-utils/alsa.confd +++ b/main/alsa-utils/alsa.confd | |||
diff --git a/testing/alsa-utils/alsa.initd b/main/alsa-utils/alsa.initd index c11861896f..c11861896f 100644 --- a/testing/alsa-utils/alsa.initd +++ b/main/alsa-utils/alsa.initd | |||
diff --git a/testing/alsa-utils/alsaconf.patch b/main/alsa-utils/alsaconf.patch index 846cf98480..846cf98480 100644 --- a/testing/alsa-utils/alsaconf.patch +++ b/main/alsa-utils/alsaconf.patch | |||
diff --git a/main/apk-tools/0001-info-fix-querying-of-removed-but-referenced-packages.patch b/main/apk-tools/0001-info-fix-querying-of-removed-but-referenced-packages.patch deleted file mode 100644 index 4df956bf36..0000000000 --- a/main/apk-tools/0001-info-fix-querying-of-removed-but-referenced-packages.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From 87420aaf295f58847332ba3aa89691a0259baace Mon Sep 17 00:00:00 2001 | ||
2 | From: Timo Teras <timo.teras@iki.fi> | ||
3 | Date: Wed, 5 May 2010 08:56:06 +0300 | ||
4 | Subject: [PATCH 1/5] info: fix querying of removed, but referenced packages | ||
5 | |||
6 | Check that package name has packages associated with it before | ||
7 | dereferencing the pointer. Fixes #345. | ||
8 | --- | ||
9 | src/info.c | 2 +- | ||
10 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
11 | |||
12 | diff --git a/src/info.c b/src/info.c | ||
13 | index 7ca486c..d944fca 100644 | ||
14 | --- a/src/info.c | ||
15 | +++ b/src/info.c | ||
16 | @@ -283,7 +283,7 @@ static int info_package(struct info_ctx *ctx, struct apk_database *db, | ||
17 | |||
18 | for (i = 0; i < argc; i++) { | ||
19 | name = apk_db_query_name(db, APK_BLOB_STR(argv[i])); | ||
20 | - if (name == NULL) { | ||
21 | + if (name == NULL || name->pkgs == NULL) { | ||
22 | apk_error("Not found: %s", argv[i]); | ||
23 | return 1; | ||
24 | } | ||
25 | -- | ||
26 | 1.7.1 | ||
27 | |||
diff --git a/main/apk-tools/0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch b/main/apk-tools/0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch deleted file mode 100644 index 2e20152ddf..0000000000 --- a/main/apk-tools/0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From 47bac8c29c9a3c3fbebfd20e907170f24f9d677c Mon Sep 17 00:00:00 2001 | ||
2 | From: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Tue, 11 May 2010 09:31:20 +0000 | ||
4 | Subject: [PATCH 2/5] upgrade: reset versioned deps in world when doing upgrade -a | ||
5 | |||
6 | Doing "apk add file.apk" adds a versioned dependency to allow | ||
7 | downgrading, and sticky version. Most often this is to install | ||
8 | single packages from newer repository. So it would make sense | ||
9 | to reset them to non-versioned if doing: | ||
10 | |||
11 | apk upgrade -a | ||
12 | |||
13 | fixes #346 | ||
14 | --- | ||
15 | src/upgrade.c | 9 +++++++-- | ||
16 | 1 files changed, 7 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/src/upgrade.c b/src/upgrade.c | ||
19 | index f91e8cc..879e14c 100644 | ||
20 | --- a/src/upgrade.c | ||
21 | +++ b/src/upgrade.c | ||
22 | @@ -41,10 +41,15 @@ static int upgrade_main(void *ctx, struct apk_database *db, int argc, char **arg | ||
23 | goto err; | ||
24 | |||
25 | for (i = 0; i < db->world->num; i++) { | ||
26 | - r = apk_state_lock_dependency(state, &db->world->item[i]); | ||
27 | + struct apk_dependency *dep = &db->world->item[i]; | ||
28 | + if (dep->version && (apk_flags & APK_PREFER_AVAILABLE)) { | ||
29 | + dep->result_mask = APK_VERSION_EQUAL | APK_VERSION_LESS | APK_VERSION_GREATER; | ||
30 | + dep->version = NULL; | ||
31 | + } | ||
32 | + r = apk_state_lock_dependency(state, dep); | ||
33 | if (r != 0) { | ||
34 | apk_error("Unable to upgrade '%s'", | ||
35 | - db->world->item[i].name->name); | ||
36 | + dep->name->name); | ||
37 | goto err; | ||
38 | } | ||
39 | } | ||
40 | -- | ||
41 | 1.7.1 | ||
42 | |||
diff --git a/main/apk-tools/0003-search-add-search-for-reverse-dependencies-in-index.patch b/main/apk-tools/0003-search-add-search-for-reverse-dependencies-in-index.patch deleted file mode 100644 index f2947c635a..0000000000 --- a/main/apk-tools/0003-search-add-search-for-reverse-dependencies-in-index.patch +++ /dev/null | |||
@@ -1,221 +0,0 @@ | |||
1 | From d9bf4aabff801164b4c54e51b38c5f6eab2da114 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Wed, 19 May 2010 16:48:40 +0300 | ||
4 | Subject: [PATCH 3/5] search: add search for reverse dependencies in index | ||
5 | |||
6 | So it'll be easier to rebuild affected packages. Fixes #349. | ||
7 | --- | ||
8 | src/search.c | 148 +++++++++++++++++++++++++++++++++++---------------------- | ||
9 | 1 files changed, 91 insertions(+), 57 deletions(-) | ||
10 | |||
11 | diff --git a/src/search.c b/src/search.c | ||
12 | index 91c2913..e5e5d55 100644 | ||
13 | --- a/src/search.c | ||
14 | +++ b/src/search.c | ||
15 | @@ -18,18 +18,14 @@ | ||
16 | #include "apk_state.h" | ||
17 | |||
18 | struct search_ctx { | ||
19 | - int (*action)(struct apk_database *db, int argc, char **argv); | ||
20 | + int (*match)(struct apk_package *pkg, const char *str); | ||
21 | + int (*print)(struct apk_package *pkg); | ||
22 | + int argc; | ||
23 | + char **argv; | ||
24 | }; | ||
25 | |||
26 | -struct search_query_ctx { | ||
27 | - struct apk_database *db; | ||
28 | - const char *query; | ||
29 | -}; | ||
30 | - | ||
31 | -static int search_list_print(apk_hash_item item, void *ctx) | ||
32 | +static int print_match(struct apk_package *pkg) | ||
33 | { | ||
34 | - struct apk_package *pkg = (struct apk_package *) item; | ||
35 | - | ||
36 | printf("%s", pkg->name->name); | ||
37 | if (apk_verbosity > 0) | ||
38 | printf("-%s", pkg->version); | ||
39 | @@ -41,61 +37,50 @@ static int search_list_print(apk_hash_item item, void *ctx) | ||
40 | return 0; | ||
41 | } | ||
42 | |||
43 | -static int search_query_print(apk_hash_item item, void *ctx) | ||
44 | +static int print_rdepends(struct apk_package *pkg) | ||
45 | { | ||
46 | - struct search_query_ctx *ictx = (struct search_query_ctx *) ctx; | ||
47 | - struct apk_package *pkg = (struct apk_package *) item; | ||
48 | + struct apk_name *name, *name0; | ||
49 | + struct apk_package *pkg0; | ||
50 | + struct apk_dependency *dep; | ||
51 | + int i, j, k; | ||
52 | |||
53 | - if (fnmatch(ictx->query, pkg->name->name, 0) != 0) | ||
54 | + name = pkg->name; | ||
55 | + if (name->rdepends == NULL) | ||
56 | return 0; | ||
57 | - search_list_print(item, ictx->db); | ||
58 | - | ||
59 | - return 0; | ||
60 | -} | ||
61 | - | ||
62 | -static int search_list(struct apk_database *db, int argc, char **argv) | ||
63 | -{ | ||
64 | - int i; | ||
65 | - struct search_query_ctx ctx; | ||
66 | - | ||
67 | - ctx.db = db; | ||
68 | |||
69 | - if (argc == 0) | ||
70 | - apk_hash_foreach(&db->available.packages, search_list_print, db); | ||
71 | - else | ||
72 | - for (i=0; i<argc; i++) { | ||
73 | - ctx.query = argv[i]; | ||
74 | - apk_hash_foreach(&db->available.packages, search_query_print, &ctx); | ||
75 | + printf("%s-%s:", pkg->name->name, pkg->version); | ||
76 | + for (i = 0; i < name->rdepends->num; i++) { | ||
77 | + name0 = name->rdepends->item[i]; | ||
78 | + if (name0->pkgs == NULL) | ||
79 | + continue; | ||
80 | + for (j = 0; j < name0->pkgs->num; j++) { | ||
81 | + pkg0 = name0->pkgs->item[j]; | ||
82 | + if (pkg0->depends == NULL) | ||
83 | + continue; | ||
84 | + for (k = 0; k < pkg0->depends->num; k++) { | ||
85 | + dep = &pkg0->depends->item[k]; | ||
86 | + if (name == dep->name && | ||
87 | + (apk_version_compare(pkg->version, dep->version) | ||
88 | + & dep->result_mask)) { | ||
89 | + printf(" %s-%s", pkg0->name->name, pkg0->version); | ||
90 | + } | ||
91 | + } | ||
92 | } | ||
93 | + } | ||
94 | + printf("\n"); | ||
95 | |||
96 | return 0; | ||
97 | } | ||
98 | |||
99 | -static int search_query_desc_print(apk_hash_item item, void *ctx) | ||
100 | +static int search_pkgname(struct apk_package *pkg, const char *str) | ||
101 | { | ||
102 | - struct search_query_ctx *ictx = (struct search_query_ctx *) ctx; | ||
103 | - struct apk_package *pkg = (struct apk_package *) item; | ||
104 | - | ||
105 | - if( strstr(pkg->description, ictx->query) == NULL ) | ||
106 | - return 0; | ||
107 | - search_list_print(item, ictx->db); | ||
108 | - | ||
109 | - return 0; | ||
110 | + return fnmatch(str, pkg->name->name, 0) == 0; | ||
111 | } | ||
112 | |||
113 | -static int search_desc(struct apk_database *db, int argc, char **argv) | ||
114 | +static int search_desc(struct apk_package *pkg, const char *str) | ||
115 | { | ||
116 | - int i; | ||
117 | - struct search_query_ctx ctx; | ||
118 | - | ||
119 | - ctx.db = db; | ||
120 | - | ||
121 | - for (i=0; i<argc; i++) { | ||
122 | - ctx.query = argv[i]; | ||
123 | - apk_hash_foreach(&db->available.packages, search_query_desc_print, &ctx); | ||
124 | - } | ||
125 | - | ||
126 | - return 0; | ||
127 | + return strstr(pkg->name->name, str) != NULL || | ||
128 | + strstr(pkg->description, str) != NULL; | ||
129 | } | ||
130 | |||
131 | static int search_parse(void *ctx, struct apk_db_options *dbopts, | ||
132 | @@ -105,7 +90,10 @@ static int search_parse(void *ctx, struct apk_db_options *dbopts, | ||
133 | |||
134 | switch (optch) { | ||
135 | case 'd': | ||
136 | - ictx->action = search_desc; | ||
137 | + ictx->match = search_desc; | ||
138 | + break; | ||
139 | + case 'r': | ||
140 | + ictx->print = print_rdepends; | ||
141 | break; | ||
142 | default: | ||
143 | return -1; | ||
144 | @@ -113,23 +101,69 @@ static int search_parse(void *ctx, struct apk_db_options *dbopts, | ||
145 | return 0; | ||
146 | } | ||
147 | |||
148 | +static int match_packages(apk_hash_item item, void *ctx) | ||
149 | +{ | ||
150 | + struct search_ctx *ictx = (struct search_ctx *) ctx; | ||
151 | + struct apk_package *pkg = (struct apk_package *) item; | ||
152 | + int i; | ||
153 | + | ||
154 | + for (i = 0; i < ictx->argc; i++) | ||
155 | + if (ictx->match(pkg, ictx->argv[i])) | ||
156 | + break; | ||
157 | + if (ictx->argc == 0 || i < ictx->argc) | ||
158 | + ictx->print(pkg); | ||
159 | + | ||
160 | + return 0; | ||
161 | +} | ||
162 | + | ||
163 | static int search_main(void *ctx, struct apk_database *db, int argc, char **argv) | ||
164 | { | ||
165 | struct search_ctx *ictx = (struct search_ctx *) ctx; | ||
166 | + struct apk_name *name; | ||
167 | + int rc = 0, i, j, slow_search; | ||
168 | + | ||
169 | + slow_search = ictx->match != NULL || argc == 0; | ||
170 | + if (!slow_search) { | ||
171 | + for (i = 0; i < argc; i++) | ||
172 | + if (strcspn(argv[i], "*?[") != strlen(argv[i])) { | ||
173 | + slow_search = 1; | ||
174 | + break; | ||
175 | + } | ||
176 | + } | ||
177 | + | ||
178 | + if (ictx->match == NULL) | ||
179 | + ictx->match = search_pkgname; | ||
180 | + if (ictx->print == NULL) | ||
181 | + ictx->print = print_match; | ||
182 | + else if (argc == 0) | ||
183 | + return -1; | ||
184 | |||
185 | - if (ictx->action != NULL) | ||
186 | - return ictx->action(db, argc, argv); | ||
187 | + if (slow_search) { | ||
188 | + ictx->argc = argc; | ||
189 | + ictx->argv = argv; | ||
190 | + rc = apk_hash_foreach(&db->available.packages, | ||
191 | + match_packages, ictx); | ||
192 | + } else { | ||
193 | + for (i = 0; i < argc; i++) { | ||
194 | + name = apk_db_query_name(db, APK_BLOB_STR(argv[i])); | ||
195 | + if (name == NULL || name->pkgs == NULL) | ||
196 | + continue; | ||
197 | + for (j = 0; j < name->pkgs->num; j++) | ||
198 | + ictx->print(name->pkgs->item[j]); | ||
199 | + } | ||
200 | + } | ||
201 | |||
202 | - return search_list(db, argc, argv); | ||
203 | + return rc; | ||
204 | } | ||
205 | |||
206 | static struct apk_option search_options[] = { | ||
207 | - { 'd', "description", "Search also package descriptions" }, | ||
208 | + { 'd', "description", "Search also package descriptions" }, | ||
209 | + { 'r', "rdepends", "Print reverse dependencies of package" }, | ||
210 | }; | ||
211 | |||
212 | static struct apk_applet apk_search = { | ||
213 | .name = "search", | ||
214 | - .help = "Search package names (and descriptions) by wildcard PATTERN.", | ||
215 | + .help = "Search package by PATTERNs or by indexed dependencies.", | ||
216 | .arguments = "PATTERN", | ||
217 | .open_flags = APK_OPENF_READ | APK_OPENF_NO_STATE, | ||
218 | .context_size = sizeof(struct search_ctx), | ||
219 | -- | ||
220 | 1.7.1 | ||
221 | |||
diff --git a/main/apk-tools/0004-package-don-t-leak-signing-key-file-fd.patch b/main/apk-tools/0004-package-don-t-leak-signing-key-file-fd.patch deleted file mode 100644 index 818eeb1e79..0000000000 --- a/main/apk-tools/0004-package-don-t-leak-signing-key-file-fd.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From fe55da70741621f7bac2cd943b64cc13e25f9427 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Wed, 26 May 2010 14:30:08 +0300 | ||
4 | Subject: [PATCH 4/5] package: don't leak signing key file fd | ||
5 | |||
6 | openssl BIO does not close the fd unless we explicitly tell it to | ||
7 | do so. | ||
8 | --- | ||
9 | src/package.c | 2 +- | ||
10 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
11 | |||
12 | diff --git a/src/package.c b/src/package.c | ||
13 | index b265468..b97c412 100644 | ||
14 | --- a/src/package.c | ||
15 | +++ b/src/package.c | ||
16 | @@ -441,7 +441,7 @@ int apk_sign_ctx_process_file(struct apk_sign_ctx *ctx, | ||
17 | if (fd < 0) | ||
18 | return 0; | ||
19 | |||
20 | - bio = BIO_new_fp(fdopen(fd, "r"), 0); | ||
21 | + bio = BIO_new_fp(fdopen(fd, "r"), BIO_CLOSE); | ||
22 | ctx->signature.pkey = PEM_read_bio_PUBKEY(bio, NULL, NULL, NULL); | ||
23 | if (ctx->signature.pkey != NULL) { | ||
24 | if (fi->name[6] == 'R') | ||
25 | -- | ||
26 | 1.7.1 | ||
27 | |||
diff --git a/main/apk-tools/0005-cache-display-more-than-one-error.patch b/main/apk-tools/0005-cache-display-more-than-one-error.patch deleted file mode 100644 index 6e85218b18..0000000000 --- a/main/apk-tools/0005-cache-display-more-than-one-error.patch +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | From d21303960544b5f11b7d69d0335f0903fb93d180 Mon Sep 17 00:00:00 2001 | ||
2 | From: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Thu, 13 May 2010 09:26:19 +0000 | ||
4 | Subject: [PATCH 5/5] cache: display more than one error | ||
5 | |||
6 | Display all packages that are bad in world rather than only first | ||
7 | before exiting. | ||
8 | --- | ||
9 | src/cache.c | 15 ++++++++------- | ||
10 | 1 files changed, 8 insertions(+), 7 deletions(-) | ||
11 | |||
12 | diff --git a/src/cache.c b/src/cache.c | ||
13 | index 85d9777..49a71fa 100644 | ||
14 | --- a/src/cache.c | ||
15 | +++ b/src/cache.c | ||
16 | @@ -30,7 +30,7 @@ static int cache_download(struct apk_database *db) | ||
17 | struct apk_package *pkg; | ||
18 | struct apk_repository *repo; | ||
19 | char item[PATH_MAX], cacheitem[PATH_MAX]; | ||
20 | - int i, r = 0; | ||
21 | + int i, r = 0, errors = 0; | ||
22 | |||
23 | if (db->world == NULL) | ||
24 | return 0; | ||
25 | @@ -41,12 +41,13 @@ static int cache_download(struct apk_database *db) | ||
26 | |||
27 | for (i = 0; i < db->world->num; i++) { | ||
28 | r = apk_state_lock_dependency(state, &db->world->item[i]); | ||
29 | - if (r != 0) { | ||
30 | - apk_error("Unable to select version for '%s': %d", | ||
31 | - db->world->item[i].name->name, r); | ||
32 | - goto err; | ||
33 | - } | ||
34 | + errors += r; | ||
35 | + if (r != 0) | ||
36 | + apk_error("Unable to select version for '%s'", | ||
37 | + db->world->item[i].name->name); | ||
38 | } | ||
39 | + if (errors) | ||
40 | + goto err; | ||
41 | |||
42 | list_for_each_entry(change, &state->change_list_head, change_list) { | ||
43 | pkg = change->newpkg; | ||
44 | @@ -67,7 +68,7 @@ static int cache_download(struct apk_database *db) | ||
45 | err: | ||
46 | if (state != NULL) | ||
47 | apk_state_unref(state); | ||
48 | - return r; | ||
49 | + return errors; | ||
50 | } | ||
51 | |||
52 | static int cache_clean(struct apk_database *db) | ||
53 | -- | ||
54 | 1.7.1 | ||
55 | |||
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD index 07b602dfaf..0fafb00356 100644 --- a/main/apk-tools/APKBUILD +++ b/main/apk-tools/APKBUILD | |||
@@ -1,17 +1,13 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=apk-tools | 2 | pkgname=apk-tools |
3 | pkgver=2.0.2 | 3 | pkgver=2.0.3 |
4 | pkgrel=6 | 4 | pkgrel=1 |
5 | pkgdesc="Alpine Package Keeper - package manager for alpine" | 5 | pkgdesc="Alpine Package Keeper - package manager for alpine" |
6 | subpackages="$pkgname-static" | 6 | subpackages="$pkgname-static" |
7 | depends= | 7 | depends= |
8 | makedepends="zlib-dev openssl-dev pkgconfig" | 8 | makedepends="zlib-dev openssl-dev pkgconfig" |
9 | source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 | 9 | source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 |
10 | 0001-info-fix-querying-of-removed-but-referenced-packages.patch | 10 | triggers.patch |
11 | 0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch | ||
12 | 0003-search-add-search-for-reverse-dependencies-in-index.patch | ||
13 | 0004-package-don-t-leak-signing-key-file-fd.patch | ||
14 | 0005-cache-display-more-than-one-error.patch | ||
15 | " | 11 | " |
16 | 12 | ||
17 | 13 | ||
@@ -48,9 +44,5 @@ static() { | |||
48 | "$subpkgdir"/sbin/apk.static | 44 | "$subpkgdir"/sbin/apk.static |
49 | } | 45 | } |
50 | 46 | ||
51 | md5sums="c87cb88f90eb8d7021d37e3b5386863d apk-tools-2.0.2.tar.bz2 | 47 | md5sums="191938ff9433745a1e24dfab6f8f7249 apk-tools-2.0.3.tar.bz2 |
52 | c590e894c2580cbb092b150fca9af3cf 0001-info-fix-querying-of-removed-but-referenced-packages.patch | 48 | b4679e85ed85914141312fcbd357bb0f triggers.patch" |
53 | 5c53eaa29dd9722c25b6878cde392d05 0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch | ||
54 | 6baca299fbf00b97f78fa8fbd0e82f5b 0003-search-add-search-for-reverse-dependencies-in-index.patch | ||
55 | 175470e6d5b2d20fe02d6fb61f8ec6d1 0004-package-don-t-leak-signing-key-file-fd.patch | ||
56 | 0ab64b75b09f37b4d265df3f7b5b7e83 0005-cache-display-more-than-one-error.patch" | ||
diff --git a/main/apk-tools/triggers.patch b/main/apk-tools/triggers.patch new file mode 100644 index 0000000000..4702e0f85a --- /dev/null +++ b/main/apk-tools/triggers.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | commit 60b537e356dfcd0ed9a3516152c6a170912efcef | ||
2 | Author: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Thu Jun 10 17:50:11 2010 +0000 | ||
4 | |||
5 | db: do not free trigger list after package is unpacked | ||
6 | |||
7 | The triggers are read during apk_db_unpack_pkg(). If we delete the | ||
8 | triggers list after then unpack we delete the triggers which is not | ||
9 | what we want. | ||
10 | |||
11 | This fixes bug introduced in ce3cf8bff901e7fcacbca640ffedaeea2b3bdf7f | ||
12 | |||
13 | diff --git a/src/database.c b/src/database.c | ||
14 | index 7421e1b..11864cb 100644 | ||
15 | --- a/src/database.c | ||
16 | +++ b/src/database.c | ||
17 | @@ -2100,6 +2100,12 @@ int apk_db_install_pkg(struct apk_database *db, | ||
18 | |||
19 | /* Install the new stuff */ | ||
20 | ipkg = apk_pkg_install(db, newpkg); | ||
21 | + ipkg->flags |= APK_IPKGF_RUN_ALL_TRIGGERS; | ||
22 | + if (ipkg->triggers->num != 0) { | ||
23 | + list_del(&ipkg->trigger_pkgs_list); | ||
24 | + apk_string_array_free(&ipkg->triggers); | ||
25 | + } | ||
26 | + | ||
27 | if (newpkg->installed_size != 0) { | ||
28 | r = apk_db_unpack_pkg(db, ipkg, (oldpkg != NULL), | ||
29 | (oldpkg == newpkg), cb, cb_ctx, | ||
30 | @@ -2110,12 +2116,6 @@ int apk_db_install_pkg(struct apk_database *db, | ||
31 | } | ||
32 | } | ||
33 | |||
34 | - ipkg->flags |= APK_IPKGF_RUN_ALL_TRIGGERS; | ||
35 | - if (ipkg->triggers->num != 0) { | ||
36 | - list_del(&ipkg->trigger_pkgs_list); | ||
37 | - apk_string_array_free(&ipkg->triggers); | ||
38 | - } | ||
39 | - | ||
40 | if (oldpkg != NULL && oldpkg != newpkg && oldpkg->ipkg != NULL) { | ||
41 | apk_db_purge_pkg(db, oldpkg->ipkg, NULL); | ||
42 | apk_pkg_uninstall(db, oldpkg); | ||
diff --git a/main/asterisk-audio-konf/0001-add-n-flag-to-prevent-dynamic-create-of-conference.patch b/main/asterisk-audio-konf/0001-add-n-flag-to-prevent-dynamic-create-of-conference.patch new file mode 100644 index 0000000000..115c42fa28 --- /dev/null +++ b/main/asterisk-audio-konf/0001-add-n-flag-to-prevent-dynamic-create-of-conference.patch | |||
@@ -0,0 +1,151 @@ | |||
1 | From 2040c4ebe42ed6a222b87f0148c0c08701afc2fd Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Mon, 7 Jun 2010 14:20:42 +0300 | ||
4 | Subject: [PATCH] add 'n' flag to prevent dynamic create of conference | ||
5 | |||
6 | --- | ||
7 | konference/Dialplan.txt | 2 ++ | ||
8 | konference/conference.c | 27 ++++++++++++++++++--------- | ||
9 | konference/conference.h | 2 +- | ||
10 | konference/member.c | 12 +++++++----- | ||
11 | konference/member.h | 3 +++ | ||
12 | 5 files changed, 31 insertions(+), 15 deletions(-) | ||
13 | |||
14 | diff --git a/konference/Dialplan.txt b/konference/Dialplan.txt | ||
15 | index 455703d..17287dd 100644 | ||
16 | --- a/konference/Dialplan.txt | ||
17 | +++ b/konference/Dialplan.txt | ||
18 | @@ -45,6 +45,8 @@ exten => <ext>,<pri>,Konference(<confname>,<flags>,<optional args>,<more optiona | ||
19 | 'r' : record the conference. it will be recorded to KONFERENCE_RECORDINGFILE with the format KONFERENCE_RECORDINGFORMAT | ||
20 | default for KONFERENCE_RECORDINGFILE is: konference-{conference-name}-{member-uniqueid} | ||
21 | default for KONFERENCE_RECORDINGFORMAT is: wav | ||
22 | + 'n' : do not create new conference, only join existing ones. | ||
23 | + if conference does not exist KONFERENCE is set to NOTFOUND | ||
24 | |||
25 | Future development (these are not implemented yet): | ||
26 | ? | ||
27 | diff --git a/konference/conference.c b/konference/conference.c | ||
28 | index 9790d2e..98fed28 100644 | ||
29 | --- a/konference/conference.c | ||
30 | +++ b/konference/conference.c | ||
31 | @@ -620,7 +620,7 @@ void init_conference( void ) | ||
32 | argument_delimiter = ( !strcmp(PACKAGE_VERSION,"1.4") ? "|" : "," ) ; | ||
33 | } | ||
34 | |||
35 | -struct ast_conference* join_conference( struct ast_conf_member* member, char* max_users_flag, const char* recfile, const char *recformat ) | ||
36 | +struct ast_conference* join_conference( struct ast_conf_member* member, const char* recfile, const char *recformat ) | ||
37 | { | ||
38 | struct ast_conference* conf = NULL ; | ||
39 | |||
40 | @@ -634,15 +634,25 @@ struct ast_conference* join_conference( struct ast_conf_member* member, char* ma | ||
41 | // unable to find an existing conference, try to create one | ||
42 | if ( conf == NULL ) | ||
43 | { | ||
44 | - // create a new conference | ||
45 | - DEBUG("attempting to create requested conference\n") ; | ||
46 | + if ( member->no_create_flag ) | ||
47 | + { | ||
48 | + DEBUG("conference not found, and create of new conference not allowed\n") ; | ||
49 | + pbx_builtin_setvar_helper(member->chan, "KONFERENCE", "NOTFOUND"); | ||
50 | + } | ||
51 | + else | ||
52 | + { | ||
53 | + // create a new conference | ||
54 | + DEBUG("attempting to create requested conference\n") ; | ||
55 | |||
56 | - // create the new conference with one member | ||
57 | - conf = create_conf( member->conf_name, member ) ; | ||
58 | + // create the new conference with one member | ||
59 | + conf = create_conf( member->conf_name, member ) ; | ||
60 | |||
61 | - // return an error if create_conf() failed | ||
62 | - if ( conf == NULL ) | ||
63 | - ast_log( LOG_ERROR, "unable to find or create requested conference\n" ) ; | ||
64 | + // return an error if create_conf() failed | ||
65 | + if ( conf == NULL ) { | ||
66 | + ast_log( LOG_ERROR, "unable to find or create requested conference\n" ) ; | ||
67 | + pbx_builtin_setvar_helper(member->chan, "KONFERENCE", "NORESOURCES"); | ||
68 | + } | ||
69 | + } | ||
70 | } | ||
71 | else | ||
72 | { | ||
73 | @@ -656,7 +666,6 @@ struct ast_conference* join_conference( struct ast_conf_member* member, char* ma | ||
74 | add_member( member, conf ) ; | ||
75 | } else { | ||
76 | pbx_builtin_setvar_helper(member->chan, "KONFERENCE", "MAXUSERS"); | ||
77 | - *max_users_flag = 1; | ||
78 | conf = NULL; | ||
79 | } | ||
80 | } | ||
81 | diff --git a/konference/conference.h b/konference/conference.h | ||
82 | index 3322f3f..e8da836 100644 | ||
83 | --- a/konference/conference.h | ||
84 | +++ b/konference/conference.h | ||
85 | @@ -157,7 +157,7 @@ int hash( const char *channel_name ) ; | ||
86 | |||
87 | int count_exec( struct ast_channel* chan, void* data ) ; | ||
88 | |||
89 | -struct ast_conference* join_conference( struct ast_conf_member* member, char* max_users_flag, const char* recfile, const char* recformat ) ; | ||
90 | +struct ast_conference* join_conference( struct ast_conf_member* member, const char* recfile, const char* recformat ) ; | ||
91 | |||
92 | int end_conference( const char *name, int hangup ) ; | ||
93 | |||
94 | diff --git a/konference/member.c b/konference/member.c | ||
95 | index c18fcdc..ff93b36 100644 | ||
96 | --- a/konference/member.c | ||
97 | +++ b/konference/member.c | ||
98 | @@ -758,14 +758,13 @@ int member_exec( struct ast_channel* chan, void* data ) | ||
99 | // setup a conference for the new member | ||
100 | // | ||
101 | |||
102 | - char max_users_flag = 0 ; | ||
103 | - conf = join_conference( member, &max_users_flag, recfile, recformat ) ; | ||
104 | + conf = join_conference( member, recfile, recformat ) ; | ||
105 | |||
106 | if ( conf == NULL ) | ||
107 | { | ||
108 | - ast_log( LOG_NOTICE, "unable to setup member conference %s: max_users_flag is %d\n", member->conf_name, max_users_flag ) ; | ||
109 | + ast_log( LOG_NOTICE, "unable to setup member conference %s\n", member->conf_name) ; | ||
110 | delete_member( member) ; | ||
111 | - return (max_users_flag ? 0 : -1 ) ; | ||
112 | + return -1; | ||
113 | } | ||
114 | |||
115 | // | ||
116 | @@ -1349,7 +1348,7 @@ struct ast_conf_member* create_member( struct ast_channel *chan, const char* dat | ||
117 | else | ||
118 | #endif | ||
119 | { | ||
120 | - // allowed flags are C, c, L, l, V, D, A, C, X, r, R, T, t, M, S, z, o, F, H | ||
121 | + // allowed flags are C, c, L, l, V, D, A, C, X, r, R, T, t, M, S, z, o, F, H, n | ||
122 | // mute/no_recv options | ||
123 | switch ( flags[i] ) | ||
124 | { | ||
125 | @@ -1405,6 +1404,9 @@ struct ast_conf_member* create_member( struct ast_channel *chan, const char* dat | ||
126 | case 'M': | ||
127 | member->ismoderator = 1; | ||
128 | break; | ||
129 | + case 'n': | ||
130 | + member->no_create_flag = 1; | ||
131 | + break; | ||
132 | #ifdef VIDEO | ||
133 | case 'N': | ||
134 | member->no_camera = 1; | ||
135 | diff --git a/konference/member.h b/konference/member.h | ||
136 | index 0f9005b..28eff6b 100644 | ||
137 | --- a/konference/member.h | ||
138 | +++ b/konference/member.h | ||
139 | @@ -105,6 +105,9 @@ struct ast_conf_member | ||
140 | // wait option flag | ||
141 | char wait_for_moderator_flag; | ||
142 | |||
143 | + // creation of new conference not allowed | ||
144 | + char no_create_flag; | ||
145 | + | ||
146 | // temp flag for when star is pressed | ||
147 | char star_pressed; | ||
148 | |||
149 | -- | ||
150 | 1.7.0.4 | ||
151 | |||
diff --git a/main/asterisk-audio-konf/APKBUILD b/main/asterisk-audio-konf/APKBUILD new file mode 100644 index 0000000000..cd87e2780e --- /dev/null +++ b/main/asterisk-audio-konf/APKBUILD | |||
@@ -0,0 +1,67 @@ | |||
1 | # Contributor: | ||
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | pkgname=asterisk-audio-konf | ||
4 | _basever=0 | ||
5 | _gitver=100607 | ||
6 | pkgver=${_basever}_git${_gitver} | ||
7 | pkgrel=0 | ||
8 | pkgdesc="A fork of AppKonference focused entirely on audio conferencing" | ||
9 | url="http://github.com/jthomerson/AsteriskAudioKonf/" | ||
10 | license="GPL" | ||
11 | depends= | ||
12 | makedepends="asterisk-dev" | ||
13 | install= | ||
14 | subpackages= | ||
15 | _snapfile="$pkgname-$pkgver.tar.bz2" | ||
16 | source="http://build.alpinelinux.org:8010/distfiles/$_snapfile | ||
17 | 0001-add-n-flag-to-prevent-dynamic-create-of-conference.patch | ||
18 | " | ||
19 | |||
20 | _gitver=100607 | ||
21 | _giturl="git://github.com/jthomerson/AsteriskAudioKonf.git" | ||
22 | |||
23 | |||
24 | _builddir="$srcdir"/$pkgname/konference | ||
25 | |||
26 | |||
27 | snapshot() { | ||
28 | _gitver=$(date +%y%m%d) | ||
29 | pkgver=${_basever}_git$_gitver | ||
30 | _snapfile="$pkgname-$pkgver.tar.bz2" | ||
31 | |||
32 | if [ -d "$SRCDEST"/$pkgname ]; then | ||
33 | cd "$SRCDEST"/$pkgname | ||
34 | git pull --rebase || return 1 | ||
35 | else | ||
36 | cd "$SRCDEST" | ||
37 | git clone $_giturl $pkgname | ||
38 | fi | ||
39 | cd "$SRCDEST" | ||
40 | tar -jcf $_snapfile $pkgname | ||
41 | |||
42 | pkgrel=0 | ||
43 | sed -i -e "s/^_gitver=.*/_gitver=${_gitver}/" \ | ||
44 | -e "s/^pkgrel=.*/pkgrel=$pkgrel/" \ | ||
45 | "$startdir"/APKBUILD | ||
46 | checksum | ||
47 | } | ||
48 | |||
49 | prepare() { | ||
50 | cd "$_builddir"/.. | ||
51 | for i in "$srcdir"/*.patch; do | ||
52 | patch -p1 -i "$i" || return 1 | ||
53 | done | ||
54 | } | ||
55 | |||
56 | build() { | ||
57 | cd "$_builddir" | ||
58 | make || return 1 | ||
59 | } | ||
60 | |||
61 | package() { | ||
62 | cd "$_builddir" | ||
63 | make INSTALL_PREFIX="$pkgdir" install | ||
64 | } | ||
65 | |||
66 | md5sums="8a716a2d1daa622f86a485804e403571 asterisk-audio-konf-0_git100607.tar.bz2 | ||
67 | 937afbb9fa2ce57615f09919e15ab2d3 0001-add-n-flag-to-prevent-dynamic-create-of-conference.patch" | ||
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD index 1ed4b41083..77b699adfb 100644 --- a/main/asterisk/APKBUILD +++ b/main/asterisk/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Contributor: Timo Teras <timo.teras@iki.fi> | 1 | # Contributor: Timo Teras <timo.teras@iki.fi> |
2 | # Maintainer: Timo Teras <timo.teras@iki.fi> | 2 | # Maintainer: Timo Teras <timo.teras@iki.fi> |
3 | pkgname=asterisk | 3 | pkgname=asterisk |
4 | pkgver=1.6.2.7 | 4 | pkgver=1.6.2.8 |
5 | pkgrel=1 | 5 | pkgrel=0 |
6 | pkgdesc="Asterisk: A Module Open Source PBX System" | 6 | pkgdesc="Asterisk: A Module Open Source PBX System" |
7 | url="http://www.asterisk.org/" | 7 | url="http://www.asterisk.org/" |
8 | license="GPL" | 8 | license="GPL" |
@@ -110,7 +110,7 @@ sample() { | |||
110 | make samples DESTDIR="$subpkgdir" | 110 | make samples DESTDIR="$subpkgdir" |
111 | } | 111 | } |
112 | 112 | ||
113 | md5sums="861f57ba43bfe05dc645e0679a260e41 asterisk-1.6.2.7.tar.gz | 113 | md5sums="2ee5bbb91771c7c9b131da473971bc2f asterisk-1.6.2.8.tar.gz |
114 | b00c9d98ce2ad445501248a197c6e436 100-uclibc-daemon.patch | 114 | b00c9d98ce2ad445501248a197c6e436 100-uclibc-daemon.patch |
115 | 6e1129e30c4fd2c25c86c81685a485a9 101-caps-uclibc.patch | 115 | 6e1129e30c4fd2c25c86c81685a485a9 101-caps-uclibc.patch |
116 | 79e9634b5054bceb3b8dc246654bb243 400-bug-227.patch | 116 | 79e9634b5054bceb3b8dc246654bb243 400-bug-227.patch |
diff --git a/testing/bacula-client/APKBUILD b/main/bacula-client/APKBUILD index b3921077e4..b3921077e4 100644 --- a/testing/bacula-client/APKBUILD +++ b/main/bacula-client/APKBUILD | |||
diff --git a/testing/bacula-client/bacula-client.post-install b/main/bacula-client/bacula-client.post-install index 51274b5c3f..51274b5c3f 100644 --- a/testing/bacula-client/bacula-client.post-install +++ b/main/bacula-client/bacula-client.post-install | |||
diff --git a/testing/bacula-client/bacula-client.pre-install b/main/bacula-client/bacula-client.pre-install index 54f4087708..54f4087708 100644 --- a/testing/bacula-client/bacula-client.pre-install +++ b/main/bacula-client/bacula-client.pre-install | |||
diff --git a/testing/bacula-client/bacula-fd-conf b/main/bacula-client/bacula-fd-conf index 033ef74b4b..033ef74b4b 100644 --- a/testing/bacula-client/bacula-fd-conf +++ b/main/bacula-client/bacula-fd-conf | |||
diff --git a/testing/bacula-client/bacula-fd-init b/main/bacula-client/bacula-fd-init index 618b3508c7..618b3508c7 100644 --- a/testing/bacula-client/bacula-fd-init +++ b/main/bacula-client/bacula-fd-init | |||
diff --git a/testing/bacula-client/configure.in.patch b/main/bacula-client/configure.in.patch index cfe2a0b7cf..cfe2a0b7cf 100644 --- a/testing/bacula-client/configure.in.patch +++ b/main/bacula-client/configure.in.patch | |||
diff --git a/testing/bacula-client/os.m4.patch b/main/bacula-client/os.m4.patch index 95dc5666ad..95dc5666ad 100644 --- a/testing/bacula-client/os.m4.patch +++ b/main/bacula-client/os.m4.patch | |||
diff --git a/testing/bacula/APKBUILD b/main/bacula/APKBUILD index ff4161ea1c..ff4161ea1c 100644 --- a/testing/bacula/APKBUILD +++ b/main/bacula/APKBUILD | |||
diff --git a/testing/bacula/bacula-dir-conf b/main/bacula/bacula-dir-conf index 17a56161f0..17a56161f0 100644 --- a/testing/bacula/bacula-dir-conf +++ b/main/bacula/bacula-dir-conf | |||
diff --git a/testing/bacula/bacula-dir-init b/main/bacula/bacula-dir-init index 033d72f9a0..033d72f9a0 100644 --- a/testing/bacula/bacula-dir-init +++ b/main/bacula/bacula-dir-init | |||
diff --git a/testing/bacula/bacula-fd-conf b/main/bacula/bacula-fd-conf index 033ef74b4b..033ef74b4b 100644 --- a/testing/bacula/bacula-fd-conf +++ b/main/bacula/bacula-fd-conf | |||
diff --git a/testing/bacula/bacula-fd-init b/main/bacula/bacula-fd-init index 1e36a19479..1e36a19479 100644 --- a/testing/bacula/bacula-fd-init +++ b/main/bacula/bacula-fd-init | |||
diff --git a/testing/bacula/bacula-sd-conf b/main/bacula/bacula-sd-conf index 88e13aa0eb..88e13aa0eb 100644 --- a/testing/bacula/bacula-sd-conf +++ b/main/bacula/bacula-sd-conf | |||
diff --git a/testing/bacula/bacula-sd-init b/main/bacula/bacula-sd-init index 2375b8e457..2375b8e457 100644 --- a/testing/bacula/bacula-sd-init +++ b/main/bacula/bacula-sd-init | |||
diff --git a/testing/bacula/bacula.post-install b/main/bacula/bacula.post-install index a092957361..a092957361 100644 --- a/testing/bacula/bacula.post-install +++ b/main/bacula/bacula.post-install | |||
diff --git a/testing/bacula/bacula.pre-install b/main/bacula/bacula.pre-install index bfac8567a5..bfac8567a5 100644 --- a/testing/bacula/bacula.pre-install +++ b/main/bacula/bacula.pre-install | |||
diff --git a/testing/bacula/configure.in.patch b/main/bacula/configure.in.patch index cfe2a0b7cf..cfe2a0b7cf 100644 --- a/testing/bacula/configure.in.patch +++ b/main/bacula/configure.in.patch | |||
diff --git a/testing/bacula/os.m4.patch b/main/bacula/os.m4.patch index 95dc5666ad..95dc5666ad 100644 --- a/testing/bacula/os.m4.patch +++ b/main/bacula/os.m4.patch | |||
diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD index b59af1b953..0b4b28ef21 100644 --- a/main/clamav/APKBUILD +++ b/main/clamav/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Contributor: Carlo Landmeter <clandmeter at gmail> | 1 | # Contributor: Carlo Landmeter <clandmeter at gmail> |
2 | # Maintainer: Carlo Landmeter <clandmeter at gmail> | 2 | # Maintainer: Carlo Landmeter <clandmeter at gmail> |
3 | pkgname=clamav | 3 | pkgname=clamav |
4 | pkgver=0.96 | 4 | pkgver=0.96.1 |
5 | pkgrel=0 | 5 | pkgrel=0 |
6 | pkgusers=clamav | 6 | pkgusers=clamav |
7 | pkggroups=clamav | 7 | pkggroups=clamav |
@@ -75,7 +75,7 @@ package() { | |||
75 | mkdir -p "$pkgdir"/var/run/clamav "$pkgdir"/var/log/clamav | 75 | mkdir -p "$pkgdir"/var/run/clamav "$pkgdir"/var/log/clamav |
76 | } | 76 | } |
77 | 77 | ||
78 | md5sums="28ac7bec4cc03627a8e2d6e8647ee661 clamav-0.96.tar.gz | 78 | md5sums="38e7870db6e9ad0e569518499a6f3651 clamav-0.96.1.tar.gz |
79 | d64432c463850663c5041c3097f3e903 clamd.initd | 79 | d64432c463850663c5041c3097f3e903 clamd.initd |
80 | 567bc32b657dd7031b9b7beaa946203a clamd.confd | 80 | 567bc32b657dd7031b9b7beaa946203a clamd.confd |
81 | f4d1f415322905128dc27135566ad136 freshclam.initd | 81 | f4d1f415322905128dc27135566ad136 freshclam.initd |
diff --git a/main/confuse/APKBUILD b/main/confuse/APKBUILD index ec90644fa2..b58927c732 100644 --- a/main/confuse/APKBUILD +++ b/main/confuse/APKBUILD | |||
@@ -1,14 +1,14 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=confuse | 2 | pkgname=confuse |
3 | pkgver=2.6 | 3 | pkgver=2.7 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="C-library for parsing configuration files" | 5 | pkgdesc="C-library for parsing configuration files" |
6 | url="http://www.nongnu.org/confuse" | 6 | url="http://www.nongnu.org/confuse" |
7 | license="LGPL" | 7 | license="LGPL" |
8 | depends= | 8 | depends= |
9 | makedepends="flex bison pkgconfig" | 9 | makedepends="flex bison pkgconfig" |
10 | subpackages="$pkgname-dev" | 10 | subpackages="$pkgname-dev" |
11 | source="http://bzero.se/$pkgname/$pkgname-$pkgver.tar.gz" | 11 | source="http://savannah.nongnu.org/download/confuse/confuse-$pkgver.tar.gz" |
12 | 12 | ||
13 | build() { | 13 | build() { |
14 | cd "$srcdir"/$pkgname-$pkgver | 14 | cd "$srcdir"/$pkgname-$pkgver |
@@ -26,4 +26,4 @@ package() { | |||
26 | make DESTDIR="$pkgdir" install | 26 | make DESTDIR="$pkgdir" install |
27 | install -D -m644 libconfuse.pc "$pkgdir"/usr/lib/pkgconfig/libconfuse.pc | 27 | install -D -m644 libconfuse.pc "$pkgdir"/usr/lib/pkgconfig/libconfuse.pc |
28 | } | 28 | } |
29 | md5sums="0e883d66f0f58fc33585b430c652aa30 confuse-2.6.tar.gz" | 29 | md5sums="45932fdeeccbb9ef4228f1c1a25e9c8f confuse-2.7.tar.gz" |
diff --git a/testing/cryptsetup/APKBUILD b/main/cryptsetup/APKBUILD index 887d15d3ed..671df0d533 100644 --- a/testing/cryptsetup/APKBUILD +++ b/main/cryptsetup/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=cryptsetup | 2 | pkgname=cryptsetup |
3 | pkgver=1.1.0 | 3 | pkgver=1.1.2 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" | 5 | pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" |
6 | url="http://code.google.com/p/cryptsetup/" | 6 | url="http://code.google.com/p/cryptsetup/" |
@@ -22,4 +22,4 @@ package() { | |||
22 | cd "$srcdir"/$pkgname-$pkgver | 22 | cd "$srcdir"/$pkgname-$pkgver |
23 | make DESTDIR=$pkgdir install | 23 | make DESTDIR=$pkgdir install |
24 | } | 24 | } |
25 | md5sums="8177f1833f4d6aaacc5812046d2010b6 cryptsetup-1.1.0.tar.bz2" | 25 | md5sums="f3928c1f1d49fcee39bb1e8d42fe707a cryptsetup-1.1.2.tar.bz2" |
diff --git a/main/dbus/APKBUILD b/main/dbus/APKBUILD index 12f946ea4f..a1f7985072 100644 --- a/main/dbus/APKBUILD +++ b/main/dbus/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=dbus | 2 | pkgname=dbus |
3 | pkgver=1.2.24 | 3 | pkgver=1.2.24 |
4 | pkgrel=2 | 4 | pkgrel=3 |
5 | pkgdesc="Freedesktop.org message bus system" | 5 | pkgdesc="Freedesktop.org message bus system" |
6 | url="http://www.freedesktop.org/Software/dbus" | 6 | url="http://www.freedesktop.org/Software/dbus" |
7 | pkggroups="messagebus" | 7 | pkggroups="messagebus" |
@@ -10,7 +10,7 @@ subpackages="$pkgname-dev $pkgname-doc" | |||
10 | depends= | 10 | depends= |
11 | makedepends="expat-dev libx11-dev pkgconfig util-linux-ng-dev" | 11 | makedepends="expat-dev libx11-dev pkgconfig util-linux-ng-dev" |
12 | depends_dev="util-linux-ng-dev" | 12 | depends_dev="util-linux-ng-dev" |
13 | install="$pkgname.pre-install" | 13 | install="$pkgname.pre-install $pkgname.post-install" |
14 | source="http://$pkgname.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz | 14 | source="http://$pkgname.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz |
15 | $pkgname.initd | 15 | $pkgname.initd |
16 | " | 16 | " |
diff --git a/main/dbus/dbus.post-install b/main/dbus/dbus.post-install new file mode 100644 index 0000000000..305297a482 --- /dev/null +++ b/main/dbus/dbus.post-install | |||
@@ -0,0 +1,3 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | exec dbus-uuidgen --ensure | ||
diff --git a/main/diffutils/APKBUILD b/main/diffutils/APKBUILD index 66f74eff96..3ccb172450 100644 --- a/main/diffutils/APKBUILD +++ b/main/diffutils/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Leonardo Arena <rnalrd@gmail.com> | 1 | # Maintainer: Leonardo Arena <rnalrd@gmail.com> |
2 | pkgname=diffutils | 2 | pkgname=diffutils |
3 | pkgver=2.9 | 3 | pkgver=3.0 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="Show differences among files" | 5 | pkgdesc="Show differences among files" |
6 | subpackages="$pkgname-doc" | 6 | subpackages="$pkgname-doc" |
7 | url="http://www.gnu.org/software/diffutils/" | 7 | url="http://www.gnu.org/software/diffutils/" |
@@ -9,8 +9,7 @@ license="GPL2" | |||
9 | depends="" | 9 | depends="" |
10 | makedepends="" | 10 | makedepends="" |
11 | install="$pkgname.post-deinstall" | 11 | install="$pkgname.post-deinstall" |
12 | source="http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz | 12 | source="http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz" |
13 | $install" | ||
14 | 13 | ||
15 | _builddir=$srcdir/$pkgname-$pkgver | 14 | _builddir=$srcdir/$pkgname-$pkgver |
16 | 15 | ||
@@ -28,5 +27,4 @@ package() { | |||
28 | make install DESTDIR=$pkgdir | 27 | make install DESTDIR=$pkgdir |
29 | } | 28 | } |
30 | 29 | ||
31 | md5sums="d6bc1bdc874ddb14cfed4d1655a0dbbe diffutils-2.9.tar.gz | 30 | md5sums="684aaba1baab743a2a90e52162ff07da diffutils-3.0.tar.gz" |
32 | e8da9a22c2389fe5e2846b8c0de45767 diffutils.post-deinstall" | ||
diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD index a570033801..aa64dda173 100644 --- a/main/dnsmasq/APKBUILD +++ b/main/dnsmasq/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=dnsmasq | 2 | pkgname=dnsmasq |
3 | pkgver=2.52 | 3 | pkgver=2.55 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="Small forwarding DNS server" | 5 | pkgdesc="Small forwarding DNS server" |
6 | url="http://www.thekelleys.org.uk/dnsmasq/" | 6 | url="http://www.thekelleys.org.uk/dnsmasq/" |
7 | license="GPL-2" | 7 | license="GPL-2" |
@@ -35,6 +35,6 @@ package() { | |||
35 | install -D -m644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname | 35 | install -D -m644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname |
36 | install dnsmasq.conf.example "$pkgdir"/etc/dnsmasq.conf | 36 | install dnsmasq.conf.example "$pkgdir"/etc/dnsmasq.conf |
37 | } | 37 | } |
38 | md5sums="1bb32fffdb4f977ead607802b5d701d0 dnsmasq-2.52.tar.gz | 38 | md5sums="b093d7c6bc7f97ae6fd35d048529232a dnsmasq-2.55.tar.gz |
39 | db46459322a0c7d9ce4f68251fd265c4 dnsmasq.initd | 39 | db46459322a0c7d9ce4f68251fd265c4 dnsmasq.initd |
40 | 5990c2d2cb92209feacf8f3a5a7d0831 dnsmasq.confd" | 40 | 5990c2d2cb92209feacf8f3a5a7d0831 dnsmasq.confd" |
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD index 6dd77003a0..c72d0bc396 100644 --- a/main/dovecot/APKBUILD +++ b/main/dovecot/APKBUILD | |||
@@ -2,17 +2,21 @@ | |||
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
3 | pkgname=dovecot | 3 | pkgname=dovecot |
4 | pkgver=1.2.11 | 4 | pkgver=1.2.11 |
5 | pkgrel=3 | 5 | pkgrel=5 |
6 | pkgdesc="IMAP and POP3 server" | 6 | pkgdesc="IMAP and POP3 server" |
7 | url="http://www.dovecot.org/" | 7 | url="http://www.dovecot.org/" |
8 | license="LGPL-2.1" | 8 | license="LGPL-2.1" |
9 | depends= | 9 | depends="openssl" |
10 | pkgusers="dovecot" | ||
11 | pkggroups="dovecot" | ||
12 | depends="logrotate" | ||
10 | makedepends="libcap-dev zlib-dev openssl-dev bzip2-dev postgresql-dev | 13 | makedepends="libcap-dev zlib-dev openssl-dev bzip2-dev postgresql-dev |
11 | mysql-dev sqlite-dev" | 14 | mysql-dev sqlite-dev" |
12 | install="dovecot.pre-install" | 15 | install="dovecot.pre-install dovecot.post-install" |
13 | subpackages="$pkgname-doc $pkgname-dev $pkgname-pgsql $pkgname-mysql | 16 | subpackages="$pkgname-doc $pkgname-dev $pkgname-pgsql $pkgname-mysql |
14 | $pkgname-sqlite" | 17 | $pkgname-sqlite" |
15 | source="http://www.dovecot.org/releases/1.2/$pkgname-$pkgver.tar.gz | 18 | source="http://www.dovecot.org/releases/1.2/$pkgname-$pkgver.tar.gz |
19 | dovecot.logrotate | ||
16 | dovecot.initd | 20 | dovecot.initd |
17 | " | 21 | " |
18 | 22 | ||
@@ -20,6 +24,7 @@ build() { | |||
20 | cd "$srcdir/$pkgname-$pkgver" | 24 | cd "$srcdir/$pkgname-$pkgver" |
21 | 25 | ||
22 | ./configure --prefix=/usr \ | 26 | ./configure --prefix=/usr \ |
27 | --localstatedir=/var \ | ||
23 | --sysconfdir=/etc/dovecot \ | 28 | --sysconfdir=/etc/dovecot \ |
24 | --mandir=/usr/share/man \ | 29 | --mandir=/usr/share/man \ |
25 | --infodir=/usr/share/info \ | 30 | --infodir=/usr/share/info \ |
@@ -36,8 +41,27 @@ build() { | |||
36 | package() { | 41 | package() { |
37 | cd "$srcdir/$pkgname-$pkgver" | 42 | cd "$srcdir/$pkgname-$pkgver" |
38 | make DESTDIR="$pkgdir" install | 43 | make DESTDIR="$pkgdir" install |
39 | install -d "$pkgdir"/var/run/dovecot | 44 | install -d "$pkgdir"/var/run/dovecot \ |
45 | "$pkgdir"/etc/ssl/dovecot | ||
40 | install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname | 46 | install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname |
47 | install -D "$srcdir"/dovecot.logrotate "$pkgdir"/etc/logrotate.d/dovecot | ||
48 | install doc/dovecot-openssl.cnf "$pkgdir"/etc/dovecot/ | ||
49 | mv "$pkgdir"/etc/dovecot/dovecot-example.conf \ | ||
50 | "$pkgdir"/etc/dovecot/dovecot.conf || return 1 | ||
51 | |||
52 | # fix ssl dirs in defautl config and set defautl passdb to passwd | ||
53 | sed -i -e 's,^#ssl_cert_file =.*,ssl_cert_file = /etc/ssl/dovecot/server.pem,' \ | ||
54 | -e 's,^#ssl_key_file =.*,ssl_key_file = /etc/ssl/dovecot/server.key,' \ | ||
55 | -e '/passdb pam {/,/^$/{ | ||
56 | s/passdb pam/\#passdb pam/ | ||
57 | s/}/\#}/ | ||
58 | }' \ | ||
59 | -e '/\#passdb passwd {/,/^$/{ | ||
60 | s/\#passdb passwd/passdb passwd/ | ||
61 | s/\#\}/\}/ | ||
62 | }' \ | ||
63 | -e 's,#log_path =.*,log_path = /var/log/dovecot.log,' \ | ||
64 | "$pkgdir"/etc/dovecot/dovecot.conf | ||
41 | } | 65 | } |
42 | 66 | ||
43 | _mv() { | 67 | _mv() { |
@@ -67,4 +91,5 @@ sqlite() { | |||
67 | } | 91 | } |
68 | 92 | ||
69 | md5sums="bdac013fd57aa616ea4bdd9ac34557c6 dovecot-1.2.11.tar.gz | 93 | md5sums="bdac013fd57aa616ea4bdd9ac34557c6 dovecot-1.2.11.tar.gz |
94 | aec5cc797ab2acf72ce3b6bb1030345f dovecot.logrotate | ||
70 | c58b474dca20e6e60fa4f1f5b9c726e1 dovecot.initd" | 95 | c58b474dca20e6e60fa4f1f5b9c726e1 dovecot.initd" |
diff --git a/main/dovecot/dovecot.logrotate b/main/dovecot/dovecot.logrotate new file mode 100644 index 0000000000..7bd0003f7f --- /dev/null +++ b/main/dovecot/dovecot.logrotate | |||
@@ -0,0 +1,15 @@ | |||
1 | /var/log/dovecot*.log { | ||
2 | daily | ||
3 | missingok | ||
4 | copytruncate | ||
5 | rotate 7 | ||
6 | compress | ||
7 | notifempty | ||
8 | sharedscripts | ||
9 | postrotate | ||
10 | if /etc/init.d/dovecot -q status ; then \ | ||
11 | /etc/init.d/dovecot reload > /dev/null 2>&1 || true ; \ | ||
12 | fi; | ||
13 | endscript | ||
14 | } | ||
15 | |||
diff --git a/main/dovecot/dovecot.post-install b/main/dovecot/dovecot.post-install new file mode 100644 index 0000000000..a7cccddfd8 --- /dev/null +++ b/main/dovecot/dovecot.post-install | |||
@@ -0,0 +1,31 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | # based on doc/mkcert.sh | ||
4 | |||
5 | # Generates a self-signed certificate. | ||
6 | # Edit dovecot-openssl.cnf before running this. | ||
7 | |||
8 | OPENSSL=${OPENSSL-openssl} | ||
9 | SSLDIR=${SSLDIR-/etc/ssl/dovecot} | ||
10 | OPENSSLCONFIG=${OPENSSLCONFIG-/etc/dovecot/dovecot-openssl.cnf} | ||
11 | |||
12 | CERTDIR=$SSLDIR | ||
13 | KEYDIR=$SSLDIR | ||
14 | |||
15 | CERTFILE=$CERTDIR/server.pem | ||
16 | KEYFILE=$KEYDIR/server.key | ||
17 | |||
18 | if [ -e "$CERTFILE" ]; then | ||
19 | echo "Keeiping existing $CERTFILE" | ||
20 | exit 0 | ||
21 | fi | ||
22 | |||
23 | if [ -e "$KEYFILE" ]; then | ||
24 | echo "Keeiping existing $KEYFILE" | ||
25 | exit 0 | ||
26 | fi | ||
27 | |||
28 | $OPENSSL req -new -x509 -nodes -config $OPENSSLCONFIG -out $CERTFILE -keyout $KEYFILE -days 365 || exit 2 | ||
29 | chmod 0600 $KEYFILE | ||
30 | echo | ||
31 | $OPENSSL x509 -subject -fingerprint -noout -in $CERTFILE || exit 2 | ||
diff --git a/testing/ebtables/0001-link-with-gcc.patch b/main/ebtables/0001-link-with-gcc.patch index 88aba09f3f..88aba09f3f 100644 --- a/testing/ebtables/0001-link-with-gcc.patch +++ b/main/ebtables/0001-link-with-gcc.patch | |||
diff --git a/testing/ebtables/APKBUILD b/main/ebtables/APKBUILD index aedc6e8a48..b92839eb25 100644 --- a/testing/ebtables/APKBUILD +++ b/main/ebtables/APKBUILD | |||
@@ -3,7 +3,7 @@ | |||
3 | pkgname=ebtables | 3 | pkgname=ebtables |
4 | pkgver=2.0.9.1 | 4 | pkgver=2.0.9.1 |
5 | _realver=v2.0.9-1 | 5 | _realver=v2.0.9-1 |
6 | pkgrel=1 | 6 | pkgrel=2 |
7 | pkgdesc="Ethernet bridge tables - Linux Ethernet filter for the Linux bridge." | 7 | pkgdesc="Ethernet bridge tables - Linux Ethernet filter for the Linux bridge." |
8 | url="http://ebtables.sourceforge.net/" | 8 | url="http://ebtables.sourceforge.net/" |
9 | license="GPL" | 9 | license="GPL" |
@@ -49,7 +49,7 @@ package() { | |||
49 | cd "$srcdir"/$pkgname-$_realver | 49 | cd "$srcdir"/$pkgname-$_realver |
50 | make DESTDIR="$pkgdir" install | 50 | make DESTDIR="$pkgdir" install |
51 | install -D -m755 ../ebtables.initd "$pkgdir"/etc/init.d/ebtables | 51 | install -D -m755 ../ebtables.initd "$pkgdir"/etc/init.d/ebtables |
52 | install -D -m644 ../ebtables.initd "$pkgdir"/etc/conf.d/ebtables | 52 | install -D -m644 ../ebtables.confd "$pkgdir"/etc/conf.d/ebtables |
53 | } | 53 | } |
54 | 54 | ||
55 | md5sums="0e0c20adf2bba6d91dbd0b74a1a38c33 ebtables-v2.0.9-1.tar.gz | 55 | md5sums="0e0c20adf2bba6d91dbd0b74a1a38c33 ebtables-v2.0.9-1.tar.gz |
diff --git a/testing/ebtables/ebtables.confd b/main/ebtables/ebtables.confd index db46ffb587..db46ffb587 100644 --- a/testing/ebtables/ebtables.confd +++ b/main/ebtables/ebtables.confd | |||
diff --git a/testing/ebtables/ebtables.initd b/main/ebtables/ebtables.initd index 27c743c910..27c743c910 100644 --- a/testing/ebtables/ebtables.initd +++ b/main/ebtables/ebtables.initd | |||
diff --git a/main/exo/APKBUILD b/main/exo/APKBUILD index 897f279f94..427aafd5f7 100644 --- a/main/exo/APKBUILD +++ b/main/exo/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | # TODO: hal | 2 | # TODO: hal |
3 | pkgname=exo | 3 | pkgname=exo |
4 | pkgver=0.3.106 | 4 | pkgver=0.3.107 |
5 | pkgrel=2 | 5 | pkgrel=0 |
6 | pkgdesc="Extensions to Xfce by os-cillation" | 6 | pkgdesc="Extensions to Xfce by os-cillation" |
7 | url="http://www.os-cillation.com/article.php?sid=40" | 7 | url="http://www.os-cillation.com/article.php?sid=40" |
8 | license="GPL-2 LGPL-2" | 8 | license="GPL-2 LGPL-2" |
@@ -31,4 +31,4 @@ package() { | |||
31 | cd "$srcdir"/$pkgname-$pkgver | 31 | cd "$srcdir"/$pkgname-$pkgver |
32 | make DESTDIR="$pkgdir" install || return 1 | 32 | make DESTDIR="$pkgdir" install || return 1 |
33 | } | 33 | } |
34 | md5sums="927905f89252fa397e50d7a4fbf3c9a7 exo-0.3.106.tar.bz2" | 34 | md5sums="3a92cca0c99ee940db4410891c9e8498 exo-0.3.107.tar.bz2" |
diff --git a/testing/ferm/APKBUILD b/main/ferm/APKBUILD index b6710399ac..b6710399ac 100644 --- a/testing/ferm/APKBUILD +++ b/main/ferm/APKBUILD | |||
diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD index 860ec0ffe7..1f9407ecd0 100644 --- a/main/freeswitch/APKBUILD +++ b/main/freeswitch/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Contributor: Michael Mason <ms13sp@gmail.com> | 1 | # Contributor: Michael Mason <ms13sp@gmail.com> |
2 | pkgname=freeswitch | 2 | pkgname=freeswitch |
3 | pkgver=1.0.6 | 3 | pkgver=1.0.6 |
4 | pkgrel=6 | 4 | pkgrel=8 |
5 | pkgdesc="A communications platform written in C from the ground up" | 5 | pkgdesc="A communications platform written in C from the ground up" |
6 | url="http://www.freeswitch.org" | 6 | url="http://www.freeswitch.org" |
7 | license="GPL" | 7 | license="GPL" |
@@ -14,8 +14,6 @@ source="http://files.freeswitch.org/freeswitch-$pkgver.tar.gz | |||
14 | modules.conf | 14 | modules.conf |
15 | freeswitch.confd | 15 | freeswitch.confd |
16 | freeswitch.initd | 16 | freeswitch.initd |
17 | freeswitch.post-install | ||
18 | freeswitch.pre-install | ||
19 | " | 17 | " |
20 | 18 | ||
21 | build() { | 19 | build() { |
@@ -32,6 +30,8 @@ build() { | |||
32 | --with-rundir=/var/run/freeswitch \ | 30 | --with-rundir=/var/run/freeswitch \ |
33 | --mandir=/usr/share/man \ | 31 | --mandir=/usr/share/man \ |
34 | --infodir=/usr/share/info \ | 32 | --infodir=/usr/share/info \ |
33 | --with-devrandom=/dev/urandom \ | ||
34 | || return 1 | ||
35 | 35 | ||
36 | make all || return 1 | 36 | make all || return 1 |
37 | } | 37 | } |
@@ -56,6 +56,4 @@ package(){ | |||
56 | md5sums="388effee587887a81fe7f411b7350590 freeswitch-1.0.6.tar.gz | 56 | md5sums="388effee587887a81fe7f411b7350590 freeswitch-1.0.6.tar.gz |
57 | c05f2356be159e99b3845f5260a33599 modules.conf | 57 | c05f2356be159e99b3845f5260a33599 modules.conf |
58 | c608cca8ad773acebf201f581438c7e7 freeswitch.confd | 58 | c608cca8ad773acebf201f581438c7e7 freeswitch.confd |
59 | a15f739b6f4f2c1685ab9f8831d30ca6 freeswitch.initd | 59 | 6973e15d72e5876152b160bd9e8d282b freeswitch.initd" |
60 | 107c52398ff88275006b8223ee0b4907 freeswitch.post-install | ||
61 | 25945ad43b7dd988f37bf6f2603e22be freeswitch.pre-install" | ||
diff --git a/main/freeswitch/freeswitch.initd b/main/freeswitch/freeswitch.initd index 0538fff56b..91df7e2acf 100755 --- a/main/freeswitch/freeswitch.initd +++ b/main/freeswitch/freeswitch.initd | |||
@@ -4,55 +4,60 @@ | |||
4 | # $Header: $ | 4 | # $Header: $ |
5 | 5 | ||
6 | depend() { | 6 | depend() { |
7 | need net | 7 | need net |
8 | } | 8 | } |
9 | 9 | ||
10 | opts="reload" | 10 | opts="reload" |
11 | pidfile=/var/run/freeswitch/freeswitch.pid | ||
11 | 12 | ||
12 | start() { | 13 | start() { |
13 | local OPTS | 14 | local OPTS |
14 | 15 | ||
15 | [ -n "${FREESWITCH_USER}" ] && \ | 16 | [ -n "${FREESWITCH_USER}" ] && \ |
16 | OPTS="${OPTS} -u ${FREESWITCH_USER}" | 17 | OPTS="${OPTS} -u ${FREESWITCH_USER}" |
17 | 18 | ||
18 | [ -n "${FREESWITCH_GROUP}" ] && \ | 19 | [ -n "${FREESWITCH_GROUP}" ] && \ |
19 | OPTS="${OPTS} -g ${FREESWITCH_GROUP}" | 20 | OPTS="${OPTS} -g ${FREESWITCH_GROUP}" |
20 | 21 | ||
21 | [ -n "${FREESWITCH_OPTS}" ] && \ | 22 | [ -n "${FREESWITCH_OPTS}" ] && \ |
22 | OPTS="${OPTS} ${FREESWITCH_OPTS}" | 23 | OPTS="${OPTS} ${FREESWITCH_OPTS}" |
23 | 24 | ||
24 | ebegin "Starting Freeswitch" | 25 | ebegin "Starting Freeswitch" |
25 | limits | 26 | limits |
26 | start-stop-daemon --start --quiet --exec /usr/bin/freeswitch \ | 27 | start-stop-daemon --start --quiet --exec /usr/bin/freeswitch \ |
27 | -- -nc -conf /etc/freeswitch -log /var/log/freeswitch \ | 28 | -- \ |
28 | -run /var/run/freeswitch -db /var/lib/freeswitch/db \ | 29 | -nc -conf /etc/freeswitch -log /var/log/freeswitch \ |
29 | -htdocs /usr/share/freeswitch/htdocs \ | 30 | -run /var/run/freeswitch -db /var/lib/freeswitch/db \ |
30 | -scripts /usr/share/freeswitch/scripts ${OPTS} | 31 | -htdocs /usr/share/freeswitch/htdocs \ |
31 | eend $? | 32 | -scripts /usr/share/freeswitch/scripts ${OPTS} |
33 | eend $? | ||
32 | } | 34 | } |
33 | 35 | ||
34 | # Recomended ULIMIT settings | 36 | # Recomended ULIMIT settings |
35 | # http://tinyurl.com/2dr467l (i,q,u,x not suppoted) | 37 | # http://tinyurl.com/2dr467l (i,q,u,x not suppoted) |
36 | 38 | ||
37 | limits() { | 39 | limits() { |
38 | ulimit -c unlimited | 40 | ulimit -c unlimited |
39 | ulimit -d unlimited | 41 | ulimit -d unlimited |
40 | ulimit -f unlimited | 42 | ulimit -f unlimited |
41 | ulimit -n 999999 | 43 | ulimit -n 999999 |
42 | ulimit -v unlimited | 44 | ulimit -v unlimited |
43 | ulimit -s 244 | 45 | ulimit -s 244 |
44 | ulimit -l unlimited | 46 | ulimit -l unlimited |
45 | } | 47 | } |
46 | 48 | ||
47 | stop() { | 49 | stop() { |
48 | ebegin "Stopping Freeswitch" | 50 | ebegin "Stopping Freeswitch" |
49 | /usr/bin/freeswitch -stop | 51 | start-stop-daemon --quiet --stop \ |
50 | eend $? | 52 | --pidfile $pidfile \ |
53 | --retry 10 \ | ||
54 | --exec /usr/bin/freeswitch | ||
55 | eend $? | ||
51 | } | 56 | } |
52 | 57 | ||
53 | reload() { | 58 | reload() { |
54 | start-stop-daemon --stop --signal 1 --quiet --pidfile \ | 59 | start-stop-daemon --stop --signal 1 --quiet \ |
55 | /var/run/freeswitch.pid --name freeswitch | 60 | --pidfile $pidfile --name freeswitch |
56 | return 0 | 61 | return 0 |
57 | } | 62 | } |
58 | 63 | ||
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD index 4668a06856..da3bdc129f 100644 --- a/main/gcc/APKBUILD +++ b/main/gcc/APKBUILD | |||
@@ -1,12 +1,12 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=gcc | 2 | pkgname=gcc |
3 | pkgver=4.4.3 | 3 | pkgver=4.4.4 |
4 | _pv=4.4.2 | 4 | _pv=4.4.2 |
5 | _specsver=0.1.7 | 5 | _specsver=0.1.7 |
6 | _espfver=0.3.6 | 6 | _espfver=0.3.6 |
7 | _uclibc_abiver=0.9.32 | 7 | _uclibc_abiver=0.9.32 |
8 | 8 | ||
9 | pkgrel=3 | 9 | pkgrel=0 |
10 | pkgdesc="The GNU Compiler Collection" | 10 | pkgdesc="The GNU Compiler Collection" |
11 | url="http://gcc.gnu.org" | 11 | url="http://gcc.gnu.org" |
12 | license="GPL LGPL" | 12 | license="GPL LGPL" |
@@ -126,8 +126,8 @@ libgomp() { | |||
126 | mv "$pkgdir"/usr/lib/libgomp.so* "$subpkgdir"/usr/lib/ | 126 | mv "$pkgdir"/usr/lib/libgomp.so* "$subpkgdir"/usr/lib/ |
127 | } | 127 | } |
128 | 128 | ||
129 | md5sums="054b66f315b3d04ad06544ce26e72365 gcc-core-4.4.3.tar.bz2 | 129 | md5sums="eb68755f64b9a4e37751992abb41c4fc gcc-core-4.4.4.tar.bz2 |
130 | cd179ec4f05ee17ce76464da25a2674c gcc-g++-4.4.3.tar.bz2 | 130 | d51a6ec3eac1a90e7fc280d976ce7f80 gcc-g++-4.4.4.tar.bz2 |
131 | 72643cf4f9751d6cbfdbce483b92461d gcc-4.4.2-espf-0.3.6.tar.bz2 | 131 | 72643cf4f9751d6cbfdbce483b92461d gcc-4.4.2-espf-0.3.6.tar.bz2 |
132 | 528926b586b2591474b6c2a7ef8ee6d7 gcc-4.4.2-specs-0.1.7.tar.bz2 | 132 | 528926b586b2591474b6c2a7ef8ee6d7 gcc-4.4.2-specs-0.1.7.tar.bz2 |
133 | c4045bfa85d8be780affd465be9d8ca8 gcc-spec-env.patch | 133 | c4045bfa85d8be780affd465be9d8ca8 gcc-spec-env.patch |
diff --git a/unstable/trac/APKBUILD b/main/geh/APKBUILD index 8292ef9e12..4f768bdaa6 100644 --- a/unstable/trac/APKBUILD +++ b/main/geh/APKBUILD | |||
@@ -1,30 +1,39 @@ | |||
1 | # Contributor: Michael Mason <ms13sp@gmail.com> | 1 | # Contributor: |
2 | # Maintainer: Michael Mason <ms13sp@gmail.com> | 2 | # Maintainer: |
3 | pkgname=trac | 3 | pkgname=geh |
4 | _altname=Trac | 4 | pkgver=0.2.0 |
5 | pkgver=0.11.5 | ||
6 | pkgrel=0 | 5 | pkgrel=0 |
7 | pkgdesc="Trac is a minimalistic web-based project management, wiki and bug/issue tracking system." | 6 | pkgdesc="a simple commandline image viewer written in C/Gtk+" |
8 | url="http://trac.edgewall.com/" | 7 | url="https://projects.pekdon.net/projects/geh" |
9 | license="GPL" | 8 | license="GPL" |
10 | depends="python" | 9 | depends= |
11 | makedepends="postgresql-dev" | 10 | makedepends="gtk+-dev intltool" |
12 | install= | 11 | install= |
13 | subpackages="$pkgname-dev $pkgname-doc" | 12 | subpackages="$pkgname-doc" |
14 | source="ftp://ftp.edgewall.com/pub/$pkgname/$_altname-$pkgver.tar.gz" | 13 | source="http://projects.pekdon.net/projects/geh/files/geh-$pkgver.tar.gz" |
15 | 14 | ||
16 | # append extra dependencies to -dev subpackage | 15 | # append extra dependencies to -dev subpackage |
17 | # remove if not used. | 16 | # remove if not used. |
18 | # depends_dev="somepackage-dev" | 17 | # depends_dev="somepackage-dev" |
19 | 18 | ||
20 | build() { | 19 | _builddir="$srcdir"/$pkgname-$pkgver |
21 | cd "$srcdir"/$_altname-$pkgver | 20 | |
21 | prepare() { | ||
22 | cd "$_builddir" | ||
23 | # apply patches here | ||
24 | } | ||
22 | 25 | ||
26 | build() { | ||
27 | cd "$_builddir" | ||
23 | ./configure --prefix=/usr \ | 28 | ./configure --prefix=/usr \ |
24 | --sysconfdir=/etc \ | 29 | --sysconfdir=/etc \ |
25 | --mandir=/usr/share/man \ | 30 | --mandir=/usr/share/man \ |
26 | --infodir=/usr/share/info | 31 | --infodir=/usr/share/info |
27 | make || return 1 | 32 | make || return 1 |
33 | } | ||
34 | |||
35 | package() { | ||
36 | cd "$_builddir" | ||
28 | make DESTDIR="$pkgdir" install | 37 | make DESTDIR="$pkgdir" install |
29 | 38 | ||
30 | # remove the 2 lines below (and this) if there is no init.d script | 39 | # remove the 2 lines below (and this) if there is no init.d script |
@@ -32,4 +41,4 @@ build() { | |||
32 | # install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname | 41 | # install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname |
33 | } | 42 | } |
34 | 43 | ||
35 | md5sums="c8042490096a49478580fd599ad26322 Trac-0.11.5.tar.gz" | 44 | md5sums="2349b774e7f0c288061fcfc8c296f20d geh-0.2.0.tar.gz" |
diff --git a/testing/gnumeric/APKBUILD b/main/gnumeric/APKBUILD index ef7d620a46..8fbcb018d6 100644 --- a/testing/gnumeric/APKBUILD +++ b/main/gnumeric/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=gnumeric | 2 | pkgname=gnumeric |
3 | pkgver=1.10.3 | 3 | pkgver=1.10.5 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="A GNOME Spreadsheet Program" | 5 | pkgdesc="A GNOME Spreadsheet Program" |
6 | url="http://www.gnome.org/projects/gnumeric/" | 6 | url="http://www.gnome.org/projects/gnumeric/" |
@@ -27,4 +27,4 @@ package() { | |||
27 | cd "$_builddir" | 27 | cd "$_builddir" |
28 | make -j1 DESTDIR="$pkgdir" install || return 1 | 28 | make -j1 DESTDIR="$pkgdir" install || return 1 |
29 | } | 29 | } |
30 | md5sums="7da8b0acac1395c6fb049d5be7da37ef gnumeric-1.10.3.tar.bz2" | 30 | md5sums="157b0bde46435566122327696a44d4cb gnumeric-1.10.5.tar.bz2" |
diff --git a/main/gobject-introspection/APKBUILD b/main/gobject-introspection/APKBUILD index ebbefb1c41..a27d4607c3 100644 --- a/main/gobject-introspection/APKBUILD +++ b/main/gobject-introspection/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=gobject-introspection | 2 | pkgname=gobject-introspection |
3 | pkgver=0.6.10 | 3 | pkgver=0.6.14 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="Introspection system for GObject-based libraries" | 5 | pkgdesc="Introspection system for GObject-based libraries" |
6 | url="http://live.gnome.org/GObjectInstrospection" | 6 | url="http://live.gnome.org/GObjectInstrospection" |
@@ -33,4 +33,4 @@ libgirepository() { | |||
33 | mv "$pkgdir"/usr/lib/libgirepository*.so* "$subpkgdir"/usr/lib/ | 33 | mv "$pkgdir"/usr/lib/libgirepository*.so* "$subpkgdir"/usr/lib/ |
34 | } | 34 | } |
35 | 35 | ||
36 | md5sums="cdf7af644a0407c3fd2d57ba2bb3549f gobject-introspection-0.6.10.tar.bz2" | 36 | md5sums="7ea9be9a347b5c408fd3c3907803de9b gobject-introspection-0.6.14.tar.bz2" |
diff --git a/main/goffice/APKBUILD b/main/goffice/APKBUILD index 51c0be8d7f..513f25f040 100644 --- a/main/goffice/APKBUILD +++ b/main/goffice/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=goffice | 2 | pkgname=goffice |
3 | pkgver=0.8.3 | 3 | pkgver=0.8.5 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" | 5 | pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" |
6 | url="http://www.gnome.org" | 6 | url="http://www.gnome.org" |
@@ -26,4 +26,4 @@ package() { | |||
26 | cd "$srcdir"/$pkgname-$pkgver | 26 | cd "$srcdir"/$pkgname-$pkgver |
27 | make DESTDIR="$pkgdir" install || return 1 | 27 | make DESTDIR="$pkgdir" install || return 1 |
28 | } | 28 | } |
29 | md5sums="f8c4fd47e1ef9d2512126d1074952201 goffice-0.8.3.tar.bz2" | 29 | md5sums="3dda09fa540c947d45384b53713e49d5 goffice-0.8.5.tar.bz2" |
diff --git a/main/gtk+/APKBUILD b/main/gtk+/APKBUILD index 1f5e44377d..07fba13ccf 100644 --- a/main/gtk+/APKBUILD +++ b/main/gtk+/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=gtk+ | 2 | pkgname=gtk+ |
3 | pkgver=2.20.1 | 3 | pkgver=2.20.1 |
4 | pkgrel=0 | 4 | pkgrel=1 |
5 | pkgdesc="The GTK+ Toolkit (v2)" | 5 | pkgdesc="The GTK+ Toolkit (v2)" |
6 | url="http://www.gtk.org/" | 6 | url="http://www.gtk.org/" |
7 | install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" | 7 | install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" |
@@ -34,7 +34,7 @@ makedepends="pkgconfig | |||
34 | zlib-dev" | 34 | zlib-dev" |
35 | source="http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.bz2" | 35 | source="http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.bz2" |
36 | 36 | ||
37 | depends_dev="atk-dev pango-dev cairo-dev glib-dev" | 37 | depends_dev="atk-dev pango-dev cairo-dev glib-dev intltool" |
38 | build() { | 38 | build() { |
39 | cd "$srcdir"/gtk+-$pkgver | 39 | cd "$srcdir"/gtk+-$pkgver |
40 | ./configure --prefix=/usr \ | 40 | ./configure --prefix=/usr \ |
diff --git a/testing/gtkspell/APKBUILD b/main/gtkspell/APKBUILD index 7e8d2a1dcc..7e8d2a1dcc 100644 --- a/testing/gtkspell/APKBUILD +++ b/main/gtkspell/APKBUILD | |||
diff --git a/main/heimdal/APKBUILD b/main/heimdal/APKBUILD index deab8f8687..1bf4d91fc1 100644 --- a/main/heimdal/APKBUILD +++ b/main/heimdal/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Maintainer: Leonardo Arena <rnalrd@gmail.com> | 1 | # Maintainer: Leonardo Arena <rnalrd@gmail.com> |
2 | # Contributor: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Contributor: Natanael Copa <ncopa@alpinelinux.org> |
3 | pkgname=heimdal | 3 | pkgname=heimdal |
4 | pkgver=1.3.1 | 4 | pkgver=1.3.3 |
5 | pkgrel=5 | 5 | pkgrel=0 |
6 | pkgdesc="An implementation of Kerberos 5" | 6 | pkgdesc="An implementation of Kerberos 5" |
7 | url="http://www.h5l.org/" | 7 | url="http://www.h5l.org/" |
8 | license="BSD" | 8 | license="BSD" |
@@ -20,9 +20,7 @@ source="http://ftp4.de.freesbie.org/pub/misc/heimdal/src/$pkgname-$pkgver.tar.gz | |||
20 | 013_all_heimdal-pthread-lib.patch | 20 | 013_all_heimdal-pthread-lib.patch |
21 | 014_all_heimdal-path.patch | 21 | 014_all_heimdal-path.patch |
22 | 100-check-com_err-pthread.patch | 22 | 100-check-com_err-pthread.patch |
23 | heimdal-c++-safe-krb5_cccol_cursor.patch | ||
24 | heimdal-locate_plugin-header.patch | 23 | heimdal-locate_plugin-header.patch |
25 | return-invalid-enctype-for-weak-crypto.patch | ||
26 | " | 24 | " |
27 | 25 | ||
28 | # krb5.h needs com_err.h | 26 | # krb5.h needs com_err.h |
@@ -40,9 +38,7 @@ prepare() { | |||
40 | patch -Np1 -i ../013_all_heimdal-pthread-lib.patch || return 1 | 38 | patch -Np1 -i ../013_all_heimdal-pthread-lib.patch || return 1 |
41 | patch -Np0 -i ../014_all_heimdal-path.patch || return 1 | 39 | patch -Np0 -i ../014_all_heimdal-path.patch || return 1 |
42 | patch -Np1 -i ../100-check-com_err-pthread.patch || return 1 | 40 | patch -Np1 -i ../100-check-com_err-pthread.patch || return 1 |
43 | patch -Np1 -i ../heimdal-c++-safe-krb5_cccol_cursor.patch || return 1 | ||
44 | patch -Np1 -i ../heimdal-locate_plugin-header.patch || return 1 | 41 | patch -Np1 -i ../heimdal-locate_plugin-header.patch || return 1 |
45 | patch -Np1 -i ../return-invalid-enctype-for-weak-crypto.patch || return 1 | ||
46 | 42 | ||
47 | # name clash with ruserpass in netdb.h | 43 | # name clash with ruserpass in netdb.h |
48 | sed -i -e 's/ruserpass/ruserpw/g' appl/ftp/ftp/*.[ch] || return 1 | 44 | sed -i -e 's/ruserpass/ruserpw/g' appl/ftp/ftp/*.[ch] || return 1 |
@@ -169,7 +165,7 @@ kf() { | |||
169 | mv $pkgdir/usr/bin/kf $subpkgdir/usr/bin/kf | 165 | mv $pkgdir/usr/bin/kf $subpkgdir/usr/bin/kf |
170 | } | 166 | } |
171 | 167 | ||
172 | md5sums="4ce17deae040a3519e542f48fd901f21 heimdal-1.3.1.tar.gz | 168 | md5sums="963c09f1b14c41660be70b55fae9f163 heimdal-1.3.3.tar.gz |
173 | 98e28f11f906c967aac22d6184102c9e 001_all_heimdal-no_libedit.patch | 169 | 98e28f11f906c967aac22d6184102c9e 001_all_heimdal-no_libedit.patch |
174 | 6d5571bdedba2e2423b90bccdbac2c0a 002_all_heimdal-fPIC.patch | 170 | 6d5571bdedba2e2423b90bccdbac2c0a 002_all_heimdal-fPIC.patch |
175 | 2feec3924ee5230b54175b4d4000c872 003_all_heimdal-rxapps.patch | 171 | 2feec3924ee5230b54175b4d4000c872 003_all_heimdal-rxapps.patch |
@@ -177,6 +173,4 @@ md5sums="4ce17deae040a3519e542f48fd901f21 heimdal-1.3.1.tar.gz | |||
177 | 1b8665b771c4eb6b56ea8582c96e56e3 013_all_heimdal-pthread-lib.patch | 173 | 1b8665b771c4eb6b56ea8582c96e56e3 013_all_heimdal-pthread-lib.patch |
178 | 8208ae8c0b6ff5ab4f64af1693e9e396 014_all_heimdal-path.patch | 174 | 8208ae8c0b6ff5ab4f64af1693e9e396 014_all_heimdal-path.patch |
179 | e73205200f9641b5d969427ffb04282a 100-check-com_err-pthread.patch | 175 | e73205200f9641b5d969427ffb04282a 100-check-com_err-pthread.patch |
180 | 7ebff9a320f18ed62f5fcb68c8fc18b8 heimdal-c++-safe-krb5_cccol_cursor.patch | 176 | 248ab80b44568171e432a23524f4fe39 heimdal-locate_plugin-header.patch" |
181 | 248ab80b44568171e432a23524f4fe39 heimdal-locate_plugin-header.patch | ||
182 | a8342f77a1aedb4f332983bcbf141827 return-invalid-enctype-for-weak-crypto.patch" | ||
diff --git a/main/heimdal/heimdal-c++-safe-krb5_cccol_cursor.patch b/main/heimdal/heimdal-c++-safe-krb5_cccol_cursor.patch deleted file mode 100644 index c688794533..0000000000 --- a/main/heimdal/heimdal-c++-safe-krb5_cccol_cursor.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | --- heimdal-1.3.1-old/lib/krb5/cache.c Sat Nov 21 15:41:51 2009 | ||
2 | +++ heimdal-1.3.1/lib/krb5/cache.c Thu Jan 21 09:12:13 2010 | ||
3 | @@ -1347,10 +1347,11 @@ | ||
4 | * | ||
5 | */ | ||
6 | |||
7 | -struct krb5_cccol_cursor { | ||
8 | +struct krb5_cccol_cursor_data { | ||
9 | int idx; | ||
10 | krb5_cc_cache_cursor cursor; | ||
11 | }; | ||
12 | +/* typedef of krb5_cccol_cursor is in krb5.h */ | ||
13 | |||
14 | /** | ||
15 | * Get a new cache interation cursor that will interate over all | ||
16 | --- heimdal-1.3.1-old/lib/krb5/krb5.h Sat Nov 21 15:41:51 2009 | ||
17 | +++ heimdal-1.3.1/lib/krb5/krb5.h Thu Jan 21 09:12:54 2010 | ||
18 | @@ -311,7 +311,7 @@ | ||
19 | NULL) | ||
20 | |||
21 | typedef void *krb5_cc_cursor; | ||
22 | -typedef struct krb5_cccol_cursor *krb5_cccol_cursor; | ||
23 | +typedef struct krb5_cccol_cursor_data *krb5_cccol_cursor; | ||
24 | |||
25 | typedef struct krb5_ccache_data { | ||
26 | const struct krb5_cc_ops *ops; | ||
diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD index 3778adc960..60ecebbec5 100644 --- a/main/imagemagick/APKBUILD +++ b/main/imagemagick/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Contributor: Carlo Landmeter <clandmeter@gmail.com> | 1 | # Contributor: Carlo Landmeter <clandmeter@gmail.com> |
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
3 | pkgname=imagemagick | 3 | pkgname=imagemagick |
4 | pkgver=6.6.1.5 | 4 | pkgver=6.6.2.0 |
5 | _pkgver=${pkgver%.*}-${pkgver##*.} | 5 | _pkgver=${pkgver%.*}-${pkgver##*.} |
6 | pkgrel=0 | 6 | pkgrel=0 |
7 | pkgdesc="A collection of tools and libraries for many image formats" | 7 | pkgdesc="A collection of tools and libraries for many image formats" |
@@ -47,4 +47,4 @@ dev() { | |||
47 | "$pkgdir"/usr/lib/ImageMagick-$_v/modules-Q16/filters/ | 47 | "$pkgdir"/usr/lib/ImageMagick-$_v/modules-Q16/filters/ |
48 | } | 48 | } |
49 | 49 | ||
50 | md5sums="ab2468747f3960bdc8d779e89b052860 ImageMagick-6.6.1-5.tar.gz" | 50 | md5sums="d84ec4e436b0b4f79812ac89703777a6 ImageMagick-6.6.2-0.tar.gz" |
diff --git a/main/iproute2-qos/APKBUILD b/main/iproute2-qos/APKBUILD index bb0b27a6f3..cb5ef09206 100644 --- a/main/iproute2-qos/APKBUILD +++ b/main/iproute2-qos/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Contributor: Ilya Strelkin <iilluzion@gmail.com> | 1 | # Contributor: Ilya Strelkin <iilluzion@gmail.com> |
2 | # Maintainer: Ilya Strelkin <iilluzion@gmail.com> | 2 | # Maintainer: Ilya Strelkin <iilluzion@gmail.com> |
3 | pkgname=iproute2-qos | 3 | pkgname=iproute2-qos |
4 | pkgver=0.3 | 4 | pkgver=0.4 |
5 | pkgrel=0 | 5 | pkgrel=0 |
6 | pkgdesc="Scripts to set up quality of service with iproute2" | 6 | pkgdesc="Scripts to set up quality of service with iproute2" |
7 | url="http://git.alpinelinux.org/cgit/aports" | 7 | url="http://git.alpinelinux.org/cgit/aports" |
@@ -19,7 +19,7 @@ build() { | |||
19 | "$pkgdir"/etc/conf.d/qos.ifb0.sample | 19 | "$pkgdir"/etc/conf.d/qos.ifb0.sample |
20 | } | 20 | } |
21 | 21 | ||
22 | md5sums="dda96b445c6e4fe377e918f860825fb1 qos.initd | 22 | md5sums="13d9c58253905f349b953593036b8134 qos.initd |
23 | 79cecb47b3d1f623d2f6790044b3afee qos.eth0.sample | 23 | 79cecb47b3d1f623d2f6790044b3afee qos.eth0.sample |
24 | 9f8d3514081624ea2ad2606c1564c759 qos.ifb0.sample | 24 | 9f8d3514081624ea2ad2606c1564c759 qos.ifb0.sample |
25 | 785aff5d4284c47038a009797c576e34 setup-qos" | 25 | 785aff5d4284c47038a009797c576e34 setup-qos" |
diff --git a/main/iproute2-qos/qos.initd b/main/iproute2-qos/qos.initd index 9986a8cce4..09677353a9 100644 --- a/main/iproute2-qos/qos.initd +++ b/main/iproute2-qos/qos.initd | |||
@@ -225,11 +225,11 @@ set_filters() | |||
225 | set_htb() | 225 | set_htb() |
226 | { | 226 | { |
227 | $ECHO tc qdisc add dev $DEV root handle 1 htb default 60 | 227 | $ECHO tc qdisc add dev $DEV root handle 1 htb default 60 |
228 | $ECHO tc class add dev $DEV parent 1: classid 1:2 htb rate $DEV_RATE | 228 | $ECHO tc class add dev $DEV parent 1: classid 1:2 htb rate $DEV_RATE burst $(($DEV_RATE*5/4)) |
229 | $ECHO tc class add dev $DEV parent 1:2 classid 1:30 htb rate $WAN_SUB_RATE | 229 | $ECHO tc class add dev $DEV parent 1:2 classid 1:30 htb rate $WAN_SUB_RATE burst $(($WAN_SUB_RATE*5/4)) |
230 | $ECHO tc class add dev $DEV parent 1:30 classid 1:40 htb rate $INTERACTIVE_RATE prio 1 | 230 | $ECHO tc class add dev $DEV parent 1:30 classid 1:40 htb rate $INTERACTIVE_RATE ceil $WAN_SUB_RATE prio 1 |
231 | $ECHO tc class add dev $DEV parent 1:30 classid 1:50 htb rate $PRIVILEGED_RATE ceil $WAN_SUB_RATE prio 3 | 231 | $ECHO tc class add dev $DEV parent 1:30 classid 1:50 htb rate $PRIVILEGED_RATE ceil $WAN_SUB_RATE prio 3 burst $(($WAN_SUB_RATE*5/4)) |
232 | $ECHO tc class add dev $DEV parent 1:30 classid 1:60 htb rate $BESTEFFORT_RATE ceil $WAN_SUB_RATE prio 6 | 232 | $ECHO tc class add dev $DEV parent 1:30 classid 1:60 htb rate $BESTEFFORT_RATE ceil $WAN_SUB_RATE prio 6 burst $(($WAN_SUB_RATE*5/4)) |
233 | 233 | ||
234 | if [ $OUT_OF_WAN_RATE -gt 0 ]; then | 234 | if [ $OUT_OF_WAN_RATE -gt 0 ]; then |
235 | $ECHO tc class add dev $DEV parent 1:2 classid 1:70 htb rate $OUT_OF_WAN_RATE prio 7 | 235 | $ECHO tc class add dev $DEV parent 1:2 classid 1:70 htb rate $OUT_OF_WAN_RATE prio 7 |
@@ -250,7 +250,7 @@ set_hfsc() | |||
250 | $ECHO tc qdisc add dev $DEV root handle 1 hfsc default 60 | 250 | $ECHO tc qdisc add dev $DEV root handle 1 hfsc default 60 |
251 | $ECHO tc class add dev $DEV parent 1: classid 1:2 hfsc sc rate $DEV_RATE ul rate $DEV_RATE | 251 | $ECHO tc class add dev $DEV parent 1: classid 1:2 hfsc sc rate $DEV_RATE ul rate $DEV_RATE |
252 | $ECHO tc class add dev $DEV parent 1:2 classid 1:30 hfsc sc rate $WAN_SUB_RATE ul rate $WAN_SUB_RATE | 252 | $ECHO tc class add dev $DEV parent 1:2 classid 1:30 hfsc sc rate $WAN_SUB_RATE ul rate $WAN_SUB_RATE |
253 | $ECHO tc class add dev $DEV parent 1:30 classid 1:40 hfsc sc umax $INTERACTIVE_HFSC_UMAX dmax $INTERACTIVE_HFSC_DMAX rate $INTERACTIVE_RATE ul rate $INTERACTIVE_RATE | 253 | $ECHO tc class add dev $DEV parent 1:30 classid 1:40 hfsc sc umax $INTERACTIVE_HFSC_UMAX dmax $INTERACTIVE_HFSC_DMAX rate $INTERACTIVE_RATE ul rate $WAN_SUB_RATE |
254 | $ECHO tc class add dev $DEV parent 1:30 classid 1:50 hfsc sc umax $PRIVILEGED_HFSC_UMAX dmax $PRIVILEGED_HFSC_DMAX rate $PRIVILEGED_RATE ul rate $WAN_SUB_RATE | 254 | $ECHO tc class add dev $DEV parent 1:30 classid 1:50 hfsc sc umax $PRIVILEGED_HFSC_UMAX dmax $PRIVILEGED_HFSC_DMAX rate $PRIVILEGED_RATE ul rate $WAN_SUB_RATE |
255 | $ECHO tc class add dev $DEV parent 1:30 classid 1:60 hfsc sc rate $BESTEFFORT_RATE ul rate $WAN_SUB_RATE | 255 | $ECHO tc class add dev $DEV parent 1:30 classid 1:60 hfsc sc rate $BESTEFFORT_RATE ul rate $WAN_SUB_RATE |
256 | 256 | ||
@@ -272,7 +272,7 @@ set_prio() | |||
272 | { | 272 | { |
273 | PARENT_CLASSID=10 | 273 | PARENT_CLASSID=10 |
274 | $ECHO tc qdisc add dev $DEV root handle 1 prio bands 2 priomap 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 # by default unclassified traffic goes to flowid 1:2 | 274 | $ECHO tc qdisc add dev $DEV root handle 1 prio bands 2 priomap 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 # by default unclassified traffic goes to flowid 1:2 |
275 | $ECHO tc qdisc add dev $DEV parent 1:1 handle 40: tbf rate $INTERACTIVE_RATE burst $INTERACTIVE_PRIO_BURST latency $INTERACTIVE_PRIO_LATENCY | 275 | $ECHO tc qdisc add dev $DEV parent 1:1 handle 40: tbf rate $INTERACTIVE_RATE burst $WAN_SUB_RATE latency $INTERACTIVE_PRIO_LATENCY |
276 | $ECHO tc qdisc add dev $DEV parent 1:2 handle $PARENT_CLASSID: htb default 60 | 276 | $ECHO tc qdisc add dev $DEV parent 1:2 handle $PARENT_CLASSID: htb default 60 |
277 | $ECHO tc class add dev $DEV parent $PARENT_CLASSID: classid $PARENT_CLASSID:30 htb rate $WAN_SUB_RATE | 277 | $ECHO tc class add dev $DEV parent $PARENT_CLASSID: classid $PARENT_CLASSID:30 htb rate $WAN_SUB_RATE |
278 | $ECHO tc class add dev $DEV parent $PARENT_CLASSID:30 classid $PARENT_CLASSID:50 htb rate $PRIVILEGED_RATE ceil $WAN_SUB_RATE prio 3 | 278 | $ECHO tc class add dev $DEV parent $PARENT_CLASSID:30 classid $PARENT_CLASSID:50 htb rate $PRIVILEGED_RATE ceil $WAN_SUB_RATE prio 3 |
@@ -309,7 +309,7 @@ set_police() | |||
309 | # burst = rate / 17 (taken basing on experemental results) | 309 | # burst = rate / 17 (taken basing on experemental results) |
310 | 310 | ||
311 | POLICE_BURST_SCALE=17 | 311 | POLICE_BURST_SCALE=17 |
312 | WAN_POLICE_BURST=$((WAN_RATE / POLICE_BURST_SCALE)) | 312 | WAN_POLICE_BURST=$((WAN_RATE / POLICE_BURST_SCALE)) |
313 | 313 | ||
314 | WAN_POLICE_FLOWID=1 | 314 | WAN_POLICE_FLOWID=1 |
315 | 315 | ||
@@ -329,9 +329,9 @@ set_cpolice() | |||
329 | # burst = rate / 17 (taken basing on experemental results) | 329 | # burst = rate / 17 (taken basing on experemental results) |
330 | 330 | ||
331 | POLICE_BURST_SCALE=17 | 331 | POLICE_BURST_SCALE=17 |
332 | INTERACTIVE_POLICE_BURST=$((INTERACTIVE_RATE / POLICE_BURST_SCALE)) | 332 | INTERACTIVE_POLICE_BURST=$((INTERACTIVE_RATE / POLICE_BURST_SCALE)) |
333 | PRIVILEGED_POLICE_BURST=$((PRIVILEGED_RATE / POLICE_BURST_SCALE)) | 333 | PRIVILEGED_POLICE_BURST=$((PRIVILEGED_RATE / POLICE_BURST_SCALE)) |
334 | BESTEFFORT_POLICE_BURST=$((BESTEFFORT_RATE / POLICE_BURST_SCALE)) | 334 | BESTEFFORT_POLICE_BURST=$((BESTEFFORT_RATE / POLICE_BURST_SCALE)) |
335 | 335 | ||
336 | CLASS_TYPES="INTERACTIVE PRIVILEGED" | 336 | CLASS_TYPES="INTERACTIVE PRIVILEGED" |
337 | INTERACTIVE_POLICE_FLOWID=1 | 337 | INTERACTIVE_POLICE_FLOWID=1 |
diff --git a/main/iproute2/APKBUILD b/main/iproute2/APKBUILD index 01cdcee6e7..6ca2999109 100644 --- a/main/iproute2/APKBUILD +++ b/main/iproute2/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=iproute2 | 2 | pkgname=iproute2 |
3 | pkgver=2.6.33 | 3 | pkgver=2.6.33 |
4 | _realver=2.6.31 | 4 | _realver=2.6.33 |
5 | pkgrel=0 | 5 | pkgrel=1 |
6 | pkgdesc="IP Routing Utilities" | 6 | pkgdesc="IP Routing Utilities" |
7 | url="http://www.linux-foundation.org/en/Net:Iproute2" | 7 | url="http://www.linux-foundation.org/en/Net:Iproute2" |
8 | license="GPL2" | 8 | license="GPL2" |
@@ -31,4 +31,4 @@ package() { | |||
31 | make -j1 DESTDIR="$pkgdir" install | 31 | make -j1 DESTDIR="$pkgdir" install |
32 | } | 32 | } |
33 | 33 | ||
34 | md5sums="230f35282a95451622f3e8394f9cd80a iproute2-2.6.31.tar.bz2" | 34 | md5sums="b371fca3fcb5e436e69a7c2111d84a3c iproute2-2.6.33.tar.bz2" |
diff --git a/main/ipsec-tools/90-openssl-oneshot.patch b/main/ipsec-tools/90-openssl-oneshot.patch new file mode 100644 index 0000000000..ece12a52dd --- /dev/null +++ b/main/ipsec-tools/90-openssl-oneshot.patch | |||
@@ -0,0 +1,210 @@ | |||
1 | Index: src/racoon/crypto_openssl.c | ||
2 | =================================================================== | ||
3 | RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c,v | ||
4 | retrieving revision 1.19 | ||
5 | diff -u -r1.19 crypto_openssl.c | ||
6 | --- a/src/racoon/crypto_openssl.c 29 Apr 2009 10:50:01 -0000 1.19 | ||
7 | +++ b/src/racoon/crypto_openssl.c 4 Jun 2010 09:13:18 -0000 | ||
8 | @@ -1800,6 +1800,42 @@ | ||
9 | return (caddr_t)c; | ||
10 | } | ||
11 | |||
12 | +static vchar_t *eay_hmac_one(key, data, type) | ||
13 | + vchar_t *key, *data; | ||
14 | + const EVP_MD *type; | ||
15 | +{ | ||
16 | + vchar_t *res; | ||
17 | + | ||
18 | + if ((res = vmalloc(EVP_MD_size(type))) == 0) | ||
19 | + return NULL; | ||
20 | + | ||
21 | + if (!HMAC(type, (void *) key->v, key->l, | ||
22 | + (void *) data->v, data->l, (void *) res->v, NULL)) { | ||
23 | + vfree(res); | ||
24 | + return NULL; | ||
25 | + } | ||
26 | + | ||
27 | + return res; | ||
28 | +} | ||
29 | + | ||
30 | +static vchar_t *eay_digest_one(data, type) | ||
31 | + vchar_t *data; | ||
32 | + const EVP_MD *type; | ||
33 | +{ | ||
34 | + vchar_t *res; | ||
35 | + | ||
36 | + if ((res = vmalloc(EVP_MD_size(type))) == 0) | ||
37 | + return NULL; | ||
38 | + | ||
39 | + if (!EVP_Digest((void *) data->v, data->l, | ||
40 | + (void *) res->v, NULL, type, NULL)) { | ||
41 | + vfree(res); | ||
42 | + return NULL; | ||
43 | + } | ||
44 | + | ||
45 | + return res; | ||
46 | +} | ||
47 | + | ||
48 | #ifdef WITH_SHA2 | ||
49 | /* | ||
50 | * HMAC SHA2-512 | ||
51 | @@ -1808,14 +1844,7 @@ | ||
52 | eay_hmacsha2_512_one(key, data) | ||
53 | vchar_t *key, *data; | ||
54 | { | ||
55 | - vchar_t *res; | ||
56 | - caddr_t ctx; | ||
57 | - | ||
58 | - ctx = eay_hmacsha2_512_init(key); | ||
59 | - eay_hmacsha2_512_update(ctx, data); | ||
60 | - res = eay_hmacsha2_512_final(ctx); | ||
61 | - | ||
62 | - return(res); | ||
63 | + return eay_hmac_one(key, data, EVP_sha2_512()); | ||
64 | } | ||
65 | |||
66 | caddr_t | ||
67 | @@ -1865,14 +1894,7 @@ | ||
68 | eay_hmacsha2_384_one(key, data) | ||
69 | vchar_t *key, *data; | ||
70 | { | ||
71 | - vchar_t *res; | ||
72 | - caddr_t ctx; | ||
73 | - | ||
74 | - ctx = eay_hmacsha2_384_init(key); | ||
75 | - eay_hmacsha2_384_update(ctx, data); | ||
76 | - res = eay_hmacsha2_384_final(ctx); | ||
77 | - | ||
78 | - return(res); | ||
79 | + return eay_hmac_one(key, data, EVP_sha2_384()); | ||
80 | } | ||
81 | |||
82 | caddr_t | ||
83 | @@ -1922,14 +1944,7 @@ | ||
84 | eay_hmacsha2_256_one(key, data) | ||
85 | vchar_t *key, *data; | ||
86 | { | ||
87 | - vchar_t *res; | ||
88 | - caddr_t ctx; | ||
89 | - | ||
90 | - ctx = eay_hmacsha2_256_init(key); | ||
91 | - eay_hmacsha2_256_update(ctx, data); | ||
92 | - res = eay_hmacsha2_256_final(ctx); | ||
93 | - | ||
94 | - return(res); | ||
95 | + return eay_hmac_one(key, data, EVP_sha2_256()); | ||
96 | } | ||
97 | |||
98 | caddr_t | ||
99 | @@ -1980,14 +1995,7 @@ | ||
100 | eay_hmacsha1_one(key, data) | ||
101 | vchar_t *key, *data; | ||
102 | { | ||
103 | - vchar_t *res; | ||
104 | - caddr_t ctx; | ||
105 | - | ||
106 | - ctx = eay_hmacsha1_init(key); | ||
107 | - eay_hmacsha1_update(ctx, data); | ||
108 | - res = eay_hmacsha1_final(ctx); | ||
109 | - | ||
110 | - return(res); | ||
111 | + return eay_hmac_one(key, data, EVP_sha1()); | ||
112 | } | ||
113 | |||
114 | caddr_t | ||
115 | @@ -2037,14 +2045,7 @@ | ||
116 | eay_hmacmd5_one(key, data) | ||
117 | vchar_t *key, *data; | ||
118 | { | ||
119 | - vchar_t *res; | ||
120 | - caddr_t ctx; | ||
121 | - | ||
122 | - ctx = eay_hmacmd5_init(key); | ||
123 | - eay_hmacmd5_update(ctx, data); | ||
124 | - res = eay_hmacmd5_final(ctx); | ||
125 | - | ||
126 | - return(res); | ||
127 | + return eay_hmac_one(key, data, EVP_md5()); | ||
128 | } | ||
129 | |||
130 | caddr_t | ||
131 | @@ -2130,14 +2131,7 @@ | ||
132 | eay_sha2_512_one(data) | ||
133 | vchar_t *data; | ||
134 | { | ||
135 | - caddr_t ctx; | ||
136 | - vchar_t *res; | ||
137 | - | ||
138 | - ctx = eay_sha2_512_init(); | ||
139 | - eay_sha2_512_update(ctx, data); | ||
140 | - res = eay_sha2_512_final(ctx); | ||
141 | - | ||
142 | - return(res); | ||
143 | + return eay_digest_one(data, EVP_sha512()); | ||
144 | } | ||
145 | |||
146 | int | ||
147 | @@ -2190,14 +2184,7 @@ | ||
148 | eay_sha2_384_one(data) | ||
149 | vchar_t *data; | ||
150 | { | ||
151 | - caddr_t ctx; | ||
152 | - vchar_t *res; | ||
153 | - | ||
154 | - ctx = eay_sha2_384_init(); | ||
155 | - eay_sha2_384_update(ctx, data); | ||
156 | - res = eay_sha2_384_final(ctx); | ||
157 | - | ||
158 | - return(res); | ||
159 | + return eay_digest_one(data, EVP_sha2_384()); | ||
160 | } | ||
161 | |||
162 | int | ||
163 | @@ -2250,14 +2237,7 @@ | ||
164 | eay_sha2_256_one(data) | ||
165 | vchar_t *data; | ||
166 | { | ||
167 | - caddr_t ctx; | ||
168 | - vchar_t *res; | ||
169 | - | ||
170 | - ctx = eay_sha2_256_init(); | ||
171 | - eay_sha2_256_update(ctx, data); | ||
172 | - res = eay_sha2_256_final(ctx); | ||
173 | - | ||
174 | - return(res); | ||
175 | + return eay_digest_one(data, EVP_sha2_256()); | ||
176 | } | ||
177 | |||
178 | int | ||
179 | @@ -2309,14 +2289,7 @@ | ||
180 | eay_sha1_one(data) | ||
181 | vchar_t *data; | ||
182 | { | ||
183 | - caddr_t ctx; | ||
184 | - vchar_t *res; | ||
185 | - | ||
186 | - ctx = eay_sha1_init(); | ||
187 | - eay_sha1_update(ctx, data); | ||
188 | - res = eay_sha1_final(ctx); | ||
189 | - | ||
190 | - return(res); | ||
191 | + return eay_digest_one(data, EVP_sha1()); | ||
192 | } | ||
193 | |||
194 | int | ||
195 | @@ -2367,14 +2340,7 @@ | ||
196 | eay_md5_one(data) | ||
197 | vchar_t *data; | ||
198 | { | ||
199 | - caddr_t ctx; | ||
200 | - vchar_t *res; | ||
201 | - | ||
202 | - ctx = eay_md5_init(); | ||
203 | - eay_md5_update(ctx, data); | ||
204 | - res = eay_md5_final(ctx); | ||
205 | - | ||
206 | - return(res); | ||
207 | + return eay_digest_one(data, EVP_md5()); | ||
208 | } | ||
209 | |||
210 | int | ||
diff --git a/main/ipsec-tools/APKBUILD b/main/ipsec-tools/APKBUILD index 4d8ef0d0c4..5534d78b7a 100644 --- a/main/ipsec-tools/APKBUILD +++ b/main/ipsec-tools/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
2 | pkgname=ipsec-tools | 2 | pkgname=ipsec-tools |
3 | pkgver=0.8_alpha20090903 | 3 | pkgver=0.8_alpha20090903 |
4 | _myver=0.8-alpha20090903 | 4 | _myver=0.8-alpha20090903 |
5 | pkgrel=8 | 5 | pkgrel=9 |
6 | pkgdesc="User-space IPsec tools for various IPsec implementations" | 6 | pkgdesc="User-space IPsec tools for various IPsec implementations" |
7 | url="http://ipsec-tools.sourceforge.net/" | 7 | url="http://ipsec-tools.sourceforge.net/" |
8 | license="BSD" | 8 | license="BSD" |
@@ -16,6 +16,7 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$_myver.tar.gz | |||
16 | 60-debug-quick.patch | 16 | 60-debug-quick.patch |
17 | initial-contact-fix.diff | 17 | initial-contact-fix.diff |
18 | fd-priorities.patch | 18 | fd-priorities.patch |
19 | 90-openssl-oneshot.patch | ||
19 | " | 20 | " |
20 | 21 | ||
21 | _builddir="$srcdir"/$pkgname-$_myver | 22 | _builddir="$srcdir"/$pkgname-$_myver |
@@ -62,4 +63,5 @@ md5sums="8ec28d4e89c0f5e49ae2caa7463fbcfd ipsec-tools-0.8-alpha20090903.tar.gz | |||
62 | 13bda94a598aabf593280e04ea16065d 50-reverse-connect.patch | 63 | 13bda94a598aabf593280e04ea16065d 50-reverse-connect.patch |
63 | baa13d7f0f48955c792f7fcd42a8587a 60-debug-quick.patch | 64 | baa13d7f0f48955c792f7fcd42a8587a 60-debug-quick.patch |
64 | 69e06c5cc3a0c1cc8b10ddc89d1e644b initial-contact-fix.diff | 65 | 69e06c5cc3a0c1cc8b10ddc89d1e644b initial-contact-fix.diff |
65 | c1e8b8dc80ef4b5d79fece52a4865e68 fd-priorities.patch" | 66 | c1e8b8dc80ef4b5d79fece52a4865e68 fd-priorities.patch |
67 | 11e2c21e443edab17725f74ffeaddb76 90-openssl-oneshot.patch" | ||
diff --git a/main/lame/APKBUILD b/main/lame/APKBUILD index 85a151c62c..9ebd4ed692 100644 --- a/main/lame/APKBUILD +++ b/main/lame/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=lame | 2 | pkgname=lame |
3 | pkgver=3.98.3 | 3 | pkgver=3.98.4 |
4 | _ver=398-2 | 4 | _ver=398-2 |
5 | pkgrel=1 | 5 | pkgrel=0 |
6 | pkgdesc="An MP3 encoder and graphical frame analyzer" | 6 | pkgdesc="An MP3 encoder and graphical frame analyzer" |
7 | url="http://lame.sourceforge.net/" | 7 | url="http://lame.sourceforge.net/" |
8 | license="LGPL" | 8 | license="LGPL" |
diff --git a/main/libc0.9.32/0001-ldd-segfault-fix.patch b/main/libc0.9.32/0001-ldd-segfault-fix.patch deleted file mode 100644 index 4384fa548c..0000000000 --- a/main/libc0.9.32/0001-ldd-segfault-fix.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | From f29b6882327573ec4e694c1c852307c957d544b9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Tue, 5 May 2009 14:10:42 +0000 | ||
4 | Subject: [PATCH] ldd segfault fix | ||
5 | |||
6 | Fixes ldd segfault on this testcase: | ||
7 | |||
8 | extern void _dl_getenv(void); | ||
9 | void foo(void) | ||
10 | { | ||
11 | printf("foo: %x\n", &_dl_getenv); | ||
12 | } | ||
13 | |||
14 | linked as -shared | ||
15 | --- | ||
16 | utils/ldd.c | 8 +++++--- | ||
17 | 1 files changed, 5 insertions(+), 3 deletions(-) | ||
18 | |||
19 | diff --git a/utils/ldd.c b/utils/ldd.c | ||
20 | index 1f1dc25..2cd173c 100644 | ||
21 | --- a/utils/ldd.c | ||
22 | +++ b/utils/ldd.c | ||
23 | @@ -576,18 +576,20 @@ static struct library *find_elf_interpreter(ElfW(Ehdr) *ehdr) | ||
24 | } | ||
25 | newlib->name = NULL; | ||
26 | newlib->path = NULL; | ||
27 | - return NULL; | ||
28 | + break; | ||
29 | } | ||
30 | } | ||
31 | - if (newlib == NULL) | ||
32 | + if (newlib == NULL) { | ||
33 | newlib = malloc(sizeof(struct library)); | ||
34 | + if (newlib) | ||
35 | + newlib->next = NULL; | ||
36 | + } | ||
37 | if (!newlib) | ||
38 | return NULL; | ||
39 | newlib->name = malloc(strlen(s) + 1); | ||
40 | strcpy(newlib->name, s); | ||
41 | newlib->path = strdup(newlib->name); | ||
42 | newlib->resolved = 1; | ||
43 | - newlib->next = NULL; | ||
44 | |||
45 | #if 0 | ||
46 | /*printf("find_elf_interpreter is adding '%s' to '%s'\n", newlib->name, newlib->path); */ | ||
47 | -- | ||
48 | 1.6.2.3 | ||
49 | |||
diff --git a/main/libc0.9.32/0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch b/main/libc0.9.32/0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch deleted file mode 100644 index 2898a0d02d..0000000000 --- a/main/libc0.9.32/0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch +++ /dev/null | |||
@@ -1,125 +0,0 @@ | |||
1 | From 67403d1d692c3b8022b0adca127a2c14ef8e3237 Mon Sep 17 00:00:00 2001 | ||
2 | From: Timo Teras <timo.teras@iki.fi> | ||
3 | Date: Fri, 7 May 2010 11:28:27 +0300 | ||
4 | Subject: [PATCH 1/2] static build: fix internal locking weaks to get pulled in always | ||
5 | |||
6 | Linker is smart and does not pull in weaks.os, ever. This happens | ||
7 | because that compilation unit does not get strong references and | ||
8 | ld eliminates dead code. We really need the weaks for static build | ||
9 | in a compilation unit that is always there, otherwise it won't work. | ||
10 | |||
11 | Signed-off-by: Timo Teras <timo.teras@iki.fi> | ||
12 | --- | ||
13 | libc/misc/internals/__uClibc_main.c | 35 ++++++++++++++++++++++++++++++ | ||
14 | libc/misc/pthread/Makefile.in | 1 - | ||
15 | libc/misc/pthread/weaks.c | 40 ----------------------------------- | ||
16 | 3 files changed, 35 insertions(+), 41 deletions(-) | ||
17 | delete mode 100644 libc/misc/pthread/weaks.c | ||
18 | |||
19 | diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c | ||
20 | index f7e45c6..f9e1244 100644 | ||
21 | --- a/libc/misc/internals/__uClibc_main.c | ||
22 | +++ b/libc/misc/internals/__uClibc_main.c | ||
23 | @@ -68,6 +68,41 @@ uintptr_t __guard attribute_relro; | ||
24 | */ | ||
25 | |||
26 | void internal_function _dl_aux_init (ElfW(auxv_t) *av); | ||
27 | + | ||
28 | +/* | ||
29 | + * uClibc internal locking requires that we have weak aliases | ||
30 | + * for dummy functions in case libpthread.a is not linked in. | ||
31 | + * This needs to be in compilation unit that is pulled always | ||
32 | + * in or linker will disregard these weaks. | ||
33 | + */ | ||
34 | + | ||
35 | +static int __pthread_return_0 (pthread_mutex_t *unused) { return 0; } | ||
36 | +weak_alias (__pthread_return_0, __pthread_mutex_lock) | ||
37 | +weak_alias (__pthread_return_0, __pthread_mutex_trylock) | ||
38 | +weak_alias (__pthread_return_0, __pthread_mutex_unlock) | ||
39 | + | ||
40 | +int weak_function | ||
41 | +__pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *attr) | ||
42 | +{ | ||
43 | + return 0; | ||
44 | +} | ||
45 | + | ||
46 | +void weak_function | ||
47 | +_pthread_cleanup_push_defer(struct _pthread_cleanup_buffer *__buffer, | ||
48 | + void (*__routine) (void *), void *__arg) | ||
49 | +{ | ||
50 | + __buffer->__routine = __routine; | ||
51 | + __buffer->__arg = __arg; | ||
52 | +} | ||
53 | + | ||
54 | +void weak_function | ||
55 | +_pthread_cleanup_pop_restore(struct _pthread_cleanup_buffer *__buffer, | ||
56 | + int __execute) | ||
57 | +{ | ||
58 | + if (__execute) | ||
59 | + __buffer->__routine(__buffer->__arg); | ||
60 | +} | ||
61 | + | ||
62 | #endif /* !SHARED */ | ||
63 | |||
64 | /* | ||
65 | diff --git a/libc/misc/pthread/Makefile.in b/libc/misc/pthread/Makefile.in | ||
66 | index 69cdf10..2f436ac 100644 | ||
67 | --- a/libc/misc/pthread/Makefile.in | ||
68 | +++ b/libc/misc/pthread/Makefile.in | ||
69 | @@ -11,7 +11,6 @@ MISC_PTHREAD_DIR := $(top_srcdir)libc/misc/pthread | ||
70 | MISC_PTHREAD_OUT := $(top_builddir)libc/misc/pthread | ||
71 | |||
72 | libc-shared-$(UCLIBC_HAS_TLS) += $(MISC_PTHREAD_OUT)/tsd.os | ||
73 | -libc-static-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/weaks.o | ||
74 | |||
75 | objclean-y += CLEAN_libc/misc/pthread | ||
76 | |||
77 | diff --git a/libc/misc/pthread/weaks.c b/libc/misc/pthread/weaks.c | ||
78 | deleted file mode 100644 | ||
79 | index fb1d85f..0000000 | ||
80 | --- a/libc/misc/pthread/weaks.c | ||
81 | +++ /dev/null | ||
82 | @@ -1,40 +0,0 @@ | ||
83 | -/* The weak pthread functions for Linux. | ||
84 | - Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. | ||
85 | - This file is part of the GNU C Library. | ||
86 | - | ||
87 | - The GNU C Library is free software; you can redistribute it and/or | ||
88 | - modify it under the terms of the GNU Library General Public License as | ||
89 | - published by the Free Software Foundation; either version 2 of the | ||
90 | - License, or (at your option) any later version. | ||
91 | - | ||
92 | - The GNU C Library is distributed in the hope that it will be useful, | ||
93 | - but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
94 | - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
95 | - Library General Public License for more details. | ||
96 | - | ||
97 | - You should have received a copy of the GNU Library General Public | ||
98 | - License along with the GNU C Library; see the file COPYING.LIB. If not, | ||
99 | - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
100 | - Boston, MA 02111-1307, USA. */ | ||
101 | - | ||
102 | -#include <libc-internal.h> | ||
103 | - | ||
104 | -/* Weaks for internal library use only. | ||
105 | - * | ||
106 | - * We need to define weaks here to cover all the pthread functions that | ||
107 | - * libc itself will use so that we aren't forced to link libc against | ||
108 | - * libpthread. This file is only used in libc.a and since we have | ||
109 | - * weaks here, they will be automatically overridden by libpthread.a | ||
110 | - * if it gets linked in. | ||
111 | - */ | ||
112 | - | ||
113 | -static int __pthread_return_0 (void) { return 0; } | ||
114 | -static void __pthread_return_void (void) { return; } | ||
115 | - | ||
116 | -weak_alias (__pthread_return_0, __pthread_mutex_init) | ||
117 | -weak_alias (__pthread_return_0, __pthread_mutex_lock) | ||
118 | -weak_alias (__pthread_return_0, __pthread_mutex_trylock) | ||
119 | -weak_alias (__pthread_return_0, __pthread_mutex_unlock) | ||
120 | -weak_alias (__pthread_return_void, _pthread_cleanup_push_defer) | ||
121 | -weak_alias (__pthread_return_void, _pthread_cleanup_pop_restore) | ||
122 | - | ||
123 | -- | ||
124 | 1.6.3.3 | ||
125 | |||
diff --git a/main/libc0.9.32/0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch b/main/libc0.9.32/0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch deleted file mode 100644 index 562d648a6a..0000000000 --- a/main/libc0.9.32/0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch +++ /dev/null | |||
@@ -1,69 +0,0 @@ | |||
1 | From bfe9a589a402d4b6265e32b1b5ca0942efdcff3b Mon Sep 17 00:00:00 2001 | ||
2 | From: Timo Teras <timo.teras@iki.fi> | ||
3 | Date: Fri, 7 May 2010 11:30:04 +0300 | ||
4 | Subject: [PATCH 2/2] resolv: various memory corruption and off by one fixes | ||
5 | |||
6 | Fixes resolution of names with AAAA entries and gethostbyaddr issues. | ||
7 | |||
8 | Signed-off-by: Timo Teras <timo.teras@iki.fi> | ||
9 | --- | ||
10 | libc/inet/resolv.c | 12 ++++++++---- | ||
11 | 1 files changed, 8 insertions(+), 4 deletions(-) | ||
12 | |||
13 | diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c | ||
14 | index 84289a6..320aec4 100644 | ||
15 | --- a/libc/inet/resolv.c | ||
16 | +++ b/libc/inet/resolv.c | ||
17 | @@ -689,7 +689,7 @@ int attribute_hidden __decode_dotted(const unsigned char *packet, | ||
18 | |||
19 | if (used + b + 1 >= dest_len) | ||
20 | return -1; | ||
21 | - if (offset + b + 1 >= packet_len) | ||
22 | + if (offset + b >= packet_len) | ||
23 | return -1; | ||
24 | memcpy(dest + used, packet + offset, b); | ||
25 | offset += b; | ||
26 | @@ -2417,7 +2417,7 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen, | ||
27 | /* Layout in buf: | ||
28 | * char *alias[ALIAS_DIM]; | ||
29 | * struct in[6]_addr* addr_list[2]; | ||
30 | - * struct in[6]_addr* in; | ||
31 | + * struct in[6]_addr in; | ||
32 | * char scratch_buffer[256+]; | ||
33 | */ | ||
34 | #define in6 ((struct in6_addr *)in) | ||
35 | @@ -2431,9 +2431,13 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen, | ||
36 | #ifndef __UCLIBC_HAS_IPV6__ | ||
37 | buf += sizeof(*in); | ||
38 | buflen -= sizeof(*in); | ||
39 | + if (addrlen > sizeof(*in)) | ||
40 | + return ERANGE; | ||
41 | #else | ||
42 | buf += sizeof(*in6); | ||
43 | buflen -= sizeof(*in6); | ||
44 | + if (addrlen > sizeof(*in6)) | ||
45 | + return ERANGE; | ||
46 | #endif | ||
47 | if ((ssize_t)buflen < 256) | ||
48 | return ERANGE; | ||
49 | @@ -2441,7 +2445,7 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen, | ||
50 | alias[1] = NULL; | ||
51 | addr_list[0] = in; | ||
52 | addr_list[1] = NULL; | ||
53 | - memcpy(&in, addr, addrlen); | ||
54 | + memcpy(in, addr, addrlen); | ||
55 | |||
56 | if (0) /* nothing */; | ||
57 | #ifdef __UCLIBC_HAS_IPV4__ | ||
58 | @@ -2456,7 +2460,7 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen, | ||
59 | char *dst = buf; | ||
60 | unsigned char *tp = (unsigned char *)addr + addrlen - 1; | ||
61 | do { | ||
62 | - dst += sprintf(dst, "%x.%x.", tp[i] & 0xf, tp[i] >> 4); | ||
63 | + dst += sprintf(dst, "%x.%x.", tp[0] & 0xf, tp[0] >> 4); | ||
64 | tp--; | ||
65 | } while (tp >= (unsigned char *)addr); | ||
66 | strcpy(dst, "ip6.arpa"); | ||
67 | -- | ||
68 | 1.6.3.3 | ||
69 | |||
diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD index 0b7751f3e8..accdcaf3af 100644 --- a/main/libc0.9.32/APKBUILD +++ b/main/libc0.9.32/APKBUILD | |||
@@ -1,9 +1,9 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | _abiver=0.9.32 | 2 | _abiver=0.9.32 |
3 | pkgname=libc$_abiver | 3 | pkgname=libc$_abiver |
4 | _gitver=100507 | 4 | _gitver=1006041126 |
5 | pkgver=${_abiver}_alpha0_git$_gitver | 5 | pkgver=${_abiver}_alpha0_git$_gitver |
6 | pkgrel=3 | 6 | pkgrel=1 |
7 | pkgdesc="C library for developing embedded Linux systems" | 7 | pkgdesc="C library for developing embedded Linux systems" |
8 | url=http://uclibc.org | 8 | url=http://uclibc.org |
9 | license="LGPL-2" | 9 | license="LGPL-2" |
@@ -17,10 +17,8 @@ _snapurl="http://git.uclibc.org/uClibc/snapshot/master.tar.bz2" | |||
17 | _snapfile="$pkgname-$pkgver.tar.bz2" | 17 | _snapfile="$pkgname-$pkgver.tar.bz2" |
18 | source="http://build.alpinelinux.org:8010/distfiles/$_snapfile | 18 | source="http://build.alpinelinux.org:8010/distfiles/$_snapfile |
19 | compat-stack-guard.patch | 19 | compat-stack-guard.patch |
20 | 0001-ldd-segfault-fix.patch | ||
21 | 0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch | ||
22 | 0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch | ||
23 | uclibc-libm-pic.patch | 20 | uclibc-libm-pic.patch |
21 | uclibc-lutimes.patch | ||
24 | uclibc-resolv-tls.patch | 22 | uclibc-resolv-tls.patch |
25 | uclibcconfig.x86 | 23 | uclibcconfig.x86 |
26 | uclibcconfig.i486 | 24 | uclibcconfig.i486 |
@@ -31,12 +29,15 @@ _builddir="$srcdir"/master | |||
31 | 29 | ||
32 | snapshot() { | 30 | snapshot() { |
33 | local _date=$(date +%y%m%d%H%M) | 31 | local _date=$(date +%y%m%d%H%M) |
32 | _gitver=$_date | ||
34 | pkgver=${_abiver}_alpha0_git$_gitver | 33 | pkgver=${_abiver}_alpha0_git$_gitver |
34 | _snapfile="$pkgname-$pkgver.tar.bz2" | ||
35 | 35 | ||
36 | rm -f "$SRCDEST"/$_snapfile | 36 | rm -f "$SRCDEST"/$_snapfile |
37 | msg "snapfile=$_snapfile" | ||
37 | wget -O "$SRCDEST"/$_snapfile $_snapurl | 38 | wget -O "$SRCDEST"/$_snapfile $_snapurl |
38 | pkgrel=0 | 39 | pkgrel=0 |
39 | sed -i -e "s/^_gitver=.*/_gitver=$(date +%y%m%d)/" \ | 40 | sed -i -e "s/^_gitver=.*/_gitver=$_gitver/" \ |
40 | -e "s/^pkgrel=.*/pkgrel=$pkgrel/" \ | 41 | -e "s/^pkgrel=.*/pkgrel=$pkgrel/" \ |
41 | APKBUILD | 42 | APKBUILD |
42 | checksum | 43 | checksum |
@@ -95,12 +96,10 @@ utils() { | |||
95 | mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/ | 96 | mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/ |
96 | } | 97 | } |
97 | 98 | ||
98 | md5sums="46e98672dc2a4309d9a7c65b4e626845 libc0.9.32-0.9.32_alpha0_git100507.tar.bz2 | 99 | md5sums="048f92606460621d9402c43417392992 libc0.9.32-0.9.32_alpha0_git1006041126.tar.bz2 |
99 | 4d408f72142ce55a0754948cc9cfe447 compat-stack-guard.patch | 100 | 4d408f72142ce55a0754948cc9cfe447 compat-stack-guard.patch |
100 | 4079b20c763727863bc53408e4988434 0001-ldd-segfault-fix.patch | ||
101 | 826666b365f2d63a71d67eb76c94f7bc 0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch | ||
102 | 0800a489a738c7b1d8c3643cb9806926 0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch | ||
103 | 2f9739a980be24a842c57516155c7885 uclibc-libm-pic.patch | 101 | 2f9739a980be24a842c57516155c7885 uclibc-libm-pic.patch |
102 | 4d0b8170e6580b47bf5775e65a6f081e uclibc-lutimes.patch | ||
104 | d08831b452acdeaa3037525ee617edab uclibc-resolv-tls.patch | 103 | d08831b452acdeaa3037525ee617edab uclibc-resolv-tls.patch |
105 | e2eb3bb00a0fe4d6f3d5b5c56b027bab uclibcconfig.x86 | 104 | e2eb3bb00a0fe4d6f3d5b5c56b027bab uclibcconfig.x86 |
106 | e2eb3bb00a0fe4d6f3d5b5c56b027bab uclibcconfig.i486" | 105 | e2eb3bb00a0fe4d6f3d5b5c56b027bab uclibcconfig.i486" |
diff --git a/main/libc0.9.32/uclibc-lutimes.patch b/main/libc0.9.32/uclibc-lutimes.patch new file mode 100644 index 0000000000..c9ec2aa475 --- /dev/null +++ b/main/libc0.9.32/uclibc-lutimes.patch | |||
@@ -0,0 +1,105 @@ | |||
1 | From: Vladimir Zapolskiy <vzapolskiy@gmail.com> | ||
2 | To: uclibc@uclibc.org | ||
3 | Subject: [PATCH v2] lutimes: add lutimes support | ||
4 | Date: Wed, 2 Jun 2010 10:27:16 +0400 | ||
5 | Message-Id: <1275460036-3289-1-git-send-email-vzapolskiy@gmail.com> | ||
6 | X-Mailer: git-send-email 1.7.0.3 | ||
7 | In-Reply-To: <1275420197-32262-1-git-send-email-vzapolskiy@gmail.com> | ||
8 | References: <1275420197-32262-1-git-send-email-vzapolskiy@gmail.com> | ||
9 | Cc: Vladimir Zapolskiy <vzapolskiy@gmail.com> | ||
10 | X-BeenThere: uclibc@uclibc.org | ||
11 | X-Mailman-Version: 2.1.12 | ||
12 | Precedence: list | ||
13 | List-Id: "Discussion and development of uClibc \(the embedded C library\)" | ||
14 | <uclibc.uclibc.org> | ||
15 | List-Unsubscribe: <http://lists.busybox.net/mailman/options/uclibc>, | ||
16 | <mailto:uclibc-request@uclibc.org?subject=unsubscribe> | ||
17 | List-Archive: <http://lists.busybox.net/pipermail/uclibc> | ||
18 | List-Post: <mailto:uclibc@uclibc.org> | ||
19 | List-Help: <mailto:uclibc-request@uclibc.org?subject=help> | ||
20 | List-Subscribe: <http://lists.busybox.net/mailman/listinfo/uclibc>, | ||
21 | <mailto:uclibc-request@uclibc.org?subject=subscribe> | ||
22 | MIME-Version: 1.0 | ||
23 | Content-Type: text/plain; charset="us-ascii" | ||
24 | Content-Transfer-Encoding: 7bit | ||
25 | Sender: uclibc-bounces@uclibc.org | ||
26 | Errors-To: uclibc-bounces@uclibc.org | ||
27 | |||
28 | This patch adds lutimes library call support. | ||
29 | |||
30 | Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com> | ||
31 | --- | ||
32 | include/sys/time.h | 4 ++- | ||
33 | libc/sysdeps/linux/common/lutimes.c | 38 +++++++++++++++++++++++++++++++++++ | ||
34 | 2 files changed, 41 insertions(+), 1 deletions(-) | ||
35 | create mode 100644 libc/sysdeps/linux/common/lutimes.c | ||
36 | |||
37 | diff --git a/include/sys/time.h b/include/sys/time.h | ||
38 | index 33f5873..952e95a 100644 | ||
39 | --- a/include/sys/time.h | ||
40 | +++ b/include/sys/time.h | ||
41 | @@ -144,14 +144,16 @@ extern int utimes (__const char *__file, __const struct timeval __tvp[2]) | ||
42 | __THROW __nonnull ((1)); | ||
43 | libc_hidden_proto(utimes) | ||
44 | |||
45 | -#if 0 /*def __USE_BSD*/ | ||
46 | +#ifdef __USE_BSD | ||
47 | /* Same as `utimes', but does not follow symbolic links. */ | ||
48 | extern int lutimes (__const char *__file, __const struct timeval __tvp[2]) | ||
49 | __THROW __nonnull ((1)); | ||
50 | |||
51 | +#if 0 | ||
52 | /* Same as `utimes', but takes an open file descriptor instead of a name. */ | ||
53 | extern int futimes (int __fd, __const struct timeval __tvp[2]) __THROW; | ||
54 | #endif | ||
55 | +#endif | ||
56 | |||
57 | #ifdef __USE_GNU | ||
58 | /* Change the access time of FILE relative to FD to TVP[0] and the | ||
59 | diff --git a/libc/sysdeps/linux/common/lutimes.c b/libc/sysdeps/linux/common/lutimes.c | ||
60 | new file mode 100644 | ||
61 | index 0000000..0b4a8ea | ||
62 | --- /dev/null | ||
63 | +++ b/libc/sysdeps/linux/common/lutimes.c | ||
64 | @@ -0,0 +1,38 @@ | ||
65 | +/* vi: set sw=4 ts=4: */ | ||
66 | +/* | ||
67 | + * lutimes() implementation for uClibc | ||
68 | + * | ||
69 | + * Copyright (C) 2010 Vladimir Zapolskiy <vzapolskiy@gmail.com> | ||
70 | + * | ||
71 | + * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. | ||
72 | + */ | ||
73 | + | ||
74 | +#include <sys/syscall.h> | ||
75 | +#include <time.h> | ||
76 | + | ||
77 | +#ifdef __NR_lutimes | ||
78 | +_syscall2(int, lutimes, const char *, file, const struct timeval *, tvp) | ||
79 | +#else | ||
80 | +#include <sys/time.h> | ||
81 | +#include <fcntl.h> | ||
82 | + | ||
83 | +int lutimes(const char *file, const struct timeval tvp[2]) | ||
84 | +{ | ||
85 | + struct timespec ts[2]; | ||
86 | + | ||
87 | + if (tvp != NULL) | ||
88 | + { | ||
89 | + if (tvp[0].tv_usec < 0 || tvp[0].tv_usec >= 1000000 | ||
90 | + || tvp[1].tv_usec < 0 || tvp[1].tv_usec >= 1000000) | ||
91 | + { | ||
92 | + __set_errno(EINVAL); | ||
93 | + return -1; | ||
94 | + } | ||
95 | + | ||
96 | + TIMEVAL_TO_TIMESPEC(&tvp[0], &ts[0]); | ||
97 | + TIMEVAL_TO_TIMESPEC(&tvp[1], &ts[1]); | ||
98 | + } | ||
99 | + | ||
100 | + return utimensat(AT_FDCWD, file, tvp ? ts : NULL, AT_SYMLINK_NOFOLLOW); | ||
101 | +} | ||
102 | +#endif | ||
103 | -- | ||
104 | 1.7.0.3 | ||
105 | |||
diff --git a/testing/libelf/APKBUILD b/main/libelf/APKBUILD index 88a52258bc..88a52258bc 100644 --- a/testing/libelf/APKBUILD +++ b/main/libelf/APKBUILD | |||
diff --git a/testing/libical/APKBUILD b/main/libical/APKBUILD index 22ef967848..22ef967848 100644 --- a/testing/libical/APKBUILD +++ b/main/libical/APKBUILD | |||
diff --git a/main/libmpdclient/APKBUILD b/main/libmpdclient/APKBUILD index 81f413e2d4..fd70fd1c6f 100644 --- a/main/libmpdclient/APKBUILD +++ b/main/libmpdclient/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=libmpdclient | 2 | pkgname=libmpdclient |
3 | pkgver=2.1 | 3 | pkgver=2.2 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="An asynchronous API library for interfacing MPD in the C, C++ & Objective C languages" | 5 | pkgdesc="An asynchronous API library for interfacing MPD in the C, C++ & Objective C languages" |
6 | url="http://mpd.wikia.com/wiki/Client:libmpdclient" | 6 | url="http://mpd.wikia.com/wiki/Client:libmpdclient" |
7 | license="GPL2" | 7 | license="GPL2" |
@@ -20,4 +20,4 @@ package() { | |||
20 | cd "$srcdir"/$pkgname-$pkgver | 20 | cd "$srcdir"/$pkgname-$pkgver |
21 | make DESTDIR="$pkgdir" install || return 1 | 21 | make DESTDIR="$pkgdir" install || return 1 |
22 | } | 22 | } |
23 | md5sums="67efa0c3d107c090ef277dfb3442d1e3 libmpdclient-2.1.tar.bz2" | 23 | md5sums="8b9dff75d6c820b781ce066417df4078 libmpdclient-2.2.tar.bz2" |
diff --git a/main/libogg/APKBUILD b/main/libogg/APKBUILD index 072f0216e3..5d5c37196f 100644 --- a/main/libogg/APKBUILD +++ b/main/libogg/APKBUILD | |||
@@ -2,8 +2,8 @@ | |||
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
3 | 3 | ||
4 | pkgname=libogg | 4 | pkgname=libogg |
5 | pkgver=1.1.4 | 5 | pkgver=1.2.0 |
6 | pkgrel=1 | 6 | pkgrel=0 |
7 | pkgdesc="Ogg bitstream and framing library" | 7 | pkgdesc="Ogg bitstream and framing library" |
8 | url="http://xiph.org/ogg/" | 8 | url="http://xiph.org/ogg/" |
9 | license="as-is" | 9 | license="as-is" |
@@ -17,9 +17,12 @@ build() { | |||
17 | 17 | ||
18 | ./configure --prefix=/usr | 18 | ./configure --prefix=/usr |
19 | make || return 1 | 19 | make || return 1 |
20 | make -j1 DESTDIR="$pkgdir" install | 20 | } |
21 | 21 | ||
22 | package() { | ||
23 | cd "$srcdir/$pkgname-$pkgver" | ||
24 | make -j1 DESTDIR="$pkgdir" install | ||
22 | install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING | 25 | install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING |
23 | } | 26 | } |
24 | 27 | ||
25 | md5sums="10200ec22543841d9d1c23e0aed4e5e9 libogg-1.1.4.tar.gz" | 28 | md5sums="c95b73759acfc30712beef6ce4e88efa libogg-1.2.0.tar.gz" |
diff --git a/main/libpri/APKBUILD b/main/libpri/APKBUILD index 4094083a58..231787c4f6 100644 --- a/main/libpri/APKBUILD +++ b/main/libpri/APKBUILD | |||
@@ -1,9 +1,8 @@ | |||
1 | # Contributor: Timo Teras <timo.teras@iki.fi> | 1 | # Contributor: Timo Teras <timo.teras@iki.fi> |
2 | # Maintainer: Timo Teras <timo.teras@iki.fi> | 2 | # Maintainer: Timo Teras <timo.teras@iki.fi> |
3 | pkgname=libpri | 3 | pkgname=libpri |
4 | pkgver=1.4.11_alpha1 | 4 | pkgver=1.4.11.2 |
5 | _pkgver=1.4.10.2 | 5 | pkgrel=0 |
6 | pkgrel=1 | ||
7 | pkgdesc="Primary Rate ISDN (PRI) library" | 6 | pkgdesc="Primary Rate ISDN (PRI) library" |
8 | url="http://www.asterisk.orig" | 7 | url="http://www.asterisk.orig" |
9 | license="GPL" | 8 | license="GPL" |
@@ -11,22 +10,22 @@ depends="" | |||
11 | makedepends="" | 10 | makedepends="" |
12 | install= | 11 | install= |
13 | subpackages="$pkgname-dev" | 12 | subpackages="$pkgname-dev" |
14 | source="http://downloads.digium.com/pub/telephony/libpri/releases/$pkgname-$_pkgver.tar.gz | 13 | source="http://downloads.digium.com/pub/telephony/libpri/releases/$pkgname-$pkgver.tar.gz" |
15 | libpri-1.4-r1357.patch" | ||
16 | 14 | ||
17 | build() { | 15 | build() { |
18 | cd "$srcdir/$pkgname-$_pkgver" | 16 | cd "$srcdir/$pkgname-$pkgver" |
19 | for i in ../*.patch; do | 17 | for i in ../*.patch; do |
18 | [ -r "$i" ] || continue | ||
20 | msg "Applying $i" | 19 | msg "Applying $i" |
21 | patch -p1 < $i || return 1; | 20 | patch -p1 < $i || return 1; |
22 | done | 21 | done |
23 | 22 | ||
24 | make LDCONFIG="echo" || return 1 | 23 | make LDCONFIG="echo" || return 1 |
25 | make LDCONFIG="echo" INSTALL_PREFIX="$pkgdir" install | 24 | } |
26 | 25 | ||
27 | # install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname | 26 | package() { |
28 | # install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname | 27 | cd "$srcdir/$pkgname-$pkgver" |
28 | make LDCONFIG="echo" INSTALL_PREFIX="$pkgdir" install | ||
29 | } | 29 | } |
30 | 30 | ||
31 | md5sums="dc1523d8ee027cd62f20fc6cc9727489 libpri-1.4.10.2.tar.gz | 31 | md5sums="320d55151e180b2fc13abfee8e2e73d8 libpri-1.4.11.2.tar.gz" |
32 | 61a245689a40e456643ed654441a280d libpri-1.4-r1357.patch" | ||
diff --git a/testing/libunique/APKBUILD b/main/libunique/APKBUILD index 59bd45083f..59bd45083f 100644 --- a/testing/libunique/APKBUILD +++ b/main/libunique/APKBUILD | |||
diff --git a/main/libx11/APKBUILD b/main/libx11/APKBUILD index 93dd4442b4..20b59466b7 100644 --- a/main/libx11/APKBUILD +++ b/main/libx11/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=libx11 | 2 | pkgname=libx11 |
3 | pkgver=1.3.3 | 3 | pkgver=1.3.4 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="X11 client-side library" | 5 | pkgdesc="X11 client-side library" |
6 | url="http://xorg.freedesktop.org/" | 6 | url="http://xorg.freedesktop.org/" |
7 | license="custom:XFREE86" | 7 | license="custom:XFREE86" |
@@ -28,4 +28,4 @@ package() { | |||
28 | install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING | 28 | install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING |
29 | } | 29 | } |
30 | 30 | ||
31 | md5sums="5d74971360f194ce33d2bd2e4d9b066c libX11-1.3.3.tar.bz2" | 31 | md5sums="f65c9c7ecbfb64c19dbd7927160d63fd libX11-1.3.4.tar.bz2" |
diff --git a/main/libxext/APKBUILD b/main/libxext/APKBUILD index 87d7d248e3..fe56fd7a34 100644 --- a/main/libxext/APKBUILD +++ b/main/libxext/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=libxext | 2 | pkgname=libxext |
3 | pkgver=1.1.1 | 3 | pkgver=1.1.2 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="X11 miscellaneous extensions library" | 5 | pkgdesc="X11 miscellaneous extensions library" |
6 | url="http://xorg.freedesktop.org/" | 6 | url="http://xorg.freedesktop.org/" |
7 | license="custom" | 7 | license="custom" |
@@ -21,4 +21,4 @@ package() { | |||
21 | cd "$srcdir"/libXext-$pkgver | 21 | cd "$srcdir"/libXext-$pkgver |
22 | make DESTDIR="$pkgdir" install || return 1 | 22 | make DESTDIR="$pkgdir" install || return 1 |
23 | } | 23 | } |
24 | md5sums="c417c0e8df39a067f90a2a2e7133637d libXext-1.1.1.tar.bz2" | 24 | md5sums="9e51f9cb7e0a38c7099ac1c0de1a1add libXext-1.1.2.tar.bz2" |
diff --git a/main/libxfce4menu/APKBUILD b/main/libxfce4menu/APKBUILD index ad6a5fd142..52a0b32e99 100644 --- a/main/libxfce4menu/APKBUILD +++ b/main/libxfce4menu/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=libxfce4menu | 2 | pkgname=libxfce4menu |
3 | pkgver=4.6.1 | 3 | pkgver=4.6.2 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="a freedesktop.org compliant menu implementation for Xfce" | 5 | pkgdesc="a freedesktop.org compliant menu implementation for Xfce" |
6 | url="http://www.xfce.org/" | 6 | url="http://www.xfce.org/" |
7 | license="GPL-2" | 7 | license="GPL-2" |
@@ -11,8 +11,7 @@ makedepends="libxfce4util-dev intltool pkgconfig gtk+-dev gettext-dev | |||
11 | libiconv-dev" | 11 | libiconv-dev" |
12 | source="http://i386.miwibox.org/distfiles/xfce4/$pkgname-$pkgver.tar.bz2" | 12 | source="http://i386.miwibox.org/distfiles/xfce4/$pkgname-$pkgver.tar.bz2" |
13 | 13 | ||
14 | build () | 14 | build () { |
15 | { | ||
16 | cd "$srcdir"/$pkgname-$pkgver | 15 | cd "$srcdir"/$pkgname-$pkgver |
17 | ./configure --prefix=/usr \ | 16 | ./configure --prefix=/usr \ |
18 | --sysconfdir=/etc \ | 17 | --sysconfdir=/etc \ |
@@ -20,6 +19,10 @@ build () | |||
20 | --localstatedir=/var \ | 19 | --localstatedir=/var \ |
21 | --disable-static | 20 | --disable-static |
22 | make || return 1 | 21 | make || return 1 |
22 | } | ||
23 | |||
24 | package() { | ||
25 | cd "$srcdir"/$pkgname-$pkgver | ||
23 | make DESTDIR="$pkgdir" install || return 1 | 26 | make DESTDIR="$pkgdir" install || return 1 |
24 | } | 27 | } |
25 | md5sums="5dc9343885c2c6f931318b2a1cdcc9db libxfce4menu-4.6.1.tar.bz2" | 28 | md5sums="ff10cacb76803ee37159e3a43345f0d1 libxfce4menu-4.6.2.tar.bz2" |
diff --git a/main/libxfce4util/APKBUILD b/main/libxfce4util/APKBUILD index 401698b6b7..884378e579 100644 --- a/main/libxfce4util/APKBUILD +++ b/main/libxfce4util/APKBUILD | |||
@@ -1,14 +1,14 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=libxfce4util | 2 | pkgname=libxfce4util |
3 | pkgver=4.6.1 | 3 | pkgver=4.6.2 |
4 | pkgrel=2 | 4 | pkgrel=0 |
5 | pkgdesc="Basic utility non-GUI functions for Xfce" | 5 | pkgdesc="Basic utility non-GUI functions for Xfce" |
6 | url="http://www.xfce.org/" | 6 | url="http://www.xfce.org/" |
7 | license="GPL-2" | 7 | license="GPL-2" |
8 | subpackages="$pkgname-dev $pkgname-doc" | 8 | subpackages="$pkgname-dev $pkgname-doc" |
9 | depends= | 9 | depends= |
10 | makedepends="pkgconfig glib-dev gettext-dev libiconv-dev" | 10 | makedepends="pkgconfig glib-dev gettext-dev libiconv-dev intltool" |
11 | source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2" | 11 | source="http://archive.xfce.org/src/xfce/$pkgname/4.6/$pkgname-$pkgver.tar.bz2" |
12 | 12 | ||
13 | depends_dev="glib-dev" | 13 | depends_dev="glib-dev" |
14 | build() { | 14 | build() { |
@@ -25,4 +25,4 @@ package() { | |||
25 | cd "$srcdir"/$pkgname-$pkgver | 25 | cd "$srcdir"/$pkgname-$pkgver |
26 | make DESTDIR="$pkgdir" install || return 1 | 26 | make DESTDIR="$pkgdir" install || return 1 |
27 | } | 27 | } |
28 | md5sums="eac51d58179cbcadc3f802450a8ec9cd libxfce4util-4.6.1.tar.bz2" | 28 | md5sums="9c3129d827d480f0906c575e7a13f1e9 libxfce4util-4.6.2.tar.bz2" |
diff --git a/main/libxfcegui4/APKBUILD b/main/libxfcegui4/APKBUILD index 620ee6cd20..db84c19533 100644 --- a/main/libxfcegui4/APKBUILD +++ b/main/libxfcegui4/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=libxfcegui4 | 2 | pkgname=libxfcegui4 |
3 | pkgver=4.6.3 | 3 | pkgver=4.6.4 |
4 | pkgrel=1 | 4 | pkgrel=1 |
5 | pkgdesc="Basic GUI functions for Xfce" | 5 | pkgdesc="Basic GUI functions for Xfce" |
6 | url="http://www.xfce.org/" | 6 | url="http://www.xfce.org/" |
@@ -12,7 +12,7 @@ makedepends="pkgconfig intltool glib-dev gettext-dev libiconv-dev gtk+-dev | |||
12 | libxfce4util-dev expat-dev" | 12 | libxfce4util-dev expat-dev" |
13 | source="http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2" | 13 | source="http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2" |
14 | 14 | ||
15 | depends_dev="gtk+-dev libxfce4util-dev xfconf-dev" | 15 | depends_dev="gtk+-dev libxfce4util-dev xfconf-dev libsm-dev" |
16 | build() { | 16 | build() { |
17 | cd "$srcdir"/$pkgname-$pkgver | 17 | cd "$srcdir"/$pkgname-$pkgver |
18 | ./configure --prefix=/usr \ | 18 | ./configure --prefix=/usr \ |
@@ -28,4 +28,4 @@ package() { | |||
28 | make DESTDIR="$pkgdir" install || return 1 | 28 | make DESTDIR="$pkgdir" install || return 1 |
29 | } | 29 | } |
30 | 30 | ||
31 | md5sums="a647411a0b95d45bb701beff83636307 libxfcegui4-4.6.3.tar.bz2" | 31 | md5sums="88de59b222cb9977f93a4c61011c1e1f libxfcegui4-4.6.4.tar.bz2" |
diff --git a/main/linux-grsec/0019-ipv4-check-rt_genid-in-dst_check.patch b/main/linux-grsec/0019-ipv4-check-rt_genid-in-dst_check.patch new file mode 100644 index 0000000000..e1e9a655e1 --- /dev/null +++ b/main/linux-grsec/0019-ipv4-check-rt_genid-in-dst_check.patch | |||
@@ -0,0 +1,96 @@ | |||
1 | From d11a4dc18bf41719c9f0d7ed494d295dd2973b92 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?utf8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Thu, 18 Mar 2010 23:20:20 +0000 | ||
4 | Subject: [PATCH] ipv4: check rt_genid in dst_check | ||
5 | |||
6 | Xfrm_dst keeps a reference to ipv4 rtable entries on each | ||
7 | cached bundle. The only way to renew xfrm_dst when the underlying | ||
8 | route has changed, is to implement dst_check for this. This is | ||
9 | what ipv6 side does too. | ||
10 | |||
11 | The problems started after 87c1e12b5eeb7b30b4b41291bef8e0b41fc3dde9 | ||
12 | ("ipsec: Fix bogus bundle flowi") which fixed a bug causing xfrm_dst | ||
13 | to not get reused, until that all lookups always generated new | ||
14 | xfrm_dst with new route reference and path mtu worked. But after the | ||
15 | fix, the old routes started to get reused even after they were expired | ||
16 | causing pmtu to break (well it would occationally work if the rtable | ||
17 | gc had run recently and marked the route obsolete causing dst_check to | ||
18 | get called). | ||
19 | |||
20 | Signed-off-by: Timo Teras <timo.teras@iki.fi> | ||
21 | Acked-by: Herbert Xu <herbert@gondor.apana.org.au> | ||
22 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
23 | --- | ||
24 | net/ipv4/route.c | 14 ++++++++++---- | ||
25 | 1 files changed, 10 insertions(+), 4 deletions(-) | ||
26 | |||
27 | diff --git a/net/ipv4/route.c b/net/ipv4/route.c | ||
28 | index a770df2..32d3961 100644 | ||
29 | --- a/net/ipv4/route.c | ||
30 | +++ b/net/ipv4/route.c | ||
31 | @@ -1441,7 +1441,7 @@ void ip_rt_redirect(__be32 old_gw, __be32 daddr, __be32 new_gw, | ||
32 | dev_hold(rt->u.dst.dev); | ||
33 | if (rt->idev) | ||
34 | in_dev_hold(rt->idev); | ||
35 | - rt->u.dst.obsolete = 0; | ||
36 | + rt->u.dst.obsolete = -1; | ||
37 | rt->u.dst.lastuse = jiffies; | ||
38 | rt->u.dst.path = &rt->u.dst; | ||
39 | rt->u.dst.neighbour = NULL; | ||
40 | @@ -1506,7 +1506,7 @@ static struct dst_entry *ipv4_negative_advice(struct dst_entry *dst) | ||
41 | struct dst_entry *ret = dst; | ||
42 | |||
43 | if (rt) { | ||
44 | - if (dst->obsolete) { | ||
45 | + if (dst->obsolete > 0) { | ||
46 | ip_rt_put(rt); | ||
47 | ret = NULL; | ||
48 | } else if ((rt->rt_flags & RTCF_REDIRECTED) || | ||
49 | @@ -1726,7 +1726,9 @@ static void ip_rt_update_pmtu(struct dst_entry *dst, u32 mtu) | ||
50 | |||
51 | static struct dst_entry *ipv4_dst_check(struct dst_entry *dst, u32 cookie) | ||
52 | { | ||
53 | - return NULL; | ||
54 | + if (rt_is_expired((struct rtable *)dst)) | ||
55 | + return NULL; | ||
56 | + return dst; | ||
57 | } | ||
58 | |||
59 | static void ipv4_dst_destroy(struct dst_entry *dst) | ||
60 | @@ -1888,7 +1890,8 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr, | ||
61 | if (!rth) | ||
62 | goto e_nobufs; | ||
63 | |||
64 | - rth->u.dst.output= ip_rt_bug; | ||
65 | + rth->u.dst.output = ip_rt_bug; | ||
66 | + rth->u.dst.obsolete = -1; | ||
67 | |||
68 | atomic_set(&rth->u.dst.__refcnt, 1); | ||
69 | rth->u.dst.flags= DST_HOST; | ||
70 | @@ -2054,6 +2057,7 @@ static int __mkroute_input(struct sk_buff *skb, | ||
71 | rth->fl.oif = 0; | ||
72 | rth->rt_spec_dst= spec_dst; | ||
73 | |||
74 | + rth->u.dst.obsolete = -1; | ||
75 | rth->u.dst.input = ip_forward; | ||
76 | rth->u.dst.output = ip_output; | ||
77 | rth->rt_genid = rt_genid(dev_net(rth->u.dst.dev)); | ||
78 | @@ -2218,6 +2222,7 @@ local_input: | ||
79 | goto e_nobufs; | ||
80 | |||
81 | rth->u.dst.output= ip_rt_bug; | ||
82 | + rth->u.dst.obsolete = -1; | ||
83 | rth->rt_genid = rt_genid(net); | ||
84 | |||
85 | atomic_set(&rth->u.dst.__refcnt, 1); | ||
86 | @@ -2444,6 +2449,7 @@ static int __mkroute_output(struct rtable **result, | ||
87 | rth->rt_spec_dst= fl->fl4_src; | ||
88 | |||
89 | rth->u.dst.output=ip_output; | ||
90 | + rth->u.dst.obsolete = -1; | ||
91 | rth->rt_genid = rt_genid(dev_net(dev_out)); | ||
92 | |||
93 | RT_CACHE_STAT_INC(out_slow_tot); | ||
94 | -- | ||
95 | 1.7.1 | ||
96 | |||
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 02edf0be3f..471b3efb8c 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD | |||
@@ -2,9 +2,9 @@ | |||
2 | 2 | ||
3 | _flavor=grsec | 3 | _flavor=grsec |
4 | pkgname=linux-${_flavor} | 4 | pkgname=linux-${_flavor} |
5 | pkgver=2.6.32.13 | 5 | pkgver=2.6.32.15 |
6 | _kernver=2.6.32 | 6 | _kernver=2.6.32 |
7 | pkgrel=0 | 7 | pkgrel=6 |
8 | pkgdesc="Linux kernel with grsecurity" | 8 | pkgdesc="Linux kernel with grsecurity" |
9 | url=http://grsecurity.net | 9 | url=http://grsecurity.net |
10 | depends="mkinitfs linux-firmware" | 10 | depends="mkinitfs linux-firmware" |
@@ -14,7 +14,7 @@ _config=${config:-kernelconfig.${CARCH:-x86}} | |||
14 | install= | 14 | install= |
15 | source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 | 15 | source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 |
16 | ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 | 16 | ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 |
17 | grsecurity-2.1.14-2.6.32.13-201005151340.patch | 17 | grsecurity-2.1.14-2.6.32.15-201006011506.patch |
18 | 0001-grsec-revert-conflicting-flow-cache-changes.patch | 18 | 0001-grsec-revert-conflicting-flow-cache-changes.patch |
19 | 0002-gre-fix-hard-header-destination-address-checking.patch | 19 | 0002-gre-fix-hard-header-destination-address-checking.patch |
20 | 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch | 20 | 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch |
@@ -30,7 +30,12 @@ source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 | |||
30 | 0016-xfrm-remove-policy-garbage-collection.patch | 30 | 0016-xfrm-remove-policy-garbage-collection.patch |
31 | 0017-flow-delayed-deletion-of-flow-cache-entries.patch | 31 | 0017-flow-delayed-deletion-of-flow-cache-entries.patch |
32 | 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch | 32 | 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch |
33 | 0019-ipv4-check-rt_genid-in-dst_check.patch | ||
33 | xfrm-fix-policy-unreferencing-on-larval-drop.patch | 34 | xfrm-fix-policy-unreferencing-on-larval-drop.patch |
35 | r8169-fix-random-mdio_write-failures.patch | ||
36 | r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch | ||
37 | x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch | ||
38 | hv-grsec.patch | ||
34 | kernelconfig.x86 | 39 | kernelconfig.x86 |
35 | " | 40 | " |
36 | subpackages="$pkgname-dev linux-firmware:firmware" | 41 | subpackages="$pkgname-dev linux-firmware:firmware" |
@@ -44,12 +49,14 @@ prepare() { | |||
44 | bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 -N || return 1 | 49 | bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 -N || return 1 |
45 | fi | 50 | fi |
46 | 51 | ||
47 | # first apply the grsecurity patch and then the rest | 52 | # first apply patches in specified order |
48 | for i in "$srcdir"/grsecurity*.patch "$srcdir"/0[0-9]*.patch \ | 53 | for i in $source; do |
49 | "$srcdir"/xfrm*; do | 54 | case $i in |
50 | [ -f $i ] || continue | 55 | *.patch) |
51 | msg "Applying $i..." | 56 | msg "Applying $i..." |
52 | patch -s -p1 -N < $i || return 1 | 57 | patch -s -p1 -N < "$srcdir"/$i || return 1 |
58 | ;; | ||
59 | esac | ||
53 | done | 60 | done |
54 | 61 | ||
55 | mkdir -p "$srcdir"/build | 62 | mkdir -p "$srcdir"/build |
@@ -67,7 +74,9 @@ menuconfig() { | |||
67 | 74 | ||
68 | build() { | 75 | build() { |
69 | cd "$srcdir"/build | 76 | cd "$srcdir"/build |
70 | make CC="${CC:--gcc}" || return 1 | 77 | make CC="${CC:--gcc}" \ |
78 | KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ | ||
79 | || return 1 | ||
71 | } | 80 | } |
72 | 81 | ||
73 | package() { | 82 | package() { |
@@ -137,8 +146,8 @@ firmware() { | |||
137 | } | 146 | } |
138 | 147 | ||
139 | md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 | 148 | md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 |
140 | ba6abb1ffee513a1d4f831599ddae490 patch-2.6.32.13.bz2 | 149 | 5c9251844c2819eddee4dba1293bd46d patch-2.6.32.15.bz2 |
141 | 00a61e28da8869669171ab12480513e1 grsecurity-2.1.14-2.6.32.13-201005151340.patch | 150 | 7f61d0de3d703c465bff03a20b2dbd30 grsecurity-2.1.14-2.6.32.15-201006011506.patch |
142 | 1d247140abec49b96250aec9aa59b324 0001-grsec-revert-conflicting-flow-cache-changes.patch | 151 | 1d247140abec49b96250aec9aa59b324 0001-grsec-revert-conflicting-flow-cache-changes.patch |
143 | 437317f88ec13ace8d39c31983a41696 0002-gre-fix-hard-header-destination-address-checking.patch | 152 | 437317f88ec13ace8d39c31983a41696 0002-gre-fix-hard-header-destination-address-checking.patch |
144 | 151b29a161178ed39d62a08f21f3484d 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch | 153 | 151b29a161178ed39d62a08f21f3484d 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch |
@@ -154,5 +163,10 @@ c09b82b89a49ba2a3836a0bc3a3312f4 0015-xfrm-cache-bundles-instead-of-policies-fo | |||
154 | 41618efb65ab9ddacfb59a1cde9b4edd 0016-xfrm-remove-policy-garbage-collection.patch | 163 | 41618efb65ab9ddacfb59a1cde9b4edd 0016-xfrm-remove-policy-garbage-collection.patch |
155 | 3b83f0972ab715819d1119b120a987e7 0017-flow-delayed-deletion-of-flow-cache-entries.patch | 164 | 3b83f0972ab715819d1119b120a987e7 0017-flow-delayed-deletion-of-flow-cache-entries.patch |
156 | 45a676c7a1759fec60b724d557b4e295 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch | 165 | 45a676c7a1759fec60b724d557b4e295 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch |
166 | 74e511f12854972db08d3fddc4df0f52 0019-ipv4-check-rt_genid-in-dst_check.patch | ||
157 | c7e606c11c05ff03012b21c3fe0ece47 xfrm-fix-policy-unreferencing-on-larval-drop.patch | 167 | c7e606c11c05ff03012b21c3fe0ece47 xfrm-fix-policy-unreferencing-on-larval-drop.patch |
158 | 7f442049b29ab749180e54ff8f20f1d0 kernelconfig.x86" | 168 | ce4a74190febe13713bab1b886dd5bee r8169-fix-random-mdio_write-failures.patch |
169 | b41ee19f13498fb25992fd60cd1126d4 r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch | ||
170 | a1bcf76870b63a4a4035a8948fb758e2 x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch | ||
171 | bf14850a0036d14bc6177adbdec23a17 hv-grsec.patch | ||
172 | 442d7174a9755ed7bba22ebd4918bbe5 kernelconfig.x86" | ||
diff --git a/main/linux-grsec/grsecurity-2.1.14-2.6.32.13-201005151340.patch b/main/linux-grsec/grsecurity-2.1.14-2.6.32.15-201006011506.patch index 84b90626b7..215c62b4e2 100644 --- a/main/linux-grsec/grsecurity-2.1.14-2.6.32.13-201005151340.patch +++ b/main/linux-grsec/grsecurity-2.1.14-2.6.32.15-201006011506.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | diff -urNp linux-2.6.32.13/arch/alpha/include/asm/elf.h linux-2.6.32.13/arch/alpha/include/asm/elf.h | 1 | diff -urNp linux-2.6.32.15/arch/alpha/include/asm/elf.h linux-2.6.32.15/arch/alpha/include/asm/elf.h |
2 | --- linux-2.6.32.13/arch/alpha/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 | 2 | --- linux-2.6.32.15/arch/alpha/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 |
3 | +++ linux-2.6.32.13/arch/alpha/include/asm/elf.h 2010-05-15 13:21:13.518878295 -0400 | 3 | +++ linux-2.6.32.15/arch/alpha/include/asm/elf.h 2010-05-28 21:27:14.402915497 -0400 |
4 | @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N | 4 | @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N |
5 | 5 | ||
6 | #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) | 6 | #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) |
@@ -15,9 +15,9 @@ diff -urNp linux-2.6.32.13/arch/alpha/include/asm/elf.h linux-2.6.32.13/arch/alp | |||
15 | /* $0 is set by ld.so to a pointer to a function which might be | 15 | /* $0 is set by ld.so to a pointer to a function which might be |
16 | registered using atexit. This provides a mean for the dynamic | 16 | registered using atexit. This provides a mean for the dynamic |
17 | linker to call DT_FINI functions for shared libraries that have | 17 | linker to call DT_FINI functions for shared libraries that have |
18 | diff -urNp linux-2.6.32.13/arch/alpha/include/asm/pgtable.h linux-2.6.32.13/arch/alpha/include/asm/pgtable.h | 18 | diff -urNp linux-2.6.32.15/arch/alpha/include/asm/pgtable.h linux-2.6.32.15/arch/alpha/include/asm/pgtable.h |
19 | --- linux-2.6.32.13/arch/alpha/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 | 19 | --- linux-2.6.32.15/arch/alpha/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 |
20 | +++ linux-2.6.32.13/arch/alpha/include/asm/pgtable.h 2010-05-15 13:21:13.518878295 -0400 | 20 | +++ linux-2.6.32.15/arch/alpha/include/asm/pgtable.h 2010-05-28 21:27:14.420270024 -0400 |
21 | @@ -101,6 +101,17 @@ struct vm_area_struct; | 21 | @@ -101,6 +101,17 @@ struct vm_area_struct; |
22 | #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS) | 22 | #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS) |
23 | #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW) | 23 | #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW) |
@@ -36,9 +36,9 @@ diff -urNp linux-2.6.32.13/arch/alpha/include/asm/pgtable.h linux-2.6.32.13/arch | |||
36 | #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE) | 36 | #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE) |
37 | 37 | ||
38 | #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x)) | 38 | #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x)) |
39 | diff -urNp linux-2.6.32.13/arch/alpha/kernel/module.c linux-2.6.32.13/arch/alpha/kernel/module.c | 39 | diff -urNp linux-2.6.32.15/arch/alpha/kernel/module.c linux-2.6.32.15/arch/alpha/kernel/module.c |
40 | --- linux-2.6.32.13/arch/alpha/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 | 40 | --- linux-2.6.32.15/arch/alpha/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 |
41 | +++ linux-2.6.32.13/arch/alpha/kernel/module.c 2010-05-15 13:21:13.518878295 -0400 | 41 | +++ linux-2.6.32.15/arch/alpha/kernel/module.c 2010-05-28 21:27:14.523207400 -0400 |
42 | @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, | 42 | @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, |
43 | 43 | ||
44 | /* The small sections were sorted to the end of the segment. | 44 | /* The small sections were sorted to the end of the segment. |
@@ -48,9 +48,9 @@ diff -urNp linux-2.6.32.13/arch/alpha/kernel/module.c linux-2.6.32.13/arch/alpha | |||
48 | got = sechdrs[me->arch.gotsecindex].sh_addr; | 48 | got = sechdrs[me->arch.gotsecindex].sh_addr; |
49 | 49 | ||
50 | for (i = 0; i < n; i++) { | 50 | for (i = 0; i < n; i++) { |
51 | diff -urNp linux-2.6.32.13/arch/alpha/kernel/osf_sys.c linux-2.6.32.13/arch/alpha/kernel/osf_sys.c | 51 | diff -urNp linux-2.6.32.15/arch/alpha/kernel/osf_sys.c linux-2.6.32.15/arch/alpha/kernel/osf_sys.c |
52 | --- linux-2.6.32.13/arch/alpha/kernel/osf_sys.c 2010-03-15 11:52:04.000000000 -0400 | 52 | --- linux-2.6.32.15/arch/alpha/kernel/osf_sys.c 2010-03-15 11:52:04.000000000 -0400 |
53 | +++ linux-2.6.32.13/arch/alpha/kernel/osf_sys.c 2010-05-15 13:21:13.518878295 -0400 | 53 | +++ linux-2.6.32.15/arch/alpha/kernel/osf_sys.c 2010-05-28 21:27:14.523207400 -0400 |
54 | @@ -1205,6 +1205,10 @@ arch_get_unmapped_area(struct file *filp | 54 | @@ -1205,6 +1205,10 @@ arch_get_unmapped_area(struct file *filp |
55 | merely specific addresses, but regions of memory -- perhaps | 55 | merely specific addresses, but regions of memory -- perhaps |
56 | this feature should be incorporated into all ports? */ | 56 | this feature should be incorporated into all ports? */ |
@@ -73,9 +73,9 @@ diff -urNp linux-2.6.32.13/arch/alpha/kernel/osf_sys.c linux-2.6.32.13/arch/alph | |||
73 | if (addr != (unsigned long) -ENOMEM) | 73 | if (addr != (unsigned long) -ENOMEM) |
74 | return addr; | 74 | return addr; |
75 | 75 | ||
76 | diff -urNp linux-2.6.32.13/arch/alpha/mm/fault.c linux-2.6.32.13/arch/alpha/mm/fault.c | 76 | diff -urNp linux-2.6.32.15/arch/alpha/mm/fault.c linux-2.6.32.15/arch/alpha/mm/fault.c |
77 | --- linux-2.6.32.13/arch/alpha/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 | 77 | --- linux-2.6.32.15/arch/alpha/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 |
78 | +++ linux-2.6.32.13/arch/alpha/mm/fault.c 2010-05-15 13:21:13.518878295 -0400 | 78 | +++ linux-2.6.32.15/arch/alpha/mm/fault.c 2010-05-28 21:27:14.523207400 -0400 |
79 | @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * | 79 | @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * |
80 | __reload_thread(pcb); | 80 | __reload_thread(pcb); |
81 | } | 81 | } |
@@ -232,9 +232,9 @@ diff -urNp linux-2.6.32.13/arch/alpha/mm/fault.c linux-2.6.32.13/arch/alpha/mm/f | |||
232 | } else if (!cause) { | 232 | } else if (!cause) { |
233 | /* Allow reads even for write-only mappings */ | 233 | /* Allow reads even for write-only mappings */ |
234 | if (!(vma->vm_flags & (VM_READ | VM_WRITE))) | 234 | if (!(vma->vm_flags & (VM_READ | VM_WRITE))) |
235 | diff -urNp linux-2.6.32.13/arch/arm/include/asm/elf.h linux-2.6.32.13/arch/arm/include/asm/elf.h | 235 | diff -urNp linux-2.6.32.15/arch/arm/include/asm/elf.h linux-2.6.32.15/arch/arm/include/asm/elf.h |
236 | --- linux-2.6.32.13/arch/arm/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 | 236 | --- linux-2.6.32.15/arch/arm/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 |
237 | +++ linux-2.6.32.13/arch/arm/include/asm/elf.h 2010-05-15 13:21:13.518878295 -0400 | 237 | +++ linux-2.6.32.15/arch/arm/include/asm/elf.h 2010-05-28 21:27:14.523207400 -0400 |
238 | @@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t | 238 | @@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t |
239 | the loader. We need to make sure that it is out of the way of the program | 239 | the loader. We need to make sure that it is out of the way of the program |
240 | that it will "exec", and that there is sufficient room for the brk. */ | 240 | that it will "exec", and that there is sufficient room for the brk. */ |
@@ -251,9 +251,9 @@ diff -urNp linux-2.6.32.13/arch/arm/include/asm/elf.h linux-2.6.32.13/arch/arm/i | |||
251 | 251 | ||
252 | /* When the program starts, a1 contains a pointer to a function to be | 252 | /* When the program starts, a1 contains a pointer to a function to be |
253 | registered with atexit, as per the SVR4 ABI. A value of 0 means we | 253 | registered with atexit, as per the SVR4 ABI. A value of 0 means we |
254 | diff -urNp linux-2.6.32.13/arch/arm/include/asm/kmap_types.h linux-2.6.32.13/arch/arm/include/asm/kmap_types.h | 254 | diff -urNp linux-2.6.32.15/arch/arm/include/asm/kmap_types.h linux-2.6.32.15/arch/arm/include/asm/kmap_types.h |
255 | --- linux-2.6.32.13/arch/arm/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 | 255 | --- linux-2.6.32.15/arch/arm/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 |
256 | +++ linux-2.6.32.13/arch/arm/include/asm/kmap_types.h 2010-05-15 13:21:13.518878295 -0400 | 256 | +++ linux-2.6.32.15/arch/arm/include/asm/kmap_types.h 2010-05-28 21:27:14.523207400 -0400 |
257 | @@ -19,6 +19,7 @@ enum km_type { | 257 | @@ -19,6 +19,7 @@ enum km_type { |
258 | KM_SOFTIRQ0, | 258 | KM_SOFTIRQ0, |
259 | KM_SOFTIRQ1, | 259 | KM_SOFTIRQ1, |
@@ -262,9 +262,9 @@ diff -urNp linux-2.6.32.13/arch/arm/include/asm/kmap_types.h linux-2.6.32.13/arc | |||
262 | KM_TYPE_NR | 262 | KM_TYPE_NR |
263 | }; | 263 | }; |
264 | 264 | ||
265 | diff -urNp linux-2.6.32.13/arch/arm/include/asm/uaccess.h linux-2.6.32.13/arch/arm/include/asm/uaccess.h | 265 | diff -urNp linux-2.6.32.15/arch/arm/include/asm/uaccess.h linux-2.6.32.15/arch/arm/include/asm/uaccess.h |
266 | --- linux-2.6.32.13/arch/arm/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 | 266 | --- linux-2.6.32.15/arch/arm/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 |
267 | +++ linux-2.6.32.13/arch/arm/include/asm/uaccess.h 2010-05-15 13:21:13.518878295 -0400 | 267 | +++ linux-2.6.32.15/arch/arm/include/asm/uaccess.h 2010-05-28 21:27:14.539151073 -0400 |
268 | @@ -403,6 +403,9 @@ extern unsigned long __must_check __strn | 268 | @@ -403,6 +403,9 @@ extern unsigned long __must_check __strn |
269 | 269 | ||
270 | static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n) | 270 | static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n) |
@@ -285,9 +285,9 @@ diff -urNp linux-2.6.32.13/arch/arm/include/asm/uaccess.h linux-2.6.32.13/arch/a | |||
285 | if (access_ok(VERIFY_WRITE, to, n)) | 285 | if (access_ok(VERIFY_WRITE, to, n)) |
286 | n = __copy_to_user(to, from, n); | 286 | n = __copy_to_user(to, from, n); |
287 | return n; | 287 | return n; |
288 | diff -urNp linux-2.6.32.13/arch/arm/kernel/kgdb.c linux-2.6.32.13/arch/arm/kernel/kgdb.c | 288 | diff -urNp linux-2.6.32.15/arch/arm/kernel/kgdb.c linux-2.6.32.15/arch/arm/kernel/kgdb.c |
289 | --- linux-2.6.32.13/arch/arm/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 | 289 | --- linux-2.6.32.15/arch/arm/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 |
290 | +++ linux-2.6.32.13/arch/arm/kernel/kgdb.c 2010-05-15 13:21:13.518878295 -0400 | 290 | +++ linux-2.6.32.15/arch/arm/kernel/kgdb.c 2010-05-28 21:27:14.539151073 -0400 |
291 | @@ -190,7 +190,7 @@ void kgdb_arch_exit(void) | 291 | @@ -190,7 +190,7 @@ void kgdb_arch_exit(void) |
292 | * and we handle the normal undef case within the do_undefinstr | 292 | * and we handle the normal undef case within the do_undefinstr |
293 | * handler. | 293 | * handler. |
@@ -297,9 +297,9 @@ diff -urNp linux-2.6.32.13/arch/arm/kernel/kgdb.c linux-2.6.32.13/arch/arm/kerne | |||
297 | #ifndef __ARMEB__ | 297 | #ifndef __ARMEB__ |
298 | .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7} | 298 | .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7} |
299 | #else /* ! __ARMEB__ */ | 299 | #else /* ! __ARMEB__ */ |
300 | diff -urNp linux-2.6.32.13/arch/arm/mach-at91/pm.c linux-2.6.32.13/arch/arm/mach-at91/pm.c | 300 | diff -urNp linux-2.6.32.15/arch/arm/mach-at91/pm.c linux-2.6.32.15/arch/arm/mach-at91/pm.c |
301 | --- linux-2.6.32.13/arch/arm/mach-at91/pm.c 2010-03-15 11:52:04.000000000 -0400 | 301 | --- linux-2.6.32.15/arch/arm/mach-at91/pm.c 2010-03-15 11:52:04.000000000 -0400 |
302 | +++ linux-2.6.32.13/arch/arm/mach-at91/pm.c 2010-05-15 13:21:13.518878295 -0400 | 302 | +++ linux-2.6.32.15/arch/arm/mach-at91/pm.c 2010-05-28 21:27:14.600189804 -0400 |
303 | @@ -348,7 +348,7 @@ static void at91_pm_end(void) | 303 | @@ -348,7 +348,7 @@ static void at91_pm_end(void) |
304 | } | 304 | } |
305 | 305 | ||
@@ -309,9 +309,9 @@ diff -urNp linux-2.6.32.13/arch/arm/mach-at91/pm.c linux-2.6.32.13/arch/arm/mach | |||
309 | .valid = at91_pm_valid_state, | 309 | .valid = at91_pm_valid_state, |
310 | .begin = at91_pm_begin, | 310 | .begin = at91_pm_begin, |
311 | .enter = at91_pm_enter, | 311 | .enter = at91_pm_enter, |
312 | diff -urNp linux-2.6.32.13/arch/arm/mach-omap1/pm.c linux-2.6.32.13/arch/arm/mach-omap1/pm.c | 312 | diff -urNp linux-2.6.32.15/arch/arm/mach-omap1/pm.c linux-2.6.32.15/arch/arm/mach-omap1/pm.c |
313 | --- linux-2.6.32.13/arch/arm/mach-omap1/pm.c 2010-03-15 11:52:04.000000000 -0400 | 313 | --- linux-2.6.32.15/arch/arm/mach-omap1/pm.c 2010-03-15 11:52:04.000000000 -0400 |
314 | +++ linux-2.6.32.13/arch/arm/mach-omap1/pm.c 2010-05-15 13:21:13.518878295 -0400 | 314 | +++ linux-2.6.32.15/arch/arm/mach-omap1/pm.c 2010-05-28 21:27:14.600189804 -0400 |
315 | @@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq | 315 | @@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq |
316 | 316 | ||
317 | 317 | ||
@@ -321,9 +321,9 @@ diff -urNp linux-2.6.32.13/arch/arm/mach-omap1/pm.c linux-2.6.32.13/arch/arm/mac | |||
321 | .prepare = omap_pm_prepare, | 321 | .prepare = omap_pm_prepare, |
322 | .enter = omap_pm_enter, | 322 | .enter = omap_pm_enter, |
323 | .finish = omap_pm_finish, | 323 | .finish = omap_pm_finish, |
324 | diff -urNp linux-2.6.32.13/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.13/arch/arm/mach-omap2/pm24xx.c | 324 | diff -urNp linux-2.6.32.15/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.15/arch/arm/mach-omap2/pm24xx.c |
325 | --- linux-2.6.32.13/arch/arm/mach-omap2/pm24xx.c 2010-03-15 11:52:04.000000000 -0400 | 325 | --- linux-2.6.32.15/arch/arm/mach-omap2/pm24xx.c 2010-03-15 11:52:04.000000000 -0400 |
326 | +++ linux-2.6.32.13/arch/arm/mach-omap2/pm24xx.c 2010-05-15 13:21:13.518878295 -0400 | 326 | +++ linux-2.6.32.15/arch/arm/mach-omap2/pm24xx.c 2010-05-28 21:27:14.650418612 -0400 |
327 | @@ -326,7 +326,7 @@ static void omap2_pm_finish(void) | 327 | @@ -326,7 +326,7 @@ static void omap2_pm_finish(void) |
328 | enable_hlt(); | 328 | enable_hlt(); |
329 | } | 329 | } |
@@ -333,9 +333,9 @@ diff -urNp linux-2.6.32.13/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.13/arch/arm | |||
333 | .prepare = omap2_pm_prepare, | 333 | .prepare = omap2_pm_prepare, |
334 | .enter = omap2_pm_enter, | 334 | .enter = omap2_pm_enter, |
335 | .finish = omap2_pm_finish, | 335 | .finish = omap2_pm_finish, |
336 | diff -urNp linux-2.6.32.13/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.13/arch/arm/mach-omap2/pm34xx.c | 336 | diff -urNp linux-2.6.32.15/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.15/arch/arm/mach-omap2/pm34xx.c |
337 | --- linux-2.6.32.13/arch/arm/mach-omap2/pm34xx.c 2010-03-15 11:52:04.000000000 -0400 | 337 | --- linux-2.6.32.15/arch/arm/mach-omap2/pm34xx.c 2010-03-15 11:52:04.000000000 -0400 |
338 | +++ linux-2.6.32.13/arch/arm/mach-omap2/pm34xx.c 2010-05-15 13:21:13.518878295 -0400 | 338 | +++ linux-2.6.32.15/arch/arm/mach-omap2/pm34xx.c 2010-05-28 21:27:14.651073283 -0400 |
339 | @@ -401,7 +401,7 @@ static void omap3_pm_end(void) | 339 | @@ -401,7 +401,7 @@ static void omap3_pm_end(void) |
340 | return; | 340 | return; |
341 | } | 341 | } |
@@ -345,9 +345,9 @@ diff -urNp linux-2.6.32.13/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.13/arch/arm | |||
345 | .begin = omap3_pm_begin, | 345 | .begin = omap3_pm_begin, |
346 | .end = omap3_pm_end, | 346 | .end = omap3_pm_end, |
347 | .prepare = omap3_pm_prepare, | 347 | .prepare = omap3_pm_prepare, |
348 | diff -urNp linux-2.6.32.13/arch/arm/mach-pnx4008/pm.c linux-2.6.32.13/arch/arm/mach-pnx4008/pm.c | 348 | diff -urNp linux-2.6.32.15/arch/arm/mach-pnx4008/pm.c linux-2.6.32.15/arch/arm/mach-pnx4008/pm.c |
349 | --- linux-2.6.32.13/arch/arm/mach-pnx4008/pm.c 2010-03-15 11:52:04.000000000 -0400 | 349 | --- linux-2.6.32.15/arch/arm/mach-pnx4008/pm.c 2010-03-15 11:52:04.000000000 -0400 |
350 | +++ linux-2.6.32.13/arch/arm/mach-pnx4008/pm.c 2010-05-15 13:21:13.518878295 -0400 | 350 | +++ linux-2.6.32.15/arch/arm/mach-pnx4008/pm.c 2010-05-28 21:27:14.651073283 -0400 |
351 | @@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat | 351 | @@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat |
352 | (state == PM_SUSPEND_MEM); | 352 | (state == PM_SUSPEND_MEM); |
353 | } | 353 | } |
@@ -357,9 +357,9 @@ diff -urNp linux-2.6.32.13/arch/arm/mach-pnx4008/pm.c linux-2.6.32.13/arch/arm/m | |||
357 | .enter = pnx4008_pm_enter, | 357 | .enter = pnx4008_pm_enter, |
358 | .valid = pnx4008_pm_valid, | 358 | .valid = pnx4008_pm_valid, |
359 | }; | 359 | }; |
360 | diff -urNp linux-2.6.32.13/arch/arm/mach-pxa/pm.c linux-2.6.32.13/arch/arm/mach-pxa/pm.c | 360 | diff -urNp linux-2.6.32.15/arch/arm/mach-pxa/pm.c linux-2.6.32.15/arch/arm/mach-pxa/pm.c |
361 | --- linux-2.6.32.13/arch/arm/mach-pxa/pm.c 2010-03-15 11:52:04.000000000 -0400 | 361 | --- linux-2.6.32.15/arch/arm/mach-pxa/pm.c 2010-03-15 11:52:04.000000000 -0400 |
362 | +++ linux-2.6.32.13/arch/arm/mach-pxa/pm.c 2010-05-15 13:21:13.518878295 -0400 | 362 | +++ linux-2.6.32.15/arch/arm/mach-pxa/pm.c 2010-05-28 21:27:14.651073283 -0400 |
363 | @@ -95,7 +95,7 @@ void pxa_pm_finish(void) | 363 | @@ -95,7 +95,7 @@ void pxa_pm_finish(void) |
364 | pxa_cpu_pm_fns->finish(); | 364 | pxa_cpu_pm_fns->finish(); |
365 | } | 365 | } |
@@ -369,9 +369,9 @@ diff -urNp linux-2.6.32.13/arch/arm/mach-pxa/pm.c linux-2.6.32.13/arch/arm/mach- | |||
369 | .valid = pxa_pm_valid, | 369 | .valid = pxa_pm_valid, |
370 | .enter = pxa_pm_enter, | 370 | .enter = pxa_pm_enter, |
371 | .prepare = pxa_pm_prepare, | 371 | .prepare = pxa_pm_prepare, |
372 | diff -urNp linux-2.6.32.13/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.13/arch/arm/mach-pxa/sharpsl_pm.c | 372 | diff -urNp linux-2.6.32.15/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.15/arch/arm/mach-pxa/sharpsl_pm.c |
373 | --- linux-2.6.32.13/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-15 11:52:04.000000000 -0400 | 373 | --- linux-2.6.32.15/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-15 11:52:04.000000000 -0400 |
374 | +++ linux-2.6.32.13/arch/arm/mach-pxa/sharpsl_pm.c 2010-05-15 13:21:13.531870735 -0400 | 374 | +++ linux-2.6.32.15/arch/arm/mach-pxa/sharpsl_pm.c 2010-05-28 21:27:14.674954367 -0400 |
375 | @@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status | 375 | @@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status |
376 | } | 376 | } |
377 | 377 | ||
@@ -381,9 +381,9 @@ diff -urNp linux-2.6.32.13/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.13/arch/a | |||
381 | .prepare = pxa_pm_prepare, | 381 | .prepare = pxa_pm_prepare, |
382 | .finish = pxa_pm_finish, | 382 | .finish = pxa_pm_finish, |
383 | .enter = corgi_pxa_pm_enter, | 383 | .enter = corgi_pxa_pm_enter, |
384 | diff -urNp linux-2.6.32.13/arch/arm/mach-sa1100/pm.c linux-2.6.32.13/arch/arm/mach-sa1100/pm.c | 384 | diff -urNp linux-2.6.32.15/arch/arm/mach-sa1100/pm.c linux-2.6.32.15/arch/arm/mach-sa1100/pm.c |
385 | --- linux-2.6.32.13/arch/arm/mach-sa1100/pm.c 2010-03-15 11:52:04.000000000 -0400 | 385 | --- linux-2.6.32.15/arch/arm/mach-sa1100/pm.c 2010-03-15 11:52:04.000000000 -0400 |
386 | +++ linux-2.6.32.13/arch/arm/mach-sa1100/pm.c 2010-05-15 13:21:13.531870735 -0400 | 386 | +++ linux-2.6.32.15/arch/arm/mach-sa1100/pm.c 2010-05-28 21:27:14.674954367 -0400 |
387 | @@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp) | 387 | @@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp) |
388 | return virt_to_phys(sp); | 388 | return virt_to_phys(sp); |
389 | } | 389 | } |
@@ -393,9 +393,9 @@ diff -urNp linux-2.6.32.13/arch/arm/mach-sa1100/pm.c linux-2.6.32.13/arch/arm/ma | |||
393 | .enter = sa11x0_pm_enter, | 393 | .enter = sa11x0_pm_enter, |
394 | .valid = suspend_valid_only_mem, | 394 | .valid = suspend_valid_only_mem, |
395 | }; | 395 | }; |
396 | diff -urNp linux-2.6.32.13/arch/arm/mm/fault.c linux-2.6.32.13/arch/arm/mm/fault.c | 396 | diff -urNp linux-2.6.32.15/arch/arm/mm/fault.c linux-2.6.32.15/arch/arm/mm/fault.c |
397 | --- linux-2.6.32.13/arch/arm/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 | 397 | --- linux-2.6.32.15/arch/arm/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 |
398 | +++ linux-2.6.32.13/arch/arm/mm/fault.c 2010-05-15 13:21:13.542880278 -0400 | 398 | +++ linux-2.6.32.15/arch/arm/mm/fault.c 2010-05-28 21:27:14.683127211 -0400 |
399 | @@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk, | 399 | @@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk, |
400 | } | 400 | } |
401 | #endif | 401 | #endif |
@@ -444,9 +444,9 @@ diff -urNp linux-2.6.32.13/arch/arm/mm/fault.c linux-2.6.32.13/arch/arm/mm/fault | |||
444 | /* | 444 | /* |
445 | * First Level Translation Fault Handler | 445 | * First Level Translation Fault Handler |
446 | * | 446 | * |
447 | diff -urNp linux-2.6.32.13/arch/arm/mm/mmap.c linux-2.6.32.13/arch/arm/mm/mmap.c | 447 | diff -urNp linux-2.6.32.15/arch/arm/mm/mmap.c linux-2.6.32.15/arch/arm/mm/mmap.c |
448 | --- linux-2.6.32.13/arch/arm/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 | 448 | --- linux-2.6.32.15/arch/arm/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 |
449 | +++ linux-2.6.32.13/arch/arm/mm/mmap.c 2010-05-15 13:21:13.546915063 -0400 | 449 | +++ linux-2.6.32.15/arch/arm/mm/mmap.c 2010-05-28 21:27:14.704140649 -0400 |
450 | @@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp | 450 | @@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp |
451 | if (len > TASK_SIZE) | 451 | if (len > TASK_SIZE) |
452 | return -ENOMEM; | 452 | return -ENOMEM; |
@@ -483,9 +483,9 @@ diff -urNp linux-2.6.32.13/arch/arm/mm/mmap.c linux-2.6.32.13/arch/arm/mm/mmap.c | |||
483 | mm->cached_hole_size = 0; | 483 | mm->cached_hole_size = 0; |
484 | goto full_search; | 484 | goto full_search; |
485 | } | 485 | } |
486 | diff -urNp linux-2.6.32.13/arch/arm/plat-s3c/pm.c linux-2.6.32.13/arch/arm/plat-s3c/pm.c | 486 | diff -urNp linux-2.6.32.15/arch/arm/plat-s3c/pm.c linux-2.6.32.15/arch/arm/plat-s3c/pm.c |
487 | --- linux-2.6.32.13/arch/arm/plat-s3c/pm.c 2010-03-15 11:52:04.000000000 -0400 | 487 | --- linux-2.6.32.15/arch/arm/plat-s3c/pm.c 2010-03-15 11:52:04.000000000 -0400 |
488 | +++ linux-2.6.32.13/arch/arm/plat-s3c/pm.c 2010-05-15 13:21:13.546915063 -0400 | 488 | +++ linux-2.6.32.15/arch/arm/plat-s3c/pm.c 2010-05-28 21:27:14.704140649 -0400 |
489 | @@ -355,7 +355,7 @@ static void s3c_pm_finish(void) | 489 | @@ -355,7 +355,7 @@ static void s3c_pm_finish(void) |
490 | s3c_pm_check_cleanup(); | 490 | s3c_pm_check_cleanup(); |
491 | } | 491 | } |
@@ -495,9 +495,9 @@ diff -urNp linux-2.6.32.13/arch/arm/plat-s3c/pm.c linux-2.6.32.13/arch/arm/plat- | |||
495 | .enter = s3c_pm_enter, | 495 | .enter = s3c_pm_enter, |
496 | .prepare = s3c_pm_prepare, | 496 | .prepare = s3c_pm_prepare, |
497 | .finish = s3c_pm_finish, | 497 | .finish = s3c_pm_finish, |
498 | diff -urNp linux-2.6.32.13/arch/avr32/include/asm/elf.h linux-2.6.32.13/arch/avr32/include/asm/elf.h | 498 | diff -urNp linux-2.6.32.15/arch/avr32/include/asm/elf.h linux-2.6.32.15/arch/avr32/include/asm/elf.h |
499 | --- linux-2.6.32.13/arch/avr32/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 | 499 | --- linux-2.6.32.15/arch/avr32/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 |
500 | +++ linux-2.6.32.13/arch/avr32/include/asm/elf.h 2010-05-15 13:21:13.546915063 -0400 | 500 | +++ linux-2.6.32.15/arch/avr32/include/asm/elf.h 2010-05-28 21:27:14.704140649 -0400 |
501 | @@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg | 501 | @@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg |
502 | the loader. We need to make sure that it is out of the way of the program | 502 | the loader. We need to make sure that it is out of the way of the program |
503 | that it will "exec", and that there is sufficient room for the brk. */ | 503 | that it will "exec", and that there is sufficient room for the brk. */ |
@@ -514,9 +514,9 @@ diff -urNp linux-2.6.32.13/arch/avr32/include/asm/elf.h linux-2.6.32.13/arch/avr | |||
514 | 514 | ||
515 | /* This yields a mask that user programs can use to figure out what | 515 | /* This yields a mask that user programs can use to figure out what |
516 | instruction set this CPU supports. This could be done in user space, | 516 | instruction set this CPU supports. This could be done in user space, |
517 | diff -urNp linux-2.6.32.13/arch/avr32/include/asm/kmap_types.h linux-2.6.32.13/arch/avr32/include/asm/kmap_types.h | 517 | diff -urNp linux-2.6.32.15/arch/avr32/include/asm/kmap_types.h linux-2.6.32.15/arch/avr32/include/asm/kmap_types.h |
518 | --- linux-2.6.32.13/arch/avr32/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 | 518 | --- linux-2.6.32.15/arch/avr32/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 |
519 | +++ linux-2.6.32.13/arch/avr32/include/asm/kmap_types.h 2010-05-15 13:21:13.546915063 -0400 | 519 | +++ linux-2.6.32.15/arch/avr32/include/asm/kmap_types.h 2010-05-28 21:27:14.706951400 -0400 |
520 | @@ -22,7 +22,8 @@ D(10) KM_IRQ0, | 520 | @@ -22,7 +22,8 @@ D(10) KM_IRQ0, |
521 | D(11) KM_IRQ1, | 521 | D(11) KM_IRQ1, |
522 | D(12) KM_SOFTIRQ0, | 522 | D(12) KM_SOFTIRQ0, |
@@ -527,9 +527,9 @@ diff -urNp linux-2.6.32.13/arch/avr32/include/asm/kmap_types.h linux-2.6.32.13/a | |||
527 | }; | 527 | }; |
528 | 528 | ||
529 | #undef D | 529 | #undef D |
530 | diff -urNp linux-2.6.32.13/arch/avr32/mach-at32ap/pm.c linux-2.6.32.13/arch/avr32/mach-at32ap/pm.c | 530 | diff -urNp linux-2.6.32.15/arch/avr32/mach-at32ap/pm.c linux-2.6.32.15/arch/avr32/mach-at32ap/pm.c |
531 | --- linux-2.6.32.13/arch/avr32/mach-at32ap/pm.c 2010-03-15 11:52:04.000000000 -0400 | 531 | --- linux-2.6.32.15/arch/avr32/mach-at32ap/pm.c 2010-03-15 11:52:04.000000000 -0400 |
532 | +++ linux-2.6.32.13/arch/avr32/mach-at32ap/pm.c 2010-05-15 13:21:13.546915063 -0400 | 532 | +++ linux-2.6.32.15/arch/avr32/mach-at32ap/pm.c 2010-05-28 21:27:14.706951400 -0400 |
533 | @@ -176,7 +176,7 @@ out: | 533 | @@ -176,7 +176,7 @@ out: |
534 | return 0; | 534 | return 0; |
535 | } | 535 | } |
@@ -539,9 +539,9 @@ diff -urNp linux-2.6.32.13/arch/avr32/mach-at32ap/pm.c linux-2.6.32.13/arch/avr3 | |||
539 | .valid = avr32_pm_valid_state, | 539 | .valid = avr32_pm_valid_state, |
540 | .enter = avr32_pm_enter, | 540 | .enter = avr32_pm_enter, |
541 | }; | 541 | }; |
542 | diff -urNp linux-2.6.32.13/arch/avr32/mm/fault.c linux-2.6.32.13/arch/avr32/mm/fault.c | 542 | diff -urNp linux-2.6.32.15/arch/avr32/mm/fault.c linux-2.6.32.15/arch/avr32/mm/fault.c |
543 | --- linux-2.6.32.13/arch/avr32/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 | 543 | --- linux-2.6.32.15/arch/avr32/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 |
544 | +++ linux-2.6.32.13/arch/avr32/mm/fault.c 2010-05-15 13:21:13.546915063 -0400 | 544 | +++ linux-2.6.32.15/arch/avr32/mm/fault.c 2010-05-28 21:27:14.706951400 -0400 |
545 | @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru | 545 | @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru |
546 | 546 | ||
547 | int exception_trace = 1; | 547 | int exception_trace = 1; |
@@ -583,9 +583,9 @@ diff -urNp linux-2.6.32.13/arch/avr32/mm/fault.c linux-2.6.32.13/arch/avr32/mm/f | |||
583 | if (exception_trace && printk_ratelimit()) | 583 | if (exception_trace && printk_ratelimit()) |
584 | printk("%s%s[%d]: segfault at %08lx pc %08lx " | 584 | printk("%s%s[%d]: segfault at %08lx pc %08lx " |
585 | "sp %08lx ecr %lu\n", | 585 | "sp %08lx ecr %lu\n", |
586 | diff -urNp linux-2.6.32.13/arch/blackfin/kernel/kgdb.c linux-2.6.32.13/arch/blackfin/kernel/kgdb.c | 586 | diff -urNp linux-2.6.32.15/arch/blackfin/kernel/kgdb.c linux-2.6.32.15/arch/blackfin/kernel/kgdb.c |
587 | --- linux-2.6.32.13/arch/blackfin/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 | 587 | --- linux-2.6.32.15/arch/blackfin/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 |
588 | +++ linux-2.6.32.13/arch/blackfin/kernel/kgdb.c 2010-05-15 13:21:13.568389913 -0400 | 588 | +++ linux-2.6.32.15/arch/blackfin/kernel/kgdb.c 2010-05-28 21:27:14.706951400 -0400 |
589 | @@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto | 589 | @@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto |
590 | return -1; /* this means that we do not want to exit from the handler */ | 590 | return -1; /* this means that we do not want to exit from the handler */ |
591 | } | 591 | } |
@@ -595,9 +595,9 @@ diff -urNp linux-2.6.32.13/arch/blackfin/kernel/kgdb.c linux-2.6.32.13/arch/blac | |||
595 | .gdb_bpt_instr = {0xa1}, | 595 | .gdb_bpt_instr = {0xa1}, |
596 | #ifdef CONFIG_SMP | 596 | #ifdef CONFIG_SMP |
597 | .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP, | 597 | .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP, |
598 | diff -urNp linux-2.6.32.13/arch/blackfin/mach-common/pm.c linux-2.6.32.13/arch/blackfin/mach-common/pm.c | 598 | diff -urNp linux-2.6.32.15/arch/blackfin/mach-common/pm.c linux-2.6.32.15/arch/blackfin/mach-common/pm.c |
599 | --- linux-2.6.32.13/arch/blackfin/mach-common/pm.c 2010-03-15 11:52:04.000000000 -0400 | 599 | --- linux-2.6.32.15/arch/blackfin/mach-common/pm.c 2010-03-15 11:52:04.000000000 -0400 |
600 | +++ linux-2.6.32.13/arch/blackfin/mach-common/pm.c 2010-05-15 13:21:13.568389913 -0400 | 600 | +++ linux-2.6.32.15/arch/blackfin/mach-common/pm.c 2010-05-28 21:27:14.706951400 -0400 |
601 | @@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t | 601 | @@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t |
602 | return 0; | 602 | return 0; |
603 | } | 603 | } |
@@ -607,9 +607,9 @@ diff -urNp linux-2.6.32.13/arch/blackfin/mach-common/pm.c linux-2.6.32.13/arch/b | |||
607 | .enter = bfin_pm_enter, | 607 | .enter = bfin_pm_enter, |
608 | .valid = bfin_pm_valid, | 608 | .valid = bfin_pm_valid, |
609 | }; | 609 | }; |
610 | diff -urNp linux-2.6.32.13/arch/frv/include/asm/kmap_types.h linux-2.6.32.13/arch/frv/include/asm/kmap_types.h | 610 | diff -urNp linux-2.6.32.15/arch/frv/include/asm/kmap_types.h linux-2.6.32.15/arch/frv/include/asm/kmap_types.h |
611 | --- linux-2.6.32.13/arch/frv/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 | 611 | --- linux-2.6.32.15/arch/frv/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 |
612 | +++ linux-2.6.32.13/arch/frv/include/asm/kmap_types.h 2010-05-15 13:21:13.568389913 -0400 | 612 | +++ linux-2.6.32.15/arch/frv/include/asm/kmap_types.h 2010-05-28 21:27:14.706951400 -0400 |
613 | @@ -23,6 +23,7 @@ enum km_type { | 613 | @@ -23,6 +23,7 @@ enum km_type { |
614 | KM_IRQ1, | 614 | KM_IRQ1, |
615 | KM_SOFTIRQ0, | 615 | KM_SOFTIRQ0, |
@@ -618,9 +618,9 @@ diff -urNp linux-2.6.32.13/arch/frv/include/asm/kmap_types.h linux-2.6.32.13/arc | |||
618 | KM_TYPE_NR | 618 | KM_TYPE_NR |
619 | }; | 619 | }; |
620 | 620 | ||
621 | diff -urNp linux-2.6.32.13/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.13/arch/ia64/hp/common/hwsw_iommu.c | 621 | diff -urNp linux-2.6.32.15/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.15/arch/ia64/hp/common/hwsw_iommu.c |
622 | --- linux-2.6.32.13/arch/ia64/hp/common/hwsw_iommu.c 2010-03-15 11:52:04.000000000 -0400 | 622 | --- linux-2.6.32.15/arch/ia64/hp/common/hwsw_iommu.c 2010-03-15 11:52:04.000000000 -0400 |
623 | +++ linux-2.6.32.13/arch/ia64/hp/common/hwsw_iommu.c 2010-05-15 13:21:13.584352190 -0400 | 623 | +++ linux-2.6.32.15/arch/ia64/hp/common/hwsw_iommu.c 2010-05-28 21:27:14.706951400 -0400 |
624 | @@ -17,7 +17,7 @@ | 624 | @@ -17,7 +17,7 @@ |
625 | #include <linux/swiotlb.h> | 625 | #include <linux/swiotlb.h> |
626 | #include <asm/machvec.h> | 626 | #include <asm/machvec.h> |
@@ -639,9 +639,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.13/arch | |||
639 | { | 639 | { |
640 | if (use_swiotlb(dev)) | 640 | if (use_swiotlb(dev)) |
641 | return &swiotlb_dma_ops; | 641 | return &swiotlb_dma_ops; |
642 | diff -urNp linux-2.6.32.13/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.13/arch/ia64/hp/common/sba_iommu.c | 642 | diff -urNp linux-2.6.32.15/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.15/arch/ia64/hp/common/sba_iommu.c |
643 | --- linux-2.6.32.13/arch/ia64/hp/common/sba_iommu.c 2010-03-15 11:52:04.000000000 -0400 | 643 | --- linux-2.6.32.15/arch/ia64/hp/common/sba_iommu.c 2010-03-15 11:52:04.000000000 -0400 |
644 | +++ linux-2.6.32.13/arch/ia64/hp/common/sba_iommu.c 2010-05-15 13:21:13.614291139 -0400 | 644 | +++ linux-2.6.32.15/arch/ia64/hp/common/sba_iommu.c 2010-05-28 21:27:14.706951400 -0400 |
645 | @@ -2077,7 +2077,7 @@ static struct acpi_driver acpi_sba_ioc_d | 645 | @@ -2077,7 +2077,7 @@ static struct acpi_driver acpi_sba_ioc_d |
646 | }, | 646 | }, |
647 | }; | 647 | }; |
@@ -660,9 +660,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.13/arch/ | |||
660 | .alloc_coherent = sba_alloc_coherent, | 660 | .alloc_coherent = sba_alloc_coherent, |
661 | .free_coherent = sba_free_coherent, | 661 | .free_coherent = sba_free_coherent, |
662 | .map_page = sba_map_page, | 662 | .map_page = sba_map_page, |
663 | diff -urNp linux-2.6.32.13/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.13/arch/ia64/ia32/binfmt_elf32.c | 663 | diff -urNp linux-2.6.32.15/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.15/arch/ia64/ia32/binfmt_elf32.c |
664 | --- linux-2.6.32.13/arch/ia64/ia32/binfmt_elf32.c 2010-03-15 11:52:04.000000000 -0400 | 664 | --- linux-2.6.32.15/arch/ia64/ia32/binfmt_elf32.c 2010-03-15 11:52:04.000000000 -0400 |
665 | +++ linux-2.6.32.13/arch/ia64/ia32/binfmt_elf32.c 2010-05-15 13:21:13.614854679 -0400 | 665 | +++ linux-2.6.32.15/arch/ia64/ia32/binfmt_elf32.c 2010-05-28 21:27:14.706951400 -0400 |
666 | @@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_ | 666 | @@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_ |
667 | 667 | ||
668 | #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack)) | 668 | #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack)) |
@@ -677,9 +677,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.13/arch/ia | |||
677 | /* Ugly but avoids duplication */ | 677 | /* Ugly but avoids duplication */ |
678 | #include "../../../fs/binfmt_elf.c" | 678 | #include "../../../fs/binfmt_elf.c" |
679 | 679 | ||
680 | diff -urNp linux-2.6.32.13/arch/ia64/ia32/ia32priv.h linux-2.6.32.13/arch/ia64/ia32/ia32priv.h | 680 | diff -urNp linux-2.6.32.15/arch/ia64/ia32/ia32priv.h linux-2.6.32.15/arch/ia64/ia32/ia32priv.h |
681 | --- linux-2.6.32.13/arch/ia64/ia32/ia32priv.h 2010-03-15 11:52:04.000000000 -0400 | 681 | --- linux-2.6.32.15/arch/ia64/ia32/ia32priv.h 2010-03-15 11:52:04.000000000 -0400 |
682 | +++ linux-2.6.32.13/arch/ia64/ia32/ia32priv.h 2010-05-15 13:21:13.614854679 -0400 | 682 | +++ linux-2.6.32.15/arch/ia64/ia32/ia32priv.h 2010-05-28 21:27:14.716122970 -0400 |
683 | @@ -296,7 +296,14 @@ typedef struct compat_siginfo { | 683 | @@ -296,7 +296,14 @@ typedef struct compat_siginfo { |
684 | #define ELF_DATA ELFDATA2LSB | 684 | #define ELF_DATA ELFDATA2LSB |
685 | #define ELF_ARCH EM_386 | 685 | #define ELF_ARCH EM_386 |
@@ -696,9 +696,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/ia32/ia32priv.h linux-2.6.32.13/arch/ia64/i | |||
696 | #define IA32_GATE_OFFSET IA32_PAGE_OFFSET | 696 | #define IA32_GATE_OFFSET IA32_PAGE_OFFSET |
697 | #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE | 697 | #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE |
698 | 698 | ||
699 | diff -urNp linux-2.6.32.13/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.13/arch/ia64/include/asm/dma-mapping.h | 699 | diff -urNp linux-2.6.32.15/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.15/arch/ia64/include/asm/dma-mapping.h |
700 | --- linux-2.6.32.13/arch/ia64/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 | 700 | --- linux-2.6.32.15/arch/ia64/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 |
701 | +++ linux-2.6.32.13/arch/ia64/include/asm/dma-mapping.h 2010-05-15 13:21:13.614854679 -0400 | 701 | +++ linux-2.6.32.15/arch/ia64/include/asm/dma-mapping.h 2010-05-28 21:27:14.716122970 -0400 |
702 | @@ -12,7 +12,7 @@ | 702 | @@ -12,7 +12,7 @@ |
703 | 703 | ||
704 | #define ARCH_HAS_DMA_GET_REQUIRED_MASK | 704 | #define ARCH_HAS_DMA_GET_REQUIRED_MASK |
@@ -742,9 +742,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.13/a | |||
742 | return ops->dma_supported(dev, mask); | 742 | return ops->dma_supported(dev, mask); |
743 | } | 743 | } |
744 | 744 | ||
745 | diff -urNp linux-2.6.32.13/arch/ia64/include/asm/elf.h linux-2.6.32.13/arch/ia64/include/asm/elf.h | 745 | diff -urNp linux-2.6.32.15/arch/ia64/include/asm/elf.h linux-2.6.32.15/arch/ia64/include/asm/elf.h |
746 | --- linux-2.6.32.13/arch/ia64/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 | 746 | --- linux-2.6.32.15/arch/ia64/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 |
747 | +++ linux-2.6.32.13/arch/ia64/include/asm/elf.h 2010-05-15 13:21:13.614854679 -0400 | 747 | +++ linux-2.6.32.15/arch/ia64/include/asm/elf.h 2010-05-28 21:27:14.716122970 -0400 |
748 | @@ -43,6 +43,13 @@ | 748 | @@ -43,6 +43,13 @@ |
749 | */ | 749 | */ |
750 | #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) | 750 | #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) |
@@ -759,9 +759,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/include/asm/elf.h linux-2.6.32.13/arch/ia64 | |||
759 | #define PT_IA_64_UNWIND 0x70000001 | 759 | #define PT_IA_64_UNWIND 0x70000001 |
760 | 760 | ||
761 | /* IA-64 relocations: */ | 761 | /* IA-64 relocations: */ |
762 | diff -urNp linux-2.6.32.13/arch/ia64/include/asm/machvec.h linux-2.6.32.13/arch/ia64/include/asm/machvec.h | 762 | diff -urNp linux-2.6.32.15/arch/ia64/include/asm/machvec.h linux-2.6.32.15/arch/ia64/include/asm/machvec.h |
763 | --- linux-2.6.32.13/arch/ia64/include/asm/machvec.h 2010-03-15 11:52:04.000000000 -0400 | 763 | --- linux-2.6.32.15/arch/ia64/include/asm/machvec.h 2010-03-15 11:52:04.000000000 -0400 |
764 | +++ linux-2.6.32.13/arch/ia64/include/asm/machvec.h 2010-05-15 13:21:13.614854679 -0400 | 764 | +++ linux-2.6.32.15/arch/ia64/include/asm/machvec.h 2010-05-28 21:27:14.716122970 -0400 |
765 | @@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event | 765 | @@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event |
766 | /* DMA-mapping interface: */ | 766 | /* DMA-mapping interface: */ |
767 | typedef void ia64_mv_dma_init (void); | 767 | typedef void ia64_mv_dma_init (void); |
@@ -780,9 +780,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/include/asm/machvec.h linux-2.6.32.13/arch/ | |||
780 | 780 | ||
781 | /* | 781 | /* |
782 | * Define default versions so we can extend machvec for new platforms without having | 782 | * Define default versions so we can extend machvec for new platforms without having |
783 | diff -urNp linux-2.6.32.13/arch/ia64/include/asm/pgtable.h linux-2.6.32.13/arch/ia64/include/asm/pgtable.h | 783 | diff -urNp linux-2.6.32.15/arch/ia64/include/asm/pgtable.h linux-2.6.32.15/arch/ia64/include/asm/pgtable.h |
784 | --- linux-2.6.32.13/arch/ia64/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 | 784 | --- linux-2.6.32.15/arch/ia64/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 |
785 | +++ linux-2.6.32.13/arch/ia64/include/asm/pgtable.h 2010-05-15 13:21:13.618628456 -0400 | 785 | +++ linux-2.6.32.15/arch/ia64/include/asm/pgtable.h 2010-05-28 21:27:14.716122970 -0400 |
786 | @@ -143,6 +143,17 @@ | 786 | @@ -143,6 +143,17 @@ |
787 | #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) | 787 | #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) |
788 | #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) | 788 | #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) |
@@ -801,9 +801,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/include/asm/pgtable.h linux-2.6.32.13/arch/ | |||
801 | #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX) | 801 | #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX) |
802 | #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX) | 802 | #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX) |
803 | #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX) | 803 | #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX) |
804 | diff -urNp linux-2.6.32.13/arch/ia64/include/asm/uaccess.h linux-2.6.32.13/arch/ia64/include/asm/uaccess.h | 804 | diff -urNp linux-2.6.32.15/arch/ia64/include/asm/uaccess.h linux-2.6.32.15/arch/ia64/include/asm/uaccess.h |
805 | --- linux-2.6.32.13/arch/ia64/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 | 805 | --- linux-2.6.32.15/arch/ia64/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 |
806 | +++ linux-2.6.32.13/arch/ia64/include/asm/uaccess.h 2010-05-15 13:21:13.626873619 -0400 | 806 | +++ linux-2.6.32.15/arch/ia64/include/asm/uaccess.h 2010-05-28 21:27:14.728159079 -0400 |
807 | @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ | 807 | @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ |
808 | const void *__cu_from = (from); \ | 808 | const void *__cu_from = (from); \ |
809 | long __cu_len = (n); \ | 809 | long __cu_len = (n); \ |
@@ -822,9 +822,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/include/asm/uaccess.h linux-2.6.32.13/arch/ | |||
822 | __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ | 822 | __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ |
823 | __cu_len; \ | 823 | __cu_len; \ |
824 | }) | 824 | }) |
825 | diff -urNp linux-2.6.32.13/arch/ia64/kernel/dma-mapping.c linux-2.6.32.13/arch/ia64/kernel/dma-mapping.c | 825 | diff -urNp linux-2.6.32.15/arch/ia64/kernel/dma-mapping.c linux-2.6.32.15/arch/ia64/kernel/dma-mapping.c |
826 | --- linux-2.6.32.13/arch/ia64/kernel/dma-mapping.c 2010-03-15 11:52:04.000000000 -0400 | 826 | --- linux-2.6.32.15/arch/ia64/kernel/dma-mapping.c 2010-03-15 11:52:04.000000000 -0400 |
827 | +++ linux-2.6.32.13/arch/ia64/kernel/dma-mapping.c 2010-05-15 13:21:13.626873619 -0400 | 827 | +++ linux-2.6.32.15/arch/ia64/kernel/dma-mapping.c 2010-05-28 21:27:14.731127928 -0400 |
828 | @@ -3,7 +3,7 @@ | 828 | @@ -3,7 +3,7 @@ |
829 | /* Set this to 1 if there is a HW IOMMU in the system */ | 829 | /* Set this to 1 if there is a HW IOMMU in the system */ |
830 | int iommu_detected __read_mostly; | 830 | int iommu_detected __read_mostly; |
@@ -843,9 +843,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/kernel/dma-mapping.c linux-2.6.32.13/arch/i | |||
843 | { | 843 | { |
844 | return dma_ops; | 844 | return dma_ops; |
845 | } | 845 | } |
846 | diff -urNp linux-2.6.32.13/arch/ia64/kernel/module.c linux-2.6.32.13/arch/ia64/kernel/module.c | 846 | diff -urNp linux-2.6.32.15/arch/ia64/kernel/module.c linux-2.6.32.15/arch/ia64/kernel/module.c |
847 | --- linux-2.6.32.13/arch/ia64/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 | 847 | --- linux-2.6.32.15/arch/ia64/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 |
848 | +++ linux-2.6.32.13/arch/ia64/kernel/module.c 2010-05-15 13:21:13.626873619 -0400 | 848 | +++ linux-2.6.32.15/arch/ia64/kernel/module.c 2010-05-28 21:27:14.734962469 -0400 |
849 | @@ -315,8 +315,7 @@ module_alloc (unsigned long size) | 849 | @@ -315,8 +315,7 @@ module_alloc (unsigned long size) |
850 | void | 850 | void |
851 | module_free (struct module *mod, void *module_region) | 851 | module_free (struct module *mod, void *module_region) |
@@ -934,9 +934,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/kernel/module.c linux-2.6.32.13/arch/ia64/k | |||
934 | mod->arch.gp = gp; | 934 | mod->arch.gp = gp; |
935 | DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); | 935 | DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); |
936 | } | 936 | } |
937 | diff -urNp linux-2.6.32.13/arch/ia64/kernel/pci-dma.c linux-2.6.32.13/arch/ia64/kernel/pci-dma.c | 937 | diff -urNp linux-2.6.32.15/arch/ia64/kernel/pci-dma.c linux-2.6.32.15/arch/ia64/kernel/pci-dma.c |
938 | --- linux-2.6.32.13/arch/ia64/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400 | 938 | --- linux-2.6.32.15/arch/ia64/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400 |
939 | +++ linux-2.6.32.13/arch/ia64/kernel/pci-dma.c 2010-05-15 13:21:13.626873619 -0400 | 939 | +++ linux-2.6.32.15/arch/ia64/kernel/pci-dma.c 2010-05-28 21:27:14.734962469 -0400 |
940 | @@ -43,7 +43,7 @@ struct device fallback_dev = { | 940 | @@ -43,7 +43,7 @@ struct device fallback_dev = { |
941 | .dma_mask = &fallback_dev.coherent_dma_mask, | 941 | .dma_mask = &fallback_dev.coherent_dma_mask, |
942 | }; | 942 | }; |
@@ -946,9 +946,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/kernel/pci-dma.c linux-2.6.32.13/arch/ia64/ | |||
946 | 946 | ||
947 | static int __init pci_iommu_init(void) | 947 | static int __init pci_iommu_init(void) |
948 | { | 948 | { |
949 | diff -urNp linux-2.6.32.13/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.13/arch/ia64/kernel/pci-swiotlb.c | 949 | diff -urNp linux-2.6.32.15/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.15/arch/ia64/kernel/pci-swiotlb.c |
950 | --- linux-2.6.32.13/arch/ia64/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 | 950 | --- linux-2.6.32.15/arch/ia64/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 |
951 | +++ linux-2.6.32.13/arch/ia64/kernel/pci-swiotlb.c 2010-05-15 13:21:13.626873619 -0400 | 951 | +++ linux-2.6.32.15/arch/ia64/kernel/pci-swiotlb.c 2010-05-28 21:27:14.734962469 -0400 |
952 | @@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent | 952 | @@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent |
953 | return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); | 953 | return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); |
954 | } | 954 | } |
@@ -958,9 +958,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.13/arch/i | |||
958 | .alloc_coherent = ia64_swiotlb_alloc_coherent, | 958 | .alloc_coherent = ia64_swiotlb_alloc_coherent, |
959 | .free_coherent = swiotlb_free_coherent, | 959 | .free_coherent = swiotlb_free_coherent, |
960 | .map_page = swiotlb_map_page, | 960 | .map_page = swiotlb_map_page, |
961 | diff -urNp linux-2.6.32.13/arch/ia64/kernel/sys_ia64.c linux-2.6.32.13/arch/ia64/kernel/sys_ia64.c | 961 | diff -urNp linux-2.6.32.15/arch/ia64/kernel/sys_ia64.c linux-2.6.32.15/arch/ia64/kernel/sys_ia64.c |
962 | --- linux-2.6.32.13/arch/ia64/kernel/sys_ia64.c 2010-03-15 11:52:04.000000000 -0400 | 962 | --- linux-2.6.32.15/arch/ia64/kernel/sys_ia64.c 2010-03-15 11:52:04.000000000 -0400 |
963 | +++ linux-2.6.32.13/arch/ia64/kernel/sys_ia64.c 2010-05-15 13:21:13.626873619 -0400 | 963 | +++ linux-2.6.32.15/arch/ia64/kernel/sys_ia64.c 2010-05-28 21:27:14.734962469 -0400 |
964 | @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil | 964 | @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil |
965 | if (REGION_NUMBER(addr) == RGN_HPAGE) | 965 | if (REGION_NUMBER(addr) == RGN_HPAGE) |
966 | addr = 0; | 966 | addr = 0; |
@@ -987,9 +987,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/kernel/sys_ia64.c linux-2.6.32.13/arch/ia64 | |||
987 | goto full_search; | 987 | goto full_search; |
988 | } | 988 | } |
989 | return -ENOMEM; | 989 | return -ENOMEM; |
990 | diff -urNp linux-2.6.32.13/arch/ia64/kernel/topology.c linux-2.6.32.13/arch/ia64/kernel/topology.c | 990 | diff -urNp linux-2.6.32.15/arch/ia64/kernel/topology.c linux-2.6.32.15/arch/ia64/kernel/topology.c |
991 | --- linux-2.6.32.13/arch/ia64/kernel/topology.c 2010-03-15 11:52:04.000000000 -0400 | 991 | --- linux-2.6.32.15/arch/ia64/kernel/topology.c 2010-03-15 11:52:04.000000000 -0400 |
992 | +++ linux-2.6.32.13/arch/ia64/kernel/topology.c 2010-05-15 13:21:13.626873619 -0400 | 992 | +++ linux-2.6.32.15/arch/ia64/kernel/topology.c 2010-05-28 21:27:14.743147071 -0400 |
993 | @@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject | 993 | @@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject |
994 | return ret; | 994 | return ret; |
995 | } | 995 | } |
@@ -999,9 +999,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/kernel/topology.c linux-2.6.32.13/arch/ia64 | |||
999 | .show = cache_show | 999 | .show = cache_show |
1000 | }; | 1000 | }; |
1001 | 1001 | ||
1002 | diff -urNp linux-2.6.32.13/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.13/arch/ia64/kernel/vmlinux.lds.S | 1002 | diff -urNp linux-2.6.32.15/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.15/arch/ia64/kernel/vmlinux.lds.S |
1003 | --- linux-2.6.32.13/arch/ia64/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400 | 1003 | --- linux-2.6.32.15/arch/ia64/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400 |
1004 | +++ linux-2.6.32.13/arch/ia64/kernel/vmlinux.lds.S 2010-05-15 13:21:13.626873619 -0400 | 1004 | +++ linux-2.6.32.15/arch/ia64/kernel/vmlinux.lds.S 2010-05-28 21:27:14.743147071 -0400 |
1005 | @@ -190,7 +190,7 @@ SECTIONS | 1005 | @@ -190,7 +190,7 @@ SECTIONS |
1006 | /* Per-cpu data: */ | 1006 | /* Per-cpu data: */ |
1007 | . = ALIGN(PERCPU_PAGE_SIZE); | 1007 | . = ALIGN(PERCPU_PAGE_SIZE); |
@@ -1011,9 +1011,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.13/arch/i | |||
1011 | . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits | 1011 | . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits |
1012 | * into percpu page size | 1012 | * into percpu page size |
1013 | */ | 1013 | */ |
1014 | diff -urNp linux-2.6.32.13/arch/ia64/mm/fault.c linux-2.6.32.13/arch/ia64/mm/fault.c | 1014 | diff -urNp linux-2.6.32.15/arch/ia64/mm/fault.c linux-2.6.32.15/arch/ia64/mm/fault.c |
1015 | --- linux-2.6.32.13/arch/ia64/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 | 1015 | --- linux-2.6.32.15/arch/ia64/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 |
1016 | +++ linux-2.6.32.13/arch/ia64/mm/fault.c 2010-05-15 13:21:13.626873619 -0400 | 1016 | +++ linux-2.6.32.15/arch/ia64/mm/fault.c 2010-05-28 21:27:14.743147071 -0400 |
1017 | @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned | 1017 | @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned |
1018 | return pte_present(pte); | 1018 | return pte_present(pte); |
1019 | } | 1019 | } |
@@ -1063,9 +1063,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/mm/fault.c linux-2.6.32.13/arch/ia64/mm/fau | |||
1063 | survive: | 1063 | survive: |
1064 | /* | 1064 | /* |
1065 | * If for any reason at all we couldn't handle the fault, make | 1065 | * If for any reason at all we couldn't handle the fault, make |
1066 | diff -urNp linux-2.6.32.13/arch/ia64/mm/init.c linux-2.6.32.13/arch/ia64/mm/init.c | 1066 | diff -urNp linux-2.6.32.15/arch/ia64/mm/init.c linux-2.6.32.15/arch/ia64/mm/init.c |
1067 | --- linux-2.6.32.13/arch/ia64/mm/init.c 2010-03-15 11:52:04.000000000 -0400 | 1067 | --- linux-2.6.32.15/arch/ia64/mm/init.c 2010-03-15 11:52:04.000000000 -0400 |
1068 | +++ linux-2.6.32.13/arch/ia64/mm/init.c 2010-05-15 13:21:13.626873619 -0400 | 1068 | +++ linux-2.6.32.15/arch/ia64/mm/init.c 2010-05-28 21:27:14.755165915 -0400 |
1069 | @@ -122,6 +122,19 @@ ia64_init_addr_space (void) | 1069 | @@ -122,6 +122,19 @@ ia64_init_addr_space (void) |
1070 | vma->vm_start = current->thread.rbs_bot & PAGE_MASK; | 1070 | vma->vm_start = current->thread.rbs_bot & PAGE_MASK; |
1071 | vma->vm_end = vma->vm_start + PAGE_SIZE; | 1071 | vma->vm_end = vma->vm_start + PAGE_SIZE; |
@@ -1086,9 +1086,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/mm/init.c linux-2.6.32.13/arch/ia64/mm/init | |||
1086 | vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); | 1086 | vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); |
1087 | down_write(¤t->mm->mmap_sem); | 1087 | down_write(¤t->mm->mmap_sem); |
1088 | if (insert_vm_struct(current->mm, vma)) { | 1088 | if (insert_vm_struct(current->mm, vma)) { |
1089 | diff -urNp linux-2.6.32.13/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.13/arch/ia64/sn/pci/pci_dma.c | 1089 | diff -urNp linux-2.6.32.15/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.15/arch/ia64/sn/pci/pci_dma.c |
1090 | --- linux-2.6.32.13/arch/ia64/sn/pci/pci_dma.c 2010-03-15 11:52:04.000000000 -0400 | 1090 | --- linux-2.6.32.15/arch/ia64/sn/pci/pci_dma.c 2010-03-15 11:52:04.000000000 -0400 |
1091 | +++ linux-2.6.32.13/arch/ia64/sn/pci/pci_dma.c 2010-05-15 13:21:13.626873619 -0400 | 1091 | +++ linux-2.6.32.15/arch/ia64/sn/pci/pci_dma.c 2010-05-28 21:27:14.755165915 -0400 |
1092 | @@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus * | 1092 | @@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus * |
1093 | return ret; | 1093 | return ret; |
1094 | } | 1094 | } |
@@ -1098,9 +1098,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.13/arch/ia64/ | |||
1098 | .alloc_coherent = sn_dma_alloc_coherent, | 1098 | .alloc_coherent = sn_dma_alloc_coherent, |
1099 | .free_coherent = sn_dma_free_coherent, | 1099 | .free_coherent = sn_dma_free_coherent, |
1100 | .map_page = sn_dma_map_page, | 1100 | .map_page = sn_dma_map_page, |
1101 | diff -urNp linux-2.6.32.13/arch/m32r/lib/usercopy.c linux-2.6.32.13/arch/m32r/lib/usercopy.c | 1101 | diff -urNp linux-2.6.32.15/arch/m32r/lib/usercopy.c linux-2.6.32.15/arch/m32r/lib/usercopy.c |
1102 | --- linux-2.6.32.13/arch/m32r/lib/usercopy.c 2010-03-15 11:52:04.000000000 -0400 | 1102 | --- linux-2.6.32.15/arch/m32r/lib/usercopy.c 2010-03-15 11:52:04.000000000 -0400 |
1103 | +++ linux-2.6.32.13/arch/m32r/lib/usercopy.c 2010-05-15 13:21:13.630645180 -0400 | 1103 | +++ linux-2.6.32.15/arch/m32r/lib/usercopy.c 2010-05-28 21:27:14.755165915 -0400 |
1104 | @@ -14,6 +14,9 @@ | 1104 | @@ -14,6 +14,9 @@ |
1105 | unsigned long | 1105 | unsigned long |
1106 | __generic_copy_to_user(void __user *to, const void *from, unsigned long n) | 1106 | __generic_copy_to_user(void __user *to, const void *from, unsigned long n) |
@@ -1121,9 +1121,9 @@ diff -urNp linux-2.6.32.13/arch/m32r/lib/usercopy.c linux-2.6.32.13/arch/m32r/li | |||
1121 | prefetchw(to); | 1121 | prefetchw(to); |
1122 | if (access_ok(VERIFY_READ, from, n)) | 1122 | if (access_ok(VERIFY_READ, from, n)) |
1123 | __copy_user_zeroing(to,from,n); | 1123 | __copy_user_zeroing(to,from,n); |
1124 | diff -urNp linux-2.6.32.13/arch/mips/alchemy/devboards/pm.c linux-2.6.32.13/arch/mips/alchemy/devboards/pm.c | 1124 | diff -urNp linux-2.6.32.15/arch/mips/alchemy/devboards/pm.c linux-2.6.32.15/arch/mips/alchemy/devboards/pm.c |
1125 | --- linux-2.6.32.13/arch/mips/alchemy/devboards/pm.c 2010-03-15 11:52:04.000000000 -0400 | 1125 | --- linux-2.6.32.15/arch/mips/alchemy/devboards/pm.c 2010-03-15 11:52:04.000000000 -0400 |
1126 | +++ linux-2.6.32.13/arch/mips/alchemy/devboards/pm.c 2010-05-15 13:21:13.630645180 -0400 | 1126 | +++ linux-2.6.32.15/arch/mips/alchemy/devboards/pm.c 2010-05-28 21:27:14.755165915 -0400 |
1127 | @@ -78,7 +78,7 @@ static void db1x_pm_end(void) | 1127 | @@ -78,7 +78,7 @@ static void db1x_pm_end(void) |
1128 | 1128 | ||
1129 | } | 1129 | } |
@@ -1133,9 +1133,9 @@ diff -urNp linux-2.6.32.13/arch/mips/alchemy/devboards/pm.c linux-2.6.32.13/arch | |||
1133 | .valid = suspend_valid_only_mem, | 1133 | .valid = suspend_valid_only_mem, |
1134 | .begin = db1x_pm_begin, | 1134 | .begin = db1x_pm_begin, |
1135 | .enter = db1x_pm_enter, | 1135 | .enter = db1x_pm_enter, |
1136 | diff -urNp linux-2.6.32.13/arch/mips/include/asm/elf.h linux-2.6.32.13/arch/mips/include/asm/elf.h | 1136 | diff -urNp linux-2.6.32.15/arch/mips/include/asm/elf.h linux-2.6.32.15/arch/mips/include/asm/elf.h |
1137 | --- linux-2.6.32.13/arch/mips/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 | 1137 | --- linux-2.6.32.15/arch/mips/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 |
1138 | +++ linux-2.6.32.13/arch/mips/include/asm/elf.h 2010-05-15 13:21:13.630645180 -0400 | 1138 | +++ linux-2.6.32.15/arch/mips/include/asm/elf.h 2010-05-28 21:27:14.755165915 -0400 |
1139 | @@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str | 1139 | @@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str |
1140 | #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) | 1140 | #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) |
1141 | #endif | 1141 | #endif |
@@ -1148,9 +1148,9 @@ diff -urNp linux-2.6.32.13/arch/mips/include/asm/elf.h linux-2.6.32.13/arch/mips | |||
1148 | +#endif | 1148 | +#endif |
1149 | + | 1149 | + |
1150 | #endif /* _ASM_ELF_H */ | 1150 | #endif /* _ASM_ELF_H */ |
1151 | diff -urNp linux-2.6.32.13/arch/mips/include/asm/page.h linux-2.6.32.13/arch/mips/include/asm/page.h | 1151 | diff -urNp linux-2.6.32.15/arch/mips/include/asm/page.h linux-2.6.32.15/arch/mips/include/asm/page.h |
1152 | --- linux-2.6.32.13/arch/mips/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 | 1152 | --- linux-2.6.32.15/arch/mips/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 |
1153 | +++ linux-2.6.32.13/arch/mips/include/asm/page.h 2010-05-15 13:21:13.630645180 -0400 | 1153 | +++ linux-2.6.32.15/arch/mips/include/asm/page.h 2010-05-28 21:27:14.755165915 -0400 |
1154 | @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa | 1154 | @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa |
1155 | #ifdef CONFIG_CPU_MIPS32 | 1155 | #ifdef CONFIG_CPU_MIPS32 |
1156 | typedef struct { unsigned long pte_low, pte_high; } pte_t; | 1156 | typedef struct { unsigned long pte_low, pte_high; } pte_t; |
@@ -1160,9 +1160,9 @@ diff -urNp linux-2.6.32.13/arch/mips/include/asm/page.h linux-2.6.32.13/arch/mip | |||
1160 | #else | 1160 | #else |
1161 | typedef struct { unsigned long long pte; } pte_t; | 1161 | typedef struct { unsigned long long pte; } pte_t; |
1162 | #define pte_val(x) ((x).pte) | 1162 | #define pte_val(x) ((x).pte) |
1163 | diff -urNp linux-2.6.32.13/arch/mips/include/asm/system.h linux-2.6.32.13/arch/mips/include/asm/system.h | 1163 | diff -urNp linux-2.6.32.15/arch/mips/include/asm/system.h linux-2.6.32.15/arch/mips/include/asm/system.h |
1164 | --- linux-2.6.32.13/arch/mips/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400 | 1164 | --- linux-2.6.32.15/arch/mips/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400 |
1165 | +++ linux-2.6.32.13/arch/mips/include/asm/system.h 2010-05-15 13:21:13.630645180 -0400 | 1165 | +++ linux-2.6.32.15/arch/mips/include/asm/system.h 2010-05-28 21:27:14.755165915 -0400 |
1166 | @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); | 1166 | @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); |
1167 | */ | 1167 | */ |
1168 | #define __ARCH_WANT_UNLOCKED_CTXSW | 1168 | #define __ARCH_WANT_UNLOCKED_CTXSW |
@@ -1171,9 +1171,9 @@ diff -urNp linux-2.6.32.13/arch/mips/include/asm/system.h linux-2.6.32.13/arch/m | |||
1171 | +#define arch_align_stack(x) ((x) & ALMASK) | 1171 | +#define arch_align_stack(x) ((x) & ALMASK) |
1172 | 1172 | ||
1173 | #endif /* _ASM_SYSTEM_H */ | 1173 | #endif /* _ASM_SYSTEM_H */ |
1174 | diff -urNp linux-2.6.32.13/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.13/arch/mips/kernel/binfmt_elfn32.c | 1174 | diff -urNp linux-2.6.32.15/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.15/arch/mips/kernel/binfmt_elfn32.c |
1175 | --- linux-2.6.32.13/arch/mips/kernel/binfmt_elfn32.c 2010-03-15 11:52:04.000000000 -0400 | 1175 | --- linux-2.6.32.15/arch/mips/kernel/binfmt_elfn32.c 2010-03-15 11:52:04.000000000 -0400 |
1176 | +++ linux-2.6.32.13/arch/mips/kernel/binfmt_elfn32.c 2010-05-15 13:21:13.630645180 -0400 | 1176 | +++ linux-2.6.32.15/arch/mips/kernel/binfmt_elfn32.c 2010-05-28 21:27:14.755165915 -0400 |
1177 | @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N | 1177 | @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N |
1178 | #undef ELF_ET_DYN_BASE | 1178 | #undef ELF_ET_DYN_BASE |
1179 | #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) | 1179 | #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) |
@@ -1188,9 +1188,9 @@ diff -urNp linux-2.6.32.13/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.13/arch | |||
1188 | #include <asm/processor.h> | 1188 | #include <asm/processor.h> |
1189 | #include <linux/module.h> | 1189 | #include <linux/module.h> |
1190 | #include <linux/elfcore.h> | 1190 | #include <linux/elfcore.h> |
1191 | diff -urNp linux-2.6.32.13/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.13/arch/mips/kernel/binfmt_elfo32.c | 1191 | diff -urNp linux-2.6.32.15/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.15/arch/mips/kernel/binfmt_elfo32.c |
1192 | --- linux-2.6.32.13/arch/mips/kernel/binfmt_elfo32.c 2010-03-15 11:52:04.000000000 -0400 | 1192 | --- linux-2.6.32.15/arch/mips/kernel/binfmt_elfo32.c 2010-03-15 11:52:04.000000000 -0400 |
1193 | +++ linux-2.6.32.13/arch/mips/kernel/binfmt_elfo32.c 2010-05-15 13:21:13.630645180 -0400 | 1193 | +++ linux-2.6.32.15/arch/mips/kernel/binfmt_elfo32.c 2010-05-28 21:27:14.755165915 -0400 |
1194 | @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N | 1194 | @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N |
1195 | #undef ELF_ET_DYN_BASE | 1195 | #undef ELF_ET_DYN_BASE |
1196 | #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) | 1196 | #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) |
@@ -1205,9 +1205,9 @@ diff -urNp linux-2.6.32.13/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.13/arch | |||
1205 | #include <asm/processor.h> | 1205 | #include <asm/processor.h> |
1206 | 1206 | ||
1207 | /* | 1207 | /* |
1208 | diff -urNp linux-2.6.32.13/arch/mips/kernel/kgdb.c linux-2.6.32.13/arch/mips/kernel/kgdb.c | 1208 | diff -urNp linux-2.6.32.15/arch/mips/kernel/kgdb.c linux-2.6.32.15/arch/mips/kernel/kgdb.c |
1209 | --- linux-2.6.32.13/arch/mips/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 | 1209 | --- linux-2.6.32.15/arch/mips/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 |
1210 | +++ linux-2.6.32.13/arch/mips/kernel/kgdb.c 2010-05-15 13:21:13.630645180 -0400 | 1210 | +++ linux-2.6.32.15/arch/mips/kernel/kgdb.c 2010-05-28 21:27:14.771146775 -0400 |
1211 | @@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto | 1211 | @@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto |
1212 | return -1; | 1212 | return -1; |
1213 | } | 1213 | } |
@@ -1216,9 +1216,9 @@ diff -urNp linux-2.6.32.13/arch/mips/kernel/kgdb.c linux-2.6.32.13/arch/mips/ker | |||
1216 | struct kgdb_arch arch_kgdb_ops; | 1216 | struct kgdb_arch arch_kgdb_ops; |
1217 | 1217 | ||
1218 | /* | 1218 | /* |
1219 | diff -urNp linux-2.6.32.13/arch/mips/kernel/process.c linux-2.6.32.13/arch/mips/kernel/process.c | 1219 | diff -urNp linux-2.6.32.15/arch/mips/kernel/process.c linux-2.6.32.15/arch/mips/kernel/process.c |
1220 | --- linux-2.6.32.13/arch/mips/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 | 1220 | --- linux-2.6.32.15/arch/mips/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 |
1221 | +++ linux-2.6.32.13/arch/mips/kernel/process.c 2010-05-15 13:21:13.630645180 -0400 | 1221 | +++ linux-2.6.32.15/arch/mips/kernel/process.c 2010-05-28 21:27:14.796819534 -0400 |
1222 | @@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru | 1222 | @@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru |
1223 | out: | 1223 | out: |
1224 | return pc; | 1224 | return pc; |
@@ -1235,9 +1235,9 @@ diff -urNp linux-2.6.32.13/arch/mips/kernel/process.c linux-2.6.32.13/arch/mips/ | |||
1235 | - | 1235 | - |
1236 | - return sp & ALMASK; | 1236 | - return sp & ALMASK; |
1237 | -} | 1237 | -} |
1238 | diff -urNp linux-2.6.32.13/arch/mips/kernel/syscall.c linux-2.6.32.13/arch/mips/kernel/syscall.c | 1238 | diff -urNp linux-2.6.32.15/arch/mips/kernel/syscall.c linux-2.6.32.15/arch/mips/kernel/syscall.c |
1239 | --- linux-2.6.32.13/arch/mips/kernel/syscall.c 2010-03-15 11:52:04.000000000 -0400 | 1239 | --- linux-2.6.32.15/arch/mips/kernel/syscall.c 2010-03-15 11:52:04.000000000 -0400 |
1240 | +++ linux-2.6.32.13/arch/mips/kernel/syscall.c 2010-05-15 13:21:13.630645180 -0400 | 1240 | +++ linux-2.6.32.15/arch/mips/kernel/syscall.c 2010-05-28 21:27:14.796819534 -0400 |
1241 | @@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str | 1241 | @@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str |
1242 | do_color_align = 0; | 1242 | do_color_align = 0; |
1243 | if (filp || (flags & MAP_SHARED)) | 1243 | if (filp || (flags & MAP_SHARED)) |
@@ -1259,9 +1259,9 @@ diff -urNp linux-2.6.32.13/arch/mips/kernel/syscall.c linux-2.6.32.13/arch/mips/ | |||
1259 | if (do_color_align) | 1259 | if (do_color_align) |
1260 | addr = COLOUR_ALIGN(addr, pgoff); | 1260 | addr = COLOUR_ALIGN(addr, pgoff); |
1261 | else | 1261 | else |
1262 | diff -urNp linux-2.6.32.13/arch/mips/mm/fault.c linux-2.6.32.13/arch/mips/mm/fault.c | 1262 | diff -urNp linux-2.6.32.15/arch/mips/mm/fault.c linux-2.6.32.15/arch/mips/mm/fault.c |
1263 | --- linux-2.6.32.13/arch/mips/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 | 1263 | --- linux-2.6.32.15/arch/mips/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 |
1264 | +++ linux-2.6.32.13/arch/mips/mm/fault.c 2010-05-15 13:21:13.630645180 -0400 | 1264 | +++ linux-2.6.32.15/arch/mips/mm/fault.c 2010-05-28 21:27:14.796819534 -0400 |
1265 | @@ -26,6 +26,23 @@ | 1265 | @@ -26,6 +26,23 @@ |
1266 | #include <asm/ptrace.h> | 1266 | #include <asm/ptrace.h> |
1267 | #include <asm/highmem.h> /* For VMALLOC_END */ | 1267 | #include <asm/highmem.h> /* For VMALLOC_END */ |
@@ -1286,9 +1286,9 @@ diff -urNp linux-2.6.32.13/arch/mips/mm/fault.c linux-2.6.32.13/arch/mips/mm/fau | |||
1286 | /* | 1286 | /* |
1287 | * This routine handles page faults. It determines the address, | 1287 | * This routine handles page faults. It determines the address, |
1288 | * and the problem, and then passes it off to one of the appropriate | 1288 | * and the problem, and then passes it off to one of the appropriate |
1289 | diff -urNp linux-2.6.32.13/arch/parisc/include/asm/elf.h linux-2.6.32.13/arch/parisc/include/asm/elf.h | 1289 | diff -urNp linux-2.6.32.15/arch/parisc/include/asm/elf.h linux-2.6.32.15/arch/parisc/include/asm/elf.h |
1290 | --- linux-2.6.32.13/arch/parisc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 | 1290 | --- linux-2.6.32.15/arch/parisc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 |
1291 | +++ linux-2.6.32.13/arch/parisc/include/asm/elf.h 2010-05-15 13:21:13.630645180 -0400 | 1291 | +++ linux-2.6.32.15/arch/parisc/include/asm/elf.h 2010-05-28 21:27:14.796819534 -0400 |
1292 | @@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration.. | 1292 | @@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration.. |
1293 | 1293 | ||
1294 | #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) | 1294 | #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) |
@@ -1303,9 +1303,9 @@ diff -urNp linux-2.6.32.13/arch/parisc/include/asm/elf.h linux-2.6.32.13/arch/pa | |||
1303 | /* This yields a mask that user programs can use to figure out what | 1303 | /* This yields a mask that user programs can use to figure out what |
1304 | instruction set this CPU supports. This could be done in user space, | 1304 | instruction set this CPU supports. This could be done in user space, |
1305 | but it's not easy, and we've already done it here. */ | 1305 | but it's not easy, and we've already done it here. */ |
1306 | diff -urNp linux-2.6.32.13/arch/parisc/include/asm/pgtable.h linux-2.6.32.13/arch/parisc/include/asm/pgtable.h | 1306 | diff -urNp linux-2.6.32.15/arch/parisc/include/asm/pgtable.h linux-2.6.32.15/arch/parisc/include/asm/pgtable.h |
1307 | --- linux-2.6.32.13/arch/parisc/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 | 1307 | --- linux-2.6.32.15/arch/parisc/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 |
1308 | +++ linux-2.6.32.13/arch/parisc/include/asm/pgtable.h 2010-05-15 13:21:13.630645180 -0400 | 1308 | +++ linux-2.6.32.15/arch/parisc/include/asm/pgtable.h 2010-05-28 21:27:14.796819534 -0400 |
1309 | @@ -207,6 +207,17 @@ | 1309 | @@ -207,6 +207,17 @@ |
1310 | #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) | 1310 | #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) |
1311 | #define PAGE_COPY PAGE_EXECREAD | 1311 | #define PAGE_COPY PAGE_EXECREAD |
@@ -1324,9 +1324,9 @@ diff -urNp linux-2.6.32.13/arch/parisc/include/asm/pgtable.h linux-2.6.32.13/arc | |||
1324 | #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) | 1324 | #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) |
1325 | #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) | 1325 | #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) |
1326 | #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) | 1326 | #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) |
1327 | diff -urNp linux-2.6.32.13/arch/parisc/kernel/module.c linux-2.6.32.13/arch/parisc/kernel/module.c | 1327 | diff -urNp linux-2.6.32.15/arch/parisc/kernel/module.c linux-2.6.32.15/arch/parisc/kernel/module.c |
1328 | --- linux-2.6.32.13/arch/parisc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 | 1328 | --- linux-2.6.32.15/arch/parisc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 |
1329 | +++ linux-2.6.32.13/arch/parisc/kernel/module.c 2010-05-15 13:21:13.630645180 -0400 | 1329 | +++ linux-2.6.32.15/arch/parisc/kernel/module.c 2010-05-28 21:27:14.796819534 -0400 |
1330 | @@ -95,16 +95,38 @@ | 1330 | @@ -95,16 +95,38 @@ |
1331 | 1331 | ||
1332 | /* three functions to determine where in the module core | 1332 | /* three functions to determine where in the module core |
@@ -1427,9 +1427,9 @@ diff -urNp linux-2.6.32.13/arch/parisc/kernel/module.c linux-2.6.32.13/arch/pari | |||
1427 | 1427 | ||
1428 | DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n", | 1428 | DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n", |
1429 | me->arch.unwind_section, table, end, gp); | 1429 | me->arch.unwind_section, table, end, gp); |
1430 | diff -urNp linux-2.6.32.13/arch/parisc/kernel/sys_parisc.c linux-2.6.32.13/arch/parisc/kernel/sys_parisc.c | 1430 | diff -urNp linux-2.6.32.15/arch/parisc/kernel/sys_parisc.c linux-2.6.32.15/arch/parisc/kernel/sys_parisc.c |
1431 | --- linux-2.6.32.13/arch/parisc/kernel/sys_parisc.c 2010-03-15 11:52:04.000000000 -0400 | 1431 | --- linux-2.6.32.15/arch/parisc/kernel/sys_parisc.c 2010-03-15 11:52:04.000000000 -0400 |
1432 | +++ linux-2.6.32.13/arch/parisc/kernel/sys_parisc.c 2010-05-15 13:21:13.630645180 -0400 | 1432 | +++ linux-2.6.32.15/arch/parisc/kernel/sys_parisc.c 2010-05-28 21:27:14.796819534 -0400 |
1433 | @@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str | 1433 | @@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str |
1434 | if (flags & MAP_FIXED) | 1434 | if (flags & MAP_FIXED) |
1435 | return addr; | 1435 | return addr; |
@@ -1439,9 +1439,9 @@ diff -urNp linux-2.6.32.13/arch/parisc/kernel/sys_parisc.c linux-2.6.32.13/arch/ | |||
1439 | 1439 | ||
1440 | if (filp) { | 1440 | if (filp) { |
1441 | addr = get_shared_area(filp->f_mapping, addr, len, pgoff); | 1441 | addr = get_shared_area(filp->f_mapping, addr, len, pgoff); |
1442 | diff -urNp linux-2.6.32.13/arch/parisc/kernel/traps.c linux-2.6.32.13/arch/parisc/kernel/traps.c | 1442 | diff -urNp linux-2.6.32.15/arch/parisc/kernel/traps.c linux-2.6.32.15/arch/parisc/kernel/traps.c |
1443 | --- linux-2.6.32.13/arch/parisc/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400 | 1443 | --- linux-2.6.32.15/arch/parisc/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400 |
1444 | +++ linux-2.6.32.13/arch/parisc/kernel/traps.c 2010-05-15 13:21:13.630645180 -0400 | 1444 | +++ linux-2.6.32.15/arch/parisc/kernel/traps.c 2010-05-28 21:27:14.796819534 -0400 |
1445 | @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod | 1445 | @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod |
1446 | 1446 | ||
1447 | down_read(¤t->mm->mmap_sem); | 1447 | down_read(¤t->mm->mmap_sem); |
@@ -1453,9 +1453,9 @@ diff -urNp linux-2.6.32.13/arch/parisc/kernel/traps.c linux-2.6.32.13/arch/paris | |||
1453 | fault_address = regs->iaoq[0]; | 1453 | fault_address = regs->iaoq[0]; |
1454 | fault_space = regs->iasq[0]; | 1454 | fault_space = regs->iasq[0]; |
1455 | 1455 | ||
1456 | diff -urNp linux-2.6.32.13/arch/parisc/mm/fault.c linux-2.6.32.13/arch/parisc/mm/fault.c | 1456 | diff -urNp linux-2.6.32.15/arch/parisc/mm/fault.c linux-2.6.32.15/arch/parisc/mm/fault.c |
1457 | --- linux-2.6.32.13/arch/parisc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 | 1457 | --- linux-2.6.32.15/arch/parisc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 |
1458 | +++ linux-2.6.32.13/arch/parisc/mm/fault.c 2010-05-15 13:21:13.630645180 -0400 | 1458 | +++ linux-2.6.32.15/arch/parisc/mm/fault.c 2010-05-28 21:27:14.796819534 -0400 |
1459 | @@ -15,6 +15,7 @@ | 1459 | @@ -15,6 +15,7 @@ |
1460 | #include <linux/sched.h> | 1460 | #include <linux/sched.h> |
1461 | #include <linux/interrupt.h> | 1461 | #include <linux/interrupt.h> |
@@ -1625,9 +1625,9 @@ diff -urNp linux-2.6.32.13/arch/parisc/mm/fault.c linux-2.6.32.13/arch/parisc/mm | |||
1625 | 1625 | ||
1626 | /* | 1626 | /* |
1627 | * If for any reason at all we couldn't handle the fault, make | 1627 | * If for any reason at all we couldn't handle the fault, make |
1628 | diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/device.h linux-2.6.32.13/arch/powerpc/include/asm/device.h | 1628 | diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/device.h linux-2.6.32.15/arch/powerpc/include/asm/device.h |
1629 | --- linux-2.6.32.13/arch/powerpc/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400 | 1629 | --- linux-2.6.32.15/arch/powerpc/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400 |
1630 | +++ linux-2.6.32.13/arch/powerpc/include/asm/device.h 2010-05-15 13:21:13.630645180 -0400 | 1630 | +++ linux-2.6.32.15/arch/powerpc/include/asm/device.h 2010-05-28 21:27:14.796819534 -0400 |
1631 | @@ -14,7 +14,7 @@ struct dev_archdata { | 1631 | @@ -14,7 +14,7 @@ struct dev_archdata { |
1632 | struct device_node *of_node; | 1632 | struct device_node *of_node; |
1633 | 1633 | ||
@@ -1637,9 +1637,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/device.h linux-2.6.32.13/arc | |||
1637 | 1637 | ||
1638 | /* | 1638 | /* |
1639 | * When an iommu is in use, dma_data is used as a ptr to the base of the | 1639 | * When an iommu is in use, dma_data is used as a ptr to the base of the |
1640 | diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h | 1640 | diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.15/arch/powerpc/include/asm/dma-mapping.h |
1641 | --- linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 | 1641 | --- linux-2.6.32.15/arch/powerpc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 |
1642 | +++ linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h 2010-05-15 13:21:13.630645180 -0400 | 1642 | +++ linux-2.6.32.15/arch/powerpc/include/asm/dma-mapping.h 2010-05-28 21:27:14.796819534 -0400 |
1643 | @@ -69,9 +69,9 @@ static inline unsigned long device_to_ma | 1643 | @@ -69,9 +69,9 @@ static inline unsigned long device_to_ma |
1644 | #ifdef CONFIG_PPC64 | 1644 | #ifdef CONFIG_PPC64 |
1645 | extern struct dma_map_ops dma_iommu_ops; | 1645 | extern struct dma_map_ops dma_iommu_ops; |
@@ -1706,9 +1706,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.1 | |||
1706 | 1706 | ||
1707 | if (dma_ops->mapping_error) | 1707 | if (dma_ops->mapping_error) |
1708 | return dma_ops->mapping_error(dev, dma_addr); | 1708 | return dma_ops->mapping_error(dev, dma_addr); |
1709 | diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/elf.h linux-2.6.32.13/arch/powerpc/include/asm/elf.h | 1709 | diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/elf.h linux-2.6.32.15/arch/powerpc/include/asm/elf.h |
1710 | --- linux-2.6.32.13/arch/powerpc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 | 1710 | --- linux-2.6.32.15/arch/powerpc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 |
1711 | +++ linux-2.6.32.13/arch/powerpc/include/asm/elf.h 2010-05-15 13:21:13.643322255 -0400 | 1711 | +++ linux-2.6.32.15/arch/powerpc/include/asm/elf.h 2010-05-28 21:27:14.799129463 -0400 |
1712 | @@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E | 1712 | @@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E |
1713 | the loader. We need to make sure that it is out of the way of the program | 1713 | the loader. We need to make sure that it is out of the way of the program |
1714 | that it will "exec", and that there is sufficient room for the brk. */ | 1714 | that it will "exec", and that there is sufficient room for the brk. */ |
@@ -1741,9 +1741,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/elf.h linux-2.6.32.13/arch/p | |||
1741 | #endif /* __KERNEL__ */ | 1741 | #endif /* __KERNEL__ */ |
1742 | 1742 | ||
1743 | /* | 1743 | /* |
1744 | diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/iommu.h linux-2.6.32.13/arch/powerpc/include/asm/iommu.h | 1744 | diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/iommu.h linux-2.6.32.15/arch/powerpc/include/asm/iommu.h |
1745 | --- linux-2.6.32.13/arch/powerpc/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400 | 1745 | --- linux-2.6.32.15/arch/powerpc/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400 |
1746 | +++ linux-2.6.32.13/arch/powerpc/include/asm/iommu.h 2010-05-15 13:21:13.643322255 -0400 | 1746 | +++ linux-2.6.32.15/arch/powerpc/include/asm/iommu.h 2010-05-28 21:27:14.799129463 -0400 |
1747 | @@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi | 1747 | @@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi |
1748 | extern void iommu_init_early_dart(void); | 1748 | extern void iommu_init_early_dart(void); |
1749 | extern void iommu_init_early_pasemi(void); | 1749 | extern void iommu_init_early_pasemi(void); |
@@ -1754,9 +1754,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/iommu.h linux-2.6.32.13/arch | |||
1754 | #ifdef CONFIG_PCI | 1754 | #ifdef CONFIG_PCI |
1755 | extern void pci_iommu_init(void); | 1755 | extern void pci_iommu_init(void); |
1756 | extern void pci_direct_iommu_init(void); | 1756 | extern void pci_direct_iommu_init(void); |
1757 | diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.13/arch/powerpc/include/asm/kmap_types.h | 1757 | diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.15/arch/powerpc/include/asm/kmap_types.h |
1758 | --- linux-2.6.32.13/arch/powerpc/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 | 1758 | --- linux-2.6.32.15/arch/powerpc/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 |
1759 | +++ linux-2.6.32.13/arch/powerpc/include/asm/kmap_types.h 2010-05-15 13:21:13.643322255 -0400 | 1759 | +++ linux-2.6.32.15/arch/powerpc/include/asm/kmap_types.h 2010-05-28 21:27:14.799129463 -0400 |
1760 | @@ -26,6 +26,7 @@ enum km_type { | 1760 | @@ -26,6 +26,7 @@ enum km_type { |
1761 | KM_SOFTIRQ1, | 1761 | KM_SOFTIRQ1, |
1762 | KM_PPC_SYNC_PAGE, | 1762 | KM_PPC_SYNC_PAGE, |
@@ -1765,9 +1765,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.13 | |||
1765 | KM_TYPE_NR | 1765 | KM_TYPE_NR |
1766 | }; | 1766 | }; |
1767 | 1767 | ||
1768 | diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/page_64.h linux-2.6.32.13/arch/powerpc/include/asm/page_64.h | 1768 | diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/page_64.h linux-2.6.32.15/arch/powerpc/include/asm/page_64.h |
1769 | --- linux-2.6.32.13/arch/powerpc/include/asm/page_64.h 2010-03-15 11:52:04.000000000 -0400 | 1769 | --- linux-2.6.32.15/arch/powerpc/include/asm/page_64.h 2010-03-15 11:52:04.000000000 -0400 |
1770 | +++ linux-2.6.32.13/arch/powerpc/include/asm/page_64.h 2010-05-15 13:21:13.643322255 -0400 | 1770 | +++ linux-2.6.32.15/arch/powerpc/include/asm/page_64.h 2010-05-28 21:27:14.799129463 -0400 |
1771 | @@ -180,15 +180,18 @@ do { \ | 1771 | @@ -180,15 +180,18 @@ do { \ |
1772 | * stack by default, so in the absense of a PT_GNU_STACK program header | 1772 | * stack by default, so in the absense of a PT_GNU_STACK program header |
1773 | * we turn execute permission off. | 1773 | * we turn execute permission off. |
@@ -1789,9 +1789,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/page_64.h linux-2.6.32.13/ar | |||
1789 | 1789 | ||
1790 | #include <asm-generic/getorder.h> | 1790 | #include <asm-generic/getorder.h> |
1791 | 1791 | ||
1792 | diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/page.h linux-2.6.32.13/arch/powerpc/include/asm/page.h | 1792 | diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/page.h linux-2.6.32.15/arch/powerpc/include/asm/page.h |
1793 | --- linux-2.6.32.13/arch/powerpc/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 | 1793 | --- linux-2.6.32.15/arch/powerpc/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 |
1794 | +++ linux-2.6.32.13/arch/powerpc/include/asm/page.h 2010-05-15 13:21:13.643322255 -0400 | 1794 | +++ linux-2.6.32.15/arch/powerpc/include/asm/page.h 2010-05-28 21:27:14.799129463 -0400 |
1795 | @@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr; | 1795 | @@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr; |
1796 | * and needs to be executable. This means the whole heap ends | 1796 | * and needs to be executable. This means the whole heap ends |
1797 | * up being executable. | 1797 | * up being executable. |
@@ -1814,9 +1814,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/page.h linux-2.6.32.13/arch/ | |||
1814 | #ifndef __ASSEMBLY__ | 1814 | #ifndef __ASSEMBLY__ |
1815 | 1815 | ||
1816 | #undef STRICT_MM_TYPECHECKS | 1816 | #undef STRICT_MM_TYPECHECKS |
1817 | diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/pci.h linux-2.6.32.13/arch/powerpc/include/asm/pci.h | 1817 | diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/pci.h linux-2.6.32.15/arch/powerpc/include/asm/pci.h |
1818 | --- linux-2.6.32.13/arch/powerpc/include/asm/pci.h 2010-03-15 11:52:04.000000000 -0400 | 1818 | --- linux-2.6.32.15/arch/powerpc/include/asm/pci.h 2010-03-15 11:52:04.000000000 -0400 |
1819 | +++ linux-2.6.32.13/arch/powerpc/include/asm/pci.h 2010-05-15 13:21:13.643322255 -0400 | 1819 | +++ linux-2.6.32.15/arch/powerpc/include/asm/pci.h 2010-05-28 21:27:14.803145185 -0400 |
1820 | @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq | 1820 | @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq |
1821 | } | 1821 | } |
1822 | 1822 | ||
@@ -1828,9 +1828,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/pci.h linux-2.6.32.13/arch/p | |||
1828 | #else /* CONFIG_PCI */ | 1828 | #else /* CONFIG_PCI */ |
1829 | #define set_pci_dma_ops(d) | 1829 | #define set_pci_dma_ops(d) |
1830 | #define get_pci_dma_ops() NULL | 1830 | #define get_pci_dma_ops() NULL |
1831 | diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.13/arch/powerpc/include/asm/pte-hash32.h | 1831 | diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.15/arch/powerpc/include/asm/pte-hash32.h |
1832 | --- linux-2.6.32.13/arch/powerpc/include/asm/pte-hash32.h 2010-03-15 11:52:04.000000000 -0400 | 1832 | --- linux-2.6.32.15/arch/powerpc/include/asm/pte-hash32.h 2010-03-15 11:52:04.000000000 -0400 |
1833 | +++ linux-2.6.32.13/arch/powerpc/include/asm/pte-hash32.h 2010-05-15 13:21:13.643322255 -0400 | 1833 | +++ linux-2.6.32.15/arch/powerpc/include/asm/pte-hash32.h 2010-05-28 21:27:14.803145185 -0400 |
1834 | @@ -21,6 +21,7 @@ | 1834 | @@ -21,6 +21,7 @@ |
1835 | #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ | 1835 | #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ |
1836 | #define _PAGE_USER 0x004 /* usermode access allowed */ | 1836 | #define _PAGE_USER 0x004 /* usermode access allowed */ |
@@ -1839,9 +1839,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.13 | |||
1839 | #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */ | 1839 | #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */ |
1840 | #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ | 1840 | #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ |
1841 | #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ | 1841 | #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ |
1842 | diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/reg.h linux-2.6.32.13/arch/powerpc/include/asm/reg.h | 1842 | diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/reg.h linux-2.6.32.15/arch/powerpc/include/asm/reg.h |
1843 | --- linux-2.6.32.13/arch/powerpc/include/asm/reg.h 2010-03-15 11:52:04.000000000 -0400 | 1843 | --- linux-2.6.32.15/arch/powerpc/include/asm/reg.h 2010-03-15 11:52:04.000000000 -0400 |
1844 | +++ linux-2.6.32.13/arch/powerpc/include/asm/reg.h 2010-05-15 13:21:13.643322255 -0400 | 1844 | +++ linux-2.6.32.15/arch/powerpc/include/asm/reg.h 2010-05-28 21:27:14.803145185 -0400 |
1845 | @@ -191,6 +191,7 @@ | 1845 | @@ -191,6 +191,7 @@ |
1846 | #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ | 1846 | #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ |
1847 | #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ | 1847 | #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ |
@@ -1850,9 +1850,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/reg.h linux-2.6.32.13/arch/p | |||
1850 | #define DSISR_PROTFAULT 0x08000000 /* protection fault */ | 1850 | #define DSISR_PROTFAULT 0x08000000 /* protection fault */ |
1851 | #define DSISR_ISSTORE 0x02000000 /* access was a store */ | 1851 | #define DSISR_ISSTORE 0x02000000 /* access was a store */ |
1852 | #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ | 1852 | #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ |
1853 | diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.13/arch/powerpc/include/asm/swiotlb.h | 1853 | diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.15/arch/powerpc/include/asm/swiotlb.h |
1854 | --- linux-2.6.32.13/arch/powerpc/include/asm/swiotlb.h 2010-03-15 11:52:04.000000000 -0400 | 1854 | --- linux-2.6.32.15/arch/powerpc/include/asm/swiotlb.h 2010-03-15 11:52:04.000000000 -0400 |
1855 | +++ linux-2.6.32.13/arch/powerpc/include/asm/swiotlb.h 2010-05-15 13:21:13.643322255 -0400 | 1855 | +++ linux-2.6.32.15/arch/powerpc/include/asm/swiotlb.h 2010-05-28 21:27:14.803145185 -0400 |
1856 | @@ -13,7 +13,7 @@ | 1856 | @@ -13,7 +13,7 @@ |
1857 | 1857 | ||
1858 | #include <linux/swiotlb.h> | 1858 | #include <linux/swiotlb.h> |
@@ -1862,9 +1862,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.13/ar | |||
1862 | 1862 | ||
1863 | static inline void dma_mark_clean(void *addr, size_t size) {} | 1863 | static inline void dma_mark_clean(void *addr, size_t size) {} |
1864 | 1864 | ||
1865 | diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/uaccess.h linux-2.6.32.13/arch/powerpc/include/asm/uaccess.h | 1865 | diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h |
1866 | --- linux-2.6.32.13/arch/powerpc/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 | 1866 | --- linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 |
1867 | +++ linux-2.6.32.13/arch/powerpc/include/asm/uaccess.h 2010-05-15 13:21:13.643322255 -0400 | 1867 | +++ linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h 2010-05-28 21:27:14.803145185 -0400 |
1868 | @@ -327,52 +327,6 @@ do { \ | 1868 | @@ -327,52 +327,6 @@ do { \ |
1869 | extern unsigned long __copy_tofrom_user(void __user *to, | 1869 | extern unsigned long __copy_tofrom_user(void __user *to, |
1870 | const void __user *from, unsigned long size); | 1870 | const void __user *from, unsigned long size); |
@@ -2033,9 +2033,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/uaccess.h linux-2.6.32.13/ar | |||
2033 | extern unsigned long __clear_user(void __user *addr, unsigned long size); | 2033 | extern unsigned long __clear_user(void __user *addr, unsigned long size); |
2034 | 2034 | ||
2035 | static inline unsigned long clear_user(void __user *addr, unsigned long size) | 2035 | static inline unsigned long clear_user(void __user *addr, unsigned long size) |
2036 | diff -urNp linux-2.6.32.13/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.13/arch/powerpc/kernel/cacheinfo.c | 2036 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.15/arch/powerpc/kernel/cacheinfo.c |
2037 | --- linux-2.6.32.13/arch/powerpc/kernel/cacheinfo.c 2010-03-15 11:52:04.000000000 -0400 | 2037 | --- linux-2.6.32.15/arch/powerpc/kernel/cacheinfo.c 2010-03-15 11:52:04.000000000 -0400 |
2038 | +++ linux-2.6.32.13/arch/powerpc/kernel/cacheinfo.c 2010-05-15 13:21:13.643322255 -0400 | 2038 | +++ linux-2.6.32.15/arch/powerpc/kernel/cacheinfo.c 2010-05-28 21:27:14.807143556 -0400 |
2039 | @@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde | 2039 | @@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde |
2040 | &cache_assoc_attr, | 2040 | &cache_assoc_attr, |
2041 | }; | 2041 | }; |
@@ -2045,9 +2045,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.13/arch/ | |||
2045 | .show = cache_index_show, | 2045 | .show = cache_index_show, |
2046 | }; | 2046 | }; |
2047 | 2047 | ||
2048 | diff -urNp linux-2.6.32.13/arch/powerpc/kernel/dma.c linux-2.6.32.13/arch/powerpc/kernel/dma.c | 2048 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/dma.c linux-2.6.32.15/arch/powerpc/kernel/dma.c |
2049 | --- linux-2.6.32.13/arch/powerpc/kernel/dma.c 2010-03-15 11:52:04.000000000 -0400 | 2049 | --- linux-2.6.32.15/arch/powerpc/kernel/dma.c 2010-03-15 11:52:04.000000000 -0400 |
2050 | +++ linux-2.6.32.13/arch/powerpc/kernel/dma.c 2010-05-15 13:21:13.643322255 -0400 | 2050 | +++ linux-2.6.32.15/arch/powerpc/kernel/dma.c 2010-05-28 21:27:14.807143556 -0400 |
2051 | @@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl | 2051 | @@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl |
2052 | } | 2052 | } |
2053 | #endif | 2053 | #endif |
@@ -2057,9 +2057,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/dma.c linux-2.6.32.13/arch/powerp | |||
2057 | .alloc_coherent = dma_direct_alloc_coherent, | 2057 | .alloc_coherent = dma_direct_alloc_coherent, |
2058 | .free_coherent = dma_direct_free_coherent, | 2058 | .free_coherent = dma_direct_free_coherent, |
2059 | .map_sg = dma_direct_map_sg, | 2059 | .map_sg = dma_direct_map_sg, |
2060 | diff -urNp linux-2.6.32.13/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.13/arch/powerpc/kernel/dma-iommu.c | 2060 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.15/arch/powerpc/kernel/dma-iommu.c |
2061 | --- linux-2.6.32.13/arch/powerpc/kernel/dma-iommu.c 2010-03-15 11:52:04.000000000 -0400 | 2061 | --- linux-2.6.32.15/arch/powerpc/kernel/dma-iommu.c 2010-03-15 11:52:04.000000000 -0400 |
2062 | +++ linux-2.6.32.13/arch/powerpc/kernel/dma-iommu.c 2010-05-15 13:21:13.643322255 -0400 | 2062 | +++ linux-2.6.32.15/arch/powerpc/kernel/dma-iommu.c 2010-05-28 21:27:14.807143556 -0400 |
2063 | @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de | 2063 | @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de |
2064 | } | 2064 | } |
2065 | 2065 | ||
@@ -2069,9 +2069,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.13/arch/ | |||
2069 | { | 2069 | { |
2070 | struct iommu_table *tbl = get_iommu_table_base(dev); | 2070 | struct iommu_table *tbl = get_iommu_table_base(dev); |
2071 | 2071 | ||
2072 | diff -urNp linux-2.6.32.13/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.13/arch/powerpc/kernel/dma-swiotlb.c | 2072 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.15/arch/powerpc/kernel/dma-swiotlb.c |
2073 | --- linux-2.6.32.13/arch/powerpc/kernel/dma-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 | 2073 | --- linux-2.6.32.15/arch/powerpc/kernel/dma-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 |
2074 | +++ linux-2.6.32.13/arch/powerpc/kernel/dma-swiotlb.c 2010-05-15 13:21:13.646883281 -0400 | 2074 | +++ linux-2.6.32.15/arch/powerpc/kernel/dma-swiotlb.c 2010-05-28 21:27:14.807143556 -0400 |
2075 | @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; | 2075 | @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; |
2076 | * map_page, and unmap_page on highmem, use normal dma_ops | 2076 | * map_page, and unmap_page on highmem, use normal dma_ops |
2077 | * for everything else. | 2077 | * for everything else. |
@@ -2081,9 +2081,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.13/arc | |||
2081 | .alloc_coherent = dma_direct_alloc_coherent, | 2081 | .alloc_coherent = dma_direct_alloc_coherent, |
2082 | .free_coherent = dma_direct_free_coherent, | 2082 | .free_coherent = dma_direct_free_coherent, |
2083 | .map_sg = swiotlb_map_sg_attrs, | 2083 | .map_sg = swiotlb_map_sg_attrs, |
2084 | diff -urNp linux-2.6.32.13/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.13/arch/powerpc/kernel/exceptions-64e.S | 2084 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.15/arch/powerpc/kernel/exceptions-64e.S |
2085 | --- linux-2.6.32.13/arch/powerpc/kernel/exceptions-64e.S 2010-03-15 11:52:04.000000000 -0400 | 2085 | --- linux-2.6.32.15/arch/powerpc/kernel/exceptions-64e.S 2010-03-15 11:52:04.000000000 -0400 |
2086 | +++ linux-2.6.32.13/arch/powerpc/kernel/exceptions-64e.S 2010-05-15 13:21:13.646883281 -0400 | 2086 | +++ linux-2.6.32.15/arch/powerpc/kernel/exceptions-64e.S 2010-05-28 21:27:14.823138187 -0400 |
2087 | @@ -455,6 +455,7 @@ storage_fault_common: | 2087 | @@ -455,6 +455,7 @@ storage_fault_common: |
2088 | std r14,_DAR(r1) | 2088 | std r14,_DAR(r1) |
2089 | std r15,_DSISR(r1) | 2089 | std r15,_DSISR(r1) |
@@ -2102,9 +2102,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.13/ | |||
2102 | addi r3,r1,STACK_FRAME_OVERHEAD | 2102 | addi r3,r1,STACK_FRAME_OVERHEAD |
2103 | ld r4,_DAR(r1) | 2103 | ld r4,_DAR(r1) |
2104 | bl .bad_page_fault | 2104 | bl .bad_page_fault |
2105 | diff -urNp linux-2.6.32.13/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.13/arch/powerpc/kernel/exceptions-64s.S | 2105 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.15/arch/powerpc/kernel/exceptions-64s.S |
2106 | --- linux-2.6.32.13/arch/powerpc/kernel/exceptions-64s.S 2010-03-15 11:52:04.000000000 -0400 | 2106 | --- linux-2.6.32.15/arch/powerpc/kernel/exceptions-64s.S 2010-03-15 11:52:04.000000000 -0400 |
2107 | +++ linux-2.6.32.13/arch/powerpc/kernel/exceptions-64s.S 2010-05-15 13:21:13.646883281 -0400 | 2107 | +++ linux-2.6.32.15/arch/powerpc/kernel/exceptions-64s.S 2010-05-28 21:27:14.834966791 -0400 |
2108 | @@ -818,10 +818,10 @@ handle_page_fault: | 2108 | @@ -818,10 +818,10 @@ handle_page_fault: |
2109 | 11: ld r4,_DAR(r1) | 2109 | 11: ld r4,_DAR(r1) |
2110 | ld r5,_DSISR(r1) | 2110 | ld r5,_DSISR(r1) |
@@ -2117,9 +2117,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.13/ | |||
2117 | mr r5,r3 | 2117 | mr r5,r3 |
2118 | addi r3,r1,STACK_FRAME_OVERHEAD | 2118 | addi r3,r1,STACK_FRAME_OVERHEAD |
2119 | lwz r4,_DAR(r1) | 2119 | lwz r4,_DAR(r1) |
2120 | diff -urNp linux-2.6.32.13/arch/powerpc/kernel/ibmebus.c linux-2.6.32.13/arch/powerpc/kernel/ibmebus.c | 2120 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/ibmebus.c linux-2.6.32.15/arch/powerpc/kernel/ibmebus.c |
2121 | --- linux-2.6.32.13/arch/powerpc/kernel/ibmebus.c 2010-03-15 11:52:04.000000000 -0400 | 2121 | --- linux-2.6.32.15/arch/powerpc/kernel/ibmebus.c 2010-03-15 11:52:04.000000000 -0400 |
2122 | +++ linux-2.6.32.13/arch/powerpc/kernel/ibmebus.c 2010-05-15 13:21:13.646883281 -0400 | 2122 | +++ linux-2.6.32.15/arch/powerpc/kernel/ibmebus.c 2010-05-28 21:27:14.834966791 -0400 |
2123 | @@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct | 2123 | @@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct |
2124 | return 1; | 2124 | return 1; |
2125 | } | 2125 | } |
@@ -2129,9 +2129,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/ibmebus.c linux-2.6.32.13/arch/po | |||
2129 | .alloc_coherent = ibmebus_alloc_coherent, | 2129 | .alloc_coherent = ibmebus_alloc_coherent, |
2130 | .free_coherent = ibmebus_free_coherent, | 2130 | .free_coherent = ibmebus_free_coherent, |
2131 | .map_sg = ibmebus_map_sg, | 2131 | .map_sg = ibmebus_map_sg, |
2132 | diff -urNp linux-2.6.32.13/arch/powerpc/kernel/kgdb.c linux-2.6.32.13/arch/powerpc/kernel/kgdb.c | 2132 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/kgdb.c linux-2.6.32.15/arch/powerpc/kernel/kgdb.c |
2133 | --- linux-2.6.32.13/arch/powerpc/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 | 2133 | --- linux-2.6.32.15/arch/powerpc/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 |
2134 | +++ linux-2.6.32.13/arch/powerpc/kernel/kgdb.c 2010-05-15 13:21:13.658890137 -0400 | 2134 | +++ linux-2.6.32.15/arch/powerpc/kernel/kgdb.c 2010-05-28 21:27:14.834966791 -0400 |
2135 | @@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct | 2135 | @@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct |
2136 | if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0) | 2136 | if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0) |
2137 | return 0; | 2137 | return 0; |
@@ -2150,9 +2150,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/kgdb.c linux-2.6.32.13/arch/power | |||
2150 | .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08}, | 2150 | .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08}, |
2151 | }; | 2151 | }; |
2152 | 2152 | ||
2153 | diff -urNp linux-2.6.32.13/arch/powerpc/kernel/module_32.c linux-2.6.32.13/arch/powerpc/kernel/module_32.c | 2153 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/module_32.c linux-2.6.32.15/arch/powerpc/kernel/module_32.c |
2154 | --- linux-2.6.32.13/arch/powerpc/kernel/module_32.c 2010-03-15 11:52:04.000000000 -0400 | 2154 | --- linux-2.6.32.15/arch/powerpc/kernel/module_32.c 2010-03-15 11:52:04.000000000 -0400 |
2155 | +++ linux-2.6.32.13/arch/powerpc/kernel/module_32.c 2010-05-15 13:21:13.658890137 -0400 | 2155 | +++ linux-2.6.32.15/arch/powerpc/kernel/module_32.c 2010-05-28 21:27:14.841132469 -0400 |
2156 | @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr | 2156 | @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr |
2157 | me->arch.core_plt_section = i; | 2157 | me->arch.core_plt_section = i; |
2158 | } | 2158 | } |
@@ -2182,9 +2182,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/module_32.c linux-2.6.32.13/arch/ | |||
2182 | 2182 | ||
2183 | /* Find this entry, or if that fails, the next avail. entry */ | 2183 | /* Find this entry, or if that fails, the next avail. entry */ |
2184 | while (entry->jump[0]) { | 2184 | while (entry->jump[0]) { |
2185 | diff -urNp linux-2.6.32.13/arch/powerpc/kernel/module.c linux-2.6.32.13/arch/powerpc/kernel/module.c | 2185 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/module.c linux-2.6.32.15/arch/powerpc/kernel/module.c |
2186 | --- linux-2.6.32.13/arch/powerpc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 | 2186 | --- linux-2.6.32.15/arch/powerpc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 |
2187 | +++ linux-2.6.32.13/arch/powerpc/kernel/module.c 2010-05-15 13:21:13.658890137 -0400 | 2187 | +++ linux-2.6.32.15/arch/powerpc/kernel/module.c 2010-05-28 21:27:14.841132469 -0400 |
2188 | @@ -31,11 +31,24 @@ | 2188 | @@ -31,11 +31,24 @@ |
2189 | 2189 | ||
2190 | LIST_HEAD(module_bug_list); | 2190 | LIST_HEAD(module_bug_list); |
@@ -2224,9 +2224,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/module.c linux-2.6.32.13/arch/pow | |||
2224 | static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, | 2224 | static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, |
2225 | const Elf_Shdr *sechdrs, | 2225 | const Elf_Shdr *sechdrs, |
2226 | const char *name) | 2226 | const char *name) |
2227 | diff -urNp linux-2.6.32.13/arch/powerpc/kernel/pci-common.c linux-2.6.32.13/arch/powerpc/kernel/pci-common.c | 2227 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/pci-common.c linux-2.6.32.15/arch/powerpc/kernel/pci-common.c |
2228 | --- linux-2.6.32.13/arch/powerpc/kernel/pci-common.c 2010-03-15 11:52:04.000000000 -0400 | 2228 | --- linux-2.6.32.15/arch/powerpc/kernel/pci-common.c 2010-03-15 11:52:04.000000000 -0400 |
2229 | +++ linux-2.6.32.13/arch/powerpc/kernel/pci-common.c 2010-05-15 13:21:13.678895652 -0400 | 2229 | +++ linux-2.6.32.15/arch/powerpc/kernel/pci-common.c 2010-05-28 21:27:14.841132469 -0400 |
2230 | @@ -50,14 +50,14 @@ resource_size_t isa_mem_base; | 2230 | @@ -50,14 +50,14 @@ resource_size_t isa_mem_base; |
2231 | unsigned int ppc_pci_flags = 0; | 2231 | unsigned int ppc_pci_flags = 0; |
2232 | 2232 | ||
@@ -2245,9 +2245,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/pci-common.c linux-2.6.32.13/arch | |||
2245 | { | 2245 | { |
2246 | return pci_dma_ops; | 2246 | return pci_dma_ops; |
2247 | } | 2247 | } |
2248 | diff -urNp linux-2.6.32.13/arch/powerpc/kernel/process.c linux-2.6.32.13/arch/powerpc/kernel/process.c | 2248 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/process.c linux-2.6.32.15/arch/powerpc/kernel/process.c |
2249 | --- linux-2.6.32.13/arch/powerpc/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 | 2249 | --- linux-2.6.32.15/arch/powerpc/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 |
2250 | +++ linux-2.6.32.13/arch/powerpc/kernel/process.c 2010-05-15 13:21:13.678895652 -0400 | 2250 | +++ linux-2.6.32.15/arch/powerpc/kernel/process.c 2010-05-28 21:27:14.843133123 -0400 |
2251 | @@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned | 2251 | @@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned |
2252 | sp -= get_random_int() & ~PAGE_MASK; | 2252 | sp -= get_random_int() & ~PAGE_MASK; |
2253 | return sp & ~0xf; | 2253 | return sp & ~0xf; |
@@ -2300,9 +2300,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/process.c linux-2.6.32.13/arch/po | |||
2300 | - | 2300 | - |
2301 | - return ret; | 2301 | - return ret; |
2302 | -} | 2302 | -} |
2303 | diff -urNp linux-2.6.32.13/arch/powerpc/kernel/signal_32.c linux-2.6.32.13/arch/powerpc/kernel/signal_32.c | 2303 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/signal_32.c linux-2.6.32.15/arch/powerpc/kernel/signal_32.c |
2304 | --- linux-2.6.32.13/arch/powerpc/kernel/signal_32.c 2010-03-15 11:52:04.000000000 -0400 | 2304 | --- linux-2.6.32.15/arch/powerpc/kernel/signal_32.c 2010-03-15 11:52:04.000000000 -0400 |
2305 | +++ linux-2.6.32.13/arch/powerpc/kernel/signal_32.c 2010-05-15 13:21:13.686885851 -0400 | 2305 | +++ linux-2.6.32.15/arch/powerpc/kernel/signal_32.c 2010-05-28 21:27:14.843133123 -0400 |
2306 | @@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig | 2306 | @@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig |
2307 | /* Save user registers on the stack */ | 2307 | /* Save user registers on the stack */ |
2308 | frame = &rt_sf->uc.uc_mcontext; | 2308 | frame = &rt_sf->uc.uc_mcontext; |
@@ -2312,9 +2312,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/signal_32.c linux-2.6.32.13/arch/ | |||
2312 | if (save_user_regs(regs, frame, 0, 1)) | 2312 | if (save_user_regs(regs, frame, 0, 1)) |
2313 | goto badframe; | 2313 | goto badframe; |
2314 | regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; | 2314 | regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; |
2315 | diff -urNp linux-2.6.32.13/arch/powerpc/kernel/signal_64.c linux-2.6.32.13/arch/powerpc/kernel/signal_64.c | 2315 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/signal_64.c linux-2.6.32.15/arch/powerpc/kernel/signal_64.c |
2316 | --- linux-2.6.32.13/arch/powerpc/kernel/signal_64.c 2010-03-15 11:52:04.000000000 -0400 | 2316 | --- linux-2.6.32.15/arch/powerpc/kernel/signal_64.c 2010-03-15 11:52:04.000000000 -0400 |
2317 | +++ linux-2.6.32.13/arch/powerpc/kernel/signal_64.c 2010-05-15 13:21:13.686885851 -0400 | 2317 | +++ linux-2.6.32.15/arch/powerpc/kernel/signal_64.c 2010-05-28 21:27:14.843133123 -0400 |
2318 | @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct | 2318 | @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct |
2319 | current->thread.fpscr.val = 0; | 2319 | current->thread.fpscr.val = 0; |
2320 | 2320 | ||
@@ -2324,9 +2324,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/signal_64.c linux-2.6.32.13/arch/ | |||
2324 | regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; | 2324 | regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; |
2325 | } else { | 2325 | } else { |
2326 | err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); | 2326 | err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); |
2327 | diff -urNp linux-2.6.32.13/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.13/arch/powerpc/kernel/sys_ppc32.c | 2327 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.15/arch/powerpc/kernel/sys_ppc32.c |
2328 | --- linux-2.6.32.13/arch/powerpc/kernel/sys_ppc32.c 2010-03-15 11:52:04.000000000 -0400 | 2328 | --- linux-2.6.32.15/arch/powerpc/kernel/sys_ppc32.c 2010-03-15 11:52:04.000000000 -0400 |
2329 | +++ linux-2.6.32.13/arch/powerpc/kernel/sys_ppc32.c 2010-05-15 13:21:13.686885851 -0400 | 2329 | +++ linux-2.6.32.15/arch/powerpc/kernel/sys_ppc32.c 2010-05-28 21:27:14.843133123 -0400 |
2330 | @@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct | 2330 | @@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct |
2331 | if (oldlenp) { | 2331 | if (oldlenp) { |
2332 | if (!error) { | 2332 | if (!error) { |
@@ -2340,9 +2340,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.13/arch/ | |||
2340 | } | 2340 | } |
2341 | return error; | 2341 | return error; |
2342 | } | 2342 | } |
2343 | diff -urNp linux-2.6.32.13/arch/powerpc/kernel/vdso.c linux-2.6.32.13/arch/powerpc/kernel/vdso.c | 2343 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/vdso.c linux-2.6.32.15/arch/powerpc/kernel/vdso.c |
2344 | --- linux-2.6.32.13/arch/powerpc/kernel/vdso.c 2010-03-15 11:52:04.000000000 -0400 | 2344 | --- linux-2.6.32.15/arch/powerpc/kernel/vdso.c 2010-03-15 11:52:04.000000000 -0400 |
2345 | +++ linux-2.6.32.13/arch/powerpc/kernel/vdso.c 2010-05-15 13:21:13.686885851 -0400 | 2345 | +++ linux-2.6.32.15/arch/powerpc/kernel/vdso.c 2010-05-28 21:27:14.843133123 -0400 |
2346 | @@ -36,6 +36,7 @@ | 2346 | @@ -36,6 +36,7 @@ |
2347 | #include <asm/firmware.h> | 2347 | #include <asm/firmware.h> |
2348 | #include <asm/vdso.h> | 2348 | #include <asm/vdso.h> |
@@ -2369,9 +2369,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/vdso.c linux-2.6.32.13/arch/power | |||
2369 | if (IS_ERR_VALUE(vdso_base)) { | 2369 | if (IS_ERR_VALUE(vdso_base)) { |
2370 | rc = vdso_base; | 2370 | rc = vdso_base; |
2371 | goto fail_mmapsem; | 2371 | goto fail_mmapsem; |
2372 | diff -urNp linux-2.6.32.13/arch/powerpc/kernel/vio.c linux-2.6.32.13/arch/powerpc/kernel/vio.c | 2372 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/vio.c linux-2.6.32.15/arch/powerpc/kernel/vio.c |
2373 | --- linux-2.6.32.13/arch/powerpc/kernel/vio.c 2010-03-15 11:52:04.000000000 -0400 | 2373 | --- linux-2.6.32.15/arch/powerpc/kernel/vio.c 2010-03-15 11:52:04.000000000 -0400 |
2374 | +++ linux-2.6.32.13/arch/powerpc/kernel/vio.c 2010-05-15 13:21:13.690884467 -0400 | 2374 | +++ linux-2.6.32.15/arch/powerpc/kernel/vio.c 2010-05-28 21:27:14.843133123 -0400 |
2375 | @@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc | 2375 | @@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc |
2376 | vio_cmo_dealloc(viodev, alloc_size); | 2376 | vio_cmo_dealloc(viodev, alloc_size); |
2377 | } | 2377 | } |
@@ -2394,9 +2394,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/vio.c linux-2.6.32.13/arch/powerp | |||
2394 | viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops; | 2394 | viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops; |
2395 | } | 2395 | } |
2396 | 2396 | ||
2397 | diff -urNp linux-2.6.32.13/arch/powerpc/lib/usercopy_64.c linux-2.6.32.13/arch/powerpc/lib/usercopy_64.c | 2397 | diff -urNp linux-2.6.32.15/arch/powerpc/lib/usercopy_64.c linux-2.6.32.15/arch/powerpc/lib/usercopy_64.c |
2398 | --- linux-2.6.32.13/arch/powerpc/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400 | 2398 | --- linux-2.6.32.15/arch/powerpc/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400 |
2399 | +++ linux-2.6.32.13/arch/powerpc/lib/usercopy_64.c 2010-05-15 13:21:13.690884467 -0400 | 2399 | +++ linux-2.6.32.15/arch/powerpc/lib/usercopy_64.c 2010-05-28 21:27:14.843133123 -0400 |
2400 | @@ -9,22 +9,6 @@ | 2400 | @@ -9,22 +9,6 @@ |
2401 | #include <linux/module.h> | 2401 | #include <linux/module.h> |
2402 | #include <asm/uaccess.h> | 2402 | #include <asm/uaccess.h> |
@@ -2428,9 +2428,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/lib/usercopy_64.c linux-2.6.32.13/arch/p | |||
2428 | -EXPORT_SYMBOL(copy_to_user); | 2428 | -EXPORT_SYMBOL(copy_to_user); |
2429 | EXPORT_SYMBOL(copy_in_user); | 2429 | EXPORT_SYMBOL(copy_in_user); |
2430 | 2430 | ||
2431 | diff -urNp linux-2.6.32.13/arch/powerpc/mm/fault.c linux-2.6.32.13/arch/powerpc/mm/fault.c | 2431 | diff -urNp linux-2.6.32.15/arch/powerpc/mm/fault.c linux-2.6.32.15/arch/powerpc/mm/fault.c |
2432 | --- linux-2.6.32.13/arch/powerpc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 | 2432 | --- linux-2.6.32.15/arch/powerpc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 |
2433 | +++ linux-2.6.32.13/arch/powerpc/mm/fault.c 2010-05-15 13:21:13.690884467 -0400 | 2433 | +++ linux-2.6.32.15/arch/powerpc/mm/fault.c 2010-05-28 21:27:14.843133123 -0400 |
2434 | @@ -30,6 +30,10 @@ | 2434 | @@ -30,6 +30,10 @@ |
2435 | #include <linux/kprobes.h> | 2435 | #include <linux/kprobes.h> |
2436 | #include <linux/kdebug.h> | 2436 | #include <linux/kdebug.h> |
@@ -2535,9 +2535,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/mm/fault.c linux-2.6.32.13/arch/powerpc/ | |||
2535 | _exception(SIGSEGV, regs, code, address); | 2535 | _exception(SIGSEGV, regs, code, address); |
2536 | return 0; | 2536 | return 0; |
2537 | } | 2537 | } |
2538 | diff -urNp linux-2.6.32.13/arch/powerpc/mm/mmap_64.c linux-2.6.32.13/arch/powerpc/mm/mmap_64.c | 2538 | diff -urNp linux-2.6.32.15/arch/powerpc/mm/mmap_64.c linux-2.6.32.15/arch/powerpc/mm/mmap_64.c |
2539 | --- linux-2.6.32.13/arch/powerpc/mm/mmap_64.c 2010-03-15 11:52:04.000000000 -0400 | 2539 | --- linux-2.6.32.15/arch/powerpc/mm/mmap_64.c 2010-03-15 11:52:04.000000000 -0400 |
2540 | +++ linux-2.6.32.13/arch/powerpc/mm/mmap_64.c 2010-05-15 13:21:13.694737832 -0400 | 2540 | +++ linux-2.6.32.15/arch/powerpc/mm/mmap_64.c 2010-05-28 21:27:14.843133123 -0400 |
2541 | @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str | 2541 | @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str |
2542 | */ | 2542 | */ |
2543 | if (mmap_is_legacy()) { | 2543 | if (mmap_is_legacy()) { |
@@ -2561,9 +2561,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/mm/mmap_64.c linux-2.6.32.13/arch/powerp | |||
2561 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; | 2561 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; |
2562 | mm->unmap_area = arch_unmap_area_topdown; | 2562 | mm->unmap_area = arch_unmap_area_topdown; |
2563 | } | 2563 | } |
2564 | diff -urNp linux-2.6.32.13/arch/powerpc/mm/slice.c linux-2.6.32.13/arch/powerpc/mm/slice.c | 2564 | diff -urNp linux-2.6.32.15/arch/powerpc/mm/slice.c linux-2.6.32.15/arch/powerpc/mm/slice.c |
2565 | --- linux-2.6.32.13/arch/powerpc/mm/slice.c 2010-03-15 11:52:04.000000000 -0400 | 2565 | --- linux-2.6.32.15/arch/powerpc/mm/slice.c 2010-03-15 11:52:04.000000000 -0400 |
2566 | +++ linux-2.6.32.13/arch/powerpc/mm/slice.c 2010-05-15 13:21:13.702894969 -0400 | 2566 | +++ linux-2.6.32.15/arch/powerpc/mm/slice.c 2010-05-28 21:27:14.843133123 -0400 |
2567 | @@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un | 2567 | @@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un |
2568 | if (fixed && addr > (mm->task_size - len)) | 2568 | if (fixed && addr > (mm->task_size - len)) |
2569 | return -EINVAL; | 2569 | return -EINVAL; |
@@ -2576,9 +2576,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/mm/slice.c linux-2.6.32.13/arch/powerpc/ | |||
2576 | /* If hint, make sure it matches our alignment restrictions */ | 2576 | /* If hint, make sure it matches our alignment restrictions */ |
2577 | if (!fixed && addr) { | 2577 | if (!fixed && addr) { |
2578 | addr = _ALIGN_UP(addr, 1ul << pshift); | 2578 | addr = _ALIGN_UP(addr, 1ul << pshift); |
2579 | diff -urNp linux-2.6.32.13/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.13/arch/powerpc/platforms/52xx/lite5200_pm.c | 2579 | diff -urNp linux-2.6.32.15/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.15/arch/powerpc/platforms/52xx/lite5200_pm.c |
2580 | --- linux-2.6.32.13/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-03-15 11:52:04.000000000 -0400 | 2580 | --- linux-2.6.32.15/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-03-15 11:52:04.000000000 -0400 |
2581 | +++ linux-2.6.32.13/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-05-15 13:21:13.702894969 -0400 | 2581 | +++ linux-2.6.32.15/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-05-28 21:27:14.843133123 -0400 |
2582 | @@ -235,7 +235,7 @@ static void lite5200_pm_end(void) | 2582 | @@ -235,7 +235,7 @@ static void lite5200_pm_end(void) |
2583 | lite5200_pm_target_state = PM_SUSPEND_ON; | 2583 | lite5200_pm_target_state = PM_SUSPEND_ON; |
2584 | } | 2584 | } |
@@ -2588,9 +2588,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.3 | |||
2588 | .valid = lite5200_pm_valid, | 2588 | .valid = lite5200_pm_valid, |
2589 | .begin = lite5200_pm_begin, | 2589 | .begin = lite5200_pm_begin, |
2590 | .prepare = lite5200_pm_prepare, | 2590 | .prepare = lite5200_pm_prepare, |
2591 | diff -urNp linux-2.6.32.13/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.13/arch/powerpc/platforms/52xx/mpc52xx_pm.c | 2591 | diff -urNp linux-2.6.32.15/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.15/arch/powerpc/platforms/52xx/mpc52xx_pm.c |
2592 | --- linux-2.6.32.13/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-03-15 11:52:04.000000000 -0400 | 2592 | --- linux-2.6.32.15/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-03-15 11:52:04.000000000 -0400 |
2593 | +++ linux-2.6.32.13/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-05-15 13:21:13.706882202 -0400 | 2593 | +++ linux-2.6.32.15/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-05-28 21:27:14.843133123 -0400 |
2594 | @@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void) | 2594 | @@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void) |
2595 | iounmap(mbar); | 2595 | iounmap(mbar); |
2596 | } | 2596 | } |
@@ -2600,9 +2600,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32 | |||
2600 | .valid = mpc52xx_pm_valid, | 2600 | .valid = mpc52xx_pm_valid, |
2601 | .prepare = mpc52xx_pm_prepare, | 2601 | .prepare = mpc52xx_pm_prepare, |
2602 | .enter = mpc52xx_pm_enter, | 2602 | .enter = mpc52xx_pm_enter, |
2603 | diff -urNp linux-2.6.32.13/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.13/arch/powerpc/platforms/83xx/suspend.c | 2603 | diff -urNp linux-2.6.32.15/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.15/arch/powerpc/platforms/83xx/suspend.c |
2604 | --- linux-2.6.32.13/arch/powerpc/platforms/83xx/suspend.c 2010-03-15 11:52:04.000000000 -0400 | 2604 | --- linux-2.6.32.15/arch/powerpc/platforms/83xx/suspend.c 2010-03-15 11:52:04.000000000 -0400 |
2605 | +++ linux-2.6.32.13/arch/powerpc/platforms/83xx/suspend.c 2010-05-15 13:21:13.714896740 -0400 | 2605 | +++ linux-2.6.32.15/arch/powerpc/platforms/83xx/suspend.c 2010-05-28 21:27:14.843133123 -0400 |
2606 | @@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void) | 2606 | @@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void) |
2607 | return ret; | 2607 | return ret; |
2608 | } | 2608 | } |
@@ -2612,9 +2612,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.13 | |||
2612 | .valid = mpc83xx_suspend_valid, | 2612 | .valid = mpc83xx_suspend_valid, |
2613 | .begin = mpc83xx_suspend_begin, | 2613 | .begin = mpc83xx_suspend_begin, |
2614 | .enter = mpc83xx_suspend_enter, | 2614 | .enter = mpc83xx_suspend_enter, |
2615 | diff -urNp linux-2.6.32.13/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.13/arch/powerpc/platforms/cell/iommu.c | 2615 | diff -urNp linux-2.6.32.15/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.15/arch/powerpc/platforms/cell/iommu.c |
2616 | --- linux-2.6.32.13/arch/powerpc/platforms/cell/iommu.c 2010-03-15 11:52:04.000000000 -0400 | 2616 | --- linux-2.6.32.15/arch/powerpc/platforms/cell/iommu.c 2010-03-15 11:52:04.000000000 -0400 |
2617 | +++ linux-2.6.32.13/arch/powerpc/platforms/cell/iommu.c 2010-05-15 13:21:13.726905139 -0400 | 2617 | +++ linux-2.6.32.15/arch/powerpc/platforms/cell/iommu.c 2010-05-28 21:27:14.864087018 -0400 |
2618 | @@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc | 2618 | @@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc |
2619 | 2619 | ||
2620 | static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); | 2620 | static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); |
@@ -2624,9 +2624,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.13/a | |||
2624 | .alloc_coherent = dma_fixed_alloc_coherent, | 2624 | .alloc_coherent = dma_fixed_alloc_coherent, |
2625 | .free_coherent = dma_fixed_free_coherent, | 2625 | .free_coherent = dma_fixed_free_coherent, |
2626 | .map_sg = dma_fixed_map_sg, | 2626 | .map_sg = dma_fixed_map_sg, |
2627 | diff -urNp linux-2.6.32.13/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.13/arch/powerpc/platforms/ps3/system-bus.c | 2627 | diff -urNp linux-2.6.32.15/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.15/arch/powerpc/platforms/ps3/system-bus.c |
2628 | --- linux-2.6.32.13/arch/powerpc/platforms/ps3/system-bus.c 2010-03-15 11:52:04.000000000 -0400 | 2628 | --- linux-2.6.32.15/arch/powerpc/platforms/ps3/system-bus.c 2010-03-15 11:52:04.000000000 -0400 |
2629 | +++ linux-2.6.32.13/arch/powerpc/platforms/ps3/system-bus.c 2010-05-15 13:21:13.726905139 -0400 | 2629 | +++ linux-2.6.32.15/arch/powerpc/platforms/ps3/system-bus.c 2010-05-28 21:27:14.867153288 -0400 |
2630 | @@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi | 2630 | @@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi |
2631 | return mask >= DMA_BIT_MASK(32); | 2631 | return mask >= DMA_BIT_MASK(32); |
2632 | } | 2632 | } |
@@ -2645,9 +2645,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32. | |||
2645 | .alloc_coherent = ps3_alloc_coherent, | 2645 | .alloc_coherent = ps3_alloc_coherent, |
2646 | .free_coherent = ps3_free_coherent, | 2646 | .free_coherent = ps3_free_coherent, |
2647 | .map_sg = ps3_ioc0_map_sg, | 2647 | .map_sg = ps3_ioc0_map_sg, |
2648 | diff -urNp linux-2.6.32.13/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.13/arch/powerpc/platforms/pseries/Kconfig | 2648 | diff -urNp linux-2.6.32.15/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.15/arch/powerpc/platforms/pseries/Kconfig |
2649 | --- linux-2.6.32.13/arch/powerpc/platforms/pseries/Kconfig 2010-03-15 11:52:04.000000000 -0400 | 2649 | --- linux-2.6.32.15/arch/powerpc/platforms/pseries/Kconfig 2010-03-15 11:52:04.000000000 -0400 |
2650 | +++ linux-2.6.32.13/arch/powerpc/platforms/pseries/Kconfig 2010-05-15 13:21:13.726905139 -0400 | 2650 | +++ linux-2.6.32.15/arch/powerpc/platforms/pseries/Kconfig 2010-05-28 21:27:14.867153288 -0400 |
2651 | @@ -2,6 +2,8 @@ config PPC_PSERIES | 2651 | @@ -2,6 +2,8 @@ config PPC_PSERIES |
2652 | depends on PPC64 && PPC_BOOK3S | 2652 | depends on PPC64 && PPC_BOOK3S |
2653 | bool "IBM pSeries & new (POWER5-based) iSeries" | 2653 | bool "IBM pSeries & new (POWER5-based) iSeries" |
@@ -2657,9 +2657,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.1 | |||
2657 | select PPC_I8259 | 2657 | select PPC_I8259 |
2658 | select PPC_RTAS | 2658 | select PPC_RTAS |
2659 | select RTAS_ERROR_LOGGING | 2659 | select RTAS_ERROR_LOGGING |
2660 | diff -urNp linux-2.6.32.13/arch/s390/include/asm/elf.h linux-2.6.32.13/arch/s390/include/asm/elf.h | 2660 | diff -urNp linux-2.6.32.15/arch/s390/include/asm/elf.h linux-2.6.32.15/arch/s390/include/asm/elf.h |
2661 | --- linux-2.6.32.13/arch/s390/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 | 2661 | --- linux-2.6.32.15/arch/s390/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 |
2662 | +++ linux-2.6.32.13/arch/s390/include/asm/elf.h 2010-05-15 13:21:13.745465180 -0400 | 2662 | +++ linux-2.6.32.15/arch/s390/include/asm/elf.h 2010-05-28 21:27:14.871031796 -0400 |
2663 | @@ -164,6 +164,13 @@ extern unsigned int vdso_enabled; | 2663 | @@ -164,6 +164,13 @@ extern unsigned int vdso_enabled; |
2664 | that it will "exec", and that there is sufficient room for the brk. */ | 2664 | that it will "exec", and that there is sufficient room for the brk. */ |
2665 | #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2) | 2665 | #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2) |
@@ -2674,9 +2674,9 @@ diff -urNp linux-2.6.32.13/arch/s390/include/asm/elf.h linux-2.6.32.13/arch/s390 | |||
2674 | /* This yields a mask that user programs can use to figure out what | 2674 | /* This yields a mask that user programs can use to figure out what |
2675 | instruction set this CPU supports. */ | 2675 | instruction set this CPU supports. */ |
2676 | 2676 | ||
2677 | diff -urNp linux-2.6.32.13/arch/s390/include/asm/setup.h linux-2.6.32.13/arch/s390/include/asm/setup.h | 2677 | diff -urNp linux-2.6.32.15/arch/s390/include/asm/setup.h linux-2.6.32.15/arch/s390/include/asm/setup.h |
2678 | --- linux-2.6.32.13/arch/s390/include/asm/setup.h 2010-03-15 11:52:04.000000000 -0400 | 2678 | --- linux-2.6.32.15/arch/s390/include/asm/setup.h 2010-03-15 11:52:04.000000000 -0400 |
2679 | +++ linux-2.6.32.13/arch/s390/include/asm/setup.h 2010-05-15 13:21:13.746887701 -0400 | 2679 | +++ linux-2.6.32.15/arch/s390/include/asm/setup.h 2010-05-28 21:27:14.871031796 -0400 |
2680 | @@ -50,13 +50,13 @@ extern unsigned long memory_end; | 2680 | @@ -50,13 +50,13 @@ extern unsigned long memory_end; |
2681 | void detect_memory_layout(struct mem_chunk chunk[]); | 2681 | void detect_memory_layout(struct mem_chunk chunk[]); |
2682 | 2682 | ||
@@ -2693,9 +2693,9 @@ diff -urNp linux-2.6.32.13/arch/s390/include/asm/setup.h linux-2.6.32.13/arch/s3 | |||
2693 | #else | 2693 | #else |
2694 | #define s390_noexec (0) | 2694 | #define s390_noexec (0) |
2695 | #endif | 2695 | #endif |
2696 | diff -urNp linux-2.6.32.13/arch/s390/include/asm/uaccess.h linux-2.6.32.13/arch/s390/include/asm/uaccess.h | 2696 | diff -urNp linux-2.6.32.15/arch/s390/include/asm/uaccess.h linux-2.6.32.15/arch/s390/include/asm/uaccess.h |
2697 | --- linux-2.6.32.13/arch/s390/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 | 2697 | --- linux-2.6.32.15/arch/s390/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 |
2698 | +++ linux-2.6.32.13/arch/s390/include/asm/uaccess.h 2010-05-15 13:21:13.746887701 -0400 | 2698 | +++ linux-2.6.32.15/arch/s390/include/asm/uaccess.h 2010-05-28 21:27:14.871031796 -0400 |
2699 | @@ -232,6 +232,10 @@ static inline unsigned long __must_check | 2699 | @@ -232,6 +232,10 @@ static inline unsigned long __must_check |
2700 | copy_to_user(void __user *to, const void *from, unsigned long n) | 2700 | copy_to_user(void __user *to, const void *from, unsigned long n) |
2701 | { | 2701 | { |
@@ -2728,9 +2728,9 @@ diff -urNp linux-2.6.32.13/arch/s390/include/asm/uaccess.h linux-2.6.32.13/arch/ | |||
2728 | if (access_ok(VERIFY_READ, from, n)) | 2728 | if (access_ok(VERIFY_READ, from, n)) |
2729 | n = __copy_from_user(to, from, n); | 2729 | n = __copy_from_user(to, from, n); |
2730 | else | 2730 | else |
2731 | diff -urNp linux-2.6.32.13/arch/s390/Kconfig linux-2.6.32.13/arch/s390/Kconfig | 2731 | diff -urNp linux-2.6.32.15/arch/s390/Kconfig linux-2.6.32.15/arch/s390/Kconfig |
2732 | --- linux-2.6.32.13/arch/s390/Kconfig 2010-03-15 11:52:04.000000000 -0400 | 2732 | --- linux-2.6.32.15/arch/s390/Kconfig 2010-03-15 11:52:04.000000000 -0400 |
2733 | +++ linux-2.6.32.13/arch/s390/Kconfig 2010-05-15 13:21:13.754899687 -0400 | 2733 | +++ linux-2.6.32.15/arch/s390/Kconfig 2010-05-28 21:27:14.871031796 -0400 |
2734 | @@ -194,28 +194,26 @@ config AUDIT_ARCH | 2734 | @@ -194,28 +194,26 @@ config AUDIT_ARCH |
2735 | 2735 | ||
2736 | config S390_SWITCH_AMODE | 2736 | config S390_SWITCH_AMODE |
@@ -2768,9 +2768,9 @@ diff -urNp linux-2.6.32.13/arch/s390/Kconfig linux-2.6.32.13/arch/s390/Kconfig | |||
2768 | 2768 | ||
2769 | comment "Code generation options" | 2769 | comment "Code generation options" |
2770 | 2770 | ||
2771 | diff -urNp linux-2.6.32.13/arch/s390/kernel/module.c linux-2.6.32.13/arch/s390/kernel/module.c | 2771 | diff -urNp linux-2.6.32.15/arch/s390/kernel/module.c linux-2.6.32.15/arch/s390/kernel/module.c |
2772 | --- linux-2.6.32.13/arch/s390/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 | 2772 | --- linux-2.6.32.15/arch/s390/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 |
2773 | +++ linux-2.6.32.13/arch/s390/kernel/module.c 2010-05-15 13:21:13.754899687 -0400 | 2773 | +++ linux-2.6.32.15/arch/s390/kernel/module.c 2010-05-28 21:27:14.871031796 -0400 |
2774 | @@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, | 2774 | @@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, |
2775 | 2775 | ||
2776 | /* Increase core size by size of got & plt and set start | 2776 | /* Increase core size by size of got & plt and set start |
@@ -2842,9 +2842,9 @@ diff -urNp linux-2.6.32.13/arch/s390/kernel/module.c linux-2.6.32.13/arch/s390/k | |||
2842 | rela->r_addend - loc; | 2842 | rela->r_addend - loc; |
2843 | if (r_type == R_390_GOTPC) | 2843 | if (r_type == R_390_GOTPC) |
2844 | *(unsigned int *) loc = val; | 2844 | *(unsigned int *) loc = val; |
2845 | diff -urNp linux-2.6.32.13/arch/s390/kernel/setup.c linux-2.6.32.13/arch/s390/kernel/setup.c | 2845 | diff -urNp linux-2.6.32.15/arch/s390/kernel/setup.c linux-2.6.32.15/arch/s390/kernel/setup.c |
2846 | --- linux-2.6.32.13/arch/s390/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400 | 2846 | --- linux-2.6.32.15/arch/s390/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400 |
2847 | +++ linux-2.6.32.13/arch/s390/kernel/setup.c 2010-05-15 13:21:13.754899687 -0400 | 2847 | +++ linux-2.6.32.15/arch/s390/kernel/setup.c 2010-05-28 21:27:14.871031796 -0400 |
2848 | @@ -306,9 +306,6 @@ static int __init early_parse_mem(char * | 2848 | @@ -306,9 +306,6 @@ static int __init early_parse_mem(char * |
2849 | early_param("mem", early_parse_mem); | 2849 | early_param("mem", early_parse_mem); |
2850 | 2850 | ||
@@ -2898,9 +2898,9 @@ diff -urNp linux-2.6.32.13/arch/s390/kernel/setup.c linux-2.6.32.13/arch/s390/ke | |||
2898 | static void setup_addressing_mode(void) | 2898 | static void setup_addressing_mode(void) |
2899 | { | 2899 | { |
2900 | if (s390_noexec) { | 2900 | if (s390_noexec) { |
2901 | diff -urNp linux-2.6.32.13/arch/s390/mm/mmap.c linux-2.6.32.13/arch/s390/mm/mmap.c | 2901 | diff -urNp linux-2.6.32.15/arch/s390/mm/mmap.c linux-2.6.32.15/arch/s390/mm/mmap.c |
2902 | --- linux-2.6.32.13/arch/s390/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 | 2902 | --- linux-2.6.32.15/arch/s390/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 |
2903 | +++ linux-2.6.32.13/arch/s390/mm/mmap.c 2010-05-15 13:21:13.770895237 -0400 | 2903 | +++ linux-2.6.32.15/arch/s390/mm/mmap.c 2010-05-28 21:27:14.871031796 -0400 |
2904 | @@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str | 2904 | @@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str |
2905 | */ | 2905 | */ |
2906 | if (mmap_is_legacy()) { | 2906 | if (mmap_is_legacy()) { |
@@ -2947,9 +2947,9 @@ diff -urNp linux-2.6.32.13/arch/s390/mm/mmap.c linux-2.6.32.13/arch/s390/mm/mmap | |||
2947 | mm->get_unmapped_area = s390_get_unmapped_area_topdown; | 2947 | mm->get_unmapped_area = s390_get_unmapped_area_topdown; |
2948 | mm->unmap_area = arch_unmap_area_topdown; | 2948 | mm->unmap_area = arch_unmap_area_topdown; |
2949 | } | 2949 | } |
2950 | diff -urNp linux-2.6.32.13/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.13/arch/sh/boards/mach-hp6xx/pm.c | 2950 | diff -urNp linux-2.6.32.15/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.15/arch/sh/boards/mach-hp6xx/pm.c |
2951 | --- linux-2.6.32.13/arch/sh/boards/mach-hp6xx/pm.c 2010-03-15 11:52:04.000000000 -0400 | 2951 | --- linux-2.6.32.15/arch/sh/boards/mach-hp6xx/pm.c 2010-03-15 11:52:04.000000000 -0400 |
2952 | +++ linux-2.6.32.13/arch/sh/boards/mach-hp6xx/pm.c 2010-05-15 13:21:13.770895237 -0400 | 2952 | +++ linux-2.6.32.15/arch/sh/boards/mach-hp6xx/pm.c 2010-05-28 21:27:14.871031796 -0400 |
2953 | @@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_ | 2953 | @@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_ |
2954 | return 0; | 2954 | return 0; |
2955 | } | 2955 | } |
@@ -2959,9 +2959,9 @@ diff -urNp linux-2.6.32.13/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.13/arch/s | |||
2959 | .enter = hp6x0_pm_enter, | 2959 | .enter = hp6x0_pm_enter, |
2960 | .valid = suspend_valid_only_mem, | 2960 | .valid = suspend_valid_only_mem, |
2961 | }; | 2961 | }; |
2962 | diff -urNp linux-2.6.32.13/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.13/arch/sh/kernel/cpu/sh4/sq.c | 2962 | diff -urNp linux-2.6.32.15/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.15/arch/sh/kernel/cpu/sh4/sq.c |
2963 | --- linux-2.6.32.13/arch/sh/kernel/cpu/sh4/sq.c 2010-03-15 11:52:04.000000000 -0400 | 2963 | --- linux-2.6.32.15/arch/sh/kernel/cpu/sh4/sq.c 2010-03-15 11:52:04.000000000 -0400 |
2964 | +++ linux-2.6.32.13/arch/sh/kernel/cpu/sh4/sq.c 2010-05-15 13:21:13.782909212 -0400 | 2964 | +++ linux-2.6.32.15/arch/sh/kernel/cpu/sh4/sq.c 2010-05-28 21:27:14.871031796 -0400 |
2965 | @@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[ | 2965 | @@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[ |
2966 | NULL, | 2966 | NULL, |
2967 | }; | 2967 | }; |
@@ -2971,9 +2971,9 @@ diff -urNp linux-2.6.32.13/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.13/arch/sh/k | |||
2971 | .show = sq_sysfs_show, | 2971 | .show = sq_sysfs_show, |
2972 | .store = sq_sysfs_store, | 2972 | .store = sq_sysfs_store, |
2973 | }; | 2973 | }; |
2974 | diff -urNp linux-2.6.32.13/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.13/arch/sh/kernel/cpu/shmobile/pm.c | 2974 | diff -urNp linux-2.6.32.15/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.15/arch/sh/kernel/cpu/shmobile/pm.c |
2975 | --- linux-2.6.32.13/arch/sh/kernel/cpu/shmobile/pm.c 2010-03-15 11:52:04.000000000 -0400 | 2975 | --- linux-2.6.32.15/arch/sh/kernel/cpu/shmobile/pm.c 2010-03-15 11:52:04.000000000 -0400 |
2976 | +++ linux-2.6.32.13/arch/sh/kernel/cpu/shmobile/pm.c 2010-05-15 13:21:13.782909212 -0400 | 2976 | +++ linux-2.6.32.15/arch/sh/kernel/cpu/shmobile/pm.c 2010-05-28 21:27:14.871031796 -0400 |
2977 | @@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s | 2977 | @@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s |
2978 | return 0; | 2978 | return 0; |
2979 | } | 2979 | } |
@@ -2983,9 +2983,9 @@ diff -urNp linux-2.6.32.13/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.13/arch | |||
2983 | .enter = sh_pm_enter, | 2983 | .enter = sh_pm_enter, |
2984 | .valid = suspend_valid_only_mem, | 2984 | .valid = suspend_valid_only_mem, |
2985 | }; | 2985 | }; |
2986 | diff -urNp linux-2.6.32.13/arch/sh/kernel/kgdb.c linux-2.6.32.13/arch/sh/kernel/kgdb.c | 2986 | diff -urNp linux-2.6.32.15/arch/sh/kernel/kgdb.c linux-2.6.32.15/arch/sh/kernel/kgdb.c |
2987 | --- linux-2.6.32.13/arch/sh/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 | 2987 | --- linux-2.6.32.15/arch/sh/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 |
2988 | +++ linux-2.6.32.13/arch/sh/kernel/kgdb.c 2010-05-15 13:21:13.782909212 -0400 | 2988 | +++ linux-2.6.32.15/arch/sh/kernel/kgdb.c 2010-05-28 21:27:14.871031796 -0400 |
2989 | @@ -271,7 +271,7 @@ void kgdb_arch_exit(void) | 2989 | @@ -271,7 +271,7 @@ void kgdb_arch_exit(void) |
2990 | { | 2990 | { |
2991 | } | 2991 | } |
@@ -2995,9 +2995,9 @@ diff -urNp linux-2.6.32.13/arch/sh/kernel/kgdb.c linux-2.6.32.13/arch/sh/kernel/ | |||
2995 | /* Breakpoint instruction: trapa #0x3c */ | 2995 | /* Breakpoint instruction: trapa #0x3c */ |
2996 | #ifdef CONFIG_CPU_LITTLE_ENDIAN | 2996 | #ifdef CONFIG_CPU_LITTLE_ENDIAN |
2997 | .gdb_bpt_instr = { 0x3c, 0xc3 }, | 2997 | .gdb_bpt_instr = { 0x3c, 0xc3 }, |
2998 | diff -urNp linux-2.6.32.13/arch/sparc/include/asm/atomic_64.h linux-2.6.32.13/arch/sparc/include/asm/atomic_64.h | 2998 | diff -urNp linux-2.6.32.15/arch/sparc/include/asm/atomic_64.h linux-2.6.32.15/arch/sparc/include/asm/atomic_64.h |
2999 | --- linux-2.6.32.13/arch/sparc/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400 | 2999 | --- linux-2.6.32.15/arch/sparc/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400 |
3000 | +++ linux-2.6.32.13/arch/sparc/include/asm/atomic_64.h 2010-05-15 13:21:13.782909212 -0400 | 3000 | +++ linux-2.6.32.15/arch/sparc/include/asm/atomic_64.h 2010-05-28 21:27:14.871031796 -0400 |
3001 | @@ -14,18 +14,38 @@ | 3001 | @@ -14,18 +14,38 @@ |
3002 | #define ATOMIC64_INIT(i) { (i) } | 3002 | #define ATOMIC64_INIT(i) { (i) } |
3003 | 3003 | ||
@@ -3127,9 +3127,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/atomic_64.h linux-2.6.32.13/ar | |||
3127 | } | 3127 | } |
3128 | 3128 | ||
3129 | #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) | 3129 | #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) |
3130 | diff -urNp linux-2.6.32.13/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.13/arch/sparc/include/asm/dma-mapping.h | 3130 | diff -urNp linux-2.6.32.15/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.15/arch/sparc/include/asm/dma-mapping.h |
3131 | --- linux-2.6.32.13/arch/sparc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 | 3131 | --- linux-2.6.32.15/arch/sparc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 |
3132 | +++ linux-2.6.32.13/arch/sparc/include/asm/dma-mapping.h 2010-05-15 13:21:13.782909212 -0400 | 3132 | +++ linux-2.6.32.15/arch/sparc/include/asm/dma-mapping.h 2010-05-28 21:27:14.871031796 -0400 |
3133 | @@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d | 3133 | @@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d |
3134 | #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) | 3134 | #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) |
3135 | #define dma_is_consistent(d, h) (1) | 3135 | #define dma_is_consistent(d, h) (1) |
@@ -3161,9 +3161,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.13/ | |||
3161 | 3161 | ||
3162 | debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); | 3162 | debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); |
3163 | ops->free_coherent(dev, size, cpu_addr, dma_handle); | 3163 | ops->free_coherent(dev, size, cpu_addr, dma_handle); |
3164 | diff -urNp linux-2.6.32.13/arch/sparc/include/asm/elf_32.h linux-2.6.32.13/arch/sparc/include/asm/elf_32.h | 3164 | diff -urNp linux-2.6.32.15/arch/sparc/include/asm/elf_32.h linux-2.6.32.15/arch/sparc/include/asm/elf_32.h |
3165 | --- linux-2.6.32.13/arch/sparc/include/asm/elf_32.h 2010-03-15 11:52:04.000000000 -0400 | 3165 | --- linux-2.6.32.15/arch/sparc/include/asm/elf_32.h 2010-03-15 11:52:04.000000000 -0400 |
3166 | +++ linux-2.6.32.13/arch/sparc/include/asm/elf_32.h 2010-05-15 13:21:13.782909212 -0400 | 3166 | +++ linux-2.6.32.15/arch/sparc/include/asm/elf_32.h 2010-05-28 21:27:14.871031796 -0400 |
3167 | @@ -116,6 +116,13 @@ typedef struct { | 3167 | @@ -116,6 +116,13 @@ typedef struct { |
3168 | 3168 | ||
3169 | #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) | 3169 | #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) |
@@ -3178,9 +3178,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/elf_32.h linux-2.6.32.13/arch/ | |||
3178 | /* This yields a mask that user programs can use to figure out what | 3178 | /* This yields a mask that user programs can use to figure out what |
3179 | instruction set this cpu supports. This can NOT be done in userspace | 3179 | instruction set this cpu supports. This can NOT be done in userspace |
3180 | on Sparc. */ | 3180 | on Sparc. */ |
3181 | diff -urNp linux-2.6.32.13/arch/sparc/include/asm/elf_64.h linux-2.6.32.13/arch/sparc/include/asm/elf_64.h | 3181 | diff -urNp linux-2.6.32.15/arch/sparc/include/asm/elf_64.h linux-2.6.32.15/arch/sparc/include/asm/elf_64.h |
3182 | --- linux-2.6.32.13/arch/sparc/include/asm/elf_64.h 2010-03-15 11:52:04.000000000 -0400 | 3182 | --- linux-2.6.32.15/arch/sparc/include/asm/elf_64.h 2010-03-15 11:52:04.000000000 -0400 |
3183 | +++ linux-2.6.32.13/arch/sparc/include/asm/elf_64.h 2010-05-15 13:21:13.788083684 -0400 | 3183 | +++ linux-2.6.32.15/arch/sparc/include/asm/elf_64.h 2010-05-28 21:27:14.871031796 -0400 |
3184 | @@ -163,6 +163,12 @@ typedef struct { | 3184 | @@ -163,6 +163,12 @@ typedef struct { |
3185 | #define ELF_ET_DYN_BASE 0x0000010000000000UL | 3185 | #define ELF_ET_DYN_BASE 0x0000010000000000UL |
3186 | #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL | 3186 | #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL |
@@ -3194,9 +3194,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/elf_64.h linux-2.6.32.13/arch/ | |||
3194 | 3194 | ||
3195 | /* This yields a mask that user programs can use to figure out what | 3195 | /* This yields a mask that user programs can use to figure out what |
3196 | instruction set this cpu supports. */ | 3196 | instruction set this cpu supports. */ |
3197 | diff -urNp linux-2.6.32.13/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.13/arch/sparc/include/asm/pgtable_32.h | 3197 | diff -urNp linux-2.6.32.15/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.15/arch/sparc/include/asm/pgtable_32.h |
3198 | --- linux-2.6.32.13/arch/sparc/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400 | 3198 | --- linux-2.6.32.15/arch/sparc/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400 |
3199 | +++ linux-2.6.32.13/arch/sparc/include/asm/pgtable_32.h 2010-05-15 13:21:13.788083684 -0400 | 3199 | +++ linux-2.6.32.15/arch/sparc/include/asm/pgtable_32.h 2010-05-28 21:27:14.871031796 -0400 |
3200 | @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) | 3200 | @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) |
3201 | BTFIXUPDEF_INT(page_none) | 3201 | BTFIXUPDEF_INT(page_none) |
3202 | BTFIXUPDEF_INT(page_copy) | 3202 | BTFIXUPDEF_INT(page_copy) |
@@ -3228,9 +3228,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.13/a | |||
3228 | extern unsigned long page_kernel; | 3228 | extern unsigned long page_kernel; |
3229 | 3229 | ||
3230 | #ifdef MODULE | 3230 | #ifdef MODULE |
3231 | diff -urNp linux-2.6.32.13/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.13/arch/sparc/include/asm/pgtsrmmu.h | 3231 | diff -urNp linux-2.6.32.15/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.15/arch/sparc/include/asm/pgtsrmmu.h |
3232 | --- linux-2.6.32.13/arch/sparc/include/asm/pgtsrmmu.h 2010-03-15 11:52:04.000000000 -0400 | 3232 | --- linux-2.6.32.15/arch/sparc/include/asm/pgtsrmmu.h 2010-03-15 11:52:04.000000000 -0400 |
3233 | +++ linux-2.6.32.13/arch/sparc/include/asm/pgtsrmmu.h 2010-05-15 13:21:13.788083684 -0400 | 3233 | +++ linux-2.6.32.15/arch/sparc/include/asm/pgtsrmmu.h 2010-05-28 21:27:14.871031796 -0400 |
3234 | @@ -115,6 +115,13 @@ | 3234 | @@ -115,6 +115,13 @@ |
3235 | SRMMU_EXEC | SRMMU_REF) | 3235 | SRMMU_EXEC | SRMMU_REF) |
3236 | #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ | 3236 | #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ |
@@ -3245,9 +3245,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.13/arc | |||
3245 | #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ | 3245 | #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ |
3246 | SRMMU_DIRTY | SRMMU_REF) | 3246 | SRMMU_DIRTY | SRMMU_REF) |
3247 | 3247 | ||
3248 | diff -urNp linux-2.6.32.13/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.13/arch/sparc/include/asm/spinlock_64.h | 3248 | diff -urNp linux-2.6.32.15/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.15/arch/sparc/include/asm/spinlock_64.h |
3249 | --- linux-2.6.32.13/arch/sparc/include/asm/spinlock_64.h 2010-03-15 11:52:04.000000000 -0400 | 3249 | --- linux-2.6.32.15/arch/sparc/include/asm/spinlock_64.h 2010-03-15 11:52:04.000000000 -0400 |
3250 | +++ linux-2.6.32.13/arch/sparc/include/asm/spinlock_64.h 2010-05-15 13:21:13.798894063 -0400 | 3250 | +++ linux-2.6.32.15/arch/sparc/include/asm/spinlock_64.h 2010-05-28 21:27:14.871031796 -0400 |
3251 | @@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw | 3251 | @@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw |
3252 | __asm__ __volatile__ ( | 3252 | __asm__ __volatile__ ( |
3253 | "1: ldsw [%2], %0\n" | 3253 | "1: ldsw [%2], %0\n" |
@@ -3299,9 +3299,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.13/ | |||
3299 | " cas [%2], %0, %1\n" | 3299 | " cas [%2], %0, %1\n" |
3300 | " cmp %0, %1\n" | 3300 | " cmp %0, %1\n" |
3301 | " bne,pn %%xcc, 1b\n" | 3301 | " bne,pn %%xcc, 1b\n" |
3302 | diff -urNp linux-2.6.32.13/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.13/arch/sparc/include/asm/uaccess_32.h | 3302 | diff -urNp linux-2.6.32.15/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.15/arch/sparc/include/asm/uaccess_32.h |
3303 | --- linux-2.6.32.13/arch/sparc/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400 | 3303 | --- linux-2.6.32.15/arch/sparc/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400 |
3304 | +++ linux-2.6.32.13/arch/sparc/include/asm/uaccess_32.h 2010-05-15 13:21:13.798894063 -0400 | 3304 | +++ linux-2.6.32.15/arch/sparc/include/asm/uaccess_32.h 2010-05-28 21:27:14.871031796 -0400 |
3305 | @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __ | 3305 | @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __ |
3306 | 3306 | ||
3307 | static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n) | 3307 | static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n) |
@@ -3353,9 +3353,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.13/a | |||
3353 | return __copy_user((__force void __user *) to, from, n); | 3353 | return __copy_user((__force void __user *) to, from, n); |
3354 | } | 3354 | } |
3355 | 3355 | ||
3356 | diff -urNp linux-2.6.32.13/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.13/arch/sparc/include/asm/uaccess_64.h | 3356 | diff -urNp linux-2.6.32.15/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.15/arch/sparc/include/asm/uaccess_64.h |
3357 | --- linux-2.6.32.13/arch/sparc/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400 | 3357 | --- linux-2.6.32.15/arch/sparc/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400 |
3358 | +++ linux-2.6.32.13/arch/sparc/include/asm/uaccess_64.h 2010-05-15 13:21:13.798894063 -0400 | 3358 | +++ linux-2.6.32.15/arch/sparc/include/asm/uaccess_64.h 2010-05-28 21:27:14.871031796 -0400 |
3359 | @@ -9,6 +9,7 @@ | 3359 | @@ -9,6 +9,7 @@ |
3360 | #include <linux/compiler.h> | 3360 | #include <linux/compiler.h> |
3361 | #include <linux/string.h> | 3361 | #include <linux/string.h> |
@@ -3406,9 +3406,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.13/a | |||
3406 | if (unlikely(ret)) | 3406 | if (unlikely(ret)) |
3407 | ret = copy_to_user_fixup(to, from, size); | 3407 | ret = copy_to_user_fixup(to, from, size); |
3408 | return ret; | 3408 | return ret; |
3409 | diff -urNp linux-2.6.32.13/arch/sparc/kernel/iommu.c linux-2.6.32.13/arch/sparc/kernel/iommu.c | 3409 | diff -urNp linux-2.6.32.15/arch/sparc/kernel/iommu.c linux-2.6.32.15/arch/sparc/kernel/iommu.c |
3410 | --- linux-2.6.32.13/arch/sparc/kernel/iommu.c 2010-03-15 11:52:04.000000000 -0400 | 3410 | --- linux-2.6.32.15/arch/sparc/kernel/iommu.c 2010-03-15 11:52:04.000000000 -0400 |
3411 | +++ linux-2.6.32.13/arch/sparc/kernel/iommu.c 2010-05-15 13:21:13.798894063 -0400 | 3411 | +++ linux-2.6.32.15/arch/sparc/kernel/iommu.c 2010-05-28 21:27:14.874960218 -0400 |
3412 | @@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc | 3412 | @@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc |
3413 | spin_unlock_irqrestore(&iommu->lock, flags); | 3413 | spin_unlock_irqrestore(&iommu->lock, flags); |
3414 | } | 3414 | } |
@@ -3427,9 +3427,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/iommu.c linux-2.6.32.13/arch/sparc/ | |||
3427 | EXPORT_SYMBOL(dma_ops); | 3427 | EXPORT_SYMBOL(dma_ops); |
3428 | 3428 | ||
3429 | extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); | 3429 | extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); |
3430 | diff -urNp linux-2.6.32.13/arch/sparc/kernel/ioport.c linux-2.6.32.13/arch/sparc/kernel/ioport.c | 3430 | diff -urNp linux-2.6.32.15/arch/sparc/kernel/ioport.c linux-2.6.32.15/arch/sparc/kernel/ioport.c |
3431 | --- linux-2.6.32.13/arch/sparc/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400 | 3431 | --- linux-2.6.32.15/arch/sparc/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400 |
3432 | +++ linux-2.6.32.13/arch/sparc/kernel/ioport.c 2010-05-15 13:21:13.798894063 -0400 | 3432 | +++ linux-2.6.32.15/arch/sparc/kernel/ioport.c 2010-05-28 21:27:14.874960218 -0400 |
3433 | @@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru | 3433 | @@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru |
3434 | BUG(); | 3434 | BUG(); |
3435 | } | 3435 | } |
@@ -3457,9 +3457,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/ioport.c linux-2.6.32.13/arch/sparc | |||
3457 | .alloc_coherent = pci32_alloc_coherent, | 3457 | .alloc_coherent = pci32_alloc_coherent, |
3458 | .free_coherent = pci32_free_coherent, | 3458 | .free_coherent = pci32_free_coherent, |
3459 | .map_page = pci32_map_page, | 3459 | .map_page = pci32_map_page, |
3460 | diff -urNp linux-2.6.32.13/arch/sparc/kernel/kgdb_32.c linux-2.6.32.13/arch/sparc/kernel/kgdb_32.c | 3460 | diff -urNp linux-2.6.32.15/arch/sparc/kernel/kgdb_32.c linux-2.6.32.15/arch/sparc/kernel/kgdb_32.c |
3461 | --- linux-2.6.32.13/arch/sparc/kernel/kgdb_32.c 2010-03-15 11:52:04.000000000 -0400 | 3461 | --- linux-2.6.32.15/arch/sparc/kernel/kgdb_32.c 2010-03-15 11:52:04.000000000 -0400 |
3462 | +++ linux-2.6.32.13/arch/sparc/kernel/kgdb_32.c 2010-05-15 13:21:13.810880669 -0400 | 3462 | +++ linux-2.6.32.15/arch/sparc/kernel/kgdb_32.c 2010-05-28 21:27:14.874960218 -0400 |
3463 | @@ -158,7 +158,7 @@ void kgdb_arch_exit(void) | 3463 | @@ -158,7 +158,7 @@ void kgdb_arch_exit(void) |
3464 | { | 3464 | { |
3465 | } | 3465 | } |
@@ -3469,9 +3469,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/kgdb_32.c linux-2.6.32.13/arch/spar | |||
3469 | /* Breakpoint instruction: ta 0x7d */ | 3469 | /* Breakpoint instruction: ta 0x7d */ |
3470 | .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, | 3470 | .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, |
3471 | }; | 3471 | }; |
3472 | diff -urNp linux-2.6.32.13/arch/sparc/kernel/kgdb_64.c linux-2.6.32.13/arch/sparc/kernel/kgdb_64.c | 3472 | diff -urNp linux-2.6.32.15/arch/sparc/kernel/kgdb_64.c linux-2.6.32.15/arch/sparc/kernel/kgdb_64.c |
3473 | --- linux-2.6.32.13/arch/sparc/kernel/kgdb_64.c 2010-03-15 11:52:04.000000000 -0400 | 3473 | --- linux-2.6.32.15/arch/sparc/kernel/kgdb_64.c 2010-03-15 11:52:04.000000000 -0400 |
3474 | +++ linux-2.6.32.13/arch/sparc/kernel/kgdb_64.c 2010-05-15 13:21:13.810880669 -0400 | 3474 | +++ linux-2.6.32.15/arch/sparc/kernel/kgdb_64.c 2010-05-28 21:27:14.874960218 -0400 |
3475 | @@ -180,7 +180,7 @@ void kgdb_arch_exit(void) | 3475 | @@ -180,7 +180,7 @@ void kgdb_arch_exit(void) |
3476 | { | 3476 | { |
3477 | } | 3477 | } |
@@ -3481,9 +3481,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/kgdb_64.c linux-2.6.32.13/arch/spar | |||
3481 | /* Breakpoint instruction: ta 0x72 */ | 3481 | /* Breakpoint instruction: ta 0x72 */ |
3482 | .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, | 3482 | .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, |
3483 | }; | 3483 | }; |
3484 | diff -urNp linux-2.6.32.13/arch/sparc/kernel/Makefile linux-2.6.32.13/arch/sparc/kernel/Makefile | 3484 | diff -urNp linux-2.6.32.15/arch/sparc/kernel/Makefile linux-2.6.32.15/arch/sparc/kernel/Makefile |
3485 | --- linux-2.6.32.13/arch/sparc/kernel/Makefile 2010-03-15 11:52:04.000000000 -0400 | 3485 | --- linux-2.6.32.15/arch/sparc/kernel/Makefile 2010-03-15 11:52:04.000000000 -0400 |
3486 | +++ linux-2.6.32.13/arch/sparc/kernel/Makefile 2010-05-15 13:21:13.810880669 -0400 | 3486 | +++ linux-2.6.32.15/arch/sparc/kernel/Makefile 2010-05-28 21:27:14.874960218 -0400 |
3487 | @@ -3,7 +3,7 @@ | 3487 | @@ -3,7 +3,7 @@ |
3488 | # | 3488 | # |
3489 | 3489 | ||
@@ -3493,9 +3493,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/Makefile linux-2.6.32.13/arch/sparc | |||
3493 | 3493 | ||
3494 | extra-y := head_$(BITS).o | 3494 | extra-y := head_$(BITS).o |
3495 | extra-y += init_task.o | 3495 | extra-y += init_task.o |
3496 | diff -urNp linux-2.6.32.13/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.13/arch/sparc/kernel/pci_sun4v.c | 3496 | diff -urNp linux-2.6.32.15/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.15/arch/sparc/kernel/pci_sun4v.c |
3497 | --- linux-2.6.32.13/arch/sparc/kernel/pci_sun4v.c 2010-03-15 11:52:04.000000000 -0400 | 3497 | --- linux-2.6.32.15/arch/sparc/kernel/pci_sun4v.c 2010-03-15 11:52:04.000000000 -0400 |
3498 | +++ linux-2.6.32.13/arch/sparc/kernel/pci_sun4v.c 2010-05-15 13:21:13.810880669 -0400 | 3498 | +++ linux-2.6.32.15/arch/sparc/kernel/pci_sun4v.c 2010-05-28 21:27:14.874960218 -0400 |
3499 | @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic | 3499 | @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic |
3500 | spin_unlock_irqrestore(&iommu->lock, flags); | 3500 | spin_unlock_irqrestore(&iommu->lock, flags); |
3501 | } | 3501 | } |
@@ -3505,9 +3505,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.13/arch/sp | |||
3505 | .alloc_coherent = dma_4v_alloc_coherent, | 3505 | .alloc_coherent = dma_4v_alloc_coherent, |
3506 | .free_coherent = dma_4v_free_coherent, | 3506 | .free_coherent = dma_4v_free_coherent, |
3507 | .map_page = dma_4v_map_page, | 3507 | .map_page = dma_4v_map_page, |
3508 | diff -urNp linux-2.6.32.13/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.13/arch/sparc/kernel/sys_sparc_32.c | 3508 | diff -urNp linux-2.6.32.15/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.15/arch/sparc/kernel/sys_sparc_32.c |
3509 | --- linux-2.6.32.13/arch/sparc/kernel/sys_sparc_32.c 2010-03-15 11:52:04.000000000 -0400 | 3509 | --- linux-2.6.32.15/arch/sparc/kernel/sys_sparc_32.c 2010-03-15 11:52:04.000000000 -0400 |
3510 | +++ linux-2.6.32.13/arch/sparc/kernel/sys_sparc_32.c 2010-05-15 13:21:13.810880669 -0400 | 3510 | +++ linux-2.6.32.15/arch/sparc/kernel/sys_sparc_32.c 2010-05-28 21:27:14.874960218 -0400 |
3511 | @@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str | 3511 | @@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str |
3512 | if (ARCH_SUN4C && len > 0x20000000) | 3512 | if (ARCH_SUN4C && len > 0x20000000) |
3513 | return -ENOMEM; | 3513 | return -ENOMEM; |
@@ -3517,9 +3517,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.13/arch | |||
3517 | 3517 | ||
3518 | if (flags & MAP_SHARED) | 3518 | if (flags & MAP_SHARED) |
3519 | addr = COLOUR_ALIGN(addr); | 3519 | addr = COLOUR_ALIGN(addr); |
3520 | diff -urNp linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c | 3520 | diff -urNp linux-2.6.32.15/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.15/arch/sparc/kernel/sys_sparc_64.c |
3521 | --- linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c 2010-03-15 11:52:04.000000000 -0400 | 3521 | --- linux-2.6.32.15/arch/sparc/kernel/sys_sparc_64.c 2010-03-15 11:52:04.000000000 -0400 |
3522 | +++ linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c 2010-05-15 13:21:13.810880669 -0400 | 3522 | +++ linux-2.6.32.15/arch/sparc/kernel/sys_sparc_64.c 2010-05-28 21:27:14.874960218 -0400 |
3523 | @@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str | 3523 | @@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str |
3524 | /* We do not accept a shared mapping if it would violate | 3524 | /* We do not accept a shared mapping if it would violate |
3525 | * cache aliasing constraints. | 3525 | * cache aliasing constraints. |
@@ -3598,9 +3598,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.13/arch | |||
3598 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; | 3598 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; |
3599 | mm->unmap_area = arch_unmap_area_topdown; | 3599 | mm->unmap_area = arch_unmap_area_topdown; |
3600 | } | 3600 | } |
3601 | diff -urNp linux-2.6.32.13/arch/sparc/kernel/traps_64.c linux-2.6.32.13/arch/sparc/kernel/traps_64.c | 3601 | diff -urNp linux-2.6.32.15/arch/sparc/kernel/traps_64.c linux-2.6.32.15/arch/sparc/kernel/traps_64.c |
3602 | --- linux-2.6.32.13/arch/sparc/kernel/traps_64.c 2010-03-15 11:52:04.000000000 -0400 | 3602 | --- linux-2.6.32.15/arch/sparc/kernel/traps_64.c 2010-03-15 11:52:04.000000000 -0400 |
3603 | +++ linux-2.6.32.13/arch/sparc/kernel/traps_64.c 2010-05-15 13:21:13.836227385 -0400 | 3603 | +++ linux-2.6.32.15/arch/sparc/kernel/traps_64.c 2010-05-28 21:27:14.874960218 -0400 |
3604 | @@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long | 3604 | @@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long |
3605 | 3605 | ||
3606 | lvl -= 0x100; | 3606 | lvl -= 0x100; |
@@ -3632,9 +3632,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/traps_64.c linux-2.6.32.13/arch/spa | |||
3632 | dump_tl1_traplog((struct tl1_traplog *)(regs + 1)); | 3632 | dump_tl1_traplog((struct tl1_traplog *)(regs + 1)); |
3633 | 3633 | ||
3634 | sprintf (buffer, "Bad trap %lx at tl>0", lvl); | 3634 | sprintf (buffer, "Bad trap %lx at tl>0", lvl); |
3635 | diff -urNp linux-2.6.32.13/arch/sparc/lib/atomic_64.S linux-2.6.32.13/arch/sparc/lib/atomic_64.S | 3635 | diff -urNp linux-2.6.32.15/arch/sparc/lib/atomic_64.S linux-2.6.32.15/arch/sparc/lib/atomic_64.S |
3636 | --- linux-2.6.32.13/arch/sparc/lib/atomic_64.S 2010-03-15 11:52:04.000000000 -0400 | 3636 | --- linux-2.6.32.15/arch/sparc/lib/atomic_64.S 2010-03-15 11:52:04.000000000 -0400 |
3637 | +++ linux-2.6.32.13/arch/sparc/lib/atomic_64.S 2010-05-15 13:21:13.836227385 -0400 | 3637 | +++ linux-2.6.32.15/arch/sparc/lib/atomic_64.S 2010-05-28 21:27:14.874960218 -0400 |
3638 | @@ -18,7 +18,12 @@ | 3638 | @@ -18,7 +18,12 @@ |
3639 | atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ | 3639 | atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ |
3640 | BACKOFF_SETUP(%o2) | 3640 | BACKOFF_SETUP(%o2) |
@@ -3828,9 +3828,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/lib/atomic_64.S linux-2.6.32.13/arch/sparc | |||
3828 | casx [%o1], %g1, %g7 | 3828 | casx [%o1], %g1, %g7 |
3829 | cmp %g1, %g7 | 3829 | cmp %g1, %g7 |
3830 | bne,pn %xcc, 2f | 3830 | bne,pn %xcc, 2f |
3831 | diff -urNp linux-2.6.32.13/arch/sparc/lib/ksyms.c linux-2.6.32.13/arch/sparc/lib/ksyms.c | 3831 | diff -urNp linux-2.6.32.15/arch/sparc/lib/ksyms.c linux-2.6.32.15/arch/sparc/lib/ksyms.c |
3832 | --- linux-2.6.32.13/arch/sparc/lib/ksyms.c 2010-03-15 11:52:04.000000000 -0400 | 3832 | --- linux-2.6.32.15/arch/sparc/lib/ksyms.c 2010-03-15 11:52:04.000000000 -0400 |
3833 | +++ linux-2.6.32.13/arch/sparc/lib/ksyms.c 2010-05-15 13:21:13.836227385 -0400 | 3833 | +++ linux-2.6.32.15/arch/sparc/lib/ksyms.c 2010-05-28 21:27:14.874960218 -0400 |
3834 | @@ -144,8 +144,10 @@ EXPORT_SYMBOL(__downgrade_write); | 3834 | @@ -144,8 +144,10 @@ EXPORT_SYMBOL(__downgrade_write); |
3835 | 3835 | ||
3836 | /* Atomic counter implementation. */ | 3836 | /* Atomic counter implementation. */ |
@@ -3842,9 +3842,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/lib/ksyms.c linux-2.6.32.13/arch/sparc/lib | |||
3842 | EXPORT_SYMBOL(atomic_sub_ret); | 3842 | EXPORT_SYMBOL(atomic_sub_ret); |
3843 | EXPORT_SYMBOL(atomic64_add); | 3843 | EXPORT_SYMBOL(atomic64_add); |
3844 | EXPORT_SYMBOL(atomic64_add_ret); | 3844 | EXPORT_SYMBOL(atomic64_add_ret); |
3845 | diff -urNp linux-2.6.32.13/arch/sparc/lib/rwsem_64.S linux-2.6.32.13/arch/sparc/lib/rwsem_64.S | 3845 | diff -urNp linux-2.6.32.15/arch/sparc/lib/rwsem_64.S linux-2.6.32.15/arch/sparc/lib/rwsem_64.S |
3846 | --- linux-2.6.32.13/arch/sparc/lib/rwsem_64.S 2010-03-15 11:52:04.000000000 -0400 | 3846 | --- linux-2.6.32.15/arch/sparc/lib/rwsem_64.S 2010-03-15 11:52:04.000000000 -0400 |
3847 | +++ linux-2.6.32.13/arch/sparc/lib/rwsem_64.S 2010-05-15 13:21:13.836227385 -0400 | 3847 | +++ linux-2.6.32.15/arch/sparc/lib/rwsem_64.S 2010-05-28 21:27:14.874960218 -0400 |
3848 | @@ -11,7 +11,12 @@ | 3848 | @@ -11,7 +11,12 @@ |
3849 | .globl __down_read | 3849 | .globl __down_read |
3850 | __down_read: | 3850 | __down_read: |
@@ -3943,9 +3943,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/lib/rwsem_64.S linux-2.6.32.13/arch/sparc/ | |||
3943 | cas [%o0], %g3, %g7 | 3943 | cas [%o0], %g3, %g7 |
3944 | cmp %g3, %g7 | 3944 | cmp %g3, %g7 |
3945 | bne,pn %icc, 1b | 3945 | bne,pn %icc, 1b |
3946 | diff -urNp linux-2.6.32.13/arch/sparc/Makefile linux-2.6.32.13/arch/sparc/Makefile | 3946 | diff -urNp linux-2.6.32.15/arch/sparc/Makefile linux-2.6.32.15/arch/sparc/Makefile |
3947 | --- linux-2.6.32.13/arch/sparc/Makefile 2010-03-15 11:52:04.000000000 -0400 | 3947 | --- linux-2.6.32.15/arch/sparc/Makefile 2010-03-15 11:52:04.000000000 -0400 |
3948 | +++ linux-2.6.32.13/arch/sparc/Makefile 2010-05-15 13:21:13.836227385 -0400 | 3948 | +++ linux-2.6.32.15/arch/sparc/Makefile 2010-05-28 21:27:14.874960218 -0400 |
3949 | @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc | 3949 | @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc |
3950 | # Export what is needed by arch/sparc/boot/Makefile | 3950 | # Export what is needed by arch/sparc/boot/Makefile |
3951 | export VMLINUX_INIT VMLINUX_MAIN | 3951 | export VMLINUX_INIT VMLINUX_MAIN |
@@ -3955,9 +3955,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/Makefile linux-2.6.32.13/arch/sparc/Makefi | |||
3955 | VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) | 3955 | VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) |
3956 | VMLINUX_MAIN += $(drivers-y) $(net-y) | 3956 | VMLINUX_MAIN += $(drivers-y) $(net-y) |
3957 | 3957 | ||
3958 | diff -urNp linux-2.6.32.13/arch/sparc/mm/fault_32.c linux-2.6.32.13/arch/sparc/mm/fault_32.c | 3958 | diff -urNp linux-2.6.32.15/arch/sparc/mm/fault_32.c linux-2.6.32.15/arch/sparc/mm/fault_32.c |
3959 | --- linux-2.6.32.13/arch/sparc/mm/fault_32.c 2010-03-15 11:52:04.000000000 -0400 | 3959 | --- linux-2.6.32.15/arch/sparc/mm/fault_32.c 2010-03-15 11:52:04.000000000 -0400 |
3960 | +++ linux-2.6.32.13/arch/sparc/mm/fault_32.c 2010-05-15 13:21:13.836227385 -0400 | 3960 | +++ linux-2.6.32.15/arch/sparc/mm/fault_32.c 2010-05-28 21:27:14.874960218 -0400 |
3961 | @@ -21,6 +21,9 @@ | 3961 | @@ -21,6 +21,9 @@ |
3962 | #include <linux/interrupt.h> | 3962 | #include <linux/interrupt.h> |
3963 | #include <linux/module.h> | 3963 | #include <linux/module.h> |
@@ -4261,9 +4261,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/mm/fault_32.c linux-2.6.32.13/arch/sparc/m | |||
4261 | /* Allow reads even for write-only mappings */ | 4261 | /* Allow reads even for write-only mappings */ |
4262 | if(!(vma->vm_flags & (VM_READ | VM_EXEC))) | 4262 | if(!(vma->vm_flags & (VM_READ | VM_EXEC))) |
4263 | goto bad_area; | 4263 | goto bad_area; |
4264 | diff -urNp linux-2.6.32.13/arch/sparc/mm/fault_64.c linux-2.6.32.13/arch/sparc/mm/fault_64.c | 4264 | diff -urNp linux-2.6.32.15/arch/sparc/mm/fault_64.c linux-2.6.32.15/arch/sparc/mm/fault_64.c |
4265 | --- linux-2.6.32.13/arch/sparc/mm/fault_64.c 2010-03-15 11:52:04.000000000 -0400 | 4265 | --- linux-2.6.32.15/arch/sparc/mm/fault_64.c 2010-03-15 11:52:04.000000000 -0400 |
4266 | +++ linux-2.6.32.13/arch/sparc/mm/fault_64.c 2010-05-15 13:21:13.842890995 -0400 | 4266 | +++ linux-2.6.32.15/arch/sparc/mm/fault_64.c 2010-05-28 21:27:14.878908357 -0400 |
4267 | @@ -20,6 +20,9 @@ | 4267 | @@ -20,6 +20,9 @@ |
4268 | #include <linux/kprobes.h> | 4268 | #include <linux/kprobes.h> |
4269 | #include <linux/kdebug.h> | 4269 | #include <linux/kdebug.h> |
@@ -4761,9 +4761,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/mm/fault_64.c linux-2.6.32.13/arch/sparc/m | |||
4761 | /* Pure DTLB misses do not tell us whether the fault causing | 4761 | /* Pure DTLB misses do not tell us whether the fault causing |
4762 | * load/store/atomic was a write or not, it only says that there | 4762 | * load/store/atomic was a write or not, it only says that there |
4763 | * was no match. So in such a case we (carefully) read the | 4763 | * was no match. So in such a case we (carefully) read the |
4764 | diff -urNp linux-2.6.32.13/arch/sparc/mm/init_32.c linux-2.6.32.13/arch/sparc/mm/init_32.c | 4764 | diff -urNp linux-2.6.32.15/arch/sparc/mm/init_32.c linux-2.6.32.15/arch/sparc/mm/init_32.c |
4765 | --- linux-2.6.32.13/arch/sparc/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400 | 4765 | --- linux-2.6.32.15/arch/sparc/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400 |
4766 | +++ linux-2.6.32.13/arch/sparc/mm/init_32.c 2010-05-15 13:21:13.842890995 -0400 | 4766 | +++ linux-2.6.32.15/arch/sparc/mm/init_32.c 2010-05-28 21:27:14.878908357 -0400 |
4767 | @@ -317,6 +317,9 @@ extern void device_scan(void); | 4767 | @@ -317,6 +317,9 @@ extern void device_scan(void); |
4768 | pgprot_t PAGE_SHARED __read_mostly; | 4768 | pgprot_t PAGE_SHARED __read_mostly; |
4769 | EXPORT_SYMBOL(PAGE_SHARED); | 4769 | EXPORT_SYMBOL(PAGE_SHARED); |
@@ -4798,9 +4798,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/mm/init_32.c linux-2.6.32.13/arch/sparc/mm | |||
4798 | protection_map[12] = PAGE_READONLY; | 4798 | protection_map[12] = PAGE_READONLY; |
4799 | protection_map[13] = PAGE_READONLY; | 4799 | protection_map[13] = PAGE_READONLY; |
4800 | protection_map[14] = PAGE_SHARED; | 4800 | protection_map[14] = PAGE_SHARED; |
4801 | diff -urNp linux-2.6.32.13/arch/sparc/mm/Makefile linux-2.6.32.13/arch/sparc/mm/Makefile | 4801 | diff -urNp linux-2.6.32.15/arch/sparc/mm/Makefile linux-2.6.32.15/arch/sparc/mm/Makefile |
4802 | --- linux-2.6.32.13/arch/sparc/mm/Makefile 2010-03-15 11:52:04.000000000 -0400 | 4802 | --- linux-2.6.32.15/arch/sparc/mm/Makefile 2010-03-15 11:52:04.000000000 -0400 |
4803 | +++ linux-2.6.32.13/arch/sparc/mm/Makefile 2010-05-15 13:21:13.842890995 -0400 | 4803 | +++ linux-2.6.32.15/arch/sparc/mm/Makefile 2010-05-28 21:27:14.878908357 -0400 |
4804 | @@ -2,7 +2,7 @@ | 4804 | @@ -2,7 +2,7 @@ |
4805 | # | 4805 | # |
4806 | 4806 | ||
@@ -4810,9 +4810,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/mm/Makefile linux-2.6.32.13/arch/sparc/mm/ | |||
4810 | 4810 | ||
4811 | obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o | 4811 | obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o |
4812 | obj-y += fault_$(BITS).o | 4812 | obj-y += fault_$(BITS).o |
4813 | diff -urNp linux-2.6.32.13/arch/sparc/mm/srmmu.c linux-2.6.32.13/arch/sparc/mm/srmmu.c | 4813 | diff -urNp linux-2.6.32.15/arch/sparc/mm/srmmu.c linux-2.6.32.15/arch/sparc/mm/srmmu.c |
4814 | --- linux-2.6.32.13/arch/sparc/mm/srmmu.c 2010-03-15 11:52:04.000000000 -0400 | 4814 | --- linux-2.6.32.15/arch/sparc/mm/srmmu.c 2010-03-15 11:52:04.000000000 -0400 |
4815 | +++ linux-2.6.32.13/arch/sparc/mm/srmmu.c 2010-05-15 13:21:13.854885513 -0400 | 4815 | +++ linux-2.6.32.15/arch/sparc/mm/srmmu.c 2010-05-28 21:27:14.878908357 -0400 |
4816 | @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void) | 4816 | @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void) |
4817 | PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); | 4817 | PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); |
4818 | BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); | 4818 | BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); |
@@ -4827,9 +4827,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/mm/srmmu.c linux-2.6.32.13/arch/sparc/mm/s | |||
4827 | BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); | 4827 | BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); |
4828 | page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); | 4828 | page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); |
4829 | 4829 | ||
4830 | diff -urNp linux-2.6.32.13/arch/um/include/asm/kmap_types.h linux-2.6.32.13/arch/um/include/asm/kmap_types.h | 4830 | diff -urNp linux-2.6.32.15/arch/um/include/asm/kmap_types.h linux-2.6.32.15/arch/um/include/asm/kmap_types.h |
4831 | --- linux-2.6.32.13/arch/um/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 | 4831 | --- linux-2.6.32.15/arch/um/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 |
4832 | +++ linux-2.6.32.13/arch/um/include/asm/kmap_types.h 2010-05-15 13:21:13.854885513 -0400 | 4832 | +++ linux-2.6.32.15/arch/um/include/asm/kmap_types.h 2010-05-28 21:27:14.883145356 -0400 |
4833 | @@ -23,6 +23,7 @@ enum km_type { | 4833 | @@ -23,6 +23,7 @@ enum km_type { |
4834 | KM_IRQ1, | 4834 | KM_IRQ1, |
4835 | KM_SOFTIRQ0, | 4835 | KM_SOFTIRQ0, |
@@ -4838,9 +4838,9 @@ diff -urNp linux-2.6.32.13/arch/um/include/asm/kmap_types.h linux-2.6.32.13/arch | |||
4838 | KM_TYPE_NR | 4838 | KM_TYPE_NR |
4839 | }; | 4839 | }; |
4840 | 4840 | ||
4841 | diff -urNp linux-2.6.32.13/arch/um/include/asm/page.h linux-2.6.32.13/arch/um/include/asm/page.h | 4841 | diff -urNp linux-2.6.32.15/arch/um/include/asm/page.h linux-2.6.32.15/arch/um/include/asm/page.h |
4842 | --- linux-2.6.32.13/arch/um/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 | 4842 | --- linux-2.6.32.15/arch/um/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 |
4843 | +++ linux-2.6.32.13/arch/um/include/asm/page.h 2010-05-15 13:21:13.854885513 -0400 | 4843 | +++ linux-2.6.32.15/arch/um/include/asm/page.h 2010-05-28 21:27:14.883145356 -0400 |
4844 | @@ -14,6 +14,9 @@ | 4844 | @@ -14,6 +14,9 @@ |
4845 | #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) | 4845 | #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) |
4846 | #define PAGE_MASK (~(PAGE_SIZE-1)) | 4846 | #define PAGE_MASK (~(PAGE_SIZE-1)) |
@@ -4851,9 +4851,9 @@ diff -urNp linux-2.6.32.13/arch/um/include/asm/page.h linux-2.6.32.13/arch/um/in | |||
4851 | #ifndef __ASSEMBLY__ | 4851 | #ifndef __ASSEMBLY__ |
4852 | 4852 | ||
4853 | struct page; | 4853 | struct page; |
4854 | diff -urNp linux-2.6.32.13/arch/um/sys-i386/syscalls.c linux-2.6.32.13/arch/um/sys-i386/syscalls.c | 4854 | diff -urNp linux-2.6.32.15/arch/um/sys-i386/syscalls.c linux-2.6.32.15/arch/um/sys-i386/syscalls.c |
4855 | --- linux-2.6.32.13/arch/um/sys-i386/syscalls.c 2010-03-15 11:52:04.000000000 -0400 | 4855 | --- linux-2.6.32.15/arch/um/sys-i386/syscalls.c 2010-03-15 11:52:04.000000000 -0400 |
4856 | +++ linux-2.6.32.13/arch/um/sys-i386/syscalls.c 2010-05-15 13:21:13.862896966 -0400 | 4856 | +++ linux-2.6.32.15/arch/um/sys-i386/syscalls.c 2010-05-28 21:27:14.883145356 -0400 |
4857 | @@ -11,6 +11,21 @@ | 4857 | @@ -11,6 +11,21 @@ |
4858 | #include "asm/uaccess.h" | 4858 | #include "asm/uaccess.h" |
4859 | #include "asm/unistd.h" | 4859 | #include "asm/unistd.h" |
@@ -4876,9 +4876,9 @@ diff -urNp linux-2.6.32.13/arch/um/sys-i386/syscalls.c linux-2.6.32.13/arch/um/s | |||
4876 | /* | 4876 | /* |
4877 | * Perform the select(nd, in, out, ex, tv) and mmap() system | 4877 | * Perform the select(nd, in, out, ex, tv) and mmap() system |
4878 | * calls. Linux/i386 didn't use to be able to handle more than | 4878 | * calls. Linux/i386 didn't use to be able to handle more than |
4879 | diff -urNp linux-2.6.32.13/arch/x86/boot/bitops.h linux-2.6.32.13/arch/x86/boot/bitops.h | 4879 | diff -urNp linux-2.6.32.15/arch/x86/boot/bitops.h linux-2.6.32.15/arch/x86/boot/bitops.h |
4880 | --- linux-2.6.32.13/arch/x86/boot/bitops.h 2010-03-15 11:52:04.000000000 -0400 | 4880 | --- linux-2.6.32.15/arch/x86/boot/bitops.h 2010-03-15 11:52:04.000000000 -0400 |
4881 | +++ linux-2.6.32.13/arch/x86/boot/bitops.h 2010-05-15 13:21:13.862896966 -0400 | 4881 | +++ linux-2.6.32.15/arch/x86/boot/bitops.h 2010-05-28 21:27:14.891136655 -0400 |
4882 | @@ -26,7 +26,7 @@ static inline int variable_test_bit(int | 4882 | @@ -26,7 +26,7 @@ static inline int variable_test_bit(int |
4883 | u8 v; | 4883 | u8 v; |
4884 | const u32 *p = (const u32 *)addr; | 4884 | const u32 *p = (const u32 *)addr; |
@@ -4897,9 +4897,9 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/bitops.h linux-2.6.32.13/arch/x86/boot/ | |||
4897 | } | 4897 | } |
4898 | 4898 | ||
4899 | #endif /* BOOT_BITOPS_H */ | 4899 | #endif /* BOOT_BITOPS_H */ |
4900 | diff -urNp linux-2.6.32.13/arch/x86/boot/boot.h linux-2.6.32.13/arch/x86/boot/boot.h | 4900 | diff -urNp linux-2.6.32.15/arch/x86/boot/boot.h linux-2.6.32.15/arch/x86/boot/boot.h |
4901 | --- linux-2.6.32.13/arch/x86/boot/boot.h 2010-03-15 11:52:04.000000000 -0400 | 4901 | --- linux-2.6.32.15/arch/x86/boot/boot.h 2010-03-15 11:52:04.000000000 -0400 |
4902 | +++ linux-2.6.32.13/arch/x86/boot/boot.h 2010-05-15 13:21:13.862896966 -0400 | 4902 | +++ linux-2.6.32.15/arch/x86/boot/boot.h 2010-05-28 21:27:14.891136655 -0400 |
4903 | @@ -82,7 +82,7 @@ static inline void io_delay(void) | 4903 | @@ -82,7 +82,7 @@ static inline void io_delay(void) |
4904 | static inline u16 ds(void) | 4904 | static inline u16 ds(void) |
4905 | { | 4905 | { |
@@ -4918,9 +4918,9 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/boot.h linux-2.6.32.13/arch/x86/boot/bo | |||
4918 | : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); | 4918 | : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); |
4919 | return diff; | 4919 | return diff; |
4920 | } | 4920 | } |
4921 | diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/head_32.S linux-2.6.32.13/arch/x86/boot/compressed/head_32.S | 4921 | diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/head_32.S linux-2.6.32.15/arch/x86/boot/compressed/head_32.S |
4922 | --- linux-2.6.32.13/arch/x86/boot/compressed/head_32.S 2010-03-15 11:52:04.000000000 -0400 | 4922 | --- linux-2.6.32.15/arch/x86/boot/compressed/head_32.S 2010-03-15 11:52:04.000000000 -0400 |
4923 | +++ linux-2.6.32.13/arch/x86/boot/compressed/head_32.S 2010-05-15 13:21:13.862896966 -0400 | 4923 | +++ linux-2.6.32.15/arch/x86/boot/compressed/head_32.S 2010-05-28 21:27:14.891136655 -0400 |
4924 | @@ -76,7 +76,7 @@ ENTRY(startup_32) | 4924 | @@ -76,7 +76,7 @@ ENTRY(startup_32) |
4925 | notl %eax | 4925 | notl %eax |
4926 | andl %eax, %ebx | 4926 | andl %eax, %ebx |
@@ -4949,9 +4949,9 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/head_32.S linux-2.6.32.13/ar | |||
4949 | addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) | 4949 | addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) |
4950 | jmp 1b | 4950 | jmp 1b |
4951 | 2: | 4951 | 2: |
4952 | diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/head_64.S linux-2.6.32.13/arch/x86/boot/compressed/head_64.S | 4952 | diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/head_64.S linux-2.6.32.15/arch/x86/boot/compressed/head_64.S |
4953 | --- linux-2.6.32.13/arch/x86/boot/compressed/head_64.S 2010-03-15 11:52:04.000000000 -0400 | 4953 | --- linux-2.6.32.15/arch/x86/boot/compressed/head_64.S 2010-03-15 11:52:04.000000000 -0400 |
4954 | +++ linux-2.6.32.13/arch/x86/boot/compressed/head_64.S 2010-05-15 13:21:13.862896966 -0400 | 4954 | +++ linux-2.6.32.15/arch/x86/boot/compressed/head_64.S 2010-05-28 21:27:14.891136655 -0400 |
4955 | @@ -91,7 +91,7 @@ ENTRY(startup_32) | 4955 | @@ -91,7 +91,7 @@ ENTRY(startup_32) |
4956 | notl %eax | 4956 | notl %eax |
4957 | andl %eax, %ebx | 4957 | andl %eax, %ebx |
@@ -4970,9 +4970,9 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/head_64.S linux-2.6.32.13/ar | |||
4970 | #endif | 4970 | #endif |
4971 | 4971 | ||
4972 | /* Target address to relocate to for decompression */ | 4972 | /* Target address to relocate to for decompression */ |
4973 | diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/misc.c linux-2.6.32.13/arch/x86/boot/compressed/misc.c | 4973 | diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/misc.c linux-2.6.32.15/arch/x86/boot/compressed/misc.c |
4974 | --- linux-2.6.32.13/arch/x86/boot/compressed/misc.c 2010-03-15 11:52:04.000000000 -0400 | 4974 | --- linux-2.6.32.15/arch/x86/boot/compressed/misc.c 2010-03-15 11:52:04.000000000 -0400 |
4975 | +++ linux-2.6.32.13/arch/x86/boot/compressed/misc.c 2010-05-15 13:21:13.866567010 -0400 | 4975 | +++ linux-2.6.32.15/arch/x86/boot/compressed/misc.c 2010-05-28 21:27:14.895019280 -0400 |
4976 | @@ -288,7 +288,7 @@ static void parse_elf(void *output) | 4976 | @@ -288,7 +288,7 @@ static void parse_elf(void *output) |
4977 | case PT_LOAD: | 4977 | case PT_LOAD: |
4978 | #ifdef CONFIG_RELOCATABLE | 4978 | #ifdef CONFIG_RELOCATABLE |
@@ -4991,9 +4991,9 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/misc.c linux-2.6.32.13/arch/ | |||
4991 | error("Wrong destination address"); | 4991 | error("Wrong destination address"); |
4992 | #endif | 4992 | #endif |
4993 | 4993 | ||
4994 | diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.13/arch/x86/boot/compressed/mkpiggy.c | 4994 | diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.15/arch/x86/boot/compressed/mkpiggy.c |
4995 | --- linux-2.6.32.13/arch/x86/boot/compressed/mkpiggy.c 2010-03-15 11:52:04.000000000 -0400 | 4995 | --- linux-2.6.32.15/arch/x86/boot/compressed/mkpiggy.c 2010-03-15 11:52:04.000000000 -0400 |
4996 | +++ linux-2.6.32.13/arch/x86/boot/compressed/mkpiggy.c 2010-05-15 13:21:13.866567010 -0400 | 4996 | +++ linux-2.6.32.15/arch/x86/boot/compressed/mkpiggy.c 2010-05-28 21:27:14.895019280 -0400 |
4997 | @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) | 4997 | @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) |
4998 | 4998 | ||
4999 | offs = (olen > ilen) ? olen - ilen : 0; | 4999 | offs = (olen > ilen) ? olen - ilen : 0; |
@@ -5003,9 +5003,9 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.13/ar | |||
5003 | offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ | 5003 | offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ |
5004 | 5004 | ||
5005 | printf(".section \".rodata.compressed\",\"a\",@progbits\n"); | 5005 | printf(".section \".rodata.compressed\",\"a\",@progbits\n"); |
5006 | diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/relocs.c linux-2.6.32.13/arch/x86/boot/compressed/relocs.c | 5006 | diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/relocs.c linux-2.6.32.15/arch/x86/boot/compressed/relocs.c |
5007 | --- linux-2.6.32.13/arch/x86/boot/compressed/relocs.c 2010-03-15 11:52:04.000000000 -0400 | 5007 | --- linux-2.6.32.15/arch/x86/boot/compressed/relocs.c 2010-03-15 11:52:04.000000000 -0400 |
5008 | +++ linux-2.6.32.13/arch/x86/boot/compressed/relocs.c 2010-05-15 13:21:13.866567010 -0400 | 5008 | +++ linux-2.6.32.15/arch/x86/boot/compressed/relocs.c 2010-05-28 21:27:14.895019280 -0400 |
5009 | @@ -10,8 +10,11 @@ | 5009 | @@ -10,8 +10,11 @@ |
5010 | #define USE_BSD | 5010 | #define USE_BSD |
5011 | #include <endian.h> | 5011 | #include <endian.h> |
@@ -5206,9 +5206,9 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/relocs.c linux-2.6.32.13/arc | |||
5206 | read_shdrs(fp); | 5206 | read_shdrs(fp); |
5207 | read_strtabs(fp); | 5207 | read_strtabs(fp); |
5208 | read_symtabs(fp); | 5208 | read_symtabs(fp); |
5209 | diff -urNp linux-2.6.32.13/arch/x86/boot/cpucheck.c linux-2.6.32.13/arch/x86/boot/cpucheck.c | 5209 | diff -urNp linux-2.6.32.15/arch/x86/boot/cpucheck.c linux-2.6.32.15/arch/x86/boot/cpucheck.c |
5210 | --- linux-2.6.32.13/arch/x86/boot/cpucheck.c 2010-03-15 11:52:04.000000000 -0400 | 5210 | --- linux-2.6.32.15/arch/x86/boot/cpucheck.c 2010-03-15 11:52:04.000000000 -0400 |
5211 | +++ linux-2.6.32.13/arch/x86/boot/cpucheck.c 2010-05-15 13:21:13.878594921 -0400 | 5211 | +++ linux-2.6.32.15/arch/x86/boot/cpucheck.c 2010-05-28 21:27:14.895019280 -0400 |
5212 | @@ -74,7 +74,7 @@ static int has_fpu(void) | 5212 | @@ -74,7 +74,7 @@ static int has_fpu(void) |
5213 | u16 fcw = -1, fsw = -1; | 5213 | u16 fcw = -1, fsw = -1; |
5214 | u32 cr0; | 5214 | u32 cr0; |
@@ -5304,9 +5304,9 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/cpucheck.c linux-2.6.32.13/arch/x86/boo | |||
5304 | 5304 | ||
5305 | err = check_flags(); | 5305 | err = check_flags(); |
5306 | } | 5306 | } |
5307 | diff -urNp linux-2.6.32.13/arch/x86/boot/header.S linux-2.6.32.13/arch/x86/boot/header.S | 5307 | diff -urNp linux-2.6.32.15/arch/x86/boot/header.S linux-2.6.32.15/arch/x86/boot/header.S |
5308 | --- linux-2.6.32.13/arch/x86/boot/header.S 2010-03-15 11:52:04.000000000 -0400 | 5308 | --- linux-2.6.32.15/arch/x86/boot/header.S 2010-03-15 11:52:04.000000000 -0400 |
5309 | +++ linux-2.6.32.13/arch/x86/boot/header.S 2010-05-15 13:21:13.878594921 -0400 | 5309 | +++ linux-2.6.32.15/arch/x86/boot/header.S 2010-05-28 21:27:14.895019280 -0400 |
5310 | @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical | 5310 | @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical |
5311 | # single linked list of | 5311 | # single linked list of |
5312 | # struct setup_data | 5312 | # struct setup_data |
@@ -5316,9 +5316,9 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/header.S linux-2.6.32.13/arch/x86/boot/ | |||
5316 | 5316 | ||
5317 | #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) | 5317 | #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) |
5318 | #define VO_INIT_SIZE (VO__end - VO__text) | 5318 | #define VO_INIT_SIZE (VO__end - VO__text) |
5319 | diff -urNp linux-2.6.32.13/arch/x86/boot/memory.c linux-2.6.32.13/arch/x86/boot/memory.c | 5319 | diff -urNp linux-2.6.32.15/arch/x86/boot/memory.c linux-2.6.32.15/arch/x86/boot/memory.c |
5320 | --- linux-2.6.32.13/arch/x86/boot/memory.c 2010-03-15 11:52:04.000000000 -0400 | 5320 | --- linux-2.6.32.15/arch/x86/boot/memory.c 2010-03-15 11:52:04.000000000 -0400 |
5321 | +++ linux-2.6.32.13/arch/x86/boot/memory.c 2010-05-15 13:21:13.878594921 -0400 | 5321 | +++ linux-2.6.32.15/arch/x86/boot/memory.c 2010-05-28 21:27:14.895019280 -0400 |
5322 | @@ -19,7 +19,7 @@ | 5322 | @@ -19,7 +19,7 @@ |
5323 | 5323 | ||
5324 | static int detect_memory_e820(void) | 5324 | static int detect_memory_e820(void) |
@@ -5328,9 +5328,9 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/memory.c linux-2.6.32.13/arch/x86/boot/ | |||
5328 | struct biosregs ireg, oreg; | 5328 | struct biosregs ireg, oreg; |
5329 | struct e820entry *desc = boot_params.e820_map; | 5329 | struct e820entry *desc = boot_params.e820_map; |
5330 | static struct e820entry buf; /* static so it is zeroed */ | 5330 | static struct e820entry buf; /* static so it is zeroed */ |
5331 | diff -urNp linux-2.6.32.13/arch/x86/boot/video.c linux-2.6.32.13/arch/x86/boot/video.c | 5331 | diff -urNp linux-2.6.32.15/arch/x86/boot/video.c linux-2.6.32.15/arch/x86/boot/video.c |
5332 | --- linux-2.6.32.13/arch/x86/boot/video.c 2010-03-15 11:52:04.000000000 -0400 | 5332 | --- linux-2.6.32.15/arch/x86/boot/video.c 2010-03-15 11:52:04.000000000 -0400 |
5333 | +++ linux-2.6.32.13/arch/x86/boot/video.c 2010-05-15 13:21:13.878594921 -0400 | 5333 | +++ linux-2.6.32.15/arch/x86/boot/video.c 2010-05-28 21:27:14.895019280 -0400 |
5334 | @@ -90,7 +90,7 @@ static void store_mode_params(void) | 5334 | @@ -90,7 +90,7 @@ static void store_mode_params(void) |
5335 | static unsigned int get_entry(void) | 5335 | static unsigned int get_entry(void) |
5336 | { | 5336 | { |
@@ -5340,9 +5340,9 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/video.c linux-2.6.32.13/arch/x86/boot/v | |||
5340 | int key; | 5340 | int key; |
5341 | unsigned int v; | 5341 | unsigned int v; |
5342 | 5342 | ||
5343 | diff -urNp linux-2.6.32.13/arch/x86/boot/video-vesa.c linux-2.6.32.13/arch/x86/boot/video-vesa.c | 5343 | diff -urNp linux-2.6.32.15/arch/x86/boot/video-vesa.c linux-2.6.32.15/arch/x86/boot/video-vesa.c |
5344 | --- linux-2.6.32.13/arch/x86/boot/video-vesa.c 2010-03-15 11:52:04.000000000 -0400 | 5344 | --- linux-2.6.32.15/arch/x86/boot/video-vesa.c 2010-03-15 11:52:04.000000000 -0400 |
5345 | +++ linux-2.6.32.13/arch/x86/boot/video-vesa.c 2010-05-15 13:21:13.878594921 -0400 | 5345 | +++ linux-2.6.32.15/arch/x86/boot/video-vesa.c 2010-05-28 21:27:14.895019280 -0400 |
5346 | @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) | 5346 | @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) |
5347 | 5347 | ||
5348 | boot_params.screen_info.vesapm_seg = oreg.es; | 5348 | boot_params.screen_info.vesapm_seg = oreg.es; |
@@ -5351,9 +5351,9 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/video-vesa.c linux-2.6.32.13/arch/x86/b | |||
5351 | } | 5351 | } |
5352 | 5352 | ||
5353 | /* | 5353 | /* |
5354 | diff -urNp linux-2.6.32.13/arch/x86/ia32/ia32entry.S linux-2.6.32.13/arch/x86/ia32/ia32entry.S | 5354 | diff -urNp linux-2.6.32.15/arch/x86/ia32/ia32entry.S linux-2.6.32.15/arch/x86/ia32/ia32entry.S |
5355 | --- linux-2.6.32.13/arch/x86/ia32/ia32entry.S 2010-03-15 11:52:04.000000000 -0400 | 5355 | --- linux-2.6.32.15/arch/x86/ia32/ia32entry.S 2010-03-15 11:52:04.000000000 -0400 |
5356 | +++ linux-2.6.32.13/arch/x86/ia32/ia32entry.S 2010-05-15 13:21:13.878594921 -0400 | 5356 | +++ linux-2.6.32.15/arch/x86/ia32/ia32entry.S 2010-05-28 21:27:14.895019280 -0400 |
5357 | @@ -13,6 +13,7 @@ | 5357 | @@ -13,6 +13,7 @@ |
5358 | #include <asm/thread_info.h> | 5358 | #include <asm/thread_info.h> |
5359 | #include <asm/segment.h> | 5359 | #include <asm/segment.h> |
@@ -5448,9 +5448,9 @@ diff -urNp linux-2.6.32.13/arch/x86/ia32/ia32entry.S linux-2.6.32.13/arch/x86/ia | |||
5448 | /* | 5448 | /* |
5449 | * No need to follow this irqs on/off section: the syscall | 5449 | * No need to follow this irqs on/off section: the syscall |
5450 | * disabled irqs and here we enable it straight after entry: | 5450 | * disabled irqs and here we enable it straight after entry: |
5451 | diff -urNp linux-2.6.32.13/arch/x86/ia32/ia32_signal.c linux-2.6.32.13/arch/x86/ia32/ia32_signal.c | 5451 | diff -urNp linux-2.6.32.15/arch/x86/ia32/ia32_signal.c linux-2.6.32.15/arch/x86/ia32/ia32_signal.c |
5452 | --- linux-2.6.32.13/arch/x86/ia32/ia32_signal.c 2010-03-15 11:52:04.000000000 -0400 | 5452 | --- linux-2.6.32.15/arch/x86/ia32/ia32_signal.c 2010-03-15 11:52:04.000000000 -0400 |
5453 | +++ linux-2.6.32.13/arch/x86/ia32/ia32_signal.c 2010-05-15 13:21:13.878594921 -0400 | 5453 | +++ linux-2.6.32.15/arch/x86/ia32/ia32_signal.c 2010-05-28 21:27:14.895019280 -0400 |
5454 | @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct | 5454 | @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct |
5455 | sp -= frame_size; | 5455 | sp -= frame_size; |
5456 | /* Align the stack pointer according to the i386 ABI, | 5456 | /* Align the stack pointer according to the i386 ABI, |
@@ -5469,9 +5469,9 @@ diff -urNp linux-2.6.32.13/arch/x86/ia32/ia32_signal.c linux-2.6.32.13/arch/x86/ | |||
5469 | }; | 5469 | }; |
5470 | 5470 | ||
5471 | frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); | 5471 | frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); |
5472 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/alternative.h linux-2.6.32.13/arch/x86/include/asm/alternative.h | 5472 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/alternative.h linux-2.6.32.15/arch/x86/include/asm/alternative.h |
5473 | --- linux-2.6.32.13/arch/x86/include/asm/alternative.h 2010-03-15 11:52:04.000000000 -0400 | 5473 | --- linux-2.6.32.15/arch/x86/include/asm/alternative.h 2010-03-15 11:52:04.000000000 -0400 |
5474 | +++ linux-2.6.32.13/arch/x86/include/asm/alternative.h 2010-05-15 13:21:13.878594921 -0400 | 5474 | +++ linux-2.6.32.15/arch/x86/include/asm/alternative.h 2010-05-28 21:27:14.895019280 -0400 |
5475 | @@ -85,7 +85,7 @@ static inline void alternatives_smp_swit | 5475 | @@ -85,7 +85,7 @@ static inline void alternatives_smp_swit |
5476 | " .byte 662b-661b\n" /* sourcelen */ \ | 5476 | " .byte 662b-661b\n" /* sourcelen */ \ |
5477 | " .byte 664f-663f\n" /* replacementlen */ \ | 5477 | " .byte 664f-663f\n" /* replacementlen */ \ |
@@ -5481,9 +5481,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/alternative.h linux-2.6.32.13/ar | |||
5481 | "663:\n\t" newinstr "\n664:\n" /* replacement */ \ | 5481 | "663:\n\t" newinstr "\n664:\n" /* replacement */ \ |
5482 | ".previous" | 5482 | ".previous" |
5483 | 5483 | ||
5484 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/apm.h linux-2.6.32.13/arch/x86/include/asm/apm.h | 5484 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/apm.h linux-2.6.32.15/arch/x86/include/asm/apm.h |
5485 | --- linux-2.6.32.13/arch/x86/include/asm/apm.h 2010-03-15 11:52:04.000000000 -0400 | 5485 | --- linux-2.6.32.15/arch/x86/include/asm/apm.h 2010-03-15 11:52:04.000000000 -0400 |
5486 | +++ linux-2.6.32.13/arch/x86/include/asm/apm.h 2010-05-15 13:21:13.878594921 -0400 | 5486 | +++ linux-2.6.32.15/arch/x86/include/asm/apm.h 2010-05-28 21:27:14.903156603 -0400 |
5487 | @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 | 5487 | @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 |
5488 | __asm__ __volatile__(APM_DO_ZERO_SEGS | 5488 | __asm__ __volatile__(APM_DO_ZERO_SEGS |
5489 | "pushl %%edi\n\t" | 5489 | "pushl %%edi\n\t" |
@@ -5502,9 +5502,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/apm.h linux-2.6.32.13/arch/x86/i | |||
5502 | "setc %%bl\n\t" | 5502 | "setc %%bl\n\t" |
5503 | "popl %%ebp\n\t" | 5503 | "popl %%ebp\n\t" |
5504 | "popl %%edi\n\t" | 5504 | "popl %%edi\n\t" |
5505 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch/x86/include/asm/atomic_32.h | 5505 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_32.h linux-2.6.32.15/arch/x86/include/asm/atomic_32.h |
5506 | --- linux-2.6.32.13/arch/x86/include/asm/atomic_32.h 2010-03-15 11:52:04.000000000 -0400 | 5506 | --- linux-2.6.32.15/arch/x86/include/asm/atomic_32.h 2010-03-15 11:52:04.000000000 -0400 |
5507 | +++ linux-2.6.32.13/arch/x86/include/asm/atomic_32.h 2010-05-15 13:21:13.878594921 -0400 | 5507 | +++ linux-2.6.32.15/arch/x86/include/asm/atomic_32.h 2010-05-28 21:27:14.903156603 -0400 |
5508 | @@ -25,6 +25,17 @@ static inline int atomic_read(const atom | 5508 | @@ -25,6 +25,17 @@ static inline int atomic_read(const atom |
5509 | } | 5509 | } |
5510 | 5510 | ||
@@ -5835,9 +5835,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch | |||
5835 | #define ATOMIC64_INIT(val) { (val) } | 5835 | #define ATOMIC64_INIT(val) { (val) } |
5836 | 5836 | ||
5837 | extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val); | 5837 | extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val); |
5838 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_64.h linux-2.6.32.13/arch/x86/include/asm/atomic_64.h | 5838 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch/x86/include/asm/atomic_64.h |
5839 | --- linux-2.6.32.13/arch/x86/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400 | 5839 | --- linux-2.6.32.15/arch/x86/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400 |
5840 | +++ linux-2.6.32.13/arch/x86/include/asm/atomic_64.h 2010-05-15 13:21:13.878594921 -0400 | 5840 | +++ linux-2.6.32.15/arch/x86/include/asm/atomic_64.h 2010-05-28 21:27:14.906924566 -0400 |
5841 | @@ -24,6 +24,17 @@ static inline int atomic_read(const atom | 5841 | @@ -24,6 +24,17 @@ static inline int atomic_read(const atom |
5842 | } | 5842 | } |
5843 | 5843 | ||
@@ -6415,9 +6415,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_64.h linux-2.6.32.13/arch | |||
6415 | } | 6415 | } |
6416 | 6416 | ||
6417 | /** | 6417 | /** |
6418 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/boot.h linux-2.6.32.13/arch/x86/include/asm/boot.h | 6418 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/boot.h linux-2.6.32.15/arch/x86/include/asm/boot.h |
6419 | --- linux-2.6.32.13/arch/x86/include/asm/boot.h 2010-03-15 11:52:04.000000000 -0400 | 6419 | --- linux-2.6.32.15/arch/x86/include/asm/boot.h 2010-03-15 11:52:04.000000000 -0400 |
6420 | +++ linux-2.6.32.13/arch/x86/include/asm/boot.h 2010-05-15 13:21:13.878594921 -0400 | 6420 | +++ linux-2.6.32.15/arch/x86/include/asm/boot.h 2010-05-28 21:27:14.906924566 -0400 |
6421 | @@ -11,10 +11,15 @@ | 6421 | @@ -11,10 +11,15 @@ |
6422 | #include <asm/pgtable_types.h> | 6422 | #include <asm/pgtable_types.h> |
6423 | 6423 | ||
@@ -6435,9 +6435,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/boot.h linux-2.6.32.13/arch/x86/ | |||
6435 | /* Minimum kernel alignment, as a power of two */ | 6435 | /* Minimum kernel alignment, as a power of two */ |
6436 | #ifdef CONFIG_X86_64 | 6436 | #ifdef CONFIG_X86_64 |
6437 | #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT | 6437 | #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT |
6438 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/cacheflush.h linux-2.6.32.13/arch/x86/include/asm/cacheflush.h | 6438 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/cacheflush.h linux-2.6.32.15/arch/x86/include/asm/cacheflush.h |
6439 | --- linux-2.6.32.13/arch/x86/include/asm/cacheflush.h 2010-03-15 11:52:04.000000000 -0400 | 6439 | --- linux-2.6.32.15/arch/x86/include/asm/cacheflush.h 2010-03-15 11:52:04.000000000 -0400 |
6440 | +++ linux-2.6.32.13/arch/x86/include/asm/cacheflush.h 2010-05-15 13:21:13.878594921 -0400 | 6440 | +++ linux-2.6.32.15/arch/x86/include/asm/cacheflush.h 2010-05-28 21:27:14.906924566 -0400 |
6441 | @@ -60,7 +60,7 @@ PAGEFLAG(WC, WC) | 6441 | @@ -60,7 +60,7 @@ PAGEFLAG(WC, WC) |
6442 | static inline unsigned long get_page_memtype(struct page *pg) | 6442 | static inline unsigned long get_page_memtype(struct page *pg) |
6443 | { | 6443 | { |
@@ -6456,9 +6456,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/cacheflush.h linux-2.6.32.13/arc | |||
6456 | ClearPageUncached(pg); | 6456 | ClearPageUncached(pg); |
6457 | ClearPageWC(pg); | 6457 | ClearPageWC(pg); |
6458 | break; | 6458 | break; |
6459 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/cache.h linux-2.6.32.13/arch/x86/include/asm/cache.h | 6459 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/cache.h linux-2.6.32.15/arch/x86/include/asm/cache.h |
6460 | --- linux-2.6.32.13/arch/x86/include/asm/cache.h 2010-03-15 11:52:04.000000000 -0400 | 6460 | --- linux-2.6.32.15/arch/x86/include/asm/cache.h 2010-03-15 11:52:04.000000000 -0400 |
6461 | +++ linux-2.6.32.13/arch/x86/include/asm/cache.h 2010-05-15 13:21:13.878594921 -0400 | 6461 | +++ linux-2.6.32.15/arch/x86/include/asm/cache.h 2010-05-28 21:27:14.906924566 -0400 |
6462 | @@ -8,6 +8,7 @@ | 6462 | @@ -8,6 +8,7 @@ |
6463 | #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) | 6463 | #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) |
6464 | 6464 | ||
@@ -6467,9 +6467,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/cache.h linux-2.6.32.13/arch/x86 | |||
6467 | 6467 | ||
6468 | #ifdef CONFIG_X86_VSMP | 6468 | #ifdef CONFIG_X86_VSMP |
6469 | /* vSMP Internode cacheline shift */ | 6469 | /* vSMP Internode cacheline shift */ |
6470 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/checksum_32.h linux-2.6.32.13/arch/x86/include/asm/checksum_32.h | 6470 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/checksum_32.h linux-2.6.32.15/arch/x86/include/asm/checksum_32.h |
6471 | --- linux-2.6.32.13/arch/x86/include/asm/checksum_32.h 2010-03-15 11:52:04.000000000 -0400 | 6471 | --- linux-2.6.32.15/arch/x86/include/asm/checksum_32.h 2010-03-15 11:52:04.000000000 -0400 |
6472 | +++ linux-2.6.32.13/arch/x86/include/asm/checksum_32.h 2010-05-15 13:21:13.878594921 -0400 | 6472 | +++ linux-2.6.32.15/arch/x86/include/asm/checksum_32.h 2010-05-28 21:27:14.906924566 -0400 |
6473 | @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene | 6473 | @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene |
6474 | int len, __wsum sum, | 6474 | int len, __wsum sum, |
6475 | int *src_err_ptr, int *dst_err_ptr); | 6475 | int *src_err_ptr, int *dst_err_ptr); |
@@ -6503,9 +6503,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/checksum_32.h linux-2.6.32.13/ar | |||
6503 | len, sum, NULL, err_ptr); | 6503 | len, sum, NULL, err_ptr); |
6504 | 6504 | ||
6505 | if (len) | 6505 | if (len) |
6506 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/desc.h linux-2.6.32.13/arch/x86/include/asm/desc.h | 6506 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/desc.h linux-2.6.32.15/arch/x86/include/asm/desc.h |
6507 | --- linux-2.6.32.13/arch/x86/include/asm/desc.h 2010-03-15 11:52:04.000000000 -0400 | 6507 | --- linux-2.6.32.15/arch/x86/include/asm/desc.h 2010-03-15 11:52:04.000000000 -0400 |
6508 | +++ linux-2.6.32.13/arch/x86/include/asm/desc.h 2010-05-15 13:21:13.882891085 -0400 | 6508 | +++ linux-2.6.32.15/arch/x86/include/asm/desc.h 2010-05-28 21:27:14.906924566 -0400 |
6509 | @@ -4,6 +4,7 @@ | 6509 | @@ -4,6 +4,7 @@ |
6510 | #include <asm/desc_defs.h> | 6510 | #include <asm/desc_defs.h> |
6511 | #include <asm/ldt.h> | 6511 | #include <asm/ldt.h> |
@@ -6675,9 +6675,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/desc.h linux-2.6.32.13/arch/x86/ | |||
6675 | +#endif | 6675 | +#endif |
6676 | + | 6676 | + |
6677 | #endif /* _ASM_X86_DESC_H */ | 6677 | #endif /* _ASM_X86_DESC_H */ |
6678 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/device.h linux-2.6.32.13/arch/x86/include/asm/device.h | 6678 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/device.h linux-2.6.32.15/arch/x86/include/asm/device.h |
6679 | --- linux-2.6.32.13/arch/x86/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400 | 6679 | --- linux-2.6.32.15/arch/x86/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400 |
6680 | +++ linux-2.6.32.13/arch/x86/include/asm/device.h 2010-05-15 13:21:13.882891085 -0400 | 6680 | +++ linux-2.6.32.15/arch/x86/include/asm/device.h 2010-05-28 21:27:14.911025615 -0400 |
6681 | @@ -6,7 +6,7 @@ struct dev_archdata { | 6681 | @@ -6,7 +6,7 @@ struct dev_archdata { |
6682 | void *acpi_handle; | 6682 | void *acpi_handle; |
6683 | #endif | 6683 | #endif |
@@ -6687,9 +6687,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/device.h linux-2.6.32.13/arch/x8 | |||
6687 | #endif | 6687 | #endif |
6688 | #ifdef CONFIG_DMAR | 6688 | #ifdef CONFIG_DMAR |
6689 | void *iommu; /* hook for IOMMU specific extension */ | 6689 | void *iommu; /* hook for IOMMU specific extension */ |
6690 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/dma-mapping.h linux-2.6.32.13/arch/x86/include/asm/dma-mapping.h | 6690 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/dma-mapping.h linux-2.6.32.15/arch/x86/include/asm/dma-mapping.h |
6691 | --- linux-2.6.32.13/arch/x86/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 | 6691 | --- linux-2.6.32.15/arch/x86/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 |
6692 | +++ linux-2.6.32.13/arch/x86/include/asm/dma-mapping.h 2010-05-15 13:21:13.882891085 -0400 | 6692 | +++ linux-2.6.32.15/arch/x86/include/asm/dma-mapping.h 2010-05-28 21:27:14.911025615 -0400 |
6693 | @@ -25,9 +25,9 @@ extern int iommu_merge; | 6693 | @@ -25,9 +25,9 @@ extern int iommu_merge; |
6694 | extern struct device x86_dma_fallback_dev; | 6694 | extern struct device x86_dma_fallback_dev; |
6695 | extern int panic_on_overflow; | 6695 | extern int panic_on_overflow; |
@@ -6729,9 +6729,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/dma-mapping.h linux-2.6.32.13/ar | |||
6729 | 6729 | ||
6730 | WARN_ON(irqs_disabled()); /* for portability */ | 6730 | WARN_ON(irqs_disabled()); /* for portability */ |
6731 | 6731 | ||
6732 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/e820.h linux-2.6.32.13/arch/x86/include/asm/e820.h | 6732 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/e820.h linux-2.6.32.15/arch/x86/include/asm/e820.h |
6733 | --- linux-2.6.32.13/arch/x86/include/asm/e820.h 2010-03-15 11:52:04.000000000 -0400 | 6733 | --- linux-2.6.32.15/arch/x86/include/asm/e820.h 2010-03-15 11:52:04.000000000 -0400 |
6734 | +++ linux-2.6.32.13/arch/x86/include/asm/e820.h 2010-05-15 13:21:13.882891085 -0400 | 6734 | +++ linux-2.6.32.15/arch/x86/include/asm/e820.h 2010-05-28 21:27:14.911025615 -0400 |
6735 | @@ -133,7 +133,7 @@ extern char *default_machine_specific_me | 6735 | @@ -133,7 +133,7 @@ extern char *default_machine_specific_me |
6736 | #define ISA_END_ADDRESS 0x100000 | 6736 | #define ISA_END_ADDRESS 0x100000 |
6737 | #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS) | 6737 | #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS) |
@@ -6741,9 +6741,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/e820.h linux-2.6.32.13/arch/x86/ | |||
6741 | #define BIOS_END 0x00100000 | 6741 | #define BIOS_END 0x00100000 |
6742 | 6742 | ||
6743 | #ifdef __KERNEL__ | 6743 | #ifdef __KERNEL__ |
6744 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/elf.h linux-2.6.32.13/arch/x86/include/asm/elf.h | 6744 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/elf.h linux-2.6.32.15/arch/x86/include/asm/elf.h |
6745 | --- linux-2.6.32.13/arch/x86/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 | 6745 | --- linux-2.6.32.15/arch/x86/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 |
6746 | +++ linux-2.6.32.13/arch/x86/include/asm/elf.h 2010-05-15 13:21:13.882891085 -0400 | 6746 | +++ linux-2.6.32.15/arch/x86/include/asm/elf.h 2010-05-28 21:27:14.911025615 -0400 |
6747 | @@ -257,7 +257,25 @@ extern int force_personality32; | 6747 | @@ -257,7 +257,25 @@ extern int force_personality32; |
6748 | the loader. We need to make sure that it is out of the way of the program | 6748 | the loader. We need to make sure that it is out of the way of the program |
6749 | that it will "exec", and that there is sufficient room for the brk. */ | 6749 | that it will "exec", and that there is sufficient room for the brk. */ |
@@ -6797,9 +6797,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/elf.h linux-2.6.32.13/arch/x86/i | |||
6797 | -#define arch_randomize_brk arch_randomize_brk | 6797 | -#define arch_randomize_brk arch_randomize_brk |
6798 | - | 6798 | - |
6799 | #endif /* _ASM_X86_ELF_H */ | 6799 | #endif /* _ASM_X86_ELF_H */ |
6800 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/futex.h linux-2.6.32.13/arch/x86/include/asm/futex.h | 6800 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/futex.h linux-2.6.32.15/arch/x86/include/asm/futex.h |
6801 | --- linux-2.6.32.13/arch/x86/include/asm/futex.h 2010-03-15 11:52:04.000000000 -0400 | 6801 | --- linux-2.6.32.15/arch/x86/include/asm/futex.h 2010-03-15 11:52:04.000000000 -0400 |
6802 | +++ linux-2.6.32.13/arch/x86/include/asm/futex.h 2010-05-15 13:21:13.882891085 -0400 | 6802 | +++ linux-2.6.32.15/arch/x86/include/asm/futex.h 2010-05-28 21:27:14.911025615 -0400 |
6803 | @@ -11,17 +11,54 @@ | 6803 | @@ -11,17 +11,54 @@ |
6804 | #include <asm/processor.h> | 6804 | #include <asm/processor.h> |
6805 | #include <asm/system.h> | 6805 | #include <asm/system.h> |
@@ -6936,9 +6936,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/futex.h linux-2.6.32.13/arch/x86 | |||
6936 | : "memory" | 6936 | : "memory" |
6937 | ); | 6937 | ); |
6938 | 6938 | ||
6939 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/i387.h linux-2.6.32.13/arch/x86/include/asm/i387.h | 6939 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/i387.h linux-2.6.32.15/arch/x86/include/asm/i387.h |
6940 | --- linux-2.6.32.13/arch/x86/include/asm/i387.h 2010-03-15 11:52:04.000000000 -0400 | 6940 | --- linux-2.6.32.15/arch/x86/include/asm/i387.h 2010-03-15 11:52:04.000000000 -0400 |
6941 | +++ linux-2.6.32.13/arch/x86/include/asm/i387.h 2010-05-15 13:21:13.886644440 -0400 | 6941 | +++ linux-2.6.32.15/arch/x86/include/asm/i387.h 2010-05-28 21:27:14.911025615 -0400 |
6942 | @@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc | 6942 | @@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc |
6943 | { | 6943 | { |
6944 | int err; | 6944 | int err; |
@@ -6979,9 +6979,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/i387.h linux-2.6.32.13/arch/x86/ | |||
6979 | 6979 | ||
6980 | /* | 6980 | /* |
6981 | * These must be called with preempt disabled | 6981 | * These must be called with preempt disabled |
6982 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/io_64.h linux-2.6.32.13/arch/x86/include/asm/io_64.h | 6982 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/io_64.h linux-2.6.32.15/arch/x86/include/asm/io_64.h |
6983 | --- linux-2.6.32.13/arch/x86/include/asm/io_64.h 2010-03-15 11:52:04.000000000 -0400 | 6983 | --- linux-2.6.32.15/arch/x86/include/asm/io_64.h 2010-03-15 11:52:04.000000000 -0400 |
6984 | +++ linux-2.6.32.13/arch/x86/include/asm/io_64.h 2010-05-15 13:21:13.886644440 -0400 | 6984 | +++ linux-2.6.32.15/arch/x86/include/asm/io_64.h 2010-05-28 21:27:14.911025615 -0400 |
6985 | @@ -140,6 +140,17 @@ __OUTS(l) | 6985 | @@ -140,6 +140,17 @@ __OUTS(l) |
6986 | 6986 | ||
6987 | #include <linux/vmalloc.h> | 6987 | #include <linux/vmalloc.h> |
@@ -7000,9 +7000,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/io_64.h linux-2.6.32.13/arch/x86 | |||
7000 | #include <asm-generic/iomap.h> | 7000 | #include <asm-generic/iomap.h> |
7001 | 7001 | ||
7002 | void __memcpy_fromio(void *, unsigned long, unsigned); | 7002 | void __memcpy_fromio(void *, unsigned long, unsigned); |
7003 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/iommu.h linux-2.6.32.13/arch/x86/include/asm/iommu.h | 7003 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/iommu.h linux-2.6.32.15/arch/x86/include/asm/iommu.h |
7004 | --- linux-2.6.32.13/arch/x86/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400 | 7004 | --- linux-2.6.32.15/arch/x86/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400 |
7005 | +++ linux-2.6.32.13/arch/x86/include/asm/iommu.h 2010-05-15 13:21:13.886644440 -0400 | 7005 | +++ linux-2.6.32.15/arch/x86/include/asm/iommu.h 2010-05-28 21:27:14.911025615 -0400 |
7006 | @@ -3,7 +3,7 @@ | 7006 | @@ -3,7 +3,7 @@ |
7007 | 7007 | ||
7008 | extern void pci_iommu_shutdown(void); | 7008 | extern void pci_iommu_shutdown(void); |
@@ -7012,9 +7012,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/iommu.h linux-2.6.32.13/arch/x86 | |||
7012 | extern int force_iommu, no_iommu; | 7012 | extern int force_iommu, no_iommu; |
7013 | extern int iommu_detected; | 7013 | extern int iommu_detected; |
7014 | extern int iommu_pass_through; | 7014 | extern int iommu_pass_through; |
7015 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/irqflags.h linux-2.6.32.13/arch/x86/include/asm/irqflags.h | 7015 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/irqflags.h linux-2.6.32.15/arch/x86/include/asm/irqflags.h |
7016 | --- linux-2.6.32.13/arch/x86/include/asm/irqflags.h 2010-03-15 11:52:04.000000000 -0400 | 7016 | --- linux-2.6.32.15/arch/x86/include/asm/irqflags.h 2010-03-15 11:52:04.000000000 -0400 |
7017 | +++ linux-2.6.32.13/arch/x86/include/asm/irqflags.h 2010-05-15 13:21:13.886644440 -0400 | 7017 | +++ linux-2.6.32.15/arch/x86/include/asm/irqflags.h 2010-05-28 21:27:14.911025615 -0400 |
7018 | @@ -142,6 +142,11 @@ static inline unsigned long __raw_local_ | 7018 | @@ -142,6 +142,11 @@ static inline unsigned long __raw_local_ |
7019 | sti; \ | 7019 | sti; \ |
7020 | sysexit | 7020 | sysexit |
@@ -7027,9 +7027,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/irqflags.h linux-2.6.32.13/arch/ | |||
7027 | #else | 7027 | #else |
7028 | #define INTERRUPT_RETURN iret | 7028 | #define INTERRUPT_RETURN iret |
7029 | #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit | 7029 | #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit |
7030 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/kvm_host.h linux-2.6.32.13/arch/x86/include/asm/kvm_host.h | 7030 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/kvm_host.h linux-2.6.32.15/arch/x86/include/asm/kvm_host.h |
7031 | --- linux-2.6.32.13/arch/x86/include/asm/kvm_host.h 2010-04-29 17:49:37.497949072 -0400 | 7031 | --- linux-2.6.32.15/arch/x86/include/asm/kvm_host.h 2010-04-29 17:49:37.497949072 -0400 |
7032 | +++ linux-2.6.32.13/arch/x86/include/asm/kvm_host.h 2010-05-15 13:21:13.886644440 -0400 | 7032 | +++ linux-2.6.32.15/arch/x86/include/asm/kvm_host.h 2010-05-28 21:27:14.911025615 -0400 |
7033 | @@ -532,7 +532,7 @@ struct kvm_x86_ops { | 7033 | @@ -532,7 +532,7 @@ struct kvm_x86_ops { |
7034 | const struct trace_print_flags *exit_reasons_str; | 7034 | const struct trace_print_flags *exit_reasons_str; |
7035 | }; | 7035 | }; |
@@ -7039,9 +7039,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/kvm_host.h linux-2.6.32.13/arch/ | |||
7039 | 7039 | ||
7040 | int kvm_mmu_module_init(void); | 7040 | int kvm_mmu_module_init(void); |
7041 | void kvm_mmu_module_exit(void); | 7041 | void kvm_mmu_module_exit(void); |
7042 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/local.h linux-2.6.32.13/arch/x86/include/asm/local.h | 7042 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/local.h linux-2.6.32.15/arch/x86/include/asm/local.h |
7043 | --- linux-2.6.32.13/arch/x86/include/asm/local.h 2010-03-15 11:52:04.000000000 -0400 | 7043 | --- linux-2.6.32.15/arch/x86/include/asm/local.h 2010-03-15 11:52:04.000000000 -0400 |
7044 | +++ linux-2.6.32.13/arch/x86/include/asm/local.h 2010-05-15 13:21:13.886644440 -0400 | 7044 | +++ linux-2.6.32.15/arch/x86/include/asm/local.h 2010-05-28 21:27:14.911025615 -0400 |
7045 | @@ -18,26 +18,90 @@ typedef struct { | 7045 | @@ -18,26 +18,90 @@ typedef struct { |
7046 | 7046 | ||
7047 | static inline void local_inc(local_t *l) | 7047 | static inline void local_inc(local_t *l) |
@@ -7266,9 +7266,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/local.h linux-2.6.32.13/arch/x86 | |||
7266 | : "+r" (i), "+m" (l->a.counter) | 7266 | : "+r" (i), "+m" (l->a.counter) |
7267 | : : "memory"); | 7267 | : : "memory"); |
7268 | return i + __i; | 7268 | return i + __i; |
7269 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.13/arch/x86/include/asm/mc146818rtc.h | 7269 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.15/arch/x86/include/asm/mc146818rtc.h |
7270 | --- linux-2.6.32.13/arch/x86/include/asm/mc146818rtc.h 2010-03-15 11:52:04.000000000 -0400 | 7270 | --- linux-2.6.32.15/arch/x86/include/asm/mc146818rtc.h 2010-03-15 11:52:04.000000000 -0400 |
7271 | +++ linux-2.6.32.13/arch/x86/include/asm/mc146818rtc.h 2010-05-15 13:21:13.886644440 -0400 | 7271 | +++ linux-2.6.32.15/arch/x86/include/asm/mc146818rtc.h 2010-05-28 21:27:14.911025615 -0400 |
7272 | @@ -81,8 +81,8 @@ static inline unsigned char current_lock | 7272 | @@ -81,8 +81,8 @@ static inline unsigned char current_lock |
7273 | #else | 7273 | #else |
7274 | #define lock_cmos_prefix(reg) do {} while (0) | 7274 | #define lock_cmos_prefix(reg) do {} while (0) |
@@ -7280,9 +7280,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.13/ar | |||
7280 | #define do_i_have_lock_cmos() 0 | 7280 | #define do_i_have_lock_cmos() 0 |
7281 | #define current_lock_cmos_reg() 0 | 7281 | #define current_lock_cmos_reg() 0 |
7282 | #endif | 7282 | #endif |
7283 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/microcode.h linux-2.6.32.13/arch/x86/include/asm/microcode.h | 7283 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/microcode.h linux-2.6.32.15/arch/x86/include/asm/microcode.h |
7284 | --- linux-2.6.32.13/arch/x86/include/asm/microcode.h 2010-03-15 11:52:04.000000000 -0400 | 7284 | --- linux-2.6.32.15/arch/x86/include/asm/microcode.h 2010-03-15 11:52:04.000000000 -0400 |
7285 | +++ linux-2.6.32.13/arch/x86/include/asm/microcode.h 2010-05-15 13:21:13.886644440 -0400 | 7285 | +++ linux-2.6.32.15/arch/x86/include/asm/microcode.h 2010-05-28 21:27:14.911025615 -0400 |
7286 | @@ -12,13 +12,13 @@ struct device; | 7286 | @@ -12,13 +12,13 @@ struct device; |
7287 | enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; | 7287 | enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; |
7288 | 7288 | ||
@@ -7323,9 +7323,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/microcode.h linux-2.6.32.13/arch | |||
7323 | { | 7323 | { |
7324 | return NULL; | 7324 | return NULL; |
7325 | } | 7325 | } |
7326 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/mman.h linux-2.6.32.13/arch/x86/include/asm/mman.h | 7326 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/mman.h linux-2.6.32.15/arch/x86/include/asm/mman.h |
7327 | --- linux-2.6.32.13/arch/x86/include/asm/mman.h 2010-03-15 11:52:04.000000000 -0400 | 7327 | --- linux-2.6.32.15/arch/x86/include/asm/mman.h 2010-03-15 11:52:04.000000000 -0400 |
7328 | +++ linux-2.6.32.13/arch/x86/include/asm/mman.h 2010-05-15 13:21:13.886644440 -0400 | 7328 | +++ linux-2.6.32.15/arch/x86/include/asm/mman.h 2010-05-28 21:27:14.911025615 -0400 |
7329 | @@ -5,4 +5,14 @@ | 7329 | @@ -5,4 +5,14 @@ |
7330 | 7330 | ||
7331 | #include <asm-generic/mman.h> | 7331 | #include <asm-generic/mman.h> |
@@ -7341,9 +7341,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/mman.h linux-2.6.32.13/arch/x86/ | |||
7341 | +#endif | 7341 | +#endif |
7342 | + | 7342 | + |
7343 | #endif /* _ASM_X86_MMAN_H */ | 7343 | #endif /* _ASM_X86_MMAN_H */ |
7344 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/mmu_context.h linux-2.6.32.13/arch/x86/include/asm/mmu_context.h | 7344 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/mmu_context.h linux-2.6.32.15/arch/x86/include/asm/mmu_context.h |
7345 | --- linux-2.6.32.13/arch/x86/include/asm/mmu_context.h 2010-03-15 11:52:04.000000000 -0400 | 7345 | --- linux-2.6.32.15/arch/x86/include/asm/mmu_context.h 2010-03-15 11:52:04.000000000 -0400 |
7346 | +++ linux-2.6.32.13/arch/x86/include/asm/mmu_context.h 2010-05-15 13:21:13.886644440 -0400 | 7346 | +++ linux-2.6.32.15/arch/x86/include/asm/mmu_context.h 2010-05-28 21:27:14.915041226 -0400 |
7347 | @@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m | 7347 | @@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m |
7348 | 7348 | ||
7349 | static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) | 7349 | static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) |
@@ -7468,9 +7468,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/mmu_context.h linux-2.6.32.13/ar | |||
7468 | } | 7468 | } |
7469 | 7469 | ||
7470 | #define activate_mm(prev, next) \ | 7470 | #define activate_mm(prev, next) \ |
7471 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/mmu.h linux-2.6.32.13/arch/x86/include/asm/mmu.h | 7471 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/mmu.h linux-2.6.32.15/arch/x86/include/asm/mmu.h |
7472 | --- linux-2.6.32.13/arch/x86/include/asm/mmu.h 2010-03-15 11:52:04.000000000 -0400 | 7472 | --- linux-2.6.32.15/arch/x86/include/asm/mmu.h 2010-03-15 11:52:04.000000000 -0400 |
7473 | +++ linux-2.6.32.13/arch/x86/include/asm/mmu.h 2010-05-15 13:21:13.886644440 -0400 | 7473 | +++ linux-2.6.32.15/arch/x86/include/asm/mmu.h 2010-05-28 21:27:14.915041226 -0400 |
7474 | @@ -9,10 +9,23 @@ | 7474 | @@ -9,10 +9,23 @@ |
7475 | * we put the segment information here. | 7475 | * we put the segment information here. |
7476 | */ | 7476 | */ |
@@ -7497,9 +7497,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/mmu.h linux-2.6.32.13/arch/x86/i | |||
7497 | } mm_context_t; | 7497 | } mm_context_t; |
7498 | 7498 | ||
7499 | #ifdef CONFIG_SMP | 7499 | #ifdef CONFIG_SMP |
7500 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/module.h linux-2.6.32.13/arch/x86/include/asm/module.h | 7500 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/module.h linux-2.6.32.15/arch/x86/include/asm/module.h |
7501 | --- linux-2.6.32.13/arch/x86/include/asm/module.h 2010-03-15 11:52:04.000000000 -0400 | 7501 | --- linux-2.6.32.15/arch/x86/include/asm/module.h 2010-03-15 11:52:04.000000000 -0400 |
7502 | +++ linux-2.6.32.13/arch/x86/include/asm/module.h 2010-05-15 13:21:13.886644440 -0400 | 7502 | +++ linux-2.6.32.15/arch/x86/include/asm/module.h 2010-05-28 21:27:14.915041226 -0400 |
7503 | @@ -59,13 +59,31 @@ | 7503 | @@ -59,13 +59,31 @@ |
7504 | #error unknown processor family | 7504 | #error unknown processor family |
7505 | #endif | 7505 | #endif |
@@ -7533,9 +7533,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/module.h linux-2.6.32.13/arch/x8 | |||
7533 | #endif | 7533 | #endif |
7534 | 7534 | ||
7535 | #endif /* _ASM_X86_MODULE_H */ | 7535 | #endif /* _ASM_X86_MODULE_H */ |
7536 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/page_32_types.h linux-2.6.32.13/arch/x86/include/asm/page_32_types.h | 7536 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/page_32_types.h linux-2.6.32.15/arch/x86/include/asm/page_32_types.h |
7537 | --- linux-2.6.32.13/arch/x86/include/asm/page_32_types.h 2010-03-15 11:52:04.000000000 -0400 | 7537 | --- linux-2.6.32.15/arch/x86/include/asm/page_32_types.h 2010-03-15 11:52:04.000000000 -0400 |
7538 | +++ linux-2.6.32.13/arch/x86/include/asm/page_32_types.h 2010-05-15 13:21:13.886644440 -0400 | 7538 | +++ linux-2.6.32.15/arch/x86/include/asm/page_32_types.h 2010-05-28 21:27:14.915041226 -0400 |
7539 | @@ -15,6 +15,10 @@ | 7539 | @@ -15,6 +15,10 @@ |
7540 | */ | 7540 | */ |
7541 | #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) | 7541 | #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) |
@@ -7547,9 +7547,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/page_32_types.h linux-2.6.32.13/ | |||
7547 | #ifdef CONFIG_4KSTACKS | 7547 | #ifdef CONFIG_4KSTACKS |
7548 | #define THREAD_ORDER 0 | 7548 | #define THREAD_ORDER 0 |
7549 | #else | 7549 | #else |
7550 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/page_64_types.h linux-2.6.32.13/arch/x86/include/asm/page_64_types.h | 7550 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/page_64_types.h linux-2.6.32.15/arch/x86/include/asm/page_64_types.h |
7551 | --- linux-2.6.32.13/arch/x86/include/asm/page_64_types.h 2010-03-15 11:52:04.000000000 -0400 | 7551 | --- linux-2.6.32.15/arch/x86/include/asm/page_64_types.h 2010-03-15 11:52:04.000000000 -0400 |
7552 | +++ linux-2.6.32.13/arch/x86/include/asm/page_64_types.h 2010-05-15 13:21:13.886644440 -0400 | 7552 | +++ linux-2.6.32.15/arch/x86/include/asm/page_64_types.h 2010-05-28 21:27:14.915041226 -0400 |
7553 | @@ -39,6 +39,9 @@ | 7553 | @@ -39,6 +39,9 @@ |
7554 | #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START) | 7554 | #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START) |
7555 | #define __START_KERNEL_map _AC(0xffffffff80000000, UL) | 7555 | #define __START_KERNEL_map _AC(0xffffffff80000000, UL) |
@@ -7560,9 +7560,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/page_64_types.h linux-2.6.32.13/ | |||
7560 | /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */ | 7560 | /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */ |
7561 | #define __PHYSICAL_MASK_SHIFT 46 | 7561 | #define __PHYSICAL_MASK_SHIFT 46 |
7562 | #define __VIRTUAL_MASK_SHIFT 47 | 7562 | #define __VIRTUAL_MASK_SHIFT 47 |
7563 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/paravirt.h linux-2.6.32.13/arch/x86/include/asm/paravirt.h | 7563 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/paravirt.h linux-2.6.32.15/arch/x86/include/asm/paravirt.h |
7564 | --- linux-2.6.32.13/arch/x86/include/asm/paravirt.h 2010-03-15 11:52:04.000000000 -0400 | 7564 | --- linux-2.6.32.15/arch/x86/include/asm/paravirt.h 2010-03-15 11:52:04.000000000 -0400 |
7565 | +++ linux-2.6.32.13/arch/x86/include/asm/paravirt.h 2010-05-15 13:21:13.886644440 -0400 | 7565 | +++ linux-2.6.32.15/arch/x86/include/asm/paravirt.h 2010-05-28 21:27:14.915041226 -0400 |
7566 | @@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned | 7566 | @@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned |
7567 | pv_mmu_ops.set_fixmap(idx, phys, flags); | 7567 | pv_mmu_ops.set_fixmap(idx, phys, flags); |
7568 | } | 7568 | } |
@@ -7616,9 +7616,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/paravirt.h linux-2.6.32.13/arch/ | |||
7616 | #endif /* CONFIG_X86_32 */ | 7616 | #endif /* CONFIG_X86_32 */ |
7617 | 7617 | ||
7618 | #endif /* __ASSEMBLY__ */ | 7618 | #endif /* __ASSEMBLY__ */ |
7619 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/paravirt_types.h linux-2.6.32.13/arch/x86/include/asm/paravirt_types.h | 7619 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/paravirt_types.h linux-2.6.32.15/arch/x86/include/asm/paravirt_types.h |
7620 | --- linux-2.6.32.13/arch/x86/include/asm/paravirt_types.h 2010-03-15 11:52:04.000000000 -0400 | 7620 | --- linux-2.6.32.15/arch/x86/include/asm/paravirt_types.h 2010-03-15 11:52:04.000000000 -0400 |
7621 | +++ linux-2.6.32.13/arch/x86/include/asm/paravirt_types.h 2010-05-15 13:21:13.902905019 -0400 | 7621 | +++ linux-2.6.32.15/arch/x86/include/asm/paravirt_types.h 2010-05-28 21:27:14.915041226 -0400 |
7622 | @@ -316,6 +316,12 @@ struct pv_mmu_ops { | 7622 | @@ -316,6 +316,12 @@ struct pv_mmu_ops { |
7623 | an mfn. We can tell which is which from the index. */ | 7623 | an mfn. We can tell which is which from the index. */ |
7624 | void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, | 7624 | void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, |
@@ -7632,9 +7632,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/paravirt_types.h linux-2.6.32.13 | |||
7632 | }; | 7632 | }; |
7633 | 7633 | ||
7634 | struct raw_spinlock; | 7634 | struct raw_spinlock; |
7635 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/pci_x86.h linux-2.6.32.13/arch/x86/include/asm/pci_x86.h | 7635 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/pci_x86.h linux-2.6.32.15/arch/x86/include/asm/pci_x86.h |
7636 | --- linux-2.6.32.13/arch/x86/include/asm/pci_x86.h 2010-03-15 11:52:04.000000000 -0400 | 7636 | --- linux-2.6.32.15/arch/x86/include/asm/pci_x86.h 2010-03-15 11:52:04.000000000 -0400 |
7637 | +++ linux-2.6.32.13/arch/x86/include/asm/pci_x86.h 2010-05-15 13:21:13.902905019 -0400 | 7637 | +++ linux-2.6.32.15/arch/x86/include/asm/pci_x86.h 2010-05-28 21:27:14.915041226 -0400 |
7638 | @@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct | 7638 | @@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct |
7639 | extern void (*pcibios_disable_irq)(struct pci_dev *dev); | 7639 | extern void (*pcibios_disable_irq)(struct pci_dev *dev); |
7640 | 7640 | ||
@@ -7657,9 +7657,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pci_x86.h linux-2.6.32.13/arch/x | |||
7657 | extern bool port_cf9_safe; | 7657 | extern bool port_cf9_safe; |
7658 | 7658 | ||
7659 | /* arch_initcall level */ | 7659 | /* arch_initcall level */ |
7660 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgalloc.h linux-2.6.32.13/arch/x86/include/asm/pgalloc.h | 7660 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgalloc.h linux-2.6.32.15/arch/x86/include/asm/pgalloc.h |
7661 | --- linux-2.6.32.13/arch/x86/include/asm/pgalloc.h 2010-03-15 11:52:04.000000000 -0400 | 7661 | --- linux-2.6.32.15/arch/x86/include/asm/pgalloc.h 2010-03-15 11:52:04.000000000 -0400 |
7662 | +++ linux-2.6.32.13/arch/x86/include/asm/pgalloc.h 2010-05-15 13:21:13.902905019 -0400 | 7662 | +++ linux-2.6.32.15/arch/x86/include/asm/pgalloc.h 2010-05-28 21:27:14.915041226 -0400 |
7663 | @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s | 7663 | @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s |
7664 | pmd_t *pmd, pte_t *pte) | 7664 | pmd_t *pmd, pte_t *pte) |
7665 | { | 7665 | { |
@@ -7674,9 +7674,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgalloc.h linux-2.6.32.13/arch/x | |||
7674 | set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); | 7674 | set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); |
7675 | } | 7675 | } |
7676 | 7676 | ||
7677 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.13/arch/x86/include/asm/pgtable-2level.h | 7677 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.15/arch/x86/include/asm/pgtable-2level.h |
7678 | --- linux-2.6.32.13/arch/x86/include/asm/pgtable-2level.h 2010-03-15 11:52:04.000000000 -0400 | 7678 | --- linux-2.6.32.15/arch/x86/include/asm/pgtable-2level.h 2010-03-15 11:52:04.000000000 -0400 |
7679 | +++ linux-2.6.32.13/arch/x86/include/asm/pgtable-2level.h 2010-05-15 13:21:13.902905019 -0400 | 7679 | +++ linux-2.6.32.15/arch/x86/include/asm/pgtable-2level.h 2010-05-28 21:27:14.915041226 -0400 |
7680 | @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t | 7680 | @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t |
7681 | 7681 | ||
7682 | static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) | 7682 | static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) |
@@ -7687,9 +7687,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.13 | |||
7687 | } | 7687 | } |
7688 | 7688 | ||
7689 | static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) | 7689 | static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) |
7690 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_32.h linux-2.6.32.13/arch/x86/include/asm/pgtable_32.h | 7690 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable_32.h linux-2.6.32.15/arch/x86/include/asm/pgtable_32.h |
7691 | --- linux-2.6.32.13/arch/x86/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400 | 7691 | --- linux-2.6.32.15/arch/x86/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400 |
7692 | +++ linux-2.6.32.13/arch/x86/include/asm/pgtable_32.h 2010-05-15 13:21:13.902905019 -0400 | 7692 | +++ linux-2.6.32.15/arch/x86/include/asm/pgtable_32.h 2010-05-28 21:27:14.915041226 -0400 |
7693 | @@ -26,8 +26,6 @@ | 7693 | @@ -26,8 +26,6 @@ |
7694 | struct mm_struct; | 7694 | struct mm_struct; |
7695 | struct vm_area_struct; | 7695 | struct vm_area_struct; |
@@ -7731,9 +7731,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_32.h linux-2.6.32.13/arc | |||
7731 | /* | 7731 | /* |
7732 | * kern_addr_valid() is (1) for FLATMEM and (0) for | 7732 | * kern_addr_valid() is (1) for FLATMEM and (0) for |
7733 | * SPARSEMEM and DISCONTIGMEM | 7733 | * SPARSEMEM and DISCONTIGMEM |
7734 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.13/arch/x86/include/asm/pgtable_32_types.h | 7734 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.15/arch/x86/include/asm/pgtable_32_types.h |
7735 | --- linux-2.6.32.13/arch/x86/include/asm/pgtable_32_types.h 2010-03-15 11:52:04.000000000 -0400 | 7735 | --- linux-2.6.32.15/arch/x86/include/asm/pgtable_32_types.h 2010-03-15 11:52:04.000000000 -0400 |
7736 | +++ linux-2.6.32.13/arch/x86/include/asm/pgtable_32_types.h 2010-05-15 13:21:13.902905019 -0400 | 7736 | +++ linux-2.6.32.15/arch/x86/include/asm/pgtable_32_types.h 2010-05-28 21:27:14.915041226 -0400 |
7737 | @@ -8,7 +8,7 @@ | 7737 | @@ -8,7 +8,7 @@ |
7738 | */ | 7738 | */ |
7739 | #ifdef CONFIG_X86_PAE | 7739 | #ifdef CONFIG_X86_PAE |
@@ -7763,9 +7763,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32. | |||
7763 | #define MODULES_VADDR VMALLOC_START | 7763 | #define MODULES_VADDR VMALLOC_START |
7764 | #define MODULES_END VMALLOC_END | 7764 | #define MODULES_END VMALLOC_END |
7765 | #define MODULES_LEN (MODULES_VADDR - MODULES_END) | 7765 | #define MODULES_LEN (MODULES_VADDR - MODULES_END) |
7766 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.13/arch/x86/include/asm/pgtable-3level.h | 7766 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.15/arch/x86/include/asm/pgtable-3level.h |
7767 | --- linux-2.6.32.13/arch/x86/include/asm/pgtable-3level.h 2010-03-15 11:52:04.000000000 -0400 | 7767 | --- linux-2.6.32.15/arch/x86/include/asm/pgtable-3level.h 2010-03-15 11:52:04.000000000 -0400 |
7768 | +++ linux-2.6.32.13/arch/x86/include/asm/pgtable-3level.h 2010-05-15 13:21:13.902905019 -0400 | 7768 | +++ linux-2.6.32.15/arch/x86/include/asm/pgtable-3level.h 2010-05-28 21:27:14.915041226 -0400 |
7769 | @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic | 7769 | @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic |
7770 | 7770 | ||
7771 | static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) | 7771 | static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) |
@@ -7783,9 +7783,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.13 | |||
7783 | } | 7783 | } |
7784 | 7784 | ||
7785 | /* | 7785 | /* |
7786 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_64.h linux-2.6.32.13/arch/x86/include/asm/pgtable_64.h | 7786 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable_64.h linux-2.6.32.15/arch/x86/include/asm/pgtable_64.h |
7787 | --- linux-2.6.32.13/arch/x86/include/asm/pgtable_64.h 2010-03-15 11:52:04.000000000 -0400 | 7787 | --- linux-2.6.32.15/arch/x86/include/asm/pgtable_64.h 2010-03-15 11:52:04.000000000 -0400 |
7788 | +++ linux-2.6.32.13/arch/x86/include/asm/pgtable_64.h 2010-05-15 13:21:13.906812769 -0400 | 7788 | +++ linux-2.6.32.15/arch/x86/include/asm/pgtable_64.h 2010-05-28 21:27:14.915041226 -0400 |
7789 | @@ -16,10 +16,13 @@ | 7789 | @@ -16,10 +16,13 @@ |
7790 | 7790 | ||
7791 | extern pud_t level3_kernel_pgt[512]; | 7791 | extern pud_t level3_kernel_pgt[512]; |
@@ -7831,9 +7831,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_64.h linux-2.6.32.13/arc | |||
7831 | } | 7831 | } |
7832 | 7832 | ||
7833 | /* | 7833 | /* |
7834 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.13/arch/x86/include/asm/pgtable_64_types.h | 7834 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.15/arch/x86/include/asm/pgtable_64_types.h |
7835 | --- linux-2.6.32.13/arch/x86/include/asm/pgtable_64_types.h 2010-03-15 11:52:04.000000000 -0400 | 7835 | --- linux-2.6.32.15/arch/x86/include/asm/pgtable_64_types.h 2010-03-15 11:52:04.000000000 -0400 |
7836 | +++ linux-2.6.32.13/arch/x86/include/asm/pgtable_64_types.h 2010-05-15 13:23:38.946686210 -0400 | 7836 | +++ linux-2.6.32.15/arch/x86/include/asm/pgtable_64_types.h 2010-05-28 21:27:14.915041226 -0400 |
7837 | @@ -59,5 +59,7 @@ typedef struct { pteval_t pte; } pte_t; | 7837 | @@ -59,5 +59,7 @@ typedef struct { pteval_t pte; } pte_t; |
7838 | #define MODULES_VADDR _AC(0xffffffffa0000000, UL) | 7838 | #define MODULES_VADDR _AC(0xffffffffa0000000, UL) |
7839 | #define MODULES_END _AC(0xffffffffff000000, UL) | 7839 | #define MODULES_END _AC(0xffffffffff000000, UL) |
@@ -7842,9 +7842,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32. | |||
7842 | +#define MODULES_EXEC_END MODULES_END | 7842 | +#define MODULES_EXEC_END MODULES_END |
7843 | 7843 | ||
7844 | #endif /* _ASM_X86_PGTABLE_64_DEFS_H */ | 7844 | #endif /* _ASM_X86_PGTABLE_64_DEFS_H */ |
7845 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable.h linux-2.6.32.13/arch/x86/include/asm/pgtable.h | 7845 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable.h linux-2.6.32.15/arch/x86/include/asm/pgtable.h |
7846 | --- linux-2.6.32.13/arch/x86/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 | 7846 | --- linux-2.6.32.15/arch/x86/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 |
7847 | +++ linux-2.6.32.13/arch/x86/include/asm/pgtable.h 2010-05-15 13:21:13.906812769 -0400 | 7847 | +++ linux-2.6.32.15/arch/x86/include/asm/pgtable.h 2010-05-28 21:27:14.918896182 -0400 |
7848 | @@ -74,12 +74,51 @@ extern struct list_head pgd_list; | 7848 | @@ -74,12 +74,51 @@ extern struct list_head pgd_list; |
7849 | 7849 | ||
7850 | #define arch_end_context_switch(prev) do {} while(0) | 7850 | #define arch_end_context_switch(prev) do {} while(0) |
@@ -8009,9 +8009,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable.h linux-2.6.32.13/arch/x | |||
8009 | 8009 | ||
8010 | #include <asm-generic/pgtable.h> | 8010 | #include <asm-generic/pgtable.h> |
8011 | #endif /* __ASSEMBLY__ */ | 8011 | #endif /* __ASSEMBLY__ */ |
8012 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_types.h linux-2.6.32.13/arch/x86/include/asm/pgtable_types.h | 8012 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable_types.h linux-2.6.32.15/arch/x86/include/asm/pgtable_types.h |
8013 | --- linux-2.6.32.13/arch/x86/include/asm/pgtable_types.h 2010-03-15 11:52:04.000000000 -0400 | 8013 | --- linux-2.6.32.15/arch/x86/include/asm/pgtable_types.h 2010-03-15 11:52:04.000000000 -0400 |
8014 | +++ linux-2.6.32.13/arch/x86/include/asm/pgtable_types.h 2010-05-15 13:21:13.906812769 -0400 | 8014 | +++ linux-2.6.32.15/arch/x86/include/asm/pgtable_types.h 2010-05-28 21:27:14.918896182 -0400 |
8015 | @@ -16,12 +16,11 @@ | 8015 | @@ -16,12 +16,11 @@ |
8016 | #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ | 8016 | #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ |
8017 | #define _PAGE_BIT_PAT 7 /* on 4KB pages */ | 8017 | #define _PAGE_BIT_PAT 7 /* on 4KB pages */ |
@@ -8096,9 +8096,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_types.h linux-2.6.32.13/ | |||
8096 | 8096 | ||
8097 | #define pgprot_writecombine pgprot_writecombine | 8097 | #define pgprot_writecombine pgprot_writecombine |
8098 | extern pgprot_t pgprot_writecombine(pgprot_t prot); | 8098 | extern pgprot_t pgprot_writecombine(pgprot_t prot); |
8099 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/processor.h linux-2.6.32.13/arch/x86/include/asm/processor.h | 8099 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/processor.h linux-2.6.32.15/arch/x86/include/asm/processor.h |
8100 | --- linux-2.6.32.13/arch/x86/include/asm/processor.h 2010-03-15 11:52:04.000000000 -0400 | 8100 | --- linux-2.6.32.15/arch/x86/include/asm/processor.h 2010-03-15 11:52:04.000000000 -0400 |
8101 | +++ linux-2.6.32.13/arch/x86/include/asm/processor.h 2010-05-15 13:21:13.906812769 -0400 | 8101 | +++ linux-2.6.32.15/arch/x86/include/asm/processor.h 2010-05-28 21:27:14.918896182 -0400 |
8102 | @@ -272,7 +272,7 @@ struct tss_struct { | 8102 | @@ -272,7 +272,7 @@ struct tss_struct { |
8103 | 8103 | ||
8104 | } ____cacheline_aligned; | 8104 | } ____cacheline_aligned; |
@@ -8183,9 +8183,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/processor.h linux-2.6.32.13/arch | |||
8183 | #define KSTK_EIP(task) (task_pt_regs(task)->ip) | 8183 | #define KSTK_EIP(task) (task_pt_regs(task)->ip) |
8184 | 8184 | ||
8185 | /* Get/set a process' ability to use the timestamp counter instruction */ | 8185 | /* Get/set a process' ability to use the timestamp counter instruction */ |
8186 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/ptrace.h linux-2.6.32.13/arch/x86/include/asm/ptrace.h | 8186 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/ptrace.h linux-2.6.32.15/arch/x86/include/asm/ptrace.h |
8187 | --- linux-2.6.32.13/arch/x86/include/asm/ptrace.h 2010-03-15 11:52:04.000000000 -0400 | 8187 | --- linux-2.6.32.15/arch/x86/include/asm/ptrace.h 2010-03-15 11:52:04.000000000 -0400 |
8188 | +++ linux-2.6.32.13/arch/x86/include/asm/ptrace.h 2010-05-15 13:21:13.906812769 -0400 | 8188 | +++ linux-2.6.32.15/arch/x86/include/asm/ptrace.h 2010-05-28 21:27:14.918896182 -0400 |
8189 | @@ -151,28 +151,29 @@ static inline unsigned long regs_return_ | 8189 | @@ -151,28 +151,29 @@ static inline unsigned long regs_return_ |
8190 | } | 8190 | } |
8191 | 8191 | ||
@@ -8222,9 +8222,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/ptrace.h linux-2.6.32.13/arch/x8 | |||
8222 | #endif | 8222 | #endif |
8223 | } | 8223 | } |
8224 | 8224 | ||
8225 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/reboot.h linux-2.6.32.13/arch/x86/include/asm/reboot.h | 8225 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/reboot.h linux-2.6.32.15/arch/x86/include/asm/reboot.h |
8226 | --- linux-2.6.32.13/arch/x86/include/asm/reboot.h 2010-03-15 11:52:04.000000000 -0400 | 8226 | --- linux-2.6.32.15/arch/x86/include/asm/reboot.h 2010-03-15 11:52:04.000000000 -0400 |
8227 | +++ linux-2.6.32.13/arch/x86/include/asm/reboot.h 2010-05-15 13:21:13.906812769 -0400 | 8227 | +++ linux-2.6.32.15/arch/x86/include/asm/reboot.h 2010-05-28 21:27:14.918896182 -0400 |
8228 | @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; | 8228 | @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; |
8229 | 8229 | ||
8230 | void native_machine_crash_shutdown(struct pt_regs *regs); | 8230 | void native_machine_crash_shutdown(struct pt_regs *regs); |
@@ -8234,9 +8234,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/reboot.h linux-2.6.32.13/arch/x8 | |||
8234 | 8234 | ||
8235 | typedef void (*nmi_shootdown_cb)(int, struct die_args*); | 8235 | typedef void (*nmi_shootdown_cb)(int, struct die_args*); |
8236 | void nmi_shootdown_cpus(nmi_shootdown_cb callback); | 8236 | void nmi_shootdown_cpus(nmi_shootdown_cb callback); |
8237 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/rwsem.h linux-2.6.32.13/arch/x86/include/asm/rwsem.h | 8237 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/rwsem.h linux-2.6.32.15/arch/x86/include/asm/rwsem.h |
8238 | --- linux-2.6.32.13/arch/x86/include/asm/rwsem.h 2010-04-29 17:49:37.501451369 -0400 | 8238 | --- linux-2.6.32.15/arch/x86/include/asm/rwsem.h 2010-04-29 17:49:37.501451369 -0400 |
8239 | +++ linux-2.6.32.13/arch/x86/include/asm/rwsem.h 2010-05-15 13:21:13.906812769 -0400 | 8239 | +++ linux-2.6.32.15/arch/x86/include/asm/rwsem.h 2010-05-28 21:27:14.918896182 -0400 |
8240 | @@ -118,10 +118,26 @@ static inline void __down_read(struct rw | 8240 | @@ -118,10 +118,26 @@ static inline void __down_read(struct rw |
8241 | { | 8241 | { |
8242 | asm volatile("# beginning down_read\n\t" | 8242 | asm volatile("# beginning down_read\n\t" |
@@ -8472,9 +8472,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/rwsem.h linux-2.6.32.13/arch/x86 | |||
8472 | : "+r" (tmp), "+m" (sem->count) | 8472 | : "+r" (tmp), "+m" (sem->count) |
8473 | : : "memory"); | 8473 | : : "memory"); |
8474 | 8474 | ||
8475 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/segment.h linux-2.6.32.13/arch/x86/include/asm/segment.h | 8475 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/segment.h linux-2.6.32.15/arch/x86/include/asm/segment.h |
8476 | --- linux-2.6.32.13/arch/x86/include/asm/segment.h 2010-03-15 11:52:04.000000000 -0400 | 8476 | --- linux-2.6.32.15/arch/x86/include/asm/segment.h 2010-03-15 11:52:04.000000000 -0400 |
8477 | +++ linux-2.6.32.13/arch/x86/include/asm/segment.h 2010-05-15 13:21:13.906812769 -0400 | 8477 | +++ linux-2.6.32.15/arch/x86/include/asm/segment.h 2010-05-28 21:27:14.918896182 -0400 |
8478 | @@ -62,8 +62,8 @@ | 8478 | @@ -62,8 +62,8 @@ |
8479 | * 26 - ESPFIX small SS | 8479 | * 26 - ESPFIX small SS |
8480 | * 27 - per-cpu [ offset to per-cpu data area ] | 8480 | * 27 - per-cpu [ offset to per-cpu data area ] |
@@ -8543,9 +8543,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/segment.h linux-2.6.32.13/arch/x | |||
8543 | #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8) | 8543 | #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8) |
8544 | #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3) | 8544 | #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3) |
8545 | #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3) | 8545 | #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3) |
8546 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/spinlock.h linux-2.6.32.13/arch/x86/include/asm/spinlock.h | 8546 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/spinlock.h linux-2.6.32.15/arch/x86/include/asm/spinlock.h |
8547 | --- linux-2.6.32.13/arch/x86/include/asm/spinlock.h 2010-03-15 11:52:04.000000000 -0400 | 8547 | --- linux-2.6.32.15/arch/x86/include/asm/spinlock.h 2010-03-15 11:52:04.000000000 -0400 |
8548 | +++ linux-2.6.32.13/arch/x86/include/asm/spinlock.h 2010-05-15 13:21:13.906812769 -0400 | 8548 | +++ linux-2.6.32.15/arch/x86/include/asm/spinlock.h 2010-05-28 21:27:14.918896182 -0400 |
8549 | @@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r | 8549 | @@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r |
8550 | static inline void __raw_read_lock(raw_rwlock_t *rw) | 8550 | static inline void __raw_read_lock(raw_rwlock_t *rw) |
8551 | { | 8551 | { |
@@ -8649,9 +8649,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/spinlock.h linux-2.6.32.13/arch/ | |||
8649 | : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); | 8649 | : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); |
8650 | } | 8650 | } |
8651 | 8651 | ||
8652 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/system.h linux-2.6.32.13/arch/x86/include/asm/system.h | 8652 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/system.h linux-2.6.32.15/arch/x86/include/asm/system.h |
8653 | --- linux-2.6.32.13/arch/x86/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400 | 8653 | --- linux-2.6.32.15/arch/x86/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400 |
8654 | +++ linux-2.6.32.13/arch/x86/include/asm/system.h 2010-05-15 13:21:13.906812769 -0400 | 8654 | +++ linux-2.6.32.15/arch/x86/include/asm/system.h 2010-05-28 21:27:14.922894828 -0400 |
8655 | @@ -200,7 +200,7 @@ static inline unsigned long get_limit(un | 8655 | @@ -200,7 +200,7 @@ static inline unsigned long get_limit(un |
8656 | { | 8656 | { |
8657 | unsigned long __limit; | 8657 | unsigned long __limit; |
@@ -8670,9 +8670,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/system.h linux-2.6.32.13/arch/x8 | |||
8670 | extern void free_init_pages(char *what, unsigned long begin, unsigned long end); | 8670 | extern void free_init_pages(char *what, unsigned long begin, unsigned long end); |
8671 | 8671 | ||
8672 | void default_idle(void); | 8672 | void default_idle(void); |
8673 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h | 8673 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess_32.h linux-2.6.32.15/arch/x86/include/asm/uaccess_32.h |
8674 | --- linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400 | 8674 | --- linux-2.6.32.15/arch/x86/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400 |
8675 | +++ linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h 2010-05-15 13:21:13.906812769 -0400 | 8675 | +++ linux-2.6.32.15/arch/x86/include/asm/uaccess_32.h 2010-05-28 21:27:14.922894828 -0400 |
8676 | @@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u | 8676 | @@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u |
8677 | static __always_inline unsigned long __must_check | 8677 | static __always_inline unsigned long __must_check |
8678 | __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) | 8678 | __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) |
@@ -8802,9 +8802,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h linux-2.6.32.13/arc | |||
8802 | long __must_check strncpy_from_user(char *dst, const char __user *src, | 8802 | long __must_check strncpy_from_user(char *dst, const char __user *src, |
8803 | long count); | 8803 | long count); |
8804 | long __must_check __strncpy_from_user(char *dst, | 8804 | long __must_check __strncpy_from_user(char *dst, |
8805 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h | 8805 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess_64.h linux-2.6.32.15/arch/x86/include/asm/uaccess_64.h |
8806 | --- linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400 | 8806 | --- linux-2.6.32.15/arch/x86/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400 |
8807 | +++ linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h 2010-05-15 13:21:13.906812769 -0400 | 8807 | +++ linux-2.6.32.15/arch/x86/include/asm/uaccess_64.h 2010-05-28 21:27:14.922894828 -0400 |
8808 | @@ -9,6 +9,9 @@ | 8808 | @@ -9,6 +9,9 @@ |
8809 | #include <linux/prefetch.h> | 8809 | #include <linux/prefetch.h> |
8810 | #include <linux/lockdep.h> | 8810 | #include <linux/lockdep.h> |
@@ -8996,10 +8996,10 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h linux-2.6.32.13/arc | |||
8996 | copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); | 8996 | copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); |
8997 | 8997 | ||
8998 | #endif /* _ASM_X86_UACCESS_64_H */ | 8998 | #endif /* _ASM_X86_UACCESS_64_H */ |
8999 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x86/include/asm/uaccess.h | 8999 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess.h linux-2.6.32.15/arch/x86/include/asm/uaccess.h |
9000 | --- linux-2.6.32.13/arch/x86/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 | 9000 | --- linux-2.6.32.15/arch/x86/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 |
9001 | +++ linux-2.6.32.13/arch/x86/include/asm/uaccess.h 2010-05-15 13:21:13.906812769 -0400 | 9001 | +++ linux-2.6.32.15/arch/x86/include/asm/uaccess.h 2010-05-28 21:27:14.922894828 -0400 |
9002 | @@ -8,8 +8,11 @@ | 9002 | @@ -8,6 +8,8 @@ |
9003 | #include <linux/thread_info.h> | 9003 | #include <linux/thread_info.h> |
9004 | #include <linux/prefetch.h> | 9004 | #include <linux/prefetch.h> |
9005 | #include <linux/string.h> | 9005 | #include <linux/string.h> |
@@ -9007,11 +9007,8 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x | |||
9007 | +#include <linux/slab.h> | 9007 | +#include <linux/slab.h> |
9008 | #include <asm/asm.h> | 9008 | #include <asm/asm.h> |
9009 | #include <asm/page.h> | 9009 | #include <asm/page.h> |
9010 | +#include <asm/segment.h> | ||
9011 | 9010 | ||
9012 | #define VERIFY_READ 0 | 9011 | @@ -29,7 +31,12 @@ |
9013 | #define VERIFY_WRITE 1 | ||
9014 | @@ -29,7 +32,12 @@ | ||
9015 | 9012 | ||
9016 | #define get_ds() (KERNEL_DS) | 9013 | #define get_ds() (KERNEL_DS) |
9017 | #define get_fs() (current_thread_info()->addr_limit) | 9014 | #define get_fs() (current_thread_info()->addr_limit) |
@@ -9024,7 +9021,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x | |||
9024 | 9021 | ||
9025 | #define segment_eq(a, b) ((a).seg == (b).seg) | 9022 | #define segment_eq(a, b) ((a).seg == (b).seg) |
9026 | 9023 | ||
9027 | @@ -77,7 +85,33 @@ | 9024 | @@ -77,7 +84,33 @@ |
9028 | * checks that the pointer is in the user space range - after calling | 9025 | * checks that the pointer is in the user space range - after calling |
9029 | * this function, memory access functions may still return -EFAULT. | 9026 | * this function, memory access functions may still return -EFAULT. |
9030 | */ | 9027 | */ |
@@ -9059,7 +9056,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x | |||
9059 | 9056 | ||
9060 | /* | 9057 | /* |
9061 | * The exception table consists of pairs of addresses: the first is the | 9058 | * The exception table consists of pairs of addresses: the first is the |
9062 | @@ -183,13 +217,21 @@ extern int __get_user_bad(void); | 9059 | @@ -183,13 +216,21 @@ extern int __get_user_bad(void); |
9063 | asm volatile("call __put_user_" #size : "=a" (__ret_pu) \ | 9060 | asm volatile("call __put_user_" #size : "=a" (__ret_pu) \ |
9064 | : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") | 9061 | : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") |
9065 | 9062 | ||
@@ -9084,7 +9081,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x | |||
9084 | ".section .fixup,\"ax\"\n" \ | 9081 | ".section .fixup,\"ax\"\n" \ |
9085 | "4: movl %3,%0\n" \ | 9082 | "4: movl %3,%0\n" \ |
9086 | " jmp 3b\n" \ | 9083 | " jmp 3b\n" \ |
9087 | @@ -197,15 +239,18 @@ extern int __get_user_bad(void); | 9084 | @@ -197,15 +238,18 @@ extern int __get_user_bad(void); |
9088 | _ASM_EXTABLE(1b, 4b) \ | 9085 | _ASM_EXTABLE(1b, 4b) \ |
9089 | _ASM_EXTABLE(2b, 4b) \ | 9086 | _ASM_EXTABLE(2b, 4b) \ |
9090 | : "=r" (err) \ | 9087 | : "=r" (err) \ |
@@ -9107,7 +9104,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x | |||
9107 | 9104 | ||
9108 | #define __put_user_x8(x, ptr, __ret_pu) \ | 9105 | #define __put_user_x8(x, ptr, __ret_pu) \ |
9109 | asm volatile("call __put_user_8" : "=a" (__ret_pu) \ | 9106 | asm volatile("call __put_user_8" : "=a" (__ret_pu) \ |
9110 | @@ -374,16 +419,18 @@ do { \ | 9107 | @@ -374,16 +418,18 @@ do { \ |
9111 | } while (0) | 9108 | } while (0) |
9112 | 9109 | ||
9113 | #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \ | 9110 | #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \ |
@@ -9129,7 +9126,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x | |||
9129 | 9126 | ||
9130 | #define __get_user_size_ex(x, ptr, size) \ | 9127 | #define __get_user_size_ex(x, ptr, size) \ |
9131 | do { \ | 9128 | do { \ |
9132 | @@ -407,10 +454,12 @@ do { \ | 9129 | @@ -407,10 +453,12 @@ do { \ |
9133 | } while (0) | 9130 | } while (0) |
9134 | 9131 | ||
9135 | #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \ | 9132 | #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \ |
@@ -9144,7 +9141,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x | |||
9144 | 9141 | ||
9145 | #define __put_user_nocheck(x, ptr, size) \ | 9142 | #define __put_user_nocheck(x, ptr, size) \ |
9146 | ({ \ | 9143 | ({ \ |
9147 | @@ -424,13 +473,24 @@ do { \ | 9144 | @@ -424,13 +472,24 @@ do { \ |
9148 | int __gu_err; \ | 9145 | int __gu_err; \ |
9149 | unsigned long __gu_val; \ | 9146 | unsigned long __gu_val; \ |
9150 | __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \ | 9147 | __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \ |
@@ -9171,7 +9168,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x | |||
9171 | 9168 | ||
9172 | /* | 9169 | /* |
9173 | * Tell gcc we read from memory instead of writing: this is because | 9170 | * Tell gcc we read from memory instead of writing: this is because |
9174 | @@ -438,21 +498,26 @@ struct __large_struct { unsigned long bu | 9171 | @@ -438,21 +497,26 @@ struct __large_struct { unsigned long bu |
9175 | * aliasing issues. | 9172 | * aliasing issues. |
9176 | */ | 9173 | */ |
9177 | #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \ | 9174 | #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \ |
@@ -9202,7 +9199,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x | |||
9202 | 9199 | ||
9203 | /* | 9200 | /* |
9204 | * uaccess_try and catch | 9201 | * uaccess_try and catch |
9205 | @@ -530,7 +595,7 @@ struct __large_struct { unsigned long bu | 9202 | @@ -530,7 +594,7 @@ struct __large_struct { unsigned long bu |
9206 | #define get_user_ex(x, ptr) do { \ | 9203 | #define get_user_ex(x, ptr) do { \ |
9207 | unsigned long __gue_val; \ | 9204 | unsigned long __gue_val; \ |
9208 | __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \ | 9205 | __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \ |
@@ -9211,7 +9208,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x | |||
9211 | } while (0) | 9208 | } while (0) |
9212 | 9209 | ||
9213 | #ifdef CONFIG_X86_WP_WORKS_OK | 9210 | #ifdef CONFIG_X86_WP_WORKS_OK |
9214 | @@ -567,6 +632,7 @@ extern struct movsl_mask { | 9211 | @@ -567,6 +631,7 @@ extern struct movsl_mask { |
9215 | 9212 | ||
9216 | #define ARCH_HAS_NOCACHE_UACCESS 1 | 9213 | #define ARCH_HAS_NOCACHE_UACCESS 1 |
9217 | 9214 | ||
@@ -9219,9 +9216,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x | |||
9219 | #ifdef CONFIG_X86_32 | 9216 | #ifdef CONFIG_X86_32 |
9220 | # include "uaccess_32.h" | 9217 | # include "uaccess_32.h" |
9221 | #else | 9218 | #else |
9222 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/vgtod.h linux-2.6.32.13/arch/x86/include/asm/vgtod.h | 9219 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/vgtod.h linux-2.6.32.15/arch/x86/include/asm/vgtod.h |
9223 | --- linux-2.6.32.13/arch/x86/include/asm/vgtod.h 2010-03-15 11:52:04.000000000 -0400 | 9220 | --- linux-2.6.32.15/arch/x86/include/asm/vgtod.h 2010-03-15 11:52:04.000000000 -0400 |
9224 | +++ linux-2.6.32.13/arch/x86/include/asm/vgtod.h 2010-05-15 13:21:13.906812769 -0400 | 9221 | +++ linux-2.6.32.15/arch/x86/include/asm/vgtod.h 2010-05-28 21:27:14.922894828 -0400 |
9225 | @@ -14,6 +14,7 @@ struct vsyscall_gtod_data { | 9222 | @@ -14,6 +14,7 @@ struct vsyscall_gtod_data { |
9226 | int sysctl_enabled; | 9223 | int sysctl_enabled; |
9227 | struct timezone sys_tz; | 9224 | struct timezone sys_tz; |
@@ -9230,9 +9227,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/vgtod.h linux-2.6.32.13/arch/x86 | |||
9230 | cycle_t (*vread)(void); | 9227 | cycle_t (*vread)(void); |
9231 | cycle_t cycle_last; | 9228 | cycle_t cycle_last; |
9232 | cycle_t mask; | 9229 | cycle_t mask; |
9233 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/vmi.h linux-2.6.32.13/arch/x86/include/asm/vmi.h | 9230 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/vmi.h linux-2.6.32.15/arch/x86/include/asm/vmi.h |
9234 | --- linux-2.6.32.13/arch/x86/include/asm/vmi.h 2010-03-15 11:52:04.000000000 -0400 | 9231 | --- linux-2.6.32.15/arch/x86/include/asm/vmi.h 2010-03-15 11:52:04.000000000 -0400 |
9235 | +++ linux-2.6.32.13/arch/x86/include/asm/vmi.h 2010-05-15 13:21:13.928275178 -0400 | 9232 | +++ linux-2.6.32.15/arch/x86/include/asm/vmi.h 2010-05-28 21:27:14.922894828 -0400 |
9236 | @@ -191,6 +191,7 @@ struct vrom_header { | 9233 | @@ -191,6 +191,7 @@ struct vrom_header { |
9237 | u8 reserved[96]; /* Reserved for headers */ | 9234 | u8 reserved[96]; /* Reserved for headers */ |
9238 | char vmi_init[8]; /* VMI_Init jump point */ | 9235 | char vmi_init[8]; /* VMI_Init jump point */ |
@@ -9241,9 +9238,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/vmi.h linux-2.6.32.13/arch/x86/i | |||
9241 | } __attribute__((packed)); | 9238 | } __attribute__((packed)); |
9242 | 9239 | ||
9243 | struct pnp_header { | 9240 | struct pnp_header { |
9244 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/vsyscall.h linux-2.6.32.13/arch/x86/include/asm/vsyscall.h | 9241 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/vsyscall.h linux-2.6.32.15/arch/x86/include/asm/vsyscall.h |
9245 | --- linux-2.6.32.13/arch/x86/include/asm/vsyscall.h 2010-03-15 11:52:04.000000000 -0400 | 9242 | --- linux-2.6.32.15/arch/x86/include/asm/vsyscall.h 2010-03-15 11:52:04.000000000 -0400 |
9246 | +++ linux-2.6.32.13/arch/x86/include/asm/vsyscall.h 2010-05-15 13:21:13.928275178 -0400 | 9243 | +++ linux-2.6.32.15/arch/x86/include/asm/vsyscall.h 2010-05-28 21:27:14.922894828 -0400 |
9247 | @@ -15,9 +15,10 @@ enum vsyscall_num { | 9244 | @@ -15,9 +15,10 @@ enum vsyscall_num { |
9248 | 9245 | ||
9249 | #ifdef __KERNEL__ | 9246 | #ifdef __KERNEL__ |
@@ -9274,9 +9271,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/vsyscall.h linux-2.6.32.13/arch/ | |||
9274 | #endif /* __KERNEL__ */ | 9271 | #endif /* __KERNEL__ */ |
9275 | 9272 | ||
9276 | #endif /* _ASM_X86_VSYSCALL_H */ | 9273 | #endif /* _ASM_X86_VSYSCALL_H */ |
9277 | diff -urNp linux-2.6.32.13/arch/x86/include/asm/xsave.h linux-2.6.32.13/arch/x86/include/asm/xsave.h | 9274 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/xsave.h linux-2.6.32.15/arch/x86/include/asm/xsave.h |
9278 | --- linux-2.6.32.13/arch/x86/include/asm/xsave.h 2010-03-15 11:52:04.000000000 -0400 | 9275 | --- linux-2.6.32.15/arch/x86/include/asm/xsave.h 2010-03-15 11:52:04.000000000 -0400 |
9279 | +++ linux-2.6.32.13/arch/x86/include/asm/xsave.h 2010-05-15 13:21:13.928275178 -0400 | 9276 | +++ linux-2.6.32.15/arch/x86/include/asm/xsave.h 2010-05-28 21:27:14.922894828 -0400 |
9280 | @@ -56,6 +56,12 @@ static inline int xrstor_checking(struct | 9277 | @@ -56,6 +56,12 @@ static inline int xrstor_checking(struct |
9281 | static inline int xsave_user(struct xsave_struct __user *buf) | 9278 | static inline int xsave_user(struct xsave_struct __user *buf) |
9282 | { | 9279 | { |
@@ -9302,9 +9299,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/xsave.h linux-2.6.32.13/arch/x86 | |||
9302 | __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n" | 9299 | __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n" |
9303 | "2:\n" | 9300 | "2:\n" |
9304 | ".section .fixup,\"ax\"\n" | 9301 | ".section .fixup,\"ax\"\n" |
9305 | diff -urNp linux-2.6.32.13/arch/x86/Kconfig linux-2.6.32.13/arch/x86/Kconfig | 9302 | diff -urNp linux-2.6.32.15/arch/x86/Kconfig linux-2.6.32.15/arch/x86/Kconfig |
9306 | --- linux-2.6.32.13/arch/x86/Kconfig 2010-05-15 13:20:18.407099662 -0400 | 9303 | --- linux-2.6.32.15/arch/x86/Kconfig 2010-05-15 13:20:18.407099662 -0400 |
9307 | +++ linux-2.6.32.13/arch/x86/Kconfig 2010-05-15 13:40:23.896554812 -0400 | 9304 | +++ linux-2.6.32.15/arch/x86/Kconfig 2010-05-28 21:27:14.922894828 -0400 |
9308 | @@ -531,6 +531,7 @@ source "arch/x86/lguest/Kconfig" | 9305 | @@ -531,6 +531,7 @@ source "arch/x86/lguest/Kconfig" |
9309 | 9306 | ||
9310 | config PARAVIRT | 9307 | config PARAVIRT |
@@ -9359,9 +9356,9 @@ diff -urNp linux-2.6.32.13/arch/x86/Kconfig linux-2.6.32.13/arch/x86/Kconfig | |||
9359 | ---help--- | 9356 | ---help--- |
9360 | Map the 32-bit VDSO to the predictable old-style address too. | 9357 | Map the 32-bit VDSO to the predictable old-style address too. |
9361 | ---help--- | 9358 | ---help--- |
9362 | diff -urNp linux-2.6.32.13/arch/x86/Kconfig.cpu linux-2.6.32.13/arch/x86/Kconfig.cpu | 9359 | diff -urNp linux-2.6.32.15/arch/x86/Kconfig.cpu linux-2.6.32.15/arch/x86/Kconfig.cpu |
9363 | --- linux-2.6.32.13/arch/x86/Kconfig.cpu 2010-04-29 17:49:37.481119841 -0400 | 9360 | --- linux-2.6.32.15/arch/x86/Kconfig.cpu 2010-04-29 17:49:37.481119841 -0400 |
9364 | +++ linux-2.6.32.13/arch/x86/Kconfig.cpu 2010-05-15 13:21:13.930870481 -0400 | 9361 | +++ linux-2.6.32.15/arch/x86/Kconfig.cpu 2010-05-28 21:27:14.922894828 -0400 |
9365 | @@ -340,7 +340,7 @@ config X86_PPRO_FENCE | 9362 | @@ -340,7 +340,7 @@ config X86_PPRO_FENCE |
9366 | 9363 | ||
9367 | config X86_F00F_BUG | 9364 | config X86_F00F_BUG |
@@ -9389,9 +9386,9 @@ diff -urNp linux-2.6.32.13/arch/x86/Kconfig.cpu linux-2.6.32.13/arch/x86/Kconfig | |||
9389 | 9386 | ||
9390 | config X86_MINIMUM_CPU_FAMILY | 9387 | config X86_MINIMUM_CPU_FAMILY |
9391 | int | 9388 | int |
9392 | diff -urNp linux-2.6.32.13/arch/x86/Kconfig.debug linux-2.6.32.13/arch/x86/Kconfig.debug | 9389 | diff -urNp linux-2.6.32.15/arch/x86/Kconfig.debug linux-2.6.32.15/arch/x86/Kconfig.debug |
9393 | --- linux-2.6.32.13/arch/x86/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400 | 9390 | --- linux-2.6.32.15/arch/x86/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400 |
9394 | +++ linux-2.6.32.13/arch/x86/Kconfig.debug 2010-05-15 13:21:13.942893840 -0400 | 9391 | +++ linux-2.6.32.15/arch/x86/Kconfig.debug 2010-05-28 21:27:14.926914091 -0400 |
9395 | @@ -99,7 +99,7 @@ config X86_PTDUMP | 9392 | @@ -99,7 +99,7 @@ config X86_PTDUMP |
9396 | config DEBUG_RODATA | 9393 | config DEBUG_RODATA |
9397 | bool "Write protect kernel read-only data structures" | 9394 | bool "Write protect kernel read-only data structures" |
@@ -9401,9 +9398,9 @@ diff -urNp linux-2.6.32.13/arch/x86/Kconfig.debug linux-2.6.32.13/arch/x86/Kconf | |||
9401 | ---help--- | 9398 | ---help--- |
9402 | Mark the kernel read-only data as write-protected in the pagetables, | 9399 | Mark the kernel read-only data as write-protected in the pagetables, |
9403 | in order to catch accidental (and incorrect) writes to such const | 9400 | in order to catch accidental (and incorrect) writes to such const |
9404 | diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/boot.c linux-2.6.32.13/arch/x86/kernel/acpi/boot.c | 9401 | diff -urNp linux-2.6.32.15/arch/x86/kernel/acpi/boot.c linux-2.6.32.15/arch/x86/kernel/acpi/boot.c |
9405 | --- linux-2.6.32.13/arch/x86/kernel/acpi/boot.c 2010-04-04 20:41:49.916475305 -0400 | 9402 | --- linux-2.6.32.15/arch/x86/kernel/acpi/boot.c 2010-04-04 20:41:49.916475305 -0400 |
9406 | +++ linux-2.6.32.13/arch/x86/kernel/acpi/boot.c 2010-05-15 13:21:13.954911113 -0400 | 9403 | +++ linux-2.6.32.15/arch/x86/kernel/acpi/boot.c 2010-05-28 21:27:14.939148318 -0400 |
9407 | @@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a | 9404 | @@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a |
9408 | DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), | 9405 | DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), |
9409 | }, | 9406 | }, |
@@ -9413,9 +9410,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/boot.c linux-2.6.32.13/arch/x86/ | |||
9413 | }; | 9410 | }; |
9414 | 9411 | ||
9415 | /* | 9412 | /* |
9416 | diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.13/arch/x86/kernel/acpi/realmode/wakeup.S | 9413 | diff -urNp linux-2.6.32.15/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.15/arch/x86/kernel/acpi/realmode/wakeup.S |
9417 | --- linux-2.6.32.13/arch/x86/kernel/acpi/realmode/wakeup.S 2010-03-15 11:52:04.000000000 -0400 | 9414 | --- linux-2.6.32.15/arch/x86/kernel/acpi/realmode/wakeup.S 2010-03-15 11:52:04.000000000 -0400 |
9418 | +++ linux-2.6.32.13/arch/x86/kernel/acpi/realmode/wakeup.S 2010-05-15 13:21:13.954911113 -0400 | 9415 | +++ linux-2.6.32.15/arch/x86/kernel/acpi/realmode/wakeup.S 2010-05-28 21:27:14.939148318 -0400 |
9419 | @@ -104,7 +104,7 @@ _start: | 9416 | @@ -104,7 +104,7 @@ _start: |
9420 | movl %eax, %ecx | 9417 | movl %eax, %ecx |
9421 | orl %edx, %ecx | 9418 | orl %edx, %ecx |
@@ -9425,9 +9422,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.1 | |||
9425 | wrmsr | 9422 | wrmsr |
9426 | 1: | 9423 | 1: |
9427 | 9424 | ||
9428 | diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/sleep.c linux-2.6.32.13/arch/x86/kernel/acpi/sleep.c | 9425 | diff -urNp linux-2.6.32.15/arch/x86/kernel/acpi/sleep.c linux-2.6.32.15/arch/x86/kernel/acpi/sleep.c |
9429 | --- linux-2.6.32.13/arch/x86/kernel/acpi/sleep.c 2010-05-15 13:20:18.407099662 -0400 | 9426 | --- linux-2.6.32.15/arch/x86/kernel/acpi/sleep.c 2010-05-15 13:20:18.407099662 -0400 |
9430 | +++ linux-2.6.32.13/arch/x86/kernel/acpi/sleep.c 2010-05-15 13:21:13.954911113 -0400 | 9427 | +++ linux-2.6.32.15/arch/x86/kernel/acpi/sleep.c 2010-05-28 21:27:14.943027635 -0400 |
9431 | @@ -11,11 +11,12 @@ | 9428 | @@ -11,11 +11,12 @@ |
9432 | #include <linux/cpumask.h> | 9429 | #include <linux/cpumask.h> |
9433 | #include <asm/segment.h> | 9430 | #include <asm/segment.h> |
@@ -9472,9 +9469,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/sleep.c linux-2.6.32.13/arch/x86 | |||
9472 | } | 9469 | } |
9473 | 9470 | ||
9474 | 9471 | ||
9475 | diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.13/arch/x86/kernel/acpi/wakeup_32.S | 9472 | diff -urNp linux-2.6.32.15/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.15/arch/x86/kernel/acpi/wakeup_32.S |
9476 | --- linux-2.6.32.13/arch/x86/kernel/acpi/wakeup_32.S 2010-03-15 11:52:04.000000000 -0400 | 9473 | --- linux-2.6.32.15/arch/x86/kernel/acpi/wakeup_32.S 2010-03-15 11:52:04.000000000 -0400 |
9477 | +++ linux-2.6.32.13/arch/x86/kernel/acpi/wakeup_32.S 2010-05-15 13:21:13.954911113 -0400 | 9474 | +++ linux-2.6.32.15/arch/x86/kernel/acpi/wakeup_32.S 2010-05-28 21:27:14.943027635 -0400 |
9478 | @@ -30,13 +30,11 @@ wakeup_pmode_return: | 9475 | @@ -30,13 +30,11 @@ wakeup_pmode_return: |
9479 | # and restore the stack ... but you need gdt for this to work | 9476 | # and restore the stack ... but you need gdt for this to work |
9480 | movl saved_context_esp, %esp | 9477 | movl saved_context_esp, %esp |
@@ -9491,9 +9488,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.13/arch | |||
9491 | 9488 | ||
9492 | bogus_magic: | 9489 | bogus_magic: |
9493 | jmp bogus_magic | 9490 | jmp bogus_magic |
9494 | diff -urNp linux-2.6.32.13/arch/x86/kernel/alternative.c linux-2.6.32.13/arch/x86/kernel/alternative.c | 9491 | diff -urNp linux-2.6.32.15/arch/x86/kernel/alternative.c linux-2.6.32.15/arch/x86/kernel/alternative.c |
9495 | --- linux-2.6.32.13/arch/x86/kernel/alternative.c 2010-03-15 11:52:04.000000000 -0400 | 9492 | --- linux-2.6.32.15/arch/x86/kernel/alternative.c 2010-03-15 11:52:04.000000000 -0400 |
9496 | +++ linux-2.6.32.13/arch/x86/kernel/alternative.c 2010-05-15 13:21:13.962912884 -0400 | 9493 | +++ linux-2.6.32.15/arch/x86/kernel/alternative.c 2010-05-28 21:27:14.943027635 -0400 |
9497 | @@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str | 9494 | @@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str |
9498 | 9495 | ||
9499 | BUG_ON(p->len > MAX_PATCH_LEN); | 9496 | BUG_ON(p->len > MAX_PATCH_LEN); |
@@ -9566,9 +9563,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/alternative.c linux-2.6.32.13/arch/x8 | |||
9566 | + BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]); | 9563 | + BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]); |
9567 | return addr; | 9564 | return addr; |
9568 | } | 9565 | } |
9569 | diff -urNp linux-2.6.32.13/arch/x86/kernel/amd_iommu.c linux-2.6.32.13/arch/x86/kernel/amd_iommu.c | 9566 | diff -urNp linux-2.6.32.15/arch/x86/kernel/amd_iommu.c linux-2.6.32.15/arch/x86/kernel/amd_iommu.c |
9570 | --- linux-2.6.32.13/arch/x86/kernel/amd_iommu.c 2010-04-29 17:49:37.521943068 -0400 | 9567 | --- linux-2.6.32.15/arch/x86/kernel/amd_iommu.c 2010-04-29 17:49:37.521943068 -0400 |
9571 | +++ linux-2.6.32.13/arch/x86/kernel/amd_iommu.c 2010-05-15 13:21:13.968009761 -0400 | 9568 | +++ linux-2.6.32.15/arch/x86/kernel/amd_iommu.c 2010-05-28 21:27:14.959145751 -0400 |
9572 | @@ -2074,7 +2074,7 @@ static void prealloc_protection_domains( | 9569 | @@ -2074,7 +2074,7 @@ static void prealloc_protection_domains( |
9573 | } | 9570 | } |
9574 | } | 9571 | } |
@@ -9578,9 +9575,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/amd_iommu.c linux-2.6.32.13/arch/x86/ | |||
9578 | .alloc_coherent = alloc_coherent, | 9575 | .alloc_coherent = alloc_coherent, |
9579 | .free_coherent = free_coherent, | 9576 | .free_coherent = free_coherent, |
9580 | .map_page = map_page, | 9577 | .map_page = map_page, |
9581 | diff -urNp linux-2.6.32.13/arch/x86/kernel/apic/io_apic.c linux-2.6.32.13/arch/x86/kernel/apic/io_apic.c | 9578 | diff -urNp linux-2.6.32.15/arch/x86/kernel/apic/io_apic.c linux-2.6.32.15/arch/x86/kernel/apic/io_apic.c |
9582 | --- linux-2.6.32.13/arch/x86/kernel/apic/io_apic.c 2010-03-15 11:52:04.000000000 -0400 | 9579 | --- linux-2.6.32.15/arch/x86/kernel/apic/io_apic.c 2010-03-15 11:52:04.000000000 -0400 |
9583 | +++ linux-2.6.32.13/arch/x86/kernel/apic/io_apic.c 2010-05-15 13:21:13.979712258 -0400 | 9580 | +++ linux-2.6.32.15/arch/x86/kernel/apic/io_apic.c 2010-05-28 21:27:14.967145332 -0400 |
9584 | @@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi | 9581 | @@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi |
9585 | ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, | 9582 | ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, |
9586 | GFP_ATOMIC); | 9583 | GFP_ATOMIC); |
@@ -9617,9 +9614,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/apic/io_apic.c linux-2.6.32.13/arch/x | |||
9617 | { | 9614 | { |
9618 | spin_unlock(&vector_lock); | 9615 | spin_unlock(&vector_lock); |
9619 | } | 9616 | } |
9620 | diff -urNp linux-2.6.32.13/arch/x86/kernel/apm_32.c linux-2.6.32.13/arch/x86/kernel/apm_32.c | 9617 | diff -urNp linux-2.6.32.15/arch/x86/kernel/apm_32.c linux-2.6.32.15/arch/x86/kernel/apm_32.c |
9621 | --- linux-2.6.32.13/arch/x86/kernel/apm_32.c 2010-03-15 11:52:04.000000000 -0400 | 9618 | --- linux-2.6.32.15/arch/x86/kernel/apm_32.c 2010-03-15 11:52:04.000000000 -0400 |
9622 | +++ linux-2.6.32.13/arch/x86/kernel/apm_32.c 2010-05-15 13:21:14.011066799 -0400 | 9619 | +++ linux-2.6.32.15/arch/x86/kernel/apm_32.c 2010-05-28 21:27:14.975148965 -0400 |
9623 | @@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock); | 9620 | @@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock); |
9624 | * This is for buggy BIOS's that refer to (real mode) segment 0x40 | 9621 | * This is for buggy BIOS's that refer to (real mode) segment 0x40 |
9625 | * even though they are called in protected mode. | 9622 | * even though they are called in protected mode. |
@@ -9721,9 +9718,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/apm_32.c linux-2.6.32.13/arch/x86/ker | |||
9721 | 9718 | ||
9722 | proc_create("apm", 0, NULL, &apm_file_ops); | 9719 | proc_create("apm", 0, NULL, &apm_file_ops); |
9723 | 9720 | ||
9724 | diff -urNp linux-2.6.32.13/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.13/arch/x86/kernel/asm-offsets_32.c | 9721 | diff -urNp linux-2.6.32.15/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.15/arch/x86/kernel/asm-offsets_32.c |
9725 | --- linux-2.6.32.13/arch/x86/kernel/asm-offsets_32.c 2010-03-15 11:52:04.000000000 -0400 | 9722 | --- linux-2.6.32.15/arch/x86/kernel/asm-offsets_32.c 2010-03-15 11:52:04.000000000 -0400 |
9726 | +++ linux-2.6.32.13/arch/x86/kernel/asm-offsets_32.c 2010-05-15 13:21:14.011066799 -0400 | 9723 | +++ linux-2.6.32.15/arch/x86/kernel/asm-offsets_32.c 2010-05-28 21:27:14.975148965 -0400 |
9727 | @@ -115,6 +115,11 @@ void foo(void) | 9724 | @@ -115,6 +115,11 @@ void foo(void) |
9728 | OFFSET(PV_CPU_iret, pv_cpu_ops, iret); | 9725 | OFFSET(PV_CPU_iret, pv_cpu_ops, iret); |
9729 | OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); | 9726 | OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); |
@@ -9736,9 +9733,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.13/arch | |||
9736 | #endif | 9733 | #endif |
9737 | 9734 | ||
9738 | #ifdef CONFIG_XEN | 9735 | #ifdef CONFIG_XEN |
9739 | diff -urNp linux-2.6.32.13/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.13/arch/x86/kernel/asm-offsets_64.c | 9736 | diff -urNp linux-2.6.32.15/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.15/arch/x86/kernel/asm-offsets_64.c |
9740 | --- linux-2.6.32.13/arch/x86/kernel/asm-offsets_64.c 2010-03-15 11:52:04.000000000 -0400 | 9737 | --- linux-2.6.32.15/arch/x86/kernel/asm-offsets_64.c 2010-03-15 11:52:04.000000000 -0400 |
9741 | +++ linux-2.6.32.13/arch/x86/kernel/asm-offsets_64.c 2010-05-15 13:21:14.011066799 -0400 | 9738 | +++ linux-2.6.32.15/arch/x86/kernel/asm-offsets_64.c 2010-05-28 21:27:14.975148965 -0400 |
9742 | @@ -63,6 +63,18 @@ int main(void) | 9739 | @@ -63,6 +63,18 @@ int main(void) |
9743 | OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); | 9740 | OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); |
9744 | OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs); | 9741 | OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs); |
@@ -9766,9 +9763,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.13/arch | |||
9766 | DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); | 9763 | DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); |
9767 | BLANK(); | 9764 | BLANK(); |
9768 | DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); | 9765 | DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); |
9769 | diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/common.c linux-2.6.32.13/arch/x86/kernel/cpu/common.c | 9766 | diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/common.c linux-2.6.32.15/arch/x86/kernel/cpu/common.c |
9770 | --- linux-2.6.32.13/arch/x86/kernel/cpu/common.c 2010-03-15 11:52:04.000000000 -0400 | 9767 | --- linux-2.6.32.15/arch/x86/kernel/cpu/common.c 2010-03-15 11:52:04.000000000 -0400 |
9771 | +++ linux-2.6.32.13/arch/x86/kernel/cpu/common.c 2010-05-15 13:21:14.011066799 -0400 | 9768 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/common.c 2010-05-28 21:27:14.975148965 -0400 |
9772 | @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon | 9769 | @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon |
9773 | 9770 | ||
9774 | static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; | 9771 | static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; |
@@ -9877,9 +9874,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/common.c linux-2.6.32.13/arch/x86 | |||
9877 | struct thread_struct *thread = &curr->thread; | 9874 | struct thread_struct *thread = &curr->thread; |
9878 | 9875 | ||
9879 | if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { | 9876 | if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { |
9880 | diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 9877 | diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c |
9881 | --- linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-03-15 11:52:04.000000000 -0400 | 9878 | --- linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-03-15 11:52:04.000000000 -0400 |
9882 | +++ linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-05-15 13:21:14.043267946 -0400 | 9879 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-05-28 21:27:14.975148965 -0400 |
9883 | @@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any | 9880 | @@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any |
9884 | DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), | 9881 | DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), |
9885 | }, | 9882 | }, |
@@ -9889,9 +9886,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6. | |||
9889 | }; | 9886 | }; |
9890 | 9887 | ||
9891 | static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) | 9888 | static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) |
9892 | diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c | 9889 | diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c |
9893 | --- linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-03-15 11:52:04.000000000 -0400 | 9890 | --- linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-03-15 11:52:04.000000000 -0400 |
9894 | +++ linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-05-15 13:21:14.043267946 -0400 | 9891 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-05-28 21:27:14.975148965 -0400 |
9895 | @@ -225,7 +225,7 @@ static struct cpu_model models[] = | 9892 | @@ -225,7 +225,7 @@ static struct cpu_model models[] = |
9896 | { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL }, | 9893 | { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL }, |
9897 | { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL }, | 9894 | { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL }, |
@@ -9901,9 +9898,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linu | |||
9901 | }; | 9898 | }; |
9902 | #undef _BANIAS | 9899 | #undef _BANIAS |
9903 | #undef BANIAS | 9900 | #undef BANIAS |
9904 | diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/intel.c linux-2.6.32.13/arch/x86/kernel/cpu/intel.c | 9901 | diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/intel.c linux-2.6.32.15/arch/x86/kernel/cpu/intel.c |
9905 | --- linux-2.6.32.13/arch/x86/kernel/cpu/intel.c 2010-05-15 13:20:18.427075180 -0400 | 9902 | --- linux-2.6.32.15/arch/x86/kernel/cpu/intel.c 2010-05-15 13:20:18.427075180 -0400 |
9906 | +++ linux-2.6.32.13/arch/x86/kernel/cpu/intel.c 2010-05-15 13:21:14.043267946 -0400 | 9903 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/intel.c 2010-05-28 21:27:14.975148965 -0400 |
9907 | @@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug | 9904 | @@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug |
9908 | * Update the IDT descriptor and reload the IDT so that | 9905 | * Update the IDT descriptor and reload the IDT so that |
9909 | * it uses the read-only mapped virtual address. | 9906 | * it uses the read-only mapped virtual address. |
@@ -9913,10 +9910,10 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/intel.c linux-2.6.32.13/arch/x86/ | |||
9913 | load_idt(&idt_descr); | 9910 | load_idt(&idt_descr); |
9914 | } | 9911 | } |
9915 | #endif | 9912 | #endif |
9916 | diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.13/arch/x86/kernel/cpu/intel_cacheinfo.c | 9913 | diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.15/arch/x86/kernel/cpu/intel_cacheinfo.c |
9917 | --- linux-2.6.32.13/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-05-15 13:20:18.427075180 -0400 | 9914 | --- linux-2.6.32.15/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-05-28 20:16:44.430924650 -0400 |
9918 | +++ linux-2.6.32.13/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-05-15 13:21:14.043267946 -0400 | 9915 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-05-28 21:27:14.987166265 -0400 |
9919 | @@ -917,7 +917,7 @@ static ssize_t store(struct kobject *kob | 9916 | @@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob |
9920 | return ret; | 9917 | return ret; |
9921 | } | 9918 | } |
9922 | 9919 | ||
@@ -9925,9 +9922,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.13 | |||
9925 | .show = show, | 9922 | .show = show, |
9926 | .store = store, | 9923 | .store = store, |
9927 | }; | 9924 | }; |
9928 | diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/Makefile linux-2.6.32.13/arch/x86/kernel/cpu/Makefile | 9925 | diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/Makefile linux-2.6.32.15/arch/x86/kernel/cpu/Makefile |
9929 | --- linux-2.6.32.13/arch/x86/kernel/cpu/Makefile 2010-03-15 11:52:04.000000000 -0400 | 9926 | --- linux-2.6.32.15/arch/x86/kernel/cpu/Makefile 2010-03-15 11:52:04.000000000 -0400 |
9930 | +++ linux-2.6.32.13/arch/x86/kernel/cpu/Makefile 2010-05-15 13:21:14.043267946 -0400 | 9927 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/Makefile 2010-05-28 21:27:14.987166265 -0400 |
9931 | @@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER | 9928 | @@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER |
9932 | CFLAGS_REMOVE_common.o = -pg | 9929 | CFLAGS_REMOVE_common.o = -pg |
9933 | endif | 9930 | endif |
@@ -9939,9 +9936,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/Makefile linux-2.6.32.13/arch/x86 | |||
9939 | obj-y := intel_cacheinfo.o addon_cpuid_features.o | 9936 | obj-y := intel_cacheinfo.o addon_cpuid_features.o |
9940 | obj-y += proc.o capflags.o powerflags.o common.o | 9937 | obj-y += proc.o capflags.o powerflags.o common.o |
9941 | obj-y += vmware.o hypervisor.o sched.o | 9938 | obj-y += vmware.o hypervisor.o sched.o |
9942 | diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce_amd.c | 9939 | diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce_amd.c |
9943 | --- linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-03-15 11:52:04.000000000 -0400 | 9940 | --- linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-03-15 11:52:04.000000000 -0400 |
9944 | +++ linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-05-15 13:21:14.043267946 -0400 | 9941 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-05-28 21:27:14.995163789 -0400 |
9945 | @@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob | 9942 | @@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob |
9946 | return ret; | 9943 | return ret; |
9947 | } | 9944 | } |
@@ -9951,9 +9948,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.13/ | |||
9951 | .show = show, | 9948 | .show = show, |
9952 | .store = store, | 9949 | .store = store, |
9953 | }; | 9950 | }; |
9954 | diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce.c | 9951 | diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce.c |
9955 | --- linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce.c 2010-03-15 11:52:04.000000000 -0400 | 9952 | --- linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce.c 2010-03-15 11:52:04.000000000 -0400 |
9956 | +++ linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce.c 2010-05-15 13:21:14.043267946 -0400 | 9953 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce.c 2010-05-28 21:27:15.011149672 -0400 |
9957 | @@ -187,7 +187,7 @@ static void print_mce(struct mce *m) | 9954 | @@ -187,7 +187,7 @@ static void print_mce(struct mce *m) |
9958 | !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "", | 9955 | !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "", |
9959 | m->cs, m->ip); | 9956 | m->cs, m->ip); |
@@ -10006,9 +10003,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.13/arch | |||
10006 | }; | 10003 | }; |
10007 | 10004 | ||
10008 | /* | 10005 | /* |
10009 | diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/amd.c | 10006 | diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/amd.c |
10010 | --- linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/amd.c 2010-03-15 11:52:04.000000000 -0400 | 10007 | --- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/amd.c 2010-03-15 11:52:04.000000000 -0400 |
10011 | +++ linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/amd.c 2010-05-15 13:21:14.043267946 -0400 | 10008 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/amd.c 2010-05-28 21:27:15.011149672 -0400 |
10012 | @@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base | 10009 | @@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base |
10013 | return 0; | 10010 | return 0; |
10014 | } | 10011 | } |
@@ -10018,9 +10015,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.13/arch/x | |||
10018 | .vendor = X86_VENDOR_AMD, | 10015 | .vendor = X86_VENDOR_AMD, |
10019 | .set = amd_set_mtrr, | 10016 | .set = amd_set_mtrr, |
10020 | .get = amd_get_mtrr, | 10017 | .get = amd_get_mtrr, |
10021 | diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/centaur.c | 10018 | diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/centaur.c |
10022 | --- linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/centaur.c 2010-03-15 11:52:04.000000000 -0400 | 10019 | --- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/centaur.c 2010-03-15 11:52:04.000000000 -0400 |
10023 | +++ linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/centaur.c 2010-05-15 13:21:14.043267946 -0400 | 10020 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/centaur.c 2010-05-28 21:27:15.011149672 -0400 |
10024 | @@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long | 10021 | @@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long |
10025 | return 0; | 10022 | return 0; |
10026 | } | 10023 | } |
@@ -10030,9 +10027,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.13/ar | |||
10030 | .vendor = X86_VENDOR_CENTAUR, | 10027 | .vendor = X86_VENDOR_CENTAUR, |
10031 | .set = centaur_set_mcr, | 10028 | .set = centaur_set_mcr, |
10032 | .get = centaur_get_mcr, | 10029 | .get = centaur_get_mcr, |
10033 | diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/cyrix.c | 10030 | diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/cyrix.c |
10034 | --- linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-03-15 11:52:04.000000000 -0400 | 10031 | --- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-03-15 11:52:04.000000000 -0400 |
10035 | +++ linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-05-15 13:21:14.043267946 -0400 | 10032 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-05-28 21:27:15.011149672 -0400 |
10036 | @@ -265,7 +265,7 @@ static void cyrix_set_all(void) | 10033 | @@ -265,7 +265,7 @@ static void cyrix_set_all(void) |
10037 | post_set(); | 10034 | post_set(); |
10038 | } | 10035 | } |
@@ -10042,9 +10039,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.13/arch | |||
10042 | .vendor = X86_VENDOR_CYRIX, | 10039 | .vendor = X86_VENDOR_CYRIX, |
10043 | .set_all = cyrix_set_all, | 10040 | .set_all = cyrix_set_all, |
10044 | .set = cyrix_set_arr, | 10041 | .set = cyrix_set_arr, |
10045 | diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/generic.c | 10042 | diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/generic.c |
10046 | --- linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/generic.c 2010-03-15 11:52:04.000000000 -0400 | 10043 | --- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/generic.c 2010-03-15 11:52:04.000000000 -0400 |
10047 | +++ linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/generic.c 2010-05-15 13:21:14.043267946 -0400 | 10044 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/generic.c 2010-05-28 21:27:15.011149672 -0400 |
10048 | @@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra | 10045 | @@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra |
10049 | { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ | 10046 | { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ |
10050 | { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ | 10047 | { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ |
@@ -10063,9 +10060,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.13/ar | |||
10063 | .use_intel_if = 1, | 10060 | .use_intel_if = 1, |
10064 | .set_all = generic_set_all, | 10061 | .set_all = generic_set_all, |
10065 | .get = generic_get_mtrr, | 10062 | .get = generic_get_mtrr, |
10066 | diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/main.c | 10063 | diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/main.c |
10067 | --- linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/main.c 2010-03-15 11:52:04.000000000 -0400 | 10064 | --- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/main.c 2010-03-15 11:52:04.000000000 -0400 |
10068 | +++ linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/main.c 2010-05-15 13:21:14.043267946 -0400 | 10065 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/main.c 2010-05-28 21:27:15.011149672 -0400 |
10069 | @@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); | 10066 | @@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); |
10070 | u64 size_or_mask, size_and_mask; | 10067 | u64 size_or_mask, size_and_mask; |
10071 | static bool mtrr_aps_delayed_init; | 10068 | static bool mtrr_aps_delayed_init; |
@@ -10084,9 +10081,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.13/arch/ | |||
10084 | { | 10081 | { |
10085 | if (ops->vendor && ops->vendor < X86_VENDOR_NUM) | 10082 | if (ops->vendor && ops->vendor < X86_VENDOR_NUM) |
10086 | mtrr_ops[ops->vendor] = ops; | 10083 | mtrr_ops[ops->vendor] = ops; |
10087 | diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/mtrr.h | 10084 | diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/mtrr.h |
10088 | --- linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-03-15 11:52:04.000000000 -0400 | 10085 | --- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-03-15 11:52:04.000000000 -0400 |
10089 | +++ linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-05-15 13:21:14.043267946 -0400 | 10086 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-05-28 21:27:15.011149672 -0400 |
10090 | @@ -12,19 +12,19 @@ | 10087 | @@ -12,19 +12,19 @@ |
10091 | extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; | 10088 | extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; |
10092 | 10089 | ||
@@ -10137,9 +10134,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.13/arch/ | |||
10137 | 10134 | ||
10138 | #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd) | 10135 | #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd) |
10139 | #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1) | 10136 | #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1) |
10140 | diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.13/arch/x86/kernel/cpu/perfctr-watchdog.c | 10137 | diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.15/arch/x86/kernel/cpu/perfctr-watchdog.c |
10141 | --- linux-2.6.32.13/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-03-15 11:52:04.000000000 -0400 | 10138 | --- linux-2.6.32.15/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-03-15 11:52:04.000000000 -0400 |
10142 | +++ linux-2.6.32.13/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-05-15 13:21:14.043267946 -0400 | 10139 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-05-28 21:27:15.011149672 -0400 |
10143 | @@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk { | 10140 | @@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk { |
10144 | 10141 | ||
10145 | /* Interface defining a CPU specific perfctr watchdog */ | 10142 | /* Interface defining a CPU specific perfctr watchdog */ |
@@ -10173,9 +10170,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.1 | |||
10173 | static struct wd_ops intel_arch_wd_ops __read_mostly = { | 10170 | static struct wd_ops intel_arch_wd_ops __read_mostly = { |
10174 | .reserve = single_msr_reserve, | 10171 | .reserve = single_msr_reserve, |
10175 | .unreserve = single_msr_unreserve, | 10172 | .unreserve = single_msr_unreserve, |
10176 | diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.13/arch/x86/kernel/cpu/perf_event.c | 10173 | diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.15/arch/x86/kernel/cpu/perf_event.c |
10177 | --- linux-2.6.32.13/arch/x86/kernel/cpu/perf_event.c 2010-04-29 17:49:37.537108997 -0400 | 10174 | --- linux-2.6.32.15/arch/x86/kernel/cpu/perf_event.c 2010-04-29 17:49:37.537108997 -0400 |
10178 | +++ linux-2.6.32.13/arch/x86/kernel/cpu/perf_event.c 2010-05-15 13:21:14.046723916 -0400 | 10175 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/perf_event.c 2010-05-28 21:27:15.015028232 -0400 |
10179 | @@ -2354,7 +2354,7 @@ perf_callchain_user(struct pt_regs *regs | 10176 | @@ -2354,7 +2354,7 @@ perf_callchain_user(struct pt_regs *regs |
10180 | break; | 10177 | break; |
10181 | 10178 | ||
@@ -10185,9 +10182,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.13/arch | |||
10185 | } | 10182 | } |
10186 | } | 10183 | } |
10187 | 10184 | ||
10188 | diff -urNp linux-2.6.32.13/arch/x86/kernel/crash.c linux-2.6.32.13/arch/x86/kernel/crash.c | 10185 | diff -urNp linux-2.6.32.15/arch/x86/kernel/crash.c linux-2.6.32.15/arch/x86/kernel/crash.c |
10189 | --- linux-2.6.32.13/arch/x86/kernel/crash.c 2010-04-29 17:49:37.537108997 -0400 | 10186 | --- linux-2.6.32.15/arch/x86/kernel/crash.c 2010-04-29 17:49:37.537108997 -0400 |
10190 | +++ linux-2.6.32.13/arch/x86/kernel/crash.c 2010-05-15 13:21:14.046723916 -0400 | 10187 | +++ linux-2.6.32.15/arch/x86/kernel/crash.c 2010-05-28 21:27:15.015028232 -0400 |
10191 | @@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu, | 10188 | @@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu, |
10192 | regs = args->regs; | 10189 | regs = args->regs; |
10193 | 10190 | ||
@@ -10197,9 +10194,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/crash.c linux-2.6.32.13/arch/x86/kern | |||
10197 | crash_fixup_ss_esp(&fixed_regs, regs); | 10194 | crash_fixup_ss_esp(&fixed_regs, regs); |
10198 | regs = &fixed_regs; | 10195 | regs = &fixed_regs; |
10199 | } | 10196 | } |
10200 | diff -urNp linux-2.6.32.13/arch/x86/kernel/doublefault_32.c linux-2.6.32.13/arch/x86/kernel/doublefault_32.c | 10197 | diff -urNp linux-2.6.32.15/arch/x86/kernel/doublefault_32.c linux-2.6.32.15/arch/x86/kernel/doublefault_32.c |
10201 | --- linux-2.6.32.13/arch/x86/kernel/doublefault_32.c 2010-03-15 11:52:04.000000000 -0400 | 10198 | --- linux-2.6.32.15/arch/x86/kernel/doublefault_32.c 2010-03-15 11:52:04.000000000 -0400 |
10202 | +++ linux-2.6.32.13/arch/x86/kernel/doublefault_32.c 2010-05-15 13:21:14.046723916 -0400 | 10199 | +++ linux-2.6.32.15/arch/x86/kernel/doublefault_32.c 2010-05-28 21:27:15.015028232 -0400 |
10203 | @@ -11,7 +11,7 @@ | 10200 | @@ -11,7 +11,7 @@ |
10204 | 10201 | ||
10205 | #define DOUBLEFAULT_STACKSIZE (1024) | 10202 | #define DOUBLEFAULT_STACKSIZE (1024) |
@@ -10231,9 +10228,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/doublefault_32.c linux-2.6.32.13/arch | |||
10231 | .fs = __KERNEL_PERCPU, | 10228 | .fs = __KERNEL_PERCPU, |
10232 | 10229 | ||
10233 | .__cr3 = __pa_nodebug(swapper_pg_dir), | 10230 | .__cr3 = __pa_nodebug(swapper_pg_dir), |
10234 | diff -urNp linux-2.6.32.13/arch/x86/kernel/dumpstack_32.c linux-2.6.32.13/arch/x86/kernel/dumpstack_32.c | 10231 | diff -urNp linux-2.6.32.15/arch/x86/kernel/dumpstack_32.c linux-2.6.32.15/arch/x86/kernel/dumpstack_32.c |
10235 | --- linux-2.6.32.13/arch/x86/kernel/dumpstack_32.c 2010-03-15 11:52:04.000000000 -0400 | 10232 | --- linux-2.6.32.15/arch/x86/kernel/dumpstack_32.c 2010-03-15 11:52:04.000000000 -0400 |
10236 | +++ linux-2.6.32.13/arch/x86/kernel/dumpstack_32.c 2010-05-15 13:21:14.068544431 -0400 | 10233 | +++ linux-2.6.32.15/arch/x86/kernel/dumpstack_32.c 2010-05-28 21:27:15.015028232 -0400 |
10237 | @@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs | 10234 | @@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs |
10238 | * When in-kernel, we also print out the stack and code at the | 10235 | * When in-kernel, we also print out the stack and code at the |
10239 | * time of the fault.. | 10236 | * time of the fault.. |
@@ -10278,9 +10275,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/dumpstack_32.c linux-2.6.32.13/arch/x | |||
10278 | if (ip < PAGE_OFFSET) | 10275 | if (ip < PAGE_OFFSET) |
10279 | return 0; | 10276 | return 0; |
10280 | if (probe_kernel_address((unsigned short *)ip, ud2)) | 10277 | if (probe_kernel_address((unsigned short *)ip, ud2)) |
10281 | diff -urNp linux-2.6.32.13/arch/x86/kernel/dumpstack.c linux-2.6.32.13/arch/x86/kernel/dumpstack.c | 10278 | diff -urNp linux-2.6.32.15/arch/x86/kernel/dumpstack.c linux-2.6.32.15/arch/x86/kernel/dumpstack.c |
10282 | --- linux-2.6.32.13/arch/x86/kernel/dumpstack.c 2010-03-15 11:52:04.000000000 -0400 | 10279 | --- linux-2.6.32.15/arch/x86/kernel/dumpstack.c 2010-03-15 11:52:04.000000000 -0400 |
10283 | +++ linux-2.6.32.13/arch/x86/kernel/dumpstack.c 2010-05-15 13:21:14.068544431 -0400 | 10280 | +++ linux-2.6.32.15/arch/x86/kernel/dumpstack.c 2010-05-28 21:27:15.023156603 -0400 |
10284 | @@ -180,7 +180,7 @@ void dump_stack(void) | 10281 | @@ -180,7 +180,7 @@ void dump_stack(void) |
10285 | #endif | 10282 | #endif |
10286 | 10283 | ||
@@ -10308,9 +10305,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/dumpstack.c linux-2.6.32.13/arch/x86/ | |||
10308 | report_bug(regs->ip, regs); | 10305 | report_bug(regs->ip, regs); |
10309 | 10306 | ||
10310 | if (__die(str, regs, err)) | 10307 | if (__die(str, regs, err)) |
10311 | diff -urNp linux-2.6.32.13/arch/x86/kernel/e820.c linux-2.6.32.13/arch/x86/kernel/e820.c | 10308 | diff -urNp linux-2.6.32.15/arch/x86/kernel/e820.c linux-2.6.32.15/arch/x86/kernel/e820.c |
10312 | --- linux-2.6.32.13/arch/x86/kernel/e820.c 2010-03-15 11:52:04.000000000 -0400 | 10309 | --- linux-2.6.32.15/arch/x86/kernel/e820.c 2010-03-15 11:52:04.000000000 -0400 |
10313 | +++ linux-2.6.32.13/arch/x86/kernel/e820.c 2010-05-15 13:21:14.068544431 -0400 | 10310 | +++ linux-2.6.32.15/arch/x86/kernel/e820.c 2010-05-28 21:27:15.023156603 -0400 |
10314 | @@ -733,7 +733,7 @@ struct early_res { | 10311 | @@ -733,7 +733,7 @@ struct early_res { |
10315 | }; | 10312 | }; |
10316 | static struct early_res early_res[MAX_EARLY_RES] __initdata = { | 10313 | static struct early_res early_res[MAX_EARLY_RES] __initdata = { |
@@ -10320,9 +10317,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/e820.c linux-2.6.32.13/arch/x86/kerne | |||
10320 | }; | 10317 | }; |
10321 | 10318 | ||
10322 | static int __init find_overlapped_early(u64 start, u64 end) | 10319 | static int __init find_overlapped_early(u64 start, u64 end) |
10323 | diff -urNp linux-2.6.32.13/arch/x86/kernel/efi_32.c linux-2.6.32.13/arch/x86/kernel/efi_32.c | 10320 | diff -urNp linux-2.6.32.15/arch/x86/kernel/efi_32.c linux-2.6.32.15/arch/x86/kernel/efi_32.c |
10324 | --- linux-2.6.32.13/arch/x86/kernel/efi_32.c 2010-03-15 11:52:04.000000000 -0400 | 10321 | --- linux-2.6.32.15/arch/x86/kernel/efi_32.c 2010-03-15 11:52:04.000000000 -0400 |
10325 | +++ linux-2.6.32.13/arch/x86/kernel/efi_32.c 2010-05-15 13:21:14.068544431 -0400 | 10322 | +++ linux-2.6.32.15/arch/x86/kernel/efi_32.c 2010-05-28 21:27:15.023156603 -0400 |
10326 | @@ -38,70 +38,38 @@ | 10323 | @@ -38,70 +38,38 @@ |
10327 | */ | 10324 | */ |
10328 | 10325 | ||
@@ -10403,9 +10400,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/efi_32.c linux-2.6.32.13/arch/x86/ker | |||
10403 | 10400 | ||
10404 | /* | 10401 | /* |
10405 | * After the lock is released, the original page table is restored. | 10402 | * After the lock is released, the original page table is restored. |
10406 | diff -urNp linux-2.6.32.13/arch/x86/kernel/efi_stub_32.S linux-2.6.32.13/arch/x86/kernel/efi_stub_32.S | 10403 | diff -urNp linux-2.6.32.15/arch/x86/kernel/efi_stub_32.S linux-2.6.32.15/arch/x86/kernel/efi_stub_32.S |
10407 | --- linux-2.6.32.13/arch/x86/kernel/efi_stub_32.S 2010-03-15 11:52:04.000000000 -0400 | 10404 | --- linux-2.6.32.15/arch/x86/kernel/efi_stub_32.S 2010-03-15 11:52:04.000000000 -0400 |
10408 | +++ linux-2.6.32.13/arch/x86/kernel/efi_stub_32.S 2010-05-15 13:21:14.068544431 -0400 | 10405 | +++ linux-2.6.32.15/arch/x86/kernel/efi_stub_32.S 2010-05-28 21:27:15.031137412 -0400 |
10409 | @@ -6,6 +6,7 @@ | 10406 | @@ -6,6 +6,7 @@ |
10410 | */ | 10407 | */ |
10411 | 10408 | ||
@@ -10504,9 +10501,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/efi_stub_32.S linux-2.6.32.13/arch/x8 | |||
10504 | saved_return_addr: | 10501 | saved_return_addr: |
10505 | .long 0 | 10502 | .long 0 |
10506 | efi_rt_function_ptr: | 10503 | efi_rt_function_ptr: |
10507 | diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_32.S linux-2.6.32.13/arch/x86/kernel/entry_32.S | 10504 | diff -urNp linux-2.6.32.15/arch/x86/kernel/entry_32.S linux-2.6.32.15/arch/x86/kernel/entry_32.S |
10508 | --- linux-2.6.32.13/arch/x86/kernel/entry_32.S 2010-03-15 11:52:04.000000000 -0400 | 10505 | --- linux-2.6.32.15/arch/x86/kernel/entry_32.S 2010-03-15 11:52:04.000000000 -0400 |
10509 | +++ linux-2.6.32.13/arch/x86/kernel/entry_32.S 2010-05-15 13:21:14.068544431 -0400 | 10506 | +++ linux-2.6.32.15/arch/x86/kernel/entry_32.S 2010-05-28 21:27:15.031137412 -0400 |
10510 | @@ -191,7 +191,67 @@ | 10507 | @@ -191,7 +191,67 @@ |
10511 | 10508 | ||
10512 | #endif /* CONFIG_X86_32_LAZY_GS */ | 10509 | #endif /* CONFIG_X86_32_LAZY_GS */ |
@@ -10820,9 +10817,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_32.S linux-2.6.32.13/arch/x86/k | |||
10820 | RESTORE_REGS | 10817 | RESTORE_REGS |
10821 | lss 12+4(%esp), %esp # back to espfix stack | 10818 | lss 12+4(%esp), %esp # back to espfix stack |
10822 | CFI_ADJUST_CFA_OFFSET -24 | 10819 | CFI_ADJUST_CFA_OFFSET -24 |
10823 | diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_64.S linux-2.6.32.13/arch/x86/kernel/entry_64.S | 10820 | diff -urNp linux-2.6.32.15/arch/x86/kernel/entry_64.S linux-2.6.32.15/arch/x86/kernel/entry_64.S |
10824 | --- linux-2.6.32.13/arch/x86/kernel/entry_64.S 2010-03-15 11:52:04.000000000 -0400 | 10821 | --- linux-2.6.32.15/arch/x86/kernel/entry_64.S 2010-03-15 11:52:04.000000000 -0400 |
10825 | +++ linux-2.6.32.13/arch/x86/kernel/entry_64.S 2010-05-15 13:23:38.934774262 -0400 | 10822 | +++ linux-2.6.32.15/arch/x86/kernel/entry_64.S 2010-05-28 21:27:15.031137412 -0400 |
10826 | @@ -53,6 +53,7 @@ | 10823 | @@ -53,6 +53,7 @@ |
10827 | #include <asm/paravirt.h> | 10824 | #include <asm/paravirt.h> |
10828 | #include <asm/ftrace.h> | 10825 | #include <asm/ftrace.h> |
@@ -11280,9 +11277,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_64.S linux-2.6.32.13/arch/x86/k | |||
11280 | RESTORE_ALL 8 | 11277 | RESTORE_ALL 8 |
11281 | jmp irq_return | 11278 | jmp irq_return |
11282 | nmi_userspace: | 11279 | nmi_userspace: |
11283 | diff -urNp linux-2.6.32.13/arch/x86/kernel/ftrace.c linux-2.6.32.13/arch/x86/kernel/ftrace.c | 11280 | diff -urNp linux-2.6.32.15/arch/x86/kernel/ftrace.c linux-2.6.32.15/arch/x86/kernel/ftrace.c |
11284 | --- linux-2.6.32.13/arch/x86/kernel/ftrace.c 2010-03-15 11:52:04.000000000 -0400 | 11281 | --- linux-2.6.32.15/arch/x86/kernel/ftrace.c 2010-03-15 11:52:04.000000000 -0400 |
11285 | +++ linux-2.6.32.13/arch/x86/kernel/ftrace.c 2010-05-15 13:21:14.070771689 -0400 | 11282 | +++ linux-2.6.32.15/arch/x86/kernel/ftrace.c 2010-05-28 21:27:15.031137412 -0400 |
11286 | @@ -149,7 +149,9 @@ void ftrace_nmi_enter(void) | 11283 | @@ -149,7 +149,9 @@ void ftrace_nmi_enter(void) |
11287 | { | 11284 | { |
11288 | if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { | 11285 | if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { |
@@ -11348,9 +11345,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/ftrace.c linux-2.6.32.13/arch/x86/ker | |||
11348 | if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) | 11345 | if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) |
11349 | return -EFAULT; | 11346 | return -EFAULT; |
11350 | 11347 | ||
11351 | diff -urNp linux-2.6.32.13/arch/x86/kernel/head32.c linux-2.6.32.13/arch/x86/kernel/head32.c | 11348 | diff -urNp linux-2.6.32.15/arch/x86/kernel/head32.c linux-2.6.32.15/arch/x86/kernel/head32.c |
11352 | --- linux-2.6.32.13/arch/x86/kernel/head32.c 2010-03-15 11:52:04.000000000 -0400 | 11349 | --- linux-2.6.32.15/arch/x86/kernel/head32.c 2010-03-15 11:52:04.000000000 -0400 |
11353 | +++ linux-2.6.32.13/arch/x86/kernel/head32.c 2010-05-15 13:21:14.070771689 -0400 | 11350 | +++ linux-2.6.32.15/arch/x86/kernel/head32.c 2010-05-28 21:27:15.031137412 -0400 |
11354 | @@ -16,6 +16,7 @@ | 11351 | @@ -16,6 +16,7 @@ |
11355 | #include <asm/apic.h> | 11352 | #include <asm/apic.h> |
11356 | #include <asm/io_apic.h> | 11353 | #include <asm/io_apic.h> |
@@ -11368,9 +11365,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head32.c linux-2.6.32.13/arch/x86/ker | |||
11368 | 11365 | ||
11369 | #ifdef CONFIG_BLK_DEV_INITRD | 11366 | #ifdef CONFIG_BLK_DEV_INITRD |
11370 | /* Reserve INITRD */ | 11367 | /* Reserve INITRD */ |
11371 | diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/kernel/head_32.S | 11368 | diff -urNp linux-2.6.32.15/arch/x86/kernel/head_32.S linux-2.6.32.15/arch/x86/kernel/head_32.S |
11372 | --- linux-2.6.32.13/arch/x86/kernel/head_32.S 2010-03-15 11:52:04.000000000 -0400 | 11369 | --- linux-2.6.32.15/arch/x86/kernel/head_32.S 2010-03-15 11:52:04.000000000 -0400 |
11373 | +++ linux-2.6.32.13/arch/x86/kernel/head_32.S 2010-05-15 13:21:14.070771689 -0400 | 11370 | +++ linux-2.6.32.15/arch/x86/kernel/head_32.S 2010-05-28 21:27:15.039159907 -0400 |
11374 | @@ -19,10 +19,17 @@ | 11371 | @@ -19,10 +19,17 @@ |
11375 | #include <asm/setup.h> | 11372 | #include <asm/setup.h> |
11376 | #include <asm/processor-flags.h> | 11373 | #include <asm/processor-flags.h> |
@@ -11812,9 +11809,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/ke | |||
11812 | + /* Be sure this is zeroed to avoid false validations in Xen */ | 11809 | + /* Be sure this is zeroed to avoid false validations in Xen */ |
11813 | + .fill PAGE_SIZE_asm - GDT_SIZE,1,0 | 11810 | + .fill PAGE_SIZE_asm - GDT_SIZE,1,0 |
11814 | + .endr | 11811 | + .endr |
11815 | diff -urNp linux-2.6.32.13/arch/x86/kernel/head64.c linux-2.6.32.13/arch/x86/kernel/head64.c | 11812 | diff -urNp linux-2.6.32.15/arch/x86/kernel/head64.c linux-2.6.32.15/arch/x86/kernel/head64.c |
11816 | --- linux-2.6.32.13/arch/x86/kernel/head64.c 2010-03-15 11:52:04.000000000 -0400 | 11813 | --- linux-2.6.32.15/arch/x86/kernel/head64.c 2010-03-15 11:52:04.000000000 -0400 |
11817 | +++ linux-2.6.32.13/arch/x86/kernel/head64.c 2010-05-15 13:21:14.070771689 -0400 | 11814 | +++ linux-2.6.32.15/arch/x86/kernel/head64.c 2010-05-28 21:27:15.039159907 -0400 |
11818 | @@ -29,7 +29,13 @@ | 11815 | @@ -29,7 +29,13 @@ |
11819 | static void __init zap_identity_mappings(void) | 11816 | static void __init zap_identity_mappings(void) |
11820 | { | 11817 | { |
@@ -11829,9 +11826,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head64.c linux-2.6.32.13/arch/x86/ker | |||
11829 | __flush_tlb_all(); | 11826 | __flush_tlb_all(); |
11830 | } | 11827 | } |
11831 | 11828 | ||
11832 | diff -urNp linux-2.6.32.13/arch/x86/kernel/head_64.S linux-2.6.32.13/arch/x86/kernel/head_64.S | 11829 | diff -urNp linux-2.6.32.15/arch/x86/kernel/head_64.S linux-2.6.32.15/arch/x86/kernel/head_64.S |
11833 | --- linux-2.6.32.13/arch/x86/kernel/head_64.S 2010-03-15 11:52:04.000000000 -0400 | 11830 | --- linux-2.6.32.15/arch/x86/kernel/head_64.S 2010-03-15 11:52:04.000000000 -0400 |
11834 | +++ linux-2.6.32.13/arch/x86/kernel/head_64.S 2010-05-15 13:21:14.070771689 -0400 | 11831 | +++ linux-2.6.32.15/arch/x86/kernel/head_64.S 2010-05-28 21:27:15.039159907 -0400 |
11835 | @@ -19,6 +19,7 @@ | 11832 | @@ -19,6 +19,7 @@ |
11836 | #include <asm/cache.h> | 11833 | #include <asm/cache.h> |
11837 | #include <asm/processor-flags.h> | 11834 | #include <asm/processor-flags.h> |
@@ -12102,9 +12099,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_64.S linux-2.6.32.13/arch/x86/ke | |||
12102 | 12099 | ||
12103 | __PAGE_ALIGNED_BSS | 12100 | __PAGE_ALIGNED_BSS |
12104 | .align PAGE_SIZE | 12101 | .align PAGE_SIZE |
12105 | diff -urNp linux-2.6.32.13/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.13/arch/x86/kernel/i386_ksyms_32.c | 12102 | diff -urNp linux-2.6.32.15/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.15/arch/x86/kernel/i386_ksyms_32.c |
12106 | --- linux-2.6.32.13/arch/x86/kernel/i386_ksyms_32.c 2010-03-15 11:52:04.000000000 -0400 | 12103 | --- linux-2.6.32.15/arch/x86/kernel/i386_ksyms_32.c 2010-03-15 11:52:04.000000000 -0400 |
12107 | +++ linux-2.6.32.13/arch/x86/kernel/i386_ksyms_32.c 2010-05-15 13:21:14.070771689 -0400 | 12104 | +++ linux-2.6.32.15/arch/x86/kernel/i386_ksyms_32.c 2010-05-28 21:27:15.039159907 -0400 |
12108 | @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); | 12105 | @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); |
12109 | EXPORT_SYMBOL(cmpxchg8b_emu); | 12106 | EXPORT_SYMBOL(cmpxchg8b_emu); |
12110 | #endif | 12107 | #endif |
@@ -12126,9 +12123,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.13/arch/ | |||
12126 | +#ifdef CONFIG_PAX_KERNEXEC | 12123 | +#ifdef CONFIG_PAX_KERNEXEC |
12127 | +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); | 12124 | +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); |
12128 | +#endif | 12125 | +#endif |
12129 | diff -urNp linux-2.6.32.13/arch/x86/kernel/init_task.c linux-2.6.32.13/arch/x86/kernel/init_task.c | 12126 | diff -urNp linux-2.6.32.15/arch/x86/kernel/init_task.c linux-2.6.32.15/arch/x86/kernel/init_task.c |
12130 | --- linux-2.6.32.13/arch/x86/kernel/init_task.c 2010-03-15 11:52:04.000000000 -0400 | 12127 | --- linux-2.6.32.15/arch/x86/kernel/init_task.c 2010-03-15 11:52:04.000000000 -0400 |
12131 | +++ linux-2.6.32.13/arch/x86/kernel/init_task.c 2010-05-15 13:21:14.070771689 -0400 | 12128 | +++ linux-2.6.32.15/arch/x86/kernel/init_task.c 2010-05-28 21:27:15.039159907 -0400 |
12132 | @@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task); | 12129 | @@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task); |
12133 | * section. Since TSS's are completely CPU-local, we want them | 12130 | * section. Since TSS's are completely CPU-local, we want them |
12134 | * on exact cacheline boundaries, to eliminate cacheline ping-pong. | 12131 | * on exact cacheline boundaries, to eliminate cacheline ping-pong. |
@@ -12137,9 +12134,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/init_task.c linux-2.6.32.13/arch/x86/ | |||
12137 | - | 12134 | - |
12138 | +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; | 12135 | +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; |
12139 | +EXPORT_SYMBOL(init_tss); | 12136 | +EXPORT_SYMBOL(init_tss); |
12140 | diff -urNp linux-2.6.32.13/arch/x86/kernel/ioport.c linux-2.6.32.13/arch/x86/kernel/ioport.c | 12137 | diff -urNp linux-2.6.32.15/arch/x86/kernel/ioport.c linux-2.6.32.15/arch/x86/kernel/ioport.c |
12141 | --- linux-2.6.32.13/arch/x86/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400 | 12138 | --- linux-2.6.32.15/arch/x86/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400 |
12142 | +++ linux-2.6.32.13/arch/x86/kernel/ioport.c 2010-05-15 13:21:14.070771689 -0400 | 12139 | +++ linux-2.6.32.15/arch/x86/kernel/ioport.c 2010-05-28 21:27:15.039159907 -0400 |
12143 | @@ -6,6 +6,7 @@ | 12140 | @@ -6,6 +6,7 @@ |
12144 | #include <linux/sched.h> | 12141 | #include <linux/sched.h> |
12145 | #include <linux/kernel.h> | 12142 | #include <linux/kernel.h> |
@@ -12184,9 +12181,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/ioport.c linux-2.6.32.13/arch/x86/ker | |||
12184 | } | 12181 | } |
12185 | regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12); | 12182 | regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12); |
12186 | 12183 | ||
12187 | diff -urNp linux-2.6.32.13/arch/x86/kernel/irq_32.c linux-2.6.32.13/arch/x86/kernel/irq_32.c | 12184 | diff -urNp linux-2.6.32.15/arch/x86/kernel/irq_32.c linux-2.6.32.15/arch/x86/kernel/irq_32.c |
12188 | --- linux-2.6.32.13/arch/x86/kernel/irq_32.c 2010-03-15 11:52:04.000000000 -0400 | 12185 | --- linux-2.6.32.15/arch/x86/kernel/irq_32.c 2010-03-15 11:52:04.000000000 -0400 |
12189 | +++ linux-2.6.32.13/arch/x86/kernel/irq_32.c 2010-05-15 13:21:14.070771689 -0400 | 12186 | +++ linux-2.6.32.15/arch/x86/kernel/irq_32.c 2010-05-28 21:27:15.039159907 -0400 |
12190 | @@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc | 12187 | @@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc |
12191 | return 0; | 12188 | return 0; |
12192 | 12189 | ||
@@ -12205,9 +12202,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/irq_32.c linux-2.6.32.13/arch/x86/ker | |||
12205 | 12202 | ||
12206 | call_on_stack(__do_softirq, isp); | 12203 | call_on_stack(__do_softirq, isp); |
12207 | /* | 12204 | /* |
12208 | diff -urNp linux-2.6.32.13/arch/x86/kernel/kgdb.c linux-2.6.32.13/arch/x86/kernel/kgdb.c | 12205 | diff -urNp linux-2.6.32.15/arch/x86/kernel/kgdb.c linux-2.6.32.15/arch/x86/kernel/kgdb.c |
12209 | --- linux-2.6.32.13/arch/x86/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 | 12206 | --- linux-2.6.32.15/arch/x86/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 |
12210 | +++ linux-2.6.32.13/arch/x86/kernel/kgdb.c 2010-05-15 13:21:14.070771689 -0400 | 12207 | +++ linux-2.6.32.15/arch/x86/kernel/kgdb.c 2010-05-28 21:27:15.039159907 -0400 |
12211 | @@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception | 12208 | @@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception |
12212 | return instruction_pointer(regs); | 12209 | return instruction_pointer(regs); |
12213 | } | 12210 | } |
@@ -12217,9 +12214,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/kgdb.c linux-2.6.32.13/arch/x86/kerne | |||
12217 | /* Breakpoint instruction: */ | 12214 | /* Breakpoint instruction: */ |
12218 | .gdb_bpt_instr = { 0xcc }, | 12215 | .gdb_bpt_instr = { 0xcc }, |
12219 | .flags = KGDB_HW_BREAKPOINT, | 12216 | .flags = KGDB_HW_BREAKPOINT, |
12220 | diff -urNp linux-2.6.32.13/arch/x86/kernel/kprobes.c linux-2.6.32.13/arch/x86/kernel/kprobes.c | 12217 | diff -urNp linux-2.6.32.15/arch/x86/kernel/kprobes.c linux-2.6.32.15/arch/x86/kernel/kprobes.c |
12221 | --- linux-2.6.32.13/arch/x86/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400 | 12218 | --- linux-2.6.32.15/arch/x86/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400 |
12222 | +++ linux-2.6.32.13/arch/x86/kernel/kprobes.c 2010-05-15 13:23:38.934774262 -0400 | 12219 | +++ linux-2.6.32.15/arch/x86/kernel/kprobes.c 2010-05-28 21:27:15.039159907 -0400 |
12223 | @@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f | 12220 | @@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f |
12224 | char op; | 12221 | char op; |
12225 | s32 raddr; | 12222 | s32 raddr; |
@@ -12312,9 +12309,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/kprobes.c linux-2.6.32.13/arch/x86/ke | |||
12312 | return ret; | 12309 | return ret; |
12313 | 12310 | ||
12314 | switch (val) { | 12311 | switch (val) { |
12315 | diff -urNp linux-2.6.32.13/arch/x86/kernel/ldt.c linux-2.6.32.13/arch/x86/kernel/ldt.c | 12312 | diff -urNp linux-2.6.32.15/arch/x86/kernel/ldt.c linux-2.6.32.15/arch/x86/kernel/ldt.c |
12316 | --- linux-2.6.32.13/arch/x86/kernel/ldt.c 2010-03-15 11:52:04.000000000 -0400 | 12313 | --- linux-2.6.32.15/arch/x86/kernel/ldt.c 2010-03-15 11:52:04.000000000 -0400 |
12317 | +++ linux-2.6.32.13/arch/x86/kernel/ldt.c 2010-05-15 13:21:14.074681352 -0400 | 12314 | +++ linux-2.6.32.15/arch/x86/kernel/ldt.c 2010-05-28 21:27:15.039159907 -0400 |
12318 | @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i | 12315 | @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i |
12319 | if (reload) { | 12316 | if (reload) { |
12320 | #ifdef CONFIG_SMP | 12317 | #ifdef CONFIG_SMP |
@@ -12379,9 +12376,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/ldt.c linux-2.6.32.13/arch/x86/kernel | |||
12379 | fill_ldt(&ldt, &ldt_info); | 12376 | fill_ldt(&ldt, &ldt_info); |
12380 | if (oldmode) | 12377 | if (oldmode) |
12381 | ldt.avl = 0; | 12378 | ldt.avl = 0; |
12382 | diff -urNp linux-2.6.32.13/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.13/arch/x86/kernel/machine_kexec_32.c | 12379 | diff -urNp linux-2.6.32.15/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.15/arch/x86/kernel/machine_kexec_32.c |
12383 | --- linux-2.6.32.13/arch/x86/kernel/machine_kexec_32.c 2010-03-15 11:52:04.000000000 -0400 | 12380 | --- linux-2.6.32.15/arch/x86/kernel/machine_kexec_32.c 2010-03-15 11:52:04.000000000 -0400 |
12384 | +++ linux-2.6.32.13/arch/x86/kernel/machine_kexec_32.c 2010-05-15 13:21:14.082777933 -0400 | 12381 | +++ linux-2.6.32.15/arch/x86/kernel/machine_kexec_32.c 2010-05-28 21:27:15.043064911 -0400 |
12385 | @@ -26,7 +26,7 @@ | 12382 | @@ -26,7 +26,7 @@ |
12386 | #include <asm/system.h> | 12383 | #include <asm/system.h> |
12387 | #include <asm/cacheflush.h> | 12384 | #include <asm/cacheflush.h> |
@@ -12409,9 +12406,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.13/ar | |||
12409 | 12406 | ||
12410 | relocate_kernel_ptr = control_page; | 12407 | relocate_kernel_ptr = control_page; |
12411 | page_list[PA_CONTROL_PAGE] = __pa(control_page); | 12408 | page_list[PA_CONTROL_PAGE] = __pa(control_page); |
12412 | diff -urNp linux-2.6.32.13/arch/x86/kernel/machine_kexec_64.c linux-2.6.32.13/arch/x86/kernel/machine_kexec_64.c | 12409 | diff -urNp linux-2.6.32.15/arch/x86/kernel/machine_kexec_64.c linux-2.6.32.15/arch/x86/kernel/machine_kexec_64.c |
12413 | --- linux-2.6.32.13/arch/x86/kernel/machine_kexec_64.c 2010-03-15 11:52:04.000000000 -0400 | 12410 | --- linux-2.6.32.15/arch/x86/kernel/machine_kexec_64.c 2010-03-15 11:52:04.000000000 -0400 |
12414 | +++ linux-2.6.32.13/arch/x86/kernel/machine_kexec_64.c 2010-05-15 13:21:14.082777933 -0400 | 12411 | +++ linux-2.6.32.15/arch/x86/kernel/machine_kexec_64.c 2010-05-28 21:27:15.043064911 -0400 |
12415 | @@ -126,7 +126,13 @@ static int init_level4_page(struct kimag | 12412 | @@ -126,7 +126,13 @@ static int init_level4_page(struct kimag |
12416 | } | 12413 | } |
12417 | /* clear the unused entries */ | 12414 | /* clear the unused entries */ |
@@ -12426,9 +12423,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/machine_kexec_64.c linux-2.6.32.13/ar | |||
12426 | addr += PGDIR_SIZE; | 12423 | addr += PGDIR_SIZE; |
12427 | } | 12424 | } |
12428 | out: | 12425 | out: |
12429 | diff -urNp linux-2.6.32.13/arch/x86/kernel/microcode_amd.c linux-2.6.32.13/arch/x86/kernel/microcode_amd.c | 12426 | diff -urNp linux-2.6.32.15/arch/x86/kernel/microcode_amd.c linux-2.6.32.15/arch/x86/kernel/microcode_amd.c |
12430 | --- linux-2.6.32.13/arch/x86/kernel/microcode_amd.c 2010-03-15 11:52:04.000000000 -0400 | 12427 | --- linux-2.6.32.15/arch/x86/kernel/microcode_amd.c 2010-03-15 11:52:04.000000000 -0400 |
12431 | +++ linux-2.6.32.13/arch/x86/kernel/microcode_amd.c 2010-05-15 13:21:14.082777933 -0400 | 12428 | +++ linux-2.6.32.15/arch/x86/kernel/microcode_amd.c 2010-05-28 21:27:15.043064911 -0400 |
12432 | @@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c | 12429 | @@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c |
12433 | uci->mc = NULL; | 12430 | uci->mc = NULL; |
12434 | } | 12431 | } |
@@ -12447,9 +12444,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/microcode_amd.c linux-2.6.32.13/arch/ | |||
12447 | { | 12444 | { |
12448 | return µcode_amd_ops; | 12445 | return µcode_amd_ops; |
12449 | } | 12446 | } |
12450 | diff -urNp linux-2.6.32.13/arch/x86/kernel/microcode_core.c linux-2.6.32.13/arch/x86/kernel/microcode_core.c | 12447 | diff -urNp linux-2.6.32.15/arch/x86/kernel/microcode_core.c linux-2.6.32.15/arch/x86/kernel/microcode_core.c |
12451 | --- linux-2.6.32.13/arch/x86/kernel/microcode_core.c 2010-03-15 11:52:04.000000000 -0400 | 12448 | --- linux-2.6.32.15/arch/x86/kernel/microcode_core.c 2010-03-15 11:52:04.000000000 -0400 |
12452 | +++ linux-2.6.32.13/arch/x86/kernel/microcode_core.c 2010-05-15 13:21:14.082777933 -0400 | 12449 | +++ linux-2.6.32.15/arch/x86/kernel/microcode_core.c 2010-05-28 21:27:15.043064911 -0400 |
12453 | @@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); | 12450 | @@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); |
12454 | 12451 | ||
12455 | #define MICROCODE_VERSION "2.00" | 12452 | #define MICROCODE_VERSION "2.00" |
@@ -12459,9 +12456,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/microcode_core.c linux-2.6.32.13/arch | |||
12459 | 12456 | ||
12460 | /* | 12457 | /* |
12461 | * Synchronization. | 12458 | * Synchronization. |
12462 | diff -urNp linux-2.6.32.13/arch/x86/kernel/microcode_intel.c linux-2.6.32.13/arch/x86/kernel/microcode_intel.c | 12459 | diff -urNp linux-2.6.32.15/arch/x86/kernel/microcode_intel.c linux-2.6.32.15/arch/x86/kernel/microcode_intel.c |
12463 | --- linux-2.6.32.13/arch/x86/kernel/microcode_intel.c 2010-03-15 11:52:04.000000000 -0400 | 12460 | --- linux-2.6.32.15/arch/x86/kernel/microcode_intel.c 2010-03-15 11:52:04.000000000 -0400 |
12464 | +++ linux-2.6.32.13/arch/x86/kernel/microcode_intel.c 2010-05-15 13:21:14.082777933 -0400 | 12461 | +++ linux-2.6.32.15/arch/x86/kernel/microcode_intel.c 2010-05-28 21:27:15.043064911 -0400 |
12465 | @@ -443,13 +443,13 @@ static enum ucode_state request_microcod | 12462 | @@ -443,13 +443,13 @@ static enum ucode_state request_microcod |
12466 | 12463 | ||
12467 | static int get_ucode_user(void *to, const void *from, size_t n) | 12464 | static int get_ucode_user(void *to, const void *from, size_t n) |
@@ -12496,9 +12493,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/microcode_intel.c linux-2.6.32.13/arc | |||
12496 | { | 12493 | { |
12497 | return µcode_intel_ops; | 12494 | return µcode_intel_ops; |
12498 | } | 12495 | } |
12499 | diff -urNp linux-2.6.32.13/arch/x86/kernel/module.c linux-2.6.32.13/arch/x86/kernel/module.c | 12496 | diff -urNp linux-2.6.32.15/arch/x86/kernel/module.c linux-2.6.32.15/arch/x86/kernel/module.c |
12500 | --- linux-2.6.32.13/arch/x86/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 | 12497 | --- linux-2.6.32.15/arch/x86/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 |
12501 | +++ linux-2.6.32.13/arch/x86/kernel/module.c 2010-05-15 13:21:14.082777933 -0400 | 12498 | +++ linux-2.6.32.15/arch/x86/kernel/module.c 2010-05-28 21:27:15.043064911 -0400 |
12502 | @@ -34,7 +34,7 @@ | 12499 | @@ -34,7 +34,7 @@ |
12503 | #define DEBUGP(fmt...) | 12500 | #define DEBUGP(fmt...) |
12504 | #endif | 12501 | #endif |
@@ -12639,9 +12636,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/module.c linux-2.6.32.13/arch/x86/ker | |||
12639 | #if 0 | 12636 | #if 0 |
12640 | if ((s64)val != *(s32 *)loc) | 12637 | if ((s64)val != *(s32 *)loc) |
12641 | goto overflow; | 12638 | goto overflow; |
12642 | diff -urNp linux-2.6.32.13/arch/x86/kernel/paravirt.c linux-2.6.32.13/arch/x86/kernel/paravirt.c | 12639 | diff -urNp linux-2.6.32.15/arch/x86/kernel/paravirt.c linux-2.6.32.15/arch/x86/kernel/paravirt.c |
12643 | --- linux-2.6.32.13/arch/x86/kernel/paravirt.c 2010-03-15 11:52:04.000000000 -0400 | 12640 | --- linux-2.6.32.15/arch/x86/kernel/paravirt.c 2010-03-15 11:52:04.000000000 -0400 |
12644 | +++ linux-2.6.32.13/arch/x86/kernel/paravirt.c 2010-05-15 13:21:14.088032889 -0400 | 12641 | +++ linux-2.6.32.15/arch/x86/kernel/paravirt.c 2010-05-28 21:27:15.043064911 -0400 |
12645 | @@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu | 12642 | @@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu |
12646 | * corresponding structure. */ | 12643 | * corresponding structure. */ |
12647 | static void *get_call_destination(u8 type) | 12644 | static void *get_call_destination(u8 type) |
@@ -12745,9 +12742,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/paravirt.c linux-2.6.32.13/arch/x86/k | |||
12745 | }; | 12742 | }; |
12746 | 12743 | ||
12747 | EXPORT_SYMBOL_GPL(pv_time_ops); | 12744 | EXPORT_SYMBOL_GPL(pv_time_ops); |
12748 | diff -urNp linux-2.6.32.13/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.13/arch/x86/kernel/paravirt-spinlocks.c | 12745 | diff -urNp linux-2.6.32.15/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.15/arch/x86/kernel/paravirt-spinlocks.c |
12749 | --- linux-2.6.32.13/arch/x86/kernel/paravirt-spinlocks.c 2010-03-15 11:52:04.000000000 -0400 | 12746 | --- linux-2.6.32.15/arch/x86/kernel/paravirt-spinlocks.c 2010-03-15 11:52:04.000000000 -0400 |
12750 | +++ linux-2.6.32.13/arch/x86/kernel/paravirt-spinlocks.c 2010-05-15 13:21:14.088032889 -0400 | 12747 | +++ linux-2.6.32.15/arch/x86/kernel/paravirt-spinlocks.c 2010-05-28 21:27:15.043064911 -0400 |
12751 | @@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * | 12748 | @@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * |
12752 | __raw_spin_lock(lock); | 12749 | __raw_spin_lock(lock); |
12753 | } | 12750 | } |
@@ -12757,9 +12754,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.13/ | |||
12757 | #ifdef CONFIG_SMP | 12754 | #ifdef CONFIG_SMP |
12758 | .spin_is_locked = __ticket_spin_is_locked, | 12755 | .spin_is_locked = __ticket_spin_is_locked, |
12759 | .spin_is_contended = __ticket_spin_is_contended, | 12756 | .spin_is_contended = __ticket_spin_is_contended, |
12760 | diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.13/arch/x86/kernel/pci-calgary_64.c | 12757 | diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.15/arch/x86/kernel/pci-calgary_64.c |
12761 | --- linux-2.6.32.13/arch/x86/kernel/pci-calgary_64.c 2010-03-15 11:52:04.000000000 -0400 | 12758 | --- linux-2.6.32.15/arch/x86/kernel/pci-calgary_64.c 2010-03-15 11:52:04.000000000 -0400 |
12762 | +++ linux-2.6.32.13/arch/x86/kernel/pci-calgary_64.c 2010-05-15 13:21:14.095776197 -0400 | 12759 | +++ linux-2.6.32.15/arch/x86/kernel/pci-calgary_64.c 2010-05-28 21:27:15.043064911 -0400 |
12763 | @@ -472,7 +472,7 @@ static void calgary_free_coherent(struct | 12760 | @@ -472,7 +472,7 @@ static void calgary_free_coherent(struct |
12764 | free_pages((unsigned long)vaddr, get_order(size)); | 12761 | free_pages((unsigned long)vaddr, get_order(size)); |
12765 | } | 12762 | } |
@@ -12769,9 +12766,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.13/arch | |||
12769 | .alloc_coherent = calgary_alloc_coherent, | 12766 | .alloc_coherent = calgary_alloc_coherent, |
12770 | .free_coherent = calgary_free_coherent, | 12767 | .free_coherent = calgary_free_coherent, |
12771 | .map_sg = calgary_map_sg, | 12768 | .map_sg = calgary_map_sg, |
12772 | diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-dma.c linux-2.6.32.13/arch/x86/kernel/pci-dma.c | 12769 | diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-dma.c linux-2.6.32.15/arch/x86/kernel/pci-dma.c |
12773 | --- linux-2.6.32.13/arch/x86/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400 | 12770 | --- linux-2.6.32.15/arch/x86/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400 |
12774 | +++ linux-2.6.32.13/arch/x86/kernel/pci-dma.c 2010-05-15 13:21:14.095776197 -0400 | 12771 | +++ linux-2.6.32.15/arch/x86/kernel/pci-dma.c 2010-05-28 21:27:15.043064911 -0400 |
12775 | @@ -14,7 +14,7 @@ | 12772 | @@ -14,7 +14,7 @@ |
12776 | 12773 | ||
12777 | static int forbid_dac __read_mostly; | 12774 | static int forbid_dac __read_mostly; |
@@ -12790,9 +12787,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-dma.c linux-2.6.32.13/arch/x86/ke | |||
12790 | 12787 | ||
12791 | #ifdef CONFIG_PCI | 12788 | #ifdef CONFIG_PCI |
12792 | if (mask > 0xffffffff && forbid_dac > 0) { | 12789 | if (mask > 0xffffffff && forbid_dac > 0) { |
12793 | diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-gart_64.c linux-2.6.32.13/arch/x86/kernel/pci-gart_64.c | 12790 | diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-gart_64.c linux-2.6.32.15/arch/x86/kernel/pci-gart_64.c |
12794 | --- linux-2.6.32.13/arch/x86/kernel/pci-gart_64.c 2010-05-15 13:20:18.438563899 -0400 | 12791 | --- linux-2.6.32.15/arch/x86/kernel/pci-gart_64.c 2010-05-15 13:20:18.438563899 -0400 |
12795 | +++ linux-2.6.32.13/arch/x86/kernel/pci-gart_64.c 2010-05-15 13:21:14.095776197 -0400 | 12792 | +++ linux-2.6.32.15/arch/x86/kernel/pci-gart_64.c 2010-05-28 21:27:15.047155410 -0400 |
12796 | @@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag | 12793 | @@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag |
12797 | return -1; | 12794 | return -1; |
12798 | } | 12795 | } |
@@ -12802,9 +12799,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-gart_64.c linux-2.6.32.13/arch/x8 | |||
12802 | .map_sg = gart_map_sg, | 12799 | .map_sg = gart_map_sg, |
12803 | .unmap_sg = gart_unmap_sg, | 12800 | .unmap_sg = gart_unmap_sg, |
12804 | .map_page = gart_map_page, | 12801 | .map_page = gart_map_page, |
12805 | diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-nommu.c linux-2.6.32.13/arch/x86/kernel/pci-nommu.c | 12802 | diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-nommu.c linux-2.6.32.15/arch/x86/kernel/pci-nommu.c |
12806 | --- linux-2.6.32.13/arch/x86/kernel/pci-nommu.c 2010-03-15 11:52:04.000000000 -0400 | 12803 | --- linux-2.6.32.15/arch/x86/kernel/pci-nommu.c 2010-03-15 11:52:04.000000000 -0400 |
12807 | +++ linux-2.6.32.13/arch/x86/kernel/pci-nommu.c 2010-05-15 13:21:14.095776197 -0400 | 12804 | +++ linux-2.6.32.15/arch/x86/kernel/pci-nommu.c 2010-05-28 21:27:15.047155410 -0400 |
12808 | @@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str | 12805 | @@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str |
12809 | flush_write_buffers(); | 12806 | flush_write_buffers(); |
12810 | } | 12807 | } |
@@ -12814,9 +12811,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-nommu.c linux-2.6.32.13/arch/x86/ | |||
12814 | .alloc_coherent = dma_generic_alloc_coherent, | 12811 | .alloc_coherent = dma_generic_alloc_coherent, |
12815 | .free_coherent = nommu_free_coherent, | 12812 | .free_coherent = nommu_free_coherent, |
12816 | .map_sg = nommu_map_sg, | 12813 | .map_sg = nommu_map_sg, |
12817 | diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.13/arch/x86/kernel/pci-swiotlb.c | 12814 | diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.15/arch/x86/kernel/pci-swiotlb.c |
12818 | --- linux-2.6.32.13/arch/x86/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 | 12815 | --- linux-2.6.32.15/arch/x86/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 |
12819 | +++ linux-2.6.32.13/arch/x86/kernel/pci-swiotlb.c 2010-05-15 13:21:14.095776197 -0400 | 12816 | +++ linux-2.6.32.15/arch/x86/kernel/pci-swiotlb.c 2010-05-28 21:27:15.047155410 -0400 |
12820 | @@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent( | 12817 | @@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent( |
12821 | return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); | 12818 | return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); |
12822 | } | 12819 | } |
@@ -12826,9 +12823,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.13/arch/x8 | |||
12826 | .mapping_error = swiotlb_dma_mapping_error, | 12823 | .mapping_error = swiotlb_dma_mapping_error, |
12827 | .alloc_coherent = x86_swiotlb_alloc_coherent, | 12824 | .alloc_coherent = x86_swiotlb_alloc_coherent, |
12828 | .free_coherent = swiotlb_free_coherent, | 12825 | .free_coherent = swiotlb_free_coherent, |
12829 | diff -urNp linux-2.6.32.13/arch/x86/kernel/process_32.c linux-2.6.32.13/arch/x86/kernel/process_32.c | 12826 | diff -urNp linux-2.6.32.15/arch/x86/kernel/process_32.c linux-2.6.32.15/arch/x86/kernel/process_32.c |
12830 | --- linux-2.6.32.13/arch/x86/kernel/process_32.c 2010-03-15 11:52:04.000000000 -0400 | 12827 | --- linux-2.6.32.15/arch/x86/kernel/process_32.c 2010-03-15 11:52:04.000000000 -0400 |
12831 | +++ linux-2.6.32.13/arch/x86/kernel/process_32.c 2010-05-15 13:21:14.095776197 -0400 | 12828 | +++ linux-2.6.32.15/arch/x86/kernel/process_32.c 2010-05-28 21:27:15.047155410 -0400 |
12832 | @@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as | 12829 | @@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as |
12833 | unsigned long thread_saved_pc(struct task_struct *tsk) | 12830 | unsigned long thread_saved_pc(struct task_struct *tsk) |
12834 | { | 12831 | { |
@@ -12923,9 +12920,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/process_32.c linux-2.6.32.13/arch/x86 | |||
12923 | + load_sp0(init_tss + smp_processor_id(), thread); | 12920 | + load_sp0(init_tss + smp_processor_id(), thread); |
12924 | +} | 12921 | +} |
12925 | +#endif | 12922 | +#endif |
12926 | diff -urNp linux-2.6.32.13/arch/x86/kernel/process_64.c linux-2.6.32.13/arch/x86/kernel/process_64.c | 12923 | diff -urNp linux-2.6.32.15/arch/x86/kernel/process_64.c linux-2.6.32.15/arch/x86/kernel/process_64.c |
12927 | --- linux-2.6.32.13/arch/x86/kernel/process_64.c 2010-05-15 13:20:18.438563899 -0400 | 12924 | --- linux-2.6.32.15/arch/x86/kernel/process_64.c 2010-05-15 13:20:18.438563899 -0400 |
12928 | +++ linux-2.6.32.13/arch/x86/kernel/process_64.c 2010-05-15 13:21:14.095776197 -0400 | 12925 | +++ linux-2.6.32.15/arch/x86/kernel/process_64.c 2010-05-28 21:27:15.047155410 -0400 |
12929 | @@ -91,7 +91,7 @@ static void __exit_idle(void) | 12926 | @@ -91,7 +91,7 @@ static void __exit_idle(void) |
12930 | void exit_idle(void) | 12927 | void exit_idle(void) |
12931 | { | 12928 | { |
@@ -12968,9 +12965,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/process_64.c linux-2.6.32.13/arch/x86 | |||
12968 | return 0; | 12965 | return 0; |
12969 | ip = *(u64 *)(fp+8); | 12966 | ip = *(u64 *)(fp+8); |
12970 | if (!in_sched_functions(ip)) | 12967 | if (!in_sched_functions(ip)) |
12971 | diff -urNp linux-2.6.32.13/arch/x86/kernel/process.c linux-2.6.32.13/arch/x86/kernel/process.c | 12968 | diff -urNp linux-2.6.32.15/arch/x86/kernel/process.c linux-2.6.32.15/arch/x86/kernel/process.c |
12972 | --- linux-2.6.32.13/arch/x86/kernel/process.c 2010-04-04 20:41:49.920655481 -0400 | 12969 | --- linux-2.6.32.15/arch/x86/kernel/process.c 2010-05-28 20:16:44.430924650 -0400 |
12973 | +++ linux-2.6.32.13/arch/x86/kernel/process.c 2010-05-15 13:21:14.095776197 -0400 | 12970 | +++ linux-2.6.32.15/arch/x86/kernel/process.c 2010-05-28 21:27:15.047155410 -0400 |
12974 | @@ -73,7 +73,7 @@ void exit_thread(void) | 12971 | @@ -73,7 +73,7 @@ void exit_thread(void) |
12975 | unsigned long *bp = t->io_bitmap_ptr; | 12972 | unsigned long *bp = t->io_bitmap_ptr; |
12976 | 12973 | ||
@@ -12990,7 +12987,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/process.c linux-2.6.32.13/arch/x86/ke | |||
12990 | tsk->thread.debugreg0 = 0; | 12987 | tsk->thread.debugreg0 = 0; |
12991 | tsk->thread.debugreg1 = 0; | 12988 | tsk->thread.debugreg1 = 0; |
12992 | tsk->thread.debugreg2 = 0; | 12989 | tsk->thread.debugreg2 = 0; |
12993 | @@ -600,17 +603,3 @@ static int __init idle_setup(char *str) | 12990 | @@ -602,17 +605,3 @@ static int __init idle_setup(char *str) |
12994 | return 0; | 12991 | return 0; |
12995 | } | 12992 | } |
12996 | early_param("idle", idle_setup); | 12993 | early_param("idle", idle_setup); |
@@ -13008,9 +13005,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/process.c linux-2.6.32.13/arch/x86/ke | |||
13008 | - return randomize_range(mm->brk, range_end, 0) ? : mm->brk; | 13005 | - return randomize_range(mm->brk, range_end, 0) ? : mm->brk; |
13009 | -} | 13006 | -} |
13010 | - | 13007 | - |
13011 | diff -urNp linux-2.6.32.13/arch/x86/kernel/ptrace.c linux-2.6.32.13/arch/x86/kernel/ptrace.c | 13008 | diff -urNp linux-2.6.32.15/arch/x86/kernel/ptrace.c linux-2.6.32.15/arch/x86/kernel/ptrace.c |
13012 | --- linux-2.6.32.13/arch/x86/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400 | 13009 | --- linux-2.6.32.15/arch/x86/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400 |
13013 | +++ linux-2.6.32.13/arch/x86/kernel/ptrace.c 2010-05-15 13:21:14.110913724 -0400 | 13010 | +++ linux-2.6.32.15/arch/x86/kernel/ptrace.c 2010-05-28 21:27:15.047155410 -0400 |
13014 | @@ -925,7 +925,7 @@ static const struct user_regset_view use | 13011 | @@ -925,7 +925,7 @@ static const struct user_regset_view use |
13015 | long arch_ptrace(struct task_struct *child, long request, long addr, long data) | 13012 | long arch_ptrace(struct task_struct *child, long request, long addr, long data) |
13016 | { | 13013 | { |
@@ -13079,9 +13076,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/ptrace.c linux-2.6.32.13/arch/x86/ker | |||
13079 | 13076 | ||
13080 | /* Send us the fake SIGTRAP */ | 13077 | /* Send us the fake SIGTRAP */ |
13081 | force_sig_info(SIGTRAP, &info, tsk); | 13078 | force_sig_info(SIGTRAP, &info, tsk); |
13082 | diff -urNp linux-2.6.32.13/arch/x86/kernel/reboot.c linux-2.6.32.13/arch/x86/kernel/reboot.c | 13079 | diff -urNp linux-2.6.32.15/arch/x86/kernel/reboot.c linux-2.6.32.15/arch/x86/kernel/reboot.c |
13083 | --- linux-2.6.32.13/arch/x86/kernel/reboot.c 2010-03-15 11:52:04.000000000 -0400 | 13080 | --- linux-2.6.32.15/arch/x86/kernel/reboot.c 2010-03-15 11:52:04.000000000 -0400 |
13084 | +++ linux-2.6.32.13/arch/x86/kernel/reboot.c 2010-05-15 13:21:14.110913724 -0400 | 13081 | +++ linux-2.6.32.15/arch/x86/kernel/reboot.c 2010-05-28 21:27:15.050883545 -0400 |
13085 | @@ -33,7 +33,7 @@ void (*pm_power_off)(void); | 13082 | @@ -33,7 +33,7 @@ void (*pm_power_off)(void); |
13086 | EXPORT_SYMBOL(pm_power_off); | 13083 | EXPORT_SYMBOL(pm_power_off); |
13087 | 13084 | ||
@@ -13158,9 +13155,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/reboot.c linux-2.6.32.13/arch/x86/ker | |||
13158 | 13155 | ||
13159 | /* Set up the IDT for real mode. */ | 13156 | /* Set up the IDT for real mode. */ |
13160 | load_idt(&real_mode_idt); | 13157 | load_idt(&real_mode_idt); |
13161 | diff -urNp linux-2.6.32.13/arch/x86/kernel/setup.c linux-2.6.32.13/arch/x86/kernel/setup.c | 13158 | diff -urNp linux-2.6.32.15/arch/x86/kernel/setup.c linux-2.6.32.15/arch/x86/kernel/setup.c |
13162 | --- linux-2.6.32.13/arch/x86/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400 | 13159 | --- linux-2.6.32.15/arch/x86/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400 |
13163 | +++ linux-2.6.32.13/arch/x86/kernel/setup.c 2010-05-15 13:21:14.110913724 -0400 | 13160 | +++ linux-2.6.32.15/arch/x86/kernel/setup.c 2010-05-28 21:27:15.062911922 -0400 |
13164 | @@ -771,14 +771,14 @@ void __init setup_arch(char **cmdline_p) | 13161 | @@ -771,14 +771,14 @@ void __init setup_arch(char **cmdline_p) |
13165 | 13162 | ||
13166 | if (!boot_params.hdr.root_flags) | 13163 | if (!boot_params.hdr.root_flags) |
@@ -13181,9 +13178,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/setup.c linux-2.6.32.13/arch/x86/kern | |||
13181 | data_resource.end = virt_to_phys(_edata)-1; | 13178 | data_resource.end = virt_to_phys(_edata)-1; |
13182 | bss_resource.start = virt_to_phys(&__bss_start); | 13179 | bss_resource.start = virt_to_phys(&__bss_start); |
13183 | bss_resource.end = virt_to_phys(&__bss_stop)-1; | 13180 | bss_resource.end = virt_to_phys(&__bss_stop)-1; |
13184 | diff -urNp linux-2.6.32.13/arch/x86/kernel/setup_percpu.c linux-2.6.32.13/arch/x86/kernel/setup_percpu.c | 13181 | diff -urNp linux-2.6.32.15/arch/x86/kernel/setup_percpu.c linux-2.6.32.15/arch/x86/kernel/setup_percpu.c |
13185 | --- linux-2.6.32.13/arch/x86/kernel/setup_percpu.c 2010-03-15 11:52:04.000000000 -0400 | 13182 | --- linux-2.6.32.15/arch/x86/kernel/setup_percpu.c 2010-03-15 11:52:04.000000000 -0400 |
13186 | +++ linux-2.6.32.13/arch/x86/kernel/setup_percpu.c 2010-05-15 13:21:14.119542394 -0400 | 13183 | +++ linux-2.6.32.15/arch/x86/kernel/setup_percpu.c 2010-05-28 21:27:15.062911922 -0400 |
13187 | @@ -25,19 +25,17 @@ | 13184 | @@ -25,19 +25,17 @@ |
13188 | # define DBG(x...) | 13185 | # define DBG(x...) |
13189 | #endif | 13186 | #endif |
@@ -13246,9 +13243,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/setup_percpu.c linux-2.6.32.13/arch/x | |||
13246 | /* | 13243 | /* |
13247 | * Up to this point, the boot CPU has been using .data.init | 13244 | * Up to this point, the boot CPU has been using .data.init |
13248 | * area. Reload any changed state for the boot CPU. | 13245 | * area. Reload any changed state for the boot CPU. |
13249 | diff -urNp linux-2.6.32.13/arch/x86/kernel/signal.c linux-2.6.32.13/arch/x86/kernel/signal.c | 13246 | diff -urNp linux-2.6.32.15/arch/x86/kernel/signal.c linux-2.6.32.15/arch/x86/kernel/signal.c |
13250 | --- linux-2.6.32.13/arch/x86/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400 | 13247 | --- linux-2.6.32.15/arch/x86/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400 |
13251 | +++ linux-2.6.32.13/arch/x86/kernel/signal.c 2010-05-15 13:21:14.119542394 -0400 | 13248 | +++ linux-2.6.32.15/arch/x86/kernel/signal.c 2010-05-28 21:27:15.062911922 -0400 |
13252 | @@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi | 13249 | @@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi |
13253 | * Align the stack pointer according to the i386 ABI, | 13250 | * Align the stack pointer according to the i386 ABI, |
13254 | * i.e. so that on function entry ((sp + 4) & 15) == 0. | 13251 | * i.e. so that on function entry ((sp + 4) & 15) == 0. |
@@ -13320,9 +13317,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/signal.c linux-2.6.32.13/arch/x86/ker | |||
13320 | return; | 13317 | return; |
13321 | 13318 | ||
13322 | if (current_thread_info()->status & TS_RESTORE_SIGMASK) | 13319 | if (current_thread_info()->status & TS_RESTORE_SIGMASK) |
13323 | diff -urNp linux-2.6.32.13/arch/x86/kernel/smpboot.c linux-2.6.32.13/arch/x86/kernel/smpboot.c | 13320 | diff -urNp linux-2.6.32.15/arch/x86/kernel/smpboot.c linux-2.6.32.15/arch/x86/kernel/smpboot.c |
13324 | --- linux-2.6.32.13/arch/x86/kernel/smpboot.c 2010-04-04 20:41:49.920655481 -0400 | 13321 | --- linux-2.6.32.15/arch/x86/kernel/smpboot.c 2010-04-04 20:41:49.920655481 -0400 |
13325 | +++ linux-2.6.32.13/arch/x86/kernel/smpboot.c 2010-05-15 13:21:14.130650342 -0400 | 13322 | +++ linux-2.6.32.15/arch/x86/kernel/smpboot.c 2010-05-28 21:27:15.062911922 -0400 |
13326 | @@ -729,7 +729,11 @@ do_rest: | 13323 | @@ -729,7 +729,11 @@ do_rest: |
13327 | (unsigned long)task_stack_page(c_idle.idle) - | 13324 | (unsigned long)task_stack_page(c_idle.idle) - |
13328 | KERNEL_STACK_OFFSET + THREAD_SIZE; | 13325 | KERNEL_STACK_OFFSET + THREAD_SIZE; |
@@ -13348,9 +13345,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/smpboot.c linux-2.6.32.13/arch/x86/ke | |||
13348 | #ifdef CONFIG_X86_32 | 13345 | #ifdef CONFIG_X86_32 |
13349 | /* init low mem mapping */ | 13346 | /* init low mem mapping */ |
13350 | clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY, | 13347 | clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY, |
13351 | diff -urNp linux-2.6.32.13/arch/x86/kernel/step.c linux-2.6.32.13/arch/x86/kernel/step.c | 13348 | diff -urNp linux-2.6.32.15/arch/x86/kernel/step.c linux-2.6.32.15/arch/x86/kernel/step.c |
13352 | --- linux-2.6.32.13/arch/x86/kernel/step.c 2010-03-15 11:52:04.000000000 -0400 | 13349 | --- linux-2.6.32.15/arch/x86/kernel/step.c 2010-03-15 11:52:04.000000000 -0400 |
13353 | +++ linux-2.6.32.13/arch/x86/kernel/step.c 2010-05-15 13:21:14.130650342 -0400 | 13350 | +++ linux-2.6.32.15/arch/x86/kernel/step.c 2010-05-28 21:27:15.062911922 -0400 |
13354 | @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc | 13351 | @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc |
13355 | struct desc_struct *desc; | 13352 | struct desc_struct *desc; |
13356 | unsigned long base; | 13353 | unsigned long base; |
@@ -13383,17 +13380,17 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/step.c linux-2.6.32.13/arch/x86/kerne | |||
13383 | /* 32-bit mode: register increment */ | 13380 | /* 32-bit mode: register increment */ |
13384 | return 0; | 13381 | return 0; |
13385 | /* 64-bit mode: REX prefix */ | 13382 | /* 64-bit mode: REX prefix */ |
13386 | diff -urNp linux-2.6.32.13/arch/x86/kernel/syscall_table_32.S linux-2.6.32.13/arch/x86/kernel/syscall_table_32.S | 13383 | diff -urNp linux-2.6.32.15/arch/x86/kernel/syscall_table_32.S linux-2.6.32.15/arch/x86/kernel/syscall_table_32.S |
13387 | --- linux-2.6.32.13/arch/x86/kernel/syscall_table_32.S 2010-03-15 11:52:04.000000000 -0400 | 13384 | --- linux-2.6.32.15/arch/x86/kernel/syscall_table_32.S 2010-03-15 11:52:04.000000000 -0400 |
13388 | +++ linux-2.6.32.13/arch/x86/kernel/syscall_table_32.S 2010-05-15 13:21:14.130650342 -0400 | 13385 | +++ linux-2.6.32.15/arch/x86/kernel/syscall_table_32.S 2010-05-28 21:27:15.062911922 -0400 |
13389 | @@ -1,3 +1,4 @@ | 13386 | @@ -1,3 +1,4 @@ |
13390 | +.section .rodata,"a",@progbits | 13387 | +.section .rodata,"a",@progbits |
13391 | ENTRY(sys_call_table) | 13388 | ENTRY(sys_call_table) |
13392 | .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ | 13389 | .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ |
13393 | .long sys_exit | 13390 | .long sys_exit |
13394 | diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c | 13391 | diff -urNp linux-2.6.32.15/arch/x86/kernel/sys_i386_32.c linux-2.6.32.15/arch/x86/kernel/sys_i386_32.c |
13395 | --- linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c 2010-03-15 11:52:04.000000000 -0400 | 13392 | --- linux-2.6.32.15/arch/x86/kernel/sys_i386_32.c 2010-03-15 11:52:04.000000000 -0400 |
13396 | +++ linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c 2010-05-15 13:21:14.130650342 -0400 | 13393 | +++ linux-2.6.32.15/arch/x86/kernel/sys_i386_32.c 2010-05-28 21:27:15.062911922 -0400 |
13397 | @@ -24,6 +24,21 @@ | 13394 | @@ -24,6 +24,21 @@ |
13398 | 13395 | ||
13399 | #include <asm/syscalls.h> | 13396 | #include <asm/syscalls.h> |
@@ -13640,9 +13637,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c linux-2.6.32.13/arch/x8 | |||
13640 | } | 13637 | } |
13641 | case 1: /* iBCS2 emulator entry point */ | 13638 | case 1: /* iBCS2 emulator entry point */ |
13642 | if (!segment_eq(get_fs(), get_ds())) | 13639 | if (!segment_eq(get_fs(), get_ds())) |
13643 | diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_x86_64.c linux-2.6.32.13/arch/x86/kernel/sys_x86_64.c | 13640 | diff -urNp linux-2.6.32.15/arch/x86/kernel/sys_x86_64.c linux-2.6.32.15/arch/x86/kernel/sys_x86_64.c |
13644 | --- linux-2.6.32.13/arch/x86/kernel/sys_x86_64.c 2010-03-15 11:52:04.000000000 -0400 | 13641 | --- linux-2.6.32.15/arch/x86/kernel/sys_x86_64.c 2010-03-15 11:52:04.000000000 -0400 |
13645 | +++ linux-2.6.32.13/arch/x86/kernel/sys_x86_64.c 2010-05-15 13:21:14.130650342 -0400 | 13642 | +++ linux-2.6.32.15/arch/x86/kernel/sys_x86_64.c 2010-05-28 21:27:15.062911922 -0400 |
13646 | @@ -32,8 +32,8 @@ out: | 13643 | @@ -32,8 +32,8 @@ out: |
13647 | return error; | 13644 | return error; |
13648 | } | 13645 | } |
@@ -13724,9 +13721,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_x86_64.c linux-2.6.32.13/arch/x86 | |||
13724 | mm->cached_hole_size = ~0UL; | 13721 | mm->cached_hole_size = ~0UL; |
13725 | 13722 | ||
13726 | return addr; | 13723 | return addr; |
13727 | diff -urNp linux-2.6.32.13/arch/x86/kernel/time.c linux-2.6.32.13/arch/x86/kernel/time.c | 13724 | diff -urNp linux-2.6.32.15/arch/x86/kernel/time.c linux-2.6.32.15/arch/x86/kernel/time.c |
13728 | --- linux-2.6.32.13/arch/x86/kernel/time.c 2010-03-15 11:52:04.000000000 -0400 | 13725 | --- linux-2.6.32.15/arch/x86/kernel/time.c 2010-03-15 11:52:04.000000000 -0400 |
13729 | +++ linux-2.6.32.13/arch/x86/kernel/time.c 2010-05-15 13:21:14.130650342 -0400 | 13726 | +++ linux-2.6.32.15/arch/x86/kernel/time.c 2010-05-28 21:27:15.062911922 -0400 |
13730 | @@ -26,17 +26,13 @@ | 13727 | @@ -26,17 +26,13 @@ |
13731 | int timer_ack; | 13728 | int timer_ack; |
13732 | #endif | 13729 | #endif |
@@ -13765,9 +13762,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/time.c linux-2.6.32.13/arch/x86/kerne | |||
13765 | } | 13762 | } |
13766 | return pc; | 13763 | return pc; |
13767 | } | 13764 | } |
13768 | diff -urNp linux-2.6.32.13/arch/x86/kernel/tls.c linux-2.6.32.13/arch/x86/kernel/tls.c | 13765 | diff -urNp linux-2.6.32.15/arch/x86/kernel/tls.c linux-2.6.32.15/arch/x86/kernel/tls.c |
13769 | --- linux-2.6.32.13/arch/x86/kernel/tls.c 2010-03-15 11:52:04.000000000 -0400 | 13766 | --- linux-2.6.32.15/arch/x86/kernel/tls.c 2010-03-15 11:52:04.000000000 -0400 |
13770 | +++ linux-2.6.32.13/arch/x86/kernel/tls.c 2010-05-15 13:21:14.130650342 -0400 | 13767 | +++ linux-2.6.32.15/arch/x86/kernel/tls.c 2010-05-28 21:27:15.062911922 -0400 |
13771 | @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc | 13768 | @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc |
13772 | if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) | 13769 | if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) |
13773 | return -EINVAL; | 13770 | return -EINVAL; |
@@ -13780,9 +13777,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/tls.c linux-2.6.32.13/arch/x86/kernel | |||
13780 | set_tls_desc(p, idx, &info, 1); | 13777 | set_tls_desc(p, idx, &info, 1); |
13781 | 13778 | ||
13782 | return 0; | 13779 | return 0; |
13783 | diff -urNp linux-2.6.32.13/arch/x86/kernel/trampoline_32.S linux-2.6.32.13/arch/x86/kernel/trampoline_32.S | 13780 | diff -urNp linux-2.6.32.15/arch/x86/kernel/trampoline_32.S linux-2.6.32.15/arch/x86/kernel/trampoline_32.S |
13784 | --- linux-2.6.32.13/arch/x86/kernel/trampoline_32.S 2010-03-15 11:52:04.000000000 -0400 | 13781 | --- linux-2.6.32.15/arch/x86/kernel/trampoline_32.S 2010-03-15 11:52:04.000000000 -0400 |
13785 | +++ linux-2.6.32.13/arch/x86/kernel/trampoline_32.S 2010-05-15 13:21:14.130650342 -0400 | 13782 | +++ linux-2.6.32.15/arch/x86/kernel/trampoline_32.S 2010-05-28 21:27:15.062911922 -0400 |
13786 | @@ -32,6 +32,12 @@ | 13783 | @@ -32,6 +32,12 @@ |
13787 | #include <asm/segment.h> | 13784 | #include <asm/segment.h> |
13788 | #include <asm/page_types.h> | 13785 | #include <asm/page_types.h> |
@@ -13805,9 +13802,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/trampoline_32.S linux-2.6.32.13/arch/ | |||
13805 | 13802 | ||
13806 | # These need to be in the same 64K segment as the above; | 13803 | # These need to be in the same 64K segment as the above; |
13807 | # hence we don't use the boot_gdt_descr defined in head.S | 13804 | # hence we don't use the boot_gdt_descr defined in head.S |
13808 | diff -urNp linux-2.6.32.13/arch/x86/kernel/traps.c linux-2.6.32.13/arch/x86/kernel/traps.c | 13805 | diff -urNp linux-2.6.32.15/arch/x86/kernel/traps.c linux-2.6.32.15/arch/x86/kernel/traps.c |
13809 | --- linux-2.6.32.13/arch/x86/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400 | 13806 | --- linux-2.6.32.15/arch/x86/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400 |
13810 | +++ linux-2.6.32.13/arch/x86/kernel/traps.c 2010-05-15 13:21:14.130650342 -0400 | 13807 | +++ linux-2.6.32.15/arch/x86/kernel/traps.c 2010-05-28 21:27:15.067055592 -0400 |
13811 | @@ -69,12 +69,6 @@ asmlinkage int system_call(void); | 13808 | @@ -69,12 +69,6 @@ asmlinkage int system_call(void); |
13812 | 13809 | ||
13813 | /* Do we ignore FPU interrupts ? */ | 13810 | /* Do we ignore FPU interrupts ? */ |
@@ -13957,9 +13954,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/traps.c linux-2.6.32.13/arch/x86/kern | |||
13957 | handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code); | 13954 | handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code); |
13958 | return; | 13955 | return; |
13959 | } | 13956 | } |
13960 | diff -urNp linux-2.6.32.13/arch/x86/kernel/tsc.c linux-2.6.32.13/arch/x86/kernel/tsc.c | 13957 | diff -urNp linux-2.6.32.15/arch/x86/kernel/tsc.c linux-2.6.32.15/arch/x86/kernel/tsc.c |
13961 | --- linux-2.6.32.13/arch/x86/kernel/tsc.c 2010-03-15 11:52:04.000000000 -0400 | 13958 | --- linux-2.6.32.15/arch/x86/kernel/tsc.c 2010-03-15 11:52:04.000000000 -0400 |
13962 | +++ linux-2.6.32.13/arch/x86/kernel/tsc.c 2010-05-15 13:21:14.134912019 -0400 | 13959 | +++ linux-2.6.32.15/arch/x86/kernel/tsc.c 2010-05-28 21:27:15.067055592 -0400 |
13963 | @@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b | 13960 | @@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b |
13964 | DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), | 13961 | DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), |
13965 | }, | 13962 | }, |
@@ -13969,9 +13966,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/tsc.c linux-2.6.32.13/arch/x86/kernel | |||
13969 | }; | 13966 | }; |
13970 | 13967 | ||
13971 | static void __init check_system_tsc_reliable(void) | 13968 | static void __init check_system_tsc_reliable(void) |
13972 | diff -urNp linux-2.6.32.13/arch/x86/kernel/vm86_32.c linux-2.6.32.13/arch/x86/kernel/vm86_32.c | 13969 | diff -urNp linux-2.6.32.15/arch/x86/kernel/vm86_32.c linux-2.6.32.15/arch/x86/kernel/vm86_32.c |
13973 | --- linux-2.6.32.13/arch/x86/kernel/vm86_32.c 2010-03-15 11:52:04.000000000 -0400 | 13970 | --- linux-2.6.32.15/arch/x86/kernel/vm86_32.c 2010-03-15 11:52:04.000000000 -0400 |
13974 | +++ linux-2.6.32.13/arch/x86/kernel/vm86_32.c 2010-05-15 13:21:14.142909281 -0400 | 13971 | +++ linux-2.6.32.15/arch/x86/kernel/vm86_32.c 2010-05-28 21:27:15.067055592 -0400 |
13975 | @@ -41,6 +41,7 @@ | 13972 | @@ -41,6 +41,7 @@ |
13976 | #include <linux/ptrace.h> | 13973 | #include <linux/ptrace.h> |
13977 | #include <linux/audit.h> | 13974 | #include <linux/audit.h> |
@@ -14036,9 +14033,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vm86_32.c linux-2.6.32.13/arch/x86/ke | |||
14036 | if (get_user(segoffs, intr_ptr)) | 14033 | if (get_user(segoffs, intr_ptr)) |
14037 | goto cannot_handle; | 14034 | goto cannot_handle; |
14038 | if ((segoffs >> 16) == BIOSSEG) | 14035 | if ((segoffs >> 16) == BIOSSEG) |
14039 | diff -urNp linux-2.6.32.13/arch/x86/kernel/vmi_32.c linux-2.6.32.13/arch/x86/kernel/vmi_32.c | 14036 | diff -urNp linux-2.6.32.15/arch/x86/kernel/vmi_32.c linux-2.6.32.15/arch/x86/kernel/vmi_32.c |
14040 | --- linux-2.6.32.13/arch/x86/kernel/vmi_32.c 2010-03-15 11:52:04.000000000 -0400 | 14037 | --- linux-2.6.32.15/arch/x86/kernel/vmi_32.c 2010-03-15 11:52:04.000000000 -0400 |
14041 | +++ linux-2.6.32.13/arch/x86/kernel/vmi_32.c 2010-05-15 13:21:14.150906044 -0400 | 14038 | +++ linux-2.6.32.15/arch/x86/kernel/vmi_32.c 2010-05-28 21:27:15.067055592 -0400 |
14042 | @@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) | 14039 | @@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) |
14043 | typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); | 14040 | typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); |
14044 | 14041 | ||
@@ -14198,9 +14195,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmi_32.c linux-2.6.32.13/arch/x86/ker | |||
14198 | return; | 14195 | return; |
14199 | 14196 | ||
14200 | local_irq_save(flags); | 14197 | local_irq_save(flags); |
14201 | diff -urNp linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S | 14198 | diff -urNp linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S |
14202 | --- linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400 | 14199 | --- linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400 |
14203 | +++ linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S 2010-05-15 13:21:14.162641857 -0400 | 14200 | +++ linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S 2010-05-28 21:27:15.067055592 -0400 |
14204 | @@ -26,6 +26,22 @@ | 14201 | @@ -26,6 +26,22 @@ |
14205 | #include <asm/page_types.h> | 14202 | #include <asm/page_types.h> |
14206 | #include <asm/cache.h> | 14203 | #include <asm/cache.h> |
@@ -14488,9 +14485,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.13/arch/x8 | |||
14488 | "kernel image bigger than KERNEL_IMAGE_SIZE"); | 14485 | "kernel image bigger than KERNEL_IMAGE_SIZE"); |
14489 | 14486 | ||
14490 | #ifdef CONFIG_SMP | 14487 | #ifdef CONFIG_SMP |
14491 | diff -urNp linux-2.6.32.13/arch/x86/kernel/vsyscall_64.c linux-2.6.32.13/arch/x86/kernel/vsyscall_64.c | 14488 | diff -urNp linux-2.6.32.15/arch/x86/kernel/vsyscall_64.c linux-2.6.32.15/arch/x86/kernel/vsyscall_64.c |
14492 | --- linux-2.6.32.13/arch/x86/kernel/vsyscall_64.c 2010-03-15 11:52:04.000000000 -0400 | 14489 | --- linux-2.6.32.15/arch/x86/kernel/vsyscall_64.c 2010-03-15 11:52:04.000000000 -0400 |
14493 | +++ linux-2.6.32.13/arch/x86/kernel/vsyscall_64.c 2010-05-15 13:21:14.162641857 -0400 | 14490 | +++ linux-2.6.32.15/arch/x86/kernel/vsyscall_64.c 2010-05-28 21:27:15.067055592 -0400 |
14494 | @@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa | 14491 | @@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa |
14495 | 14492 | ||
14496 | write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); | 14493 | write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); |
@@ -14524,9 +14521,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vsyscall_64.c linux-2.6.32.13/arch/x8 | |||
14524 | }; | 14521 | }; |
14525 | #endif | 14522 | #endif |
14526 | 14523 | ||
14527 | diff -urNp linux-2.6.32.13/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.13/arch/x86/kernel/x8664_ksyms_64.c | 14524 | diff -urNp linux-2.6.32.15/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.15/arch/x86/kernel/x8664_ksyms_64.c |
14528 | --- linux-2.6.32.13/arch/x86/kernel/x8664_ksyms_64.c 2010-03-15 11:52:04.000000000 -0400 | 14525 | --- linux-2.6.32.15/arch/x86/kernel/x8664_ksyms_64.c 2010-03-15 11:52:04.000000000 -0400 |
14529 | +++ linux-2.6.32.13/arch/x86/kernel/x8664_ksyms_64.c 2010-05-15 13:21:14.162641857 -0400 | 14526 | +++ linux-2.6.32.15/arch/x86/kernel/x8664_ksyms_64.c 2010-05-28 21:27:15.067055592 -0400 |
14530 | @@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); | 14527 | @@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); |
14531 | 14528 | ||
14532 | EXPORT_SYMBOL(copy_user_generic); | 14529 | EXPORT_SYMBOL(copy_user_generic); |
@@ -14536,9 +14533,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.13/arch | |||
14536 | EXPORT_SYMBOL(__copy_from_user_inatomic); | 14533 | EXPORT_SYMBOL(__copy_from_user_inatomic); |
14537 | 14534 | ||
14538 | EXPORT_SYMBOL(copy_page); | 14535 | EXPORT_SYMBOL(copy_page); |
14539 | diff -urNp linux-2.6.32.13/arch/x86/kernel/xsave.c linux-2.6.32.13/arch/x86/kernel/xsave.c | 14536 | diff -urNp linux-2.6.32.15/arch/x86/kernel/xsave.c linux-2.6.32.15/arch/x86/kernel/xsave.c |
14540 | --- linux-2.6.32.13/arch/x86/kernel/xsave.c 2010-03-15 11:52:04.000000000 -0400 | 14537 | --- linux-2.6.32.15/arch/x86/kernel/xsave.c 2010-03-15 11:52:04.000000000 -0400 |
14541 | +++ linux-2.6.32.13/arch/x86/kernel/xsave.c 2010-05-15 13:21:14.162641857 -0400 | 14538 | +++ linux-2.6.32.15/arch/x86/kernel/xsave.c 2010-05-28 21:27:15.067055592 -0400 |
14542 | @@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_ | 14539 | @@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_ |
14543 | fx_sw_user->xstate_size > fx_sw_user->extended_size) | 14540 | fx_sw_user->xstate_size > fx_sw_user->extended_size) |
14544 | return -1; | 14541 | return -1; |
@@ -14566,9 +14563,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/xsave.c linux-2.6.32.13/arch/x86/kern | |||
14566 | buf); | 14563 | buf); |
14567 | if (unlikely(err)) { | 14564 | if (unlikely(err)) { |
14568 | /* | 14565 | /* |
14569 | diff -urNp linux-2.6.32.13/arch/x86/kvm/emulate.c linux-2.6.32.13/arch/x86/kvm/emulate.c | 14566 | diff -urNp linux-2.6.32.15/arch/x86/kvm/emulate.c linux-2.6.32.15/arch/x86/kvm/emulate.c |
14570 | --- linux-2.6.32.13/arch/x86/kvm/emulate.c 2010-04-29 17:49:37.541027029 -0400 | 14567 | --- linux-2.6.32.15/arch/x86/kvm/emulate.c 2010-04-29 17:49:37.541027029 -0400 |
14571 | +++ linux-2.6.32.13/arch/x86/kvm/emulate.c 2010-05-15 13:21:14.178920275 -0400 | 14568 | +++ linux-2.6.32.15/arch/x86/kvm/emulate.c 2010-05-28 21:27:15.086896808 -0400 |
14572 | @@ -81,8 +81,8 @@ | 14569 | @@ -81,8 +81,8 @@ |
14573 | #define Src2CL (1<<29) | 14570 | #define Src2CL (1<<29) |
14574 | #define Src2ImmByte (2<<29) | 14571 | #define Src2ImmByte (2<<29) |
@@ -14605,9 +14602,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kvm/emulate.c linux-2.6.32.13/arch/x86/kvm/e | |||
14605 | switch ((_dst).bytes) { \ | 14602 | switch ((_dst).bytes) { \ |
14606 | case 1: \ | 14603 | case 1: \ |
14607 | ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ | 14604 | ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ |
14608 | diff -urNp linux-2.6.32.13/arch/x86/kvm/lapic.c linux-2.6.32.13/arch/x86/kvm/lapic.c | 14605 | diff -urNp linux-2.6.32.15/arch/x86/kvm/lapic.c linux-2.6.32.15/arch/x86/kvm/lapic.c |
14609 | --- linux-2.6.32.13/arch/x86/kvm/lapic.c 2010-03-15 11:52:04.000000000 -0400 | 14606 | --- linux-2.6.32.15/arch/x86/kvm/lapic.c 2010-03-15 11:52:04.000000000 -0400 |
14610 | +++ linux-2.6.32.13/arch/x86/kvm/lapic.c 2010-05-15 13:21:14.186649754 -0400 | 14607 | +++ linux-2.6.32.15/arch/x86/kvm/lapic.c 2010-05-28 21:27:15.086896808 -0400 |
14611 | @@ -52,7 +52,7 @@ | 14608 | @@ -52,7 +52,7 @@ |
14612 | #define APIC_BUS_CYCLE_NS 1 | 14609 | #define APIC_BUS_CYCLE_NS 1 |
14613 | 14610 | ||
@@ -14617,9 +14614,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kvm/lapic.c linux-2.6.32.13/arch/x86/kvm/lap | |||
14617 | 14614 | ||
14618 | #define APIC_LVT_NUM 6 | 14615 | #define APIC_LVT_NUM 6 |
14619 | /* 14 is the version for Xeon and Pentium 8.4.8*/ | 14616 | /* 14 is the version for Xeon and Pentium 8.4.8*/ |
14620 | diff -urNp linux-2.6.32.13/arch/x86/kvm/svm.c linux-2.6.32.13/arch/x86/kvm/svm.c | 14617 | diff -urNp linux-2.6.32.15/arch/x86/kvm/svm.c linux-2.6.32.15/arch/x86/kvm/svm.c |
14621 | --- linux-2.6.32.13/arch/x86/kvm/svm.c 2010-04-29 17:49:37.601044544 -0400 | 14618 | --- linux-2.6.32.15/arch/x86/kvm/svm.c 2010-04-29 17:49:37.601044544 -0400 |
14622 | +++ linux-2.6.32.13/arch/x86/kvm/svm.c 2010-05-15 13:21:14.206681110 -0400 | 14619 | +++ linux-2.6.32.15/arch/x86/kvm/svm.c 2010-05-28 21:27:15.086896808 -0400 |
14623 | @@ -2395,9 +2395,12 @@ static int handle_exit(struct kvm_run *k | 14620 | @@ -2395,9 +2395,12 @@ static int handle_exit(struct kvm_run *k |
14624 | static void reload_tss(struct kvm_vcpu *vcpu) | 14621 | static void reload_tss(struct kvm_vcpu *vcpu) |
14625 | { | 14622 | { |
@@ -14643,9 +14640,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kvm/svm.c linux-2.6.32.13/arch/x86/kvm/svm.c | |||
14643 | .cpu_has_kvm_support = has_svm, | 14640 | .cpu_has_kvm_support = has_svm, |
14644 | .disabled_by_bios = is_disabled, | 14641 | .disabled_by_bios = is_disabled, |
14645 | .hardware_setup = svm_hardware_setup, | 14642 | .hardware_setup = svm_hardware_setup, |
14646 | diff -urNp linux-2.6.32.13/arch/x86/kvm/vmx.c linux-2.6.32.13/arch/x86/kvm/vmx.c | 14643 | diff -urNp linux-2.6.32.15/arch/x86/kvm/vmx.c linux-2.6.32.15/arch/x86/kvm/vmx.c |
14647 | --- linux-2.6.32.13/arch/x86/kvm/vmx.c 2010-04-29 17:49:37.601044544 -0400 | 14644 | --- linux-2.6.32.15/arch/x86/kvm/vmx.c 2010-04-29 17:49:37.601044544 -0400 |
14648 | +++ linux-2.6.32.13/arch/x86/kvm/vmx.c 2010-05-15 13:23:38.934774262 -0400 | 14645 | +++ linux-2.6.32.15/arch/x86/kvm/vmx.c 2010-05-28 21:27:15.091170095 -0400 |
14649 | @@ -568,7 +568,11 @@ static void reload_tss(void) | 14646 | @@ -568,7 +568,11 @@ static void reload_tss(void) |
14650 | 14647 | ||
14651 | kvm_get_gdt(&gdt); | 14648 | kvm_get_gdt(&gdt); |
@@ -14727,9 +14724,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kvm/vmx.c linux-2.6.32.13/arch/x86/kvm/vmx.c | |||
14727 | .cpu_has_kvm_support = cpu_has_kvm_support, | 14724 | .cpu_has_kvm_support = cpu_has_kvm_support, |
14728 | .disabled_by_bios = vmx_disabled_by_bios, | 14725 | .disabled_by_bios = vmx_disabled_by_bios, |
14729 | .hardware_setup = hardware_setup, | 14726 | .hardware_setup = hardware_setup, |
14730 | diff -urNp linux-2.6.32.13/arch/x86/kvm/x86.c linux-2.6.32.13/arch/x86/kvm/x86.c | 14727 | diff -urNp linux-2.6.32.15/arch/x86/kvm/x86.c linux-2.6.32.15/arch/x86/kvm/x86.c |
14731 | --- linux-2.6.32.13/arch/x86/kvm/x86.c 2010-05-15 13:20:18.454567530 -0400 | 14728 | --- linux-2.6.32.15/arch/x86/kvm/x86.c 2010-05-15 13:20:18.454567530 -0400 |
14732 | +++ linux-2.6.32.13/arch/x86/kvm/x86.c 2010-05-15 13:21:14.230911822 -0400 | 14729 | +++ linux-2.6.32.15/arch/x86/kvm/x86.c 2010-05-28 21:27:15.095006556 -0400 |
14733 | @@ -81,45 +81,45 @@ static void update_cr8_intercept(struct | 14730 | @@ -81,45 +81,45 @@ static void update_cr8_intercept(struct |
14734 | static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, | 14731 | static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, |
14735 | struct kvm_cpuid_entry2 __user *entries); | 14732 | struct kvm_cpuid_entry2 __user *entries); |
@@ -14831,9 +14828,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kvm/x86.c linux-2.6.32.13/arch/x86/kvm/x86.c | |||
14831 | 14828 | ||
14832 | if (kvm_x86_ops) { | 14829 | if (kvm_x86_ops) { |
14833 | printk(KERN_ERR "kvm: already loaded the other module\n"); | 14830 | printk(KERN_ERR "kvm: already loaded the other module\n"); |
14834 | diff -urNp linux-2.6.32.13/arch/x86/lib/checksum_32.S linux-2.6.32.13/arch/x86/lib/checksum_32.S | 14831 | diff -urNp linux-2.6.32.15/arch/x86/lib/checksum_32.S linux-2.6.32.15/arch/x86/lib/checksum_32.S |
14835 | --- linux-2.6.32.13/arch/x86/lib/checksum_32.S 2010-03-15 11:52:04.000000000 -0400 | 14832 | --- linux-2.6.32.15/arch/x86/lib/checksum_32.S 2010-03-15 11:52:04.000000000 -0400 |
14836 | +++ linux-2.6.32.13/arch/x86/lib/checksum_32.S 2010-05-15 13:21:14.230911822 -0400 | 14833 | +++ linux-2.6.32.15/arch/x86/lib/checksum_32.S 2010-05-28 21:27:15.095006556 -0400 |
14837 | @@ -28,7 +28,8 @@ | 14834 | @@ -28,7 +28,8 @@ |
14838 | #include <linux/linkage.h> | 14835 | #include <linux/linkage.h> |
14839 | #include <asm/dwarf2.h> | 14836 | #include <asm/dwarf2.h> |
@@ -15079,9 +15076,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/checksum_32.S linux-2.6.32.13/arch/x86/l | |||
15079 | 15076 | ||
15080 | #undef ROUND | 15077 | #undef ROUND |
15081 | #undef ROUND1 | 15078 | #undef ROUND1 |
15082 | diff -urNp linux-2.6.32.13/arch/x86/lib/clear_page_64.S linux-2.6.32.13/arch/x86/lib/clear_page_64.S | 15079 | diff -urNp linux-2.6.32.15/arch/x86/lib/clear_page_64.S linux-2.6.32.15/arch/x86/lib/clear_page_64.S |
15083 | --- linux-2.6.32.13/arch/x86/lib/clear_page_64.S 2010-03-15 11:52:04.000000000 -0400 | 15080 | --- linux-2.6.32.15/arch/x86/lib/clear_page_64.S 2010-03-15 11:52:04.000000000 -0400 |
15084 | +++ linux-2.6.32.13/arch/x86/lib/clear_page_64.S 2010-05-15 13:21:14.230911822 -0400 | 15081 | +++ linux-2.6.32.15/arch/x86/lib/clear_page_64.S 2010-05-28 21:27:15.095006556 -0400 |
15085 | @@ -43,7 +43,7 @@ ENDPROC(clear_page) | 15082 | @@ -43,7 +43,7 @@ ENDPROC(clear_page) |
15086 | 15083 | ||
15087 | #include <asm/cpufeature.h> | 15084 | #include <asm/cpufeature.h> |
@@ -15091,9 +15088,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/clear_page_64.S linux-2.6.32.13/arch/x86 | |||
15091 | 1: .byte 0xeb /* jmp <disp8> */ | 15088 | 1: .byte 0xeb /* jmp <disp8> */ |
15092 | .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ | 15089 | .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ |
15093 | 2: | 15090 | 2: |
15094 | diff -urNp linux-2.6.32.13/arch/x86/lib/copy_page_64.S linux-2.6.32.13/arch/x86/lib/copy_page_64.S | 15091 | diff -urNp linux-2.6.32.15/arch/x86/lib/copy_page_64.S linux-2.6.32.15/arch/x86/lib/copy_page_64.S |
15095 | --- linux-2.6.32.13/arch/x86/lib/copy_page_64.S 2010-03-15 11:52:04.000000000 -0400 | 15092 | --- linux-2.6.32.15/arch/x86/lib/copy_page_64.S 2010-03-15 11:52:04.000000000 -0400 |
15096 | +++ linux-2.6.32.13/arch/x86/lib/copy_page_64.S 2010-05-15 13:21:14.230911822 -0400 | 15093 | +++ linux-2.6.32.15/arch/x86/lib/copy_page_64.S 2010-05-28 21:27:15.095006556 -0400 |
15097 | @@ -104,7 +104,7 @@ ENDPROC(copy_page) | 15094 | @@ -104,7 +104,7 @@ ENDPROC(copy_page) |
15098 | 15095 | ||
15099 | #include <asm/cpufeature.h> | 15096 | #include <asm/cpufeature.h> |
@@ -15103,9 +15100,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/copy_page_64.S linux-2.6.32.13/arch/x86/ | |||
15103 | 1: .byte 0xeb /* jmp <disp8> */ | 15100 | 1: .byte 0xeb /* jmp <disp8> */ |
15104 | .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ | 15101 | .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ |
15105 | 2: | 15102 | 2: |
15106 | diff -urNp linux-2.6.32.13/arch/x86/lib/copy_user_64.S linux-2.6.32.13/arch/x86/lib/copy_user_64.S | 15103 | diff -urNp linux-2.6.32.15/arch/x86/lib/copy_user_64.S linux-2.6.32.15/arch/x86/lib/copy_user_64.S |
15107 | --- linux-2.6.32.13/arch/x86/lib/copy_user_64.S 2010-03-15 11:52:04.000000000 -0400 | 15104 | --- linux-2.6.32.15/arch/x86/lib/copy_user_64.S 2010-03-15 11:52:04.000000000 -0400 |
15108 | +++ linux-2.6.32.13/arch/x86/lib/copy_user_64.S 2010-05-15 13:21:14.234766826 -0400 | 15105 | +++ linux-2.6.32.15/arch/x86/lib/copy_user_64.S 2010-05-28 21:27:15.095006556 -0400 |
15109 | @@ -15,13 +15,14 @@ | 15106 | @@ -15,13 +15,14 @@ |
15110 | #include <asm/asm-offsets.h> | 15107 | #include <asm/asm-offsets.h> |
15111 | #include <asm/thread_info.h> | 15108 | #include <asm/thread_info.h> |
@@ -15180,9 +15177,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/copy_user_64.S linux-2.6.32.13/arch/x86/ | |||
15180 | movl %edx,%ecx | 15177 | movl %edx,%ecx |
15181 | xorl %eax,%eax | 15178 | xorl %eax,%eax |
15182 | rep | 15179 | rep |
15183 | diff -urNp linux-2.6.32.13/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.13/arch/x86/lib/copy_user_nocache_64.S | 15180 | diff -urNp linux-2.6.32.15/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.15/arch/x86/lib/copy_user_nocache_64.S |
15184 | --- linux-2.6.32.13/arch/x86/lib/copy_user_nocache_64.S 2010-03-15 11:52:04.000000000 -0400 | 15181 | --- linux-2.6.32.15/arch/x86/lib/copy_user_nocache_64.S 2010-03-15 11:52:04.000000000 -0400 |
15185 | +++ linux-2.6.32.13/arch/x86/lib/copy_user_nocache_64.S 2010-05-15 13:21:14.234766826 -0400 | 15182 | +++ linux-2.6.32.15/arch/x86/lib/copy_user_nocache_64.S 2010-05-28 21:27:15.095006556 -0400 |
15186 | @@ -14,6 +14,7 @@ | 15183 | @@ -14,6 +14,7 @@ |
15187 | #include <asm/current.h> | 15184 | #include <asm/current.h> |
15188 | #include <asm/asm-offsets.h> | 15185 | #include <asm/asm-offsets.h> |
@@ -15207,9 +15204,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.13/a | |||
15207 | cmpl $8,%edx | 15204 | cmpl $8,%edx |
15208 | jb 20f /* less then 8 bytes, go to byte copy loop */ | 15205 | jb 20f /* less then 8 bytes, go to byte copy loop */ |
15209 | ALIGN_DESTINATION | 15206 | ALIGN_DESTINATION |
15210 | diff -urNp linux-2.6.32.13/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.13/arch/x86/lib/csum-wrappers_64.c | 15207 | diff -urNp linux-2.6.32.15/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.15/arch/x86/lib/csum-wrappers_64.c |
15211 | --- linux-2.6.32.13/arch/x86/lib/csum-wrappers_64.c 2010-03-15 11:52:04.000000000 -0400 | 15208 | --- linux-2.6.32.15/arch/x86/lib/csum-wrappers_64.c 2010-03-15 11:52:04.000000000 -0400 |
15212 | +++ linux-2.6.32.13/arch/x86/lib/csum-wrappers_64.c 2010-05-15 13:21:14.234766826 -0400 | 15209 | +++ linux-2.6.32.15/arch/x86/lib/csum-wrappers_64.c 2010-05-28 21:27:15.095006556 -0400 |
15213 | @@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _ | 15210 | @@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _ |
15214 | len -= 2; | 15211 | len -= 2; |
15215 | } | 15212 | } |
@@ -15228,9 +15225,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.13/arch/ | |||
15228 | return csum_partial_copy_generic(src, (void __force *)dst, | 15225 | return csum_partial_copy_generic(src, (void __force *)dst, |
15229 | len, isum, NULL, errp); | 15226 | len, isum, NULL, errp); |
15230 | } | 15227 | } |
15231 | diff -urNp linux-2.6.32.13/arch/x86/lib/getuser.S linux-2.6.32.13/arch/x86/lib/getuser.S | 15228 | diff -urNp linux-2.6.32.15/arch/x86/lib/getuser.S linux-2.6.32.15/arch/x86/lib/getuser.S |
15232 | --- linux-2.6.32.13/arch/x86/lib/getuser.S 2010-03-15 11:52:04.000000000 -0400 | 15229 | --- linux-2.6.32.15/arch/x86/lib/getuser.S 2010-03-15 11:52:04.000000000 -0400 |
15233 | +++ linux-2.6.32.13/arch/x86/lib/getuser.S 2010-05-15 13:21:14.234766826 -0400 | 15230 | +++ linux-2.6.32.15/arch/x86/lib/getuser.S 2010-05-28 21:27:15.095006556 -0400 |
15234 | @@ -33,14 +33,38 @@ | 15231 | @@ -33,14 +33,38 @@ |
15235 | #include <asm/asm-offsets.h> | 15232 | #include <asm/asm-offsets.h> |
15236 | #include <asm/thread_info.h> | 15233 | #include <asm/thread_info.h> |
@@ -15367,9 +15364,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/getuser.S linux-2.6.32.13/arch/x86/lib/g | |||
15367 | xor %edx,%edx | 15364 | xor %edx,%edx |
15368 | mov $(-EFAULT),%_ASM_AX | 15365 | mov $(-EFAULT),%_ASM_AX |
15369 | ret | 15366 | ret |
15370 | diff -urNp linux-2.6.32.13/arch/x86/lib/memcpy_64.S linux-2.6.32.13/arch/x86/lib/memcpy_64.S | 15367 | diff -urNp linux-2.6.32.15/arch/x86/lib/memcpy_64.S linux-2.6.32.15/arch/x86/lib/memcpy_64.S |
15371 | --- linux-2.6.32.13/arch/x86/lib/memcpy_64.S 2010-03-15 11:52:04.000000000 -0400 | 15368 | --- linux-2.6.32.15/arch/x86/lib/memcpy_64.S 2010-03-15 11:52:04.000000000 -0400 |
15372 | +++ linux-2.6.32.13/arch/x86/lib/memcpy_64.S 2010-05-15 13:21:14.234766826 -0400 | 15369 | +++ linux-2.6.32.15/arch/x86/lib/memcpy_64.S 2010-05-28 21:27:15.095006556 -0400 |
15373 | @@ -128,7 +128,7 @@ ENDPROC(__memcpy) | 15370 | @@ -128,7 +128,7 @@ ENDPROC(__memcpy) |
15374 | * It is also a lot simpler. Use this when possible: | 15371 | * It is also a lot simpler. Use this when possible: |
15375 | */ | 15372 | */ |
@@ -15379,9 +15376,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/memcpy_64.S linux-2.6.32.13/arch/x86/lib | |||
15379 | 1: .byte 0xeb /* jmp <disp8> */ | 15376 | 1: .byte 0xeb /* jmp <disp8> */ |
15380 | .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ | 15377 | .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ |
15381 | 2: | 15378 | 2: |
15382 | diff -urNp linux-2.6.32.13/arch/x86/lib/memset_64.S linux-2.6.32.13/arch/x86/lib/memset_64.S | 15379 | diff -urNp linux-2.6.32.15/arch/x86/lib/memset_64.S linux-2.6.32.15/arch/x86/lib/memset_64.S |
15383 | --- linux-2.6.32.13/arch/x86/lib/memset_64.S 2010-03-15 11:52:04.000000000 -0400 | 15380 | --- linux-2.6.32.15/arch/x86/lib/memset_64.S 2010-03-15 11:52:04.000000000 -0400 |
15384 | +++ linux-2.6.32.13/arch/x86/lib/memset_64.S 2010-05-15 13:21:14.234766826 -0400 | 15381 | +++ linux-2.6.32.15/arch/x86/lib/memset_64.S 2010-05-28 21:27:15.095006556 -0400 |
15385 | @@ -118,7 +118,7 @@ ENDPROC(__memset) | 15382 | @@ -118,7 +118,7 @@ ENDPROC(__memset) |
15386 | 15383 | ||
15387 | #include <asm/cpufeature.h> | 15384 | #include <asm/cpufeature.h> |
@@ -15391,9 +15388,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/memset_64.S linux-2.6.32.13/arch/x86/lib | |||
15391 | 1: .byte 0xeb /* jmp <disp8> */ | 15388 | 1: .byte 0xeb /* jmp <disp8> */ |
15392 | .byte (memset_c - memset) - (2f - 1b) /* offset */ | 15389 | .byte (memset_c - memset) - (2f - 1b) /* offset */ |
15393 | 2: | 15390 | 2: |
15394 | diff -urNp linux-2.6.32.13/arch/x86/lib/mmx_32.c linux-2.6.32.13/arch/x86/lib/mmx_32.c | 15391 | diff -urNp linux-2.6.32.15/arch/x86/lib/mmx_32.c linux-2.6.32.15/arch/x86/lib/mmx_32.c |
15395 | --- linux-2.6.32.13/arch/x86/lib/mmx_32.c 2010-03-15 11:52:04.000000000 -0400 | 15392 | --- linux-2.6.32.15/arch/x86/lib/mmx_32.c 2010-03-15 11:52:04.000000000 -0400 |
15396 | +++ linux-2.6.32.13/arch/x86/lib/mmx_32.c 2010-05-15 13:21:14.234766826 -0400 | 15393 | +++ linux-2.6.32.15/arch/x86/lib/mmx_32.c 2010-05-28 21:27:15.095006556 -0400 |
15397 | @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * | 15394 | @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * |
15398 | { | 15395 | { |
15399 | void *p; | 15396 | void *p; |
@@ -15709,9 +15706,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/mmx_32.c linux-2.6.32.13/arch/x86/lib/mm | |||
15709 | 15706 | ||
15710 | from += 64; | 15707 | from += 64; |
15711 | to += 64; | 15708 | to += 64; |
15712 | diff -urNp linux-2.6.32.13/arch/x86/lib/putuser.S linux-2.6.32.13/arch/x86/lib/putuser.S | 15709 | diff -urNp linux-2.6.32.15/arch/x86/lib/putuser.S linux-2.6.32.15/arch/x86/lib/putuser.S |
15713 | --- linux-2.6.32.13/arch/x86/lib/putuser.S 2010-03-15 11:52:04.000000000 -0400 | 15710 | --- linux-2.6.32.15/arch/x86/lib/putuser.S 2010-03-15 11:52:04.000000000 -0400 |
15714 | +++ linux-2.6.32.13/arch/x86/lib/putuser.S 2010-05-15 13:21:14.234766826 -0400 | 15711 | +++ linux-2.6.32.15/arch/x86/lib/putuser.S 2010-05-28 21:27:15.095006556 -0400 |
15715 | @@ -15,7 +15,8 @@ | 15712 | @@ -15,7 +15,8 @@ |
15716 | #include <asm/thread_info.h> | 15713 | #include <asm/thread_info.h> |
15717 | #include <asm/errno.h> | 15714 | #include <asm/errno.h> |
@@ -15881,9 +15878,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/putuser.S linux-2.6.32.13/arch/x86/lib/p | |||
15881 | movl $-EFAULT,%eax | 15878 | movl $-EFAULT,%eax |
15882 | EXIT | 15879 | EXIT |
15883 | END(bad_put_user) | 15880 | END(bad_put_user) |
15884 | diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/lib/usercopy_32.c | 15881 | diff -urNp linux-2.6.32.15/arch/x86/lib/usercopy_32.c linux-2.6.32.15/arch/x86/lib/usercopy_32.c |
15885 | --- linux-2.6.32.13/arch/x86/lib/usercopy_32.c 2010-03-15 11:52:04.000000000 -0400 | 15882 | --- linux-2.6.32.15/arch/x86/lib/usercopy_32.c 2010-03-15 11:52:04.000000000 -0400 |
15886 | +++ linux-2.6.32.13/arch/x86/lib/usercopy_32.c 2010-05-15 13:21:14.234766826 -0400 | 15883 | +++ linux-2.6.32.15/arch/x86/lib/usercopy_32.c 2010-05-28 21:27:15.107152206 -0400 |
15887 | @@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned | 15884 | @@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned |
15888 | * Copy a null terminated string from userspace. | 15885 | * Copy a null terminated string from userspace. |
15889 | */ | 15886 | */ |
@@ -16852,9 +16849,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l | |||
16852 | +#endif | 16849 | +#endif |
16853 | + | 16850 | + |
16854 | +EXPORT_SYMBOL(set_fs); | 16851 | +EXPORT_SYMBOL(set_fs); |
16855 | diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_64.c linux-2.6.32.13/arch/x86/lib/usercopy_64.c | 16852 | diff -urNp linux-2.6.32.15/arch/x86/lib/usercopy_64.c linux-2.6.32.15/arch/x86/lib/usercopy_64.c |
16856 | --- linux-2.6.32.13/arch/x86/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400 | 16853 | --- linux-2.6.32.15/arch/x86/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400 |
16857 | +++ linux-2.6.32.13/arch/x86/lib/usercopy_64.c 2010-05-15 13:21:14.234766826 -0400 | 16854 | +++ linux-2.6.32.15/arch/x86/lib/usercopy_64.c 2010-05-28 21:27:15.107152206 -0400 |
16858 | @@ -42,6 +42,8 @@ long | 16855 | @@ -42,6 +42,8 @@ long |
16859 | __strncpy_from_user(char *dst, const char __user *src, long count) | 16856 | __strncpy_from_user(char *dst, const char __user *src, long count) |
16860 | { | 16857 | { |
@@ -16891,9 +16888,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_64.c linux-2.6.32.13/arch/x86/l | |||
16891 | } | 16888 | } |
16892 | EXPORT_SYMBOL(copy_in_user); | 16889 | EXPORT_SYMBOL(copy_in_user); |
16893 | 16890 | ||
16894 | diff -urNp linux-2.6.32.13/arch/x86/Makefile linux-2.6.32.13/arch/x86/Makefile | 16891 | diff -urNp linux-2.6.32.15/arch/x86/Makefile linux-2.6.32.15/arch/x86/Makefile |
16895 | --- linux-2.6.32.13/arch/x86/Makefile 2010-03-15 11:52:04.000000000 -0400 | 16892 | --- linux-2.6.32.15/arch/x86/Makefile 2010-03-15 11:52:04.000000000 -0400 |
16896 | +++ linux-2.6.32.13/arch/x86/Makefile 2010-05-15 13:21:14.234766826 -0400 | 16893 | +++ linux-2.6.32.15/arch/x86/Makefile 2010-05-28 21:27:15.107152206 -0400 |
16897 | @@ -189,3 +189,12 @@ define archhelp | 16894 | @@ -189,3 +189,12 @@ define archhelp |
16898 | echo ' FDARGS="..." arguments for the booted kernel' | 16895 | echo ' FDARGS="..." arguments for the booted kernel' |
16899 | echo ' FDINITRD=file initrd for the booted kernel' | 16896 | echo ' FDINITRD=file initrd for the booted kernel' |
@@ -16907,9 +16904,9 @@ diff -urNp linux-2.6.32.13/arch/x86/Makefile linux-2.6.32.13/arch/x86/Makefile | |||
16907 | + | 16904 | + |
16908 | +archprepare: | 16905 | +archprepare: |
16909 | + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) | 16906 | + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) |
16910 | diff -urNp linux-2.6.32.13/arch/x86/mm/extable.c linux-2.6.32.13/arch/x86/mm/extable.c | 16907 | diff -urNp linux-2.6.32.15/arch/x86/mm/extable.c linux-2.6.32.15/arch/x86/mm/extable.c |
16911 | --- linux-2.6.32.13/arch/x86/mm/extable.c 2010-03-15 11:52:04.000000000 -0400 | 16908 | --- linux-2.6.32.15/arch/x86/mm/extable.c 2010-03-15 11:52:04.000000000 -0400 |
16912 | +++ linux-2.6.32.13/arch/x86/mm/extable.c 2010-05-15 13:21:14.234766826 -0400 | 16909 | +++ linux-2.6.32.15/arch/x86/mm/extable.c 2010-05-28 21:27:15.107152206 -0400 |
16913 | @@ -1,14 +1,71 @@ | 16910 | @@ -1,14 +1,71 @@ |
16914 | #include <linux/module.h> | 16911 | #include <linux/module.h> |
16915 | #include <linux/spinlock.h> | 16912 | #include <linux/spinlock.h> |
@@ -16983,9 +16980,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/extable.c linux-2.6.32.13/arch/x86/mm/ext | |||
16983 | extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; | 16980 | extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; |
16984 | extern u32 pnp_bios_is_utter_crap; | 16981 | extern u32 pnp_bios_is_utter_crap; |
16985 | pnp_bios_is_utter_crap = 1; | 16982 | pnp_bios_is_utter_crap = 1; |
16986 | diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault.c | 16983 | diff -urNp linux-2.6.32.15/arch/x86/mm/fault.c linux-2.6.32.15/arch/x86/mm/fault.c |
16987 | --- linux-2.6.32.13/arch/x86/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 | 16984 | --- linux-2.6.32.15/arch/x86/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 |
16988 | +++ linux-2.6.32.13/arch/x86/mm/fault.c 2010-05-15 13:23:38.934774262 -0400 | 16985 | +++ linux-2.6.32.15/arch/x86/mm/fault.c 2010-05-28 21:27:15.107152206 -0400 |
16989 | @@ -11,10 +11,19 @@ | 16986 | @@ -11,10 +11,19 @@ |
16990 | #include <linux/kprobes.h> /* __kprobes, ... */ | 16987 | #include <linux/kprobes.h> /* __kprobes, ... */ |
16991 | #include <linux/mmiotrace.h> /* kmmio_handler, ... */ | 16988 | #include <linux/mmiotrace.h> /* kmmio_handler, ... */ |
@@ -17651,9 +17648,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault | |||
17651 | + | 17648 | + |
17652 | + return ret ? -EFAULT : 0; | 17649 | + return ret ? -EFAULT : 0; |
17653 | +} | 17650 | +} |
17654 | diff -urNp linux-2.6.32.13/arch/x86/mm/gup.c linux-2.6.32.13/arch/x86/mm/gup.c | 17651 | diff -urNp linux-2.6.32.15/arch/x86/mm/gup.c linux-2.6.32.15/arch/x86/mm/gup.c |
17655 | --- linux-2.6.32.13/arch/x86/mm/gup.c 2010-03-15 11:52:04.000000000 -0400 | 17652 | --- linux-2.6.32.15/arch/x86/mm/gup.c 2010-03-15 11:52:04.000000000 -0400 |
17656 | +++ linux-2.6.32.13/arch/x86/mm/gup.c 2010-05-15 13:21:14.234766826 -0400 | 17653 | +++ linux-2.6.32.15/arch/x86/mm/gup.c 2010-05-28 21:27:15.107152206 -0400 |
17657 | @@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long | 17654 | @@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long |
17658 | addr = start; | 17655 | addr = start; |
17659 | len = (unsigned long) nr_pages << PAGE_SHIFT; | 17656 | len = (unsigned long) nr_pages << PAGE_SHIFT; |
@@ -17663,9 +17660,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/gup.c linux-2.6.32.13/arch/x86/mm/gup.c | |||
17663 | (void __user *)start, len))) | 17660 | (void __user *)start, len))) |
17664 | return 0; | 17661 | return 0; |
17665 | 17662 | ||
17666 | diff -urNp linux-2.6.32.13/arch/x86/mm/highmem_32.c linux-2.6.32.13/arch/x86/mm/highmem_32.c | 17663 | diff -urNp linux-2.6.32.15/arch/x86/mm/highmem_32.c linux-2.6.32.15/arch/x86/mm/highmem_32.c |
17667 | --- linux-2.6.32.13/arch/x86/mm/highmem_32.c 2010-03-15 11:52:04.000000000 -0400 | 17664 | --- linux-2.6.32.15/arch/x86/mm/highmem_32.c 2010-03-15 11:52:04.000000000 -0400 |
17668 | +++ linux-2.6.32.13/arch/x86/mm/highmem_32.c 2010-05-15 13:21:14.238617110 -0400 | 17665 | +++ linux-2.6.32.15/arch/x86/mm/highmem_32.c 2010-05-28 21:27:15.107152206 -0400 |
17669 | @@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page | 17666 | @@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page |
17670 | idx = type + KM_TYPE_NR*smp_processor_id(); | 17667 | idx = type + KM_TYPE_NR*smp_processor_id(); |
17671 | vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); | 17668 | vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); |
@@ -17677,9 +17674,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/highmem_32.c linux-2.6.32.13/arch/x86/mm/ | |||
17677 | 17674 | ||
17678 | return (void *)vaddr; | 17675 | return (void *)vaddr; |
17679 | } | 17676 | } |
17680 | diff -urNp linux-2.6.32.13/arch/x86/mm/hugetlbpage.c linux-2.6.32.13/arch/x86/mm/hugetlbpage.c | 17677 | diff -urNp linux-2.6.32.15/arch/x86/mm/hugetlbpage.c linux-2.6.32.15/arch/x86/mm/hugetlbpage.c |
17681 | --- linux-2.6.32.13/arch/x86/mm/hugetlbpage.c 2010-03-15 11:52:04.000000000 -0400 | 17678 | --- linux-2.6.32.15/arch/x86/mm/hugetlbpage.c 2010-03-15 11:52:04.000000000 -0400 |
17682 | +++ linux-2.6.32.13/arch/x86/mm/hugetlbpage.c 2010-05-15 13:21:14.238617110 -0400 | 17679 | +++ linux-2.6.32.15/arch/x86/mm/hugetlbpage.c 2010-05-28 21:27:15.107152206 -0400 |
17683 | @@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe | 17680 | @@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe |
17684 | struct hstate *h = hstate_file(file); | 17681 | struct hstate *h = hstate_file(file); |
17685 | struct mm_struct *mm = current->mm; | 17682 | struct mm_struct *mm = current->mm; |
@@ -17814,9 +17811,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/hugetlbpage.c linux-2.6.32.13/arch/x86/mm | |||
17814 | (!vma || addr + len <= vma->vm_start)) | 17811 | (!vma || addr + len <= vma->vm_start)) |
17815 | return addr; | 17812 | return addr; |
17816 | } | 17813 | } |
17817 | diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/init_32.c | 17814 | diff -urNp linux-2.6.32.15/arch/x86/mm/init_32.c linux-2.6.32.15/arch/x86/mm/init_32.c |
17818 | --- linux-2.6.32.13/arch/x86/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400 | 17815 | --- linux-2.6.32.15/arch/x86/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400 |
17819 | +++ linux-2.6.32.13/arch/x86/mm/init_32.c 2010-05-15 13:21:14.238617110 -0400 | 17816 | +++ linux-2.6.32.15/arch/x86/mm/init_32.c 2010-05-28 21:27:15.114903294 -0400 |
17820 | @@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) | 17817 | @@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) |
17821 | } | 17818 | } |
17822 | 17819 | ||
@@ -18120,9 +18117,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/ini | |||
18120 | set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); | 18117 | set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); |
18121 | printk(KERN_INFO "Write protecting the kernel text: %luk\n", | 18118 | printk(KERN_INFO "Write protecting the kernel text: %luk\n", |
18122 | size >> 10); | 18119 | size >> 10); |
18123 | diff -urNp linux-2.6.32.13/arch/x86/mm/init_64.c linux-2.6.32.13/arch/x86/mm/init_64.c | 18120 | diff -urNp linux-2.6.32.15/arch/x86/mm/init_64.c linux-2.6.32.15/arch/x86/mm/init_64.c |
18124 | --- linux-2.6.32.13/arch/x86/mm/init_64.c 2010-03-15 11:52:04.000000000 -0400 | 18121 | --- linux-2.6.32.15/arch/x86/mm/init_64.c 2010-03-15 11:52:04.000000000 -0400 |
18125 | +++ linux-2.6.32.13/arch/x86/mm/init_64.c 2010-05-15 13:21:14.238617110 -0400 | 18122 | +++ linux-2.6.32.15/arch/x86/mm/init_64.c 2010-05-28 21:27:15.114903294 -0400 |
18126 | @@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, | 18123 | @@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, |
18127 | pmd = fill_pmd(pud, vaddr); | 18124 | pmd = fill_pmd(pud, vaddr); |
18128 | pte = fill_pte(pmd, vaddr); | 18125 | pte = fill_pte(pmd, vaddr); |
@@ -18183,9 +18180,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_64.c linux-2.6.32.13/arch/x86/mm/ini | |||
18183 | return "[vdso]"; | 18180 | return "[vdso]"; |
18184 | if (vma == &gate_vma) | 18181 | if (vma == &gate_vma) |
18185 | return "[vsyscall]"; | 18182 | return "[vsyscall]"; |
18186 | diff -urNp linux-2.6.32.13/arch/x86/mm/init.c linux-2.6.32.13/arch/x86/mm/init.c | 18183 | diff -urNp linux-2.6.32.15/arch/x86/mm/init.c linux-2.6.32.15/arch/x86/mm/init.c |
18187 | --- linux-2.6.32.13/arch/x86/mm/init.c 2010-03-15 11:52:04.000000000 -0400 | 18184 | --- linux-2.6.32.15/arch/x86/mm/init.c 2010-03-15 11:52:04.000000000 -0400 |
18188 | +++ linux-2.6.32.13/arch/x86/mm/init.c 2010-05-15 13:21:14.238617110 -0400 | 18185 | +++ linux-2.6.32.15/arch/x86/mm/init.c 2010-05-28 21:27:15.114903294 -0400 |
18189 | @@ -69,11 +69,7 @@ static void __init find_early_table_spac | 18186 | @@ -69,11 +69,7 @@ static void __init find_early_table_spac |
18190 | * cause a hotspot and fill up ZONE_DMA. The page tables | 18187 | * cause a hotspot and fill up ZONE_DMA. The page tables |
18191 | * need roughly 0.5KB per GB. | 18188 | * need roughly 0.5KB per GB. |
@@ -18302,9 +18299,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init.c linux-2.6.32.13/arch/x86/mm/init.c | |||
18302 | free_init_pages("unused kernel memory", | 18299 | free_init_pages("unused kernel memory", |
18303 | (unsigned long)(&__init_begin), | 18300 | (unsigned long)(&__init_begin), |
18304 | (unsigned long)(&__init_end)); | 18301 | (unsigned long)(&__init_end)); |
18305 | diff -urNp linux-2.6.32.13/arch/x86/mm/iomap_32.c linux-2.6.32.13/arch/x86/mm/iomap_32.c | 18302 | diff -urNp linux-2.6.32.15/arch/x86/mm/iomap_32.c linux-2.6.32.15/arch/x86/mm/iomap_32.c |
18306 | --- linux-2.6.32.13/arch/x86/mm/iomap_32.c 2010-03-15 11:52:04.000000000 -0400 | 18303 | --- linux-2.6.32.15/arch/x86/mm/iomap_32.c 2010-03-15 11:52:04.000000000 -0400 |
18307 | +++ linux-2.6.32.13/arch/x86/mm/iomap_32.c 2010-05-15 13:21:14.238617110 -0400 | 18304 | +++ linux-2.6.32.15/arch/x86/mm/iomap_32.c 2010-05-28 21:27:15.114903294 -0400 |
18308 | @@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long | 18305 | @@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long |
18309 | debug_kmap_atomic(type); | 18306 | debug_kmap_atomic(type); |
18310 | idx = type + KM_TYPE_NR * smp_processor_id(); | 18307 | idx = type + KM_TYPE_NR * smp_processor_id(); |
@@ -18317,9 +18314,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/iomap_32.c linux-2.6.32.13/arch/x86/mm/io | |||
18317 | arch_flush_lazy_mmu_mode(); | 18314 | arch_flush_lazy_mmu_mode(); |
18318 | 18315 | ||
18319 | return (void *)vaddr; | 18316 | return (void *)vaddr; |
18320 | diff -urNp linux-2.6.32.13/arch/x86/mm/ioremap.c linux-2.6.32.13/arch/x86/mm/ioremap.c | 18317 | diff -urNp linux-2.6.32.15/arch/x86/mm/ioremap.c linux-2.6.32.15/arch/x86/mm/ioremap.c |
18321 | --- linux-2.6.32.13/arch/x86/mm/ioremap.c 2010-03-15 11:52:04.000000000 -0400 | 18318 | --- linux-2.6.32.15/arch/x86/mm/ioremap.c 2010-03-15 11:52:04.000000000 -0400 |
18322 | +++ linux-2.6.32.13/arch/x86/mm/ioremap.c 2010-05-15 13:21:14.238617110 -0400 | 18319 | +++ linux-2.6.32.15/arch/x86/mm/ioremap.c 2010-05-28 21:27:15.114903294 -0400 |
18323 | @@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr) | 18320 | @@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr) |
18324 | * Second special case: Some BIOSen report the PC BIOS | 18321 | * Second special case: Some BIOSen report the PC BIOS |
18325 | * area (640->1Mb) as ram even though it is not. | 18322 | * area (640->1Mb) as ram even though it is not. |
@@ -18366,9 +18363,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/ioremap.c linux-2.6.32.13/arch/x86/mm/ior | |||
18366 | 18363 | ||
18367 | /* | 18364 | /* |
18368 | * The boot-ioremap range spans multiple pmds, for which | 18365 | * The boot-ioremap range spans multiple pmds, for which |
18369 | diff -urNp linux-2.6.32.13/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.13/arch/x86/mm/kmemcheck/kmemcheck.c | 18366 | diff -urNp linux-2.6.32.15/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.15/arch/x86/mm/kmemcheck/kmemcheck.c |
18370 | --- linux-2.6.32.13/arch/x86/mm/kmemcheck/kmemcheck.c 2010-03-15 11:52:04.000000000 -0400 | 18367 | --- linux-2.6.32.15/arch/x86/mm/kmemcheck/kmemcheck.c 2010-03-15 11:52:04.000000000 -0400 |
18371 | +++ linux-2.6.32.13/arch/x86/mm/kmemcheck/kmemcheck.c 2010-05-15 13:21:14.238617110 -0400 | 18368 | +++ linux-2.6.32.15/arch/x86/mm/kmemcheck/kmemcheck.c 2010-05-28 21:27:15.114903294 -0400 |
18372 | @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg | 18369 | @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg |
18373 | * memory (e.g. tracked pages)? For now, we need this to avoid | 18370 | * memory (e.g. tracked pages)? For now, we need this to avoid |
18374 | * invoking kmemcheck for PnP BIOS calls. | 18371 | * invoking kmemcheck for PnP BIOS calls. |
@@ -18381,9 +18378,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.13/arc | |||
18381 | return false; | 18378 | return false; |
18382 | 18379 | ||
18383 | pte = kmemcheck_pte_lookup(address); | 18380 | pte = kmemcheck_pte_lookup(address); |
18384 | diff -urNp linux-2.6.32.13/arch/x86/mm/mmap.c linux-2.6.32.13/arch/x86/mm/mmap.c | 18381 | diff -urNp linux-2.6.32.15/arch/x86/mm/mmap.c linux-2.6.32.15/arch/x86/mm/mmap.c |
18385 | --- linux-2.6.32.13/arch/x86/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 | 18382 | --- linux-2.6.32.15/arch/x86/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 |
18386 | +++ linux-2.6.32.13/arch/x86/mm/mmap.c 2010-05-15 13:21:14.238617110 -0400 | 18383 | +++ linux-2.6.32.15/arch/x86/mm/mmap.c 2010-05-28 21:27:15.114903294 -0400 |
18387 | @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size | 18384 | @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size |
18388 | * Leave an at least ~128 MB hole with possible stack randomization. | 18385 | * Leave an at least ~128 MB hole with possible stack randomization. |
18389 | */ | 18386 | */ |
@@ -18465,9 +18462,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/mmap.c linux-2.6.32.13/arch/x86/mm/mmap.c | |||
18465 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; | 18462 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; |
18466 | mm->unmap_area = arch_unmap_area_topdown; | 18463 | mm->unmap_area = arch_unmap_area_topdown; |
18467 | } | 18464 | } |
18468 | diff -urNp linux-2.6.32.13/arch/x86/mm/numa_32.c linux-2.6.32.13/arch/x86/mm/numa_32.c | 18465 | diff -urNp linux-2.6.32.15/arch/x86/mm/numa_32.c linux-2.6.32.15/arch/x86/mm/numa_32.c |
18469 | --- linux-2.6.32.13/arch/x86/mm/numa_32.c 2010-03-15 11:52:04.000000000 -0400 | 18466 | --- linux-2.6.32.15/arch/x86/mm/numa_32.c 2010-03-15 11:52:04.000000000 -0400 |
18470 | +++ linux-2.6.32.13/arch/x86/mm/numa_32.c 2010-05-15 13:21:14.238617110 -0400 | 18467 | +++ linux-2.6.32.15/arch/x86/mm/numa_32.c 2010-05-28 21:27:15.118897735 -0400 |
18471 | @@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int | 18468 | @@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int |
18472 | } | 18469 | } |
18473 | #endif | 18470 | #endif |
@@ -18476,9 +18473,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/numa_32.c linux-2.6.32.13/arch/x86/mm/num | |||
18476 | extern unsigned long highend_pfn, highstart_pfn; | 18473 | extern unsigned long highend_pfn, highstart_pfn; |
18477 | 18474 | ||
18478 | #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) | 18475 | #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) |
18479 | diff -urNp linux-2.6.32.13/arch/x86/mm/pageattr.c linux-2.6.32.13/arch/x86/mm/pageattr.c | 18476 | diff -urNp linux-2.6.32.15/arch/x86/mm/pageattr.c linux-2.6.32.15/arch/x86/mm/pageattr.c |
18480 | --- linux-2.6.32.13/arch/x86/mm/pageattr.c 2010-03-15 11:52:04.000000000 -0400 | 18477 | --- linux-2.6.32.15/arch/x86/mm/pageattr.c 2010-03-15 11:52:04.000000000 -0400 |
18481 | +++ linux-2.6.32.13/arch/x86/mm/pageattr.c 2010-05-15 13:21:14.238617110 -0400 | 18478 | +++ linux-2.6.32.15/arch/x86/mm/pageattr.c 2010-05-28 21:27:15.118897735 -0400 |
18482 | @@ -268,9 +268,10 @@ static inline pgprot_t static_protection | 18479 | @@ -268,9 +268,10 @@ static inline pgprot_t static_protection |
18483 | * Does not cover __inittext since that is gone later on. On | 18480 | * Does not cover __inittext since that is gone later on. On |
18484 | * 64bit we do not enforce !NX on the low mapping | 18481 | * 64bit we do not enforce !NX on the low mapping |
@@ -18510,9 +18507,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/pageattr.c linux-2.6.32.13/arch/x86/mm/pa | |||
18510 | #ifdef CONFIG_X86_32 | 18507 | #ifdef CONFIG_X86_32 |
18511 | if (!SHARED_KERNEL_PMD) { | 18508 | if (!SHARED_KERNEL_PMD) { |
18512 | struct page *page; | 18509 | struct page *page; |
18513 | diff -urNp linux-2.6.32.13/arch/x86/mm/pageattr-test.c linux-2.6.32.13/arch/x86/mm/pageattr-test.c | 18510 | diff -urNp linux-2.6.32.15/arch/x86/mm/pageattr-test.c linux-2.6.32.15/arch/x86/mm/pageattr-test.c |
18514 | --- linux-2.6.32.13/arch/x86/mm/pageattr-test.c 2010-03-15 11:52:04.000000000 -0400 | 18511 | --- linux-2.6.32.15/arch/x86/mm/pageattr-test.c 2010-03-15 11:52:04.000000000 -0400 |
18515 | +++ linux-2.6.32.13/arch/x86/mm/pageattr-test.c 2010-05-15 13:21:14.238617110 -0400 | 18512 | +++ linux-2.6.32.15/arch/x86/mm/pageattr-test.c 2010-05-28 21:27:15.118897735 -0400 |
18516 | @@ -36,7 +36,7 @@ enum { | 18513 | @@ -36,7 +36,7 @@ enum { |
18517 | 18514 | ||
18518 | static int pte_testbit(pte_t pte) | 18515 | static int pte_testbit(pte_t pte) |
@@ -18522,9 +18519,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/pageattr-test.c linux-2.6.32.13/arch/x86/ | |||
18522 | } | 18519 | } |
18523 | 18520 | ||
18524 | struct split_state { | 18521 | struct split_state { |
18525 | diff -urNp linux-2.6.32.13/arch/x86/mm/pat.c linux-2.6.32.13/arch/x86/mm/pat.c | 18522 | diff -urNp linux-2.6.32.15/arch/x86/mm/pat.c linux-2.6.32.15/arch/x86/mm/pat.c |
18526 | --- linux-2.6.32.13/arch/x86/mm/pat.c 2010-03-15 11:52:04.000000000 -0400 | 18523 | --- linux-2.6.32.15/arch/x86/mm/pat.c 2010-03-15 11:52:04.000000000 -0400 |
18527 | +++ linux-2.6.32.13/arch/x86/mm/pat.c 2010-05-15 13:21:14.258921790 -0400 | 18524 | +++ linux-2.6.32.15/arch/x86/mm/pat.c 2010-05-28 21:27:15.118897735 -0400 |
18528 | @@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct | 18525 | @@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct |
18529 | 18526 | ||
18530 | conflict: | 18527 | conflict: |
@@ -18561,9 +18558,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/pat.c linux-2.6.32.13/arch/x86/mm/pat.c | |||
18561 | cattr_name(want_flags), | 18558 | cattr_name(want_flags), |
18562 | (unsigned long long)paddr, | 18559 | (unsigned long long)paddr, |
18563 | (unsigned long long)(paddr + size), | 18560 | (unsigned long long)(paddr + size), |
18564 | diff -urNp linux-2.6.32.13/arch/x86/mm/pgtable_32.c linux-2.6.32.13/arch/x86/mm/pgtable_32.c | 18561 | diff -urNp linux-2.6.32.15/arch/x86/mm/pgtable_32.c linux-2.6.32.15/arch/x86/mm/pgtable_32.c |
18565 | --- linux-2.6.32.13/arch/x86/mm/pgtable_32.c 2010-03-15 11:52:04.000000000 -0400 | 18562 | --- linux-2.6.32.15/arch/x86/mm/pgtable_32.c 2010-03-15 11:52:04.000000000 -0400 |
18566 | +++ linux-2.6.32.13/arch/x86/mm/pgtable_32.c 2010-05-15 13:21:14.258921790 -0400 | 18563 | +++ linux-2.6.32.15/arch/x86/mm/pgtable_32.c 2010-05-28 21:27:15.118897735 -0400 |
18567 | @@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, | 18564 | @@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, |
18568 | return; | 18565 | return; |
18569 | } | 18566 | } |
@@ -18578,9 +18575,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/pgtable_32.c linux-2.6.32.13/arch/x86/mm/ | |||
18578 | 18575 | ||
18579 | /* | 18576 | /* |
18580 | * It's enough to flush this one mapping. | 18577 | * It's enough to flush this one mapping. |
18581 | diff -urNp linux-2.6.32.13/arch/x86/mm/pgtable.c linux-2.6.32.13/arch/x86/mm/pgtable.c | 18578 | diff -urNp linux-2.6.32.15/arch/x86/mm/pgtable.c linux-2.6.32.15/arch/x86/mm/pgtable.c |
18582 | --- linux-2.6.32.13/arch/x86/mm/pgtable.c 2010-03-15 11:52:04.000000000 -0400 | 18579 | --- linux-2.6.32.15/arch/x86/mm/pgtable.c 2010-03-15 11:52:04.000000000 -0400 |
18583 | +++ linux-2.6.32.13/arch/x86/mm/pgtable.c 2010-05-15 13:21:14.258921790 -0400 | 18580 | +++ linux-2.6.32.15/arch/x86/mm/pgtable.c 2010-05-28 21:27:15.118897735 -0400 |
18584 | @@ -63,8 +63,12 @@ void ___pmd_free_tlb(struct mmu_gather * | 18581 | @@ -63,8 +63,12 @@ void ___pmd_free_tlb(struct mmu_gather * |
18585 | #if PAGETABLE_LEVELS > 3 | 18582 | #if PAGETABLE_LEVELS > 3 |
18586 | void ___pud_free_tlb(struct mmu_gather *tlb, pud_t *pud) | 18583 | void ___pud_free_tlb(struct mmu_gather *tlb, pud_t *pud) |
@@ -18850,9 +18847,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/pgtable.c linux-2.6.32.13/arch/x86/mm/pgt | |||
18850 | pgd_dtor(pgd); | 18847 | pgd_dtor(pgd); |
18851 | paravirt_pgd_free(mm, pgd); | 18848 | paravirt_pgd_free(mm, pgd); |
18852 | free_page((unsigned long)pgd); | 18849 | free_page((unsigned long)pgd); |
18853 | diff -urNp linux-2.6.32.13/arch/x86/mm/setup_nx.c linux-2.6.32.13/arch/x86/mm/setup_nx.c | 18850 | diff -urNp linux-2.6.32.15/arch/x86/mm/setup_nx.c linux-2.6.32.15/arch/x86/mm/setup_nx.c |
18854 | --- linux-2.6.32.13/arch/x86/mm/setup_nx.c 2010-03-15 11:52:04.000000000 -0400 | 18851 | --- linux-2.6.32.15/arch/x86/mm/setup_nx.c 2010-03-15 11:52:04.000000000 -0400 |
18855 | +++ linux-2.6.32.13/arch/x86/mm/setup_nx.c 2010-05-15 13:21:14.258921790 -0400 | 18852 | +++ linux-2.6.32.15/arch/x86/mm/setup_nx.c 2010-05-28 21:27:15.118897735 -0400 |
18856 | @@ -4,11 +4,10 @@ | 18853 | @@ -4,11 +4,10 @@ |
18857 | 18854 | ||
18858 | #include <asm/pgtable.h> | 18855 | #include <asm/pgtable.h> |
@@ -18918,9 +18915,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/setup_nx.c linux-2.6.32.13/arch/x86/mm/se | |||
18918 | __supported_pte_mask &= ~_PAGE_NX; | 18915 | __supported_pte_mask &= ~_PAGE_NX; |
18919 | } | 18916 | } |
18920 | #endif | 18917 | #endif |
18921 | diff -urNp linux-2.6.32.13/arch/x86/mm/tlb.c linux-2.6.32.13/arch/x86/mm/tlb.c | 18918 | diff -urNp linux-2.6.32.15/arch/x86/mm/tlb.c linux-2.6.32.15/arch/x86/mm/tlb.c |
18922 | --- linux-2.6.32.13/arch/x86/mm/tlb.c 2010-03-15 11:52:04.000000000 -0400 | 18919 | --- linux-2.6.32.15/arch/x86/mm/tlb.c 2010-03-15 11:52:04.000000000 -0400 |
18923 | +++ linux-2.6.32.13/arch/x86/mm/tlb.c 2010-05-15 13:21:14.258921790 -0400 | 18920 | +++ linux-2.6.32.15/arch/x86/mm/tlb.c 2010-05-28 21:27:15.118897735 -0400 |
18924 | @@ -12,7 +12,7 @@ | 18921 | @@ -12,7 +12,7 @@ |
18925 | #include <asm/uv/uv.h> | 18922 | #include <asm/uv/uv.h> |
18926 | 18923 | ||
@@ -18942,9 +18939,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/tlb.c linux-2.6.32.13/arch/x86/mm/tlb.c | |||
18942 | } | 18939 | } |
18943 | EXPORT_SYMBOL_GPL(leave_mm); | 18940 | EXPORT_SYMBOL_GPL(leave_mm); |
18944 | 18941 | ||
18945 | diff -urNp linux-2.6.32.13/arch/x86/oprofile/backtrace.c linux-2.6.32.13/arch/x86/oprofile/backtrace.c | 18942 | diff -urNp linux-2.6.32.15/arch/x86/oprofile/backtrace.c linux-2.6.32.15/arch/x86/oprofile/backtrace.c |
18946 | --- linux-2.6.32.13/arch/x86/oprofile/backtrace.c 2010-03-15 11:52:04.000000000 -0400 | 18943 | --- linux-2.6.32.15/arch/x86/oprofile/backtrace.c 2010-03-15 11:52:04.000000000 -0400 |
18947 | +++ linux-2.6.32.13/arch/x86/oprofile/backtrace.c 2010-05-15 13:21:14.258921790 -0400 | 18944 | +++ linux-2.6.32.15/arch/x86/oprofile/backtrace.c 2010-05-28 21:27:15.118897735 -0400 |
18948 | @@ -57,7 +57,7 @@ static struct frame_head *dump_user_back | 18945 | @@ -57,7 +57,7 @@ static struct frame_head *dump_user_back |
18949 | struct frame_head bufhead[2]; | 18946 | struct frame_head bufhead[2]; |
18950 | 18947 | ||
@@ -18963,9 +18960,9 @@ diff -urNp linux-2.6.32.13/arch/x86/oprofile/backtrace.c linux-2.6.32.13/arch/x8 | |||
18963 | unsigned long stack = kernel_stack_pointer(regs); | 18960 | unsigned long stack = kernel_stack_pointer(regs); |
18964 | if (depth) | 18961 | if (depth) |
18965 | dump_trace(NULL, regs, (unsigned long *)stack, 0, | 18962 | dump_trace(NULL, regs, (unsigned long *)stack, 0, |
18966 | diff -urNp linux-2.6.32.13/arch/x86/oprofile/op_model_p4.c linux-2.6.32.13/arch/x86/oprofile/op_model_p4.c | 18963 | diff -urNp linux-2.6.32.15/arch/x86/oprofile/op_model_p4.c linux-2.6.32.15/arch/x86/oprofile/op_model_p4.c |
18967 | --- linux-2.6.32.13/arch/x86/oprofile/op_model_p4.c 2010-03-15 11:52:04.000000000 -0400 | 18964 | --- linux-2.6.32.15/arch/x86/oprofile/op_model_p4.c 2010-03-15 11:52:04.000000000 -0400 |
18968 | +++ linux-2.6.32.13/arch/x86/oprofile/op_model_p4.c 2010-05-15 13:21:14.270940782 -0400 | 18965 | +++ linux-2.6.32.15/arch/x86/oprofile/op_model_p4.c 2010-05-28 21:27:15.118897735 -0400 |
18969 | @@ -50,7 +50,7 @@ static inline void setup_num_counters(vo | 18966 | @@ -50,7 +50,7 @@ static inline void setup_num_counters(vo |
18970 | #endif | 18967 | #endif |
18971 | } | 18968 | } |
@@ -18975,9 +18972,9 @@ diff -urNp linux-2.6.32.13/arch/x86/oprofile/op_model_p4.c linux-2.6.32.13/arch/ | |||
18975 | { | 18972 | { |
18976 | #ifdef CONFIG_SMP | 18973 | #ifdef CONFIG_SMP |
18977 | return smp_num_siblings == 2 ? 2 : 1; | 18974 | return smp_num_siblings == 2 ? 2 : 1; |
18978 | diff -urNp linux-2.6.32.13/arch/x86/pci/common.c linux-2.6.32.13/arch/x86/pci/common.c | 18975 | diff -urNp linux-2.6.32.15/arch/x86/pci/common.c linux-2.6.32.15/arch/x86/pci/common.c |
18979 | --- linux-2.6.32.13/arch/x86/pci/common.c 2010-03-15 11:52:04.000000000 -0400 | 18976 | --- linux-2.6.32.15/arch/x86/pci/common.c 2010-03-15 11:52:04.000000000 -0400 |
18980 | +++ linux-2.6.32.13/arch/x86/pci/common.c 2010-05-15 13:21:14.270940782 -0400 | 18977 | +++ linux-2.6.32.15/arch/x86/pci/common.c 2010-05-28 21:27:15.118897735 -0400 |
18981 | @@ -31,8 +31,8 @@ int noioapicreroute = 1; | 18978 | @@ -31,8 +31,8 @@ int noioapicreroute = 1; |
18982 | int pcibios_last_bus = -1; | 18979 | int pcibios_last_bus = -1; |
18983 | unsigned long pirq_table_addr; | 18980 | unsigned long pirq_table_addr; |
@@ -18998,9 +18995,9 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/common.c linux-2.6.32.13/arch/x86/pci/co | |||
18998 | }; | 18995 | }; |
18999 | 18996 | ||
19000 | void __init dmi_check_pciprobe(void) | 18997 | void __init dmi_check_pciprobe(void) |
19001 | diff -urNp linux-2.6.32.13/arch/x86/pci/direct.c linux-2.6.32.13/arch/x86/pci/direct.c | 18998 | diff -urNp linux-2.6.32.15/arch/x86/pci/direct.c linux-2.6.32.15/arch/x86/pci/direct.c |
19002 | --- linux-2.6.32.13/arch/x86/pci/direct.c 2010-03-15 11:52:04.000000000 -0400 | 18999 | --- linux-2.6.32.15/arch/x86/pci/direct.c 2010-03-15 11:52:04.000000000 -0400 |
19003 | +++ linux-2.6.32.13/arch/x86/pci/direct.c 2010-05-15 13:21:14.270940782 -0400 | 19000 | +++ linux-2.6.32.15/arch/x86/pci/direct.c 2010-05-28 21:27:15.118897735 -0400 |
19004 | @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int | 19001 | @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int |
19005 | 19002 | ||
19006 | #undef PCI_CONF1_ADDRESS | 19003 | #undef PCI_CONF1_ADDRESS |
@@ -19028,9 +19025,9 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/direct.c linux-2.6.32.13/arch/x86/pci/di | |||
19028 | { | 19025 | { |
19029 | u32 x = 0; | 19026 | u32 x = 0; |
19030 | int year, devfn; | 19027 | int year, devfn; |
19031 | diff -urNp linux-2.6.32.13/arch/x86/pci/fixup.c linux-2.6.32.13/arch/x86/pci/fixup.c | 19028 | diff -urNp linux-2.6.32.15/arch/x86/pci/fixup.c linux-2.6.32.15/arch/x86/pci/fixup.c |
19032 | --- linux-2.6.32.13/arch/x86/pci/fixup.c 2010-03-15 11:52:04.000000000 -0400 | 19029 | --- linux-2.6.32.15/arch/x86/pci/fixup.c 2010-03-15 11:52:04.000000000 -0400 |
19033 | +++ linux-2.6.32.13/arch/x86/pci/fixup.c 2010-05-15 13:21:14.270940782 -0400 | 19030 | +++ linux-2.6.32.15/arch/x86/pci/fixup.c 2010-05-28 21:27:15.118897735 -0400 |
19034 | @@ -364,7 +364,7 @@ static const struct dmi_system_id __devi | 19031 | @@ -364,7 +364,7 @@ static const struct dmi_system_id __devi |
19035 | DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), | 19032 | DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), |
19036 | }, | 19033 | }, |
@@ -19049,9 +19046,9 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/fixup.c linux-2.6.32.13/arch/x86/pci/fix | |||
19049 | }; | 19046 | }; |
19050 | 19047 | ||
19051 | static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) | 19048 | static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) |
19052 | diff -urNp linux-2.6.32.13/arch/x86/pci/irq.c linux-2.6.32.13/arch/x86/pci/irq.c | 19049 | diff -urNp linux-2.6.32.15/arch/x86/pci/irq.c linux-2.6.32.15/arch/x86/pci/irq.c |
19053 | --- linux-2.6.32.13/arch/x86/pci/irq.c 2010-04-29 17:49:37.625451376 -0400 | 19050 | --- linux-2.6.32.15/arch/x86/pci/irq.c 2010-04-29 17:49:37.625451376 -0400 |
19054 | +++ linux-2.6.32.13/arch/x86/pci/irq.c 2010-05-15 13:21:14.270940782 -0400 | 19051 | +++ linux-2.6.32.15/arch/x86/pci/irq.c 2010-05-28 21:27:15.118897735 -0400 |
19055 | @@ -543,7 +543,7 @@ static __init int intel_router_probe(str | 19052 | @@ -543,7 +543,7 @@ static __init int intel_router_probe(str |
19056 | static struct pci_device_id __initdata pirq_440gx[] = { | 19053 | static struct pci_device_id __initdata pirq_440gx[] = { |
19057 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) }, | 19054 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) }, |
@@ -19070,9 +19067,9 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/irq.c linux-2.6.32.13/arch/x86/pci/irq.c | |||
19070 | }; | 19067 | }; |
19071 | 19068 | ||
19072 | int __init pcibios_irq_init(void) | 19069 | int __init pcibios_irq_init(void) |
19073 | diff -urNp linux-2.6.32.13/arch/x86/pci/mmconfig_32.c linux-2.6.32.13/arch/x86/pci/mmconfig_32.c | 19070 | diff -urNp linux-2.6.32.15/arch/x86/pci/mmconfig_32.c linux-2.6.32.15/arch/x86/pci/mmconfig_32.c |
19074 | --- linux-2.6.32.13/arch/x86/pci/mmconfig_32.c 2010-03-15 11:52:04.000000000 -0400 | 19071 | --- linux-2.6.32.15/arch/x86/pci/mmconfig_32.c 2010-03-15 11:52:04.000000000 -0400 |
19075 | +++ linux-2.6.32.13/arch/x86/pci/mmconfig_32.c 2010-05-15 13:21:14.270940782 -0400 | 19072 | +++ linux-2.6.32.15/arch/x86/pci/mmconfig_32.c 2010-05-28 21:27:15.118897735 -0400 |
19076 | @@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int | 19073 | @@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int |
19077 | return 0; | 19074 | return 0; |
19078 | } | 19075 | } |
@@ -19082,9 +19079,9 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/mmconfig_32.c linux-2.6.32.13/arch/x86/p | |||
19082 | .read = pci_mmcfg_read, | 19079 | .read = pci_mmcfg_read, |
19083 | .write = pci_mmcfg_write, | 19080 | .write = pci_mmcfg_write, |
19084 | }; | 19081 | }; |
19085 | diff -urNp linux-2.6.32.13/arch/x86/pci/mmconfig_64.c linux-2.6.32.13/arch/x86/pci/mmconfig_64.c | 19082 | diff -urNp linux-2.6.32.15/arch/x86/pci/mmconfig_64.c linux-2.6.32.15/arch/x86/pci/mmconfig_64.c |
19086 | --- linux-2.6.32.13/arch/x86/pci/mmconfig_64.c 2010-03-15 11:52:04.000000000 -0400 | 19083 | --- linux-2.6.32.15/arch/x86/pci/mmconfig_64.c 2010-03-15 11:52:04.000000000 -0400 |
19087 | +++ linux-2.6.32.13/arch/x86/pci/mmconfig_64.c 2010-05-15 13:21:14.270940782 -0400 | 19084 | +++ linux-2.6.32.15/arch/x86/pci/mmconfig_64.c 2010-05-28 21:27:15.118897735 -0400 |
19088 | @@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int | 19085 | @@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int |
19089 | return 0; | 19086 | return 0; |
19090 | } | 19087 | } |
@@ -19094,9 +19091,9 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/mmconfig_64.c linux-2.6.32.13/arch/x86/p | |||
19094 | .read = pci_mmcfg_read, | 19091 | .read = pci_mmcfg_read, |
19095 | .write = pci_mmcfg_write, | 19092 | .write = pci_mmcfg_write, |
19096 | }; | 19093 | }; |
19097 | diff -urNp linux-2.6.32.13/arch/x86/pci/numaq_32.c linux-2.6.32.13/arch/x86/pci/numaq_32.c | 19094 | diff -urNp linux-2.6.32.15/arch/x86/pci/numaq_32.c linux-2.6.32.15/arch/x86/pci/numaq_32.c |
19098 | --- linux-2.6.32.13/arch/x86/pci/numaq_32.c 2010-03-15 11:52:04.000000000 -0400 | 19095 | --- linux-2.6.32.15/arch/x86/pci/numaq_32.c 2010-03-15 11:52:04.000000000 -0400 |
19099 | +++ linux-2.6.32.13/arch/x86/pci/numaq_32.c 2010-05-15 13:21:14.270940782 -0400 | 19096 | +++ linux-2.6.32.15/arch/x86/pci/numaq_32.c 2010-05-28 21:27:15.118897735 -0400 |
19100 | @@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i | 19097 | @@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i |
19101 | 19098 | ||
19102 | #undef PCI_CONF1_MQ_ADDRESS | 19099 | #undef PCI_CONF1_MQ_ADDRESS |
@@ -19106,9 +19103,9 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/numaq_32.c linux-2.6.32.13/arch/x86/pci/ | |||
19106 | .read = pci_conf1_mq_read, | 19103 | .read = pci_conf1_mq_read, |
19107 | .write = pci_conf1_mq_write | 19104 | .write = pci_conf1_mq_write |
19108 | }; | 19105 | }; |
19109 | diff -urNp linux-2.6.32.13/arch/x86/pci/olpc.c linux-2.6.32.13/arch/x86/pci/olpc.c | 19106 | diff -urNp linux-2.6.32.15/arch/x86/pci/olpc.c linux-2.6.32.15/arch/x86/pci/olpc.c |
19110 | --- linux-2.6.32.13/arch/x86/pci/olpc.c 2010-03-15 11:52:04.000000000 -0400 | 19107 | --- linux-2.6.32.15/arch/x86/pci/olpc.c 2010-03-15 11:52:04.000000000 -0400 |
19111 | +++ linux-2.6.32.13/arch/x86/pci/olpc.c 2010-05-15 13:21:14.270940782 -0400 | 19108 | +++ linux-2.6.32.15/arch/x86/pci/olpc.c 2010-05-28 21:27:15.118897735 -0400 |
19112 | @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s | 19109 | @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s |
19113 | return 0; | 19110 | return 0; |
19114 | } | 19111 | } |
@@ -19118,9 +19115,9 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/olpc.c linux-2.6.32.13/arch/x86/pci/olpc | |||
19118 | .read = pci_olpc_read, | 19115 | .read = pci_olpc_read, |
19119 | .write = pci_olpc_write, | 19116 | .write = pci_olpc_write, |
19120 | }; | 19117 | }; |
19121 | diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pcbios.c | 19118 | diff -urNp linux-2.6.32.15/arch/x86/pci/pcbios.c linux-2.6.32.15/arch/x86/pci/pcbios.c |
19122 | --- linux-2.6.32.13/arch/x86/pci/pcbios.c 2010-03-15 11:52:04.000000000 -0400 | 19119 | --- linux-2.6.32.15/arch/x86/pci/pcbios.c 2010-03-15 11:52:04.000000000 -0400 |
19123 | +++ linux-2.6.32.13/arch/x86/pci/pcbios.c 2010-05-15 13:21:14.274578804 -0400 | 19120 | +++ linux-2.6.32.15/arch/x86/pci/pcbios.c 2010-05-28 21:27:15.135148926 -0400 |
19124 | @@ -56,50 +56,93 @@ union bios32 { | 19121 | @@ -56,50 +56,93 @@ union bios32 { |
19125 | static struct { | 19122 | static struct { |
19126 | unsigned long address; | 19123 | unsigned long address; |
@@ -19443,9 +19440,9 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pc | |||
19443 | return !(ret & 0xff00); | 19440 | return !(ret & 0xff00); |
19444 | } | 19441 | } |
19445 | EXPORT_SYMBOL(pcibios_set_irq_routing); | 19442 | EXPORT_SYMBOL(pcibios_set_irq_routing); |
19446 | diff -urNp linux-2.6.32.13/arch/x86/power/cpu.c linux-2.6.32.13/arch/x86/power/cpu.c | 19443 | diff -urNp linux-2.6.32.15/arch/x86/power/cpu.c linux-2.6.32.15/arch/x86/power/cpu.c |
19447 | --- linux-2.6.32.13/arch/x86/power/cpu.c 2010-03-15 11:52:04.000000000 -0400 | 19444 | --- linux-2.6.32.15/arch/x86/power/cpu.c 2010-03-15 11:52:04.000000000 -0400 |
19448 | +++ linux-2.6.32.13/arch/x86/power/cpu.c 2010-05-15 13:21:14.274578804 -0400 | 19445 | +++ linux-2.6.32.15/arch/x86/power/cpu.c 2010-05-28 21:27:15.135148926 -0400 |
19449 | @@ -126,7 +126,7 @@ static void do_fpu_end(void) | 19446 | @@ -126,7 +126,7 @@ static void do_fpu_end(void) |
19450 | static void fix_processor_context(void) | 19447 | static void fix_processor_context(void) |
19451 | { | 19448 | { |
@@ -19465,9 +19462,9 @@ diff -urNp linux-2.6.32.13/arch/x86/power/cpu.c linux-2.6.32.13/arch/x86/power/c | |||
19465 | 19462 | ||
19466 | syscall_init(); /* This sets MSR_*STAR and related */ | 19463 | syscall_init(); /* This sets MSR_*STAR and related */ |
19467 | #endif | 19464 | #endif |
19468 | diff -urNp linux-2.6.32.13/arch/x86/vdso/Makefile linux-2.6.32.13/arch/x86/vdso/Makefile | 19465 | diff -urNp linux-2.6.32.15/arch/x86/vdso/Makefile linux-2.6.32.15/arch/x86/vdso/Makefile |
19469 | --- linux-2.6.32.13/arch/x86/vdso/Makefile 2010-03-15 11:52:04.000000000 -0400 | 19466 | --- linux-2.6.32.15/arch/x86/vdso/Makefile 2010-03-15 11:52:04.000000000 -0400 |
19470 | +++ linux-2.6.32.13/arch/x86/vdso/Makefile 2010-05-15 13:21:14.274578804 -0400 | 19467 | +++ linux-2.6.32.15/arch/x86/vdso/Makefile 2010-05-28 21:27:15.135148926 -0400 |
19471 | @@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ | 19468 | @@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ |
19472 | $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ | 19469 | $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ |
19473 | -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) | 19470 | -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) |
@@ -19477,9 +19474,9 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/Makefile linux-2.6.32.13/arch/x86/vdso/ | |||
19477 | GCOV_PROFILE := n | 19474 | GCOV_PROFILE := n |
19478 | 19475 | ||
19479 | # | 19476 | # |
19480 | diff -urNp linux-2.6.32.13/arch/x86/vdso/vclock_gettime.c linux-2.6.32.13/arch/x86/vdso/vclock_gettime.c | 19477 | diff -urNp linux-2.6.32.15/arch/x86/vdso/vclock_gettime.c linux-2.6.32.15/arch/x86/vdso/vclock_gettime.c |
19481 | --- linux-2.6.32.13/arch/x86/vdso/vclock_gettime.c 2010-03-15 11:52:04.000000000 -0400 | 19478 | --- linux-2.6.32.15/arch/x86/vdso/vclock_gettime.c 2010-03-15 11:52:04.000000000 -0400 |
19482 | +++ linux-2.6.32.13/arch/x86/vdso/vclock_gettime.c 2010-05-15 13:21:14.274578804 -0400 | 19479 | +++ linux-2.6.32.15/arch/x86/vdso/vclock_gettime.c 2010-05-28 21:27:15.151704467 -0400 |
19483 | @@ -22,24 +22,48 @@ | 19480 | @@ -22,24 +22,48 @@ |
19484 | #include <asm/hpet.h> | 19481 | #include <asm/hpet.h> |
19485 | #include <asm/unistd.h> | 19482 | #include <asm/unistd.h> |
@@ -19578,9 +19575,9 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vclock_gettime.c linux-2.6.32.13/arch/x | |||
19578 | } | 19575 | } |
19579 | int gettimeofday(struct timeval *, struct timezone *) | 19576 | int gettimeofday(struct timeval *, struct timezone *) |
19580 | __attribute__((weak, alias("__vdso_gettimeofday"))); | 19577 | __attribute__((weak, alias("__vdso_gettimeofday"))); |
19581 | diff -urNp linux-2.6.32.13/arch/x86/vdso/vdso32-setup.c linux-2.6.32.13/arch/x86/vdso/vdso32-setup.c | 19578 | diff -urNp linux-2.6.32.15/arch/x86/vdso/vdso32-setup.c linux-2.6.32.15/arch/x86/vdso/vdso32-setup.c |
19582 | --- linux-2.6.32.13/arch/x86/vdso/vdso32-setup.c 2010-03-15 11:52:04.000000000 -0400 | 19579 | --- linux-2.6.32.15/arch/x86/vdso/vdso32-setup.c 2010-03-15 11:52:04.000000000 -0400 |
19583 | +++ linux-2.6.32.13/arch/x86/vdso/vdso32-setup.c 2010-05-15 13:21:14.274578804 -0400 | 19580 | +++ linux-2.6.32.15/arch/x86/vdso/vdso32-setup.c 2010-05-28 21:27:15.151704467 -0400 |
19584 | @@ -25,6 +25,7 @@ | 19581 | @@ -25,6 +25,7 @@ |
19585 | #include <asm/tlbflush.h> | 19582 | #include <asm/tlbflush.h> |
19586 | #include <asm/vdso.h> | 19583 | #include <asm/vdso.h> |
@@ -19681,9 +19678,9 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vdso32-setup.c linux-2.6.32.13/arch/x86 | |||
19681 | return &gate_vma; | 19678 | return &gate_vma; |
19682 | return NULL; | 19679 | return NULL; |
19683 | } | 19680 | } |
19684 | diff -urNp linux-2.6.32.13/arch/x86/vdso/vdso.lds.S linux-2.6.32.13/arch/x86/vdso/vdso.lds.S | 19681 | diff -urNp linux-2.6.32.15/arch/x86/vdso/vdso.lds.S linux-2.6.32.15/arch/x86/vdso/vdso.lds.S |
19685 | --- linux-2.6.32.13/arch/x86/vdso/vdso.lds.S 2010-03-15 11:52:04.000000000 -0400 | 19682 | --- linux-2.6.32.15/arch/x86/vdso/vdso.lds.S 2010-03-15 11:52:04.000000000 -0400 |
19686 | +++ linux-2.6.32.13/arch/x86/vdso/vdso.lds.S 2010-05-15 13:21:14.274578804 -0400 | 19683 | +++ linux-2.6.32.15/arch/x86/vdso/vdso.lds.S 2010-05-28 21:27:15.151704467 -0400 |
19687 | @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; | 19684 | @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; |
19688 | #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; | 19685 | #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; |
19689 | #include "vextern.h" | 19686 | #include "vextern.h" |
@@ -19694,9 +19691,9 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vdso.lds.S linux-2.6.32.13/arch/x86/vds | |||
19694 | +VEXTERN(fallback_time) | 19691 | +VEXTERN(fallback_time) |
19695 | +VEXTERN(getcpu) | 19692 | +VEXTERN(getcpu) |
19696 | +#undef VEXTERN | 19693 | +#undef VEXTERN |
19697 | diff -urNp linux-2.6.32.13/arch/x86/vdso/vextern.h linux-2.6.32.13/arch/x86/vdso/vextern.h | 19694 | diff -urNp linux-2.6.32.15/arch/x86/vdso/vextern.h linux-2.6.32.15/arch/x86/vdso/vextern.h |
19698 | --- linux-2.6.32.13/arch/x86/vdso/vextern.h 2010-03-15 11:52:04.000000000 -0400 | 19695 | --- linux-2.6.32.15/arch/x86/vdso/vextern.h 2010-03-15 11:52:04.000000000 -0400 |
19699 | +++ linux-2.6.32.13/arch/x86/vdso/vextern.h 2010-05-15 13:21:14.274578804 -0400 | 19696 | +++ linux-2.6.32.15/arch/x86/vdso/vextern.h 2010-05-28 21:27:15.151704467 -0400 |
19700 | @@ -11,6 +11,5 @@ | 19697 | @@ -11,6 +11,5 @@ |
19701 | put into vextern.h and be referenced as a pointer with vdso prefix. | 19698 | put into vextern.h and be referenced as a pointer with vdso prefix. |
19702 | The main kernel later fills in the values. */ | 19699 | The main kernel later fills in the values. */ |
@@ -19704,9 +19701,9 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vextern.h linux-2.6.32.13/arch/x86/vdso | |||
19704 | -VEXTERN(jiffies) | 19701 | -VEXTERN(jiffies) |
19705 | VEXTERN(vgetcpu_mode) | 19702 | VEXTERN(vgetcpu_mode) |
19706 | VEXTERN(vsyscall_gtod_data) | 19703 | VEXTERN(vsyscall_gtod_data) |
19707 | diff -urNp linux-2.6.32.13/arch/x86/vdso/vma.c linux-2.6.32.13/arch/x86/vdso/vma.c | 19704 | diff -urNp linux-2.6.32.15/arch/x86/vdso/vma.c linux-2.6.32.15/arch/x86/vdso/vma.c |
19708 | --- linux-2.6.32.13/arch/x86/vdso/vma.c 2010-03-15 11:52:04.000000000 -0400 | 19705 | --- linux-2.6.32.15/arch/x86/vdso/vma.c 2010-03-15 11:52:04.000000000 -0400 |
19709 | +++ linux-2.6.32.13/arch/x86/vdso/vma.c 2010-05-15 13:21:14.274578804 -0400 | 19706 | +++ linux-2.6.32.15/arch/x86/vdso/vma.c 2010-05-28 21:27:15.151704467 -0400 |
19710 | @@ -57,7 +57,7 @@ static int __init init_vdso_vars(void) | 19707 | @@ -57,7 +57,7 @@ static int __init init_vdso_vars(void) |
19711 | if (!vbase) | 19708 | if (!vbase) |
19712 | goto oom; | 19709 | goto oom; |
@@ -19753,9 +19750,9 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vma.c linux-2.6.32.13/arch/x86/vdso/vma | |||
19753 | - return 0; | 19750 | - return 0; |
19754 | -} | 19751 | -} |
19755 | -__setup("vdso=", vdso_setup); | 19752 | -__setup("vdso=", vdso_setup); |
19756 | diff -urNp linux-2.6.32.13/arch/x86/xen/enlighten.c linux-2.6.32.13/arch/x86/xen/enlighten.c | 19753 | diff -urNp linux-2.6.32.15/arch/x86/xen/enlighten.c linux-2.6.32.15/arch/x86/xen/enlighten.c |
19757 | --- linux-2.6.32.13/arch/x86/xen/enlighten.c 2010-03-15 11:52:04.000000000 -0400 | 19754 | --- linux-2.6.32.15/arch/x86/xen/enlighten.c 2010-03-15 11:52:04.000000000 -0400 |
19758 | +++ linux-2.6.32.13/arch/x86/xen/enlighten.c 2010-05-15 13:23:38.934774262 -0400 | 19755 | +++ linux-2.6.32.15/arch/x86/xen/enlighten.c 2010-05-29 16:33:34.251291763 -0400 |
19759 | @@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); | 19756 | @@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); |
19760 | 19757 | ||
19761 | struct shared_info xen_dummy_shared_info; | 19758 | struct shared_info xen_dummy_shared_info; |
@@ -19774,15 +19771,21 @@ diff -urNp linux-2.6.32.13/arch/x86/xen/enlighten.c linux-2.6.32.13/arch/x86/xen | |||
19774 | end = start + __get_cpu_var(idt_desc).size + 1; | 19771 | end = start + __get_cpu_var(idt_desc).size + 1; |
19775 | 19772 | ||
19776 | xen_mc_flush(); | 19773 | xen_mc_flush(); |
19777 | @@ -1102,6 +1100,16 @@ asmlinkage void __init xen_start_kernel( | 19774 | @@ -1099,9 +1097,20 @@ asmlinkage void __init xen_start_kernel( |
19778 | #ifdef CONFIG_X86_64 | 19775 | */ |
19776 | __userpte_alloc_gfp &= ~__GFP_HIGHMEM; | ||
19777 | |||
19778 | -#ifdef CONFIG_X86_64 | ||
19779 | /* Work out if we support NX */ | 19779 | /* Work out if we support NX */ |
19780 | check_efer(); | 19780 | - check_efer(); |
19781 | +#elif defined(CONFIG_X86_PAE) | 19781 | +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) |
19782 | + if (cpu_has_nx) { | 19782 | + if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 && |
19783 | + (cpuid_edx(0x80000001) & (1 << (X86_FEATURE_NX & 31)))) { | ||
19783 | + unsigned l, h; | 19784 | + unsigned l, h; |
19784 | + | 19785 | + |
19786 | +#if defined(CONFIG_X86_32) | ||
19785 | + nx_enabled = 1; | 19787 | + nx_enabled = 1; |
19788 | +#endif | ||
19786 | + __supported_pte_mask |= _PAGE_NX; | 19789 | + __supported_pte_mask |= _PAGE_NX; |
19787 | + rdmsr(MSR_EFER, l, h); | 19790 | + rdmsr(MSR_EFER, l, h); |
19788 | + l |= EFER_NX; | 19791 | + l |= EFER_NX; |
@@ -19791,7 +19794,7 @@ diff -urNp linux-2.6.32.13/arch/x86/xen/enlighten.c linux-2.6.32.13/arch/x86/xen | |||
19791 | #endif | 19794 | #endif |
19792 | 19795 | ||
19793 | xen_setup_features(); | 19796 | xen_setup_features(); |
19794 | @@ -1133,13 +1141,6 @@ asmlinkage void __init xen_start_kernel( | 19797 | @@ -1133,13 +1142,6 @@ asmlinkage void __init xen_start_kernel( |
19795 | 19798 | ||
19796 | machine_ops = xen_machine_ops; | 19799 | machine_ops = xen_machine_ops; |
19797 | 19800 | ||
@@ -19805,9 +19808,9 @@ diff -urNp linux-2.6.32.13/arch/x86/xen/enlighten.c linux-2.6.32.13/arch/x86/xen | |||
19805 | xen_smp_init(); | 19808 | xen_smp_init(); |
19806 | 19809 | ||
19807 | pgd = (pgd_t *)xen_start_info->pt_base; | 19810 | pgd = (pgd_t *)xen_start_info->pt_base; |
19808 | diff -urNp linux-2.6.32.13/arch/x86/xen/mmu.c linux-2.6.32.13/arch/x86/xen/mmu.c | 19811 | diff -urNp linux-2.6.32.15/arch/x86/xen/mmu.c linux-2.6.32.15/arch/x86/xen/mmu.c |
19809 | --- linux-2.6.32.13/arch/x86/xen/mmu.c 2010-03-15 11:52:04.000000000 -0400 | 19812 | --- linux-2.6.32.15/arch/x86/xen/mmu.c 2010-03-15 11:52:04.000000000 -0400 |
19810 | +++ linux-2.6.32.13/arch/x86/xen/mmu.c 2010-05-15 13:21:14.282910849 -0400 | 19813 | +++ linux-2.6.32.15/arch/x86/xen/mmu.c 2010-05-28 21:27:15.151704467 -0400 |
19811 | @@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable | 19814 | @@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable |
19812 | convert_pfn_mfn(init_level4_pgt); | 19815 | convert_pfn_mfn(init_level4_pgt); |
19813 | convert_pfn_mfn(level3_ident_pgt); | 19816 | convert_pfn_mfn(level3_ident_pgt); |
@@ -19828,9 +19831,9 @@ diff -urNp linux-2.6.32.13/arch/x86/xen/mmu.c linux-2.6.32.13/arch/x86/xen/mmu.c | |||
19828 | set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); | 19831 | set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); |
19829 | set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); | 19832 | set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); |
19830 | 19833 | ||
19831 | diff -urNp linux-2.6.32.13/arch/x86/xen/smp.c linux-2.6.32.13/arch/x86/xen/smp.c | 19834 | diff -urNp linux-2.6.32.15/arch/x86/xen/smp.c linux-2.6.32.15/arch/x86/xen/smp.c |
19832 | --- linux-2.6.32.13/arch/x86/xen/smp.c 2010-03-15 11:52:04.000000000 -0400 | 19835 | --- linux-2.6.32.15/arch/x86/xen/smp.c 2010-03-15 11:52:04.000000000 -0400 |
19833 | +++ linux-2.6.32.13/arch/x86/xen/smp.c 2010-05-15 13:21:14.282910849 -0400 | 19836 | +++ linux-2.6.32.15/arch/x86/xen/smp.c 2010-05-28 21:27:15.155009648 -0400 |
19834 | @@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ | 19837 | @@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ |
19835 | { | 19838 | { |
19836 | BUG_ON(smp_processor_id() != 0); | 19839 | BUG_ON(smp_processor_id() != 0); |
@@ -19854,9 +19857,9 @@ diff -urNp linux-2.6.32.13/arch/x86/xen/smp.c linux-2.6.32.13/arch/x86/xen/smp.c | |||
19854 | ctxt->user_regs.ss = __KERNEL_DS; | 19857 | ctxt->user_regs.ss = __KERNEL_DS; |
19855 | #ifdef CONFIG_X86_32 | 19858 | #ifdef CONFIG_X86_32 |
19856 | ctxt->user_regs.fs = __KERNEL_PERCPU; | 19859 | ctxt->user_regs.fs = __KERNEL_PERCPU; |
19857 | diff -urNp linux-2.6.32.13/arch/x86/xen/xen-head.S linux-2.6.32.13/arch/x86/xen/xen-head.S | 19860 | diff -urNp linux-2.6.32.15/arch/x86/xen/xen-head.S linux-2.6.32.15/arch/x86/xen/xen-head.S |
19858 | --- linux-2.6.32.13/arch/x86/xen/xen-head.S 2010-03-15 11:52:04.000000000 -0400 | 19861 | --- linux-2.6.32.15/arch/x86/xen/xen-head.S 2010-03-15 11:52:04.000000000 -0400 |
19859 | +++ linux-2.6.32.13/arch/x86/xen/xen-head.S 2010-05-15 13:21:14.282910849 -0400 | 19862 | +++ linux-2.6.32.15/arch/x86/xen/xen-head.S 2010-05-28 21:27:15.155009648 -0400 |
19860 | @@ -19,6 +19,17 @@ ENTRY(startup_xen) | 19863 | @@ -19,6 +19,17 @@ ENTRY(startup_xen) |
19861 | #ifdef CONFIG_X86_32 | 19864 | #ifdef CONFIG_X86_32 |
19862 | mov %esi,xen_start_info | 19865 | mov %esi,xen_start_info |
@@ -19875,9 +19878,9 @@ diff -urNp linux-2.6.32.13/arch/x86/xen/xen-head.S linux-2.6.32.13/arch/x86/xen/ | |||
19875 | #else | 19878 | #else |
19876 | mov %rsi,xen_start_info | 19879 | mov %rsi,xen_start_info |
19877 | mov $init_thread_union+THREAD_SIZE,%rsp | 19880 | mov $init_thread_union+THREAD_SIZE,%rsp |
19878 | diff -urNp linux-2.6.32.13/arch/x86/xen/xen-ops.h linux-2.6.32.13/arch/x86/xen/xen-ops.h | 19881 | diff -urNp linux-2.6.32.15/arch/x86/xen/xen-ops.h linux-2.6.32.15/arch/x86/xen/xen-ops.h |
19879 | --- linux-2.6.32.13/arch/x86/xen/xen-ops.h 2010-03-15 11:52:04.000000000 -0400 | 19882 | --- linux-2.6.32.15/arch/x86/xen/xen-ops.h 2010-03-15 11:52:04.000000000 -0400 |
19880 | +++ linux-2.6.32.13/arch/x86/xen/xen-ops.h 2010-05-15 13:21:14.282910849 -0400 | 19883 | +++ linux-2.6.32.15/arch/x86/xen/xen-ops.h 2010-05-28 21:27:15.155009648 -0400 |
19881 | @@ -10,8 +10,6 @@ | 19884 | @@ -10,8 +10,6 @@ |
19882 | extern const char xen_hypervisor_callback[]; | 19885 | extern const char xen_hypervisor_callback[]; |
19883 | extern const char xen_failsafe_callback[]; | 19886 | extern const char xen_failsafe_callback[]; |
@@ -19887,9 +19890,9 @@ diff -urNp linux-2.6.32.13/arch/x86/xen/xen-ops.h linux-2.6.32.13/arch/x86/xen/x | |||
19887 | struct trap_info; | 19890 | struct trap_info; |
19888 | void xen_copy_trap_info(struct trap_info *traps); | 19891 | void xen_copy_trap_info(struct trap_info *traps); |
19889 | 19892 | ||
19890 | diff -urNp linux-2.6.32.13/block/blk-integrity.c linux-2.6.32.13/block/blk-integrity.c | 19893 | diff -urNp linux-2.6.32.15/block/blk-integrity.c linux-2.6.32.15/block/blk-integrity.c |
19891 | --- linux-2.6.32.13/block/blk-integrity.c 2010-03-15 11:52:04.000000000 -0400 | 19894 | --- linux-2.6.32.15/block/blk-integrity.c 2010-03-15 11:52:04.000000000 -0400 |
19892 | +++ linux-2.6.32.13/block/blk-integrity.c 2010-05-15 13:21:14.282910849 -0400 | 19895 | +++ linux-2.6.32.15/block/blk-integrity.c 2010-05-28 21:27:15.167161810 -0400 |
19893 | @@ -278,7 +278,7 @@ static struct attribute *integrity_attrs | 19896 | @@ -278,7 +278,7 @@ static struct attribute *integrity_attrs |
19894 | NULL, | 19897 | NULL, |
19895 | }; | 19898 | }; |
@@ -19899,9 +19902,9 @@ diff -urNp linux-2.6.32.13/block/blk-integrity.c linux-2.6.32.13/block/blk-integ | |||
19899 | .show = &integrity_attr_show, | 19902 | .show = &integrity_attr_show, |
19900 | .store = &integrity_attr_store, | 19903 | .store = &integrity_attr_store, |
19901 | }; | 19904 | }; |
19902 | diff -urNp linux-2.6.32.13/block/blk-iopoll.c linux-2.6.32.13/block/blk-iopoll.c | 19905 | diff -urNp linux-2.6.32.15/block/blk-iopoll.c linux-2.6.32.15/block/blk-iopoll.c |
19903 | --- linux-2.6.32.13/block/blk-iopoll.c 2010-03-15 11:52:04.000000000 -0400 | 19906 | --- linux-2.6.32.15/block/blk-iopoll.c 2010-03-15 11:52:04.000000000 -0400 |
19904 | +++ linux-2.6.32.13/block/blk-iopoll.c 2010-05-15 13:21:14.282910849 -0400 | 19907 | +++ linux-2.6.32.15/block/blk-iopoll.c 2010-05-28 21:27:15.167161810 -0400 |
19905 | @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo | 19908 | @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo |
19906 | } | 19909 | } |
19907 | EXPORT_SYMBOL(blk_iopoll_complete); | 19910 | EXPORT_SYMBOL(blk_iopoll_complete); |
@@ -19911,9 +19914,9 @@ diff -urNp linux-2.6.32.13/block/blk-iopoll.c linux-2.6.32.13/block/blk-iopoll.c | |||
19911 | { | 19914 | { |
19912 | struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); | 19915 | struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); |
19913 | int rearm = 0, budget = blk_iopoll_budget; | 19916 | int rearm = 0, budget = blk_iopoll_budget; |
19914 | diff -urNp linux-2.6.32.13/block/blk-map.c linux-2.6.32.13/block/blk-map.c | 19917 | diff -urNp linux-2.6.32.15/block/blk-map.c linux-2.6.32.15/block/blk-map.c |
19915 | --- linux-2.6.32.13/block/blk-map.c 2010-03-15 11:52:04.000000000 -0400 | 19918 | --- linux-2.6.32.15/block/blk-map.c 2010-03-15 11:52:04.000000000 -0400 |
19916 | +++ linux-2.6.32.13/block/blk-map.c 2010-05-15 13:21:14.282910849 -0400 | 19919 | +++ linux-2.6.32.15/block/blk-map.c 2010-05-28 21:27:15.167161810 -0400 |
19917 | @@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ | 19920 | @@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ |
19918 | * direct dma. else, set up kernel bounce buffers | 19921 | * direct dma. else, set up kernel bounce buffers |
19919 | */ | 19922 | */ |
@@ -19932,9 +19935,9 @@ diff -urNp linux-2.6.32.13/block/blk-map.c linux-2.6.32.13/block/blk-map.c | |||
19932 | if (do_copy) | 19935 | if (do_copy) |
19933 | bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); | 19936 | bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); |
19934 | else | 19937 | else |
19935 | diff -urNp linux-2.6.32.13/block/blk-softirq.c linux-2.6.32.13/block/blk-softirq.c | 19938 | diff -urNp linux-2.6.32.15/block/blk-softirq.c linux-2.6.32.15/block/blk-softirq.c |
19936 | --- linux-2.6.32.13/block/blk-softirq.c 2010-03-15 11:52:04.000000000 -0400 | 19939 | --- linux-2.6.32.15/block/blk-softirq.c 2010-03-15 11:52:04.000000000 -0400 |
19937 | +++ linux-2.6.32.13/block/blk-softirq.c 2010-05-15 13:21:14.282910849 -0400 | 19940 | +++ linux-2.6.32.15/block/blk-softirq.c 2010-05-28 21:27:15.179152446 -0400 |
19938 | @@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, | 19941 | @@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, |
19939 | * Softirq action handler - move entries to local list and loop over them | 19942 | * Softirq action handler - move entries to local list and loop over them |
19940 | * while passing them to the queue registered handler. | 19943 | * while passing them to the queue registered handler. |
@@ -19944,9 +19947,9 @@ diff -urNp linux-2.6.32.13/block/blk-softirq.c linux-2.6.32.13/block/blk-softirq | |||
19944 | { | 19947 | { |
19945 | struct list_head *cpu_list, local_list; | 19948 | struct list_head *cpu_list, local_list; |
19946 | 19949 | ||
19947 | diff -urNp linux-2.6.32.13/block/blk-sysfs.c linux-2.6.32.13/block/blk-sysfs.c | 19950 | diff -urNp linux-2.6.32.15/block/blk-sysfs.c linux-2.6.32.15/block/blk-sysfs.c |
19948 | --- linux-2.6.32.13/block/blk-sysfs.c 2010-03-15 11:52:04.000000000 -0400 | 19951 | --- linux-2.6.32.15/block/blk-sysfs.c 2010-03-15 11:52:04.000000000 -0400 |
19949 | +++ linux-2.6.32.13/block/blk-sysfs.c 2010-05-15 13:21:14.282910849 -0400 | 19952 | +++ linux-2.6.32.15/block/blk-sysfs.c 2010-05-28 21:27:15.179152446 -0400 |
19950 | @@ -414,7 +414,7 @@ static void blk_release_queue(struct kob | 19953 | @@ -414,7 +414,7 @@ static void blk_release_queue(struct kob |
19951 | kmem_cache_free(blk_requestq_cachep, q); | 19954 | kmem_cache_free(blk_requestq_cachep, q); |
19952 | } | 19955 | } |
@@ -19956,9 +19959,9 @@ diff -urNp linux-2.6.32.13/block/blk-sysfs.c linux-2.6.32.13/block/blk-sysfs.c | |||
19956 | .show = queue_attr_show, | 19959 | .show = queue_attr_show, |
19957 | .store = queue_attr_store, | 19960 | .store = queue_attr_store, |
19958 | }; | 19961 | }; |
19959 | diff -urNp linux-2.6.32.13/block/elevator.c linux-2.6.32.13/block/elevator.c | 19962 | diff -urNp linux-2.6.32.15/block/elevator.c linux-2.6.32.15/block/elevator.c |
19960 | --- linux-2.6.32.13/block/elevator.c 2010-03-15 11:52:04.000000000 -0400 | 19963 | --- linux-2.6.32.15/block/elevator.c 2010-03-15 11:52:04.000000000 -0400 |
19961 | +++ linux-2.6.32.13/block/elevator.c 2010-05-15 13:21:14.282910849 -0400 | 19964 | +++ linux-2.6.32.15/block/elevator.c 2010-05-28 21:27:15.179152446 -0400 |
19962 | @@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str | 19965 | @@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str |
19963 | return error; | 19966 | return error; |
19964 | } | 19967 | } |
@@ -19968,9 +19971,9 @@ diff -urNp linux-2.6.32.13/block/elevator.c linux-2.6.32.13/block/elevator.c | |||
19968 | .show = elv_attr_show, | 19971 | .show = elv_attr_show, |
19969 | .store = elv_attr_store, | 19972 | .store = elv_attr_store, |
19970 | }; | 19973 | }; |
19971 | diff -urNp linux-2.6.32.13/crypto/lrw.c linux-2.6.32.13/crypto/lrw.c | 19974 | diff -urNp linux-2.6.32.15/crypto/lrw.c linux-2.6.32.15/crypto/lrw.c |
19972 | --- linux-2.6.32.13/crypto/lrw.c 2010-03-15 11:52:04.000000000 -0400 | 19975 | --- linux-2.6.32.15/crypto/lrw.c 2010-03-15 11:52:04.000000000 -0400 |
19973 | +++ linux-2.6.32.13/crypto/lrw.c 2010-05-15 13:21:14.282910849 -0400 | 19976 | +++ linux-2.6.32.15/crypto/lrw.c 2010-05-28 21:27:15.179152446 -0400 |
19974 | @@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par | 19977 | @@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par |
19975 | struct priv *ctx = crypto_tfm_ctx(parent); | 19978 | struct priv *ctx = crypto_tfm_ctx(parent); |
19976 | struct crypto_cipher *child = ctx->child; | 19979 | struct crypto_cipher *child = ctx->child; |
@@ -19980,9 +19983,9 @@ diff -urNp linux-2.6.32.13/crypto/lrw.c linux-2.6.32.13/crypto/lrw.c | |||
19980 | int bsize = crypto_cipher_blocksize(child); | 19983 | int bsize = crypto_cipher_blocksize(child); |
19981 | 19984 | ||
19982 | crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); | 19985 | crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); |
19983 | diff -urNp linux-2.6.32.13/Documentation/dontdiff linux-2.6.32.13/Documentation/dontdiff | 19986 | diff -urNp linux-2.6.32.15/Documentation/dontdiff linux-2.6.32.15/Documentation/dontdiff |
19984 | --- linux-2.6.32.13/Documentation/dontdiff 2010-03-15 11:52:04.000000000 -0400 | 19987 | --- linux-2.6.32.15/Documentation/dontdiff 2010-03-15 11:52:04.000000000 -0400 |
19985 | +++ linux-2.6.32.13/Documentation/dontdiff 2010-05-15 13:21:14.282910849 -0400 | 19988 | +++ linux-2.6.32.15/Documentation/dontdiff 2010-05-28 21:27:15.179152446 -0400 |
19986 | @@ -3,6 +3,7 @@ | 19989 | @@ -3,6 +3,7 @@ |
19987 | *.bin | 19990 | *.bin |
19988 | *.cpio | 19991 | *.cpio |
@@ -20090,9 +20093,9 @@ diff -urNp linux-2.6.32.13/Documentation/dontdiff linux-2.6.32.13/Documentation/ | |||
20090 | zImage* | 20093 | zImage* |
20091 | zconf.hash.c | 20094 | zconf.hash.c |
20092 | +zoffset.h | 20095 | +zoffset.h |
20093 | diff -urNp linux-2.6.32.13/Documentation/kernel-parameters.txt linux-2.6.32.13/Documentation/kernel-parameters.txt | 20096 | diff -urNp linux-2.6.32.15/Documentation/kernel-parameters.txt linux-2.6.32.15/Documentation/kernel-parameters.txt |
20094 | --- linux-2.6.32.13/Documentation/kernel-parameters.txt 2010-05-15 13:20:18.374565913 -0400 | 20097 | --- linux-2.6.32.15/Documentation/kernel-parameters.txt 2010-05-15 13:20:18.374565913 -0400 |
20095 | +++ linux-2.6.32.13/Documentation/kernel-parameters.txt 2010-05-15 13:21:14.282910849 -0400 | 20098 | +++ linux-2.6.32.15/Documentation/kernel-parameters.txt 2010-05-28 21:27:15.179152446 -0400 |
20096 | @@ -1836,6 +1836,12 @@ and is between 256 and 4096 characters. | 20099 | @@ -1836,6 +1836,12 @@ and is between 256 and 4096 characters. |
20097 | the specified number of seconds. This is to be used if | 20100 | the specified number of seconds. This is to be used if |
20098 | your oopses keep scrolling off the screen. | 20101 | your oopses keep scrolling off the screen. |
@@ -20106,9 +20109,9 @@ diff -urNp linux-2.6.32.13/Documentation/kernel-parameters.txt linux-2.6.32.13/D | |||
20106 | pcbit= [HW,ISDN] | 20109 | pcbit= [HW,ISDN] |
20107 | 20110 | ||
20108 | pcd. [PARIDE] | 20111 | pcd. [PARIDE] |
20109 | diff -urNp linux-2.6.32.13/drivers/acpi/battery.c linux-2.6.32.13/drivers/acpi/battery.c | 20112 | diff -urNp linux-2.6.32.15/drivers/acpi/battery.c linux-2.6.32.15/drivers/acpi/battery.c |
20110 | --- linux-2.6.32.13/drivers/acpi/battery.c 2010-03-15 11:52:04.000000000 -0400 | 20113 | --- linux-2.6.32.15/drivers/acpi/battery.c 2010-03-15 11:52:04.000000000 -0400 |
20111 | +++ linux-2.6.32.13/drivers/acpi/battery.c 2010-05-15 13:21:14.282910849 -0400 | 20114 | +++ linux-2.6.32.15/drivers/acpi/battery.c 2010-05-28 21:27:15.179152446 -0400 |
20112 | @@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm); | 20115 | @@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm); |
20113 | } | 20116 | } |
20114 | 20117 | ||
@@ -20118,9 +20121,9 @@ diff -urNp linux-2.6.32.13/drivers/acpi/battery.c linux-2.6.32.13/drivers/acpi/b | |||
20118 | mode_t mode; | 20121 | mode_t mode; |
20119 | const char *name; | 20122 | const char *name; |
20120 | } acpi_battery_file[] = { | 20123 | } acpi_battery_file[] = { |
20121 | diff -urNp linux-2.6.32.13/drivers/acpi/blacklist.c linux-2.6.32.13/drivers/acpi/blacklist.c | 20124 | diff -urNp linux-2.6.32.15/drivers/acpi/blacklist.c linux-2.6.32.15/drivers/acpi/blacklist.c |
20122 | --- linux-2.6.32.13/drivers/acpi/blacklist.c 2010-03-15 11:52:04.000000000 -0400 | 20125 | --- linux-2.6.32.15/drivers/acpi/blacklist.c 2010-03-15 11:52:04.000000000 -0400 |
20123 | +++ linux-2.6.32.13/drivers/acpi/blacklist.c 2010-05-15 13:21:14.295422110 -0400 | 20126 | +++ linux-2.6.32.15/drivers/acpi/blacklist.c 2010-05-28 21:27:15.179152446 -0400 |
20124 | @@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b | 20127 | @@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b |
20125 | {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, | 20128 | {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, |
20126 | "Incorrect _ADR", 1}, | 20129 | "Incorrect _ADR", 1}, |
@@ -20130,9 +20133,9 @@ diff -urNp linux-2.6.32.13/drivers/acpi/blacklist.c linux-2.6.32.13/drivers/acpi | |||
20130 | }; | 20133 | }; |
20131 | 20134 | ||
20132 | #if CONFIG_ACPI_BLACKLIST_YEAR | 20135 | #if CONFIG_ACPI_BLACKLIST_YEAR |
20133 | diff -urNp linux-2.6.32.13/drivers/acpi/dock.c linux-2.6.32.13/drivers/acpi/dock.c | 20136 | diff -urNp linux-2.6.32.15/drivers/acpi/dock.c linux-2.6.32.15/drivers/acpi/dock.c |
20134 | --- linux-2.6.32.13/drivers/acpi/dock.c 2010-03-15 11:52:04.000000000 -0400 | 20137 | --- linux-2.6.32.15/drivers/acpi/dock.c 2010-03-15 11:52:04.000000000 -0400 |
20135 | +++ linux-2.6.32.13/drivers/acpi/dock.c 2010-05-15 13:21:14.298962418 -0400 | 20138 | +++ linux-2.6.32.15/drivers/acpi/dock.c 2010-05-28 21:27:15.179152446 -0400 |
20136 | @@ -77,7 +77,7 @@ struct dock_dependent_device { | 20139 | @@ -77,7 +77,7 @@ struct dock_dependent_device { |
20137 | struct list_head list; | 20140 | struct list_head list; |
20138 | struct list_head hotplug_list; | 20141 | struct list_head hotplug_list; |
@@ -20151,9 +20154,9 @@ diff -urNp linux-2.6.32.13/drivers/acpi/dock.c linux-2.6.32.13/drivers/acpi/dock | |||
20151 | void *context) | 20154 | void *context) |
20152 | { | 20155 | { |
20153 | struct dock_dependent_device *dd; | 20156 | struct dock_dependent_device *dd; |
20154 | diff -urNp linux-2.6.32.13/drivers/acpi/osl.c linux-2.6.32.13/drivers/acpi/osl.c | 20157 | diff -urNp linux-2.6.32.15/drivers/acpi/osl.c linux-2.6.32.15/drivers/acpi/osl.c |
20155 | --- linux-2.6.32.13/drivers/acpi/osl.c 2010-03-15 11:52:04.000000000 -0400 | 20158 | --- linux-2.6.32.15/drivers/acpi/osl.c 2010-03-15 11:52:04.000000000 -0400 |
20156 | +++ linux-2.6.32.13/drivers/acpi/osl.c 2010-05-15 13:21:14.298962418 -0400 | 20159 | +++ linux-2.6.32.15/drivers/acpi/osl.c 2010-05-28 21:27:15.183173771 -0400 |
20157 | @@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres | 20160 | @@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres |
20158 | void __iomem *virt_addr; | 20161 | void __iomem *virt_addr; |
20159 | 20162 | ||
@@ -20172,9 +20175,9 @@ diff -urNp linux-2.6.32.13/drivers/acpi/osl.c linux-2.6.32.13/drivers/acpi/osl.c | |||
20172 | 20175 | ||
20173 | switch (width) { | 20176 | switch (width) { |
20174 | case 8: | 20177 | case 8: |
20175 | diff -urNp linux-2.6.32.13/drivers/acpi/power_meter.c linux-2.6.32.13/drivers/acpi/power_meter.c | 20178 | diff -urNp linux-2.6.32.15/drivers/acpi/power_meter.c linux-2.6.32.15/drivers/acpi/power_meter.c |
20176 | --- linux-2.6.32.13/drivers/acpi/power_meter.c 2010-05-15 13:20:18.454567530 -0400 | 20179 | --- linux-2.6.32.15/drivers/acpi/power_meter.c 2010-05-15 13:20:18.454567530 -0400 |
20177 | +++ linux-2.6.32.13/drivers/acpi/power_meter.c 2010-05-15 13:21:14.298962418 -0400 | 20180 | +++ linux-2.6.32.15/drivers/acpi/power_meter.c 2010-05-28 21:27:15.191153765 -0400 |
20178 | @@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d | 20181 | @@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d |
20179 | return res; | 20182 | return res; |
20180 | 20183 | ||
@@ -20184,9 +20187,9 @@ diff -urNp linux-2.6.32.13/drivers/acpi/power_meter.c linux-2.6.32.13/drivers/ac | |||
20184 | 20187 | ||
20185 | mutex_lock(&resource->lock); | 20188 | mutex_lock(&resource->lock); |
20186 | resource->trip[attr->index - 7] = temp; | 20189 | resource->trip[attr->index - 7] = temp; |
20187 | diff -urNp linux-2.6.32.13/drivers/acpi/proc.c linux-2.6.32.13/drivers/acpi/proc.c | 20190 | diff -urNp linux-2.6.32.15/drivers/acpi/proc.c linux-2.6.32.15/drivers/acpi/proc.c |
20188 | --- linux-2.6.32.13/drivers/acpi/proc.c 2010-03-15 11:52:04.000000000 -0400 | 20191 | --- linux-2.6.32.15/drivers/acpi/proc.c 2010-03-15 11:52:04.000000000 -0400 |
20189 | +++ linux-2.6.32.13/drivers/acpi/proc.c 2010-05-15 13:21:14.307002164 -0400 | 20192 | +++ linux-2.6.32.15/drivers/acpi/proc.c 2010-05-28 21:27:15.191153765 -0400 |
20190 | @@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f | 20193 | @@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f |
20191 | size_t count, loff_t * ppos) | 20194 | size_t count, loff_t * ppos) |
20192 | { | 20195 | { |
@@ -20222,9 +20225,9 @@ diff -urNp linux-2.6.32.13/drivers/acpi/proc.c linux-2.6.32.13/drivers/acpi/proc | |||
20222 | dev->wakeup.state.enabled = | 20225 | dev->wakeup.state.enabled = |
20223 | dev->wakeup.state.enabled ? 0 : 1; | 20226 | dev->wakeup.state.enabled ? 0 : 1; |
20224 | found_dev = dev; | 20227 | found_dev = dev; |
20225 | diff -urNp linux-2.6.32.13/drivers/acpi/processor_core.c linux-2.6.32.13/drivers/acpi/processor_core.c | 20228 | diff -urNp linux-2.6.32.15/drivers/acpi/processor_core.c linux-2.6.32.15/drivers/acpi/processor_core.c |
20226 | --- linux-2.6.32.13/drivers/acpi/processor_core.c 2010-03-15 11:52:04.000000000 -0400 | 20229 | --- linux-2.6.32.15/drivers/acpi/processor_core.c 2010-03-15 11:52:04.000000000 -0400 |
20227 | +++ linux-2.6.32.13/drivers/acpi/processor_core.c 2010-05-15 13:21:14.307002164 -0400 | 20230 | +++ linux-2.6.32.15/drivers/acpi/processor_core.c 2010-05-28 21:27:15.191153765 -0400 |
20228 | @@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add( | 20231 | @@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add( |
20229 | return 0; | 20232 | return 0; |
20230 | } | 20233 | } |
@@ -20234,9 +20237,9 @@ diff -urNp linux-2.6.32.13/drivers/acpi/processor_core.c linux-2.6.32.13/drivers | |||
20234 | 20237 | ||
20235 | /* | 20238 | /* |
20236 | * Buggy BIOS check | 20239 | * Buggy BIOS check |
20237 | diff -urNp linux-2.6.32.13/drivers/acpi/processor_idle.c linux-2.6.32.13/drivers/acpi/processor_idle.c | 20240 | diff -urNp linux-2.6.32.15/drivers/acpi/processor_idle.c linux-2.6.32.15/drivers/acpi/processor_idle.c |
20238 | --- linux-2.6.32.13/drivers/acpi/processor_idle.c 2010-03-15 11:52:04.000000000 -0400 | 20241 | --- linux-2.6.32.15/drivers/acpi/processor_idle.c 2010-03-15 11:52:04.000000000 -0400 |
20239 | +++ linux-2.6.32.13/drivers/acpi/processor_idle.c 2010-05-15 13:21:14.330926828 -0400 | 20242 | +++ linux-2.6.32.15/drivers/acpi/processor_idle.c 2010-05-28 21:27:15.191153765 -0400 |
20240 | @@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat | 20243 | @@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat |
20241 | DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), | 20244 | DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), |
20242 | DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, | 20245 | DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, |
@@ -20246,9 +20249,21 @@ diff -urNp linux-2.6.32.13/drivers/acpi/processor_idle.c linux-2.6.32.13/drivers | |||
20246 | }; | 20249 | }; |
20247 | 20250 | ||
20248 | 20251 | ||
20249 | diff -urNp linux-2.6.32.13/drivers/acpi/sleep.c linux-2.6.32.13/drivers/acpi/sleep.c | 20252 | diff -urNp linux-2.6.32.15/drivers/acpi/sbshc.c linux-2.6.32.15/drivers/acpi/sbshc.c |
20250 | --- linux-2.6.32.13/drivers/acpi/sleep.c 2010-05-15 13:20:18.454567530 -0400 | 20253 | --- linux-2.6.32.15/drivers/acpi/sbshc.c 2010-03-15 11:52:04.000000000 -0400 |
20251 | +++ linux-2.6.32.13/drivers/acpi/sleep.c 2010-05-15 13:21:14.330926828 -0400 | 20254 | +++ linux-2.6.32.15/drivers/acpi/sbshc.c 2010-05-31 11:26:43.164958464 -0400 |
20255 | @@ -17,7 +17,7 @@ | ||
20256 | |||
20257 | #define PREFIX "ACPI: " | ||
20258 | |||
20259 | -#define ACPI_SMB_HC_CLASS "smbus_host_controller" | ||
20260 | +#define ACPI_SMB_HC_CLASS "smbus_host_ctl" | ||
20261 | #define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC" | ||
20262 | |||
20263 | struct acpi_smb_hc { | ||
20264 | diff -urNp linux-2.6.32.15/drivers/acpi/sleep.c linux-2.6.32.15/drivers/acpi/sleep.c | ||
20265 | --- linux-2.6.32.15/drivers/acpi/sleep.c 2010-05-28 20:16:44.438931092 -0400 | ||
20266 | +++ linux-2.6.32.15/drivers/acpi/sleep.c 2010-05-28 21:27:15.191153765 -0400 | ||
20252 | @@ -302,7 +302,7 @@ static int acpi_suspend_state_valid(susp | 20267 | @@ -302,7 +302,7 @@ static int acpi_suspend_state_valid(susp |
20253 | } | 20268 | } |
20254 | } | 20269 | } |
@@ -20267,7 +20282,7 @@ diff -urNp linux-2.6.32.13/drivers/acpi/sleep.c linux-2.6.32.13/drivers/acpi/sle | |||
20267 | .valid = acpi_suspend_state_valid, | 20282 | .valid = acpi_suspend_state_valid, |
20268 | .begin = acpi_suspend_begin_old, | 20283 | .begin = acpi_suspend_begin_old, |
20269 | .prepare_late = acpi_pm_disable_gpes, | 20284 | .prepare_late = acpi_pm_disable_gpes, |
20270 | @@ -701,7 +701,7 @@ static void acpi_pm_enable_gpes(void) | 20285 | @@ -613,7 +613,7 @@ static void acpi_pm_enable_gpes(void) |
20271 | acpi_enable_all_runtime_gpes(); | 20286 | acpi_enable_all_runtime_gpes(); |
20272 | } | 20287 | } |
20273 | 20288 | ||
@@ -20276,7 +20291,7 @@ diff -urNp linux-2.6.32.13/drivers/acpi/sleep.c linux-2.6.32.13/drivers/acpi/sle | |||
20276 | .begin = acpi_hibernation_begin, | 20291 | .begin = acpi_hibernation_begin, |
20277 | .end = acpi_pm_end, | 20292 | .end = acpi_pm_end, |
20278 | .pre_snapshot = acpi_hibernation_pre_snapshot, | 20293 | .pre_snapshot = acpi_hibernation_pre_snapshot, |
20279 | @@ -754,7 +754,7 @@ static int acpi_hibernation_pre_snapshot | 20294 | @@ -666,7 +666,7 @@ static int acpi_hibernation_pre_snapshot |
20280 | * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has | 20295 | * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has |
20281 | * been requested. | 20296 | * been requested. |
20282 | */ | 20297 | */ |
@@ -20285,9 +20300,9 @@ diff -urNp linux-2.6.32.13/drivers/acpi/sleep.c linux-2.6.32.13/drivers/acpi/sle | |||
20285 | .begin = acpi_hibernation_begin_old, | 20300 | .begin = acpi_hibernation_begin_old, |
20286 | .end = acpi_pm_end, | 20301 | .end = acpi_pm_end, |
20287 | .pre_snapshot = acpi_hibernation_pre_snapshot_old, | 20302 | .pre_snapshot = acpi_hibernation_pre_snapshot_old, |
20288 | diff -urNp linux-2.6.32.13/drivers/acpi/video.c linux-2.6.32.13/drivers/acpi/video.c | 20303 | diff -urNp linux-2.6.32.15/drivers/acpi/video.c linux-2.6.32.15/drivers/acpi/video.c |
20289 | --- linux-2.6.32.13/drivers/acpi/video.c 2010-03-15 11:52:04.000000000 -0400 | 20304 | --- linux-2.6.32.15/drivers/acpi/video.c 2010-03-15 11:52:04.000000000 -0400 |
20290 | +++ linux-2.6.32.13/drivers/acpi/video.c 2010-05-15 13:21:14.330926828 -0400 | 20305 | +++ linux-2.6.32.15/drivers/acpi/video.c 2010-05-28 21:27:15.203165017 -0400 |
20291 | @@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str | 20306 | @@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str |
20292 | vd->brightness->levels[request_level]); | 20307 | vd->brightness->levels[request_level]); |
20293 | } | 20308 | } |
@@ -20297,9 +20312,9 @@ diff -urNp linux-2.6.32.13/drivers/acpi/video.c linux-2.6.32.13/drivers/acpi/vid | |||
20297 | .get_brightness = acpi_video_get_brightness, | 20312 | .get_brightness = acpi_video_get_brightness, |
20298 | .update_status = acpi_video_set_brightness, | 20313 | .update_status = acpi_video_set_brightness, |
20299 | }; | 20314 | }; |
20300 | diff -urNp linux-2.6.32.13/drivers/ata/ahci.c linux-2.6.32.13/drivers/ata/ahci.c | 20315 | diff -urNp linux-2.6.32.15/drivers/ata/ahci.c linux-2.6.32.15/drivers/ata/ahci.c |
20301 | --- linux-2.6.32.13/drivers/ata/ahci.c 2010-04-29 17:49:37.661448235 -0400 | 20316 | --- linux-2.6.32.15/drivers/ata/ahci.c 2010-04-29 17:49:37.661448235 -0400 |
20302 | +++ linux-2.6.32.13/drivers/ata/ahci.c 2010-05-15 13:21:14.374114367 -0400 | 20317 | +++ linux-2.6.32.15/drivers/ata/ahci.c 2010-05-28 21:27:15.203165017 -0400 |
20303 | @@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh | 20318 | @@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh |
20304 | .sdev_attrs = ahci_sdev_attrs, | 20319 | .sdev_attrs = ahci_sdev_attrs, |
20305 | }; | 20320 | }; |
@@ -20339,9 +20354,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/ahci.c linux-2.6.32.13/drivers/ata/ahci.c | |||
20339 | }; | 20354 | }; |
20340 | 20355 | ||
20341 | 20356 | ||
20342 | diff -urNp linux-2.6.32.13/drivers/ata/ata_generic.c linux-2.6.32.13/drivers/ata/ata_generic.c | 20357 | diff -urNp linux-2.6.32.15/drivers/ata/ata_generic.c linux-2.6.32.15/drivers/ata/ata_generic.c |
20343 | --- linux-2.6.32.13/drivers/ata/ata_generic.c 2010-03-15 11:52:04.000000000 -0400 | 20358 | --- linux-2.6.32.15/drivers/ata/ata_generic.c 2010-03-15 11:52:04.000000000 -0400 |
20344 | +++ linux-2.6.32.13/drivers/ata/ata_generic.c 2010-05-15 13:21:14.387424242 -0400 | 20359 | +++ linux-2.6.32.15/drivers/ata/ata_generic.c 2010-05-28 21:27:15.203165017 -0400 |
20345 | @@ -95,7 +95,7 @@ static struct scsi_host_template generic | 20360 | @@ -95,7 +95,7 @@ static struct scsi_host_template generic |
20346 | ATA_BMDMA_SHT(DRV_NAME), | 20361 | ATA_BMDMA_SHT(DRV_NAME), |
20347 | }; | 20362 | }; |
@@ -20351,9 +20366,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/ata_generic.c linux-2.6.32.13/drivers/ata | |||
20351 | .inherits = &ata_bmdma_port_ops, | 20366 | .inherits = &ata_bmdma_port_ops, |
20352 | .cable_detect = ata_cable_unknown, | 20367 | .cable_detect = ata_cable_unknown, |
20353 | .set_mode = generic_set_mode, | 20368 | .set_mode = generic_set_mode, |
20354 | diff -urNp linux-2.6.32.13/drivers/ata/ata_piix.c linux-2.6.32.13/drivers/ata/ata_piix.c | 20369 | diff -urNp linux-2.6.32.15/drivers/ata/ata_piix.c linux-2.6.32.15/drivers/ata/ata_piix.c |
20355 | --- linux-2.6.32.13/drivers/ata/ata_piix.c 2010-04-29 17:49:37.669446700 -0400 | 20370 | --- linux-2.6.32.15/drivers/ata/ata_piix.c 2010-04-29 17:49:37.669446700 -0400 |
20356 | +++ linux-2.6.32.13/drivers/ata/ata_piix.c 2010-05-15 13:21:14.387424242 -0400 | 20371 | +++ linux-2.6.32.15/drivers/ata/ata_piix.c 2010-05-28 21:27:15.203165017 -0400 |
20357 | @@ -299,7 +299,7 @@ static const struct pci_device_id piix_p | 20372 | @@ -299,7 +299,7 @@ static const struct pci_device_id piix_p |
20358 | { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, | 20373 | { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, |
20359 | /* SATA Controller IDE (CPT) */ | 20374 | /* SATA Controller IDE (CPT) */ |
@@ -20417,9 +20432,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/ata_piix.c linux-2.6.32.13/drivers/ata/at | |||
20417 | }; | 20432 | }; |
20418 | static const char *oemstrs[] = { | 20433 | static const char *oemstrs[] = { |
20419 | "Tecra M3,", | 20434 | "Tecra M3,", |
20420 | diff -urNp linux-2.6.32.13/drivers/ata/libata-acpi.c linux-2.6.32.13/drivers/ata/libata-acpi.c | 20435 | diff -urNp linux-2.6.32.15/drivers/ata/libata-acpi.c linux-2.6.32.15/drivers/ata/libata-acpi.c |
20421 | --- linux-2.6.32.13/drivers/ata/libata-acpi.c 2010-03-15 11:52:04.000000000 -0400 | 20436 | --- linux-2.6.32.15/drivers/ata/libata-acpi.c 2010-03-15 11:52:04.000000000 -0400 |
20422 | +++ linux-2.6.32.13/drivers/ata/libata-acpi.c 2010-05-15 13:21:14.387424242 -0400 | 20437 | +++ linux-2.6.32.15/drivers/ata/libata-acpi.c 2010-05-28 21:27:15.203165017 -0400 |
20423 | @@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han | 20438 | @@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han |
20424 | ata_acpi_uevent(dev->link->ap, dev, event); | 20439 | ata_acpi_uevent(dev->link->ap, dev, event); |
20425 | } | 20440 | } |
@@ -20435,9 +20450,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/libata-acpi.c linux-2.6.32.13/drivers/ata | |||
20435 | .handler = ata_acpi_ap_notify_dock, | 20450 | .handler = ata_acpi_ap_notify_dock, |
20436 | .uevent = ata_acpi_ap_uevent, | 20451 | .uevent = ata_acpi_ap_uevent, |
20437 | }; | 20452 | }; |
20438 | diff -urNp linux-2.6.32.13/drivers/ata/libata-core.c linux-2.6.32.13/drivers/ata/libata-core.c | 20453 | diff -urNp linux-2.6.32.15/drivers/ata/libata-core.c linux-2.6.32.15/drivers/ata/libata-core.c |
20439 | --- linux-2.6.32.13/drivers/ata/libata-core.c 2010-04-29 17:49:37.689144697 -0400 | 20454 | --- linux-2.6.32.15/drivers/ata/libata-core.c 2010-04-29 17:49:37.689144697 -0400 |
20440 | +++ linux-2.6.32.13/drivers/ata/libata-core.c 2010-05-15 13:21:14.390775531 -0400 | 20455 | +++ linux-2.6.32.15/drivers/ata/libata-core.c 2010-05-28 21:27:15.207155482 -0400 |
20441 | @@ -896,7 +896,7 @@ static const struct ata_xfer_ent { | 20456 | @@ -896,7 +896,7 @@ static const struct ata_xfer_ent { |
20442 | { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 }, | 20457 | { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 }, |
20443 | { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 }, | 20458 | { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 }, |
@@ -20511,9 +20526,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/libata-core.c linux-2.6.32.13/drivers/ata | |||
20511 | .qc_prep = ata_noop_qc_prep, | 20526 | .qc_prep = ata_noop_qc_prep, |
20512 | .qc_issue = ata_dummy_qc_issue, | 20527 | .qc_issue = ata_dummy_qc_issue, |
20513 | .error_handler = ata_dummy_error_handler, | 20528 | .error_handler = ata_dummy_error_handler, |
20514 | diff -urNp linux-2.6.32.13/drivers/ata/libata-eh.c linux-2.6.32.13/drivers/ata/libata-eh.c | 20529 | diff -urNp linux-2.6.32.15/drivers/ata/libata-eh.c linux-2.6.32.15/drivers/ata/libata-eh.c |
20515 | --- linux-2.6.32.13/drivers/ata/libata-eh.c 2010-05-15 13:20:18.462978524 -0400 | 20530 | --- linux-2.6.32.15/drivers/ata/libata-eh.c 2010-05-15 13:20:18.462978524 -0400 |
20516 | +++ linux-2.6.32.13/drivers/ata/libata-eh.c 2010-05-15 13:21:14.390775531 -0400 | 20531 | +++ linux-2.6.32.15/drivers/ata/libata-eh.c 2010-05-28 21:27:15.215165530 -0400 |
20517 | @@ -3586,7 +3586,7 @@ void ata_do_eh(struct ata_port *ap, ata_ | 20532 | @@ -3586,7 +3586,7 @@ void ata_do_eh(struct ata_port *ap, ata_ |
20518 | */ | 20533 | */ |
20519 | void ata_std_error_handler(struct ata_port *ap) | 20534 | void ata_std_error_handler(struct ata_port *ap) |
@@ -20523,9 +20538,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/libata-eh.c linux-2.6.32.13/drivers/ata/l | |||
20523 | ata_reset_fn_t hardreset = ops->hardreset; | 20538 | ata_reset_fn_t hardreset = ops->hardreset; |
20524 | 20539 | ||
20525 | /* ignore built-in hardreset if SCR access is not available */ | 20540 | /* ignore built-in hardreset if SCR access is not available */ |
20526 | diff -urNp linux-2.6.32.13/drivers/ata/libata-pmp.c linux-2.6.32.13/drivers/ata/libata-pmp.c | 20541 | diff -urNp linux-2.6.32.15/drivers/ata/libata-pmp.c linux-2.6.32.15/drivers/ata/libata-pmp.c |
20527 | --- linux-2.6.32.13/drivers/ata/libata-pmp.c 2010-03-15 11:52:04.000000000 -0400 | 20542 | --- linux-2.6.32.15/drivers/ata/libata-pmp.c 2010-03-15 11:52:04.000000000 -0400 |
20528 | +++ linux-2.6.32.13/drivers/ata/libata-pmp.c 2010-05-15 13:21:14.390775531 -0400 | 20543 | +++ linux-2.6.32.15/drivers/ata/libata-pmp.c 2010-05-28 21:27:15.215165530 -0400 |
20529 | @@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str | 20544 | @@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str |
20530 | */ | 20545 | */ |
20531 | static int sata_pmp_eh_recover(struct ata_port *ap) | 20546 | static int sata_pmp_eh_recover(struct ata_port *ap) |
@@ -20535,9 +20550,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/libata-pmp.c linux-2.6.32.13/drivers/ata/ | |||
20535 | int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; | 20550 | int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; |
20536 | struct ata_link *pmp_link = &ap->link; | 20551 | struct ata_link *pmp_link = &ap->link; |
20537 | struct ata_device *pmp_dev = pmp_link->device; | 20552 | struct ata_device *pmp_dev = pmp_link->device; |
20538 | diff -urNp linux-2.6.32.13/drivers/ata/pata_acpi.c linux-2.6.32.13/drivers/ata/pata_acpi.c | 20553 | diff -urNp linux-2.6.32.15/drivers/ata/pata_acpi.c linux-2.6.32.15/drivers/ata/pata_acpi.c |
20539 | --- linux-2.6.32.13/drivers/ata/pata_acpi.c 2010-03-15 11:52:04.000000000 -0400 | 20554 | --- linux-2.6.32.15/drivers/ata/pata_acpi.c 2010-03-15 11:52:04.000000000 -0400 |
20540 | +++ linux-2.6.32.13/drivers/ata/pata_acpi.c 2010-05-15 13:21:14.390775531 -0400 | 20555 | +++ linux-2.6.32.15/drivers/ata/pata_acpi.c 2010-05-28 21:27:15.215165530 -0400 |
20541 | @@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s | 20556 | @@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s |
20542 | ATA_BMDMA_SHT(DRV_NAME), | 20557 | ATA_BMDMA_SHT(DRV_NAME), |
20543 | }; | 20558 | }; |
@@ -20547,9 +20562,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_acpi.c linux-2.6.32.13/drivers/ata/p | |||
20547 | .inherits = &ata_bmdma_port_ops, | 20562 | .inherits = &ata_bmdma_port_ops, |
20548 | .qc_issue = pacpi_qc_issue, | 20563 | .qc_issue = pacpi_qc_issue, |
20549 | .cable_detect = pacpi_cable_detect, | 20564 | .cable_detect = pacpi_cable_detect, |
20550 | diff -urNp linux-2.6.32.13/drivers/ata/pata_ali.c linux-2.6.32.13/drivers/ata/pata_ali.c | 20565 | diff -urNp linux-2.6.32.15/drivers/ata/pata_ali.c linux-2.6.32.15/drivers/ata/pata_ali.c |
20551 | --- linux-2.6.32.13/drivers/ata/pata_ali.c 2010-04-29 17:49:37.689144697 -0400 | 20566 | --- linux-2.6.32.15/drivers/ata/pata_ali.c 2010-04-29 17:49:37.689144697 -0400 |
20552 | +++ linux-2.6.32.13/drivers/ata/pata_ali.c 2010-05-15 13:21:14.402931362 -0400 | 20567 | +++ linux-2.6.32.15/drivers/ata/pata_ali.c 2010-05-28 21:27:15.215165530 -0400 |
20553 | @@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht | 20568 | @@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht |
20554 | * Port operations for PIO only ALi | 20569 | * Port operations for PIO only ALi |
20555 | */ | 20570 | */ |
@@ -20595,9 +20610,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_ali.c linux-2.6.32.13/drivers/ata/pa | |||
20595 | .inherits = &ali_dma_base_ops, | 20610 | .inherits = &ali_dma_base_ops, |
20596 | .check_atapi_dma = ali_check_atapi_dma, | 20611 | .check_atapi_dma = ali_check_atapi_dma, |
20597 | .dev_config = ali_warn_atapi_dma, | 20612 | .dev_config = ali_warn_atapi_dma, |
20598 | diff -urNp linux-2.6.32.13/drivers/ata/pata_amd.c linux-2.6.32.13/drivers/ata/pata_amd.c | 20613 | diff -urNp linux-2.6.32.15/drivers/ata/pata_amd.c linux-2.6.32.15/drivers/ata/pata_amd.c |
20599 | --- linux-2.6.32.13/drivers/ata/pata_amd.c 2010-03-15 11:52:04.000000000 -0400 | 20614 | --- linux-2.6.32.15/drivers/ata/pata_amd.c 2010-03-15 11:52:04.000000000 -0400 |
20600 | +++ linux-2.6.32.13/drivers/ata/pata_amd.c 2010-05-15 13:21:14.402931362 -0400 | 20615 | +++ linux-2.6.32.15/drivers/ata/pata_amd.c 2010-05-28 21:27:15.215165530 -0400 |
20601 | @@ -397,28 +397,28 @@ static const struct ata_port_operations | 20616 | @@ -397,28 +397,28 @@ static const struct ata_port_operations |
20602 | .prereset = amd_pre_reset, | 20617 | .prereset = amd_pre_reset, |
20603 | }; | 20618 | }; |
@@ -20647,9 +20662,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_amd.c linux-2.6.32.13/drivers/ata/pa | |||
20647 | .inherits = &nv_base_port_ops, | 20662 | .inherits = &nv_base_port_ops, |
20648 | .set_piomode = nv133_set_piomode, | 20663 | .set_piomode = nv133_set_piomode, |
20649 | .set_dmamode = nv133_set_dmamode, | 20664 | .set_dmamode = nv133_set_dmamode, |
20650 | diff -urNp linux-2.6.32.13/drivers/ata/pata_artop.c linux-2.6.32.13/drivers/ata/pata_artop.c | 20665 | diff -urNp linux-2.6.32.15/drivers/ata/pata_artop.c linux-2.6.32.15/drivers/ata/pata_artop.c |
20651 | --- linux-2.6.32.13/drivers/ata/pata_artop.c 2010-03-15 11:52:04.000000000 -0400 | 20666 | --- linux-2.6.32.15/drivers/ata/pata_artop.c 2010-03-15 11:52:04.000000000 -0400 |
20652 | +++ linux-2.6.32.13/drivers/ata/pata_artop.c 2010-05-15 13:21:14.402931362 -0400 | 20667 | +++ linux-2.6.32.15/drivers/ata/pata_artop.c 2010-05-28 21:27:15.215165530 -0400 |
20653 | @@ -311,7 +311,7 @@ static struct scsi_host_template artop_s | 20668 | @@ -311,7 +311,7 @@ static struct scsi_host_template artop_s |
20654 | ATA_BMDMA_SHT(DRV_NAME), | 20669 | ATA_BMDMA_SHT(DRV_NAME), |
20655 | }; | 20670 | }; |
@@ -20668,9 +20683,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_artop.c linux-2.6.32.13/drivers/ata/ | |||
20668 | .inherits = &ata_bmdma_port_ops, | 20683 | .inherits = &ata_bmdma_port_ops, |
20669 | .cable_detect = artop6260_cable_detect, | 20684 | .cable_detect = artop6260_cable_detect, |
20670 | .set_piomode = artop6260_set_piomode, | 20685 | .set_piomode = artop6260_set_piomode, |
20671 | diff -urNp linux-2.6.32.13/drivers/ata/pata_at32.c linux-2.6.32.13/drivers/ata/pata_at32.c | 20686 | diff -urNp linux-2.6.32.15/drivers/ata/pata_at32.c linux-2.6.32.15/drivers/ata/pata_at32.c |
20672 | --- linux-2.6.32.13/drivers/ata/pata_at32.c 2010-03-15 11:52:04.000000000 -0400 | 20687 | --- linux-2.6.32.15/drivers/ata/pata_at32.c 2010-03-15 11:52:04.000000000 -0400 |
20673 | +++ linux-2.6.32.13/drivers/ata/pata_at32.c 2010-05-15 13:21:14.402931362 -0400 | 20688 | +++ linux-2.6.32.15/drivers/ata/pata_at32.c 2010-05-28 21:27:15.215165530 -0400 |
20674 | @@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh | 20689 | @@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh |
20675 | ATA_PIO_SHT(DRV_NAME), | 20690 | ATA_PIO_SHT(DRV_NAME), |
20676 | }; | 20691 | }; |
@@ -20680,9 +20695,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_at32.c linux-2.6.32.13/drivers/ata/p | |||
20680 | .inherits = &ata_sff_port_ops, | 20695 | .inherits = &ata_sff_port_ops, |
20681 | .cable_detect = ata_cable_40wire, | 20696 | .cable_detect = ata_cable_40wire, |
20682 | .set_piomode = pata_at32_set_piomode, | 20697 | .set_piomode = pata_at32_set_piomode, |
20683 | diff -urNp linux-2.6.32.13/drivers/ata/pata_at91.c linux-2.6.32.13/drivers/ata/pata_at91.c | 20698 | diff -urNp linux-2.6.32.15/drivers/ata/pata_at91.c linux-2.6.32.15/drivers/ata/pata_at91.c |
20684 | --- linux-2.6.32.13/drivers/ata/pata_at91.c 2010-03-15 11:52:04.000000000 -0400 | 20699 | --- linux-2.6.32.15/drivers/ata/pata_at91.c 2010-03-15 11:52:04.000000000 -0400 |
20685 | +++ linux-2.6.32.13/drivers/ata/pata_at91.c 2010-05-15 13:21:14.402931362 -0400 | 20700 | +++ linux-2.6.32.15/drivers/ata/pata_at91.c 2010-05-28 21:27:15.227169983 -0400 |
20686 | @@ -195,7 +195,7 @@ static struct scsi_host_template pata_at | 20701 | @@ -195,7 +195,7 @@ static struct scsi_host_template pata_at |
20687 | ATA_PIO_SHT(DRV_NAME), | 20702 | ATA_PIO_SHT(DRV_NAME), |
20688 | }; | 20703 | }; |
@@ -20692,9 +20707,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_at91.c linux-2.6.32.13/drivers/ata/p | |||
20692 | .inherits = &ata_sff_port_ops, | 20707 | .inherits = &ata_sff_port_ops, |
20693 | 20708 | ||
20694 | .sff_data_xfer = pata_at91_data_xfer_noirq, | 20709 | .sff_data_xfer = pata_at91_data_xfer_noirq, |
20695 | diff -urNp linux-2.6.32.13/drivers/ata/pata_atiixp.c linux-2.6.32.13/drivers/ata/pata_atiixp.c | 20710 | diff -urNp linux-2.6.32.15/drivers/ata/pata_atiixp.c linux-2.6.32.15/drivers/ata/pata_atiixp.c |
20696 | --- linux-2.6.32.13/drivers/ata/pata_atiixp.c 2010-03-15 11:52:04.000000000 -0400 | 20711 | --- linux-2.6.32.15/drivers/ata/pata_atiixp.c 2010-03-15 11:52:04.000000000 -0400 |
20697 | +++ linux-2.6.32.13/drivers/ata/pata_atiixp.c 2010-05-15 13:21:14.444201793 -0400 | 20712 | +++ linux-2.6.32.15/drivers/ata/pata_atiixp.c 2010-05-28 21:27:15.227169983 -0400 |
20698 | @@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_ | 20713 | @@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_ |
20699 | .sg_tablesize = LIBATA_DUMB_MAX_PRD, | 20714 | .sg_tablesize = LIBATA_DUMB_MAX_PRD, |
20700 | }; | 20715 | }; |
@@ -20704,9 +20719,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_atiixp.c linux-2.6.32.13/drivers/ata | |||
20704 | .inherits = &ata_bmdma_port_ops, | 20719 | .inherits = &ata_bmdma_port_ops, |
20705 | 20720 | ||
20706 | .qc_prep = ata_sff_dumb_qc_prep, | 20721 | .qc_prep = ata_sff_dumb_qc_prep, |
20707 | diff -urNp linux-2.6.32.13/drivers/ata/pata_atp867x.c linux-2.6.32.13/drivers/ata/pata_atp867x.c | 20722 | diff -urNp linux-2.6.32.15/drivers/ata/pata_atp867x.c linux-2.6.32.15/drivers/ata/pata_atp867x.c |
20708 | --- linux-2.6.32.13/drivers/ata/pata_atp867x.c 2010-03-15 11:52:04.000000000 -0400 | 20723 | --- linux-2.6.32.15/drivers/ata/pata_atp867x.c 2010-03-15 11:52:04.000000000 -0400 |
20709 | +++ linux-2.6.32.13/drivers/ata/pata_atp867x.c 2010-05-15 13:21:14.451300458 -0400 | 20724 | +++ linux-2.6.32.15/drivers/ata/pata_atp867x.c 2010-05-28 21:27:15.227169983 -0400 |
20710 | @@ -274,7 +274,7 @@ static struct scsi_host_template atp867x | 20725 | @@ -274,7 +274,7 @@ static struct scsi_host_template atp867x |
20711 | ATA_BMDMA_SHT(DRV_NAME), | 20726 | ATA_BMDMA_SHT(DRV_NAME), |
20712 | }; | 20727 | }; |
@@ -20716,9 +20731,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_atp867x.c linux-2.6.32.13/drivers/at | |||
20716 | .inherits = &ata_bmdma_port_ops, | 20731 | .inherits = &ata_bmdma_port_ops, |
20717 | .cable_detect = atp867x_cable_detect, | 20732 | .cable_detect = atp867x_cable_detect, |
20718 | .set_piomode = atp867x_set_piomode, | 20733 | .set_piomode = atp867x_set_piomode, |
20719 | diff -urNp linux-2.6.32.13/drivers/ata/pata_bf54x.c linux-2.6.32.13/drivers/ata/pata_bf54x.c | 20734 | diff -urNp linux-2.6.32.15/drivers/ata/pata_bf54x.c linux-2.6.32.15/drivers/ata/pata_bf54x.c |
20720 | --- linux-2.6.32.13/drivers/ata/pata_bf54x.c 2010-03-15 11:52:04.000000000 -0400 | 20735 | --- linux-2.6.32.15/drivers/ata/pata_bf54x.c 2010-03-15 11:52:04.000000000 -0400 |
20721 | +++ linux-2.6.32.13/drivers/ata/pata_bf54x.c 2010-05-15 13:21:14.451300458 -0400 | 20736 | +++ linux-2.6.32.15/drivers/ata/pata_bf54x.c 2010-05-28 21:27:15.235166526 -0400 |
20722 | @@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh | 20737 | @@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh |
20723 | .dma_boundary = ATA_DMA_BOUNDARY, | 20738 | .dma_boundary = ATA_DMA_BOUNDARY, |
20724 | }; | 20739 | }; |
@@ -20728,9 +20743,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_bf54x.c linux-2.6.32.13/drivers/ata/ | |||
20728 | .inherits = &ata_sff_port_ops, | 20743 | .inherits = &ata_sff_port_ops, |
20729 | 20744 | ||
20730 | .set_piomode = bfin_set_piomode, | 20745 | .set_piomode = bfin_set_piomode, |
20731 | diff -urNp linux-2.6.32.13/drivers/ata/pata_cmd640.c linux-2.6.32.13/drivers/ata/pata_cmd640.c | 20746 | diff -urNp linux-2.6.32.15/drivers/ata/pata_cmd640.c linux-2.6.32.15/drivers/ata/pata_cmd640.c |
20732 | --- linux-2.6.32.13/drivers/ata/pata_cmd640.c 2010-03-15 11:52:04.000000000 -0400 | 20747 | --- linux-2.6.32.15/drivers/ata/pata_cmd640.c 2010-03-15 11:52:04.000000000 -0400 |
20733 | +++ linux-2.6.32.13/drivers/ata/pata_cmd640.c 2010-05-15 13:21:14.451300458 -0400 | 20748 | +++ linux-2.6.32.15/drivers/ata/pata_cmd640.c 2010-05-28 21:27:15.235166526 -0400 |
20734 | @@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_ | 20749 | @@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_ |
20735 | ATA_BMDMA_SHT(DRV_NAME), | 20750 | ATA_BMDMA_SHT(DRV_NAME), |
20736 | }; | 20751 | }; |
@@ -20740,9 +20755,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_cmd640.c linux-2.6.32.13/drivers/ata | |||
20740 | .inherits = &ata_bmdma_port_ops, | 20755 | .inherits = &ata_bmdma_port_ops, |
20741 | /* In theory xfer_noirq is not needed once we kill the prefetcher */ | 20756 | /* In theory xfer_noirq is not needed once we kill the prefetcher */ |
20742 | .sff_data_xfer = ata_sff_data_xfer_noirq, | 20757 | .sff_data_xfer = ata_sff_data_xfer_noirq, |
20743 | diff -urNp linux-2.6.32.13/drivers/ata/pata_cmd64x.c linux-2.6.32.13/drivers/ata/pata_cmd64x.c | 20758 | diff -urNp linux-2.6.32.15/drivers/ata/pata_cmd64x.c linux-2.6.32.15/drivers/ata/pata_cmd64x.c |
20744 | --- linux-2.6.32.13/drivers/ata/pata_cmd64x.c 2010-03-15 11:52:04.000000000 -0400 | 20759 | --- linux-2.6.32.15/drivers/ata/pata_cmd64x.c 2010-03-15 11:52:04.000000000 -0400 |
20745 | +++ linux-2.6.32.13/drivers/ata/pata_cmd64x.c 2010-05-15 13:21:14.451300458 -0400 | 20760 | +++ linux-2.6.32.15/drivers/ata/pata_cmd64x.c 2010-05-28 21:27:15.235166526 -0400 |
20746 | @@ -275,18 +275,18 @@ static const struct ata_port_operations | 20761 | @@ -275,18 +275,18 @@ static const struct ata_port_operations |
20747 | .set_dmamode = cmd64x_set_dmamode, | 20762 | .set_dmamode = cmd64x_set_dmamode, |
20748 | }; | 20763 | }; |
@@ -20765,9 +20780,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_cmd64x.c linux-2.6.32.13/drivers/ata | |||
20765 | .inherits = &cmd64x_base_ops, | 20780 | .inherits = &cmd64x_base_ops, |
20766 | .bmdma_stop = cmd648_bmdma_stop, | 20781 | .bmdma_stop = cmd648_bmdma_stop, |
20767 | .cable_detect = cmd648_cable_detect, | 20782 | .cable_detect = cmd648_cable_detect, |
20768 | diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5520.c linux-2.6.32.13/drivers/ata/pata_cs5520.c | 20783 | diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5520.c linux-2.6.32.15/drivers/ata/pata_cs5520.c |
20769 | --- linux-2.6.32.13/drivers/ata/pata_cs5520.c 2010-03-15 11:52:04.000000000 -0400 | 20784 | --- linux-2.6.32.15/drivers/ata/pata_cs5520.c 2010-03-15 11:52:04.000000000 -0400 |
20770 | +++ linux-2.6.32.13/drivers/ata/pata_cs5520.c 2010-05-15 13:21:14.475033843 -0400 | 20785 | +++ linux-2.6.32.15/drivers/ata/pata_cs5520.c 2010-05-28 21:27:15.239154462 -0400 |
20771 | @@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_ | 20786 | @@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_ |
20772 | .sg_tablesize = LIBATA_DUMB_MAX_PRD, | 20787 | .sg_tablesize = LIBATA_DUMB_MAX_PRD, |
20773 | }; | 20788 | }; |
@@ -20777,9 +20792,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5520.c linux-2.6.32.13/drivers/ata | |||
20777 | .inherits = &ata_bmdma_port_ops, | 20792 | .inherits = &ata_bmdma_port_ops, |
20778 | .qc_prep = ata_sff_dumb_qc_prep, | 20793 | .qc_prep = ata_sff_dumb_qc_prep, |
20779 | .cable_detect = ata_cable_40wire, | 20794 | .cable_detect = ata_cable_40wire, |
20780 | diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5530.c linux-2.6.32.13/drivers/ata/pata_cs5530.c | 20795 | diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5530.c linux-2.6.32.15/drivers/ata/pata_cs5530.c |
20781 | --- linux-2.6.32.13/drivers/ata/pata_cs5530.c 2010-03-15 11:52:04.000000000 -0400 | 20796 | --- linux-2.6.32.15/drivers/ata/pata_cs5530.c 2010-03-15 11:52:04.000000000 -0400 |
20782 | +++ linux-2.6.32.13/drivers/ata/pata_cs5530.c 2010-05-15 13:21:14.487977689 -0400 | 20797 | +++ linux-2.6.32.15/drivers/ata/pata_cs5530.c 2010-05-28 21:27:15.239154462 -0400 |
20783 | @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ | 20798 | @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ |
20784 | .sg_tablesize = LIBATA_DUMB_MAX_PRD, | 20799 | .sg_tablesize = LIBATA_DUMB_MAX_PRD, |
20785 | }; | 20800 | }; |
@@ -20789,9 +20804,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5530.c linux-2.6.32.13/drivers/ata | |||
20789 | .inherits = &ata_bmdma_port_ops, | 20804 | .inherits = &ata_bmdma_port_ops, |
20790 | 20805 | ||
20791 | .qc_prep = ata_sff_dumb_qc_prep, | 20806 | .qc_prep = ata_sff_dumb_qc_prep, |
20792 | diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5535.c linux-2.6.32.13/drivers/ata/pata_cs5535.c | 20807 | diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5535.c linux-2.6.32.15/drivers/ata/pata_cs5535.c |
20793 | --- linux-2.6.32.13/drivers/ata/pata_cs5535.c 2010-03-15 11:52:04.000000000 -0400 | 20808 | --- linux-2.6.32.15/drivers/ata/pata_cs5535.c 2010-03-15 11:52:04.000000000 -0400 |
20794 | +++ linux-2.6.32.13/drivers/ata/pata_cs5535.c 2010-05-15 13:21:14.487977689 -0400 | 20809 | +++ linux-2.6.32.15/drivers/ata/pata_cs5535.c 2010-05-28 21:27:15.239154462 -0400 |
20795 | @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ | 20810 | @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ |
20796 | ATA_BMDMA_SHT(DRV_NAME), | 20811 | ATA_BMDMA_SHT(DRV_NAME), |
20797 | }; | 20812 | }; |
@@ -20801,9 +20816,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5535.c linux-2.6.32.13/drivers/ata | |||
20801 | .inherits = &ata_bmdma_port_ops, | 20816 | .inherits = &ata_bmdma_port_ops, |
20802 | .cable_detect = cs5535_cable_detect, | 20817 | .cable_detect = cs5535_cable_detect, |
20803 | .set_piomode = cs5535_set_piomode, | 20818 | .set_piomode = cs5535_set_piomode, |
20804 | diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5536.c linux-2.6.32.13/drivers/ata/pata_cs5536.c | 20819 | diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5536.c linux-2.6.32.15/drivers/ata/pata_cs5536.c |
20805 | --- linux-2.6.32.13/drivers/ata/pata_cs5536.c 2010-03-15 11:52:04.000000000 -0400 | 20820 | --- linux-2.6.32.15/drivers/ata/pata_cs5536.c 2010-03-15 11:52:04.000000000 -0400 |
20806 | +++ linux-2.6.32.13/drivers/ata/pata_cs5536.c 2010-05-15 13:21:14.487977689 -0400 | 20821 | +++ linux-2.6.32.15/drivers/ata/pata_cs5536.c 2010-05-28 21:27:15.239154462 -0400 |
20807 | @@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_ | 20822 | @@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_ |
20808 | ATA_BMDMA_SHT(DRV_NAME), | 20823 | ATA_BMDMA_SHT(DRV_NAME), |
20809 | }; | 20824 | }; |
@@ -20813,9 +20828,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5536.c linux-2.6.32.13/drivers/ata | |||
20813 | .inherits = &ata_bmdma_port_ops, | 20828 | .inherits = &ata_bmdma_port_ops, |
20814 | .cable_detect = cs5536_cable_detect, | 20829 | .cable_detect = cs5536_cable_detect, |
20815 | .set_piomode = cs5536_set_piomode, | 20830 | .set_piomode = cs5536_set_piomode, |
20816 | diff -urNp linux-2.6.32.13/drivers/ata/pata_cypress.c linux-2.6.32.13/drivers/ata/pata_cypress.c | 20831 | diff -urNp linux-2.6.32.15/drivers/ata/pata_cypress.c linux-2.6.32.15/drivers/ata/pata_cypress.c |
20817 | --- linux-2.6.32.13/drivers/ata/pata_cypress.c 2010-03-15 11:52:04.000000000 -0400 | 20832 | --- linux-2.6.32.15/drivers/ata/pata_cypress.c 2010-03-15 11:52:04.000000000 -0400 |
20818 | +++ linux-2.6.32.13/drivers/ata/pata_cypress.c 2010-05-15 13:21:14.487977689 -0400 | 20833 | +++ linux-2.6.32.15/drivers/ata/pata_cypress.c 2010-05-28 21:27:15.243179627 -0400 |
20819 | @@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69 | 20834 | @@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69 |
20820 | ATA_BMDMA_SHT(DRV_NAME), | 20835 | ATA_BMDMA_SHT(DRV_NAME), |
20821 | }; | 20836 | }; |
@@ -20825,9 +20840,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_cypress.c linux-2.6.32.13/drivers/at | |||
20825 | .inherits = &ata_bmdma_port_ops, | 20840 | .inherits = &ata_bmdma_port_ops, |
20826 | .cable_detect = ata_cable_40wire, | 20841 | .cable_detect = ata_cable_40wire, |
20827 | .set_piomode = cy82c693_set_piomode, | 20842 | .set_piomode = cy82c693_set_piomode, |
20828 | diff -urNp linux-2.6.32.13/drivers/ata/pata_efar.c linux-2.6.32.13/drivers/ata/pata_efar.c | 20843 | diff -urNp linux-2.6.32.15/drivers/ata/pata_efar.c linux-2.6.32.15/drivers/ata/pata_efar.c |
20829 | --- linux-2.6.32.13/drivers/ata/pata_efar.c 2010-03-15 11:52:04.000000000 -0400 | 20844 | --- linux-2.6.32.15/drivers/ata/pata_efar.c 2010-03-15 11:52:04.000000000 -0400 |
20830 | +++ linux-2.6.32.13/drivers/ata/pata_efar.c 2010-05-15 13:21:14.487977689 -0400 | 20845 | +++ linux-2.6.32.15/drivers/ata/pata_efar.c 2010-05-28 21:27:15.243179627 -0400 |
20831 | @@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh | 20846 | @@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh |
20832 | ATA_BMDMA_SHT(DRV_NAME), | 20847 | ATA_BMDMA_SHT(DRV_NAME), |
20833 | }; | 20848 | }; |
@@ -20837,9 +20852,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_efar.c linux-2.6.32.13/drivers/ata/p | |||
20837 | .inherits = &ata_bmdma_port_ops, | 20852 | .inherits = &ata_bmdma_port_ops, |
20838 | .cable_detect = efar_cable_detect, | 20853 | .cable_detect = efar_cable_detect, |
20839 | .set_piomode = efar_set_piomode, | 20854 | .set_piomode = efar_set_piomode, |
20840 | diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt366.c linux-2.6.32.13/drivers/ata/pata_hpt366.c | 20855 | diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt366.c linux-2.6.32.15/drivers/ata/pata_hpt366.c |
20841 | --- linux-2.6.32.13/drivers/ata/pata_hpt366.c 2010-03-15 11:52:04.000000000 -0400 | 20856 | --- linux-2.6.32.15/drivers/ata/pata_hpt366.c 2010-03-15 11:52:04.000000000 -0400 |
20842 | +++ linux-2.6.32.13/drivers/ata/pata_hpt366.c 2010-05-15 13:21:14.487977689 -0400 | 20857 | +++ linux-2.6.32.15/drivers/ata/pata_hpt366.c 2010-05-28 21:27:15.243179627 -0400 |
20843 | @@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_ | 20858 | @@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_ |
20844 | * Configuration for HPT366/68 | 20859 | * Configuration for HPT366/68 |
20845 | */ | 20860 | */ |
@@ -20849,9 +20864,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt366.c linux-2.6.32.13/drivers/ata | |||
20849 | .inherits = &ata_bmdma_port_ops, | 20864 | .inherits = &ata_bmdma_port_ops, |
20850 | .cable_detect = hpt36x_cable_detect, | 20865 | .cable_detect = hpt36x_cable_detect, |
20851 | .mode_filter = hpt366_filter, | 20866 | .mode_filter = hpt366_filter, |
20852 | diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt37x.c linux-2.6.32.13/drivers/ata/pata_hpt37x.c | 20867 | diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt37x.c linux-2.6.32.15/drivers/ata/pata_hpt37x.c |
20853 | --- linux-2.6.32.13/drivers/ata/pata_hpt37x.c 2010-03-15 11:52:04.000000000 -0400 | 20868 | --- linux-2.6.32.15/drivers/ata/pata_hpt37x.c 2010-03-15 11:52:04.000000000 -0400 |
20854 | +++ linux-2.6.32.13/drivers/ata/pata_hpt37x.c 2010-05-15 13:21:14.490951596 -0400 | 20869 | +++ linux-2.6.32.15/drivers/ata/pata_hpt37x.c 2010-05-28 21:27:15.247200461 -0400 |
20855 | @@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_ | 20870 | @@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_ |
20856 | * Configuration for HPT370 | 20871 | * Configuration for HPT370 |
20857 | */ | 20872 | */ |
@@ -20888,9 +20903,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt37x.c linux-2.6.32.13/drivers/ata | |||
20888 | .inherits = &hpt372_port_ops, | 20903 | .inherits = &hpt372_port_ops, |
20889 | .prereset = hpt374_fn1_pre_reset, | 20904 | .prereset = hpt374_fn1_pre_reset, |
20890 | }; | 20905 | }; |
20891 | diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt3x2n.c linux-2.6.32.13/drivers/ata/pata_hpt3x2n.c | 20906 | diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt3x2n.c linux-2.6.32.15/drivers/ata/pata_hpt3x2n.c |
20892 | --- linux-2.6.32.13/drivers/ata/pata_hpt3x2n.c 2010-03-15 11:52:04.000000000 -0400 | 20907 | --- linux-2.6.32.15/drivers/ata/pata_hpt3x2n.c 2010-03-15 11:52:04.000000000 -0400 |
20893 | +++ linux-2.6.32.13/drivers/ata/pata_hpt3x2n.c 2010-05-15 13:21:14.498954899 -0400 | 20908 | +++ linux-2.6.32.15/drivers/ata/pata_hpt3x2n.c 2010-05-28 21:27:15.247200461 -0400 |
20894 | @@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n | 20909 | @@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n |
20895 | * Configuration for HPT3x2n. | 20910 | * Configuration for HPT3x2n. |
20896 | */ | 20911 | */ |
@@ -20900,9 +20915,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt3x2n.c linux-2.6.32.13/drivers/at | |||
20900 | .inherits = &ata_bmdma_port_ops, | 20915 | .inherits = &ata_bmdma_port_ops, |
20901 | 20916 | ||
20902 | .bmdma_stop = hpt3x2n_bmdma_stop, | 20917 | .bmdma_stop = hpt3x2n_bmdma_stop, |
20903 | diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt3x3.c linux-2.6.32.13/drivers/ata/pata_hpt3x3.c | 20918 | diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt3x3.c linux-2.6.32.15/drivers/ata/pata_hpt3x3.c |
20904 | --- linux-2.6.32.13/drivers/ata/pata_hpt3x3.c 2010-03-15 11:52:04.000000000 -0400 | 20919 | --- linux-2.6.32.15/drivers/ata/pata_hpt3x3.c 2010-03-15 11:52:04.000000000 -0400 |
20905 | +++ linux-2.6.32.13/drivers/ata/pata_hpt3x3.c 2010-05-15 13:21:14.498954899 -0400 | 20920 | +++ linux-2.6.32.15/drivers/ata/pata_hpt3x3.c 2010-05-28 21:27:15.247200461 -0400 |
20906 | @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ | 20921 | @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ |
20907 | ATA_BMDMA_SHT(DRV_NAME), | 20922 | ATA_BMDMA_SHT(DRV_NAME), |
20908 | }; | 20923 | }; |
@@ -20912,9 +20927,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt3x3.c linux-2.6.32.13/drivers/ata | |||
20912 | .inherits = &ata_bmdma_port_ops, | 20927 | .inherits = &ata_bmdma_port_ops, |
20913 | .cable_detect = ata_cable_40wire, | 20928 | .cable_detect = ata_cable_40wire, |
20914 | .set_piomode = hpt3x3_set_piomode, | 20929 | .set_piomode = hpt3x3_set_piomode, |
20915 | diff -urNp linux-2.6.32.13/drivers/ata/pata_icside.c linux-2.6.32.13/drivers/ata/pata_icside.c | 20930 | diff -urNp linux-2.6.32.15/drivers/ata/pata_icside.c linux-2.6.32.15/drivers/ata/pata_icside.c |
20916 | --- linux-2.6.32.13/drivers/ata/pata_icside.c 2010-03-15 11:52:04.000000000 -0400 | 20931 | --- linux-2.6.32.15/drivers/ata/pata_icside.c 2010-03-15 11:52:04.000000000 -0400 |
20917 | +++ linux-2.6.32.13/drivers/ata/pata_icside.c 2010-05-15 13:21:14.498954899 -0400 | 20932 | +++ linux-2.6.32.15/drivers/ata/pata_icside.c 2010-05-28 21:27:15.251151122 -0400 |
20918 | @@ -319,7 +319,7 @@ static void pata_icside_postreset(struct | 20933 | @@ -319,7 +319,7 @@ static void pata_icside_postreset(struct |
20919 | } | 20934 | } |
20920 | } | 20935 | } |
@@ -20924,9 +20939,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_icside.c linux-2.6.32.13/drivers/ata | |||
20924 | .inherits = &ata_sff_port_ops, | 20939 | .inherits = &ata_sff_port_ops, |
20925 | /* no need to build any PRD tables for DMA */ | 20940 | /* no need to build any PRD tables for DMA */ |
20926 | .qc_prep = ata_noop_qc_prep, | 20941 | .qc_prep = ata_noop_qc_prep, |
20927 | diff -urNp linux-2.6.32.13/drivers/ata/pata_isapnp.c linux-2.6.32.13/drivers/ata/pata_isapnp.c | 20942 | diff -urNp linux-2.6.32.15/drivers/ata/pata_isapnp.c linux-2.6.32.15/drivers/ata/pata_isapnp.c |
20928 | --- linux-2.6.32.13/drivers/ata/pata_isapnp.c 2010-03-15 11:52:04.000000000 -0400 | 20943 | --- linux-2.6.32.15/drivers/ata/pata_isapnp.c 2010-03-15 11:52:04.000000000 -0400 |
20929 | +++ linux-2.6.32.13/drivers/ata/pata_isapnp.c 2010-05-15 13:21:14.498954899 -0400 | 20944 | +++ linux-2.6.32.15/drivers/ata/pata_isapnp.c 2010-05-28 21:27:15.251151122 -0400 |
20930 | @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ | 20945 | @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ |
20931 | ATA_PIO_SHT(DRV_NAME), | 20946 | ATA_PIO_SHT(DRV_NAME), |
20932 | }; | 20947 | }; |
@@ -20942,9 +20957,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_isapnp.c linux-2.6.32.13/drivers/ata | |||
20942 | .inherits = &ata_sff_port_ops, | 20957 | .inherits = &ata_sff_port_ops, |
20943 | .cable_detect = ata_cable_40wire, | 20958 | .cable_detect = ata_cable_40wire, |
20944 | /* No altstatus so we don't want to use the lost interrupt poll */ | 20959 | /* No altstatus so we don't want to use the lost interrupt poll */ |
20945 | diff -urNp linux-2.6.32.13/drivers/ata/pata_it8213.c linux-2.6.32.13/drivers/ata/pata_it8213.c | 20960 | diff -urNp linux-2.6.32.15/drivers/ata/pata_it8213.c linux-2.6.32.15/drivers/ata/pata_it8213.c |
20946 | --- linux-2.6.32.13/drivers/ata/pata_it8213.c 2010-03-15 11:52:04.000000000 -0400 | 20961 | --- linux-2.6.32.15/drivers/ata/pata_it8213.c 2010-03-15 11:52:04.000000000 -0400 |
20947 | +++ linux-2.6.32.13/drivers/ata/pata_it8213.c 2010-05-15 13:21:14.498954899 -0400 | 20962 | +++ linux-2.6.32.15/drivers/ata/pata_it8213.c 2010-05-28 21:27:15.251151122 -0400 |
20948 | @@ -234,7 +234,7 @@ static struct scsi_host_template it8213_ | 20963 | @@ -234,7 +234,7 @@ static struct scsi_host_template it8213_ |
20949 | }; | 20964 | }; |
20950 | 20965 | ||
@@ -20954,9 +20969,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_it8213.c linux-2.6.32.13/drivers/ata | |||
20954 | .inherits = &ata_bmdma_port_ops, | 20969 | .inherits = &ata_bmdma_port_ops, |
20955 | .cable_detect = it8213_cable_detect, | 20970 | .cable_detect = it8213_cable_detect, |
20956 | .set_piomode = it8213_set_piomode, | 20971 | .set_piomode = it8213_set_piomode, |
20957 | diff -urNp linux-2.6.32.13/drivers/ata/pata_it821x.c linux-2.6.32.13/drivers/ata/pata_it821x.c | 20972 | diff -urNp linux-2.6.32.15/drivers/ata/pata_it821x.c linux-2.6.32.15/drivers/ata/pata_it821x.c |
20958 | --- linux-2.6.32.13/drivers/ata/pata_it821x.c 2010-03-15 11:52:04.000000000 -0400 | 20973 | --- linux-2.6.32.15/drivers/ata/pata_it821x.c 2010-03-15 11:52:04.000000000 -0400 |
20959 | +++ linux-2.6.32.13/drivers/ata/pata_it821x.c 2010-05-15 13:21:14.498954899 -0400 | 20974 | +++ linux-2.6.32.15/drivers/ata/pata_it821x.c 2010-05-28 21:27:15.251151122 -0400 |
20960 | @@ -800,7 +800,7 @@ static struct scsi_host_template it821x_ | 20975 | @@ -800,7 +800,7 @@ static struct scsi_host_template it821x_ |
20961 | ATA_BMDMA_SHT(DRV_NAME), | 20976 | ATA_BMDMA_SHT(DRV_NAME), |
20962 | }; | 20977 | }; |
@@ -20984,9 +20999,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_it821x.c linux-2.6.32.13/drivers/ata | |||
20984 | .inherits = &ata_bmdma_port_ops, | 20999 | .inherits = &ata_bmdma_port_ops, |
20985 | 21000 | ||
20986 | .check_atapi_dma= it821x_check_atapi_dma, | 21001 | .check_atapi_dma= it821x_check_atapi_dma, |
20987 | diff -urNp linux-2.6.32.13/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.13/drivers/ata/pata_ixp4xx_cf.c | 21002 | diff -urNp linux-2.6.32.15/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.15/drivers/ata/pata_ixp4xx_cf.c |
20988 | --- linux-2.6.32.13/drivers/ata/pata_ixp4xx_cf.c 2010-03-15 11:52:04.000000000 -0400 | 21003 | --- linux-2.6.32.15/drivers/ata/pata_ixp4xx_cf.c 2010-03-15 11:52:04.000000000 -0400 |
20989 | +++ linux-2.6.32.13/drivers/ata/pata_ixp4xx_cf.c 2010-05-15 13:21:14.498954899 -0400 | 21004 | +++ linux-2.6.32.15/drivers/ata/pata_ixp4xx_cf.c 2010-05-28 21:27:15.251151122 -0400 |
20990 | @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ | 21005 | @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ |
20991 | ATA_PIO_SHT(DRV_NAME), | 21006 | ATA_PIO_SHT(DRV_NAME), |
20992 | }; | 21007 | }; |
@@ -20996,9 +21011,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.13/drivers/ | |||
20996 | .inherits = &ata_sff_port_ops, | 21011 | .inherits = &ata_sff_port_ops, |
20997 | .sff_data_xfer = ixp4xx_mmio_data_xfer, | 21012 | .sff_data_xfer = ixp4xx_mmio_data_xfer, |
20998 | .cable_detect = ata_cable_40wire, | 21013 | .cable_detect = ata_cable_40wire, |
20999 | diff -urNp linux-2.6.32.13/drivers/ata/pata_jmicron.c linux-2.6.32.13/drivers/ata/pata_jmicron.c | 21014 | diff -urNp linux-2.6.32.15/drivers/ata/pata_jmicron.c linux-2.6.32.15/drivers/ata/pata_jmicron.c |
21000 | --- linux-2.6.32.13/drivers/ata/pata_jmicron.c 2010-03-15 11:52:04.000000000 -0400 | 21015 | --- linux-2.6.32.15/drivers/ata/pata_jmicron.c 2010-03-15 11:52:04.000000000 -0400 |
21001 | +++ linux-2.6.32.13/drivers/ata/pata_jmicron.c 2010-05-15 13:21:14.502920623 -0400 | 21016 | +++ linux-2.6.32.15/drivers/ata/pata_jmicron.c 2010-05-28 21:27:15.251151122 -0400 |
21002 | @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron | 21017 | @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron |
21003 | ATA_BMDMA_SHT(DRV_NAME), | 21018 | ATA_BMDMA_SHT(DRV_NAME), |
21004 | }; | 21019 | }; |
@@ -21008,9 +21023,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_jmicron.c linux-2.6.32.13/drivers/at | |||
21008 | .inherits = &ata_bmdma_port_ops, | 21023 | .inherits = &ata_bmdma_port_ops, |
21009 | .prereset = jmicron_pre_reset, | 21024 | .prereset = jmicron_pre_reset, |
21010 | }; | 21025 | }; |
21011 | diff -urNp linux-2.6.32.13/drivers/ata/pata_legacy.c linux-2.6.32.13/drivers/ata/pata_legacy.c | 21026 | diff -urNp linux-2.6.32.15/drivers/ata/pata_legacy.c linux-2.6.32.15/drivers/ata/pata_legacy.c |
21012 | --- linux-2.6.32.13/drivers/ata/pata_legacy.c 2010-03-15 11:52:04.000000000 -0400 | 21027 | --- linux-2.6.32.15/drivers/ata/pata_legacy.c 2010-03-15 11:52:04.000000000 -0400 |
21013 | +++ linux-2.6.32.13/drivers/ata/pata_legacy.c 2010-05-15 13:21:14.502920623 -0400 | 21028 | +++ linux-2.6.32.15/drivers/ata/pata_legacy.c 2010-05-28 21:27:15.251151122 -0400 |
21014 | @@ -106,7 +106,7 @@ struct legacy_probe { | 21029 | @@ -106,7 +106,7 @@ struct legacy_probe { |
21015 | 21030 | ||
21016 | struct legacy_controller { | 21031 | struct legacy_controller { |
@@ -21122,9 +21137,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_legacy.c linux-2.6.32.13/drivers/ata | |||
21122 | struct legacy_data *ld = &legacy_data[probe->slot]; | 21137 | struct legacy_data *ld = &legacy_data[probe->slot]; |
21123 | struct ata_host *host = NULL; | 21138 | struct ata_host *host = NULL; |
21124 | struct ata_port *ap; | 21139 | struct ata_port *ap; |
21125 | diff -urNp linux-2.6.32.13/drivers/ata/pata_marvell.c linux-2.6.32.13/drivers/ata/pata_marvell.c | 21140 | diff -urNp linux-2.6.32.15/drivers/ata/pata_marvell.c linux-2.6.32.15/drivers/ata/pata_marvell.c |
21126 | --- linux-2.6.32.13/drivers/ata/pata_marvell.c 2010-03-15 11:52:04.000000000 -0400 | 21141 | --- linux-2.6.32.15/drivers/ata/pata_marvell.c 2010-03-15 11:52:04.000000000 -0400 |
21127 | +++ linux-2.6.32.13/drivers/ata/pata_marvell.c 2010-05-15 13:21:14.502920623 -0400 | 21142 | +++ linux-2.6.32.15/drivers/ata/pata_marvell.c 2010-05-28 21:27:15.251151122 -0400 |
21128 | @@ -100,7 +100,7 @@ static struct scsi_host_template marvell | 21143 | @@ -100,7 +100,7 @@ static struct scsi_host_template marvell |
21129 | ATA_BMDMA_SHT(DRV_NAME), | 21144 | ATA_BMDMA_SHT(DRV_NAME), |
21130 | }; | 21145 | }; |
@@ -21134,9 +21149,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_marvell.c linux-2.6.32.13/drivers/at | |||
21134 | .inherits = &ata_bmdma_port_ops, | 21149 | .inherits = &ata_bmdma_port_ops, |
21135 | .cable_detect = marvell_cable_detect, | 21150 | .cable_detect = marvell_cable_detect, |
21136 | .prereset = marvell_pre_reset, | 21151 | .prereset = marvell_pre_reset, |
21137 | diff -urNp linux-2.6.32.13/drivers/ata/pata_mpc52xx.c linux-2.6.32.13/drivers/ata/pata_mpc52xx.c | 21152 | diff -urNp linux-2.6.32.15/drivers/ata/pata_mpc52xx.c linux-2.6.32.15/drivers/ata/pata_mpc52xx.c |
21138 | --- linux-2.6.32.13/drivers/ata/pata_mpc52xx.c 2010-03-15 11:52:04.000000000 -0400 | 21153 | --- linux-2.6.32.15/drivers/ata/pata_mpc52xx.c 2010-03-15 11:52:04.000000000 -0400 |
21139 | +++ linux-2.6.32.13/drivers/ata/pata_mpc52xx.c 2010-05-15 13:21:14.515739682 -0400 | 21154 | +++ linux-2.6.32.15/drivers/ata/pata_mpc52xx.c 2010-05-28 21:27:15.251151122 -0400 |
21140 | @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx | 21155 | @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx |
21141 | ATA_PIO_SHT(DRV_NAME), | 21156 | ATA_PIO_SHT(DRV_NAME), |
21142 | }; | 21157 | }; |
@@ -21146,9 +21161,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_mpc52xx.c linux-2.6.32.13/drivers/at | |||
21146 | .inherits = &ata_sff_port_ops, | 21161 | .inherits = &ata_sff_port_ops, |
21147 | .sff_dev_select = mpc52xx_ata_dev_select, | 21162 | .sff_dev_select = mpc52xx_ata_dev_select, |
21148 | .set_piomode = mpc52xx_ata_set_piomode, | 21163 | .set_piomode = mpc52xx_ata_set_piomode, |
21149 | diff -urNp linux-2.6.32.13/drivers/ata/pata_mpiix.c linux-2.6.32.13/drivers/ata/pata_mpiix.c | 21164 | diff -urNp linux-2.6.32.15/drivers/ata/pata_mpiix.c linux-2.6.32.15/drivers/ata/pata_mpiix.c |
21150 | --- linux-2.6.32.13/drivers/ata/pata_mpiix.c 2010-03-15 11:52:04.000000000 -0400 | 21165 | --- linux-2.6.32.15/drivers/ata/pata_mpiix.c 2010-03-15 11:52:04.000000000 -0400 |
21151 | +++ linux-2.6.32.13/drivers/ata/pata_mpiix.c 2010-05-15 13:21:14.515739682 -0400 | 21166 | +++ linux-2.6.32.15/drivers/ata/pata_mpiix.c 2010-05-28 21:27:15.251151122 -0400 |
21152 | @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s | 21167 | @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s |
21153 | ATA_PIO_SHT(DRV_NAME), | 21168 | ATA_PIO_SHT(DRV_NAME), |
21154 | }; | 21169 | }; |
@@ -21158,9 +21173,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_mpiix.c linux-2.6.32.13/drivers/ata/ | |||
21158 | .inherits = &ata_sff_port_ops, | 21173 | .inherits = &ata_sff_port_ops, |
21159 | .qc_issue = mpiix_qc_issue, | 21174 | .qc_issue = mpiix_qc_issue, |
21160 | .cable_detect = ata_cable_40wire, | 21175 | .cable_detect = ata_cable_40wire, |
21161 | diff -urNp linux-2.6.32.13/drivers/ata/pata_netcell.c linux-2.6.32.13/drivers/ata/pata_netcell.c | 21176 | diff -urNp linux-2.6.32.15/drivers/ata/pata_netcell.c linux-2.6.32.15/drivers/ata/pata_netcell.c |
21162 | --- linux-2.6.32.13/drivers/ata/pata_netcell.c 2010-03-15 11:52:04.000000000 -0400 | 21177 | --- linux-2.6.32.15/drivers/ata/pata_netcell.c 2010-03-15 11:52:04.000000000 -0400 |
21163 | +++ linux-2.6.32.13/drivers/ata/pata_netcell.c 2010-05-15 13:21:14.515739682 -0400 | 21178 | +++ linux-2.6.32.15/drivers/ata/pata_netcell.c 2010-05-28 21:27:15.251151122 -0400 |
21164 | @@ -34,7 +34,7 @@ static struct scsi_host_template netcell | 21179 | @@ -34,7 +34,7 @@ static struct scsi_host_template netcell |
21165 | ATA_BMDMA_SHT(DRV_NAME), | 21180 | ATA_BMDMA_SHT(DRV_NAME), |
21166 | }; | 21181 | }; |
@@ -21170,9 +21185,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_netcell.c linux-2.6.32.13/drivers/at | |||
21170 | .inherits = &ata_bmdma_port_ops, | 21185 | .inherits = &ata_bmdma_port_ops, |
21171 | .cable_detect = ata_cable_80wire, | 21186 | .cable_detect = ata_cable_80wire, |
21172 | .read_id = netcell_read_id, | 21187 | .read_id = netcell_read_id, |
21173 | diff -urNp linux-2.6.32.13/drivers/ata/pata_ninja32.c linux-2.6.32.13/drivers/ata/pata_ninja32.c | 21188 | diff -urNp linux-2.6.32.15/drivers/ata/pata_ninja32.c linux-2.6.32.15/drivers/ata/pata_ninja32.c |
21174 | --- linux-2.6.32.13/drivers/ata/pata_ninja32.c 2010-03-15 11:52:04.000000000 -0400 | 21189 | --- linux-2.6.32.15/drivers/ata/pata_ninja32.c 2010-03-15 11:52:04.000000000 -0400 |
21175 | +++ linux-2.6.32.13/drivers/ata/pata_ninja32.c 2010-05-15 13:21:14.515739682 -0400 | 21190 | +++ linux-2.6.32.15/drivers/ata/pata_ninja32.c 2010-05-28 21:27:15.251151122 -0400 |
21176 | @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 | 21191 | @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 |
21177 | ATA_BMDMA_SHT(DRV_NAME), | 21192 | ATA_BMDMA_SHT(DRV_NAME), |
21178 | }; | 21193 | }; |
@@ -21182,9 +21197,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_ninja32.c linux-2.6.32.13/drivers/at | |||
21182 | .inherits = &ata_bmdma_port_ops, | 21197 | .inherits = &ata_bmdma_port_ops, |
21183 | .sff_dev_select = ninja32_dev_select, | 21198 | .sff_dev_select = ninja32_dev_select, |
21184 | .cable_detect = ata_cable_40wire, | 21199 | .cable_detect = ata_cable_40wire, |
21185 | diff -urNp linux-2.6.32.13/drivers/ata/pata_ns87410.c linux-2.6.32.13/drivers/ata/pata_ns87410.c | 21200 | diff -urNp linux-2.6.32.15/drivers/ata/pata_ns87410.c linux-2.6.32.15/drivers/ata/pata_ns87410.c |
21186 | --- linux-2.6.32.13/drivers/ata/pata_ns87410.c 2010-03-15 11:52:04.000000000 -0400 | 21201 | --- linux-2.6.32.15/drivers/ata/pata_ns87410.c 2010-03-15 11:52:04.000000000 -0400 |
21187 | +++ linux-2.6.32.13/drivers/ata/pata_ns87410.c 2010-05-15 13:21:14.515739682 -0400 | 21202 | +++ linux-2.6.32.15/drivers/ata/pata_ns87410.c 2010-05-28 21:27:15.251151122 -0400 |
21188 | @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 | 21203 | @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 |
21189 | ATA_PIO_SHT(DRV_NAME), | 21204 | ATA_PIO_SHT(DRV_NAME), |
21190 | }; | 21205 | }; |
@@ -21194,9 +21209,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_ns87410.c linux-2.6.32.13/drivers/at | |||
21194 | .inherits = &ata_sff_port_ops, | 21209 | .inherits = &ata_sff_port_ops, |
21195 | .qc_issue = ns87410_qc_issue, | 21210 | .qc_issue = ns87410_qc_issue, |
21196 | .cable_detect = ata_cable_40wire, | 21211 | .cable_detect = ata_cable_40wire, |
21197 | diff -urNp linux-2.6.32.13/drivers/ata/pata_ns87415.c linux-2.6.32.13/drivers/ata/pata_ns87415.c | 21212 | diff -urNp linux-2.6.32.15/drivers/ata/pata_ns87415.c linux-2.6.32.15/drivers/ata/pata_ns87415.c |
21198 | --- linux-2.6.32.13/drivers/ata/pata_ns87415.c 2010-03-15 11:52:04.000000000 -0400 | 21213 | --- linux-2.6.32.15/drivers/ata/pata_ns87415.c 2010-03-15 11:52:04.000000000 -0400 |
21199 | +++ linux-2.6.32.13/drivers/ata/pata_ns87415.c 2010-05-15 13:21:14.515739682 -0400 | 21214 | +++ linux-2.6.32.15/drivers/ata/pata_ns87415.c 2010-05-28 21:27:15.251151122 -0400 |
21200 | @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at | 21215 | @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at |
21201 | } | 21216 | } |
21202 | #endif /* 87560 SuperIO Support */ | 21217 | #endif /* 87560 SuperIO Support */ |
@@ -21215,9 +21230,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_ns87415.c linux-2.6.32.13/drivers/at | |||
21215 | .inherits = &ns87415_pata_ops, | 21230 | .inherits = &ns87415_pata_ops, |
21216 | .sff_tf_read = ns87560_tf_read, | 21231 | .sff_tf_read = ns87560_tf_read, |
21217 | .sff_check_status = ns87560_check_status, | 21232 | .sff_check_status = ns87560_check_status, |
21218 | diff -urNp linux-2.6.32.13/drivers/ata/pata_octeon_cf.c linux-2.6.32.13/drivers/ata/pata_octeon_cf.c | 21233 | diff -urNp linux-2.6.32.15/drivers/ata/pata_octeon_cf.c linux-2.6.32.15/drivers/ata/pata_octeon_cf.c |
21219 | --- linux-2.6.32.13/drivers/ata/pata_octeon_cf.c 2010-03-15 11:52:04.000000000 -0400 | 21234 | --- linux-2.6.32.15/drivers/ata/pata_octeon_cf.c 2010-03-15 11:52:04.000000000 -0400 |
21220 | +++ linux-2.6.32.13/drivers/ata/pata_octeon_cf.c 2010-05-15 13:21:14.515739682 -0400 | 21235 | +++ linux-2.6.32.15/drivers/ata/pata_octeon_cf.c 2010-05-28 21:27:15.251151122 -0400 |
21221 | @@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s | 21236 | @@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s |
21222 | return 0; | 21237 | return 0; |
21223 | } | 21238 | } |
@@ -21226,9 +21241,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_octeon_cf.c linux-2.6.32.13/drivers/ | |||
21226 | static struct ata_port_operations octeon_cf_ops = { | 21241 | static struct ata_port_operations octeon_cf_ops = { |
21227 | .inherits = &ata_sff_port_ops, | 21242 | .inherits = &ata_sff_port_ops, |
21228 | .check_atapi_dma = octeon_cf_check_atapi_dma, | 21243 | .check_atapi_dma = octeon_cf_check_atapi_dma, |
21229 | diff -urNp linux-2.6.32.13/drivers/ata/pata_oldpiix.c linux-2.6.32.13/drivers/ata/pata_oldpiix.c | 21244 | diff -urNp linux-2.6.32.15/drivers/ata/pata_oldpiix.c linux-2.6.32.15/drivers/ata/pata_oldpiix.c |
21230 | --- linux-2.6.32.13/drivers/ata/pata_oldpiix.c 2010-03-15 11:52:04.000000000 -0400 | 21245 | --- linux-2.6.32.15/drivers/ata/pata_oldpiix.c 2010-03-15 11:52:04.000000000 -0400 |
21231 | +++ linux-2.6.32.13/drivers/ata/pata_oldpiix.c 2010-05-15 13:21:14.515739682 -0400 | 21246 | +++ linux-2.6.32.15/drivers/ata/pata_oldpiix.c 2010-05-28 21:27:15.251151122 -0400 |
21232 | @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix | 21247 | @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix |
21233 | ATA_BMDMA_SHT(DRV_NAME), | 21248 | ATA_BMDMA_SHT(DRV_NAME), |
21234 | }; | 21249 | }; |
@@ -21238,9 +21253,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_oldpiix.c linux-2.6.32.13/drivers/at | |||
21238 | .inherits = &ata_bmdma_port_ops, | 21253 | .inherits = &ata_bmdma_port_ops, |
21239 | .qc_issue = oldpiix_qc_issue, | 21254 | .qc_issue = oldpiix_qc_issue, |
21240 | .cable_detect = ata_cable_40wire, | 21255 | .cable_detect = ata_cable_40wire, |
21241 | diff -urNp linux-2.6.32.13/drivers/ata/pata_opti.c linux-2.6.32.13/drivers/ata/pata_opti.c | 21256 | diff -urNp linux-2.6.32.15/drivers/ata/pata_opti.c linux-2.6.32.15/drivers/ata/pata_opti.c |
21242 | --- linux-2.6.32.13/drivers/ata/pata_opti.c 2010-03-15 11:52:04.000000000 -0400 | 21257 | --- linux-2.6.32.15/drivers/ata/pata_opti.c 2010-03-15 11:52:04.000000000 -0400 |
21243 | +++ linux-2.6.32.13/drivers/ata/pata_opti.c 2010-05-15 13:21:14.515739682 -0400 | 21258 | +++ linux-2.6.32.15/drivers/ata/pata_opti.c 2010-05-28 21:27:15.263188611 -0400 |
21244 | @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh | 21259 | @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh |
21245 | ATA_PIO_SHT(DRV_NAME), | 21260 | ATA_PIO_SHT(DRV_NAME), |
21246 | }; | 21261 | }; |
@@ -21250,9 +21265,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_opti.c linux-2.6.32.13/drivers/ata/p | |||
21250 | .inherits = &ata_sff_port_ops, | 21265 | .inherits = &ata_sff_port_ops, |
21251 | .cable_detect = ata_cable_40wire, | 21266 | .cable_detect = ata_cable_40wire, |
21252 | .set_piomode = opti_set_piomode, | 21267 | .set_piomode = opti_set_piomode, |
21253 | diff -urNp linux-2.6.32.13/drivers/ata/pata_optidma.c linux-2.6.32.13/drivers/ata/pata_optidma.c | 21268 | diff -urNp linux-2.6.32.15/drivers/ata/pata_optidma.c linux-2.6.32.15/drivers/ata/pata_optidma.c |
21254 | --- linux-2.6.32.13/drivers/ata/pata_optidma.c 2010-03-15 11:52:04.000000000 -0400 | 21269 | --- linux-2.6.32.15/drivers/ata/pata_optidma.c 2010-03-15 11:52:04.000000000 -0400 |
21255 | +++ linux-2.6.32.13/drivers/ata/pata_optidma.c 2010-05-15 13:21:14.518593102 -0400 | 21270 | +++ linux-2.6.32.15/drivers/ata/pata_optidma.c 2010-05-28 21:27:15.263188611 -0400 |
21256 | @@ -337,7 +337,7 @@ static struct scsi_host_template optidma | 21271 | @@ -337,7 +337,7 @@ static struct scsi_host_template optidma |
21257 | ATA_BMDMA_SHT(DRV_NAME), | 21272 | ATA_BMDMA_SHT(DRV_NAME), |
21258 | }; | 21273 | }; |
@@ -21271,9 +21286,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_optidma.c linux-2.6.32.13/drivers/at | |||
21271 | .inherits = &optidma_port_ops, | 21286 | .inherits = &optidma_port_ops, |
21272 | .set_piomode = optiplus_set_pio_mode, | 21287 | .set_piomode = optiplus_set_pio_mode, |
21273 | .set_dmamode = optiplus_set_dma_mode, | 21288 | .set_dmamode = optiplus_set_dma_mode, |
21274 | diff -urNp linux-2.6.32.13/drivers/ata/pata_palmld.c linux-2.6.32.13/drivers/ata/pata_palmld.c | 21289 | diff -urNp linux-2.6.32.15/drivers/ata/pata_palmld.c linux-2.6.32.15/drivers/ata/pata_palmld.c |
21275 | --- linux-2.6.32.13/drivers/ata/pata_palmld.c 2010-03-15 11:52:04.000000000 -0400 | 21290 | --- linux-2.6.32.15/drivers/ata/pata_palmld.c 2010-03-15 11:52:04.000000000 -0400 |
21276 | +++ linux-2.6.32.13/drivers/ata/pata_palmld.c 2010-05-15 13:21:14.518593102 -0400 | 21291 | +++ linux-2.6.32.15/drivers/ata/pata_palmld.c 2010-05-28 21:27:15.263188611 -0400 |
21277 | @@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ | 21292 | @@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ |
21278 | ATA_PIO_SHT(DRV_NAME), | 21293 | ATA_PIO_SHT(DRV_NAME), |
21279 | }; | 21294 | }; |
@@ -21283,9 +21298,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_palmld.c linux-2.6.32.13/drivers/ata | |||
21283 | .inherits = &ata_sff_port_ops, | 21298 | .inherits = &ata_sff_port_ops, |
21284 | .sff_data_xfer = ata_sff_data_xfer_noirq, | 21299 | .sff_data_xfer = ata_sff_data_xfer_noirq, |
21285 | .cable_detect = ata_cable_40wire, | 21300 | .cable_detect = ata_cable_40wire, |
21286 | diff -urNp linux-2.6.32.13/drivers/ata/pata_pcmcia.c linux-2.6.32.13/drivers/ata/pata_pcmcia.c | 21301 | diff -urNp linux-2.6.32.15/drivers/ata/pata_pcmcia.c linux-2.6.32.15/drivers/ata/pata_pcmcia.c |
21287 | --- linux-2.6.32.13/drivers/ata/pata_pcmcia.c 2010-03-15 11:52:04.000000000 -0400 | 21302 | --- linux-2.6.32.15/drivers/ata/pata_pcmcia.c 2010-03-15 11:52:04.000000000 -0400 |
21288 | +++ linux-2.6.32.13/drivers/ata/pata_pcmcia.c 2010-05-15 13:21:14.522920519 -0400 | 21303 | +++ linux-2.6.32.15/drivers/ata/pata_pcmcia.c 2010-05-28 21:27:15.263188611 -0400 |
21289 | @@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_ | 21304 | @@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_ |
21290 | ATA_PIO_SHT(DRV_NAME), | 21305 | ATA_PIO_SHT(DRV_NAME), |
21291 | }; | 21306 | }; |
@@ -21312,9 +21327,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_pcmcia.c linux-2.6.32.13/drivers/ata | |||
21312 | 21327 | ||
21313 | info = kzalloc(sizeof(*info), GFP_KERNEL); | 21328 | info = kzalloc(sizeof(*info), GFP_KERNEL); |
21314 | if (info == NULL) | 21329 | if (info == NULL) |
21315 | diff -urNp linux-2.6.32.13/drivers/ata/pata_pdc2027x.c linux-2.6.32.13/drivers/ata/pata_pdc2027x.c | 21330 | diff -urNp linux-2.6.32.15/drivers/ata/pata_pdc2027x.c linux-2.6.32.15/drivers/ata/pata_pdc2027x.c |
21316 | --- linux-2.6.32.13/drivers/ata/pata_pdc2027x.c 2010-03-15 11:52:04.000000000 -0400 | 21331 | --- linux-2.6.32.15/drivers/ata/pata_pdc2027x.c 2010-03-15 11:52:04.000000000 -0400 |
21317 | +++ linux-2.6.32.13/drivers/ata/pata_pdc2027x.c 2010-05-15 13:21:14.522920519 -0400 | 21332 | +++ linux-2.6.32.15/drivers/ata/pata_pdc2027x.c 2010-05-28 21:27:15.263188611 -0400 |
21318 | @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 | 21333 | @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 |
21319 | ATA_BMDMA_SHT(DRV_NAME), | 21334 | ATA_BMDMA_SHT(DRV_NAME), |
21320 | }; | 21335 | }; |
@@ -21332,9 +21347,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_pdc2027x.c linux-2.6.32.13/drivers/a | |||
21332 | .inherits = &pdc2027x_pata100_ops, | 21347 | .inherits = &pdc2027x_pata100_ops, |
21333 | .mode_filter = pdc2027x_mode_filter, | 21348 | .mode_filter = pdc2027x_mode_filter, |
21334 | .set_piomode = pdc2027x_set_piomode, | 21349 | .set_piomode = pdc2027x_set_piomode, |
21335 | diff -urNp linux-2.6.32.13/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.13/drivers/ata/pata_pdc202xx_old.c | 21350 | diff -urNp linux-2.6.32.15/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.15/drivers/ata/pata_pdc202xx_old.c |
21336 | --- linux-2.6.32.13/drivers/ata/pata_pdc202xx_old.c 2010-03-15 11:52:04.000000000 -0400 | 21351 | --- linux-2.6.32.15/drivers/ata/pata_pdc202xx_old.c 2010-03-15 11:52:04.000000000 -0400 |
21337 | +++ linux-2.6.32.13/drivers/ata/pata_pdc202xx_old.c 2010-05-15 13:21:14.522920519 -0400 | 21352 | +++ linux-2.6.32.15/drivers/ata/pata_pdc202xx_old.c 2010-05-28 21:27:15.263188611 -0400 |
21338 | @@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x | 21353 | @@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x |
21339 | ATA_BMDMA_SHT(DRV_NAME), | 21354 | ATA_BMDMA_SHT(DRV_NAME), |
21340 | }; | 21355 | }; |
@@ -21353,9 +21368,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.13/drive | |||
21353 | .inherits = &pdc2024x_port_ops, | 21368 | .inherits = &pdc2024x_port_ops, |
21354 | 21369 | ||
21355 | .check_atapi_dma = pdc2026x_check_atapi_dma, | 21370 | .check_atapi_dma = pdc2026x_check_atapi_dma, |
21356 | diff -urNp linux-2.6.32.13/drivers/ata/pata_platform.c linux-2.6.32.13/drivers/ata/pata_platform.c | 21371 | diff -urNp linux-2.6.32.15/drivers/ata/pata_platform.c linux-2.6.32.15/drivers/ata/pata_platform.c |
21357 | --- linux-2.6.32.13/drivers/ata/pata_platform.c 2010-03-15 11:52:04.000000000 -0400 | 21372 | --- linux-2.6.32.15/drivers/ata/pata_platform.c 2010-03-15 11:52:04.000000000 -0400 |
21358 | +++ linux-2.6.32.13/drivers/ata/pata_platform.c 2010-05-15 13:21:14.522920519 -0400 | 21373 | +++ linux-2.6.32.15/drivers/ata/pata_platform.c 2010-05-28 21:27:15.263188611 -0400 |
21359 | @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl | 21374 | @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl |
21360 | ATA_PIO_SHT(DRV_NAME), | 21375 | ATA_PIO_SHT(DRV_NAME), |
21361 | }; | 21376 | }; |
@@ -21365,9 +21380,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_platform.c linux-2.6.32.13/drivers/a | |||
21365 | .inherits = &ata_sff_port_ops, | 21380 | .inherits = &ata_sff_port_ops, |
21366 | .sff_data_xfer = ata_sff_data_xfer_noirq, | 21381 | .sff_data_xfer = ata_sff_data_xfer_noirq, |
21367 | .cable_detect = ata_cable_unknown, | 21382 | .cable_detect = ata_cable_unknown, |
21368 | diff -urNp linux-2.6.32.13/drivers/ata/pata_qdi.c linux-2.6.32.13/drivers/ata/pata_qdi.c | 21383 | diff -urNp linux-2.6.32.15/drivers/ata/pata_qdi.c linux-2.6.32.15/drivers/ata/pata_qdi.c |
21369 | --- linux-2.6.32.13/drivers/ata/pata_qdi.c 2010-03-15 11:52:04.000000000 -0400 | 21384 | --- linux-2.6.32.15/drivers/ata/pata_qdi.c 2010-03-15 11:52:04.000000000 -0400 |
21370 | +++ linux-2.6.32.13/drivers/ata/pata_qdi.c 2010-05-15 13:21:14.526754945 -0400 | 21385 | +++ linux-2.6.32.15/drivers/ata/pata_qdi.c 2010-05-28 21:27:15.263188611 -0400 |
21371 | @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht | 21386 | @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht |
21372 | ATA_PIO_SHT(DRV_NAME), | 21387 | ATA_PIO_SHT(DRV_NAME), |
21373 | }; | 21388 | }; |
@@ -21386,9 +21401,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_qdi.c linux-2.6.32.13/drivers/ata/pa | |||
21386 | .inherits = &qdi6500_port_ops, | 21401 | .inherits = &qdi6500_port_ops, |
21387 | .set_piomode = qdi6580_set_piomode, | 21402 | .set_piomode = qdi6580_set_piomode, |
21388 | }; | 21403 | }; |
21389 | diff -urNp linux-2.6.32.13/drivers/ata/pata_radisys.c linux-2.6.32.13/drivers/ata/pata_radisys.c | 21404 | diff -urNp linux-2.6.32.15/drivers/ata/pata_radisys.c linux-2.6.32.15/drivers/ata/pata_radisys.c |
21390 | --- linux-2.6.32.13/drivers/ata/pata_radisys.c 2010-03-15 11:52:04.000000000 -0400 | 21405 | --- linux-2.6.32.15/drivers/ata/pata_radisys.c 2010-03-15 11:52:04.000000000 -0400 |
21391 | +++ linux-2.6.32.13/drivers/ata/pata_radisys.c 2010-05-15 13:21:14.526754945 -0400 | 21406 | +++ linux-2.6.32.15/drivers/ata/pata_radisys.c 2010-05-28 21:27:15.267180677 -0400 |
21392 | @@ -187,7 +187,7 @@ static struct scsi_host_template radisys | 21407 | @@ -187,7 +187,7 @@ static struct scsi_host_template radisys |
21393 | ATA_BMDMA_SHT(DRV_NAME), | 21408 | ATA_BMDMA_SHT(DRV_NAME), |
21394 | }; | 21409 | }; |
@@ -21398,9 +21413,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_radisys.c linux-2.6.32.13/drivers/at | |||
21398 | .inherits = &ata_bmdma_port_ops, | 21413 | .inherits = &ata_bmdma_port_ops, |
21399 | .qc_issue = radisys_qc_issue, | 21414 | .qc_issue = radisys_qc_issue, |
21400 | .cable_detect = ata_cable_unknown, | 21415 | .cable_detect = ata_cable_unknown, |
21401 | diff -urNp linux-2.6.32.13/drivers/ata/pata_rb532_cf.c linux-2.6.32.13/drivers/ata/pata_rb532_cf.c | 21416 | diff -urNp linux-2.6.32.15/drivers/ata/pata_rb532_cf.c linux-2.6.32.15/drivers/ata/pata_rb532_cf.c |
21402 | --- linux-2.6.32.13/drivers/ata/pata_rb532_cf.c 2010-03-15 11:52:04.000000000 -0400 | 21417 | --- linux-2.6.32.15/drivers/ata/pata_rb532_cf.c 2010-03-15 11:52:04.000000000 -0400 |
21403 | +++ linux-2.6.32.13/drivers/ata/pata_rb532_cf.c 2010-05-15 13:21:14.526754945 -0400 | 21418 | +++ linux-2.6.32.15/drivers/ata/pata_rb532_cf.c 2010-05-28 21:27:15.267180677 -0400 |
21404 | @@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle | 21419 | @@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle |
21405 | return IRQ_HANDLED; | 21420 | return IRQ_HANDLED; |
21406 | } | 21421 | } |
@@ -21410,9 +21425,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_rb532_cf.c linux-2.6.32.13/drivers/a | |||
21410 | .inherits = &ata_sff_port_ops, | 21425 | .inherits = &ata_sff_port_ops, |
21411 | .sff_data_xfer = ata_sff_data_xfer32, | 21426 | .sff_data_xfer = ata_sff_data_xfer32, |
21412 | }; | 21427 | }; |
21413 | diff -urNp linux-2.6.32.13/drivers/ata/pata_rdc.c linux-2.6.32.13/drivers/ata/pata_rdc.c | 21428 | diff -urNp linux-2.6.32.15/drivers/ata/pata_rdc.c linux-2.6.32.15/drivers/ata/pata_rdc.c |
21414 | --- linux-2.6.32.13/drivers/ata/pata_rdc.c 2010-03-15 11:52:04.000000000 -0400 | 21429 | --- linux-2.6.32.15/drivers/ata/pata_rdc.c 2010-03-15 11:52:04.000000000 -0400 |
21415 | +++ linux-2.6.32.13/drivers/ata/pata_rdc.c 2010-05-15 13:21:14.530928469 -0400 | 21430 | +++ linux-2.6.32.15/drivers/ata/pata_rdc.c 2010-05-28 21:27:15.267180677 -0400 |
21416 | @@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p | 21431 | @@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p |
21417 | pci_write_config_byte(dev, 0x48, udma_enable); | 21432 | pci_write_config_byte(dev, 0x48, udma_enable); |
21418 | } | 21433 | } |
@@ -21422,9 +21437,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_rdc.c linux-2.6.32.13/drivers/ata/pa | |||
21422 | .inherits = &ata_bmdma32_port_ops, | 21437 | .inherits = &ata_bmdma32_port_ops, |
21423 | .cable_detect = rdc_pata_cable_detect, | 21438 | .cable_detect = rdc_pata_cable_detect, |
21424 | .set_piomode = rdc_set_piomode, | 21439 | .set_piomode = rdc_set_piomode, |
21425 | diff -urNp linux-2.6.32.13/drivers/ata/pata_rz1000.c linux-2.6.32.13/drivers/ata/pata_rz1000.c | 21440 | diff -urNp linux-2.6.32.15/drivers/ata/pata_rz1000.c linux-2.6.32.15/drivers/ata/pata_rz1000.c |
21426 | --- linux-2.6.32.13/drivers/ata/pata_rz1000.c 2010-03-15 11:52:04.000000000 -0400 | 21441 | --- linux-2.6.32.15/drivers/ata/pata_rz1000.c 2010-03-15 11:52:04.000000000 -0400 |
21427 | +++ linux-2.6.32.13/drivers/ata/pata_rz1000.c 2010-05-15 13:21:14.530928469 -0400 | 21442 | +++ linux-2.6.32.15/drivers/ata/pata_rz1000.c 2010-05-28 21:27:15.267180677 -0400 |
21428 | @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ | 21443 | @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ |
21429 | ATA_PIO_SHT(DRV_NAME), | 21444 | ATA_PIO_SHT(DRV_NAME), |
21430 | }; | 21445 | }; |
@@ -21434,9 +21449,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_rz1000.c linux-2.6.32.13/drivers/ata | |||
21434 | .inherits = &ata_sff_port_ops, | 21449 | .inherits = &ata_sff_port_ops, |
21435 | .cable_detect = ata_cable_40wire, | 21450 | .cable_detect = ata_cable_40wire, |
21436 | .set_mode = rz1000_set_mode, | 21451 | .set_mode = rz1000_set_mode, |
21437 | diff -urNp linux-2.6.32.13/drivers/ata/pata_sc1200.c linux-2.6.32.13/drivers/ata/pata_sc1200.c | 21452 | diff -urNp linux-2.6.32.15/drivers/ata/pata_sc1200.c linux-2.6.32.15/drivers/ata/pata_sc1200.c |
21438 | --- linux-2.6.32.13/drivers/ata/pata_sc1200.c 2010-03-15 11:52:04.000000000 -0400 | 21453 | --- linux-2.6.32.15/drivers/ata/pata_sc1200.c 2010-03-15 11:52:04.000000000 -0400 |
21439 | +++ linux-2.6.32.13/drivers/ata/pata_sc1200.c 2010-05-15 13:21:14.530928469 -0400 | 21454 | +++ linux-2.6.32.15/drivers/ata/pata_sc1200.c 2010-05-28 21:27:15.267180677 -0400 |
21440 | @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ | 21455 | @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ |
21441 | .sg_tablesize = LIBATA_DUMB_MAX_PRD, | 21456 | .sg_tablesize = LIBATA_DUMB_MAX_PRD, |
21442 | }; | 21457 | }; |
@@ -21446,9 +21461,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_sc1200.c linux-2.6.32.13/drivers/ata | |||
21446 | .inherits = &ata_bmdma_port_ops, | 21461 | .inherits = &ata_bmdma_port_ops, |
21447 | .qc_prep = ata_sff_dumb_qc_prep, | 21462 | .qc_prep = ata_sff_dumb_qc_prep, |
21448 | .qc_issue = sc1200_qc_issue, | 21463 | .qc_issue = sc1200_qc_issue, |
21449 | diff -urNp linux-2.6.32.13/drivers/ata/pata_scc.c linux-2.6.32.13/drivers/ata/pata_scc.c | 21464 | diff -urNp linux-2.6.32.15/drivers/ata/pata_scc.c linux-2.6.32.15/drivers/ata/pata_scc.c |
21450 | --- linux-2.6.32.13/drivers/ata/pata_scc.c 2010-03-15 11:52:04.000000000 -0400 | 21465 | --- linux-2.6.32.15/drivers/ata/pata_scc.c 2010-03-15 11:52:04.000000000 -0400 |
21451 | +++ linux-2.6.32.13/drivers/ata/pata_scc.c 2010-05-15 13:21:14.530928469 -0400 | 21466 | +++ linux-2.6.32.15/drivers/ata/pata_scc.c 2010-05-28 21:27:15.267180677 -0400 |
21452 | @@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht | 21467 | @@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht |
21453 | ATA_BMDMA_SHT(DRV_NAME), | 21468 | ATA_BMDMA_SHT(DRV_NAME), |
21454 | }; | 21469 | }; |
@@ -21458,9 +21473,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_scc.c linux-2.6.32.13/drivers/ata/pa | |||
21458 | .inherits = &ata_bmdma_port_ops, | 21473 | .inherits = &ata_bmdma_port_ops, |
21459 | 21474 | ||
21460 | .set_piomode = scc_set_piomode, | 21475 | .set_piomode = scc_set_piomode, |
21461 | diff -urNp linux-2.6.32.13/drivers/ata/pata_sch.c linux-2.6.32.13/drivers/ata/pata_sch.c | 21476 | diff -urNp linux-2.6.32.15/drivers/ata/pata_sch.c linux-2.6.32.15/drivers/ata/pata_sch.c |
21462 | --- linux-2.6.32.13/drivers/ata/pata_sch.c 2010-03-15 11:52:04.000000000 -0400 | 21477 | --- linux-2.6.32.15/drivers/ata/pata_sch.c 2010-03-15 11:52:04.000000000 -0400 |
21463 | +++ linux-2.6.32.13/drivers/ata/pata_sch.c 2010-05-15 13:21:14.534836180 -0400 | 21478 | +++ linux-2.6.32.15/drivers/ata/pata_sch.c 2010-05-28 21:27:15.267180677 -0400 |
21464 | @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht | 21479 | @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht |
21465 | ATA_BMDMA_SHT(DRV_NAME), | 21480 | ATA_BMDMA_SHT(DRV_NAME), |
21466 | }; | 21481 | }; |
@@ -21470,9 +21485,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_sch.c linux-2.6.32.13/drivers/ata/pa | |||
21470 | .inherits = &ata_bmdma_port_ops, | 21485 | .inherits = &ata_bmdma_port_ops, |
21471 | .cable_detect = ata_cable_unknown, | 21486 | .cable_detect = ata_cable_unknown, |
21472 | .set_piomode = sch_set_piomode, | 21487 | .set_piomode = sch_set_piomode, |
21473 | diff -urNp linux-2.6.32.13/drivers/ata/pata_serverworks.c linux-2.6.32.13/drivers/ata/pata_serverworks.c | 21488 | diff -urNp linux-2.6.32.15/drivers/ata/pata_serverworks.c linux-2.6.32.15/drivers/ata/pata_serverworks.c |
21474 | --- linux-2.6.32.13/drivers/ata/pata_serverworks.c 2010-03-15 11:52:04.000000000 -0400 | 21489 | --- linux-2.6.32.15/drivers/ata/pata_serverworks.c 2010-03-15 11:52:04.000000000 -0400 |
21475 | +++ linux-2.6.32.13/drivers/ata/pata_serverworks.c 2010-05-15 13:21:14.534836180 -0400 | 21490 | +++ linux-2.6.32.15/drivers/ata/pata_serverworks.c 2010-05-28 21:27:15.267180677 -0400 |
21476 | @@ -299,7 +299,7 @@ static struct scsi_host_template serverw | 21491 | @@ -299,7 +299,7 @@ static struct scsi_host_template serverw |
21477 | ATA_BMDMA_SHT(DRV_NAME), | 21492 | ATA_BMDMA_SHT(DRV_NAME), |
21478 | }; | 21493 | }; |
@@ -21491,9 +21506,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_serverworks.c linux-2.6.32.13/driver | |||
21491 | .inherits = &serverworks_osb4_port_ops, | 21506 | .inherits = &serverworks_osb4_port_ops, |
21492 | .mode_filter = serverworks_csb_filter, | 21507 | .mode_filter = serverworks_csb_filter, |
21493 | }; | 21508 | }; |
21494 | diff -urNp linux-2.6.32.13/drivers/ata/pata_sil680.c linux-2.6.32.13/drivers/ata/pata_sil680.c | 21509 | diff -urNp linux-2.6.32.15/drivers/ata/pata_sil680.c linux-2.6.32.15/drivers/ata/pata_sil680.c |
21495 | --- linux-2.6.32.13/drivers/ata/pata_sil680.c 2010-03-15 11:52:04.000000000 -0400 | 21510 | --- linux-2.6.32.15/drivers/ata/pata_sil680.c 2010-03-15 11:52:04.000000000 -0400 |
21496 | +++ linux-2.6.32.13/drivers/ata/pata_sil680.c 2010-05-15 13:21:14.538682329 -0400 | 21511 | +++ linux-2.6.32.15/drivers/ata/pata_sil680.c 2010-05-28 21:27:15.267180677 -0400 |
21497 | @@ -194,7 +194,7 @@ static struct scsi_host_template sil680_ | 21512 | @@ -194,7 +194,7 @@ static struct scsi_host_template sil680_ |
21498 | ATA_BMDMA_SHT(DRV_NAME), | 21513 | ATA_BMDMA_SHT(DRV_NAME), |
21499 | }; | 21514 | }; |
@@ -21503,9 +21518,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_sil680.c linux-2.6.32.13/drivers/ata | |||
21503 | .inherits = &ata_bmdma32_port_ops, | 21518 | .inherits = &ata_bmdma32_port_ops, |
21504 | .cable_detect = sil680_cable_detect, | 21519 | .cable_detect = sil680_cable_detect, |
21505 | .set_piomode = sil680_set_piomode, | 21520 | .set_piomode = sil680_set_piomode, |
21506 | diff -urNp linux-2.6.32.13/drivers/ata/pata_sis.c linux-2.6.32.13/drivers/ata/pata_sis.c | 21521 | diff -urNp linux-2.6.32.15/drivers/ata/pata_sis.c linux-2.6.32.15/drivers/ata/pata_sis.c |
21507 | --- linux-2.6.32.13/drivers/ata/pata_sis.c 2010-03-15 11:52:04.000000000 -0400 | 21522 | --- linux-2.6.32.15/drivers/ata/pata_sis.c 2010-03-15 11:52:04.000000000 -0400 |
21508 | +++ linux-2.6.32.13/drivers/ata/pata_sis.c 2010-05-15 13:21:14.538682329 -0400 | 21523 | +++ linux-2.6.32.15/drivers/ata/pata_sis.c 2010-05-28 21:27:15.267180677 -0400 |
21509 | @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht | 21524 | @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht |
21510 | ATA_BMDMA_SHT(DRV_NAME), | 21525 | ATA_BMDMA_SHT(DRV_NAME), |
21511 | }; | 21526 | }; |
@@ -21561,9 +21576,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_sis.c linux-2.6.32.13/drivers/ata/pa | |||
21561 | .inherits = &sis_base_ops, | 21576 | .inherits = &sis_base_ops, |
21562 | .set_piomode = sis_old_set_piomode, | 21577 | .set_piomode = sis_old_set_piomode, |
21563 | .set_dmamode = sis_old_set_dmamode, | 21578 | .set_dmamode = sis_old_set_dmamode, |
21564 | diff -urNp linux-2.6.32.13/drivers/ata/pata_sl82c105.c linux-2.6.32.13/drivers/ata/pata_sl82c105.c | 21579 | diff -urNp linux-2.6.32.15/drivers/ata/pata_sl82c105.c linux-2.6.32.15/drivers/ata/pata_sl82c105.c |
21565 | --- linux-2.6.32.13/drivers/ata/pata_sl82c105.c 2010-03-15 11:52:04.000000000 -0400 | 21580 | --- linux-2.6.32.15/drivers/ata/pata_sl82c105.c 2010-03-15 11:52:04.000000000 -0400 |
21566 | +++ linux-2.6.32.13/drivers/ata/pata_sl82c105.c 2010-05-15 13:21:14.538682329 -0400 | 21581 | +++ linux-2.6.32.15/drivers/ata/pata_sl82c105.c 2010-05-28 21:27:15.267180677 -0400 |
21567 | @@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10 | 21582 | @@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10 |
21568 | ATA_BMDMA_SHT(DRV_NAME), | 21583 | ATA_BMDMA_SHT(DRV_NAME), |
21569 | }; | 21584 | }; |
@@ -21573,9 +21588,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_sl82c105.c linux-2.6.32.13/drivers/a | |||
21573 | .inherits = &ata_bmdma_port_ops, | 21588 | .inherits = &ata_bmdma_port_ops, |
21574 | .qc_defer = sl82c105_qc_defer, | 21589 | .qc_defer = sl82c105_qc_defer, |
21575 | .bmdma_start = sl82c105_bmdma_start, | 21590 | .bmdma_start = sl82c105_bmdma_start, |
21576 | diff -urNp linux-2.6.32.13/drivers/ata/pata_triflex.c linux-2.6.32.13/drivers/ata/pata_triflex.c | 21591 | diff -urNp linux-2.6.32.15/drivers/ata/pata_triflex.c linux-2.6.32.15/drivers/ata/pata_triflex.c |
21577 | --- linux-2.6.32.13/drivers/ata/pata_triflex.c 2010-03-15 11:52:04.000000000 -0400 | 21592 | --- linux-2.6.32.15/drivers/ata/pata_triflex.c 2010-03-15 11:52:04.000000000 -0400 |
21578 | +++ linux-2.6.32.13/drivers/ata/pata_triflex.c 2010-05-15 13:21:14.538682329 -0400 | 21593 | +++ linux-2.6.32.15/drivers/ata/pata_triflex.c 2010-05-28 21:27:15.267180677 -0400 |
21579 | @@ -178,7 +178,7 @@ static struct scsi_host_template triflex | 21594 | @@ -178,7 +178,7 @@ static struct scsi_host_template triflex |
21580 | ATA_BMDMA_SHT(DRV_NAME), | 21595 | ATA_BMDMA_SHT(DRV_NAME), |
21581 | }; | 21596 | }; |
@@ -21585,9 +21600,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_triflex.c linux-2.6.32.13/drivers/at | |||
21585 | .inherits = &ata_bmdma_port_ops, | 21600 | .inherits = &ata_bmdma_port_ops, |
21586 | .bmdma_start = triflex_bmdma_start, | 21601 | .bmdma_start = triflex_bmdma_start, |
21587 | .bmdma_stop = triflex_bmdma_stop, | 21602 | .bmdma_stop = triflex_bmdma_stop, |
21588 | diff -urNp linux-2.6.32.13/drivers/ata/pata_via.c linux-2.6.32.13/drivers/ata/pata_via.c | 21603 | diff -urNp linux-2.6.32.15/drivers/ata/pata_via.c linux-2.6.32.15/drivers/ata/pata_via.c |
21589 | --- linux-2.6.32.13/drivers/ata/pata_via.c 2010-04-29 17:49:37.709698369 -0400 | 21604 | --- linux-2.6.32.15/drivers/ata/pata_via.c 2010-04-29 17:49:37.709698369 -0400 |
21590 | +++ linux-2.6.32.13/drivers/ata/pata_via.c 2010-05-15 13:21:14.538682329 -0400 | 21605 | +++ linux-2.6.32.15/drivers/ata/pata_via.c 2010-05-28 21:27:15.267180677 -0400 |
21591 | @@ -419,7 +419,7 @@ static struct scsi_host_template via_sht | 21606 | @@ -419,7 +419,7 @@ static struct scsi_host_template via_sht |
21592 | ATA_BMDMA_SHT(DRV_NAME), | 21607 | ATA_BMDMA_SHT(DRV_NAME), |
21593 | }; | 21608 | }; |
@@ -21606,9 +21621,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_via.c linux-2.6.32.13/drivers/ata/pa | |||
21606 | .inherits = &via_port_ops, | 21621 | .inherits = &via_port_ops, |
21607 | .sff_data_xfer = ata_sff_data_xfer_noirq, | 21622 | .sff_data_xfer = ata_sff_data_xfer_noirq, |
21608 | }; | 21623 | }; |
21609 | diff -urNp linux-2.6.32.13/drivers/ata/pata_winbond.c linux-2.6.32.13/drivers/ata/pata_winbond.c | 21624 | diff -urNp linux-2.6.32.15/drivers/ata/pata_winbond.c linux-2.6.32.15/drivers/ata/pata_winbond.c |
21610 | --- linux-2.6.32.13/drivers/ata/pata_winbond.c 2010-03-15 11:52:04.000000000 -0400 | 21625 | --- linux-2.6.32.15/drivers/ata/pata_winbond.c 2010-03-15 11:52:04.000000000 -0400 |
21611 | +++ linux-2.6.32.13/drivers/ata/pata_winbond.c 2010-05-15 13:21:14.538682329 -0400 | 21626 | +++ linux-2.6.32.15/drivers/ata/pata_winbond.c 2010-05-28 21:27:15.267180677 -0400 |
21612 | @@ -125,7 +125,7 @@ static struct scsi_host_template winbond | 21627 | @@ -125,7 +125,7 @@ static struct scsi_host_template winbond |
21613 | ATA_PIO_SHT(DRV_NAME), | 21628 | ATA_PIO_SHT(DRV_NAME), |
21614 | }; | 21629 | }; |
@@ -21618,9 +21633,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_winbond.c linux-2.6.32.13/drivers/at | |||
21618 | .inherits = &ata_sff_port_ops, | 21633 | .inherits = &ata_sff_port_ops, |
21619 | .sff_data_xfer = winbond_data_xfer, | 21634 | .sff_data_xfer = winbond_data_xfer, |
21620 | .cable_detect = ata_cable_40wire, | 21635 | .cable_detect = ata_cable_40wire, |
21621 | diff -urNp linux-2.6.32.13/drivers/ata/pdc_adma.c linux-2.6.32.13/drivers/ata/pdc_adma.c | 21636 | diff -urNp linux-2.6.32.15/drivers/ata/pdc_adma.c linux-2.6.32.15/drivers/ata/pdc_adma.c |
21622 | --- linux-2.6.32.13/drivers/ata/pdc_adma.c 2010-03-15 11:52:04.000000000 -0400 | 21637 | --- linux-2.6.32.15/drivers/ata/pdc_adma.c 2010-03-15 11:52:04.000000000 -0400 |
21623 | +++ linux-2.6.32.13/drivers/ata/pdc_adma.c 2010-05-15 13:21:14.538682329 -0400 | 21638 | +++ linux-2.6.32.15/drivers/ata/pdc_adma.c 2010-05-28 21:27:15.267180677 -0400 |
21624 | @@ -145,7 +145,7 @@ static struct scsi_host_template adma_at | 21639 | @@ -145,7 +145,7 @@ static struct scsi_host_template adma_at |
21625 | .dma_boundary = ADMA_DMA_BOUNDARY, | 21640 | .dma_boundary = ADMA_DMA_BOUNDARY, |
21626 | }; | 21641 | }; |
@@ -21630,9 +21645,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pdc_adma.c linux-2.6.32.13/drivers/ata/pd | |||
21630 | .inherits = &ata_sff_port_ops, | 21645 | .inherits = &ata_sff_port_ops, |
21631 | 21646 | ||
21632 | .lost_interrupt = ATA_OP_NULL, | 21647 | .lost_interrupt = ATA_OP_NULL, |
21633 | diff -urNp linux-2.6.32.13/drivers/ata/sata_fsl.c linux-2.6.32.13/drivers/ata/sata_fsl.c | 21648 | diff -urNp linux-2.6.32.15/drivers/ata/sata_fsl.c linux-2.6.32.15/drivers/ata/sata_fsl.c |
21634 | --- linux-2.6.32.13/drivers/ata/sata_fsl.c 2010-03-15 11:52:04.000000000 -0400 | 21649 | --- linux-2.6.32.15/drivers/ata/sata_fsl.c 2010-03-15 11:52:04.000000000 -0400 |
21635 | +++ linux-2.6.32.13/drivers/ata/sata_fsl.c 2010-05-15 13:21:14.542941562 -0400 | 21650 | +++ linux-2.6.32.15/drivers/ata/sata_fsl.c 2010-05-28 21:27:15.270965204 -0400 |
21636 | @@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs | 21651 | @@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs |
21637 | .dma_boundary = ATA_DMA_BOUNDARY, | 21652 | .dma_boundary = ATA_DMA_BOUNDARY, |
21638 | }; | 21653 | }; |
@@ -21642,9 +21657,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_fsl.c linux-2.6.32.13/drivers/ata/sa | |||
21642 | .inherits = &sata_pmp_port_ops, | 21657 | .inherits = &sata_pmp_port_ops, |
21643 | 21658 | ||
21644 | .qc_defer = ata_std_qc_defer, | 21659 | .qc_defer = ata_std_qc_defer, |
21645 | diff -urNp linux-2.6.32.13/drivers/ata/sata_inic162x.c linux-2.6.32.13/drivers/ata/sata_inic162x.c | 21660 | diff -urNp linux-2.6.32.15/drivers/ata/sata_inic162x.c linux-2.6.32.15/drivers/ata/sata_inic162x.c |
21646 | --- linux-2.6.32.13/drivers/ata/sata_inic162x.c 2010-03-15 11:52:04.000000000 -0400 | 21661 | --- linux-2.6.32.15/drivers/ata/sata_inic162x.c 2010-03-15 11:52:04.000000000 -0400 |
21647 | +++ linux-2.6.32.13/drivers/ata/sata_inic162x.c 2010-05-15 13:21:14.542941562 -0400 | 21662 | +++ linux-2.6.32.15/drivers/ata/sata_inic162x.c 2010-05-28 21:27:15.270965204 -0400 |
21648 | @@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po | 21663 | @@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po |
21649 | return 0; | 21664 | return 0; |
21650 | } | 21665 | } |
@@ -21654,9 +21669,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_inic162x.c linux-2.6.32.13/drivers/a | |||
21654 | .inherits = &sata_port_ops, | 21669 | .inherits = &sata_port_ops, |
21655 | 21670 | ||
21656 | .check_atapi_dma = inic_check_atapi_dma, | 21671 | .check_atapi_dma = inic_check_atapi_dma, |
21657 | diff -urNp linux-2.6.32.13/drivers/ata/sata_mv.c linux-2.6.32.13/drivers/ata/sata_mv.c | 21672 | diff -urNp linux-2.6.32.15/drivers/ata/sata_mv.c linux-2.6.32.15/drivers/ata/sata_mv.c |
21658 | --- linux-2.6.32.13/drivers/ata/sata_mv.c 2010-03-15 11:52:04.000000000 -0400 | 21673 | --- linux-2.6.32.15/drivers/ata/sata_mv.c 2010-03-15 11:52:04.000000000 -0400 |
21659 | +++ linux-2.6.32.13/drivers/ata/sata_mv.c 2010-05-15 13:21:14.567430978 -0400 | 21674 | +++ linux-2.6.32.15/drivers/ata/sata_mv.c 2010-05-28 21:27:15.270965204 -0400 |
21660 | @@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht | 21675 | @@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht |
21661 | .dma_boundary = MV_DMA_BOUNDARY, | 21676 | .dma_boundary = MV_DMA_BOUNDARY, |
21662 | }; | 21677 | }; |
@@ -21684,9 +21699,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_mv.c linux-2.6.32.13/drivers/ata/sat | |||
21684 | .inherits = &mv6_ops, | 21699 | .inherits = &mv6_ops, |
21685 | .dev_config = ATA_OP_NULL, | 21700 | .dev_config = ATA_OP_NULL, |
21686 | .qc_prep = mv_qc_prep_iie, | 21701 | .qc_prep = mv_qc_prep_iie, |
21687 | diff -urNp linux-2.6.32.13/drivers/ata/sata_nv.c linux-2.6.32.13/drivers/ata/sata_nv.c | 21702 | diff -urNp linux-2.6.32.15/drivers/ata/sata_nv.c linux-2.6.32.15/drivers/ata/sata_nv.c |
21688 | --- linux-2.6.32.13/drivers/ata/sata_nv.c 2010-03-15 11:52:04.000000000 -0400 | 21703 | --- linux-2.6.32.15/drivers/ata/sata_nv.c 2010-03-15 11:52:04.000000000 -0400 |
21689 | +++ linux-2.6.32.13/drivers/ata/sata_nv.c 2010-05-15 13:21:14.570612236 -0400 | 21704 | +++ linux-2.6.32.15/drivers/ata/sata_nv.c 2010-05-28 21:27:15.275100842 -0400 |
21690 | @@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc | 21705 | @@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc |
21691 | * cases. Define nv_hardreset() which only kicks in for post-boot | 21706 | * cases. Define nv_hardreset() which only kicks in for post-boot |
21692 | * probing and use it for all variants. | 21707 | * probing and use it for all variants. |
@@ -21729,9 +21744,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_nv.c linux-2.6.32.13/drivers/ata/sat | |||
21729 | .inherits = &nv_generic_ops, | 21744 | .inherits = &nv_generic_ops, |
21730 | 21745 | ||
21731 | .qc_defer = ata_std_qc_defer, | 21746 | .qc_defer = ata_std_qc_defer, |
21732 | diff -urNp linux-2.6.32.13/drivers/ata/sata_promise.c linux-2.6.32.13/drivers/ata/sata_promise.c | 21747 | diff -urNp linux-2.6.32.15/drivers/ata/sata_promise.c linux-2.6.32.15/drivers/ata/sata_promise.c |
21733 | --- linux-2.6.32.13/drivers/ata/sata_promise.c 2010-03-15 11:52:04.000000000 -0400 | 21748 | --- linux-2.6.32.15/drivers/ata/sata_promise.c 2010-03-15 11:52:04.000000000 -0400 |
21734 | +++ linux-2.6.32.13/drivers/ata/sata_promise.c 2010-05-15 13:21:14.570612236 -0400 | 21749 | +++ linux-2.6.32.15/drivers/ata/sata_promise.c 2010-05-28 21:27:15.275100842 -0400 |
21735 | @@ -195,7 +195,7 @@ static const struct ata_port_operations | 21750 | @@ -195,7 +195,7 @@ static const struct ata_port_operations |
21736 | .error_handler = pdc_error_handler, | 21751 | .error_handler = pdc_error_handler, |
21737 | }; | 21752 | }; |
@@ -21758,9 +21773,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_promise.c linux-2.6.32.13/drivers/at | |||
21758 | .inherits = &pdc_common_ops, | 21773 | .inherits = &pdc_common_ops, |
21759 | .cable_detect = pdc_pata_cable_detect, | 21774 | .cable_detect = pdc_pata_cable_detect, |
21760 | .freeze = pdc_freeze, | 21775 | .freeze = pdc_freeze, |
21761 | diff -urNp linux-2.6.32.13/drivers/ata/sata_qstor.c linux-2.6.32.13/drivers/ata/sata_qstor.c | 21776 | diff -urNp linux-2.6.32.15/drivers/ata/sata_qstor.c linux-2.6.32.15/drivers/ata/sata_qstor.c |
21762 | --- linux-2.6.32.13/drivers/ata/sata_qstor.c 2010-03-15 11:52:04.000000000 -0400 | 21777 | --- linux-2.6.32.15/drivers/ata/sata_qstor.c 2010-03-15 11:52:04.000000000 -0400 |
21763 | +++ linux-2.6.32.13/drivers/ata/sata_qstor.c 2010-05-15 13:21:14.570612236 -0400 | 21778 | +++ linux-2.6.32.15/drivers/ata/sata_qstor.c 2010-05-28 21:27:15.275100842 -0400 |
21764 | @@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_ | 21779 | @@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_ |
21765 | .dma_boundary = QS_DMA_BOUNDARY, | 21780 | .dma_boundary = QS_DMA_BOUNDARY, |
21766 | }; | 21781 | }; |
@@ -21770,9 +21785,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_qstor.c linux-2.6.32.13/drivers/ata/ | |||
21770 | .inherits = &ata_sff_port_ops, | 21785 | .inherits = &ata_sff_port_ops, |
21771 | 21786 | ||
21772 | .check_atapi_dma = qs_check_atapi_dma, | 21787 | .check_atapi_dma = qs_check_atapi_dma, |
21773 | diff -urNp linux-2.6.32.13/drivers/ata/sata_sil24.c linux-2.6.32.13/drivers/ata/sata_sil24.c | 21788 | diff -urNp linux-2.6.32.15/drivers/ata/sata_sil24.c linux-2.6.32.15/drivers/ata/sata_sil24.c |
21774 | --- linux-2.6.32.13/drivers/ata/sata_sil24.c 2010-03-15 11:52:04.000000000 -0400 | 21789 | --- linux-2.6.32.15/drivers/ata/sata_sil24.c 2010-03-15 11:52:04.000000000 -0400 |
21775 | +++ linux-2.6.32.13/drivers/ata/sata_sil24.c 2010-05-15 13:21:14.570612236 -0400 | 21790 | +++ linux-2.6.32.15/drivers/ata/sata_sil24.c 2010-05-28 21:27:15.275100842 -0400 |
21776 | @@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s | 21791 | @@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s |
21777 | .dma_boundary = ATA_DMA_BOUNDARY, | 21792 | .dma_boundary = ATA_DMA_BOUNDARY, |
21778 | }; | 21793 | }; |
@@ -21782,9 +21797,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_sil24.c linux-2.6.32.13/drivers/ata/ | |||
21782 | .inherits = &sata_pmp_port_ops, | 21797 | .inherits = &sata_pmp_port_ops, |
21783 | 21798 | ||
21784 | .qc_defer = sil24_qc_defer, | 21799 | .qc_defer = sil24_qc_defer, |
21785 | diff -urNp linux-2.6.32.13/drivers/ata/sata_sil.c linux-2.6.32.13/drivers/ata/sata_sil.c | 21800 | diff -urNp linux-2.6.32.15/drivers/ata/sata_sil.c linux-2.6.32.15/drivers/ata/sata_sil.c |
21786 | --- linux-2.6.32.13/drivers/ata/sata_sil.c 2010-03-15 11:52:04.000000000 -0400 | 21801 | --- linux-2.6.32.15/drivers/ata/sata_sil.c 2010-03-15 11:52:04.000000000 -0400 |
21787 | +++ linux-2.6.32.13/drivers/ata/sata_sil.c 2010-05-15 13:21:14.570612236 -0400 | 21802 | +++ linux-2.6.32.15/drivers/ata/sata_sil.c 2010-05-28 21:27:15.275100842 -0400 |
21788 | @@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht | 21803 | @@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht |
21789 | .sg_tablesize = ATA_MAX_PRD | 21804 | .sg_tablesize = ATA_MAX_PRD |
21790 | }; | 21805 | }; |
@@ -21794,9 +21809,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_sil.c linux-2.6.32.13/drivers/ata/sa | |||
21794 | .inherits = &ata_bmdma32_port_ops, | 21809 | .inherits = &ata_bmdma32_port_ops, |
21795 | .dev_config = sil_dev_config, | 21810 | .dev_config = sil_dev_config, |
21796 | .set_mode = sil_set_mode, | 21811 | .set_mode = sil_set_mode, |
21797 | diff -urNp linux-2.6.32.13/drivers/ata/sata_sis.c linux-2.6.32.13/drivers/ata/sata_sis.c | 21812 | diff -urNp linux-2.6.32.15/drivers/ata/sata_sis.c linux-2.6.32.15/drivers/ata/sata_sis.c |
21798 | --- linux-2.6.32.13/drivers/ata/sata_sis.c 2010-03-15 11:52:04.000000000 -0400 | 21813 | --- linux-2.6.32.15/drivers/ata/sata_sis.c 2010-03-15 11:52:04.000000000 -0400 |
21799 | +++ linux-2.6.32.13/drivers/ata/sata_sis.c 2010-05-15 13:21:14.578938263 -0400 | 21814 | +++ linux-2.6.32.15/drivers/ata/sata_sis.c 2010-05-28 21:27:15.275100842 -0400 |
21800 | @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht | 21815 | @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht |
21801 | ATA_BMDMA_SHT(DRV_NAME), | 21816 | ATA_BMDMA_SHT(DRV_NAME), |
21802 | }; | 21817 | }; |
@@ -21806,9 +21821,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_sis.c linux-2.6.32.13/drivers/ata/sa | |||
21806 | .inherits = &ata_bmdma_port_ops, | 21821 | .inherits = &ata_bmdma_port_ops, |
21807 | .scr_read = sis_scr_read, | 21822 | .scr_read = sis_scr_read, |
21808 | .scr_write = sis_scr_write, | 21823 | .scr_write = sis_scr_write, |
21809 | diff -urNp linux-2.6.32.13/drivers/ata/sata_svw.c linux-2.6.32.13/drivers/ata/sata_svw.c | 21824 | diff -urNp linux-2.6.32.15/drivers/ata/sata_svw.c linux-2.6.32.15/drivers/ata/sata_svw.c |
21810 | --- linux-2.6.32.13/drivers/ata/sata_svw.c 2010-03-15 11:52:04.000000000 -0400 | 21825 | --- linux-2.6.32.15/drivers/ata/sata_svw.c 2010-03-15 11:52:04.000000000 -0400 |
21811 | +++ linux-2.6.32.13/drivers/ata/sata_svw.c 2010-05-15 13:21:14.578938263 -0400 | 21826 | +++ linux-2.6.32.15/drivers/ata/sata_svw.c 2010-05-28 21:27:15.275100842 -0400 |
21812 | @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata | 21827 | @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata |
21813 | }; | 21828 | }; |
21814 | 21829 | ||
@@ -21818,9 +21833,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_svw.c linux-2.6.32.13/drivers/ata/sa | |||
21818 | .inherits = &ata_bmdma_port_ops, | 21833 | .inherits = &ata_bmdma_port_ops, |
21819 | .sff_tf_load = k2_sata_tf_load, | 21834 | .sff_tf_load = k2_sata_tf_load, |
21820 | .sff_tf_read = k2_sata_tf_read, | 21835 | .sff_tf_read = k2_sata_tf_read, |
21821 | diff -urNp linux-2.6.32.13/drivers/ata/sata_sx4.c linux-2.6.32.13/drivers/ata/sata_sx4.c | 21836 | diff -urNp linux-2.6.32.15/drivers/ata/sata_sx4.c linux-2.6.32.15/drivers/ata/sata_sx4.c |
21822 | --- linux-2.6.32.13/drivers/ata/sata_sx4.c 2010-03-15 11:52:04.000000000 -0400 | 21837 | --- linux-2.6.32.15/drivers/ata/sata_sx4.c 2010-03-15 11:52:04.000000000 -0400 |
21823 | +++ linux-2.6.32.13/drivers/ata/sata_sx4.c 2010-05-15 13:21:14.594941059 -0400 | 21838 | +++ linux-2.6.32.15/drivers/ata/sata_sx4.c 2010-05-28 21:27:15.275100842 -0400 |
21824 | @@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat | 21839 | @@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat |
21825 | }; | 21840 | }; |
21826 | 21841 | ||
@@ -21830,9 +21845,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_sx4.c linux-2.6.32.13/drivers/ata/sa | |||
21830 | .inherits = &ata_sff_port_ops, | 21845 | .inherits = &ata_sff_port_ops, |
21831 | 21846 | ||
21832 | .check_atapi_dma = pdc_check_atapi_dma, | 21847 | .check_atapi_dma = pdc_check_atapi_dma, |
21833 | diff -urNp linux-2.6.32.13/drivers/ata/sata_uli.c linux-2.6.32.13/drivers/ata/sata_uli.c | 21848 | diff -urNp linux-2.6.32.15/drivers/ata/sata_uli.c linux-2.6.32.15/drivers/ata/sata_uli.c |
21834 | --- linux-2.6.32.13/drivers/ata/sata_uli.c 2010-03-15 11:52:04.000000000 -0400 | 21849 | --- linux-2.6.32.15/drivers/ata/sata_uli.c 2010-03-15 11:52:04.000000000 -0400 |
21835 | +++ linux-2.6.32.13/drivers/ata/sata_uli.c 2010-05-15 13:21:14.594941059 -0400 | 21850 | +++ linux-2.6.32.15/drivers/ata/sata_uli.c 2010-05-28 21:27:15.275100842 -0400 |
21836 | @@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht | 21851 | @@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht |
21837 | ATA_BMDMA_SHT(DRV_NAME), | 21852 | ATA_BMDMA_SHT(DRV_NAME), |
21838 | }; | 21853 | }; |
@@ -21842,9 +21857,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_uli.c linux-2.6.32.13/drivers/ata/sa | |||
21842 | .inherits = &ata_bmdma_port_ops, | 21857 | .inherits = &ata_bmdma_port_ops, |
21843 | .scr_read = uli_scr_read, | 21858 | .scr_read = uli_scr_read, |
21844 | .scr_write = uli_scr_write, | 21859 | .scr_write = uli_scr_write, |
21845 | diff -urNp linux-2.6.32.13/drivers/ata/sata_via.c linux-2.6.32.13/drivers/ata/sata_via.c | 21860 | diff -urNp linux-2.6.32.15/drivers/ata/sata_via.c linux-2.6.32.15/drivers/ata/sata_via.c |
21846 | --- linux-2.6.32.13/drivers/ata/sata_via.c 2010-03-15 11:52:04.000000000 -0400 | 21861 | --- linux-2.6.32.15/drivers/ata/sata_via.c 2010-03-15 11:52:04.000000000 -0400 |
21847 | +++ linux-2.6.32.13/drivers/ata/sata_via.c 2010-05-15 13:21:14.599908388 -0400 | 21862 | +++ linux-2.6.32.15/drivers/ata/sata_via.c 2010-05-28 21:27:15.275100842 -0400 |
21848 | @@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh | 21863 | @@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh |
21849 | ATA_BMDMA_SHT(DRV_NAME), | 21864 | ATA_BMDMA_SHT(DRV_NAME), |
21850 | }; | 21865 | }; |
@@ -21882,9 +21897,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_via.c linux-2.6.32.13/drivers/ata/sa | |||
21882 | .inherits = &svia_base_ops, | 21897 | .inherits = &svia_base_ops, |
21883 | .hardreset = sata_std_hardreset, | 21898 | .hardreset = sata_std_hardreset, |
21884 | .scr_read = vt8251_scr_read, | 21899 | .scr_read = vt8251_scr_read, |
21885 | diff -urNp linux-2.6.32.13/drivers/ata/sata_vsc.c linux-2.6.32.13/drivers/ata/sata_vsc.c | 21900 | diff -urNp linux-2.6.32.15/drivers/ata/sata_vsc.c linux-2.6.32.15/drivers/ata/sata_vsc.c |
21886 | --- linux-2.6.32.13/drivers/ata/sata_vsc.c 2010-03-15 11:52:04.000000000 -0400 | 21901 | --- linux-2.6.32.15/drivers/ata/sata_vsc.c 2010-03-15 11:52:04.000000000 -0400 |
21887 | +++ linux-2.6.32.13/drivers/ata/sata_vsc.c 2010-05-15 13:21:14.606569540 -0400 | 21902 | +++ linux-2.6.32.15/drivers/ata/sata_vsc.c 2010-05-28 21:27:15.275100842 -0400 |
21888 | @@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat | 21903 | @@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat |
21889 | }; | 21904 | }; |
21890 | 21905 | ||
@@ -21894,9 +21909,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_vsc.c linux-2.6.32.13/drivers/ata/sa | |||
21894 | .inherits = &ata_bmdma_port_ops, | 21909 | .inherits = &ata_bmdma_port_ops, |
21895 | /* The IRQ handling is not quite standard SFF behaviour so we | 21910 | /* The IRQ handling is not quite standard SFF behaviour so we |
21896 | cannot use the default lost interrupt handler */ | 21911 | cannot use the default lost interrupt handler */ |
21897 | diff -urNp linux-2.6.32.13/drivers/atm/adummy.c linux-2.6.32.13/drivers/atm/adummy.c | 21912 | diff -urNp linux-2.6.32.15/drivers/atm/adummy.c linux-2.6.32.15/drivers/atm/adummy.c |
21898 | --- linux-2.6.32.13/drivers/atm/adummy.c 2010-03-15 11:52:04.000000000 -0400 | 21913 | --- linux-2.6.32.15/drivers/atm/adummy.c 2010-03-15 11:52:04.000000000 -0400 |
21899 | +++ linux-2.6.32.13/drivers/atm/adummy.c 2010-05-15 13:21:14.606569540 -0400 | 21914 | +++ linux-2.6.32.15/drivers/atm/adummy.c 2010-05-28 21:27:15.275100842 -0400 |
21900 | @@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct | 21915 | @@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct |
21901 | vcc->pop(vcc, skb); | 21916 | vcc->pop(vcc, skb); |
21902 | else | 21917 | else |
@@ -21906,9 +21921,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/adummy.c linux-2.6.32.13/drivers/atm/adum | |||
21906 | 21921 | ||
21907 | return 0; | 21922 | return 0; |
21908 | } | 21923 | } |
21909 | diff -urNp linux-2.6.32.13/drivers/atm/ambassador.c linux-2.6.32.13/drivers/atm/ambassador.c | 21924 | diff -urNp linux-2.6.32.15/drivers/atm/ambassador.c linux-2.6.32.15/drivers/atm/ambassador.c |
21910 | --- linux-2.6.32.13/drivers/atm/ambassador.c 2010-03-15 11:52:04.000000000 -0400 | 21925 | --- linux-2.6.32.15/drivers/atm/ambassador.c 2010-03-15 11:52:04.000000000 -0400 |
21911 | +++ linux-2.6.32.13/drivers/atm/ambassador.c 2010-05-15 13:21:14.622930740 -0400 | 21926 | +++ linux-2.6.32.15/drivers/atm/ambassador.c 2010-05-28 21:27:15.283225651 -0400 |
21912 | @@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, | 21927 | @@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, |
21913 | PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); | 21928 | PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); |
21914 | 21929 | ||
@@ -21945,9 +21960,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/ambassador.c linux-2.6.32.13/drivers/atm/ | |||
21945 | return -ENOMEM; // ? | 21960 | return -ENOMEM; // ? |
21946 | } | 21961 | } |
21947 | 21962 | ||
21948 | diff -urNp linux-2.6.32.13/drivers/atm/atmtcp.c linux-2.6.32.13/drivers/atm/atmtcp.c | 21963 | diff -urNp linux-2.6.32.15/drivers/atm/atmtcp.c linux-2.6.32.15/drivers/atm/atmtcp.c |
21949 | --- linux-2.6.32.13/drivers/atm/atmtcp.c 2010-03-15 11:52:04.000000000 -0400 | 21964 | --- linux-2.6.32.15/drivers/atm/atmtcp.c 2010-03-15 11:52:04.000000000 -0400 |
21950 | +++ linux-2.6.32.13/drivers/atm/atmtcp.c 2010-05-15 13:21:14.626657707 -0400 | 21965 | +++ linux-2.6.32.15/drivers/atm/atmtcp.c 2010-05-28 21:27:15.287736634 -0400 |
21951 | @@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc | 21966 | @@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc |
21952 | if (vcc->pop) vcc->pop(vcc,skb); | 21967 | if (vcc->pop) vcc->pop(vcc,skb); |
21953 | else dev_kfree_skb(skb); | 21968 | else dev_kfree_skb(skb); |
@@ -21997,9 +22012,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/atmtcp.c linux-2.6.32.13/drivers/atm/atmt | |||
21997 | done: | 22012 | done: |
21998 | if (vcc->pop) vcc->pop(vcc,skb); | 22013 | if (vcc->pop) vcc->pop(vcc,skb); |
21999 | else dev_kfree_skb(skb); | 22014 | else dev_kfree_skb(skb); |
22000 | diff -urNp linux-2.6.32.13/drivers/atm/eni.c linux-2.6.32.13/drivers/atm/eni.c | 22015 | diff -urNp linux-2.6.32.15/drivers/atm/eni.c linux-2.6.32.15/drivers/atm/eni.c |
22001 | --- linux-2.6.32.13/drivers/atm/eni.c 2010-03-15 11:52:04.000000000 -0400 | 22016 | --- linux-2.6.32.15/drivers/atm/eni.c 2010-03-15 11:52:04.000000000 -0400 |
22002 | +++ linux-2.6.32.13/drivers/atm/eni.c 2010-05-15 13:21:14.634928336 -0400 | 22017 | +++ linux-2.6.32.15/drivers/atm/eni.c 2010-05-28 21:27:15.299117902 -0400 |
22003 | @@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc) | 22018 | @@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc) |
22004 | DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", | 22019 | DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", |
22005 | vcc->dev->number); | 22020 | vcc->dev->number); |
@@ -22045,9 +22060,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/eni.c linux-2.6.32.13/drivers/atm/eni.c | |||
22045 | wake_up(&eni_dev->tx_wait); | 22060 | wake_up(&eni_dev->tx_wait); |
22046 | dma_complete++; | 22061 | dma_complete++; |
22047 | } | 22062 | } |
22048 | diff -urNp linux-2.6.32.13/drivers/atm/firestream.c linux-2.6.32.13/drivers/atm/firestream.c | 22063 | diff -urNp linux-2.6.32.15/drivers/atm/firestream.c linux-2.6.32.15/drivers/atm/firestream.c |
22049 | --- linux-2.6.32.13/drivers/atm/firestream.c 2010-03-15 11:52:04.000000000 -0400 | 22064 | --- linux-2.6.32.15/drivers/atm/firestream.c 2010-03-15 11:52:04.000000000 -0400 |
22050 | +++ linux-2.6.32.13/drivers/atm/firestream.c 2010-05-15 13:21:14.647057643 -0400 | 22065 | +++ linux-2.6.32.15/drivers/atm/firestream.c 2010-05-28 21:27:15.303175631 -0400 |
22051 | @@ -748,7 +748,7 @@ static void process_txdone_queue (struct | 22066 | @@ -748,7 +748,7 @@ static void process_txdone_queue (struct |
22052 | } | 22067 | } |
22053 | } | 22068 | } |
@@ -22081,9 +22096,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/firestream.c linux-2.6.32.13/drivers/atm/ | |||
22081 | break; | 22096 | break; |
22082 | default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ | 22097 | default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ |
22083 | printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", | 22098 | printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", |
22084 | diff -urNp linux-2.6.32.13/drivers/atm/fore200e.c linux-2.6.32.13/drivers/atm/fore200e.c | 22099 | diff -urNp linux-2.6.32.15/drivers/atm/fore200e.c linux-2.6.32.15/drivers/atm/fore200e.c |
22085 | --- linux-2.6.32.13/drivers/atm/fore200e.c 2010-03-15 11:52:04.000000000 -0400 | 22100 | --- linux-2.6.32.15/drivers/atm/fore200e.c 2010-03-15 11:52:04.000000000 -0400 |
22086 | +++ linux-2.6.32.13/drivers/atm/fore200e.c 2010-05-15 13:21:14.676169638 -0400 | 22101 | +++ linux-2.6.32.15/drivers/atm/fore200e.c 2010-05-28 21:27:15.311169155 -0400 |
22087 | @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 | 22102 | @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 |
22088 | #endif | 22103 | #endif |
22089 | /* check error condition */ | 22104 | /* check error condition */ |
@@ -22140,9 +22155,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/fore200e.c linux-2.6.32.13/drivers/atm/fo | |||
22140 | 22155 | ||
22141 | fore200e->tx_sat++; | 22156 | fore200e->tx_sat++; |
22142 | DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", | 22157 | DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", |
22143 | diff -urNp linux-2.6.32.13/drivers/atm/he.c linux-2.6.32.13/drivers/atm/he.c | 22158 | diff -urNp linux-2.6.32.15/drivers/atm/he.c linux-2.6.32.15/drivers/atm/he.c |
22144 | --- linux-2.6.32.13/drivers/atm/he.c 2010-03-15 11:52:04.000000000 -0400 | 22159 | --- linux-2.6.32.15/drivers/atm/he.c 2010-03-15 11:52:04.000000000 -0400 |
22145 | +++ linux-2.6.32.13/drivers/atm/he.c 2010-05-15 13:21:14.691446990 -0400 | 22160 | +++ linux-2.6.32.15/drivers/atm/he.c 2010-05-28 21:27:15.311169155 -0400 |
22146 | @@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i | 22161 | @@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i |
22147 | 22162 | ||
22148 | if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { | 22163 | if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { |
@@ -22224,9 +22239,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/he.c linux-2.6.32.13/drivers/atm/he.c | |||
22224 | 22239 | ||
22225 | return 0; | 22240 | return 0; |
22226 | } | 22241 | } |
22227 | diff -urNp linux-2.6.32.13/drivers/atm/horizon.c linux-2.6.32.13/drivers/atm/horizon.c | 22242 | diff -urNp linux-2.6.32.15/drivers/atm/horizon.c linux-2.6.32.15/drivers/atm/horizon.c |
22228 | --- linux-2.6.32.13/drivers/atm/horizon.c 2010-03-15 11:52:04.000000000 -0400 | 22243 | --- linux-2.6.32.15/drivers/atm/horizon.c 2010-03-15 11:52:04.000000000 -0400 |
22229 | +++ linux-2.6.32.13/drivers/atm/horizon.c 2010-05-15 13:21:14.706969618 -0400 | 22244 | +++ linux-2.6.32.15/drivers/atm/horizon.c 2010-05-28 21:27:15.311169155 -0400 |
22230 | @@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, | 22245 | @@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, |
22231 | { | 22246 | { |
22232 | struct atm_vcc * vcc = ATM_SKB(skb)->vcc; | 22247 | struct atm_vcc * vcc = ATM_SKB(skb)->vcc; |
@@ -22245,9 +22260,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/horizon.c linux-2.6.32.13/drivers/atm/hor | |||
22245 | 22260 | ||
22246 | // free the skb | 22261 | // free the skb |
22247 | hrz_kfree_skb (skb); | 22262 | hrz_kfree_skb (skb); |
22248 | diff -urNp linux-2.6.32.13/drivers/atm/idt77252.c linux-2.6.32.13/drivers/atm/idt77252.c | 22263 | diff -urNp linux-2.6.32.15/drivers/atm/idt77252.c linux-2.6.32.15/drivers/atm/idt77252.c |
22249 | --- linux-2.6.32.13/drivers/atm/idt77252.c 2010-03-15 11:52:04.000000000 -0400 | 22264 | --- linux-2.6.32.15/drivers/atm/idt77252.c 2010-03-15 11:52:04.000000000 -0400 |
22250 | +++ linux-2.6.32.13/drivers/atm/idt77252.c 2010-05-15 13:21:14.706969618 -0400 | 22265 | +++ linux-2.6.32.15/drivers/atm/idt77252.c 2010-05-28 21:27:15.326952874 -0400 |
22251 | @@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str | 22266 | @@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str |
22252 | else | 22267 | else |
22253 | dev_kfree_skb(skb); | 22268 | dev_kfree_skb(skb); |
@@ -22402,9 +22417,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/idt77252.c linux-2.6.32.13/drivers/atm/id | |||
22402 | return -ENOMEM; | 22417 | return -ENOMEM; |
22403 | } | 22418 | } |
22404 | atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); | 22419 | atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); |
22405 | diff -urNp linux-2.6.32.13/drivers/atm/iphase.c linux-2.6.32.13/drivers/atm/iphase.c | 22420 | diff -urNp linux-2.6.32.15/drivers/atm/iphase.c linux-2.6.32.15/drivers/atm/iphase.c |
22406 | --- linux-2.6.32.13/drivers/atm/iphase.c 2010-03-15 11:52:04.000000000 -0400 | 22421 | --- linux-2.6.32.15/drivers/atm/iphase.c 2010-03-15 11:52:04.000000000 -0400 |
22407 | +++ linux-2.6.32.13/drivers/atm/iphase.c 2010-05-15 13:21:14.750617431 -0400 | 22422 | +++ linux-2.6.32.15/drivers/atm/iphase.c 2010-05-28 21:27:15.326952874 -0400 |
22408 | @@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev) | 22423 | @@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev) |
22409 | status = (u_short) (buf_desc_ptr->desc_mode); | 22424 | status = (u_short) (buf_desc_ptr->desc_mode); |
22410 | if (status & (RX_CER | RX_PTE | RX_OFL)) | 22425 | if (status & (RX_CER | RX_PTE | RX_OFL)) |
@@ -22501,9 +22516,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/iphase.c linux-2.6.32.13/drivers/atm/ipha | |||
22501 | if (iavcc->vc_desc_cnt > 10) { | 22516 | if (iavcc->vc_desc_cnt > 10) { |
22502 | vcc->tx_quota = vcc->tx_quota * 3 / 4; | 22517 | vcc->tx_quota = vcc->tx_quota * 3 / 4; |
22503 | printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); | 22518 | printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); |
22504 | diff -urNp linux-2.6.32.13/drivers/atm/lanai.c linux-2.6.32.13/drivers/atm/lanai.c | 22519 | diff -urNp linux-2.6.32.15/drivers/atm/lanai.c linux-2.6.32.15/drivers/atm/lanai.c |
22505 | --- linux-2.6.32.13/drivers/atm/lanai.c 2010-03-15 11:52:04.000000000 -0400 | 22520 | --- linux-2.6.32.15/drivers/atm/lanai.c 2010-03-15 11:52:04.000000000 -0400 |
22506 | +++ linux-2.6.32.13/drivers/atm/lanai.c 2010-05-15 13:21:14.750617431 -0400 | 22521 | +++ linux-2.6.32.15/drivers/atm/lanai.c 2010-05-28 21:27:15.331218290 -0400 |
22507 | @@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l | 22522 | @@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l |
22508 | vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); | 22523 | vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); |
22509 | lanai_endtx(lanai, lvcc); | 22524 | lanai_endtx(lanai, lvcc); |
@@ -22558,9 +22573,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/lanai.c linux-2.6.32.13/drivers/atm/lanai | |||
22558 | lvcc->stats.x.aal5.service_rxcrc++; | 22573 | lvcc->stats.x.aal5.service_rxcrc++; |
22559 | lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; | 22574 | lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; |
22560 | cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); | 22575 | cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); |
22561 | diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nicstar.c | 22576 | diff -urNp linux-2.6.32.15/drivers/atm/nicstar.c linux-2.6.32.15/drivers/atm/nicstar.c |
22562 | --- linux-2.6.32.13/drivers/atm/nicstar.c 2010-03-15 11:52:04.000000000 -0400 | 22577 | --- linux-2.6.32.15/drivers/atm/nicstar.c 2010-03-15 11:52:04.000000000 -0400 |
22563 | +++ linux-2.6.32.13/drivers/atm/nicstar.c 2010-05-15 13:21:14.787751803 -0400 | 22578 | +++ linux-2.6.32.15/drivers/atm/nicstar.c 2010-05-28 21:27:15.368039837 -0400 |
22564 | @@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, | 22579 | @@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, |
22565 | if ((vc = (vc_map *) vcc->dev_data) == NULL) | 22580 | if ((vc = (vc_map *) vcc->dev_data) == NULL) |
22566 | { | 22581 | { |
@@ -22763,9 +22778,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nic | |||
22763 | } | 22778 | } |
22764 | } | 22779 | } |
22765 | 22780 | ||
22766 | diff -urNp linux-2.6.32.13/drivers/atm/solos-pci.c linux-2.6.32.13/drivers/atm/solos-pci.c | 22781 | diff -urNp linux-2.6.32.15/drivers/atm/solos-pci.c linux-2.6.32.15/drivers/atm/solos-pci.c |
22767 | --- linux-2.6.32.13/drivers/atm/solos-pci.c 2010-03-15 11:52:04.000000000 -0400 | 22782 | --- linux-2.6.32.15/drivers/atm/solos-pci.c 2010-03-15 11:52:04.000000000 -0400 |
22768 | +++ linux-2.6.32.13/drivers/atm/solos-pci.c 2010-05-15 13:21:14.815606670 -0400 | 22783 | +++ linux-2.6.32.15/drivers/atm/solos-pci.c 2010-05-28 21:27:15.368039837 -0400 |
22769 | @@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg) | 22784 | @@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg) |
22770 | } | 22785 | } |
22771 | atm_charge(vcc, skb->truesize); | 22786 | atm_charge(vcc, skb->truesize); |
@@ -22784,9 +22799,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/solos-pci.c linux-2.6.32.13/drivers/atm/s | |||
22784 | solos_pop(vcc, oldskb); | 22799 | solos_pop(vcc, oldskb); |
22785 | } else | 22800 | } else |
22786 | dev_kfree_skb_irq(oldskb); | 22801 | dev_kfree_skb_irq(oldskb); |
22787 | diff -urNp linux-2.6.32.13/drivers/atm/suni.c linux-2.6.32.13/drivers/atm/suni.c | 22802 | diff -urNp linux-2.6.32.15/drivers/atm/suni.c linux-2.6.32.15/drivers/atm/suni.c |
22788 | --- linux-2.6.32.13/drivers/atm/suni.c 2010-03-15 11:52:04.000000000 -0400 | 22803 | --- linux-2.6.32.15/drivers/atm/suni.c 2010-03-15 11:52:04.000000000 -0400 |
22789 | +++ linux-2.6.32.13/drivers/atm/suni.c 2010-05-15 13:21:14.815606670 -0400 | 22804 | +++ linux-2.6.32.15/drivers/atm/suni.c 2010-05-28 21:27:15.368039837 -0400 |
22790 | @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); | 22805 | @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); |
22791 | 22806 | ||
22792 | 22807 | ||
@@ -22798,9 +22813,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/suni.c linux-2.6.32.13/drivers/atm/suni.c | |||
22798 | 22813 | ||
22799 | 22814 | ||
22800 | static void suni_hz(unsigned long from_timer) | 22815 | static void suni_hz(unsigned long from_timer) |
22801 | diff -urNp linux-2.6.32.13/drivers/atm/uPD98402.c linux-2.6.32.13/drivers/atm/uPD98402.c | 22816 | diff -urNp linux-2.6.32.15/drivers/atm/uPD98402.c linux-2.6.32.15/drivers/atm/uPD98402.c |
22802 | --- linux-2.6.32.13/drivers/atm/uPD98402.c 2010-03-15 11:52:04.000000000 -0400 | 22817 | --- linux-2.6.32.15/drivers/atm/uPD98402.c 2010-03-15 11:52:04.000000000 -0400 |
22803 | +++ linux-2.6.32.13/drivers/atm/uPD98402.c 2010-05-15 13:21:14.815606670 -0400 | 22818 | +++ linux-2.6.32.15/drivers/atm/uPD98402.c 2010-05-28 21:27:15.368039837 -0400 |
22804 | @@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d | 22819 | @@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d |
22805 | struct sonet_stats tmp; | 22820 | struct sonet_stats tmp; |
22806 | int error = 0; | 22821 | int error = 0; |
@@ -22845,9 +22860,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/uPD98402.c linux-2.6.32.13/drivers/atm/uP | |||
22845 | return 0; | 22860 | return 0; |
22846 | } | 22861 | } |
22847 | 22862 | ||
22848 | diff -urNp linux-2.6.32.13/drivers/atm/zatm.c linux-2.6.32.13/drivers/atm/zatm.c | 22863 | diff -urNp linux-2.6.32.15/drivers/atm/zatm.c linux-2.6.32.15/drivers/atm/zatm.c |
22849 | --- linux-2.6.32.13/drivers/atm/zatm.c 2010-03-15 11:52:04.000000000 -0400 | 22864 | --- linux-2.6.32.15/drivers/atm/zatm.c 2010-03-15 11:52:04.000000000 -0400 |
22850 | +++ linux-2.6.32.13/drivers/atm/zatm.c 2010-05-15 13:21:14.815606670 -0400 | 22865 | +++ linux-2.6.32.15/drivers/atm/zatm.c 2010-05-28 21:27:15.375178174 -0400 |
22851 | @@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy | 22866 | @@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy |
22852 | } | 22867 | } |
22853 | if (!size) { | 22868 | if (!size) { |
@@ -22875,9 +22890,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/zatm.c linux-2.6.32.13/drivers/atm/zatm.c | |||
22875 | wake_up(&zatm_vcc->tx_wait); | 22890 | wake_up(&zatm_vcc->tx_wait); |
22876 | } | 22891 | } |
22877 | 22892 | ||
22878 | diff -urNp linux-2.6.32.13/drivers/base/bus.c linux-2.6.32.13/drivers/base/bus.c | 22893 | diff -urNp linux-2.6.32.15/drivers/base/bus.c linux-2.6.32.15/drivers/base/bus.c |
22879 | --- linux-2.6.32.13/drivers/base/bus.c 2010-03-15 11:52:04.000000000 -0400 | 22894 | --- linux-2.6.32.15/drivers/base/bus.c 2010-03-15 11:52:04.000000000 -0400 |
22880 | +++ linux-2.6.32.13/drivers/base/bus.c 2010-05-15 13:21:14.831148567 -0400 | 22895 | +++ linux-2.6.32.15/drivers/base/bus.c 2010-05-28 21:27:15.383215309 -0400 |
22881 | @@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob | 22896 | @@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob |
22882 | return ret; | 22897 | return ret; |
22883 | } | 22898 | } |
@@ -22905,9 +22920,9 @@ diff -urNp linux-2.6.32.13/drivers/base/bus.c linux-2.6.32.13/drivers/base/bus.c | |||
22905 | .filter = bus_uevent_filter, | 22920 | .filter = bus_uevent_filter, |
22906 | }; | 22921 | }; |
22907 | 22922 | ||
22908 | diff -urNp linux-2.6.32.13/drivers/base/class.c linux-2.6.32.13/drivers/base/class.c | 22923 | diff -urNp linux-2.6.32.15/drivers/base/class.c linux-2.6.32.15/drivers/base/class.c |
22909 | --- linux-2.6.32.13/drivers/base/class.c 2010-03-15 11:52:04.000000000 -0400 | 22924 | --- linux-2.6.32.15/drivers/base/class.c 2010-03-15 11:52:04.000000000 -0400 |
22910 | +++ linux-2.6.32.13/drivers/base/class.c 2010-05-15 13:21:14.874164060 -0400 | 22925 | +++ linux-2.6.32.15/drivers/base/class.c 2010-05-28 21:27:15.383215309 -0400 |
22911 | @@ -63,7 +63,7 @@ static void class_release(struct kobject | 22926 | @@ -63,7 +63,7 @@ static void class_release(struct kobject |
22912 | kfree(cp); | 22927 | kfree(cp); |
22913 | } | 22928 | } |
@@ -22917,9 +22932,9 @@ diff -urNp linux-2.6.32.13/drivers/base/class.c linux-2.6.32.13/drivers/base/cla | |||
22917 | .show = class_attr_show, | 22932 | .show = class_attr_show, |
22918 | .store = class_attr_store, | 22933 | .store = class_attr_store, |
22919 | }; | 22934 | }; |
22920 | diff -urNp linux-2.6.32.13/drivers/base/core.c linux-2.6.32.13/drivers/base/core.c | 22935 | diff -urNp linux-2.6.32.15/drivers/base/core.c linux-2.6.32.15/drivers/base/core.c |
22921 | --- linux-2.6.32.13/drivers/base/core.c 2010-03-15 11:52:04.000000000 -0400 | 22936 | --- linux-2.6.32.15/drivers/base/core.c 2010-03-15 11:52:04.000000000 -0400 |
22922 | +++ linux-2.6.32.13/drivers/base/core.c 2010-05-15 13:21:14.878954723 -0400 | 22937 | +++ linux-2.6.32.15/drivers/base/core.c 2010-05-28 21:27:15.386909095 -0400 |
22923 | @@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob | 22938 | @@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob |
22924 | return ret; | 22939 | return ret; |
22925 | } | 22940 | } |
@@ -22938,9 +22953,9 @@ diff -urNp linux-2.6.32.13/drivers/base/core.c linux-2.6.32.13/drivers/base/core | |||
22938 | .filter = dev_uevent_filter, | 22953 | .filter = dev_uevent_filter, |
22939 | .name = dev_uevent_name, | 22954 | .name = dev_uevent_name, |
22940 | .uevent = dev_uevent, | 22955 | .uevent = dev_uevent, |
22941 | diff -urNp linux-2.6.32.13/drivers/base/memory.c linux-2.6.32.13/drivers/base/memory.c | 22956 | diff -urNp linux-2.6.32.15/drivers/base/memory.c linux-2.6.32.15/drivers/base/memory.c |
22942 | --- linux-2.6.32.13/drivers/base/memory.c 2010-03-15 11:52:04.000000000 -0400 | 22957 | --- linux-2.6.32.15/drivers/base/memory.c 2010-03-15 11:52:04.000000000 -0400 |
22943 | +++ linux-2.6.32.13/drivers/base/memory.c 2010-05-15 13:21:14.882954278 -0400 | 22958 | +++ linux-2.6.32.15/drivers/base/memory.c 2010-05-28 21:27:15.386909095 -0400 |
22944 | @@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks | 22959 | @@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks |
22945 | return retval; | 22960 | return retval; |
22946 | } | 22961 | } |
@@ -22950,9 +22965,9 @@ diff -urNp linux-2.6.32.13/drivers/base/memory.c linux-2.6.32.13/drivers/base/me | |||
22950 | .name = memory_uevent_name, | 22965 | .name = memory_uevent_name, |
22951 | .uevent = memory_uevent, | 22966 | .uevent = memory_uevent, |
22952 | }; | 22967 | }; |
22953 | diff -urNp linux-2.6.32.13/drivers/base/sys.c linux-2.6.32.13/drivers/base/sys.c | 22968 | diff -urNp linux-2.6.32.15/drivers/base/sys.c linux-2.6.32.15/drivers/base/sys.c |
22954 | --- linux-2.6.32.13/drivers/base/sys.c 2010-03-15 11:52:04.000000000 -0400 | 22969 | --- linux-2.6.32.15/drivers/base/sys.c 2010-03-15 11:52:04.000000000 -0400 |
22955 | +++ linux-2.6.32.13/drivers/base/sys.c 2010-05-15 13:21:14.890945998 -0400 | 22970 | +++ linux-2.6.32.15/drivers/base/sys.c 2010-05-28 21:27:15.395045412 -0400 |
22956 | @@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc | 22971 | @@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc |
22957 | return -EIO; | 22972 | return -EIO; |
22958 | } | 22973 | } |
@@ -22971,9 +22986,9 @@ diff -urNp linux-2.6.32.13/drivers/base/sys.c linux-2.6.32.13/drivers/base/sys.c | |||
22971 | .show = sysdev_class_show, | 22986 | .show = sysdev_class_show, |
22972 | .store = sysdev_class_store, | 22987 | .store = sysdev_class_store, |
22973 | }; | 22988 | }; |
22974 | diff -urNp linux-2.6.32.13/drivers/block/pktcdvd.c linux-2.6.32.13/drivers/block/pktcdvd.c | 22989 | diff -urNp linux-2.6.32.15/drivers/block/pktcdvd.c linux-2.6.32.15/drivers/block/pktcdvd.c |
22975 | --- linux-2.6.32.13/drivers/block/pktcdvd.c 2010-03-15 11:52:04.000000000 -0400 | 22990 | --- linux-2.6.32.15/drivers/block/pktcdvd.c 2010-03-15 11:52:04.000000000 -0400 |
22976 | +++ linux-2.6.32.13/drivers/block/pktcdvd.c 2010-05-15 13:21:14.919938646 -0400 | 22991 | +++ linux-2.6.32.15/drivers/block/pktcdvd.c 2010-05-28 21:27:15.403194679 -0400 |
22977 | @@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob | 22992 | @@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob |
22978 | return len; | 22993 | return len; |
22979 | } | 22994 | } |
@@ -22983,9 +22998,9 @@ diff -urNp linux-2.6.32.13/drivers/block/pktcdvd.c linux-2.6.32.13/drivers/block | |||
22983 | .show = kobj_pkt_show, | 22998 | .show = kobj_pkt_show, |
22984 | .store = kobj_pkt_store | 22999 | .store = kobj_pkt_store |
22985 | }; | 23000 | }; |
22986 | diff -urNp linux-2.6.32.13/drivers/char/agp/frontend.c linux-2.6.32.13/drivers/char/agp/frontend.c | 23001 | diff -urNp linux-2.6.32.15/drivers/char/agp/frontend.c linux-2.6.32.15/drivers/char/agp/frontend.c |
22987 | --- linux-2.6.32.13/drivers/char/agp/frontend.c 2010-03-15 11:52:04.000000000 -0400 | 23002 | --- linux-2.6.32.15/drivers/char/agp/frontend.c 2010-03-15 11:52:04.000000000 -0400 |
22988 | +++ linux-2.6.32.13/drivers/char/agp/frontend.c 2010-05-15 13:21:14.919938646 -0400 | 23003 | +++ linux-2.6.32.15/drivers/char/agp/frontend.c 2010-05-28 21:27:15.403194679 -0400 |
22989 | @@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag | 23004 | @@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag |
22990 | if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) | 23005 | if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) |
22991 | return -EFAULT; | 23006 | return -EFAULT; |
@@ -22995,9 +23010,9 @@ diff -urNp linux-2.6.32.13/drivers/char/agp/frontend.c linux-2.6.32.13/drivers/c | |||
22995 | return -EFAULT; | 23010 | return -EFAULT; |
22996 | 23011 | ||
22997 | client = agp_find_client_by_pid(reserve.pid); | 23012 | client = agp_find_client_by_pid(reserve.pid); |
22998 | diff -urNp linux-2.6.32.13/drivers/char/agp/intel-agp.c linux-2.6.32.13/drivers/char/agp/intel-agp.c | 23013 | diff -urNp linux-2.6.32.15/drivers/char/agp/intel-agp.c linux-2.6.32.15/drivers/char/agp/intel-agp.c |
22999 | --- linux-2.6.32.13/drivers/char/agp/intel-agp.c 2010-04-29 17:49:37.777981896 -0400 | 23014 | --- linux-2.6.32.15/drivers/char/agp/intel-agp.c 2010-04-29 17:49:37.777981896 -0400 |
23000 | +++ linux-2.6.32.13/drivers/char/agp/intel-agp.c 2010-05-15 13:21:14.919938646 -0400 | 23015 | +++ linux-2.6.32.15/drivers/char/agp/intel-agp.c 2010-05-28 21:27:15.403194679 -0400 |
23001 | @@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc | 23016 | @@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc |
23002 | ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB), | 23017 | ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB), |
23003 | ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB), | 23018 | ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB), |
@@ -23007,9 +23022,9 @@ diff -urNp linux-2.6.32.13/drivers/char/agp/intel-agp.c linux-2.6.32.13/drivers/ | |||
23007 | }; | 23022 | }; |
23008 | 23023 | ||
23009 | MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); | 23024 | MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); |
23010 | diff -urNp linux-2.6.32.13/drivers/char/hpet.c linux-2.6.32.13/drivers/char/hpet.c | 23025 | diff -urNp linux-2.6.32.15/drivers/char/hpet.c linux-2.6.32.15/drivers/char/hpet.c |
23011 | --- linux-2.6.32.13/drivers/char/hpet.c 2010-03-15 11:52:04.000000000 -0400 | 23026 | --- linux-2.6.32.15/drivers/char/hpet.c 2010-03-15 11:52:04.000000000 -0400 |
23012 | +++ linux-2.6.32.13/drivers/char/hpet.c 2010-05-15 13:21:14.922737516 -0400 | 23027 | +++ linux-2.6.32.15/drivers/char/hpet.c 2010-05-28 21:27:15.403194679 -0400 |
23013 | @@ -430,7 +430,7 @@ static int hpet_release(struct inode *in | 23028 | @@ -430,7 +430,7 @@ static int hpet_release(struct inode *in |
23014 | return 0; | 23029 | return 0; |
23015 | } | 23030 | } |
@@ -23037,9 +23052,9 @@ diff -urNp linux-2.6.32.13/drivers/char/hpet.c linux-2.6.32.13/drivers/char/hpet | |||
23037 | 23052 | ||
23038 | static int __init hpet_init(void) | 23053 | static int __init hpet_init(void) |
23039 | { | 23054 | { |
23040 | diff -urNp linux-2.6.32.13/drivers/char/hvc_beat.c linux-2.6.32.13/drivers/char/hvc_beat.c | 23055 | diff -urNp linux-2.6.32.15/drivers/char/hvc_beat.c linux-2.6.32.15/drivers/char/hvc_beat.c |
23041 | --- linux-2.6.32.13/drivers/char/hvc_beat.c 2010-03-15 11:52:04.000000000 -0400 | 23056 | --- linux-2.6.32.15/drivers/char/hvc_beat.c 2010-03-15 11:52:04.000000000 -0400 |
23042 | +++ linux-2.6.32.13/drivers/char/hvc_beat.c 2010-05-15 13:21:14.922737516 -0400 | 23057 | +++ linux-2.6.32.15/drivers/char/hvc_beat.c 2010-05-28 21:27:15.403194679 -0400 |
23043 | @@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v | 23058 | @@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v |
23044 | return cnt; | 23059 | return cnt; |
23045 | } | 23060 | } |
@@ -23049,9 +23064,9 @@ diff -urNp linux-2.6.32.13/drivers/char/hvc_beat.c linux-2.6.32.13/drivers/char/ | |||
23049 | .get_chars = hvc_beat_get_chars, | 23064 | .get_chars = hvc_beat_get_chars, |
23050 | .put_chars = hvc_beat_put_chars, | 23065 | .put_chars = hvc_beat_put_chars, |
23051 | }; | 23066 | }; |
23052 | diff -urNp linux-2.6.32.13/drivers/char/hvc_console.c linux-2.6.32.13/drivers/char/hvc_console.c | 23067 | diff -urNp linux-2.6.32.15/drivers/char/hvc_console.c linux-2.6.32.15/drivers/char/hvc_console.c |
23053 | --- linux-2.6.32.13/drivers/char/hvc_console.c 2010-03-15 11:52:04.000000000 -0400 | 23068 | --- linux-2.6.32.15/drivers/char/hvc_console.c 2010-03-15 11:52:04.000000000 -0400 |
23054 | +++ linux-2.6.32.13/drivers/char/hvc_console.c 2010-05-15 13:21:14.922737516 -0400 | 23069 | +++ linux-2.6.32.15/drivers/char/hvc_console.c 2010-05-28 21:27:15.403194679 -0400 |
23055 | @@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind | 23070 | @@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind |
23056 | * console interfaces but can still be used as a tty device. This has to be | 23071 | * console interfaces but can still be used as a tty device. This has to be |
23057 | * static because kmalloc will not work during early console init. | 23072 | * static because kmalloc will not work during early console init. |
@@ -23079,9 +23094,9 @@ diff -urNp linux-2.6.32.13/drivers/char/hvc_console.c linux-2.6.32.13/drivers/ch | |||
23079 | { | 23094 | { |
23080 | struct hvc_struct *hp; | 23095 | struct hvc_struct *hp; |
23081 | int i; | 23096 | int i; |
23082 | diff -urNp linux-2.6.32.13/drivers/char/hvc_console.h linux-2.6.32.13/drivers/char/hvc_console.h | 23097 | diff -urNp linux-2.6.32.15/drivers/char/hvc_console.h linux-2.6.32.15/drivers/char/hvc_console.h |
23083 | --- linux-2.6.32.13/drivers/char/hvc_console.h 2010-03-15 11:52:04.000000000 -0400 | 23098 | --- linux-2.6.32.15/drivers/char/hvc_console.h 2010-03-15 11:52:04.000000000 -0400 |
23084 | +++ linux-2.6.32.13/drivers/char/hvc_console.h 2010-05-15 13:21:14.922737516 -0400 | 23099 | +++ linux-2.6.32.15/drivers/char/hvc_console.h 2010-05-28 21:27:15.403194679 -0400 |
23085 | @@ -55,7 +55,7 @@ struct hvc_struct { | 23100 | @@ -55,7 +55,7 @@ struct hvc_struct { |
23086 | int outbuf_size; | 23101 | int outbuf_size; |
23087 | int n_outbuf; | 23102 | int n_outbuf; |
@@ -23105,9 +23120,9 @@ diff -urNp linux-2.6.32.13/drivers/char/hvc_console.h linux-2.6.32.13/drivers/ch | |||
23105 | /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ | 23120 | /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ |
23106 | extern int hvc_remove(struct hvc_struct *hp); | 23121 | extern int hvc_remove(struct hvc_struct *hp); |
23107 | 23122 | ||
23108 | diff -urNp linux-2.6.32.13/drivers/char/hvc_iseries.c linux-2.6.32.13/drivers/char/hvc_iseries.c | 23123 | diff -urNp linux-2.6.32.15/drivers/char/hvc_iseries.c linux-2.6.32.15/drivers/char/hvc_iseries.c |
23109 | --- linux-2.6.32.13/drivers/char/hvc_iseries.c 2010-03-15 11:52:04.000000000 -0400 | 23124 | --- linux-2.6.32.15/drivers/char/hvc_iseries.c 2010-03-15 11:52:04.000000000 -0400 |
23110 | +++ linux-2.6.32.13/drivers/char/hvc_iseries.c 2010-05-15 13:21:14.922737516 -0400 | 23125 | +++ linux-2.6.32.15/drivers/char/hvc_iseries.c 2010-05-28 21:27:15.403194679 -0400 |
23111 | @@ -197,7 +197,7 @@ done: | 23126 | @@ -197,7 +197,7 @@ done: |
23112 | return sent; | 23127 | return sent; |
23113 | } | 23128 | } |
@@ -23117,9 +23132,9 @@ diff -urNp linux-2.6.32.13/drivers/char/hvc_iseries.c linux-2.6.32.13/drivers/ch | |||
23117 | .get_chars = get_chars, | 23132 | .get_chars = get_chars, |
23118 | .put_chars = put_chars, | 23133 | .put_chars = put_chars, |
23119 | .notifier_add = notifier_add_irq, | 23134 | .notifier_add = notifier_add_irq, |
23120 | diff -urNp linux-2.6.32.13/drivers/char/hvc_iucv.c linux-2.6.32.13/drivers/char/hvc_iucv.c | 23135 | diff -urNp linux-2.6.32.15/drivers/char/hvc_iucv.c linux-2.6.32.15/drivers/char/hvc_iucv.c |
23121 | --- linux-2.6.32.13/drivers/char/hvc_iucv.c 2010-03-15 11:52:04.000000000 -0400 | 23136 | --- linux-2.6.32.15/drivers/char/hvc_iucv.c 2010-03-15 11:52:04.000000000 -0400 |
23122 | +++ linux-2.6.32.13/drivers/char/hvc_iucv.c 2010-05-15 13:21:14.922737516 -0400 | 23137 | +++ linux-2.6.32.15/drivers/char/hvc_iucv.c 2010-05-28 21:27:15.403194679 -0400 |
23123 | @@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru | 23138 | @@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru |
23124 | 23139 | ||
23125 | 23140 | ||
@@ -23129,9 +23144,9 @@ diff -urNp linux-2.6.32.13/drivers/char/hvc_iucv.c linux-2.6.32.13/drivers/char/ | |||
23129 | .get_chars = hvc_iucv_get_chars, | 23144 | .get_chars = hvc_iucv_get_chars, |
23130 | .put_chars = hvc_iucv_put_chars, | 23145 | .put_chars = hvc_iucv_put_chars, |
23131 | .notifier_add = hvc_iucv_notifier_add, | 23146 | .notifier_add = hvc_iucv_notifier_add, |
23132 | diff -urNp linux-2.6.32.13/drivers/char/hvc_rtas.c linux-2.6.32.13/drivers/char/hvc_rtas.c | 23147 | diff -urNp linux-2.6.32.15/drivers/char/hvc_rtas.c linux-2.6.32.15/drivers/char/hvc_rtas.c |
23133 | --- linux-2.6.32.13/drivers/char/hvc_rtas.c 2010-03-15 11:52:04.000000000 -0400 | 23148 | --- linux-2.6.32.15/drivers/char/hvc_rtas.c 2010-03-15 11:52:04.000000000 -0400 |
23134 | +++ linux-2.6.32.13/drivers/char/hvc_rtas.c 2010-05-15 13:21:14.922737516 -0400 | 23149 | +++ linux-2.6.32.15/drivers/char/hvc_rtas.c 2010-05-28 21:27:15.407096871 -0400 |
23135 | @@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ | 23150 | @@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ |
23136 | return i; | 23151 | return i; |
23137 | } | 23152 | } |
@@ -23141,9 +23156,9 @@ diff -urNp linux-2.6.32.13/drivers/char/hvc_rtas.c linux-2.6.32.13/drivers/char/ | |||
23141 | .get_chars = hvc_rtas_read_console, | 23156 | .get_chars = hvc_rtas_read_console, |
23142 | .put_chars = hvc_rtas_write_console, | 23157 | .put_chars = hvc_rtas_write_console, |
23143 | }; | 23158 | }; |
23144 | diff -urNp linux-2.6.32.13/drivers/char/hvcs.c linux-2.6.32.13/drivers/char/hvcs.c | 23159 | diff -urNp linux-2.6.32.15/drivers/char/hvcs.c linux-2.6.32.15/drivers/char/hvcs.c |
23145 | --- linux-2.6.32.13/drivers/char/hvcs.c 2010-03-15 11:52:04.000000000 -0400 | 23160 | --- linux-2.6.32.15/drivers/char/hvcs.c 2010-03-15 11:52:04.000000000 -0400 |
23146 | +++ linux-2.6.32.13/drivers/char/hvcs.c 2010-05-15 13:21:14.967285135 -0400 | 23161 | +++ linux-2.6.32.15/drivers/char/hvcs.c 2010-05-28 21:27:15.407096871 -0400 |
23147 | @@ -269,7 +269,7 @@ struct hvcs_struct { | 23162 | @@ -269,7 +269,7 @@ struct hvcs_struct { |
23148 | unsigned int index; | 23163 | unsigned int index; |
23149 | 23164 | ||
@@ -23238,9 +23253,9 @@ diff -urNp linux-2.6.32.13/drivers/char/hvcs.c linux-2.6.32.13/drivers/char/hvcs | |||
23238 | return 0; | 23253 | return 0; |
23239 | 23254 | ||
23240 | return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; | 23255 | return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; |
23241 | diff -urNp linux-2.6.32.13/drivers/char/hvc_udbg.c linux-2.6.32.13/drivers/char/hvc_udbg.c | 23256 | diff -urNp linux-2.6.32.15/drivers/char/hvc_udbg.c linux-2.6.32.15/drivers/char/hvc_udbg.c |
23242 | --- linux-2.6.32.13/drivers/char/hvc_udbg.c 2010-03-15 11:52:04.000000000 -0400 | 23257 | --- linux-2.6.32.15/drivers/char/hvc_udbg.c 2010-03-15 11:52:04.000000000 -0400 |
23243 | +++ linux-2.6.32.13/drivers/char/hvc_udbg.c 2010-05-15 13:21:14.967285135 -0400 | 23258 | +++ linux-2.6.32.15/drivers/char/hvc_udbg.c 2010-05-28 21:27:15.407096871 -0400 |
23244 | @@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno | 23259 | @@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno |
23245 | return i; | 23260 | return i; |
23246 | } | 23261 | } |
@@ -23250,9 +23265,9 @@ diff -urNp linux-2.6.32.13/drivers/char/hvc_udbg.c linux-2.6.32.13/drivers/char/ | |||
23250 | .get_chars = hvc_udbg_get, | 23265 | .get_chars = hvc_udbg_get, |
23251 | .put_chars = hvc_udbg_put, | 23266 | .put_chars = hvc_udbg_put, |
23252 | }; | 23267 | }; |
23253 | diff -urNp linux-2.6.32.13/drivers/char/hvc_vio.c linux-2.6.32.13/drivers/char/hvc_vio.c | 23268 | diff -urNp linux-2.6.32.15/drivers/char/hvc_vio.c linux-2.6.32.15/drivers/char/hvc_vio.c |
23254 | --- linux-2.6.32.13/drivers/char/hvc_vio.c 2010-03-15 11:52:04.000000000 -0400 | 23269 | --- linux-2.6.32.15/drivers/char/hvc_vio.c 2010-03-15 11:52:04.000000000 -0400 |
23255 | +++ linux-2.6.32.13/drivers/char/hvc_vio.c 2010-05-15 13:21:14.967285135 -0400 | 23270 | +++ linux-2.6.32.15/drivers/char/hvc_vio.c 2010-05-28 21:27:15.407096871 -0400 |
23256 | @@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v | 23271 | @@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v |
23257 | return got; | 23272 | return got; |
23258 | } | 23273 | } |
@@ -23262,9 +23277,9 @@ diff -urNp linux-2.6.32.13/drivers/char/hvc_vio.c linux-2.6.32.13/drivers/char/h | |||
23262 | .get_chars = filtered_get_chars, | 23277 | .get_chars = filtered_get_chars, |
23263 | .put_chars = hvc_put_chars, | 23278 | .put_chars = hvc_put_chars, |
23264 | .notifier_add = notifier_add_irq, | 23279 | .notifier_add = notifier_add_irq, |
23265 | diff -urNp linux-2.6.32.13/drivers/char/hvc_xen.c linux-2.6.32.13/drivers/char/hvc_xen.c | 23280 | diff -urNp linux-2.6.32.15/drivers/char/hvc_xen.c linux-2.6.32.15/drivers/char/hvc_xen.c |
23266 | --- linux-2.6.32.13/drivers/char/hvc_xen.c 2010-03-15 11:52:04.000000000 -0400 | 23281 | --- linux-2.6.32.15/drivers/char/hvc_xen.c 2010-03-15 11:52:04.000000000 -0400 |
23267 | +++ linux-2.6.32.13/drivers/char/hvc_xen.c 2010-05-15 13:21:14.967285135 -0400 | 23282 | +++ linux-2.6.32.15/drivers/char/hvc_xen.c 2010-05-28 21:27:15.407096871 -0400 |
23268 | @@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno | 23283 | @@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno |
23269 | return recv; | 23284 | return recv; |
23270 | } | 23285 | } |
@@ -23274,9 +23289,9 @@ diff -urNp linux-2.6.32.13/drivers/char/hvc_xen.c linux-2.6.32.13/drivers/char/h | |||
23274 | .get_chars = read_console, | 23289 | .get_chars = read_console, |
23275 | .put_chars = write_console, | 23290 | .put_chars = write_console, |
23276 | .notifier_add = notifier_add_irq, | 23291 | .notifier_add = notifier_add_irq, |
23277 | diff -urNp linux-2.6.32.13/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.13/drivers/char/ipmi/ipmi_msghandler.c | 23292 | diff -urNp linux-2.6.32.15/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.15/drivers/char/ipmi/ipmi_msghandler.c |
23278 | --- linux-2.6.32.13/drivers/char/ipmi/ipmi_msghandler.c 2010-03-15 11:52:04.000000000 -0400 | 23293 | --- linux-2.6.32.15/drivers/char/ipmi/ipmi_msghandler.c 2010-03-15 11:52:04.000000000 -0400 |
23279 | +++ linux-2.6.32.13/drivers/char/ipmi/ipmi_msghandler.c 2010-05-15 13:21:15.002974818 -0400 | 23294 | +++ linux-2.6.32.15/drivers/char/ipmi/ipmi_msghandler.c 2010-05-28 21:27:15.407096871 -0400 |
23280 | @@ -414,7 +414,7 @@ struct ipmi_smi { | 23295 | @@ -414,7 +414,7 @@ struct ipmi_smi { |
23281 | struct proc_dir_entry *proc_dir; | 23296 | struct proc_dir_entry *proc_dir; |
23282 | char proc_dir_name[10]; | 23297 | char proc_dir_name[10]; |
@@ -23307,9 +23322,9 @@ diff -urNp linux-2.6.32.13/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.13/d | |||
23307 | 23322 | ||
23308 | intf->proc_dir = NULL; | 23323 | intf->proc_dir = NULL; |
23309 | 23324 | ||
23310 | diff -urNp linux-2.6.32.13/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.13/drivers/char/ipmi/ipmi_si_intf.c | 23325 | diff -urNp linux-2.6.32.15/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.15/drivers/char/ipmi/ipmi_si_intf.c |
23311 | --- linux-2.6.32.13/drivers/char/ipmi/ipmi_si_intf.c 2010-03-15 11:52:04.000000000 -0400 | 23326 | --- linux-2.6.32.15/drivers/char/ipmi/ipmi_si_intf.c 2010-03-15 11:52:04.000000000 -0400 |
23312 | +++ linux-2.6.32.13/drivers/char/ipmi/ipmi_si_intf.c 2010-05-15 13:21:15.014624441 -0400 | 23327 | +++ linux-2.6.32.15/drivers/char/ipmi/ipmi_si_intf.c 2010-05-28 21:27:15.407096871 -0400 |
23313 | @@ -277,7 +277,7 @@ struct smi_info { | 23328 | @@ -277,7 +277,7 @@ struct smi_info { |
23314 | unsigned char slave_addr; | 23329 | unsigned char slave_addr; |
23315 | 23330 | ||
@@ -23340,9 +23355,9 @@ diff -urNp linux-2.6.32.13/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.13/driv | |||
23340 | 23355 | ||
23341 | new_smi->interrupt_disabled = 0; | 23356 | new_smi->interrupt_disabled = 0; |
23342 | atomic_set(&new_smi->stop_operation, 0); | 23357 | atomic_set(&new_smi->stop_operation, 0); |
23343 | diff -urNp linux-2.6.32.13/drivers/char/keyboard.c linux-2.6.32.13/drivers/char/keyboard.c | 23358 | diff -urNp linux-2.6.32.15/drivers/char/keyboard.c linux-2.6.32.15/drivers/char/keyboard.c |
23344 | --- linux-2.6.32.13/drivers/char/keyboard.c 2010-03-15 11:52:04.000000000 -0400 | 23359 | --- linux-2.6.32.15/drivers/char/keyboard.c 2010-03-15 11:52:04.000000000 -0400 |
23345 | +++ linux-2.6.32.13/drivers/char/keyboard.c 2010-05-15 13:21:15.018564312 -0400 | 23360 | +++ linux-2.6.32.15/drivers/char/keyboard.c 2010-05-28 21:27:15.407096871 -0400 |
23346 | @@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u | 23361 | @@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u |
23347 | kbd->kbdmode == VC_MEDIUMRAW) && | 23362 | kbd->kbdmode == VC_MEDIUMRAW) && |
23348 | value != KVAL(K_SAK)) | 23363 | value != KVAL(K_SAK)) |
@@ -23369,9 +23384,9 @@ diff -urNp linux-2.6.32.13/drivers/char/keyboard.c linux-2.6.32.13/drivers/char/ | |||
23369 | }; | 23384 | }; |
23370 | 23385 | ||
23371 | MODULE_DEVICE_TABLE(input, kbd_ids); | 23386 | MODULE_DEVICE_TABLE(input, kbd_ids); |
23372 | diff -urNp linux-2.6.32.13/drivers/char/mem.c linux-2.6.32.13/drivers/char/mem.c | 23387 | diff -urNp linux-2.6.32.15/drivers/char/mem.c linux-2.6.32.15/drivers/char/mem.c |
23373 | --- linux-2.6.32.13/drivers/char/mem.c 2010-03-15 11:52:04.000000000 -0400 | 23388 | --- linux-2.6.32.15/drivers/char/mem.c 2010-03-15 11:52:04.000000000 -0400 |
23374 | +++ linux-2.6.32.13/drivers/char/mem.c 2010-05-15 13:21:15.018564312 -0400 | 23389 | +++ linux-2.6.32.15/drivers/char/mem.c 2010-05-28 21:27:15.407096871 -0400 |
23375 | @@ -18,6 +18,7 @@ | 23390 | @@ -18,6 +18,7 @@ |
23376 | #include <linux/raw.h> | 23391 | #include <linux/raw.h> |
23377 | #include <linux/tty.h> | 23392 | #include <linux/tty.h> |
@@ -23462,9 +23477,9 @@ diff -urNp linux-2.6.32.13/drivers/char/mem.c linux-2.6.32.13/drivers/char/mem.c | |||
23462 | }; | 23477 | }; |
23463 | 23478 | ||
23464 | static int memory_open(struct inode *inode, struct file *filp) | 23479 | static int memory_open(struct inode *inode, struct file *filp) |
23465 | diff -urNp linux-2.6.32.13/drivers/char/nvram.c linux-2.6.32.13/drivers/char/nvram.c | 23480 | diff -urNp linux-2.6.32.15/drivers/char/nvram.c linux-2.6.32.15/drivers/char/nvram.c |
23466 | --- linux-2.6.32.13/drivers/char/nvram.c 2010-03-15 11:52:04.000000000 -0400 | 23481 | --- linux-2.6.32.15/drivers/char/nvram.c 2010-03-15 11:52:04.000000000 -0400 |
23467 | +++ linux-2.6.32.13/drivers/char/nvram.c 2010-05-15 13:21:15.018564312 -0400 | 23482 | +++ linux-2.6.32.15/drivers/char/nvram.c 2010-05-28 21:27:15.407096871 -0400 |
23468 | @@ -429,7 +429,10 @@ static const struct file_operations nvra | 23483 | @@ -429,7 +429,10 @@ static const struct file_operations nvra |
23469 | static struct miscdevice nvram_dev = { | 23484 | static struct miscdevice nvram_dev = { |
23470 | NVRAM_MINOR, | 23485 | NVRAM_MINOR, |
@@ -23477,9 +23492,9 @@ diff -urNp linux-2.6.32.13/drivers/char/nvram.c linux-2.6.32.13/drivers/char/nvr | |||
23477 | }; | 23492 | }; |
23478 | 23493 | ||
23479 | static int __init nvram_init(void) | 23494 | static int __init nvram_init(void) |
23480 | diff -urNp linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c | 23495 | diff -urNp linux-2.6.32.15/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.15/drivers/char/pcmcia/ipwireless/tty.c |
23481 | --- linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c 2010-03-15 11:52:04.000000000 -0400 | 23496 | --- linux-2.6.32.15/drivers/char/pcmcia/ipwireless/tty.c 2010-03-15 11:52:04.000000000 -0400 |
23482 | +++ linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c 2010-05-15 13:21:15.018564312 -0400 | 23497 | +++ linux-2.6.32.15/drivers/char/pcmcia/ipwireless/tty.c 2010-05-28 21:27:15.407096871 -0400 |
23483 | @@ -51,7 +51,7 @@ struct ipw_tty { | 23498 | @@ -51,7 +51,7 @@ struct ipw_tty { |
23484 | int tty_type; | 23499 | int tty_type; |
23485 | struct ipw_network *network; | 23500 | struct ipw_network *network; |
@@ -23594,9 +23609,9 @@ diff -urNp linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.13/ | |||
23594 | do_ipw_close(ttyj); | 23609 | do_ipw_close(ttyj); |
23595 | ipwireless_disassociate_network_ttys(network, | 23610 | ipwireless_disassociate_network_ttys(network, |
23596 | ttyj->channel_idx); | 23611 | ttyj->channel_idx); |
23597 | diff -urNp linux-2.6.32.13/drivers/char/pty.c linux-2.6.32.13/drivers/char/pty.c | 23612 | diff -urNp linux-2.6.32.15/drivers/char/pty.c linux-2.6.32.15/drivers/char/pty.c |
23598 | --- linux-2.6.32.13/drivers/char/pty.c 2010-03-15 11:52:04.000000000 -0400 | 23613 | --- linux-2.6.32.15/drivers/char/pty.c 2010-03-15 11:52:04.000000000 -0400 |
23599 | +++ linux-2.6.32.13/drivers/char/pty.c 2010-05-15 13:21:15.035728941 -0400 | 23614 | +++ linux-2.6.32.15/drivers/char/pty.c 2010-05-28 21:27:15.411167470 -0400 |
23600 | @@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode | 23615 | @@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode |
23601 | return ret; | 23616 | return ret; |
23602 | } | 23617 | } |
@@ -23627,9 +23642,9 @@ diff -urNp linux-2.6.32.13/drivers/char/pty.c linux-2.6.32.13/drivers/char/pty.c | |||
23627 | cdev_init(&ptmx_cdev, &ptmx_fops); | 23642 | cdev_init(&ptmx_cdev, &ptmx_fops); |
23628 | if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || | 23643 | if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || |
23629 | register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) | 23644 | register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) |
23630 | diff -urNp linux-2.6.32.13/drivers/char/random.c linux-2.6.32.13/drivers/char/random.c | 23645 | diff -urNp linux-2.6.32.15/drivers/char/random.c linux-2.6.32.15/drivers/char/random.c |
23631 | --- linux-2.6.32.13/drivers/char/random.c 2010-03-15 11:52:04.000000000 -0400 | 23646 | --- linux-2.6.32.15/drivers/char/random.c 2010-03-15 11:52:04.000000000 -0400 |
23632 | +++ linux-2.6.32.13/drivers/char/random.c 2010-05-15 13:21:15.038954680 -0400 | 23647 | +++ linux-2.6.32.15/drivers/char/random.c 2010-05-28 21:27:15.411167470 -0400 |
23633 | @@ -254,8 +254,13 @@ | 23648 | @@ -254,8 +254,13 @@ |
23634 | /* | 23649 | /* |
23635 | * Configuration information | 23650 | * Configuration information |
@@ -23671,9 +23686,9 @@ diff -urNp linux-2.6.32.13/drivers/char/random.c linux-2.6.32.13/drivers/char/ra | |||
23671 | static int max_write_thresh = INPUT_POOL_WORDS * 32; | 23686 | static int max_write_thresh = INPUT_POOL_WORDS * 32; |
23672 | static char sysctl_bootid[16]; | 23687 | static char sysctl_bootid[16]; |
23673 | 23688 | ||
23674 | diff -urNp linux-2.6.32.13/drivers/char/sonypi.c linux-2.6.32.13/drivers/char/sonypi.c | 23689 | diff -urNp linux-2.6.32.15/drivers/char/sonypi.c linux-2.6.32.15/drivers/char/sonypi.c |
23675 | --- linux-2.6.32.13/drivers/char/sonypi.c 2010-03-15 11:52:04.000000000 -0400 | 23690 | --- linux-2.6.32.15/drivers/char/sonypi.c 2010-03-15 11:52:04.000000000 -0400 |
23676 | +++ linux-2.6.32.13/drivers/char/sonypi.c 2010-05-15 13:21:15.038954680 -0400 | 23691 | +++ linux-2.6.32.15/drivers/char/sonypi.c 2010-05-28 21:27:15.411167470 -0400 |
23677 | @@ -491,7 +491,7 @@ static struct sonypi_device { | 23692 | @@ -491,7 +491,7 @@ static struct sonypi_device { |
23678 | spinlock_t fifo_lock; | 23693 | spinlock_t fifo_lock; |
23679 | wait_queue_head_t fifo_proc_list; | 23694 | wait_queue_head_t fifo_proc_list; |
@@ -23704,9 +23719,9 @@ diff -urNp linux-2.6.32.13/drivers/char/sonypi.c linux-2.6.32.13/drivers/char/so | |||
23704 | mutex_unlock(&sonypi_device.lock); | 23719 | mutex_unlock(&sonypi_device.lock); |
23705 | unlock_kernel(); | 23720 | unlock_kernel(); |
23706 | return 0; | 23721 | return 0; |
23707 | diff -urNp linux-2.6.32.13/drivers/char/tpm/tpm_bios.c linux-2.6.32.13/drivers/char/tpm/tpm_bios.c | 23722 | diff -urNp linux-2.6.32.15/drivers/char/tpm/tpm_bios.c linux-2.6.32.15/drivers/char/tpm/tpm_bios.c |
23708 | --- linux-2.6.32.13/drivers/char/tpm/tpm_bios.c 2010-03-15 11:52:04.000000000 -0400 | 23723 | --- linux-2.6.32.15/drivers/char/tpm/tpm_bios.c 2010-03-15 11:52:04.000000000 -0400 |
23709 | +++ linux-2.6.32.13/drivers/char/tpm/tpm_bios.c 2010-05-15 13:21:15.042644897 -0400 | 23724 | +++ linux-2.6.32.15/drivers/char/tpm/tpm_bios.c 2010-05-28 21:27:15.411167470 -0400 |
23710 | @@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start | 23725 | @@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start |
23711 | event = addr; | 23726 | event = addr; |
23712 | 23727 | ||
@@ -23747,9 +23762,9 @@ diff -urNp linux-2.6.32.13/drivers/char/tpm/tpm_bios.c linux-2.6.32.13/drivers/c | |||
23747 | 23762 | ||
23748 | memcpy(log->bios_event_log, virt, len); | 23763 | memcpy(log->bios_event_log, virt, len); |
23749 | 23764 | ||
23750 | diff -urNp linux-2.6.32.13/drivers/char/tty_io.c linux-2.6.32.13/drivers/char/tty_io.c | 23765 | diff -urNp linux-2.6.32.15/drivers/char/tty_io.c linux-2.6.32.15/drivers/char/tty_io.c |
23751 | --- linux-2.6.32.13/drivers/char/tty_io.c 2010-04-29 17:49:37.826084348 -0400 | 23766 | --- linux-2.6.32.15/drivers/char/tty_io.c 2010-04-29 17:49:37.826084348 -0400 |
23752 | +++ linux-2.6.32.13/drivers/char/tty_io.c 2010-05-15 13:21:15.058626500 -0400 | 23767 | +++ linux-2.6.32.15/drivers/char/tty_io.c 2010-05-28 21:27:15.411167470 -0400 |
23753 | @@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list | 23768 | @@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list |
23754 | DEFINE_MUTEX(tty_mutex); | 23769 | DEFINE_MUTEX(tty_mutex); |
23755 | EXPORT_SYMBOL(tty_mutex); | 23770 | EXPORT_SYMBOL(tty_mutex); |
@@ -23888,9 +23903,9 @@ diff -urNp linux-2.6.32.13/drivers/char/tty_io.c linux-2.6.32.13/drivers/char/tt | |||
23888 | /* | 23903 | /* |
23889 | * Initialize the console device. This is called *early*, so | 23904 | * Initialize the console device. This is called *early*, so |
23890 | * we can't necessarily depend on lots of kernel help here. | 23905 | * we can't necessarily depend on lots of kernel help here. |
23891 | diff -urNp linux-2.6.32.13/drivers/char/tty_ldisc.c linux-2.6.32.13/drivers/char/tty_ldisc.c | 23906 | diff -urNp linux-2.6.32.15/drivers/char/tty_ldisc.c linux-2.6.32.15/drivers/char/tty_ldisc.c |
23892 | --- linux-2.6.32.13/drivers/char/tty_ldisc.c 2010-03-15 11:52:04.000000000 -0400 | 23907 | --- linux-2.6.32.15/drivers/char/tty_ldisc.c 2010-03-15 11:52:04.000000000 -0400 |
23893 | +++ linux-2.6.32.13/drivers/char/tty_ldisc.c 2010-05-15 13:21:15.058626500 -0400 | 23908 | +++ linux-2.6.32.15/drivers/char/tty_ldisc.c 2010-05-28 21:27:15.411167470 -0400 |
23894 | @@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc * | 23909 | @@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc * |
23895 | if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { | 23910 | if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { |
23896 | struct tty_ldisc_ops *ldo = ld->ops; | 23911 | struct tty_ldisc_ops *ldo = ld->ops; |
@@ -23936,9 +23951,9 @@ diff -urNp linux-2.6.32.13/drivers/char/tty_ldisc.c linux-2.6.32.13/drivers/char | |||
23936 | module_put(ldops->owner); | 23951 | module_put(ldops->owner); |
23937 | spin_unlock_irqrestore(&tty_ldisc_lock, flags); | 23952 | spin_unlock_irqrestore(&tty_ldisc_lock, flags); |
23938 | } | 23953 | } |
23939 | diff -urNp linux-2.6.32.13/drivers/char/virtio_console.c linux-2.6.32.13/drivers/char/virtio_console.c | 23954 | diff -urNp linux-2.6.32.15/drivers/char/virtio_console.c linux-2.6.32.15/drivers/char/virtio_console.c |
23940 | --- linux-2.6.32.13/drivers/char/virtio_console.c 2010-03-15 11:52:04.000000000 -0400 | 23955 | --- linux-2.6.32.15/drivers/char/virtio_console.c 2010-03-15 11:52:04.000000000 -0400 |
23941 | +++ linux-2.6.32.13/drivers/char/virtio_console.c 2010-05-15 13:21:15.058626500 -0400 | 23956 | +++ linux-2.6.32.15/drivers/char/virtio_console.c 2010-05-28 21:27:15.411167470 -0400 |
23942 | @@ -44,6 +44,7 @@ static unsigned int in_len; | 23957 | @@ -44,6 +44,7 @@ static unsigned int in_len; |
23943 | static char *in, *inbuf; | 23958 | static char *in, *inbuf; |
23944 | 23959 | ||
@@ -23947,9 +23962,9 @@ diff -urNp linux-2.6.32.13/drivers/char/virtio_console.c linux-2.6.32.13/drivers | |||
23947 | static struct hv_ops virtio_cons; | 23962 | static struct hv_ops virtio_cons; |
23948 | 23963 | ||
23949 | /* The hvc device */ | 23964 | /* The hvc device */ |
23950 | diff -urNp linux-2.6.32.13/drivers/char/vt_ioctl.c linux-2.6.32.13/drivers/char/vt_ioctl.c | 23965 | diff -urNp linux-2.6.32.15/drivers/char/vt_ioctl.c linux-2.6.32.15/drivers/char/vt_ioctl.c |
23951 | --- linux-2.6.32.13/drivers/char/vt_ioctl.c 2010-03-15 11:52:04.000000000 -0400 | 23966 | --- linux-2.6.32.15/drivers/char/vt_ioctl.c 2010-03-15 11:52:04.000000000 -0400 |
23952 | +++ linux-2.6.32.13/drivers/char/vt_ioctl.c 2010-05-15 13:21:15.062960555 -0400 | 23967 | +++ linux-2.6.32.15/drivers/char/vt_ioctl.c 2010-05-28 21:27:15.414917676 -0400 |
23953 | @@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __ | 23968 | @@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __ |
23954 | case KDSKBENT: | 23969 | case KDSKBENT: |
23955 | if (!perm) | 23970 | if (!perm) |
@@ -23977,9 +23992,9 @@ diff -urNp linux-2.6.32.13/drivers/char/vt_ioctl.c linux-2.6.32.13/drivers/char/ | |||
23977 | q = func_table[i]; | 23992 | q = func_table[i]; |
23978 | first_free = funcbufptr + (funcbufsize - funcbufleft); | 23993 | first_free = funcbufptr + (funcbufsize - funcbufleft); |
23979 | for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) | 23994 | for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) |
23980 | diff -urNp linux-2.6.32.13/drivers/cpufreq/cpufreq.c linux-2.6.32.13/drivers/cpufreq/cpufreq.c | 23995 | diff -urNp linux-2.6.32.15/drivers/cpufreq/cpufreq.c linux-2.6.32.15/drivers/cpufreq/cpufreq.c |
23981 | --- linux-2.6.32.13/drivers/cpufreq/cpufreq.c 2010-03-15 11:52:04.000000000 -0400 | 23996 | --- linux-2.6.32.15/drivers/cpufreq/cpufreq.c 2010-03-15 11:52:04.000000000 -0400 |
23982 | +++ linux-2.6.32.13/drivers/cpufreq/cpufreq.c 2010-05-15 13:21:15.062960555 -0400 | 23997 | +++ linux-2.6.32.15/drivers/cpufreq/cpufreq.c 2010-05-28 21:27:15.418968453 -0400 |
23983 | @@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct | 23998 | @@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct |
23984 | complete(&policy->kobj_unregister); | 23999 | complete(&policy->kobj_unregister); |
23985 | } | 24000 | } |
@@ -23989,9 +24004,9 @@ diff -urNp linux-2.6.32.13/drivers/cpufreq/cpufreq.c linux-2.6.32.13/drivers/cpu | |||
23989 | .show = show, | 24004 | .show = show, |
23990 | .store = store, | 24005 | .store = store, |
23991 | }; | 24006 | }; |
23992 | diff -urNp linux-2.6.32.13/drivers/cpuidle/sysfs.c linux-2.6.32.13/drivers/cpuidle/sysfs.c | 24007 | diff -urNp linux-2.6.32.15/drivers/cpuidle/sysfs.c linux-2.6.32.15/drivers/cpuidle/sysfs.c |
23993 | --- linux-2.6.32.13/drivers/cpuidle/sysfs.c 2010-03-15 11:52:04.000000000 -0400 | 24008 | --- linux-2.6.32.15/drivers/cpuidle/sysfs.c 2010-03-15 11:52:04.000000000 -0400 |
23994 | +++ linux-2.6.32.13/drivers/cpuidle/sysfs.c 2010-05-15 13:21:15.062960555 -0400 | 24009 | +++ linux-2.6.32.15/drivers/cpuidle/sysfs.c 2010-05-28 21:27:15.418968453 -0400 |
23995 | @@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj | 24010 | @@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj |
23996 | return ret; | 24011 | return ret; |
23997 | } | 24012 | } |
@@ -24019,9 +24034,9 @@ diff -urNp linux-2.6.32.13/drivers/cpuidle/sysfs.c linux-2.6.32.13/drivers/cpuid | |||
24019 | { | 24034 | { |
24020 | kobject_put(&device->kobjs[i]->kobj); | 24035 | kobject_put(&device->kobjs[i]->kobj); |
24021 | wait_for_completion(&device->kobjs[i]->kobj_unregister); | 24036 | wait_for_completion(&device->kobjs[i]->kobj_unregister); |
24022 | diff -urNp linux-2.6.32.13/drivers/dma/ioat/dma.c linux-2.6.32.13/drivers/dma/ioat/dma.c | 24037 | diff -urNp linux-2.6.32.15/drivers/dma/ioat/dma.c linux-2.6.32.15/drivers/dma/ioat/dma.c |
24023 | --- linux-2.6.32.13/drivers/dma/ioat/dma.c 2010-03-15 11:52:04.000000000 -0400 | 24038 | --- linux-2.6.32.15/drivers/dma/ioat/dma.c 2010-03-15 11:52:04.000000000 -0400 |
24024 | +++ linux-2.6.32.13/drivers/dma/ioat/dma.c 2010-05-15 13:21:15.074651091 -0400 | 24039 | +++ linux-2.6.32.15/drivers/dma/ioat/dma.c 2010-05-28 21:27:15.418968453 -0400 |
24025 | @@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str | 24040 | @@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str |
24026 | return entry->show(&chan->common, page); | 24041 | return entry->show(&chan->common, page); |
24027 | } | 24042 | } |
@@ -24031,9 +24046,9 @@ diff -urNp linux-2.6.32.13/drivers/dma/ioat/dma.c linux-2.6.32.13/drivers/dma/io | |||
24031 | .show = ioat_attr_show, | 24046 | .show = ioat_attr_show, |
24032 | }; | 24047 | }; |
24033 | 24048 | ||
24034 | diff -urNp linux-2.6.32.13/drivers/dma/ioat/dma.h linux-2.6.32.13/drivers/dma/ioat/dma.h | 24049 | diff -urNp linux-2.6.32.15/drivers/dma/ioat/dma.h linux-2.6.32.15/drivers/dma/ioat/dma.h |
24035 | --- linux-2.6.32.13/drivers/dma/ioat/dma.h 2010-03-15 11:52:04.000000000 -0400 | 24050 | --- linux-2.6.32.15/drivers/dma/ioat/dma.h 2010-03-15 11:52:04.000000000 -0400 |
24036 | +++ linux-2.6.32.13/drivers/dma/ioat/dma.h 2010-05-15 13:21:15.090639890 -0400 | 24051 | +++ linux-2.6.32.15/drivers/dma/ioat/dma.h 2010-05-28 21:27:15.418968453 -0400 |
24037 | @@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c | 24052 | @@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c |
24038 | unsigned long *phys_complete); | 24053 | unsigned long *phys_complete); |
24039 | void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type); | 24054 | void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type); |
@@ -24043,9 +24058,9 @@ diff -urNp linux-2.6.32.13/drivers/dma/ioat/dma.h linux-2.6.32.13/drivers/dma/io | |||
24043 | extern struct ioat_sysfs_entry ioat_version_attr; | 24058 | extern struct ioat_sysfs_entry ioat_version_attr; |
24044 | extern struct ioat_sysfs_entry ioat_cap_attr; | 24059 | extern struct ioat_sysfs_entry ioat_cap_attr; |
24045 | #endif /* IOATDMA_H */ | 24060 | #endif /* IOATDMA_H */ |
24046 | diff -urNp linux-2.6.32.13/drivers/edac/edac_core.h linux-2.6.32.13/drivers/edac/edac_core.h | 24061 | diff -urNp linux-2.6.32.15/drivers/edac/edac_core.h linux-2.6.32.15/drivers/edac/edac_core.h |
24047 | --- linux-2.6.32.13/drivers/edac/edac_core.h 2010-03-15 11:52:04.000000000 -0400 | 24062 | --- linux-2.6.32.15/drivers/edac/edac_core.h 2010-03-15 11:52:04.000000000 -0400 |
24048 | +++ linux-2.6.32.13/drivers/edac/edac_core.h 2010-05-15 13:21:15.090639890 -0400 | 24063 | +++ linux-2.6.32.15/drivers/edac/edac_core.h 2010-05-28 21:27:15.418968453 -0400 |
24049 | @@ -99,11 +99,11 @@ extern int edac_debug_level; | 24064 | @@ -99,11 +99,11 @@ extern int edac_debug_level; |
24050 | 24065 | ||
24051 | #else /* !CONFIG_EDAC_DEBUG */ | 24066 | #else /* !CONFIG_EDAC_DEBUG */ |
@@ -24063,9 +24078,9 @@ diff -urNp linux-2.6.32.13/drivers/edac/edac_core.h linux-2.6.32.13/drivers/edac | |||
24063 | 24078 | ||
24064 | #endif /* !CONFIG_EDAC_DEBUG */ | 24079 | #endif /* !CONFIG_EDAC_DEBUG */ |
24065 | 24080 | ||
24066 | diff -urNp linux-2.6.32.13/drivers/edac/edac_device_sysfs.c linux-2.6.32.13/drivers/edac/edac_device_sysfs.c | 24081 | diff -urNp linux-2.6.32.15/drivers/edac/edac_device_sysfs.c linux-2.6.32.15/drivers/edac/edac_device_sysfs.c |
24067 | --- linux-2.6.32.13/drivers/edac/edac_device_sysfs.c 2010-03-15 11:52:04.000000000 -0400 | 24082 | --- linux-2.6.32.15/drivers/edac/edac_device_sysfs.c 2010-03-15 11:52:04.000000000 -0400 |
24068 | +++ linux-2.6.32.13/drivers/edac/edac_device_sysfs.c 2010-05-15 13:21:15.090639890 -0400 | 24083 | +++ linux-2.6.32.15/drivers/edac/edac_device_sysfs.c 2010-05-28 21:27:15.418968453 -0400 |
24069 | @@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s | 24084 | @@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s |
24070 | } | 24085 | } |
24071 | 24086 | ||
@@ -24093,9 +24108,9 @@ diff -urNp linux-2.6.32.13/drivers/edac/edac_device_sysfs.c linux-2.6.32.13/driv | |||
24093 | .show = edac_dev_block_show, | 24108 | .show = edac_dev_block_show, |
24094 | .store = edac_dev_block_store | 24109 | .store = edac_dev_block_store |
24095 | }; | 24110 | }; |
24096 | diff -urNp linux-2.6.32.13/drivers/edac/edac_mc_sysfs.c linux-2.6.32.13/drivers/edac/edac_mc_sysfs.c | 24111 | diff -urNp linux-2.6.32.15/drivers/edac/edac_mc_sysfs.c linux-2.6.32.15/drivers/edac/edac_mc_sysfs.c |
24097 | --- linux-2.6.32.13/drivers/edac/edac_mc_sysfs.c 2010-03-15 11:52:04.000000000 -0400 | 24112 | --- linux-2.6.32.15/drivers/edac/edac_mc_sysfs.c 2010-03-15 11:52:04.000000000 -0400 |
24098 | +++ linux-2.6.32.13/drivers/edac/edac_mc_sysfs.c 2010-05-15 13:21:15.090639890 -0400 | 24113 | +++ linux-2.6.32.15/drivers/edac/edac_mc_sysfs.c 2010-05-28 21:27:15.418968453 -0400 |
24099 | @@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob | 24114 | @@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob |
24100 | return -EIO; | 24115 | return -EIO; |
24101 | } | 24116 | } |
@@ -24114,9 +24129,9 @@ diff -urNp linux-2.6.32.13/drivers/edac/edac_mc_sysfs.c linux-2.6.32.13/drivers/ | |||
24114 | .show = mcidev_show, | 24129 | .show = mcidev_show, |
24115 | .store = mcidev_store | 24130 | .store = mcidev_store |
24116 | }; | 24131 | }; |
24117 | diff -urNp linux-2.6.32.13/drivers/edac/edac_pci_sysfs.c linux-2.6.32.13/drivers/edac/edac_pci_sysfs.c | 24132 | diff -urNp linux-2.6.32.15/drivers/edac/edac_pci_sysfs.c linux-2.6.32.15/drivers/edac/edac_pci_sysfs.c |
24118 | --- linux-2.6.32.13/drivers/edac/edac_pci_sysfs.c 2010-03-15 11:52:04.000000000 -0400 | 24133 | --- linux-2.6.32.15/drivers/edac/edac_pci_sysfs.c 2010-03-15 11:52:04.000000000 -0400 |
24119 | +++ linux-2.6.32.13/drivers/edac/edac_pci_sysfs.c 2010-05-15 13:21:15.090639890 -0400 | 24134 | +++ linux-2.6.32.15/drivers/edac/edac_pci_sysfs.c 2010-05-28 21:27:15.418968453 -0400 |
24120 | @@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s | 24135 | @@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s |
24121 | } | 24136 | } |
24122 | 24137 | ||
@@ -24135,9 +24150,9 @@ diff -urNp linux-2.6.32.13/drivers/edac/edac_pci_sysfs.c linux-2.6.32.13/drivers | |||
24135 | .show = edac_pci_dev_show, | 24150 | .show = edac_pci_dev_show, |
24136 | .store = edac_pci_dev_store | 24151 | .store = edac_pci_dev_store |
24137 | }; | 24152 | }; |
24138 | diff -urNp linux-2.6.32.13/drivers/firewire/core-cdev.c linux-2.6.32.13/drivers/firewire/core-cdev.c | 24153 | diff -urNp linux-2.6.32.15/drivers/firewire/core-cdev.c linux-2.6.32.15/drivers/firewire/core-cdev.c |
24139 | --- linux-2.6.32.13/drivers/firewire/core-cdev.c 2010-03-15 11:52:04.000000000 -0400 | 24154 | --- linux-2.6.32.15/drivers/firewire/core-cdev.c 2010-03-15 11:52:04.000000000 -0400 |
24140 | +++ linux-2.6.32.13/drivers/firewire/core-cdev.c 2010-05-15 13:21:15.094957471 -0400 | 24155 | +++ linux-2.6.32.15/drivers/firewire/core-cdev.c 2010-05-28 21:27:15.422980793 -0400 |
24141 | @@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie | 24156 | @@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie |
24142 | int ret; | 24157 | int ret; |
24143 | 24158 | ||
@@ -24148,9 +24163,9 @@ diff -urNp linux-2.6.32.13/drivers/firewire/core-cdev.c linux-2.6.32.13/drivers/ | |||
24148 | return -EINVAL; | 24163 | return -EINVAL; |
24149 | 24164 | ||
24150 | r = kmalloc(sizeof(*r), GFP_KERNEL); | 24165 | r = kmalloc(sizeof(*r), GFP_KERNEL); |
24151 | diff -urNp linux-2.6.32.13/drivers/firmware/dmi_scan.c linux-2.6.32.13/drivers/firmware/dmi_scan.c | 24166 | diff -urNp linux-2.6.32.15/drivers/firmware/dmi_scan.c linux-2.6.32.15/drivers/firmware/dmi_scan.c |
24152 | --- linux-2.6.32.13/drivers/firmware/dmi_scan.c 2010-03-15 11:52:04.000000000 -0400 | 24167 | --- linux-2.6.32.15/drivers/firmware/dmi_scan.c 2010-03-15 11:52:04.000000000 -0400 |
24153 | +++ linux-2.6.32.13/drivers/firmware/dmi_scan.c 2010-05-15 13:21:15.094957471 -0400 | 24168 | +++ linux-2.6.32.15/drivers/firmware/dmi_scan.c 2010-05-28 21:27:15.422980793 -0400 |
24154 | @@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) | 24169 | @@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) |
24155 | } | 24170 | } |
24156 | } | 24171 | } |
@@ -24163,9 +24178,9 @@ diff -urNp linux-2.6.32.13/drivers/firmware/dmi_scan.c linux-2.6.32.13/drivers/f | |||
24163 | p = dmi_ioremap(0xF0000, 0x10000); | 24178 | p = dmi_ioremap(0xF0000, 0x10000); |
24164 | if (p == NULL) | 24179 | if (p == NULL) |
24165 | goto error; | 24180 | goto error; |
24166 | diff -urNp linux-2.6.32.13/drivers/firmware/edd.c linux-2.6.32.13/drivers/firmware/edd.c | 24181 | diff -urNp linux-2.6.32.15/drivers/firmware/edd.c linux-2.6.32.15/drivers/firmware/edd.c |
24167 | --- linux-2.6.32.13/drivers/firmware/edd.c 2010-03-15 11:52:04.000000000 -0400 | 24182 | --- linux-2.6.32.15/drivers/firmware/edd.c 2010-03-15 11:52:04.000000000 -0400 |
24168 | +++ linux-2.6.32.13/drivers/firmware/edd.c 2010-05-15 13:21:15.094957471 -0400 | 24183 | +++ linux-2.6.32.15/drivers/firmware/edd.c 2010-05-28 21:27:15.422980793 -0400 |
24169 | @@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str | 24184 | @@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str |
24170 | return ret; | 24185 | return ret; |
24171 | } | 24186 | } |
@@ -24175,9 +24190,9 @@ diff -urNp linux-2.6.32.13/drivers/firmware/edd.c linux-2.6.32.13/drivers/firmwa | |||
24175 | .show = edd_attr_show, | 24190 | .show = edd_attr_show, |
24176 | }; | 24191 | }; |
24177 | 24192 | ||
24178 | diff -urNp linux-2.6.32.13/drivers/firmware/efivars.c linux-2.6.32.13/drivers/firmware/efivars.c | 24193 | diff -urNp linux-2.6.32.15/drivers/firmware/efivars.c linux-2.6.32.15/drivers/firmware/efivars.c |
24179 | --- linux-2.6.32.13/drivers/firmware/efivars.c 2010-03-15 11:52:04.000000000 -0400 | 24194 | --- linux-2.6.32.15/drivers/firmware/efivars.c 2010-03-15 11:52:04.000000000 -0400 |
24180 | +++ linux-2.6.32.13/drivers/firmware/efivars.c 2010-05-15 13:21:15.102953838 -0400 | 24195 | +++ linux-2.6.32.15/drivers/firmware/efivars.c 2010-05-28 21:27:15.422980793 -0400 |
24181 | @@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct | 24196 | @@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct |
24182 | return ret; | 24197 | return ret; |
24183 | } | 24198 | } |
@@ -24187,9 +24202,9 @@ diff -urNp linux-2.6.32.13/drivers/firmware/efivars.c linux-2.6.32.13/drivers/fi | |||
24187 | .show = efivar_attr_show, | 24202 | .show = efivar_attr_show, |
24188 | .store = efivar_attr_store, | 24203 | .store = efivar_attr_store, |
24189 | }; | 24204 | }; |
24190 | diff -urNp linux-2.6.32.13/drivers/firmware/iscsi_ibft.c linux-2.6.32.13/drivers/firmware/iscsi_ibft.c | 24205 | diff -urNp linux-2.6.32.15/drivers/firmware/iscsi_ibft.c linux-2.6.32.15/drivers/firmware/iscsi_ibft.c |
24191 | --- linux-2.6.32.13/drivers/firmware/iscsi_ibft.c 2010-03-15 11:52:04.000000000 -0400 | 24206 | --- linux-2.6.32.15/drivers/firmware/iscsi_ibft.c 2010-03-15 11:52:04.000000000 -0400 |
24192 | +++ linux-2.6.32.13/drivers/firmware/iscsi_ibft.c 2010-05-15 13:21:15.102953838 -0400 | 24207 | +++ linux-2.6.32.15/drivers/firmware/iscsi_ibft.c 2010-05-28 21:27:15.431186849 -0400 |
24193 | @@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc | 24208 | @@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc |
24194 | return ret; | 24209 | return ret; |
24195 | } | 24210 | } |
@@ -24199,9 +24214,9 @@ diff -urNp linux-2.6.32.13/drivers/firmware/iscsi_ibft.c linux-2.6.32.13/drivers | |||
24199 | .show = ibft_show_attribute, | 24214 | .show = ibft_show_attribute, |
24200 | }; | 24215 | }; |
24201 | 24216 | ||
24202 | diff -urNp linux-2.6.32.13/drivers/firmware/memmap.c linux-2.6.32.13/drivers/firmware/memmap.c | 24217 | diff -urNp linux-2.6.32.15/drivers/firmware/memmap.c linux-2.6.32.15/drivers/firmware/memmap.c |
24203 | --- linux-2.6.32.13/drivers/firmware/memmap.c 2010-03-15 11:52:04.000000000 -0400 | 24218 | --- linux-2.6.32.15/drivers/firmware/memmap.c 2010-03-15 11:52:04.000000000 -0400 |
24204 | +++ linux-2.6.32.13/drivers/firmware/memmap.c 2010-05-15 13:21:15.102953838 -0400 | 24219 | +++ linux-2.6.32.15/drivers/firmware/memmap.c 2010-05-28 21:27:15.446919696 -0400 |
24205 | @@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = { | 24220 | @@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = { |
24206 | NULL | 24221 | NULL |
24207 | }; | 24222 | }; |
@@ -24211,9 +24226,9 @@ diff -urNp linux-2.6.32.13/drivers/firmware/memmap.c linux-2.6.32.13/drivers/fir | |||
24211 | .show = memmap_attr_show, | 24226 | .show = memmap_attr_show, |
24212 | }; | 24227 | }; |
24213 | 24228 | ||
24214 | diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_drv.c linux-2.6.32.13/drivers/gpu/drm/drm_drv.c | 24229 | diff -urNp linux-2.6.32.15/drivers/gpu/drm/drm_drv.c linux-2.6.32.15/drivers/gpu/drm/drm_drv.c |
24215 | --- linux-2.6.32.13/drivers/gpu/drm/drm_drv.c 2010-03-15 11:52:04.000000000 -0400 | 24230 | --- linux-2.6.32.15/drivers/gpu/drm/drm_drv.c 2010-03-15 11:52:04.000000000 -0400 |
24216 | +++ linux-2.6.32.13/drivers/gpu/drm/drm_drv.c 2010-05-15 13:21:15.118645498 -0400 | 24231 | +++ linux-2.6.32.15/drivers/gpu/drm/drm_drv.c 2010-05-28 21:27:15.446919696 -0400 |
24217 | @@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc | 24232 | @@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc |
24218 | char *kdata = NULL; | 24233 | char *kdata = NULL; |
24219 | 24234 | ||
@@ -24223,9 +24238,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_drv.c linux-2.6.32.13/drivers/gpu | |||
24223 | ++file_priv->ioctl_count; | 24238 | ++file_priv->ioctl_count; |
24224 | 24239 | ||
24225 | DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", | 24240 | DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", |
24226 | diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_fops.c linux-2.6.32.13/drivers/gpu/drm/drm_fops.c | 24241 | diff -urNp linux-2.6.32.15/drivers/gpu/drm/drm_fops.c linux-2.6.32.15/drivers/gpu/drm/drm_fops.c |
24227 | --- linux-2.6.32.13/drivers/gpu/drm/drm_fops.c 2010-04-29 17:49:37.845185844 -0400 | 24242 | --- linux-2.6.32.15/drivers/gpu/drm/drm_fops.c 2010-04-29 17:49:37.845185844 -0400 |
24228 | +++ linux-2.6.32.13/drivers/gpu/drm/drm_fops.c 2010-05-15 13:21:15.130631389 -0400 | 24243 | +++ linux-2.6.32.15/drivers/gpu/drm/drm_fops.c 2010-05-28 21:27:15.451193295 -0400 |
24229 | @@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * | 24244 | @@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * |
24230 | } | 24245 | } |
24231 | 24246 | ||
@@ -24277,9 +24292,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_fops.c linux-2.6.32.13/drivers/gp | |||
24277 | if (atomic_read(&dev->ioctl_count)) { | 24292 | if (atomic_read(&dev->ioctl_count)) { |
24278 | DRM_ERROR("Device busy: %d\n", | 24293 | DRM_ERROR("Device busy: %d\n", |
24279 | atomic_read(&dev->ioctl_count)); | 24294 | atomic_read(&dev->ioctl_count)); |
24280 | diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.13/drivers/gpu/drm/drm_ioctl.c | 24295 | diff -urNp linux-2.6.32.15/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.15/drivers/gpu/drm/drm_ioctl.c |
24281 | --- linux-2.6.32.13/drivers/gpu/drm/drm_ioctl.c 2010-03-15 11:52:04.000000000 -0400 | 24296 | --- linux-2.6.32.15/drivers/gpu/drm/drm_ioctl.c 2010-03-15 11:52:04.000000000 -0400 |
24282 | +++ linux-2.6.32.13/drivers/gpu/drm/drm_ioctl.c 2010-05-15 13:21:15.138734335 -0400 | 24297 | +++ linux-2.6.32.15/drivers/gpu/drm/drm_ioctl.c 2010-05-28 21:27:15.451193295 -0400 |
24283 | @@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev, | 24298 | @@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev, |
24284 | stats->data[i].value = | 24299 | stats->data[i].value = |
24285 | (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0); | 24300 | (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0); |
@@ -24289,9 +24304,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.13/drivers/g | |||
24289 | stats->data[i].type = dev->types[i]; | 24304 | stats->data[i].type = dev->types[i]; |
24290 | } | 24305 | } |
24291 | 24306 | ||
24292 | diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_lock.c linux-2.6.32.13/drivers/gpu/drm/drm_lock.c | 24307 | diff -urNp linux-2.6.32.15/drivers/gpu/drm/drm_lock.c linux-2.6.32.15/drivers/gpu/drm/drm_lock.c |
24293 | --- linux-2.6.32.13/drivers/gpu/drm/drm_lock.c 2010-03-15 11:52:04.000000000 -0400 | 24308 | --- linux-2.6.32.15/drivers/gpu/drm/drm_lock.c 2010-03-15 11:52:04.000000000 -0400 |
24294 | +++ linux-2.6.32.13/drivers/gpu/drm/drm_lock.c 2010-05-15 13:21:15.138734335 -0400 | 24309 | +++ linux-2.6.32.15/drivers/gpu/drm/drm_lock.c 2010-05-28 21:27:15.451193295 -0400 |
24295 | @@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi | 24310 | @@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi |
24296 | if (drm_lock_take(&master->lock, lock->context)) { | 24311 | if (drm_lock_take(&master->lock, lock->context)) { |
24297 | master->lock.file_priv = file_priv; | 24312 | master->lock.file_priv = file_priv; |
@@ -24310,9 +24325,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_lock.c linux-2.6.32.13/drivers/gp | |||
24310 | 24325 | ||
24311 | /* kernel_context_switch isn't used by any of the x86 drm | 24326 | /* kernel_context_switch isn't used by any of the x86 drm |
24312 | * modules but is required by the Sparc driver. | 24327 | * modules but is required by the Sparc driver. |
24313 | diff -urNp linux-2.6.32.13/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.13/drivers/gpu/drm/i810/i810_dma.c | 24328 | diff -urNp linux-2.6.32.15/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.15/drivers/gpu/drm/i810/i810_dma.c |
24314 | --- linux-2.6.32.13/drivers/gpu/drm/i810/i810_dma.c 2010-03-15 11:52:04.000000000 -0400 | 24329 | --- linux-2.6.32.15/drivers/gpu/drm/i810/i810_dma.c 2010-03-15 11:52:04.000000000 -0400 |
24315 | +++ linux-2.6.32.13/drivers/gpu/drm/i810/i810_dma.c 2010-05-15 13:21:15.158669145 -0400 | 24330 | +++ linux-2.6.32.15/drivers/gpu/drm/i810/i810_dma.c 2010-05-28 21:27:15.455180050 -0400 |
24316 | @@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de | 24331 | @@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de |
24317 | dma->buflist[vertex->idx], | 24332 | dma->buflist[vertex->idx], |
24318 | vertex->discard, vertex->used); | 24333 | vertex->discard, vertex->used); |
@@ -24335,9 +24350,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.13/drive | |||
24335 | sarea_priv->last_enqueue = dev_priv->counter - 1; | 24350 | sarea_priv->last_enqueue = dev_priv->counter - 1; |
24336 | sarea_priv->last_dispatch = (int)hw_status[5]; | 24351 | sarea_priv->last_dispatch = (int)hw_status[5]; |
24337 | 24352 | ||
24338 | diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7017.c | 24353 | diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7017.c |
24339 | --- linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7017.c 2010-03-15 11:52:04.000000000 -0400 | 24354 | --- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7017.c 2010-03-15 11:52:04.000000000 -0400 |
24340 | +++ linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7017.c 2010-05-15 13:21:15.175041309 -0400 | 24355 | +++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7017.c 2010-05-28 21:27:15.455180050 -0400 |
24341 | @@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_ | 24356 | @@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_ |
24342 | } | 24357 | } |
24343 | } | 24358 | } |
@@ -24347,9 +24362,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.13/dri | |||
24347 | .init = ch7017_init, | 24362 | .init = ch7017_init, |
24348 | .detect = ch7017_detect, | 24363 | .detect = ch7017_detect, |
24349 | .mode_valid = ch7017_mode_valid, | 24364 | .mode_valid = ch7017_mode_valid, |
24350 | diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7xxx.c | 24365 | diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7xxx.c |
24351 | --- linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-03-15 11:52:04.000000000 -0400 | 24366 | --- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-03-15 11:52:04.000000000 -0400 |
24352 | +++ linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-05-15 13:21:15.175041309 -0400 | 24367 | +++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-05-28 21:27:15.459183485 -0400 |
24353 | @@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_ | 24368 | @@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_ |
24354 | } | 24369 | } |
24355 | } | 24370 | } |
@@ -24359,9 +24374,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.13/dri | |||
24359 | .init = ch7xxx_init, | 24374 | .init = ch7xxx_init, |
24360 | .detect = ch7xxx_detect, | 24375 | .detect = ch7xxx_detect, |
24361 | .mode_valid = ch7xxx_mode_valid, | 24376 | .mode_valid = ch7xxx_mode_valid, |
24362 | diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo.h linux-2.6.32.13/drivers/gpu/drm/i915/dvo.h | 24377 | diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo.h linux-2.6.32.15/drivers/gpu/drm/i915/dvo.h |
24363 | --- linux-2.6.32.13/drivers/gpu/drm/i915/dvo.h 2010-03-15 11:52:04.000000000 -0400 | 24378 | --- linux-2.6.32.15/drivers/gpu/drm/i915/dvo.h 2010-03-15 11:52:04.000000000 -0400 |
24364 | +++ linux-2.6.32.13/drivers/gpu/drm/i915/dvo.h 2010-05-15 13:21:15.175041309 -0400 | 24379 | +++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo.h 2010-05-28 21:27:15.463172433 -0400 |
24365 | @@ -135,23 +135,23 @@ struct intel_dvo_dev_ops { | 24380 | @@ -135,23 +135,23 @@ struct intel_dvo_dev_ops { |
24366 | * | 24381 | * |
24367 | * \return singly-linked list of modes or NULL if no modes found. | 24382 | * \return singly-linked list of modes or NULL if no modes found. |
@@ -24394,9 +24409,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo.h linux-2.6.32.13/drivers/gp | |||
24394 | +extern const struct intel_dvo_dev_ops ch7017_ops; | 24409 | +extern const struct intel_dvo_dev_ops ch7017_ops; |
24395 | 24410 | ||
24396 | #endif /* _INTEL_DVO_H */ | 24411 | #endif /* _INTEL_DVO_H */ |
24397 | diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ivch.c | 24412 | diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ivch.c |
24398 | --- linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ivch.c 2010-03-15 11:52:04.000000000 -0400 | 24413 | --- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ivch.c 2010-03-15 11:52:04.000000000 -0400 |
24399 | +++ linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ivch.c 2010-05-15 13:21:15.175041309 -0400 | 24414 | +++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ivch.c 2010-05-28 21:27:15.463172433 -0400 |
24400 | @@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv | 24415 | @@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv |
24401 | } | 24416 | } |
24402 | } | 24417 | } |
@@ -24406,9 +24421,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.13/drive | |||
24406 | .init = ivch_init, | 24421 | .init = ivch_init, |
24407 | .dpms = ivch_dpms, | 24422 | .dpms = ivch_dpms, |
24408 | .save = ivch_save, | 24423 | .save = ivch_save, |
24409 | diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.13/drivers/gpu/drm/i915/dvo_sil164.c | 24424 | diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.15/drivers/gpu/drm/i915/dvo_sil164.c |
24410 | --- linux-2.6.32.13/drivers/gpu/drm/i915/dvo_sil164.c 2010-03-15 11:52:04.000000000 -0400 | 24425 | --- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_sil164.c 2010-03-15 11:52:04.000000000 -0400 |
24411 | +++ linux-2.6.32.13/drivers/gpu/drm/i915/dvo_sil164.c 2010-05-15 13:21:15.175041309 -0400 | 24426 | +++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_sil164.c 2010-05-28 21:27:15.463172433 -0400 |
24412 | @@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_ | 24427 | @@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_ |
24413 | } | 24428 | } |
24414 | } | 24429 | } |
@@ -24418,9 +24433,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.13/dri | |||
24418 | .init = sil164_init, | 24433 | .init = sil164_init, |
24419 | .detect = sil164_detect, | 24434 | .detect = sil164_detect, |
24420 | .mode_valid = sil164_mode_valid, | 24435 | .mode_valid = sil164_mode_valid, |
24421 | diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.13/drivers/gpu/drm/i915/dvo_tfp410.c | 24436 | diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.15/drivers/gpu/drm/i915/dvo_tfp410.c |
24422 | --- linux-2.6.32.13/drivers/gpu/drm/i915/dvo_tfp410.c 2010-03-15 11:52:04.000000000 -0400 | 24437 | --- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_tfp410.c 2010-03-15 11:52:04.000000000 -0400 |
24423 | +++ linux-2.6.32.13/drivers/gpu/drm/i915/dvo_tfp410.c 2010-05-15 13:21:15.178966455 -0400 | 24438 | +++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_tfp410.c 2010-05-28 21:27:15.463172433 -0400 |
24424 | @@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_ | 24439 | @@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_ |
24425 | } | 24440 | } |
24426 | } | 24441 | } |
@@ -24430,9 +24445,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.13/dri | |||
24430 | .init = tfp410_init, | 24445 | .init = tfp410_init, |
24431 | .detect = tfp410_detect, | 24446 | .detect = tfp410_detect, |
24432 | .mode_valid = tfp410_mode_valid, | 24447 | .mode_valid = tfp410_mode_valid, |
24433 | diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.13/drivers/gpu/drm/i915/i915_drv.c | 24448 | diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.15/drivers/gpu/drm/i915/i915_drv.c |
24434 | --- linux-2.6.32.13/drivers/gpu/drm/i915/i915_drv.c 2010-03-15 11:52:04.000000000 -0400 | 24449 | --- linux-2.6.32.15/drivers/gpu/drm/i915/i915_drv.c 2010-03-15 11:52:04.000000000 -0400 |
24435 | +++ linux-2.6.32.13/drivers/gpu/drm/i915/i915_drv.c 2010-05-15 13:21:15.178966455 -0400 | 24450 | +++ linux-2.6.32.15/drivers/gpu/drm/i915/i915_drv.c 2010-05-28 21:27:15.463172433 -0400 |
24436 | @@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev) | 24451 | @@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev) |
24437 | return i915_resume(dev); | 24452 | return i915_resume(dev); |
24438 | } | 24453 | } |
@@ -24442,9 +24457,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.13/drive | |||
24442 | .fault = i915_gem_fault, | 24457 | .fault = i915_gem_fault, |
24443 | .open = drm_gem_vm_open, | 24458 | .open = drm_gem_vm_open, |
24444 | .close = drm_gem_vm_close, | 24459 | .close = drm_gem_vm_close, |
24445 | diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.13/drivers/gpu/drm/radeon/mkregtable.c | 24460 | diff -urNp linux-2.6.32.15/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.15/drivers/gpu/drm/radeon/mkregtable.c |
24446 | --- linux-2.6.32.13/drivers/gpu/drm/radeon/mkregtable.c 2010-03-15 11:52:04.000000000 -0400 | 24461 | --- linux-2.6.32.15/drivers/gpu/drm/radeon/mkregtable.c 2010-03-15 11:52:04.000000000 -0400 |
24447 | +++ linux-2.6.32.13/drivers/gpu/drm/radeon/mkregtable.c 2010-05-15 13:21:15.190982657 -0400 | 24462 | +++ linux-2.6.32.15/drivers/gpu/drm/radeon/mkregtable.c 2010-05-28 21:27:15.467181648 -0400 |
24448 | @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, | 24463 | @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, |
24449 | regex_t mask_rex; | 24464 | regex_t mask_rex; |
24450 | regmatch_t match[4]; | 24465 | regmatch_t match[4]; |
@@ -24462,9 +24477,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.13/d | |||
24462 | 24477 | ||
24463 | if (regcomp | 24478 | if (regcomp |
24464 | (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { | 24479 | (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { |
24465 | diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_atombios.c | 24480 | diff -urNp linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_atombios.c |
24466 | --- linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_atombios.c 2010-03-15 11:52:04.000000000 -0400 | 24481 | --- linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_atombios.c 2010-03-15 11:52:04.000000000 -0400 |
24467 | +++ linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_atombios.c 2010-05-15 13:21:15.194751236 -0400 | 24482 | +++ linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_atombios.c 2010-05-28 21:27:15.467181648 -0400 |
24468 | @@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o | 24483 | @@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o |
24469 | } | 24484 | } |
24470 | } | 24485 | } |
@@ -24489,9 +24504,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32 | |||
24489 | 24504 | ||
24490 | atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); | 24505 | atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); |
24491 | 24506 | ||
24492 | diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_display.c | 24507 | diff -urNp linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_display.c |
24493 | --- linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_display.c 2010-03-15 11:52:04.000000000 -0400 | 24508 | --- linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_display.c 2010-03-15 11:52:04.000000000 -0400 |
24494 | +++ linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_display.c 2010-05-15 13:21:15.198961996 -0400 | 24509 | +++ linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_display.c 2010-05-28 21:27:15.467181648 -0400 |
24495 | @@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl | 24510 | @@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl |
24496 | 24511 | ||
24497 | if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) { | 24512 | if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) { |
@@ -24501,9 +24516,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32. | |||
24501 | } else | 24516 | } else |
24502 | error = abs(current_freq - freq); | 24517 | error = abs(current_freq - freq); |
24503 | vco_diff = abs(vco - best_vco); | 24518 | vco_diff = abs(vco - best_vco); |
24504 | diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_state.c | 24519 | diff -urNp linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_state.c |
24505 | --- linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_state.c 2010-03-15 11:52:04.000000000 -0400 | 24520 | --- linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_state.c 2010-03-15 11:52:04.000000000 -0400 |
24506 | +++ linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_state.c 2010-05-15 13:21:15.206905040 -0400 | 24521 | +++ linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_state.c 2010-05-28 21:27:15.475020618 -0400 |
24507 | @@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm | 24522 | @@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm |
24508 | { | 24523 | { |
24509 | drm_radeon_private_t *dev_priv = dev->dev_private; | 24524 | drm_radeon_private_t *dev_priv = dev->dev_private; |
@@ -24513,9 +24528,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.13 | |||
24513 | 24528 | ||
24514 | DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); | 24529 | DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); |
24515 | 24530 | ||
24516 | diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_ttm.c | 24531 | diff -urNp linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_ttm.c |
24517 | --- linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_ttm.c 2010-03-15 11:52:04.000000000 -0400 | 24532 | --- linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_ttm.c 2010-03-15 11:52:04.000000000 -0400 |
24518 | +++ linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_ttm.c 2010-05-15 13:21:15.206905040 -0400 | 24533 | +++ linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_ttm.c 2010-05-28 21:27:15.475020618 -0400 |
24519 | @@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic | 24534 | @@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic |
24520 | DRM_INFO("radeon: ttm finalized\n"); | 24535 | DRM_INFO("radeon: ttm finalized\n"); |
24521 | } | 24536 | } |
@@ -24567,9 +24582,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.13/d | |||
24567 | } | 24582 | } |
24568 | 24583 | ||
24569 | 24584 | ||
24570 | diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo.c | 24585 | diff -urNp linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo.c |
24571 | --- linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo.c 2010-03-15 11:52:04.000000000 -0400 | 24586 | --- linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo.c 2010-03-15 11:52:04.000000000 -0400 |
24572 | +++ linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo.c 2010-05-15 13:21:15.206905040 -0400 | 24587 | +++ linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo.c 2010-05-28 21:27:15.483213986 -0400 |
24573 | @@ -39,7 +39,7 @@ | 24588 | @@ -39,7 +39,7 @@ |
24574 | #include <linux/module.h> | 24589 | #include <linux/module.h> |
24575 | 24590 | ||
@@ -24588,9 +24603,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.13/drivers/ | |||
24588 | .show = &ttm_bo_global_show | 24603 | .show = &ttm_bo_global_show |
24589 | }; | 24604 | }; |
24590 | 24605 | ||
24591 | diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo_vm.c | 24606 | diff -urNp linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo_vm.c |
24592 | --- linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-03-15 11:52:04.000000000 -0400 | 24607 | --- linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-03-15 11:52:04.000000000 -0400 |
24593 | +++ linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-05-15 13:21:15.206905040 -0400 | 24608 | +++ linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-05-28 21:27:15.483213986 -0400 |
24594 | @@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are | 24609 | @@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are |
24595 | { | 24610 | { |
24596 | struct ttm_buffer_object *bo = (struct ttm_buffer_object *) | 24611 | struct ttm_buffer_object *bo = (struct ttm_buffer_object *) |
@@ -24611,9 +24626,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.13/drive | |||
24611 | /* | 24626 | /* |
24612 | * Work around locking order reversal in fault / nopfn | 24627 | * Work around locking order reversal in fault / nopfn |
24613 | * between mmap_sem and bo_reserve: Perform a trylock operation | 24628 | * between mmap_sem and bo_reserve: Perform a trylock operation |
24614 | diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_global.c | 24629 | diff -urNp linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_global.c |
24615 | --- linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_global.c 2010-03-15 11:52:04.000000000 -0400 | 24630 | --- linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_global.c 2010-03-15 11:52:04.000000000 -0400 |
24616 | +++ linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_global.c 2010-05-15 13:21:15.206905040 -0400 | 24631 | +++ linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_global.c 2010-05-28 21:27:15.487089783 -0400 |
24617 | @@ -36,7 +36,7 @@ | 24632 | @@ -36,7 +36,7 @@ |
24618 | struct ttm_global_item { | 24633 | struct ttm_global_item { |
24619 | struct mutex mutex; | 24634 | struct mutex mutex; |
@@ -24671,9 +24686,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.13/driv | |||
24671 | ref->release(ref); | 24686 | ref->release(ref); |
24672 | item->object = NULL; | 24687 | item->object = NULL; |
24673 | } | 24688 | } |
24674 | diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_memory.c | 24689 | diff -urNp linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_memory.c |
24675 | --- linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_memory.c 2010-03-15 11:52:04.000000000 -0400 | 24690 | --- linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_memory.c 2010-03-15 11:52:04.000000000 -0400 |
24676 | +++ linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_memory.c 2010-05-15 13:21:15.206905040 -0400 | 24691 | +++ linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_memory.c 2010-05-28 21:27:15.487089783 -0400 |
24677 | @@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at | 24692 | @@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at |
24678 | NULL | 24693 | NULL |
24679 | }; | 24694 | }; |
@@ -24683,9 +24698,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.13/driv | |||
24683 | .show = &ttm_mem_zone_show, | 24698 | .show = &ttm_mem_zone_show, |
24684 | .store = &ttm_mem_zone_store | 24699 | .store = &ttm_mem_zone_store |
24685 | }; | 24700 | }; |
24686 | diff -urNp linux-2.6.32.13/drivers/hid/usbhid/hiddev.c linux-2.6.32.13/drivers/hid/usbhid/hiddev.c | 24701 | diff -urNp linux-2.6.32.15/drivers/hid/usbhid/hiddev.c linux-2.6.32.15/drivers/hid/usbhid/hiddev.c |
24687 | --- linux-2.6.32.13/drivers/hid/usbhid/hiddev.c 2010-03-15 11:52:04.000000000 -0400 | 24702 | --- linux-2.6.32.15/drivers/hid/usbhid/hiddev.c 2010-03-15 11:52:04.000000000 -0400 |
24688 | +++ linux-2.6.32.13/drivers/hid/usbhid/hiddev.c 2010-05-15 13:21:15.206905040 -0400 | 24703 | +++ linux-2.6.32.15/drivers/hid/usbhid/hiddev.c 2010-05-28 21:27:15.487089783 -0400 |
24689 | @@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi | 24704 | @@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi |
24690 | return put_user(HID_VERSION, (int __user *)arg); | 24705 | return put_user(HID_VERSION, (int __user *)arg); |
24691 | 24706 | ||
@@ -24695,9 +24710,9 @@ diff -urNp linux-2.6.32.13/drivers/hid/usbhid/hiddev.c linux-2.6.32.13/drivers/h | |||
24695 | return -EINVAL; | 24710 | return -EINVAL; |
24696 | 24711 | ||
24697 | for (i = 0; i < hid->maxcollection; i++) | 24712 | for (i = 0; i < hid->maxcollection; i++) |
24698 | diff -urNp linux-2.6.32.13/drivers/hwmon/k8temp.c linux-2.6.32.13/drivers/hwmon/k8temp.c | 24713 | diff -urNp linux-2.6.32.15/drivers/hwmon/k8temp.c linux-2.6.32.15/drivers/hwmon/k8temp.c |
24699 | --- linux-2.6.32.13/drivers/hwmon/k8temp.c 2010-03-15 11:52:04.000000000 -0400 | 24714 | --- linux-2.6.32.15/drivers/hwmon/k8temp.c 2010-03-15 11:52:04.000000000 -0400 |
24700 | +++ linux-2.6.32.13/drivers/hwmon/k8temp.c 2010-05-15 13:21:15.206905040 -0400 | 24715 | +++ linux-2.6.32.15/drivers/hwmon/k8temp.c 2010-05-28 21:27:15.487089783 -0400 |
24701 | @@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n | 24716 | @@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n |
24702 | 24717 | ||
24703 | static struct pci_device_id k8temp_ids[] = { | 24718 | static struct pci_device_id k8temp_ids[] = { |
@@ -24707,9 +24722,9 @@ diff -urNp linux-2.6.32.13/drivers/hwmon/k8temp.c linux-2.6.32.13/drivers/hwmon/ | |||
24707 | }; | 24722 | }; |
24708 | 24723 | ||
24709 | MODULE_DEVICE_TABLE(pci, k8temp_ids); | 24724 | MODULE_DEVICE_TABLE(pci, k8temp_ids); |
24710 | diff -urNp linux-2.6.32.13/drivers/hwmon/sis5595.c linux-2.6.32.13/drivers/hwmon/sis5595.c | 24725 | diff -urNp linux-2.6.32.15/drivers/hwmon/sis5595.c linux-2.6.32.15/drivers/hwmon/sis5595.c |
24711 | --- linux-2.6.32.13/drivers/hwmon/sis5595.c 2010-03-15 11:52:04.000000000 -0400 | 24726 | --- linux-2.6.32.15/drivers/hwmon/sis5595.c 2010-03-15 11:52:04.000000000 -0400 |
24712 | +++ linux-2.6.32.13/drivers/hwmon/sis5595.c 2010-05-15 13:21:15.222963784 -0400 | 24727 | +++ linux-2.6.32.15/drivers/hwmon/sis5595.c 2010-05-28 21:27:15.495189257 -0400 |
24713 | @@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda | 24728 | @@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda |
24714 | 24729 | ||
24715 | static struct pci_device_id sis5595_pci_ids[] = { | 24730 | static struct pci_device_id sis5595_pci_ids[] = { |
@@ -24719,9 +24734,9 @@ diff -urNp linux-2.6.32.13/drivers/hwmon/sis5595.c linux-2.6.32.13/drivers/hwmon | |||
24719 | }; | 24734 | }; |
24720 | 24735 | ||
24721 | MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); | 24736 | MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); |
24722 | diff -urNp linux-2.6.32.13/drivers/hwmon/via686a.c linux-2.6.32.13/drivers/hwmon/via686a.c | 24737 | diff -urNp linux-2.6.32.15/drivers/hwmon/via686a.c linux-2.6.32.15/drivers/hwmon/via686a.c |
24723 | --- linux-2.6.32.13/drivers/hwmon/via686a.c 2010-03-15 11:52:04.000000000 -0400 | 24738 | --- linux-2.6.32.15/drivers/hwmon/via686a.c 2010-03-15 11:52:04.000000000 -0400 |
24724 | +++ linux-2.6.32.13/drivers/hwmon/via686a.c 2010-05-15 13:21:15.230602217 -0400 | 24739 | +++ linux-2.6.32.15/drivers/hwmon/via686a.c 2010-05-28 21:27:15.495189257 -0400 |
24725 | @@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda | 24740 | @@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda |
24726 | 24741 | ||
24727 | static struct pci_device_id via686a_pci_ids[] = { | 24742 | static struct pci_device_id via686a_pci_ids[] = { |
@@ -24731,9 +24746,9 @@ diff -urNp linux-2.6.32.13/drivers/hwmon/via686a.c linux-2.6.32.13/drivers/hwmon | |||
24731 | }; | 24746 | }; |
24732 | 24747 | ||
24733 | MODULE_DEVICE_TABLE(pci, via686a_pci_ids); | 24748 | MODULE_DEVICE_TABLE(pci, via686a_pci_ids); |
24734 | diff -urNp linux-2.6.32.13/drivers/hwmon/vt8231.c linux-2.6.32.13/drivers/hwmon/vt8231.c | 24749 | diff -urNp linux-2.6.32.15/drivers/hwmon/vt8231.c linux-2.6.32.15/drivers/hwmon/vt8231.c |
24735 | --- linux-2.6.32.13/drivers/hwmon/vt8231.c 2010-03-15 11:52:04.000000000 -0400 | 24750 | --- linux-2.6.32.15/drivers/hwmon/vt8231.c 2010-03-15 11:52:04.000000000 -0400 |
24736 | +++ linux-2.6.32.13/drivers/hwmon/vt8231.c 2010-05-15 13:21:15.230602217 -0400 | 24751 | +++ linux-2.6.32.15/drivers/hwmon/vt8231.c 2010-05-28 21:27:15.507004721 -0400 |
24737 | @@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri | 24752 | @@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri |
24738 | 24753 | ||
24739 | static struct pci_device_id vt8231_pci_ids[] = { | 24754 | static struct pci_device_id vt8231_pci_ids[] = { |
@@ -24743,9 +24758,9 @@ diff -urNp linux-2.6.32.13/drivers/hwmon/vt8231.c linux-2.6.32.13/drivers/hwmon/ | |||
24743 | }; | 24758 | }; |
24744 | 24759 | ||
24745 | MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); | 24760 | MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); |
24746 | diff -urNp linux-2.6.32.13/drivers/hwmon/w83791d.c linux-2.6.32.13/drivers/hwmon/w83791d.c | 24761 | diff -urNp linux-2.6.32.15/drivers/hwmon/w83791d.c linux-2.6.32.15/drivers/hwmon/w83791d.c |
24747 | --- linux-2.6.32.13/drivers/hwmon/w83791d.c 2010-03-15 11:52:04.000000000 -0400 | 24762 | --- linux-2.6.32.15/drivers/hwmon/w83791d.c 2010-03-15 11:52:04.000000000 -0400 |
24748 | +++ linux-2.6.32.13/drivers/hwmon/w83791d.c 2010-05-15 13:21:15.234719424 -0400 | 24763 | +++ linux-2.6.32.15/drivers/hwmon/w83791d.c 2010-05-28 21:27:15.507004721 -0400 |
24749 | @@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli | 24764 | @@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli |
24750 | struct i2c_board_info *info); | 24765 | struct i2c_board_info *info); |
24751 | static int w83791d_remove(struct i2c_client *client); | 24766 | static int w83791d_remove(struct i2c_client *client); |
@@ -24757,9 +24772,9 @@ diff -urNp linux-2.6.32.13/drivers/hwmon/w83791d.c linux-2.6.32.13/drivers/hwmon | |||
24757 | static struct w83791d_data *w83791d_update_device(struct device *dev); | 24772 | static struct w83791d_data *w83791d_update_device(struct device *dev); |
24758 | 24773 | ||
24759 | #ifdef DEBUG | 24774 | #ifdef DEBUG |
24760 | diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-i801.c linux-2.6.32.13/drivers/i2c/busses/i2c-i801.c | 24775 | diff -urNp linux-2.6.32.15/drivers/i2c/busses/i2c-i801.c linux-2.6.32.15/drivers/i2c/busses/i2c-i801.c |
24761 | --- linux-2.6.32.13/drivers/i2c/busses/i2c-i801.c 2010-04-29 17:49:37.945518391 -0400 | 24776 | --- linux-2.6.32.15/drivers/i2c/busses/i2c-i801.c 2010-04-29 17:49:37.945518391 -0400 |
24762 | +++ linux-2.6.32.13/drivers/i2c/busses/i2c-i801.c 2010-05-15 13:21:15.234719424 -0400 | 24777 | +++ linux-2.6.32.15/drivers/i2c/busses/i2c-i801.c 2010-05-28 21:27:15.507004721 -0400 |
24763 | @@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] = | 24778 | @@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] = |
24764 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, | 24779 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, |
24765 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) }, | 24780 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) }, |
@@ -24769,9 +24784,9 @@ diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-i801.c linux-2.6.32.13/drivers | |||
24769 | }; | 24784 | }; |
24770 | 24785 | ||
24771 | MODULE_DEVICE_TABLE (pci, i801_ids); | 24786 | MODULE_DEVICE_TABLE (pci, i801_ids); |
24772 | diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.13/drivers/i2c/busses/i2c-piix4.c | 24787 | diff -urNp linux-2.6.32.15/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.15/drivers/i2c/busses/i2c-piix4.c |
24773 | --- linux-2.6.32.13/drivers/i2c/busses/i2c-piix4.c 2010-03-15 11:52:04.000000000 -0400 | 24788 | --- linux-2.6.32.15/drivers/i2c/busses/i2c-piix4.c 2010-03-15 11:52:04.000000000 -0400 |
24774 | +++ linux-2.6.32.13/drivers/i2c/busses/i2c-piix4.c 2010-05-15 13:21:15.234719424 -0400 | 24789 | +++ linux-2.6.32.15/drivers/i2c/busses/i2c-piix4.c 2010-05-28 21:27:15.507004721 -0400 |
24775 | @@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat | 24790 | @@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat |
24776 | .ident = "IBM", | 24791 | .ident = "IBM", |
24777 | .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, | 24792 | .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, |
@@ -24790,9 +24805,9 @@ diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.13/driver | |||
24790 | }; | 24805 | }; |
24791 | 24806 | ||
24792 | MODULE_DEVICE_TABLE (pci, piix4_ids); | 24807 | MODULE_DEVICE_TABLE (pci, piix4_ids); |
24793 | diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.13/drivers/i2c/busses/i2c-sis630.c | 24808 | diff -urNp linux-2.6.32.15/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.15/drivers/i2c/busses/i2c-sis630.c |
24794 | --- linux-2.6.32.13/drivers/i2c/busses/i2c-sis630.c 2010-03-15 11:52:04.000000000 -0400 | 24809 | --- linux-2.6.32.15/drivers/i2c/busses/i2c-sis630.c 2010-03-15 11:52:04.000000000 -0400 |
24795 | +++ linux-2.6.32.13/drivers/i2c/busses/i2c-sis630.c 2010-05-15 13:21:15.234719424 -0400 | 24810 | +++ linux-2.6.32.15/drivers/i2c/busses/i2c-sis630.c 2010-05-28 21:27:15.507004721 -0400 |
24796 | @@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter | 24811 | @@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter |
24797 | static struct pci_device_id sis630_ids[] __devinitdata = { | 24812 | static struct pci_device_id sis630_ids[] __devinitdata = { |
24798 | { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, | 24813 | { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, |
@@ -24802,9 +24817,9 @@ diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.13/drive | |||
24802 | }; | 24817 | }; |
24803 | 24818 | ||
24804 | MODULE_DEVICE_TABLE (pci, sis630_ids); | 24819 | MODULE_DEVICE_TABLE (pci, sis630_ids); |
24805 | diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.13/drivers/i2c/busses/i2c-sis96x.c | 24820 | diff -urNp linux-2.6.32.15/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.15/drivers/i2c/busses/i2c-sis96x.c |
24806 | --- linux-2.6.32.13/drivers/i2c/busses/i2c-sis96x.c 2010-03-15 11:52:04.000000000 -0400 | 24821 | --- linux-2.6.32.15/drivers/i2c/busses/i2c-sis96x.c 2010-03-15 11:52:04.000000000 -0400 |
24807 | +++ linux-2.6.32.13/drivers/i2c/busses/i2c-sis96x.c 2010-05-15 13:21:15.234719424 -0400 | 24822 | +++ linux-2.6.32.15/drivers/i2c/busses/i2c-sis96x.c 2010-05-28 21:27:15.507004721 -0400 |
24808 | @@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter | 24823 | @@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter |
24809 | 24824 | ||
24810 | static struct pci_device_id sis96x_ids[] = { | 24825 | static struct pci_device_id sis96x_ids[] = { |
@@ -24814,9 +24829,9 @@ diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.13/drive | |||
24814 | }; | 24829 | }; |
24815 | 24830 | ||
24816 | MODULE_DEVICE_TABLE (pci, sis96x_ids); | 24831 | MODULE_DEVICE_TABLE (pci, sis96x_ids); |
24817 | diff -urNp linux-2.6.32.13/drivers/ide/ide-cd.c linux-2.6.32.13/drivers/ide/ide-cd.c | 24832 | diff -urNp linux-2.6.32.15/drivers/ide/ide-cd.c linux-2.6.32.15/drivers/ide/ide-cd.c |
24818 | --- linux-2.6.32.13/drivers/ide/ide-cd.c 2010-03-15 11:52:04.000000000 -0400 | 24833 | --- linux-2.6.32.15/drivers/ide/ide-cd.c 2010-03-15 11:52:04.000000000 -0400 |
24819 | +++ linux-2.6.32.13/drivers/ide/ide-cd.c 2010-05-15 13:21:15.234719424 -0400 | 24834 | +++ linux-2.6.32.15/drivers/ide/ide-cd.c 2010-05-28 21:27:15.510961438 -0400 |
24820 | @@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_ | 24835 | @@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_ |
24821 | alignment = queue_dma_alignment(q) | q->dma_pad_mask; | 24836 | alignment = queue_dma_alignment(q) | q->dma_pad_mask; |
24822 | if ((unsigned long)buf & alignment | 24837 | if ((unsigned long)buf & alignment |
@@ -24826,9 +24841,9 @@ diff -urNp linux-2.6.32.13/drivers/ide/ide-cd.c linux-2.6.32.13/drivers/ide/ide- | |||
24826 | drive->dma = 0; | 24841 | drive->dma = 0; |
24827 | } | 24842 | } |
24828 | } | 24843 | } |
24829 | diff -urNp linux-2.6.32.13/drivers/ieee1394/dv1394.c linux-2.6.32.13/drivers/ieee1394/dv1394.c | 24844 | diff -urNp linux-2.6.32.15/drivers/ieee1394/dv1394.c linux-2.6.32.15/drivers/ieee1394/dv1394.c |
24830 | --- linux-2.6.32.13/drivers/ieee1394/dv1394.c 2010-03-15 11:52:04.000000000 -0400 | 24845 | --- linux-2.6.32.15/drivers/ieee1394/dv1394.c 2010-03-15 11:52:04.000000000 -0400 |
24831 | +++ linux-2.6.32.13/drivers/ieee1394/dv1394.c 2010-05-15 13:21:15.234719424 -0400 | 24846 | +++ linux-2.6.32.15/drivers/ieee1394/dv1394.c 2010-05-28 21:27:15.527187024 -0400 |
24832 | @@ -739,7 +739,7 @@ static void frame_prepare(struct video_c | 24847 | @@ -739,7 +739,7 @@ static void frame_prepare(struct video_c |
24833 | based upon DIF section and sequence | 24848 | based upon DIF section and sequence |
24834 | */ | 24849 | */ |
@@ -24847,9 +24862,9 @@ diff -urNp linux-2.6.32.13/drivers/ieee1394/dv1394.c linux-2.6.32.13/drivers/iee | |||
24847 | }; | 24862 | }; |
24848 | 24863 | ||
24849 | MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); | 24864 | MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); |
24850 | diff -urNp linux-2.6.32.13/drivers/ieee1394/eth1394.c linux-2.6.32.13/drivers/ieee1394/eth1394.c | 24865 | diff -urNp linux-2.6.32.15/drivers/ieee1394/eth1394.c linux-2.6.32.15/drivers/ieee1394/eth1394.c |
24851 | --- linux-2.6.32.13/drivers/ieee1394/eth1394.c 2010-03-15 11:52:04.000000000 -0400 | 24866 | --- linux-2.6.32.15/drivers/ieee1394/eth1394.c 2010-03-15 11:52:04.000000000 -0400 |
24852 | +++ linux-2.6.32.13/drivers/ieee1394/eth1394.c 2010-05-15 13:21:15.250965621 -0400 | 24867 | +++ linux-2.6.32.15/drivers/ieee1394/eth1394.c 2010-05-28 21:27:15.544607394 -0400 |
24853 | @@ -446,7 +446,7 @@ static const struct ieee1394_device_id e | 24868 | @@ -446,7 +446,7 @@ static const struct ieee1394_device_id e |
24854 | .specifier_id = ETHER1394_GASP_SPECIFIER_ID, | 24869 | .specifier_id = ETHER1394_GASP_SPECIFIER_ID, |
24855 | .version = ETHER1394_GASP_VERSION, | 24870 | .version = ETHER1394_GASP_VERSION, |
@@ -24859,9 +24874,9 @@ diff -urNp linux-2.6.32.13/drivers/ieee1394/eth1394.c linux-2.6.32.13/drivers/ie | |||
24859 | }; | 24874 | }; |
24860 | 24875 | ||
24861 | MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); | 24876 | MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); |
24862 | diff -urNp linux-2.6.32.13/drivers/ieee1394/hosts.c linux-2.6.32.13/drivers/ieee1394/hosts.c | 24877 | diff -urNp linux-2.6.32.15/drivers/ieee1394/hosts.c linux-2.6.32.15/drivers/ieee1394/hosts.c |
24863 | --- linux-2.6.32.13/drivers/ieee1394/hosts.c 2010-03-15 11:52:04.000000000 -0400 | 24878 | --- linux-2.6.32.15/drivers/ieee1394/hosts.c 2010-03-15 11:52:04.000000000 -0400 |
24864 | +++ linux-2.6.32.13/drivers/ieee1394/hosts.c 2010-05-15 13:21:15.250965621 -0400 | 24879 | +++ linux-2.6.32.15/drivers/ieee1394/hosts.c 2010-05-28 21:27:15.544607394 -0400 |
24865 | @@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso | 24880 | @@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso |
24866 | } | 24881 | } |
24867 | 24882 | ||
@@ -24870,9 +24885,9 @@ diff -urNp linux-2.6.32.13/drivers/ieee1394/hosts.c linux-2.6.32.13/drivers/ieee | |||
24870 | .transmit_packet = dummy_transmit_packet, | 24885 | .transmit_packet = dummy_transmit_packet, |
24871 | .devctl = dummy_devctl, | 24886 | .devctl = dummy_devctl, |
24872 | .isoctl = dummy_isoctl | 24887 | .isoctl = dummy_isoctl |
24873 | diff -urNp linux-2.6.32.13/drivers/ieee1394/ohci1394.c linux-2.6.32.13/drivers/ieee1394/ohci1394.c | 24888 | diff -urNp linux-2.6.32.15/drivers/ieee1394/ohci1394.c linux-2.6.32.15/drivers/ieee1394/ohci1394.c |
24874 | --- linux-2.6.32.13/drivers/ieee1394/ohci1394.c 2010-03-15 11:52:04.000000000 -0400 | 24889 | --- linux-2.6.32.15/drivers/ieee1394/ohci1394.c 2010-03-15 11:52:04.000000000 -0400 |
24875 | +++ linux-2.6.32.13/drivers/ieee1394/ohci1394.c 2010-05-15 13:21:15.283282671 -0400 | 24890 | +++ linux-2.6.32.15/drivers/ieee1394/ohci1394.c 2010-05-28 21:27:15.555018453 -0400 |
24876 | @@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_ | 24891 | @@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_ |
24877 | printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args) | 24892 | printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args) |
24878 | 24893 | ||
@@ -24894,9 +24909,9 @@ diff -urNp linux-2.6.32.13/drivers/ieee1394/ohci1394.c linux-2.6.32.13/drivers/i | |||
24894 | }; | 24909 | }; |
24895 | 24910 | ||
24896 | MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); | 24911 | MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); |
24897 | diff -urNp linux-2.6.32.13/drivers/ieee1394/raw1394.c linux-2.6.32.13/drivers/ieee1394/raw1394.c | 24912 | diff -urNp linux-2.6.32.15/drivers/ieee1394/raw1394.c linux-2.6.32.15/drivers/ieee1394/raw1394.c |
24898 | --- linux-2.6.32.13/drivers/ieee1394/raw1394.c 2010-03-15 11:52:04.000000000 -0400 | 24913 | --- linux-2.6.32.15/drivers/ieee1394/raw1394.c 2010-03-15 11:52:04.000000000 -0400 |
24899 | +++ linux-2.6.32.13/drivers/ieee1394/raw1394.c 2010-05-15 13:21:15.340016183 -0400 | 24914 | +++ linux-2.6.32.15/drivers/ieee1394/raw1394.c 2010-05-28 21:27:15.555018453 -0400 |
24900 | @@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r | 24915 | @@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r |
24901 | .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, | 24916 | .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, |
24902 | .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, | 24917 | .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, |
@@ -24906,9 +24921,9 @@ diff -urNp linux-2.6.32.13/drivers/ieee1394/raw1394.c linux-2.6.32.13/drivers/ie | |||
24906 | }; | 24921 | }; |
24907 | 24922 | ||
24908 | MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); | 24923 | MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); |
24909 | diff -urNp linux-2.6.32.13/drivers/ieee1394/sbp2.c linux-2.6.32.13/drivers/ieee1394/sbp2.c | 24924 | diff -urNp linux-2.6.32.15/drivers/ieee1394/sbp2.c linux-2.6.32.15/drivers/ieee1394/sbp2.c |
24910 | --- linux-2.6.32.13/drivers/ieee1394/sbp2.c 2010-03-15 11:52:04.000000000 -0400 | 24925 | --- linux-2.6.32.15/drivers/ieee1394/sbp2.c 2010-03-15 11:52:04.000000000 -0400 |
24911 | +++ linux-2.6.32.13/drivers/ieee1394/sbp2.c 2010-05-15 13:21:15.374974502 -0400 | 24926 | +++ linux-2.6.32.15/drivers/ieee1394/sbp2.c 2010-05-28 21:27:15.555018453 -0400 |
24912 | @@ -290,7 +290,7 @@ static const struct ieee1394_device_id s | 24927 | @@ -290,7 +290,7 @@ static const struct ieee1394_device_id s |
24913 | .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, | 24928 | .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, |
24914 | .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, | 24929 | .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, |
@@ -24927,9 +24942,9 @@ diff -urNp linux-2.6.32.13/drivers/ieee1394/sbp2.c linux-2.6.32.13/drivers/ieee1 | |||
24927 | { | 24942 | { |
24928 | int ret; | 24943 | int ret; |
24929 | 24944 | ||
24930 | diff -urNp linux-2.6.32.13/drivers/ieee1394/video1394.c linux-2.6.32.13/drivers/ieee1394/video1394.c | 24945 | diff -urNp linux-2.6.32.15/drivers/ieee1394/video1394.c linux-2.6.32.15/drivers/ieee1394/video1394.c |
24931 | --- linux-2.6.32.13/drivers/ieee1394/video1394.c 2010-03-15 11:52:04.000000000 -0400 | 24946 | --- linux-2.6.32.15/drivers/ieee1394/video1394.c 2010-03-15 11:52:04.000000000 -0400 |
24932 | +++ linux-2.6.32.13/drivers/ieee1394/video1394.c 2010-05-15 13:21:15.379405032 -0400 | 24947 | +++ linux-2.6.32.15/drivers/ieee1394/video1394.c 2010-05-28 21:27:15.559201489 -0400 |
24933 | @@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v | 24948 | @@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v |
24934 | .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, | 24949 | .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, |
24935 | .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff | 24950 | .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff |
@@ -24939,9 +24954,9 @@ diff -urNp linux-2.6.32.13/drivers/ieee1394/video1394.c linux-2.6.32.13/drivers/ | |||
24939 | }; | 24954 | }; |
24940 | 24955 | ||
24941 | MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); | 24956 | MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); |
24942 | diff -urNp linux-2.6.32.13/drivers/infiniband/core/cm.c linux-2.6.32.13/drivers/infiniband/core/cm.c | 24957 | diff -urNp linux-2.6.32.15/drivers/infiniband/core/cm.c linux-2.6.32.15/drivers/infiniband/core/cm.c |
24943 | --- linux-2.6.32.13/drivers/infiniband/core/cm.c 2010-03-15 11:52:04.000000000 -0400 | 24958 | --- linux-2.6.32.15/drivers/infiniband/core/cm.c 2010-03-15 11:52:04.000000000 -0400 |
24944 | +++ linux-2.6.32.13/drivers/infiniband/core/cm.c 2010-05-15 13:21:15.390974340 -0400 | 24959 | +++ linux-2.6.32.15/drivers/infiniband/core/cm.c 2010-05-28 21:27:15.559201489 -0400 |
24945 | @@ -112,7 +112,7 @@ static char const counter_group_names[CM | 24960 | @@ -112,7 +112,7 @@ static char const counter_group_names[CM |
24946 | 24961 | ||
24947 | struct cm_counter_group { | 24962 | struct cm_counter_group { |
@@ -25085,9 +25100,9 @@ diff -urNp linux-2.6.32.13/drivers/infiniband/core/cm.c linux-2.6.32.13/drivers/ | |||
25085 | .show = cm_show_counter | 25100 | .show = cm_show_counter |
25086 | }; | 25101 | }; |
25087 | 25102 | ||
25088 | diff -urNp linux-2.6.32.13/drivers/infiniband/core/sysfs.c linux-2.6.32.13/drivers/infiniband/core/sysfs.c | 25103 | diff -urNp linux-2.6.32.15/drivers/infiniband/core/sysfs.c linux-2.6.32.15/drivers/infiniband/core/sysfs.c |
25089 | --- linux-2.6.32.13/drivers/infiniband/core/sysfs.c 2010-03-15 11:52:04.000000000 -0400 | 25104 | --- linux-2.6.32.15/drivers/infiniband/core/sysfs.c 2010-03-15 11:52:04.000000000 -0400 |
25090 | +++ linux-2.6.32.13/drivers/infiniband/core/sysfs.c 2010-05-15 13:21:15.420653417 -0400 | 25105 | +++ linux-2.6.32.15/drivers/infiniband/core/sysfs.c 2010-05-28 21:27:15.563689341 -0400 |
25091 | @@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob | 25106 | @@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob |
25092 | return port_attr->show(p, port_attr, buf); | 25107 | return port_attr->show(p, port_attr, buf); |
25093 | } | 25108 | } |
@@ -25097,9 +25112,9 @@ diff -urNp linux-2.6.32.13/drivers/infiniband/core/sysfs.c linux-2.6.32.13/drive | |||
25097 | .show = port_attr_show | 25112 | .show = port_attr_show |
25098 | }; | 25113 | }; |
25099 | 25114 | ||
25100 | diff -urNp linux-2.6.32.13/drivers/input/keyboard/atkbd.c linux-2.6.32.13/drivers/input/keyboard/atkbd.c | 25115 | diff -urNp linux-2.6.32.15/drivers/input/keyboard/atkbd.c linux-2.6.32.15/drivers/input/keyboard/atkbd.c |
25101 | --- linux-2.6.32.13/drivers/input/keyboard/atkbd.c 2010-03-15 11:52:04.000000000 -0400 | 25116 | --- linux-2.6.32.15/drivers/input/keyboard/atkbd.c 2010-03-15 11:52:04.000000000 -0400 |
25102 | +++ linux-2.6.32.13/drivers/input/keyboard/atkbd.c 2010-05-15 13:21:15.420653417 -0400 | 25117 | +++ linux-2.6.32.15/drivers/input/keyboard/atkbd.c 2010-05-28 21:27:15.568704406 -0400 |
25103 | @@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri | 25118 | @@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri |
25104 | .id = SERIO_ANY, | 25119 | .id = SERIO_ANY, |
25105 | .extra = SERIO_ANY, | 25120 | .extra = SERIO_ANY, |
@@ -25109,9 +25124,9 @@ diff -urNp linux-2.6.32.13/drivers/input/keyboard/atkbd.c linux-2.6.32.13/driver | |||
25109 | }; | 25124 | }; |
25110 | 25125 | ||
25111 | MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); | 25126 | MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); |
25112 | diff -urNp linux-2.6.32.13/drivers/input/mouse/lifebook.c linux-2.6.32.13/drivers/input/mouse/lifebook.c | 25127 | diff -urNp linux-2.6.32.15/drivers/input/mouse/lifebook.c linux-2.6.32.15/drivers/input/mouse/lifebook.c |
25113 | --- linux-2.6.32.13/drivers/input/mouse/lifebook.c 2010-03-15 11:52:04.000000000 -0400 | 25128 | --- linux-2.6.32.15/drivers/input/mouse/lifebook.c 2010-03-15 11:52:04.000000000 -0400 |
25114 | +++ linux-2.6.32.13/drivers/input/mouse/lifebook.c 2010-05-15 13:21:15.420653417 -0400 | 25129 | +++ linux-2.6.32.15/drivers/input/mouse/lifebook.c 2010-05-28 21:27:15.572693057 -0400 |
25115 | @@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo | 25130 | @@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo |
25116 | DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), | 25131 | DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), |
25117 | }, | 25132 | }, |
@@ -25121,9 +25136,9 @@ diff -urNp linux-2.6.32.13/drivers/input/mouse/lifebook.c linux-2.6.32.13/driver | |||
25121 | }; | 25136 | }; |
25122 | 25137 | ||
25123 | static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) | 25138 | static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) |
25124 | diff -urNp linux-2.6.32.13/drivers/input/mouse/psmouse-base.c linux-2.6.32.13/drivers/input/mouse/psmouse-base.c | 25139 | diff -urNp linux-2.6.32.15/drivers/input/mouse/psmouse-base.c linux-2.6.32.15/drivers/input/mouse/psmouse-base.c |
25125 | --- linux-2.6.32.13/drivers/input/mouse/psmouse-base.c 2010-03-15 11:52:04.000000000 -0400 | 25140 | --- linux-2.6.32.15/drivers/input/mouse/psmouse-base.c 2010-03-15 11:52:04.000000000 -0400 |
25126 | +++ linux-2.6.32.13/drivers/input/mouse/psmouse-base.c 2010-05-15 13:21:15.430620618 -0400 | 25141 | +++ linux-2.6.32.15/drivers/input/mouse/psmouse-base.c 2010-05-28 21:27:15.580689971 -0400 |
25127 | @@ -1409,7 +1409,7 @@ static struct serio_device_id psmouse_se | 25142 | @@ -1409,7 +1409,7 @@ static struct serio_device_id psmouse_se |
25128 | .id = SERIO_ANY, | 25143 | .id = SERIO_ANY, |
25129 | .extra = SERIO_ANY, | 25144 | .extra = SERIO_ANY, |
@@ -25133,9 +25148,9 @@ diff -urNp linux-2.6.32.13/drivers/input/mouse/psmouse-base.c linux-2.6.32.13/dr | |||
25133 | }; | 25148 | }; |
25134 | 25149 | ||
25135 | MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); | 25150 | MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); |
25136 | diff -urNp linux-2.6.32.13/drivers/input/mouse/synaptics.c linux-2.6.32.13/drivers/input/mouse/synaptics.c | 25151 | diff -urNp linux-2.6.32.15/drivers/input/mouse/synaptics.c linux-2.6.32.15/drivers/input/mouse/synaptics.c |
25137 | --- linux-2.6.32.13/drivers/input/mouse/synaptics.c 2010-03-15 11:52:04.000000000 -0400 | 25152 | --- linux-2.6.32.15/drivers/input/mouse/synaptics.c 2010-03-15 11:52:04.000000000 -0400 |
25138 | +++ linux-2.6.32.13/drivers/input/mouse/synaptics.c 2010-05-15 13:21:15.430620618 -0400 | 25153 | +++ linux-2.6.32.15/drivers/input/mouse/synaptics.c 2010-05-28 21:27:15.587725031 -0400 |
25139 | @@ -437,7 +437,7 @@ static void synaptics_process_packet(str | 25154 | @@ -437,7 +437,7 @@ static void synaptics_process_packet(str |
25140 | break; | 25155 | break; |
25141 | case 2: | 25156 | case 2: |
@@ -25164,9 +25179,9 @@ diff -urNp linux-2.6.32.13/drivers/input/mouse/synaptics.c linux-2.6.32.13/drive | |||
25164 | }; | 25179 | }; |
25165 | #endif | 25180 | #endif |
25166 | 25181 | ||
25167 | diff -urNp linux-2.6.32.13/drivers/input/mousedev.c linux-2.6.32.13/drivers/input/mousedev.c | 25182 | diff -urNp linux-2.6.32.15/drivers/input/mousedev.c linux-2.6.32.15/drivers/input/mousedev.c |
25168 | --- linux-2.6.32.13/drivers/input/mousedev.c 2010-03-15 11:52:04.000000000 -0400 | 25183 | --- linux-2.6.32.15/drivers/input/mousedev.c 2010-03-15 11:52:04.000000000 -0400 |
25169 | +++ linux-2.6.32.13/drivers/input/mousedev.c 2010-05-15 13:21:15.435182881 -0400 | 25184 | +++ linux-2.6.32.15/drivers/input/mousedev.c 2010-05-28 21:27:15.592694173 -0400 |
25170 | @@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han | 25185 | @@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han |
25171 | 25186 | ||
25172 | #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX | 25187 | #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX |
@@ -25176,9 +25191,9 @@ diff -urNp linux-2.6.32.13/drivers/input/mousedev.c linux-2.6.32.13/drivers/inpu | |||
25176 | }; | 25191 | }; |
25177 | static int psaux_registered; | 25192 | static int psaux_registered; |
25178 | #endif | 25193 | #endif |
25179 | diff -urNp linux-2.6.32.13/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.13/drivers/input/serio/i8042-x86ia64io.h | 25194 | diff -urNp linux-2.6.32.15/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.15/drivers/input/serio/i8042-x86ia64io.h |
25180 | --- linux-2.6.32.13/drivers/input/serio/i8042-x86ia64io.h 2010-04-04 20:41:49.956500002 -0400 | 25195 | --- linux-2.6.32.15/drivers/input/serio/i8042-x86ia64io.h 2010-04-04 20:41:49.956500002 -0400 |
25181 | +++ linux-2.6.32.13/drivers/input/serio/i8042-x86ia64io.h 2010-05-15 13:21:15.435182881 -0400 | 25196 | +++ linux-2.6.32.15/drivers/input/serio/i8042-x86ia64io.h 2010-05-28 21:27:15.592694173 -0400 |
25182 | @@ -172,7 +172,7 @@ static const struct dmi_system_id __init | 25197 | @@ -172,7 +172,7 @@ static const struct dmi_system_id __init |
25183 | DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), | 25198 | DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), |
25184 | }, | 25199 | }, |
@@ -25233,9 +25248,9 @@ diff -urNp linux-2.6.32.13/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.13 | |||
25233 | }; | 25248 | }; |
25234 | 25249 | ||
25235 | #endif /* CONFIG_X86 */ | 25250 | #endif /* CONFIG_X86 */ |
25236 | diff -urNp linux-2.6.32.13/drivers/input/serio/serio_raw.c linux-2.6.32.13/drivers/input/serio/serio_raw.c | 25251 | diff -urNp linux-2.6.32.15/drivers/input/serio/serio_raw.c linux-2.6.32.15/drivers/input/serio/serio_raw.c |
25237 | --- linux-2.6.32.13/drivers/input/serio/serio_raw.c 2010-03-15 11:52:04.000000000 -0400 | 25252 | --- linux-2.6.32.15/drivers/input/serio/serio_raw.c 2010-03-15 11:52:04.000000000 -0400 |
25238 | +++ linux-2.6.32.13/drivers/input/serio/serio_raw.c 2010-05-15 13:21:15.435182881 -0400 | 25253 | +++ linux-2.6.32.15/drivers/input/serio/serio_raw.c 2010-05-28 21:27:15.596690001 -0400 |
25239 | @@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_ | 25254 | @@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_ |
25240 | .id = SERIO_ANY, | 25255 | .id = SERIO_ANY, |
25241 | .extra = SERIO_ANY, | 25256 | .extra = SERIO_ANY, |
@@ -25245,9 +25260,9 @@ diff -urNp linux-2.6.32.13/drivers/input/serio/serio_raw.c linux-2.6.32.13/drive | |||
25245 | }; | 25260 | }; |
25246 | 25261 | ||
25247 | MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); | 25262 | MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); |
25248 | diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/common.c linux-2.6.32.13/drivers/isdn/gigaset/common.c | 25263 | diff -urNp linux-2.6.32.15/drivers/isdn/gigaset/common.c linux-2.6.32.15/drivers/isdn/gigaset/common.c |
25249 | --- linux-2.6.32.13/drivers/isdn/gigaset/common.c 2010-03-15 11:52:04.000000000 -0400 | 25264 | --- linux-2.6.32.15/drivers/isdn/gigaset/common.c 2010-03-15 11:52:04.000000000 -0400 |
25250 | +++ linux-2.6.32.13/drivers/isdn/gigaset/common.c 2010-05-15 13:21:15.435182881 -0400 | 25265 | +++ linux-2.6.32.15/drivers/isdn/gigaset/common.c 2010-05-28 21:27:15.600680043 -0400 |
25251 | @@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct | 25266 | @@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct |
25252 | cs->commands_pending = 0; | 25267 | cs->commands_pending = 0; |
25253 | cs->cur_at_seq = 0; | 25268 | cs->cur_at_seq = 0; |
@@ -25257,9 +25272,9 @@ diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/common.c linux-2.6.32.13/drivers | |||
25257 | cs->dev = NULL; | 25272 | cs->dev = NULL; |
25258 | cs->tty = NULL; | 25273 | cs->tty = NULL; |
25259 | cs->tty_dev = NULL; | 25274 | cs->tty_dev = NULL; |
25260 | diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/gigaset.h linux-2.6.32.13/drivers/isdn/gigaset/gigaset.h | 25275 | diff -urNp linux-2.6.32.15/drivers/isdn/gigaset/gigaset.h linux-2.6.32.15/drivers/isdn/gigaset/gigaset.h |
25261 | --- linux-2.6.32.13/drivers/isdn/gigaset/gigaset.h 2010-03-15 11:52:04.000000000 -0400 | 25276 | --- linux-2.6.32.15/drivers/isdn/gigaset/gigaset.h 2010-03-15 11:52:04.000000000 -0400 |
25262 | +++ linux-2.6.32.13/drivers/isdn/gigaset/gigaset.h 2010-05-15 13:21:15.435182881 -0400 | 25277 | +++ linux-2.6.32.15/drivers/isdn/gigaset/gigaset.h 2010-05-28 21:27:15.600680043 -0400 |
25263 | @@ -446,7 +446,7 @@ struct cardstate { | 25278 | @@ -446,7 +446,7 @@ struct cardstate { |
25264 | spinlock_t cmdlock; | 25279 | spinlock_t cmdlock; |
25265 | unsigned curlen, cmdbytes; | 25280 | unsigned curlen, cmdbytes; |
@@ -25269,9 +25284,9 @@ diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/gigaset.h linux-2.6.32.13/driver | |||
25269 | struct tty_struct *tty; | 25284 | struct tty_struct *tty; |
25270 | struct tasklet_struct if_wake_tasklet; | 25285 | struct tasklet_struct if_wake_tasklet; |
25271 | unsigned control_state; | 25286 | unsigned control_state; |
25272 | diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/interface.c linux-2.6.32.13/drivers/isdn/gigaset/interface.c | 25287 | diff -urNp linux-2.6.32.15/drivers/isdn/gigaset/interface.c linux-2.6.32.15/drivers/isdn/gigaset/interface.c |
25273 | --- linux-2.6.32.13/drivers/isdn/gigaset/interface.c 2010-04-04 20:41:49.956500002 -0400 | 25288 | --- linux-2.6.32.15/drivers/isdn/gigaset/interface.c 2010-04-04 20:41:49.956500002 -0400 |
25274 | +++ linux-2.6.32.13/drivers/isdn/gigaset/interface.c 2010-05-15 13:21:15.462977265 -0400 | 25289 | +++ linux-2.6.32.15/drivers/isdn/gigaset/interface.c 2010-05-28 21:27:15.600680043 -0400 |
25275 | @@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt | 25290 | @@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt |
25276 | return -ERESTARTSYS; // FIXME -EINTR? | 25291 | return -ERESTARTSYS; // FIXME -EINTR? |
25277 | tty->driver_data = cs; | 25292 | tty->driver_data = cs; |
@@ -25359,9 +25374,9 @@ diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/interface.c linux-2.6.32.13/driv | |||
25359 | dev_warn(cs->dev, "%s: device not opened\n", __func__); | 25374 | dev_warn(cs->dev, "%s: device not opened\n", __func__); |
25360 | goto out; | 25375 | goto out; |
25361 | } | 25376 | } |
25362 | diff -urNp linux-2.6.32.13/drivers/isdn/hardware/avm/b1.c linux-2.6.32.13/drivers/isdn/hardware/avm/b1.c | 25377 | diff -urNp linux-2.6.32.15/drivers/isdn/hardware/avm/b1.c linux-2.6.32.15/drivers/isdn/hardware/avm/b1.c |
25363 | --- linux-2.6.32.13/drivers/isdn/hardware/avm/b1.c 2010-03-15 11:52:04.000000000 -0400 | 25378 | --- linux-2.6.32.15/drivers/isdn/hardware/avm/b1.c 2010-03-15 11:52:04.000000000 -0400 |
25364 | +++ linux-2.6.32.13/drivers/isdn/hardware/avm/b1.c 2010-05-15 13:21:15.462977265 -0400 | 25379 | +++ linux-2.6.32.15/drivers/isdn/hardware/avm/b1.c 2010-05-28 21:27:15.600680043 -0400 |
25365 | @@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo | 25380 | @@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo |
25366 | } | 25381 | } |
25367 | if (left) { | 25382 | if (left) { |
@@ -25380,9 +25395,9 @@ diff -urNp linux-2.6.32.13/drivers/isdn/hardware/avm/b1.c linux-2.6.32.13/driver | |||
25380 | return -EFAULT; | 25395 | return -EFAULT; |
25381 | } else { | 25396 | } else { |
25382 | memcpy(buf, dp, left); | 25397 | memcpy(buf, dp, left); |
25383 | diff -urNp linux-2.6.32.13/drivers/isdn/icn/icn.c linux-2.6.32.13/drivers/isdn/icn/icn.c | 25398 | diff -urNp linux-2.6.32.15/drivers/isdn/icn/icn.c linux-2.6.32.15/drivers/isdn/icn/icn.c |
25384 | --- linux-2.6.32.13/drivers/isdn/icn/icn.c 2010-03-15 11:52:04.000000000 -0400 | 25399 | --- linux-2.6.32.15/drivers/isdn/icn/icn.c 2010-03-15 11:52:04.000000000 -0400 |
25385 | +++ linux-2.6.32.13/drivers/isdn/icn/icn.c 2010-05-15 13:21:15.462977265 -0400 | 25400 | +++ linux-2.6.32.15/drivers/isdn/icn/icn.c 2010-05-28 21:27:15.600680043 -0400 |
25386 | @@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len | 25401 | @@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len |
25387 | if (count > len) | 25402 | if (count > len) |
25388 | count = len; | 25403 | count = len; |
@@ -25392,9 +25407,9 @@ diff -urNp linux-2.6.32.13/drivers/isdn/icn/icn.c linux-2.6.32.13/drivers/isdn/i | |||
25392 | return -EFAULT; | 25407 | return -EFAULT; |
25393 | } else | 25408 | } else |
25394 | memcpy(msg, buf, count); | 25409 | memcpy(msg, buf, count); |
25395 | diff -urNp linux-2.6.32.13/drivers/lguest/core.c linux-2.6.32.13/drivers/lguest/core.c | 25410 | diff -urNp linux-2.6.32.15/drivers/lguest/core.c linux-2.6.32.15/drivers/lguest/core.c |
25396 | --- linux-2.6.32.13/drivers/lguest/core.c 2010-03-15 11:52:04.000000000 -0400 | 25411 | --- linux-2.6.32.15/drivers/lguest/core.c 2010-03-15 11:52:04.000000000 -0400 |
25397 | +++ linux-2.6.32.13/drivers/lguest/core.c 2010-05-15 13:21:15.466573931 -0400 | 25412 | +++ linux-2.6.32.15/drivers/lguest/core.c 2010-05-28 21:27:15.600680043 -0400 |
25398 | @@ -91,9 +91,17 @@ static __init int map_switcher(void) | 25413 | @@ -91,9 +91,17 @@ static __init int map_switcher(void) |
25399 | * it's worked so far. The end address needs +1 because __get_vm_area | 25414 | * it's worked so far. The end address needs +1 because __get_vm_area |
25400 | * allocates an extra guard page, so we need space for that. | 25415 | * allocates an extra guard page, so we need space for that. |
@@ -25413,9 +25428,9 @@ diff -urNp linux-2.6.32.13/drivers/lguest/core.c linux-2.6.32.13/drivers/lguest/ | |||
25413 | if (!switcher_vma) { | 25428 | if (!switcher_vma) { |
25414 | err = -ENOMEM; | 25429 | err = -ENOMEM; |
25415 | printk("lguest: could not map switcher pages high\n"); | 25430 | printk("lguest: could not map switcher pages high\n"); |
25416 | diff -urNp linux-2.6.32.13/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.13/drivers/macintosh/via-pmu-backlight.c | 25431 | diff -urNp linux-2.6.32.15/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.15/drivers/macintosh/via-pmu-backlight.c |
25417 | --- linux-2.6.32.13/drivers/macintosh/via-pmu-backlight.c 2010-03-15 11:52:04.000000000 -0400 | 25432 | --- linux-2.6.32.15/drivers/macintosh/via-pmu-backlight.c 2010-03-15 11:52:04.000000000 -0400 |
25418 | +++ linux-2.6.32.13/drivers/macintosh/via-pmu-backlight.c 2010-05-15 13:21:15.466573931 -0400 | 25433 | +++ linux-2.6.32.15/drivers/macintosh/via-pmu-backlight.c 2010-05-28 21:27:15.600680043 -0400 |
25419 | @@ -15,7 +15,7 @@ | 25434 | @@ -15,7 +15,7 @@ |
25420 | 25435 | ||
25421 | #define MAX_PMU_LEVEL 0xFF | 25436 | #define MAX_PMU_LEVEL 0xFF |
@@ -25434,9 +25449,9 @@ diff -urNp linux-2.6.32.13/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.13 | |||
25434 | .get_brightness = pmu_backlight_get_brightness, | 25449 | .get_brightness = pmu_backlight_get_brightness, |
25435 | .update_status = pmu_backlight_update_status, | 25450 | .update_status = pmu_backlight_update_status, |
25436 | 25451 | ||
25437 | diff -urNp linux-2.6.32.13/drivers/macintosh/via-pmu.c linux-2.6.32.13/drivers/macintosh/via-pmu.c | 25452 | diff -urNp linux-2.6.32.15/drivers/macintosh/via-pmu.c linux-2.6.32.15/drivers/macintosh/via-pmu.c |
25438 | --- linux-2.6.32.13/drivers/macintosh/via-pmu.c 2010-03-15 11:52:04.000000000 -0400 | 25453 | --- linux-2.6.32.15/drivers/macintosh/via-pmu.c 2010-03-15 11:52:04.000000000 -0400 |
25439 | +++ linux-2.6.32.13/drivers/macintosh/via-pmu.c 2010-05-15 13:21:15.488292870 -0400 | 25454 | +++ linux-2.6.32.15/drivers/macintosh/via-pmu.c 2010-05-28 21:27:15.608683910 -0400 |
25440 | @@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state | 25455 | @@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state |
25441 | && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); | 25456 | && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); |
25442 | } | 25457 | } |
@@ -25446,9 +25461,9 @@ diff -urNp linux-2.6.32.13/drivers/macintosh/via-pmu.c linux-2.6.32.13/drivers/m | |||
25446 | .enter = powerbook_sleep, | 25461 | .enter = powerbook_sleep, |
25447 | .valid = pmu_sleep_valid, | 25462 | .valid = pmu_sleep_valid, |
25448 | }; | 25463 | }; |
25449 | diff -urNp linux-2.6.32.13/drivers/md/bitmap.c linux-2.6.32.13/drivers/md/bitmap.c | 25464 | diff -urNp linux-2.6.32.15/drivers/md/bitmap.c linux-2.6.32.15/drivers/md/bitmap.c |
25450 | --- linux-2.6.32.13/drivers/md/bitmap.c 2010-03-15 11:52:04.000000000 -0400 | 25465 | --- linux-2.6.32.15/drivers/md/bitmap.c 2010-03-15 11:52:04.000000000 -0400 |
25451 | +++ linux-2.6.32.13/drivers/md/bitmap.c 2010-05-15 13:21:15.498921900 -0400 | 25466 | +++ linux-2.6.32.15/drivers/md/bitmap.c 2010-05-28 21:27:15.608683910 -0400 |
25452 | @@ -58,7 +58,7 @@ | 25467 | @@ -58,7 +58,7 @@ |
25453 | # if DEBUG > 0 | 25468 | # if DEBUG > 0 |
25454 | # define PRINTK(x...) printk(KERN_DEBUG x) | 25469 | # define PRINTK(x...) printk(KERN_DEBUG x) |
@@ -25458,9 +25473,9 @@ diff -urNp linux-2.6.32.13/drivers/md/bitmap.c linux-2.6.32.13/drivers/md/bitmap | |||
25458 | # endif | 25473 | # endif |
25459 | #endif | 25474 | #endif |
25460 | 25475 | ||
25461 | diff -urNp linux-2.6.32.13/drivers/md/dm-sysfs.c linux-2.6.32.13/drivers/md/dm-sysfs.c | 25476 | diff -urNp linux-2.6.32.15/drivers/md/dm-sysfs.c linux-2.6.32.15/drivers/md/dm-sysfs.c |
25462 | --- linux-2.6.32.13/drivers/md/dm-sysfs.c 2010-03-15 11:52:04.000000000 -0400 | 25477 | --- linux-2.6.32.15/drivers/md/dm-sysfs.c 2010-03-15 11:52:04.000000000 -0400 |
25463 | +++ linux-2.6.32.13/drivers/md/dm-sysfs.c 2010-05-15 13:21:15.498921900 -0400 | 25478 | +++ linux-2.6.32.15/drivers/md/dm-sysfs.c 2010-05-28 21:27:15.608683910 -0400 |
25464 | @@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = { | 25479 | @@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = { |
25465 | NULL, | 25480 | NULL, |
25466 | }; | 25481 | }; |
@@ -25470,9 +25485,9 @@ diff -urNp linux-2.6.32.13/drivers/md/dm-sysfs.c linux-2.6.32.13/drivers/md/dm-s | |||
25470 | .show = dm_attr_show, | 25485 | .show = dm_attr_show, |
25471 | }; | 25486 | }; |
25472 | 25487 | ||
25473 | diff -urNp linux-2.6.32.13/drivers/md/dm-table.c linux-2.6.32.13/drivers/md/dm-table.c | 25488 | diff -urNp linux-2.6.32.15/drivers/md/dm-table.c linux-2.6.32.15/drivers/md/dm-table.c |
25474 | --- linux-2.6.32.13/drivers/md/dm-table.c 2010-03-15 11:52:04.000000000 -0400 | 25489 | --- linux-2.6.32.15/drivers/md/dm-table.c 2010-03-15 11:52:04.000000000 -0400 |
25475 | +++ linux-2.6.32.13/drivers/md/dm-table.c 2010-05-15 13:21:15.498921900 -0400 | 25490 | +++ linux-2.6.32.15/drivers/md/dm-table.c 2010-05-28 21:27:15.608683910 -0400 |
25476 | @@ -359,7 +359,7 @@ static int device_area_is_invalid(struct | 25491 | @@ -359,7 +359,7 @@ static int device_area_is_invalid(struct |
25477 | if (!dev_size) | 25492 | if (!dev_size) |
25478 | return 0; | 25493 | return 0; |
@@ -25482,9 +25497,9 @@ diff -urNp linux-2.6.32.13/drivers/md/dm-table.c linux-2.6.32.13/drivers/md/dm-t | |||
25482 | DMWARN("%s: %s too small for target: " | 25497 | DMWARN("%s: %s too small for target: " |
25483 | "start=%llu, len=%llu, dev_size=%llu", | 25498 | "start=%llu, len=%llu, dev_size=%llu", |
25484 | dm_device_name(ti->table->md), bdevname(bdev, b), | 25499 | dm_device_name(ti->table->md), bdevname(bdev, b), |
25485 | diff -urNp linux-2.6.32.13/drivers/md/md.c linux-2.6.32.13/drivers/md/md.c | 25500 | diff -urNp linux-2.6.32.15/drivers/md/md.c linux-2.6.32.15/drivers/md/md.c |
25486 | --- linux-2.6.32.13/drivers/md/md.c 2010-05-15 13:20:18.542567696 -0400 | 25501 | --- linux-2.6.32.15/drivers/md/md.c 2010-05-15 13:20:18.542567696 -0400 |
25487 | +++ linux-2.6.32.13/drivers/md/md.c 2010-05-15 13:21:15.498921900 -0400 | 25502 | +++ linux-2.6.32.15/drivers/md/md.c 2010-05-28 21:27:15.608683910 -0400 |
25488 | @@ -2514,7 +2514,7 @@ static void rdev_free(struct kobject *ko | 25503 | @@ -2514,7 +2514,7 @@ static void rdev_free(struct kobject *ko |
25489 | mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj); | 25504 | mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj); |
25490 | kfree(rdev); | 25505 | kfree(rdev); |
@@ -25521,9 +25536,9 @@ diff -urNp linux-2.6.32.13/drivers/md/md.c linux-2.6.32.13/drivers/md/md.c | |||
25521 | /* sync IO will cause sync_io to increase before the disk_stats | 25536 | /* sync IO will cause sync_io to increase before the disk_stats |
25522 | * as sync_io is counted when a request starts, and | 25537 | * as sync_io is counted when a request starts, and |
25523 | * disk_stats is counted when it completes. | 25538 | * disk_stats is counted when it completes. |
25524 | diff -urNp linux-2.6.32.13/drivers/md/md.h linux-2.6.32.13/drivers/md/md.h | 25539 | diff -urNp linux-2.6.32.15/drivers/md/md.h linux-2.6.32.15/drivers/md/md.h |
25525 | --- linux-2.6.32.13/drivers/md/md.h 2010-03-15 11:52:04.000000000 -0400 | 25540 | --- linux-2.6.32.15/drivers/md/md.h 2010-03-15 11:52:04.000000000 -0400 |
25526 | +++ linux-2.6.32.13/drivers/md/md.h 2010-05-15 13:21:15.507356136 -0400 | 25541 | +++ linux-2.6.32.15/drivers/md/md.h 2010-05-28 21:27:15.608683910 -0400 |
25527 | @@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_ | 25542 | @@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_ |
25528 | 25543 | ||
25529 | static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) | 25544 | static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) |
@@ -25533,9 +25548,9 @@ diff -urNp linux-2.6.32.13/drivers/md/md.h linux-2.6.32.13/drivers/md/md.h | |||
25533 | } | 25548 | } |
25534 | 25549 | ||
25535 | struct mdk_personality | 25550 | struct mdk_personality |
25536 | diff -urNp linux-2.6.32.13/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.13/drivers/media/dvb/dvb-core/dvbdev.c | 25551 | diff -urNp linux-2.6.32.15/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.15/drivers/media/dvb/dvb-core/dvbdev.c |
25537 | --- linux-2.6.32.13/drivers/media/dvb/dvb-core/dvbdev.c 2010-03-15 11:52:04.000000000 -0400 | 25552 | --- linux-2.6.32.15/drivers/media/dvb/dvb-core/dvbdev.c 2010-03-15 11:52:04.000000000 -0400 |
25538 | +++ linux-2.6.32.13/drivers/media/dvb/dvb-core/dvbdev.c 2010-05-15 13:21:15.510998118 -0400 | 25553 | +++ linux-2.6.32.15/drivers/media/dvb/dvb-core/dvbdev.c 2010-05-28 21:27:15.616695200 -0400 |
25539 | @@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt | 25554 | @@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt |
25540 | const struct dvb_device *template, void *priv, int type) | 25555 | const struct dvb_device *template, void *priv, int type) |
25541 | { | 25556 | { |
@@ -25544,9 +25559,9 @@ diff -urNp linux-2.6.32.13/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.13/d | |||
25544 | struct file_operations *dvbdevfops; | 25559 | struct file_operations *dvbdevfops; |
25545 | struct device *clsdev; | 25560 | struct device *clsdev; |
25546 | int minor; | 25561 | int minor; |
25547 | diff -urNp linux-2.6.32.13/drivers/media/radio/radio-cadet.c linux-2.6.32.13/drivers/media/radio/radio-cadet.c | 25562 | diff -urNp linux-2.6.32.15/drivers/media/radio/radio-cadet.c linux-2.6.32.15/drivers/media/radio/radio-cadet.c |
25548 | --- linux-2.6.32.13/drivers/media/radio/radio-cadet.c 2010-03-15 11:52:04.000000000 -0400 | 25563 | --- linux-2.6.32.15/drivers/media/radio/radio-cadet.c 2010-03-15 11:52:04.000000000 -0400 |
25549 | +++ linux-2.6.32.13/drivers/media/radio/radio-cadet.c 2010-05-15 13:21:15.510998118 -0400 | 25564 | +++ linux-2.6.32.15/drivers/media/radio/radio-cadet.c 2010-05-28 21:27:15.616695200 -0400 |
25550 | @@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f | 25565 | @@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f |
25551 | while (i < count && dev->rdsin != dev->rdsout) | 25566 | while (i < count && dev->rdsin != dev->rdsout) |
25552 | readbuf[i++] = dev->rdsbuf[dev->rdsout++]; | 25567 | readbuf[i++] = dev->rdsbuf[dev->rdsout++]; |
@@ -25556,9 +25571,9 @@ diff -urNp linux-2.6.32.13/drivers/media/radio/radio-cadet.c linux-2.6.32.13/dri | |||
25556 | return -EFAULT; | 25571 | return -EFAULT; |
25557 | return i; | 25572 | return i; |
25558 | } | 25573 | } |
25559 | diff -urNp linux-2.6.32.13/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.13/drivers/media/video/usbvideo/konicawc.c | 25574 | diff -urNp linux-2.6.32.15/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.15/drivers/media/video/usbvideo/konicawc.c |
25560 | --- linux-2.6.32.13/drivers/media/video/usbvideo/konicawc.c 2010-03-15 11:52:04.000000000 -0400 | 25575 | --- linux-2.6.32.15/drivers/media/video/usbvideo/konicawc.c 2010-03-15 11:52:04.000000000 -0400 |
25561 | +++ linux-2.6.32.13/drivers/media/video/usbvideo/konicawc.c 2010-05-15 13:21:15.526921305 -0400 | 25576 | +++ linux-2.6.32.15/drivers/media/video/usbvideo/konicawc.c 2010-05-28 21:27:15.628727154 -0400 |
25562 | @@ -225,7 +225,7 @@ static void konicawc_register_input(stru | 25577 | @@ -225,7 +225,7 @@ static void konicawc_register_input(stru |
25563 | int error; | 25578 | int error; |
25564 | 25579 | ||
@@ -25568,9 +25583,9 @@ diff -urNp linux-2.6.32.13/drivers/media/video/usbvideo/konicawc.c linux-2.6.32. | |||
25568 | 25583 | ||
25569 | cam->input = input_dev = input_allocate_device(); | 25584 | cam->input = input_dev = input_allocate_device(); |
25570 | if (!input_dev) { | 25585 | if (!input_dev) { |
25571 | diff -urNp linux-2.6.32.13/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.13/drivers/media/video/usbvideo/quickcam_messenger.c | 25586 | diff -urNp linux-2.6.32.15/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.15/drivers/media/video/usbvideo/quickcam_messenger.c |
25572 | --- linux-2.6.32.13/drivers/media/video/usbvideo/quickcam_messenger.c 2010-03-15 11:52:04.000000000 -0400 | 25587 | --- linux-2.6.32.15/drivers/media/video/usbvideo/quickcam_messenger.c 2010-03-15 11:52:04.000000000 -0400 |
25573 | +++ linux-2.6.32.13/drivers/media/video/usbvideo/quickcam_messenger.c 2010-05-15 13:21:15.526921305 -0400 | 25588 | +++ linux-2.6.32.15/drivers/media/video/usbvideo/quickcam_messenger.c 2010-05-28 21:27:15.630929247 -0400 |
25574 | @@ -89,7 +89,7 @@ static void qcm_register_input(struct qc | 25589 | @@ -89,7 +89,7 @@ static void qcm_register_input(struct qc |
25575 | int error; | 25590 | int error; |
25576 | 25591 | ||
@@ -25580,9 +25595,9 @@ diff -urNp linux-2.6.32.13/drivers/media/video/usbvideo/quickcam_messenger.c lin | |||
25580 | 25595 | ||
25581 | cam->input = input_dev = input_allocate_device(); | 25596 | cam->input = input_dev = input_allocate_device(); |
25582 | if (!input_dev) { | 25597 | if (!input_dev) { |
25583 | diff -urNp linux-2.6.32.13/drivers/message/fusion/mptdebug.h linux-2.6.32.13/drivers/message/fusion/mptdebug.h | 25598 | diff -urNp linux-2.6.32.15/drivers/message/fusion/mptdebug.h linux-2.6.32.15/drivers/message/fusion/mptdebug.h |
25584 | --- linux-2.6.32.13/drivers/message/fusion/mptdebug.h 2010-03-15 11:52:04.000000000 -0400 | 25599 | --- linux-2.6.32.15/drivers/message/fusion/mptdebug.h 2010-03-15 11:52:04.000000000 -0400 |
25585 | +++ linux-2.6.32.13/drivers/message/fusion/mptdebug.h 2010-05-15 13:21:15.526921305 -0400 | 25600 | +++ linux-2.6.32.15/drivers/message/fusion/mptdebug.h 2010-05-28 21:27:15.630929247 -0400 |
25586 | @@ -71,7 +71,7 @@ | 25601 | @@ -71,7 +71,7 @@ |
25587 | CMD; \ | 25602 | CMD; \ |
25588 | } | 25603 | } |
@@ -25592,9 +25607,9 @@ diff -urNp linux-2.6.32.13/drivers/message/fusion/mptdebug.h linux-2.6.32.13/dri | |||
25592 | #endif | 25607 | #endif |
25593 | 25608 | ||
25594 | 25609 | ||
25595 | diff -urNp linux-2.6.32.13/drivers/message/fusion/mptsas.c linux-2.6.32.13/drivers/message/fusion/mptsas.c | 25610 | diff -urNp linux-2.6.32.15/drivers/message/fusion/mptsas.c linux-2.6.32.15/drivers/message/fusion/mptsas.c |
25596 | --- linux-2.6.32.13/drivers/message/fusion/mptsas.c 2010-03-15 11:52:04.000000000 -0400 | 25611 | --- linux-2.6.32.15/drivers/message/fusion/mptsas.c 2010-03-15 11:52:04.000000000 -0400 |
25597 | +++ linux-2.6.32.13/drivers/message/fusion/mptsas.c 2010-05-15 13:21:15.526921305 -0400 | 25612 | +++ linux-2.6.32.15/drivers/message/fusion/mptsas.c 2010-05-28 21:27:15.639064560 -0400 |
25598 | @@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin | 25613 | @@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin |
25599 | return 0; | 25614 | return 0; |
25600 | } | 25615 | } |
@@ -25643,9 +25658,9 @@ diff -urNp linux-2.6.32.13/drivers/message/fusion/mptsas.c linux-2.6.32.13/drive | |||
25643 | static inline struct sas_port * | 25658 | static inline struct sas_port * |
25644 | mptsas_get_port(struct mptsas_phyinfo *phy_info) | 25659 | mptsas_get_port(struct mptsas_phyinfo *phy_info) |
25645 | { | 25660 | { |
25646 | diff -urNp linux-2.6.32.13/drivers/message/i2o/i2o_proc.c linux-2.6.32.13/drivers/message/i2o/i2o_proc.c | 25661 | diff -urNp linux-2.6.32.15/drivers/message/i2o/i2o_proc.c linux-2.6.32.15/drivers/message/i2o/i2o_proc.c |
25647 | --- linux-2.6.32.13/drivers/message/i2o/i2o_proc.c 2010-03-15 11:52:04.000000000 -0400 | 25662 | --- linux-2.6.32.15/drivers/message/i2o/i2o_proc.c 2010-03-15 11:52:04.000000000 -0400 |
25648 | +++ linux-2.6.32.13/drivers/message/i2o/i2o_proc.c 2010-05-15 13:21:15.526921305 -0400 | 25663 | +++ linux-2.6.32.15/drivers/message/i2o/i2o_proc.c 2010-05-28 21:27:15.639064560 -0400 |
25649 | @@ -259,13 +259,6 @@ static char *scsi_devices[] = { | 25664 | @@ -259,13 +259,6 @@ static char *scsi_devices[] = { |
25650 | "Array Controller Device" | 25665 | "Array Controller Device" |
25651 | }; | 25666 | }; |
@@ -25732,9 +25747,9 @@ diff -urNp linux-2.6.32.13/drivers/message/i2o/i2o_proc.c linux-2.6.32.13/driver | |||
25732 | 25747 | ||
25733 | return 0; | 25748 | return 0; |
25734 | } | 25749 | } |
25735 | diff -urNp linux-2.6.32.13/drivers/misc/kgdbts.c linux-2.6.32.13/drivers/misc/kgdbts.c | 25750 | diff -urNp linux-2.6.32.15/drivers/misc/kgdbts.c linux-2.6.32.15/drivers/misc/kgdbts.c |
25736 | --- linux-2.6.32.13/drivers/misc/kgdbts.c 2010-03-15 11:52:04.000000000 -0400 | 25751 | --- linux-2.6.32.15/drivers/misc/kgdbts.c 2010-03-15 11:52:04.000000000 -0400 |
25737 | +++ linux-2.6.32.13/drivers/misc/kgdbts.c 2010-05-15 13:21:15.554995461 -0400 | 25752 | +++ linux-2.6.32.15/drivers/misc/kgdbts.c 2010-05-28 21:27:15.650946222 -0400 |
25738 | @@ -118,7 +118,7 @@ | 25753 | @@ -118,7 +118,7 @@ |
25739 | } while (0) | 25754 | } while (0) |
25740 | #define MAX_CONFIG_LEN 40 | 25755 | #define MAX_CONFIG_LEN 40 |
@@ -25753,9 +25768,9 @@ diff -urNp linux-2.6.32.13/drivers/misc/kgdbts.c linux-2.6.32.13/drivers/misc/kg | |||
25753 | .name = "kgdbts", | 25768 | .name = "kgdbts", |
25754 | .read_char = kgdbts_get_char, | 25769 | .read_char = kgdbts_get_char, |
25755 | .write_char = kgdbts_put_char, | 25770 | .write_char = kgdbts_put_char, |
25756 | diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.13/drivers/misc/sgi-gru/gruhandles.c | 25771 | diff -urNp linux-2.6.32.15/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.15/drivers/misc/sgi-gru/gruhandles.c |
25757 | --- linux-2.6.32.13/drivers/misc/sgi-gru/gruhandles.c 2010-03-15 11:52:04.000000000 -0400 | 25772 | --- linux-2.6.32.15/drivers/misc/sgi-gru/gruhandles.c 2010-03-15 11:52:04.000000000 -0400 |
25758 | +++ linux-2.6.32.13/drivers/misc/sgi-gru/gruhandles.c 2010-05-15 13:21:15.554995461 -0400 | 25773 | +++ linux-2.6.32.15/drivers/misc/sgi-gru/gruhandles.c 2010-05-28 21:27:15.650946222 -0400 |
25759 | @@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic | 25774 | @@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic |
25760 | 25775 | ||
25761 | static void update_mcs_stats(enum mcs_op op, unsigned long clks) | 25776 | static void update_mcs_stats(enum mcs_op op, unsigned long clks) |
@@ -25767,9 +25782,9 @@ diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.13/dri | |||
25767 | if (mcs_op_statistics[op].max < clks) | 25782 | if (mcs_op_statistics[op].max < clks) |
25768 | mcs_op_statistics[op].max = clks; | 25783 | mcs_op_statistics[op].max = clks; |
25769 | } | 25784 | } |
25770 | diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.13/drivers/misc/sgi-gru/gruprocfs.c | 25785 | diff -urNp linux-2.6.32.15/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.15/drivers/misc/sgi-gru/gruprocfs.c |
25771 | --- linux-2.6.32.13/drivers/misc/sgi-gru/gruprocfs.c 2010-03-15 11:52:04.000000000 -0400 | 25786 | --- linux-2.6.32.15/drivers/misc/sgi-gru/gruprocfs.c 2010-03-15 11:52:04.000000000 -0400 |
25772 | +++ linux-2.6.32.13/drivers/misc/sgi-gru/gruprocfs.c 2010-05-15 13:21:15.554995461 -0400 | 25787 | +++ linux-2.6.32.15/drivers/misc/sgi-gru/gruprocfs.c 2010-05-28 21:27:15.650946222 -0400 |
25773 | @@ -32,9 +32,9 @@ | 25788 | @@ -32,9 +32,9 @@ |
25774 | 25789 | ||
25775 | #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) | 25790 | #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) |
@@ -25793,9 +25808,9 @@ diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.13/driv | |||
25793 | max = mcs_op_statistics[op].max; | 25808 | max = mcs_op_statistics[op].max; |
25794 | seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, | 25809 | seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, |
25795 | count ? total / count : 0, max); | 25810 | count ? total / count : 0, max); |
25796 | diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h | 25811 | diff -urNp linux-2.6.32.15/drivers/misc/sgi-gru/grutables.h linux-2.6.32.15/drivers/misc/sgi-gru/grutables.h |
25797 | --- linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h 2010-03-15 11:52:04.000000000 -0400 | 25812 | --- linux-2.6.32.15/drivers/misc/sgi-gru/grutables.h 2010-03-15 11:52:04.000000000 -0400 |
25798 | +++ linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h 2010-05-15 13:21:15.554995461 -0400 | 25813 | +++ linux-2.6.32.15/drivers/misc/sgi-gru/grutables.h 2010-05-28 21:27:15.650946222 -0400 |
25799 | @@ -167,84 +167,84 @@ extern unsigned int gru_max_gids; | 25814 | @@ -167,84 +167,84 @@ extern unsigned int gru_max_gids; |
25800 | * GRU statistics. | 25815 | * GRU statistics. |
25801 | */ | 25816 | */ |
@@ -25979,9 +25994,9 @@ diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h linux-2.6.32.13/driv | |||
25979 | } while (0) | 25994 | } while (0) |
25980 | 25995 | ||
25981 | #ifdef CONFIG_SGI_GRU_DEBUG | 25996 | #ifdef CONFIG_SGI_GRU_DEBUG |
25982 | diff -urNp linux-2.6.32.13/drivers/mtd/devices/doc2000.c linux-2.6.32.13/drivers/mtd/devices/doc2000.c | 25997 | diff -urNp linux-2.6.32.15/drivers/mtd/devices/doc2000.c linux-2.6.32.15/drivers/mtd/devices/doc2000.c |
25983 | --- linux-2.6.32.13/drivers/mtd/devices/doc2000.c 2010-03-15 11:52:04.000000000 -0400 | 25998 | --- linux-2.6.32.15/drivers/mtd/devices/doc2000.c 2010-03-15 11:52:04.000000000 -0400 |
25984 | +++ linux-2.6.32.13/drivers/mtd/devices/doc2000.c 2010-05-15 13:21:15.563050037 -0400 | 25999 | +++ linux-2.6.32.15/drivers/mtd/devices/doc2000.c 2010-05-28 21:27:15.650946222 -0400 |
25985 | @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt | 26000 | @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt |
25986 | 26001 | ||
25987 | /* The ECC will not be calculated correctly if less than 512 is written */ | 26002 | /* The ECC will not be calculated correctly if less than 512 is written */ |
@@ -25991,9 +26006,9 @@ diff -urNp linux-2.6.32.13/drivers/mtd/devices/doc2000.c linux-2.6.32.13/drivers | |||
25991 | printk(KERN_WARNING | 26006 | printk(KERN_WARNING |
25992 | "ECC needs a full sector write (adr: %lx size %lx)\n", | 26007 | "ECC needs a full sector write (adr: %lx size %lx)\n", |
25993 | (long) to, (long) len); | 26008 | (long) to, (long) len); |
25994 | diff -urNp linux-2.6.32.13/drivers/mtd/devices/doc2001.c linux-2.6.32.13/drivers/mtd/devices/doc2001.c | 26009 | diff -urNp linux-2.6.32.15/drivers/mtd/devices/doc2001.c linux-2.6.32.15/drivers/mtd/devices/doc2001.c |
25995 | --- linux-2.6.32.13/drivers/mtd/devices/doc2001.c 2010-03-15 11:52:04.000000000 -0400 | 26010 | --- linux-2.6.32.15/drivers/mtd/devices/doc2001.c 2010-03-15 11:52:04.000000000 -0400 |
25996 | +++ linux-2.6.32.13/drivers/mtd/devices/doc2001.c 2010-05-15 13:21:15.563050037 -0400 | 26011 | +++ linux-2.6.32.15/drivers/mtd/devices/doc2001.c 2010-05-28 21:27:15.650946222 -0400 |
25997 | @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt | 26012 | @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt |
25998 | struct Nand *mychip = &this->chips[from >> (this->chipshift)]; | 26013 | struct Nand *mychip = &this->chips[from >> (this->chipshift)]; |
25999 | 26014 | ||
@@ -26003,9 +26018,9 @@ diff -urNp linux-2.6.32.13/drivers/mtd/devices/doc2001.c linux-2.6.32.13/drivers | |||
26003 | return -EINVAL; | 26018 | return -EINVAL; |
26004 | 26019 | ||
26005 | /* Don't allow a single read to cross a 512-byte block boundary */ | 26020 | /* Don't allow a single read to cross a 512-byte block boundary */ |
26006 | diff -urNp linux-2.6.32.13/drivers/mtd/ubi/build.c linux-2.6.32.13/drivers/mtd/ubi/build.c | 26021 | diff -urNp linux-2.6.32.15/drivers/mtd/ubi/build.c linux-2.6.32.15/drivers/mtd/ubi/build.c |
26007 | --- linux-2.6.32.13/drivers/mtd/ubi/build.c 2010-03-15 11:52:04.000000000 -0400 | 26022 | --- linux-2.6.32.15/drivers/mtd/ubi/build.c 2010-03-15 11:52:04.000000000 -0400 |
26008 | +++ linux-2.6.32.13/drivers/mtd/ubi/build.c 2010-05-15 13:21:15.566632432 -0400 | 26023 | +++ linux-2.6.32.15/drivers/mtd/ubi/build.c 2010-05-28 21:27:15.650946222 -0400 |
26009 | @@ -1255,7 +1255,7 @@ module_exit(ubi_exit); | 26024 | @@ -1255,7 +1255,7 @@ module_exit(ubi_exit); |
26010 | static int __init bytes_str_to_int(const char *str) | 26025 | static int __init bytes_str_to_int(const char *str) |
26011 | { | 26026 | { |
@@ -26045,9 +26060,9 @@ diff -urNp linux-2.6.32.13/drivers/mtd/ubi/build.c linux-2.6.32.13/drivers/mtd/u | |||
26045 | } | 26060 | } |
26046 | 26061 | ||
26047 | /** | 26062 | /** |
26048 | diff -urNp linux-2.6.32.13/drivers/net/e1000e/82571.c linux-2.6.32.13/drivers/net/e1000e/82571.c | 26063 | diff -urNp linux-2.6.32.15/drivers/net/e1000e/82571.c linux-2.6.32.15/drivers/net/e1000e/82571.c |
26049 | --- linux-2.6.32.13/drivers/net/e1000e/82571.c 2010-03-15 11:52:04.000000000 -0400 | 26064 | --- linux-2.6.32.15/drivers/net/e1000e/82571.c 2010-03-15 11:52:04.000000000 -0400 |
26050 | +++ linux-2.6.32.13/drivers/net/e1000e/82571.c 2010-05-15 13:21:15.586662276 -0400 | 26065 | +++ linux-2.6.32.15/drivers/net/e1000e/82571.c 2010-05-28 21:27:15.655178202 -0400 |
26051 | @@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s | 26066 | @@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s |
26052 | { | 26067 | { |
26053 | struct e1000_hw *hw = &adapter->hw; | 26068 | struct e1000_hw *hw = &adapter->hw; |
@@ -26101,9 +26116,9 @@ diff -urNp linux-2.6.32.13/drivers/net/e1000e/82571.c linux-2.6.32.13/drivers/ne | |||
26101 | .acquire_nvm = e1000_acquire_nvm_82571, | 26116 | .acquire_nvm = e1000_acquire_nvm_82571, |
26102 | .read_nvm = e1000e_read_nvm_eerd, | 26117 | .read_nvm = e1000e_read_nvm_eerd, |
26103 | .release_nvm = e1000_release_nvm_82571, | 26118 | .release_nvm = e1000_release_nvm_82571, |
26104 | diff -urNp linux-2.6.32.13/drivers/net/e1000e/e1000.h linux-2.6.32.13/drivers/net/e1000e/e1000.h | 26119 | diff -urNp linux-2.6.32.15/drivers/net/e1000e/e1000.h linux-2.6.32.15/drivers/net/e1000e/e1000.h |
26105 | --- linux-2.6.32.13/drivers/net/e1000e/e1000.h 2010-03-15 11:52:04.000000000 -0400 | 26120 | --- linux-2.6.32.15/drivers/net/e1000e/e1000.h 2010-03-15 11:52:04.000000000 -0400 |
26106 | +++ linux-2.6.32.13/drivers/net/e1000e/e1000.h 2010-05-15 13:21:15.586662276 -0400 | 26121 | +++ linux-2.6.32.15/drivers/net/e1000e/e1000.h 2010-05-28 21:27:15.655178202 -0400 |
26107 | @@ -375,9 +375,9 @@ struct e1000_info { | 26122 | @@ -375,9 +375,9 @@ struct e1000_info { |
26108 | u32 pba; | 26123 | u32 pba; |
26109 | u32 max_hw_frame_size; | 26124 | u32 max_hw_frame_size; |
@@ -26117,9 +26132,9 @@ diff -urNp linux-2.6.32.13/drivers/net/e1000e/e1000.h linux-2.6.32.13/drivers/ne | |||
26117 | }; | 26132 | }; |
26118 | 26133 | ||
26119 | /* hardware capability, feature, and workaround flags */ | 26134 | /* hardware capability, feature, and workaround flags */ |
26120 | diff -urNp linux-2.6.32.13/drivers/net/e1000e/es2lan.c linux-2.6.32.13/drivers/net/e1000e/es2lan.c | 26135 | diff -urNp linux-2.6.32.15/drivers/net/e1000e/es2lan.c linux-2.6.32.15/drivers/net/e1000e/es2lan.c |
26121 | --- linux-2.6.32.13/drivers/net/e1000e/es2lan.c 2010-03-15 11:52:04.000000000 -0400 | 26136 | --- linux-2.6.32.15/drivers/net/e1000e/es2lan.c 2010-03-15 11:52:04.000000000 -0400 |
26122 | +++ linux-2.6.32.13/drivers/net/e1000e/es2lan.c 2010-05-15 13:21:15.611440944 -0400 | 26137 | +++ linux-2.6.32.15/drivers/net/e1000e/es2lan.c 2010-05-28 21:27:15.655178202 -0400 |
26123 | @@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es | 26138 | @@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es |
26124 | { | 26139 | { |
26125 | struct e1000_hw *hw = &adapter->hw; | 26140 | struct e1000_hw *hw = &adapter->hw; |
@@ -26155,9 +26170,9 @@ diff -urNp linux-2.6.32.13/drivers/net/e1000e/es2lan.c linux-2.6.32.13/drivers/n | |||
26155 | .acquire_nvm = e1000_acquire_nvm_80003es2lan, | 26170 | .acquire_nvm = e1000_acquire_nvm_80003es2lan, |
26156 | .read_nvm = e1000e_read_nvm_eerd, | 26171 | .read_nvm = e1000e_read_nvm_eerd, |
26157 | .release_nvm = e1000_release_nvm_80003es2lan, | 26172 | .release_nvm = e1000_release_nvm_80003es2lan, |
26158 | diff -urNp linux-2.6.32.13/drivers/net/e1000e/hw.h linux-2.6.32.13/drivers/net/e1000e/hw.h | 26173 | diff -urNp linux-2.6.32.15/drivers/net/e1000e/hw.h linux-2.6.32.15/drivers/net/e1000e/hw.h |
26159 | --- linux-2.6.32.13/drivers/net/e1000e/hw.h 2010-04-04 20:41:49.956500002 -0400 | 26174 | --- linux-2.6.32.15/drivers/net/e1000e/hw.h 2010-04-04 20:41:49.956500002 -0400 |
26160 | +++ linux-2.6.32.13/drivers/net/e1000e/hw.h 2010-05-15 13:21:15.627454440 -0400 | 26175 | +++ linux-2.6.32.15/drivers/net/e1000e/hw.h 2010-05-28 21:27:15.659202304 -0400 |
26161 | @@ -756,34 +756,34 @@ struct e1000_mac_operations { | 26176 | @@ -756,34 +756,34 @@ struct e1000_mac_operations { |
26162 | 26177 | ||
26163 | /* Function pointers for the PHY. */ | 26178 | /* Function pointers for the PHY. */ |
@@ -26217,9 +26232,9 @@ diff -urNp linux-2.6.32.13/drivers/net/e1000e/hw.h linux-2.6.32.13/drivers/net/e | |||
26217 | }; | 26232 | }; |
26218 | 26233 | ||
26219 | struct e1000_mac_info { | 26234 | struct e1000_mac_info { |
26220 | diff -urNp linux-2.6.32.13/drivers/net/e1000e/ich8lan.c linux-2.6.32.13/drivers/net/e1000e/ich8lan.c | 26235 | diff -urNp linux-2.6.32.15/drivers/net/e1000e/ich8lan.c linux-2.6.32.15/drivers/net/e1000e/ich8lan.c |
26221 | --- linux-2.6.32.13/drivers/net/e1000e/ich8lan.c 2010-04-04 20:41:49.960543003 -0400 | 26236 | --- linux-2.6.32.15/drivers/net/e1000e/ich8lan.c 2010-04-04 20:41:49.960543003 -0400 |
26222 | +++ linux-2.6.32.13/drivers/net/e1000e/ich8lan.c 2010-05-15 13:21:15.627454440 -0400 | 26237 | +++ linux-2.6.32.15/drivers/net/e1000e/ich8lan.c 2010-05-28 21:27:15.659202304 -0400 |
26223 | @@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan | 26238 | @@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan |
26224 | } | 26239 | } |
26225 | } | 26240 | } |
@@ -26247,9 +26262,9 @@ diff -urNp linux-2.6.32.13/drivers/net/e1000e/ich8lan.c linux-2.6.32.13/drivers/ | |||
26247 | .acquire_nvm = e1000_acquire_nvm_ich8lan, | 26262 | .acquire_nvm = e1000_acquire_nvm_ich8lan, |
26248 | .read_nvm = e1000_read_nvm_ich8lan, | 26263 | .read_nvm = e1000_read_nvm_ich8lan, |
26249 | .release_nvm = e1000_release_nvm_ich8lan, | 26264 | .release_nvm = e1000_release_nvm_ich8lan, |
26250 | diff -urNp linux-2.6.32.13/drivers/net/ibmveth.c linux-2.6.32.13/drivers/net/ibmveth.c | 26265 | diff -urNp linux-2.6.32.15/drivers/net/ibmveth.c linux-2.6.32.15/drivers/net/ibmveth.c |
26251 | --- linux-2.6.32.13/drivers/net/ibmveth.c 2010-03-15 11:52:04.000000000 -0400 | 26266 | --- linux-2.6.32.15/drivers/net/ibmveth.c 2010-03-15 11:52:04.000000000 -0400 |
26252 | +++ linux-2.6.32.13/drivers/net/ibmveth.c 2010-05-15 13:21:15.630621605 -0400 | 26267 | +++ linux-2.6.32.15/drivers/net/ibmveth.c 2010-05-28 21:27:15.659202304 -0400 |
26253 | @@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr | 26268 | @@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr |
26254 | NULL, | 26269 | NULL, |
26255 | }; | 26270 | }; |
@@ -26259,9 +26274,9 @@ diff -urNp linux-2.6.32.13/drivers/net/ibmveth.c linux-2.6.32.13/drivers/net/ibm | |||
26259 | .show = veth_pool_show, | 26274 | .show = veth_pool_show, |
26260 | .store = veth_pool_store, | 26275 | .store = veth_pool_store, |
26261 | }; | 26276 | }; |
26262 | diff -urNp linux-2.6.32.13/drivers/net/igb/e1000_82575.c linux-2.6.32.13/drivers/net/igb/e1000_82575.c | 26277 | diff -urNp linux-2.6.32.15/drivers/net/igb/e1000_82575.c linux-2.6.32.15/drivers/net/igb/e1000_82575.c |
26263 | --- linux-2.6.32.13/drivers/net/igb/e1000_82575.c 2010-04-29 17:49:38.085476187 -0400 | 26278 | --- linux-2.6.32.15/drivers/net/igb/e1000_82575.c 2010-04-29 17:49:38.085476187 -0400 |
26264 | +++ linux-2.6.32.13/drivers/net/igb/e1000_82575.c 2010-05-15 13:21:15.646981498 -0400 | 26279 | +++ linux-2.6.32.15/drivers/net/igb/e1000_82575.c 2010-05-28 21:27:15.659202304 -0400 |
26265 | @@ -1401,7 +1401,7 @@ void igb_vmdq_set_replication_pf(struct | 26280 | @@ -1401,7 +1401,7 @@ void igb_vmdq_set_replication_pf(struct |
26266 | wr32(E1000_VT_CTL, vt_ctl); | 26281 | wr32(E1000_VT_CTL, vt_ctl); |
26267 | } | 26282 | } |
@@ -26287,9 +26302,9 @@ diff -urNp linux-2.6.32.13/drivers/net/igb/e1000_82575.c linux-2.6.32.13/drivers | |||
26287 | .acquire = igb_acquire_nvm_82575, | 26302 | .acquire = igb_acquire_nvm_82575, |
26288 | .read = igb_read_nvm_eerd, | 26303 | .read = igb_read_nvm_eerd, |
26289 | .release = igb_release_nvm_82575, | 26304 | .release = igb_release_nvm_82575, |
26290 | diff -urNp linux-2.6.32.13/drivers/net/igb/e1000_hw.h linux-2.6.32.13/drivers/net/igb/e1000_hw.h | 26305 | diff -urNp linux-2.6.32.15/drivers/net/igb/e1000_hw.h linux-2.6.32.15/drivers/net/igb/e1000_hw.h |
26291 | --- linux-2.6.32.13/drivers/net/igb/e1000_hw.h 2010-04-29 17:49:38.085476187 -0400 | 26306 | --- linux-2.6.32.15/drivers/net/igb/e1000_hw.h 2010-04-29 17:49:38.085476187 -0400 |
26292 | +++ linux-2.6.32.13/drivers/net/igb/e1000_hw.h 2010-05-15 13:21:15.646981498 -0400 | 26307 | +++ linux-2.6.32.15/drivers/net/igb/e1000_hw.h 2010-05-28 21:27:15.659202304 -0400 |
26293 | @@ -303,17 +303,17 @@ struct e1000_phy_operations { | 26308 | @@ -303,17 +303,17 @@ struct e1000_phy_operations { |
26294 | }; | 26309 | }; |
26295 | 26310 | ||
@@ -26315,9 +26330,9 @@ diff -urNp linux-2.6.32.13/drivers/net/igb/e1000_hw.h linux-2.6.32.13/drivers/ne | |||
26315 | }; | 26330 | }; |
26316 | 26331 | ||
26317 | extern const struct e1000_info e1000_82575_info; | 26332 | extern const struct e1000_info e1000_82575_info; |
26318 | diff -urNp linux-2.6.32.13/drivers/net/irda/vlsi_ir.c linux-2.6.32.13/drivers/net/irda/vlsi_ir.c | 26333 | diff -urNp linux-2.6.32.15/drivers/net/irda/vlsi_ir.c linux-2.6.32.15/drivers/net/irda/vlsi_ir.c |
26319 | --- linux-2.6.32.13/drivers/net/irda/vlsi_ir.c 2010-03-15 11:52:04.000000000 -0400 | 26334 | --- linux-2.6.32.15/drivers/net/irda/vlsi_ir.c 2010-03-15 11:52:04.000000000 -0400 |
26320 | +++ linux-2.6.32.13/drivers/net/irda/vlsi_ir.c 2010-05-15 13:21:15.650979196 -0400 | 26335 | +++ linux-2.6.32.15/drivers/net/irda/vlsi_ir.c 2010-05-28 21:27:15.662946876 -0400 |
26321 | @@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit( | 26336 | @@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit( |
26322 | /* no race - tx-ring already empty */ | 26337 | /* no race - tx-ring already empty */ |
26323 | vlsi_set_baud(idev, iobase); | 26338 | vlsi_set_baud(idev, iobase); |
@@ -26334,9 +26349,9 @@ diff -urNp linux-2.6.32.13/drivers/net/irda/vlsi_ir.c linux-2.6.32.13/drivers/ne | |||
26334 | spin_unlock_irqrestore(&idev->lock, flags); | 26349 | spin_unlock_irqrestore(&idev->lock, flags); |
26335 | dev_kfree_skb_any(skb); | 26350 | dev_kfree_skb_any(skb); |
26336 | return NETDEV_TX_OK; | 26351 | return NETDEV_TX_OK; |
26337 | diff -urNp linux-2.6.32.13/drivers/net/iseries_veth.c linux-2.6.32.13/drivers/net/iseries_veth.c | 26352 | diff -urNp linux-2.6.32.15/drivers/net/iseries_veth.c linux-2.6.32.15/drivers/net/iseries_veth.c |
26338 | --- linux-2.6.32.13/drivers/net/iseries_veth.c 2010-03-15 11:52:04.000000000 -0400 | 26353 | --- linux-2.6.32.15/drivers/net/iseries_veth.c 2010-03-15 11:52:04.000000000 -0400 |
26339 | +++ linux-2.6.32.13/drivers/net/iseries_veth.c 2010-05-15 13:21:15.675080517 -0400 | 26354 | +++ linux-2.6.32.15/drivers/net/iseries_veth.c 2010-05-28 21:27:15.662946876 -0400 |
26340 | @@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul | 26355 | @@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul |
26341 | NULL | 26356 | NULL |
26342 | }; | 26357 | }; |
@@ -26355,9 +26370,9 @@ diff -urNp linux-2.6.32.13/drivers/net/iseries_veth.c linux-2.6.32.13/drivers/ne | |||
26355 | .show = veth_port_attribute_show | 26370 | .show = veth_port_attribute_show |
26356 | }; | 26371 | }; |
26357 | 26372 | ||
26358 | diff -urNp linux-2.6.32.13/drivers/net/pcnet32.c linux-2.6.32.13/drivers/net/pcnet32.c | 26373 | diff -urNp linux-2.6.32.15/drivers/net/pcnet32.c linux-2.6.32.15/drivers/net/pcnet32.c |
26359 | --- linux-2.6.32.13/drivers/net/pcnet32.c 2010-03-15 11:52:04.000000000 -0400 | 26374 | --- linux-2.6.32.15/drivers/net/pcnet32.c 2010-03-15 11:52:04.000000000 -0400 |
26360 | +++ linux-2.6.32.13/drivers/net/pcnet32.c 2010-05-15 13:21:15.695242570 -0400 | 26375 | +++ linux-2.6.32.15/drivers/net/pcnet32.c 2010-05-28 21:27:15.662946876 -0400 |
26361 | @@ -79,7 +79,7 @@ static int cards_found; | 26376 | @@ -79,7 +79,7 @@ static int cards_found; |
26362 | /* | 26377 | /* |
26363 | * VLB I/O addresses | 26378 | * VLB I/O addresses |
@@ -26367,9 +26382,9 @@ diff -urNp linux-2.6.32.13/drivers/net/pcnet32.c linux-2.6.32.13/drivers/net/pcn | |||
26367 | { 0x300, 0x320, 0x340, 0x360, 0 }; | 26382 | { 0x300, 0x320, 0x340, 0x360, 0 }; |
26368 | 26383 | ||
26369 | static int pcnet32_debug = 0; | 26384 | static int pcnet32_debug = 0; |
26370 | diff -urNp linux-2.6.32.13/drivers/net/tg3.h linux-2.6.32.13/drivers/net/tg3.h | 26385 | diff -urNp linux-2.6.32.15/drivers/net/tg3.h linux-2.6.32.15/drivers/net/tg3.h |
26371 | --- linux-2.6.32.13/drivers/net/tg3.h 2010-04-04 20:41:49.968494922 -0400 | 26386 | --- linux-2.6.32.15/drivers/net/tg3.h 2010-04-04 20:41:49.968494922 -0400 |
26372 | +++ linux-2.6.32.13/drivers/net/tg3.h 2010-05-15 13:21:15.715816686 -0400 | 26387 | +++ linux-2.6.32.15/drivers/net/tg3.h 2010-05-28 21:27:15.662946876 -0400 |
26373 | @@ -95,6 +95,7 @@ | 26388 | @@ -95,6 +95,7 @@ |
26374 | #define CHIPREV_ID_5750_A0 0x4000 | 26389 | #define CHIPREV_ID_5750_A0 0x4000 |
26375 | #define CHIPREV_ID_5750_A1 0x4001 | 26390 | #define CHIPREV_ID_5750_A1 0x4001 |
@@ -26378,9 +26393,9 @@ diff -urNp linux-2.6.32.13/drivers/net/tg3.h linux-2.6.32.13/drivers/net/tg3.h | |||
26378 | #define CHIPREV_ID_5750_C2 0x4202 | 26393 | #define CHIPREV_ID_5750_C2 0x4202 |
26379 | #define CHIPREV_ID_5752_A0_HW 0x5000 | 26394 | #define CHIPREV_ID_5752_A0_HW 0x5000 |
26380 | #define CHIPREV_ID_5752_A0 0x6000 | 26395 | #define CHIPREV_ID_5752_A0 0x6000 |
26381 | diff -urNp linux-2.6.32.13/drivers/net/tulip/de4x5.c linux-2.6.32.13/drivers/net/tulip/de4x5.c | 26396 | diff -urNp linux-2.6.32.15/drivers/net/tulip/de4x5.c linux-2.6.32.15/drivers/net/tulip/de4x5.c |
26382 | --- linux-2.6.32.13/drivers/net/tulip/de4x5.c 2010-03-15 11:52:04.000000000 -0400 | 26397 | --- linux-2.6.32.15/drivers/net/tulip/de4x5.c 2010-03-15 11:52:04.000000000 -0400 |
26383 | +++ linux-2.6.32.13/drivers/net/tulip/de4x5.c 2010-05-15 13:21:15.731971640 -0400 | 26398 | +++ linux-2.6.32.15/drivers/net/tulip/de4x5.c 2010-05-28 21:27:15.696210343 -0400 |
26384 | @@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru | 26399 | @@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru |
26385 | for (i=0; i<ETH_ALEN; i++) { | 26400 | for (i=0; i<ETH_ALEN; i++) { |
26386 | tmp.addr[i] = dev->dev_addr[i]; | 26401 | tmp.addr[i] = dev->dev_addr[i]; |
@@ -26399,9 +26414,9 @@ diff -urNp linux-2.6.32.13/drivers/net/tulip/de4x5.c linux-2.6.32.13/drivers/net | |||
26399 | return -EFAULT; | 26414 | return -EFAULT; |
26400 | break; | 26415 | break; |
26401 | } | 26416 | } |
26402 | diff -urNp linux-2.6.32.13/drivers/net/usb/hso.c linux-2.6.32.13/drivers/net/usb/hso.c | 26417 | diff -urNp linux-2.6.32.15/drivers/net/usb/hso.c linux-2.6.32.15/drivers/net/usb/hso.c |
26403 | --- linux-2.6.32.13/drivers/net/usb/hso.c 2010-03-15 11:52:04.000000000 -0400 | 26418 | --- linux-2.6.32.15/drivers/net/usb/hso.c 2010-03-15 11:52:04.000000000 -0400 |
26404 | +++ linux-2.6.32.13/drivers/net/usb/hso.c 2010-05-15 13:21:15.731971640 -0400 | 26419 | +++ linux-2.6.32.15/drivers/net/usb/hso.c 2010-05-28 21:27:15.699197955 -0400 |
26405 | @@ -258,7 +258,7 @@ struct hso_serial { | 26420 | @@ -258,7 +258,7 @@ struct hso_serial { |
26406 | 26421 | ||
26407 | /* from usb_serial_port */ | 26422 | /* from usb_serial_port */ |
@@ -26480,9 +26495,9 @@ diff -urNp linux-2.6.32.13/drivers/net/usb/hso.c linux-2.6.32.13/drivers/net/usb | |||
26480 | result = | 26495 | result = |
26481 | hso_start_serial_device(serial_table[i], GFP_NOIO); | 26496 | hso_start_serial_device(serial_table[i], GFP_NOIO); |
26482 | hso_kick_transmit(dev2ser(serial_table[i])); | 26497 | hso_kick_transmit(dev2ser(serial_table[i])); |
26483 | diff -urNp linux-2.6.32.13/drivers/net/wireless/b43/debugfs.c linux-2.6.32.13/drivers/net/wireless/b43/debugfs.c | 26498 | diff -urNp linux-2.6.32.15/drivers/net/wireless/b43/debugfs.c linux-2.6.32.15/drivers/net/wireless/b43/debugfs.c |
26484 | --- linux-2.6.32.13/drivers/net/wireless/b43/debugfs.c 2010-03-15 11:52:04.000000000 -0400 | 26499 | --- linux-2.6.32.15/drivers/net/wireless/b43/debugfs.c 2010-03-15 11:52:04.000000000 -0400 |
26485 | +++ linux-2.6.32.13/drivers/net/wireless/b43/debugfs.c 2010-05-15 13:21:15.742991879 -0400 | 26500 | +++ linux-2.6.32.15/drivers/net/wireless/b43/debugfs.c 2010-05-28 21:27:15.699197955 -0400 |
26486 | @@ -43,7 +43,7 @@ static struct dentry *rootdir; | 26501 | @@ -43,7 +43,7 @@ static struct dentry *rootdir; |
26487 | struct b43_debugfs_fops { | 26502 | struct b43_debugfs_fops { |
26488 | ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); | 26503 | ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); |
@@ -26492,9 +26507,9 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/b43/debugfs.c linux-2.6.32.13/dr | |||
26492 | /* Offset of struct b43_dfs_file in struct b43_dfsentry */ | 26507 | /* Offset of struct b43_dfs_file in struct b43_dfsentry */ |
26493 | size_t file_struct_offset; | 26508 | size_t file_struct_offset; |
26494 | }; | 26509 | }; |
26495 | diff -urNp linux-2.6.32.13/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.13/drivers/net/wireless/b43legacy/debugfs.c | 26510 | diff -urNp linux-2.6.32.15/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.15/drivers/net/wireless/b43legacy/debugfs.c |
26496 | --- linux-2.6.32.13/drivers/net/wireless/b43legacy/debugfs.c 2010-03-15 11:52:04.000000000 -0400 | 26511 | --- linux-2.6.32.15/drivers/net/wireless/b43legacy/debugfs.c 2010-03-15 11:52:04.000000000 -0400 |
26497 | +++ linux-2.6.32.13/drivers/net/wireless/b43legacy/debugfs.c 2010-05-15 13:21:15.742991879 -0400 | 26512 | +++ linux-2.6.32.15/drivers/net/wireless/b43legacy/debugfs.c 2010-05-28 21:27:15.699197955 -0400 |
26498 | @@ -44,7 +44,7 @@ static struct dentry *rootdir; | 26513 | @@ -44,7 +44,7 @@ static struct dentry *rootdir; |
26499 | struct b43legacy_debugfs_fops { | 26514 | struct b43legacy_debugfs_fops { |
26500 | ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize); | 26515 | ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize); |
@@ -26504,9 +26519,9 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32 | |||
26504 | /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ | 26519 | /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ |
26505 | size_t file_struct_offset; | 26520 | size_t file_struct_offset; |
26506 | /* Take wl->irq_lock before calling read/write? */ | 26521 | /* Take wl->irq_lock before calling read/write? */ |
26507 | diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-1000.c | 26522 | diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-1000.c |
26508 | --- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-03-15 11:52:04.000000000 -0400 | 26523 | --- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-03-15 11:52:04.000000000 -0400 |
26509 | +++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-05-15 13:21:15.746908676 -0400 | 26524 | +++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-05-28 21:27:15.699197955 -0400 |
26510 | @@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = | 26525 | @@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = |
26511 | }, | 26526 | }, |
26512 | }; | 26527 | }; |
@@ -26516,9 +26531,9 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32. | |||
26516 | .ucode = &iwl5000_ucode, | 26531 | .ucode = &iwl5000_ucode, |
26517 | .lib = &iwl1000_lib, | 26532 | .lib = &iwl1000_lib, |
26518 | .hcmd = &iwl5000_hcmd, | 26533 | .hcmd = &iwl5000_hcmd, |
26519 | diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-3945.c | 26534 | diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-3945.c |
26520 | --- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-04-04 20:41:49.972919715 -0400 | 26535 | --- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-04-04 20:41:49.972919715 -0400 |
26521 | +++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-05-15 13:21:15.777121582 -0400 | 26536 | +++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-05-28 21:27:15.707206768 -0400 |
26522 | @@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945 | 26537 | @@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945 |
26523 | .build_addsta_hcmd = iwl3945_build_addsta_hcmd, | 26538 | .build_addsta_hcmd = iwl3945_build_addsta_hcmd, |
26524 | }; | 26539 | }; |
@@ -26528,10 +26543,10 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32. | |||
26528 | .ucode = &iwl3945_ucode, | 26543 | .ucode = &iwl3945_ucode, |
26529 | .lib = &iwl3945_lib, | 26544 | .lib = &iwl3945_lib, |
26530 | .hcmd = &iwl3945_hcmd, | 26545 | .hcmd = &iwl3945_hcmd, |
26531 | diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-4965.c | 26546 | diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-4965.c |
26532 | --- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-04-29 17:49:38.221487644 -0400 | 26547 | --- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-05-28 20:16:44.442935997 -0400 |
26533 | +++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-05-15 13:21:15.803555313 -0400 | 26548 | +++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-05-28 21:27:15.707206768 -0400 |
26534 | @@ -2340,7 +2340,7 @@ static struct iwl_lib_ops iwl4965_lib = | 26549 | @@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib = |
26535 | }, | 26550 | }, |
26536 | }; | 26551 | }; |
26537 | 26552 | ||
@@ -26540,10 +26555,10 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32. | |||
26540 | .ucode = &iwl4965_ucode, | 26555 | .ucode = &iwl4965_ucode, |
26541 | .lib = &iwl4965_lib, | 26556 | .lib = &iwl4965_lib, |
26542 | .hcmd = &iwl4965_hcmd, | 26557 | .hcmd = &iwl4965_hcmd, |
26543 | diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-5000.c | 26558 | diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-5000.c |
26544 | --- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-04-29 17:49:38.221487644 -0400 | 26559 | --- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-05-28 20:16:44.446927415 -0400 |
26545 | +++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-05-15 13:21:15.810712850 -0400 | 26560 | +++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-05-28 21:27:15.707206768 -0400 |
26546 | @@ -1628,14 +1628,14 @@ static struct iwl_lib_ops iwl5150_lib = | 26561 | @@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib = |
26547 | }, | 26562 | }, |
26548 | }; | 26563 | }; |
26549 | 26564 | ||
@@ -26560,9 +26575,9 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32. | |||
26560 | .ucode = &iwl5000_ucode, | 26575 | .ucode = &iwl5000_ucode, |
26561 | .lib = &iwl5150_lib, | 26576 | .lib = &iwl5150_lib, |
26562 | .hcmd = &iwl5000_hcmd, | 26577 | .hcmd = &iwl5000_hcmd, |
26563 | diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-6000.c | 26578 | diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-6000.c |
26564 | --- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-03-15 11:52:04.000000000 -0400 | 26579 | --- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-03-15 11:52:04.000000000 -0400 |
26565 | +++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-05-15 13:21:15.810712850 -0400 | 26580 | +++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-05-28 21:27:15.707206768 -0400 |
26566 | @@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000 | 26581 | @@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000 |
26567 | .calc_rssi = iwl5000_calc_rssi, | 26582 | .calc_rssi = iwl5000_calc_rssi, |
26568 | }; | 26583 | }; |
@@ -26572,9 +26587,9 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32. | |||
26572 | .ucode = &iwl5000_ucode, | 26587 | .ucode = &iwl5000_ucode, |
26573 | .lib = &iwl6000_lib, | 26588 | .lib = &iwl6000_lib, |
26574 | .hcmd = &iwl5000_hcmd, | 26589 | .hcmd = &iwl5000_hcmd, |
26575 | diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-debug.h | 26590 | diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-debug.h |
26576 | --- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-03-15 11:52:04.000000000 -0400 | 26591 | --- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-03-15 11:52:04.000000000 -0400 |
26577 | +++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-05-15 13:21:15.810712850 -0400 | 26592 | +++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-05-28 21:27:15.707206768 -0400 |
26578 | @@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri | 26593 | @@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri |
26579 | #endif | 26594 | #endif |
26580 | 26595 | ||
@@ -26586,9 +26601,9 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32 | |||
26586 | static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level, | 26601 | static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level, |
26587 | void *p, u32 len) | 26602 | void *p, u32 len) |
26588 | {} | 26603 | {} |
26589 | diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-dev.h | 26604 | diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-dev.h |
26590 | --- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-03-15 11:52:04.000000000 -0400 | 26605 | --- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-03-15 11:52:04.000000000 -0400 |
26591 | +++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-05-15 13:21:15.810712850 -0400 | 26606 | +++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-05-28 21:27:15.707206768 -0400 |
26592 | @@ -67,7 +67,7 @@ struct iwl_tx_queue; | 26607 | @@ -67,7 +67,7 @@ struct iwl_tx_queue; |
26593 | 26608 | ||
26594 | /* shared structures from iwl-5000.c */ | 26609 | /* shared structures from iwl-5000.c */ |
@@ -26598,9 +26613,9 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.1 | |||
26598 | extern struct iwl_ucode_ops iwl5000_ucode; | 26613 | extern struct iwl_ucode_ops iwl5000_ucode; |
26599 | extern struct iwl_lib_ops iwl5000_lib; | 26614 | extern struct iwl_lib_ops iwl5000_lib; |
26600 | extern struct iwl_hcmd_ops iwl5000_hcmd; | 26615 | extern struct iwl_hcmd_ops iwl5000_hcmd; |
26601 | diff -urNp linux-2.6.32.13/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.13/drivers/net/wireless/libertas/debugfs.c | 26616 | diff -urNp linux-2.6.32.15/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.15/drivers/net/wireless/libertas/debugfs.c |
26602 | --- linux-2.6.32.13/drivers/net/wireless/libertas/debugfs.c 2010-03-15 11:52:04.000000000 -0400 | 26617 | --- linux-2.6.32.15/drivers/net/wireless/libertas/debugfs.c 2010-03-15 11:52:04.000000000 -0400 |
26603 | +++ linux-2.6.32.13/drivers/net/wireless/libertas/debugfs.c 2010-05-15 13:21:15.810712850 -0400 | 26618 | +++ linux-2.6.32.15/drivers/net/wireless/libertas/debugfs.c 2010-05-28 21:27:15.715208538 -0400 |
26604 | @@ -708,7 +708,7 @@ out_unlock: | 26619 | @@ -708,7 +708,7 @@ out_unlock: |
26605 | struct lbs_debugfs_files { | 26620 | struct lbs_debugfs_files { |
26606 | const char *name; | 26621 | const char *name; |
@@ -26610,9 +26625,9 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/libertas/debugfs.c linux-2.6.32. | |||
26610 | }; | 26625 | }; |
26611 | 26626 | ||
26612 | static const struct lbs_debugfs_files debugfs_files[] = { | 26627 | static const struct lbs_debugfs_files debugfs_files[] = { |
26613 | diff -urNp linux-2.6.32.13/drivers/net/wireless/rndis_wlan.c linux-2.6.32.13/drivers/net/wireless/rndis_wlan.c | 26628 | diff -urNp linux-2.6.32.15/drivers/net/wireless/rndis_wlan.c linux-2.6.32.15/drivers/net/wireless/rndis_wlan.c |
26614 | --- linux-2.6.32.13/drivers/net/wireless/rndis_wlan.c 2010-03-15 11:52:04.000000000 -0400 | 26629 | --- linux-2.6.32.15/drivers/net/wireless/rndis_wlan.c 2010-03-15 11:52:04.000000000 -0400 |
26615 | +++ linux-2.6.32.13/drivers/net/wireless/rndis_wlan.c 2010-05-15 13:21:15.822985498 -0400 | 26630 | +++ linux-2.6.32.15/drivers/net/wireless/rndis_wlan.c 2010-05-28 21:27:15.715208538 -0400 |
26616 | @@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn | 26631 | @@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn |
26617 | 26632 | ||
26618 | devdbg(usbdev, "set_rts_threshold %i", rts_threshold); | 26633 | devdbg(usbdev, "set_rts_threshold %i", rts_threshold); |
@@ -26622,9 +26637,9 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/rndis_wlan.c linux-2.6.32.13/dri | |||
26622 | rts_threshold = 2347; | 26637 | rts_threshold = 2347; |
26623 | 26638 | ||
26624 | tmp = cpu_to_le32(rts_threshold); | 26639 | tmp = cpu_to_le32(rts_threshold); |
26625 | diff -urNp linux-2.6.32.13/drivers/oprofile/buffer_sync.c linux-2.6.32.13/drivers/oprofile/buffer_sync.c | 26640 | diff -urNp linux-2.6.32.15/drivers/oprofile/buffer_sync.c linux-2.6.32.15/drivers/oprofile/buffer_sync.c |
26626 | --- linux-2.6.32.13/drivers/oprofile/buffer_sync.c 2010-03-15 11:52:04.000000000 -0400 | 26641 | --- linux-2.6.32.15/drivers/oprofile/buffer_sync.c 2010-03-15 11:52:04.000000000 -0400 |
26627 | +++ linux-2.6.32.13/drivers/oprofile/buffer_sync.c 2010-05-15 13:21:15.822985498 -0400 | 26642 | +++ linux-2.6.32.15/drivers/oprofile/buffer_sync.c 2010-05-28 21:27:15.718942362 -0400 |
26628 | @@ -340,7 +340,7 @@ static void add_data(struct op_entry *en | 26643 | @@ -340,7 +340,7 @@ static void add_data(struct op_entry *en |
26629 | if (cookie == NO_COOKIE) | 26644 | if (cookie == NO_COOKIE) |
26630 | offset = pc; | 26645 | offset = pc; |
@@ -26660,9 +26675,9 @@ diff -urNp linux-2.6.32.13/drivers/oprofile/buffer_sync.c linux-2.6.32.13/driver | |||
26660 | } | 26675 | } |
26661 | } | 26676 | } |
26662 | release_mm(mm); | 26677 | release_mm(mm); |
26663 | diff -urNp linux-2.6.32.13/drivers/oprofile/event_buffer.c linux-2.6.32.13/drivers/oprofile/event_buffer.c | 26678 | diff -urNp linux-2.6.32.15/drivers/oprofile/event_buffer.c linux-2.6.32.15/drivers/oprofile/event_buffer.c |
26664 | --- linux-2.6.32.13/drivers/oprofile/event_buffer.c 2010-03-15 11:52:04.000000000 -0400 | 26679 | --- linux-2.6.32.15/drivers/oprofile/event_buffer.c 2010-03-15 11:52:04.000000000 -0400 |
26665 | +++ linux-2.6.32.13/drivers/oprofile/event_buffer.c 2010-05-15 13:21:15.822985498 -0400 | 26680 | +++ linux-2.6.32.15/drivers/oprofile/event_buffer.c 2010-05-28 21:27:15.718942362 -0400 |
26666 | @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value | 26681 | @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value |
26667 | } | 26682 | } |
26668 | 26683 | ||
@@ -26672,9 +26687,9 @@ diff -urNp linux-2.6.32.13/drivers/oprofile/event_buffer.c linux-2.6.32.13/drive | |||
26672 | return; | 26687 | return; |
26673 | } | 26688 | } |
26674 | 26689 | ||
26675 | diff -urNp linux-2.6.32.13/drivers/oprofile/oprof.c linux-2.6.32.13/drivers/oprofile/oprof.c | 26690 | diff -urNp linux-2.6.32.15/drivers/oprofile/oprof.c linux-2.6.32.15/drivers/oprofile/oprof.c |
26676 | --- linux-2.6.32.13/drivers/oprofile/oprof.c 2010-03-15 11:52:04.000000000 -0400 | 26691 | --- linux-2.6.32.15/drivers/oprofile/oprof.c 2010-03-15 11:52:04.000000000 -0400 |
26677 | +++ linux-2.6.32.13/drivers/oprofile/oprof.c 2010-05-15 13:21:15.822985498 -0400 | 26692 | +++ linux-2.6.32.15/drivers/oprofile/oprof.c 2010-05-28 21:27:15.718942362 -0400 |
26678 | @@ -110,7 +110,7 @@ static void switch_worker(struct work_st | 26693 | @@ -110,7 +110,7 @@ static void switch_worker(struct work_st |
26679 | if (oprofile_ops.switch_events()) | 26694 | if (oprofile_ops.switch_events()) |
26680 | return; | 26695 | return; |
@@ -26684,9 +26699,9 @@ diff -urNp linux-2.6.32.13/drivers/oprofile/oprof.c linux-2.6.32.13/drivers/opro | |||
26684 | start_switch_worker(); | 26699 | start_switch_worker(); |
26685 | } | 26700 | } |
26686 | 26701 | ||
26687 | diff -urNp linux-2.6.32.13/drivers/oprofile/oprofilefs.c linux-2.6.32.13/drivers/oprofile/oprofilefs.c | 26702 | diff -urNp linux-2.6.32.15/drivers/oprofile/oprofilefs.c linux-2.6.32.15/drivers/oprofile/oprofilefs.c |
26688 | --- linux-2.6.32.13/drivers/oprofile/oprofilefs.c 2010-03-15 11:52:04.000000000 -0400 | 26703 | --- linux-2.6.32.15/drivers/oprofile/oprofilefs.c 2010-03-15 11:52:04.000000000 -0400 |
26689 | +++ linux-2.6.32.13/drivers/oprofile/oprofilefs.c 2010-05-15 13:21:15.822985498 -0400 | 26704 | +++ linux-2.6.32.15/drivers/oprofile/oprofilefs.c 2010-05-28 21:27:15.718942362 -0400 |
26690 | @@ -187,7 +187,7 @@ static const struct file_operations atom | 26705 | @@ -187,7 +187,7 @@ static const struct file_operations atom |
26691 | 26706 | ||
26692 | 26707 | ||
@@ -26696,9 +26711,9 @@ diff -urNp linux-2.6.32.13/drivers/oprofile/oprofilefs.c linux-2.6.32.13/drivers | |||
26696 | { | 26711 | { |
26697 | struct dentry *d = __oprofilefs_create_file(sb, root, name, | 26712 | struct dentry *d = __oprofilefs_create_file(sb, root, name, |
26698 | &atomic_ro_fops, 0444); | 26713 | &atomic_ro_fops, 0444); |
26699 | diff -urNp linux-2.6.32.13/drivers/oprofile/oprofile_stats.c linux-2.6.32.13/drivers/oprofile/oprofile_stats.c | 26714 | diff -urNp linux-2.6.32.15/drivers/oprofile/oprofile_stats.c linux-2.6.32.15/drivers/oprofile/oprofile_stats.c |
26700 | --- linux-2.6.32.13/drivers/oprofile/oprofile_stats.c 2010-03-15 11:52:04.000000000 -0400 | 26715 | --- linux-2.6.32.15/drivers/oprofile/oprofile_stats.c 2010-03-15 11:52:04.000000000 -0400 |
26701 | +++ linux-2.6.32.13/drivers/oprofile/oprofile_stats.c 2010-05-15 13:21:15.822985498 -0400 | 26716 | +++ linux-2.6.32.15/drivers/oprofile/oprofile_stats.c 2010-05-28 21:27:15.718942362 -0400 |
26702 | @@ -30,11 +30,11 @@ void oprofile_reset_stats(void) | 26717 | @@ -30,11 +30,11 @@ void oprofile_reset_stats(void) |
26703 | cpu_buf->sample_invalid_eip = 0; | 26718 | cpu_buf->sample_invalid_eip = 0; |
26704 | } | 26719 | } |
@@ -26716,9 +26731,9 @@ diff -urNp linux-2.6.32.13/drivers/oprofile/oprofile_stats.c linux-2.6.32.13/dri | |||
26716 | } | 26731 | } |
26717 | 26732 | ||
26718 | 26733 | ||
26719 | diff -urNp linux-2.6.32.13/drivers/oprofile/oprofile_stats.h linux-2.6.32.13/drivers/oprofile/oprofile_stats.h | 26734 | diff -urNp linux-2.6.32.15/drivers/oprofile/oprofile_stats.h linux-2.6.32.15/drivers/oprofile/oprofile_stats.h |
26720 | --- linux-2.6.32.13/drivers/oprofile/oprofile_stats.h 2010-03-15 11:52:04.000000000 -0400 | 26735 | --- linux-2.6.32.15/drivers/oprofile/oprofile_stats.h 2010-03-15 11:52:04.000000000 -0400 |
26721 | +++ linux-2.6.32.13/drivers/oprofile/oprofile_stats.h 2010-05-15 13:21:15.822985498 -0400 | 26736 | +++ linux-2.6.32.15/drivers/oprofile/oprofile_stats.h 2010-05-28 21:27:15.718942362 -0400 |
26722 | @@ -13,11 +13,11 @@ | 26737 | @@ -13,11 +13,11 @@ |
26723 | #include <asm/atomic.h> | 26738 | #include <asm/atomic.h> |
26724 | 26739 | ||
@@ -26736,9 +26751,9 @@ diff -urNp linux-2.6.32.13/drivers/oprofile/oprofile_stats.h linux-2.6.32.13/dri | |||
26736 | }; | 26751 | }; |
26737 | 26752 | ||
26738 | extern struct oprofile_stat_struct oprofile_stats; | 26753 | extern struct oprofile_stat_struct oprofile_stats; |
26739 | diff -urNp linux-2.6.32.13/drivers/parisc/pdc_stable.c linux-2.6.32.13/drivers/parisc/pdc_stable.c | 26754 | diff -urNp linux-2.6.32.15/drivers/parisc/pdc_stable.c linux-2.6.32.15/drivers/parisc/pdc_stable.c |
26740 | --- linux-2.6.32.13/drivers/parisc/pdc_stable.c 2010-03-15 11:52:04.000000000 -0400 | 26755 | --- linux-2.6.32.15/drivers/parisc/pdc_stable.c 2010-03-15 11:52:04.000000000 -0400 |
26741 | +++ linux-2.6.32.13/drivers/parisc/pdc_stable.c 2010-05-15 13:21:15.822985498 -0400 | 26756 | +++ linux-2.6.32.15/drivers/parisc/pdc_stable.c 2010-05-28 21:27:15.727198333 -0400 |
26742 | @@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj | 26757 | @@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj |
26743 | return ret; | 26758 | return ret; |
26744 | } | 26759 | } |
@@ -26748,9 +26763,9 @@ diff -urNp linux-2.6.32.13/drivers/parisc/pdc_stable.c linux-2.6.32.13/drivers/p | |||
26748 | .show = pdcspath_attr_show, | 26763 | .show = pdcspath_attr_show, |
26749 | .store = pdcspath_attr_store, | 26764 | .store = pdcspath_attr_store, |
26750 | }; | 26765 | }; |
26751 | diff -urNp linux-2.6.32.13/drivers/parport/procfs.c linux-2.6.32.13/drivers/parport/procfs.c | 26766 | diff -urNp linux-2.6.32.15/drivers/parport/procfs.c linux-2.6.32.15/drivers/parport/procfs.c |
26752 | --- linux-2.6.32.13/drivers/parport/procfs.c 2010-03-15 11:52:04.000000000 -0400 | 26767 | --- linux-2.6.32.15/drivers/parport/procfs.c 2010-03-15 11:52:04.000000000 -0400 |
26753 | +++ linux-2.6.32.13/drivers/parport/procfs.c 2010-05-15 13:21:15.822985498 -0400 | 26768 | +++ linux-2.6.32.15/drivers/parport/procfs.c 2010-05-28 21:27:15.727198333 -0400 |
26754 | @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t | 26769 | @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t |
26755 | 26770 | ||
26756 | *ppos += len; | 26771 | *ppos += len; |
@@ -26769,9 +26784,9 @@ diff -urNp linux-2.6.32.13/drivers/parport/procfs.c linux-2.6.32.13/drivers/parp | |||
26769 | } | 26784 | } |
26770 | #endif /* IEEE1284.3 support. */ | 26785 | #endif /* IEEE1284.3 support. */ |
26771 | 26786 | ||
26772 | diff -urNp linux-2.6.32.13/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.13/drivers/pci/hotplug/acpiphp_glue.c | 26787 | diff -urNp linux-2.6.32.15/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.15/drivers/pci/hotplug/acpiphp_glue.c |
26773 | --- linux-2.6.32.13/drivers/pci/hotplug/acpiphp_glue.c 2010-03-15 11:52:04.000000000 -0400 | 26788 | --- linux-2.6.32.15/drivers/pci/hotplug/acpiphp_glue.c 2010-03-15 11:52:04.000000000 -0400 |
26774 | +++ linux-2.6.32.13/drivers/pci/hotplug/acpiphp_glue.c 2010-05-15 13:21:15.842765021 -0400 | 26789 | +++ linux-2.6.32.15/drivers/pci/hotplug/acpiphp_glue.c 2010-05-28 21:27:15.727198333 -0400 |
26775 | @@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif | 26790 | @@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif |
26776 | } | 26791 | } |
26777 | 26792 | ||
@@ -26781,9 +26796,9 @@ diff -urNp linux-2.6.32.13/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.13/dr | |||
26781 | .handler = handle_hotplug_event_func, | 26796 | .handler = handle_hotplug_event_func, |
26782 | }; | 26797 | }; |
26783 | 26798 | ||
26784 | diff -urNp linux-2.6.32.13/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.13/drivers/pci/hotplug/cpqphp_nvram.c | 26799 | diff -urNp linux-2.6.32.15/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.15/drivers/pci/hotplug/cpqphp_nvram.c |
26785 | --- linux-2.6.32.13/drivers/pci/hotplug/cpqphp_nvram.c 2010-03-15 11:52:04.000000000 -0400 | 26800 | --- linux-2.6.32.15/drivers/pci/hotplug/cpqphp_nvram.c 2010-03-15 11:52:04.000000000 -0400 |
26786 | +++ linux-2.6.32.13/drivers/pci/hotplug/cpqphp_nvram.c 2010-05-15 13:21:15.842765021 -0400 | 26801 | +++ linux-2.6.32.15/drivers/pci/hotplug/cpqphp_nvram.c 2010-05-28 21:27:15.727198333 -0400 |
26787 | @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ | 26802 | @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ |
26788 | 26803 | ||
26789 | void compaq_nvram_init (void __iomem *rom_start) | 26804 | void compaq_nvram_init (void __iomem *rom_start) |
@@ -26798,9 +26813,9 @@ diff -urNp linux-2.6.32.13/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.13/dr | |||
26798 | dbg("int15 entry = %p\n", compaq_int15_entry_point); | 26813 | dbg("int15 entry = %p\n", compaq_int15_entry_point); |
26799 | 26814 | ||
26800 | /* initialize our int15 lock */ | 26815 | /* initialize our int15 lock */ |
26801 | diff -urNp linux-2.6.32.13/drivers/pci/hotplug/fakephp.c linux-2.6.32.13/drivers/pci/hotplug/fakephp.c | 26816 | diff -urNp linux-2.6.32.15/drivers/pci/hotplug/fakephp.c linux-2.6.32.15/drivers/pci/hotplug/fakephp.c |
26802 | --- linux-2.6.32.13/drivers/pci/hotplug/fakephp.c 2010-03-15 11:52:04.000000000 -0400 | 26817 | --- linux-2.6.32.15/drivers/pci/hotplug/fakephp.c 2010-03-15 11:52:04.000000000 -0400 |
26803 | +++ linux-2.6.32.13/drivers/pci/hotplug/fakephp.c 2010-05-15 13:21:15.847000534 -0400 | 26818 | +++ linux-2.6.32.15/drivers/pci/hotplug/fakephp.c 2010-05-28 21:27:15.727198333 -0400 |
26804 | @@ -73,7 +73,7 @@ static void legacy_release(struct kobjec | 26819 | @@ -73,7 +73,7 @@ static void legacy_release(struct kobjec |
26805 | } | 26820 | } |
26806 | 26821 | ||
@@ -26810,9 +26825,9 @@ diff -urNp linux-2.6.32.13/drivers/pci/hotplug/fakephp.c linux-2.6.32.13/drivers | |||
26810 | .store = legacy_store, .show = legacy_show | 26825 | .store = legacy_store, .show = legacy_show |
26811 | }, | 26826 | }, |
26812 | .release = &legacy_release, | 26827 | .release = &legacy_release, |
26813 | diff -urNp linux-2.6.32.13/drivers/pci/intel-iommu.c linux-2.6.32.13/drivers/pci/intel-iommu.c | 26828 | diff -urNp linux-2.6.32.15/drivers/pci/intel-iommu.c linux-2.6.32.15/drivers/pci/intel-iommu.c |
26814 | --- linux-2.6.32.13/drivers/pci/intel-iommu.c 2010-03-15 11:52:04.000000000 -0400 | 26829 | --- linux-2.6.32.15/drivers/pci/intel-iommu.c 2010-03-15 11:52:04.000000000 -0400 |
26815 | +++ linux-2.6.32.13/drivers/pci/intel-iommu.c 2010-05-15 13:21:15.847000534 -0400 | 26830 | +++ linux-2.6.32.15/drivers/pci/intel-iommu.c 2010-05-28 21:27:15.730990089 -0400 |
26816 | @@ -2950,7 +2950,7 @@ static int intel_mapping_error(struct de | 26831 | @@ -2950,7 +2950,7 @@ static int intel_mapping_error(struct de |
26817 | return !dma_addr; | 26832 | return !dma_addr; |
26818 | } | 26833 | } |
@@ -26822,9 +26837,9 @@ diff -urNp linux-2.6.32.13/drivers/pci/intel-iommu.c linux-2.6.32.13/drivers/pci | |||
26822 | .alloc_coherent = intel_alloc_coherent, | 26837 | .alloc_coherent = intel_alloc_coherent, |
26823 | .free_coherent = intel_free_coherent, | 26838 | .free_coherent = intel_free_coherent, |
26824 | .map_sg = intel_map_sg, | 26839 | .map_sg = intel_map_sg, |
26825 | diff -urNp linux-2.6.32.13/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.13/drivers/pci/pcie/portdrv_pci.c | 26840 | diff -urNp linux-2.6.32.15/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.15/drivers/pci/pcie/portdrv_pci.c |
26826 | --- linux-2.6.32.13/drivers/pci/pcie/portdrv_pci.c 2010-03-15 11:52:04.000000000 -0400 | 26841 | --- linux-2.6.32.15/drivers/pci/pcie/portdrv_pci.c 2010-03-15 11:52:04.000000000 -0400 |
26827 | +++ linux-2.6.32.13/drivers/pci/pcie/portdrv_pci.c 2010-05-15 13:21:15.867469095 -0400 | 26842 | +++ linux-2.6.32.15/drivers/pci/pcie/portdrv_pci.c 2010-05-28 21:27:15.730990089 -0400 |
26828 | @@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru | 26843 | @@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru |
26829 | static const struct pci_device_id port_pci_ids[] = { { | 26844 | static const struct pci_device_id port_pci_ids[] = { { |
26830 | /* handle any PCI-Express port */ | 26845 | /* handle any PCI-Express port */ |
@@ -26834,9 +26849,9 @@ diff -urNp linux-2.6.32.13/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.13/driver | |||
26834 | }; | 26849 | }; |
26835 | MODULE_DEVICE_TABLE(pci, port_pci_ids); | 26850 | MODULE_DEVICE_TABLE(pci, port_pci_ids); |
26836 | 26851 | ||
26837 | diff -urNp linux-2.6.32.13/drivers/pci/probe.c linux-2.6.32.13/drivers/pci/probe.c | 26852 | diff -urNp linux-2.6.32.15/drivers/pci/probe.c linux-2.6.32.15/drivers/pci/probe.c |
26838 | --- linux-2.6.32.13/drivers/pci/probe.c 2010-03-15 11:52:04.000000000 -0400 | 26853 | --- linux-2.6.32.15/drivers/pci/probe.c 2010-03-15 11:52:04.000000000 -0400 |
26839 | +++ linux-2.6.32.13/drivers/pci/probe.c 2010-05-15 13:21:15.867469095 -0400 | 26854 | +++ linux-2.6.32.15/drivers/pci/probe.c 2010-05-28 21:27:15.739209869 -0400 |
26840 | @@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity( | 26855 | @@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity( |
26841 | return ret; | 26856 | return ret; |
26842 | } | 26857 | } |
@@ -26854,9 +26869,9 @@ diff -urNp linux-2.6.32.13/drivers/pci/probe.c linux-2.6.32.13/drivers/pci/probe | |||
26854 | struct device_attribute *attr, | 26869 | struct device_attribute *attr, |
26855 | char *buf) | 26870 | char *buf) |
26856 | { | 26871 | { |
26857 | diff -urNp linux-2.6.32.13/drivers/pci/proc.c linux-2.6.32.13/drivers/pci/proc.c | 26872 | diff -urNp linux-2.6.32.15/drivers/pci/proc.c linux-2.6.32.15/drivers/pci/proc.c |
26858 | --- linux-2.6.32.13/drivers/pci/proc.c 2010-03-15 11:52:04.000000000 -0400 | 26873 | --- linux-2.6.32.15/drivers/pci/proc.c 2010-03-15 11:52:04.000000000 -0400 |
26859 | +++ linux-2.6.32.13/drivers/pci/proc.c 2010-05-15 13:21:15.867469095 -0400 | 26874 | +++ linux-2.6.32.15/drivers/pci/proc.c 2010-05-28 21:27:15.739209869 -0400 |
26860 | @@ -480,7 +480,16 @@ static const struct file_operations proc | 26875 | @@ -480,7 +480,16 @@ static const struct file_operations proc |
26861 | static int __init pci_proc_init(void) | 26876 | static int __init pci_proc_init(void) |
26862 | { | 26877 | { |
@@ -26874,9 +26889,9 @@ diff -urNp linux-2.6.32.13/drivers/pci/proc.c linux-2.6.32.13/drivers/pci/proc.c | |||
26874 | proc_create("devices", 0, proc_bus_pci_dir, | 26889 | proc_create("devices", 0, proc_bus_pci_dir, |
26875 | &proc_bus_pci_dev_operations); | 26890 | &proc_bus_pci_dev_operations); |
26876 | proc_initialized = 1; | 26891 | proc_initialized = 1; |
26877 | diff -urNp linux-2.6.32.13/drivers/pci/slot.c linux-2.6.32.13/drivers/pci/slot.c | 26892 | diff -urNp linux-2.6.32.15/drivers/pci/slot.c linux-2.6.32.15/drivers/pci/slot.c |
26878 | --- linux-2.6.32.13/drivers/pci/slot.c 2010-03-15 11:52:04.000000000 -0400 | 26893 | --- linux-2.6.32.15/drivers/pci/slot.c 2010-03-15 11:52:04.000000000 -0400 |
26879 | +++ linux-2.6.32.13/drivers/pci/slot.c 2010-05-15 13:21:15.895764457 -0400 | 26894 | +++ linux-2.6.32.15/drivers/pci/slot.c 2010-05-28 21:27:15.739209869 -0400 |
26880 | @@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc | 26895 | @@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc |
26881 | return attribute->store ? attribute->store(slot, buf, len) : -EIO; | 26896 | return attribute->store ? attribute->store(slot, buf, len) : -EIO; |
26882 | } | 26897 | } |
@@ -26886,9 +26901,9 @@ diff -urNp linux-2.6.32.13/drivers/pci/slot.c linux-2.6.32.13/drivers/pci/slot.c | |||
26886 | .show = pci_slot_attr_show, | 26901 | .show = pci_slot_attr_show, |
26887 | .store = pci_slot_attr_store, | 26902 | .store = pci_slot_attr_store, |
26888 | }; | 26903 | }; |
26889 | diff -urNp linux-2.6.32.13/drivers/pcmcia/ti113x.h linux-2.6.32.13/drivers/pcmcia/ti113x.h | 26904 | diff -urNp linux-2.6.32.15/drivers/pcmcia/ti113x.h linux-2.6.32.15/drivers/pcmcia/ti113x.h |
26890 | --- linux-2.6.32.13/drivers/pcmcia/ti113x.h 2010-03-15 11:52:04.000000000 -0400 | 26905 | --- linux-2.6.32.15/drivers/pcmcia/ti113x.h 2010-03-15 11:52:04.000000000 -0400 |
26891 | +++ linux-2.6.32.13/drivers/pcmcia/ti113x.h 2010-05-15 13:21:15.895764457 -0400 | 26906 | +++ linux-2.6.32.15/drivers/pcmcia/ti113x.h 2010-05-28 21:27:15.743188935 -0400 |
26892 | @@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl | 26907 | @@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl |
26893 | DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID, | 26908 | DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID, |
26894 | ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE), | 26909 | ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE), |
@@ -26898,9 +26913,9 @@ diff -urNp linux-2.6.32.13/drivers/pcmcia/ti113x.h linux-2.6.32.13/drivers/pcmci | |||
26898 | }; | 26913 | }; |
26899 | 26914 | ||
26900 | static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) | 26915 | static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) |
26901 | diff -urNp linux-2.6.32.13/drivers/pcmcia/yenta_socket.c linux-2.6.32.13/drivers/pcmcia/yenta_socket.c | 26916 | diff -urNp linux-2.6.32.15/drivers/pcmcia/yenta_socket.c linux-2.6.32.15/drivers/pcmcia/yenta_socket.c |
26902 | --- linux-2.6.32.13/drivers/pcmcia/yenta_socket.c 2010-03-15 11:52:04.000000000 -0400 | 26917 | --- linux-2.6.32.15/drivers/pcmcia/yenta_socket.c 2010-03-15 11:52:04.000000000 -0400 |
26903 | +++ linux-2.6.32.13/drivers/pcmcia/yenta_socket.c 2010-05-15 13:21:15.911499692 -0400 | 26918 | +++ linux-2.6.32.15/drivers/pcmcia/yenta_socket.c 2010-05-28 21:27:15.751196243 -0400 |
26904 | @@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table | 26919 | @@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table |
26905 | 26920 | ||
26906 | /* match any cardbus bridge */ | 26921 | /* match any cardbus bridge */ |
@@ -26910,9 +26925,9 @@ diff -urNp linux-2.6.32.13/drivers/pcmcia/yenta_socket.c linux-2.6.32.13/drivers | |||
26910 | }; | 26925 | }; |
26911 | MODULE_DEVICE_TABLE(pci, yenta_table); | 26926 | MODULE_DEVICE_TABLE(pci, yenta_table); |
26912 | 26927 | ||
26913 | diff -urNp linux-2.6.32.13/drivers/platform/x86/acer-wmi.c linux-2.6.32.13/drivers/platform/x86/acer-wmi.c | 26928 | diff -urNp linux-2.6.32.15/drivers/platform/x86/acer-wmi.c linux-2.6.32.15/drivers/platform/x86/acer-wmi.c |
26914 | --- linux-2.6.32.13/drivers/platform/x86/acer-wmi.c 2010-03-15 11:52:04.000000000 -0400 | 26929 | --- linux-2.6.32.15/drivers/platform/x86/acer-wmi.c 2010-03-15 11:52:04.000000000 -0400 |
26915 | +++ linux-2.6.32.13/drivers/platform/x86/acer-wmi.c 2010-05-15 13:21:15.911499692 -0400 | 26930 | +++ linux-2.6.32.15/drivers/platform/x86/acer-wmi.c 2010-05-28 21:27:15.759196972 -0400 |
26916 | @@ -918,7 +918,7 @@ static int update_bl_status(struct backl | 26931 | @@ -918,7 +918,7 @@ static int update_bl_status(struct backl |
26917 | return 0; | 26932 | return 0; |
26918 | } | 26933 | } |
@@ -26922,9 +26937,9 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/acer-wmi.c linux-2.6.32.13/drive | |||
26922 | .get_brightness = read_brightness, | 26937 | .get_brightness = read_brightness, |
26923 | .update_status = update_bl_status, | 26938 | .update_status = update_bl_status, |
26924 | }; | 26939 | }; |
26925 | diff -urNp linux-2.6.32.13/drivers/platform/x86/asus_acpi.c linux-2.6.32.13/drivers/platform/x86/asus_acpi.c | 26940 | diff -urNp linux-2.6.32.15/drivers/platform/x86/asus_acpi.c linux-2.6.32.15/drivers/platform/x86/asus_acpi.c |
26926 | --- linux-2.6.32.13/drivers/platform/x86/asus_acpi.c 2010-03-15 11:52:04.000000000 -0400 | 26941 | --- linux-2.6.32.15/drivers/platform/x86/asus_acpi.c 2010-03-15 11:52:04.000000000 -0400 |
26927 | +++ linux-2.6.32.13/drivers/platform/x86/asus_acpi.c 2010-05-15 13:21:15.911499692 -0400 | 26942 | +++ linux-2.6.32.15/drivers/platform/x86/asus_acpi.c 2010-05-28 21:27:15.759196972 -0400 |
26928 | @@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_ | 26943 | @@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_ |
26929 | return 0; | 26944 | return 0; |
26930 | } | 26945 | } |
@@ -26934,9 +26949,9 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/asus_acpi.c linux-2.6.32.13/driv | |||
26934 | .get_brightness = read_brightness, | 26949 | .get_brightness = read_brightness, |
26935 | .update_status = set_brightness_status, | 26950 | .update_status = set_brightness_status, |
26936 | }; | 26951 | }; |
26937 | diff -urNp linux-2.6.32.13/drivers/platform/x86/asus-laptop.c linux-2.6.32.13/drivers/platform/x86/asus-laptop.c | 26952 | diff -urNp linux-2.6.32.15/drivers/platform/x86/asus-laptop.c linux-2.6.32.15/drivers/platform/x86/asus-laptop.c |
26938 | --- linux-2.6.32.13/drivers/platform/x86/asus-laptop.c 2010-03-15 11:52:04.000000000 -0400 | 26953 | --- linux-2.6.32.15/drivers/platform/x86/asus-laptop.c 2010-03-15 11:52:04.000000000 -0400 |
26939 | +++ linux-2.6.32.13/drivers/platform/x86/asus-laptop.c 2010-05-15 13:21:15.911499692 -0400 | 26954 | +++ linux-2.6.32.15/drivers/platform/x86/asus-laptop.c 2010-05-28 21:27:15.759196972 -0400 |
26940 | @@ -250,7 +250,7 @@ static struct backlight_device *asus_bac | 26955 | @@ -250,7 +250,7 @@ static struct backlight_device *asus_bac |
26941 | */ | 26956 | */ |
26942 | static int read_brightness(struct backlight_device *bd); | 26957 | static int read_brightness(struct backlight_device *bd); |
@@ -26946,9 +26961,9 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/asus-laptop.c linux-2.6.32.13/dr | |||
26946 | .get_brightness = read_brightness, | 26961 | .get_brightness = read_brightness, |
26947 | .update_status = update_bl_status, | 26962 | .update_status = update_bl_status, |
26948 | }; | 26963 | }; |
26949 | diff -urNp linux-2.6.32.13/drivers/platform/x86/compal-laptop.c linux-2.6.32.13/drivers/platform/x86/compal-laptop.c | 26964 | diff -urNp linux-2.6.32.15/drivers/platform/x86/compal-laptop.c linux-2.6.32.15/drivers/platform/x86/compal-laptop.c |
26950 | --- linux-2.6.32.13/drivers/platform/x86/compal-laptop.c 2010-03-15 11:52:04.000000000 -0400 | 26965 | --- linux-2.6.32.15/drivers/platform/x86/compal-laptop.c 2010-03-15 11:52:04.000000000 -0400 |
26951 | +++ linux-2.6.32.13/drivers/platform/x86/compal-laptop.c 2010-05-15 13:21:15.911499692 -0400 | 26966 | +++ linux-2.6.32.15/drivers/platform/x86/compal-laptop.c 2010-05-28 21:27:15.759196972 -0400 |
26952 | @@ -163,7 +163,7 @@ static int bl_update_status(struct backl | 26967 | @@ -163,7 +163,7 @@ static int bl_update_status(struct backl |
26953 | return set_lcd_level(b->props.brightness); | 26968 | return set_lcd_level(b->props.brightness); |
26954 | } | 26969 | } |
@@ -26958,9 +26973,9 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/compal-laptop.c linux-2.6.32.13/ | |||
26958 | .get_brightness = bl_get_brightness, | 26973 | .get_brightness = bl_get_brightness, |
26959 | .update_status = bl_update_status, | 26974 | .update_status = bl_update_status, |
26960 | }; | 26975 | }; |
26961 | diff -urNp linux-2.6.32.13/drivers/platform/x86/dell-laptop.c linux-2.6.32.13/drivers/platform/x86/dell-laptop.c | 26976 | diff -urNp linux-2.6.32.15/drivers/platform/x86/dell-laptop.c linux-2.6.32.15/drivers/platform/x86/dell-laptop.c |
26962 | --- linux-2.6.32.13/drivers/platform/x86/dell-laptop.c 2010-03-15 11:52:04.000000000 -0400 | 26977 | --- linux-2.6.32.15/drivers/platform/x86/dell-laptop.c 2010-03-15 11:52:04.000000000 -0400 |
26963 | +++ linux-2.6.32.13/drivers/platform/x86/dell-laptop.c 2010-05-15 13:21:15.911499692 -0400 | 26978 | +++ linux-2.6.32.15/drivers/platform/x86/dell-laptop.c 2010-05-28 21:27:15.759196972 -0400 |
26964 | @@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac | 26979 | @@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac |
26965 | return buffer.output[1]; | 26980 | return buffer.output[1]; |
26966 | } | 26981 | } |
@@ -26970,9 +26985,9 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/dell-laptop.c linux-2.6.32.13/dr | |||
26970 | .get_brightness = dell_get_intensity, | 26985 | .get_brightness = dell_get_intensity, |
26971 | .update_status = dell_send_intensity, | 26986 | .update_status = dell_send_intensity, |
26972 | }; | 26987 | }; |
26973 | diff -urNp linux-2.6.32.13/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.13/drivers/platform/x86/eeepc-laptop.c | 26988 | diff -urNp linux-2.6.32.15/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.15/drivers/platform/x86/eeepc-laptop.c |
26974 | --- linux-2.6.32.13/drivers/platform/x86/eeepc-laptop.c 2010-04-29 17:49:38.317493070 -0400 | 26989 | --- linux-2.6.32.15/drivers/platform/x86/eeepc-laptop.c 2010-04-29 17:49:38.317493070 -0400 |
26975 | +++ linux-2.6.32.13/drivers/platform/x86/eeepc-laptop.c 2010-05-15 13:21:15.911499692 -0400 | 26990 | +++ linux-2.6.32.15/drivers/platform/x86/eeepc-laptop.c 2010-05-28 21:27:15.759196972 -0400 |
26976 | @@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device | 26991 | @@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device |
26977 | */ | 26992 | */ |
26978 | static int read_brightness(struct backlight_device *bd); | 26993 | static int read_brightness(struct backlight_device *bd); |
@@ -26982,9 +26997,9 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.13/d | |||
26982 | .get_brightness = read_brightness, | 26997 | .get_brightness = read_brightness, |
26983 | .update_status = update_bl_status, | 26998 | .update_status = update_bl_status, |
26984 | }; | 26999 | }; |
26985 | diff -urNp linux-2.6.32.13/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.13/drivers/platform/x86/fujitsu-laptop.c | 27000 | diff -urNp linux-2.6.32.15/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.15/drivers/platform/x86/fujitsu-laptop.c |
26986 | --- linux-2.6.32.13/drivers/platform/x86/fujitsu-laptop.c 2010-03-15 11:52:04.000000000 -0400 | 27001 | --- linux-2.6.32.15/drivers/platform/x86/fujitsu-laptop.c 2010-03-15 11:52:04.000000000 -0400 |
26987 | +++ linux-2.6.32.13/drivers/platform/x86/fujitsu-laptop.c 2010-05-15 13:21:15.911499692 -0400 | 27002 | +++ linux-2.6.32.15/drivers/platform/x86/fujitsu-laptop.c 2010-05-28 21:27:15.759196972 -0400 |
26988 | @@ -436,7 +436,7 @@ static int bl_update_status(struct backl | 27003 | @@ -436,7 +436,7 @@ static int bl_update_status(struct backl |
26989 | return ret; | 27004 | return ret; |
26990 | } | 27005 | } |
@@ -26994,9 +27009,9 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.13 | |||
26994 | .get_brightness = bl_get_brightness, | 27009 | .get_brightness = bl_get_brightness, |
26995 | .update_status = bl_update_status, | 27010 | .update_status = bl_update_status, |
26996 | }; | 27011 | }; |
26997 | diff -urNp linux-2.6.32.13/drivers/platform/x86/msi-laptop.c linux-2.6.32.13/drivers/platform/x86/msi-laptop.c | 27012 | diff -urNp linux-2.6.32.15/drivers/platform/x86/msi-laptop.c linux-2.6.32.15/drivers/platform/x86/msi-laptop.c |
26998 | --- linux-2.6.32.13/drivers/platform/x86/msi-laptop.c 2010-03-15 11:52:04.000000000 -0400 | 27013 | --- linux-2.6.32.15/drivers/platform/x86/msi-laptop.c 2010-03-15 11:52:04.000000000 -0400 |
26999 | +++ linux-2.6.32.13/drivers/platform/x86/msi-laptop.c 2010-05-15 13:21:15.911499692 -0400 | 27014 | +++ linux-2.6.32.15/drivers/platform/x86/msi-laptop.c 2010-05-28 21:27:15.759196972 -0400 |
27000 | @@ -161,7 +161,7 @@ static int bl_update_status(struct backl | 27015 | @@ -161,7 +161,7 @@ static int bl_update_status(struct backl |
27001 | return set_lcd_level(b->props.brightness); | 27016 | return set_lcd_level(b->props.brightness); |
27002 | } | 27017 | } |
@@ -27006,9 +27021,9 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/msi-laptop.c linux-2.6.32.13/dri | |||
27006 | .get_brightness = bl_get_brightness, | 27021 | .get_brightness = bl_get_brightness, |
27007 | .update_status = bl_update_status, | 27022 | .update_status = bl_update_status, |
27008 | }; | 27023 | }; |
27009 | diff -urNp linux-2.6.32.13/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.13/drivers/platform/x86/panasonic-laptop.c | 27024 | diff -urNp linux-2.6.32.15/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.15/drivers/platform/x86/panasonic-laptop.c |
27010 | --- linux-2.6.32.13/drivers/platform/x86/panasonic-laptop.c 2010-03-15 11:52:04.000000000 -0400 | 27025 | --- linux-2.6.32.15/drivers/platform/x86/panasonic-laptop.c 2010-03-15 11:52:04.000000000 -0400 |
27011 | +++ linux-2.6.32.13/drivers/platform/x86/panasonic-laptop.c 2010-05-15 13:21:15.911499692 -0400 | 27026 | +++ linux-2.6.32.15/drivers/platform/x86/panasonic-laptop.c 2010-05-28 21:27:15.759196972 -0400 |
27012 | @@ -352,7 +352,7 @@ static int bl_set_status(struct backligh | 27027 | @@ -352,7 +352,7 @@ static int bl_set_status(struct backligh |
27013 | return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright); | 27028 | return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright); |
27014 | } | 27029 | } |
@@ -27018,9 +27033,9 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/panasonic-laptop.c linux-2.6.32. | |||
27018 | .get_brightness = bl_get, | 27033 | .get_brightness = bl_get, |
27019 | .update_status = bl_set_status, | 27034 | .update_status = bl_set_status, |
27020 | }; | 27035 | }; |
27021 | diff -urNp linux-2.6.32.13/drivers/platform/x86/sony-laptop.c linux-2.6.32.13/drivers/platform/x86/sony-laptop.c | 27036 | diff -urNp linux-2.6.32.15/drivers/platform/x86/sony-laptop.c linux-2.6.32.15/drivers/platform/x86/sony-laptop.c |
27022 | --- linux-2.6.32.13/drivers/platform/x86/sony-laptop.c 2010-03-15 11:52:04.000000000 -0400 | 27037 | --- linux-2.6.32.15/drivers/platform/x86/sony-laptop.c 2010-03-15 11:52:04.000000000 -0400 |
27023 | +++ linux-2.6.32.13/drivers/platform/x86/sony-laptop.c 2010-05-15 13:21:15.914756904 -0400 | 27038 | +++ linux-2.6.32.15/drivers/platform/x86/sony-laptop.c 2010-05-28 21:27:15.759196972 -0400 |
27024 | @@ -850,7 +850,7 @@ static int sony_backlight_get_brightness | 27039 | @@ -850,7 +850,7 @@ static int sony_backlight_get_brightness |
27025 | } | 27040 | } |
27026 | 27041 | ||
@@ -27030,9 +27045,9 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/sony-laptop.c linux-2.6.32.13/dr | |||
27030 | .update_status = sony_backlight_update_status, | 27045 | .update_status = sony_backlight_update_status, |
27031 | .get_brightness = sony_backlight_get_brightness, | 27046 | .get_brightness = sony_backlight_get_brightness, |
27032 | }; | 27047 | }; |
27033 | diff -urNp linux-2.6.32.13/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.13/drivers/platform/x86/thinkpad_acpi.c | 27048 | diff -urNp linux-2.6.32.15/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.15/drivers/platform/x86/thinkpad_acpi.c |
27034 | --- linux-2.6.32.13/drivers/platform/x86/thinkpad_acpi.c 2010-04-29 17:49:38.333363657 -0400 | 27049 | --- linux-2.6.32.15/drivers/platform/x86/thinkpad_acpi.c 2010-04-29 17:49:38.333363657 -0400 |
27035 | +++ linux-2.6.32.13/drivers/platform/x86/thinkpad_acpi.c 2010-05-15 13:21:15.914756904 -0400 | 27050 | +++ linux-2.6.32.15/drivers/platform/x86/thinkpad_acpi.c 2010-05-28 21:27:15.763212426 -0400 |
27036 | @@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha | 27051 | @@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha |
27037 | BACKLIGHT_UPDATE_HOTKEY); | 27052 | BACKLIGHT_UPDATE_HOTKEY); |
27038 | } | 27053 | } |
@@ -27042,9 +27057,9 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.13/ | |||
27042 | .get_brightness = brightness_get, | 27057 | .get_brightness = brightness_get, |
27043 | .update_status = brightness_update_status, | 27058 | .update_status = brightness_update_status, |
27044 | }; | 27059 | }; |
27045 | diff -urNp linux-2.6.32.13/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.13/drivers/platform/x86/toshiba_acpi.c | 27060 | diff -urNp linux-2.6.32.15/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.15/drivers/platform/x86/toshiba_acpi.c |
27046 | --- linux-2.6.32.13/drivers/platform/x86/toshiba_acpi.c 2010-03-15 11:52:04.000000000 -0400 | 27061 | --- linux-2.6.32.15/drivers/platform/x86/toshiba_acpi.c 2010-03-15 11:52:04.000000000 -0400 |
27047 | +++ linux-2.6.32.13/drivers/platform/x86/toshiba_acpi.c 2010-05-15 13:21:15.914756904 -0400 | 27062 | +++ linux-2.6.32.15/drivers/platform/x86/toshiba_acpi.c 2010-05-28 21:27:15.763212426 -0400 |
27048 | @@ -671,7 +671,7 @@ static acpi_status remove_device(void) | 27063 | @@ -671,7 +671,7 @@ static acpi_status remove_device(void) |
27049 | return AE_OK; | 27064 | return AE_OK; |
27050 | } | 27065 | } |
@@ -27054,9 +27069,9 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.13/d | |||
27054 | .get_brightness = get_lcd, | 27069 | .get_brightness = get_lcd, |
27055 | .update_status = set_lcd_status, | 27070 | .update_status = set_lcd_status, |
27056 | }; | 27071 | }; |
27057 | diff -urNp linux-2.6.32.13/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.13/drivers/pnp/pnpbios/bioscalls.c | 27072 | diff -urNp linux-2.6.32.15/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.15/drivers/pnp/pnpbios/bioscalls.c |
27058 | --- linux-2.6.32.13/drivers/pnp/pnpbios/bioscalls.c 2010-03-15 11:52:04.000000000 -0400 | 27073 | --- linux-2.6.32.15/drivers/pnp/pnpbios/bioscalls.c 2010-03-15 11:52:04.000000000 -0400 |
27059 | +++ linux-2.6.32.13/drivers/pnp/pnpbios/bioscalls.c 2010-05-15 13:21:15.914756904 -0400 | 27074 | +++ linux-2.6.32.15/drivers/pnp/pnpbios/bioscalls.c 2010-05-28 21:27:15.763212426 -0400 |
27060 | @@ -60,7 +60,7 @@ do { \ | 27075 | @@ -60,7 +60,7 @@ do { \ |
27061 | set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ | 27076 | set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ |
27062 | } while(0) | 27077 | } while(0) |
@@ -27113,9 +27128,9 @@ diff -urNp linux-2.6.32.13/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.13/drive | |||
27113 | + | 27128 | + |
27114 | + pax_close_kernel(); | 27129 | + pax_close_kernel(); |
27115 | } | 27130 | } |
27116 | diff -urNp linux-2.6.32.13/drivers/pnp/quirks.c linux-2.6.32.13/drivers/pnp/quirks.c | 27131 | diff -urNp linux-2.6.32.15/drivers/pnp/quirks.c linux-2.6.32.15/drivers/pnp/quirks.c |
27117 | --- linux-2.6.32.13/drivers/pnp/quirks.c 2010-03-15 11:52:04.000000000 -0400 | 27132 | --- linux-2.6.32.15/drivers/pnp/quirks.c 2010-03-15 11:52:04.000000000 -0400 |
27118 | +++ linux-2.6.32.13/drivers/pnp/quirks.c 2010-05-15 13:21:15.914756904 -0400 | 27133 | +++ linux-2.6.32.15/drivers/pnp/quirks.c 2010-05-28 21:27:15.763212426 -0400 |
27119 | @@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = { | 27134 | @@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = { |
27120 | /* PnP resources that might overlap PCI BARs */ | 27135 | /* PnP resources that might overlap PCI BARs */ |
27121 | {"PNP0c01", quirk_system_pci_resources}, | 27136 | {"PNP0c01", quirk_system_pci_resources}, |
@@ -27125,9 +27140,9 @@ diff -urNp linux-2.6.32.13/drivers/pnp/quirks.c linux-2.6.32.13/drivers/pnp/quir | |||
27125 | }; | 27140 | }; |
27126 | 27141 | ||
27127 | void pnp_fixup_device(struct pnp_dev *dev) | 27142 | void pnp_fixup_device(struct pnp_dev *dev) |
27128 | diff -urNp linux-2.6.32.13/drivers/pnp/resource.c linux-2.6.32.13/drivers/pnp/resource.c | 27143 | diff -urNp linux-2.6.32.15/drivers/pnp/resource.c linux-2.6.32.15/drivers/pnp/resource.c |
27129 | --- linux-2.6.32.13/drivers/pnp/resource.c 2010-03-15 11:52:04.000000000 -0400 | 27144 | --- linux-2.6.32.15/drivers/pnp/resource.c 2010-03-15 11:52:04.000000000 -0400 |
27130 | +++ linux-2.6.32.13/drivers/pnp/resource.c 2010-05-15 13:21:15.914756904 -0400 | 27145 | +++ linux-2.6.32.15/drivers/pnp/resource.c 2010-05-28 21:27:15.763212426 -0400 |
27131 | @@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s | 27146 | @@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s |
27132 | return 1; | 27147 | return 1; |
27133 | 27148 | ||
@@ -27146,9 +27161,9 @@ diff -urNp linux-2.6.32.13/drivers/pnp/resource.c linux-2.6.32.13/drivers/pnp/re | |||
27146 | return 0; | 27161 | return 0; |
27147 | 27162 | ||
27148 | /* check if the resource is reserved */ | 27163 | /* check if the resource is reserved */ |
27149 | diff -urNp linux-2.6.32.13/drivers/s390/cio/qdio_perf.c linux-2.6.32.13/drivers/s390/cio/qdio_perf.c | 27164 | diff -urNp linux-2.6.32.15/drivers/s390/cio/qdio_perf.c linux-2.6.32.15/drivers/s390/cio/qdio_perf.c |
27150 | --- linux-2.6.32.13/drivers/s390/cio/qdio_perf.c 2010-03-15 11:52:04.000000000 -0400 | 27165 | --- linux-2.6.32.15/drivers/s390/cio/qdio_perf.c 2010-03-15 11:52:04.000000000 -0400 |
27151 | +++ linux-2.6.32.13/drivers/s390/cio/qdio_perf.c 2010-05-15 13:21:15.914756904 -0400 | 27166 | +++ linux-2.6.32.15/drivers/s390/cio/qdio_perf.c 2010-05-28 21:27:15.763212426 -0400 |
27152 | @@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_ | 27167 | @@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_ |
27153 | static int qdio_perf_proc_show(struct seq_file *m, void *v) | 27168 | static int qdio_perf_proc_show(struct seq_file *m, void *v) |
27154 | { | 27169 | { |
@@ -27224,9 +27239,9 @@ diff -urNp linux-2.6.32.13/drivers/s390/cio/qdio_perf.c linux-2.6.32.13/drivers/ | |||
27224 | seq_printf(m, "\n"); | 27239 | seq_printf(m, "\n"); |
27225 | return 0; | 27240 | return 0; |
27226 | } | 27241 | } |
27227 | diff -urNp linux-2.6.32.13/drivers/s390/cio/qdio_perf.h linux-2.6.32.13/drivers/s390/cio/qdio_perf.h | 27242 | diff -urNp linux-2.6.32.15/drivers/s390/cio/qdio_perf.h linux-2.6.32.15/drivers/s390/cio/qdio_perf.h |
27228 | --- linux-2.6.32.13/drivers/s390/cio/qdio_perf.h 2010-03-15 11:52:04.000000000 -0400 | 27243 | --- linux-2.6.32.15/drivers/s390/cio/qdio_perf.h 2010-03-15 11:52:04.000000000 -0400 |
27229 | +++ linux-2.6.32.13/drivers/s390/cio/qdio_perf.h 2010-05-15 13:21:15.927411554 -0400 | 27244 | +++ linux-2.6.32.15/drivers/s390/cio/qdio_perf.h 2010-05-28 21:27:15.763212426 -0400 |
27230 | @@ -13,46 +13,46 @@ | 27245 | @@ -13,46 +13,46 @@ |
27231 | 27246 | ||
27232 | struct qdio_perf_stats { | 27247 | struct qdio_perf_stats { |
@@ -27299,9 +27314,9 @@ diff -urNp linux-2.6.32.13/drivers/s390/cio/qdio_perf.h linux-2.6.32.13/drivers/ | |||
27299 | } | 27314 | } |
27300 | 27315 | ||
27301 | int qdio_setup_perf_stats(void); | 27316 | int qdio_setup_perf_stats(void); |
27302 | diff -urNp linux-2.6.32.13/drivers/scsi/ipr.c linux-2.6.32.13/drivers/scsi/ipr.c | 27317 | diff -urNp linux-2.6.32.15/drivers/scsi/ipr.c linux-2.6.32.15/drivers/scsi/ipr.c |
27303 | --- linux-2.6.32.13/drivers/scsi/ipr.c 2010-03-15 11:52:04.000000000 -0400 | 27318 | --- linux-2.6.32.15/drivers/scsi/ipr.c 2010-03-15 11:52:04.000000000 -0400 |
27304 | +++ linux-2.6.32.13/drivers/scsi/ipr.c 2010-05-15 13:21:15.970703897 -0400 | 27319 | +++ linux-2.6.32.15/drivers/scsi/ipr.c 2010-05-28 21:27:15.787650200 -0400 |
27305 | @@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q | 27320 | @@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q |
27306 | return true; | 27321 | return true; |
27307 | } | 27322 | } |
@@ -27311,9 +27326,9 @@ diff -urNp linux-2.6.32.13/drivers/scsi/ipr.c linux-2.6.32.13/drivers/scsi/ipr.c | |||
27311 | .phy_reset = ipr_ata_phy_reset, | 27326 | .phy_reset = ipr_ata_phy_reset, |
27312 | .hardreset = ipr_sata_reset, | 27327 | .hardreset = ipr_sata_reset, |
27313 | .post_internal_cmd = ipr_ata_post_internal, | 27328 | .post_internal_cmd = ipr_ata_post_internal, |
27314 | diff -urNp linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c | 27329 | diff -urNp linux-2.6.32.15/drivers/scsi/libfc/fc_exch.c linux-2.6.32.15/drivers/scsi/libfc/fc_exch.c |
27315 | --- linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c 2010-03-15 11:52:04.000000000 -0400 | 27330 | --- linux-2.6.32.15/drivers/scsi/libfc/fc_exch.c 2010-03-15 11:52:04.000000000 -0400 |
27316 | +++ linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c 2010-05-15 13:21:15.970703897 -0400 | 27331 | +++ linux-2.6.32.15/drivers/scsi/libfc/fc_exch.c 2010-05-28 21:27:15.795200668 -0400 |
27317 | @@ -86,12 +86,12 @@ struct fc_exch_mgr { | 27332 | @@ -86,12 +86,12 @@ struct fc_exch_mgr { |
27318 | * all together if not used XXX | 27333 | * all together if not used XXX |
27319 | */ | 27334 | */ |
@@ -27435,9 +27450,9 @@ diff -urNp linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c linux-2.6.32.13/drivers/ | |||
27435 | 27450 | ||
27436 | fc_frame_free(fp); | 27451 | fc_frame_free(fp); |
27437 | } | 27452 | } |
27438 | diff -urNp linux-2.6.32.13/drivers/scsi/libsas/sas_ata.c linux-2.6.32.13/drivers/scsi/libsas/sas_ata.c | 27453 | diff -urNp linux-2.6.32.15/drivers/scsi/libsas/sas_ata.c linux-2.6.32.15/drivers/scsi/libsas/sas_ata.c |
27439 | --- linux-2.6.32.13/drivers/scsi/libsas/sas_ata.c 2010-05-15 13:20:18.878584179 -0400 | 27454 | --- linux-2.6.32.15/drivers/scsi/libsas/sas_ata.c 2010-05-15 13:20:18.878584179 -0400 |
27440 | +++ linux-2.6.32.13/drivers/scsi/libsas/sas_ata.c 2010-05-15 13:21:15.970703897 -0400 | 27455 | +++ linux-2.6.32.15/drivers/scsi/libsas/sas_ata.c 2010-05-28 21:27:15.803426462 -0400 |
27441 | @@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l | 27456 | @@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l |
27442 | } | 27457 | } |
27443 | } | 27458 | } |
@@ -27447,9 +27462,9 @@ diff -urNp linux-2.6.32.13/drivers/scsi/libsas/sas_ata.c linux-2.6.32.13/drivers | |||
27447 | .phy_reset = sas_ata_phy_reset, | 27462 | .phy_reset = sas_ata_phy_reset, |
27448 | .post_internal_cmd = sas_ata_post_internal, | 27463 | .post_internal_cmd = sas_ata_post_internal, |
27449 | .qc_prep = ata_noop_qc_prep, | 27464 | .qc_prep = ata_noop_qc_prep, |
27450 | diff -urNp linux-2.6.32.13/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.13/drivers/scsi/mpt2sas/mpt2sas_debug.h | 27465 | diff -urNp linux-2.6.32.15/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.15/drivers/scsi/mpt2sas/mpt2sas_debug.h |
27451 | --- linux-2.6.32.13/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-03-15 11:52:04.000000000 -0400 | 27466 | --- linux-2.6.32.15/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-03-15 11:52:04.000000000 -0400 |
27452 | +++ linux-2.6.32.13/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-05-15 13:21:15.991412669 -0400 | 27467 | +++ linux-2.6.32.15/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-05-28 21:27:15.803426462 -0400 |
27453 | @@ -79,7 +79,7 @@ | 27468 | @@ -79,7 +79,7 @@ |
27454 | CMD; \ | 27469 | CMD; \ |
27455 | } | 27470 | } |
@@ -27459,9 +27474,9 @@ diff -urNp linux-2.6.32.13/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.13/ | |||
27459 | #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */ | 27474 | #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */ |
27460 | 27475 | ||
27461 | 27476 | ||
27462 | diff -urNp linux-2.6.32.13/drivers/scsi/scsi_logging.h linux-2.6.32.13/drivers/scsi/scsi_logging.h | 27477 | diff -urNp linux-2.6.32.15/drivers/scsi/scsi_logging.h linux-2.6.32.15/drivers/scsi/scsi_logging.h |
27463 | --- linux-2.6.32.13/drivers/scsi/scsi_logging.h 2010-03-15 11:52:04.000000000 -0400 | 27478 | --- linux-2.6.32.15/drivers/scsi/scsi_logging.h 2010-03-15 11:52:04.000000000 -0400 |
27464 | +++ linux-2.6.32.13/drivers/scsi/scsi_logging.h 2010-05-15 13:21:15.991412669 -0400 | 27479 | +++ linux-2.6.32.15/drivers/scsi/scsi_logging.h 2010-05-28 21:27:15.803426462 -0400 |
27465 | @@ -51,7 +51,7 @@ do { \ | 27480 | @@ -51,7 +51,7 @@ do { \ |
27466 | } while (0); \ | 27481 | } while (0); \ |
27467 | } while (0) | 27482 | } while (0) |
@@ -27471,9 +27486,9 @@ diff -urNp linux-2.6.32.13/drivers/scsi/scsi_logging.h linux-2.6.32.13/drivers/s | |||
27471 | #endif /* CONFIG_SCSI_LOGGING */ | 27486 | #endif /* CONFIG_SCSI_LOGGING */ |
27472 | 27487 | ||
27473 | /* | 27488 | /* |
27474 | diff -urNp linux-2.6.32.13/drivers/scsi/sg.c linux-2.6.32.13/drivers/scsi/sg.c | 27489 | diff -urNp linux-2.6.32.15/drivers/scsi/sg.c linux-2.6.32.15/drivers/scsi/sg.c |
27475 | --- linux-2.6.32.13/drivers/scsi/sg.c 2010-03-15 11:52:04.000000000 -0400 | 27490 | --- linux-2.6.32.15/drivers/scsi/sg.c 2010-03-15 11:52:04.000000000 -0400 |
27476 | +++ linux-2.6.32.13/drivers/scsi/sg.c 2010-05-15 13:21:15.991412669 -0400 | 27491 | +++ linux-2.6.32.15/drivers/scsi/sg.c 2010-05-28 21:27:15.803426462 -0400 |
27477 | @@ -2292,7 +2292,7 @@ struct sg_proc_leaf { | 27492 | @@ -2292,7 +2292,7 @@ struct sg_proc_leaf { |
27478 | const struct file_operations * fops; | 27493 | const struct file_operations * fops; |
27479 | }; | 27494 | }; |
@@ -27492,9 +27507,9 @@ diff -urNp linux-2.6.32.13/drivers/scsi/sg.c linux-2.6.32.13/drivers/scsi/sg.c | |||
27492 | 27507 | ||
27493 | sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); | 27508 | sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); |
27494 | if (!sg_proc_sgp) | 27509 | if (!sg_proc_sgp) |
27495 | diff -urNp linux-2.6.32.13/drivers/serial/8250_pci.c linux-2.6.32.13/drivers/serial/8250_pci.c | 27510 | diff -urNp linux-2.6.32.15/drivers/serial/8250_pci.c linux-2.6.32.15/drivers/serial/8250_pci.c |
27496 | --- linux-2.6.32.13/drivers/serial/8250_pci.c 2010-03-15 11:52:04.000000000 -0400 | 27511 | --- linux-2.6.32.15/drivers/serial/8250_pci.c 2010-03-15 11:52:04.000000000 -0400 |
27497 | +++ linux-2.6.32.13/drivers/serial/8250_pci.c 2010-05-15 13:21:16.030795257 -0400 | 27512 | +++ linux-2.6.32.15/drivers/serial/8250_pci.c 2010-05-28 21:27:15.803426462 -0400 |
27498 | @@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t | 27513 | @@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t |
27499 | PCI_ANY_ID, PCI_ANY_ID, | 27514 | PCI_ANY_ID, PCI_ANY_ID, |
27500 | PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, | 27515 | PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, |
@@ -27504,9 +27519,9 @@ diff -urNp linux-2.6.32.13/drivers/serial/8250_pci.c linux-2.6.32.13/drivers/ser | |||
27504 | }; | 27519 | }; |
27505 | 27520 | ||
27506 | static struct pci_driver serial_pci_driver = { | 27521 | static struct pci_driver serial_pci_driver = { |
27507 | diff -urNp linux-2.6.32.13/drivers/serial/kgdboc.c linux-2.6.32.13/drivers/serial/kgdboc.c | 27522 | diff -urNp linux-2.6.32.15/drivers/serial/kgdboc.c linux-2.6.32.15/drivers/serial/kgdboc.c |
27508 | --- linux-2.6.32.13/drivers/serial/kgdboc.c 2010-03-15 11:52:04.000000000 -0400 | 27523 | --- linux-2.6.32.15/drivers/serial/kgdboc.c 2010-03-15 11:52:04.000000000 -0400 |
27509 | +++ linux-2.6.32.13/drivers/serial/kgdboc.c 2010-05-15 13:21:16.030795257 -0400 | 27524 | +++ linux-2.6.32.15/drivers/serial/kgdboc.c 2010-05-28 21:27:15.803426462 -0400 |
27510 | @@ -18,7 +18,7 @@ | 27525 | @@ -18,7 +18,7 @@ |
27511 | 27526 | ||
27512 | #define MAX_CONFIG_LEN 40 | 27527 | #define MAX_CONFIG_LEN 40 |
@@ -27525,9 +27540,9 @@ diff -urNp linux-2.6.32.13/drivers/serial/kgdboc.c linux-2.6.32.13/drivers/seria | |||
27525 | .name = "kgdboc", | 27540 | .name = "kgdboc", |
27526 | .read_char = kgdboc_get_char, | 27541 | .read_char = kgdboc_get_char, |
27527 | .write_char = kgdboc_put_char, | 27542 | .write_char = kgdboc_put_char, |
27528 | diff -urNp linux-2.6.32.13/drivers/staging/android/binder.c linux-2.6.32.13/drivers/staging/android/binder.c | 27543 | diff -urNp linux-2.6.32.15/drivers/staging/android/binder.c linux-2.6.32.15/drivers/staging/android/binder.c |
27529 | --- linux-2.6.32.13/drivers/staging/android/binder.c 2010-03-15 11:52:04.000000000 -0400 | 27544 | --- linux-2.6.32.15/drivers/staging/android/binder.c 2010-03-15 11:52:04.000000000 -0400 |
27530 | +++ linux-2.6.32.13/drivers/staging/android/binder.c 2010-05-15 13:21:16.072777583 -0400 | 27545 | +++ linux-2.6.32.15/drivers/staging/android/binder.c 2010-05-28 21:27:15.815152627 -0400 |
27531 | @@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a | 27546 | @@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a |
27532 | binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); | 27547 | binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); |
27533 | } | 27548 | } |
@@ -27537,9 +27552,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/android/binder.c linux-2.6.32.13/driv | |||
27537 | .open = binder_vma_open, | 27552 | .open = binder_vma_open, |
27538 | .close = binder_vma_close, | 27553 | .close = binder_vma_close, |
27539 | }; | 27554 | }; |
27540 | diff -urNp linux-2.6.32.13/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.13/drivers/staging/b3dfg/b3dfg.c | 27555 | diff -urNp linux-2.6.32.15/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.15/drivers/staging/b3dfg/b3dfg.c |
27541 | --- linux-2.6.32.13/drivers/staging/b3dfg/b3dfg.c 2010-03-15 11:52:04.000000000 -0400 | 27556 | --- linux-2.6.32.15/drivers/staging/b3dfg/b3dfg.c 2010-03-15 11:52:04.000000000 -0400 |
27542 | +++ linux-2.6.32.13/drivers/staging/b3dfg/b3dfg.c 2010-05-15 13:21:16.111132239 -0400 | 27557 | +++ linux-2.6.32.15/drivers/staging/b3dfg/b3dfg.c 2010-05-28 21:27:15.815152627 -0400 |
27543 | @@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are | 27558 | @@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are |
27544 | return VM_FAULT_NOPAGE; | 27559 | return VM_FAULT_NOPAGE; |
27545 | } | 27560 | } |
@@ -27558,9 +27573,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.13/drivers | |||
27558 | .owner = THIS_MODULE, | 27573 | .owner = THIS_MODULE, |
27559 | .open = b3dfg_open, | 27574 | .open = b3dfg_open, |
27560 | .release = b3dfg_release, | 27575 | .release = b3dfg_release, |
27561 | diff -urNp linux-2.6.32.13/drivers/staging/comedi/comedi_fops.c linux-2.6.32.13/drivers/staging/comedi/comedi_fops.c | 27576 | diff -urNp linux-2.6.32.15/drivers/staging/comedi/comedi_fops.c linux-2.6.32.15/drivers/staging/comedi/comedi_fops.c |
27562 | --- linux-2.6.32.13/drivers/staging/comedi/comedi_fops.c 2010-03-15 11:52:04.000000000 -0400 | 27577 | --- linux-2.6.32.15/drivers/staging/comedi/comedi_fops.c 2010-03-15 11:52:04.000000000 -0400 |
27563 | +++ linux-2.6.32.13/drivers/staging/comedi/comedi_fops.c 2010-05-15 13:21:16.111132239 -0400 | 27578 | +++ linux-2.6.32.15/drivers/staging/comedi/comedi_fops.c 2010-05-28 21:27:15.815152627 -0400 |
27564 | @@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct | 27579 | @@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct |
27565 | mutex_unlock(&dev->mutex); | 27580 | mutex_unlock(&dev->mutex); |
27566 | } | 27581 | } |
@@ -27570,9 +27585,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/comedi/comedi_fops.c linux-2.6.32.13/ | |||
27570 | .close = comedi_unmap, | 27585 | .close = comedi_unmap, |
27571 | }; | 27586 | }; |
27572 | 27587 | ||
27573 | diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.13/drivers/staging/dream/qdsp5/adsp_driver.c | 27588 | diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.15/drivers/staging/dream/qdsp5/adsp_driver.c |
27574 | --- linux-2.6.32.13/drivers/staging/dream/qdsp5/adsp_driver.c 2010-03-15 11:52:04.000000000 -0400 | 27589 | --- linux-2.6.32.15/drivers/staging/dream/qdsp5/adsp_driver.c 2010-03-15 11:52:04.000000000 -0400 |
27575 | +++ linux-2.6.32.13/drivers/staging/dream/qdsp5/adsp_driver.c 2010-05-15 13:21:16.111132239 -0400 | 27590 | +++ linux-2.6.32.15/drivers/staging/dream/qdsp5/adsp_driver.c 2010-05-28 21:27:15.815152627 -0400 |
27576 | @@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi | 27591 | @@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi |
27577 | static dev_t adsp_devno; | 27592 | static dev_t adsp_devno; |
27578 | static struct class *adsp_class; | 27593 | static struct class *adsp_class; |
@@ -27582,9 +27597,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.3 | |||
27582 | .owner = THIS_MODULE, | 27597 | .owner = THIS_MODULE, |
27583 | .open = adsp_open, | 27598 | .open = adsp_open, |
27584 | .unlocked_ioctl = adsp_ioctl, | 27599 | .unlocked_ioctl = adsp_ioctl, |
27585 | diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_aac.c | 27600 | diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_aac.c |
27586 | --- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_aac.c 2010-03-15 11:52:04.000000000 -0400 | 27601 | --- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_aac.c 2010-03-15 11:52:04.000000000 -0400 |
27587 | +++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_aac.c 2010-05-15 13:21:16.127017061 -0400 | 27602 | +++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_aac.c 2010-05-28 21:27:15.819209681 -0400 |
27588 | @@ -1022,7 +1022,7 @@ done: | 27603 | @@ -1022,7 +1022,7 @@ done: |
27589 | return rc; | 27604 | return rc; |
27590 | } | 27605 | } |
@@ -27594,9 +27609,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32. | |||
27594 | .owner = THIS_MODULE, | 27609 | .owner = THIS_MODULE, |
27595 | .open = audio_open, | 27610 | .open = audio_open, |
27596 | .release = audio_release, | 27611 | .release = audio_release, |
27597 | diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_amrnb.c | 27612 | diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_amrnb.c |
27598 | --- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-03-15 11:52:04.000000000 -0400 | 27613 | --- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-03-15 11:52:04.000000000 -0400 |
27599 | +++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-05-15 13:21:16.139031435 -0400 | 27614 | +++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-05-28 21:27:15.823076824 -0400 |
27600 | @@ -833,7 +833,7 @@ done: | 27615 | @@ -833,7 +833,7 @@ done: |
27601 | return rc; | 27616 | return rc; |
27602 | } | 27617 | } |
@@ -27606,9 +27621,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.3 | |||
27606 | .owner = THIS_MODULE, | 27621 | .owner = THIS_MODULE, |
27607 | .open = audamrnb_open, | 27622 | .open = audamrnb_open, |
27608 | .release = audamrnb_release, | 27623 | .release = audamrnb_release, |
27609 | diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_evrc.c | 27624 | diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_evrc.c |
27610 | --- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_evrc.c 2010-03-15 11:52:04.000000000 -0400 | 27625 | --- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_evrc.c 2010-03-15 11:52:04.000000000 -0400 |
27611 | +++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_evrc.c 2010-05-15 13:21:16.151007392 -0400 | 27626 | +++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_evrc.c 2010-05-28 21:27:15.823076824 -0400 |
27612 | @@ -805,7 +805,7 @@ dma_fail: | 27627 | @@ -805,7 +805,7 @@ dma_fail: |
27613 | return rc; | 27628 | return rc; |
27614 | } | 27629 | } |
@@ -27618,9 +27633,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32 | |||
27618 | .owner = THIS_MODULE, | 27633 | .owner = THIS_MODULE, |
27619 | .open = audevrc_open, | 27634 | .open = audevrc_open, |
27620 | .release = audevrc_release, | 27635 | .release = audevrc_release, |
27621 | diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_in.c | 27636 | diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_in.c |
27622 | --- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_in.c 2010-03-15 11:52:04.000000000 -0400 | 27637 | --- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_in.c 2010-03-15 11:52:04.000000000 -0400 |
27623 | +++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_in.c 2010-05-15 13:21:16.155145249 -0400 | 27638 | +++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_in.c 2010-05-28 21:27:15.823076824 -0400 |
27624 | @@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino | 27639 | @@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino |
27625 | return 0; | 27640 | return 0; |
27626 | } | 27641 | } |
@@ -27639,9 +27654,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.1 | |||
27639 | .owner = THIS_MODULE, | 27654 | .owner = THIS_MODULE, |
27640 | .open = audpre_open, | 27655 | .open = audpre_open, |
27641 | .unlocked_ioctl = audpre_ioctl, | 27656 | .unlocked_ioctl = audpre_ioctl, |
27642 | diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_mp3.c | 27657 | diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_mp3.c |
27643 | --- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_mp3.c 2010-03-15 11:52:04.000000000 -0400 | 27658 | --- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_mp3.c 2010-03-15 11:52:04.000000000 -0400 |
27644 | +++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_mp3.c 2010-05-15 13:21:16.171026730 -0400 | 27659 | +++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_mp3.c 2010-05-28 21:27:15.823076824 -0400 |
27645 | @@ -941,7 +941,7 @@ done: | 27660 | @@ -941,7 +941,7 @@ done: |
27646 | return rc; | 27661 | return rc; |
27647 | } | 27662 | } |
@@ -27651,9 +27666,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32. | |||
27651 | .owner = THIS_MODULE, | 27666 | .owner = THIS_MODULE, |
27652 | .open = audio_open, | 27667 | .open = audio_open, |
27653 | .release = audio_release, | 27668 | .release = audio_release, |
27654 | diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_out.c | 27669 | diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_out.c |
27655 | --- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_out.c 2010-03-15 11:52:04.000000000 -0400 | 27670 | --- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_out.c 2010-03-15 11:52:04.000000000 -0400 |
27656 | +++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_out.c 2010-05-15 13:21:16.175016772 -0400 | 27671 | +++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_out.c 2010-05-28 21:27:15.823076824 -0400 |
27657 | @@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod | 27672 | @@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod |
27658 | return 0; | 27673 | return 0; |
27659 | } | 27674 | } |
@@ -27672,9 +27687,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32. | |||
27672 | .owner = THIS_MODULE, | 27687 | .owner = THIS_MODULE, |
27673 | .open = audpp_open, | 27688 | .open = audpp_open, |
27674 | .unlocked_ioctl = audpp_ioctl, | 27689 | .unlocked_ioctl = audpp_ioctl, |
27675 | diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_qcelp.c | 27690 | diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_qcelp.c |
27676 | --- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-03-15 11:52:04.000000000 -0400 | 27691 | --- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-03-15 11:52:04.000000000 -0400 |
27677 | +++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-05-15 13:21:16.183014216 -0400 | 27692 | +++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-05-28 21:27:15.841738212 -0400 |
27678 | @@ -816,7 +816,7 @@ err: | 27693 | @@ -816,7 +816,7 @@ err: |
27679 | return rc; | 27694 | return rc; |
27680 | } | 27695 | } |
@@ -27684,9 +27699,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.3 | |||
27684 | .owner = THIS_MODULE, | 27699 | .owner = THIS_MODULE, |
27685 | .open = audqcelp_open, | 27700 | .open = audqcelp_open, |
27686 | .release = audqcelp_release, | 27701 | .release = audqcelp_release, |
27687 | diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.13/drivers/staging/dream/qdsp5/snd.c | 27702 | diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.15/drivers/staging/dream/qdsp5/snd.c |
27688 | --- linux-2.6.32.13/drivers/staging/dream/qdsp5/snd.c 2010-03-15 11:52:04.000000000 -0400 | 27703 | --- linux-2.6.32.15/drivers/staging/dream/qdsp5/snd.c 2010-03-15 11:52:04.000000000 -0400 |
27689 | +++ linux-2.6.32.13/drivers/staging/dream/qdsp5/snd.c 2010-05-15 13:21:16.187015266 -0400 | 27704 | +++ linux-2.6.32.15/drivers/staging/dream/qdsp5/snd.c 2010-05-28 21:27:15.841738212 -0400 |
27690 | @@ -242,7 +242,7 @@ err: | 27705 | @@ -242,7 +242,7 @@ err: |
27691 | return rc; | 27706 | return rc; |
27692 | } | 27707 | } |
@@ -27696,9 +27711,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.13/dri | |||
27696 | .owner = THIS_MODULE, | 27711 | .owner = THIS_MODULE, |
27697 | .open = snd_open, | 27712 | .open = snd_open, |
27698 | .release = snd_release, | 27713 | .release = snd_release, |
27699 | diff -urNp linux-2.6.32.13/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.13/drivers/staging/dream/smd/smd_qmi.c | 27714 | diff -urNp linux-2.6.32.15/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.15/drivers/staging/dream/smd/smd_qmi.c |
27700 | --- linux-2.6.32.13/drivers/staging/dream/smd/smd_qmi.c 2010-03-15 11:52:04.000000000 -0400 | 27715 | --- linux-2.6.32.15/drivers/staging/dream/smd/smd_qmi.c 2010-03-15 11:52:04.000000000 -0400 |
27701 | +++ linux-2.6.32.13/drivers/staging/dream/smd/smd_qmi.c 2010-05-15 13:21:16.190693177 -0400 | 27716 | +++ linux-2.6.32.15/drivers/staging/dream/smd/smd_qmi.c 2010-05-28 21:27:15.841738212 -0400 |
27702 | @@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, | 27717 | @@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, |
27703 | return 0; | 27718 | return 0; |
27704 | } | 27719 | } |
@@ -27708,9 +27723,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.13/d | |||
27708 | .owner = THIS_MODULE, | 27723 | .owner = THIS_MODULE, |
27709 | .read = qmi_read, | 27724 | .read = qmi_read, |
27710 | .write = qmi_write, | 27725 | .write = qmi_write, |
27711 | diff -urNp linux-2.6.32.13/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.13/drivers/staging/dream/smd/smd_rpcrouter_device.c | 27726 | diff -urNp linux-2.6.32.15/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.15/drivers/staging/dream/smd/smd_rpcrouter_device.c |
27712 | --- linux-2.6.32.13/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-03-15 11:52:04.000000000 -0400 | 27727 | --- linux-2.6.32.15/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-03-15 11:52:04.000000000 -0400 |
27713 | +++ linux-2.6.32.13/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-05-15 13:21:16.190693177 -0400 | 27728 | +++ linux-2.6.32.15/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-05-28 21:27:15.841738212 -0400 |
27714 | @@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file | 27729 | @@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file |
27715 | return rc; | 27730 | return rc; |
27716 | } | 27731 | } |
@@ -27729,9 +27744,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/smd/smd_rpcrouter_device.c linu | |||
27729 | .owner = THIS_MODULE, | 27744 | .owner = THIS_MODULE, |
27730 | .open = rpcrouter_open, | 27745 | .open = rpcrouter_open, |
27731 | .release = rpcrouter_release, | 27746 | .release = rpcrouter_release, |
27732 | diff -urNp linux-2.6.32.13/drivers/staging/dst/dcore.c linux-2.6.32.13/drivers/staging/dst/dcore.c | 27747 | diff -urNp linux-2.6.32.15/drivers/staging/dst/dcore.c linux-2.6.32.15/drivers/staging/dst/dcore.c |
27733 | --- linux-2.6.32.13/drivers/staging/dst/dcore.c 2010-03-15 11:52:04.000000000 -0400 | 27748 | --- linux-2.6.32.15/drivers/staging/dst/dcore.c 2010-03-15 11:52:04.000000000 -0400 |
27734 | +++ linux-2.6.32.13/drivers/staging/dst/dcore.c 2010-05-15 13:21:16.190693177 -0400 | 27749 | +++ linux-2.6.32.15/drivers/staging/dst/dcore.c 2010-05-28 21:27:15.841738212 -0400 |
27735 | @@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi | 27750 | @@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi |
27736 | return 0; | 27751 | return 0; |
27737 | } | 27752 | } |
@@ -27750,9 +27765,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dst/dcore.c linux-2.6.32.13/drivers/s | |||
27750 | snprintf(n->name, sizeof(n->name), "%s", ctl->name); | 27765 | snprintf(n->name, sizeof(n->name), "%s", ctl->name); |
27751 | 27766 | ||
27752 | err = dst_node_sysfs_init(n); | 27767 | err = dst_node_sysfs_init(n); |
27753 | diff -urNp linux-2.6.32.13/drivers/staging/dst/trans.c linux-2.6.32.13/drivers/staging/dst/trans.c | 27768 | diff -urNp linux-2.6.32.15/drivers/staging/dst/trans.c linux-2.6.32.15/drivers/staging/dst/trans.c |
27754 | --- linux-2.6.32.13/drivers/staging/dst/trans.c 2010-03-15 11:52:04.000000000 -0400 | 27769 | --- linux-2.6.32.15/drivers/staging/dst/trans.c 2010-03-15 11:52:04.000000000 -0400 |
27755 | +++ linux-2.6.32.13/drivers/staging/dst/trans.c 2010-05-15 13:21:16.211066896 -0400 | 27770 | +++ linux-2.6.32.15/drivers/staging/dst/trans.c 2010-05-28 21:27:15.842942312 -0400 |
27756 | @@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, | 27771 | @@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, |
27757 | t->error = 0; | 27772 | t->error = 0; |
27758 | t->retries = 0; | 27773 | t->retries = 0; |
@@ -27762,9 +27777,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dst/trans.c linux-2.6.32.13/drivers/s | |||
27762 | 27777 | ||
27763 | t->enc = bio_data_dir(bio); | 27778 | t->enc = bio_data_dir(bio); |
27764 | dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen); | 27779 | dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen); |
27765 | diff -urNp linux-2.6.32.13/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.13/drivers/staging/go7007/go7007-v4l2.c | 27780 | diff -urNp linux-2.6.32.15/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.15/drivers/staging/go7007/go7007-v4l2.c |
27766 | --- linux-2.6.32.13/drivers/staging/go7007/go7007-v4l2.c 2010-03-15 11:52:04.000000000 -0400 | 27781 | --- linux-2.6.32.15/drivers/staging/go7007/go7007-v4l2.c 2010-03-15 11:52:04.000000000 -0400 |
27767 | +++ linux-2.6.32.13/drivers/staging/go7007/go7007-v4l2.c 2010-05-15 13:21:16.231838911 -0400 | 27782 | +++ linux-2.6.32.15/drivers/staging/go7007/go7007-v4l2.c 2010-05-28 21:27:15.842942312 -0400 |
27768 | @@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are | 27783 | @@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are |
27769 | return 0; | 27784 | return 0; |
27770 | } | 27785 | } |
@@ -27774,9 +27789,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.13/ | |||
27774 | .open = go7007_vm_open, | 27789 | .open = go7007_vm_open, |
27775 | .close = go7007_vm_close, | 27790 | .close = go7007_vm_close, |
27776 | .fault = go7007_vm_fault, | 27791 | .fault = go7007_vm_fault, |
27777 | diff -urNp linux-2.6.32.13/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.13/drivers/staging/hv/blkvsc_drv.c | 27792 | diff -urNp linux-2.6.32.15/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.15/drivers/staging/hv/blkvsc_drv.c |
27778 | --- linux-2.6.32.13/drivers/staging/hv/blkvsc_drv.c 2010-03-15 11:52:04.000000000 -0400 | 27793 | --- linux-2.6.32.15/drivers/staging/hv/blkvsc_drv.c 2010-03-15 11:52:04.000000000 -0400 |
27779 | +++ linux-2.6.32.13/drivers/staging/hv/blkvsc_drv.c 2010-05-15 13:21:16.231838911 -0400 | 27794 | +++ linux-2.6.32.15/drivers/staging/hv/blkvsc_drv.c 2010-05-28 21:27:15.842942312 -0400 |
27780 | @@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV | 27795 | @@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV |
27781 | /* The one and only one */ | 27796 | /* The one and only one */ |
27782 | static struct blkvsc_driver_context g_blkvsc_drv; | 27797 | static struct blkvsc_driver_context g_blkvsc_drv; |
@@ -27786,9 +27801,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.13/drive | |||
27786 | .owner = THIS_MODULE, | 27801 | .owner = THIS_MODULE, |
27787 | .open = blkvsc_open, | 27802 | .open = blkvsc_open, |
27788 | .release = blkvsc_release, | 27803 | .release = blkvsc_release, |
27789 | diff -urNp linux-2.6.32.13/drivers/staging/panel/panel.c linux-2.6.32.13/drivers/staging/panel/panel.c | 27804 | diff -urNp linux-2.6.32.15/drivers/staging/panel/panel.c linux-2.6.32.15/drivers/staging/panel/panel.c |
27790 | --- linux-2.6.32.13/drivers/staging/panel/panel.c 2010-03-15 11:52:04.000000000 -0400 | 27805 | --- linux-2.6.32.15/drivers/staging/panel/panel.c 2010-03-15 11:52:04.000000000 -0400 |
27791 | +++ linux-2.6.32.13/drivers/staging/panel/panel.c 2010-05-15 13:21:16.231838911 -0400 | 27806 | +++ linux-2.6.32.15/drivers/staging/panel/panel.c 2010-05-28 21:27:15.842942312 -0400 |
27792 | @@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino | 27807 | @@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino |
27793 | return 0; | 27808 | return 0; |
27794 | } | 27809 | } |
@@ -27807,9 +27822,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/panel/panel.c linux-2.6.32.13/drivers | |||
27807 | .read = keypad_read, /* read */ | 27822 | .read = keypad_read, /* read */ |
27808 | .open = keypad_open, /* open */ | 27823 | .open = keypad_open, /* open */ |
27809 | .release = keypad_release, /* close */ | 27824 | .release = keypad_release, /* close */ |
27810 | diff -urNp linux-2.6.32.13/drivers/staging/phison/phison.c linux-2.6.32.13/drivers/staging/phison/phison.c | 27825 | diff -urNp linux-2.6.32.15/drivers/staging/phison/phison.c linux-2.6.32.15/drivers/staging/phison/phison.c |
27811 | --- linux-2.6.32.13/drivers/staging/phison/phison.c 2010-03-15 11:52:04.000000000 -0400 | 27826 | --- linux-2.6.32.15/drivers/staging/phison/phison.c 2010-03-15 11:52:04.000000000 -0400 |
27812 | +++ linux-2.6.32.13/drivers/staging/phison/phison.c 2010-05-15 13:21:16.242656725 -0400 | 27827 | +++ linux-2.6.32.15/drivers/staging/phison/phison.c 2010-05-28 21:27:15.842942312 -0400 |
27813 | @@ -43,7 +43,7 @@ static struct scsi_host_template phison_ | 27828 | @@ -43,7 +43,7 @@ static struct scsi_host_template phison_ |
27814 | ATA_BMDMA_SHT(DRV_NAME), | 27829 | ATA_BMDMA_SHT(DRV_NAME), |
27815 | }; | 27830 | }; |
@@ -27819,9 +27834,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/phison/phison.c linux-2.6.32.13/drive | |||
27819 | .inherits = &ata_bmdma_port_ops, | 27834 | .inherits = &ata_bmdma_port_ops, |
27820 | .prereset = phison_pre_reset, | 27835 | .prereset = phison_pre_reset, |
27821 | }; | 27836 | }; |
27822 | diff -urNp linux-2.6.32.13/drivers/staging/poch/poch.c linux-2.6.32.13/drivers/staging/poch/poch.c | 27837 | diff -urNp linux-2.6.32.15/drivers/staging/poch/poch.c linux-2.6.32.15/drivers/staging/poch/poch.c |
27823 | --- linux-2.6.32.13/drivers/staging/poch/poch.c 2010-03-15 11:52:04.000000000 -0400 | 27838 | --- linux-2.6.32.15/drivers/staging/poch/poch.c 2010-03-15 11:52:04.000000000 -0400 |
27824 | +++ linux-2.6.32.13/drivers/staging/poch/poch.c 2010-05-15 13:21:16.268445393 -0400 | 27839 | +++ linux-2.6.32.15/drivers/staging/poch/poch.c 2010-05-28 21:27:15.842942312 -0400 |
27825 | @@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod | 27840 | @@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod |
27826 | return 0; | 27841 | return 0; |
27827 | } | 27842 | } |
@@ -27831,9 +27846,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/poch/poch.c linux-2.6.32.13/drivers/s | |||
27831 | .owner = THIS_MODULE, | 27846 | .owner = THIS_MODULE, |
27832 | .open = poch_open, | 27847 | .open = poch_open, |
27833 | .release = poch_release, | 27848 | .release = poch_release, |
27834 | diff -urNp linux-2.6.32.13/drivers/staging/pohmelfs/inode.c linux-2.6.32.13/drivers/staging/pohmelfs/inode.c | 27849 | diff -urNp linux-2.6.32.15/drivers/staging/pohmelfs/inode.c linux-2.6.32.15/drivers/staging/pohmelfs/inode.c |
27835 | --- linux-2.6.32.13/drivers/staging/pohmelfs/inode.c 2010-03-15 11:52:04.000000000 -0400 | 27850 | --- linux-2.6.32.15/drivers/staging/pohmelfs/inode.c 2010-03-15 11:52:04.000000000 -0400 |
27836 | +++ linux-2.6.32.13/drivers/staging/pohmelfs/inode.c 2010-05-15 13:21:16.285190860 -0400 | 27851 | +++ linux-2.6.32.15/drivers/staging/pohmelfs/inode.c 2010-05-28 21:27:15.842942312 -0400 |
27837 | @@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su | 27852 | @@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su |
27838 | mutex_init(&psb->mcache_lock); | 27853 | mutex_init(&psb->mcache_lock); |
27839 | psb->mcache_root = RB_ROOT; | 27854 | psb->mcache_root = RB_ROOT; |
@@ -27843,9 +27858,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/pohmelfs/inode.c linux-2.6.32.13/driv | |||
27843 | 27858 | ||
27844 | psb->trans_max_pages = 100; | 27859 | psb->trans_max_pages = 100; |
27845 | 27860 | ||
27846 | diff -urNp linux-2.6.32.13/drivers/staging/pohmelfs/mcache.c linux-2.6.32.13/drivers/staging/pohmelfs/mcache.c | 27861 | diff -urNp linux-2.6.32.15/drivers/staging/pohmelfs/mcache.c linux-2.6.32.15/drivers/staging/pohmelfs/mcache.c |
27847 | --- linux-2.6.32.13/drivers/staging/pohmelfs/mcache.c 2010-03-15 11:52:04.000000000 -0400 | 27862 | --- linux-2.6.32.15/drivers/staging/pohmelfs/mcache.c 2010-03-15 11:52:04.000000000 -0400 |
27848 | +++ linux-2.6.32.13/drivers/staging/pohmelfs/mcache.c 2010-05-15 13:21:16.291030028 -0400 | 27863 | +++ linux-2.6.32.15/drivers/staging/pohmelfs/mcache.c 2010-05-28 21:27:15.842942312 -0400 |
27849 | @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ | 27864 | @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ |
27850 | m->data = data; | 27865 | m->data = data; |
27851 | m->start = start; | 27866 | m->start = start; |
@@ -27855,9 +27870,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/pohmelfs/mcache.c linux-2.6.32.13/dri | |||
27855 | 27870 | ||
27856 | mutex_lock(&psb->mcache_lock); | 27871 | mutex_lock(&psb->mcache_lock); |
27857 | err = pohmelfs_mcache_insert(psb, m); | 27872 | err = pohmelfs_mcache_insert(psb, m); |
27858 | diff -urNp linux-2.6.32.13/drivers/staging/pohmelfs/netfs.h linux-2.6.32.13/drivers/staging/pohmelfs/netfs.h | 27873 | diff -urNp linux-2.6.32.15/drivers/staging/pohmelfs/netfs.h linux-2.6.32.15/drivers/staging/pohmelfs/netfs.h |
27859 | --- linux-2.6.32.13/drivers/staging/pohmelfs/netfs.h 2010-03-15 11:52:04.000000000 -0400 | 27874 | --- linux-2.6.32.15/drivers/staging/pohmelfs/netfs.h 2010-03-15 11:52:04.000000000 -0400 |
27860 | +++ linux-2.6.32.13/drivers/staging/pohmelfs/netfs.h 2010-05-15 13:21:16.307023663 -0400 | 27875 | +++ linux-2.6.32.15/drivers/staging/pohmelfs/netfs.h 2010-05-28 21:27:15.846971345 -0400 |
27861 | @@ -570,7 +570,7 @@ struct pohmelfs_config; | 27876 | @@ -570,7 +570,7 @@ struct pohmelfs_config; |
27862 | struct pohmelfs_sb { | 27877 | struct pohmelfs_sb { |
27863 | struct rb_root mcache_root; | 27878 | struct rb_root mcache_root; |
@@ -27867,9 +27882,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/pohmelfs/netfs.h linux-2.6.32.13/driv | |||
27867 | unsigned long mcache_timeout; | 27882 | unsigned long mcache_timeout; |
27868 | 27883 | ||
27869 | unsigned int idx; | 27884 | unsigned int idx; |
27870 | diff -urNp linux-2.6.32.13/drivers/staging/sep/sep_driver.c linux-2.6.32.13/drivers/staging/sep/sep_driver.c | 27885 | diff -urNp linux-2.6.32.15/drivers/staging/sep/sep_driver.c linux-2.6.32.15/drivers/staging/sep/sep_driver.c |
27871 | --- linux-2.6.32.13/drivers/staging/sep/sep_driver.c 2010-03-15 11:52:04.000000000 -0400 | 27886 | --- linux-2.6.32.15/drivers/staging/sep/sep_driver.c 2010-03-15 11:52:04.000000000 -0400 |
27872 | +++ linux-2.6.32.13/drivers/staging/sep/sep_driver.c 2010-05-15 13:21:16.365819296 -0400 | 27887 | +++ linux-2.6.32.15/drivers/staging/sep/sep_driver.c 2010-05-28 21:27:15.859198868 -0400 |
27873 | @@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver | 27888 | @@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver |
27874 | static dev_t sep_devno; | 27889 | static dev_t sep_devno; |
27875 | 27890 | ||
@@ -27879,9 +27894,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/sep/sep_driver.c linux-2.6.32.13/driv | |||
27879 | .owner = THIS_MODULE, | 27894 | .owner = THIS_MODULE, |
27880 | .ioctl = sep_ioctl, | 27895 | .ioctl = sep_ioctl, |
27881 | .poll = sep_poll, | 27896 | .poll = sep_poll, |
27882 | diff -urNp linux-2.6.32.13/drivers/staging/vme/devices/vme_user.c linux-2.6.32.13/drivers/staging/vme/devices/vme_user.c | 27897 | diff -urNp linux-2.6.32.15/drivers/staging/vme/devices/vme_user.c linux-2.6.32.15/drivers/staging/vme/devices/vme_user.c |
27883 | --- linux-2.6.32.13/drivers/staging/vme/devices/vme_user.c 2010-03-15 11:52:04.000000000 -0400 | 27898 | --- linux-2.6.32.15/drivers/staging/vme/devices/vme_user.c 2010-03-15 11:52:04.000000000 -0400 |
27884 | +++ linux-2.6.32.13/drivers/staging/vme/devices/vme_user.c 2010-05-15 13:21:16.387343522 -0400 | 27899 | +++ linux-2.6.32.15/drivers/staging/vme/devices/vme_user.c 2010-05-28 21:27:15.859198868 -0400 |
27885 | @@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode * | 27900 | @@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode * |
27886 | static int __init vme_user_probe(struct device *, int, int); | 27901 | static int __init vme_user_probe(struct device *, int, int); |
27887 | static int __exit vme_user_remove(struct device *, int, int); | 27902 | static int __exit vme_user_remove(struct device *, int, int); |
@@ -27891,9 +27906,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/vme/devices/vme_user.c linux-2.6.32.1 | |||
27891 | .open = vme_user_open, | 27906 | .open = vme_user_open, |
27892 | .release = vme_user_release, | 27907 | .release = vme_user_release, |
27893 | .read = vme_user_read, | 27908 | .read = vme_user_read, |
27894 | diff -urNp linux-2.6.32.13/drivers/uio/uio.c linux-2.6.32.13/drivers/uio/uio.c | 27909 | diff -urNp linux-2.6.32.15/drivers/uio/uio.c linux-2.6.32.15/drivers/uio/uio.c |
27895 | --- linux-2.6.32.13/drivers/uio/uio.c 2010-03-15 11:52:04.000000000 -0400 | 27910 | --- linux-2.6.32.15/drivers/uio/uio.c 2010-03-15 11:52:04.000000000 -0400 |
27896 | +++ linux-2.6.32.13/drivers/uio/uio.c 2010-05-15 13:21:16.387343522 -0400 | 27911 | +++ linux-2.6.32.15/drivers/uio/uio.c 2010-05-28 21:27:15.859198868 -0400 |
27897 | @@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj | 27912 | @@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj |
27898 | return entry->show(mem, buf); | 27913 | return entry->show(mem, buf); |
27899 | } | 27914 | } |
@@ -27912,9 +27927,9 @@ diff -urNp linux-2.6.32.13/drivers/uio/uio.c linux-2.6.32.13/drivers/uio/uio.c | |||
27912 | .show = portio_type_show, | 27927 | .show = portio_type_show, |
27913 | }; | 27928 | }; |
27914 | 27929 | ||
27915 | diff -urNp linux-2.6.32.13/drivers/usb/atm/usbatm.c linux-2.6.32.13/drivers/usb/atm/usbatm.c | 27930 | diff -urNp linux-2.6.32.15/drivers/usb/atm/usbatm.c linux-2.6.32.15/drivers/usb/atm/usbatm.c |
27916 | --- linux-2.6.32.13/drivers/usb/atm/usbatm.c 2010-03-15 11:52:04.000000000 -0400 | 27931 | --- linux-2.6.32.15/drivers/usb/atm/usbatm.c 2010-03-15 11:52:04.000000000 -0400 |
27917 | +++ linux-2.6.32.13/drivers/usb/atm/usbatm.c 2010-05-15 13:21:16.394585811 -0400 | 27932 | +++ linux-2.6.32.15/drivers/usb/atm/usbatm.c 2010-05-28 21:27:15.859198868 -0400 |
27918 | @@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru | 27933 | @@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru |
27919 | if (printk_ratelimit()) | 27934 | if (printk_ratelimit()) |
27920 | atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", | 27935 | atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", |
@@ -27994,9 +28009,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/atm/usbatm.c linux-2.6.32.13/drivers/usb/ | |||
27994 | 28009 | ||
27995 | if (!left--) { | 28010 | if (!left--) { |
27996 | if (instance->disconnected) | 28011 | if (instance->disconnected) |
27997 | diff -urNp linux-2.6.32.13/drivers/usb/class/cdc-acm.c linux-2.6.32.13/drivers/usb/class/cdc-acm.c | 28012 | diff -urNp linux-2.6.32.15/drivers/usb/class/cdc-acm.c linux-2.6.32.15/drivers/usb/class/cdc-acm.c |
27998 | --- linux-2.6.32.13/drivers/usb/class/cdc-acm.c 2010-04-29 17:49:38.389083173 -0400 | 28013 | --- linux-2.6.32.15/drivers/usb/class/cdc-acm.c 2010-04-29 17:49:38.389083173 -0400 |
27999 | +++ linux-2.6.32.13/drivers/usb/class/cdc-acm.c 2010-05-15 13:21:16.402576854 -0400 | 28014 | +++ linux-2.6.32.15/drivers/usb/class/cdc-acm.c 2010-05-28 21:27:15.867210979 -0400 |
28000 | @@ -1535,7 +1535,7 @@ static struct usb_device_id acm_ids[] = | 28015 | @@ -1535,7 +1535,7 @@ static struct usb_device_id acm_ids[] = |
28001 | USB_CDC_ACM_PROTO_AT_CDMA) }, | 28016 | USB_CDC_ACM_PROTO_AT_CDMA) }, |
28002 | 28017 | ||
@@ -28006,9 +28021,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/class/cdc-acm.c linux-2.6.32.13/drivers/u | |||
28006 | }; | 28021 | }; |
28007 | 28022 | ||
28008 | MODULE_DEVICE_TABLE(usb, acm_ids); | 28023 | MODULE_DEVICE_TABLE(usb, acm_ids); |
28009 | diff -urNp linux-2.6.32.13/drivers/usb/class/usblp.c linux-2.6.32.13/drivers/usb/class/usblp.c | 28024 | diff -urNp linux-2.6.32.15/drivers/usb/class/usblp.c linux-2.6.32.15/drivers/usb/class/usblp.c |
28010 | --- linux-2.6.32.13/drivers/usb/class/usblp.c 2010-03-15 11:52:04.000000000 -0400 | 28025 | --- linux-2.6.32.15/drivers/usb/class/usblp.c 2010-03-15 11:52:04.000000000 -0400 |
28011 | +++ linux-2.6.32.13/drivers/usb/class/usblp.c 2010-05-15 13:21:16.423521533 -0400 | 28026 | +++ linux-2.6.32.15/drivers/usb/class/usblp.c 2010-05-28 21:27:15.875212570 -0400 |
28012 | @@ -228,7 +228,7 @@ static const struct quirk_printer_struct | 28027 | @@ -228,7 +228,7 @@ static const struct quirk_printer_struct |
28013 | { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */ | 28028 | { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */ |
28014 | { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */ | 28029 | { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */ |
@@ -28027,9 +28042,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/class/usblp.c linux-2.6.32.13/drivers/usb | |||
28027 | }; | 28042 | }; |
28028 | 28043 | ||
28029 | MODULE_DEVICE_TABLE (usb, usblp_ids); | 28044 | MODULE_DEVICE_TABLE (usb, usblp_ids); |
28030 | diff -urNp linux-2.6.32.13/drivers/usb/core/hcd.c linux-2.6.32.13/drivers/usb/core/hcd.c | 28045 | diff -urNp linux-2.6.32.15/drivers/usb/core/hcd.c linux-2.6.32.15/drivers/usb/core/hcd.c |
28031 | --- linux-2.6.32.13/drivers/usb/core/hcd.c 2010-03-15 11:52:04.000000000 -0400 | 28046 | --- linux-2.6.32.15/drivers/usb/core/hcd.c 2010-03-15 11:52:04.000000000 -0400 |
28032 | +++ linux-2.6.32.13/drivers/usb/core/hcd.c 2010-05-15 13:21:16.445526992 -0400 | 28047 | +++ linux-2.6.32.15/drivers/usb/core/hcd.c 2010-05-28 21:27:15.887216714 -0400 |
28033 | @@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd | 28048 | @@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd |
28034 | 28049 | ||
28035 | #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) | 28050 | #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) |
@@ -28048,9 +28063,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/core/hcd.c linux-2.6.32.13/drivers/usb/co | |||
28048 | { | 28063 | { |
28049 | 28064 | ||
28050 | if (mon_ops) | 28065 | if (mon_ops) |
28051 | diff -urNp linux-2.6.32.13/drivers/usb/core/hcd.h linux-2.6.32.13/drivers/usb/core/hcd.h | 28066 | diff -urNp linux-2.6.32.15/drivers/usb/core/hcd.h linux-2.6.32.15/drivers/usb/core/hcd.h |
28052 | --- linux-2.6.32.13/drivers/usb/core/hcd.h 2010-03-15 11:52:04.000000000 -0400 | 28067 | --- linux-2.6.32.15/drivers/usb/core/hcd.h 2010-03-15 11:52:04.000000000 -0400 |
28053 | +++ linux-2.6.32.13/drivers/usb/core/hcd.h 2010-05-15 13:21:16.447026425 -0400 | 28068 | +++ linux-2.6.32.15/drivers/usb/core/hcd.h 2010-05-28 21:27:15.887216714 -0400 |
28054 | @@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { | 28069 | @@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { |
28055 | #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) | 28070 | #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) |
28056 | 28071 | ||
@@ -28078,9 +28093,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/core/hcd.h linux-2.6.32.13/drivers/usb/co | |||
28078 | void usb_mon_deregister(void); | 28093 | void usb_mon_deregister(void); |
28079 | 28094 | ||
28080 | #else | 28095 | #else |
28081 | diff -urNp linux-2.6.32.13/drivers/usb/core/hub.c linux-2.6.32.13/drivers/usb/core/hub.c | 28096 | diff -urNp linux-2.6.32.15/drivers/usb/core/hub.c linux-2.6.32.15/drivers/usb/core/hub.c |
28082 | --- linux-2.6.32.13/drivers/usb/core/hub.c 2010-03-15 11:52:04.000000000 -0400 | 28097 | --- linux-2.6.32.15/drivers/usb/core/hub.c 2010-03-15 11:52:04.000000000 -0400 |
28083 | +++ linux-2.6.32.13/drivers/usb/core/hub.c 2010-05-15 13:21:16.479087397 -0400 | 28098 | +++ linux-2.6.32.15/drivers/usb/core/hub.c 2010-05-28 21:27:15.887216714 -0400 |
28084 | @@ -3397,7 +3397,7 @@ static struct usb_device_id hub_id_table | 28099 | @@ -3397,7 +3397,7 @@ static struct usb_device_id hub_id_table |
28085 | .bDeviceClass = USB_CLASS_HUB}, | 28100 | .bDeviceClass = USB_CLASS_HUB}, |
28086 | { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, | 28101 | { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, |
@@ -28090,9 +28105,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/core/hub.c linux-2.6.32.13/drivers/usb/co | |||
28090 | }; | 28105 | }; |
28091 | 28106 | ||
28092 | MODULE_DEVICE_TABLE (usb, hub_id_table); | 28107 | MODULE_DEVICE_TABLE (usb, hub_id_table); |
28093 | diff -urNp linux-2.6.32.13/drivers/usb/core/message.c linux-2.6.32.13/drivers/usb/core/message.c | 28108 | diff -urNp linux-2.6.32.15/drivers/usb/core/message.c linux-2.6.32.15/drivers/usb/core/message.c |
28094 | --- linux-2.6.32.13/drivers/usb/core/message.c 2010-03-15 11:52:04.000000000 -0400 | 28109 | --- linux-2.6.32.15/drivers/usb/core/message.c 2010-03-15 11:52:04.000000000 -0400 |
28095 | +++ linux-2.6.32.13/drivers/usb/core/message.c 2010-05-15 13:21:16.479087397 -0400 | 28110 | +++ linux-2.6.32.15/drivers/usb/core/message.c 2010-05-28 21:27:15.898958902 -0400 |
28096 | @@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device | 28111 | @@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device |
28097 | buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); | 28112 | buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); |
28098 | if (buf) { | 28113 | if (buf) { |
@@ -28104,9 +28119,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/core/message.c linux-2.6.32.13/drivers/us | |||
28104 | if (!smallbuf) | 28119 | if (!smallbuf) |
28105 | return buf; | 28120 | return buf; |
28106 | memcpy(smallbuf, buf, len); | 28121 | memcpy(smallbuf, buf, len); |
28107 | diff -urNp linux-2.6.32.13/drivers/usb/host/ehci-pci.c linux-2.6.32.13/drivers/usb/host/ehci-pci.c | 28122 | diff -urNp linux-2.6.32.15/drivers/usb/host/ehci-pci.c linux-2.6.32.15/drivers/usb/host/ehci-pci.c |
28108 | --- linux-2.6.32.13/drivers/usb/host/ehci-pci.c 2010-03-15 11:52:04.000000000 -0400 | 28123 | --- linux-2.6.32.15/drivers/usb/host/ehci-pci.c 2010-03-15 11:52:04.000000000 -0400 |
28109 | +++ linux-2.6.32.13/drivers/usb/host/ehci-pci.c 2010-05-15 13:21:16.495431959 -0400 | 28124 | +++ linux-2.6.32.15/drivers/usb/host/ehci-pci.c 2010-05-28 21:27:15.898958902 -0400 |
28110 | @@ -422,7 +422,7 @@ static const struct pci_device_id pci_id | 28125 | @@ -422,7 +422,7 @@ static const struct pci_device_id pci_id |
28111 | PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), | 28126 | PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), |
28112 | .driver_data = (unsigned long) &ehci_pci_hc_driver, | 28127 | .driver_data = (unsigned long) &ehci_pci_hc_driver, |
@@ -28116,9 +28131,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/host/ehci-pci.c linux-2.6.32.13/drivers/u | |||
28116 | }; | 28131 | }; |
28117 | MODULE_DEVICE_TABLE(pci, pci_ids); | 28132 | MODULE_DEVICE_TABLE(pci, pci_ids); |
28118 | 28133 | ||
28119 | diff -urNp linux-2.6.32.13/drivers/usb/host/uhci-hcd.c linux-2.6.32.13/drivers/usb/host/uhci-hcd.c | 28134 | diff -urNp linux-2.6.32.15/drivers/usb/host/uhci-hcd.c linux-2.6.32.15/drivers/usb/host/uhci-hcd.c |
28120 | --- linux-2.6.32.13/drivers/usb/host/uhci-hcd.c 2010-03-15 11:52:04.000000000 -0400 | 28135 | --- linux-2.6.32.15/drivers/usb/host/uhci-hcd.c 2010-03-15 11:52:04.000000000 -0400 |
28121 | +++ linux-2.6.32.13/drivers/usb/host/uhci-hcd.c 2010-05-15 13:21:16.495431959 -0400 | 28136 | +++ linux-2.6.32.15/drivers/usb/host/uhci-hcd.c 2010-05-28 21:27:15.903225521 -0400 |
28122 | @@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p | 28137 | @@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p |
28123 | /* handle any USB UHCI controller */ | 28138 | /* handle any USB UHCI controller */ |
28124 | PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), | 28139 | PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), |
@@ -28128,9 +28143,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/host/uhci-hcd.c linux-2.6.32.13/drivers/u | |||
28128 | }; | 28143 | }; |
28129 | 28144 | ||
28130 | MODULE_DEVICE_TABLE(pci, uhci_pci_ids); | 28145 | MODULE_DEVICE_TABLE(pci, uhci_pci_ids); |
28131 | diff -urNp linux-2.6.32.13/drivers/usb/misc/appledisplay.c linux-2.6.32.13/drivers/usb/misc/appledisplay.c | 28146 | diff -urNp linux-2.6.32.15/drivers/usb/misc/appledisplay.c linux-2.6.32.15/drivers/usb/misc/appledisplay.c |
28132 | --- linux-2.6.32.13/drivers/usb/misc/appledisplay.c 2010-03-15 11:52:04.000000000 -0400 | 28147 | --- linux-2.6.32.15/drivers/usb/misc/appledisplay.c 2010-03-15 11:52:04.000000000 -0400 |
28133 | +++ linux-2.6.32.13/drivers/usb/misc/appledisplay.c 2010-05-15 13:21:16.495431959 -0400 | 28148 | +++ linux-2.6.32.15/drivers/usb/misc/appledisplay.c 2010-05-28 21:27:15.903225521 -0400 |
28134 | @@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes | 28149 | @@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes |
28135 | return pdata->msgdata[1]; | 28150 | return pdata->msgdata[1]; |
28136 | } | 28151 | } |
@@ -28140,9 +28155,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/misc/appledisplay.c linux-2.6.32.13/drive | |||
28140 | .get_brightness = appledisplay_bl_get_brightness, | 28155 | .get_brightness = appledisplay_bl_get_brightness, |
28141 | .update_status = appledisplay_bl_update_status, | 28156 | .update_status = appledisplay_bl_update_status, |
28142 | }; | 28157 | }; |
28143 | diff -urNp linux-2.6.32.13/drivers/usb/mon/mon_main.c linux-2.6.32.13/drivers/usb/mon/mon_main.c | 28158 | diff -urNp linux-2.6.32.15/drivers/usb/mon/mon_main.c linux-2.6.32.15/drivers/usb/mon/mon_main.c |
28144 | --- linux-2.6.32.13/drivers/usb/mon/mon_main.c 2010-03-15 11:52:04.000000000 -0400 | 28159 | --- linux-2.6.32.15/drivers/usb/mon/mon_main.c 2010-03-15 11:52:04.000000000 -0400 |
28145 | +++ linux-2.6.32.13/drivers/usb/mon/mon_main.c 2010-05-15 13:21:16.504078790 -0400 | 28160 | +++ linux-2.6.32.15/drivers/usb/mon/mon_main.c 2010-05-28 21:27:15.903225521 -0400 |
28146 | @@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { | 28161 | @@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { |
28147 | /* | 28162 | /* |
28148 | * Ops | 28163 | * Ops |
@@ -28152,9 +28167,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/mon/mon_main.c linux-2.6.32.13/drivers/us | |||
28152 | .urb_submit = mon_submit, | 28167 | .urb_submit = mon_submit, |
28153 | .urb_submit_error = mon_submit_error, | 28168 | .urb_submit_error = mon_submit_error, |
28154 | .urb_complete = mon_complete, | 28169 | .urb_complete = mon_complete, |
28155 | diff -urNp linux-2.6.32.13/drivers/usb/storage/debug.h linux-2.6.32.13/drivers/usb/storage/debug.h | 28170 | diff -urNp linux-2.6.32.15/drivers/usb/storage/debug.h linux-2.6.32.15/drivers/usb/storage/debug.h |
28156 | --- linux-2.6.32.13/drivers/usb/storage/debug.h 2010-03-15 11:52:04.000000000 -0400 | 28171 | --- linux-2.6.32.15/drivers/usb/storage/debug.h 2010-03-15 11:52:04.000000000 -0400 |
28157 | +++ linux-2.6.32.13/drivers/usb/storage/debug.h 2010-05-15 13:21:16.521852812 -0400 | 28172 | +++ linux-2.6.32.15/drivers/usb/storage/debug.h 2010-05-28 21:27:15.903225521 -0400 |
28158 | @@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char | 28173 | @@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char |
28159 | #define US_DEBUGPX(x...) printk( x ) | 28174 | #define US_DEBUGPX(x...) printk( x ) |
28160 | #define US_DEBUG(x) x | 28175 | #define US_DEBUG(x) x |
@@ -28168,9 +28183,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/storage/debug.h linux-2.6.32.13/drivers/u | |||
28168 | #endif | 28183 | #endif |
28169 | 28184 | ||
28170 | #endif | 28185 | #endif |
28171 | diff -urNp linux-2.6.32.13/drivers/usb/storage/usb.c linux-2.6.32.13/drivers/usb/storage/usb.c | 28186 | diff -urNp linux-2.6.32.15/drivers/usb/storage/usb.c linux-2.6.32.15/drivers/usb/storage/usb.c |
28172 | --- linux-2.6.32.13/drivers/usb/storage/usb.c 2010-03-15 11:52:04.000000000 -0400 | 28187 | --- linux-2.6.32.15/drivers/usb/storage/usb.c 2010-03-15 11:52:04.000000000 -0400 |
28173 | +++ linux-2.6.32.13/drivers/usb/storage/usb.c 2010-05-15 13:21:16.547749964 -0400 | 28188 | +++ linux-2.6.32.15/drivers/usb/storage/usb.c 2010-05-28 21:27:15.915209208 -0400 |
28174 | @@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l | 28189 | @@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l |
28175 | 28190 | ||
28176 | static struct us_unusual_dev us_unusual_dev_list[] = { | 28191 | static struct us_unusual_dev us_unusual_dev_list[] = { |
@@ -28180,9 +28195,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/storage/usb.c linux-2.6.32.13/drivers/usb | |||
28180 | }; | 28195 | }; |
28181 | 28196 | ||
28182 | #undef UNUSUAL_DEV | 28197 | #undef UNUSUAL_DEV |
28183 | diff -urNp linux-2.6.32.13/drivers/usb/storage/usual-tables.c linux-2.6.32.13/drivers/usb/storage/usual-tables.c | 28198 | diff -urNp linux-2.6.32.15/drivers/usb/storage/usual-tables.c linux-2.6.32.15/drivers/usb/storage/usual-tables.c |
28184 | --- linux-2.6.32.13/drivers/usb/storage/usual-tables.c 2010-03-15 11:52:04.000000000 -0400 | 28199 | --- linux-2.6.32.15/drivers/usb/storage/usual-tables.c 2010-03-15 11:52:04.000000000 -0400 |
28185 | +++ linux-2.6.32.13/drivers/usb/storage/usual-tables.c 2010-05-15 13:21:16.559032137 -0400 | 28200 | +++ linux-2.6.32.15/drivers/usb/storage/usual-tables.c 2010-05-28 21:27:15.915209208 -0400 |
28186 | @@ -48,7 +48,7 @@ | 28201 | @@ -48,7 +48,7 @@ |
28187 | 28202 | ||
28188 | struct usb_device_id usb_storage_usb_ids[] = { | 28203 | struct usb_device_id usb_storage_usb_ids[] = { |
@@ -28192,9 +28207,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/storage/usual-tables.c linux-2.6.32.13/dr | |||
28192 | }; | 28207 | }; |
28193 | EXPORT_SYMBOL_GPL(usb_storage_usb_ids); | 28208 | EXPORT_SYMBOL_GPL(usb_storage_usb_ids); |
28194 | 28209 | ||
28195 | diff -urNp linux-2.6.32.13/drivers/uwb/wlp/messages.c linux-2.6.32.13/drivers/uwb/wlp/messages.c | 28210 | diff -urNp linux-2.6.32.15/drivers/uwb/wlp/messages.c linux-2.6.32.15/drivers/uwb/wlp/messages.c |
28196 | --- linux-2.6.32.13/drivers/uwb/wlp/messages.c 2010-03-15 11:52:04.000000000 -0400 | 28211 | --- linux-2.6.32.15/drivers/uwb/wlp/messages.c 2010-03-15 11:52:04.000000000 -0400 |
28197 | +++ linux-2.6.32.13/drivers/uwb/wlp/messages.c 2010-05-15 13:21:16.584920944 -0400 | 28212 | +++ linux-2.6.32.15/drivers/uwb/wlp/messages.c 2010-05-28 21:27:15.915209208 -0400 |
28198 | @@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct | 28213 | @@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct |
28199 | size_t len = skb->len; | 28214 | size_t len = skb->len; |
28200 | size_t used; | 28215 | size_t used; |
@@ -28204,9 +28219,9 @@ diff -urNp linux-2.6.32.13/drivers/uwb/wlp/messages.c linux-2.6.32.13/drivers/uw | |||
28204 | enum wlp_assc_error assc_err; | 28219 | enum wlp_assc_error assc_err; |
28205 | char enonce_buf[WLP_WSS_NONCE_STRSIZE]; | 28220 | char enonce_buf[WLP_WSS_NONCE_STRSIZE]; |
28206 | char rnonce_buf[WLP_WSS_NONCE_STRSIZE]; | 28221 | char rnonce_buf[WLP_WSS_NONCE_STRSIZE]; |
28207 | diff -urNp linux-2.6.32.13/drivers/uwb/wlp/sysfs.c linux-2.6.32.13/drivers/uwb/wlp/sysfs.c | 28222 | diff -urNp linux-2.6.32.15/drivers/uwb/wlp/sysfs.c linux-2.6.32.15/drivers/uwb/wlp/sysfs.c |
28208 | --- linux-2.6.32.13/drivers/uwb/wlp/sysfs.c 2010-03-15 11:52:04.000000000 -0400 | 28223 | --- linux-2.6.32.15/drivers/uwb/wlp/sysfs.c 2010-03-15 11:52:04.000000000 -0400 |
28209 | +++ linux-2.6.32.13/drivers/uwb/wlp/sysfs.c 2010-05-15 13:21:16.587027337 -0400 | 28224 | +++ linux-2.6.32.15/drivers/uwb/wlp/sysfs.c 2010-05-28 21:27:15.915209208 -0400 |
28210 | @@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec | 28225 | @@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec |
28211 | return ret; | 28226 | return ret; |
28212 | } | 28227 | } |
@@ -28217,9 +28232,9 @@ diff -urNp linux-2.6.32.13/drivers/uwb/wlp/sysfs.c linux-2.6.32.13/drivers/uwb/w | |||
28217 | .show = wlp_wss_attr_show, | 28232 | .show = wlp_wss_attr_show, |
28218 | .store = wlp_wss_attr_store, | 28233 | .store = wlp_wss_attr_store, |
28219 | }; | 28234 | }; |
28220 | diff -urNp linux-2.6.32.13/drivers/video/atmel_lcdfb.c linux-2.6.32.13/drivers/video/atmel_lcdfb.c | 28235 | diff -urNp linux-2.6.32.15/drivers/video/atmel_lcdfb.c linux-2.6.32.15/drivers/video/atmel_lcdfb.c |
28221 | --- linux-2.6.32.13/drivers/video/atmel_lcdfb.c 2010-03-15 11:52:04.000000000 -0400 | 28236 | --- linux-2.6.32.15/drivers/video/atmel_lcdfb.c 2010-03-15 11:52:04.000000000 -0400 |
28222 | +++ linux-2.6.32.13/drivers/video/atmel_lcdfb.c 2010-05-15 13:21:16.587027337 -0400 | 28237 | +++ linux-2.6.32.15/drivers/video/atmel_lcdfb.c 2010-05-28 21:27:15.915209208 -0400 |
28223 | @@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc | 28238 | @@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc |
28224 | return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); | 28239 | return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); |
28225 | } | 28240 | } |
@@ -28229,9 +28244,9 @@ diff -urNp linux-2.6.32.13/drivers/video/atmel_lcdfb.c linux-2.6.32.13/drivers/v | |||
28229 | .update_status = atmel_bl_update_status, | 28244 | .update_status = atmel_bl_update_status, |
28230 | .get_brightness = atmel_bl_get_brightness, | 28245 | .get_brightness = atmel_bl_get_brightness, |
28231 | }; | 28246 | }; |
28232 | diff -urNp linux-2.6.32.13/drivers/video/aty/aty128fb.c linux-2.6.32.13/drivers/video/aty/aty128fb.c | 28247 | diff -urNp linux-2.6.32.15/drivers/video/aty/aty128fb.c linux-2.6.32.15/drivers/video/aty/aty128fb.c |
28233 | --- linux-2.6.32.13/drivers/video/aty/aty128fb.c 2010-03-15 11:52:04.000000000 -0400 | 28248 | --- linux-2.6.32.15/drivers/video/aty/aty128fb.c 2010-03-15 11:52:04.000000000 -0400 |
28234 | +++ linux-2.6.32.13/drivers/video/aty/aty128fb.c 2010-05-15 13:21:16.599120806 -0400 | 28249 | +++ linux-2.6.32.15/drivers/video/aty/aty128fb.c 2010-05-28 21:27:15.931199110 -0400 |
28235 | @@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru | 28250 | @@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru |
28236 | return bd->props.brightness; | 28251 | return bd->props.brightness; |
28237 | } | 28252 | } |
@@ -28241,9 +28256,9 @@ diff -urNp linux-2.6.32.13/drivers/video/aty/aty128fb.c linux-2.6.32.13/drivers/ | |||
28241 | .get_brightness = aty128_bl_get_brightness, | 28256 | .get_brightness = aty128_bl_get_brightness, |
28242 | .update_status = aty128_bl_update_status, | 28257 | .update_status = aty128_bl_update_status, |
28243 | }; | 28258 | }; |
28244 | diff -urNp linux-2.6.32.13/drivers/video/aty/atyfb_base.c linux-2.6.32.13/drivers/video/aty/atyfb_base.c | 28259 | diff -urNp linux-2.6.32.15/drivers/video/aty/atyfb_base.c linux-2.6.32.15/drivers/video/aty/atyfb_base.c |
28245 | --- linux-2.6.32.13/drivers/video/aty/atyfb_base.c 2010-03-15 11:52:04.000000000 -0400 | 28260 | --- linux-2.6.32.15/drivers/video/aty/atyfb_base.c 2010-03-15 11:52:04.000000000 -0400 |
28246 | +++ linux-2.6.32.13/drivers/video/aty/atyfb_base.c 2010-05-15 13:21:16.611030004 -0400 | 28261 | +++ linux-2.6.32.15/drivers/video/aty/atyfb_base.c 2010-05-28 21:27:15.939052461 -0400 |
28247 | @@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct | 28262 | @@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct |
28248 | return bd->props.brightness; | 28263 | return bd->props.brightness; |
28249 | } | 28264 | } |
@@ -28253,9 +28268,9 @@ diff -urNp linux-2.6.32.13/drivers/video/aty/atyfb_base.c linux-2.6.32.13/driver | |||
28253 | .get_brightness = aty_bl_get_brightness, | 28268 | .get_brightness = aty_bl_get_brightness, |
28254 | .update_status = aty_bl_update_status, | 28269 | .update_status = aty_bl_update_status, |
28255 | }; | 28270 | }; |
28256 | diff -urNp linux-2.6.32.13/drivers/video/aty/radeon_backlight.c linux-2.6.32.13/drivers/video/aty/radeon_backlight.c | 28271 | diff -urNp linux-2.6.32.15/drivers/video/aty/radeon_backlight.c linux-2.6.32.15/drivers/video/aty/radeon_backlight.c |
28257 | --- linux-2.6.32.13/drivers/video/aty/radeon_backlight.c 2010-03-15 11:52:04.000000000 -0400 | 28272 | --- linux-2.6.32.15/drivers/video/aty/radeon_backlight.c 2010-03-15 11:52:04.000000000 -0400 |
28258 | +++ linux-2.6.32.13/drivers/video/aty/radeon_backlight.c 2010-05-15 13:21:16.611030004 -0400 | 28273 | +++ linux-2.6.32.15/drivers/video/aty/radeon_backlight.c 2010-05-28 21:27:15.939052461 -0400 |
28259 | @@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru | 28274 | @@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru |
28260 | return bd->props.brightness; | 28275 | return bd->props.brightness; |
28261 | } | 28276 | } |
@@ -28265,9 +28280,9 @@ diff -urNp linux-2.6.32.13/drivers/video/aty/radeon_backlight.c linux-2.6.32.13/ | |||
28265 | .get_brightness = radeon_bl_get_brightness, | 28280 | .get_brightness = radeon_bl_get_brightness, |
28266 | .update_status = radeon_bl_update_status, | 28281 | .update_status = radeon_bl_update_status, |
28267 | }; | 28282 | }; |
28268 | diff -urNp linux-2.6.32.13/drivers/video/backlight/adp5520_bl.c linux-2.6.32.13/drivers/video/backlight/adp5520_bl.c | 28283 | diff -urNp linux-2.6.32.15/drivers/video/backlight/adp5520_bl.c linux-2.6.32.15/drivers/video/backlight/adp5520_bl.c |
28269 | --- linux-2.6.32.13/drivers/video/backlight/adp5520_bl.c 2010-03-15 11:52:04.000000000 -0400 | 28284 | --- linux-2.6.32.15/drivers/video/backlight/adp5520_bl.c 2010-03-15 11:52:04.000000000 -0400 |
28270 | +++ linux-2.6.32.13/drivers/video/backlight/adp5520_bl.c 2010-05-15 13:21:16.611030004 -0400 | 28285 | +++ linux-2.6.32.15/drivers/video/backlight/adp5520_bl.c 2010-05-28 21:27:15.939052461 -0400 |
28271 | @@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str | 28286 | @@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str |
28272 | return error ? data->current_brightness : reg_val; | 28287 | return error ? data->current_brightness : reg_val; |
28273 | } | 28288 | } |
@@ -28277,9 +28292,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/adp5520_bl.c linux-2.6.32.13/ | |||
28277 | .update_status = adp5520_bl_update_status, | 28292 | .update_status = adp5520_bl_update_status, |
28278 | .get_brightness = adp5520_bl_get_brightness, | 28293 | .get_brightness = adp5520_bl_get_brightness, |
28279 | }; | 28294 | }; |
28280 | diff -urNp linux-2.6.32.13/drivers/video/backlight/adx_bl.c linux-2.6.32.13/drivers/video/backlight/adx_bl.c | 28295 | diff -urNp linux-2.6.32.15/drivers/video/backlight/adx_bl.c linux-2.6.32.15/drivers/video/backlight/adx_bl.c |
28281 | --- linux-2.6.32.13/drivers/video/backlight/adx_bl.c 2010-03-15 11:52:04.000000000 -0400 | 28296 | --- linux-2.6.32.15/drivers/video/backlight/adx_bl.c 2010-03-15 11:52:04.000000000 -0400 |
28282 | +++ linux-2.6.32.13/drivers/video/backlight/adx_bl.c 2010-05-15 13:21:16.611030004 -0400 | 28297 | +++ linux-2.6.32.15/drivers/video/backlight/adx_bl.c 2010-05-28 21:27:15.939052461 -0400 |
28283 | @@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct | 28298 | @@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct |
28284 | return 1; | 28299 | return 1; |
28285 | } | 28300 | } |
@@ -28289,9 +28304,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/adx_bl.c linux-2.6.32.13/driv | |||
28289 | .options = 0, | 28304 | .options = 0, |
28290 | .update_status = adx_backlight_update_status, | 28305 | .update_status = adx_backlight_update_status, |
28291 | .get_brightness = adx_backlight_get_brightness, | 28306 | .get_brightness = adx_backlight_get_brightness, |
28292 | diff -urNp linux-2.6.32.13/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.13/drivers/video/backlight/atmel-pwm-bl.c | 28307 | diff -urNp linux-2.6.32.15/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.15/drivers/video/backlight/atmel-pwm-bl.c |
28293 | --- linux-2.6.32.13/drivers/video/backlight/atmel-pwm-bl.c 2010-03-15 11:52:04.000000000 -0400 | 28308 | --- linux-2.6.32.15/drivers/video/backlight/atmel-pwm-bl.c 2010-03-15 11:52:04.000000000 -0400 |
28294 | +++ linux-2.6.32.13/drivers/video/backlight/atmel-pwm-bl.c 2010-05-15 13:21:16.611030004 -0400 | 28309 | +++ linux-2.6.32.15/drivers/video/backlight/atmel-pwm-bl.c 2010-05-28 21:27:15.939052461 -0400 |
28295 | @@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct | 28310 | @@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct |
28296 | return pwm_channel_enable(&pwmbl->pwmc); | 28311 | return pwm_channel_enable(&pwmbl->pwmc); |
28297 | } | 28312 | } |
@@ -28301,9 +28316,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.1 | |||
28301 | .get_brightness = atmel_pwm_bl_get_intensity, | 28316 | .get_brightness = atmel_pwm_bl_get_intensity, |
28302 | .update_status = atmel_pwm_bl_set_intensity, | 28317 | .update_status = atmel_pwm_bl_set_intensity, |
28303 | }; | 28318 | }; |
28304 | diff -urNp linux-2.6.32.13/drivers/video/backlight/backlight.c linux-2.6.32.13/drivers/video/backlight/backlight.c | 28319 | diff -urNp linux-2.6.32.15/drivers/video/backlight/backlight.c linux-2.6.32.15/drivers/video/backlight/backlight.c |
28305 | --- linux-2.6.32.13/drivers/video/backlight/backlight.c 2010-03-15 11:52:04.000000000 -0400 | 28320 | --- linux-2.6.32.15/drivers/video/backlight/backlight.c 2010-03-15 11:52:04.000000000 -0400 |
28306 | +++ linux-2.6.32.13/drivers/video/backlight/backlight.c 2010-05-15 13:21:16.611030004 -0400 | 28321 | +++ linux-2.6.32.15/drivers/video/backlight/backlight.c 2010-05-28 21:27:15.939052461 -0400 |
28307 | @@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update); | 28322 | @@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update); |
28308 | * ERR_PTR() or a pointer to the newly allocated device. | 28323 | * ERR_PTR() or a pointer to the newly allocated device. |
28309 | */ | 28324 | */ |
@@ -28313,9 +28328,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/backlight.c linux-2.6.32.13/d | |||
28313 | { | 28328 | { |
28314 | struct backlight_device *new_bd; | 28329 | struct backlight_device *new_bd; |
28315 | int rc; | 28330 | int rc; |
28316 | diff -urNp linux-2.6.32.13/drivers/video/backlight/corgi_lcd.c linux-2.6.32.13/drivers/video/backlight/corgi_lcd.c | 28331 | diff -urNp linux-2.6.32.15/drivers/video/backlight/corgi_lcd.c linux-2.6.32.15/drivers/video/backlight/corgi_lcd.c |
28317 | --- linux-2.6.32.13/drivers/video/backlight/corgi_lcd.c 2010-03-15 11:52:04.000000000 -0400 | 28332 | --- linux-2.6.32.15/drivers/video/backlight/corgi_lcd.c 2010-03-15 11:52:04.000000000 -0400 |
28318 | +++ linux-2.6.32.13/drivers/video/backlight/corgi_lcd.c 2010-05-15 13:21:16.611030004 -0400 | 28333 | +++ linux-2.6.32.15/drivers/video/backlight/corgi_lcd.c 2010-05-28 21:27:15.939052461 -0400 |
28319 | @@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit | 28334 | @@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit |
28320 | } | 28335 | } |
28321 | EXPORT_SYMBOL(corgi_lcd_limit_intensity); | 28336 | EXPORT_SYMBOL(corgi_lcd_limit_intensity); |
@@ -28325,9 +28340,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/corgi_lcd.c linux-2.6.32.13/d | |||
28325 | .get_brightness = corgi_bl_get_intensity, | 28340 | .get_brightness = corgi_bl_get_intensity, |
28326 | .update_status = corgi_bl_update_status, | 28341 | .update_status = corgi_bl_update_status, |
28327 | }; | 28342 | }; |
28328 | diff -urNp linux-2.6.32.13/drivers/video/backlight/cr_bllcd.c linux-2.6.32.13/drivers/video/backlight/cr_bllcd.c | 28343 | diff -urNp linux-2.6.32.15/drivers/video/backlight/cr_bllcd.c linux-2.6.32.15/drivers/video/backlight/cr_bllcd.c |
28329 | --- linux-2.6.32.13/drivers/video/backlight/cr_bllcd.c 2010-03-15 11:52:04.000000000 -0400 | 28344 | --- linux-2.6.32.15/drivers/video/backlight/cr_bllcd.c 2010-03-15 11:52:04.000000000 -0400 |
28330 | +++ linux-2.6.32.13/drivers/video/backlight/cr_bllcd.c 2010-05-15 13:21:16.611030004 -0400 | 28345 | +++ linux-2.6.32.15/drivers/video/backlight/cr_bllcd.c 2010-05-28 21:27:15.939052461 -0400 |
28331 | @@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st | 28346 | @@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st |
28332 | return intensity; | 28347 | return intensity; |
28333 | } | 28348 | } |
@@ -28337,9 +28352,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/cr_bllcd.c linux-2.6.32.13/dr | |||
28337 | .get_brightness = cr_backlight_get_intensity, | 28352 | .get_brightness = cr_backlight_get_intensity, |
28338 | .update_status = cr_backlight_set_intensity, | 28353 | .update_status = cr_backlight_set_intensity, |
28339 | }; | 28354 | }; |
28340 | diff -urNp linux-2.6.32.13/drivers/video/backlight/da903x_bl.c linux-2.6.32.13/drivers/video/backlight/da903x_bl.c | 28355 | diff -urNp linux-2.6.32.15/drivers/video/backlight/da903x_bl.c linux-2.6.32.15/drivers/video/backlight/da903x_bl.c |
28341 | --- linux-2.6.32.13/drivers/video/backlight/da903x_bl.c 2010-03-15 11:52:04.000000000 -0400 | 28356 | --- linux-2.6.32.15/drivers/video/backlight/da903x_bl.c 2010-03-15 11:52:04.000000000 -0400 |
28342 | +++ linux-2.6.32.13/drivers/video/backlight/da903x_bl.c 2010-05-15 13:21:16.611030004 -0400 | 28357 | +++ linux-2.6.32.15/drivers/video/backlight/da903x_bl.c 2010-05-28 21:27:15.939052461 -0400 |
28343 | @@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne | 28358 | @@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne |
28344 | return data->current_brightness; | 28359 | return data->current_brightness; |
28345 | } | 28360 | } |
@@ -28349,9 +28364,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/da903x_bl.c linux-2.6.32.13/d | |||
28349 | .update_status = da903x_backlight_update_status, | 28364 | .update_status = da903x_backlight_update_status, |
28350 | .get_brightness = da903x_backlight_get_brightness, | 28365 | .get_brightness = da903x_backlight_get_brightness, |
28351 | }; | 28366 | }; |
28352 | diff -urNp linux-2.6.32.13/drivers/video/backlight/generic_bl.c linux-2.6.32.13/drivers/video/backlight/generic_bl.c | 28367 | diff -urNp linux-2.6.32.15/drivers/video/backlight/generic_bl.c linux-2.6.32.15/drivers/video/backlight/generic_bl.c |
28353 | --- linux-2.6.32.13/drivers/video/backlight/generic_bl.c 2010-03-15 11:52:04.000000000 -0400 | 28368 | --- linux-2.6.32.15/drivers/video/backlight/generic_bl.c 2010-03-15 11:52:04.000000000 -0400 |
28354 | +++ linux-2.6.32.13/drivers/video/backlight/generic_bl.c 2010-05-15 13:21:16.611030004 -0400 | 28369 | +++ linux-2.6.32.15/drivers/video/backlight/generic_bl.c 2010-05-28 21:27:15.939052461 -0400 |
28355 | @@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit) | 28370 | @@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit) |
28356 | } | 28371 | } |
28357 | EXPORT_SYMBOL(corgibl_limit_intensity); | 28372 | EXPORT_SYMBOL(corgibl_limit_intensity); |
@@ -28361,9 +28376,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/generic_bl.c linux-2.6.32.13/ | |||
28361 | .options = BL_CORE_SUSPENDRESUME, | 28376 | .options = BL_CORE_SUSPENDRESUME, |
28362 | .get_brightness = genericbl_get_intensity, | 28377 | .get_brightness = genericbl_get_intensity, |
28363 | .update_status = genericbl_send_intensity, | 28378 | .update_status = genericbl_send_intensity, |
28364 | diff -urNp linux-2.6.32.13/drivers/video/backlight/hp680_bl.c linux-2.6.32.13/drivers/video/backlight/hp680_bl.c | 28379 | diff -urNp linux-2.6.32.15/drivers/video/backlight/hp680_bl.c linux-2.6.32.15/drivers/video/backlight/hp680_bl.c |
28365 | --- linux-2.6.32.13/drivers/video/backlight/hp680_bl.c 2010-03-15 11:52:04.000000000 -0400 | 28380 | --- linux-2.6.32.15/drivers/video/backlight/hp680_bl.c 2010-03-15 11:52:04.000000000 -0400 |
28366 | +++ linux-2.6.32.13/drivers/video/backlight/hp680_bl.c 2010-05-15 13:21:16.611030004 -0400 | 28381 | +++ linux-2.6.32.15/drivers/video/backlight/hp680_bl.c 2010-05-28 21:27:15.939052461 -0400 |
28367 | @@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct | 28382 | @@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct |
28368 | return current_intensity; | 28383 | return current_intensity; |
28369 | } | 28384 | } |
@@ -28373,9 +28388,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/hp680_bl.c linux-2.6.32.13/dr | |||
28373 | .get_brightness = hp680bl_get_intensity, | 28388 | .get_brightness = hp680bl_get_intensity, |
28374 | .update_status = hp680bl_set_intensity, | 28389 | .update_status = hp680bl_set_intensity, |
28375 | }; | 28390 | }; |
28376 | diff -urNp linux-2.6.32.13/drivers/video/backlight/jornada720_bl.c linux-2.6.32.13/drivers/video/backlight/jornada720_bl.c | 28391 | diff -urNp linux-2.6.32.15/drivers/video/backlight/jornada720_bl.c linux-2.6.32.15/drivers/video/backlight/jornada720_bl.c |
28377 | --- linux-2.6.32.13/drivers/video/backlight/jornada720_bl.c 2010-03-15 11:52:04.000000000 -0400 | 28392 | --- linux-2.6.32.15/drivers/video/backlight/jornada720_bl.c 2010-03-15 11:52:04.000000000 -0400 |
28378 | +++ linux-2.6.32.13/drivers/video/backlight/jornada720_bl.c 2010-05-15 13:21:16.611030004 -0400 | 28393 | +++ linux-2.6.32.15/drivers/video/backlight/jornada720_bl.c 2010-05-28 21:27:15.943207359 -0400 |
28379 | @@ -93,7 +93,7 @@ out: | 28394 | @@ -93,7 +93,7 @@ out: |
28380 | return ret; | 28395 | return ret; |
28381 | } | 28396 | } |
@@ -28385,9 +28400,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/jornada720_bl.c linux-2.6.32. | |||
28385 | .get_brightness = jornada_bl_get_brightness, | 28400 | .get_brightness = jornada_bl_get_brightness, |
28386 | .update_status = jornada_bl_update_status, | 28401 | .update_status = jornada_bl_update_status, |
28387 | .options = BL_CORE_SUSPENDRESUME, | 28402 | .options = BL_CORE_SUSPENDRESUME, |
28388 | diff -urNp linux-2.6.32.13/drivers/video/backlight/kb3886_bl.c linux-2.6.32.13/drivers/video/backlight/kb3886_bl.c | 28403 | diff -urNp linux-2.6.32.15/drivers/video/backlight/kb3886_bl.c linux-2.6.32.15/drivers/video/backlight/kb3886_bl.c |
28389 | --- linux-2.6.32.13/drivers/video/backlight/kb3886_bl.c 2010-03-15 11:52:04.000000000 -0400 | 28404 | --- linux-2.6.32.15/drivers/video/backlight/kb3886_bl.c 2010-03-15 11:52:04.000000000 -0400 |
28390 | +++ linux-2.6.32.13/drivers/video/backlight/kb3886_bl.c 2010-05-15 13:21:16.611030004 -0400 | 28405 | +++ linux-2.6.32.15/drivers/video/backlight/kb3886_bl.c 2010-05-28 21:27:15.943207359 -0400 |
28391 | @@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct | 28406 | @@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct |
28392 | return kb3886bl_intensity; | 28407 | return kb3886bl_intensity; |
28393 | } | 28408 | } |
@@ -28397,9 +28412,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/kb3886_bl.c linux-2.6.32.13/d | |||
28397 | .get_brightness = kb3886bl_get_intensity, | 28412 | .get_brightness = kb3886bl_get_intensity, |
28398 | .update_status = kb3886bl_send_intensity, | 28413 | .update_status = kb3886bl_send_intensity, |
28399 | }; | 28414 | }; |
28400 | diff -urNp linux-2.6.32.13/drivers/video/backlight/locomolcd.c linux-2.6.32.13/drivers/video/backlight/locomolcd.c | 28415 | diff -urNp linux-2.6.32.15/drivers/video/backlight/locomolcd.c linux-2.6.32.15/drivers/video/backlight/locomolcd.c |
28401 | --- linux-2.6.32.13/drivers/video/backlight/locomolcd.c 2010-03-15 11:52:04.000000000 -0400 | 28416 | --- linux-2.6.32.15/drivers/video/backlight/locomolcd.c 2010-03-15 11:52:04.000000000 -0400 |
28402 | +++ linux-2.6.32.13/drivers/video/backlight/locomolcd.c 2010-05-15 13:21:16.611030004 -0400 | 28417 | +++ linux-2.6.32.15/drivers/video/backlight/locomolcd.c 2010-05-28 21:27:15.943207359 -0400 |
28403 | @@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc | 28418 | @@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc |
28404 | return current_intensity; | 28419 | return current_intensity; |
28405 | } | 28420 | } |
@@ -28409,9 +28424,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/locomolcd.c linux-2.6.32.13/d | |||
28409 | .get_brightness = locomolcd_get_intensity, | 28424 | .get_brightness = locomolcd_get_intensity, |
28410 | .update_status = locomolcd_set_intensity, | 28425 | .update_status = locomolcd_set_intensity, |
28411 | }; | 28426 | }; |
28412 | diff -urNp linux-2.6.32.13/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.13/drivers/video/backlight/mbp_nvidia_bl.c | 28427 | diff -urNp linux-2.6.32.15/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.15/drivers/video/backlight/mbp_nvidia_bl.c |
28413 | --- linux-2.6.32.13/drivers/video/backlight/mbp_nvidia_bl.c 2010-04-29 17:49:38.397382140 -0400 | 28428 | --- linux-2.6.32.15/drivers/video/backlight/mbp_nvidia_bl.c 2010-04-29 17:49:38.397382140 -0400 |
28414 | +++ linux-2.6.32.13/drivers/video/backlight/mbp_nvidia_bl.c 2010-05-15 13:21:16.611030004 -0400 | 28429 | +++ linux-2.6.32.15/drivers/video/backlight/mbp_nvidia_bl.c 2010-05-28 21:27:15.943207359 -0400 |
28415 | @@ -33,7 +33,7 @@ struct dmi_match_data { | 28430 | @@ -33,7 +33,7 @@ struct dmi_match_data { |
28416 | unsigned long iostart; | 28431 | unsigned long iostart; |
28417 | unsigned long iolen; | 28432 | unsigned long iolen; |
@@ -28421,9 +28436,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32. | |||
28421 | }; | 28436 | }; |
28422 | 28437 | ||
28423 | /* Module parameters. */ | 28438 | /* Module parameters. */ |
28424 | diff -urNp linux-2.6.32.13/drivers/video/backlight/omap1_bl.c linux-2.6.32.13/drivers/video/backlight/omap1_bl.c | 28439 | diff -urNp linux-2.6.32.15/drivers/video/backlight/omap1_bl.c linux-2.6.32.15/drivers/video/backlight/omap1_bl.c |
28425 | --- linux-2.6.32.13/drivers/video/backlight/omap1_bl.c 2010-03-15 11:52:04.000000000 -0400 | 28440 | --- linux-2.6.32.15/drivers/video/backlight/omap1_bl.c 2010-03-15 11:52:04.000000000 -0400 |
28426 | +++ linux-2.6.32.13/drivers/video/backlight/omap1_bl.c 2010-05-15 13:21:16.647199475 -0400 | 28441 | +++ linux-2.6.32.15/drivers/video/backlight/omap1_bl.c 2010-05-28 21:27:15.943207359 -0400 |
28427 | @@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b | 28442 | @@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b |
28428 | return bl->current_intensity; | 28443 | return bl->current_intensity; |
28429 | } | 28444 | } |
@@ -28433,9 +28448,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/omap1_bl.c linux-2.6.32.13/dr | |||
28433 | .get_brightness = omapbl_get_intensity, | 28448 | .get_brightness = omapbl_get_intensity, |
28434 | .update_status = omapbl_update_status, | 28449 | .update_status = omapbl_update_status, |
28435 | }; | 28450 | }; |
28436 | diff -urNp linux-2.6.32.13/drivers/video/backlight/progear_bl.c linux-2.6.32.13/drivers/video/backlight/progear_bl.c | 28451 | diff -urNp linux-2.6.32.15/drivers/video/backlight/progear_bl.c linux-2.6.32.15/drivers/video/backlight/progear_bl.c |
28437 | --- linux-2.6.32.13/drivers/video/backlight/progear_bl.c 2010-03-15 11:52:04.000000000 -0400 | 28452 | --- linux-2.6.32.15/drivers/video/backlight/progear_bl.c 2010-03-15 11:52:04.000000000 -0400 |
28438 | +++ linux-2.6.32.13/drivers/video/backlight/progear_bl.c 2010-05-15 13:21:16.647199475 -0400 | 28453 | +++ linux-2.6.32.15/drivers/video/backlight/progear_bl.c 2010-05-28 21:27:15.943207359 -0400 |
28439 | @@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc | 28454 | @@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc |
28440 | return intensity - HW_LEVEL_MIN; | 28455 | return intensity - HW_LEVEL_MIN; |
28441 | } | 28456 | } |
@@ -28445,9 +28460,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/progear_bl.c linux-2.6.32.13/ | |||
28445 | .get_brightness = progearbl_get_intensity, | 28460 | .get_brightness = progearbl_get_intensity, |
28446 | .update_status = progearbl_set_intensity, | 28461 | .update_status = progearbl_set_intensity, |
28447 | }; | 28462 | }; |
28448 | diff -urNp linux-2.6.32.13/drivers/video/backlight/pwm_bl.c linux-2.6.32.13/drivers/video/backlight/pwm_bl.c | 28463 | diff -urNp linux-2.6.32.15/drivers/video/backlight/pwm_bl.c linux-2.6.32.15/drivers/video/backlight/pwm_bl.c |
28449 | --- linux-2.6.32.13/drivers/video/backlight/pwm_bl.c 2010-03-15 11:52:04.000000000 -0400 | 28464 | --- linux-2.6.32.15/drivers/video/backlight/pwm_bl.c 2010-03-15 11:52:04.000000000 -0400 |
28450 | +++ linux-2.6.32.13/drivers/video/backlight/pwm_bl.c 2010-05-15 13:21:16.647199475 -0400 | 28465 | +++ linux-2.6.32.15/drivers/video/backlight/pwm_bl.c 2010-05-28 21:27:15.943207359 -0400 |
28451 | @@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness( | 28466 | @@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness( |
28452 | return bl->props.brightness; | 28467 | return bl->props.brightness; |
28453 | } | 28468 | } |
@@ -28457,9 +28472,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/pwm_bl.c linux-2.6.32.13/driv | |||
28457 | .update_status = pwm_backlight_update_status, | 28472 | .update_status = pwm_backlight_update_status, |
28458 | .get_brightness = pwm_backlight_get_brightness, | 28473 | .get_brightness = pwm_backlight_get_brightness, |
28459 | }; | 28474 | }; |
28460 | diff -urNp linux-2.6.32.13/drivers/video/backlight/tosa_bl.c linux-2.6.32.13/drivers/video/backlight/tosa_bl.c | 28475 | diff -urNp linux-2.6.32.15/drivers/video/backlight/tosa_bl.c linux-2.6.32.15/drivers/video/backlight/tosa_bl.c |
28461 | --- linux-2.6.32.13/drivers/video/backlight/tosa_bl.c 2010-03-15 11:52:04.000000000 -0400 | 28476 | --- linux-2.6.32.15/drivers/video/backlight/tosa_bl.c 2010-03-15 11:52:04.000000000 -0400 |
28462 | +++ linux-2.6.32.13/drivers/video/backlight/tosa_bl.c 2010-05-15 13:21:16.647199475 -0400 | 28477 | +++ linux-2.6.32.15/drivers/video/backlight/tosa_bl.c 2010-05-28 21:27:15.943207359 -0400 |
28463 | @@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct | 28478 | @@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct |
28464 | return props->brightness; | 28479 | return props->brightness; |
28465 | } | 28480 | } |
@@ -28469,9 +28484,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/tosa_bl.c linux-2.6.32.13/dri | |||
28469 | .get_brightness = tosa_bl_get_brightness, | 28484 | .get_brightness = tosa_bl_get_brightness, |
28470 | .update_status = tosa_bl_update_status, | 28485 | .update_status = tosa_bl_update_status, |
28471 | }; | 28486 | }; |
28472 | diff -urNp linux-2.6.32.13/drivers/video/backlight/wm831x_bl.c linux-2.6.32.13/drivers/video/backlight/wm831x_bl.c | 28487 | diff -urNp linux-2.6.32.15/drivers/video/backlight/wm831x_bl.c linux-2.6.32.15/drivers/video/backlight/wm831x_bl.c |
28473 | --- linux-2.6.32.13/drivers/video/backlight/wm831x_bl.c 2010-03-15 11:52:04.000000000 -0400 | 28488 | --- linux-2.6.32.15/drivers/video/backlight/wm831x_bl.c 2010-03-15 11:52:04.000000000 -0400 |
28474 | +++ linux-2.6.32.13/drivers/video/backlight/wm831x_bl.c 2010-05-15 13:21:16.647199475 -0400 | 28489 | +++ linux-2.6.32.15/drivers/video/backlight/wm831x_bl.c 2010-05-28 21:27:15.943207359 -0400 |
28475 | @@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne | 28490 | @@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne |
28476 | return data->current_brightness; | 28491 | return data->current_brightness; |
28477 | } | 28492 | } |
@@ -28481,9 +28496,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/wm831x_bl.c linux-2.6.32.13/d | |||
28481 | .options = BL_CORE_SUSPENDRESUME, | 28496 | .options = BL_CORE_SUSPENDRESUME, |
28482 | .update_status = wm831x_backlight_update_status, | 28497 | .update_status = wm831x_backlight_update_status, |
28483 | .get_brightness = wm831x_backlight_get_brightness, | 28498 | .get_brightness = wm831x_backlight_get_brightness, |
28484 | diff -urNp linux-2.6.32.13/drivers/video/bf54x-lq043fb.c linux-2.6.32.13/drivers/video/bf54x-lq043fb.c | 28499 | diff -urNp linux-2.6.32.15/drivers/video/bf54x-lq043fb.c linux-2.6.32.15/drivers/video/bf54x-lq043fb.c |
28485 | --- linux-2.6.32.13/drivers/video/bf54x-lq043fb.c 2010-03-15 11:52:04.000000000 -0400 | 28500 | --- linux-2.6.32.15/drivers/video/bf54x-lq043fb.c 2010-03-15 11:52:04.000000000 -0400 |
28486 | +++ linux-2.6.32.13/drivers/video/bf54x-lq043fb.c 2010-05-15 13:21:16.647199475 -0400 | 28501 | +++ linux-2.6.32.15/drivers/video/bf54x-lq043fb.c 2010-05-28 21:27:15.943207359 -0400 |
28487 | @@ -463,7 +463,7 @@ static int bl_get_brightness(struct back | 28502 | @@ -463,7 +463,7 @@ static int bl_get_brightness(struct back |
28488 | return 0; | 28503 | return 0; |
28489 | } | 28504 | } |
@@ -28493,9 +28508,9 @@ diff -urNp linux-2.6.32.13/drivers/video/bf54x-lq043fb.c linux-2.6.32.13/drivers | |||
28493 | .get_brightness = bl_get_brightness, | 28508 | .get_brightness = bl_get_brightness, |
28494 | }; | 28509 | }; |
28495 | 28510 | ||
28496 | diff -urNp linux-2.6.32.13/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.13/drivers/video/bfin-t350mcqb-fb.c | 28511 | diff -urNp linux-2.6.32.15/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.15/drivers/video/bfin-t350mcqb-fb.c |
28497 | --- linux-2.6.32.13/drivers/video/bfin-t350mcqb-fb.c 2010-03-15 11:52:04.000000000 -0400 | 28512 | --- linux-2.6.32.15/drivers/video/bfin-t350mcqb-fb.c 2010-05-28 20:16:44.454934408 -0400 |
28498 | +++ linux-2.6.32.13/drivers/video/bfin-t350mcqb-fb.c 2010-05-15 13:21:16.647199475 -0400 | 28513 | +++ linux-2.6.32.15/drivers/video/bfin-t350mcqb-fb.c 2010-05-28 21:27:15.943207359 -0400 |
28499 | @@ -381,7 +381,7 @@ static int bl_get_brightness(struct back | 28514 | @@ -381,7 +381,7 @@ static int bl_get_brightness(struct back |
28500 | return 0; | 28515 | return 0; |
28501 | } | 28516 | } |
@@ -28505,9 +28520,9 @@ diff -urNp linux-2.6.32.13/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.13/driv | |||
28505 | .get_brightness = bl_get_brightness, | 28520 | .get_brightness = bl_get_brightness, |
28506 | }; | 28521 | }; |
28507 | 28522 | ||
28508 | diff -urNp linux-2.6.32.13/drivers/video/fbcmap.c linux-2.6.32.13/drivers/video/fbcmap.c | 28523 | diff -urNp linux-2.6.32.15/drivers/video/fbcmap.c linux-2.6.32.15/drivers/video/fbcmap.c |
28509 | --- linux-2.6.32.13/drivers/video/fbcmap.c 2010-03-15 11:52:04.000000000 -0400 | 28524 | --- linux-2.6.32.15/drivers/video/fbcmap.c 2010-03-15 11:52:04.000000000 -0400 |
28510 | +++ linux-2.6.32.13/drivers/video/fbcmap.c 2010-05-15 13:21:16.647199475 -0400 | 28525 | +++ linux-2.6.32.15/drivers/video/fbcmap.c 2010-05-28 21:27:15.943207359 -0400 |
28511 | @@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user | 28526 | @@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user |
28512 | rc = -ENODEV; | 28527 | rc = -ENODEV; |
28513 | goto out; | 28528 | goto out; |
@@ -28518,9 +28533,9 @@ diff -urNp linux-2.6.32.13/drivers/video/fbcmap.c linux-2.6.32.13/drivers/video/ | |||
28518 | rc = -EINVAL; | 28533 | rc = -EINVAL; |
28519 | goto out1; | 28534 | goto out1; |
28520 | } | 28535 | } |
28521 | diff -urNp linux-2.6.32.13/drivers/video/fbmem.c linux-2.6.32.13/drivers/video/fbmem.c | 28536 | diff -urNp linux-2.6.32.15/drivers/video/fbmem.c linux-2.6.32.15/drivers/video/fbmem.c |
28522 | --- linux-2.6.32.13/drivers/video/fbmem.c 2010-03-15 11:52:04.000000000 -0400 | 28537 | --- linux-2.6.32.15/drivers/video/fbmem.c 2010-03-15 11:52:04.000000000 -0400 |
28523 | +++ linux-2.6.32.13/drivers/video/fbmem.c 2010-05-15 13:21:16.659032956 -0400 | 28538 | +++ linux-2.6.32.15/drivers/video/fbmem.c 2010-05-28 21:27:15.947209363 -0400 |
28524 | @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in | 28539 | @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in |
28525 | image->dx += image->width + 8; | 28540 | image->dx += image->width + 8; |
28526 | } | 28541 | } |
@@ -28548,9 +28563,9 @@ diff -urNp linux-2.6.32.13/drivers/video/fbmem.c linux-2.6.32.13/drivers/video/f | |||
28548 | return -EINVAL; | 28563 | return -EINVAL; |
28549 | if (!registered_fb[con2fb.framebuffer]) | 28564 | if (!registered_fb[con2fb.framebuffer]) |
28550 | request_module("fb%d", con2fb.framebuffer); | 28565 | request_module("fb%d", con2fb.framebuffer); |
28551 | diff -urNp linux-2.6.32.13/drivers/video/fbmon.c linux-2.6.32.13/drivers/video/fbmon.c | 28566 | diff -urNp linux-2.6.32.15/drivers/video/fbmon.c linux-2.6.32.15/drivers/video/fbmon.c |
28552 | --- linux-2.6.32.13/drivers/video/fbmon.c 2010-03-15 11:52:04.000000000 -0400 | 28567 | --- linux-2.6.32.15/drivers/video/fbmon.c 2010-03-15 11:52:04.000000000 -0400 |
28553 | +++ linux-2.6.32.13/drivers/video/fbmon.c 2010-05-15 13:21:16.667905259 -0400 | 28568 | +++ linux-2.6.32.15/drivers/video/fbmon.c 2010-05-28 21:27:15.947209363 -0400 |
28554 | @@ -45,7 +45,7 @@ | 28569 | @@ -45,7 +45,7 @@ |
28555 | #ifdef DEBUG | 28570 | #ifdef DEBUG |
28556 | #define DPRINTK(fmt, args...) printk(fmt,## args) | 28571 | #define DPRINTK(fmt, args...) printk(fmt,## args) |
@@ -28560,9 +28575,9 @@ diff -urNp linux-2.6.32.13/drivers/video/fbmon.c linux-2.6.32.13/drivers/video/f | |||
28560 | #endif | 28575 | #endif |
28561 | 28576 | ||
28562 | #define FBMON_FIX_HEADER 1 | 28577 | #define FBMON_FIX_HEADER 1 |
28563 | diff -urNp linux-2.6.32.13/drivers/video/i810/i810_accel.c linux-2.6.32.13/drivers/video/i810/i810_accel.c | 28578 | diff -urNp linux-2.6.32.15/drivers/video/i810/i810_accel.c linux-2.6.32.15/drivers/video/i810/i810_accel.c |
28564 | --- linux-2.6.32.13/drivers/video/i810/i810_accel.c 2010-03-15 11:52:04.000000000 -0400 | 28579 | --- linux-2.6.32.15/drivers/video/i810/i810_accel.c 2010-03-15 11:52:04.000000000 -0400 |
28565 | +++ linux-2.6.32.13/drivers/video/i810/i810_accel.c 2010-05-15 13:21:16.667905259 -0400 | 28580 | +++ linux-2.6.32.15/drivers/video/i810/i810_accel.c 2010-05-28 21:27:15.947209363 -0400 |
28566 | @@ -73,6 +73,7 @@ static inline int wait_for_space(struct | 28581 | @@ -73,6 +73,7 @@ static inline int wait_for_space(struct |
28567 | } | 28582 | } |
28568 | } | 28583 | } |
@@ -28571,9 +28586,9 @@ diff -urNp linux-2.6.32.13/drivers/video/i810/i810_accel.c linux-2.6.32.13/drive | |||
28571 | i810_report_error(mmio); | 28586 | i810_report_error(mmio); |
28572 | par->dev_flags |= LOCKUP; | 28587 | par->dev_flags |= LOCKUP; |
28573 | info->pixmap.scan_align = 1; | 28588 | info->pixmap.scan_align = 1; |
28574 | diff -urNp linux-2.6.32.13/drivers/video/i810/i810_main.c linux-2.6.32.13/drivers/video/i810/i810_main.c | 28589 | diff -urNp linux-2.6.32.15/drivers/video/i810/i810_main.c linux-2.6.32.15/drivers/video/i810/i810_main.c |
28575 | --- linux-2.6.32.13/drivers/video/i810/i810_main.c 2010-03-15 11:52:04.000000000 -0400 | 28590 | --- linux-2.6.32.15/drivers/video/i810/i810_main.c 2010-03-15 11:52:04.000000000 -0400 |
28576 | +++ linux-2.6.32.13/drivers/video/i810/i810_main.c 2010-05-15 13:21:16.675089243 -0400 | 28591 | +++ linux-2.6.32.15/drivers/video/i810/i810_main.c 2010-05-28 21:27:15.987994154 -0400 |
28577 | @@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t | 28592 | @@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t |
28578 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, | 28593 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, |
28579 | { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC, | 28594 | { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC, |
@@ -28583,9 +28598,9 @@ diff -urNp linux-2.6.32.13/drivers/video/i810/i810_main.c linux-2.6.32.13/driver | |||
28583 | }; | 28598 | }; |
28584 | 28599 | ||
28585 | static struct pci_driver i810fb_driver = { | 28600 | static struct pci_driver i810fb_driver = { |
28586 | diff -urNp linux-2.6.32.13/drivers/video/modedb.c linux-2.6.32.13/drivers/video/modedb.c | 28601 | diff -urNp linux-2.6.32.15/drivers/video/modedb.c linux-2.6.32.15/drivers/video/modedb.c |
28587 | --- linux-2.6.32.13/drivers/video/modedb.c 2010-03-15 11:52:04.000000000 -0400 | 28602 | --- linux-2.6.32.15/drivers/video/modedb.c 2010-03-15 11:52:04.000000000 -0400 |
28588 | +++ linux-2.6.32.13/drivers/video/modedb.c 2010-05-15 13:21:16.691535841 -0400 | 28603 | +++ linux-2.6.32.15/drivers/video/modedb.c 2010-05-28 21:27:15.987994154 -0400 |
28589 | @@ -38,240 +38,240 @@ static const struct fb_videomode modedb[ | 28604 | @@ -38,240 +38,240 @@ static const struct fb_videomode modedb[ |
28590 | { | 28605 | { |
28591 | /* 640x400 @ 70 Hz, 31.5 kHz hsync */ | 28606 | /* 640x400 @ 70 Hz, 31.5 kHz hsync */ |
@@ -28886,9 +28901,9 @@ diff -urNp linux-2.6.32.13/drivers/video/modedb.c linux-2.6.32.13/drivers/video/ | |||
28886 | }, | 28901 | }, |
28887 | }; | 28902 | }; |
28888 | 28903 | ||
28889 | diff -urNp linux-2.6.32.13/drivers/video/nvidia/nv_backlight.c linux-2.6.32.13/drivers/video/nvidia/nv_backlight.c | 28904 | diff -urNp linux-2.6.32.15/drivers/video/nvidia/nv_backlight.c linux-2.6.32.15/drivers/video/nvidia/nv_backlight.c |
28890 | --- linux-2.6.32.13/drivers/video/nvidia/nv_backlight.c 2010-03-15 11:52:04.000000000 -0400 | 28905 | --- linux-2.6.32.15/drivers/video/nvidia/nv_backlight.c 2010-03-15 11:52:04.000000000 -0400 |
28891 | +++ linux-2.6.32.13/drivers/video/nvidia/nv_backlight.c 2010-05-15 13:21:16.691535841 -0400 | 28906 | +++ linux-2.6.32.15/drivers/video/nvidia/nv_backlight.c 2010-05-28 21:27:15.987994154 -0400 |
28892 | @@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru | 28907 | @@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru |
28893 | return bd->props.brightness; | 28908 | return bd->props.brightness; |
28894 | } | 28909 | } |
@@ -28898,9 +28913,9 @@ diff -urNp linux-2.6.32.13/drivers/video/nvidia/nv_backlight.c linux-2.6.32.13/d | |||
28898 | .get_brightness = nvidia_bl_get_brightness, | 28913 | .get_brightness = nvidia_bl_get_brightness, |
28899 | .update_status = nvidia_bl_update_status, | 28914 | .update_status = nvidia_bl_update_status, |
28900 | }; | 28915 | }; |
28901 | diff -urNp linux-2.6.32.13/drivers/video/riva/fbdev.c linux-2.6.32.13/drivers/video/riva/fbdev.c | 28916 | diff -urNp linux-2.6.32.15/drivers/video/riva/fbdev.c linux-2.6.32.15/drivers/video/riva/fbdev.c |
28902 | --- linux-2.6.32.13/drivers/video/riva/fbdev.c 2010-03-15 11:52:04.000000000 -0400 | 28917 | --- linux-2.6.32.15/drivers/video/riva/fbdev.c 2010-03-15 11:52:04.000000000 -0400 |
28903 | +++ linux-2.6.32.13/drivers/video/riva/fbdev.c 2010-05-15 13:21:16.695039791 -0400 | 28918 | +++ linux-2.6.32.15/drivers/video/riva/fbdev.c 2010-05-28 21:27:15.987994154 -0400 |
28904 | @@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct | 28919 | @@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct |
28905 | return bd->props.brightness; | 28920 | return bd->props.brightness; |
28906 | } | 28921 | } |
@@ -28910,9 +28925,9 @@ diff -urNp linux-2.6.32.13/drivers/video/riva/fbdev.c linux-2.6.32.13/drivers/vi | |||
28910 | .get_brightness = riva_bl_get_brightness, | 28925 | .get_brightness = riva_bl_get_brightness, |
28911 | .update_status = riva_bl_update_status, | 28926 | .update_status = riva_bl_update_status, |
28912 | }; | 28927 | }; |
28913 | diff -urNp linux-2.6.32.13/drivers/video/uvesafb.c linux-2.6.32.13/drivers/video/uvesafb.c | 28928 | diff -urNp linux-2.6.32.15/drivers/video/uvesafb.c linux-2.6.32.15/drivers/video/uvesafb.c |
28914 | --- linux-2.6.32.13/drivers/video/uvesafb.c 2010-03-15 11:52:04.000000000 -0400 | 28929 | --- linux-2.6.32.15/drivers/video/uvesafb.c 2010-03-15 11:52:04.000000000 -0400 |
28915 | +++ linux-2.6.32.13/drivers/video/uvesafb.c 2010-05-15 13:21:16.714782153 -0400 | 28930 | +++ linux-2.6.32.15/drivers/video/uvesafb.c 2010-05-28 21:27:15.987994154 -0400 |
28916 | @@ -18,6 +18,7 @@ | 28931 | @@ -18,6 +18,7 @@ |
28917 | #include <linux/fb.h> | 28932 | #include <linux/fb.h> |
28918 | #include <linux/io.h> | 28933 | #include <linux/io.h> |
@@ -28988,9 +29003,9 @@ diff -urNp linux-2.6.32.13/drivers/video/uvesafb.c linux-2.6.32.13/drivers/video | |||
28988 | } | 29003 | } |
28989 | 29004 | ||
28990 | framebuffer_release(info); | 29005 | framebuffer_release(info); |
28991 | diff -urNp linux-2.6.32.13/drivers/video/vesafb.c linux-2.6.32.13/drivers/video/vesafb.c | 29006 | diff -urNp linux-2.6.32.15/drivers/video/vesafb.c linux-2.6.32.15/drivers/video/vesafb.c |
28992 | --- linux-2.6.32.13/drivers/video/vesafb.c 2010-03-15 11:52:04.000000000 -0400 | 29007 | --- linux-2.6.32.15/drivers/video/vesafb.c 2010-03-15 11:52:04.000000000 -0400 |
28993 | +++ linux-2.6.32.13/drivers/video/vesafb.c 2010-05-15 13:21:16.727737170 -0400 | 29008 | +++ linux-2.6.32.15/drivers/video/vesafb.c 2010-05-28 21:27:15.987994154 -0400 |
28994 | @@ -9,6 +9,7 @@ | 29009 | @@ -9,6 +9,7 @@ |
28995 | */ | 29010 | */ |
28996 | 29011 | ||
@@ -29094,9 +29109,9 @@ diff -urNp linux-2.6.32.13/drivers/video/vesafb.c linux-2.6.32.13/drivers/video/ | |||
29094 | if (info->screen_base) | 29109 | if (info->screen_base) |
29095 | iounmap(info->screen_base); | 29110 | iounmap(info->screen_base); |
29096 | framebuffer_release(info); | 29111 | framebuffer_release(info); |
29097 | diff -urNp linux-2.6.32.13/drivers/xen/sys-hypervisor.c linux-2.6.32.13/drivers/xen/sys-hypervisor.c | 29112 | diff -urNp linux-2.6.32.15/drivers/xen/sys-hypervisor.c linux-2.6.32.15/drivers/xen/sys-hypervisor.c |
29098 | --- linux-2.6.32.13/drivers/xen/sys-hypervisor.c 2010-03-15 11:52:04.000000000 -0400 | 29113 | --- linux-2.6.32.15/drivers/xen/sys-hypervisor.c 2010-03-15 11:52:04.000000000 -0400 |
29099 | +++ linux-2.6.32.13/drivers/xen/sys-hypervisor.c 2010-05-15 13:21:16.727737170 -0400 | 29114 | +++ linux-2.6.32.15/drivers/xen/sys-hypervisor.c 2010-05-28 21:27:15.987994154 -0400 |
29100 | @@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko | 29115 | @@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko |
29101 | return 0; | 29116 | return 0; |
29102 | } | 29117 | } |
@@ -29106,9 +29121,9 @@ diff -urNp linux-2.6.32.13/drivers/xen/sys-hypervisor.c linux-2.6.32.13/drivers/ | |||
29106 | .show = hyp_sysfs_show, | 29121 | .show = hyp_sysfs_show, |
29107 | .store = hyp_sysfs_store, | 29122 | .store = hyp_sysfs_store, |
29108 | }; | 29123 | }; |
29109 | diff -urNp linux-2.6.32.13/fs/9p/vfs_inode.c linux-2.6.32.13/fs/9p/vfs_inode.c | 29124 | diff -urNp linux-2.6.32.15/fs/9p/vfs_inode.c linux-2.6.32.15/fs/9p/vfs_inode.c |
29110 | --- linux-2.6.32.13/fs/9p/vfs_inode.c 2010-03-15 11:52:04.000000000 -0400 | 29125 | --- linux-2.6.32.15/fs/9p/vfs_inode.c 2010-03-15 11:52:04.000000000 -0400 |
29111 | +++ linux-2.6.32.13/fs/9p/vfs_inode.c 2010-05-15 13:21:16.735266886 -0400 | 29126 | +++ linux-2.6.32.15/fs/9p/vfs_inode.c 2010-05-28 21:27:15.987994154 -0400 |
29112 | @@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct | 29127 | @@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct |
29113 | static void | 29128 | static void |
29114 | v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) | 29129 | v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) |
@@ -29118,9 +29133,9 @@ diff -urNp linux-2.6.32.13/fs/9p/vfs_inode.c linux-2.6.32.13/fs/9p/vfs_inode.c | |||
29118 | 29133 | ||
29119 | P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, | 29134 | P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, |
29120 | IS_ERR(s) ? "<error>" : s); | 29135 | IS_ERR(s) ? "<error>" : s); |
29121 | diff -urNp linux-2.6.32.13/fs/aio.c linux-2.6.32.13/fs/aio.c | 29136 | diff -urNp linux-2.6.32.15/fs/aio.c linux-2.6.32.15/fs/aio.c |
29122 | --- linux-2.6.32.13/fs/aio.c 2010-03-15 11:52:04.000000000 -0400 | 29137 | --- linux-2.6.32.15/fs/aio.c 2010-03-15 11:52:04.000000000 -0400 |
29123 | +++ linux-2.6.32.13/fs/aio.c 2010-05-15 13:21:16.759050469 -0400 | 29138 | +++ linux-2.6.32.15/fs/aio.c 2010-05-28 21:27:15.995209124 -0400 |
29124 | @@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx | 29139 | @@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx |
29125 | size += sizeof(struct io_event) * nr_events; | 29140 | size += sizeof(struct io_event) * nr_events; |
29126 | nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; | 29141 | nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; |
@@ -29130,9 +29145,9 @@ diff -urNp linux-2.6.32.13/fs/aio.c linux-2.6.32.13/fs/aio.c | |||
29130 | return -EINVAL; | 29145 | return -EINVAL; |
29131 | 29146 | ||
29132 | nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); | 29147 | nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); |
29133 | diff -urNp linux-2.6.32.13/fs/attr.c linux-2.6.32.13/fs/attr.c | 29148 | diff -urNp linux-2.6.32.15/fs/attr.c linux-2.6.32.15/fs/attr.c |
29134 | --- linux-2.6.32.13/fs/attr.c 2010-03-15 11:52:04.000000000 -0400 | 29149 | --- linux-2.6.32.15/fs/attr.c 2010-03-15 11:52:04.000000000 -0400 |
29135 | +++ linux-2.6.32.13/fs/attr.c 2010-05-15 13:21:16.767048242 -0400 | 29150 | +++ linux-2.6.32.15/fs/attr.c 2010-05-28 21:27:15.995209124 -0400 |
29136 | @@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode | 29151 | @@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode |
29137 | unsigned long limit; | 29152 | unsigned long limit; |
29138 | 29153 | ||
@@ -29141,9 +29156,9 @@ diff -urNp linux-2.6.32.13/fs/attr.c linux-2.6.32.13/fs/attr.c | |||
29141 | if (limit != RLIM_INFINITY && offset > limit) | 29156 | if (limit != RLIM_INFINITY && offset > limit) |
29142 | goto out_sig; | 29157 | goto out_sig; |
29143 | if (offset > inode->i_sb->s_maxbytes) | 29158 | if (offset > inode->i_sb->s_maxbytes) |
29144 | diff -urNp linux-2.6.32.13/fs/autofs/root.c linux-2.6.32.13/fs/autofs/root.c | 29159 | diff -urNp linux-2.6.32.15/fs/autofs/root.c linux-2.6.32.15/fs/autofs/root.c |
29145 | --- linux-2.6.32.13/fs/autofs/root.c 2010-03-15 11:52:04.000000000 -0400 | 29160 | --- linux-2.6.32.15/fs/autofs/root.c 2010-03-15 11:52:04.000000000 -0400 |
29146 | +++ linux-2.6.32.13/fs/autofs/root.c 2010-05-15 13:21:16.770726483 -0400 | 29161 | +++ linux-2.6.32.15/fs/autofs/root.c 2010-05-28 21:27:15.995209124 -0400 |
29147 | @@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in | 29162 | @@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in |
29148 | set_bit(n,sbi->symlink_bitmap); | 29163 | set_bit(n,sbi->symlink_bitmap); |
29149 | sl = &sbi->symlink[n]; | 29164 | sl = &sbi->symlink[n]; |
@@ -29154,9 +29169,9 @@ diff -urNp linux-2.6.32.13/fs/autofs/root.c linux-2.6.32.13/fs/autofs/root.c | |||
29154 | if (!sl->data) { | 29169 | if (!sl->data) { |
29155 | clear_bit(n,sbi->symlink_bitmap); | 29170 | clear_bit(n,sbi->symlink_bitmap); |
29156 | unlock_kernel(); | 29171 | unlock_kernel(); |
29157 | diff -urNp linux-2.6.32.13/fs/autofs4/symlink.c linux-2.6.32.13/fs/autofs4/symlink.c | 29172 | diff -urNp linux-2.6.32.15/fs/autofs4/symlink.c linux-2.6.32.15/fs/autofs4/symlink.c |
29158 | --- linux-2.6.32.13/fs/autofs4/symlink.c 2010-03-15 11:52:04.000000000 -0400 | 29173 | --- linux-2.6.32.15/fs/autofs4/symlink.c 2010-03-15 11:52:04.000000000 -0400 |
29159 | +++ linux-2.6.32.13/fs/autofs4/symlink.c 2010-05-15 13:21:16.786757439 -0400 | 29174 | +++ linux-2.6.32.15/fs/autofs4/symlink.c 2010-05-28 21:27:15.995209124 -0400 |
29160 | @@ -15,7 +15,7 @@ | 29175 | @@ -15,7 +15,7 @@ |
29161 | static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) | 29176 | static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) |
29162 | { | 29177 | { |
@@ -29166,9 +29181,9 @@ diff -urNp linux-2.6.32.13/fs/autofs4/symlink.c linux-2.6.32.13/fs/autofs4/symli | |||
29166 | return NULL; | 29181 | return NULL; |
29167 | } | 29182 | } |
29168 | 29183 | ||
29169 | diff -urNp linux-2.6.32.13/fs/befs/linuxvfs.c linux-2.6.32.13/fs/befs/linuxvfs.c | 29184 | diff -urNp linux-2.6.32.15/fs/befs/linuxvfs.c linux-2.6.32.15/fs/befs/linuxvfs.c |
29170 | --- linux-2.6.32.13/fs/befs/linuxvfs.c 2010-03-15 11:52:04.000000000 -0400 | 29185 | --- linux-2.6.32.15/fs/befs/linuxvfs.c 2010-03-15 11:52:04.000000000 -0400 |
29171 | +++ linux-2.6.32.13/fs/befs/linuxvfs.c 2010-05-15 13:21:16.795284033 -0400 | 29186 | +++ linux-2.6.32.15/fs/befs/linuxvfs.c 2010-05-28 21:27:16.011217374 -0400 |
29172 | @@ -493,7 +493,7 @@ static void befs_put_link(struct dentry | 29187 | @@ -493,7 +493,7 @@ static void befs_put_link(struct dentry |
29173 | { | 29188 | { |
29174 | befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); | 29189 | befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); |
@@ -29178,9 +29193,9 @@ diff -urNp linux-2.6.32.13/fs/befs/linuxvfs.c linux-2.6.32.13/fs/befs/linuxvfs.c | |||
29178 | if (!IS_ERR(link)) | 29193 | if (!IS_ERR(link)) |
29179 | kfree(link); | 29194 | kfree(link); |
29180 | } | 29195 | } |
29181 | diff -urNp linux-2.6.32.13/fs/binfmt_aout.c linux-2.6.32.13/fs/binfmt_aout.c | 29196 | diff -urNp linux-2.6.32.15/fs/binfmt_aout.c linux-2.6.32.15/fs/binfmt_aout.c |
29182 | --- linux-2.6.32.13/fs/binfmt_aout.c 2010-03-15 11:52:04.000000000 -0400 | 29197 | --- linux-2.6.32.15/fs/binfmt_aout.c 2010-03-15 11:52:04.000000000 -0400 |
29183 | +++ linux-2.6.32.13/fs/binfmt_aout.c 2010-05-15 13:21:16.799043518 -0400 | 29198 | +++ linux-2.6.32.15/fs/binfmt_aout.c 2010-05-28 21:27:16.011217374 -0400 |
29184 | @@ -16,6 +16,7 @@ | 29199 | @@ -16,6 +16,7 @@ |
29185 | #include <linux/string.h> | 29200 | #include <linux/string.h> |
29186 | #include <linux/fs.h> | 29201 | #include <linux/fs.h> |
@@ -29248,9 +29263,9 @@ diff -urNp linux-2.6.32.13/fs/binfmt_aout.c linux-2.6.32.13/fs/binfmt_aout.c | |||
29248 | MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, | 29263 | MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, |
29249 | fd_offset + ex.a_text); | 29264 | fd_offset + ex.a_text); |
29250 | up_write(¤t->mm->mmap_sem); | 29265 | up_write(¤t->mm->mmap_sem); |
29251 | diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c | 29266 | diff -urNp linux-2.6.32.15/fs/binfmt_elf.c linux-2.6.32.15/fs/binfmt_elf.c |
29252 | --- linux-2.6.32.13/fs/binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400 | 29267 | --- linux-2.6.32.15/fs/binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400 |
29253 | +++ linux-2.6.32.13/fs/binfmt_elf.c 2010-05-15 13:21:16.818718975 -0400 | 29268 | +++ linux-2.6.32.15/fs/binfmt_elf.c 2010-05-28 21:27:16.011217374 -0400 |
29254 | @@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str | 29269 | @@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str |
29255 | #define elf_core_dump NULL | 29270 | #define elf_core_dump NULL |
29256 | #endif | 29271 | #endif |
@@ -29886,9 +29901,9 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c | |||
29886 | static int __init init_elf_binfmt(void) | 29901 | static int __init init_elf_binfmt(void) |
29887 | { | 29902 | { |
29888 | return register_binfmt(&elf_format); | 29903 | return register_binfmt(&elf_format); |
29889 | diff -urNp linux-2.6.32.13/fs/binfmt_flat.c linux-2.6.32.13/fs/binfmt_flat.c | 29904 | diff -urNp linux-2.6.32.15/fs/binfmt_flat.c linux-2.6.32.15/fs/binfmt_flat.c |
29890 | --- linux-2.6.32.13/fs/binfmt_flat.c 2010-03-15 11:52:04.000000000 -0400 | 29905 | --- linux-2.6.32.15/fs/binfmt_flat.c 2010-03-15 11:52:04.000000000 -0400 |
29891 | +++ linux-2.6.32.13/fs/binfmt_flat.c 2010-05-15 13:21:16.818718975 -0400 | 29906 | +++ linux-2.6.32.15/fs/binfmt_flat.c 2010-05-28 21:27:16.018905555 -0400 |
29892 | @@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b | 29907 | @@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b |
29893 | realdatastart = (unsigned long) -ENOMEM; | 29908 | realdatastart = (unsigned long) -ENOMEM; |
29894 | printk("Unable to allocate RAM for process data, errno %d\n", | 29909 | printk("Unable to allocate RAM for process data, errno %d\n", |
@@ -29921,9 +29936,9 @@ diff -urNp linux-2.6.32.13/fs/binfmt_flat.c linux-2.6.32.13/fs/binfmt_flat.c | |||
29921 | ret = result; | 29936 | ret = result; |
29922 | goto err; | 29937 | goto err; |
29923 | } | 29938 | } |
29924 | diff -urNp linux-2.6.32.13/fs/binfmt_misc.c linux-2.6.32.13/fs/binfmt_misc.c | 29939 | diff -urNp linux-2.6.32.15/fs/binfmt_misc.c linux-2.6.32.15/fs/binfmt_misc.c |
29925 | --- linux-2.6.32.13/fs/binfmt_misc.c 2010-03-15 11:52:04.000000000 -0400 | 29940 | --- linux-2.6.32.15/fs/binfmt_misc.c 2010-03-15 11:52:04.000000000 -0400 |
29926 | +++ linux-2.6.32.13/fs/binfmt_misc.c 2010-05-15 13:21:16.827094561 -0400 | 29941 | +++ linux-2.6.32.15/fs/binfmt_misc.c 2010-05-28 21:27:16.018905555 -0400 |
29927 | @@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl | 29942 | @@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl |
29928 | static struct tree_descr bm_files[] = { | 29943 | static struct tree_descr bm_files[] = { |
29929 | [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO}, | 29944 | [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO}, |
@@ -29933,9 +29948,9 @@ diff -urNp linux-2.6.32.13/fs/binfmt_misc.c linux-2.6.32.13/fs/binfmt_misc.c | |||
29933 | }; | 29948 | }; |
29934 | int err = simple_fill_super(sb, 0x42494e4d, bm_files); | 29949 | int err = simple_fill_super(sb, 0x42494e4d, bm_files); |
29935 | if (!err) | 29950 | if (!err) |
29936 | diff -urNp linux-2.6.32.13/fs/bio.c linux-2.6.32.13/fs/bio.c | 29951 | diff -urNp linux-2.6.32.15/fs/bio.c linux-2.6.32.15/fs/bio.c |
29937 | --- linux-2.6.32.13/fs/bio.c 2010-03-15 11:52:04.000000000 -0400 | 29952 | --- linux-2.6.32.15/fs/bio.c 2010-03-15 11:52:04.000000000 -0400 |
29938 | +++ linux-2.6.32.13/fs/bio.c 2010-05-15 13:21:16.827094561 -0400 | 29953 | +++ linux-2.6.32.15/fs/bio.c 2010-05-28 21:27:16.018905555 -0400 |
29939 | @@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr | 29954 | @@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr |
29940 | 29955 | ||
29941 | i = 0; | 29956 | i = 0; |
@@ -29954,9 +29969,9 @@ diff -urNp linux-2.6.32.13/fs/bio.c linux-2.6.32.13/fs/bio.c | |||
29954 | 29969 | ||
29955 | __bio_for_each_segment(bvec, bio, i, 0) { | 29970 | __bio_for_each_segment(bvec, bio, i, 0) { |
29956 | char *addr = page_address(bvec->bv_page); | 29971 | char *addr = page_address(bvec->bv_page); |
29957 | diff -urNp linux-2.6.32.13/fs/block_dev.c linux-2.6.32.13/fs/block_dev.c | 29972 | diff -urNp linux-2.6.32.15/fs/block_dev.c linux-2.6.32.15/fs/block_dev.c |
29958 | --- linux-2.6.32.13/fs/block_dev.c 2010-04-29 17:49:38.421500081 -0400 | 29973 | --- linux-2.6.32.15/fs/block_dev.c 2010-04-29 17:49:38.421500081 -0400 |
29959 | +++ linux-2.6.32.13/fs/block_dev.c 2010-05-15 13:21:16.839060742 -0400 | 29974 | +++ linux-2.6.32.15/fs/block_dev.c 2010-05-28 21:27:16.030907926 -0400 |
29960 | @@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev, | 29975 | @@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev, |
29961 | else if (bdev->bd_contains == bdev) | 29976 | else if (bdev->bd_contains == bdev) |
29962 | res = 0; /* is a whole device which isn't held */ | 29977 | res = 0; /* is a whole device which isn't held */ |
@@ -29966,9 +29981,9 @@ diff -urNp linux-2.6.32.13/fs/block_dev.c linux-2.6.32.13/fs/block_dev.c | |||
29966 | res = 0; /* is a partition of a device that is being partitioned */ | 29981 | res = 0; /* is a partition of a device that is being partitioned */ |
29967 | else if (bdev->bd_contains->bd_holder != NULL) | 29982 | else if (bdev->bd_contains->bd_holder != NULL) |
29968 | res = -EBUSY; /* is a partition of a held device */ | 29983 | res = -EBUSY; /* is a partition of a held device */ |
29969 | diff -urNp linux-2.6.32.13/fs/btrfs/ctree.c linux-2.6.32.13/fs/btrfs/ctree.c | 29984 | diff -urNp linux-2.6.32.15/fs/btrfs/ctree.c linux-2.6.32.15/fs/btrfs/ctree.c |
29970 | --- linux-2.6.32.13/fs/btrfs/ctree.c 2010-03-15 11:52:04.000000000 -0400 | 29985 | --- linux-2.6.32.15/fs/btrfs/ctree.c 2010-03-15 11:52:04.000000000 -0400 |
29971 | +++ linux-2.6.32.13/fs/btrfs/ctree.c 2010-05-15 13:21:16.884750763 -0400 | 29986 | +++ linux-2.6.32.15/fs/btrfs/ctree.c 2010-05-28 21:27:16.047217370 -0400 |
29972 | @@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran | 29987 | @@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran |
29973 | 29988 | ||
29974 | ret = 0; | 29989 | ret = 0; |
@@ -29977,9 +29992,9 @@ diff -urNp linux-2.6.32.13/fs/btrfs/ctree.c linux-2.6.32.13/fs/btrfs/ctree.c | |||
29977 | btrfs_cpu_key_to_disk(&disk_key, cpu_key); | 29992 | btrfs_cpu_key_to_disk(&disk_key, cpu_key); |
29978 | ret = fixup_low_keys(trans, root, path, &disk_key, 1); | 29993 | ret = fixup_low_keys(trans, root, path, &disk_key, 1); |
29979 | } | 29994 | } |
29980 | diff -urNp linux-2.6.32.13/fs/btrfs/disk-io.c linux-2.6.32.13/fs/btrfs/disk-io.c | 29995 | diff -urNp linux-2.6.32.15/fs/btrfs/disk-io.c linux-2.6.32.15/fs/btrfs/disk-io.c |
29981 | --- linux-2.6.32.13/fs/btrfs/disk-io.c 2010-03-15 11:52:04.000000000 -0400 | 29996 | --- linux-2.6.32.15/fs/btrfs/disk-io.c 2010-03-15 11:52:04.000000000 -0400 |
29982 | +++ linux-2.6.32.13/fs/btrfs/disk-io.c 2010-05-15 13:21:16.884750763 -0400 | 29997 | +++ linux-2.6.32.15/fs/btrfs/disk-io.c 2010-05-28 21:27:16.055226050 -0400 |
29983 | @@ -39,7 +39,7 @@ | 29998 | @@ -39,7 +39,7 @@ |
29984 | #include "tree-log.h" | 29999 | #include "tree-log.h" |
29985 | #include "free-space-cache.h" | 30000 | #include "free-space-cache.h" |
@@ -29998,9 +30013,9 @@ diff -urNp linux-2.6.32.13/fs/btrfs/disk-io.c linux-2.6.32.13/fs/btrfs/disk-io.c | |||
29998 | .write_cache_pages_lock_hook = btree_lock_page_hook, | 30013 | .write_cache_pages_lock_hook = btree_lock_page_hook, |
29999 | .readpage_end_io_hook = btree_readpage_end_io_hook, | 30014 | .readpage_end_io_hook = btree_readpage_end_io_hook, |
30000 | .submit_bio_hook = btree_submit_bio_hook, | 30015 | .submit_bio_hook = btree_submit_bio_hook, |
30001 | diff -urNp linux-2.6.32.13/fs/btrfs/extent_io.h linux-2.6.32.13/fs/btrfs/extent_io.h | 30016 | diff -urNp linux-2.6.32.15/fs/btrfs/extent_io.h linux-2.6.32.15/fs/btrfs/extent_io.h |
30002 | --- linux-2.6.32.13/fs/btrfs/extent_io.h 2010-03-15 11:52:04.000000000 -0400 | 30017 | --- linux-2.6.32.15/fs/btrfs/extent_io.h 2010-03-15 11:52:04.000000000 -0400 |
30003 | +++ linux-2.6.32.13/fs/btrfs/extent_io.h 2010-05-15 13:21:16.911563863 -0400 | 30018 | +++ linux-2.6.32.15/fs/btrfs/extent_io.h 2010-05-28 21:27:16.055226050 -0400 |
30004 | @@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s | 30019 | @@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s |
30005 | struct bio *bio, int mirror_num, | 30020 | struct bio *bio, int mirror_num, |
30006 | unsigned long bio_flags); | 30021 | unsigned long bio_flags); |
@@ -30061,9 +30076,9 @@ diff -urNp linux-2.6.32.13/fs/btrfs/extent_io.h linux-2.6.32.13/fs/btrfs/extent_ | |||
30061 | }; | 30076 | }; |
30062 | 30077 | ||
30063 | struct extent_state { | 30078 | struct extent_state { |
30064 | diff -urNp linux-2.6.32.13/fs/btrfs/free-space-cache.c linux-2.6.32.13/fs/btrfs/free-space-cache.c | 30079 | diff -urNp linux-2.6.32.15/fs/btrfs/free-space-cache.c linux-2.6.32.15/fs/btrfs/free-space-cache.c |
30065 | --- linux-2.6.32.13/fs/btrfs/free-space-cache.c 2010-03-15 11:52:04.000000000 -0400 | 30080 | --- linux-2.6.32.15/fs/btrfs/free-space-cache.c 2010-03-15 11:52:04.000000000 -0400 |
30066 | +++ linux-2.6.32.13/fs/btrfs/free-space-cache.c 2010-05-15 13:21:16.918599051 -0400 | 30081 | +++ linux-2.6.32.15/fs/btrfs/free-space-cache.c 2010-05-28 21:27:16.067008196 -0400 |
30067 | @@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf | 30082 | @@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf |
30068 | 30083 | ||
30069 | while(1) { | 30084 | while(1) { |
@@ -30082,9 +30097,9 @@ diff -urNp linux-2.6.32.13/fs/btrfs/free-space-cache.c linux-2.6.32.13/fs/btrfs/ | |||
30082 | 30097 | ||
30083 | if (entry->bitmap && entry->bytes > bytes + empty_size) { | 30098 | if (entry->bitmap && entry->bytes > bytes + empty_size) { |
30084 | ret = btrfs_bitmap_cluster(block_group, entry, cluster, | 30099 | ret = btrfs_bitmap_cluster(block_group, entry, cluster, |
30085 | diff -urNp linux-2.6.32.13/fs/btrfs/inode.c linux-2.6.32.13/fs/btrfs/inode.c | 30100 | diff -urNp linux-2.6.32.15/fs/btrfs/inode.c linux-2.6.32.15/fs/btrfs/inode.c |
30086 | --- linux-2.6.32.13/fs/btrfs/inode.c 2010-03-15 11:52:04.000000000 -0400 | 30101 | --- linux-2.6.32.15/fs/btrfs/inode.c 2010-03-15 11:52:04.000000000 -0400 |
30087 | +++ linux-2.6.32.13/fs/btrfs/inode.c 2010-05-15 13:21:16.951236359 -0400 | 30102 | +++ linux-2.6.32.15/fs/btrfs/inode.c 2010-05-28 21:27:16.071504594 -0400 |
30088 | @@ -63,7 +63,7 @@ static const struct inode_operations btr | 30103 | @@ -63,7 +63,7 @@ static const struct inode_operations btr |
30089 | static const struct address_space_operations btrfs_aops; | 30104 | static const struct address_space_operations btrfs_aops; |
30090 | static const struct address_space_operations btrfs_symlink_aops; | 30105 | static const struct address_space_operations btrfs_symlink_aops; |
@@ -30103,9 +30118,9 @@ diff -urNp linux-2.6.32.13/fs/btrfs/inode.c linux-2.6.32.13/fs/btrfs/inode.c | |||
30103 | .fill_delalloc = run_delalloc_range, | 30118 | .fill_delalloc = run_delalloc_range, |
30104 | .submit_bio_hook = btrfs_submit_bio_hook, | 30119 | .submit_bio_hook = btrfs_submit_bio_hook, |
30105 | .merge_bio_hook = btrfs_merge_bio_hook, | 30120 | .merge_bio_hook = btrfs_merge_bio_hook, |
30106 | diff -urNp linux-2.6.32.13/fs/btrfs/sysfs.c linux-2.6.32.13/fs/btrfs/sysfs.c | 30121 | diff -urNp linux-2.6.32.15/fs/btrfs/sysfs.c linux-2.6.32.15/fs/btrfs/sysfs.c |
30107 | --- linux-2.6.32.13/fs/btrfs/sysfs.c 2010-03-15 11:52:04.000000000 -0400 | 30122 | --- linux-2.6.32.15/fs/btrfs/sysfs.c 2010-03-15 11:52:04.000000000 -0400 |
30108 | +++ linux-2.6.32.13/fs/btrfs/sysfs.c 2010-05-15 13:21:16.956074066 -0400 | 30123 | +++ linux-2.6.32.15/fs/btrfs/sysfs.c 2010-05-28 21:27:16.071504594 -0400 |
30109 | @@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko | 30124 | @@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko |
30110 | complete(&root->kobj_unregister); | 30125 | complete(&root->kobj_unregister); |
30111 | } | 30126 | } |
@@ -30121,9 +30136,9 @@ diff -urNp linux-2.6.32.13/fs/btrfs/sysfs.c linux-2.6.32.13/fs/btrfs/sysfs.c | |||
30121 | .show = btrfs_root_attr_show, | 30136 | .show = btrfs_root_attr_show, |
30122 | .store = btrfs_root_attr_store, | 30137 | .store = btrfs_root_attr_store, |
30123 | }; | 30138 | }; |
30124 | diff -urNp linux-2.6.32.13/fs/buffer.c linux-2.6.32.13/fs/buffer.c | 30139 | diff -urNp linux-2.6.32.15/fs/buffer.c linux-2.6.32.15/fs/buffer.c |
30125 | --- linux-2.6.32.13/fs/buffer.c 2010-03-15 11:52:04.000000000 -0400 | 30140 | --- linux-2.6.32.15/fs/buffer.c 2010-03-15 11:52:04.000000000 -0400 |
30126 | +++ linux-2.6.32.13/fs/buffer.c 2010-05-15 13:21:16.978563593 -0400 | 30141 | +++ linux-2.6.32.15/fs/buffer.c 2010-05-28 21:27:16.083222448 -0400 |
30127 | @@ -25,6 +25,7 @@ | 30142 | @@ -25,6 +25,7 @@ |
30128 | #include <linux/percpu.h> | 30143 | #include <linux/percpu.h> |
30129 | #include <linux/slab.h> | 30144 | #include <linux/slab.h> |
@@ -30132,9 +30147,9 @@ diff -urNp linux-2.6.32.13/fs/buffer.c linux-2.6.32.13/fs/buffer.c | |||
30132 | #include <linux/blkdev.h> | 30147 | #include <linux/blkdev.h> |
30133 | #include <linux/file.h> | 30148 | #include <linux/file.h> |
30134 | #include <linux/quotaops.h> | 30149 | #include <linux/quotaops.h> |
30135 | diff -urNp linux-2.6.32.13/fs/cachefiles/bind.c linux-2.6.32.13/fs/cachefiles/bind.c | 30150 | diff -urNp linux-2.6.32.15/fs/cachefiles/bind.c linux-2.6.32.15/fs/cachefiles/bind.c |
30136 | --- linux-2.6.32.13/fs/cachefiles/bind.c 2010-03-15 11:52:04.000000000 -0400 | 30151 | --- linux-2.6.32.15/fs/cachefiles/bind.c 2010-03-15 11:52:04.000000000 -0400 |
30137 | +++ linux-2.6.32.13/fs/cachefiles/bind.c 2010-05-15 13:21:16.978563593 -0400 | 30152 | +++ linux-2.6.32.15/fs/cachefiles/bind.c 2010-05-28 21:27:16.083222448 -0400 |
30138 | @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef | 30153 | @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef |
30139 | args); | 30154 | args); |
30140 | 30155 | ||
@@ -30151,9 +30166,9 @@ diff -urNp linux-2.6.32.13/fs/cachefiles/bind.c linux-2.6.32.13/fs/cachefiles/bi | |||
30151 | cache->bcull_percent < cache->brun_percent && | 30166 | cache->bcull_percent < cache->brun_percent && |
30152 | cache->brun_percent < 100); | 30167 | cache->brun_percent < 100); |
30153 | 30168 | ||
30154 | diff -urNp linux-2.6.32.13/fs/cachefiles/daemon.c linux-2.6.32.13/fs/cachefiles/daemon.c | 30169 | diff -urNp linux-2.6.32.15/fs/cachefiles/daemon.c linux-2.6.32.15/fs/cachefiles/daemon.c |
30155 | --- linux-2.6.32.13/fs/cachefiles/daemon.c 2010-03-15 11:52:04.000000000 -0400 | 30170 | --- linux-2.6.32.15/fs/cachefiles/daemon.c 2010-03-15 11:52:04.000000000 -0400 |
30156 | +++ linux-2.6.32.13/fs/cachefiles/daemon.c 2010-05-15 13:21:16.995071409 -0400 | 30171 | +++ linux-2.6.32.15/fs/cachefiles/daemon.c 2010-05-28 21:27:16.091216728 -0400 |
30157 | @@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s | 30172 | @@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s |
30158 | if (test_bit(CACHEFILES_DEAD, &cache->flags)) | 30173 | if (test_bit(CACHEFILES_DEAD, &cache->flags)) |
30159 | return -EIO; | 30174 | return -EIO; |
@@ -30181,9 +30196,9 @@ diff -urNp linux-2.6.32.13/fs/cachefiles/daemon.c linux-2.6.32.13/fs/cachefiles/ | |||
30181 | return cachefiles_daemon_range_error(cache, args); | 30196 | return cachefiles_daemon_range_error(cache, args); |
30182 | 30197 | ||
30183 | cache->bstop_percent = bstop; | 30198 | cache->bstop_percent = bstop; |
30184 | diff -urNp linux-2.6.32.13/fs/cachefiles/rdwr.c linux-2.6.32.13/fs/cachefiles/rdwr.c | 30199 | diff -urNp linux-2.6.32.15/fs/cachefiles/rdwr.c linux-2.6.32.15/fs/cachefiles/rdwr.c |
30185 | --- linux-2.6.32.13/fs/cachefiles/rdwr.c 2010-03-15 11:52:04.000000000 -0400 | 30200 | --- linux-2.6.32.15/fs/cachefiles/rdwr.c 2010-03-15 11:52:04.000000000 -0400 |
30186 | +++ linux-2.6.32.13/fs/cachefiles/rdwr.c 2010-05-15 13:21:16.995071409 -0400 | 30201 | +++ linux-2.6.32.15/fs/cachefiles/rdwr.c 2010-05-28 21:27:16.091216728 -0400 |
30187 | @@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache | 30202 | @@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache |
30188 | old_fs = get_fs(); | 30203 | old_fs = get_fs(); |
30189 | set_fs(KERNEL_DS); | 30204 | set_fs(KERNEL_DS); |
@@ -30193,9 +30208,9 @@ diff -urNp linux-2.6.32.13/fs/cachefiles/rdwr.c linux-2.6.32.13/fs/cachefiles/rd | |||
30193 | set_fs(old_fs); | 30208 | set_fs(old_fs); |
30194 | kunmap(page); | 30209 | kunmap(page); |
30195 | if (ret != len) | 30210 | if (ret != len) |
30196 | diff -urNp linux-2.6.32.13/fs/cifs/cifs_uniupr.h linux-2.6.32.13/fs/cifs/cifs_uniupr.h | 30211 | diff -urNp linux-2.6.32.15/fs/cifs/cifs_uniupr.h linux-2.6.32.15/fs/cifs/cifs_uniupr.h |
30197 | --- linux-2.6.32.13/fs/cifs/cifs_uniupr.h 2010-03-15 11:52:04.000000000 -0400 | 30212 | --- linux-2.6.32.15/fs/cifs/cifs_uniupr.h 2010-03-15 11:52:04.000000000 -0400 |
30198 | +++ linux-2.6.32.13/fs/cifs/cifs_uniupr.h 2010-05-15 13:21:16.995071409 -0400 | 30213 | +++ linux-2.6.32.15/fs/cifs/cifs_uniupr.h 2010-05-28 21:27:16.091216728 -0400 |
30199 | @@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa | 30214 | @@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa |
30200 | {0x0490, 0x04cc, UniCaseRangeU0490}, | 30215 | {0x0490, 0x04cc, UniCaseRangeU0490}, |
30201 | {0x1e00, 0x1ffc, UniCaseRangeU1e00}, | 30216 | {0x1e00, 0x1ffc, UniCaseRangeU1e00}, |
@@ -30205,9 +30220,9 @@ diff -urNp linux-2.6.32.13/fs/cifs/cifs_uniupr.h linux-2.6.32.13/fs/cifs/cifs_un | |||
30205 | }; | 30220 | }; |
30206 | #endif | 30221 | #endif |
30207 | 30222 | ||
30208 | diff -urNp linux-2.6.32.13/fs/cifs/link.c linux-2.6.32.13/fs/cifs/link.c | 30223 | diff -urNp linux-2.6.32.15/fs/cifs/link.c linux-2.6.32.15/fs/cifs/link.c |
30209 | --- linux-2.6.32.13/fs/cifs/link.c 2010-03-15 11:52:04.000000000 -0400 | 30224 | --- linux-2.6.32.15/fs/cifs/link.c 2010-03-15 11:52:04.000000000 -0400 |
30210 | +++ linux-2.6.32.13/fs/cifs/link.c 2010-05-15 13:21:16.995071409 -0400 | 30225 | +++ linux-2.6.32.15/fs/cifs/link.c 2010-05-28 21:27:16.091216728 -0400 |
30211 | @@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct | 30226 | @@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct |
30212 | 30227 | ||
30213 | void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) | 30228 | void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) |
@@ -30217,9 +30232,9 @@ diff -urNp linux-2.6.32.13/fs/cifs/link.c linux-2.6.32.13/fs/cifs/link.c | |||
30217 | if (!IS_ERR(p)) | 30232 | if (!IS_ERR(p)) |
30218 | kfree(p); | 30233 | kfree(p); |
30219 | } | 30234 | } |
30220 | diff -urNp linux-2.6.32.13/fs/compat_binfmt_elf.c linux-2.6.32.13/fs/compat_binfmt_elf.c | 30235 | diff -urNp linux-2.6.32.15/fs/compat_binfmt_elf.c linux-2.6.32.15/fs/compat_binfmt_elf.c |
30221 | --- linux-2.6.32.13/fs/compat_binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400 | 30236 | --- linux-2.6.32.15/fs/compat_binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400 |
30222 | +++ linux-2.6.32.13/fs/compat_binfmt_elf.c 2010-05-15 13:21:16.995071409 -0400 | 30237 | +++ linux-2.6.32.15/fs/compat_binfmt_elf.c 2010-05-28 21:27:16.091216728 -0400 |
30223 | @@ -29,10 +29,12 @@ | 30238 | @@ -29,10 +29,12 @@ |
30224 | #undef elfhdr | 30239 | #undef elfhdr |
30225 | #undef elf_phdr | 30240 | #undef elf_phdr |
@@ -30233,9 +30248,9 @@ diff -urNp linux-2.6.32.13/fs/compat_binfmt_elf.c linux-2.6.32.13/fs/compat_binf | |||
30233 | #define elf_addr_t Elf32_Addr | 30248 | #define elf_addr_t Elf32_Addr |
30234 | 30249 | ||
30235 | /* | 30250 | /* |
30236 | diff -urNp linux-2.6.32.13/fs/compat.c linux-2.6.32.13/fs/compat.c | 30251 | diff -urNp linux-2.6.32.15/fs/compat.c linux-2.6.32.15/fs/compat.c |
30237 | --- linux-2.6.32.13/fs/compat.c 2010-03-15 11:52:04.000000000 -0400 | 30252 | --- linux-2.6.32.15/fs/compat.c 2010-05-28 20:16:44.454934408 -0400 |
30238 | +++ linux-2.6.32.13/fs/compat.c 2010-05-15 13:21:17.027084488 -0400 | 30253 | +++ linux-2.6.32.15/fs/compat.c 2010-05-28 21:27:16.095276039 -0400 |
30239 | @@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc, | 30254 | @@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc, |
30240 | if (!kmapped_page || kpos != (pos & PAGE_MASK)) { | 30255 | if (!kmapped_page || kpos != (pos & PAGE_MASK)) { |
30241 | struct page *page; | 30256 | struct page *page; |
@@ -30318,9 +30333,9 @@ diff -urNp linux-2.6.32.13/fs/compat.c linux-2.6.32.13/fs/compat.c | |||
30318 | + fput(old_exec_file); | 30333 | + fput(old_exec_file); |
30319 | +#endif | 30334 | +#endif |
30320 | 30335 | ||
30321 | current->stack_start = current->mm->start_stack; | 30336 | /* execve succeeded */ |
30322 | 30337 | current->fs->in_exec = 0; | |
30323 | @@ -1543,6 +1585,14 @@ int compat_do_execve(char * filename, | 30338 | @@ -1541,6 +1583,14 @@ int compat_do_execve(char * filename, |
30324 | put_files_struct(displaced); | 30339 | put_files_struct(displaced); |
30325 | return retval; | 30340 | return retval; |
30326 | 30341 | ||
@@ -30335,9 +30350,9 @@ diff -urNp linux-2.6.32.13/fs/compat.c linux-2.6.32.13/fs/compat.c | |||
30335 | out: | 30350 | out: |
30336 | if (bprm->mm) | 30351 | if (bprm->mm) |
30337 | mmput(bprm->mm); | 30352 | mmput(bprm->mm); |
30338 | diff -urNp linux-2.6.32.13/fs/compat_ioctl.c linux-2.6.32.13/fs/compat_ioctl.c | 30353 | diff -urNp linux-2.6.32.15/fs/compat_ioctl.c linux-2.6.32.15/fs/compat_ioctl.c |
30339 | --- linux-2.6.32.13/fs/compat_ioctl.c 2010-03-15 11:52:04.000000000 -0400 | 30354 | --- linux-2.6.32.15/fs/compat_ioctl.c 2010-03-15 11:52:04.000000000 -0400 |
30340 | +++ linux-2.6.32.13/fs/compat_ioctl.c 2010-05-15 13:21:17.050796208 -0400 | 30355 | +++ linux-2.6.32.15/fs/compat_ioctl.c 2010-05-28 21:27:16.111229439 -0400 |
30341 | @@ -1827,15 +1827,15 @@ struct ioctl_trans { | 30356 | @@ -1827,15 +1827,15 @@ struct ioctl_trans { |
30342 | }; | 30357 | }; |
30343 | 30358 | ||
@@ -30357,9 +30372,9 @@ diff -urNp linux-2.6.32.13/fs/compat_ioctl.c linux-2.6.32.13/fs/compat_ioctl.c | |||
30357 | 30372 | ||
30358 | /* ioctl should not be warned about even if it's not implemented. | 30373 | /* ioctl should not be warned about even if it's not implemented. |
30359 | Valid reasons to use this: | 30374 | Valid reasons to use this: |
30360 | diff -urNp linux-2.6.32.13/fs/debugfs/inode.c linux-2.6.32.13/fs/debugfs/inode.c | 30375 | diff -urNp linux-2.6.32.15/fs/debugfs/inode.c linux-2.6.32.15/fs/debugfs/inode.c |
30361 | --- linux-2.6.32.13/fs/debugfs/inode.c 2010-03-15 11:52:04.000000000 -0400 | 30376 | --- linux-2.6.32.15/fs/debugfs/inode.c 2010-03-15 11:52:04.000000000 -0400 |
30362 | +++ linux-2.6.32.13/fs/debugfs/inode.c 2010-05-15 13:21:17.062663383 -0400 | 30377 | +++ linux-2.6.32.15/fs/debugfs/inode.c 2010-05-28 21:27:16.111229439 -0400 |
30363 | @@ -128,7 +128,7 @@ static inline int debugfs_positive(struc | 30378 | @@ -128,7 +128,7 @@ static inline int debugfs_positive(struc |
30364 | 30379 | ||
30365 | static int debug_fill_super(struct super_block *sb, void *data, int silent) | 30380 | static int debug_fill_super(struct super_block *sb, void *data, int silent) |
@@ -30369,9 +30384,9 @@ diff -urNp linux-2.6.32.13/fs/debugfs/inode.c linux-2.6.32.13/fs/debugfs/inode.c | |||
30369 | 30384 | ||
30370 | return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); | 30385 | return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); |
30371 | } | 30386 | } |
30372 | diff -urNp linux-2.6.32.13/fs/dlm/lockspace.c linux-2.6.32.13/fs/dlm/lockspace.c | 30387 | diff -urNp linux-2.6.32.15/fs/dlm/lockspace.c linux-2.6.32.15/fs/dlm/lockspace.c |
30373 | --- linux-2.6.32.13/fs/dlm/lockspace.c 2010-03-15 11:52:04.000000000 -0400 | 30388 | --- linux-2.6.32.15/fs/dlm/lockspace.c 2010-03-15 11:52:04.000000000 -0400 |
30374 | +++ linux-2.6.32.13/fs/dlm/lockspace.c 2010-05-15 13:21:17.082686362 -0400 | 30389 | +++ linux-2.6.32.15/fs/dlm/lockspace.c 2010-05-28 21:27:16.111229439 -0400 |
30375 | @@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc | 30390 | @@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc |
30376 | kfree(ls); | 30391 | kfree(ls); |
30377 | } | 30392 | } |
@@ -30381,9 +30396,9 @@ diff -urNp linux-2.6.32.13/fs/dlm/lockspace.c linux-2.6.32.13/fs/dlm/lockspace.c | |||
30381 | .show = dlm_attr_show, | 30396 | .show = dlm_attr_show, |
30382 | .store = dlm_attr_store, | 30397 | .store = dlm_attr_store, |
30383 | }; | 30398 | }; |
30384 | diff -urNp linux-2.6.32.13/fs/ecryptfs/inode.c linux-2.6.32.13/fs/ecryptfs/inode.c | 30399 | diff -urNp linux-2.6.32.15/fs/ecryptfs/inode.c linux-2.6.32.15/fs/ecryptfs/inode.c |
30385 | --- linux-2.6.32.13/fs/ecryptfs/inode.c 2010-04-29 17:49:38.429034237 -0400 | 30400 | --- linux-2.6.32.15/fs/ecryptfs/inode.c 2010-04-29 17:49:38.429034237 -0400 |
30386 | +++ linux-2.6.32.13/fs/ecryptfs/inode.c 2010-05-15 13:21:17.090658956 -0400 | 30401 | +++ linux-2.6.32.15/fs/ecryptfs/inode.c 2010-05-28 21:27:16.111229439 -0400 |
30387 | @@ -655,7 +655,7 @@ static int ecryptfs_readlink_lower(struc | 30402 | @@ -655,7 +655,7 @@ static int ecryptfs_readlink_lower(struc |
30388 | old_fs = get_fs(); | 30403 | old_fs = get_fs(); |
30389 | set_fs(get_ds()); | 30404 | set_fs(get_ds()); |
@@ -30402,9 +30417,9 @@ diff -urNp linux-2.6.32.13/fs/ecryptfs/inode.c linux-2.6.32.13/fs/ecryptfs/inode | |||
30402 | set_fs(old_fs); | 30417 | set_fs(old_fs); |
30403 | if (rc < 0) | 30418 | if (rc < 0) |
30404 | goto out_free; | 30419 | goto out_free; |
30405 | diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c | 30420 | diff -urNp linux-2.6.32.15/fs/exec.c linux-2.6.32.15/fs/exec.c |
30406 | --- linux-2.6.32.13/fs/exec.c 2010-04-04 20:41:50.037938751 -0400 | 30421 | --- linux-2.6.32.15/fs/exec.c 2010-05-28 20:16:44.454934408 -0400 |
30407 | +++ linux-2.6.32.13/fs/exec.c 2010-05-15 13:21:17.114657511 -0400 | 30422 | +++ linux-2.6.32.15/fs/exec.c 2010-05-28 21:27:16.119217721 -0400 |
30408 | @@ -56,12 +56,24 @@ | 30423 | @@ -56,12 +56,24 @@ |
30409 | #include <linux/fsnotify.h> | 30424 | #include <linux/fsnotify.h> |
30410 | #include <linux/fs_struct.h> | 30425 | #include <linux/fs_struct.h> |
@@ -30662,9 +30677,9 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c | |||
30662 | + fput(old_exec_file); | 30677 | + fput(old_exec_file); |
30663 | +#endif | 30678 | +#endif |
30664 | 30679 | ||
30665 | current->stack_start = current->mm->start_stack; | 30680 | /* execve succeeded */ |
30666 | 30681 | current->fs->in_exec = 0; | |
30667 | @@ -1390,6 +1471,14 @@ int do_execve(char * filename, | 30682 | @@ -1388,6 +1469,14 @@ int do_execve(char * filename, |
30668 | put_files_struct(displaced); | 30683 | put_files_struct(displaced); |
30669 | return retval; | 30684 | return retval; |
30670 | 30685 | ||
@@ -30679,7 +30694,7 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c | |||
30679 | out: | 30694 | out: |
30680 | if (bprm->mm) | 30695 | if (bprm->mm) |
30681 | mmput (bprm->mm); | 30696 | mmput (bprm->mm); |
30682 | @@ -1553,6 +1642,169 @@ out: | 30697 | @@ -1551,6 +1640,169 @@ out: |
30683 | return ispipe; | 30698 | return ispipe; |
30684 | } | 30699 | } |
30685 | 30700 | ||
@@ -30849,7 +30864,7 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c | |||
30849 | static int zap_process(struct task_struct *start) | 30864 | static int zap_process(struct task_struct *start) |
30850 | { | 30865 | { |
30851 | struct task_struct *t; | 30866 | struct task_struct *t; |
30852 | @@ -1755,17 +2007,17 @@ static void wait_for_dump_helpers(struct | 30867 | @@ -1753,17 +2005,17 @@ static void wait_for_dump_helpers(struct |
30853 | pipe = file->f_path.dentry->d_inode->i_pipe; | 30868 | pipe = file->f_path.dentry->d_inode->i_pipe; |
30854 | 30869 | ||
30855 | pipe_lock(pipe); | 30870 | pipe_lock(pipe); |
@@ -30872,7 +30887,7 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c | |||
30872 | pipe_unlock(pipe); | 30887 | pipe_unlock(pipe); |
30873 | 30888 | ||
30874 | } | 30889 | } |
30875 | @@ -1836,6 +2088,10 @@ void do_coredump(long signr, int exit_co | 30890 | @@ -1834,6 +2086,10 @@ void do_coredump(long signr, int exit_co |
30876 | */ | 30891 | */ |
30877 | clear_thread_flag(TIF_SIGPENDING); | 30892 | clear_thread_flag(TIF_SIGPENDING); |
30878 | 30893 | ||
@@ -30883,9 +30898,9 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c | |||
30883 | /* | 30898 | /* |
30884 | * lock_kernel() because format_corename() is controlled by sysctl, which | 30899 | * lock_kernel() because format_corename() is controlled by sysctl, which |
30885 | * uses lock_kernel() | 30900 | * uses lock_kernel() |
30886 | diff -urNp linux-2.6.32.13/fs/ext2/balloc.c linux-2.6.32.13/fs/ext2/balloc.c | 30901 | diff -urNp linux-2.6.32.15/fs/ext2/balloc.c linux-2.6.32.15/fs/ext2/balloc.c |
30887 | --- linux-2.6.32.13/fs/ext2/balloc.c 2010-03-15 11:52:04.000000000 -0400 | 30902 | --- linux-2.6.32.15/fs/ext2/balloc.c 2010-03-15 11:52:04.000000000 -0400 |
30888 | +++ linux-2.6.32.13/fs/ext2/balloc.c 2010-05-15 13:21:17.118672646 -0400 | 30903 | +++ linux-2.6.32.15/fs/ext2/balloc.c 2010-05-28 21:27:16.139352882 -0400 |
30889 | @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e | 30904 | @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e |
30890 | 30905 | ||
30891 | free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); | 30906 | free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); |
@@ -30895,9 +30910,9 @@ diff -urNp linux-2.6.32.13/fs/ext2/balloc.c linux-2.6.32.13/fs/ext2/balloc.c | |||
30895 | sbi->s_resuid != current_fsuid() && | 30910 | sbi->s_resuid != current_fsuid() && |
30896 | (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { | 30911 | (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { |
30897 | return 0; | 30912 | return 0; |
30898 | diff -urNp linux-2.6.32.13/fs/ext2/xattr.c linux-2.6.32.13/fs/ext2/xattr.c | 30913 | diff -urNp linux-2.6.32.15/fs/ext2/xattr.c linux-2.6.32.15/fs/ext2/xattr.c |
30899 | --- linux-2.6.32.13/fs/ext2/xattr.c 2010-03-15 11:52:04.000000000 -0400 | 30914 | --- linux-2.6.32.15/fs/ext2/xattr.c 2010-03-15 11:52:04.000000000 -0400 |
30900 | +++ linux-2.6.32.13/fs/ext2/xattr.c 2010-05-15 13:21:17.122783817 -0400 | 30915 | +++ linux-2.6.32.15/fs/ext2/xattr.c 2010-05-28 21:27:16.139352882 -0400 |
30901 | @@ -85,8 +85,8 @@ | 30916 | @@ -85,8 +85,8 @@ |
30902 | printk("\n"); \ | 30917 | printk("\n"); \ |
30903 | } while (0) | 30918 | } while (0) |
@@ -30909,9 +30924,9 @@ diff -urNp linux-2.6.32.13/fs/ext2/xattr.c linux-2.6.32.13/fs/ext2/xattr.c | |||
30909 | #endif | 30924 | #endif |
30910 | 30925 | ||
30911 | static int ext2_xattr_set2(struct inode *, struct buffer_head *, | 30926 | static int ext2_xattr_set2(struct inode *, struct buffer_head *, |
30912 | diff -urNp linux-2.6.32.13/fs/ext3/balloc.c linux-2.6.32.13/fs/ext3/balloc.c | 30927 | diff -urNp linux-2.6.32.15/fs/ext3/balloc.c linux-2.6.32.15/fs/ext3/balloc.c |
30913 | --- linux-2.6.32.13/fs/ext3/balloc.c 2010-03-15 11:52:04.000000000 -0400 | 30928 | --- linux-2.6.32.15/fs/ext3/balloc.c 2010-03-15 11:52:04.000000000 -0400 |
30914 | +++ linux-2.6.32.13/fs/ext3/balloc.c 2010-05-15 13:21:17.135016428 -0400 | 30929 | +++ linux-2.6.32.15/fs/ext3/balloc.c 2010-05-28 21:27:16.139352882 -0400 |
30915 | @@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e | 30930 | @@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e |
30916 | 30931 | ||
30917 | free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); | 30932 | free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); |
@@ -30921,9 +30936,9 @@ diff -urNp linux-2.6.32.13/fs/ext3/balloc.c linux-2.6.32.13/fs/ext3/balloc.c | |||
30921 | sbi->s_resuid != current_fsuid() && | 30936 | sbi->s_resuid != current_fsuid() && |
30922 | (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { | 30937 | (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { |
30923 | return 0; | 30938 | return 0; |
30924 | diff -urNp linux-2.6.32.13/fs/ext3/namei.c linux-2.6.32.13/fs/ext3/namei.c | 30939 | diff -urNp linux-2.6.32.15/fs/ext3/namei.c linux-2.6.32.15/fs/ext3/namei.c |
30925 | --- linux-2.6.32.13/fs/ext3/namei.c 2010-03-15 11:52:04.000000000 -0400 | 30940 | --- linux-2.6.32.15/fs/ext3/namei.c 2010-03-15 11:52:04.000000000 -0400 |
30926 | +++ linux-2.6.32.13/fs/ext3/namei.c 2010-05-15 13:21:17.155157464 -0400 | 30941 | +++ linux-2.6.32.15/fs/ext3/namei.c 2010-05-28 21:27:16.139352882 -0400 |
30927 | @@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split | 30942 | @@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split |
30928 | char *data1 = (*bh)->b_data, *data2; | 30943 | char *data1 = (*bh)->b_data, *data2; |
30929 | unsigned split, move, size; | 30944 | unsigned split, move, size; |
@@ -30933,9 +30948,9 @@ diff -urNp linux-2.6.32.13/fs/ext3/namei.c linux-2.6.32.13/fs/ext3/namei.c | |||
30933 | 30948 | ||
30934 | bh2 = ext3_append (handle, dir, &newblock, &err); | 30949 | bh2 = ext3_append (handle, dir, &newblock, &err); |
30935 | if (!(bh2)) { | 30950 | if (!(bh2)) { |
30936 | diff -urNp linux-2.6.32.13/fs/ext3/xattr.c linux-2.6.32.13/fs/ext3/xattr.c | 30951 | diff -urNp linux-2.6.32.15/fs/ext3/xattr.c linux-2.6.32.15/fs/ext3/xattr.c |
30937 | --- linux-2.6.32.13/fs/ext3/xattr.c 2010-04-29 17:49:38.429034237 -0400 | 30952 | --- linux-2.6.32.15/fs/ext3/xattr.c 2010-04-29 17:49:38.429034237 -0400 |
30938 | +++ linux-2.6.32.13/fs/ext3/xattr.c 2010-05-15 13:21:17.158583972 -0400 | 30953 | +++ linux-2.6.32.15/fs/ext3/xattr.c 2010-05-28 21:27:16.139352882 -0400 |
30939 | @@ -89,8 +89,8 @@ | 30954 | @@ -89,8 +89,8 @@ |
30940 | printk("\n"); \ | 30955 | printk("\n"); \ |
30941 | } while (0) | 30956 | } while (0) |
@@ -30947,9 +30962,9 @@ diff -urNp linux-2.6.32.13/fs/ext3/xattr.c linux-2.6.32.13/fs/ext3/xattr.c | |||
30947 | #endif | 30962 | #endif |
30948 | 30963 | ||
30949 | static void ext3_xattr_cache_insert(struct buffer_head *); | 30964 | static void ext3_xattr_cache_insert(struct buffer_head *); |
30950 | diff -urNp linux-2.6.32.13/fs/ext4/balloc.c linux-2.6.32.13/fs/ext4/balloc.c | 30965 | diff -urNp linux-2.6.32.15/fs/ext4/balloc.c linux-2.6.32.15/fs/ext4/balloc.c |
30951 | --- linux-2.6.32.13/fs/ext4/balloc.c 2010-03-15 11:52:04.000000000 -0400 | 30966 | --- linux-2.6.32.15/fs/ext4/balloc.c 2010-03-15 11:52:04.000000000 -0400 |
30952 | +++ linux-2.6.32.13/fs/ext4/balloc.c 2010-05-15 13:21:17.158583972 -0400 | 30967 | +++ linux-2.6.32.15/fs/ext4/balloc.c 2010-05-28 21:27:16.143235197 -0400 |
30953 | @@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_ | 30968 | @@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_ |
30954 | /* Hm, nope. Are (enough) root reserved blocks available? */ | 30969 | /* Hm, nope. Are (enough) root reserved blocks available? */ |
30955 | if (sbi->s_resuid == current_fsuid() || | 30970 | if (sbi->s_resuid == current_fsuid() || |
@@ -30959,9 +30974,9 @@ diff -urNp linux-2.6.32.13/fs/ext4/balloc.c linux-2.6.32.13/fs/ext4/balloc.c | |||
30959 | if (free_blocks >= (nblocks + dirty_blocks)) | 30974 | if (free_blocks >= (nblocks + dirty_blocks)) |
30960 | return 1; | 30975 | return 1; |
30961 | } | 30976 | } |
30962 | diff -urNp linux-2.6.32.13/fs/ext4/ioctl.c linux-2.6.32.13/fs/ext4/ioctl.c | 30977 | diff -urNp linux-2.6.32.15/fs/ext4/ioctl.c linux-2.6.32.15/fs/ext4/ioctl.c |
30963 | --- linux-2.6.32.13/fs/ext4/ioctl.c 2010-03-15 11:52:04.000000000 -0400 | 30978 | --- linux-2.6.32.15/fs/ext4/ioctl.c 2010-03-15 11:52:04.000000000 -0400 |
30964 | +++ linux-2.6.32.13/fs/ext4/ioctl.c 2010-05-15 13:21:17.158583972 -0400 | 30979 | +++ linux-2.6.32.15/fs/ext4/ioctl.c 2010-05-28 21:27:16.143235197 -0400 |
30965 | @@ -221,6 +221,9 @@ setversion_out: | 30980 | @@ -221,6 +221,9 @@ setversion_out: |
30966 | struct file *donor_filp; | 30981 | struct file *donor_filp; |
30967 | int err; | 30982 | int err; |
@@ -30972,9 +30987,9 @@ diff -urNp linux-2.6.32.13/fs/ext4/ioctl.c linux-2.6.32.13/fs/ext4/ioctl.c | |||
30972 | if (!(filp->f_mode & FMODE_READ) || | 30987 | if (!(filp->f_mode & FMODE_READ) || |
30973 | !(filp->f_mode & FMODE_WRITE)) | 30988 | !(filp->f_mode & FMODE_WRITE)) |
30974 | return -EBADF; | 30989 | return -EBADF; |
30975 | diff -urNp linux-2.6.32.13/fs/ext4/namei.c linux-2.6.32.13/fs/ext4/namei.c | 30990 | diff -urNp linux-2.6.32.15/fs/ext4/namei.c linux-2.6.32.15/fs/ext4/namei.c |
30976 | --- linux-2.6.32.13/fs/ext4/namei.c 2010-03-15 11:52:04.000000000 -0400 | 30991 | --- linux-2.6.32.15/fs/ext4/namei.c 2010-03-15 11:52:04.000000000 -0400 |
30977 | +++ linux-2.6.32.13/fs/ext4/namei.c 2010-05-15 13:21:17.183216444 -0400 | 30992 | +++ linux-2.6.32.15/fs/ext4/namei.c 2010-05-28 21:27:16.151243127 -0400 |
30978 | @@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split | 30993 | @@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split |
30979 | char *data1 = (*bh)->b_data, *data2; | 30994 | char *data1 = (*bh)->b_data, *data2; |
30980 | unsigned split, move, size; | 30995 | unsigned split, move, size; |
@@ -30984,9 +30999,9 @@ diff -urNp linux-2.6.32.13/fs/ext4/namei.c linux-2.6.32.13/fs/ext4/namei.c | |||
30984 | 30999 | ||
30985 | bh2 = ext4_append (handle, dir, &newblock, &err); | 31000 | bh2 = ext4_append (handle, dir, &newblock, &err); |
30986 | if (!(bh2)) { | 31001 | if (!(bh2)) { |
30987 | diff -urNp linux-2.6.32.13/fs/ext4/super.c linux-2.6.32.13/fs/ext4/super.c | 31002 | diff -urNp linux-2.6.32.15/fs/ext4/super.c linux-2.6.32.15/fs/ext4/super.c |
30988 | --- linux-2.6.32.13/fs/ext4/super.c 2010-03-15 11:52:04.000000000 -0400 | 31003 | --- linux-2.6.32.15/fs/ext4/super.c 2010-03-15 11:52:04.000000000 -0400 |
30989 | +++ linux-2.6.32.13/fs/ext4/super.c 2010-05-15 13:21:17.215811745 -0400 | 31004 | +++ linux-2.6.32.15/fs/ext4/super.c 2010-05-28 21:27:16.155228523 -0400 |
30990 | @@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje | 31005 | @@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje |
30991 | } | 31006 | } |
30992 | 31007 | ||
@@ -30996,9 +31011,9 @@ diff -urNp linux-2.6.32.13/fs/ext4/super.c linux-2.6.32.13/fs/ext4/super.c | |||
30996 | .show = ext4_attr_show, | 31011 | .show = ext4_attr_show, |
30997 | .store = ext4_attr_store, | 31012 | .store = ext4_attr_store, |
30998 | }; | 31013 | }; |
30999 | diff -urNp linux-2.6.32.13/fs/ext4/xattr.c linux-2.6.32.13/fs/ext4/xattr.c | 31014 | diff -urNp linux-2.6.32.15/fs/ext4/xattr.c linux-2.6.32.15/fs/ext4/xattr.c |
31000 | --- linux-2.6.32.13/fs/ext4/xattr.c 2010-03-15 11:52:04.000000000 -0400 | 31015 | --- linux-2.6.32.15/fs/ext4/xattr.c 2010-03-15 11:52:04.000000000 -0400 |
31001 | +++ linux-2.6.32.13/fs/ext4/xattr.c 2010-05-15 13:21:17.227060881 -0400 | 31016 | +++ linux-2.6.32.15/fs/ext4/xattr.c 2010-05-28 21:27:16.155228523 -0400 |
31002 | @@ -82,8 +82,8 @@ | 31017 | @@ -82,8 +82,8 @@ |
31003 | printk("\n"); \ | 31018 | printk("\n"); \ |
31004 | } while (0) | 31019 | } while (0) |
@@ -31010,9 +31025,9 @@ diff -urNp linux-2.6.32.13/fs/ext4/xattr.c linux-2.6.32.13/fs/ext4/xattr.c | |||
31010 | #endif | 31025 | #endif |
31011 | 31026 | ||
31012 | static void ext4_xattr_cache_insert(struct buffer_head *); | 31027 | static void ext4_xattr_cache_insert(struct buffer_head *); |
31013 | diff -urNp linux-2.6.32.13/fs/fcntl.c linux-2.6.32.13/fs/fcntl.c | 31028 | diff -urNp linux-2.6.32.15/fs/fcntl.c linux-2.6.32.15/fs/fcntl.c |
31014 | --- linux-2.6.32.13/fs/fcntl.c 2010-03-15 11:52:04.000000000 -0400 | 31029 | --- linux-2.6.32.15/fs/fcntl.c 2010-03-15 11:52:04.000000000 -0400 |
31015 | +++ linux-2.6.32.13/fs/fcntl.c 2010-05-15 13:21:17.227060881 -0400 | 31030 | +++ linux-2.6.32.15/fs/fcntl.c 2010-05-28 21:27:16.158915754 -0400 |
31016 | @@ -344,6 +344,7 @@ static long do_fcntl(int fd, unsigned in | 31031 | @@ -344,6 +344,7 @@ static long do_fcntl(int fd, unsigned in |
31017 | switch (cmd) { | 31032 | switch (cmd) { |
31018 | case F_DUPFD: | 31033 | case F_DUPFD: |
@@ -31031,9 +31046,9 @@ diff -urNp linux-2.6.32.13/fs/fcntl.c linux-2.6.32.13/fs/fcntl.c | |||
31031 | rcu_read_unlock(); | 31046 | rcu_read_unlock(); |
31032 | return ret; | 31047 | return ret; |
31033 | } | 31048 | } |
31034 | diff -urNp linux-2.6.32.13/fs/fifo.c linux-2.6.32.13/fs/fifo.c | 31049 | diff -urNp linux-2.6.32.15/fs/fifo.c linux-2.6.32.15/fs/fifo.c |
31035 | --- linux-2.6.32.13/fs/fifo.c 2010-03-15 11:52:04.000000000 -0400 | 31050 | --- linux-2.6.32.15/fs/fifo.c 2010-03-15 11:52:04.000000000 -0400 |
31036 | +++ linux-2.6.32.13/fs/fifo.c 2010-05-15 13:21:17.252844788 -0400 | 31051 | +++ linux-2.6.32.15/fs/fifo.c 2010-05-28 21:27:16.158915754 -0400 |
31037 | @@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode | 31052 | @@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode |
31038 | */ | 31053 | */ |
31039 | filp->f_op = &read_pipefifo_fops; | 31054 | filp->f_op = &read_pipefifo_fops; |
@@ -31104,9 +31119,9 @@ diff -urNp linux-2.6.32.13/fs/fifo.c linux-2.6.32.13/fs/fifo.c | |||
31104 | free_pipe_info(inode); | 31119 | free_pipe_info(inode); |
31105 | 31120 | ||
31106 | err_nocleanup: | 31121 | err_nocleanup: |
31107 | diff -urNp linux-2.6.32.13/fs/file.c linux-2.6.32.13/fs/file.c | 31122 | diff -urNp linux-2.6.32.15/fs/file.c linux-2.6.32.15/fs/file.c |
31108 | --- linux-2.6.32.13/fs/file.c 2010-03-15 11:52:04.000000000 -0400 | 31123 | --- linux-2.6.32.15/fs/file.c 2010-03-15 11:52:04.000000000 -0400 |
31109 | +++ linux-2.6.32.13/fs/file.c 2010-05-15 13:21:17.256078508 -0400 | 31124 | +++ linux-2.6.32.15/fs/file.c 2010-05-28 21:27:16.158915754 -0400 |
31110 | @@ -14,6 +14,7 @@ | 31125 | @@ -14,6 +14,7 @@ |
31111 | #include <linux/slab.h> | 31126 | #include <linux/slab.h> |
31112 | #include <linux/vmalloc.h> | 31127 | #include <linux/vmalloc.h> |
@@ -31124,9 +31139,9 @@ diff -urNp linux-2.6.32.13/fs/file.c linux-2.6.32.13/fs/file.c | |||
31124 | if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) | 31139 | if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) |
31125 | return -EMFILE; | 31140 | return -EMFILE; |
31126 | 31141 | ||
31127 | diff -urNp linux-2.6.32.13/fs/fs_struct.c linux-2.6.32.13/fs/fs_struct.c | 31142 | diff -urNp linux-2.6.32.15/fs/fs_struct.c linux-2.6.32.15/fs/fs_struct.c |
31128 | --- linux-2.6.32.13/fs/fs_struct.c 2010-03-15 11:52:04.000000000 -0400 | 31143 | --- linux-2.6.32.15/fs/fs_struct.c 2010-03-15 11:52:04.000000000 -0400 |
31129 | +++ linux-2.6.32.13/fs/fs_struct.c 2010-05-15 13:21:17.256078508 -0400 | 31144 | +++ linux-2.6.32.15/fs/fs_struct.c 2010-05-28 21:27:16.158915754 -0400 |
31130 | @@ -45,10 +45,12 @@ void chroot_fs_refs(struct path *old_roo | 31145 | @@ -45,10 +45,12 @@ void chroot_fs_refs(struct path *old_roo |
31131 | struct task_struct *g, *p; | 31146 | struct task_struct *g, *p; |
31132 | struct fs_struct *fs; | 31147 | struct fs_struct *fs; |
@@ -31231,9 +31246,9 @@ diff -urNp linux-2.6.32.13/fs/fs_struct.c linux-2.6.32.13/fs/fs_struct.c | |||
31231 | 31246 | ||
31232 | task_unlock(current); | 31247 | task_unlock(current); |
31233 | if (kill) | 31248 | if (kill) |
31234 | diff -urNp linux-2.6.32.13/fs/fuse/control.c linux-2.6.32.13/fs/fuse/control.c | 31249 | diff -urNp linux-2.6.32.15/fs/fuse/control.c linux-2.6.32.15/fs/fuse/control.c |
31235 | --- linux-2.6.32.13/fs/fuse/control.c 2010-03-15 11:52:04.000000000 -0400 | 31250 | --- linux-2.6.32.15/fs/fuse/control.c 2010-03-15 11:52:04.000000000 -0400 |
31236 | +++ linux-2.6.32.13/fs/fuse/control.c 2010-05-15 13:21:17.271074520 -0400 | 31251 | +++ linux-2.6.32.15/fs/fuse/control.c 2010-05-28 21:27:16.158915754 -0400 |
31237 | @@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co | 31252 | @@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co |
31238 | 31253 | ||
31239 | static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent) | 31254 | static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent) |
@@ -31243,9 +31258,9 @@ diff -urNp linux-2.6.32.13/fs/fuse/control.c linux-2.6.32.13/fs/fuse/control.c | |||
31243 | struct fuse_conn *fc; | 31258 | struct fuse_conn *fc; |
31244 | int err; | 31259 | int err; |
31245 | 31260 | ||
31246 | diff -urNp linux-2.6.32.13/fs/fuse/cuse.c linux-2.6.32.13/fs/fuse/cuse.c | 31261 | diff -urNp linux-2.6.32.15/fs/fuse/cuse.c linux-2.6.32.15/fs/fuse/cuse.c |
31247 | --- linux-2.6.32.13/fs/fuse/cuse.c 2010-03-15 11:52:04.000000000 -0400 | 31262 | --- linux-2.6.32.15/fs/fuse/cuse.c 2010-03-15 11:52:04.000000000 -0400 |
31248 | +++ linux-2.6.32.13/fs/fuse/cuse.c 2010-05-15 13:21:17.289230785 -0400 | 31263 | +++ linux-2.6.32.15/fs/fuse/cuse.c 2010-05-28 21:27:16.158915754 -0400 |
31249 | @@ -528,8 +528,18 @@ static int cuse_channel_release(struct i | 31264 | @@ -528,8 +528,18 @@ static int cuse_channel_release(struct i |
31250 | return rc; | 31265 | return rc; |
31251 | } | 31266 | } |
@@ -31280,9 +31295,9 @@ diff -urNp linux-2.6.32.13/fs/fuse/cuse.c linux-2.6.32.13/fs/fuse/cuse.c | |||
31280 | cuse_class = class_create(THIS_MODULE, "cuse"); | 31295 | cuse_class = class_create(THIS_MODULE, "cuse"); |
31281 | if (IS_ERR(cuse_class)) | 31296 | if (IS_ERR(cuse_class)) |
31282 | return PTR_ERR(cuse_class); | 31297 | return PTR_ERR(cuse_class); |
31283 | diff -urNp linux-2.6.32.13/fs/fuse/dev.c linux-2.6.32.13/fs/fuse/dev.c | 31298 | diff -urNp linux-2.6.32.15/fs/fuse/dev.c linux-2.6.32.15/fs/fuse/dev.c |
31284 | --- linux-2.6.32.13/fs/fuse/dev.c 2010-03-15 11:52:04.000000000 -0400 | 31299 | --- linux-2.6.32.15/fs/fuse/dev.c 2010-03-15 11:52:04.000000000 -0400 |
31285 | +++ linux-2.6.32.13/fs/fuse/dev.c 2010-05-15 13:21:17.290606220 -0400 | 31300 | +++ linux-2.6.32.15/fs/fuse/dev.c 2010-05-28 21:27:16.158915754 -0400 |
31286 | @@ -745,7 +745,7 @@ __releases(&fc->lock) | 31301 | @@ -745,7 +745,7 @@ __releases(&fc->lock) |
31287 | * request_end(). Otherwise add it to the processing list, and set | 31302 | * request_end(). Otherwise add it to the processing list, and set |
31288 | * the 'sent' flag. | 31303 | * the 'sent' flag. |
@@ -31388,9 +31403,9 @@ diff -urNp linux-2.6.32.13/fs/fuse/dev.c linux-2.6.32.13/fs/fuse/dev.c | |||
31388 | 31403 | ||
31389 | const struct file_operations fuse_dev_operations = { | 31404 | const struct file_operations fuse_dev_operations = { |
31390 | .owner = THIS_MODULE, | 31405 | .owner = THIS_MODULE, |
31391 | diff -urNp linux-2.6.32.13/fs/fuse/dir.c linux-2.6.32.13/fs/fuse/dir.c | 31406 | diff -urNp linux-2.6.32.15/fs/fuse/dir.c linux-2.6.32.15/fs/fuse/dir.c |
31392 | --- linux-2.6.32.13/fs/fuse/dir.c 2010-03-15 11:52:04.000000000 -0400 | 31407 | --- linux-2.6.32.15/fs/fuse/dir.c 2010-03-15 11:52:04.000000000 -0400 |
31393 | +++ linux-2.6.32.13/fs/fuse/dir.c 2010-05-15 13:21:17.295063654 -0400 | 31408 | +++ linux-2.6.32.15/fs/fuse/dir.c 2010-05-28 21:27:16.167243337 -0400 |
31394 | @@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de | 31409 | @@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de |
31395 | return link; | 31410 | return link; |
31396 | } | 31411 | } |
@@ -31400,9 +31415,9 @@ diff -urNp linux-2.6.32.13/fs/fuse/dir.c linux-2.6.32.13/fs/fuse/dir.c | |||
31400 | { | 31415 | { |
31401 | if (!IS_ERR(link)) | 31416 | if (!IS_ERR(link)) |
31402 | free_page((unsigned long) link); | 31417 | free_page((unsigned long) link); |
31403 | diff -urNp linux-2.6.32.13/fs/fuse/fuse_i.h linux-2.6.32.13/fs/fuse/fuse_i.h | 31418 | diff -urNp linux-2.6.32.15/fs/fuse/fuse_i.h linux-2.6.32.15/fs/fuse/fuse_i.h |
31404 | --- linux-2.6.32.13/fs/fuse/fuse_i.h 2010-03-15 11:52:04.000000000 -0400 | 31419 | --- linux-2.6.32.15/fs/fuse/fuse_i.h 2010-03-15 11:52:04.000000000 -0400 |
31405 | +++ linux-2.6.32.13/fs/fuse/fuse_i.h 2010-05-15 13:21:17.298596794 -0400 | 31420 | +++ linux-2.6.32.15/fs/fuse/fuse_i.h 2010-05-28 21:27:16.167243337 -0400 |
31406 | @@ -521,6 +521,16 @@ extern const struct file_operations fuse | 31421 | @@ -521,6 +521,16 @@ extern const struct file_operations fuse |
31407 | 31422 | ||
31408 | extern const struct dentry_operations fuse_dentry_operations; | 31423 | extern const struct dentry_operations fuse_dentry_operations; |
@@ -31420,9 +31435,9 @@ diff -urNp linux-2.6.32.13/fs/fuse/fuse_i.h linux-2.6.32.13/fs/fuse/fuse_i.h | |||
31420 | /** | 31435 | /** |
31421 | * Inode to nodeid comparison. | 31436 | * Inode to nodeid comparison. |
31422 | */ | 31437 | */ |
31423 | diff -urNp linux-2.6.32.13/fs/gfs2/sys.c linux-2.6.32.13/fs/gfs2/sys.c | 31438 | diff -urNp linux-2.6.32.15/fs/gfs2/sys.c linux-2.6.32.15/fs/gfs2/sys.c |
31424 | --- linux-2.6.32.13/fs/gfs2/sys.c 2010-03-15 11:52:04.000000000 -0400 | 31439 | --- linux-2.6.32.15/fs/gfs2/sys.c 2010-03-15 11:52:04.000000000 -0400 |
31425 | +++ linux-2.6.32.13/fs/gfs2/sys.c 2010-05-15 13:21:17.323073000 -0400 | 31440 | +++ linux-2.6.32.15/fs/gfs2/sys.c 2010-05-28 21:27:16.167243337 -0400 |
31426 | @@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko | 31441 | @@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko |
31427 | return a->store ? a->store(sdp, buf, len) : len; | 31442 | return a->store ? a->store(sdp, buf, len) : len; |
31428 | } | 31443 | } |
@@ -31441,9 +31456,9 @@ diff -urNp linux-2.6.32.13/fs/gfs2/sys.c linux-2.6.32.13/fs/gfs2/sys.c | |||
31441 | .uevent = gfs2_uevent, | 31456 | .uevent = gfs2_uevent, |
31442 | }; | 31457 | }; |
31443 | 31458 | ||
31444 | diff -urNp linux-2.6.32.13/fs/hfs/inode.c linux-2.6.32.13/fs/hfs/inode.c | 31459 | diff -urNp linux-2.6.32.15/fs/hfs/inode.c linux-2.6.32.15/fs/hfs/inode.c |
31445 | --- linux-2.6.32.13/fs/hfs/inode.c 2010-03-15 11:52:04.000000000 -0400 | 31460 | --- linux-2.6.32.15/fs/hfs/inode.c 2010-03-15 11:52:04.000000000 -0400 |
31446 | +++ linux-2.6.32.13/fs/hfs/inode.c 2010-05-15 13:21:17.331804288 -0400 | 31461 | +++ linux-2.6.32.15/fs/hfs/inode.c 2010-05-28 21:27:16.171892577 -0400 |
31447 | @@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode, | 31462 | @@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode, |
31448 | 31463 | ||
31449 | if (S_ISDIR(main_inode->i_mode)) { | 31464 | if (S_ISDIR(main_inode->i_mode)) { |
@@ -31462,9 +31477,9 @@ diff -urNp linux-2.6.32.13/fs/hfs/inode.c linux-2.6.32.13/fs/hfs/inode.c | |||
31462 | hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, | 31477 | hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, |
31463 | sizeof(struct hfs_cat_file)); | 31478 | sizeof(struct hfs_cat_file)); |
31464 | if (rec.type != HFS_CDR_FIL || | 31479 | if (rec.type != HFS_CDR_FIL || |
31465 | diff -urNp linux-2.6.32.13/fs/hfsplus/inode.c linux-2.6.32.13/fs/hfsplus/inode.c | 31480 | diff -urNp linux-2.6.32.15/fs/hfsplus/inode.c linux-2.6.32.15/fs/hfsplus/inode.c |
31466 | --- linux-2.6.32.13/fs/hfsplus/inode.c 2010-03-15 11:52:04.000000000 -0400 | 31481 | --- linux-2.6.32.15/fs/hfsplus/inode.c 2010-03-15 11:52:04.000000000 -0400 |
31467 | +++ linux-2.6.32.13/fs/hfsplus/inode.c 2010-05-15 13:21:17.338586981 -0400 | 31482 | +++ linux-2.6.32.15/fs/hfsplus/inode.c 2010-05-28 21:27:16.171892577 -0400 |
31468 | @@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode | 31483 | @@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode |
31469 | struct hfsplus_cat_folder *folder = &entry.folder; | 31484 | struct hfsplus_cat_folder *folder = &entry.folder; |
31470 | 31485 | ||
@@ -31501,9 +31516,9 @@ diff -urNp linux-2.6.32.13/fs/hfsplus/inode.c linux-2.6.32.13/fs/hfsplus/inode.c | |||
31501 | hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, | 31516 | hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, |
31502 | sizeof(struct hfsplus_cat_file)); | 31517 | sizeof(struct hfsplus_cat_file)); |
31503 | hfsplus_inode_write_fork(inode, &file->data_fork); | 31518 | hfsplus_inode_write_fork(inode, &file->data_fork); |
31504 | diff -urNp linux-2.6.32.13/fs/hugetlbfs/inode.c linux-2.6.32.13/fs/hugetlbfs/inode.c | 31519 | diff -urNp linux-2.6.32.15/fs/hugetlbfs/inode.c linux-2.6.32.15/fs/hugetlbfs/inode.c |
31505 | --- linux-2.6.32.13/fs/hugetlbfs/inode.c 2010-03-15 11:52:04.000000000 -0400 | 31520 | --- linux-2.6.32.15/fs/hugetlbfs/inode.c 2010-03-15 11:52:04.000000000 -0400 |
31506 | +++ linux-2.6.32.13/fs/hugetlbfs/inode.c 2010-05-15 13:21:17.367723130 -0400 | 31521 | +++ linux-2.6.32.15/fs/hugetlbfs/inode.c 2010-05-28 21:27:16.171892577 -0400 |
31507 | @@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs | 31522 | @@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs |
31508 | .kill_sb = kill_litter_super, | 31523 | .kill_sb = kill_litter_super, |
31509 | }; | 31524 | }; |
@@ -31513,9 +31528,9 @@ diff -urNp linux-2.6.32.13/fs/hugetlbfs/inode.c linux-2.6.32.13/fs/hugetlbfs/ino | |||
31513 | 31528 | ||
31514 | static int can_do_hugetlb_shm(void) | 31529 | static int can_do_hugetlb_shm(void) |
31515 | { | 31530 | { |
31516 | diff -urNp linux-2.6.32.13/fs/ioctl.c linux-2.6.32.13/fs/ioctl.c | 31531 | diff -urNp linux-2.6.32.15/fs/ioctl.c linux-2.6.32.15/fs/ioctl.c |
31517 | --- linux-2.6.32.13/fs/ioctl.c 2010-03-15 11:52:04.000000000 -0400 | 31532 | --- linux-2.6.32.15/fs/ioctl.c 2010-03-15 11:52:04.000000000 -0400 |
31518 | +++ linux-2.6.32.13/fs/ioctl.c 2010-05-15 13:21:17.367723130 -0400 | 31533 | +++ linux-2.6.32.15/fs/ioctl.c 2010-05-28 21:27:16.175116356 -0400 |
31519 | @@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema | 31534 | @@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema |
31520 | u64 phys, u64 len, u32 flags) | 31535 | u64 phys, u64 len, u32 flags) |
31521 | { | 31536 | { |
@@ -31543,9 +31558,9 @@ diff -urNp linux-2.6.32.13/fs/ioctl.c linux-2.6.32.13/fs/ioctl.c | |||
31543 | error = -EFAULT; | 31558 | error = -EFAULT; |
31544 | 31559 | ||
31545 | return error; | 31560 | return error; |
31546 | diff -urNp linux-2.6.32.13/fs/jffs2/debug.h linux-2.6.32.13/fs/jffs2/debug.h | 31561 | diff -urNp linux-2.6.32.15/fs/jffs2/debug.h linux-2.6.32.15/fs/jffs2/debug.h |
31547 | --- linux-2.6.32.13/fs/jffs2/debug.h 2010-03-15 11:52:04.000000000 -0400 | 31562 | --- linux-2.6.32.15/fs/jffs2/debug.h 2010-03-15 11:52:04.000000000 -0400 |
31548 | +++ linux-2.6.32.13/fs/jffs2/debug.h 2010-05-15 13:21:17.378571837 -0400 | 31563 | +++ linux-2.6.32.15/fs/jffs2/debug.h 2010-05-28 21:27:16.175116356 -0400 |
31549 | @@ -52,13 +52,13 @@ | 31564 | @@ -52,13 +52,13 @@ |
31550 | #if CONFIG_JFFS2_FS_DEBUG > 0 | 31565 | #if CONFIG_JFFS2_FS_DEBUG > 0 |
31551 | #define D1(x) x | 31566 | #define D1(x) x |
@@ -31647,9 +31662,9 @@ diff -urNp linux-2.6.32.13/fs/jffs2/debug.h linux-2.6.32.13/fs/jffs2/debug.h | |||
31647 | #endif | 31662 | #endif |
31648 | 31663 | ||
31649 | /* "Sanity" checks */ | 31664 | /* "Sanity" checks */ |
31650 | diff -urNp linux-2.6.32.13/fs/jffs2/erase.c linux-2.6.32.13/fs/jffs2/erase.c | 31665 | diff -urNp linux-2.6.32.15/fs/jffs2/erase.c linux-2.6.32.15/fs/jffs2/erase.c |
31651 | --- linux-2.6.32.13/fs/jffs2/erase.c 2010-03-15 11:52:04.000000000 -0400 | 31666 | --- linux-2.6.32.15/fs/jffs2/erase.c 2010-03-15 11:52:04.000000000 -0400 |
31652 | +++ linux-2.6.32.13/fs/jffs2/erase.c 2010-05-15 13:21:17.386577527 -0400 | 31667 | +++ linux-2.6.32.15/fs/jffs2/erase.c 2010-05-28 21:27:16.175116356 -0400 |
31653 | @@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru | 31668 | @@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru |
31654 | struct jffs2_unknown_node marker = { | 31669 | struct jffs2_unknown_node marker = { |
31655 | .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), | 31670 | .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), |
@@ -31660,9 +31675,9 @@ diff -urNp linux-2.6.32.13/fs/jffs2/erase.c linux-2.6.32.13/fs/jffs2/erase.c | |||
31660 | }; | 31675 | }; |
31661 | 31676 | ||
31662 | jffs2_prealloc_raw_node_refs(c, jeb, 1); | 31677 | jffs2_prealloc_raw_node_refs(c, jeb, 1); |
31663 | diff -urNp linux-2.6.32.13/fs/jffs2/summary.h linux-2.6.32.13/fs/jffs2/summary.h | 31678 | diff -urNp linux-2.6.32.15/fs/jffs2/summary.h linux-2.6.32.15/fs/jffs2/summary.h |
31664 | --- linux-2.6.32.13/fs/jffs2/summary.h 2010-03-15 11:52:04.000000000 -0400 | 31679 | --- linux-2.6.32.15/fs/jffs2/summary.h 2010-03-15 11:52:04.000000000 -0400 |
31665 | +++ linux-2.6.32.13/fs/jffs2/summary.h 2010-05-15 13:21:17.386577527 -0400 | 31680 | +++ linux-2.6.32.15/fs/jffs2/summary.h 2010-05-28 21:27:16.175116356 -0400 |
31666 | @@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ | 31681 | @@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ |
31667 | 31682 | ||
31668 | #define jffs2_sum_active() (0) | 31683 | #define jffs2_sum_active() (0) |
@@ -31691,9 +31706,9 @@ diff -urNp linux-2.6.32.13/fs/jffs2/summary.h linux-2.6.32.13/fs/jffs2/summary.h | |||
31691 | #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) | 31706 | #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) |
31692 | 31707 | ||
31693 | #endif /* CONFIG_JFFS2_SUMMARY */ | 31708 | #endif /* CONFIG_JFFS2_SUMMARY */ |
31694 | diff -urNp linux-2.6.32.13/fs/jffs2/wbuf.c linux-2.6.32.13/fs/jffs2/wbuf.c | 31709 | diff -urNp linux-2.6.32.15/fs/jffs2/wbuf.c linux-2.6.32.15/fs/jffs2/wbuf.c |
31695 | --- linux-2.6.32.13/fs/jffs2/wbuf.c 2010-03-15 11:52:04.000000000 -0400 | 31710 | --- linux-2.6.32.15/fs/jffs2/wbuf.c 2010-03-15 11:52:04.000000000 -0400 |
31696 | +++ linux-2.6.32.13/fs/jffs2/wbuf.c 2010-05-15 13:21:17.386577527 -0400 | 31711 | +++ linux-2.6.32.15/fs/jffs2/wbuf.c 2010-05-28 21:27:16.175116356 -0400 |
31697 | @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o | 31712 | @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o |
31698 | { | 31713 | { |
31699 | .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), | 31714 | .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), |
@@ -31704,9 +31719,9 @@ diff -urNp linux-2.6.32.13/fs/jffs2/wbuf.c linux-2.6.32.13/fs/jffs2/wbuf.c | |||
31704 | }; | 31719 | }; |
31705 | 31720 | ||
31706 | /* | 31721 | /* |
31707 | diff -urNp linux-2.6.32.13/fs/lockd/svc.c linux-2.6.32.13/fs/lockd/svc.c | 31722 | diff -urNp linux-2.6.32.15/fs/lockd/svc.c linux-2.6.32.15/fs/lockd/svc.c |
31708 | --- linux-2.6.32.13/fs/lockd/svc.c 2010-03-15 11:52:04.000000000 -0400 | 31723 | --- linux-2.6.32.15/fs/lockd/svc.c 2010-03-15 11:52:04.000000000 -0400 |
31709 | +++ linux-2.6.32.13/fs/lockd/svc.c 2010-05-15 13:21:17.394616660 -0400 | 31724 | +++ linux-2.6.32.15/fs/lockd/svc.c 2010-05-28 21:27:16.175116356 -0400 |
31710 | @@ -43,7 +43,7 @@ | 31725 | @@ -43,7 +43,7 @@ |
31711 | 31726 | ||
31712 | static struct svc_program nlmsvc_program; | 31727 | static struct svc_program nlmsvc_program; |
@@ -31716,9 +31731,9 @@ diff -urNp linux-2.6.32.13/fs/lockd/svc.c linux-2.6.32.13/fs/lockd/svc.c | |||
31716 | EXPORT_SYMBOL_GPL(nlmsvc_ops); | 31731 | EXPORT_SYMBOL_GPL(nlmsvc_ops); |
31717 | 31732 | ||
31718 | static DEFINE_MUTEX(nlmsvc_mutex); | 31733 | static DEFINE_MUTEX(nlmsvc_mutex); |
31719 | diff -urNp linux-2.6.32.13/fs/locks.c linux-2.6.32.13/fs/locks.c | 31734 | diff -urNp linux-2.6.32.15/fs/locks.c linux-2.6.32.15/fs/locks.c |
31720 | --- linux-2.6.32.13/fs/locks.c 2010-03-15 11:52:04.000000000 -0400 | 31735 | --- linux-2.6.32.15/fs/locks.c 2010-03-15 11:52:04.000000000 -0400 |
31721 | +++ linux-2.6.32.13/fs/locks.c 2010-05-15 13:21:17.398591192 -0400 | 31736 | +++ linux-2.6.32.15/fs/locks.c 2010-05-28 21:27:16.191151426 -0400 |
31722 | @@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil | 31737 | @@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil |
31723 | return; | 31738 | return; |
31724 | 31739 | ||
@@ -31740,9 +31755,9 @@ diff -urNp linux-2.6.32.13/fs/locks.c linux-2.6.32.13/fs/locks.c | |||
31740 | } | 31755 | } |
31741 | 31756 | ||
31742 | lock_kernel(); | 31757 | lock_kernel(); |
31743 | diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c | 31758 | diff -urNp linux-2.6.32.15/fs/namei.c linux-2.6.32.15/fs/namei.c |
31744 | --- linux-2.6.32.13/fs/namei.c 2010-03-15 11:52:04.000000000 -0400 | 31759 | --- linux-2.6.32.15/fs/namei.c 2010-03-15 11:52:04.000000000 -0400 |
31745 | +++ linux-2.6.32.13/fs/namei.c 2010-05-15 13:21:17.402570795 -0400 | 31760 | +++ linux-2.6.32.15/fs/namei.c 2010-05-28 21:27:16.199231859 -0400 |
31746 | @@ -638,7 +638,7 @@ static __always_inline int __do_follow_l | 31761 | @@ -638,7 +638,7 @@ static __always_inline int __do_follow_l |
31747 | cookie = dentry->d_inode->i_op->follow_link(dentry, nd); | 31762 | cookie = dentry->d_inode->i_op->follow_link(dentry, nd); |
31748 | error = PTR_ERR(cookie); | 31763 | error = PTR_ERR(cookie); |
@@ -32069,9 +32084,9 @@ diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c | |||
32069 | exit6: | 32084 | exit6: |
32070 | mnt_drop_write(oldnd.path.mnt); | 32085 | mnt_drop_write(oldnd.path.mnt); |
32071 | exit5: | 32086 | exit5: |
32072 | diff -urNp linux-2.6.32.13/fs/namespace.c linux-2.6.32.13/fs/namespace.c | 32087 | diff -urNp linux-2.6.32.15/fs/namespace.c linux-2.6.32.15/fs/namespace.c |
32073 | --- linux-2.6.32.13/fs/namespace.c 2010-03-15 11:52:04.000000000 -0400 | 32088 | --- linux-2.6.32.15/fs/namespace.c 2010-03-15 11:52:04.000000000 -0400 |
32074 | +++ linux-2.6.32.13/fs/namespace.c 2010-05-15 13:21:17.430740691 -0400 | 32089 | +++ linux-2.6.32.15/fs/namespace.c 2010-05-28 21:27:16.199231859 -0400 |
32075 | @@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn | 32090 | @@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn |
32076 | if (!(sb->s_flags & MS_RDONLY)) | 32091 | if (!(sb->s_flags & MS_RDONLY)) |
32077 | retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); | 32092 | retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); |
@@ -32132,9 +32147,9 @@ diff -urNp linux-2.6.32.13/fs/namespace.c linux-2.6.32.13/fs/namespace.c | |||
32132 | read_lock(¤t->fs->lock); | 32147 | read_lock(¤t->fs->lock); |
32133 | root = current->fs->root; | 32148 | root = current->fs->root; |
32134 | path_get(¤t->fs->root); | 32149 | path_get(¤t->fs->root); |
32135 | diff -urNp linux-2.6.32.13/fs/nfs/inode.c linux-2.6.32.13/fs/nfs/inode.c | 32150 | diff -urNp linux-2.6.32.15/fs/nfs/inode.c linux-2.6.32.15/fs/nfs/inode.c |
32136 | --- linux-2.6.32.13/fs/nfs/inode.c 2010-04-04 20:41:50.045778117 -0400 | 32151 | --- linux-2.6.32.15/fs/nfs/inode.c 2010-04-04 20:41:50.045778117 -0400 |
32137 | +++ linux-2.6.32.13/fs/nfs/inode.c 2010-05-15 13:21:17.459288785 -0400 | 32152 | +++ linux-2.6.32.15/fs/nfs/inode.c 2010-05-28 21:27:16.199231859 -0400 |
32138 | @@ -965,16 +965,16 @@ static int nfs_size_need_update(const st | 32153 | @@ -965,16 +965,16 @@ static int nfs_size_need_update(const st |
32139 | return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); | 32154 | return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); |
32140 | } | 32155 | } |
@@ -32155,9 +32170,9 @@ diff -urNp linux-2.6.32.13/fs/nfs/inode.c linux-2.6.32.13/fs/nfs/inode.c | |||
32155 | } | 32170 | } |
32156 | 32171 | ||
32157 | void nfs_fattr_init(struct nfs_fattr *fattr) | 32172 | void nfs_fattr_init(struct nfs_fattr *fattr) |
32158 | diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c | 32173 | diff -urNp linux-2.6.32.15/fs/nfs/nfs4proc.c linux-2.6.32.15/fs/nfs/nfs4proc.c |
32159 | --- linux-2.6.32.13/fs/nfs/nfs4proc.c 2010-04-29 17:49:38.445067399 -0400 | 32174 | --- linux-2.6.32.15/fs/nfs/nfs4proc.c 2010-04-29 17:49:38.445067399 -0400 |
32160 | +++ linux-2.6.32.13/fs/nfs/nfs4proc.c 2010-05-15 13:21:17.510781468 -0400 | 32175 | +++ linux-2.6.32.15/fs/nfs/nfs4proc.c 2010-05-28 21:27:16.210892100 -0400 |
32161 | @@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct | 32176 | @@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct |
32162 | static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state) | 32177 | static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state) |
32163 | { | 32178 | { |
@@ -32428,9 +32443,9 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c | |||
32428 | int err; | 32443 | int err; |
32429 | 32444 | ||
32430 | err = nfs4_set_lock_state(state, fl); | 32445 | err = nfs4_set_lock_state(state, fl); |
32431 | diff -urNp linux-2.6.32.13/fs/nfsd/lockd.c linux-2.6.32.13/fs/nfsd/lockd.c | 32446 | diff -urNp linux-2.6.32.15/fs/nfsd/lockd.c linux-2.6.32.15/fs/nfsd/lockd.c |
32432 | --- linux-2.6.32.13/fs/nfsd/lockd.c 2010-03-15 11:52:04.000000000 -0400 | 32447 | --- linux-2.6.32.15/fs/nfsd/lockd.c 2010-03-15 11:52:04.000000000 -0400 |
32433 | +++ linux-2.6.32.13/fs/nfsd/lockd.c 2010-05-15 13:21:17.510781468 -0400 | 32448 | +++ linux-2.6.32.15/fs/nfsd/lockd.c 2010-05-28 21:27:16.210892100 -0400 |
32434 | @@ -67,7 +67,7 @@ nlm_fclose(struct file *filp) | 32449 | @@ -67,7 +67,7 @@ nlm_fclose(struct file *filp) |
32435 | fput(filp); | 32450 | fput(filp); |
32436 | } | 32451 | } |
@@ -32440,9 +32455,9 @@ diff -urNp linux-2.6.32.13/fs/nfsd/lockd.c linux-2.6.32.13/fs/nfsd/lockd.c | |||
32440 | .fopen = nlm_fopen, /* open file for locking */ | 32455 | .fopen = nlm_fopen, /* open file for locking */ |
32441 | .fclose = nlm_fclose, /* close file */ | 32456 | .fclose = nlm_fclose, /* close file */ |
32442 | }; | 32457 | }; |
32443 | diff -urNp linux-2.6.32.13/fs/nfsd/vfs.c linux-2.6.32.13/fs/nfsd/vfs.c | 32458 | diff -urNp linux-2.6.32.15/fs/nfsd/vfs.c linux-2.6.32.15/fs/nfsd/vfs.c |
32444 | --- linux-2.6.32.13/fs/nfsd/vfs.c 2010-03-15 11:52:04.000000000 -0400 | 32459 | --- linux-2.6.32.15/fs/nfsd/vfs.c 2010-03-15 11:52:04.000000000 -0400 |
32445 | +++ linux-2.6.32.13/fs/nfsd/vfs.c 2010-05-15 13:21:17.539124101 -0400 | 32460 | +++ linux-2.6.32.15/fs/nfsd/vfs.c 2010-05-28 21:27:16.218925750 -0400 |
32446 | @@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st | 32461 | @@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st |
32447 | } else { | 32462 | } else { |
32448 | oldfs = get_fs(); | 32463 | oldfs = get_fs(); |
@@ -32470,9 +32485,9 @@ diff -urNp linux-2.6.32.13/fs/nfsd/vfs.c linux-2.6.32.13/fs/nfsd/vfs.c | |||
32470 | set_fs(oldfs); | 32485 | set_fs(oldfs); |
32471 | 32486 | ||
32472 | if (host_err < 0) | 32487 | if (host_err < 0) |
32473 | diff -urNp linux-2.6.32.13/fs/nls/nls_base.c linux-2.6.32.13/fs/nls/nls_base.c | 32488 | diff -urNp linux-2.6.32.15/fs/nls/nls_base.c linux-2.6.32.15/fs/nls/nls_base.c |
32474 | --- linux-2.6.32.13/fs/nls/nls_base.c 2010-03-15 11:52:04.000000000 -0400 | 32489 | --- linux-2.6.32.15/fs/nls/nls_base.c 2010-03-15 11:52:04.000000000 -0400 |
32475 | +++ linux-2.6.32.13/fs/nls/nls_base.c 2010-05-15 13:21:17.550577951 -0400 | 32490 | +++ linux-2.6.32.15/fs/nls/nls_base.c 2010-05-28 21:27:16.218925750 -0400 |
32476 | @@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl | 32491 | @@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl |
32477 | {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */}, | 32492 | {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */}, |
32478 | {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */}, | 32493 | {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */}, |
@@ -32482,9 +32497,9 @@ diff -urNp linux-2.6.32.13/fs/nls/nls_base.c linux-2.6.32.13/fs/nls/nls_base.c | |||
32482 | }; | 32497 | }; |
32483 | 32498 | ||
32484 | #define UNICODE_MAX 0x0010ffff | 32499 | #define UNICODE_MAX 0x0010ffff |
32485 | diff -urNp linux-2.6.32.13/fs/ntfs/file.c linux-2.6.32.13/fs/ntfs/file.c | 32500 | diff -urNp linux-2.6.32.15/fs/ntfs/file.c linux-2.6.32.15/fs/ntfs/file.c |
32486 | --- linux-2.6.32.13/fs/ntfs/file.c 2010-03-15 11:52:04.000000000 -0400 | 32501 | --- linux-2.6.32.15/fs/ntfs/file.c 2010-03-15 11:52:04.000000000 -0400 |
32487 | +++ linux-2.6.32.13/fs/ntfs/file.c 2010-05-15 13:21:17.582652999 -0400 | 32502 | +++ linux-2.6.32.15/fs/ntfs/file.c 2010-05-28 21:27:16.227248042 -0400 |
32488 | @@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_ | 32503 | @@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_ |
32489 | #endif /* NTFS_RW */ | 32504 | #endif /* NTFS_RW */ |
32490 | }; | 32505 | }; |
@@ -32494,9 +32509,9 @@ diff -urNp linux-2.6.32.13/fs/ntfs/file.c linux-2.6.32.13/fs/ntfs/file.c | |||
32494 | 32509 | ||
32495 | -const struct inode_operations ntfs_empty_inode_ops = {}; | 32510 | -const struct inode_operations ntfs_empty_inode_ops = {}; |
32496 | +const struct inode_operations ntfs_empty_inode_ops __read_only; | 32511 | +const struct inode_operations ntfs_empty_inode_ops __read_only; |
32497 | diff -urNp linux-2.6.32.13/fs/ocfs2/cluster/masklog.c linux-2.6.32.13/fs/ocfs2/cluster/masklog.c | 32512 | diff -urNp linux-2.6.32.15/fs/ocfs2/cluster/masklog.c linux-2.6.32.15/fs/ocfs2/cluster/masklog.c |
32498 | --- linux-2.6.32.13/fs/ocfs2/cluster/masklog.c 2010-03-15 11:52:04.000000000 -0400 | 32513 | --- linux-2.6.32.15/fs/ocfs2/cluster/masklog.c 2010-03-15 11:52:04.000000000 -0400 |
32499 | +++ linux-2.6.32.13/fs/ocfs2/cluster/masklog.c 2010-05-15 13:21:17.582652999 -0400 | 32514 | +++ linux-2.6.32.15/fs/ocfs2/cluster/masklog.c 2010-05-28 21:27:16.227248042 -0400 |
32500 | @@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject | 32515 | @@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject |
32501 | return mlog_mask_store(mlog_attr->mask, buf, count); | 32516 | return mlog_mask_store(mlog_attr->mask, buf, count); |
32502 | } | 32517 | } |
@@ -32506,9 +32521,9 @@ diff -urNp linux-2.6.32.13/fs/ocfs2/cluster/masklog.c linux-2.6.32.13/fs/ocfs2/c | |||
32506 | .show = mlog_show, | 32521 | .show = mlog_show, |
32507 | .store = mlog_store, | 32522 | .store = mlog_store, |
32508 | }; | 32523 | }; |
32509 | diff -urNp linux-2.6.32.13/fs/ocfs2/localalloc.c linux-2.6.32.13/fs/ocfs2/localalloc.c | 32524 | diff -urNp linux-2.6.32.15/fs/ocfs2/localalloc.c linux-2.6.32.15/fs/ocfs2/localalloc.c |
32510 | --- linux-2.6.32.13/fs/ocfs2/localalloc.c 2010-03-15 11:52:04.000000000 -0400 | 32525 | --- linux-2.6.32.15/fs/ocfs2/localalloc.c 2010-03-15 11:52:04.000000000 -0400 |
32511 | +++ linux-2.6.32.13/fs/ocfs2/localalloc.c 2010-05-15 13:21:17.587704007 -0400 | 32526 | +++ linux-2.6.32.15/fs/ocfs2/localalloc.c 2010-05-28 21:27:16.227248042 -0400 |
32512 | @@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo | 32527 | @@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo |
32513 | goto bail; | 32528 | goto bail; |
32514 | } | 32529 | } |
@@ -32518,9 +32533,9 @@ diff -urNp linux-2.6.32.13/fs/ocfs2/localalloc.c linux-2.6.32.13/fs/ocfs2/locala | |||
32518 | 32533 | ||
32519 | status = 0; | 32534 | status = 0; |
32520 | bail: | 32535 | bail: |
32521 | diff -urNp linux-2.6.32.13/fs/ocfs2/ocfs2.h linux-2.6.32.13/fs/ocfs2/ocfs2.h | 32536 | diff -urNp linux-2.6.32.15/fs/ocfs2/ocfs2.h linux-2.6.32.15/fs/ocfs2/ocfs2.h |
32522 | --- linux-2.6.32.13/fs/ocfs2/ocfs2.h 2010-03-15 11:52:04.000000000 -0400 | 32537 | --- linux-2.6.32.15/fs/ocfs2/ocfs2.h 2010-03-15 11:52:04.000000000 -0400 |
32523 | +++ linux-2.6.32.13/fs/ocfs2/ocfs2.h 2010-05-15 13:21:17.612604736 -0400 | 32538 | +++ linux-2.6.32.15/fs/ocfs2/ocfs2.h 2010-05-28 21:27:16.227248042 -0400 |
32524 | @@ -217,11 +217,11 @@ enum ocfs2_vol_state | 32539 | @@ -217,11 +217,11 @@ enum ocfs2_vol_state |
32525 | 32540 | ||
32526 | struct ocfs2_alloc_stats | 32541 | struct ocfs2_alloc_stats |
@@ -32538,9 +32553,9 @@ diff -urNp linux-2.6.32.13/fs/ocfs2/ocfs2.h linux-2.6.32.13/fs/ocfs2/ocfs2.h | |||
32538 | }; | 32553 | }; |
32539 | 32554 | ||
32540 | enum ocfs2_local_alloc_state | 32555 | enum ocfs2_local_alloc_state |
32541 | diff -urNp linux-2.6.32.13/fs/ocfs2/suballoc.c linux-2.6.32.13/fs/ocfs2/suballoc.c | 32556 | diff -urNp linux-2.6.32.15/fs/ocfs2/suballoc.c linux-2.6.32.15/fs/ocfs2/suballoc.c |
32542 | --- linux-2.6.32.13/fs/ocfs2/suballoc.c 2010-04-29 17:49:38.449086403 -0400 | 32557 | --- linux-2.6.32.15/fs/ocfs2/suballoc.c 2010-04-29 17:49:38.449086403 -0400 |
32543 | +++ linux-2.6.32.13/fs/ocfs2/suballoc.c 2010-05-15 13:21:17.655985201 -0400 | 32558 | +++ linux-2.6.32.15/fs/ocfs2/suballoc.c 2010-05-28 21:27:16.227248042 -0400 |
32544 | @@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s | 32559 | @@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s |
32545 | mlog_errno(status); | 32560 | mlog_errno(status); |
32546 | goto bail; | 32561 | goto bail; |
@@ -32586,9 +32601,9 @@ diff -urNp linux-2.6.32.13/fs/ocfs2/suballoc.c linux-2.6.32.13/fs/ocfs2/suballoc | |||
32586 | } | 32601 | } |
32587 | } | 32602 | } |
32588 | if (status < 0) { | 32603 | if (status < 0) { |
32589 | diff -urNp linux-2.6.32.13/fs/ocfs2/super.c linux-2.6.32.13/fs/ocfs2/super.c | 32604 | diff -urNp linux-2.6.32.15/fs/ocfs2/super.c linux-2.6.32.15/fs/ocfs2/super.c |
32590 | --- linux-2.6.32.13/fs/ocfs2/super.c 2010-03-15 11:52:04.000000000 -0400 | 32605 | --- linux-2.6.32.15/fs/ocfs2/super.c 2010-03-15 11:52:04.000000000 -0400 |
32591 | +++ linux-2.6.32.13/fs/ocfs2/super.c 2010-05-15 13:21:17.677940986 -0400 | 32606 | +++ linux-2.6.32.15/fs/ocfs2/super.c 2010-05-28 21:27:16.247317121 -0400 |
32592 | @@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s | 32607 | @@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s |
32593 | "%10s => GlobalAllocs: %d LocalAllocs: %d " | 32608 | "%10s => GlobalAllocs: %d LocalAllocs: %d " |
32594 | "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", | 32609 | "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", |
@@ -32623,9 +32638,9 @@ diff -urNp linux-2.6.32.13/fs/ocfs2/super.c linux-2.6.32.13/fs/ocfs2/super.c | |||
32623 | 32638 | ||
32624 | /* Copy the blockcheck stats from the superblock probe */ | 32639 | /* Copy the blockcheck stats from the superblock probe */ |
32625 | osb->osb_ecc_stats = *stats; | 32640 | osb->osb_ecc_stats = *stats; |
32626 | diff -urNp linux-2.6.32.13/fs/open.c linux-2.6.32.13/fs/open.c | 32641 | diff -urNp linux-2.6.32.15/fs/open.c linux-2.6.32.15/fs/open.c |
32627 | --- linux-2.6.32.13/fs/open.c 2010-03-15 11:52:04.000000000 -0400 | 32642 | --- linux-2.6.32.15/fs/open.c 2010-03-15 11:52:04.000000000 -0400 |
32628 | +++ linux-2.6.32.13/fs/open.c 2010-05-15 13:21:17.687346474 -0400 | 32643 | +++ linux-2.6.32.15/fs/open.c 2010-05-28 21:27:16.247317121 -0400 |
32629 | @@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l | 32644 | @@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l |
32630 | if (length < 0) | 32645 | if (length < 0) |
32631 | return -EINVAL; | 32646 | return -EINVAL; |
@@ -32799,9 +32814,9 @@ diff -urNp linux-2.6.32.13/fs/open.c linux-2.6.32.13/fs/open.c | |||
32799 | mnt_drop_write(file->f_path.mnt); | 32814 | mnt_drop_write(file->f_path.mnt); |
32800 | out_fput: | 32815 | out_fput: |
32801 | fput(file); | 32816 | fput(file); |
32802 | diff -urNp linux-2.6.32.13/fs/pipe.c linux-2.6.32.13/fs/pipe.c | 32817 | diff -urNp linux-2.6.32.15/fs/pipe.c linux-2.6.32.15/fs/pipe.c |
32803 | --- linux-2.6.32.13/fs/pipe.c 2010-03-15 11:52:04.000000000 -0400 | 32818 | --- linux-2.6.32.15/fs/pipe.c 2010-03-15 11:52:04.000000000 -0400 |
32804 | +++ linux-2.6.32.13/fs/pipe.c 2010-05-15 13:21:17.687346474 -0400 | 32819 | +++ linux-2.6.32.15/fs/pipe.c 2010-05-28 21:27:16.247317121 -0400 |
32805 | @@ -401,9 +401,9 @@ redo: | 32820 | @@ -401,9 +401,9 @@ redo: |
32806 | } | 32821 | } |
32807 | if (bufs) /* More to do? */ | 32822 | if (bufs) /* More to do? */ |
@@ -32925,12 +32940,12 @@ diff -urNp linux-2.6.32.13/fs/pipe.c linux-2.6.32.13/fs/pipe.c | |||
32925 | inode->i_fop = &rdwr_pipefifo_fops; | 32940 | inode->i_fop = &rdwr_pipefifo_fops; |
32926 | 32941 | ||
32927 | /* | 32942 | /* |
32928 | diff -urNp linux-2.6.32.13/fs/proc/array.c linux-2.6.32.13/fs/proc/array.c | 32943 | diff -urNp linux-2.6.32.15/fs/proc/array.c linux-2.6.32.15/fs/proc/array.c |
32929 | --- linux-2.6.32.13/fs/proc/array.c 2010-03-15 11:52:04.000000000 -0400 | 32944 | --- linux-2.6.32.15/fs/proc/array.c 2010-05-28 20:16:44.454934408 -0400 |
32930 | +++ linux-2.6.32.13/fs/proc/array.c 2010-05-15 13:21:17.690587811 -0400 | 32945 | +++ linux-2.6.32.15/fs/proc/array.c 2010-05-28 22:32:01.011402212 -0400 |
32931 | @@ -410,6 +410,21 @@ static void task_show_stack_usage(struct | 32946 | @@ -321,6 +321,21 @@ static inline void task_context_switch_c |
32947 | p->nivcsw); | ||
32932 | } | 32948 | } |
32933 | #endif /* CONFIG_MMU */ | ||
32934 | 32949 | ||
32935 | +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR) | 32950 | +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR) |
32936 | +static inline void task_pax(struct seq_file *m, struct task_struct *p) | 32951 | +static inline void task_pax(struct seq_file *m, struct task_struct *p) |
@@ -32950,10 +32965,10 @@ diff -urNp linux-2.6.32.13/fs/proc/array.c linux-2.6.32.13/fs/proc/array.c | |||
32950 | int proc_pid_status(struct seq_file *m, struct pid_namespace *ns, | 32965 | int proc_pid_status(struct seq_file *m, struct pid_namespace *ns, |
32951 | struct pid *pid, struct task_struct *task) | 32966 | struct pid *pid, struct task_struct *task) |
32952 | { | 32967 | { |
32953 | @@ -430,9 +445,20 @@ int proc_pid_status(struct seq_file *m, | 32968 | @@ -340,9 +355,20 @@ int proc_pid_status(struct seq_file *m, |
32969 | task_show_regs(m, task); | ||
32954 | #endif | 32970 | #endif |
32955 | task_context_switch_counts(m, task); | 32971 | task_context_switch_counts(m, task); |
32956 | task_show_stack_usage(m, task); | ||
32957 | + | 32972 | + |
32958 | +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR) | 32973 | +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR) |
32959 | + task_pax(m, task); | 32974 | + task_pax(m, task); |
@@ -32971,7 +32986,7 @@ diff -urNp linux-2.6.32.13/fs/proc/array.c linux-2.6.32.13/fs/proc/array.c | |||
32971 | static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, | 32986 | static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, |
32972 | struct pid *pid, struct task_struct *task, int whole) | 32987 | struct pid *pid, struct task_struct *task, int whole) |
32973 | { | 32988 | { |
32974 | @@ -529,6 +555,19 @@ static int do_task_stat(struct seq_file | 32989 | @@ -439,6 +465,19 @@ static int do_task_stat(struct seq_file |
32975 | gtime = task_gtime(task); | 32990 | gtime = task_gtime(task); |
32976 | } | 32991 | } |
32977 | 32992 | ||
@@ -32991,23 +33006,23 @@ diff -urNp linux-2.6.32.13/fs/proc/array.c linux-2.6.32.13/fs/proc/array.c | |||
32991 | /* scale priority and nice values from timeslices to -20..20 */ | 33006 | /* scale priority and nice values from timeslices to -20..20 */ |
32992 | /* to make it look like a "normal" Unix priority/nice value */ | 33007 | /* to make it look like a "normal" Unix priority/nice value */ |
32993 | priority = task_prio(task); | 33008 | priority = task_prio(task); |
32994 | @@ -569,9 +608,15 @@ static int do_task_stat(struct seq_file | 33009 | @@ -479,9 +518,15 @@ static int do_task_stat(struct seq_file |
32995 | vsize, | 33010 | vsize, |
32996 | mm ? get_mm_rss(mm) : 0, | 33011 | mm ? get_mm_rss(mm) : 0, |
32997 | rsslim, | 33012 | rsslim, |
32998 | +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP | 33013 | +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP |
32999 | + PAX_RAND_FLAGS(mm) ? 1 : (mm ? mm->start_code : 0), | 33014 | + PAX_RAND_FLAGS(mm) ? 1 : (mm ? mm->start_code : 0), |
33000 | + PAX_RAND_FLAGS(mm) ? 1 : (mm ? mm->end_code : 0), | 33015 | + PAX_RAND_FLAGS(mm) ? 1 : (mm ? mm->end_code : 0), |
33001 | + PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? task->stack_start : 0), | 33016 | + PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0), |
33002 | +#else | 33017 | +#else |
33003 | mm ? mm->start_code : 0, | 33018 | mm ? mm->start_code : 0, |
33004 | mm ? mm->end_code : 0, | 33019 | mm ? mm->end_code : 0, |
33005 | (permitted && mm) ? task->stack_start : 0, | 33020 | (permitted && mm) ? mm->start_stack : 0, |
33006 | +#endif | 33021 | +#endif |
33007 | esp, | 33022 | esp, |
33008 | eip, | 33023 | eip, |
33009 | /* The signal information here is obsolete. | 33024 | /* The signal information here is obsolete. |
33010 | @@ -624,3 +669,10 @@ int proc_pid_statm(struct seq_file *m, s | 33025 | @@ -534,3 +579,10 @@ int proc_pid_statm(struct seq_file *m, s |
33011 | 33026 | ||
33012 | return 0; | 33027 | return 0; |
33013 | } | 33028 | } |
@@ -33018,9 +33033,9 @@ diff -urNp linux-2.6.32.13/fs/proc/array.c linux-2.6.32.13/fs/proc/array.c | |||
33018 | + return sprintf(buffer, "%pI4\n", &task->signal->curr_ip); | 33033 | + return sprintf(buffer, "%pI4\n", &task->signal->curr_ip); |
33019 | +} | 33034 | +} |
33020 | +#endif | 33035 | +#endif |
33021 | diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c | 33036 | diff -urNp linux-2.6.32.15/fs/proc/base.c linux-2.6.32.15/fs/proc/base.c |
33022 | --- linux-2.6.32.13/fs/proc/base.c 2010-05-15 13:20:19.242597763 -0400 | 33037 | --- linux-2.6.32.15/fs/proc/base.c 2010-05-15 13:20:19.242597763 -0400 |
33023 | +++ linux-2.6.32.13/fs/proc/base.c 2010-05-15 13:21:17.690587811 -0400 | 33038 | +++ linux-2.6.32.15/fs/proc/base.c 2010-05-28 21:27:16.250934990 -0400 |
33024 | @@ -102,6 +102,22 @@ struct pid_entry { | 33039 | @@ -102,6 +102,22 @@ struct pid_entry { |
33025 | union proc_op op; | 33040 | union proc_op op; |
33026 | }; | 33041 | }; |
@@ -33386,9 +33401,9 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c | |||
33386 | ONE("stack", S_IRUSR, proc_pid_stack), | 33401 | ONE("stack", S_IRUSR, proc_pid_stack), |
33387 | #endif | 33402 | #endif |
33388 | #ifdef CONFIG_SCHEDSTATS | 33403 | #ifdef CONFIG_SCHEDSTATS |
33389 | diff -urNp linux-2.6.32.13/fs/proc/cmdline.c linux-2.6.32.13/fs/proc/cmdline.c | 33404 | diff -urNp linux-2.6.32.15/fs/proc/cmdline.c linux-2.6.32.15/fs/proc/cmdline.c |
33390 | --- linux-2.6.32.13/fs/proc/cmdline.c 2010-03-15 11:52:04.000000000 -0400 | 33405 | --- linux-2.6.32.15/fs/proc/cmdline.c 2010-03-15 11:52:04.000000000 -0400 |
33391 | +++ linux-2.6.32.13/fs/proc/cmdline.c 2010-05-15 13:21:17.694581759 -0400 | 33406 | +++ linux-2.6.32.15/fs/proc/cmdline.c 2010-05-28 21:27:16.250934990 -0400 |
33392 | @@ -23,7 +23,11 @@ static const struct file_operations cmdl | 33407 | @@ -23,7 +23,11 @@ static const struct file_operations cmdl |
33393 | 33408 | ||
33394 | static int __init proc_cmdline_init(void) | 33409 | static int __init proc_cmdline_init(void) |
@@ -33401,9 +33416,9 @@ diff -urNp linux-2.6.32.13/fs/proc/cmdline.c linux-2.6.32.13/fs/proc/cmdline.c | |||
33401 | return 0; | 33416 | return 0; |
33402 | } | 33417 | } |
33403 | module_init(proc_cmdline_init); | 33418 | module_init(proc_cmdline_init); |
33404 | diff -urNp linux-2.6.32.13/fs/proc/devices.c linux-2.6.32.13/fs/proc/devices.c | 33419 | diff -urNp linux-2.6.32.15/fs/proc/devices.c linux-2.6.32.15/fs/proc/devices.c |
33405 | --- linux-2.6.32.13/fs/proc/devices.c 2010-03-15 11:52:04.000000000 -0400 | 33420 | --- linux-2.6.32.15/fs/proc/devices.c 2010-03-15 11:52:04.000000000 -0400 |
33406 | +++ linux-2.6.32.13/fs/proc/devices.c 2010-05-15 13:21:17.706647417 -0400 | 33421 | +++ linux-2.6.32.15/fs/proc/devices.c 2010-05-28 21:27:16.250934990 -0400 |
33407 | @@ -64,7 +64,11 @@ static const struct file_operations proc | 33422 | @@ -64,7 +64,11 @@ static const struct file_operations proc |
33408 | 33423 | ||
33409 | static int __init proc_devices_init(void) | 33424 | static int __init proc_devices_init(void) |
@@ -33416,9 +33431,9 @@ diff -urNp linux-2.6.32.13/fs/proc/devices.c linux-2.6.32.13/fs/proc/devices.c | |||
33416 | return 0; | 33431 | return 0; |
33417 | } | 33432 | } |
33418 | module_init(proc_devices_init); | 33433 | module_init(proc_devices_init); |
33419 | diff -urNp linux-2.6.32.13/fs/proc/inode.c linux-2.6.32.13/fs/proc/inode.c | 33434 | diff -urNp linux-2.6.32.15/fs/proc/inode.c linux-2.6.32.15/fs/proc/inode.c |
33420 | --- linux-2.6.32.13/fs/proc/inode.c 2010-03-15 11:52:04.000000000 -0400 | 33435 | --- linux-2.6.32.15/fs/proc/inode.c 2010-03-15 11:52:04.000000000 -0400 |
33421 | +++ linux-2.6.32.13/fs/proc/inode.c 2010-05-15 13:21:17.710596393 -0400 | 33436 | +++ linux-2.6.32.15/fs/proc/inode.c 2010-05-28 21:27:16.250934990 -0400 |
33422 | @@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe | 33437 | @@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe |
33423 | if (de->mode) { | 33438 | if (de->mode) { |
33424 | inode->i_mode = de->mode; | 33439 | inode->i_mode = de->mode; |
@@ -33431,9 +33446,9 @@ diff -urNp linux-2.6.32.13/fs/proc/inode.c linux-2.6.32.13/fs/proc/inode.c | |||
33431 | } | 33446 | } |
33432 | if (de->size) | 33447 | if (de->size) |
33433 | inode->i_size = de->size; | 33448 | inode->i_size = de->size; |
33434 | diff -urNp linux-2.6.32.13/fs/proc/internal.h linux-2.6.32.13/fs/proc/internal.h | 33449 | diff -urNp linux-2.6.32.15/fs/proc/internal.h linux-2.6.32.15/fs/proc/internal.h |
33435 | --- linux-2.6.32.13/fs/proc/internal.h 2010-03-15 11:52:04.000000000 -0400 | 33450 | --- linux-2.6.32.15/fs/proc/internal.h 2010-03-15 11:52:04.000000000 -0400 |
33436 | +++ linux-2.6.32.13/fs/proc/internal.h 2010-05-15 13:21:17.714628011 -0400 | 33451 | +++ linux-2.6.32.15/fs/proc/internal.h 2010-05-28 21:27:16.250934990 -0400 |
33437 | @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi | 33452 | @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi |
33438 | struct pid *pid, struct task_struct *task); | 33453 | struct pid *pid, struct task_struct *task); |
33439 | extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, | 33454 | extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, |
@@ -33444,9 +33459,9 @@ diff -urNp linux-2.6.32.13/fs/proc/internal.h linux-2.6.32.13/fs/proc/internal.h | |||
33444 | extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); | 33459 | extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); |
33445 | 33460 | ||
33446 | extern const struct file_operations proc_maps_operations; | 33461 | extern const struct file_operations proc_maps_operations; |
33447 | diff -urNp linux-2.6.32.13/fs/proc/Kconfig linux-2.6.32.13/fs/proc/Kconfig | 33462 | diff -urNp linux-2.6.32.15/fs/proc/Kconfig linux-2.6.32.15/fs/proc/Kconfig |
33448 | --- linux-2.6.32.13/fs/proc/Kconfig 2010-03-15 11:52:04.000000000 -0400 | 33463 | --- linux-2.6.32.15/fs/proc/Kconfig 2010-03-15 11:52:04.000000000 -0400 |
33449 | +++ linux-2.6.32.13/fs/proc/Kconfig 2010-05-15 13:21:17.722605604 -0400 | 33464 | +++ linux-2.6.32.15/fs/proc/Kconfig 2010-05-28 21:27:16.250934990 -0400 |
33450 | @@ -30,12 +30,12 @@ config PROC_FS | 33465 | @@ -30,12 +30,12 @@ config PROC_FS |
33451 | 33466 | ||
33452 | config PROC_KCORE | 33467 | config PROC_KCORE |
@@ -33474,9 +33489,9 @@ diff -urNp linux-2.6.32.13/fs/proc/Kconfig linux-2.6.32.13/fs/proc/Kconfig | |||
33474 | bool "Enable /proc page monitoring" if EMBEDDED | 33489 | bool "Enable /proc page monitoring" if EMBEDDED |
33475 | help | 33490 | help |
33476 | Various /proc files exist to monitor process memory utilization: | 33491 | Various /proc files exist to monitor process memory utilization: |
33477 | diff -urNp linux-2.6.32.13/fs/proc/kcore.c linux-2.6.32.13/fs/proc/kcore.c | 33492 | diff -urNp linux-2.6.32.15/fs/proc/kcore.c linux-2.6.32.15/fs/proc/kcore.c |
33478 | --- linux-2.6.32.13/fs/proc/kcore.c 2010-03-15 11:52:04.000000000 -0400 | 33493 | --- linux-2.6.32.15/fs/proc/kcore.c 2010-03-15 11:52:04.000000000 -0400 |
33479 | +++ linux-2.6.32.13/fs/proc/kcore.c 2010-05-15 13:21:17.730660780 -0400 | 33494 | +++ linux-2.6.32.15/fs/proc/kcore.c 2010-05-28 21:27:16.250934990 -0400 |
33480 | @@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use | 33495 | @@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use |
33481 | 33496 | ||
33482 | static int open_kcore(struct inode *inode, struct file *filp) | 33497 | static int open_kcore(struct inode *inode, struct file *filp) |
@@ -33487,9 +33502,9 @@ diff -urNp linux-2.6.32.13/fs/proc/kcore.c linux-2.6.32.13/fs/proc/kcore.c | |||
33487 | if (!capable(CAP_SYS_RAWIO)) | 33502 | if (!capable(CAP_SYS_RAWIO)) |
33488 | return -EPERM; | 33503 | return -EPERM; |
33489 | if (kcore_need_update) | 33504 | if (kcore_need_update) |
33490 | diff -urNp linux-2.6.32.13/fs/proc/meminfo.c linux-2.6.32.13/fs/proc/meminfo.c | 33505 | diff -urNp linux-2.6.32.15/fs/proc/meminfo.c linux-2.6.32.15/fs/proc/meminfo.c |
33491 | --- linux-2.6.32.13/fs/proc/meminfo.c 2010-03-15 11:52:04.000000000 -0400 | 33506 | --- linux-2.6.32.15/fs/proc/meminfo.c 2010-03-15 11:52:04.000000000 -0400 |
33492 | +++ linux-2.6.32.13/fs/proc/meminfo.c 2010-05-15 13:21:17.734637714 -0400 | 33507 | +++ linux-2.6.32.15/fs/proc/meminfo.c 2010-05-28 21:27:16.250934990 -0400 |
33493 | @@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_ | 33508 | @@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_ |
33494 | vmi.used >> 10, | 33509 | vmi.used >> 10, |
33495 | vmi.largest_chunk >> 10 | 33510 | vmi.largest_chunk >> 10 |
@@ -33499,9 +33514,9 @@ diff -urNp linux-2.6.32.13/fs/proc/meminfo.c linux-2.6.32.13/fs/proc/meminfo.c | |||
33499 | #endif | 33514 | #endif |
33500 | ); | 33515 | ); |
33501 | 33516 | ||
33502 | diff -urNp linux-2.6.32.13/fs/proc/nommu.c linux-2.6.32.13/fs/proc/nommu.c | 33517 | diff -urNp linux-2.6.32.15/fs/proc/nommu.c linux-2.6.32.15/fs/proc/nommu.c |
33503 | --- linux-2.6.32.13/fs/proc/nommu.c 2010-03-15 11:52:04.000000000 -0400 | 33518 | --- linux-2.6.32.15/fs/proc/nommu.c 2010-03-15 11:52:04.000000000 -0400 |
33504 | +++ linux-2.6.32.13/fs/proc/nommu.c 2010-05-15 13:21:17.738599356 -0400 | 33519 | +++ linux-2.6.32.15/fs/proc/nommu.c 2010-05-28 21:27:16.250934990 -0400 |
33505 | @@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ | 33520 | @@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ |
33506 | if (len < 1) | 33521 | if (len < 1) |
33507 | len = 1; | 33522 | len = 1; |
@@ -33511,9 +33526,9 @@ diff -urNp linux-2.6.32.13/fs/proc/nommu.c linux-2.6.32.13/fs/proc/nommu.c | |||
33511 | } | 33526 | } |
33512 | 33527 | ||
33513 | seq_putc(m, '\n'); | 33528 | seq_putc(m, '\n'); |
33514 | diff -urNp linux-2.6.32.13/fs/proc/proc_net.c linux-2.6.32.13/fs/proc/proc_net.c | 33529 | diff -urNp linux-2.6.32.15/fs/proc/proc_net.c linux-2.6.32.15/fs/proc/proc_net.c |
33515 | --- linux-2.6.32.13/fs/proc/proc_net.c 2010-03-15 11:52:04.000000000 -0400 | 33530 | --- linux-2.6.32.15/fs/proc/proc_net.c 2010-03-15 11:52:04.000000000 -0400 |
33516 | +++ linux-2.6.32.13/fs/proc/proc_net.c 2010-05-15 13:21:17.742599005 -0400 | 33531 | +++ linux-2.6.32.15/fs/proc/proc_net.c 2010-05-28 21:27:16.250934990 -0400 |
33517 | @@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str | 33532 | @@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str |
33518 | struct task_struct *task; | 33533 | struct task_struct *task; |
33519 | struct nsproxy *ns; | 33534 | struct nsproxy *ns; |
@@ -33532,9 +33547,9 @@ diff -urNp linux-2.6.32.13/fs/proc/proc_net.c linux-2.6.32.13/fs/proc/proc_net.c | |||
33532 | 33547 | ||
33533 | rcu_read_lock(); | 33548 | rcu_read_lock(); |
33534 | task = pid_task(proc_pid(dir), PIDTYPE_PID); | 33549 | task = pid_task(proc_pid(dir), PIDTYPE_PID); |
33535 | diff -urNp linux-2.6.32.13/fs/proc/proc_sysctl.c linux-2.6.32.13/fs/proc/proc_sysctl.c | 33550 | diff -urNp linux-2.6.32.15/fs/proc/proc_sysctl.c linux-2.6.32.15/fs/proc/proc_sysctl.c |
33536 | --- linux-2.6.32.13/fs/proc/proc_sysctl.c 2010-03-15 11:52:04.000000000 -0400 | 33551 | --- linux-2.6.32.15/fs/proc/proc_sysctl.c 2010-03-15 11:52:04.000000000 -0400 |
33537 | +++ linux-2.6.32.13/fs/proc/proc_sysctl.c 2010-05-15 13:21:17.746588317 -0400 | 33552 | +++ linux-2.6.32.15/fs/proc/proc_sysctl.c 2010-05-28 21:27:16.250934990 -0400 |
33538 | @@ -7,6 +7,8 @@ | 33553 | @@ -7,6 +7,8 @@ |
33539 | #include <linux/security.h> | 33554 | #include <linux/security.h> |
33540 | #include "internal.h" | 33555 | #include "internal.h" |
@@ -33574,9 +33589,9 @@ diff -urNp linux-2.6.32.13/fs/proc/proc_sysctl.c linux-2.6.32.13/fs/proc/proc_sy | |||
33574 | generic_fillattr(inode, stat); | 33589 | generic_fillattr(inode, stat); |
33575 | if (table) | 33590 | if (table) |
33576 | stat->mode = (stat->mode & S_IFMT) | table->mode; | 33591 | stat->mode = (stat->mode & S_IFMT) | table->mode; |
33577 | diff -urNp linux-2.6.32.13/fs/proc/root.c linux-2.6.32.13/fs/proc/root.c | 33592 | diff -urNp linux-2.6.32.15/fs/proc/root.c linux-2.6.32.15/fs/proc/root.c |
33578 | --- linux-2.6.32.13/fs/proc/root.c 2010-03-15 11:52:04.000000000 -0400 | 33593 | --- linux-2.6.32.15/fs/proc/root.c 2010-03-15 11:52:04.000000000 -0400 |
33579 | +++ linux-2.6.32.13/fs/proc/root.c 2010-05-15 13:21:17.750584298 -0400 | 33594 | +++ linux-2.6.32.15/fs/proc/root.c 2010-05-28 21:27:16.250934990 -0400 |
33580 | @@ -134,7 +134,15 @@ void __init proc_root_init(void) | 33595 | @@ -134,7 +134,15 @@ void __init proc_root_init(void) |
33581 | #ifdef CONFIG_PROC_DEVICETREE | 33596 | #ifdef CONFIG_PROC_DEVICETREE |
33582 | proc_device_tree_init(); | 33597 | proc_device_tree_init(); |
@@ -33593,9 +33608,9 @@ diff -urNp linux-2.6.32.13/fs/proc/root.c linux-2.6.32.13/fs/proc/root.c | |||
33593 | proc_sys_init(); | 33608 | proc_sys_init(); |
33594 | } | 33609 | } |
33595 | 33610 | ||
33596 | diff -urNp linux-2.6.32.13/fs/proc/task_mmu.c linux-2.6.32.13/fs/proc/task_mmu.c | 33611 | diff -urNp linux-2.6.32.15/fs/proc/task_mmu.c linux-2.6.32.15/fs/proc/task_mmu.c |
33597 | --- linux-2.6.32.13/fs/proc/task_mmu.c 2010-03-15 11:52:04.000000000 -0400 | 33612 | --- linux-2.6.32.15/fs/proc/task_mmu.c 2010-05-28 20:16:44.454934408 -0400 |
33598 | +++ linux-2.6.32.13/fs/proc/task_mmu.c 2010-05-15 13:21:17.758934117 -0400 | 33613 | +++ linux-2.6.32.15/fs/proc/task_mmu.c 2010-05-28 21:27:16.250934990 -0400 |
33599 | @@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct | 33614 | @@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct |
33600 | "VmStk:\t%8lu kB\n" | 33615 | "VmStk:\t%8lu kB\n" |
33601 | "VmExe:\t%8lu kB\n" | 33616 | "VmExe:\t%8lu kB\n" |
@@ -33682,9 +33697,9 @@ diff -urNp linux-2.6.32.13/fs/proc/task_mmu.c linux-2.6.32.13/fs/proc/task_mmu.c | |||
33682 | + (vma->vm_start <= mm->start_stack && | 33697 | + (vma->vm_start <= mm->start_stack && |
33683 | + vma->vm_end >= mm->start_stack)) { | 33698 | + vma->vm_end >= mm->start_stack)) { |
33684 | name = "[stack]"; | 33699 | name = "[stack]"; |
33685 | } else { | 33700 | } |
33686 | unsigned long stack_start; | 33701 | } else { |
33687 | @@ -403,9 +429,16 @@ static int show_smap(struct seq_file *m, | 33702 | @@ -384,9 +410,16 @@ static int show_smap(struct seq_file *m, |
33688 | }; | 33703 | }; |
33689 | 33704 | ||
33690 | memset(&mss, 0, sizeof mss); | 33705 | memset(&mss, 0, sizeof mss); |
@@ -33704,7 +33719,7 @@ diff -urNp linux-2.6.32.13/fs/proc/task_mmu.c linux-2.6.32.13/fs/proc/task_mmu.c | |||
33704 | 33719 | ||
33705 | show_map_vma(m, vma); | 33720 | show_map_vma(m, vma); |
33706 | 33721 | ||
33707 | @@ -421,7 +454,11 @@ static int show_smap(struct seq_file *m, | 33722 | @@ -402,7 +435,11 @@ static int show_smap(struct seq_file *m, |
33708 | "Swap: %8lu kB\n" | 33723 | "Swap: %8lu kB\n" |
33709 | "KernelPageSize: %8lu kB\n" | 33724 | "KernelPageSize: %8lu kB\n" |
33710 | "MMUPageSize: %8lu kB\n", | 33725 | "MMUPageSize: %8lu kB\n", |
@@ -33716,9 +33731,9 @@ diff -urNp linux-2.6.32.13/fs/proc/task_mmu.c linux-2.6.32.13/fs/proc/task_mmu.c | |||
33716 | mss.resident >> 10, | 33731 | mss.resident >> 10, |
33717 | (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), | 33732 | (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), |
33718 | mss.shared_clean >> 10, | 33733 | mss.shared_clean >> 10, |
33719 | diff -urNp linux-2.6.32.13/fs/proc/task_nommu.c linux-2.6.32.13/fs/proc/task_nommu.c | 33734 | diff -urNp linux-2.6.32.15/fs/proc/task_nommu.c linux-2.6.32.15/fs/proc/task_nommu.c |
33720 | --- linux-2.6.32.13/fs/proc/task_nommu.c 2010-03-15 11:52:04.000000000 -0400 | 33735 | --- linux-2.6.32.15/fs/proc/task_nommu.c 2010-03-15 11:52:04.000000000 -0400 |
33721 | +++ linux-2.6.32.13/fs/proc/task_nommu.c 2010-05-15 13:21:17.758934117 -0400 | 33736 | +++ linux-2.6.32.15/fs/proc/task_nommu.c 2010-05-28 21:27:16.250934990 -0400 |
33722 | @@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct | 33737 | @@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct |
33723 | else | 33738 | else |
33724 | bytes += kobjsize(mm); | 33739 | bytes += kobjsize(mm); |
@@ -33737,9 +33752,9 @@ diff -urNp linux-2.6.32.13/fs/proc/task_nommu.c linux-2.6.32.13/fs/proc/task_nom | |||
33737 | } | 33752 | } |
33738 | 33753 | ||
33739 | seq_putc(m, '\n'); | 33754 | seq_putc(m, '\n'); |
33740 | diff -urNp linux-2.6.32.13/fs/readdir.c linux-2.6.32.13/fs/readdir.c | 33755 | diff -urNp linux-2.6.32.15/fs/readdir.c linux-2.6.32.15/fs/readdir.c |
33741 | --- linux-2.6.32.13/fs/readdir.c 2010-03-15 11:52:04.000000000 -0400 | 33756 | --- linux-2.6.32.15/fs/readdir.c 2010-03-15 11:52:04.000000000 -0400 |
33742 | +++ linux-2.6.32.13/fs/readdir.c 2010-05-15 13:21:17.778956743 -0400 | 33757 | +++ linux-2.6.32.15/fs/readdir.c 2010-05-28 21:27:16.250934990 -0400 |
33743 | @@ -16,6 +16,7 @@ | 33758 | @@ -16,6 +16,7 @@ |
33744 | #include <linux/security.h> | 33759 | #include <linux/security.h> |
33745 | #include <linux/syscalls.h> | 33760 | #include <linux/syscalls.h> |
@@ -33829,9 +33844,9 @@ diff -urNp linux-2.6.32.13/fs/readdir.c linux-2.6.32.13/fs/readdir.c | |||
33829 | buf.count = count; | 33844 | buf.count = count; |
33830 | buf.error = 0; | 33845 | buf.error = 0; |
33831 | 33846 | ||
33832 | diff -urNp linux-2.6.32.13/fs/reiserfs/do_balan.c linux-2.6.32.13/fs/reiserfs/do_balan.c | 33847 | diff -urNp linux-2.6.32.15/fs/reiserfs/do_balan.c linux-2.6.32.15/fs/reiserfs/do_balan.c |
33833 | --- linux-2.6.32.13/fs/reiserfs/do_balan.c 2010-03-15 11:52:04.000000000 -0400 | 33848 | --- linux-2.6.32.15/fs/reiserfs/do_balan.c 2010-03-15 11:52:04.000000000 -0400 |
33834 | +++ linux-2.6.32.13/fs/reiserfs/do_balan.c 2010-05-15 13:21:17.786600991 -0400 | 33849 | +++ linux-2.6.32.15/fs/reiserfs/do_balan.c 2010-05-28 21:27:16.255227340 -0400 |
33835 | @@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, | 33850 | @@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, |
33836 | return; | 33851 | return; |
33837 | } | 33852 | } |
@@ -33841,9 +33856,9 @@ diff -urNp linux-2.6.32.13/fs/reiserfs/do_balan.c linux-2.6.32.13/fs/reiserfs/do | |||
33841 | do_balance_starts(tb); | 33856 | do_balance_starts(tb); |
33842 | 33857 | ||
33843 | /* balance leaf returns 0 except if combining L R and S into | 33858 | /* balance leaf returns 0 except if combining L R and S into |
33844 | diff -urNp linux-2.6.32.13/fs/reiserfs/item_ops.c linux-2.6.32.13/fs/reiserfs/item_ops.c | 33859 | diff -urNp linux-2.6.32.15/fs/reiserfs/item_ops.c linux-2.6.32.15/fs/reiserfs/item_ops.c |
33845 | --- linux-2.6.32.13/fs/reiserfs/item_ops.c 2010-03-15 11:52:04.000000000 -0400 | 33860 | --- linux-2.6.32.15/fs/reiserfs/item_ops.c 2010-03-15 11:52:04.000000000 -0400 |
33846 | +++ linux-2.6.32.13/fs/reiserfs/item_ops.c 2010-05-15 13:21:17.794567981 -0400 | 33861 | +++ linux-2.6.32.15/fs/reiserfs/item_ops.c 2010-05-28 21:27:16.255227340 -0400 |
33847 | @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i | 33862 | @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i |
33848 | vi->vi_index, vi->vi_type, vi->vi_ih); | 33863 | vi->vi_index, vi->vi_type, vi->vi_ih); |
33849 | } | 33864 | } |
@@ -33898,9 +33913,9 @@ diff -urNp linux-2.6.32.13/fs/reiserfs/item_ops.c linux-2.6.32.13/fs/reiserfs/it | |||
33898 | &stat_data_ops, | 33913 | &stat_data_ops, |
33899 | &indirect_ops, | 33914 | &indirect_ops, |
33900 | &direct_ops, | 33915 | &direct_ops, |
33901 | diff -urNp linux-2.6.32.13/fs/reiserfs/procfs.c linux-2.6.32.13/fs/reiserfs/procfs.c | 33916 | diff -urNp linux-2.6.32.15/fs/reiserfs/procfs.c linux-2.6.32.15/fs/reiserfs/procfs.c |
33902 | --- linux-2.6.32.13/fs/reiserfs/procfs.c 2010-03-15 11:52:04.000000000 -0400 | 33917 | --- linux-2.6.32.15/fs/reiserfs/procfs.c 2010-03-15 11:52:04.000000000 -0400 |
33903 | +++ linux-2.6.32.13/fs/reiserfs/procfs.c 2010-05-15 13:21:17.802593961 -0400 | 33918 | +++ linux-2.6.32.15/fs/reiserfs/procfs.c 2010-05-28 21:27:16.255227340 -0400 |
33904 | @@ -123,7 +123,7 @@ static int show_super(struct seq_file *m | 33919 | @@ -123,7 +123,7 @@ static int show_super(struct seq_file *m |
33905 | "SMALL_TAILS " : "NO_TAILS ", | 33920 | "SMALL_TAILS " : "NO_TAILS ", |
33906 | replay_only(sb) ? "REPLAY_ONLY " : "", | 33921 | replay_only(sb) ? "REPLAY_ONLY " : "", |
@@ -33910,9 +33925,9 @@ diff -urNp linux-2.6.32.13/fs/reiserfs/procfs.c linux-2.6.32.13/fs/reiserfs/proc | |||
33910 | SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes), | 33925 | SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes), |
33911 | SF(s_do_balance), SF(s_unneeded_left_neighbor), | 33926 | SF(s_do_balance), SF(s_unneeded_left_neighbor), |
33912 | SF(s_good_search_by_key_reada), SF(s_bmaps), | 33927 | SF(s_good_search_by_key_reada), SF(s_bmaps), |
33913 | diff -urNp linux-2.6.32.13/fs/select.c linux-2.6.32.13/fs/select.c | 33928 | diff -urNp linux-2.6.32.15/fs/select.c linux-2.6.32.15/fs/select.c |
33914 | --- linux-2.6.32.13/fs/select.c 2010-03-15 11:52:04.000000000 -0400 | 33929 | --- linux-2.6.32.15/fs/select.c 2010-03-15 11:52:04.000000000 -0400 |
33915 | +++ linux-2.6.32.13/fs/select.c 2010-05-15 13:21:17.806683634 -0400 | 33930 | +++ linux-2.6.32.15/fs/select.c 2010-05-28 21:27:16.263231213 -0400 |
33916 | @@ -20,6 +20,7 @@ | 33931 | @@ -20,6 +20,7 @@ |
33917 | #include <linux/module.h> | 33932 | #include <linux/module.h> |
33918 | #include <linux/slab.h> | 33933 | #include <linux/slab.h> |
@@ -33929,9 +33944,9 @@ diff -urNp linux-2.6.32.13/fs/select.c linux-2.6.32.13/fs/select.c | |||
33929 | if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) | 33944 | if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) |
33930 | return -EINVAL; | 33945 | return -EINVAL; |
33931 | 33946 | ||
33932 | diff -urNp linux-2.6.32.13/fs/seq_file.c linux-2.6.32.13/fs/seq_file.c | 33947 | diff -urNp linux-2.6.32.15/fs/seq_file.c linux-2.6.32.15/fs/seq_file.c |
33933 | --- linux-2.6.32.13/fs/seq_file.c 2010-03-15 11:52:04.000000000 -0400 | 33948 | --- linux-2.6.32.15/fs/seq_file.c 2010-03-15 11:52:04.000000000 -0400 |
33934 | +++ linux-2.6.32.13/fs/seq_file.c 2010-05-15 13:21:17.810601731 -0400 | 33949 | +++ linux-2.6.32.15/fs/seq_file.c 2010-05-28 21:27:16.267126788 -0400 |
33935 | @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, | 33950 | @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, |
33936 | return 0; | 33951 | return 0; |
33937 | } | 33952 | } |
@@ -33972,9 +33987,9 @@ diff -urNp linux-2.6.32.13/fs/seq_file.c linux-2.6.32.13/fs/seq_file.c | |||
33972 | if (!m->buf) | 33987 | if (!m->buf) |
33973 | goto Enomem; | 33988 | goto Enomem; |
33974 | m->count = 0; | 33989 | m->count = 0; |
33975 | diff -urNp linux-2.6.32.13/fs/smbfs/symlink.c linux-2.6.32.13/fs/smbfs/symlink.c | 33990 | diff -urNp linux-2.6.32.15/fs/smbfs/symlink.c linux-2.6.32.15/fs/smbfs/symlink.c |
33976 | --- linux-2.6.32.13/fs/smbfs/symlink.c 2010-03-15 11:52:04.000000000 -0400 | 33991 | --- linux-2.6.32.15/fs/smbfs/symlink.c 2010-03-15 11:52:04.000000000 -0400 |
33977 | +++ linux-2.6.32.13/fs/smbfs/symlink.c 2010-05-15 13:21:17.810601731 -0400 | 33992 | +++ linux-2.6.32.15/fs/smbfs/symlink.c 2010-05-28 21:27:16.267126788 -0400 |
33978 | @@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent | 33993 | @@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent |
33979 | 33994 | ||
33980 | static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p) | 33995 | static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p) |
@@ -33984,9 +33999,9 @@ diff -urNp linux-2.6.32.13/fs/smbfs/symlink.c linux-2.6.32.13/fs/smbfs/symlink.c | |||
33984 | if (!IS_ERR(s)) | 33999 | if (!IS_ERR(s)) |
33985 | __putname(s); | 34000 | __putname(s); |
33986 | } | 34001 | } |
33987 | diff -urNp linux-2.6.32.13/fs/splice.c linux-2.6.32.13/fs/splice.c | 34002 | diff -urNp linux-2.6.32.15/fs/splice.c linux-2.6.32.15/fs/splice.c |
33988 | --- linux-2.6.32.13/fs/splice.c 2010-03-15 11:52:04.000000000 -0400 | 34003 | --- linux-2.6.32.15/fs/splice.c 2010-03-15 11:52:04.000000000 -0400 |
33989 | +++ linux-2.6.32.13/fs/splice.c 2010-05-15 13:21:17.818603295 -0400 | 34004 | +++ linux-2.6.32.15/fs/splice.c 2010-05-28 21:27:16.267126788 -0400 |
33990 | @@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode | 34005 | @@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode |
33991 | pipe_lock(pipe); | 34006 | pipe_lock(pipe); |
33992 | 34007 | ||
@@ -34125,9 +34140,9 @@ diff -urNp linux-2.6.32.13/fs/splice.c linux-2.6.32.13/fs/splice.c | |||
34125 | ret = -EAGAIN; | 34140 | ret = -EAGAIN; |
34126 | 34141 | ||
34127 | pipe_unlock(ipipe); | 34142 | pipe_unlock(ipipe); |
34128 | diff -urNp linux-2.6.32.13/fs/sysfs/file.c linux-2.6.32.13/fs/sysfs/file.c | 34143 | diff -urNp linux-2.6.32.15/fs/sysfs/file.c linux-2.6.32.15/fs/sysfs/file.c |
34129 | --- linux-2.6.32.13/fs/sysfs/file.c 2010-03-15 11:52:04.000000000 -0400 | 34144 | --- linux-2.6.32.15/fs/sysfs/file.c 2010-03-15 11:52:04.000000000 -0400 |
34130 | +++ linux-2.6.32.13/fs/sysfs/file.c 2010-05-15 13:21:17.818603295 -0400 | 34145 | +++ linux-2.6.32.15/fs/sysfs/file.c 2010-05-28 21:27:16.267126788 -0400 |
34131 | @@ -53,7 +53,7 @@ struct sysfs_buffer { | 34146 | @@ -53,7 +53,7 @@ struct sysfs_buffer { |
34132 | size_t count; | 34147 | size_t count; |
34133 | loff_t pos; | 34148 | loff_t pos; |
@@ -34164,9 +34179,9 @@ diff -urNp linux-2.6.32.13/fs/sysfs/file.c linux-2.6.32.13/fs/sysfs/file.c | |||
34164 | int error = -EACCES; | 34179 | int error = -EACCES; |
34165 | char *p; | 34180 | char *p; |
34166 | 34181 | ||
34167 | diff -urNp linux-2.6.32.13/fs/sysfs/symlink.c linux-2.6.32.13/fs/sysfs/symlink.c | 34182 | diff -urNp linux-2.6.32.15/fs/sysfs/symlink.c linux-2.6.32.15/fs/sysfs/symlink.c |
34168 | --- linux-2.6.32.13/fs/sysfs/symlink.c 2010-03-15 11:52:04.000000000 -0400 | 34183 | --- linux-2.6.32.15/fs/sysfs/symlink.c 2010-03-15 11:52:04.000000000 -0400 |
34169 | +++ linux-2.6.32.13/fs/sysfs/symlink.c 2010-05-15 13:21:17.822590321 -0400 | 34184 | +++ linux-2.6.32.15/fs/sysfs/symlink.c 2010-05-28 21:27:16.267126788 -0400 |
34170 | @@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de | 34185 | @@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de |
34171 | 34186 | ||
34172 | static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) | 34187 | static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) |
@@ -34176,9 +34191,9 @@ diff -urNp linux-2.6.32.13/fs/sysfs/symlink.c linux-2.6.32.13/fs/sysfs/symlink.c | |||
34176 | if (!IS_ERR(page)) | 34191 | if (!IS_ERR(page)) |
34177 | free_page((unsigned long)page); | 34192 | free_page((unsigned long)page); |
34178 | } | 34193 | } |
34179 | diff -urNp linux-2.6.32.13/fs/udf/balloc.c linux-2.6.32.13/fs/udf/balloc.c | 34194 | diff -urNp linux-2.6.32.15/fs/udf/balloc.c linux-2.6.32.15/fs/udf/balloc.c |
34180 | --- linux-2.6.32.13/fs/udf/balloc.c 2010-03-15 11:52:04.000000000 -0400 | 34195 | --- linux-2.6.32.15/fs/udf/balloc.c 2010-03-15 11:52:04.000000000 -0400 |
34181 | +++ linux-2.6.32.13/fs/udf/balloc.c 2010-05-15 13:21:17.834616935 -0400 | 34196 | +++ linux-2.6.32.15/fs/udf/balloc.c 2010-05-28 21:27:16.267126788 -0400 |
34182 | @@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc | 34197 | @@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc |
34183 | 34198 | ||
34184 | mutex_lock(&sbi->s_alloc_mutex); | 34199 | mutex_lock(&sbi->s_alloc_mutex); |
@@ -34201,9 +34216,9 @@ diff -urNp linux-2.6.32.13/fs/udf/balloc.c linux-2.6.32.13/fs/udf/balloc.c | |||
34201 | udf_debug("%d < %d || %d + %d > %d\n", | 34216 | udf_debug("%d < %d || %d + %d > %d\n", |
34202 | bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count, | 34217 | bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count, |
34203 | partmap->s_partition_len); | 34218 | partmap->s_partition_len); |
34204 | diff -urNp linux-2.6.32.13/fs/udf/misc.c linux-2.6.32.13/fs/udf/misc.c | 34219 | diff -urNp linux-2.6.32.15/fs/udf/misc.c linux-2.6.32.15/fs/udf/misc.c |
34205 | --- linux-2.6.32.13/fs/udf/misc.c 2010-03-15 11:52:04.000000000 -0400 | 34220 | --- linux-2.6.32.15/fs/udf/misc.c 2010-03-15 11:52:04.000000000 -0400 |
34206 | +++ linux-2.6.32.13/fs/udf/misc.c 2010-05-15 13:21:17.834616935 -0400 | 34221 | +++ linux-2.6.32.15/fs/udf/misc.c 2010-05-28 21:27:16.271177364 -0400 |
34207 | @@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat | 34222 | @@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat |
34208 | iinfo->i_lenEAttr += size; | 34223 | iinfo->i_lenEAttr += size; |
34209 | return (struct genericFormat *)&ea[offset]; | 34224 | return (struct genericFormat *)&ea[offset]; |
@@ -34215,9 +34230,9 @@ diff -urNp linux-2.6.32.13/fs/udf/misc.c linux-2.6.32.13/fs/udf/misc.c | |||
34215 | 34230 | ||
34216 | return NULL; | 34231 | return NULL; |
34217 | } | 34232 | } |
34218 | diff -urNp linux-2.6.32.13/fs/udf/udfdecl.h linux-2.6.32.13/fs/udf/udfdecl.h | 34233 | diff -urNp linux-2.6.32.15/fs/udf/udfdecl.h linux-2.6.32.15/fs/udf/udfdecl.h |
34219 | --- linux-2.6.32.13/fs/udf/udfdecl.h 2010-03-15 11:52:04.000000000 -0400 | 34234 | --- linux-2.6.32.15/fs/udf/udfdecl.h 2010-03-15 11:52:04.000000000 -0400 |
34220 | +++ linux-2.6.32.13/fs/udf/udfdecl.h 2010-05-15 13:21:17.859848219 -0400 | 34235 | +++ linux-2.6.32.15/fs/udf/udfdecl.h 2010-05-28 21:27:16.271177364 -0400 |
34221 | @@ -26,7 +26,7 @@ do { \ | 34236 | @@ -26,7 +26,7 @@ do { \ |
34222 | printk(f, ##a); \ | 34237 | printk(f, ##a); \ |
34223 | } while (0) | 34238 | } while (0) |
@@ -34227,9 +34242,9 @@ diff -urNp linux-2.6.32.13/fs/udf/udfdecl.h linux-2.6.32.13/fs/udf/udfdecl.h | |||
34227 | #endif | 34242 | #endif |
34228 | 34243 | ||
34229 | #define udf_info(f, a...) \ | 34244 | #define udf_info(f, a...) \ |
34230 | diff -urNp linux-2.6.32.13/fs/utimes.c linux-2.6.32.13/fs/utimes.c | 34245 | diff -urNp linux-2.6.32.15/fs/utimes.c linux-2.6.32.15/fs/utimes.c |
34231 | --- linux-2.6.32.13/fs/utimes.c 2010-03-15 11:52:04.000000000 -0400 | 34246 | --- linux-2.6.32.15/fs/utimes.c 2010-03-15 11:52:04.000000000 -0400 |
34232 | +++ linux-2.6.32.13/fs/utimes.c 2010-05-15 13:21:17.859848219 -0400 | 34247 | +++ linux-2.6.32.15/fs/utimes.c 2010-05-28 21:27:16.271177364 -0400 |
34233 | @@ -1,6 +1,7 @@ | 34248 | @@ -1,6 +1,7 @@ |
34234 | #include <linux/compiler.h> | 34249 | #include <linux/compiler.h> |
34235 | #include <linux/file.h> | 34250 | #include <linux/file.h> |
@@ -34251,9 +34266,9 @@ diff -urNp linux-2.6.32.13/fs/utimes.c linux-2.6.32.13/fs/utimes.c | |||
34251 | mutex_lock(&inode->i_mutex); | 34266 | mutex_lock(&inode->i_mutex); |
34252 | error = notify_change(path->dentry, &newattrs); | 34267 | error = notify_change(path->dentry, &newattrs); |
34253 | mutex_unlock(&inode->i_mutex); | 34268 | mutex_unlock(&inode->i_mutex); |
34254 | diff -urNp linux-2.6.32.13/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.13/fs/xfs/linux-2.6/xfs_ioctl.c | 34269 | diff -urNp linux-2.6.32.15/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.15/fs/xfs/linux-2.6/xfs_ioctl.c |
34255 | --- linux-2.6.32.13/fs/xfs/linux-2.6/xfs_ioctl.c 2010-03-15 11:52:04.000000000 -0400 | 34270 | --- linux-2.6.32.15/fs/xfs/linux-2.6/xfs_ioctl.c 2010-03-15 11:52:04.000000000 -0400 |
34256 | +++ linux-2.6.32.13/fs/xfs/linux-2.6/xfs_ioctl.c 2010-05-15 13:21:17.862604779 -0400 | 34271 | +++ linux-2.6.32.15/fs/xfs/linux-2.6/xfs_ioctl.c 2010-05-28 21:27:16.275231809 -0400 |
34257 | @@ -134,7 +134,7 @@ xfs_find_handle( | 34272 | @@ -134,7 +134,7 @@ xfs_find_handle( |
34258 | } | 34273 | } |
34259 | 34274 | ||
@@ -34263,9 +34278,9 @@ diff -urNp linux-2.6.32.13/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.13/fs/xfs/l | |||
34263 | copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32))) | 34278 | copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32))) |
34264 | goto out_put; | 34279 | goto out_put; |
34265 | 34280 | ||
34266 | diff -urNp linux-2.6.32.13/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.13/fs/xfs/linux-2.6/xfs_iops.c | 34281 | diff -urNp linux-2.6.32.15/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.15/fs/xfs/linux-2.6/xfs_iops.c |
34267 | --- linux-2.6.32.13/fs/xfs/linux-2.6/xfs_iops.c 2010-04-29 17:49:38.453075413 -0400 | 34282 | --- linux-2.6.32.15/fs/xfs/linux-2.6/xfs_iops.c 2010-04-29 17:49:38.453075413 -0400 |
34268 | +++ linux-2.6.32.13/fs/xfs/linux-2.6/xfs_iops.c 2010-05-15 13:21:17.866593235 -0400 | 34283 | +++ linux-2.6.32.15/fs/xfs/linux-2.6/xfs_iops.c 2010-05-28 21:27:16.279036027 -0400 |
34269 | @@ -468,7 +468,7 @@ xfs_vn_put_link( | 34284 | @@ -468,7 +468,7 @@ xfs_vn_put_link( |
34270 | struct nameidata *nd, | 34285 | struct nameidata *nd, |
34271 | void *p) | 34286 | void *p) |
@@ -34275,9 +34290,9 @@ diff -urNp linux-2.6.32.13/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.13/fs/xfs/li | |||
34275 | 34290 | ||
34276 | if (!IS_ERR(s)) | 34291 | if (!IS_ERR(s)) |
34277 | kfree(s); | 34292 | kfree(s); |
34278 | diff -urNp linux-2.6.32.13/fs/xfs/xfs_bmap.c linux-2.6.32.13/fs/xfs/xfs_bmap.c | 34293 | diff -urNp linux-2.6.32.15/fs/xfs/xfs_bmap.c linux-2.6.32.15/fs/xfs/xfs_bmap.c |
34279 | --- linux-2.6.32.13/fs/xfs/xfs_bmap.c 2010-03-15 11:52:04.000000000 -0400 | 34294 | --- linux-2.6.32.15/fs/xfs/xfs_bmap.c 2010-03-15 11:52:04.000000000 -0400 |
34280 | +++ linux-2.6.32.13/fs/xfs/xfs_bmap.c 2010-05-15 13:21:17.902607196 -0400 | 34295 | +++ linux-2.6.32.15/fs/xfs/xfs_bmap.c 2010-05-28 21:27:16.327077893 -0400 |
34281 | @@ -360,7 +360,7 @@ xfs_bmap_validate_ret( | 34296 | @@ -360,7 +360,7 @@ xfs_bmap_validate_ret( |
34282 | int nmap, | 34297 | int nmap, |
34283 | int ret_nmap); | 34298 | int ret_nmap); |
@@ -34287,9 +34302,9 @@ diff -urNp linux-2.6.32.13/fs/xfs/xfs_bmap.c linux-2.6.32.13/fs/xfs/xfs_bmap.c | |||
34287 | #endif /* DEBUG */ | 34302 | #endif /* DEBUG */ |
34288 | 34303 | ||
34289 | #if defined(XFS_RW_TRACE) | 34304 | #if defined(XFS_RW_TRACE) |
34290 | diff -urNp linux-2.6.32.13/grsecurity/gracl_alloc.c linux-2.6.32.13/grsecurity/gracl_alloc.c | 34305 | diff -urNp linux-2.6.32.15/grsecurity/gracl_alloc.c linux-2.6.32.15/grsecurity/gracl_alloc.c |
34291 | --- linux-2.6.32.13/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 | 34306 | --- linux-2.6.32.15/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 |
34292 | +++ linux-2.6.32.13/grsecurity/gracl_alloc.c 2010-05-15 13:21:17.902607196 -0400 | 34307 | +++ linux-2.6.32.15/grsecurity/gracl_alloc.c 2010-05-28 21:27:16.327077893 -0400 |
34293 | @@ -0,0 +1,105 @@ | 34308 | @@ -0,0 +1,105 @@ |
34294 | +#include <linux/kernel.h> | 34309 | +#include <linux/kernel.h> |
34295 | +#include <linux/mm.h> | 34310 | +#include <linux/mm.h> |
@@ -34396,9 +34411,9 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_alloc.c linux-2.6.32.13/grsecurity/g | |||
34396 | + else | 34411 | + else |
34397 | + return 1; | 34412 | + return 1; |
34398 | +} | 34413 | +} |
34399 | diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c | 34414 | diff -urNp linux-2.6.32.15/grsecurity/gracl.c linux-2.6.32.15/grsecurity/gracl.c |
34400 | --- linux-2.6.32.13/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 | 34415 | --- linux-2.6.32.15/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 |
34401 | +++ linux-2.6.32.13/grsecurity/gracl.c 2010-05-15 13:21:17.906582737 -0400 | 34416 | +++ linux-2.6.32.15/grsecurity/gracl.c 2010-05-28 21:27:16.327077893 -0400 |
34402 | @@ -0,0 +1,3897 @@ | 34417 | @@ -0,0 +1,3897 @@ |
34403 | +#include <linux/kernel.h> | 34418 | +#include <linux/kernel.h> |
34404 | +#include <linux/module.h> | 34419 | +#include <linux/module.h> |
@@ -38297,9 +38312,9 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c | |||
38297 | +EXPORT_SYMBOL(gr_check_group_change); | 38312 | +EXPORT_SYMBOL(gr_check_group_change); |
38298 | +#endif | 38313 | +#endif |
38299 | + | 38314 | + |
38300 | diff -urNp linux-2.6.32.13/grsecurity/gracl_cap.c linux-2.6.32.13/grsecurity/gracl_cap.c | 38315 | diff -urNp linux-2.6.32.15/grsecurity/gracl_cap.c linux-2.6.32.15/grsecurity/gracl_cap.c |
38301 | --- linux-2.6.32.13/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 | 38316 | --- linux-2.6.32.15/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 |
38302 | +++ linux-2.6.32.13/grsecurity/gracl_cap.c 2010-05-15 13:21:17.906582737 -0400 | 38317 | +++ linux-2.6.32.15/grsecurity/gracl_cap.c 2010-05-28 21:27:16.327077893 -0400 |
38303 | @@ -0,0 +1,131 @@ | 38318 | @@ -0,0 +1,131 @@ |
38304 | +#include <linux/kernel.h> | 38319 | +#include <linux/kernel.h> |
38305 | +#include <linux/module.h> | 38320 | +#include <linux/module.h> |
@@ -38432,9 +38447,9 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_cap.c linux-2.6.32.13/grsecurity/gra | |||
38432 | + return 0; | 38447 | + return 0; |
38433 | +} | 38448 | +} |
38434 | + | 38449 | + |
38435 | diff -urNp linux-2.6.32.13/grsecurity/gracl_fs.c linux-2.6.32.13/grsecurity/gracl_fs.c | 38450 | diff -urNp linux-2.6.32.15/grsecurity/gracl_fs.c linux-2.6.32.15/grsecurity/gracl_fs.c |
38436 | --- linux-2.6.32.13/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 | 38451 | --- linux-2.6.32.15/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 |
38437 | +++ linux-2.6.32.13/grsecurity/gracl_fs.c 2010-05-15 13:21:17.906582737 -0400 | 38452 | +++ linux-2.6.32.15/grsecurity/gracl_fs.c 2010-05-28 21:27:16.327077893 -0400 |
38438 | @@ -0,0 +1,424 @@ | 38453 | @@ -0,0 +1,424 @@ |
38439 | +#include <linux/kernel.h> | 38454 | +#include <linux/kernel.h> |
38440 | +#include <linux/sched.h> | 38455 | +#include <linux/sched.h> |
@@ -38860,9 +38875,9 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_fs.c linux-2.6.32.13/grsecurity/grac | |||
38860 | + | 38875 | + |
38861 | + return 0; | 38876 | + return 0; |
38862 | +} | 38877 | +} |
38863 | diff -urNp linux-2.6.32.13/grsecurity/gracl_ip.c linux-2.6.32.13/grsecurity/gracl_ip.c | 38878 | diff -urNp linux-2.6.32.15/grsecurity/gracl_ip.c linux-2.6.32.15/grsecurity/gracl_ip.c |
38864 | --- linux-2.6.32.13/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 | 38879 | --- linux-2.6.32.15/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 |
38865 | +++ linux-2.6.32.13/grsecurity/gracl_ip.c 2010-05-15 13:21:17.906582737 -0400 | 38880 | +++ linux-2.6.32.15/grsecurity/gracl_ip.c 2010-05-28 21:27:16.327077893 -0400 |
38866 | @@ -0,0 +1,339 @@ | 38881 | @@ -0,0 +1,339 @@ |
38867 | +#include <linux/kernel.h> | 38882 | +#include <linux/kernel.h> |
38868 | +#include <asm/uaccess.h> | 38883 | +#include <asm/uaccess.h> |
@@ -39203,9 +39218,9 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_ip.c linux-2.6.32.13/grsecurity/grac | |||
39203 | + | 39218 | + |
39204 | + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); | 39219 | + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); |
39205 | +} | 39220 | +} |
39206 | diff -urNp linux-2.6.32.13/grsecurity/gracl_learn.c linux-2.6.32.13/grsecurity/gracl_learn.c | 39221 | diff -urNp linux-2.6.32.15/grsecurity/gracl_learn.c linux-2.6.32.15/grsecurity/gracl_learn.c |
39207 | --- linux-2.6.32.13/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 | 39222 | --- linux-2.6.32.15/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 |
39208 | +++ linux-2.6.32.13/grsecurity/gracl_learn.c 2010-05-15 13:21:17.906582737 -0400 | 39223 | +++ linux-2.6.32.15/grsecurity/gracl_learn.c 2010-05-28 21:27:16.327077893 -0400 |
39209 | @@ -0,0 +1,211 @@ | 39224 | @@ -0,0 +1,211 @@ |
39210 | +#include <linux/kernel.h> | 39225 | +#include <linux/kernel.h> |
39211 | +#include <linux/mm.h> | 39226 | +#include <linux/mm.h> |
@@ -39418,9 +39433,9 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_learn.c linux-2.6.32.13/grsecurity/g | |||
39418 | + .release = close_learn, | 39433 | + .release = close_learn, |
39419 | + .poll = poll_learn, | 39434 | + .poll = poll_learn, |
39420 | +}; | 39435 | +}; |
39421 | diff -urNp linux-2.6.32.13/grsecurity/gracl_res.c linux-2.6.32.13/grsecurity/gracl_res.c | 39436 | diff -urNp linux-2.6.32.15/grsecurity/gracl_res.c linux-2.6.32.15/grsecurity/gracl_res.c |
39422 | --- linux-2.6.32.13/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 | 39437 | --- linux-2.6.32.15/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 |
39423 | +++ linux-2.6.32.13/grsecurity/gracl_res.c 2010-05-15 13:21:17.906582737 -0400 | 39438 | +++ linux-2.6.32.15/grsecurity/gracl_res.c 2010-05-28 21:27:16.331240103 -0400 |
39424 | @@ -0,0 +1,65 @@ | 39439 | @@ -0,0 +1,65 @@ |
39425 | +#include <linux/kernel.h> | 39440 | +#include <linux/kernel.h> |
39426 | +#include <linux/sched.h> | 39441 | +#include <linux/sched.h> |
@@ -39487,9 +39502,9 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_res.c linux-2.6.32.13/grsecurity/gra | |||
39487 | + rcu_read_unlock(); | 39502 | + rcu_read_unlock(); |
39488 | + return; | 39503 | + return; |
39489 | +} | 39504 | +} |
39490 | diff -urNp linux-2.6.32.13/grsecurity/gracl_segv.c linux-2.6.32.13/grsecurity/gracl_segv.c | 39505 | diff -urNp linux-2.6.32.15/grsecurity/gracl_segv.c linux-2.6.32.15/grsecurity/gracl_segv.c |
39491 | --- linux-2.6.32.13/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 | 39506 | --- linux-2.6.32.15/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 |
39492 | +++ linux-2.6.32.13/grsecurity/gracl_segv.c 2010-05-15 13:21:17.906582737 -0400 | 39507 | +++ linux-2.6.32.15/grsecurity/gracl_segv.c 2010-05-28 21:27:16.331240103 -0400 |
39493 | @@ -0,0 +1,310 @@ | 39508 | @@ -0,0 +1,310 @@ |
39494 | +#include <linux/kernel.h> | 39509 | +#include <linux/kernel.h> |
39495 | +#include <linux/mm.h> | 39510 | +#include <linux/mm.h> |
@@ -39801,9 +39816,9 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_segv.c linux-2.6.32.13/grsecurity/gr | |||
39801 | + | 39816 | + |
39802 | + return; | 39817 | + return; |
39803 | +} | 39818 | +} |
39804 | diff -urNp linux-2.6.32.13/grsecurity/gracl_shm.c linux-2.6.32.13/grsecurity/gracl_shm.c | 39819 | diff -urNp linux-2.6.32.15/grsecurity/gracl_shm.c linux-2.6.32.15/grsecurity/gracl_shm.c |
39805 | --- linux-2.6.32.13/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 | 39820 | --- linux-2.6.32.15/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 |
39806 | +++ linux-2.6.32.13/grsecurity/gracl_shm.c 2010-05-15 13:21:17.906582737 -0400 | 39821 | +++ linux-2.6.32.15/grsecurity/gracl_shm.c 2010-05-28 21:27:16.331240103 -0400 |
39807 | @@ -0,0 +1,37 @@ | 39822 | @@ -0,0 +1,37 @@ |
39808 | +#include <linux/kernel.h> | 39823 | +#include <linux/kernel.h> |
39809 | +#include <linux/mm.h> | 39824 | +#include <linux/mm.h> |
@@ -39842,9 +39857,9 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_shm.c linux-2.6.32.13/grsecurity/gra | |||
39842 | + | 39857 | + |
39843 | + return 1; | 39858 | + return 1; |
39844 | +} | 39859 | +} |
39845 | diff -urNp linux-2.6.32.13/grsecurity/grsec_chdir.c linux-2.6.32.13/grsecurity/grsec_chdir.c | 39860 | diff -urNp linux-2.6.32.15/grsecurity/grsec_chdir.c linux-2.6.32.15/grsecurity/grsec_chdir.c |
39846 | --- linux-2.6.32.13/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 | 39861 | --- linux-2.6.32.15/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 |
39847 | +++ linux-2.6.32.13/grsecurity/grsec_chdir.c 2010-05-15 13:21:17.906582737 -0400 | 39862 | +++ linux-2.6.32.15/grsecurity/grsec_chdir.c 2010-05-28 21:27:16.331240103 -0400 |
39848 | @@ -0,0 +1,19 @@ | 39863 | @@ -0,0 +1,19 @@ |
39849 | +#include <linux/kernel.h> | 39864 | +#include <linux/kernel.h> |
39850 | +#include <linux/sched.h> | 39865 | +#include <linux/sched.h> |
@@ -39865,9 +39880,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_chdir.c linux-2.6.32.13/grsecurity/g | |||
39865 | +#endif | 39880 | +#endif |
39866 | + return; | 39881 | + return; |
39867 | +} | 39882 | +} |
39868 | diff -urNp linux-2.6.32.13/grsecurity/grsec_chroot.c linux-2.6.32.13/grsecurity/grsec_chroot.c | 39883 | diff -urNp linux-2.6.32.15/grsecurity/grsec_chroot.c linux-2.6.32.15/grsecurity/grsec_chroot.c |
39869 | --- linux-2.6.32.13/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 | 39884 | --- linux-2.6.32.15/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 |
39870 | +++ linux-2.6.32.13/grsecurity/grsec_chroot.c 2010-05-15 13:21:17.906582737 -0400 | 39885 | +++ linux-2.6.32.15/grsecurity/grsec_chroot.c 2010-05-28 21:27:16.331240103 -0400 |
39871 | @@ -0,0 +1,348 @@ | 39886 | @@ -0,0 +1,348 @@ |
39872 | +#include <linux/kernel.h> | 39887 | +#include <linux/kernel.h> |
39873 | +#include <linux/module.h> | 39888 | +#include <linux/module.h> |
@@ -40217,9 +40232,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_chroot.c linux-2.6.32.13/grsecurity/ | |||
40217 | +#ifdef CONFIG_SECURITY | 40232 | +#ifdef CONFIG_SECURITY |
40218 | +EXPORT_SYMBOL(gr_handle_chroot_caps); | 40233 | +EXPORT_SYMBOL(gr_handle_chroot_caps); |
40219 | +#endif | 40234 | +#endif |
40220 | diff -urNp linux-2.6.32.13/grsecurity/grsec_disabled.c linux-2.6.32.13/grsecurity/grsec_disabled.c | 40235 | diff -urNp linux-2.6.32.15/grsecurity/grsec_disabled.c linux-2.6.32.15/grsecurity/grsec_disabled.c |
40221 | --- linux-2.6.32.13/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 | 40236 | --- linux-2.6.32.15/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 |
40222 | +++ linux-2.6.32.13/grsecurity/grsec_disabled.c 2010-05-15 13:21:17.906582737 -0400 | 40237 | +++ linux-2.6.32.15/grsecurity/grsec_disabled.c 2010-05-28 21:27:16.331240103 -0400 |
40223 | @@ -0,0 +1,426 @@ | 40238 | @@ -0,0 +1,426 @@ |
40224 | +#include <linux/kernel.h> | 40239 | +#include <linux/kernel.h> |
40225 | +#include <linux/module.h> | 40240 | +#include <linux/module.h> |
@@ -40647,9 +40662,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_disabled.c linux-2.6.32.13/grsecurit | |||
40647 | +EXPORT_SYMBOL(gr_check_user_change); | 40662 | +EXPORT_SYMBOL(gr_check_user_change); |
40648 | +EXPORT_SYMBOL(gr_check_group_change); | 40663 | +EXPORT_SYMBOL(gr_check_group_change); |
40649 | +#endif | 40664 | +#endif |
40650 | diff -urNp linux-2.6.32.13/grsecurity/grsec_exec.c linux-2.6.32.13/grsecurity/grsec_exec.c | 40665 | diff -urNp linux-2.6.32.15/grsecurity/grsec_exec.c linux-2.6.32.15/grsecurity/grsec_exec.c |
40651 | --- linux-2.6.32.13/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 | 40666 | --- linux-2.6.32.15/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 |
40652 | +++ linux-2.6.32.13/grsecurity/grsec_exec.c 2010-05-15 13:21:17.906582737 -0400 | 40667 | +++ linux-2.6.32.15/grsecurity/grsec_exec.c 2010-05-28 21:27:16.331240103 -0400 |
40653 | @@ -0,0 +1,89 @@ | 40668 | @@ -0,0 +1,89 @@ |
40654 | +#include <linux/kernel.h> | 40669 | +#include <linux/kernel.h> |
40655 | +#include <linux/sched.h> | 40670 | +#include <linux/sched.h> |
@@ -40740,9 +40755,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_exec.c linux-2.6.32.13/grsecurity/gr | |||
40740 | +#endif | 40755 | +#endif |
40741 | + return; | 40756 | + return; |
40742 | +} | 40757 | +} |
40743 | diff -urNp linux-2.6.32.13/grsecurity/grsec_fifo.c linux-2.6.32.13/grsecurity/grsec_fifo.c | 40758 | diff -urNp linux-2.6.32.15/grsecurity/grsec_fifo.c linux-2.6.32.15/grsecurity/grsec_fifo.c |
40744 | --- linux-2.6.32.13/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 | 40759 | --- linux-2.6.32.15/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 |
40745 | +++ linux-2.6.32.13/grsecurity/grsec_fifo.c 2010-05-15 13:21:17.906582737 -0400 | 40760 | +++ linux-2.6.32.15/grsecurity/grsec_fifo.c 2010-05-28 21:27:16.331240103 -0400 |
40746 | @@ -0,0 +1,24 @@ | 40761 | @@ -0,0 +1,24 @@ |
40747 | +#include <linux/kernel.h> | 40762 | +#include <linux/kernel.h> |
40748 | +#include <linux/sched.h> | 40763 | +#include <linux/sched.h> |
@@ -40768,9 +40783,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_fifo.c linux-2.6.32.13/grsecurity/gr | |||
40768 | +#endif | 40783 | +#endif |
40769 | + return 0; | 40784 | + return 0; |
40770 | +} | 40785 | +} |
40771 | diff -urNp linux-2.6.32.13/grsecurity/grsec_fork.c linux-2.6.32.13/grsecurity/grsec_fork.c | 40786 | diff -urNp linux-2.6.32.15/grsecurity/grsec_fork.c linux-2.6.32.15/grsecurity/grsec_fork.c |
40772 | --- linux-2.6.32.13/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 | 40787 | --- linux-2.6.32.15/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 |
40773 | +++ linux-2.6.32.13/grsecurity/grsec_fork.c 2010-05-15 13:21:17.906582737 -0400 | 40788 | +++ linux-2.6.32.15/grsecurity/grsec_fork.c 2010-05-28 21:27:16.331240103 -0400 |
40774 | @@ -0,0 +1,15 @@ | 40789 | @@ -0,0 +1,15 @@ |
40775 | +#include <linux/kernel.h> | 40790 | +#include <linux/kernel.h> |
40776 | +#include <linux/sched.h> | 40791 | +#include <linux/sched.h> |
@@ -40787,9 +40802,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_fork.c linux-2.6.32.13/grsecurity/gr | |||
40787 | +#endif | 40802 | +#endif |
40788 | + return; | 40803 | + return; |
40789 | +} | 40804 | +} |
40790 | diff -urNp linux-2.6.32.13/grsecurity/grsec_init.c linux-2.6.32.13/grsecurity/grsec_init.c | 40805 | diff -urNp linux-2.6.32.15/grsecurity/grsec_init.c linux-2.6.32.15/grsecurity/grsec_init.c |
40791 | --- linux-2.6.32.13/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 | 40806 | --- linux-2.6.32.15/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 |
40792 | +++ linux-2.6.32.13/grsecurity/grsec_init.c 2010-05-15 13:21:17.906582737 -0400 | 40807 | +++ linux-2.6.32.15/grsecurity/grsec_init.c 2010-05-28 21:27:16.331240103 -0400 |
40793 | @@ -0,0 +1,241 @@ | 40808 | @@ -0,0 +1,241 @@ |
40794 | +#include <linux/kernel.h> | 40809 | +#include <linux/kernel.h> |
40795 | +#include <linux/sched.h> | 40810 | +#include <linux/sched.h> |
@@ -41032,9 +41047,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_init.c linux-2.6.32.13/grsecurity/gr | |||
41032 | + | 41047 | + |
41033 | + return; | 41048 | + return; |
41034 | +} | 41049 | +} |
41035 | diff -urNp linux-2.6.32.13/grsecurity/grsec_link.c linux-2.6.32.13/grsecurity/grsec_link.c | 41050 | diff -urNp linux-2.6.32.15/grsecurity/grsec_link.c linux-2.6.32.15/grsecurity/grsec_link.c |
41036 | --- linux-2.6.32.13/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 | 41051 | --- linux-2.6.32.15/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 |
41037 | +++ linux-2.6.32.13/grsecurity/grsec_link.c 2010-05-15 13:21:17.906582737 -0400 | 41052 | +++ linux-2.6.32.15/grsecurity/grsec_link.c 2010-05-28 21:27:16.331240103 -0400 |
41038 | @@ -0,0 +1,43 @@ | 41053 | @@ -0,0 +1,43 @@ |
41039 | +#include <linux/kernel.h> | 41054 | +#include <linux/kernel.h> |
41040 | +#include <linux/sched.h> | 41055 | +#include <linux/sched.h> |
@@ -41079,9 +41094,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_link.c linux-2.6.32.13/grsecurity/gr | |||
41079 | +#endif | 41094 | +#endif |
41080 | + return 0; | 41095 | + return 0; |
41081 | +} | 41096 | +} |
41082 | diff -urNp linux-2.6.32.13/grsecurity/grsec_log.c linux-2.6.32.13/grsecurity/grsec_log.c | 41097 | diff -urNp linux-2.6.32.15/grsecurity/grsec_log.c linux-2.6.32.15/grsecurity/grsec_log.c |
41083 | --- linux-2.6.32.13/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 | 41098 | --- linux-2.6.32.15/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 |
41084 | +++ linux-2.6.32.13/grsecurity/grsec_log.c 2010-05-15 13:21:17.906582737 -0400 | 41099 | +++ linux-2.6.32.15/grsecurity/grsec_log.c 2010-05-28 21:27:16.331240103 -0400 |
41085 | @@ -0,0 +1,296 @@ | 41100 | @@ -0,0 +1,296 @@ |
41086 | +#include <linux/kernel.h> | 41101 | +#include <linux/kernel.h> |
41087 | +#include <linux/sched.h> | 41102 | +#include <linux/sched.h> |
@@ -41379,9 +41394,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_log.c linux-2.6.32.13/grsecurity/grs | |||
41379 | + gr_log_end(audit); | 41394 | + gr_log_end(audit); |
41380 | + END_LOCKS(audit); | 41395 | + END_LOCKS(audit); |
41381 | +} | 41396 | +} |
41382 | diff -urNp linux-2.6.32.13/grsecurity/grsec_mem.c linux-2.6.32.13/grsecurity/grsec_mem.c | 41397 | diff -urNp linux-2.6.32.15/grsecurity/grsec_mem.c linux-2.6.32.15/grsecurity/grsec_mem.c |
41383 | --- linux-2.6.32.13/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 | 41398 | --- linux-2.6.32.15/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 |
41384 | +++ linux-2.6.32.13/grsecurity/grsec_mem.c 2010-05-15 13:21:17.910594530 -0400 | 41399 | +++ linux-2.6.32.15/grsecurity/grsec_mem.c 2010-05-28 21:27:16.331240103 -0400 |
41385 | @@ -0,0 +1,85 @@ | 41400 | @@ -0,0 +1,85 @@ |
41386 | +#include <linux/kernel.h> | 41401 | +#include <linux/kernel.h> |
41387 | +#include <linux/sched.h> | 41402 | +#include <linux/sched.h> |
@@ -41468,9 +41483,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_mem.c linux-2.6.32.13/grsecurity/grs | |||
41468 | + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); | 41483 | + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); |
41469 | + return; | 41484 | + return; |
41470 | +} | 41485 | +} |
41471 | diff -urNp linux-2.6.32.13/grsecurity/grsec_mount.c linux-2.6.32.13/grsecurity/grsec_mount.c | 41486 | diff -urNp linux-2.6.32.15/grsecurity/grsec_mount.c linux-2.6.32.15/grsecurity/grsec_mount.c |
41472 | --- linux-2.6.32.13/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 | 41487 | --- linux-2.6.32.15/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 |
41473 | +++ linux-2.6.32.13/grsecurity/grsec_mount.c 2010-05-15 13:21:17.910594530 -0400 | 41488 | +++ linux-2.6.32.15/grsecurity/grsec_mount.c 2010-05-28 21:27:16.331240103 -0400 |
41474 | @@ -0,0 +1,62 @@ | 41489 | @@ -0,0 +1,62 @@ |
41475 | +#include <linux/kernel.h> | 41490 | +#include <linux/kernel.h> |
41476 | +#include <linux/sched.h> | 41491 | +#include <linux/sched.h> |
@@ -41534,9 +41549,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_mount.c linux-2.6.32.13/grsecurity/g | |||
41534 | +#endif | 41549 | +#endif |
41535 | + return 0; | 41550 | + return 0; |
41536 | +} | 41551 | +} |
41537 | diff -urNp linux-2.6.32.13/grsecurity/grsec_ptrace.c linux-2.6.32.13/grsecurity/grsec_ptrace.c | 41552 | diff -urNp linux-2.6.32.15/grsecurity/grsec_ptrace.c linux-2.6.32.15/grsecurity/grsec_ptrace.c |
41538 | --- linux-2.6.32.13/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 | 41553 | --- linux-2.6.32.15/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 |
41539 | +++ linux-2.6.32.13/grsecurity/grsec_ptrace.c 2010-05-15 13:21:17.910594530 -0400 | 41554 | +++ linux-2.6.32.15/grsecurity/grsec_ptrace.c 2010-05-28 21:27:16.331240103 -0400 |
41540 | @@ -0,0 +1,14 @@ | 41555 | @@ -0,0 +1,14 @@ |
41541 | +#include <linux/kernel.h> | 41556 | +#include <linux/kernel.h> |
41542 | +#include <linux/sched.h> | 41557 | +#include <linux/sched.h> |
@@ -41552,9 +41567,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_ptrace.c linux-2.6.32.13/grsecurity/ | |||
41552 | +#endif | 41567 | +#endif |
41553 | + return; | 41568 | + return; |
41554 | +} | 41569 | +} |
41555 | diff -urNp linux-2.6.32.13/grsecurity/grsec_sig.c linux-2.6.32.13/grsecurity/grsec_sig.c | 41570 | diff -urNp linux-2.6.32.15/grsecurity/grsec_sig.c linux-2.6.32.15/grsecurity/grsec_sig.c |
41556 | --- linux-2.6.32.13/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 | 41571 | --- linux-2.6.32.15/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 |
41557 | +++ linux-2.6.32.13/grsecurity/grsec_sig.c 2010-05-15 13:21:17.910594530 -0400 | 41572 | +++ linux-2.6.32.15/grsecurity/grsec_sig.c 2010-05-28 21:27:16.331240103 -0400 |
41558 | @@ -0,0 +1,65 @@ | 41573 | @@ -0,0 +1,65 @@ |
41559 | +#include <linux/kernel.h> | 41574 | +#include <linux/kernel.h> |
41560 | +#include <linux/sched.h> | 41575 | +#include <linux/sched.h> |
@@ -41621,9 +41636,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sig.c linux-2.6.32.13/grsecurity/grs | |||
41621 | + return; | 41636 | + return; |
41622 | +} | 41637 | +} |
41623 | + | 41638 | + |
41624 | diff -urNp linux-2.6.32.13/grsecurity/grsec_sock.c linux-2.6.32.13/grsecurity/grsec_sock.c | 41639 | diff -urNp linux-2.6.32.15/grsecurity/grsec_sock.c linux-2.6.32.15/grsecurity/grsec_sock.c |
41625 | --- linux-2.6.32.13/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 | 41640 | --- linux-2.6.32.15/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 |
41626 | +++ linux-2.6.32.13/grsecurity/grsec_sock.c 2010-05-15 13:21:17.910594530 -0400 | 41641 | +++ linux-2.6.32.15/grsecurity/grsec_sock.c 2010-05-28 21:27:16.331240103 -0400 |
41627 | @@ -0,0 +1,271 @@ | 41642 | @@ -0,0 +1,271 @@ |
41628 | +#include <linux/kernel.h> | 41643 | +#include <linux/kernel.h> |
41629 | +#include <linux/module.h> | 41644 | +#include <linux/module.h> |
@@ -41896,9 +41911,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sock.c linux-2.6.32.13/grsecurity/gr | |||
41896 | + return current_cap(); | 41911 | + return current_cap(); |
41897 | +#endif | 41912 | +#endif |
41898 | +} | 41913 | +} |
41899 | diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/grsec_sysctl.c | 41914 | diff -urNp linux-2.6.32.15/grsecurity/grsec_sysctl.c linux-2.6.32.15/grsecurity/grsec_sysctl.c |
41900 | --- linux-2.6.32.13/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 | 41915 | --- linux-2.6.32.15/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 |
41901 | +++ linux-2.6.32.13/grsecurity/grsec_sysctl.c 2010-05-15 13:21:17.910594530 -0400 | 41916 | +++ linux-2.6.32.15/grsecurity/grsec_sysctl.c 2010-05-28 21:27:16.331240103 -0400 |
41902 | @@ -0,0 +1,447 @@ | 41917 | @@ -0,0 +1,447 @@ |
41903 | +#include <linux/kernel.h> | 41918 | +#include <linux/kernel.h> |
41904 | +#include <linux/sched.h> | 41919 | +#include <linux/sched.h> |
@@ -42347,9 +42362,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/ | |||
42347 | + { .ctl_name = 0 } | 42362 | + { .ctl_name = 0 } |
42348 | +}; | 42363 | +}; |
42349 | +#endif | 42364 | +#endif |
42350 | diff -urNp linux-2.6.32.13/grsecurity/grsec_textrel.c linux-2.6.32.13/grsecurity/grsec_textrel.c | 42365 | diff -urNp linux-2.6.32.15/grsecurity/grsec_textrel.c linux-2.6.32.15/grsecurity/grsec_textrel.c |
42351 | --- linux-2.6.32.13/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 | 42366 | --- linux-2.6.32.15/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 |
42352 | +++ linux-2.6.32.13/grsecurity/grsec_textrel.c 2010-05-15 13:21:17.910594530 -0400 | 42367 | +++ linux-2.6.32.15/grsecurity/grsec_textrel.c 2010-05-28 21:27:16.331240103 -0400 |
42353 | @@ -0,0 +1,16 @@ | 42368 | @@ -0,0 +1,16 @@ |
42354 | +#include <linux/kernel.h> | 42369 | +#include <linux/kernel.h> |
42355 | +#include <linux/sched.h> | 42370 | +#include <linux/sched.h> |
@@ -42367,9 +42382,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_textrel.c linux-2.6.32.13/grsecurity | |||
42367 | +#endif | 42382 | +#endif |
42368 | + return; | 42383 | + return; |
42369 | +} | 42384 | +} |
42370 | diff -urNp linux-2.6.32.13/grsecurity/grsec_time.c linux-2.6.32.13/grsecurity/grsec_time.c | 42385 | diff -urNp linux-2.6.32.15/grsecurity/grsec_time.c linux-2.6.32.15/grsecurity/grsec_time.c |
42371 | --- linux-2.6.32.13/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 | 42386 | --- linux-2.6.32.15/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 |
42372 | +++ linux-2.6.32.13/grsecurity/grsec_time.c 2010-05-15 13:21:17.910594530 -0400 | 42387 | +++ linux-2.6.32.15/grsecurity/grsec_time.c 2010-05-28 21:27:16.331240103 -0400 |
42373 | @@ -0,0 +1,13 @@ | 42388 | @@ -0,0 +1,13 @@ |
42374 | +#include <linux/kernel.h> | 42389 | +#include <linux/kernel.h> |
42375 | +#include <linux/sched.h> | 42390 | +#include <linux/sched.h> |
@@ -42384,9 +42399,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_time.c linux-2.6.32.13/grsecurity/gr | |||
42384 | +#endif | 42399 | +#endif |
42385 | + return; | 42400 | + return; |
42386 | +} | 42401 | +} |
42387 | diff -urNp linux-2.6.32.13/grsecurity/grsec_tpe.c linux-2.6.32.13/grsecurity/grsec_tpe.c | 42402 | diff -urNp linux-2.6.32.15/grsecurity/grsec_tpe.c linux-2.6.32.15/grsecurity/grsec_tpe.c |
42388 | --- linux-2.6.32.13/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 | 42403 | --- linux-2.6.32.15/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 |
42389 | +++ linux-2.6.32.13/grsecurity/grsec_tpe.c 2010-05-15 13:21:17.910594530 -0400 | 42404 | +++ linux-2.6.32.15/grsecurity/grsec_tpe.c 2010-05-28 21:27:16.331240103 -0400 |
42390 | @@ -0,0 +1,38 @@ | 42405 | @@ -0,0 +1,38 @@ |
42391 | +#include <linux/kernel.h> | 42406 | +#include <linux/kernel.h> |
42392 | +#include <linux/sched.h> | 42407 | +#include <linux/sched.h> |
@@ -42426,9 +42441,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_tpe.c linux-2.6.32.13/grsecurity/grs | |||
42426 | +#endif | 42441 | +#endif |
42427 | + return 1; | 42442 | + return 1; |
42428 | +} | 42443 | +} |
42429 | diff -urNp linux-2.6.32.13/grsecurity/grsum.c linux-2.6.32.13/grsecurity/grsum.c | 42444 | diff -urNp linux-2.6.32.15/grsecurity/grsum.c linux-2.6.32.15/grsecurity/grsum.c |
42430 | --- linux-2.6.32.13/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 | 42445 | --- linux-2.6.32.15/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 |
42431 | +++ linux-2.6.32.13/grsecurity/grsum.c 2010-05-15 13:21:17.910594530 -0400 | 42446 | +++ linux-2.6.32.15/grsecurity/grsum.c 2010-05-28 21:27:16.331240103 -0400 |
42432 | @@ -0,0 +1,59 @@ | 42447 | @@ -0,0 +1,59 @@ |
42433 | +#include <linux/err.h> | 42448 | +#include <linux/err.h> |
42434 | +#include <linux/kernel.h> | 42449 | +#include <linux/kernel.h> |
@@ -42489,9 +42504,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsum.c linux-2.6.32.13/grsecurity/grsum.c | |||
42489 | + | 42504 | + |
42490 | + return retval; | 42505 | + return retval; |
42491 | +} | 42506 | +} |
42492 | diff -urNp linux-2.6.32.13/grsecurity/Kconfig linux-2.6.32.13/grsecurity/Kconfig | 42507 | diff -urNp linux-2.6.32.15/grsecurity/Kconfig linux-2.6.32.15/grsecurity/Kconfig |
42493 | --- linux-2.6.32.13/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 | 42508 | --- linux-2.6.32.15/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 |
42494 | +++ linux-2.6.32.13/grsecurity/Kconfig 2010-05-15 13:21:17.910594530 -0400 | 42509 | +++ linux-2.6.32.15/grsecurity/Kconfig 2010-05-28 21:27:16.331240103 -0400 |
42495 | @@ -0,0 +1,965 @@ | 42510 | @@ -0,0 +1,965 @@ |
42496 | +# | 42511 | +# |
42497 | +# grecurity configuration | 42512 | +# grecurity configuration |
@@ -43458,9 +43473,9 @@ diff -urNp linux-2.6.32.13/grsecurity/Kconfig linux-2.6.32.13/grsecurity/Kconfig | |||
43458 | +endmenu | 43473 | +endmenu |
43459 | + | 43474 | + |
43460 | +endmenu | 43475 | +endmenu |
43461 | diff -urNp linux-2.6.32.13/grsecurity/Makefile linux-2.6.32.13/grsecurity/Makefile | 43476 | diff -urNp linux-2.6.32.15/grsecurity/Makefile linux-2.6.32.15/grsecurity/Makefile |
43462 | --- linux-2.6.32.13/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 | 43477 | --- linux-2.6.32.15/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 |
43463 | +++ linux-2.6.32.13/grsecurity/Makefile 2010-05-15 13:21:17.910594530 -0400 | 43478 | +++ linux-2.6.32.15/grsecurity/Makefile 2010-05-28 21:27:16.331240103 -0400 |
43464 | @@ -0,0 +1,29 @@ | 43479 | @@ -0,0 +1,29 @@ |
43465 | +# grsecurity's ACL system was originally written in 2001 by Michael Dalton | 43480 | +# grsecurity's ACL system was originally written in 2001 by Michael Dalton |
43466 | +# during 2001-2009 it has been completely redesigned by Brad Spengler | 43481 | +# during 2001-2009 it has been completely redesigned by Brad Spengler |
@@ -43491,9 +43506,9 @@ diff -urNp linux-2.6.32.13/grsecurity/Makefile linux-2.6.32.13/grsecurity/Makefi | |||
43491 | + @-chmod -f 700 . | 43506 | + @-chmod -f 700 . |
43492 | + @echo ' grsec: protected kernel image paths' | 43507 | + @echo ' grsec: protected kernel image paths' |
43493 | +endif | 43508 | +endif |
43494 | diff -urNp linux-2.6.32.13/include/acpi/acoutput.h linux-2.6.32.13/include/acpi/acoutput.h | 43509 | diff -urNp linux-2.6.32.15/include/acpi/acoutput.h linux-2.6.32.15/include/acpi/acoutput.h |
43495 | --- linux-2.6.32.13/include/acpi/acoutput.h 2010-03-15 11:52:04.000000000 -0400 | 43510 | --- linux-2.6.32.15/include/acpi/acoutput.h 2010-03-15 11:52:04.000000000 -0400 |
43496 | +++ linux-2.6.32.13/include/acpi/acoutput.h 2010-05-15 13:21:17.910594530 -0400 | 43511 | +++ linux-2.6.32.15/include/acpi/acoutput.h 2010-05-28 21:27:16.336579957 -0400 |
43497 | @@ -264,8 +264,8 @@ | 43512 | @@ -264,8 +264,8 @@ |
43498 | * leaving no executable debug code! | 43513 | * leaving no executable debug code! |
43499 | */ | 43514 | */ |
@@ -43505,9 +43520,9 @@ diff -urNp linux-2.6.32.13/include/acpi/acoutput.h linux-2.6.32.13/include/acpi/ | |||
43505 | 43520 | ||
43506 | #endif /* ACPI_DEBUG_OUTPUT */ | 43521 | #endif /* ACPI_DEBUG_OUTPUT */ |
43507 | 43522 | ||
43508 | diff -urNp linux-2.6.32.13/include/acpi/acpi_drivers.h linux-2.6.32.13/include/acpi/acpi_drivers.h | 43523 | diff -urNp linux-2.6.32.15/include/acpi/acpi_drivers.h linux-2.6.32.15/include/acpi/acpi_drivers.h |
43509 | --- linux-2.6.32.13/include/acpi/acpi_drivers.h 2010-03-15 11:52:04.000000000 -0400 | 43524 | --- linux-2.6.32.15/include/acpi/acpi_drivers.h 2010-03-15 11:52:04.000000000 -0400 |
43510 | +++ linux-2.6.32.13/include/acpi/acpi_drivers.h 2010-05-15 13:21:17.910594530 -0400 | 43525 | +++ linux-2.6.32.15/include/acpi/acpi_drivers.h 2010-05-28 21:27:16.336579957 -0400 |
43511 | @@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp | 43526 | @@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp |
43512 | Dock Station | 43527 | Dock Station |
43513 | -------------------------------------------------------------------------- */ | 43528 | -------------------------------------------------------------------------- */ |
@@ -43537,9 +43552,9 @@ diff -urNp linux-2.6.32.13/include/acpi/acpi_drivers.h linux-2.6.32.13/include/a | |||
43537 | void *context) | 43552 | void *context) |
43538 | { | 43553 | { |
43539 | return -ENODEV; | 43554 | return -ENODEV; |
43540 | diff -urNp linux-2.6.32.13/include/asm-generic/atomic-long.h linux-2.6.32.13/include/asm-generic/atomic-long.h | 43555 | diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/include/asm-generic/atomic-long.h |
43541 | --- linux-2.6.32.13/include/asm-generic/atomic-long.h 2010-03-15 11:52:04.000000000 -0400 | 43556 | --- linux-2.6.32.15/include/asm-generic/atomic-long.h 2010-03-15 11:52:04.000000000 -0400 |
43542 | +++ linux-2.6.32.13/include/asm-generic/atomic-long.h 2010-05-15 13:21:17.910594530 -0400 | 43557 | +++ linux-2.6.32.15/include/asm-generic/atomic-long.h 2010-05-28 21:27:16.339120729 -0400 |
43543 | @@ -22,6 +22,12 @@ | 43558 | @@ -22,6 +22,12 @@ |
43544 | 43559 | ||
43545 | typedef atomic64_t atomic_long_t; | 43560 | typedef atomic64_t atomic_long_t; |
@@ -43760,9 +43775,9 @@ diff -urNp linux-2.6.32.13/include/asm-generic/atomic-long.h linux-2.6.32.13/inc | |||
43760 | +#endif | 43775 | +#endif |
43761 | + | 43776 | + |
43762 | #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ | 43777 | #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ |
43763 | diff -urNp linux-2.6.32.13/include/asm-generic/dma-mapping-common.h linux-2.6.32.13/include/asm-generic/dma-mapping-common.h | 43778 | diff -urNp linux-2.6.32.15/include/asm-generic/dma-mapping-common.h linux-2.6.32.15/include/asm-generic/dma-mapping-common.h |
43764 | --- linux-2.6.32.13/include/asm-generic/dma-mapping-common.h 2010-03-15 11:52:04.000000000 -0400 | 43779 | --- linux-2.6.32.15/include/asm-generic/dma-mapping-common.h 2010-05-28 20:16:44.458924952 -0400 |
43765 | +++ linux-2.6.32.13/include/asm-generic/dma-mapping-common.h 2010-05-15 13:21:17.910594530 -0400 | 43780 | +++ linux-2.6.32.15/include/asm-generic/dma-mapping-common.h 2010-05-28 21:27:16.339120729 -0400 |
43766 | @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ | 43781 | @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ |
43767 | enum dma_data_direction dir, | 43782 | enum dma_data_direction dir, |
43768 | struct dma_attrs *attrs) | 43783 | struct dma_attrs *attrs) |
@@ -43871,9 +43886,9 @@ diff -urNp linux-2.6.32.13/include/asm-generic/dma-mapping-common.h linux-2.6.32 | |||
43871 | 43886 | ||
43872 | BUG_ON(!valid_dma_direction(dir)); | 43887 | BUG_ON(!valid_dma_direction(dir)); |
43873 | if (ops->sync_sg_for_device) | 43888 | if (ops->sync_sg_for_device) |
43874 | diff -urNp linux-2.6.32.13/include/asm-generic/futex.h linux-2.6.32.13/include/asm-generic/futex.h | 43889 | diff -urNp linux-2.6.32.15/include/asm-generic/futex.h linux-2.6.32.15/include/asm-generic/futex.h |
43875 | --- linux-2.6.32.13/include/asm-generic/futex.h 2010-03-15 11:52:04.000000000 -0400 | 43890 | --- linux-2.6.32.15/include/asm-generic/futex.h 2010-03-15 11:52:04.000000000 -0400 |
43876 | +++ linux-2.6.32.13/include/asm-generic/futex.h 2010-05-15 13:21:17.910594530 -0400 | 43891 | +++ linux-2.6.32.15/include/asm-generic/futex.h 2010-05-28 21:27:16.343246556 -0400 |
43877 | @@ -6,7 +6,7 @@ | 43892 | @@ -6,7 +6,7 @@ |
43878 | #include <asm/errno.h> | 43893 | #include <asm/errno.h> |
43879 | 43894 | ||
@@ -43892,9 +43907,9 @@ diff -urNp linux-2.6.32.13/include/asm-generic/futex.h linux-2.6.32.13/include/a | |||
43892 | { | 43907 | { |
43893 | return -ENOSYS; | 43908 | return -ENOSYS; |
43894 | } | 43909 | } |
43895 | diff -urNp linux-2.6.32.13/include/asm-generic/int-l64.h linux-2.6.32.13/include/asm-generic/int-l64.h | 43910 | diff -urNp linux-2.6.32.15/include/asm-generic/int-l64.h linux-2.6.32.15/include/asm-generic/int-l64.h |
43896 | --- linux-2.6.32.13/include/asm-generic/int-l64.h 2010-03-15 11:52:04.000000000 -0400 | 43911 | --- linux-2.6.32.15/include/asm-generic/int-l64.h 2010-03-15 11:52:04.000000000 -0400 |
43897 | +++ linux-2.6.32.13/include/asm-generic/int-l64.h 2010-05-15 13:21:17.910594530 -0400 | 43912 | +++ linux-2.6.32.15/include/asm-generic/int-l64.h 2010-05-28 21:27:16.343246556 -0400 |
43898 | @@ -46,6 +46,8 @@ typedef unsigned int u32; | 43913 | @@ -46,6 +46,8 @@ typedef unsigned int u32; |
43899 | typedef signed long s64; | 43914 | typedef signed long s64; |
43900 | typedef unsigned long u64; | 43915 | typedef unsigned long u64; |
@@ -43904,9 +43919,9 @@ diff -urNp linux-2.6.32.13/include/asm-generic/int-l64.h linux-2.6.32.13/include | |||
43904 | #define S8_C(x) x | 43919 | #define S8_C(x) x |
43905 | #define U8_C(x) x ## U | 43920 | #define U8_C(x) x ## U |
43906 | #define S16_C(x) x | 43921 | #define S16_C(x) x |
43907 | diff -urNp linux-2.6.32.13/include/asm-generic/int-ll64.h linux-2.6.32.13/include/asm-generic/int-ll64.h | 43922 | diff -urNp linux-2.6.32.15/include/asm-generic/int-ll64.h linux-2.6.32.15/include/asm-generic/int-ll64.h |
43908 | --- linux-2.6.32.13/include/asm-generic/int-ll64.h 2010-03-15 11:52:04.000000000 -0400 | 43923 | --- linux-2.6.32.15/include/asm-generic/int-ll64.h 2010-03-15 11:52:04.000000000 -0400 |
43909 | +++ linux-2.6.32.13/include/asm-generic/int-ll64.h 2010-05-15 13:21:17.910594530 -0400 | 43924 | +++ linux-2.6.32.15/include/asm-generic/int-ll64.h 2010-05-28 21:27:16.343246556 -0400 |
43910 | @@ -51,6 +51,8 @@ typedef unsigned int u32; | 43925 | @@ -51,6 +51,8 @@ typedef unsigned int u32; |
43911 | typedef signed long long s64; | 43926 | typedef signed long long s64; |
43912 | typedef unsigned long long u64; | 43927 | typedef unsigned long long u64; |
@@ -43916,9 +43931,9 @@ diff -urNp linux-2.6.32.13/include/asm-generic/int-ll64.h linux-2.6.32.13/includ | |||
43916 | #define S8_C(x) x | 43931 | #define S8_C(x) x |
43917 | #define U8_C(x) x ## U | 43932 | #define U8_C(x) x ## U |
43918 | #define S16_C(x) x | 43933 | #define S16_C(x) x |
43919 | diff -urNp linux-2.6.32.13/include/asm-generic/kmap_types.h linux-2.6.32.13/include/asm-generic/kmap_types.h | 43934 | diff -urNp linux-2.6.32.15/include/asm-generic/kmap_types.h linux-2.6.32.15/include/asm-generic/kmap_types.h |
43920 | --- linux-2.6.32.13/include/asm-generic/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 | 43935 | --- linux-2.6.32.15/include/asm-generic/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 |
43921 | +++ linux-2.6.32.13/include/asm-generic/kmap_types.h 2010-05-15 13:21:17.910594530 -0400 | 43936 | +++ linux-2.6.32.15/include/asm-generic/kmap_types.h 2010-05-28 21:27:16.343246556 -0400 |
43922 | @@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY, | 43937 | @@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY, |
43923 | KMAP_D(16) KM_IRQ_PTE, | 43938 | KMAP_D(16) KM_IRQ_PTE, |
43924 | KMAP_D(17) KM_NMI, | 43939 | KMAP_D(17) KM_NMI, |
@@ -43929,9 +43944,9 @@ diff -urNp linux-2.6.32.13/include/asm-generic/kmap_types.h linux-2.6.32.13/incl | |||
43929 | }; | 43944 | }; |
43930 | 43945 | ||
43931 | #undef KMAP_D | 43946 | #undef KMAP_D |
43932 | diff -urNp linux-2.6.32.13/include/asm-generic/pgtable.h linux-2.6.32.13/include/asm-generic/pgtable.h | 43947 | diff -urNp linux-2.6.32.15/include/asm-generic/pgtable.h linux-2.6.32.15/include/asm-generic/pgtable.h |
43933 | --- linux-2.6.32.13/include/asm-generic/pgtable.h 2010-03-15 11:52:04.000000000 -0400 | 43948 | --- linux-2.6.32.15/include/asm-generic/pgtable.h 2010-03-15 11:52:04.000000000 -0400 |
43934 | +++ linux-2.6.32.13/include/asm-generic/pgtable.h 2010-05-15 13:21:17.910594530 -0400 | 43949 | +++ linux-2.6.32.15/include/asm-generic/pgtable.h 2010-05-28 21:27:16.343246556 -0400 |
43935 | @@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar | 43950 | @@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar |
43936 | unsigned long size); | 43951 | unsigned long size); |
43937 | #endif | 43952 | #endif |
@@ -43947,9 +43962,9 @@ diff -urNp linux-2.6.32.13/include/asm-generic/pgtable.h linux-2.6.32.13/include | |||
43947 | #endif /* !__ASSEMBLY__ */ | 43962 | #endif /* !__ASSEMBLY__ */ |
43948 | 43963 | ||
43949 | #endif /* _ASM_GENERIC_PGTABLE_H */ | 43964 | #endif /* _ASM_GENERIC_PGTABLE_H */ |
43950 | diff -urNp linux-2.6.32.13/include/asm-generic/vmlinux.lds.h linux-2.6.32.13/include/asm-generic/vmlinux.lds.h | 43965 | diff -urNp linux-2.6.32.15/include/asm-generic/vmlinux.lds.h linux-2.6.32.15/include/asm-generic/vmlinux.lds.h |
43951 | --- linux-2.6.32.13/include/asm-generic/vmlinux.lds.h 2010-03-15 11:52:04.000000000 -0400 | 43966 | --- linux-2.6.32.15/include/asm-generic/vmlinux.lds.h 2010-03-15 11:52:04.000000000 -0400 |
43952 | +++ linux-2.6.32.13/include/asm-generic/vmlinux.lds.h 2010-05-15 13:21:17.910594530 -0400 | 43967 | +++ linux-2.6.32.15/include/asm-generic/vmlinux.lds.h 2010-05-28 21:27:16.343246556 -0400 |
43953 | @@ -199,6 +199,7 @@ | 43968 | @@ -199,6 +199,7 @@ |
43954 | .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ | 43969 | .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ |
43955 | VMLINUX_SYMBOL(__start_rodata) = .; \ | 43970 | VMLINUX_SYMBOL(__start_rodata) = .; \ |
@@ -43988,9 +44003,9 @@ diff -urNp linux-2.6.32.13/include/asm-generic/vmlinux.lds.h linux-2.6.32.13/inc | |||
43988 | 44003 | ||
43989 | /** | 44004 | /** |
43990 | * PERCPU - define output section for percpu area, simple version | 44005 | * PERCPU - define output section for percpu area, simple version |
43991 | diff -urNp linux-2.6.32.13/include/drm/drm_pciids.h linux-2.6.32.13/include/drm/drm_pciids.h | 44006 | diff -urNp linux-2.6.32.15/include/drm/drm_pciids.h linux-2.6.32.15/include/drm/drm_pciids.h |
43992 | --- linux-2.6.32.13/include/drm/drm_pciids.h 2010-04-29 17:49:38.529851956 -0400 | 44007 | --- linux-2.6.32.15/include/drm/drm_pciids.h 2010-04-29 17:49:38.529851956 -0400 |
43993 | +++ linux-2.6.32.13/include/drm/drm_pciids.h 2010-05-15 13:21:17.910594530 -0400 | 44008 | +++ linux-2.6.32.15/include/drm/drm_pciids.h 2010-05-28 21:27:16.343246556 -0400 |
43994 | @@ -377,7 +377,7 @@ | 44009 | @@ -377,7 +377,7 @@ |
43995 | {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | 44010 | {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
43996 | {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | 44011 | {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
@@ -44094,9 +44109,9 @@ diff -urNp linux-2.6.32.13/include/drm/drm_pciids.h linux-2.6.32.13/include/drm/ | |||
44094 | {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ | 44109 | {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ |
44095 | - {0, 0, 0} | 44110 | - {0, 0, 0} |
44096 | + {0, 0, 0, 0, 0, 0} | 44111 | + {0, 0, 0, 0, 0, 0} |
44097 | diff -urNp linux-2.6.32.13/include/drm/drmP.h linux-2.6.32.13/include/drm/drmP.h | 44112 | diff -urNp linux-2.6.32.15/include/drm/drmP.h linux-2.6.32.15/include/drm/drmP.h |
44098 | --- linux-2.6.32.13/include/drm/drmP.h 2010-03-15 11:52:04.000000000 -0400 | 44113 | --- linux-2.6.32.15/include/drm/drmP.h 2010-03-15 11:52:04.000000000 -0400 |
44099 | +++ linux-2.6.32.13/include/drm/drmP.h 2010-05-15 13:21:17.910594530 -0400 | 44114 | +++ linux-2.6.32.15/include/drm/drmP.h 2010-05-28 21:27:16.343246556 -0400 |
44100 | @@ -814,7 +814,7 @@ struct drm_driver { | 44115 | @@ -814,7 +814,7 @@ struct drm_driver { |
44101 | void (*vgaarb_irq)(struct drm_device *dev, bool state); | 44116 | void (*vgaarb_irq)(struct drm_device *dev, bool state); |
44102 | 44117 | ||
@@ -44124,9 +44139,9 @@ diff -urNp linux-2.6.32.13/include/drm/drmP.h linux-2.6.32.13/include/drm/drmP.h | |||
44124 | /*@} */ | 44139 | /*@} */ |
44125 | 44140 | ||
44126 | struct list_head filelist; | 44141 | struct list_head filelist; |
44127 | diff -urNp linux-2.6.32.13/include/linux/a.out.h linux-2.6.32.13/include/linux/a.out.h | 44142 | diff -urNp linux-2.6.32.15/include/linux/a.out.h linux-2.6.32.15/include/linux/a.out.h |
44128 | --- linux-2.6.32.13/include/linux/a.out.h 2010-03-15 11:52:04.000000000 -0400 | 44143 | --- linux-2.6.32.15/include/linux/a.out.h 2010-03-15 11:52:04.000000000 -0400 |
44129 | +++ linux-2.6.32.13/include/linux/a.out.h 2010-05-15 13:21:17.914599996 -0400 | 44144 | +++ linux-2.6.32.15/include/linux/a.out.h 2010-05-28 21:27:16.343246556 -0400 |
44130 | @@ -39,6 +39,14 @@ enum machine_type { | 44145 | @@ -39,6 +39,14 @@ enum machine_type { |
44131 | M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ | 44146 | M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ |
44132 | }; | 44147 | }; |
@@ -44142,9 +44157,9 @@ diff -urNp linux-2.6.32.13/include/linux/a.out.h linux-2.6.32.13/include/linux/a | |||
44142 | #if !defined (N_MAGIC) | 44157 | #if !defined (N_MAGIC) |
44143 | #define N_MAGIC(exec) ((exec).a_info & 0xffff) | 44158 | #define N_MAGIC(exec) ((exec).a_info & 0xffff) |
44144 | #endif | 44159 | #endif |
44145 | diff -urNp linux-2.6.32.13/include/linux/atmdev.h linux-2.6.32.13/include/linux/atmdev.h | 44160 | diff -urNp linux-2.6.32.15/include/linux/atmdev.h linux-2.6.32.15/include/linux/atmdev.h |
44146 | --- linux-2.6.32.13/include/linux/atmdev.h 2010-03-15 11:52:04.000000000 -0400 | 44161 | --- linux-2.6.32.15/include/linux/atmdev.h 2010-03-15 11:52:04.000000000 -0400 |
44147 | +++ linux-2.6.32.13/include/linux/atmdev.h 2010-05-15 13:21:17.914599996 -0400 | 44162 | +++ linux-2.6.32.15/include/linux/atmdev.h 2010-05-28 21:27:16.343246556 -0400 |
44148 | @@ -237,7 +237,7 @@ struct compat_atm_iobuf { | 44163 | @@ -237,7 +237,7 @@ struct compat_atm_iobuf { |
44149 | #endif | 44164 | #endif |
44150 | 44165 | ||
@@ -44154,9 +44169,9 @@ diff -urNp linux-2.6.32.13/include/linux/atmdev.h linux-2.6.32.13/include/linux/ | |||
44154 | __AAL_STAT_ITEMS | 44169 | __AAL_STAT_ITEMS |
44155 | #undef __HANDLE_ITEM | 44170 | #undef __HANDLE_ITEM |
44156 | }; | 44171 | }; |
44157 | diff -urNp linux-2.6.32.13/include/linux/backlight.h linux-2.6.32.13/include/linux/backlight.h | 44172 | diff -urNp linux-2.6.32.15/include/linux/backlight.h linux-2.6.32.15/include/linux/backlight.h |
44158 | --- linux-2.6.32.13/include/linux/backlight.h 2010-03-15 11:52:04.000000000 -0400 | 44173 | --- linux-2.6.32.15/include/linux/backlight.h 2010-03-15 11:52:04.000000000 -0400 |
44159 | +++ linux-2.6.32.13/include/linux/backlight.h 2010-05-15 13:21:17.914599996 -0400 | 44174 | +++ linux-2.6.32.15/include/linux/backlight.h 2010-05-28 21:27:16.343246556 -0400 |
44160 | @@ -36,18 +36,18 @@ struct backlight_device; | 44175 | @@ -36,18 +36,18 @@ struct backlight_device; |
44161 | struct fb_info; | 44176 | struct fb_info; |
44162 | 44177 | ||
@@ -44198,9 +44213,9 @@ diff -urNp linux-2.6.32.13/include/linux/backlight.h linux-2.6.32.13/include/lin | |||
44198 | extern void backlight_device_unregister(struct backlight_device *bd); | 44213 | extern void backlight_device_unregister(struct backlight_device *bd); |
44199 | extern void backlight_force_update(struct backlight_device *bd, | 44214 | extern void backlight_force_update(struct backlight_device *bd, |
44200 | enum backlight_update_reason reason); | 44215 | enum backlight_update_reason reason); |
44201 | diff -urNp linux-2.6.32.13/include/linux/binfmts.h linux-2.6.32.13/include/linux/binfmts.h | 44216 | diff -urNp linux-2.6.32.15/include/linux/binfmts.h linux-2.6.32.15/include/linux/binfmts.h |
44202 | --- linux-2.6.32.13/include/linux/binfmts.h 2010-03-15 11:52:04.000000000 -0400 | 44217 | --- linux-2.6.32.15/include/linux/binfmts.h 2010-03-15 11:52:04.000000000 -0400 |
44203 | +++ linux-2.6.32.13/include/linux/binfmts.h 2010-05-15 13:21:17.934614916 -0400 | 44218 | +++ linux-2.6.32.15/include/linux/binfmts.h 2010-05-28 21:27:16.343246556 -0400 |
44204 | @@ -78,6 +78,7 @@ struct linux_binfmt { | 44219 | @@ -78,6 +78,7 @@ struct linux_binfmt { |
44205 | int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); | 44220 | int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); |
44206 | int (*load_shlib)(struct file *); | 44221 | int (*load_shlib)(struct file *); |
@@ -44209,9 +44224,9 @@ diff -urNp linux-2.6.32.13/include/linux/binfmts.h linux-2.6.32.13/include/linux | |||
44209 | unsigned long min_coredump; /* minimal dump size */ | 44224 | unsigned long min_coredump; /* minimal dump size */ |
44210 | int hasvdso; | 44225 | int hasvdso; |
44211 | }; | 44226 | }; |
44212 | diff -urNp linux-2.6.32.13/include/linux/blkdev.h linux-2.6.32.13/include/linux/blkdev.h | 44227 | diff -urNp linux-2.6.32.15/include/linux/blkdev.h linux-2.6.32.15/include/linux/blkdev.h |
44213 | --- linux-2.6.32.13/include/linux/blkdev.h 2010-03-15 11:52:04.000000000 -0400 | 44228 | --- linux-2.6.32.15/include/linux/blkdev.h 2010-03-15 11:52:04.000000000 -0400 |
44214 | +++ linux-2.6.32.13/include/linux/blkdev.h 2010-05-15 13:21:17.934614916 -0400 | 44229 | +++ linux-2.6.32.15/include/linux/blkdev.h 2010-05-28 21:27:16.347237122 -0400 |
44215 | @@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc | 44230 | @@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc |
44216 | #endif /* CONFIG_BLK_DEV_INTEGRITY */ | 44231 | #endif /* CONFIG_BLK_DEV_INTEGRITY */ |
44217 | 44232 | ||
@@ -44243,9 +44258,9 @@ diff -urNp linux-2.6.32.13/include/linux/blkdev.h linux-2.6.32.13/include/linux/ | |||
44243 | }; | 44258 | }; |
44244 | 44259 | ||
44245 | extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, | 44260 | extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, |
44246 | diff -urNp linux-2.6.32.13/include/linux/cache.h linux-2.6.32.13/include/linux/cache.h | 44261 | diff -urNp linux-2.6.32.15/include/linux/cache.h linux-2.6.32.15/include/linux/cache.h |
44247 | --- linux-2.6.32.13/include/linux/cache.h 2010-03-15 11:52:04.000000000 -0400 | 44262 | --- linux-2.6.32.15/include/linux/cache.h 2010-03-15 11:52:04.000000000 -0400 |
44248 | +++ linux-2.6.32.13/include/linux/cache.h 2010-05-15 13:21:17.934614916 -0400 | 44263 | +++ linux-2.6.32.15/include/linux/cache.h 2010-05-28 21:27:16.347237122 -0400 |
44249 | @@ -16,6 +16,10 @@ | 44264 | @@ -16,6 +16,10 @@ |
44250 | #define __read_mostly | 44265 | #define __read_mostly |
44251 | #endif | 44266 | #endif |
@@ -44257,9 +44272,9 @@ diff -urNp linux-2.6.32.13/include/linux/cache.h linux-2.6.32.13/include/linux/c | |||
44257 | #ifndef ____cacheline_aligned | 44272 | #ifndef ____cacheline_aligned |
44258 | #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) | 44273 | #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) |
44259 | #endif | 44274 | #endif |
44260 | diff -urNp linux-2.6.32.13/include/linux/capability.h linux-2.6.32.13/include/linux/capability.h | 44275 | diff -urNp linux-2.6.32.15/include/linux/capability.h linux-2.6.32.15/include/linux/capability.h |
44261 | --- linux-2.6.32.13/include/linux/capability.h 2010-03-15 11:52:04.000000000 -0400 | 44276 | --- linux-2.6.32.15/include/linux/capability.h 2010-03-15 11:52:04.000000000 -0400 |
44262 | +++ linux-2.6.32.13/include/linux/capability.h 2010-05-15 13:21:17.934614916 -0400 | 44277 | +++ linux-2.6.32.15/include/linux/capability.h 2010-05-28 21:27:16.347237122 -0400 |
44263 | @@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff | 44278 | @@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff |
44264 | (security_real_capable_noaudit((t), (cap)) == 0) | 44279 | (security_real_capable_noaudit((t), (cap)) == 0) |
44265 | 44280 | ||
@@ -44268,9 +44283,9 @@ diff -urNp linux-2.6.32.13/include/linux/capability.h linux-2.6.32.13/include/li | |||
44268 | 44283 | ||
44269 | /* audit system wants to get cap info from files as well */ | 44284 | /* audit system wants to get cap info from files as well */ |
44270 | struct dentry; | 44285 | struct dentry; |
44271 | diff -urNp linux-2.6.32.13/include/linux/compiler-gcc4.h linux-2.6.32.13/include/linux/compiler-gcc4.h | 44286 | diff -urNp linux-2.6.32.15/include/linux/compiler-gcc4.h linux-2.6.32.15/include/linux/compiler-gcc4.h |
44272 | --- linux-2.6.32.13/include/linux/compiler-gcc4.h 2010-03-15 11:52:04.000000000 -0400 | 44287 | --- linux-2.6.32.15/include/linux/compiler-gcc4.h 2010-03-15 11:52:04.000000000 -0400 |
44273 | +++ linux-2.6.32.13/include/linux/compiler-gcc4.h 2010-05-15 13:21:17.934614916 -0400 | 44288 | +++ linux-2.6.32.15/include/linux/compiler-gcc4.h 2010-05-28 21:27:16.347237122 -0400 |
44274 | @@ -36,4 +36,8 @@ | 44289 | @@ -36,4 +36,8 @@ |
44275 | the kernel context */ | 44290 | the kernel context */ |
44276 | #define __cold __attribute__((__cold__)) | 44291 | #define __cold __attribute__((__cold__)) |
@@ -44280,9 +44295,9 @@ diff -urNp linux-2.6.32.13/include/linux/compiler-gcc4.h linux-2.6.32.13/include | |||
44280 | +#define __bos0(ptr) __bos((ptr), 0) | 44295 | +#define __bos0(ptr) __bos((ptr), 0) |
44281 | +#define __bos1(ptr) __bos((ptr), 1) | 44296 | +#define __bos1(ptr) __bos((ptr), 1) |
44282 | #endif | 44297 | #endif |
44283 | diff -urNp linux-2.6.32.13/include/linux/compiler.h linux-2.6.32.13/include/linux/compiler.h | 44298 | diff -urNp linux-2.6.32.15/include/linux/compiler.h linux-2.6.32.15/include/linux/compiler.h |
44284 | --- linux-2.6.32.13/include/linux/compiler.h 2010-03-15 11:52:04.000000000 -0400 | 44299 | --- linux-2.6.32.15/include/linux/compiler.h 2010-03-15 11:52:04.000000000 -0400 |
44285 | +++ linux-2.6.32.13/include/linux/compiler.h 2010-05-15 13:21:17.934614916 -0400 | 44300 | +++ linux-2.6.32.15/include/linux/compiler.h 2010-05-28 21:27:16.347237122 -0400 |
44286 | @@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_ | 44301 | @@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_ |
44287 | #define __cold | 44302 | #define __cold |
44288 | #endif | 44303 | #endif |
@@ -44306,9 +44321,9 @@ diff -urNp linux-2.6.32.13/include/linux/compiler.h linux-2.6.32.13/include/linu | |||
44306 | /* Simple shorthand for a section definition */ | 44321 | /* Simple shorthand for a section definition */ |
44307 | #ifndef __section | 44322 | #ifndef __section |
44308 | # define __section(S) __attribute__ ((__section__(#S))) | 44323 | # define __section(S) __attribute__ ((__section__(#S))) |
44309 | diff -urNp linux-2.6.32.13/include/linux/decompress/mm.h linux-2.6.32.13/include/linux/decompress/mm.h | 44324 | diff -urNp linux-2.6.32.15/include/linux/decompress/mm.h linux-2.6.32.15/include/linux/decompress/mm.h |
44310 | --- linux-2.6.32.13/include/linux/decompress/mm.h 2010-04-04 20:41:50.048452804 -0400 | 44325 | --- linux-2.6.32.15/include/linux/decompress/mm.h 2010-04-04 20:41:50.048452804 -0400 |
44311 | +++ linux-2.6.32.13/include/linux/decompress/mm.h 2010-05-15 13:21:17.938584561 -0400 | 44326 | +++ linux-2.6.32.15/include/linux/decompress/mm.h 2010-05-28 21:27:16.347237122 -0400 |
44312 | @@ -78,7 +78,7 @@ static void free(void *where) | 44327 | @@ -78,7 +78,7 @@ static void free(void *where) |
44313 | * warnings when not needed (indeed large_malloc / large_free are not | 44328 | * warnings when not needed (indeed large_malloc / large_free are not |
44314 | * needed by inflate */ | 44329 | * needed by inflate */ |
@@ -44318,9 +44333,9 @@ diff -urNp linux-2.6.32.13/include/linux/decompress/mm.h linux-2.6.32.13/include | |||
44318 | #define free(a) kfree(a) | 44333 | #define free(a) kfree(a) |
44319 | 44334 | ||
44320 | #define large_malloc(a) vmalloc(a) | 44335 | #define large_malloc(a) vmalloc(a) |
44321 | diff -urNp linux-2.6.32.13/include/linux/dma-mapping.h linux-2.6.32.13/include/linux/dma-mapping.h | 44336 | diff -urNp linux-2.6.32.15/include/linux/dma-mapping.h linux-2.6.32.15/include/linux/dma-mapping.h |
44322 | --- linux-2.6.32.13/include/linux/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 | 44337 | --- linux-2.6.32.15/include/linux/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 |
44323 | +++ linux-2.6.32.13/include/linux/dma-mapping.h 2010-05-15 13:21:17.938584561 -0400 | 44338 | +++ linux-2.6.32.15/include/linux/dma-mapping.h 2010-05-28 21:27:16.347237122 -0400 |
44324 | @@ -16,50 +16,50 @@ enum dma_data_direction { | 44339 | @@ -16,50 +16,50 @@ enum dma_data_direction { |
44325 | }; | 44340 | }; |
44326 | 44341 | ||
@@ -44387,9 +44402,9 @@ diff -urNp linux-2.6.32.13/include/linux/dma-mapping.h linux-2.6.32.13/include/l | |||
44387 | }; | 44402 | }; |
44388 | 44403 | ||
44389 | #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) | 44404 | #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) |
44390 | diff -urNp linux-2.6.32.13/include/linux/dst.h linux-2.6.32.13/include/linux/dst.h | 44405 | diff -urNp linux-2.6.32.15/include/linux/dst.h linux-2.6.32.15/include/linux/dst.h |
44391 | --- linux-2.6.32.13/include/linux/dst.h 2010-03-15 11:52:04.000000000 -0400 | 44406 | --- linux-2.6.32.15/include/linux/dst.h 2010-03-15 11:52:04.000000000 -0400 |
44392 | +++ linux-2.6.32.13/include/linux/dst.h 2010-05-15 13:21:17.938584561 -0400 | 44407 | +++ linux-2.6.32.15/include/linux/dst.h 2010-05-28 21:27:16.347237122 -0400 |
44393 | @@ -380,7 +380,7 @@ struct dst_node | 44408 | @@ -380,7 +380,7 @@ struct dst_node |
44394 | struct thread_pool *pool; | 44409 | struct thread_pool *pool; |
44395 | 44410 | ||
@@ -44399,9 +44414,9 @@ diff -urNp linux-2.6.32.13/include/linux/dst.h linux-2.6.32.13/include/linux/dst | |||
44399 | 44414 | ||
44400 | /* | 44415 | /* |
44401 | * How frequently and how many times transaction | 44416 | * How frequently and how many times transaction |
44402 | diff -urNp linux-2.6.32.13/include/linux/elf.h linux-2.6.32.13/include/linux/elf.h | 44417 | diff -urNp linux-2.6.32.15/include/linux/elf.h linux-2.6.32.15/include/linux/elf.h |
44403 | --- linux-2.6.32.13/include/linux/elf.h 2010-03-15 11:52:04.000000000 -0400 | 44418 | --- linux-2.6.32.15/include/linux/elf.h 2010-03-15 11:52:04.000000000 -0400 |
44404 | +++ linux-2.6.32.13/include/linux/elf.h 2010-05-15 13:21:17.938584561 -0400 | 44419 | +++ linux-2.6.32.15/include/linux/elf.h 2010-05-28 21:27:16.347237122 -0400 |
44405 | @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; | 44420 | @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; |
44406 | #define PT_GNU_EH_FRAME 0x6474e550 | 44421 | #define PT_GNU_EH_FRAME 0x6474e550 |
44407 | 44422 | ||
@@ -44474,9 +44489,9 @@ diff -urNp linux-2.6.32.13/include/linux/elf.h linux-2.6.32.13/include/linux/elf | |||
44474 | 44489 | ||
44475 | #endif | 44490 | #endif |
44476 | 44491 | ||
44477 | diff -urNp linux-2.6.32.13/include/linux/fs.h linux-2.6.32.13/include/linux/fs.h | 44492 | diff -urNp linux-2.6.32.15/include/linux/fs.h linux-2.6.32.15/include/linux/fs.h |
44478 | --- linux-2.6.32.13/include/linux/fs.h 2010-04-29 17:49:38.529851956 -0400 | 44493 | --- linux-2.6.32.15/include/linux/fs.h 2010-04-29 17:49:38.529851956 -0400 |
44479 | +++ linux-2.6.32.13/include/linux/fs.h 2010-05-15 13:21:17.938584561 -0400 | 44494 | +++ linux-2.6.32.15/include/linux/fs.h 2010-05-28 21:27:16.347237122 -0400 |
44480 | @@ -90,6 +90,11 @@ struct inodes_stat_t { | 44495 | @@ -90,6 +90,11 @@ struct inodes_stat_t { |
44481 | /* Expect random access pattern */ | 44496 | /* Expect random access pattern */ |
44482 | #define FMODE_RANDOM ((__force fmode_t)4096) | 44497 | #define FMODE_RANDOM ((__force fmode_t)4096) |
@@ -44638,9 +44653,9 @@ diff -urNp linux-2.6.32.13/include/linux/fs.h linux-2.6.32.13/include/linux/fs.h | |||
44638 | }; | 44653 | }; |
44639 | 44654 | ||
44640 | /* | 44655 | /* |
44641 | diff -urNp linux-2.6.32.13/include/linux/fs_struct.h linux-2.6.32.13/include/linux/fs_struct.h | 44656 | diff -urNp linux-2.6.32.15/include/linux/fs_struct.h linux-2.6.32.15/include/linux/fs_struct.h |
44642 | --- linux-2.6.32.13/include/linux/fs_struct.h 2010-03-15 11:52:04.000000000 -0400 | 44657 | --- linux-2.6.32.15/include/linux/fs_struct.h 2010-03-15 11:52:04.000000000 -0400 |
44643 | +++ linux-2.6.32.13/include/linux/fs_struct.h 2010-05-15 13:21:17.938584561 -0400 | 44658 | +++ linux-2.6.32.15/include/linux/fs_struct.h 2010-05-28 21:27:16.347237122 -0400 |
44644 | @@ -4,7 +4,7 @@ | 44659 | @@ -4,7 +4,7 @@ |
44645 | #include <linux/path.h> | 44660 | #include <linux/path.h> |
44646 | 44661 | ||
@@ -44650,9 +44665,9 @@ diff -urNp linux-2.6.32.13/include/linux/fs_struct.h linux-2.6.32.13/include/lin | |||
44650 | rwlock_t lock; | 44665 | rwlock_t lock; |
44651 | int umask; | 44666 | int umask; |
44652 | int in_exec; | 44667 | int in_exec; |
44653 | diff -urNp linux-2.6.32.13/include/linux/genhd.h linux-2.6.32.13/include/linux/genhd.h | 44668 | diff -urNp linux-2.6.32.15/include/linux/genhd.h linux-2.6.32.15/include/linux/genhd.h |
44654 | --- linux-2.6.32.13/include/linux/genhd.h 2010-03-15 11:52:04.000000000 -0400 | 44669 | --- linux-2.6.32.15/include/linux/genhd.h 2010-03-15 11:52:04.000000000 -0400 |
44655 | +++ linux-2.6.32.13/include/linux/genhd.h 2010-05-15 13:21:17.938584561 -0400 | 44670 | +++ linux-2.6.32.15/include/linux/genhd.h 2010-05-28 21:27:16.355225759 -0400 |
44656 | @@ -161,7 +161,7 @@ struct gendisk { | 44671 | @@ -161,7 +161,7 @@ struct gendisk { |
44657 | 44672 | ||
44658 | struct timer_rand_state *random; | 44673 | struct timer_rand_state *random; |
@@ -44662,9 +44677,9 @@ diff -urNp linux-2.6.32.13/include/linux/genhd.h linux-2.6.32.13/include/linux/g | |||
44662 | struct work_struct async_notify; | 44677 | struct work_struct async_notify; |
44663 | #ifdef CONFIG_BLK_DEV_INTEGRITY | 44678 | #ifdef CONFIG_BLK_DEV_INTEGRITY |
44664 | struct blk_integrity *integrity; | 44679 | struct blk_integrity *integrity; |
44665 | diff -urNp linux-2.6.32.13/include/linux/gracl.h linux-2.6.32.13/include/linux/gracl.h | 44680 | diff -urNp linux-2.6.32.15/include/linux/gracl.h linux-2.6.32.15/include/linux/gracl.h |
44666 | --- linux-2.6.32.13/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 | 44681 | --- linux-2.6.32.15/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 |
44667 | +++ linux-2.6.32.13/include/linux/gracl.h 2010-05-15 13:21:17.938584561 -0400 | 44682 | +++ linux-2.6.32.15/include/linux/gracl.h 2010-05-28 21:27:16.355225759 -0400 |
44668 | @@ -0,0 +1,309 @@ | 44683 | @@ -0,0 +1,309 @@ |
44669 | +#ifndef GR_ACL_H | 44684 | +#ifndef GR_ACL_H |
44670 | +#define GR_ACL_H | 44685 | +#define GR_ACL_H |
@@ -44975,9 +44990,9 @@ diff -urNp linux-2.6.32.13/include/linux/gracl.h linux-2.6.32.13/include/linux/g | |||
44975 | + | 44990 | + |
44976 | +#endif | 44991 | +#endif |
44977 | + | 44992 | + |
44978 | diff -urNp linux-2.6.32.13/include/linux/gralloc.h linux-2.6.32.13/include/linux/gralloc.h | 44993 | diff -urNp linux-2.6.32.15/include/linux/gralloc.h linux-2.6.32.15/include/linux/gralloc.h |
44979 | --- linux-2.6.32.13/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 | 44994 | --- linux-2.6.32.15/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 |
44980 | +++ linux-2.6.32.13/include/linux/gralloc.h 2010-05-15 13:21:17.938584561 -0400 | 44995 | +++ linux-2.6.32.15/include/linux/gralloc.h 2010-05-28 21:27:16.355225759 -0400 |
44981 | @@ -0,0 +1,9 @@ | 44996 | @@ -0,0 +1,9 @@ |
44982 | +#ifndef __GRALLOC_H | 44997 | +#ifndef __GRALLOC_H |
44983 | +#define __GRALLOC_H | 44998 | +#define __GRALLOC_H |
@@ -44988,9 +45003,9 @@ diff -urNp linux-2.6.32.13/include/linux/gralloc.h linux-2.6.32.13/include/linux | |||
44988 | +void *acl_alloc_num(unsigned long num, unsigned long len); | 45003 | +void *acl_alloc_num(unsigned long num, unsigned long len); |
44989 | + | 45004 | + |
44990 | +#endif | 45005 | +#endif |
44991 | diff -urNp linux-2.6.32.13/include/linux/grdefs.h linux-2.6.32.13/include/linux/grdefs.h | 45006 | diff -urNp linux-2.6.32.15/include/linux/grdefs.h linux-2.6.32.15/include/linux/grdefs.h |
44992 | --- linux-2.6.32.13/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 | 45007 | --- linux-2.6.32.15/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 |
44993 | +++ linux-2.6.32.13/include/linux/grdefs.h 2010-05-15 13:21:17.938584561 -0400 | 45008 | +++ linux-2.6.32.15/include/linux/grdefs.h 2010-05-28 21:27:16.355225759 -0400 |
44994 | @@ -0,0 +1,136 @@ | 45009 | @@ -0,0 +1,136 @@ |
44995 | +#ifndef GRDEFS_H | 45010 | +#ifndef GRDEFS_H |
44996 | +#define GRDEFS_H | 45011 | +#define GRDEFS_H |
@@ -45128,9 +45143,9 @@ diff -urNp linux-2.6.32.13/include/linux/grdefs.h linux-2.6.32.13/include/linux/ | |||
45128 | +}; | 45143 | +}; |
45129 | + | 45144 | + |
45130 | +#endif | 45145 | +#endif |
45131 | diff -urNp linux-2.6.32.13/include/linux/grinternal.h linux-2.6.32.13/include/linux/grinternal.h | 45146 | diff -urNp linux-2.6.32.15/include/linux/grinternal.h linux-2.6.32.15/include/linux/grinternal.h |
45132 | --- linux-2.6.32.13/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 | 45147 | --- linux-2.6.32.15/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 |
45133 | +++ linux-2.6.32.13/include/linux/grinternal.h 2010-05-15 13:21:17.938584561 -0400 | 45148 | +++ linux-2.6.32.15/include/linux/grinternal.h 2010-05-28 21:27:16.355225759 -0400 |
45134 | @@ -0,0 +1,215 @@ | 45149 | @@ -0,0 +1,215 @@ |
45135 | +#ifndef __GRINTERNAL_H | 45150 | +#ifndef __GRINTERNAL_H |
45136 | +#define __GRINTERNAL_H | 45151 | +#define __GRINTERNAL_H |
@@ -45347,9 +45362,9 @@ diff -urNp linux-2.6.32.13/include/linux/grinternal.h linux-2.6.32.13/include/li | |||
45347 | +#endif | 45362 | +#endif |
45348 | + | 45363 | + |
45349 | +#endif | 45364 | +#endif |
45350 | diff -urNp linux-2.6.32.13/include/linux/grmsg.h linux-2.6.32.13/include/linux/grmsg.h | 45365 | diff -urNp linux-2.6.32.15/include/linux/grmsg.h linux-2.6.32.15/include/linux/grmsg.h |
45351 | --- linux-2.6.32.13/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 | 45366 | --- linux-2.6.32.15/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 |
45352 | +++ linux-2.6.32.13/include/linux/grmsg.h 2010-05-15 13:21:17.938584561 -0400 | 45367 | +++ linux-2.6.32.15/include/linux/grmsg.h 2010-05-28 21:27:16.355225759 -0400 |
45353 | @@ -0,0 +1,107 @@ | 45368 | @@ -0,0 +1,107 @@ |
45354 | +#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u" | 45369 | +#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u" |
45355 | +#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u" | 45370 | +#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u" |
@@ -45458,9 +45473,9 @@ diff -urNp linux-2.6.32.13/include/linux/grmsg.h linux-2.6.32.13/include/linux/g | |||
45458 | +#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by " | 45473 | +#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by " |
45459 | +#define GR_VM86_MSG "denied use of vm86 by " | 45474 | +#define GR_VM86_MSG "denied use of vm86 by " |
45460 | +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by " | 45475 | +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by " |
45461 | diff -urNp linux-2.6.32.13/include/linux/grsecurity.h linux-2.6.32.13/include/linux/grsecurity.h | 45476 | diff -urNp linux-2.6.32.15/include/linux/grsecurity.h linux-2.6.32.15/include/linux/grsecurity.h |
45462 | --- linux-2.6.32.13/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 | 45477 | --- linux-2.6.32.15/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 |
45463 | +++ linux-2.6.32.13/include/linux/grsecurity.h 2010-05-15 13:21:17.942979526 -0400 | 45478 | +++ linux-2.6.32.15/include/linux/grsecurity.h 2010-05-28 21:27:16.355225759 -0400 |
45464 | @@ -0,0 +1,199 @@ | 45479 | @@ -0,0 +1,199 @@ |
45465 | +#ifndef GR_SECURITY_H | 45480 | +#ifndef GR_SECURITY_H |
45466 | +#define GR_SECURITY_H | 45481 | +#define GR_SECURITY_H |
@@ -45661,9 +45676,9 @@ diff -urNp linux-2.6.32.13/include/linux/grsecurity.h linux-2.6.32.13/include/li | |||
45661 | +#endif | 45676 | +#endif |
45662 | + | 45677 | + |
45663 | +#endif | 45678 | +#endif |
45664 | diff -urNp linux-2.6.32.13/include/linux/hdpu_features.h linux-2.6.32.13/include/linux/hdpu_features.h | 45679 | diff -urNp linux-2.6.32.15/include/linux/hdpu_features.h linux-2.6.32.15/include/linux/hdpu_features.h |
45665 | --- linux-2.6.32.13/include/linux/hdpu_features.h 2010-03-15 11:52:04.000000000 -0400 | 45680 | --- linux-2.6.32.15/include/linux/hdpu_features.h 2010-03-15 11:52:04.000000000 -0400 |
45666 | +++ linux-2.6.32.13/include/linux/hdpu_features.h 2010-05-15 13:21:17.942979526 -0400 | 45681 | +++ linux-2.6.32.15/include/linux/hdpu_features.h 2010-05-28 21:27:16.355225759 -0400 |
45667 | @@ -3,7 +3,7 @@ | 45682 | @@ -3,7 +3,7 @@ |
45668 | struct cpustate_t { | 45683 | struct cpustate_t { |
45669 | spinlock_t lock; | 45684 | spinlock_t lock; |
@@ -45673,9 +45688,9 @@ diff -urNp linux-2.6.32.13/include/linux/hdpu_features.h linux-2.6.32.13/include | |||
45673 | unsigned char cached_val; | 45688 | unsigned char cached_val; |
45674 | int inited; | 45689 | int inited; |
45675 | unsigned long *set_addr; | 45690 | unsigned long *set_addr; |
45676 | diff -urNp linux-2.6.32.13/include/linux/highmem.h linux-2.6.32.13/include/linux/highmem.h | 45691 | diff -urNp linux-2.6.32.15/include/linux/highmem.h linux-2.6.32.15/include/linux/highmem.h |
45677 | --- linux-2.6.32.13/include/linux/highmem.h 2010-03-15 11:52:04.000000000 -0400 | 45692 | --- linux-2.6.32.15/include/linux/highmem.h 2010-03-15 11:52:04.000000000 -0400 |
45678 | +++ linux-2.6.32.13/include/linux/highmem.h 2010-05-15 13:21:17.942979526 -0400 | 45693 | +++ linux-2.6.32.15/include/linux/highmem.h 2010-05-28 21:27:16.372277939 -0400 |
45679 | @@ -137,6 +137,18 @@ static inline void clear_highpage(struct | 45694 | @@ -137,6 +137,18 @@ static inline void clear_highpage(struct |
45680 | kunmap_atomic(kaddr, KM_USER0); | 45695 | kunmap_atomic(kaddr, KM_USER0); |
45681 | } | 45696 | } |
@@ -45695,9 +45710,9 @@ diff -urNp linux-2.6.32.13/include/linux/highmem.h linux-2.6.32.13/include/linux | |||
45695 | static inline void zero_user_segments(struct page *page, | 45710 | static inline void zero_user_segments(struct page *page, |
45696 | unsigned start1, unsigned end1, | 45711 | unsigned start1, unsigned end1, |
45697 | unsigned start2, unsigned end2) | 45712 | unsigned start2, unsigned end2) |
45698 | diff -urNp linux-2.6.32.13/include/linux/init_task.h linux-2.6.32.13/include/linux/init_task.h | 45713 | diff -urNp linux-2.6.32.15/include/linux/init_task.h linux-2.6.32.15/include/linux/init_task.h |
45699 | --- linux-2.6.32.13/include/linux/init_task.h 2010-03-15 11:52:04.000000000 -0400 | 45714 | --- linux-2.6.32.15/include/linux/init_task.h 2010-03-15 11:52:04.000000000 -0400 |
45700 | +++ linux-2.6.32.13/include/linux/init_task.h 2010-05-15 13:21:17.942979526 -0400 | 45715 | +++ linux-2.6.32.15/include/linux/init_task.h 2010-05-28 21:27:16.377048812 -0400 |
45701 | @@ -115,6 +115,13 @@ extern struct cred init_cred; | 45716 | @@ -115,6 +115,13 @@ extern struct cred init_cred; |
45702 | # define INIT_PERF_EVENTS(tsk) | 45717 | # define INIT_PERF_EVENTS(tsk) |
45703 | #endif | 45718 | #endif |
@@ -45720,9 +45735,9 @@ diff -urNp linux-2.6.32.13/include/linux/init_task.h linux-2.6.32.13/include/lin | |||
45720 | } | 45735 | } |
45721 | 45736 | ||
45722 | 45737 | ||
45723 | diff -urNp linux-2.6.32.13/include/linux/interrupt.h linux-2.6.32.13/include/linux/interrupt.h | 45738 | diff -urNp linux-2.6.32.15/include/linux/interrupt.h linux-2.6.32.15/include/linux/interrupt.h |
45724 | --- linux-2.6.32.13/include/linux/interrupt.h 2010-03-15 11:52:04.000000000 -0400 | 45739 | --- linux-2.6.32.15/include/linux/interrupt.h 2010-03-15 11:52:04.000000000 -0400 |
45725 | +++ linux-2.6.32.13/include/linux/interrupt.h 2010-05-15 13:21:17.942979526 -0400 | 45740 | +++ linux-2.6.32.15/include/linux/interrupt.h 2010-05-28 21:27:16.377048812 -0400 |
45726 | @@ -357,7 +357,7 @@ enum | 45741 | @@ -357,7 +357,7 @@ enum |
45727 | /* map softirq index to softirq name. update 'softirq_to_name' in | 45742 | /* map softirq index to softirq name. update 'softirq_to_name' in |
45728 | * kernel/softirq.c when adding a new softirq. | 45743 | * kernel/softirq.c when adding a new softirq. |
@@ -45747,9 +45762,9 @@ diff -urNp linux-2.6.32.13/include/linux/interrupt.h linux-2.6.32.13/include/lin | |||
45747 | extern void softirq_init(void); | 45762 | extern void softirq_init(void); |
45748 | #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0) | 45763 | #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0) |
45749 | extern void raise_softirq_irqoff(unsigned int nr); | 45764 | extern void raise_softirq_irqoff(unsigned int nr); |
45750 | diff -urNp linux-2.6.32.13/include/linux/jbd2.h linux-2.6.32.13/include/linux/jbd2.h | 45765 | diff -urNp linux-2.6.32.15/include/linux/jbd2.h linux-2.6.32.15/include/linux/jbd2.h |
45751 | --- linux-2.6.32.13/include/linux/jbd2.h 2010-03-15 11:52:04.000000000 -0400 | 45766 | --- linux-2.6.32.15/include/linux/jbd2.h 2010-03-15 11:52:04.000000000 -0400 |
45752 | +++ linux-2.6.32.13/include/linux/jbd2.h 2010-05-15 13:21:17.942979526 -0400 | 45767 | +++ linux-2.6.32.15/include/linux/jbd2.h 2010-05-28 21:27:16.377048812 -0400 |
45753 | @@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; | 45768 | @@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; |
45754 | } \ | 45769 | } \ |
45755 | } while (0) | 45770 | } while (0) |
@@ -45759,9 +45774,9 @@ diff -urNp linux-2.6.32.13/include/linux/jbd2.h linux-2.6.32.13/include/linux/jb | |||
45759 | #endif | 45774 | #endif |
45760 | 45775 | ||
45761 | static inline void *jbd2_alloc(size_t size, gfp_t flags) | 45776 | static inline void *jbd2_alloc(size_t size, gfp_t flags) |
45762 | diff -urNp linux-2.6.32.13/include/linux/jbd.h linux-2.6.32.13/include/linux/jbd.h | 45777 | diff -urNp linux-2.6.32.15/include/linux/jbd.h linux-2.6.32.15/include/linux/jbd.h |
45763 | --- linux-2.6.32.13/include/linux/jbd.h 2010-03-15 11:52:04.000000000 -0400 | 45778 | --- linux-2.6.32.15/include/linux/jbd.h 2010-03-15 11:52:04.000000000 -0400 |
45764 | +++ linux-2.6.32.13/include/linux/jbd.h 2010-05-15 13:21:17.942979526 -0400 | 45779 | +++ linux-2.6.32.15/include/linux/jbd.h 2010-05-28 21:27:16.377048812 -0400 |
45765 | @@ -66,7 +66,7 @@ extern u8 journal_enable_debug; | 45780 | @@ -66,7 +66,7 @@ extern u8 journal_enable_debug; |
45766 | } \ | 45781 | } \ |
45767 | } while (0) | 45782 | } while (0) |
@@ -45771,9 +45786,9 @@ diff -urNp linux-2.6.32.13/include/linux/jbd.h linux-2.6.32.13/include/linux/jbd | |||
45771 | #endif | 45786 | #endif |
45772 | 45787 | ||
45773 | static inline void *jbd_alloc(size_t size, gfp_t flags) | 45788 | static inline void *jbd_alloc(size_t size, gfp_t flags) |
45774 | diff -urNp linux-2.6.32.13/include/linux/kallsyms.h linux-2.6.32.13/include/linux/kallsyms.h | 45789 | diff -urNp linux-2.6.32.15/include/linux/kallsyms.h linux-2.6.32.15/include/linux/kallsyms.h |
45775 | --- linux-2.6.32.13/include/linux/kallsyms.h 2010-03-15 11:52:04.000000000 -0400 | 45790 | --- linux-2.6.32.15/include/linux/kallsyms.h 2010-03-15 11:52:04.000000000 -0400 |
45776 | +++ linux-2.6.32.13/include/linux/kallsyms.h 2010-05-15 13:21:17.942979526 -0400 | 45791 | +++ linux-2.6.32.15/include/linux/kallsyms.h 2010-05-28 21:27:16.377048812 -0400 |
45777 | @@ -15,7 +15,8 @@ | 45792 | @@ -15,7 +15,8 @@ |
45778 | 45793 | ||
45779 | struct module; | 45794 | struct module; |
@@ -45794,9 +45809,9 @@ diff -urNp linux-2.6.32.13/include/linux/kallsyms.h linux-2.6.32.13/include/linu | |||
45794 | 45809 | ||
45795 | /* This macro allows us to keep printk typechecking */ | 45810 | /* This macro allows us to keep printk typechecking */ |
45796 | static void __check_printsym_format(const char *fmt, ...) | 45811 | static void __check_printsym_format(const char *fmt, ...) |
45797 | diff -urNp linux-2.6.32.13/include/linux/kgdb.h linux-2.6.32.13/include/linux/kgdb.h | 45812 | diff -urNp linux-2.6.32.15/include/linux/kgdb.h linux-2.6.32.15/include/linux/kgdb.h |
45798 | --- linux-2.6.32.13/include/linux/kgdb.h 2010-03-15 11:52:04.000000000 -0400 | 45813 | --- linux-2.6.32.15/include/linux/kgdb.h 2010-03-15 11:52:04.000000000 -0400 |
45799 | +++ linux-2.6.32.13/include/linux/kgdb.h 2010-05-15 13:21:17.942979526 -0400 | 45814 | +++ linux-2.6.32.15/include/linux/kgdb.h 2010-05-28 21:27:16.379237094 -0400 |
45800 | @@ -251,20 +251,20 @@ struct kgdb_arch { | 45815 | @@ -251,20 +251,20 @@ struct kgdb_arch { |
45801 | */ | 45816 | */ |
45802 | struct kgdb_io { | 45817 | struct kgdb_io { |
@@ -45827,9 +45842,9 @@ diff -urNp linux-2.6.32.13/include/linux/kgdb.h linux-2.6.32.13/include/linux/kg | |||
45827 | 45842 | ||
45828 | extern int kgdb_hex2long(char **ptr, unsigned long *long_val); | 45843 | extern int kgdb_hex2long(char **ptr, unsigned long *long_val); |
45829 | extern int kgdb_mem2hex(char *mem, char *buf, int count); | 45844 | extern int kgdb_mem2hex(char *mem, char *buf, int count); |
45830 | diff -urNp linux-2.6.32.13/include/linux/kobject.h linux-2.6.32.13/include/linux/kobject.h | 45845 | diff -urNp linux-2.6.32.15/include/linux/kobject.h linux-2.6.32.15/include/linux/kobject.h |
45831 | --- linux-2.6.32.13/include/linux/kobject.h 2010-03-15 11:52:04.000000000 -0400 | 45846 | --- linux-2.6.32.15/include/linux/kobject.h 2010-03-15 11:52:04.000000000 -0400 |
45832 | +++ linux-2.6.32.13/include/linux/kobject.h 2010-05-15 13:21:17.942979526 -0400 | 45847 | +++ linux-2.6.32.15/include/linux/kobject.h 2010-05-28 21:27:16.379237094 -0400 |
45833 | @@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob | 45848 | @@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob |
45834 | 45849 | ||
45835 | struct kobj_type { | 45850 | struct kobj_type { |
@@ -45878,9 +45893,9 @@ diff -urNp linux-2.6.32.13/include/linux/kobject.h linux-2.6.32.13/include/linux | |||
45878 | struct kobject *parent_kobj); | 45893 | struct kobject *parent_kobj); |
45879 | 45894 | ||
45880 | static inline struct kset *to_kset(struct kobject *kobj) | 45895 | static inline struct kset *to_kset(struct kobject *kobj) |
45881 | diff -urNp linux-2.6.32.13/include/linux/kvm_host.h linux-2.6.32.13/include/linux/kvm_host.h | 45896 | diff -urNp linux-2.6.32.15/include/linux/kvm_host.h linux-2.6.32.15/include/linux/kvm_host.h |
45882 | --- linux-2.6.32.13/include/linux/kvm_host.h 2010-04-29 17:49:38.529851956 -0400 | 45897 | --- linux-2.6.32.15/include/linux/kvm_host.h 2010-04-29 17:49:38.529851956 -0400 |
45883 | +++ linux-2.6.32.13/include/linux/kvm_host.h 2010-05-15 13:21:17.942979526 -0400 | 45898 | +++ linux-2.6.32.15/include/linux/kvm_host.h 2010-05-28 21:27:16.379237094 -0400 |
45884 | @@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc | 45899 | @@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc |
45885 | void vcpu_load(struct kvm_vcpu *vcpu); | 45900 | void vcpu_load(struct kvm_vcpu *vcpu); |
45886 | void vcpu_put(struct kvm_vcpu *vcpu); | 45901 | void vcpu_put(struct kvm_vcpu *vcpu); |
@@ -45899,9 +45914,9 @@ diff -urNp linux-2.6.32.13/include/linux/kvm_host.h linux-2.6.32.13/include/linu | |||
45899 | void kvm_arch_exit(void); | 45914 | void kvm_arch_exit(void); |
45900 | 45915 | ||
45901 | int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); | 45916 | int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); |
45902 | diff -urNp linux-2.6.32.13/include/linux/libata.h linux-2.6.32.13/include/linux/libata.h | 45917 | diff -urNp linux-2.6.32.15/include/linux/libata.h linux-2.6.32.15/include/linux/libata.h |
45903 | --- linux-2.6.32.13/include/linux/libata.h 2010-03-15 11:52:04.000000000 -0400 | 45918 | --- linux-2.6.32.15/include/linux/libata.h 2010-03-15 11:52:04.000000000 -0400 |
45904 | +++ linux-2.6.32.13/include/linux/libata.h 2010-05-15 13:21:17.942979526 -0400 | 45919 | +++ linux-2.6.32.15/include/linux/libata.h 2010-05-28 21:27:16.391248013 -0400 |
45905 | @@ -64,11 +64,11 @@ | 45920 | @@ -64,11 +64,11 @@ |
45906 | #ifdef ATA_VERBOSE_DEBUG | 45921 | #ifdef ATA_VERBOSE_DEBUG |
45907 | #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) | 45922 | #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) |
@@ -45967,9 +45982,9 @@ diff -urNp linux-2.6.32.13/include/linux/libata.h linux-2.6.32.13/include/linux/ | |||
45967 | extern int ata_scsi_detect(struct scsi_host_template *sht); | 45982 | extern int ata_scsi_detect(struct scsi_host_template *sht); |
45968 | extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); | 45983 | extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); |
45969 | extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); | 45984 | extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); |
45970 | diff -urNp linux-2.6.32.13/include/linux/lockd/bind.h linux-2.6.32.13/include/linux/lockd/bind.h | 45985 | diff -urNp linux-2.6.32.15/include/linux/lockd/bind.h linux-2.6.32.15/include/linux/lockd/bind.h |
45971 | --- linux-2.6.32.13/include/linux/lockd/bind.h 2010-03-15 11:52:04.000000000 -0400 | 45986 | --- linux-2.6.32.15/include/linux/lockd/bind.h 2010-03-15 11:52:04.000000000 -0400 |
45972 | +++ linux-2.6.32.13/include/linux/lockd/bind.h 2010-05-15 13:21:17.942979526 -0400 | 45987 | +++ linux-2.6.32.15/include/linux/lockd/bind.h 2010-05-28 21:27:16.391248013 -0400 |
45973 | @@ -23,13 +23,13 @@ struct svc_rqst; | 45988 | @@ -23,13 +23,13 @@ struct svc_rqst; |
45974 | * This is the set of functions for lockd->nfsd communication | 45989 | * This is the set of functions for lockd->nfsd communication |
45975 | */ | 45990 | */ |
@@ -45987,21 +46002,25 @@ diff -urNp linux-2.6.32.13/include/linux/lockd/bind.h linux-2.6.32.13/include/li | |||
45987 | 46002 | ||
45988 | /* | 46003 | /* |
45989 | * Similar to nfs_client_initdata, but without the NFS-specific | 46004 | * Similar to nfs_client_initdata, but without the NFS-specific |
45990 | diff -urNp linux-2.6.32.13/include/linux/mm.h linux-2.6.32.13/include/linux/mm.h | 46005 | diff -urNp linux-2.6.32.15/include/linux/mm.h linux-2.6.32.15/include/linux/mm.h |
45991 | --- linux-2.6.32.13/include/linux/mm.h 2010-03-15 11:52:04.000000000 -0400 | 46006 | --- linux-2.6.32.15/include/linux/mm.h 2010-03-15 11:52:04.000000000 -0400 |
45992 | +++ linux-2.6.32.13/include/linux/mm.h 2010-05-15 13:21:17.946623351 -0400 | 46007 | +++ linux-2.6.32.15/include/linux/mm.h 2010-05-31 11:15:44.592892079 -0400 |
45993 | @@ -106,6 +106,10 @@ extern unsigned int kobjsize(const void | 46008 | @@ -102,7 +102,14 @@ extern unsigned int kobjsize(const void |
45994 | #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */ | ||
45995 | #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */ | ||
45996 | 46009 | ||
45997 | +#ifdef CONFIG_PAX_PAGEEXEC | 46010 | #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */ |
45998 | +#define VM_PAGEEXEC 0x80000000 /* vma->vm_page_prot needs special handling */ | 46011 | #define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */ |
46012 | + | ||
46013 | +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32) | ||
46014 | +#define VM_SAO 0x00000000 /* Strong Access Ordering (powerpc) */ | ||
46015 | +#define VM_PAGEEXEC 0x20000000 /* vma->vm_page_prot needs special handling */ | ||
46016 | +#else | ||
46017 | #define VM_SAO 0x20000000 /* Strong Access Ordering (powerpc) */ | ||
45999 | +#endif | 46018 | +#endif |
46000 | + | 46019 | + |
46001 | #ifndef VM_STACK_DEFAULT_FLAGS /* arch can override this */ | 46020 | #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */ |
46002 | #define VM_STACK_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS | 46021 | #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */ |
46003 | #endif | 46022 | |
46004 | @@ -880,6 +884,8 @@ struct shrinker { | 46023 | @@ -880,6 +887,8 @@ struct shrinker { |
46005 | extern void register_shrinker(struct shrinker *); | 46024 | extern void register_shrinker(struct shrinker *); |
46006 | extern void unregister_shrinker(struct shrinker *); | 46025 | extern void unregister_shrinker(struct shrinker *); |
46007 | 46026 | ||
@@ -46010,7 +46029,7 @@ diff -urNp linux-2.6.32.13/include/linux/mm.h linux-2.6.32.13/include/linux/mm.h | |||
46010 | int vma_wants_writenotify(struct vm_area_struct *vma); | 46029 | int vma_wants_writenotify(struct vm_area_struct *vma); |
46011 | 46030 | ||
46012 | extern pte_t *get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl); | 46031 | extern pte_t *get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl); |
46013 | @@ -1152,6 +1158,7 @@ out: | 46032 | @@ -1152,6 +1161,7 @@ out: |
46014 | } | 46033 | } |
46015 | 46034 | ||
46016 | extern int do_munmap(struct mm_struct *, unsigned long, size_t); | 46035 | extern int do_munmap(struct mm_struct *, unsigned long, size_t); |
@@ -46018,7 +46037,7 @@ diff -urNp linux-2.6.32.13/include/linux/mm.h linux-2.6.32.13/include/linux/mm.h | |||
46018 | 46037 | ||
46019 | extern unsigned long do_brk(unsigned long, unsigned long); | 46038 | extern unsigned long do_brk(unsigned long, unsigned long); |
46020 | 46039 | ||
46021 | @@ -1206,6 +1213,10 @@ extern struct vm_area_struct * find_vma( | 46040 | @@ -1206,6 +1216,10 @@ extern struct vm_area_struct * find_vma( |
46022 | extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr, | 46041 | extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr, |
46023 | struct vm_area_struct **pprev); | 46042 | struct vm_area_struct **pprev); |
46024 | 46043 | ||
@@ -46029,7 +46048,7 @@ diff -urNp linux-2.6.32.13/include/linux/mm.h linux-2.6.32.13/include/linux/mm.h | |||
46029 | /* Look up the first VMA which intersects the interval start_addr..end_addr-1, | 46048 | /* Look up the first VMA which intersects the interval start_addr..end_addr-1, |
46030 | NULL if none. Assume start_addr < end_addr. */ | 46049 | NULL if none. Assume start_addr < end_addr. */ |
46031 | static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr) | 46050 | static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr) |
46032 | @@ -1222,7 +1233,6 @@ static inline unsigned long vma_pages(st | 46051 | @@ -1222,7 +1236,6 @@ static inline unsigned long vma_pages(st |
46033 | return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; | 46052 | return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; |
46034 | } | 46053 | } |
46035 | 46054 | ||
@@ -46037,7 +46056,7 @@ diff -urNp linux-2.6.32.13/include/linux/mm.h linux-2.6.32.13/include/linux/mm.h | |||
46037 | struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr); | 46056 | struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr); |
46038 | int remap_pfn_range(struct vm_area_struct *, unsigned long addr, | 46057 | int remap_pfn_range(struct vm_area_struct *, unsigned long addr, |
46039 | unsigned long pfn, unsigned long size, pgprot_t); | 46058 | unsigned long pfn, unsigned long size, pgprot_t); |
46040 | @@ -1320,7 +1330,13 @@ extern void memory_failure(unsigned long | 46059 | @@ -1320,7 +1333,13 @@ extern void memory_failure(unsigned long |
46041 | extern int __memory_failure(unsigned long pfn, int trapno, int ref); | 46060 | extern int __memory_failure(unsigned long pfn, int trapno, int ref); |
46042 | extern int sysctl_memory_failure_early_kill; | 46061 | extern int sysctl_memory_failure_early_kill; |
46043 | extern int sysctl_memory_failure_recovery; | 46062 | extern int sysctl_memory_failure_recovery; |
@@ -46052,9 +46071,9 @@ diff -urNp linux-2.6.32.13/include/linux/mm.h linux-2.6.32.13/include/linux/mm.h | |||
46052 | 46071 | ||
46053 | #endif /* __KERNEL__ */ | 46072 | #endif /* __KERNEL__ */ |
46054 | #endif /* _LINUX_MM_H */ | 46073 | #endif /* _LINUX_MM_H */ |
46055 | diff -urNp linux-2.6.32.13/include/linux/mm_types.h linux-2.6.32.13/include/linux/mm_types.h | 46074 | diff -urNp linux-2.6.32.15/include/linux/mm_types.h linux-2.6.32.15/include/linux/mm_types.h |
46056 | --- linux-2.6.32.13/include/linux/mm_types.h 2010-03-15 11:52:04.000000000 -0400 | 46075 | --- linux-2.6.32.15/include/linux/mm_types.h 2010-03-15 11:52:04.000000000 -0400 |
46057 | +++ linux-2.6.32.13/include/linux/mm_types.h 2010-05-15 13:21:17.946623351 -0400 | 46076 | +++ linux-2.6.32.15/include/linux/mm_types.h 2010-05-28 21:27:16.391248013 -0400 |
46058 | @@ -186,6 +186,8 @@ struct vm_area_struct { | 46077 | @@ -186,6 +186,8 @@ struct vm_area_struct { |
46059 | #ifdef CONFIG_NUMA | 46078 | #ifdef CONFIG_NUMA |
46060 | struct mempolicy *vm_policy; /* NUMA policy for the VMA */ | 46079 | struct mempolicy *vm_policy; /* NUMA policy for the VMA */ |
@@ -46089,9 +46108,9 @@ diff -urNp linux-2.6.32.13/include/linux/mm_types.h linux-2.6.32.13/include/linu | |||
46089 | }; | 46108 | }; |
46090 | 46109 | ||
46091 | /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ | 46110 | /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ |
46092 | diff -urNp linux-2.6.32.13/include/linux/mmu_notifier.h linux-2.6.32.13/include/linux/mmu_notifier.h | 46111 | diff -urNp linux-2.6.32.15/include/linux/mmu_notifier.h linux-2.6.32.15/include/linux/mmu_notifier.h |
46093 | --- linux-2.6.32.13/include/linux/mmu_notifier.h 2010-03-15 11:52:04.000000000 -0400 | 46112 | --- linux-2.6.32.15/include/linux/mmu_notifier.h 2010-03-15 11:52:04.000000000 -0400 |
46094 | +++ linux-2.6.32.13/include/linux/mmu_notifier.h 2010-05-15 13:21:17.946623351 -0400 | 46113 | +++ linux-2.6.32.15/include/linux/mmu_notifier.h 2010-05-28 21:27:16.391248013 -0400 |
46095 | @@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr | 46114 | @@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr |
46096 | */ | 46115 | */ |
46097 | #define ptep_clear_flush_notify(__vma, __address, __ptep) \ | 46116 | #define ptep_clear_flush_notify(__vma, __address, __ptep) \ |
@@ -46108,9 +46127,9 @@ diff -urNp linux-2.6.32.13/include/linux/mmu_notifier.h linux-2.6.32.13/include/ | |||
46108 | }) | 46127 | }) |
46109 | 46128 | ||
46110 | #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \ | 46129 | #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \ |
46111 | diff -urNp linux-2.6.32.13/include/linux/mod_devicetable.h linux-2.6.32.13/include/linux/mod_devicetable.h | 46130 | diff -urNp linux-2.6.32.15/include/linux/mod_devicetable.h linux-2.6.32.15/include/linux/mod_devicetable.h |
46112 | --- linux-2.6.32.13/include/linux/mod_devicetable.h 2010-03-15 11:52:04.000000000 -0400 | 46131 | --- linux-2.6.32.15/include/linux/mod_devicetable.h 2010-03-15 11:52:04.000000000 -0400 |
46113 | +++ linux-2.6.32.13/include/linux/mod_devicetable.h 2010-05-15 13:21:17.946623351 -0400 | 46132 | +++ linux-2.6.32.15/include/linux/mod_devicetable.h 2010-05-28 21:27:16.391248013 -0400 |
46114 | @@ -12,7 +12,7 @@ | 46133 | @@ -12,7 +12,7 @@ |
46115 | typedef unsigned long kernel_ulong_t; | 46134 | typedef unsigned long kernel_ulong_t; |
46116 | #endif | 46135 | #endif |
@@ -46129,9 +46148,9 @@ diff -urNp linux-2.6.32.13/include/linux/mod_devicetable.h linux-2.6.32.13/inclu | |||
46129 | 46148 | ||
46130 | struct hid_device_id { | 46149 | struct hid_device_id { |
46131 | __u16 bus; | 46150 | __u16 bus; |
46132 | diff -urNp linux-2.6.32.13/include/linux/module.h linux-2.6.32.13/include/linux/module.h | 46151 | diff -urNp linux-2.6.32.15/include/linux/module.h linux-2.6.32.15/include/linux/module.h |
46133 | --- linux-2.6.32.13/include/linux/module.h 2010-04-29 17:49:38.529851956 -0400 | 46152 | --- linux-2.6.32.15/include/linux/module.h 2010-05-28 20:16:44.458924952 -0400 |
46134 | +++ linux-2.6.32.13/include/linux/module.h 2010-05-15 13:21:17.946623351 -0400 | 46153 | +++ linux-2.6.32.15/include/linux/module.h 2010-05-28 21:27:16.391248013 -0400 |
46135 | @@ -287,16 +287,16 @@ struct module | 46154 | @@ -287,16 +287,16 @@ struct module |
46136 | int (*init)(void); | 46155 | int (*init)(void); |
46137 | 46156 | ||
@@ -46204,9 +46223,9 @@ diff -urNp linux-2.6.32.13/include/linux/module.h linux-2.6.32.13/include/linux/ | |||
46204 | } | 46223 | } |
46205 | 46224 | ||
46206 | /* Search for module by name: must hold module_mutex. */ | 46225 | /* Search for module by name: must hold module_mutex. */ |
46207 | diff -urNp linux-2.6.32.13/include/linux/moduleloader.h linux-2.6.32.13/include/linux/moduleloader.h | 46226 | diff -urNp linux-2.6.32.15/include/linux/moduleloader.h linux-2.6.32.15/include/linux/moduleloader.h |
46208 | --- linux-2.6.32.13/include/linux/moduleloader.h 2010-03-15 11:52:04.000000000 -0400 | 46227 | --- linux-2.6.32.15/include/linux/moduleloader.h 2010-03-15 11:52:04.000000000 -0400 |
46209 | +++ linux-2.6.32.13/include/linux/moduleloader.h 2010-05-15 13:21:17.946623351 -0400 | 46228 | +++ linux-2.6.32.15/include/linux/moduleloader.h 2010-05-28 21:27:16.391248013 -0400 |
46210 | @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st | 46229 | @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st |
46211 | sections. Returns NULL on failure. */ | 46230 | sections. Returns NULL on failure. */ |
46212 | void *module_alloc(unsigned long size); | 46231 | void *module_alloc(unsigned long size); |
@@ -46229,9 +46248,9 @@ diff -urNp linux-2.6.32.13/include/linux/moduleloader.h linux-2.6.32.13/include/ | |||
46229 | /* Apply the given relocation to the (simplified) ELF. Return -error | 46248 | /* Apply the given relocation to the (simplified) ELF. Return -error |
46230 | or 0. */ | 46249 | or 0. */ |
46231 | int apply_relocate(Elf_Shdr *sechdrs, | 46250 | int apply_relocate(Elf_Shdr *sechdrs, |
46232 | diff -urNp linux-2.6.32.13/include/linux/namei.h linux-2.6.32.13/include/linux/namei.h | 46251 | diff -urNp linux-2.6.32.15/include/linux/namei.h linux-2.6.32.15/include/linux/namei.h |
46233 | --- linux-2.6.32.13/include/linux/namei.h 2010-03-15 11:52:04.000000000 -0400 | 46252 | --- linux-2.6.32.15/include/linux/namei.h 2010-03-15 11:52:04.000000000 -0400 |
46234 | +++ linux-2.6.32.13/include/linux/namei.h 2010-05-15 13:21:17.946623351 -0400 | 46253 | +++ linux-2.6.32.15/include/linux/namei.h 2010-05-28 21:27:16.394947878 -0400 |
46235 | @@ -22,7 +22,7 @@ struct nameidata { | 46254 | @@ -22,7 +22,7 @@ struct nameidata { |
46236 | unsigned int flags; | 46255 | unsigned int flags; |
46237 | int last_type; | 46256 | int last_type; |
@@ -46256,9 +46275,9 @@ diff -urNp linux-2.6.32.13/include/linux/namei.h linux-2.6.32.13/include/linux/n | |||
46256 | { | 46275 | { |
46257 | return nd->saved_names[nd->depth]; | 46276 | return nd->saved_names[nd->depth]; |
46258 | } | 46277 | } |
46259 | diff -urNp linux-2.6.32.13/include/linux/nodemask.h linux-2.6.32.13/include/linux/nodemask.h | 46278 | diff -urNp linux-2.6.32.15/include/linux/nodemask.h linux-2.6.32.15/include/linux/nodemask.h |
46260 | --- linux-2.6.32.13/include/linux/nodemask.h 2010-03-15 11:52:04.000000000 -0400 | 46279 | --- linux-2.6.32.15/include/linux/nodemask.h 2010-03-15 11:52:04.000000000 -0400 |
46261 | +++ linux-2.6.32.13/include/linux/nodemask.h 2010-05-15 13:21:17.946623351 -0400 | 46280 | +++ linux-2.6.32.15/include/linux/nodemask.h 2010-05-28 21:27:16.394947878 -0400 |
46262 | @@ -464,11 +464,11 @@ static inline int num_node_state(enum no | 46281 | @@ -464,11 +464,11 @@ static inline int num_node_state(enum no |
46263 | 46282 | ||
46264 | #define any_online_node(mask) \ | 46283 | #define any_online_node(mask) \ |
@@ -46275,9 +46294,9 @@ diff -urNp linux-2.6.32.13/include/linux/nodemask.h linux-2.6.32.13/include/linu | |||
46275 | }) | 46294 | }) |
46276 | 46295 | ||
46277 | #define num_online_nodes() num_node_state(N_ONLINE) | 46296 | #define num_online_nodes() num_node_state(N_ONLINE) |
46278 | diff -urNp linux-2.6.32.13/include/linux/oprofile.h linux-2.6.32.13/include/linux/oprofile.h | 46297 | diff -urNp linux-2.6.32.15/include/linux/oprofile.h linux-2.6.32.15/include/linux/oprofile.h |
46279 | --- linux-2.6.32.13/include/linux/oprofile.h 2010-03-15 11:52:04.000000000 -0400 | 46298 | --- linux-2.6.32.15/include/linux/oprofile.h 2010-03-15 11:52:04.000000000 -0400 |
46280 | +++ linux-2.6.32.13/include/linux/oprofile.h 2010-05-15 13:21:17.946623351 -0400 | 46299 | +++ linux-2.6.32.15/include/linux/oprofile.h 2010-05-28 21:27:16.394947878 -0400 |
46281 | @@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super | 46300 | @@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super |
46282 | int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, | 46301 | int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, |
46283 | char const * name, ulong * val); | 46302 | char const * name, ulong * val); |
@@ -46290,9 +46309,9 @@ diff -urNp linux-2.6.32.13/include/linux/oprofile.h linux-2.6.32.13/include/linu | |||
46290 | 46309 | ||
46291 | /** create a directory */ | 46310 | /** create a directory */ |
46292 | struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, | 46311 | struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, |
46293 | diff -urNp linux-2.6.32.13/include/linux/pipe_fs_i.h linux-2.6.32.13/include/linux/pipe_fs_i.h | 46312 | diff -urNp linux-2.6.32.15/include/linux/pipe_fs_i.h linux-2.6.32.15/include/linux/pipe_fs_i.h |
46294 | --- linux-2.6.32.13/include/linux/pipe_fs_i.h 2010-03-15 11:52:04.000000000 -0400 | 46313 | --- linux-2.6.32.15/include/linux/pipe_fs_i.h 2010-03-15 11:52:04.000000000 -0400 |
46295 | +++ linux-2.6.32.13/include/linux/pipe_fs_i.h 2010-05-15 13:21:17.946623351 -0400 | 46314 | +++ linux-2.6.32.15/include/linux/pipe_fs_i.h 2010-05-28 21:27:16.394947878 -0400 |
46296 | @@ -46,9 +46,9 @@ struct pipe_inode_info { | 46315 | @@ -46,9 +46,9 @@ struct pipe_inode_info { |
46297 | wait_queue_head_t wait; | 46316 | wait_queue_head_t wait; |
46298 | unsigned int nrbufs, curbuf; | 46317 | unsigned int nrbufs, curbuf; |
@@ -46306,9 +46325,9 @@ diff -urNp linux-2.6.32.13/include/linux/pipe_fs_i.h linux-2.6.32.13/include/lin | |||
46306 | unsigned int r_counter; | 46325 | unsigned int r_counter; |
46307 | unsigned int w_counter; | 46326 | unsigned int w_counter; |
46308 | struct fasync_struct *fasync_readers; | 46327 | struct fasync_struct *fasync_readers; |
46309 | diff -urNp linux-2.6.32.13/include/linux/poison.h linux-2.6.32.13/include/linux/poison.h | 46328 | diff -urNp linux-2.6.32.15/include/linux/poison.h linux-2.6.32.15/include/linux/poison.h |
46310 | --- linux-2.6.32.13/include/linux/poison.h 2010-05-15 13:20:19.331913169 -0400 | 46329 | --- linux-2.6.32.15/include/linux/poison.h 2010-05-15 13:20:19.331913169 -0400 |
46311 | +++ linux-2.6.32.13/include/linux/poison.h 2010-05-15 13:23:00.179313143 -0400 | 46330 | +++ linux-2.6.32.15/include/linux/poison.h 2010-05-28 21:27:16.394947878 -0400 |
46312 | @@ -19,8 +19,8 @@ | 46331 | @@ -19,8 +19,8 @@ |
46313 | * under normal circumstances, used to verify that nobody uses | 46332 | * under normal circumstances, used to verify that nobody uses |
46314 | * non-initialized list entries. | 46333 | * non-initialized list entries. |
@@ -46320,9 +46339,9 @@ diff -urNp linux-2.6.32.13/include/linux/poison.h linux-2.6.32.13/include/linux/ | |||
46320 | 46339 | ||
46321 | /********** include/linux/timer.h **********/ | 46340 | /********** include/linux/timer.h **********/ |
46322 | /* | 46341 | /* |
46323 | diff -urNp linux-2.6.32.13/include/linux/proc_fs.h linux-2.6.32.13/include/linux/proc_fs.h | 46342 | diff -urNp linux-2.6.32.15/include/linux/proc_fs.h linux-2.6.32.15/include/linux/proc_fs.h |
46324 | --- linux-2.6.32.13/include/linux/proc_fs.h 2010-03-15 11:52:04.000000000 -0400 | 46343 | --- linux-2.6.32.15/include/linux/proc_fs.h 2010-03-15 11:52:04.000000000 -0400 |
46325 | +++ linux-2.6.32.13/include/linux/proc_fs.h 2010-05-15 13:21:17.946623351 -0400 | 46344 | +++ linux-2.6.32.15/include/linux/proc_fs.h 2010-05-28 21:27:16.394947878 -0400 |
46326 | @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro | 46345 | @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro |
46327 | return proc_create_data(name, mode, parent, proc_fops, NULL); | 46346 | return proc_create_data(name, mode, parent, proc_fops, NULL); |
46328 | } | 46347 | } |
@@ -46343,9 +46362,9 @@ diff -urNp linux-2.6.32.13/include/linux/proc_fs.h linux-2.6.32.13/include/linux | |||
46343 | static inline struct proc_dir_entry *create_proc_read_entry(const char *name, | 46362 | static inline struct proc_dir_entry *create_proc_read_entry(const char *name, |
46344 | mode_t mode, struct proc_dir_entry *base, | 46363 | mode_t mode, struct proc_dir_entry *base, |
46345 | read_proc_t *read_proc, void * data) | 46364 | read_proc_t *read_proc, void * data) |
46346 | diff -urNp linux-2.6.32.13/include/linux/random.h linux-2.6.32.13/include/linux/random.h | 46365 | diff -urNp linux-2.6.32.15/include/linux/random.h linux-2.6.32.15/include/linux/random.h |
46347 | --- linux-2.6.32.13/include/linux/random.h 2010-03-15 11:52:04.000000000 -0400 | 46366 | --- linux-2.6.32.15/include/linux/random.h 2010-03-15 11:52:04.000000000 -0400 |
46348 | +++ linux-2.6.32.13/include/linux/random.h 2010-05-15 13:21:17.950606770 -0400 | 46367 | +++ linux-2.6.32.15/include/linux/random.h 2010-05-28 21:27:16.394947878 -0400 |
46349 | @@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l | 46368 | @@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l |
46350 | u32 random32(void); | 46369 | u32 random32(void); |
46351 | void srandom32(u32 seed); | 46370 | void srandom32(u32 seed); |
@@ -46358,9 +46377,9 @@ diff -urNp linux-2.6.32.13/include/linux/random.h linux-2.6.32.13/include/linux/ | |||
46358 | #endif /* __KERNEL___ */ | 46377 | #endif /* __KERNEL___ */ |
46359 | 46378 | ||
46360 | #endif /* _LINUX_RANDOM_H */ | 46379 | #endif /* _LINUX_RANDOM_H */ |
46361 | diff -urNp linux-2.6.32.13/include/linux/reiserfs_fs.h linux-2.6.32.13/include/linux/reiserfs_fs.h | 46380 | diff -urNp linux-2.6.32.15/include/linux/reiserfs_fs.h linux-2.6.32.15/include/linux/reiserfs_fs.h |
46362 | --- linux-2.6.32.13/include/linux/reiserfs_fs.h 2010-03-15 11:52:04.000000000 -0400 | 46381 | --- linux-2.6.32.15/include/linux/reiserfs_fs.h 2010-03-15 11:52:04.000000000 -0400 |
46363 | +++ linux-2.6.32.13/include/linux/reiserfs_fs.h 2010-05-15 13:21:17.950606770 -0400 | 46382 | +++ linux-2.6.32.15/include/linux/reiserfs_fs.h 2010-05-28 21:27:16.394947878 -0400 |
46364 | @@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset | 46383 | @@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset |
46365 | #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ | 46384 | #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ |
46366 | 46385 | ||
@@ -46407,9 +46426,9 @@ diff -urNp linux-2.6.32.13/include/linux/reiserfs_fs.h linux-2.6.32.13/include/l | |||
46407 | 46426 | ||
46408 | #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize) | 46427 | #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize) |
46409 | #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize) | 46428 | #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize) |
46410 | diff -urNp linux-2.6.32.13/include/linux/reiserfs_fs_sb.h linux-2.6.32.13/include/linux/reiserfs_fs_sb.h | 46429 | diff -urNp linux-2.6.32.15/include/linux/reiserfs_fs_sb.h linux-2.6.32.15/include/linux/reiserfs_fs_sb.h |
46411 | --- linux-2.6.32.13/include/linux/reiserfs_fs_sb.h 2010-03-15 11:52:04.000000000 -0400 | 46430 | --- linux-2.6.32.15/include/linux/reiserfs_fs_sb.h 2010-03-15 11:52:04.000000000 -0400 |
46412 | +++ linux-2.6.32.13/include/linux/reiserfs_fs_sb.h 2010-05-15 13:21:17.950606770 -0400 | 46431 | +++ linux-2.6.32.15/include/linux/reiserfs_fs_sb.h 2010-05-28 21:27:16.394947878 -0400 |
46413 | @@ -377,7 +377,7 @@ struct reiserfs_sb_info { | 46432 | @@ -377,7 +377,7 @@ struct reiserfs_sb_info { |
46414 | /* Comment? -Hans */ | 46433 | /* Comment? -Hans */ |
46415 | wait_queue_head_t s_wait; | 46434 | wait_queue_head_t s_wait; |
@@ -46419,9 +46438,9 @@ diff -urNp linux-2.6.32.13/include/linux/reiserfs_fs_sb.h linux-2.6.32.13/includ | |||
46419 | // tree gets re-balanced | 46438 | // tree gets re-balanced |
46420 | unsigned long s_properties; /* File system properties. Currently holds | 46439 | unsigned long s_properties; /* File system properties. Currently holds |
46421 | on-disk FS format */ | 46440 | on-disk FS format */ |
46422 | diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/sched.h | 46441 | diff -urNp linux-2.6.32.15/include/linux/sched.h linux-2.6.32.15/include/linux/sched.h |
46423 | --- linux-2.6.32.13/include/linux/sched.h 2010-03-15 11:52:04.000000000 -0400 | 46442 | --- linux-2.6.32.15/include/linux/sched.h 2010-05-28 20:16:44.458924952 -0400 |
46424 | +++ linux-2.6.32.13/include/linux/sched.h 2010-05-15 13:21:17.950606770 -0400 | 46443 | +++ linux-2.6.32.15/include/linux/sched.h 2010-05-28 21:27:16.403248422 -0400 |
46425 | @@ -101,6 +101,7 @@ struct bio; | 46444 | @@ -101,6 +101,7 @@ struct bio; |
46426 | struct fs_struct; | 46445 | struct fs_struct; |
46427 | struct bts_context; | 46446 | struct bts_context; |
@@ -46529,8 +46548,8 @@ diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/s | |||
46529 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | 46548 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER |
46530 | /* Index of current stored adress in ret_stack */ | 46549 | /* Index of current stored adress in ret_stack */ |
46531 | int curr_ret_stack; | 46550 | int curr_ret_stack; |
46532 | @@ -1544,6 +1569,52 @@ struct task_struct { | 46551 | @@ -1543,6 +1568,52 @@ struct task_struct { |
46533 | unsigned long stack_start; | 46552 | #endif /* CONFIG_TRACING */ |
46534 | }; | 46553 | }; |
46535 | 46554 | ||
46536 | +#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */ | 46555 | +#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */ |
@@ -46582,7 +46601,7 @@ diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/s | |||
46582 | /* Future-safe accessor for struct task_struct's cpus_allowed. */ | 46601 | /* Future-safe accessor for struct task_struct's cpus_allowed. */ |
46583 | #define tsk_cpumask(tsk) (&(tsk)->cpus_allowed) | 46602 | #define tsk_cpumask(tsk) (&(tsk)->cpus_allowed) |
46584 | 46603 | ||
46585 | @@ -2143,7 +2214,7 @@ extern void __cleanup_sighand(struct sig | 46604 | @@ -2142,7 +2213,7 @@ extern void __cleanup_sighand(struct sig |
46586 | extern void exit_itimers(struct signal_struct *); | 46605 | extern void exit_itimers(struct signal_struct *); |
46587 | extern void flush_itimer_signals(void); | 46606 | extern void flush_itimer_signals(void); |
46588 | 46607 | ||
@@ -46591,7 +46610,7 @@ diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/s | |||
46591 | 46610 | ||
46592 | extern void daemonize(const char *, ...); | 46611 | extern void daemonize(const char *, ...); |
46593 | extern int allow_signal(int); | 46612 | extern int allow_signal(int); |
46594 | @@ -2245,6 +2316,33 @@ static inline void task_unlock(struct ta | 46613 | @@ -2244,6 +2315,33 @@ static inline void task_unlock(struct ta |
46595 | spin_unlock(&p->alloc_lock); | 46614 | spin_unlock(&p->alloc_lock); |
46596 | } | 46615 | } |
46597 | 46616 | ||
@@ -46625,7 +46644,7 @@ diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/s | |||
46625 | extern struct sighand_struct *lock_task_sighand(struct task_struct *tsk, | 46644 | extern struct sighand_struct *lock_task_sighand(struct task_struct *tsk, |
46626 | unsigned long *flags); | 46645 | unsigned long *flags); |
46627 | 46646 | ||
46628 | @@ -2256,8 +2354,8 @@ static inline void unlock_task_sighand(s | 46647 | @@ -2255,8 +2353,8 @@ static inline void unlock_task_sighand(s |
46629 | 46648 | ||
46630 | #ifndef __HAVE_THREAD_FUNCTIONS | 46649 | #ifndef __HAVE_THREAD_FUNCTIONS |
46631 | 46650 | ||
@@ -46636,7 +46655,7 @@ diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/s | |||
46636 | 46655 | ||
46637 | static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org) | 46656 | static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org) |
46638 | { | 46657 | { |
46639 | @@ -2272,13 +2370,31 @@ static inline unsigned long *end_of_stac | 46658 | @@ -2271,13 +2369,31 @@ static inline unsigned long *end_of_stac |
46640 | 46659 | ||
46641 | #endif | 46660 | #endif |
46642 | 46661 | ||
@@ -46670,9 +46689,9 @@ diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/s | |||
46670 | extern void thread_info_cache_init(void); | 46689 | extern void thread_info_cache_init(void); |
46671 | 46690 | ||
46672 | #ifdef CONFIG_DEBUG_STACK_USAGE | 46691 | #ifdef CONFIG_DEBUG_STACK_USAGE |
46673 | diff -urNp linux-2.6.32.13/include/linux/screen_info.h linux-2.6.32.13/include/linux/screen_info.h | 46692 | diff -urNp linux-2.6.32.15/include/linux/screen_info.h linux-2.6.32.15/include/linux/screen_info.h |
46674 | --- linux-2.6.32.13/include/linux/screen_info.h 2010-03-15 11:52:04.000000000 -0400 | 46693 | --- linux-2.6.32.15/include/linux/screen_info.h 2010-03-15 11:52:04.000000000 -0400 |
46675 | +++ linux-2.6.32.13/include/linux/screen_info.h 2010-05-15 13:21:17.950606770 -0400 | 46694 | +++ linux-2.6.32.15/include/linux/screen_info.h 2010-05-28 21:27:16.403248422 -0400 |
46676 | @@ -42,7 +42,8 @@ struct screen_info { | 46695 | @@ -42,7 +42,8 @@ struct screen_info { |
46677 | __u16 pages; /* 0x32 */ | 46696 | __u16 pages; /* 0x32 */ |
46678 | __u16 vesa_attributes; /* 0x34 */ | 46697 | __u16 vesa_attributes; /* 0x34 */ |
@@ -46683,9 +46702,9 @@ diff -urNp linux-2.6.32.13/include/linux/screen_info.h linux-2.6.32.13/include/l | |||
46683 | } __attribute__((packed)); | 46702 | } __attribute__((packed)); |
46684 | 46703 | ||
46685 | #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ | 46704 | #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ |
46686 | diff -urNp linux-2.6.32.13/include/linux/security.h linux-2.6.32.13/include/linux/security.h | 46705 | diff -urNp linux-2.6.32.15/include/linux/security.h linux-2.6.32.15/include/linux/security.h |
46687 | --- linux-2.6.32.13/include/linux/security.h 2010-03-15 11:52:04.000000000 -0400 | 46706 | --- linux-2.6.32.15/include/linux/security.h 2010-03-15 11:52:04.000000000 -0400 |
46688 | +++ linux-2.6.32.13/include/linux/security.h 2010-05-15 13:21:17.950606770 -0400 | 46707 | +++ linux-2.6.32.15/include/linux/security.h 2010-05-28 21:27:16.403248422 -0400 |
46689 | @@ -34,6 +34,7 @@ | 46708 | @@ -34,6 +34,7 @@ |
46690 | #include <linux/key.h> | 46709 | #include <linux/key.h> |
46691 | #include <linux/xfrm.h> | 46710 | #include <linux/xfrm.h> |
@@ -46694,9 +46713,9 @@ diff -urNp linux-2.6.32.13/include/linux/security.h linux-2.6.32.13/include/linu | |||
46694 | #include <net/flow.h> | 46713 | #include <net/flow.h> |
46695 | 46714 | ||
46696 | /* Maximum number of letters for an LSM name string */ | 46715 | /* Maximum number of letters for an LSM name string */ |
46697 | diff -urNp linux-2.6.32.13/include/linux/shm.h linux-2.6.32.13/include/linux/shm.h | 46716 | diff -urNp linux-2.6.32.15/include/linux/shm.h linux-2.6.32.15/include/linux/shm.h |
46698 | --- linux-2.6.32.13/include/linux/shm.h 2010-03-15 11:52:04.000000000 -0400 | 46717 | --- linux-2.6.32.15/include/linux/shm.h 2010-03-15 11:52:04.000000000 -0400 |
46699 | +++ linux-2.6.32.13/include/linux/shm.h 2010-05-15 13:21:17.950606770 -0400 | 46718 | +++ linux-2.6.32.15/include/linux/shm.h 2010-05-28 21:27:16.403248422 -0400 |
46700 | @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke | 46719 | @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke |
46701 | pid_t shm_cprid; | 46720 | pid_t shm_cprid; |
46702 | pid_t shm_lprid; | 46721 | pid_t shm_lprid; |
@@ -46708,9 +46727,9 @@ diff -urNp linux-2.6.32.13/include/linux/shm.h linux-2.6.32.13/include/linux/shm | |||
46708 | }; | 46727 | }; |
46709 | 46728 | ||
46710 | /* shm_mode upper byte flags */ | 46729 | /* shm_mode upper byte flags */ |
46711 | diff -urNp linux-2.6.32.13/include/linux/slab.h linux-2.6.32.13/include/linux/slab.h | 46730 | diff -urNp linux-2.6.32.15/include/linux/slab.h linux-2.6.32.15/include/linux/slab.h |
46712 | --- linux-2.6.32.13/include/linux/slab.h 2010-03-15 11:52:04.000000000 -0400 | 46731 | --- linux-2.6.32.15/include/linux/slab.h 2010-03-15 11:52:04.000000000 -0400 |
46713 | +++ linux-2.6.32.13/include/linux/slab.h 2010-05-15 13:21:17.950606770 -0400 | 46732 | +++ linux-2.6.32.15/include/linux/slab.h 2010-05-28 21:27:16.407250185 -0400 |
46714 | @@ -11,6 +11,7 @@ | 46733 | @@ -11,6 +11,7 @@ |
46715 | 46734 | ||
46716 | #include <linux/gfp.h> | 46735 | #include <linux/gfp.h> |
@@ -46782,9 +46801,9 @@ diff -urNp linux-2.6.32.13/include/linux/slab.h linux-2.6.32.13/include/linux/sl | |||
46782 | +}) | 46801 | +}) |
46783 | + | 46802 | + |
46784 | #endif /* _LINUX_SLAB_H */ | 46803 | #endif /* _LINUX_SLAB_H */ |
46785 | diff -urNp linux-2.6.32.13/include/linux/slub_def.h linux-2.6.32.13/include/linux/slub_def.h | 46804 | diff -urNp linux-2.6.32.15/include/linux/slub_def.h linux-2.6.32.15/include/linux/slub_def.h |
46786 | --- linux-2.6.32.13/include/linux/slub_def.h 2010-03-15 11:52:04.000000000 -0400 | 46805 | --- linux-2.6.32.15/include/linux/slub_def.h 2010-03-15 11:52:04.000000000 -0400 |
46787 | +++ linux-2.6.32.13/include/linux/slub_def.h 2010-05-15 13:21:17.950606770 -0400 | 46806 | +++ linux-2.6.32.15/include/linux/slub_def.h 2010-05-28 21:27:16.407250185 -0400 |
46788 | @@ -86,7 +86,7 @@ struct kmem_cache { | 46807 | @@ -86,7 +86,7 @@ struct kmem_cache { |
46789 | struct kmem_cache_order_objects max; | 46808 | struct kmem_cache_order_objects max; |
46790 | struct kmem_cache_order_objects min; | 46809 | struct kmem_cache_order_objects min; |
@@ -46794,9 +46813,9 @@ diff -urNp linux-2.6.32.13/include/linux/slub_def.h linux-2.6.32.13/include/linu | |||
46794 | void (*ctor)(void *); | 46813 | void (*ctor)(void *); |
46795 | int inuse; /* Offset to metadata */ | 46814 | int inuse; /* Offset to metadata */ |
46796 | int align; /* Alignment */ | 46815 | int align; /* Alignment */ |
46797 | diff -urNp linux-2.6.32.13/include/linux/sonet.h linux-2.6.32.13/include/linux/sonet.h | 46816 | diff -urNp linux-2.6.32.15/include/linux/sonet.h linux-2.6.32.15/include/linux/sonet.h |
46798 | --- linux-2.6.32.13/include/linux/sonet.h 2010-03-15 11:52:04.000000000 -0400 | 46817 | --- linux-2.6.32.15/include/linux/sonet.h 2010-03-15 11:52:04.000000000 -0400 |
46799 | +++ linux-2.6.32.13/include/linux/sonet.h 2010-05-15 13:21:17.950606770 -0400 | 46818 | +++ linux-2.6.32.15/include/linux/sonet.h 2010-05-28 21:27:16.407250185 -0400 |
46800 | @@ -61,7 +61,7 @@ struct sonet_stats { | 46819 | @@ -61,7 +61,7 @@ struct sonet_stats { |
46801 | #include <asm/atomic.h> | 46820 | #include <asm/atomic.h> |
46802 | 46821 | ||
@@ -46806,9 +46825,9 @@ diff -urNp linux-2.6.32.13/include/linux/sonet.h linux-2.6.32.13/include/linux/s | |||
46806 | __SONET_ITEMS | 46825 | __SONET_ITEMS |
46807 | #undef __HANDLE_ITEM | 46826 | #undef __HANDLE_ITEM |
46808 | }; | 46827 | }; |
46809 | diff -urNp linux-2.6.32.13/include/linux/suspend.h linux-2.6.32.13/include/linux/suspend.h | 46828 | diff -urNp linux-2.6.32.15/include/linux/suspend.h linux-2.6.32.15/include/linux/suspend.h |
46810 | --- linux-2.6.32.13/include/linux/suspend.h 2010-03-15 11:52:04.000000000 -0400 | 46829 | --- linux-2.6.32.15/include/linux/suspend.h 2010-03-15 11:52:04.000000000 -0400 |
46811 | +++ linux-2.6.32.13/include/linux/suspend.h 2010-05-15 13:21:17.950606770 -0400 | 46830 | +++ linux-2.6.32.15/include/linux/suspend.h 2010-05-28 21:27:16.407250185 -0400 |
46812 | @@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t; | 46831 | @@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t; |
46813 | * which require special recovery actions in that situation. | 46832 | * which require special recovery actions in that situation. |
46814 | */ | 46833 | */ |
@@ -46897,9 +46916,9 @@ diff -urNp linux-2.6.32.13/include/linux/suspend.h linux-2.6.32.13/include/linux | |||
46897 | static inline int hibernate(void) { return -ENOSYS; } | 46916 | static inline int hibernate(void) { return -ENOSYS; } |
46898 | static inline bool system_entering_hibernation(void) { return false; } | 46917 | static inline bool system_entering_hibernation(void) { return false; } |
46899 | #endif /* CONFIG_HIBERNATION */ | 46918 | #endif /* CONFIG_HIBERNATION */ |
46900 | diff -urNp linux-2.6.32.13/include/linux/sysctl.h linux-2.6.32.13/include/linux/sysctl.h | 46919 | diff -urNp linux-2.6.32.15/include/linux/sysctl.h linux-2.6.32.15/include/linux/sysctl.h |
46901 | --- linux-2.6.32.13/include/linux/sysctl.h 2010-03-15 11:52:04.000000000 -0400 | 46920 | --- linux-2.6.32.15/include/linux/sysctl.h 2010-03-15 11:52:04.000000000 -0400 |
46902 | +++ linux-2.6.32.13/include/linux/sysctl.h 2010-05-15 13:21:17.950606770 -0400 | 46921 | +++ linux-2.6.32.15/include/linux/sysctl.h 2010-05-28 21:27:16.423734148 -0400 |
46903 | @@ -164,7 +164,11 @@ enum | 46922 | @@ -164,7 +164,11 @@ enum |
46904 | KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ | 46923 | KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ |
46905 | }; | 46924 | }; |
@@ -46913,9 +46932,9 @@ diff -urNp linux-2.6.32.13/include/linux/sysctl.h linux-2.6.32.13/include/linux/ | |||
46913 | 46932 | ||
46914 | /* CTL_VM names: */ | 46933 | /* CTL_VM names: */ |
46915 | enum | 46934 | enum |
46916 | diff -urNp linux-2.6.32.13/include/linux/sysfs.h linux-2.6.32.13/include/linux/sysfs.h | 46935 | diff -urNp linux-2.6.32.15/include/linux/sysfs.h linux-2.6.32.15/include/linux/sysfs.h |
46917 | --- linux-2.6.32.13/include/linux/sysfs.h 2010-03-15 11:52:04.000000000 -0400 | 46936 | --- linux-2.6.32.15/include/linux/sysfs.h 2010-03-15 11:52:04.000000000 -0400 |
46918 | +++ linux-2.6.32.13/include/linux/sysfs.h 2010-05-15 13:21:17.950606770 -0400 | 46937 | +++ linux-2.6.32.15/include/linux/sysfs.h 2010-05-28 21:27:16.423734148 -0400 |
46919 | @@ -75,8 +75,8 @@ struct bin_attribute { | 46938 | @@ -75,8 +75,8 @@ struct bin_attribute { |
46920 | }; | 46939 | }; |
46921 | 46940 | ||
@@ -46927,9 +46946,9 @@ diff -urNp linux-2.6.32.13/include/linux/sysfs.h linux-2.6.32.13/include/linux/s | |||
46927 | }; | 46946 | }; |
46928 | 46947 | ||
46929 | struct sysfs_dirent; | 46948 | struct sysfs_dirent; |
46930 | diff -urNp linux-2.6.32.13/include/linux/thread_info.h linux-2.6.32.13/include/linux/thread_info.h | 46949 | diff -urNp linux-2.6.32.15/include/linux/thread_info.h linux-2.6.32.15/include/linux/thread_info.h |
46931 | --- linux-2.6.32.13/include/linux/thread_info.h 2010-03-15 11:52:04.000000000 -0400 | 46950 | --- linux-2.6.32.15/include/linux/thread_info.h 2010-03-15 11:52:04.000000000 -0400 |
46932 | +++ linux-2.6.32.13/include/linux/thread_info.h 2010-05-15 13:21:17.950606770 -0400 | 46951 | +++ linux-2.6.32.15/include/linux/thread_info.h 2010-05-28 21:27:16.423734148 -0400 |
46933 | @@ -23,7 +23,7 @@ struct restart_block { | 46952 | @@ -23,7 +23,7 @@ struct restart_block { |
46934 | }; | 46953 | }; |
46935 | /* For futex_wait and futex_wait_requeue_pi */ | 46954 | /* For futex_wait and futex_wait_requeue_pi */ |
@@ -46939,9 +46958,9 @@ diff -urNp linux-2.6.32.13/include/linux/thread_info.h linux-2.6.32.13/include/l | |||
46939 | u32 val; | 46958 | u32 val; |
46940 | u32 flags; | 46959 | u32 flags; |
46941 | u32 bitset; | 46960 | u32 bitset; |
46942 | diff -urNp linux-2.6.32.13/include/linux/tty.h linux-2.6.32.13/include/linux/tty.h | 46961 | diff -urNp linux-2.6.32.15/include/linux/tty.h linux-2.6.32.15/include/linux/tty.h |
46943 | --- linux-2.6.32.13/include/linux/tty.h 2010-04-04 20:41:50.060586306 -0400 | 46962 | --- linux-2.6.32.15/include/linux/tty.h 2010-04-04 20:41:50.060586306 -0400 |
46944 | +++ linux-2.6.32.13/include/linux/tty.h 2010-05-15 13:21:17.950606770 -0400 | 46963 | +++ linux-2.6.32.15/include/linux/tty.h 2010-05-28 21:27:16.423734148 -0400 |
46945 | @@ -13,6 +13,7 @@ | 46964 | @@ -13,6 +13,7 @@ |
46946 | #include <linux/tty_driver.h> | 46965 | #include <linux/tty_driver.h> |
46947 | #include <linux/tty_ldisc.h> | 46966 | #include <linux/tty_ldisc.h> |
@@ -46977,9 +46996,9 @@ diff -urNp linux-2.6.32.13/include/linux/tty.h linux-2.6.32.13/include/linux/tty | |||
46977 | 46996 | ||
46978 | /* n_tty.c */ | 46997 | /* n_tty.c */ |
46979 | extern struct tty_ldisc_ops tty_ldisc_N_TTY; | 46998 | extern struct tty_ldisc_ops tty_ldisc_N_TTY; |
46980 | diff -urNp linux-2.6.32.13/include/linux/tty_ldisc.h linux-2.6.32.13/include/linux/tty_ldisc.h | 46999 | diff -urNp linux-2.6.32.15/include/linux/tty_ldisc.h linux-2.6.32.15/include/linux/tty_ldisc.h |
46981 | --- linux-2.6.32.13/include/linux/tty_ldisc.h 2010-03-15 11:52:04.000000000 -0400 | 47000 | --- linux-2.6.32.15/include/linux/tty_ldisc.h 2010-03-15 11:52:04.000000000 -0400 |
46982 | +++ linux-2.6.32.13/include/linux/tty_ldisc.h 2010-05-15 13:21:17.950606770 -0400 | 47001 | +++ linux-2.6.32.15/include/linux/tty_ldisc.h 2010-05-28 21:27:16.423734148 -0400 |
46983 | @@ -139,7 +139,7 @@ struct tty_ldisc_ops { | 47002 | @@ -139,7 +139,7 @@ struct tty_ldisc_ops { |
46984 | 47003 | ||
46985 | struct module *owner; | 47004 | struct module *owner; |
@@ -46989,9 +47008,9 @@ diff -urNp linux-2.6.32.13/include/linux/tty_ldisc.h linux-2.6.32.13/include/lin | |||
46989 | }; | 47008 | }; |
46990 | 47009 | ||
46991 | struct tty_ldisc { | 47010 | struct tty_ldisc { |
46992 | diff -urNp linux-2.6.32.13/include/linux/types.h linux-2.6.32.13/include/linux/types.h | 47011 | diff -urNp linux-2.6.32.15/include/linux/types.h linux-2.6.32.15/include/linux/types.h |
46993 | --- linux-2.6.32.13/include/linux/types.h 2010-03-15 11:52:04.000000000 -0400 | 47012 | --- linux-2.6.32.15/include/linux/types.h 2010-03-15 11:52:04.000000000 -0400 |
46994 | +++ linux-2.6.32.13/include/linux/types.h 2010-05-15 13:21:17.956129899 -0400 | 47013 | +++ linux-2.6.32.15/include/linux/types.h 2010-05-28 21:27:16.427051097 -0400 |
46995 | @@ -191,10 +191,26 @@ typedef struct { | 47014 | @@ -191,10 +191,26 @@ typedef struct { |
46996 | volatile int counter; | 47015 | volatile int counter; |
46997 | } atomic_t; | 47016 | } atomic_t; |
@@ -47019,9 +47038,9 @@ diff -urNp linux-2.6.32.13/include/linux/types.h linux-2.6.32.13/include/linux/t | |||
47019 | #endif | 47038 | #endif |
47020 | 47039 | ||
47021 | struct ustat { | 47040 | struct ustat { |
47022 | diff -urNp linux-2.6.32.13/include/linux/uaccess.h linux-2.6.32.13/include/linux/uaccess.h | 47041 | diff -urNp linux-2.6.32.15/include/linux/uaccess.h linux-2.6.32.15/include/linux/uaccess.h |
47023 | --- linux-2.6.32.13/include/linux/uaccess.h 2010-03-15 11:52:04.000000000 -0400 | 47042 | --- linux-2.6.32.15/include/linux/uaccess.h 2010-03-15 11:52:04.000000000 -0400 |
47024 | +++ linux-2.6.32.13/include/linux/uaccess.h 2010-05-15 13:21:17.956129899 -0400 | 47043 | +++ linux-2.6.32.15/include/linux/uaccess.h 2010-05-28 21:27:16.427051097 -0400 |
47025 | @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ | 47044 | @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ |
47026 | long ret; \ | 47045 | long ret; \ |
47027 | mm_segment_t old_fs = get_fs(); \ | 47046 | mm_segment_t old_fs = get_fs(); \ |
@@ -47053,9 +47072,9 @@ diff -urNp linux-2.6.32.13/include/linux/uaccess.h linux-2.6.32.13/include/linux | |||
47053 | +extern long probe_kernel_write(void *dst, const void *src, size_t size); | 47072 | +extern long probe_kernel_write(void *dst, const void *src, size_t size); |
47054 | 47073 | ||
47055 | #endif /* __LINUX_UACCESS_H__ */ | 47074 | #endif /* __LINUX_UACCESS_H__ */ |
47056 | diff -urNp linux-2.6.32.13/include/linux/vmalloc.h linux-2.6.32.13/include/linux/vmalloc.h | 47075 | diff -urNp linux-2.6.32.15/include/linux/vmalloc.h linux-2.6.32.15/include/linux/vmalloc.h |
47057 | --- linux-2.6.32.13/include/linux/vmalloc.h 2010-03-15 11:52:04.000000000 -0400 | 47076 | --- linux-2.6.32.15/include/linux/vmalloc.h 2010-03-15 11:52:04.000000000 -0400 |
47058 | +++ linux-2.6.32.13/include/linux/vmalloc.h 2010-05-15 13:23:38.934774262 -0400 | 47077 | +++ linux-2.6.32.15/include/linux/vmalloc.h 2010-05-28 21:27:16.427051097 -0400 |
47059 | @@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining | 47078 | @@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining |
47060 | #define VM_MAP 0x00000004 /* vmap()ed pages */ | 47079 | #define VM_MAP 0x00000004 /* vmap()ed pages */ |
47061 | #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ | 47080 | #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ |
@@ -47150,9 +47169,9 @@ diff -urNp linux-2.6.32.13/include/linux/vmalloc.h linux-2.6.32.13/include/linux | |||
47150 | +}) | 47169 | +}) |
47151 | + | 47170 | + |
47152 | #endif /* _LINUX_VMALLOC_H */ | 47171 | #endif /* _LINUX_VMALLOC_H */ |
47153 | diff -urNp linux-2.6.32.13/include/net/irda/ircomm_tty.h linux-2.6.32.13/include/net/irda/ircomm_tty.h | 47172 | diff -urNp linux-2.6.32.15/include/net/irda/ircomm_tty.h linux-2.6.32.15/include/net/irda/ircomm_tty.h |
47154 | --- linux-2.6.32.13/include/net/irda/ircomm_tty.h 2010-03-15 11:52:04.000000000 -0400 | 47173 | --- linux-2.6.32.15/include/net/irda/ircomm_tty.h 2010-03-15 11:52:04.000000000 -0400 |
47155 | +++ linux-2.6.32.13/include/net/irda/ircomm_tty.h 2010-05-15 13:21:17.956129899 -0400 | 47174 | +++ linux-2.6.32.15/include/net/irda/ircomm_tty.h 2010-05-28 21:27:16.427051097 -0400 |
47156 | @@ -105,8 +105,8 @@ struct ircomm_tty_cb { | 47175 | @@ -105,8 +105,8 @@ struct ircomm_tty_cb { |
47157 | unsigned short close_delay; | 47176 | unsigned short close_delay; |
47158 | unsigned short closing_wait; /* time to wait before closing */ | 47177 | unsigned short closing_wait; /* time to wait before closing */ |
@@ -47164,9 +47183,9 @@ diff -urNp linux-2.6.32.13/include/net/irda/ircomm_tty.h linux-2.6.32.13/include | |||
47164 | 47183 | ||
47165 | /* Protect concurent access to : | 47184 | /* Protect concurent access to : |
47166 | * o self->open_count | 47185 | * o self->open_count |
47167 | diff -urNp linux-2.6.32.13/include/net/neighbour.h linux-2.6.32.13/include/net/neighbour.h | 47186 | diff -urNp linux-2.6.32.15/include/net/neighbour.h linux-2.6.32.15/include/net/neighbour.h |
47168 | --- linux-2.6.32.13/include/net/neighbour.h 2010-03-15 11:52:04.000000000 -0400 | 47187 | --- linux-2.6.32.15/include/net/neighbour.h 2010-03-15 11:52:04.000000000 -0400 |
47169 | +++ linux-2.6.32.13/include/net/neighbour.h 2010-05-15 13:21:17.956129899 -0400 | 47188 | +++ linux-2.6.32.15/include/net/neighbour.h 2010-05-28 21:27:16.427051097 -0400 |
47170 | @@ -125,12 +125,12 @@ struct neighbour | 47189 | @@ -125,12 +125,12 @@ struct neighbour |
47171 | struct neigh_ops | 47190 | struct neigh_ops |
47172 | { | 47191 | { |
@@ -47186,9 +47205,9 @@ diff -urNp linux-2.6.32.13/include/net/neighbour.h linux-2.6.32.13/include/net/n | |||
47186 | }; | 47205 | }; |
47187 | 47206 | ||
47188 | struct pneigh_entry | 47207 | struct pneigh_entry |
47189 | diff -urNp linux-2.6.32.13/include/net/sctp/sctp.h linux-2.6.32.13/include/net/sctp/sctp.h | 47208 | diff -urNp linux-2.6.32.15/include/net/sctp/sctp.h linux-2.6.32.15/include/net/sctp/sctp.h |
47190 | --- linux-2.6.32.13/include/net/sctp/sctp.h 2010-03-15 11:52:04.000000000 -0400 | 47209 | --- linux-2.6.32.15/include/net/sctp/sctp.h 2010-03-15 11:52:04.000000000 -0400 |
47191 | +++ linux-2.6.32.13/include/net/sctp/sctp.h 2010-05-15 13:21:17.956129899 -0400 | 47210 | +++ linux-2.6.32.15/include/net/sctp/sctp.h 2010-05-28 21:27:16.427051097 -0400 |
47192 | @@ -305,8 +305,8 @@ extern int sctp_debug_flag; | 47211 | @@ -305,8 +305,8 @@ extern int sctp_debug_flag; |
47193 | 47212 | ||
47194 | #else /* SCTP_DEBUG */ | 47213 | #else /* SCTP_DEBUG */ |
@@ -47200,9 +47219,9 @@ diff -urNp linux-2.6.32.13/include/net/sctp/sctp.h linux-2.6.32.13/include/net/s | |||
47200 | #define SCTP_ENABLE_DEBUG | 47219 | #define SCTP_ENABLE_DEBUG |
47201 | #define SCTP_DISABLE_DEBUG | 47220 | #define SCTP_DISABLE_DEBUG |
47202 | #define SCTP_ASSERT(expr, str, func) | 47221 | #define SCTP_ASSERT(expr, str, func) |
47203 | diff -urNp linux-2.6.32.13/include/net/tcp.h linux-2.6.32.13/include/net/tcp.h | 47222 | diff -urNp linux-2.6.32.15/include/net/tcp.h linux-2.6.32.15/include/net/tcp.h |
47204 | --- linux-2.6.32.13/include/net/tcp.h 2010-03-15 11:52:04.000000000 -0400 | 47223 | --- linux-2.6.32.15/include/net/tcp.h 2010-03-15 11:52:04.000000000 -0400 |
47205 | +++ linux-2.6.32.13/include/net/tcp.h 2010-05-15 13:21:17.956129899 -0400 | 47224 | +++ linux-2.6.32.15/include/net/tcp.h 2010-05-28 21:27:16.427051097 -0400 |
47206 | @@ -1420,6 +1420,7 @@ enum tcp_seq_states { | 47225 | @@ -1420,6 +1420,7 @@ enum tcp_seq_states { |
47207 | struct tcp_seq_afinfo { | 47226 | struct tcp_seq_afinfo { |
47208 | char *name; | 47227 | char *name; |
@@ -47211,9 +47230,9 @@ diff -urNp linux-2.6.32.13/include/net/tcp.h linux-2.6.32.13/include/net/tcp.h | |||
47211 | struct file_operations seq_fops; | 47230 | struct file_operations seq_fops; |
47212 | struct seq_operations seq_ops; | 47231 | struct seq_operations seq_ops; |
47213 | }; | 47232 | }; |
47214 | diff -urNp linux-2.6.32.13/include/net/udp.h linux-2.6.32.13/include/net/udp.h | 47233 | diff -urNp linux-2.6.32.15/include/net/udp.h linux-2.6.32.15/include/net/udp.h |
47215 | --- linux-2.6.32.13/include/net/udp.h 2010-03-15 11:52:04.000000000 -0400 | 47234 | --- linux-2.6.32.15/include/net/udp.h 2010-03-15 11:52:04.000000000 -0400 |
47216 | +++ linux-2.6.32.13/include/net/udp.h 2010-05-15 13:21:17.956129899 -0400 | 47235 | +++ linux-2.6.32.15/include/net/udp.h 2010-05-28 21:27:16.427051097 -0400 |
47217 | @@ -187,6 +187,7 @@ struct udp_seq_afinfo { | 47236 | @@ -187,6 +187,7 @@ struct udp_seq_afinfo { |
47218 | char *name; | 47237 | char *name; |
47219 | sa_family_t family; | 47238 | sa_family_t family; |
@@ -47222,9 +47241,9 @@ diff -urNp linux-2.6.32.13/include/net/udp.h linux-2.6.32.13/include/net/udp.h | |||
47222 | struct file_operations seq_fops; | 47241 | struct file_operations seq_fops; |
47223 | struct seq_operations seq_ops; | 47242 | struct seq_operations seq_ops; |
47224 | }; | 47243 | }; |
47225 | diff -urNp linux-2.6.32.13/include/sound/ac97_codec.h linux-2.6.32.13/include/sound/ac97_codec.h | 47244 | diff -urNp linux-2.6.32.15/include/sound/ac97_codec.h linux-2.6.32.15/include/sound/ac97_codec.h |
47226 | --- linux-2.6.32.13/include/sound/ac97_codec.h 2010-03-15 11:52:04.000000000 -0400 | 47245 | --- linux-2.6.32.15/include/sound/ac97_codec.h 2010-03-15 11:52:04.000000000 -0400 |
47227 | +++ linux-2.6.32.13/include/sound/ac97_codec.h 2010-05-15 13:21:17.956129899 -0400 | 47246 | +++ linux-2.6.32.15/include/sound/ac97_codec.h 2010-05-28 21:27:16.427051097 -0400 |
47228 | @@ -419,15 +419,15 @@ | 47247 | @@ -419,15 +419,15 @@ |
47229 | struct snd_ac97; | 47248 | struct snd_ac97; |
47230 | 47249 | ||
@@ -47257,9 +47276,9 @@ diff -urNp linux-2.6.32.13/include/sound/ac97_codec.h linux-2.6.32.13/include/so | |||
47257 | void *private_data; | 47276 | void *private_data; |
47258 | void (*private_free) (struct snd_ac97 *ac97); | 47277 | void (*private_free) (struct snd_ac97 *ac97); |
47259 | /* --- */ | 47278 | /* --- */ |
47260 | diff -urNp linux-2.6.32.13/include/trace/events/irq.h linux-2.6.32.13/include/trace/events/irq.h | 47279 | diff -urNp linux-2.6.32.15/include/trace/events/irq.h linux-2.6.32.15/include/trace/events/irq.h |
47261 | --- linux-2.6.32.13/include/trace/events/irq.h 2010-03-15 11:52:04.000000000 -0400 | 47280 | --- linux-2.6.32.15/include/trace/events/irq.h 2010-03-15 11:52:04.000000000 -0400 |
47262 | +++ linux-2.6.32.13/include/trace/events/irq.h 2010-05-15 13:21:17.956129899 -0400 | 47281 | +++ linux-2.6.32.15/include/trace/events/irq.h 2010-05-28 21:27:16.427051097 -0400 |
47263 | @@ -34,7 +34,7 @@ | 47282 | @@ -34,7 +34,7 @@ |
47264 | */ | 47283 | */ |
47265 | TRACE_EVENT(irq_handler_entry, | 47284 | TRACE_EVENT(irq_handler_entry, |
@@ -47296,9 +47315,9 @@ diff -urNp linux-2.6.32.13/include/trace/events/irq.h linux-2.6.32.13/include/tr | |||
47296 | 47315 | ||
47297 | TP_ARGS(h, vec), | 47316 | TP_ARGS(h, vec), |
47298 | 47317 | ||
47299 | diff -urNp linux-2.6.32.13/include/video/uvesafb.h linux-2.6.32.13/include/video/uvesafb.h | 47318 | diff -urNp linux-2.6.32.15/include/video/uvesafb.h linux-2.6.32.15/include/video/uvesafb.h |
47300 | --- linux-2.6.32.13/include/video/uvesafb.h 2010-03-15 11:52:04.000000000 -0400 | 47319 | --- linux-2.6.32.15/include/video/uvesafb.h 2010-03-15 11:52:04.000000000 -0400 |
47301 | +++ linux-2.6.32.13/include/video/uvesafb.h 2010-05-15 13:21:17.956129899 -0400 | 47320 | +++ linux-2.6.32.15/include/video/uvesafb.h 2010-05-28 21:27:16.427051097 -0400 |
47302 | @@ -177,6 +177,7 @@ struct uvesafb_par { | 47321 | @@ -177,6 +177,7 @@ struct uvesafb_par { |
47303 | u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ | 47322 | u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ |
47304 | u8 pmi_setpal; /* PMI for palette changes */ | 47323 | u8 pmi_setpal; /* PMI for palette changes */ |
@@ -47307,9 +47326,9 @@ diff -urNp linux-2.6.32.13/include/video/uvesafb.h linux-2.6.32.13/include/video | |||
47307 | void *pmi_start; | 47326 | void *pmi_start; |
47308 | void *pmi_pal; | 47327 | void *pmi_pal; |
47309 | u8 *vbe_state_orig; /* | 47328 | u8 *vbe_state_orig; /* |
47310 | diff -urNp linux-2.6.32.13/init/do_mounts.c linux-2.6.32.13/init/do_mounts.c | 47329 | diff -urNp linux-2.6.32.15/init/do_mounts.c linux-2.6.32.15/init/do_mounts.c |
47311 | --- linux-2.6.32.13/init/do_mounts.c 2010-03-15 11:52:04.000000000 -0400 | 47330 | --- linux-2.6.32.15/init/do_mounts.c 2010-03-15 11:52:04.000000000 -0400 |
47312 | +++ linux-2.6.32.13/init/do_mounts.c 2010-05-15 13:21:17.956129899 -0400 | 47331 | +++ linux-2.6.32.15/init/do_mounts.c 2010-05-28 21:27:16.427051097 -0400 |
47313 | @@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa | 47332 | @@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa |
47314 | 47333 | ||
47315 | static int __init do_mount_root(char *name, char *fs, int flags, void *data) | 47334 | static int __init do_mount_root(char *name, char *fs, int flags, void *data) |
@@ -47355,9 +47374,9 @@ diff -urNp linux-2.6.32.13/init/do_mounts.c linux-2.6.32.13/init/do_mounts.c | |||
47355 | + sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL); | 47374 | + sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL); |
47356 | + sys_chroot((__force char __user *)"."); | 47375 | + sys_chroot((__force char __user *)"."); |
47357 | } | 47376 | } |
47358 | diff -urNp linux-2.6.32.13/init/do_mounts.h linux-2.6.32.13/init/do_mounts.h | 47377 | diff -urNp linux-2.6.32.15/init/do_mounts.h linux-2.6.32.15/init/do_mounts.h |
47359 | --- linux-2.6.32.13/init/do_mounts.h 2010-03-15 11:52:04.000000000 -0400 | 47378 | --- linux-2.6.32.15/init/do_mounts.h 2010-03-15 11:52:04.000000000 -0400 |
47360 | +++ linux-2.6.32.13/init/do_mounts.h 2010-05-15 13:21:18.018620095 -0400 | 47379 | +++ linux-2.6.32.15/init/do_mounts.h 2010-05-28 21:27:16.427051097 -0400 |
47361 | @@ -15,15 +15,15 @@ extern int root_mountflags; | 47380 | @@ -15,15 +15,15 @@ extern int root_mountflags; |
47362 | 47381 | ||
47363 | static inline int create_dev(char *name, dev_t dev) | 47382 | static inline int create_dev(char *name, dev_t dev) |
@@ -47377,9 +47396,9 @@ diff -urNp linux-2.6.32.13/init/do_mounts.h linux-2.6.32.13/init/do_mounts.h | |||
47377 | return 0; | 47396 | return 0; |
47378 | if (!S_ISBLK(stat.st_mode)) | 47397 | if (!S_ISBLK(stat.st_mode)) |
47379 | return 0; | 47398 | return 0; |
47380 | diff -urNp linux-2.6.32.13/init/do_mounts_initrd.c linux-2.6.32.13/init/do_mounts_initrd.c | 47399 | diff -urNp linux-2.6.32.15/init/do_mounts_initrd.c linux-2.6.32.15/init/do_mounts_initrd.c |
47381 | --- linux-2.6.32.13/init/do_mounts_initrd.c 2010-03-15 11:52:04.000000000 -0400 | 47400 | --- linux-2.6.32.15/init/do_mounts_initrd.c 2010-03-15 11:52:04.000000000 -0400 |
47382 | +++ linux-2.6.32.13/init/do_mounts_initrd.c 2010-05-15 13:21:18.018620095 -0400 | 47401 | +++ linux-2.6.32.15/init/do_mounts_initrd.c 2010-05-28 21:27:16.427051097 -0400 |
47383 | @@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel | 47402 | @@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel |
47384 | sys_close(old_fd);sys_close(root_fd); | 47403 | sys_close(old_fd);sys_close(root_fd); |
47385 | sys_close(0);sys_close(1);sys_close(2); | 47404 | sys_close(0);sys_close(1);sys_close(2); |
@@ -47463,9 +47482,9 @@ diff -urNp linux-2.6.32.13/init/do_mounts_initrd.c linux-2.6.32.13/init/do_mount | |||
47463 | + sys_unlink((__force const char __user *)"/initrd.image"); | 47482 | + sys_unlink((__force const char __user *)"/initrd.image"); |
47464 | return 0; | 47483 | return 0; |
47465 | } | 47484 | } |
47466 | diff -urNp linux-2.6.32.13/init/do_mounts_md.c linux-2.6.32.13/init/do_mounts_md.c | 47485 | diff -urNp linux-2.6.32.15/init/do_mounts_md.c linux-2.6.32.15/init/do_mounts_md.c |
47467 | --- linux-2.6.32.13/init/do_mounts_md.c 2010-03-15 11:52:04.000000000 -0400 | 47486 | --- linux-2.6.32.15/init/do_mounts_md.c 2010-03-15 11:52:04.000000000 -0400 |
47468 | +++ linux-2.6.32.13/init/do_mounts_md.c 2010-05-15 13:21:18.018620095 -0400 | 47487 | +++ linux-2.6.32.15/init/do_mounts_md.c 2010-05-28 21:27:16.427051097 -0400 |
47469 | @@ -170,7 +170,7 @@ static void __init md_setup_drive(void) | 47488 | @@ -170,7 +170,7 @@ static void __init md_setup_drive(void) |
47470 | partitioned ? "_d" : "", minor, | 47489 | partitioned ? "_d" : "", minor, |
47471 | md_setup_args[ent].device_names); | 47490 | md_setup_args[ent].device_names); |
@@ -47493,9 +47512,9 @@ diff -urNp linux-2.6.32.13/init/do_mounts_md.c linux-2.6.32.13/init/do_mounts_md | |||
47493 | if (fd >= 0) { | 47512 | if (fd >= 0) { |
47494 | sys_ioctl(fd, RAID_AUTORUN, raid_autopart); | 47513 | sys_ioctl(fd, RAID_AUTORUN, raid_autopart); |
47495 | sys_close(fd); | 47514 | sys_close(fd); |
47496 | diff -urNp linux-2.6.32.13/init/initramfs.c linux-2.6.32.13/init/initramfs.c | 47515 | diff -urNp linux-2.6.32.15/init/initramfs.c linux-2.6.32.15/init/initramfs.c |
47497 | --- linux-2.6.32.13/init/initramfs.c 2010-05-15 13:20:19.362999772 -0400 | 47516 | --- linux-2.6.32.15/init/initramfs.c 2010-05-15 13:20:19.362999772 -0400 |
47498 | +++ linux-2.6.32.13/init/initramfs.c 2010-05-15 13:21:18.018620095 -0400 | 47517 | +++ linux-2.6.32.15/init/initramfs.c 2010-05-28 21:27:16.427051097 -0400 |
47499 | @@ -74,7 +74,7 @@ static void __init free_hash(void) | 47518 | @@ -74,7 +74,7 @@ static void __init free_hash(void) |
47500 | } | 47519 | } |
47501 | } | 47520 | } |
@@ -47604,9 +47623,9 @@ diff -urNp linux-2.6.32.13/init/initramfs.c linux-2.6.32.13/init/initramfs.c | |||
47604 | state = SkipIt; | 47623 | state = SkipIt; |
47605 | next_state = Reset; | 47624 | next_state = Reset; |
47606 | return 0; | 47625 | return 0; |
47607 | diff -urNp linux-2.6.32.13/init/Kconfig linux-2.6.32.13/init/Kconfig | 47626 | diff -urNp linux-2.6.32.15/init/Kconfig linux-2.6.32.15/init/Kconfig |
47608 | --- linux-2.6.32.13/init/Kconfig 2010-03-15 11:52:04.000000000 -0400 | 47627 | --- linux-2.6.32.15/init/Kconfig 2010-03-15 11:52:04.000000000 -0400 |
47609 | +++ linux-2.6.32.13/init/Kconfig 2010-05-15 13:21:18.034611512 -0400 | 47628 | +++ linux-2.6.32.15/init/Kconfig 2010-05-29 16:35:52.581909467 -0400 |
47610 | @@ -1026,7 +1026,7 @@ config SLUB_DEBUG | 47629 | @@ -1026,7 +1026,7 @@ config SLUB_DEBUG |
47611 | 47630 | ||
47612 | config COMPAT_BRK | 47631 | config COMPAT_BRK |
@@ -47616,21 +47635,9 @@ diff -urNp linux-2.6.32.13/init/Kconfig linux-2.6.32.13/init/Kconfig | |||
47616 | help | 47635 | help |
47617 | Randomizing heap placement makes heap exploits harder, but it | 47636 | Randomizing heap placement makes heap exploits harder, but it |
47618 | also breaks ancient binaries (including anything libc5 based). | 47637 | also breaks ancient binaries (including anything libc5 based). |
47619 | @@ -1116,9 +1116,9 @@ config HAVE_GENERIC_DMA_COHERENT | 47638 | diff -urNp linux-2.6.32.15/init/main.c linux-2.6.32.15/init/main.c |
47620 | 47639 | --- linux-2.6.32.15/init/main.c 2010-04-04 20:41:50.060586306 -0400 | |
47621 | config SLABINFO | 47640 | +++ linux-2.6.32.15/init/main.c 2010-05-28 21:27:16.427051097 -0400 |
47622 | bool | ||
47623 | - depends on PROC_FS | ||
47624 | + depends on PROC_FS && !GRKERNSEC_PROC_ADD | ||
47625 | depends on SLAB || SLUB_DEBUG | ||
47626 | - default y | ||
47627 | + default n | ||
47628 | |||
47629 | config RT_MUTEXES | ||
47630 | boolean | ||
47631 | diff -urNp linux-2.6.32.13/init/main.c linux-2.6.32.13/init/main.c | ||
47632 | --- linux-2.6.32.13/init/main.c 2010-04-04 20:41:50.060586306 -0400 | ||
47633 | +++ linux-2.6.32.13/init/main.c 2010-05-15 13:21:18.034611512 -0400 | ||
47634 | @@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) | 47641 | @@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) |
47635 | #ifdef CONFIG_TC | 47642 | #ifdef CONFIG_TC |
47636 | extern void tc_init(void); | 47643 | extern void tc_init(void); |
@@ -47775,9 +47782,9 @@ diff -urNp linux-2.6.32.13/init/main.c linux-2.6.32.13/init/main.c | |||
47775 | /* | 47782 | /* |
47776 | * Ok, we have completed the initial bootup, and | 47783 | * Ok, we have completed the initial bootup, and |
47777 | * we're essentially up and running. Get rid of the | 47784 | * we're essentially up and running. Get rid of the |
47778 | diff -urNp linux-2.6.32.13/init/noinitramfs.c linux-2.6.32.13/init/noinitramfs.c | 47785 | diff -urNp linux-2.6.32.15/init/noinitramfs.c linux-2.6.32.15/init/noinitramfs.c |
47779 | --- linux-2.6.32.13/init/noinitramfs.c 2010-03-15 11:52:04.000000000 -0400 | 47786 | --- linux-2.6.32.15/init/noinitramfs.c 2010-03-15 11:52:04.000000000 -0400 |
47780 | +++ linux-2.6.32.13/init/noinitramfs.c 2010-05-15 13:21:18.034611512 -0400 | 47787 | +++ linux-2.6.32.15/init/noinitramfs.c 2010-05-28 21:27:16.427051097 -0400 |
47781 | @@ -29,7 +29,7 @@ static int __init default_rootfs(void) | 47788 | @@ -29,7 +29,7 @@ static int __init default_rootfs(void) |
47782 | { | 47789 | { |
47783 | int err; | 47790 | int err; |
@@ -47796,9 +47803,9 @@ diff -urNp linux-2.6.32.13/init/noinitramfs.c linux-2.6.32.13/init/noinitramfs.c | |||
47796 | if (err < 0) | 47803 | if (err < 0) |
47797 | goto out; | 47804 | goto out; |
47798 | 47805 | ||
47799 | diff -urNp linux-2.6.32.13/ipc/ipc_sysctl.c linux-2.6.32.13/ipc/ipc_sysctl.c | 47806 | diff -urNp linux-2.6.32.15/ipc/ipc_sysctl.c linux-2.6.32.15/ipc/ipc_sysctl.c |
47800 | --- linux-2.6.32.13/ipc/ipc_sysctl.c 2010-03-15 11:52:04.000000000 -0400 | 47807 | --- linux-2.6.32.15/ipc/ipc_sysctl.c 2010-03-15 11:52:04.000000000 -0400 |
47801 | +++ linux-2.6.32.13/ipc/ipc_sysctl.c 2010-05-15 13:21:18.060013842 -0400 | 47808 | +++ linux-2.6.32.15/ipc/ipc_sysctl.c 2010-05-28 21:27:16.427051097 -0400 |
47802 | @@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[] | 47809 | @@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[] |
47803 | .extra1 = &zero, | 47810 | .extra1 = &zero, |
47804 | .extra2 = &one, | 47811 | .extra2 = &one, |
@@ -47817,9 +47824,9 @@ diff -urNp linux-2.6.32.13/ipc/ipc_sysctl.c linux-2.6.32.13/ipc/ipc_sysctl.c | |||
47817 | }; | 47824 | }; |
47818 | 47825 | ||
47819 | static int __init ipc_sysctl_init(void) | 47826 | static int __init ipc_sysctl_init(void) |
47820 | diff -urNp linux-2.6.32.13/ipc/mqueue.c linux-2.6.32.13/ipc/mqueue.c | 47827 | diff -urNp linux-2.6.32.15/ipc/mqueue.c linux-2.6.32.15/ipc/mqueue.c |
47821 | --- linux-2.6.32.13/ipc/mqueue.c 2010-04-04 20:41:50.060586306 -0400 | 47828 | --- linux-2.6.32.15/ipc/mqueue.c 2010-04-04 20:41:50.060586306 -0400 |
47822 | +++ linux-2.6.32.13/ipc/mqueue.c 2010-05-15 13:21:18.060013842 -0400 | 47829 | +++ linux-2.6.32.15/ipc/mqueue.c 2010-05-28 21:27:16.431938706 -0400 |
47823 | @@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st | 47830 | @@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st |
47824 | mq_bytes = (mq_msg_tblsz + | 47831 | mq_bytes = (mq_msg_tblsz + |
47825 | (info->attr.mq_maxmsg * info->attr.mq_msgsize)); | 47832 | (info->attr.mq_maxmsg * info->attr.mq_msgsize)); |
@@ -47828,9 +47835,9 @@ diff -urNp linux-2.6.32.13/ipc/mqueue.c linux-2.6.32.13/ipc/mqueue.c | |||
47828 | spin_lock(&mq_lock); | 47835 | spin_lock(&mq_lock); |
47829 | if (u->mq_bytes + mq_bytes < u->mq_bytes || | 47836 | if (u->mq_bytes + mq_bytes < u->mq_bytes || |
47830 | u->mq_bytes + mq_bytes > | 47837 | u->mq_bytes + mq_bytes > |
47831 | diff -urNp linux-2.6.32.13/ipc/shm.c linux-2.6.32.13/ipc/shm.c | 47838 | diff -urNp linux-2.6.32.15/ipc/shm.c linux-2.6.32.15/ipc/shm.c |
47832 | --- linux-2.6.32.13/ipc/shm.c 2010-03-15 11:52:04.000000000 -0400 | 47839 | --- linux-2.6.32.15/ipc/shm.c 2010-03-15 11:52:04.000000000 -0400 |
47833 | +++ linux-2.6.32.13/ipc/shm.c 2010-05-15 13:21:18.060013842 -0400 | 47840 | +++ linux-2.6.32.15/ipc/shm.c 2010-05-28 21:27:16.431938706 -0400 |
47834 | @@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name | 47841 | @@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name |
47835 | static int sysvipc_shm_proc_show(struct seq_file *s, void *it); | 47842 | static int sysvipc_shm_proc_show(struct seq_file *s, void *it); |
47836 | #endif | 47843 | #endif |
@@ -47883,9 +47890,9 @@ diff -urNp linux-2.6.32.13/ipc/shm.c linux-2.6.32.13/ipc/shm.c | |||
47883 | size = i_size_read(path.dentry->d_inode); | 47890 | size = i_size_read(path.dentry->d_inode); |
47884 | shm_unlock(shp); | 47891 | shm_unlock(shp); |
47885 | 47892 | ||
47886 | diff -urNp linux-2.6.32.13/kernel/acct.c linux-2.6.32.13/kernel/acct.c | 47893 | diff -urNp linux-2.6.32.15/kernel/acct.c linux-2.6.32.15/kernel/acct.c |
47887 | --- linux-2.6.32.13/kernel/acct.c 2010-03-15 11:52:04.000000000 -0400 | 47894 | --- linux-2.6.32.15/kernel/acct.c 2010-03-15 11:52:04.000000000 -0400 |
47888 | +++ linux-2.6.32.13/kernel/acct.c 2010-05-15 13:21:18.060013842 -0400 | 47895 | +++ linux-2.6.32.15/kernel/acct.c 2010-05-28 21:27:16.431938706 -0400 |
47889 | @@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a | 47896 | @@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a |
47890 | */ | 47897 | */ |
47891 | flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; | 47898 | flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; |
@@ -47895,9 +47902,9 @@ diff -urNp linux-2.6.32.13/kernel/acct.c linux-2.6.32.13/kernel/acct.c | |||
47895 | sizeof(acct_t), &file->f_pos); | 47902 | sizeof(acct_t), &file->f_pos); |
47896 | current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; | 47903 | current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; |
47897 | set_fs(fs); | 47904 | set_fs(fs); |
47898 | diff -urNp linux-2.6.32.13/kernel/capability.c linux-2.6.32.13/kernel/capability.c | 47905 | diff -urNp linux-2.6.32.15/kernel/capability.c linux-2.6.32.15/kernel/capability.c |
47899 | --- linux-2.6.32.13/kernel/capability.c 2010-03-15 11:52:04.000000000 -0400 | 47906 | --- linux-2.6.32.15/kernel/capability.c 2010-03-15 11:52:04.000000000 -0400 |
47900 | +++ linux-2.6.32.13/kernel/capability.c 2010-05-15 13:21:18.079122751 -0400 | 47907 | +++ linux-2.6.32.15/kernel/capability.c 2010-05-28 21:27:16.431938706 -0400 |
47901 | @@ -306,10 +306,21 @@ int capable(int cap) | 47908 | @@ -306,10 +306,21 @@ int capable(int cap) |
47902 | BUG(); | 47909 | BUG(); |
47903 | } | 47910 | } |
@@ -47921,9 +47928,9 @@ diff -urNp linux-2.6.32.13/kernel/capability.c linux-2.6.32.13/kernel/capability | |||
47921 | + | 47928 | + |
47922 | EXPORT_SYMBOL(capable); | 47929 | EXPORT_SYMBOL(capable); |
47923 | +EXPORT_SYMBOL(capable_nolog); | 47930 | +EXPORT_SYMBOL(capable_nolog); |
47924 | diff -urNp linux-2.6.32.13/kernel/configs.c linux-2.6.32.13/kernel/configs.c | 47931 | diff -urNp linux-2.6.32.15/kernel/configs.c linux-2.6.32.15/kernel/configs.c |
47925 | --- linux-2.6.32.13/kernel/configs.c 2010-03-15 11:52:04.000000000 -0400 | 47932 | --- linux-2.6.32.15/kernel/configs.c 2010-03-15 11:52:04.000000000 -0400 |
47926 | +++ linux-2.6.32.13/kernel/configs.c 2010-05-15 13:21:18.079122751 -0400 | 47933 | +++ linux-2.6.32.15/kernel/configs.c 2010-05-28 21:27:16.431938706 -0400 |
47927 | @@ -73,8 +73,19 @@ static int __init ikconfig_init(void) | 47934 | @@ -73,8 +73,19 @@ static int __init ikconfig_init(void) |
47928 | struct proc_dir_entry *entry; | 47935 | struct proc_dir_entry *entry; |
47929 | 47936 | ||
@@ -47944,9 +47951,9 @@ diff -urNp linux-2.6.32.13/kernel/configs.c linux-2.6.32.13/kernel/configs.c | |||
47944 | if (!entry) | 47951 | if (!entry) |
47945 | return -ENOMEM; | 47952 | return -ENOMEM; |
47946 | 47953 | ||
47947 | diff -urNp linux-2.6.32.13/kernel/cpu.c linux-2.6.32.13/kernel/cpu.c | 47954 | diff -urNp linux-2.6.32.15/kernel/cpu.c linux-2.6.32.15/kernel/cpu.c |
47948 | --- linux-2.6.32.13/kernel/cpu.c 2010-03-15 11:52:04.000000000 -0400 | 47955 | --- linux-2.6.32.15/kernel/cpu.c 2010-03-15 11:52:04.000000000 -0400 |
47949 | +++ linux-2.6.32.13/kernel/cpu.c 2010-05-15 13:21:18.079122751 -0400 | 47956 | +++ linux-2.6.32.15/kernel/cpu.c 2010-05-28 21:27:16.431938706 -0400 |
47950 | @@ -19,7 +19,7 @@ | 47957 | @@ -19,7 +19,7 @@ |
47951 | /* Serializes the updates to cpu_online_mask, cpu_present_mask */ | 47958 | /* Serializes the updates to cpu_online_mask, cpu_present_mask */ |
47952 | static DEFINE_MUTEX(cpu_add_remove_lock); | 47959 | static DEFINE_MUTEX(cpu_add_remove_lock); |
@@ -47956,9 +47963,9 @@ diff -urNp linux-2.6.32.13/kernel/cpu.c linux-2.6.32.13/kernel/cpu.c | |||
47956 | 47963 | ||
47957 | /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. | 47964 | /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. |
47958 | * Should always be manipulated under cpu_add_remove_lock | 47965 | * Should always be manipulated under cpu_add_remove_lock |
47959 | diff -urNp linux-2.6.32.13/kernel/cred.c linux-2.6.32.13/kernel/cred.c | 47966 | diff -urNp linux-2.6.32.15/kernel/cred.c linux-2.6.32.15/kernel/cred.c |
47960 | --- linux-2.6.32.13/kernel/cred.c 2010-05-15 13:20:19.362999772 -0400 | 47967 | --- linux-2.6.32.15/kernel/cred.c 2010-05-15 13:20:19.362999772 -0400 |
47961 | +++ linux-2.6.32.13/kernel/cred.c 2010-05-15 13:21:18.079122751 -0400 | 47968 | +++ linux-2.6.32.15/kernel/cred.c 2010-05-28 21:27:16.431938706 -0400 |
47962 | @@ -520,6 +520,8 @@ int commit_creds(struct cred *new) | 47969 | @@ -520,6 +520,8 @@ int commit_creds(struct cred *new) |
47963 | 47970 | ||
47964 | get_cred(new); /* we will require a ref for the subj creds too */ | 47971 | get_cred(new); /* we will require a ref for the subj creds too */ |
@@ -47968,9 +47975,9 @@ diff -urNp linux-2.6.32.13/kernel/cred.c linux-2.6.32.13/kernel/cred.c | |||
47968 | /* dumpability changes */ | 47975 | /* dumpability changes */ |
47969 | if (old->euid != new->euid || | 47976 | if (old->euid != new->euid || |
47970 | old->egid != new->egid || | 47977 | old->egid != new->egid || |
47971 | diff -urNp linux-2.6.32.13/kernel/exit.c linux-2.6.32.13/kernel/exit.c | 47978 | diff -urNp linux-2.6.32.15/kernel/exit.c linux-2.6.32.15/kernel/exit.c |
47972 | --- linux-2.6.32.13/kernel/exit.c 2010-03-15 11:52:04.000000000 -0400 | 47979 | --- linux-2.6.32.15/kernel/exit.c 2010-03-15 11:52:04.000000000 -0400 |
47973 | +++ linux-2.6.32.13/kernel/exit.c 2010-05-15 13:21:18.103069718 -0400 | 47980 | +++ linux-2.6.32.15/kernel/exit.c 2010-05-28 21:27:16.431938706 -0400 |
47974 | @@ -56,6 +56,10 @@ | 47981 | @@ -56,6 +56,10 @@ |
47975 | #include <asm/mmu_context.h> | 47982 | #include <asm/mmu_context.h> |
47976 | #include "cred-internals.h" | 47983 | #include "cred-internals.h" |
@@ -48060,9 +48067,9 @@ diff -urNp linux-2.6.32.13/kernel/exit.c linux-2.6.32.13/kernel/exit.c | |||
48060 | 48067 | ||
48061 | get_task_struct(p); | 48068 | get_task_struct(p); |
48062 | read_unlock(&tasklist_lock); | 48069 | read_unlock(&tasklist_lock); |
48063 | diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c | 48070 | diff -urNp linux-2.6.32.15/kernel/fork.c linux-2.6.32.15/kernel/fork.c |
48064 | --- linux-2.6.32.13/kernel/fork.c 2010-03-15 11:52:04.000000000 -0400 | 48071 | --- linux-2.6.32.15/kernel/fork.c 2010-05-28 20:16:44.458924952 -0400 |
48065 | +++ linux-2.6.32.13/kernel/fork.c 2010-05-15 13:21:18.103069718 -0400 | 48072 | +++ linux-2.6.32.15/kernel/fork.c 2010-05-28 21:27:16.436716677 -0400 |
48066 | @@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru | 48073 | @@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru |
48067 | *stackend = STACK_END_MAGIC; /* for overflow detection */ | 48074 | *stackend = STACK_END_MAGIC; /* for overflow detection */ |
48068 | 48075 | ||
@@ -48159,7 +48166,7 @@ diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c | |||
48159 | init_sigpending(&p->pending); | 48166 | init_sigpending(&p->pending); |
48160 | 48167 | ||
48161 | p->utime = cputime_zero; | 48168 | p->utime = cputime_zero; |
48162 | @@ -1179,6 +1212,8 @@ static struct task_struct *copy_process( | 48169 | @@ -1177,6 +1210,8 @@ static struct task_struct *copy_process( |
48163 | goto bad_fork_free_pid; | 48170 | goto bad_fork_free_pid; |
48164 | } | 48171 | } |
48165 | 48172 | ||
@@ -48168,7 +48175,7 @@ diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c | |||
48168 | p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL; | 48175 | p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL; |
48169 | /* | 48176 | /* |
48170 | * Clear TID on mm_release()? | 48177 | * Clear TID on mm_release()? |
48171 | @@ -1344,6 +1379,8 @@ bad_fork_cleanup_count: | 48178 | @@ -1342,6 +1377,8 @@ bad_fork_cleanup_count: |
48172 | bad_fork_free: | 48179 | bad_fork_free: |
48173 | free_task(p); | 48180 | free_task(p); |
48174 | fork_out: | 48181 | fork_out: |
@@ -48177,7 +48184,7 @@ diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c | |||
48177 | return ERR_PTR(retval); | 48184 | return ERR_PTR(retval); |
48178 | } | 48185 | } |
48179 | 48186 | ||
48180 | @@ -1437,6 +1474,8 @@ long do_fork(unsigned long clone_flags, | 48187 | @@ -1435,6 +1472,8 @@ long do_fork(unsigned long clone_flags, |
48181 | if (clone_flags & CLONE_PARENT_SETTID) | 48188 | if (clone_flags & CLONE_PARENT_SETTID) |
48182 | put_user(nr, parent_tidptr); | 48189 | put_user(nr, parent_tidptr); |
48183 | 48190 | ||
@@ -48186,7 +48193,7 @@ diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c | |||
48186 | if (clone_flags & CLONE_VFORK) { | 48193 | if (clone_flags & CLONE_VFORK) { |
48187 | p->vfork_done = &vfork; | 48194 | p->vfork_done = &vfork; |
48188 | init_completion(&vfork); | 48195 | init_completion(&vfork); |
48189 | @@ -1569,7 +1608,7 @@ static int unshare_fs(unsigned long unsh | 48196 | @@ -1567,7 +1606,7 @@ static int unshare_fs(unsigned long unsh |
48190 | return 0; | 48197 | return 0; |
48191 | 48198 | ||
48192 | /* don't need lock here; in the worst case we'll do useless copy */ | 48199 | /* don't need lock here; in the worst case we'll do useless copy */ |
@@ -48195,7 +48202,7 @@ diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c | |||
48195 | return 0; | 48202 | return 0; |
48196 | 48203 | ||
48197 | *new_fsp = copy_fs_struct(fs); | 48204 | *new_fsp = copy_fs_struct(fs); |
48198 | @@ -1689,14 +1728,18 @@ SYSCALL_DEFINE1(unshare, unsigned long, | 48205 | @@ -1687,14 +1726,18 @@ SYSCALL_DEFINE1(unshare, unsigned long, |
48199 | task_lock(current); | 48206 | task_lock(current); |
48200 | 48207 | ||
48201 | if (new_fs) { | 48208 | if (new_fs) { |
@@ -48215,9 +48222,9 @@ diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c | |||
48215 | } | 48222 | } |
48216 | 48223 | ||
48217 | if (new_mm) { | 48224 | if (new_mm) { |
48218 | diff -urNp linux-2.6.32.13/kernel/futex.c linux-2.6.32.13/kernel/futex.c | 48225 | diff -urNp linux-2.6.32.15/kernel/futex.c linux-2.6.32.15/kernel/futex.c |
48219 | --- linux-2.6.32.13/kernel/futex.c 2010-03-15 11:52:04.000000000 -0400 | 48226 | --- linux-2.6.32.15/kernel/futex.c 2010-03-15 11:52:04.000000000 -0400 |
48220 | +++ linux-2.6.32.13/kernel/futex.c 2010-05-15 13:21:18.106616956 -0400 | 48227 | +++ linux-2.6.32.15/kernel/futex.c 2010-05-28 21:27:16.439128347 -0400 |
48221 | @@ -54,6 +54,7 @@ | 48228 | @@ -54,6 +54,7 @@ |
48222 | #include <linux/mount.h> | 48229 | #include <linux/mount.h> |
48223 | #include <linux/pagemap.h> | 48230 | #include <linux/pagemap.h> |
@@ -48285,9 +48292,9 @@ diff -urNp linux-2.6.32.13/kernel/futex.c linux-2.6.32.13/kernel/futex.c | |||
48285 | { | 48292 | { |
48286 | unsigned long uentry; | 48293 | unsigned long uentry; |
48287 | 48294 | ||
48288 | diff -urNp linux-2.6.32.13/kernel/futex_compat.c linux-2.6.32.13/kernel/futex_compat.c | 48295 | diff -urNp linux-2.6.32.15/kernel/futex_compat.c linux-2.6.32.15/kernel/futex_compat.c |
48289 | --- linux-2.6.32.13/kernel/futex_compat.c 2010-03-15 11:52:04.000000000 -0400 | 48296 | --- linux-2.6.32.15/kernel/futex_compat.c 2010-03-15 11:52:04.000000000 -0400 |
48290 | +++ linux-2.6.32.13/kernel/futex_compat.c 2010-05-15 13:21:18.106616956 -0400 | 48297 | +++ linux-2.6.32.15/kernel/futex_compat.c 2010-05-28 21:27:16.439128347 -0400 |
48291 | @@ -10,6 +10,7 @@ | 48298 | @@ -10,6 +10,7 @@ |
48292 | #include <linux/compat.h> | 48299 | #include <linux/compat.h> |
48293 | #include <linux/nsproxy.h> | 48300 | #include <linux/nsproxy.h> |
@@ -48325,9 +48332,9 @@ diff -urNp linux-2.6.32.13/kernel/futex_compat.c linux-2.6.32.13/kernel/futex_co | |||
48325 | head = p->compat_robust_list; | 48332 | head = p->compat_robust_list; |
48326 | read_unlock(&tasklist_lock); | 48333 | read_unlock(&tasklist_lock); |
48327 | } | 48334 | } |
48328 | diff -urNp linux-2.6.32.13/kernel/gcov/base.c linux-2.6.32.13/kernel/gcov/base.c | 48335 | diff -urNp linux-2.6.32.15/kernel/gcov/base.c linux-2.6.32.15/kernel/gcov/base.c |
48329 | --- linux-2.6.32.13/kernel/gcov/base.c 2010-03-15 11:52:04.000000000 -0400 | 48336 | --- linux-2.6.32.15/kernel/gcov/base.c 2010-03-15 11:52:04.000000000 -0400 |
48330 | +++ linux-2.6.32.13/kernel/gcov/base.c 2010-05-15 13:21:18.106616956 -0400 | 48337 | +++ linux-2.6.32.15/kernel/gcov/base.c 2010-05-28 21:27:16.439128347 -0400 |
48331 | @@ -102,11 +102,6 @@ void gcov_enable_events(void) | 48338 | @@ -102,11 +102,6 @@ void gcov_enable_events(void) |
48332 | } | 48339 | } |
48333 | 48340 | ||
@@ -48349,9 +48356,9 @@ diff -urNp linux-2.6.32.13/kernel/gcov/base.c linux-2.6.32.13/kernel/gcov/base.c | |||
48349 | if (prev) | 48356 | if (prev) |
48350 | prev->next = info->next; | 48357 | prev->next = info->next; |
48351 | else | 48358 | else |
48352 | diff -urNp linux-2.6.32.13/kernel/hrtimer.c linux-2.6.32.13/kernel/hrtimer.c | 48359 | diff -urNp linux-2.6.32.15/kernel/hrtimer.c linux-2.6.32.15/kernel/hrtimer.c |
48353 | --- linux-2.6.32.13/kernel/hrtimer.c 2010-04-04 20:41:50.064534828 -0400 | 48360 | --- linux-2.6.32.15/kernel/hrtimer.c 2010-04-04 20:41:50.064534828 -0400 |
48354 | +++ linux-2.6.32.13/kernel/hrtimer.c 2010-05-15 13:21:18.118636223 -0400 | 48361 | +++ linux-2.6.32.15/kernel/hrtimer.c 2010-05-28 21:27:16.439128347 -0400 |
48355 | @@ -1382,7 +1382,7 @@ void hrtimer_peek_ahead_timers(void) | 48362 | @@ -1382,7 +1382,7 @@ void hrtimer_peek_ahead_timers(void) |
48356 | local_irq_restore(flags); | 48363 | local_irq_restore(flags); |
48357 | } | 48364 | } |
@@ -48361,9 +48368,9 @@ diff -urNp linux-2.6.32.13/kernel/hrtimer.c linux-2.6.32.13/kernel/hrtimer.c | |||
48361 | { | 48368 | { |
48362 | hrtimer_peek_ahead_timers(); | 48369 | hrtimer_peek_ahead_timers(); |
48363 | } | 48370 | } |
48364 | diff -urNp linux-2.6.32.13/kernel/kallsyms.c linux-2.6.32.13/kernel/kallsyms.c | 48371 | diff -urNp linux-2.6.32.15/kernel/kallsyms.c linux-2.6.32.15/kernel/kallsyms.c |
48365 | --- linux-2.6.32.13/kernel/kallsyms.c 2010-03-15 11:52:04.000000000 -0400 | 48372 | --- linux-2.6.32.15/kernel/kallsyms.c 2010-03-15 11:52:04.000000000 -0400 |
48366 | +++ linux-2.6.32.13/kernel/kallsyms.c 2010-05-15 13:21:18.118636223 -0400 | 48373 | +++ linux-2.6.32.15/kernel/kallsyms.c 2010-05-28 21:27:16.439128347 -0400 |
48367 | @@ -11,6 +11,9 @@ | 48374 | @@ -11,6 +11,9 @@ |
48368 | * Changed the compression method from stem compression to "table lookup" | 48375 | * Changed the compression method from stem compression to "table lookup" |
48369 | * compression (see scripts/kallsyms.c for a more complete description) | 48376 | * compression (see scripts/kallsyms.c for a more complete description) |
@@ -48440,9 +48447,9 @@ diff -urNp linux-2.6.32.13/kernel/kallsyms.c linux-2.6.32.13/kernel/kallsyms.c | |||
48440 | if (!iter) | 48447 | if (!iter) |
48441 | return -ENOMEM; | 48448 | return -ENOMEM; |
48442 | reset_iter(iter, 0); | 48449 | reset_iter(iter, 0); |
48443 | diff -urNp linux-2.6.32.13/kernel/kgdb.c linux-2.6.32.13/kernel/kgdb.c | 48450 | diff -urNp linux-2.6.32.15/kernel/kgdb.c linux-2.6.32.15/kernel/kgdb.c |
48444 | --- linux-2.6.32.13/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 | 48451 | --- linux-2.6.32.15/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 |
48445 | +++ linux-2.6.32.13/kernel/kgdb.c 2010-05-15 13:21:18.118636223 -0400 | 48452 | +++ linux-2.6.32.15/kernel/kgdb.c 2010-05-28 21:27:16.439128347 -0400 |
48446 | @@ -86,7 +86,7 @@ static int kgdb_io_module_registered; | 48453 | @@ -86,7 +86,7 @@ static int kgdb_io_module_registered; |
48447 | /* Guard for recursive entry */ | 48454 | /* Guard for recursive entry */ |
48448 | static int exception_level; | 48455 | static int exception_level; |
@@ -48470,9 +48477,9 @@ diff -urNp linux-2.6.32.13/kernel/kgdb.c linux-2.6.32.13/kernel/kgdb.c | |||
48470 | { | 48477 | { |
48471 | BUG_ON(kgdb_connected); | 48478 | BUG_ON(kgdb_connected); |
48472 | 48479 | ||
48473 | diff -urNp linux-2.6.32.13/kernel/kmod.c linux-2.6.32.13/kernel/kmod.c | 48480 | diff -urNp linux-2.6.32.15/kernel/kmod.c linux-2.6.32.15/kernel/kmod.c |
48474 | --- linux-2.6.32.13/kernel/kmod.c 2010-03-15 11:52:04.000000000 -0400 | 48481 | --- linux-2.6.32.15/kernel/kmod.c 2010-03-15 11:52:04.000000000 -0400 |
48475 | +++ linux-2.6.32.13/kernel/kmod.c 2010-05-15 13:21:18.118636223 -0400 | 48482 | +++ linux-2.6.32.15/kernel/kmod.c 2010-05-28 21:27:16.439128347 -0400 |
48476 | @@ -90,6 +90,18 @@ int __request_module(bool wait, const ch | 48483 | @@ -90,6 +90,18 @@ int __request_module(bool wait, const ch |
48477 | if (ret >= MODULE_NAME_LEN) | 48484 | if (ret >= MODULE_NAME_LEN) |
48478 | return -ENAMETOOLONG; | 48485 | return -ENAMETOOLONG; |
@@ -48492,9 +48499,9 @@ diff -urNp linux-2.6.32.13/kernel/kmod.c linux-2.6.32.13/kernel/kmod.c | |||
48492 | /* If modprobe needs a service that is in a module, we get a recursive | 48499 | /* If modprobe needs a service that is in a module, we get a recursive |
48493 | * loop. Limit the number of running kmod threads to max_threads/2 or | 48500 | * loop. Limit the number of running kmod threads to max_threads/2 or |
48494 | * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method | 48501 | * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method |
48495 | diff -urNp linux-2.6.32.13/kernel/kprobes.c linux-2.6.32.13/kernel/kprobes.c | 48502 | diff -urNp linux-2.6.32.15/kernel/kprobes.c linux-2.6.32.15/kernel/kprobes.c |
48496 | --- linux-2.6.32.13/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400 | 48503 | --- linux-2.6.32.15/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400 |
48497 | +++ linux-2.6.32.13/kernel/kprobes.c 2010-05-15 13:21:18.118636223 -0400 | 48504 | +++ linux-2.6.32.15/kernel/kprobes.c 2010-05-28 21:27:16.439128347 -0400 |
48498 | @@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_ | 48505 | @@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_ |
48499 | * kernel image and loaded module images reside. This is required | 48506 | * kernel image and loaded module images reside. This is required |
48500 | * so x86_64 can correctly handle the %rip-relative fixups. | 48507 | * so x86_64 can correctly handle the %rip-relative fixups. |
@@ -48531,9 +48538,9 @@ diff -urNp linux-2.6.32.13/kernel/kprobes.c linux-2.6.32.13/kernel/kprobes.c | |||
48531 | 48538 | ||
48532 | head = &kprobe_table[i]; | 48539 | head = &kprobe_table[i]; |
48533 | preempt_disable(); | 48540 | preempt_disable(); |
48534 | diff -urNp linux-2.6.32.13/kernel/lockdep.c linux-2.6.32.13/kernel/lockdep.c | 48541 | diff -urNp linux-2.6.32.15/kernel/lockdep.c linux-2.6.32.15/kernel/lockdep.c |
48535 | --- linux-2.6.32.13/kernel/lockdep.c 2010-04-29 17:49:38.578001941 -0400 | 48542 | --- linux-2.6.32.15/kernel/lockdep.c 2010-06-01 15:02:53.017540947 -0400 |
48536 | +++ linux-2.6.32.13/kernel/lockdep.c 2010-05-15 13:21:18.122615093 -0400 | 48543 | +++ linux-2.6.32.15/kernel/lockdep.c 2010-06-01 15:06:14.633871339 -0400 |
48537 | @@ -577,6 +577,10 @@ static int static_obj(void *obj) | 48544 | @@ -577,6 +577,10 @@ static int static_obj(void *obj) |
48538 | int i; | 48545 | int i; |
48539 | #endif | 48546 | #endif |
@@ -48548,9 +48555,9 @@ diff -urNp linux-2.6.32.13/kernel/lockdep.c linux-2.6.32.13/kernel/lockdep.c | |||
48548 | @@ -592,8 +596,7 @@ static int static_obj(void *obj) | 48555 | @@ -592,8 +596,7 @@ static int static_obj(void *obj) |
48549 | */ | 48556 | */ |
48550 | for_each_possible_cpu(i) { | 48557 | for_each_possible_cpu(i) { |
48551 | start = (unsigned long) per_cpu_ptr(&__per_cpu_start, i); | 48558 | start = (unsigned long) &__per_cpu_start + per_cpu_offset(i); |
48552 | - end = (unsigned long) per_cpu_ptr(&__per_cpu_start, i) | 48559 | - end = (unsigned long) &__per_cpu_start + PERCPU_ENOUGH_ROOM |
48553 | - + PERCPU_ENOUGH_ROOM; | 48560 | - + per_cpu_offset(i); |
48554 | + end = start + PERCPU_ENOUGH_ROOM; | 48561 | + end = start + PERCPU_ENOUGH_ROOM; |
48555 | 48562 | ||
48556 | if ((addr >= start) && (addr < end)) | 48563 | if ((addr >= start) && (addr < end)) |
@@ -48563,9 +48570,9 @@ diff -urNp linux-2.6.32.13/kernel/lockdep.c linux-2.6.32.13/kernel/lockdep.c | |||
48563 | printk("the code is fine but needs lockdep annotation.\n"); | 48570 | printk("the code is fine but needs lockdep annotation.\n"); |
48564 | printk("turning off the locking correctness validator.\n"); | 48571 | printk("turning off the locking correctness validator.\n"); |
48565 | dump_stack(); | 48572 | dump_stack(); |
48566 | diff -urNp linux-2.6.32.13/kernel/lockdep_proc.c linux-2.6.32.13/kernel/lockdep_proc.c | 48573 | diff -urNp linux-2.6.32.15/kernel/lockdep_proc.c linux-2.6.32.15/kernel/lockdep_proc.c |
48567 | --- linux-2.6.32.13/kernel/lockdep_proc.c 2010-03-15 11:52:04.000000000 -0400 | 48574 | --- linux-2.6.32.15/kernel/lockdep_proc.c 2010-03-15 11:52:04.000000000 -0400 |
48568 | +++ linux-2.6.32.13/kernel/lockdep_proc.c 2010-05-15 13:21:18.122615093 -0400 | 48575 | +++ linux-2.6.32.15/kernel/lockdep_proc.c 2010-05-28 21:27:16.439128347 -0400 |
48569 | @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v | 48576 | @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v |
48570 | 48577 | ||
48571 | static void print_name(struct seq_file *m, struct lock_class *class) | 48578 | static void print_name(struct seq_file *m, struct lock_class *class) |
@@ -48575,9 +48582,9 @@ diff -urNp linux-2.6.32.13/kernel/lockdep_proc.c linux-2.6.32.13/kernel/lockdep_ | |||
48575 | const char *name = class->name; | 48582 | const char *name = class->name; |
48576 | 48583 | ||
48577 | if (!name) { | 48584 | if (!name) { |
48578 | diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c | 48585 | diff -urNp linux-2.6.32.15/kernel/module.c linux-2.6.32.15/kernel/module.c |
48579 | --- linux-2.6.32.13/kernel/module.c 2010-04-29 17:49:38.586002480 -0400 | 48586 | --- linux-2.6.32.15/kernel/module.c 2010-06-01 15:02:53.053672396 -0400 |
48580 | +++ linux-2.6.32.13/kernel/module.c 2010-05-15 13:21:18.134612708 -0400 | 48587 | +++ linux-2.6.32.15/kernel/module.c 2010-06-01 15:03:15.410128488 -0400 |
48581 | @@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq | 48588 | @@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq |
48582 | static BLOCKING_NOTIFIER_HEAD(module_notify_list); | 48589 | static BLOCKING_NOTIFIER_HEAD(module_notify_list); |
48583 | 48590 | ||
@@ -49117,9 +49124,9 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c | |||
49117 | mod = NULL; | 49124 | mod = NULL; |
49118 | } | 49125 | } |
49119 | return mod; | 49126 | return mod; |
49120 | diff -urNp linux-2.6.32.13/kernel/panic.c linux-2.6.32.13/kernel/panic.c | 49127 | diff -urNp linux-2.6.32.15/kernel/panic.c linux-2.6.32.15/kernel/panic.c |
49121 | --- linux-2.6.32.13/kernel/panic.c 2010-03-15 11:52:04.000000000 -0400 | 49128 | --- linux-2.6.32.15/kernel/panic.c 2010-03-15 11:52:04.000000000 -0400 |
49122 | +++ linux-2.6.32.13/kernel/panic.c 2010-05-15 13:21:18.146612793 -0400 | 49129 | +++ linux-2.6.32.15/kernel/panic.c 2010-05-28 21:27:16.442904432 -0400 |
49123 | @@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null); | 49130 | @@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null); |
49124 | */ | 49131 | */ |
49125 | void __stack_chk_fail(void) | 49132 | void __stack_chk_fail(void) |
@@ -49130,9 +49137,9 @@ diff -urNp linux-2.6.32.13/kernel/panic.c linux-2.6.32.13/kernel/panic.c | |||
49130 | __builtin_return_address(0)); | 49137 | __builtin_return_address(0)); |
49131 | } | 49138 | } |
49132 | EXPORT_SYMBOL(__stack_chk_fail); | 49139 | EXPORT_SYMBOL(__stack_chk_fail); |
49133 | diff -urNp linux-2.6.32.13/kernel/params.c linux-2.6.32.13/kernel/params.c | 49140 | diff -urNp linux-2.6.32.15/kernel/params.c linux-2.6.32.15/kernel/params.c |
49134 | --- linux-2.6.32.13/kernel/params.c 2010-03-15 11:52:04.000000000 -0400 | 49141 | --- linux-2.6.32.15/kernel/params.c 2010-03-15 11:52:04.000000000 -0400 |
49135 | +++ linux-2.6.32.13/kernel/params.c 2010-05-15 13:21:18.146612793 -0400 | 49142 | +++ linux-2.6.32.15/kernel/params.c 2010-05-28 21:27:16.442904432 -0400 |
49136 | @@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct | 49143 | @@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct |
49137 | return ret; | 49144 | return ret; |
49138 | } | 49145 | } |
@@ -49151,9 +49158,9 @@ diff -urNp linux-2.6.32.13/kernel/params.c linux-2.6.32.13/kernel/params.c | |||
49151 | .filter = uevent_filter, | 49158 | .filter = uevent_filter, |
49152 | }; | 49159 | }; |
49153 | 49160 | ||
49154 | diff -urNp linux-2.6.32.13/kernel/pid.c linux-2.6.32.13/kernel/pid.c | 49161 | diff -urNp linux-2.6.32.15/kernel/pid.c linux-2.6.32.15/kernel/pid.c |
49155 | --- linux-2.6.32.13/kernel/pid.c 2010-03-15 11:52:04.000000000 -0400 | 49162 | --- linux-2.6.32.15/kernel/pid.c 2010-03-15 11:52:04.000000000 -0400 |
49156 | +++ linux-2.6.32.13/kernel/pid.c 2010-05-15 13:21:18.154611186 -0400 | 49163 | +++ linux-2.6.32.15/kernel/pid.c 2010-05-28 21:27:16.442904432 -0400 |
49157 | @@ -33,6 +33,7 @@ | 49164 | @@ -33,6 +33,7 @@ |
49158 | #include <linux/rculist.h> | 49165 | #include <linux/rculist.h> |
49159 | #include <linux/bootmem.h> | 49166 | #include <linux/bootmem.h> |
@@ -49187,9 +49194,9 @@ diff -urNp linux-2.6.32.13/kernel/pid.c linux-2.6.32.13/kernel/pid.c | |||
49187 | } | 49194 | } |
49188 | 49195 | ||
49189 | struct task_struct *find_task_by_vpid(pid_t vnr) | 49196 | struct task_struct *find_task_by_vpid(pid_t vnr) |
49190 | diff -urNp linux-2.6.32.13/kernel/posix-cpu-timers.c linux-2.6.32.13/kernel/posix-cpu-timers.c | 49197 | diff -urNp linux-2.6.32.15/kernel/posix-cpu-timers.c linux-2.6.32.15/kernel/posix-cpu-timers.c |
49191 | --- linux-2.6.32.13/kernel/posix-cpu-timers.c 2010-03-15 11:52:04.000000000 -0400 | 49198 | --- linux-2.6.32.15/kernel/posix-cpu-timers.c 2010-03-15 11:52:04.000000000 -0400 |
49192 | +++ linux-2.6.32.13/kernel/posix-cpu-timers.c 2010-05-15 13:21:18.158615271 -0400 | 49199 | +++ linux-2.6.32.15/kernel/posix-cpu-timers.c 2010-05-28 21:27:16.442904432 -0400 |
49193 | @@ -6,6 +6,7 @@ | 49200 | @@ -6,6 +6,7 @@ |
49194 | #include <linux/posix-timers.h> | 49201 | #include <linux/posix-timers.h> |
49195 | #include <linux/errno.h> | 49202 | #include <linux/errno.h> |
@@ -49214,9 +49221,9 @@ diff -urNp linux-2.6.32.13/kernel/posix-cpu-timers.c linux-2.6.32.13/kernel/posi | |||
49214 | if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) { | 49221 | if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) { |
49215 | /* | 49222 | /* |
49216 | * At the soft limit, send a SIGXCPU every second. | 49223 | * At the soft limit, send a SIGXCPU every second. |
49217 | diff -urNp linux-2.6.32.13/kernel/power/hibernate.c linux-2.6.32.13/kernel/power/hibernate.c | 49224 | diff -urNp linux-2.6.32.15/kernel/power/hibernate.c linux-2.6.32.15/kernel/power/hibernate.c |
49218 | --- linux-2.6.32.13/kernel/power/hibernate.c 2010-03-15 11:52:04.000000000 -0400 | 49225 | --- linux-2.6.32.15/kernel/power/hibernate.c 2010-03-15 11:52:04.000000000 -0400 |
49219 | +++ linux-2.6.32.13/kernel/power/hibernate.c 2010-05-15 13:21:18.158615271 -0400 | 49226 | +++ linux-2.6.32.15/kernel/power/hibernate.c 2010-05-28 21:27:16.442904432 -0400 |
49220 | @@ -48,14 +48,14 @@ enum { | 49227 | @@ -48,14 +48,14 @@ enum { |
49221 | 49228 | ||
49222 | static int hibernation_mode = HIBERNATION_SHUTDOWN; | 49229 | static int hibernation_mode = HIBERNATION_SHUTDOWN; |
@@ -49234,9 +49241,9 @@ diff -urNp linux-2.6.32.13/kernel/power/hibernate.c linux-2.6.32.13/kernel/power | |||
49234 | { | 49241 | { |
49235 | if (ops && !(ops->begin && ops->end && ops->pre_snapshot | 49242 | if (ops && !(ops->begin && ops->end && ops->pre_snapshot |
49236 | && ops->prepare && ops->finish && ops->enter && ops->pre_restore | 49243 | && ops->prepare && ops->finish && ops->enter && ops->pre_restore |
49237 | diff -urNp linux-2.6.32.13/kernel/power/poweroff.c linux-2.6.32.13/kernel/power/poweroff.c | 49244 | diff -urNp linux-2.6.32.15/kernel/power/poweroff.c linux-2.6.32.15/kernel/power/poweroff.c |
49238 | --- linux-2.6.32.13/kernel/power/poweroff.c 2010-03-15 11:52:04.000000000 -0400 | 49245 | --- linux-2.6.32.15/kernel/power/poweroff.c 2010-03-15 11:52:04.000000000 -0400 |
49239 | +++ linux-2.6.32.13/kernel/power/poweroff.c 2010-05-15 13:21:18.158615271 -0400 | 49246 | +++ linux-2.6.32.15/kernel/power/poweroff.c 2010-05-28 21:27:16.442904432 -0400 |
49240 | @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof | 49247 | @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof |
49241 | .enable_mask = SYSRQ_ENABLE_BOOT, | 49248 | .enable_mask = SYSRQ_ENABLE_BOOT, |
49242 | }; | 49249 | }; |
@@ -49246,9 +49253,9 @@ diff -urNp linux-2.6.32.13/kernel/power/poweroff.c linux-2.6.32.13/kernel/power/ | |||
49246 | { | 49253 | { |
49247 | register_sysrq_key('o', &sysrq_poweroff_op); | 49254 | register_sysrq_key('o', &sysrq_poweroff_op); |
49248 | return 0; | 49255 | return 0; |
49249 | diff -urNp linux-2.6.32.13/kernel/power/process.c linux-2.6.32.13/kernel/power/process.c | 49256 | diff -urNp linux-2.6.32.15/kernel/power/process.c linux-2.6.32.15/kernel/power/process.c |
49250 | --- linux-2.6.32.13/kernel/power/process.c 2010-04-29 17:49:38.590000225 -0400 | 49257 | --- linux-2.6.32.15/kernel/power/process.c 2010-04-29 17:49:38.590000225 -0400 |
49251 | +++ linux-2.6.32.13/kernel/power/process.c 2010-05-15 13:21:18.158615271 -0400 | 49258 | +++ linux-2.6.32.15/kernel/power/process.c 2010-05-28 21:27:16.442904432 -0400 |
49252 | @@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_ | 49259 | @@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_ |
49253 | struct timeval start, end; | 49260 | struct timeval start, end; |
49254 | u64 elapsed_csecs64; | 49261 | u64 elapsed_csecs64; |
@@ -49288,9 +49295,9 @@ diff -urNp linux-2.6.32.13/kernel/power/process.c linux-2.6.32.13/kernel/power/p | |||
49288 | 49295 | ||
49289 | do_gettimeofday(&end); | 49296 | do_gettimeofday(&end); |
49290 | elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start); | 49297 | elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start); |
49291 | diff -urNp linux-2.6.32.13/kernel/power/suspend.c linux-2.6.32.13/kernel/power/suspend.c | 49298 | diff -urNp linux-2.6.32.15/kernel/power/suspend.c linux-2.6.32.15/kernel/power/suspend.c |
49292 | --- linux-2.6.32.13/kernel/power/suspend.c 2010-03-15 11:52:04.000000000 -0400 | 49299 | --- linux-2.6.32.15/kernel/power/suspend.c 2010-03-15 11:52:04.000000000 -0400 |
49293 | +++ linux-2.6.32.13/kernel/power/suspend.c 2010-05-15 13:21:18.158615271 -0400 | 49300 | +++ linux-2.6.32.15/kernel/power/suspend.c 2010-05-28 21:27:16.442904432 -0400 |
49294 | @@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M | 49301 | @@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M |
49295 | [PM_SUSPEND_MEM] = "mem", | 49302 | [PM_SUSPEND_MEM] = "mem", |
49296 | }; | 49303 | }; |
@@ -49307,9 +49314,9 @@ diff -urNp linux-2.6.32.13/kernel/power/suspend.c linux-2.6.32.13/kernel/power/s | |||
49307 | { | 49314 | { |
49308 | mutex_lock(&pm_mutex); | 49315 | mutex_lock(&pm_mutex); |
49309 | suspend_ops = ops; | 49316 | suspend_ops = ops; |
49310 | diff -urNp linux-2.6.32.13/kernel/printk.c linux-2.6.32.13/kernel/printk.c | 49317 | diff -urNp linux-2.6.32.15/kernel/printk.c linux-2.6.32.15/kernel/printk.c |
49311 | --- linux-2.6.32.13/kernel/printk.c 2010-03-15 11:52:04.000000000 -0400 | 49318 | --- linux-2.6.32.15/kernel/printk.c 2010-03-15 11:52:04.000000000 -0400 |
49312 | +++ linux-2.6.32.13/kernel/printk.c 2010-05-15 13:21:18.158615271 -0400 | 49319 | +++ linux-2.6.32.15/kernel/printk.c 2010-05-28 21:27:16.442904432 -0400 |
49313 | @@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf | 49320 | @@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf |
49314 | char c; | 49321 | char c; |
49315 | int error = 0; | 49322 | int error = 0; |
@@ -49322,9 +49329,9 @@ diff -urNp linux-2.6.32.13/kernel/printk.c linux-2.6.32.13/kernel/printk.c | |||
49322 | error = security_syslog(type); | 49329 | error = security_syslog(type); |
49323 | if (error) | 49330 | if (error) |
49324 | return error; | 49331 | return error; |
49325 | diff -urNp linux-2.6.32.13/kernel/ptrace.c linux-2.6.32.13/kernel/ptrace.c | 49332 | diff -urNp linux-2.6.32.15/kernel/ptrace.c linux-2.6.32.15/kernel/ptrace.c |
49326 | --- linux-2.6.32.13/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400 | 49333 | --- linux-2.6.32.15/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400 |
49327 | +++ linux-2.6.32.13/kernel/ptrace.c 2010-05-15 13:21:18.158615271 -0400 | 49334 | +++ linux-2.6.32.15/kernel/ptrace.c 2010-05-28 21:27:16.442904432 -0400 |
49328 | @@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru | 49335 | @@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru |
49329 | cred->gid != tcred->egid || | 49336 | cred->gid != tcred->egid || |
49330 | cred->gid != tcred->sgid || | 49337 | cred->gid != tcred->sgid || |
@@ -49406,9 +49413,9 @@ diff -urNp linux-2.6.32.13/kernel/ptrace.c linux-2.6.32.13/kernel/ptrace.c | |||
49406 | } | 49413 | } |
49407 | 49414 | ||
49408 | int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data) | 49415 | int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data) |
49409 | diff -urNp linux-2.6.32.13/kernel/rcutree.c linux-2.6.32.13/kernel/rcutree.c | 49416 | diff -urNp linux-2.6.32.15/kernel/rcutree.c linux-2.6.32.15/kernel/rcutree.c |
49410 | --- linux-2.6.32.13/kernel/rcutree.c 2010-03-15 11:52:04.000000000 -0400 | 49417 | --- linux-2.6.32.15/kernel/rcutree.c 2010-03-15 11:52:04.000000000 -0400 |
49411 | +++ linux-2.6.32.13/kernel/rcutree.c 2010-05-15 13:21:18.162587722 -0400 | 49418 | +++ linux-2.6.32.15/kernel/rcutree.c 2010-05-28 21:27:16.442904432 -0400 |
49412 | @@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state | 49419 | @@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state |
49413 | /* | 49420 | /* |
49414 | * Do softirq processing for the current CPU. | 49421 | * Do softirq processing for the current CPU. |
@@ -49418,9 +49425,9 @@ diff -urNp linux-2.6.32.13/kernel/rcutree.c linux-2.6.32.13/kernel/rcutree.c | |||
49418 | { | 49425 | { |
49419 | /* | 49426 | /* |
49420 | * Memory references from any prior RCU read-side critical sections | 49427 | * Memory references from any prior RCU read-side critical sections |
49421 | diff -urNp linux-2.6.32.13/kernel/relay.c linux-2.6.32.13/kernel/relay.c | 49428 | diff -urNp linux-2.6.32.15/kernel/relay.c linux-2.6.32.15/kernel/relay.c |
49422 | --- linux-2.6.32.13/kernel/relay.c 2010-03-15 11:52:04.000000000 -0400 | 49429 | --- linux-2.6.32.15/kernel/relay.c 2010-03-15 11:52:04.000000000 -0400 |
49423 | +++ linux-2.6.32.13/kernel/relay.c 2010-05-15 13:21:18.162587722 -0400 | 49430 | +++ linux-2.6.32.15/kernel/relay.c 2010-05-28 21:27:16.442904432 -0400 |
49424 | @@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi | 49431 | @@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi |
49425 | return 0; | 49432 | return 0; |
49426 | 49433 | ||
@@ -49430,9 +49437,9 @@ diff -urNp linux-2.6.32.13/kernel/relay.c linux-2.6.32.13/kernel/relay.c | |||
49430 | return ret; | 49437 | return ret; |
49431 | 49438 | ||
49432 | if (read_start + ret == nonpad_end) | 49439 | if (read_start + ret == nonpad_end) |
49433 | diff -urNp linux-2.6.32.13/kernel/resource.c linux-2.6.32.13/kernel/resource.c | 49440 | diff -urNp linux-2.6.32.15/kernel/resource.c linux-2.6.32.15/kernel/resource.c |
49434 | --- linux-2.6.32.13/kernel/resource.c 2010-03-15 11:52:04.000000000 -0400 | 49441 | --- linux-2.6.32.15/kernel/resource.c 2010-03-15 11:52:04.000000000 -0400 |
49435 | +++ linux-2.6.32.13/kernel/resource.c 2010-05-15 13:21:18.162587722 -0400 | 49442 | +++ linux-2.6.32.15/kernel/resource.c 2010-05-28 21:27:16.442904432 -0400 |
49436 | @@ -132,8 +132,18 @@ static const struct file_operations proc | 49443 | @@ -132,8 +132,18 @@ static const struct file_operations proc |
49437 | 49444 | ||
49438 | static int __init ioresources_init(void) | 49445 | static int __init ioresources_init(void) |
@@ -49452,9 +49459,9 @@ diff -urNp linux-2.6.32.13/kernel/resource.c linux-2.6.32.13/kernel/resource.c | |||
49452 | return 0; | 49459 | return 0; |
49453 | } | 49460 | } |
49454 | __initcall(ioresources_init); | 49461 | __initcall(ioresources_init); |
49455 | diff -urNp linux-2.6.32.13/kernel/sched.c linux-2.6.32.13/kernel/sched.c | 49462 | diff -urNp linux-2.6.32.15/kernel/sched.c linux-2.6.32.15/kernel/sched.c |
49456 | --- linux-2.6.32.13/kernel/sched.c 2010-04-29 17:49:38.609495328 -0400 | 49463 | --- linux-2.6.32.15/kernel/sched.c 2010-04-29 17:49:38.609495328 -0400 |
49457 | +++ linux-2.6.32.13/kernel/sched.c 2010-05-15 13:21:18.180350069 -0400 | 49464 | +++ linux-2.6.32.15/kernel/sched.c 2010-05-28 21:27:16.447114196 -0400 |
49458 | @@ -4841,7 +4841,7 @@ out: | 49465 | @@ -4841,7 +4841,7 @@ out: |
49459 | * In CONFIG_NO_HZ case, the idle load balance owner will do the | 49466 | * In CONFIG_NO_HZ case, the idle load balance owner will do the |
49460 | * rebalancing for all the cpus for whom scheduler ticks are stopped. | 49467 | * rebalancing for all the cpus for whom scheduler ticks are stopped. |
@@ -49510,9 +49517,9 @@ diff -urNp linux-2.6.32.13/kernel/sched.c linux-2.6.32.13/kernel/sched.c | |||
49510 | }; | 49517 | }; |
49511 | 49518 | ||
49512 | static struct ctl_table *sd_alloc_ctl_entry(int n) | 49519 | static struct ctl_table *sd_alloc_ctl_entry(int n) |
49513 | diff -urNp linux-2.6.32.13/kernel/signal.c linux-2.6.32.13/kernel/signal.c | 49520 | diff -urNp linux-2.6.32.15/kernel/signal.c linux-2.6.32.15/kernel/signal.c |
49514 | --- linux-2.6.32.13/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400 | 49521 | --- linux-2.6.32.15/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400 |
49515 | +++ linux-2.6.32.13/kernel/signal.c 2010-05-15 13:21:18.180350069 -0400 | 49522 | +++ linux-2.6.32.15/kernel/signal.c 2010-05-28 21:27:16.447114196 -0400 |
49516 | @@ -41,12 +41,12 @@ | 49523 | @@ -41,12 +41,12 @@ |
49517 | 49524 | ||
49518 | static struct kmem_cache *sigqueue_cachep; | 49525 | static struct kmem_cache *sigqueue_cachep; |
@@ -49598,9 +49605,9 @@ diff -urNp linux-2.6.32.13/kernel/signal.c linux-2.6.32.13/kernel/signal.c | |||
49598 | 49605 | ||
49599 | return ret; | 49606 | return ret; |
49600 | } | 49607 | } |
49601 | diff -urNp linux-2.6.32.13/kernel/smp.c linux-2.6.32.13/kernel/smp.c | 49608 | diff -urNp linux-2.6.32.15/kernel/smp.c linux-2.6.32.15/kernel/smp.c |
49602 | --- linux-2.6.32.13/kernel/smp.c 2010-03-15 11:52:04.000000000 -0400 | 49609 | --- linux-2.6.32.15/kernel/smp.c 2010-03-15 11:52:04.000000000 -0400 |
49603 | +++ linux-2.6.32.13/kernel/smp.c 2010-05-15 13:21:18.180350069 -0400 | 49610 | +++ linux-2.6.32.15/kernel/smp.c 2010-05-28 21:27:16.447114196 -0400 |
49604 | @@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void | 49611 | @@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void |
49605 | } | 49612 | } |
49606 | EXPORT_SYMBOL(smp_call_function); | 49613 | EXPORT_SYMBOL(smp_call_function); |
@@ -49628,9 +49635,9 @@ diff -urNp linux-2.6.32.13/kernel/smp.c linux-2.6.32.13/kernel/smp.c | |||
49628 | { | 49635 | { |
49629 | spin_unlock_irq(&call_function.lock); | 49636 | spin_unlock_irq(&call_function.lock); |
49630 | } | 49637 | } |
49631 | diff -urNp linux-2.6.32.13/kernel/softirq.c linux-2.6.32.13/kernel/softirq.c | 49638 | diff -urNp linux-2.6.32.15/kernel/softirq.c linux-2.6.32.15/kernel/softirq.c |
49632 | --- linux-2.6.32.13/kernel/softirq.c 2010-03-15 11:52:04.000000000 -0400 | 49639 | --- linux-2.6.32.15/kernel/softirq.c 2010-03-15 11:52:04.000000000 -0400 |
49633 | +++ linux-2.6.32.13/kernel/softirq.c 2010-05-15 13:21:18.186622968 -0400 | 49640 | +++ linux-2.6.32.15/kernel/softirq.c 2010-05-28 21:27:16.447114196 -0400 |
49634 | @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec | 49641 | @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec |
49635 | 49642 | ||
49636 | static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); | 49643 | static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); |
@@ -49685,9 +49692,9 @@ diff -urNp linux-2.6.32.13/kernel/softirq.c linux-2.6.32.13/kernel/softirq.c | |||
49685 | { | 49692 | { |
49686 | struct tasklet_struct *list; | 49693 | struct tasklet_struct *list; |
49687 | 49694 | ||
49688 | diff -urNp linux-2.6.32.13/kernel/sys.c linux-2.6.32.13/kernel/sys.c | 49695 | diff -urNp linux-2.6.32.15/kernel/sys.c linux-2.6.32.15/kernel/sys.c |
49689 | --- linux-2.6.32.13/kernel/sys.c 2010-03-15 11:52:04.000000000 -0400 | 49696 | --- linux-2.6.32.15/kernel/sys.c 2010-03-15 11:52:04.000000000 -0400 |
49690 | +++ linux-2.6.32.13/kernel/sys.c 2010-05-15 13:21:18.223438230 -0400 | 49697 | +++ linux-2.6.32.15/kernel/sys.c 2010-05-28 21:27:16.447114196 -0400 |
49691 | @@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru | 49698 | @@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru |
49692 | error = -EACCES; | 49699 | error = -EACCES; |
49693 | goto out; | 49700 | goto out; |
@@ -49823,9 +49830,9 @@ diff -urNp linux-2.6.32.13/kernel/sys.c linux-2.6.32.13/kernel/sys.c | |||
49823 | error = -EINVAL; | 49830 | error = -EINVAL; |
49824 | break; | 49831 | break; |
49825 | } | 49832 | } |
49826 | diff -urNp linux-2.6.32.13/kernel/sysctl.c linux-2.6.32.13/kernel/sysctl.c | 49833 | diff -urNp linux-2.6.32.15/kernel/sysctl.c linux-2.6.32.15/kernel/sysctl.c |
49827 | --- linux-2.6.32.13/kernel/sysctl.c 2010-03-15 11:52:04.000000000 -0400 | 49834 | --- linux-2.6.32.15/kernel/sysctl.c 2010-03-15 11:52:04.000000000 -0400 |
49828 | +++ linux-2.6.32.13/kernel/sysctl.c 2010-05-15 13:21:18.258852946 -0400 | 49835 | +++ linux-2.6.32.15/kernel/sysctl.c 2010-05-28 21:27:16.447114196 -0400 |
49829 | @@ -63,6 +63,13 @@ | 49836 | @@ -63,6 +63,13 @@ |
49830 | static int deprecated_sysctl_warning(struct __sysctl_args *args); | 49837 | static int deprecated_sysctl_warning(struct __sysctl_args *args); |
49831 | 49838 | ||
@@ -49947,9 +49954,9 @@ diff -urNp linux-2.6.32.13/kernel/sysctl.c linux-2.6.32.13/kernel/sysctl.c | |||
49947 | error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC)); | 49954 | error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC)); |
49948 | if (error) | 49955 | if (error) |
49949 | return error; | 49956 | return error; |
49950 | diff -urNp linux-2.6.32.13/kernel/taskstats.c linux-2.6.32.13/kernel/taskstats.c | 49957 | diff -urNp linux-2.6.32.15/kernel/taskstats.c linux-2.6.32.15/kernel/taskstats.c |
49951 | --- linux-2.6.32.13/kernel/taskstats.c 2010-03-15 11:52:04.000000000 -0400 | 49958 | --- linux-2.6.32.15/kernel/taskstats.c 2010-03-15 11:52:04.000000000 -0400 |
49952 | +++ linux-2.6.32.13/kernel/taskstats.c 2010-05-15 13:21:18.258852946 -0400 | 49959 | +++ linux-2.6.32.15/kernel/taskstats.c 2010-05-28 21:27:16.447114196 -0400 |
49953 | @@ -26,9 +26,12 @@ | 49960 | @@ -26,9 +26,12 @@ |
49954 | #include <linux/cgroup.h> | 49961 | #include <linux/cgroup.h> |
49955 | #include <linux/fs.h> | 49962 | #include <linux/fs.h> |
@@ -49973,9 +49980,9 @@ diff -urNp linux-2.6.32.13/kernel/taskstats.c linux-2.6.32.13/kernel/taskstats.c | |||
49973 | if (!alloc_cpumask_var(&mask, GFP_KERNEL)) | 49980 | if (!alloc_cpumask_var(&mask, GFP_KERNEL)) |
49974 | return -ENOMEM; | 49981 | return -ENOMEM; |
49975 | 49982 | ||
49976 | diff -urNp linux-2.6.32.13/kernel/time/tick-broadcast.c linux-2.6.32.13/kernel/time/tick-broadcast.c | 49983 | diff -urNp linux-2.6.32.15/kernel/time/tick-broadcast.c linux-2.6.32.15/kernel/time/tick-broadcast.c |
49977 | --- linux-2.6.32.13/kernel/time/tick-broadcast.c 2010-03-15 11:52:04.000000000 -0400 | 49984 | --- linux-2.6.32.15/kernel/time/tick-broadcast.c 2010-03-15 11:52:04.000000000 -0400 |
49978 | +++ linux-2.6.32.13/kernel/time/tick-broadcast.c 2010-05-15 13:21:18.258852946 -0400 | 49985 | +++ linux-2.6.32.15/kernel/time/tick-broadcast.c 2010-05-28 21:27:16.447114196 -0400 |
49979 | @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl | 49986 | @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl |
49980 | * then clear the broadcast bit. | 49987 | * then clear the broadcast bit. |
49981 | */ | 49988 | */ |
@@ -49985,9 +49992,9 @@ diff -urNp linux-2.6.32.13/kernel/time/tick-broadcast.c linux-2.6.32.13/kernel/t | |||
49985 | 49992 | ||
49986 | cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); | 49993 | cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); |
49987 | tick_broadcast_clear_oneshot(cpu); | 49994 | tick_broadcast_clear_oneshot(cpu); |
49988 | diff -urNp linux-2.6.32.13/kernel/time.c linux-2.6.32.13/kernel/time.c | 49995 | diff -urNp linux-2.6.32.15/kernel/time.c linux-2.6.32.15/kernel/time.c |
49989 | --- linux-2.6.32.13/kernel/time.c 2010-03-15 11:52:04.000000000 -0400 | 49996 | --- linux-2.6.32.15/kernel/time.c 2010-03-15 11:52:04.000000000 -0400 |
49990 | +++ linux-2.6.32.13/kernel/time.c 2010-05-15 13:21:18.262613670 -0400 | 49997 | +++ linux-2.6.32.15/kernel/time.c 2010-05-28 21:27:16.451020026 -0400 |
49991 | @@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, | 49998 | @@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, |
49992 | return err; | 49999 | return err; |
49993 | 50000 | ||
@@ -50025,9 +50032,9 @@ diff -urNp linux-2.6.32.13/kernel/time.c linux-2.6.32.13/kernel/time.c | |||
50025 | { | 50032 | { |
50026 | #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) | 50033 | #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) |
50027 | return (USEC_PER_SEC / HZ) * j; | 50034 | return (USEC_PER_SEC / HZ) * j; |
50028 | diff -urNp linux-2.6.32.13/kernel/timer.c linux-2.6.32.13/kernel/timer.c | 50035 | diff -urNp linux-2.6.32.15/kernel/timer.c linux-2.6.32.15/kernel/timer.c |
50029 | --- linux-2.6.32.13/kernel/timer.c 2010-03-15 11:52:04.000000000 -0400 | 50036 | --- linux-2.6.32.15/kernel/timer.c 2010-03-15 11:52:04.000000000 -0400 |
50030 | +++ linux-2.6.32.13/kernel/timer.c 2010-05-15 13:21:18.262613670 -0400 | 50037 | +++ linux-2.6.32.15/kernel/timer.c 2010-05-28 21:27:16.451020026 -0400 |
50031 | @@ -1207,7 +1207,7 @@ void update_process_times(int user_tick) | 50038 | @@ -1207,7 +1207,7 @@ void update_process_times(int user_tick) |
50032 | /* | 50039 | /* |
50033 | * This function runs timers and the timer-tq in bottom half context. | 50040 | * This function runs timers and the timer-tq in bottom half context. |
@@ -50037,9 +50044,9 @@ diff -urNp linux-2.6.32.13/kernel/timer.c linux-2.6.32.13/kernel/timer.c | |||
50037 | { | 50044 | { |
50038 | struct tvec_base *base = __get_cpu_var(tvec_bases); | 50045 | struct tvec_base *base = __get_cpu_var(tvec_bases); |
50039 | 50046 | ||
50040 | diff -urNp linux-2.6.32.13/kernel/trace/ftrace.c linux-2.6.32.13/kernel/trace/ftrace.c | 50047 | diff -urNp linux-2.6.32.15/kernel/trace/ftrace.c linux-2.6.32.15/kernel/trace/ftrace.c |
50041 | --- linux-2.6.32.13/kernel/trace/ftrace.c 2010-04-04 20:41:50.068477203 -0400 | 50048 | --- linux-2.6.32.15/kernel/trace/ftrace.c 2010-04-04 20:41:50.068477203 -0400 |
50042 | +++ linux-2.6.32.13/kernel/trace/ftrace.c 2010-05-15 13:21:18.274619950 -0400 | 50049 | +++ linux-2.6.32.15/kernel/trace/ftrace.c 2010-05-28 21:27:16.451020026 -0400 |
50043 | @@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod, | 50050 | @@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod, |
50044 | 50051 | ||
50045 | ip = rec->ip; | 50052 | ip = rec->ip; |
@@ -50061,9 +50068,9 @@ diff -urNp linux-2.6.32.13/kernel/trace/ftrace.c linux-2.6.32.13/kernel/trace/ft | |||
50061 | } | 50068 | } |
50062 | 50069 | ||
50063 | /* | 50070 | /* |
50064 | diff -urNp linux-2.6.32.13/kernel/trace/Kconfig linux-2.6.32.13/kernel/trace/Kconfig | 50071 | diff -urNp linux-2.6.32.15/kernel/trace/Kconfig linux-2.6.32.15/kernel/trace/Kconfig |
50065 | --- linux-2.6.32.13/kernel/trace/Kconfig 2010-03-15 11:52:04.000000000 -0400 | 50072 | --- linux-2.6.32.15/kernel/trace/Kconfig 2010-03-15 11:52:04.000000000 -0400 |
50066 | +++ linux-2.6.32.13/kernel/trace/Kconfig 2010-05-15 13:21:18.278715003 -0400 | 50073 | +++ linux-2.6.32.15/kernel/trace/Kconfig 2010-05-28 21:27:16.451020026 -0400 |
50067 | @@ -126,6 +126,7 @@ if FTRACE | 50074 | @@ -126,6 +126,7 @@ if FTRACE |
50068 | config FUNCTION_TRACER | 50075 | config FUNCTION_TRACER |
50069 | bool "Kernel Function Tracer" | 50076 | bool "Kernel Function Tracer" |
@@ -50080,9 +50087,9 @@ diff -urNp linux-2.6.32.13/kernel/trace/Kconfig linux-2.6.32.13/kernel/trace/Kco | |||
50080 | select FUNCTION_TRACER | 50087 | select FUNCTION_TRACER |
50081 | select STACKTRACE | 50088 | select STACKTRACE |
50082 | select KALLSYMS | 50089 | select KALLSYMS |
50083 | diff -urNp linux-2.6.32.13/kernel/trace/ring_buffer.c linux-2.6.32.13/kernel/trace/ring_buffer.c | 50090 | diff -urNp linux-2.6.32.15/kernel/trace/ring_buffer.c linux-2.6.32.15/kernel/trace/ring_buffer.c |
50084 | --- linux-2.6.32.13/kernel/trace/ring_buffer.c 2010-04-04 20:41:50.072525146 -0400 | 50091 | --- linux-2.6.32.15/kernel/trace/ring_buffer.c 2010-04-04 20:41:50.072525146 -0400 |
50085 | +++ linux-2.6.32.13/kernel/trace/ring_buffer.c 2010-05-15 13:21:18.278715003 -0400 | 50092 | +++ linux-2.6.32.15/kernel/trace/ring_buffer.c 2010-05-28 21:27:16.451020026 -0400 |
50086 | @@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st | 50093 | @@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st |
50087 | * the reader page). But if the next page is a header page, | 50094 | * the reader page). But if the next page is a header page, |
50088 | * its flags will be non zero. | 50095 | * its flags will be non zero. |
@@ -50092,9 +50099,9 @@ diff -urNp linux-2.6.32.13/kernel/trace/ring_buffer.c linux-2.6.32.13/kernel/tra | |||
50092 | rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer, | 50099 | rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer, |
50093 | struct buffer_page *page, struct list_head *list) | 50100 | struct buffer_page *page, struct list_head *list) |
50094 | { | 50101 | { |
50095 | diff -urNp linux-2.6.32.13/kernel/trace/trace.c linux-2.6.32.13/kernel/trace/trace.c | 50102 | diff -urNp linux-2.6.32.15/kernel/trace/trace.c linux-2.6.32.15/kernel/trace/trace.c |
50096 | --- linux-2.6.32.13/kernel/trace/trace.c 2010-04-04 20:41:50.072525146 -0400 | 50103 | --- linux-2.6.32.15/kernel/trace/trace.c 2010-04-04 20:41:50.072525146 -0400 |
50097 | +++ linux-2.6.32.13/kernel/trace/trace.c 2010-05-15 13:21:18.278715003 -0400 | 50104 | +++ linux-2.6.32.15/kernel/trace/trace.c 2010-05-28 21:27:16.451020026 -0400 |
50098 | @@ -3808,10 +3808,9 @@ static const struct file_operations trac | 50105 | @@ -3808,10 +3808,9 @@ static const struct file_operations trac |
50099 | }; | 50106 | }; |
50100 | #endif | 50107 | #endif |
@@ -50119,9 +50126,9 @@ diff -urNp linux-2.6.32.13/kernel/trace/trace.c linux-2.6.32.13/kernel/trace/tra | |||
50119 | static int once; | 50126 | static int once; |
50120 | struct dentry *d_tracer; | 50127 | struct dentry *d_tracer; |
50121 | 50128 | ||
50122 | diff -urNp linux-2.6.32.13/kernel/trace/trace_events.c linux-2.6.32.13/kernel/trace/trace_events.c | 50129 | diff -urNp linux-2.6.32.15/kernel/trace/trace_events.c linux-2.6.32.15/kernel/trace/trace_events.c |
50123 | --- linux-2.6.32.13/kernel/trace/trace_events.c 2010-03-15 11:52:04.000000000 -0400 | 50130 | --- linux-2.6.32.15/kernel/trace/trace_events.c 2010-03-15 11:52:04.000000000 -0400 |
50124 | +++ linux-2.6.32.13/kernel/trace/trace_events.c 2010-05-15 13:21:18.282652483 -0400 | 50131 | +++ linux-2.6.32.15/kernel/trace/trace_events.c 2010-05-28 21:27:16.451020026 -0400 |
50125 | @@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list | 50132 | @@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list |
50126 | * Modules must own their file_operations to keep up with | 50133 | * Modules must own their file_operations to keep up with |
50127 | * reference counting. | 50134 | * reference counting. |
@@ -50131,9 +50138,9 @@ diff -urNp linux-2.6.32.13/kernel/trace/trace_events.c linux-2.6.32.13/kernel/tr | |||
50131 | struct ftrace_module_file_ops { | 50138 | struct ftrace_module_file_ops { |
50132 | struct list_head list; | 50139 | struct list_head list; |
50133 | struct module *mod; | 50140 | struct module *mod; |
50134 | diff -urNp linux-2.6.32.13/kernel/trace/trace_output.c linux-2.6.32.13/kernel/trace/trace_output.c | 50141 | diff -urNp linux-2.6.32.15/kernel/trace/trace_output.c linux-2.6.32.15/kernel/trace/trace_output.c |
50135 | --- linux-2.6.32.13/kernel/trace/trace_output.c 2010-03-15 11:52:04.000000000 -0400 | 50142 | --- linux-2.6.32.15/kernel/trace/trace_output.c 2010-03-15 11:52:04.000000000 -0400 |
50136 | +++ linux-2.6.32.13/kernel/trace/trace_output.c 2010-05-15 13:21:18.282652483 -0400 | 50143 | +++ linux-2.6.32.15/kernel/trace/trace_output.c 2010-05-28 21:27:16.451020026 -0400 |
50137 | @@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s, | 50144 | @@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s, |
50138 | return 0; | 50145 | return 0; |
50139 | p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); | 50146 | p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); |
@@ -50143,9 +50150,9 @@ diff -urNp linux-2.6.32.13/kernel/trace/trace_output.c linux-2.6.32.13/kernel/tr | |||
50143 | if (p) { | 50150 | if (p) { |
50144 | s->len = p - s->buffer; | 50151 | s->len = p - s->buffer; |
50145 | return 1; | 50152 | return 1; |
50146 | diff -urNp linux-2.6.32.13/kernel/trace/trace_stack.c linux-2.6.32.13/kernel/trace/trace_stack.c | 50153 | diff -urNp linux-2.6.32.15/kernel/trace/trace_stack.c linux-2.6.32.15/kernel/trace/trace_stack.c |
50147 | --- linux-2.6.32.13/kernel/trace/trace_stack.c 2010-03-15 11:52:04.000000000 -0400 | 50154 | --- linux-2.6.32.15/kernel/trace/trace_stack.c 2010-03-15 11:52:04.000000000 -0400 |
50148 | +++ linux-2.6.32.13/kernel/trace/trace_stack.c 2010-05-15 13:21:18.282652483 -0400 | 50155 | +++ linux-2.6.32.15/kernel/trace/trace_stack.c 2010-05-28 21:27:16.451020026 -0400 |
50149 | @@ -50,7 +50,7 @@ static inline void check_stack(void) | 50156 | @@ -50,7 +50,7 @@ static inline void check_stack(void) |
50150 | return; | 50157 | return; |
50151 | 50158 | ||
@@ -50155,9 +50162,9 @@ diff -urNp linux-2.6.32.13/kernel/trace/trace_stack.c linux-2.6.32.13/kernel/tra | |||
50155 | return; | 50162 | return; |
50156 | 50163 | ||
50157 | local_irq_save(flags); | 50164 | local_irq_save(flags); |
50158 | diff -urNp linux-2.6.32.13/kernel/utsname_sysctl.c linux-2.6.32.13/kernel/utsname_sysctl.c | 50165 | diff -urNp linux-2.6.32.15/kernel/utsname_sysctl.c linux-2.6.32.15/kernel/utsname_sysctl.c |
50159 | --- linux-2.6.32.13/kernel/utsname_sysctl.c 2010-03-15 11:52:04.000000000 -0400 | 50166 | --- linux-2.6.32.15/kernel/utsname_sysctl.c 2010-03-15 11:52:04.000000000 -0400 |
50160 | +++ linux-2.6.32.13/kernel/utsname_sysctl.c 2010-05-15 13:21:18.282652483 -0400 | 50167 | +++ linux-2.6.32.15/kernel/utsname_sysctl.c 2010-05-28 21:27:16.451020026 -0400 |
50161 | @@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[] | 50168 | @@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[] |
50162 | .proc_handler = proc_do_uts_string, | 50169 | .proc_handler = proc_do_uts_string, |
50163 | .strategy = sysctl_uts_string, | 50170 | .strategy = sysctl_uts_string, |
@@ -50176,9 +50183,9 @@ diff -urNp linux-2.6.32.13/kernel/utsname_sysctl.c linux-2.6.32.13/kernel/utsnam | |||
50176 | }; | 50183 | }; |
50177 | 50184 | ||
50178 | static int __init utsname_sysctl_init(void) | 50185 | static int __init utsname_sysctl_init(void) |
50179 | diff -urNp linux-2.6.32.13/lib/bug.c linux-2.6.32.13/lib/bug.c | 50186 | diff -urNp linux-2.6.32.15/lib/bug.c linux-2.6.32.15/lib/bug.c |
50180 | --- linux-2.6.32.13/lib/bug.c 2010-03-15 11:52:04.000000000 -0400 | 50187 | --- linux-2.6.32.15/lib/bug.c 2010-03-15 11:52:04.000000000 -0400 |
50181 | +++ linux-2.6.32.13/lib/bug.c 2010-05-15 13:21:18.282652483 -0400 | 50188 | +++ linux-2.6.32.15/lib/bug.c 2010-05-28 21:27:16.451020026 -0400 |
50182 | @@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l | 50189 | @@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l |
50183 | return BUG_TRAP_TYPE_NONE; | 50190 | return BUG_TRAP_TYPE_NONE; |
50184 | 50191 | ||
@@ -50188,9 +50195,9 @@ diff -urNp linux-2.6.32.13/lib/bug.c linux-2.6.32.13/lib/bug.c | |||
50188 | 50195 | ||
50189 | printk(KERN_EMERG "------------[ cut here ]------------\n"); | 50196 | printk(KERN_EMERG "------------[ cut here ]------------\n"); |
50190 | 50197 | ||
50191 | diff -urNp linux-2.6.32.13/lib/debugobjects.c linux-2.6.32.13/lib/debugobjects.c | 50198 | diff -urNp linux-2.6.32.15/lib/debugobjects.c linux-2.6.32.15/lib/debugobjects.c |
50192 | --- linux-2.6.32.13/lib/debugobjects.c 2010-03-15 11:52:04.000000000 -0400 | 50199 | --- linux-2.6.32.15/lib/debugobjects.c 2010-03-15 11:52:04.000000000 -0400 |
50193 | +++ linux-2.6.32.13/lib/debugobjects.c 2010-05-15 13:21:18.298622839 -0400 | 50200 | +++ linux-2.6.32.15/lib/debugobjects.c 2010-05-28 21:27:16.455065280 -0400 |
50194 | @@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi | 50201 | @@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi |
50195 | if (limit > 4) | 50202 | if (limit > 4) |
50196 | return; | 50203 | return; |
@@ -50200,9 +50207,9 @@ diff -urNp linux-2.6.32.13/lib/debugobjects.c linux-2.6.32.13/lib/debugobjects.c | |||
50200 | if (is_on_stack == onstack) | 50207 | if (is_on_stack == onstack) |
50201 | return; | 50208 | return; |
50202 | 50209 | ||
50203 | diff -urNp linux-2.6.32.13/lib/dma-debug.c linux-2.6.32.13/lib/dma-debug.c | 50210 | diff -urNp linux-2.6.32.15/lib/dma-debug.c linux-2.6.32.15/lib/dma-debug.c |
50204 | --- linux-2.6.32.13/lib/dma-debug.c 2010-03-15 11:52:04.000000000 -0400 | 50211 | --- linux-2.6.32.15/lib/dma-debug.c 2010-03-15 11:52:04.000000000 -0400 |
50205 | +++ linux-2.6.32.13/lib/dma-debug.c 2010-05-15 13:21:18.322629085 -0400 | 50212 | +++ linux-2.6.32.15/lib/dma-debug.c 2010-05-28 21:27:16.463242745 -0400 |
50206 | @@ -861,7 +861,7 @@ out: | 50213 | @@ -861,7 +861,7 @@ out: |
50207 | 50214 | ||
50208 | static void check_for_stack(struct device *dev, void *addr) | 50215 | static void check_for_stack(struct device *dev, void *addr) |
@@ -50212,9 +50219,9 @@ diff -urNp linux-2.6.32.13/lib/dma-debug.c linux-2.6.32.13/lib/dma-debug.c | |||
50212 | err_printk(dev, NULL, "DMA-API: device driver maps memory from" | 50219 | err_printk(dev, NULL, "DMA-API: device driver maps memory from" |
50213 | "stack [addr=%p]\n", addr); | 50220 | "stack [addr=%p]\n", addr); |
50214 | } | 50221 | } |
50215 | diff -urNp linux-2.6.32.13/lib/idr.c linux-2.6.32.13/lib/idr.c | 50222 | diff -urNp linux-2.6.32.15/lib/idr.c linux-2.6.32.15/lib/idr.c |
50216 | --- linux-2.6.32.13/lib/idr.c 2010-03-15 11:52:04.000000000 -0400 | 50223 | --- linux-2.6.32.15/lib/idr.c 2010-03-15 11:52:04.000000000 -0400 |
50217 | +++ linux-2.6.32.13/lib/idr.c 2010-05-15 13:21:18.327545957 -0400 | 50224 | +++ linux-2.6.32.15/lib/idr.c 2010-05-28 21:27:16.463242745 -0400 |
50218 | @@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in | 50225 | @@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in |
50219 | id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1; | 50226 | id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1; |
50220 | 50227 | ||
@@ -50224,9 +50231,9 @@ diff -urNp linux-2.6.32.13/lib/idr.c linux-2.6.32.13/lib/idr.c | |||
50224 | *starting_id = id; | 50231 | *starting_id = id; |
50225 | return IDR_NEED_TO_GROW; | 50232 | return IDR_NEED_TO_GROW; |
50226 | } | 50233 | } |
50227 | diff -urNp linux-2.6.32.13/lib/inflate.c linux-2.6.32.13/lib/inflate.c | 50234 | diff -urNp linux-2.6.32.15/lib/inflate.c linux-2.6.32.15/lib/inflate.c |
50228 | --- linux-2.6.32.13/lib/inflate.c 2010-03-15 11:52:04.000000000 -0400 | 50235 | --- linux-2.6.32.15/lib/inflate.c 2010-03-15 11:52:04.000000000 -0400 |
50229 | +++ linux-2.6.32.13/lib/inflate.c 2010-05-15 13:21:18.327545957 -0400 | 50236 | +++ linux-2.6.32.15/lib/inflate.c 2010-05-28 21:27:16.463242745 -0400 |
50230 | @@ -266,7 +266,7 @@ static void free(void *where) | 50237 | @@ -266,7 +266,7 @@ static void free(void *where) |
50231 | malloc_ptr = free_mem_ptr; | 50238 | malloc_ptr = free_mem_ptr; |
50232 | } | 50239 | } |
@@ -50236,9 +50243,9 @@ diff -urNp linux-2.6.32.13/lib/inflate.c linux-2.6.32.13/lib/inflate.c | |||
50236 | #define free(a) kfree(a) | 50243 | #define free(a) kfree(a) |
50237 | #endif | 50244 | #endif |
50238 | 50245 | ||
50239 | diff -urNp linux-2.6.32.13/lib/Kconfig.debug linux-2.6.32.13/lib/Kconfig.debug | 50246 | diff -urNp linux-2.6.32.15/lib/Kconfig.debug linux-2.6.32.15/lib/Kconfig.debug |
50240 | --- linux-2.6.32.13/lib/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400 | 50247 | --- linux-2.6.32.15/lib/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400 |
50241 | +++ linux-2.6.32.13/lib/Kconfig.debug 2010-05-15 13:21:18.339667096 -0400 | 50248 | +++ linux-2.6.32.15/lib/Kconfig.debug 2010-05-28 21:27:16.463242745 -0400 |
50242 | @@ -905,7 +905,7 @@ config LATENCYTOP | 50249 | @@ -905,7 +905,7 @@ config LATENCYTOP |
50243 | select STACKTRACE | 50250 | select STACKTRACE |
50244 | select SCHEDSTATS | 50251 | select SCHEDSTATS |
@@ -50248,9 +50255,9 @@ diff -urNp linux-2.6.32.13/lib/Kconfig.debug linux-2.6.32.13/lib/Kconfig.debug | |||
50248 | help | 50255 | help |
50249 | Enable this option if you want to use the LatencyTOP tool | 50256 | Enable this option if you want to use the LatencyTOP tool |
50250 | to find out which userspace is blocking on what kernel operations. | 50257 | to find out which userspace is blocking on what kernel operations. |
50251 | diff -urNp linux-2.6.32.13/lib/kobject.c linux-2.6.32.13/lib/kobject.c | 50258 | diff -urNp linux-2.6.32.15/lib/kobject.c linux-2.6.32.15/lib/kobject.c |
50252 | --- linux-2.6.32.13/lib/kobject.c 2010-03-15 11:52:04.000000000 -0400 | 50259 | --- linux-2.6.32.15/lib/kobject.c 2010-03-15 11:52:04.000000000 -0400 |
50253 | +++ linux-2.6.32.13/lib/kobject.c 2010-05-15 13:21:18.355221413 -0400 | 50260 | +++ linux-2.6.32.15/lib/kobject.c 2010-05-28 21:27:16.463242745 -0400 |
50254 | @@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko | 50261 | @@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko |
50255 | return ret; | 50262 | return ret; |
50256 | } | 50263 | } |
@@ -50278,9 +50285,9 @@ diff -urNp linux-2.6.32.13/lib/kobject.c linux-2.6.32.13/lib/kobject.c | |||
50278 | struct kobject *parent_kobj) | 50285 | struct kobject *parent_kobj) |
50279 | { | 50286 | { |
50280 | struct kset *kset; | 50287 | struct kset *kset; |
50281 | diff -urNp linux-2.6.32.13/lib/kobject_uevent.c linux-2.6.32.13/lib/kobject_uevent.c | 50288 | diff -urNp linux-2.6.32.15/lib/kobject_uevent.c linux-2.6.32.15/lib/kobject_uevent.c |
50282 | --- linux-2.6.32.13/lib/kobject_uevent.c 2010-03-15 11:52:04.000000000 -0400 | 50289 | --- linux-2.6.32.15/lib/kobject_uevent.c 2010-03-15 11:52:04.000000000 -0400 |
50283 | +++ linux-2.6.32.13/lib/kobject_uevent.c 2010-05-15 13:21:18.355221413 -0400 | 50290 | +++ linux-2.6.32.15/lib/kobject_uevent.c 2010-05-28 21:27:16.463242745 -0400 |
50284 | @@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k | 50291 | @@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k |
50285 | const char *subsystem; | 50292 | const char *subsystem; |
50286 | struct kobject *top_kobj; | 50293 | struct kobject *top_kobj; |
@@ -50290,9 +50297,9 @@ diff -urNp linux-2.6.32.13/lib/kobject_uevent.c linux-2.6.32.13/lib/kobject_ueve | |||
50290 | u64 seq; | 50297 | u64 seq; |
50291 | int i = 0; | 50298 | int i = 0; |
50292 | int retval = 0; | 50299 | int retval = 0; |
50293 | diff -urNp linux-2.6.32.13/lib/parser.c linux-2.6.32.13/lib/parser.c | 50300 | diff -urNp linux-2.6.32.15/lib/parser.c linux-2.6.32.15/lib/parser.c |
50294 | --- linux-2.6.32.13/lib/parser.c 2010-03-15 11:52:04.000000000 -0400 | 50301 | --- linux-2.6.32.15/lib/parser.c 2010-03-15 11:52:04.000000000 -0400 |
50295 | +++ linux-2.6.32.13/lib/parser.c 2010-05-15 13:21:18.358625413 -0400 | 50302 | +++ linux-2.6.32.15/lib/parser.c 2010-05-28 21:27:16.463242745 -0400 |
50296 | @@ -126,7 +126,7 @@ static int match_number(substring_t *s, | 50303 | @@ -126,7 +126,7 @@ static int match_number(substring_t *s, |
50297 | char *buf; | 50304 | char *buf; |
50298 | int ret; | 50305 | int ret; |
@@ -50302,9 +50309,9 @@ diff -urNp linux-2.6.32.13/lib/parser.c linux-2.6.32.13/lib/parser.c | |||
50302 | if (!buf) | 50309 | if (!buf) |
50303 | return -ENOMEM; | 50310 | return -ENOMEM; |
50304 | memcpy(buf, s->from, s->to - s->from); | 50311 | memcpy(buf, s->from, s->to - s->from); |
50305 | diff -urNp linux-2.6.32.13/lib/radix-tree.c linux-2.6.32.13/lib/radix-tree.c | 50312 | diff -urNp linux-2.6.32.15/lib/radix-tree.c linux-2.6.32.15/lib/radix-tree.c |
50306 | --- linux-2.6.32.13/lib/radix-tree.c 2010-03-15 11:52:04.000000000 -0400 | 50313 | --- linux-2.6.32.15/lib/radix-tree.c 2010-03-15 11:52:04.000000000 -0400 |
50307 | +++ linux-2.6.32.13/lib/radix-tree.c 2010-05-15 13:21:18.366643034 -0400 | 50314 | +++ linux-2.6.32.15/lib/radix-tree.c 2010-05-28 21:27:16.471246042 -0400 |
50308 | @@ -81,7 +81,7 @@ struct radix_tree_preload { | 50315 | @@ -81,7 +81,7 @@ struct radix_tree_preload { |
50309 | int nr; | 50316 | int nr; |
50310 | struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; | 50317 | struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; |
@@ -50314,9 +50321,9 @@ diff -urNp linux-2.6.32.13/lib/radix-tree.c linux-2.6.32.13/lib/radix-tree.c | |||
50314 | 50321 | ||
50315 | static inline gfp_t root_gfp_mask(struct radix_tree_root *root) | 50322 | static inline gfp_t root_gfp_mask(struct radix_tree_root *root) |
50316 | { | 50323 | { |
50317 | diff -urNp linux-2.6.32.13/lib/random32.c linux-2.6.32.13/lib/random32.c | 50324 | diff -urNp linux-2.6.32.15/lib/random32.c linux-2.6.32.15/lib/random32.c |
50318 | --- linux-2.6.32.13/lib/random32.c 2010-03-15 11:52:04.000000000 -0400 | 50325 | --- linux-2.6.32.15/lib/random32.c 2010-03-15 11:52:04.000000000 -0400 |
50319 | +++ linux-2.6.32.13/lib/random32.c 2010-05-15 13:21:18.370623064 -0400 | 50326 | +++ linux-2.6.32.15/lib/random32.c 2010-05-28 21:27:16.471246042 -0400 |
50320 | @@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * | 50327 | @@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * |
50321 | */ | 50328 | */ |
50322 | static inline u32 __seed(u32 x, u32 m) | 50329 | static inline u32 __seed(u32 x, u32 m) |
@@ -50326,14 +50333,14 @@ diff -urNp linux-2.6.32.13/lib/random32.c linux-2.6.32.13/lib/random32.c | |||
50326 | } | 50333 | } |
50327 | 50334 | ||
50328 | /** | 50335 | /** |
50329 | diff -urNp linux-2.6.32.13/localversion-grsec linux-2.6.32.13/localversion-grsec | 50336 | diff -urNp linux-2.6.32.15/localversion-grsec linux-2.6.32.15/localversion-grsec |
50330 | --- linux-2.6.32.13/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 | 50337 | --- linux-2.6.32.15/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 |
50331 | +++ linux-2.6.32.13/localversion-grsec 2010-05-15 13:21:18.370623064 -0400 | 50338 | +++ linux-2.6.32.15/localversion-grsec 2010-05-28 21:27:16.471246042 -0400 |
50332 | @@ -0,0 +1 @@ | 50339 | @@ -0,0 +1 @@ |
50333 | +-grsec | 50340 | +-grsec |
50334 | diff -urNp linux-2.6.32.13/Makefile linux-2.6.32.13/Makefile | 50341 | diff -urNp linux-2.6.32.15/Makefile linux-2.6.32.15/Makefile |
50335 | --- linux-2.6.32.13/Makefile 2010-05-15 13:20:18.396226636 -0400 | 50342 | --- linux-2.6.32.15/Makefile 2010-06-01 15:02:53.005442437 -0400 |
50336 | +++ linux-2.6.32.13/Makefile 2010-05-15 13:21:18.370623064 -0400 | 50343 | +++ linux-2.6.32.15/Makefile 2010-06-01 15:03:15.405630699 -0400 |
50337 | @@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" | 50344 | @@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" |
50338 | 50345 | ||
50339 | HOSTCC = gcc | 50346 | HOSTCC = gcc |
@@ -50354,9 +50361,9 @@ diff -urNp linux-2.6.32.13/Makefile linux-2.6.32.13/Makefile | |||
50354 | 50361 | ||
50355 | vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ | 50362 | vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ |
50356 | $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ | 50363 | $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ |
50357 | diff -urNp linux-2.6.32.13/mm/filemap.c linux-2.6.32.13/mm/filemap.c | 50364 | diff -urNp linux-2.6.32.15/mm/filemap.c linux-2.6.32.15/mm/filemap.c |
50358 | --- linux-2.6.32.13/mm/filemap.c 2010-03-15 11:52:04.000000000 -0400 | 50365 | --- linux-2.6.32.15/mm/filemap.c 2010-03-15 11:52:04.000000000 -0400 |
50359 | +++ linux-2.6.32.13/mm/filemap.c 2010-05-15 13:21:18.370623064 -0400 | 50366 | +++ linux-2.6.32.15/mm/filemap.c 2010-05-28 21:27:16.479250347 -0400 |
50360 | @@ -1622,7 +1622,7 @@ int generic_file_mmap(struct file * file | 50367 | @@ -1622,7 +1622,7 @@ int generic_file_mmap(struct file * file |
50361 | struct address_space *mapping = file->f_mapping; | 50368 | struct address_space *mapping = file->f_mapping; |
50362 | 50369 | ||
@@ -50374,9 +50381,9 @@ diff -urNp linux-2.6.32.13/mm/filemap.c linux-2.6.32.13/mm/filemap.c | |||
50374 | if (*pos >= limit) { | 50381 | if (*pos >= limit) { |
50375 | send_sig(SIGXFSZ, current, 0); | 50382 | send_sig(SIGXFSZ, current, 0); |
50376 | return -EFBIG; | 50383 | return -EFBIG; |
50377 | diff -urNp linux-2.6.32.13/mm/fremap.c linux-2.6.32.13/mm/fremap.c | 50384 | diff -urNp linux-2.6.32.15/mm/fremap.c linux-2.6.32.15/mm/fremap.c |
50378 | --- linux-2.6.32.13/mm/fremap.c 2010-03-15 11:52:04.000000000 -0400 | 50385 | --- linux-2.6.32.15/mm/fremap.c 2010-03-15 11:52:04.000000000 -0400 |
50379 | +++ linux-2.6.32.13/mm/fremap.c 2010-05-15 13:21:18.370623064 -0400 | 50386 | +++ linux-2.6.32.15/mm/fremap.c 2010-05-28 21:27:16.487251224 -0400 |
50380 | @@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign | 50387 | @@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign |
50381 | retry: | 50388 | retry: |
50382 | vma = find_vma(mm, start); | 50389 | vma = find_vma(mm, start); |
@@ -50389,9 +50396,9 @@ diff -urNp linux-2.6.32.13/mm/fremap.c linux-2.6.32.13/mm/fremap.c | |||
50389 | /* | 50396 | /* |
50390 | * Make sure the vma is shared, that it supports prefaulting, | 50397 | * Make sure the vma is shared, that it supports prefaulting, |
50391 | * and that the remapped range is valid and fully within | 50398 | * and that the remapped range is valid and fully within |
50392 | diff -urNp linux-2.6.32.13/mm/highmem.c linux-2.6.32.13/mm/highmem.c | 50399 | diff -urNp linux-2.6.32.15/mm/highmem.c linux-2.6.32.15/mm/highmem.c |
50393 | --- linux-2.6.32.13/mm/highmem.c 2010-03-15 11:52:04.000000000 -0400 | 50400 | --- linux-2.6.32.15/mm/highmem.c 2010-03-15 11:52:04.000000000 -0400 |
50394 | +++ linux-2.6.32.13/mm/highmem.c 2010-05-15 13:21:18.370623064 -0400 | 50401 | +++ linux-2.6.32.15/mm/highmem.c 2010-05-28 21:27:16.487251224 -0400 |
50395 | @@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void) | 50402 | @@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void) |
50396 | * So no dangers, even with speculative execution. | 50403 | * So no dangers, even with speculative execution. |
50397 | */ | 50404 | */ |
@@ -50417,9 +50424,9 @@ diff -urNp linux-2.6.32.13/mm/highmem.c linux-2.6.32.13/mm/highmem.c | |||
50417 | pkmap_count[last_pkmap_nr] = 1; | 50424 | pkmap_count[last_pkmap_nr] = 1; |
50418 | set_page_address(page, (void *)vaddr); | 50425 | set_page_address(page, (void *)vaddr); |
50419 | 50426 | ||
50420 | diff -urNp linux-2.6.32.13/mm/hugetlb.c linux-2.6.32.13/mm/hugetlb.c | 50427 | diff -urNp linux-2.6.32.15/mm/hugetlb.c linux-2.6.32.15/mm/hugetlb.c |
50421 | --- linux-2.6.32.13/mm/hugetlb.c 2010-05-15 13:20:19.411414284 -0400 | 50428 | --- linux-2.6.32.15/mm/hugetlb.c 2010-05-28 20:16:44.458924952 -0400 |
50422 | +++ linux-2.6.32.13/mm/hugetlb.c 2010-05-15 13:21:18.370623064 -0400 | 50429 | +++ linux-2.6.32.15/mm/hugetlb.c 2010-05-28 21:27:16.487251224 -0400 |
50423 | @@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s | 50430 | @@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s |
50424 | return 1; | 50431 | return 1; |
50425 | } | 50432 | } |
@@ -50499,9 +50506,9 @@ diff -urNp linux-2.6.32.13/mm/hugetlb.c linux-2.6.32.13/mm/hugetlb.c | |||
50499 | ptep = huge_pte_alloc(mm, address, huge_page_size(h)); | 50506 | ptep = huge_pte_alloc(mm, address, huge_page_size(h)); |
50500 | if (!ptep) | 50507 | if (!ptep) |
50501 | return VM_FAULT_OOM; | 50508 | return VM_FAULT_OOM; |
50502 | diff -urNp linux-2.6.32.13/mm/Kconfig linux-2.6.32.13/mm/Kconfig | 50509 | diff -urNp linux-2.6.32.15/mm/Kconfig linux-2.6.32.15/mm/Kconfig |
50503 | --- linux-2.6.32.13/mm/Kconfig 2010-03-15 11:52:04.000000000 -0400 | 50510 | --- linux-2.6.32.15/mm/Kconfig 2010-03-15 11:52:04.000000000 -0400 |
50504 | +++ linux-2.6.32.13/mm/Kconfig 2010-05-15 13:21:18.370623064 -0400 | 50511 | +++ linux-2.6.32.15/mm/Kconfig 2010-05-28 21:27:16.487251224 -0400 |
50505 | @@ -228,7 +228,7 @@ config KSM | 50512 | @@ -228,7 +228,7 @@ config KSM |
50506 | config DEFAULT_MMAP_MIN_ADDR | 50513 | config DEFAULT_MMAP_MIN_ADDR |
50507 | int "Low address space to protect from user allocation" | 50514 | int "Low address space to protect from user allocation" |
@@ -50511,9 +50518,9 @@ diff -urNp linux-2.6.32.13/mm/Kconfig linux-2.6.32.13/mm/Kconfig | |||
50511 | help | 50518 | help |
50512 | This is the portion of low virtual memory which should be protected | 50519 | This is the portion of low virtual memory which should be protected |
50513 | from userspace allocation. Keeping a user from writing to low pages | 50520 | from userspace allocation. Keeping a user from writing to low pages |
50514 | diff -urNp linux-2.6.32.13/mm/maccess.c linux-2.6.32.13/mm/maccess.c | 50521 | diff -urNp linux-2.6.32.15/mm/maccess.c linux-2.6.32.15/mm/maccess.c |
50515 | --- linux-2.6.32.13/mm/maccess.c 2010-03-15 11:52:04.000000000 -0400 | 50522 | --- linux-2.6.32.15/mm/maccess.c 2010-03-15 11:52:04.000000000 -0400 |
50516 | +++ linux-2.6.32.13/mm/maccess.c 2010-05-15 13:21:18.370623064 -0400 | 50523 | +++ linux-2.6.32.15/mm/maccess.c 2010-05-28 21:27:16.487251224 -0400 |
50517 | @@ -14,7 +14,7 @@ | 50524 | @@ -14,7 +14,7 @@ |
50518 | * Safely read from address @src to the buffer at @dst. If a kernel fault | 50525 | * Safely read from address @src to the buffer at @dst. If a kernel fault |
50519 | * happens, handle that and return -EFAULT. | 50526 | * happens, handle that and return -EFAULT. |
@@ -50532,9 +50539,9 @@ diff -urNp linux-2.6.32.13/mm/maccess.c linux-2.6.32.13/mm/maccess.c | |||
50532 | { | 50539 | { |
50533 | long ret; | 50540 | long ret; |
50534 | mm_segment_t old_fs = get_fs(); | 50541 | mm_segment_t old_fs = get_fs(); |
50535 | diff -urNp linux-2.6.32.13/mm/madvise.c linux-2.6.32.13/mm/madvise.c | 50542 | diff -urNp linux-2.6.32.15/mm/madvise.c linux-2.6.32.15/mm/madvise.c |
50536 | --- linux-2.6.32.13/mm/madvise.c 2010-03-15 11:52:04.000000000 -0400 | 50543 | --- linux-2.6.32.15/mm/madvise.c 2010-03-15 11:52:04.000000000 -0400 |
50537 | +++ linux-2.6.32.13/mm/madvise.c 2010-05-15 13:21:18.378626814 -0400 | 50544 | +++ linux-2.6.32.15/mm/madvise.c 2010-05-28 21:27:16.487251224 -0400 |
50538 | @@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a | 50545 | @@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a |
50539 | pgoff_t pgoff; | 50546 | pgoff_t pgoff; |
50540 | unsigned long new_flags = vma->vm_flags; | 50547 | unsigned long new_flags = vma->vm_flags; |
@@ -50611,9 +50618,9 @@ diff -urNp linux-2.6.32.13/mm/madvise.c linux-2.6.32.13/mm/madvise.c | |||
50611 | error = 0; | 50618 | error = 0; |
50612 | if (end == start) | 50619 | if (end == start) |
50613 | goto out; | 50620 | goto out; |
50614 | diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c | 50621 | diff -urNp linux-2.6.32.15/mm/memory.c linux-2.6.32.15/mm/memory.c |
50615 | --- linux-2.6.32.13/mm/memory.c 2010-03-15 11:52:04.000000000 -0400 | 50622 | --- linux-2.6.32.15/mm/memory.c 2010-03-15 11:52:04.000000000 -0400 |
50616 | +++ linux-2.6.32.13/mm/memory.c 2010-05-15 13:21:18.394625565 -0400 | 50623 | +++ linux-2.6.32.15/mm/memory.c 2010-05-28 21:27:16.487251224 -0400 |
50617 | @@ -48,6 +48,7 @@ | 50624 | @@ -48,6 +48,7 @@ |
50618 | #include <linux/ksm.h> | 50625 | #include <linux/ksm.h> |
50619 | #include <linux/rmap.h> | 50626 | #include <linux/rmap.h> |
@@ -51018,9 +51025,9 @@ diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c | |||
51018 | /* | 51025 | /* |
51019 | * Make sure the vDSO gets into every core dump. | 51026 | * Make sure the vDSO gets into every core dump. |
51020 | * Dumping its contents makes post-mortem fully interpretable later | 51027 | * Dumping its contents makes post-mortem fully interpretable later |
51021 | diff -urNp linux-2.6.32.13/mm/memory-failure.c linux-2.6.32.13/mm/memory-failure.c | 51028 | diff -urNp linux-2.6.32.15/mm/memory-failure.c linux-2.6.32.15/mm/memory-failure.c |
51022 | --- linux-2.6.32.13/mm/memory-failure.c 2010-03-15 11:52:04.000000000 -0400 | 51029 | --- linux-2.6.32.15/mm/memory-failure.c 2010-03-15 11:52:04.000000000 -0400 |
51023 | +++ linux-2.6.32.13/mm/memory-failure.c 2010-05-15 13:21:18.394625565 -0400 | 51030 | +++ linux-2.6.32.15/mm/memory-failure.c 2010-05-28 21:27:16.487251224 -0400 |
51024 | @@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r | 51031 | @@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r |
51025 | 51032 | ||
51026 | int sysctl_memory_failure_recovery __read_mostly = 1; | 51033 | int sysctl_memory_failure_recovery __read_mostly = 1; |
@@ -51039,9 +51046,9 @@ diff -urNp linux-2.6.32.13/mm/memory-failure.c linux-2.6.32.13/mm/memory-failure | |||
51039 | 51046 | ||
51040 | /* | 51047 | /* |
51041 | * We need/can do nothing about count=0 pages. | 51048 | * We need/can do nothing about count=0 pages. |
51042 | diff -urNp linux-2.6.32.13/mm/mempolicy.c linux-2.6.32.13/mm/mempolicy.c | 51049 | diff -urNp linux-2.6.32.15/mm/mempolicy.c linux-2.6.32.15/mm/mempolicy.c |
51043 | --- linux-2.6.32.13/mm/mempolicy.c 2010-04-04 20:41:50.072525146 -0400 | 51050 | --- linux-2.6.32.15/mm/mempolicy.c 2010-04-04 20:41:50.072525146 -0400 |
51044 | +++ linux-2.6.32.13/mm/mempolicy.c 2010-05-15 13:21:18.411130134 -0400 | 51051 | +++ linux-2.6.32.15/mm/mempolicy.c 2010-05-28 21:27:16.487251224 -0400 |
51045 | @@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st | 51052 | @@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st |
51046 | struct vm_area_struct *next; | 51053 | struct vm_area_struct *next; |
51047 | int err; | 51054 | int err; |
@@ -51122,9 +51129,9 @@ diff -urNp linux-2.6.32.13/mm/mempolicy.c linux-2.6.32.13/mm/mempolicy.c | |||
51122 | } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { | 51129 | } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { |
51123 | seq_printf(m, " heap"); | 51130 | seq_printf(m, " heap"); |
51124 | } else if (vma->vm_start <= mm->start_stack && | 51131 | } else if (vma->vm_start <= mm->start_stack && |
51125 | diff -urNp linux-2.6.32.13/mm/migrate.c linux-2.6.32.13/mm/migrate.c | 51132 | diff -urNp linux-2.6.32.15/mm/migrate.c linux-2.6.32.15/mm/migrate.c |
51126 | --- linux-2.6.32.13/mm/migrate.c 2010-03-15 11:52:04.000000000 -0400 | 51133 | --- linux-2.6.32.15/mm/migrate.c 2010-03-15 11:52:04.000000000 -0400 |
51127 | +++ linux-2.6.32.13/mm/migrate.c 2010-05-15 13:21:18.411130134 -0400 | 51134 | +++ linux-2.6.32.15/mm/migrate.c 2010-05-28 21:27:16.491098771 -0400 |
51128 | @@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, | 51135 | @@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, |
51129 | if (!mm) | 51136 | if (!mm) |
51130 | return -EINVAL; | 51137 | return -EINVAL; |
@@ -51150,9 +51157,9 @@ diff -urNp linux-2.6.32.13/mm/migrate.c linux-2.6.32.13/mm/migrate.c | |||
51150 | rcu_read_unlock(); | 51157 | rcu_read_unlock(); |
51151 | err = -EPERM; | 51158 | err = -EPERM; |
51152 | goto out; | 51159 | goto out; |
51153 | diff -urNp linux-2.6.32.13/mm/mlock.c linux-2.6.32.13/mm/mlock.c | 51160 | diff -urNp linux-2.6.32.15/mm/mlock.c linux-2.6.32.15/mm/mlock.c |
51154 | --- linux-2.6.32.13/mm/mlock.c 2010-03-15 11:52:04.000000000 -0400 | 51161 | --- linux-2.6.32.15/mm/mlock.c 2010-03-15 11:52:04.000000000 -0400 |
51155 | +++ linux-2.6.32.13/mm/mlock.c 2010-05-15 13:21:18.411130134 -0400 | 51162 | +++ linux-2.6.32.15/mm/mlock.c 2010-05-28 21:27:16.499256346 -0400 |
51156 | @@ -13,6 +13,7 @@ | 51163 | @@ -13,6 +13,7 @@ |
51157 | #include <linux/pagemap.h> | 51164 | #include <linux/pagemap.h> |
51158 | #include <linux/mempolicy.h> | 51165 | #include <linux/mempolicy.h> |
@@ -51221,9 +51228,9 @@ diff -urNp linux-2.6.32.13/mm/mlock.c linux-2.6.32.13/mm/mlock.c | |||
51221 | if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || | 51228 | if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || |
51222 | capable(CAP_IPC_LOCK)) | 51229 | capable(CAP_IPC_LOCK)) |
51223 | ret = do_mlockall(flags); | 51230 | ret = do_mlockall(flags); |
51224 | diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c | 51231 | diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c |
51225 | --- linux-2.6.32.13/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 | 51232 | --- linux-2.6.32.15/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 |
51226 | +++ linux-2.6.32.13/mm/mmap.c 2010-05-15 13:21:18.411130134 -0400 | 51233 | +++ linux-2.6.32.15/mm/mmap.c 2010-05-28 21:27:16.502950026 -0400 |
51227 | @@ -45,6 +45,16 @@ | 51234 | @@ -45,6 +45,16 @@ |
51228 | #define arch_rebalance_pgtables(addr, len) (addr) | 51235 | #define arch_rebalance_pgtables(addr, len) (addr) |
51229 | #endif | 51236 | #endif |
@@ -52312,9 +52319,9 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c | |||
52312 | vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; | 52319 | vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; |
52313 | vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); | 52320 | vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); |
52314 | 52321 | ||
52315 | diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c | 52322 | diff -urNp linux-2.6.32.15/mm/mprotect.c linux-2.6.32.15/mm/mprotect.c |
52316 | --- linux-2.6.32.13/mm/mprotect.c 2010-03-15 11:52:04.000000000 -0400 | 52323 | --- linux-2.6.32.15/mm/mprotect.c 2010-03-15 11:52:04.000000000 -0400 |
52317 | +++ linux-2.6.32.13/mm/mprotect.c 2010-05-15 13:21:18.411130134 -0400 | 52324 | +++ linux-2.6.32.15/mm/mprotect.c 2010-05-28 21:27:16.502950026 -0400 |
52318 | @@ -24,10 +24,16 @@ | 52325 | @@ -24,10 +24,16 @@ |
52319 | #include <linux/mmu_notifier.h> | 52326 | #include <linux/mmu_notifier.h> |
52320 | #include <linux/migrate.h> | 52327 | #include <linux/migrate.h> |
@@ -52435,9 +52442,16 @@ diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c | |||
52435 | /* | 52442 | /* |
52436 | * First try to merge with previous and/or next vma. | 52443 | * First try to merge with previous and/or next vma. |
52437 | */ | 52444 | */ |
52438 | @@ -196,8 +284,14 @@ success: | 52445 | @@ -195,9 +283,21 @@ success: |
52446 | * vm_flags and vm_page_prot are protected by the mmap_sem | ||
52439 | * held in write mode. | 52447 | * held in write mode. |
52440 | */ | 52448 | */ |
52449 | + | ||
52450 | +#ifdef CONFIG_PAX_SEGMEXEC | ||
52451 | + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ)) | ||
52452 | + pax_find_mirror_vma(vma)->vm_flags ^= VM_READ; | ||
52453 | +#endif | ||
52454 | + | ||
52441 | vma->vm_flags = newflags; | 52455 | vma->vm_flags = newflags; |
52442 | + | 52456 | + |
52443 | +#ifdef CONFIG_PAX_MPROTECT | 52457 | +#ifdef CONFIG_PAX_MPROTECT |
@@ -52451,7 +52465,7 @@ diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c | |||
52451 | 52465 | ||
52452 | if (vma_wants_writenotify(vma)) { | 52466 | if (vma_wants_writenotify(vma)) { |
52453 | vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED); | 52467 | vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED); |
52454 | @@ -238,6 +332,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, | 52468 | @@ -238,6 +338,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, |
52455 | end = start + len; | 52469 | end = start + len; |
52456 | if (end <= start) | 52470 | if (end <= start) |
52457 | return -ENOMEM; | 52471 | return -ENOMEM; |
@@ -52469,7 +52483,7 @@ diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c | |||
52469 | if (!arch_validate_prot(prot)) | 52483 | if (!arch_validate_prot(prot)) |
52470 | return -EINVAL; | 52484 | return -EINVAL; |
52471 | 52485 | ||
52472 | @@ -245,7 +350,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, | 52486 | @@ -245,7 +356,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, |
52473 | /* | 52487 | /* |
52474 | * Does the application expect PROT_READ to imply PROT_EXEC: | 52488 | * Does the application expect PROT_READ to imply PROT_EXEC: |
52475 | */ | 52489 | */ |
@@ -52478,7 +52492,7 @@ diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c | |||
52478 | prot |= PROT_EXEC; | 52492 | prot |= PROT_EXEC; |
52479 | 52493 | ||
52480 | vm_flags = calc_vm_prot_bits(prot); | 52494 | vm_flags = calc_vm_prot_bits(prot); |
52481 | @@ -277,6 +382,16 @@ SYSCALL_DEFINE3(mprotect, unsigned long, | 52495 | @@ -277,6 +388,16 @@ SYSCALL_DEFINE3(mprotect, unsigned long, |
52482 | if (start > vma->vm_start) | 52496 | if (start > vma->vm_start) |
52483 | prev = vma; | 52497 | prev = vma; |
52484 | 52498 | ||
@@ -52495,7 +52509,7 @@ diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c | |||
52495 | for (nstart = start ; ; ) { | 52509 | for (nstart = start ; ; ) { |
52496 | unsigned long newflags; | 52510 | unsigned long newflags; |
52497 | 52511 | ||
52498 | @@ -301,6 +416,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, | 52512 | @@ -301,6 +422,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, |
52499 | if (error) | 52513 | if (error) |
52500 | goto out; | 52514 | goto out; |
52501 | perf_event_mmap(vma); | 52515 | perf_event_mmap(vma); |
@@ -52505,9 +52519,9 @@ diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c | |||
52505 | nstart = tmp; | 52519 | nstart = tmp; |
52506 | 52520 | ||
52507 | if (nstart < prev->vm_end) | 52521 | if (nstart < prev->vm_end) |
52508 | diff -urNp linux-2.6.32.13/mm/mremap.c linux-2.6.32.13/mm/mremap.c | 52522 | diff -urNp linux-2.6.32.15/mm/mremap.c linux-2.6.32.15/mm/mremap.c |
52509 | --- linux-2.6.32.13/mm/mremap.c 2010-03-15 11:52:04.000000000 -0400 | 52523 | --- linux-2.6.32.15/mm/mremap.c 2010-03-15 11:52:04.000000000 -0400 |
52510 | +++ linux-2.6.32.13/mm/mremap.c 2010-05-15 13:21:18.411130134 -0400 | 52524 | +++ linux-2.6.32.15/mm/mremap.c 2010-05-28 21:27:16.502950026 -0400 |
52511 | @@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str | 52525 | @@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str |
52512 | continue; | 52526 | continue; |
52513 | pte = ptep_clear_flush(vma, old_addr, old_pte); | 52527 | pte = ptep_clear_flush(vma, old_addr, old_pte); |
@@ -52608,9 +52622,9 @@ diff -urNp linux-2.6.32.13/mm/mremap.c linux-2.6.32.13/mm/mremap.c | |||
52608 | } | 52622 | } |
52609 | out: | 52623 | out: |
52610 | if (ret & ~PAGE_MASK) | 52624 | if (ret & ~PAGE_MASK) |
52611 | diff -urNp linux-2.6.32.13/mm/nommu.c linux-2.6.32.13/mm/nommu.c | 52625 | diff -urNp linux-2.6.32.15/mm/nommu.c linux-2.6.32.15/mm/nommu.c |
52612 | --- linux-2.6.32.13/mm/nommu.c 2010-03-15 11:52:04.000000000 -0400 | 52626 | --- linux-2.6.32.15/mm/nommu.c 2010-03-15 11:52:04.000000000 -0400 |
52613 | +++ linux-2.6.32.13/mm/nommu.c 2010-05-15 13:21:18.414629737 -0400 | 52627 | +++ linux-2.6.32.15/mm/nommu.c 2010-05-28 21:27:16.502950026 -0400 |
52614 | @@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m | 52628 | @@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m |
52615 | EXPORT_SYMBOL(find_vma); | 52629 | EXPORT_SYMBOL(find_vma); |
52616 | 52630 | ||
@@ -52627,9 +52641,9 @@ diff -urNp linux-2.6.32.13/mm/nommu.c linux-2.6.32.13/mm/nommu.c | |||
52627 | * expand a stack to a given address | 52641 | * expand a stack to a given address |
52628 | * - not supported under NOMMU conditions | 52642 | * - not supported under NOMMU conditions |
52629 | */ | 52643 | */ |
52630 | diff -urNp linux-2.6.32.13/mm/page_alloc.c linux-2.6.32.13/mm/page_alloc.c | 52644 | diff -urNp linux-2.6.32.15/mm/page_alloc.c linux-2.6.32.15/mm/page_alloc.c |
52631 | --- linux-2.6.32.13/mm/page_alloc.c 2010-03-15 11:52:04.000000000 -0400 | 52645 | --- linux-2.6.32.15/mm/page_alloc.c 2010-03-15 11:52:04.000000000 -0400 |
52632 | +++ linux-2.6.32.13/mm/page_alloc.c 2010-05-15 13:21:18.414629737 -0400 | 52646 | +++ linux-2.6.32.15/mm/page_alloc.c 2010-05-28 21:27:16.530961628 -0400 |
52633 | @@ -586,6 +586,10 @@ static void __free_pages_ok(struct page | 52647 | @@ -586,6 +586,10 @@ static void __free_pages_ok(struct page |
52634 | int bad = 0; | 52648 | int bad = 0; |
52635 | int wasMlocked = __TestClearPageMlocked(page); | 52649 | int wasMlocked = __TestClearPageMlocked(page); |
@@ -52686,9 +52700,9 @@ diff -urNp linux-2.6.32.13/mm/page_alloc.c linux-2.6.32.13/mm/page_alloc.c | |||
52686 | struct zone *zone, unsigned long zonesize) {} | 52700 | struct zone *zone, unsigned long zonesize) {} |
52687 | #endif /* CONFIG_SPARSEMEM */ | 52701 | #endif /* CONFIG_SPARSEMEM */ |
52688 | 52702 | ||
52689 | diff -urNp linux-2.6.32.13/mm/percpu.c linux-2.6.32.13/mm/percpu.c | 52703 | diff -urNp linux-2.6.32.15/mm/percpu.c linux-2.6.32.15/mm/percpu.c |
52690 | --- linux-2.6.32.13/mm/percpu.c 2010-03-15 11:52:04.000000000 -0400 | 52704 | --- linux-2.6.32.15/mm/percpu.c 2010-03-15 11:52:04.000000000 -0400 |
52691 | +++ linux-2.6.32.13/mm/percpu.c 2010-05-15 13:21:18.450640661 -0400 | 52705 | +++ linux-2.6.32.15/mm/percpu.c 2010-05-28 21:27:16.530961628 -0400 |
52692 | @@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu | 52706 | @@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu |
52693 | static unsigned int pcpu_last_unit_cpu __read_mostly; | 52707 | static unsigned int pcpu_last_unit_cpu __read_mostly; |
52694 | 52708 | ||
@@ -52698,9 +52712,9 @@ diff -urNp linux-2.6.32.13/mm/percpu.c linux-2.6.32.13/mm/percpu.c | |||
52698 | EXPORT_SYMBOL_GPL(pcpu_base_addr); | 52712 | EXPORT_SYMBOL_GPL(pcpu_base_addr); |
52699 | 52713 | ||
52700 | static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ | 52714 | static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ |
52701 | diff -urNp linux-2.6.32.13/mm/rmap.c linux-2.6.32.13/mm/rmap.c | 52715 | diff -urNp linux-2.6.32.15/mm/rmap.c linux-2.6.32.15/mm/rmap.c |
52702 | --- linux-2.6.32.13/mm/rmap.c 2010-03-15 11:52:04.000000000 -0400 | 52716 | --- linux-2.6.32.15/mm/rmap.c 2010-03-15 11:52:04.000000000 -0400 |
52703 | +++ linux-2.6.32.13/mm/rmap.c 2010-05-15 13:21:18.454622314 -0400 | 52717 | +++ linux-2.6.32.15/mm/rmap.c 2010-05-28 21:27:16.539259032 -0400 |
52704 | @@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru | 52718 | @@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru |
52705 | struct mm_struct *mm = vma->vm_mm; | 52719 | struct mm_struct *mm = vma->vm_mm; |
52706 | struct anon_vma *allocated; | 52720 | struct anon_vma *allocated; |
@@ -52712,7 +52726,7 @@ diff -urNp linux-2.6.32.13/mm/rmap.c linux-2.6.32.13/mm/rmap.c | |||
52712 | anon_vma = find_mergeable_anon_vma(vma); | 52726 | anon_vma = find_mergeable_anon_vma(vma); |
52713 | allocated = NULL; | 52727 | allocated = NULL; |
52714 | if (!anon_vma) { | 52728 | if (!anon_vma) { |
52715 | @@ -121,6 +125,15 @@ int anon_vma_prepare(struct vm_area_stru | 52729 | @@ -121,6 +125,16 @@ int anon_vma_prepare(struct vm_area_stru |
52716 | /* page_table_lock to protect against threads */ | 52730 | /* page_table_lock to protect against threads */ |
52717 | spin_lock(&mm->page_table_lock); | 52731 | spin_lock(&mm->page_table_lock); |
52718 | if (likely(!vma->anon_vma)) { | 52732 | if (likely(!vma->anon_vma)) { |
@@ -52720,17 +52734,18 @@ diff -urNp linux-2.6.32.13/mm/rmap.c linux-2.6.32.13/mm/rmap.c | |||
52720 | +#ifdef CONFIG_PAX_SEGMEXEC | 52734 | +#ifdef CONFIG_PAX_SEGMEXEC |
52721 | + vma_m = pax_find_mirror_vma(vma); | 52735 | + vma_m = pax_find_mirror_vma(vma); |
52722 | + if (vma_m) { | 52736 | + if (vma_m) { |
52737 | + BUG_ON(vma_m->anon_vma); | ||
52723 | + vma_m->anon_vma = anon_vma; | 52738 | + vma_m->anon_vma = anon_vma; |
52724 | + __anon_vma_link(vma_m); | 52739 | + list_add_tail(&vma_m->anon_vma_node, &anon_vma->head); |
52725 | + } | 52740 | + } |
52726 | +#endif | 52741 | +#endif |
52727 | + | 52742 | + |
52728 | vma->anon_vma = anon_vma; | 52743 | vma->anon_vma = anon_vma; |
52729 | list_add_tail(&vma->anon_vma_node, &anon_vma->head); | 52744 | list_add_tail(&vma->anon_vma_node, &anon_vma->head); |
52730 | allocated = NULL; | 52745 | allocated = NULL; |
52731 | diff -urNp linux-2.6.32.13/mm/shmem.c linux-2.6.32.13/mm/shmem.c | 52746 | diff -urNp linux-2.6.32.15/mm/shmem.c linux-2.6.32.15/mm/shmem.c |
52732 | --- linux-2.6.32.13/mm/shmem.c 2010-03-15 11:52:04.000000000 -0400 | 52747 | --- linux-2.6.32.15/mm/shmem.c 2010-03-15 11:52:04.000000000 -0400 |
52733 | +++ linux-2.6.32.13/mm/shmem.c 2010-05-15 13:21:18.454622314 -0400 | 52748 | +++ linux-2.6.32.15/mm/shmem.c 2010-05-28 21:27:16.543245570 -0400 |
52734 | @@ -31,7 +31,7 @@ | 52749 | @@ -31,7 +31,7 @@ |
52735 | #include <linux/swap.h> | 52750 | #include <linux/swap.h> |
52736 | #include <linux/ima.h> | 52751 | #include <linux/ima.h> |
@@ -52740,9 +52755,9 @@ diff -urNp linux-2.6.32.13/mm/shmem.c linux-2.6.32.13/mm/shmem.c | |||
52740 | 52755 | ||
52741 | #ifdef CONFIG_SHMEM | 52756 | #ifdef CONFIG_SHMEM |
52742 | /* | 52757 | /* |
52743 | diff -urNp linux-2.6.32.13/mm/slab.c linux-2.6.32.13/mm/slab.c | 52758 | diff -urNp linux-2.6.32.15/mm/slab.c linux-2.6.32.15/mm/slab.c |
52744 | --- linux-2.6.32.13/mm/slab.c 2010-03-15 11:52:04.000000000 -0400 | 52759 | --- linux-2.6.32.15/mm/slab.c 2010-03-15 11:52:04.000000000 -0400 |
52745 | +++ linux-2.6.32.13/mm/slab.c 2010-05-15 13:21:18.454622314 -0400 | 52760 | +++ linux-2.6.32.15/mm/slab.c 2010-05-31 11:16:00.657200601 -0400 |
52746 | @@ -308,7 +308,7 @@ struct kmem_list3 { | 52761 | @@ -308,7 +308,7 @@ struct kmem_list3 { |
52747 | * Need this for bootstrapping a per node allocator. | 52762 | * Need this for bootstrapping a per node allocator. |
52748 | */ | 52763 | */ |
@@ -52779,16 +52794,24 @@ diff -urNp linux-2.6.32.13/mm/slab.c linux-2.6.32.13/mm/slab.c | |||
52779 | 52794 | ||
52780 | /* internal cache of cache description objs */ | 52795 | /* internal cache of cache description objs */ |
52781 | static struct kmem_cache cache_cache = { | 52796 | static struct kmem_cache cache_cache = { |
52782 | @@ -4082,7 +4082,7 @@ out: | 52797 | @@ -4471,15 +4471,66 @@ static const struct file_operations proc |
52783 | schedule_delayed_work(work, round_jiffies_relative(REAPTIMEOUT_CPUC)); | ||
52784 | } | ||
52785 | |||
52786 | -#ifdef CONFIG_SLABINFO | ||
52787 | +#if defined(CONFIG_SLABINFO) && !defined(CONFIG_GRKERNSEC_PROC_ADD) | ||
52788 | 52798 | ||
52789 | static void print_slabinfo_header(struct seq_file *m) | 52799 | static int __init slab_proc_init(void) |
52790 | { | 52800 | { |
52791 | @@ -4480,6 +4480,51 @@ static int __init slab_proc_init(void) | 52801 | - proc_create("slabinfo",S_IWUSR|S_IRUGO,NULL,&proc_slabinfo_operations); |
52802 | + mode_t gr_mode = S_IRUGO; | ||
52803 | + | ||
52804 | +#ifdef CONFIG_GRKERNSEC_PROC_ADD | ||
52805 | + gr_mode = S_IRUSR; | ||
52806 | +#endif | ||
52807 | + | ||
52808 | + proc_create("slabinfo",S_IWUSR|gr_mode,NULL,&proc_slabinfo_operations); | ||
52809 | #ifdef CONFIG_DEBUG_SLAB_LEAK | ||
52810 | - proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations); | ||
52811 | + proc_create("slab_allocators", gr_mode, NULL, &proc_slabstats_operations); | ||
52812 | #endif | ||
52813 | return 0; | ||
52814 | } | ||
52792 | module_init(slab_proc_init); | 52815 | module_init(slab_proc_init); |
52793 | #endif | 52816 | #endif |
52794 | 52817 | ||
@@ -52840,9 +52863,9 @@ diff -urNp linux-2.6.32.13/mm/slab.c linux-2.6.32.13/mm/slab.c | |||
52840 | /** | 52863 | /** |
52841 | * ksize - get the actual amount of memory allocated for a given object | 52864 | * ksize - get the actual amount of memory allocated for a given object |
52842 | * @objp: Pointer to the object | 52865 | * @objp: Pointer to the object |
52843 | diff -urNp linux-2.6.32.13/mm/slob.c linux-2.6.32.13/mm/slob.c | 52866 | diff -urNp linux-2.6.32.15/mm/slob.c linux-2.6.32.15/mm/slob.c |
52844 | --- linux-2.6.32.13/mm/slob.c 2010-03-15 11:52:04.000000000 -0400 | 52867 | --- linux-2.6.32.15/mm/slob.c 2010-03-15 11:52:04.000000000 -0400 |
52845 | +++ linux-2.6.32.13/mm/slob.c 2010-05-15 13:21:18.454622314 -0400 | 52868 | +++ linux-2.6.32.15/mm/slob.c 2010-05-31 11:16:35.308884479 -0400 |
52846 | @@ -29,7 +29,7 @@ | 52869 | @@ -29,7 +29,7 @@ |
52847 | * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls | 52870 | * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls |
52848 | * alloc_pages() directly, allocating compound pages so the page order | 52871 | * alloc_pages() directly, allocating compound pages so the page order |
@@ -53163,9 +53186,9 @@ diff -urNp linux-2.6.32.13/mm/slob.c linux-2.6.32.13/mm/slob.c | |||
53163 | } | 53186 | } |
53164 | 53187 | ||
53165 | trace_kmem_cache_free(_RET_IP_, b); | 53188 | trace_kmem_cache_free(_RET_IP_, b); |
53166 | diff -urNp linux-2.6.32.13/mm/slub.c linux-2.6.32.13/mm/slub.c | 53189 | diff -urNp linux-2.6.32.15/mm/slub.c linux-2.6.32.15/mm/slub.c |
53167 | --- linux-2.6.32.13/mm/slub.c 2010-03-15 11:52:04.000000000 -0400 | 53190 | --- linux-2.6.32.15/mm/slub.c 2010-03-15 11:52:04.000000000 -0400 |
53168 | +++ linux-2.6.32.13/mm/slub.c 2010-05-15 13:21:18.454622314 -0400 | 53191 | +++ linux-2.6.32.15/mm/slub.c 2010-05-31 11:16:21.137686742 -0400 |
53169 | @@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache * | 53192 | @@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache * |
53170 | 53193 | ||
53171 | page = virt_to_head_page(x); | 53194 | page = virt_to_head_page(x); |
@@ -53313,18 +53336,24 @@ diff -urNp linux-2.6.32.13/mm/slub.c linux-2.6.32.13/mm/slub.c | |||
53313 | .filter = uevent_filter, | 53336 | .filter = uevent_filter, |
53314 | }; | 53337 | }; |
53315 | 53338 | ||
53316 | @@ -4696,7 +4737,7 @@ __initcall(slab_sysfs_init); | 53339 | @@ -4785,7 +4826,13 @@ static const struct file_operations proc |
53317 | /* | 53340 | |
53318 | * The /proc/slabinfo ABI | 53341 | static int __init slab_proc_init(void) |
53319 | */ | 53342 | { |
53320 | -#ifdef CONFIG_SLABINFO | 53343 | - proc_create("slabinfo", S_IRUGO, NULL, &proc_slabinfo_operations); |
53321 | +#if defined(CONFIG_SLABINFO) && !defined(CONFIG_GRKERNSEC_PROC_ADD) | 53344 | + mode_t gr_mode = S_IRUGO; |
53322 | static void print_slabinfo_header(struct seq_file *m) | 53345 | + |
53323 | { | 53346 | +#ifdef CONFIG_GRKERNSEC_PROC_ADD |
53324 | seq_puts(m, "slabinfo - version: 2.1\n"); | 53347 | + gr_mode = S_IRUSR; |
53325 | diff -urNp linux-2.6.32.13/mm/util.c linux-2.6.32.13/mm/util.c | 53348 | +#endif |
53326 | --- linux-2.6.32.13/mm/util.c 2010-03-15 11:52:04.000000000 -0400 | 53349 | + |
53327 | +++ linux-2.6.32.13/mm/util.c 2010-05-15 13:21:18.454622314 -0400 | 53350 | + proc_create("slabinfo", gr_mode, NULL, &proc_slabinfo_operations); |
53351 | return 0; | ||
53352 | } | ||
53353 | module_init(slab_proc_init); | ||
53354 | diff -urNp linux-2.6.32.15/mm/util.c linux-2.6.32.15/mm/util.c | ||
53355 | --- linux-2.6.32.15/mm/util.c 2010-03-15 11:52:04.000000000 -0400 | ||
53356 | +++ linux-2.6.32.15/mm/util.c 2010-05-28 21:27:16.563017088 -0400 | ||
53328 | @@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user); | 53357 | @@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user); |
53329 | void arch_pick_mmap_layout(struct mm_struct *mm) | 53358 | void arch_pick_mmap_layout(struct mm_struct *mm) |
53330 | { | 53359 | { |
@@ -53338,9 +53367,9 @@ diff -urNp linux-2.6.32.13/mm/util.c linux-2.6.32.13/mm/util.c | |||
53338 | mm->get_unmapped_area = arch_get_unmapped_area; | 53367 | mm->get_unmapped_area = arch_get_unmapped_area; |
53339 | mm->unmap_area = arch_unmap_area; | 53368 | mm->unmap_area = arch_unmap_area; |
53340 | } | 53369 | } |
53341 | diff -urNp linux-2.6.32.13/mm/vmalloc.c linux-2.6.32.13/mm/vmalloc.c | 53370 | diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c |
53342 | --- linux-2.6.32.13/mm/vmalloc.c 2010-03-15 11:52:04.000000000 -0400 | 53371 | --- linux-2.6.32.15/mm/vmalloc.c 2010-03-15 11:52:04.000000000 -0400 |
53343 | +++ linux-2.6.32.13/mm/vmalloc.c 2010-05-15 13:23:38.946686210 -0400 | 53372 | +++ linux-2.6.32.15/mm/vmalloc.c 2010-05-28 21:27:16.567244417 -0400 |
53344 | @@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, | 53373 | @@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, |
53345 | 53374 | ||
53346 | pte = pte_offset_kernel(pmd, addr); | 53375 | pte = pte_offset_kernel(pmd, addr); |
@@ -53551,9 +53580,9 @@ diff -urNp linux-2.6.32.13/mm/vmalloc.c linux-2.6.32.13/mm/vmalloc.c | |||
53551 | void *vmalloc_32_user(unsigned long size) | 53580 | void *vmalloc_32_user(unsigned long size) |
53552 | { | 53581 | { |
53553 | struct vm_struct *area; | 53582 | struct vm_struct *area; |
53554 | diff -urNp linux-2.6.32.13/net/8021q/vlan.c linux-2.6.32.13/net/8021q/vlan.c | 53583 | diff -urNp linux-2.6.32.15/net/8021q/vlan.c linux-2.6.32.15/net/8021q/vlan.c |
53555 | --- linux-2.6.32.13/net/8021q/vlan.c 2010-03-15 11:52:04.000000000 -0400 | 53584 | --- linux-2.6.32.15/net/8021q/vlan.c 2010-03-15 11:52:04.000000000 -0400 |
53556 | +++ linux-2.6.32.13/net/8021q/vlan.c 2010-05-15 13:21:18.454622314 -0400 | 53585 | +++ linux-2.6.32.15/net/8021q/vlan.c 2010-05-28 21:27:16.567244417 -0400 |
53557 | @@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net | 53586 | @@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net |
53558 | err = -EPERM; | 53587 | err = -EPERM; |
53559 | if (!capable(CAP_NET_ADMIN)) | 53588 | if (!capable(CAP_NET_ADMIN)) |
@@ -53564,9 +53593,9 @@ diff -urNp linux-2.6.32.13/net/8021q/vlan.c linux-2.6.32.13/net/8021q/vlan.c | |||
53564 | struct vlan_net *vn; | 53593 | struct vlan_net *vn; |
53565 | 53594 | ||
53566 | vn = net_generic(net, vlan_net_id); | 53595 | vn = net_generic(net, vlan_net_id); |
53567 | diff -urNp linux-2.6.32.13/net/atm/atm_misc.c linux-2.6.32.13/net/atm/atm_misc.c | 53596 | diff -urNp linux-2.6.32.15/net/atm/atm_misc.c linux-2.6.32.15/net/atm/atm_misc.c |
53568 | --- linux-2.6.32.13/net/atm/atm_misc.c 2010-03-15 11:52:04.000000000 -0400 | 53597 | --- linux-2.6.32.15/net/atm/atm_misc.c 2010-03-15 11:52:04.000000000 -0400 |
53569 | +++ linux-2.6.32.13/net/atm/atm_misc.c 2010-05-15 13:21:18.454622314 -0400 | 53598 | +++ linux-2.6.32.15/net/atm/atm_misc.c 2010-05-28 21:27:16.567244417 -0400 |
53570 | @@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t | 53599 | @@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t |
53571 | if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) | 53600 | if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) |
53572 | return 1; | 53601 | return 1; |
@@ -53603,9 +53632,9 @@ diff -urNp linux-2.6.32.13/net/atm/atm_misc.c linux-2.6.32.13/net/atm/atm_misc.c | |||
53603 | __SONET_ITEMS | 53632 | __SONET_ITEMS |
53604 | #undef __HANDLE_ITEM | 53633 | #undef __HANDLE_ITEM |
53605 | } | 53634 | } |
53606 | diff -urNp linux-2.6.32.13/net/atm/proc.c linux-2.6.32.13/net/atm/proc.c | 53635 | diff -urNp linux-2.6.32.15/net/atm/proc.c linux-2.6.32.15/net/atm/proc.c |
53607 | --- linux-2.6.32.13/net/atm/proc.c 2010-03-15 11:52:04.000000000 -0400 | 53636 | --- linux-2.6.32.15/net/atm/proc.c 2010-03-15 11:52:04.000000000 -0400 |
53608 | +++ linux-2.6.32.13/net/atm/proc.c 2010-05-15 13:21:18.466625554 -0400 | 53637 | +++ linux-2.6.32.15/net/atm/proc.c 2010-05-28 21:27:16.567244417 -0400 |
53609 | @@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s | 53638 | @@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s |
53610 | const struct k_atm_aal_stats *stats) | 53639 | const struct k_atm_aal_stats *stats) |
53611 | { | 53640 | { |
@@ -53619,9 +53648,9 @@ diff -urNp linux-2.6.32.13/net/atm/proc.c linux-2.6.32.13/net/atm/proc.c | |||
53619 | } | 53648 | } |
53620 | 53649 | ||
53621 | static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev) | 53650 | static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev) |
53622 | diff -urNp linux-2.6.32.13/net/atm/resources.c linux-2.6.32.13/net/atm/resources.c | 53651 | diff -urNp linux-2.6.32.15/net/atm/resources.c linux-2.6.32.15/net/atm/resources.c |
53623 | --- linux-2.6.32.13/net/atm/resources.c 2010-03-15 11:52:04.000000000 -0400 | 53652 | --- linux-2.6.32.15/net/atm/resources.c 2010-03-15 11:52:04.000000000 -0400 |
53624 | +++ linux-2.6.32.13/net/atm/resources.c 2010-05-15 13:21:18.466625554 -0400 | 53653 | +++ linux-2.6.32.15/net/atm/resources.c 2010-05-28 21:27:16.579274907 -0400 |
53625 | @@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev * | 53654 | @@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev * |
53626 | static void copy_aal_stats(struct k_atm_aal_stats *from, | 53655 | static void copy_aal_stats(struct k_atm_aal_stats *from, |
53627 | struct atm_aal_stats *to) | 53656 | struct atm_aal_stats *to) |
@@ -53640,9 +53669,9 @@ diff -urNp linux-2.6.32.13/net/atm/resources.c linux-2.6.32.13/net/atm/resources | |||
53640 | __AAL_STAT_ITEMS | 53669 | __AAL_STAT_ITEMS |
53641 | #undef __HANDLE_ITEM | 53670 | #undef __HANDLE_ITEM |
53642 | } | 53671 | } |
53643 | diff -urNp linux-2.6.32.13/net/bridge/br_private.h linux-2.6.32.13/net/bridge/br_private.h | 53672 | diff -urNp linux-2.6.32.15/net/bridge/br_private.h linux-2.6.32.15/net/bridge/br_private.h |
53644 | --- linux-2.6.32.13/net/bridge/br_private.h 2010-03-15 11:52:04.000000000 -0400 | 53673 | --- linux-2.6.32.15/net/bridge/br_private.h 2010-03-15 11:52:04.000000000 -0400 |
53645 | +++ linux-2.6.32.13/net/bridge/br_private.h 2010-05-15 13:21:18.499638693 -0400 | 53674 | +++ linux-2.6.32.15/net/bridge/br_private.h 2010-05-28 21:27:16.579274907 -0400 |
53646 | @@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event, | 53675 | @@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event, |
53647 | 53676 | ||
53648 | #ifdef CONFIG_SYSFS | 53677 | #ifdef CONFIG_SYSFS |
@@ -53652,9 +53681,9 @@ diff -urNp linux-2.6.32.13/net/bridge/br_private.h linux-2.6.32.13/net/bridge/br | |||
53652 | extern int br_sysfs_addif(struct net_bridge_port *p); | 53681 | extern int br_sysfs_addif(struct net_bridge_port *p); |
53653 | 53682 | ||
53654 | /* br_sysfs_br.c */ | 53683 | /* br_sysfs_br.c */ |
53655 | diff -urNp linux-2.6.32.13/net/bridge/br_stp_if.c linux-2.6.32.13/net/bridge/br_stp_if.c | 53684 | diff -urNp linux-2.6.32.15/net/bridge/br_stp_if.c linux-2.6.32.15/net/bridge/br_stp_if.c |
53656 | --- linux-2.6.32.13/net/bridge/br_stp_if.c 2010-03-15 11:52:04.000000000 -0400 | 53685 | --- linux-2.6.32.15/net/bridge/br_stp_if.c 2010-03-15 11:52:04.000000000 -0400 |
53657 | +++ linux-2.6.32.13/net/bridge/br_stp_if.c 2010-05-15 13:21:18.499638693 -0400 | 53686 | +++ linux-2.6.32.15/net/bridge/br_stp_if.c 2010-05-28 21:27:16.579274907 -0400 |
53658 | @@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg | 53687 | @@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg |
53659 | char *envp[] = { NULL }; | 53688 | char *envp[] = { NULL }; |
53660 | 53689 | ||
@@ -53664,9 +53693,9 @@ diff -urNp linux-2.6.32.13/net/bridge/br_stp_if.c linux-2.6.32.13/net/bridge/br_ | |||
53664 | printk(KERN_INFO "%s: userspace STP stopped, return code %d\n", | 53693 | printk(KERN_INFO "%s: userspace STP stopped, return code %d\n", |
53665 | br->dev->name, r); | 53694 | br->dev->name, r); |
53666 | 53695 | ||
53667 | diff -urNp linux-2.6.32.13/net/bridge/br_sysfs_if.c linux-2.6.32.13/net/bridge/br_sysfs_if.c | 53696 | diff -urNp linux-2.6.32.15/net/bridge/br_sysfs_if.c linux-2.6.32.15/net/bridge/br_sysfs_if.c |
53668 | --- linux-2.6.32.13/net/bridge/br_sysfs_if.c 2010-03-15 11:52:04.000000000 -0400 | 53697 | --- linux-2.6.32.15/net/bridge/br_sysfs_if.c 2010-03-15 11:52:04.000000000 -0400 |
53669 | +++ linux-2.6.32.13/net/bridge/br_sysfs_if.c 2010-05-15 13:21:18.499638693 -0400 | 53698 | +++ linux-2.6.32.15/net/bridge/br_sysfs_if.c 2010-05-28 21:27:16.579274907 -0400 |
53670 | @@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje | 53699 | @@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje |
53671 | return ret; | 53700 | return ret; |
53672 | } | 53701 | } |
@@ -53676,9 +53705,9 @@ diff -urNp linux-2.6.32.13/net/bridge/br_sysfs_if.c linux-2.6.32.13/net/bridge/b | |||
53676 | .show = brport_show, | 53705 | .show = brport_show, |
53677 | .store = brport_store, | 53706 | .store = brport_store, |
53678 | }; | 53707 | }; |
53679 | diff -urNp linux-2.6.32.13/net/core/dev.c linux-2.6.32.13/net/core/dev.c | 53708 | diff -urNp linux-2.6.32.15/net/core/dev.c linux-2.6.32.15/net/core/dev.c |
53680 | --- linux-2.6.32.13/net/core/dev.c 2010-03-15 11:52:04.000000000 -0400 | 53709 | --- linux-2.6.32.15/net/core/dev.c 2010-03-15 11:52:04.000000000 -0400 |
53681 | +++ linux-2.6.32.13/net/core/dev.c 2010-05-15 13:21:18.499638693 -0400 | 53710 | +++ linux-2.6.32.15/net/core/dev.c 2010-05-28 21:27:16.595266161 -0400 |
53682 | @@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb) | 53711 | @@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb) |
53683 | } | 53712 | } |
53684 | EXPORT_SYMBOL(netif_rx_ni); | 53713 | EXPORT_SYMBOL(netif_rx_ni); |
@@ -53697,9 +53726,9 @@ diff -urNp linux-2.6.32.13/net/core/dev.c linux-2.6.32.13/net/core/dev.c | |||
53697 | { | 53726 | { |
53698 | struct list_head *list = &__get_cpu_var(softnet_data).poll_list; | 53727 | struct list_head *list = &__get_cpu_var(softnet_data).poll_list; |
53699 | unsigned long time_limit = jiffies + 2; | 53728 | unsigned long time_limit = jiffies + 2; |
53700 | diff -urNp linux-2.6.32.13/net/core/flow.c linux-2.6.32.13/net/core/flow.c | 53729 | diff -urNp linux-2.6.32.15/net/core/flow.c linux-2.6.32.15/net/core/flow.c |
53701 | --- linux-2.6.32.13/net/core/flow.c 2010-03-15 11:52:04.000000000 -0400 | 53730 | --- linux-2.6.32.15/net/core/flow.c 2010-03-15 11:52:04.000000000 -0400 |
53702 | +++ linux-2.6.32.13/net/core/flow.c 2010-05-15 13:21:18.499638693 -0400 | 53731 | +++ linux-2.6.32.15/net/core/flow.c 2010-05-28 21:27:16.595266161 -0400 |
53703 | @@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT( | 53732 | @@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT( |
53704 | 53733 | ||
53705 | static u32 flow_hash_shift; | 53734 | static u32 flow_hash_shift; |
@@ -53727,9 +53756,9 @@ diff -urNp linux-2.6.32.13/net/core/flow.c linux-2.6.32.13/net/core/flow.c | |||
53727 | 53756 | ||
53728 | #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) | 53757 | #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) |
53729 | 53758 | ||
53730 | diff -urNp linux-2.6.32.13/net/dccp/ccids/ccid3.c linux-2.6.32.13/net/dccp/ccids/ccid3.c | 53759 | diff -urNp linux-2.6.32.15/net/dccp/ccids/ccid3.c linux-2.6.32.15/net/dccp/ccids/ccid3.c |
53731 | --- linux-2.6.32.13/net/dccp/ccids/ccid3.c 2010-03-15 11:52:04.000000000 -0400 | 53760 | --- linux-2.6.32.15/net/dccp/ccids/ccid3.c 2010-03-15 11:52:04.000000000 -0400 |
53732 | +++ linux-2.6.32.13/net/dccp/ccids/ccid3.c 2010-05-15 13:21:18.502580406 -0400 | 53761 | +++ linux-2.6.32.15/net/dccp/ccids/ccid3.c 2010-05-28 21:27:16.595266161 -0400 |
53733 | @@ -41,7 +41,7 @@ | 53762 | @@ -41,7 +41,7 @@ |
53734 | static int ccid3_debug; | 53763 | static int ccid3_debug; |
53735 | #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a) | 53764 | #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a) |
@@ -53739,9 +53768,9 @@ diff -urNp linux-2.6.32.13/net/dccp/ccids/ccid3.c linux-2.6.32.13/net/dccp/ccids | |||
53739 | #endif | 53768 | #endif |
53740 | 53769 | ||
53741 | /* | 53770 | /* |
53742 | diff -urNp linux-2.6.32.13/net/dccp/dccp.h linux-2.6.32.13/net/dccp/dccp.h | 53771 | diff -urNp linux-2.6.32.15/net/dccp/dccp.h linux-2.6.32.15/net/dccp/dccp.h |
53743 | --- linux-2.6.32.13/net/dccp/dccp.h 2010-03-15 11:52:04.000000000 -0400 | 53772 | --- linux-2.6.32.15/net/dccp/dccp.h 2010-03-15 11:52:04.000000000 -0400 |
53744 | +++ linux-2.6.32.13/net/dccp/dccp.h 2010-05-15 13:21:18.502580406 -0400 | 53773 | +++ linux-2.6.32.15/net/dccp/dccp.h 2010-05-28 21:27:16.595266161 -0400 |
53745 | @@ -44,9 +44,9 @@ extern int dccp_debug; | 53774 | @@ -44,9 +44,9 @@ extern int dccp_debug; |
53746 | #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a) | 53775 | #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a) |
53747 | #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a) | 53776 | #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a) |
@@ -53755,9 +53784,9 @@ diff -urNp linux-2.6.32.13/net/dccp/dccp.h linux-2.6.32.13/net/dccp/dccp.h | |||
53755 | #endif | 53784 | #endif |
53756 | 53785 | ||
53757 | extern struct inet_hashinfo dccp_hashinfo; | 53786 | extern struct inet_hashinfo dccp_hashinfo; |
53758 | diff -urNp linux-2.6.32.13/net/decnet/sysctl_net_decnet.c linux-2.6.32.13/net/decnet/sysctl_net_decnet.c | 53787 | diff -urNp linux-2.6.32.15/net/decnet/sysctl_net_decnet.c linux-2.6.32.15/net/decnet/sysctl_net_decnet.c |
53759 | --- linux-2.6.32.13/net/decnet/sysctl_net_decnet.c 2010-03-15 11:52:04.000000000 -0400 | 53788 | --- linux-2.6.32.15/net/decnet/sysctl_net_decnet.c 2010-03-15 11:52:04.000000000 -0400 |
53760 | +++ linux-2.6.32.13/net/decnet/sysctl_net_decnet.c 2010-05-15 13:21:18.502580406 -0400 | 53789 | +++ linux-2.6.32.15/net/decnet/sysctl_net_decnet.c 2010-05-28 21:27:16.595266161 -0400 |
53761 | @@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t | 53790 | @@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t |
53762 | 53791 | ||
53763 | if (len > *lenp) len = *lenp; | 53792 | if (len > *lenp) len = *lenp; |
@@ -53776,9 +53805,9 @@ diff -urNp linux-2.6.32.13/net/decnet/sysctl_net_decnet.c linux-2.6.32.13/net/de | |||
53776 | return -EFAULT; | 53805 | return -EFAULT; |
53777 | 53806 | ||
53778 | *lenp = len; | 53807 | *lenp = len; |
53779 | diff -urNp linux-2.6.32.13/net/ipv4/inet_hashtables.c linux-2.6.32.13/net/ipv4/inet_hashtables.c | 53808 | diff -urNp linux-2.6.32.15/net/ipv4/inet_hashtables.c linux-2.6.32.15/net/ipv4/inet_hashtables.c |
53780 | --- linux-2.6.32.13/net/ipv4/inet_hashtables.c 2010-03-15 11:52:04.000000000 -0400 | 53809 | --- linux-2.6.32.15/net/ipv4/inet_hashtables.c 2010-03-15 11:52:04.000000000 -0400 |
53781 | +++ linux-2.6.32.13/net/ipv4/inet_hashtables.c 2010-05-15 13:21:18.502580406 -0400 | 53810 | +++ linux-2.6.32.15/net/ipv4/inet_hashtables.c 2010-05-28 21:27:16.600259316 -0400 |
53782 | @@ -18,11 +18,14 @@ | 53811 | @@ -18,11 +18,14 @@ |
53783 | #include <linux/sched.h> | 53812 | #include <linux/sched.h> |
53784 | #include <linux/slab.h> | 53813 | #include <linux/slab.h> |
@@ -53803,9 +53832,9 @@ diff -urNp linux-2.6.32.13/net/ipv4/inet_hashtables.c linux-2.6.32.13/net/ipv4/i | |||
53803 | if (tw) { | 53832 | if (tw) { |
53804 | inet_twsk_deschedule(tw, death_row); | 53833 | inet_twsk_deschedule(tw, death_row); |
53805 | inet_twsk_put(tw); | 53834 | inet_twsk_put(tw); |
53806 | diff -urNp linux-2.6.32.13/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.13/net/ipv4/netfilter/nf_nat_snmp_basic.c | 53835 | diff -urNp linux-2.6.32.15/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.15/net/ipv4/netfilter/nf_nat_snmp_basic.c |
53807 | --- linux-2.6.32.13/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-03-15 11:52:04.000000000 -0400 | 53836 | --- linux-2.6.32.15/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-03-15 11:52:04.000000000 -0400 |
53808 | +++ linux-2.6.32.13/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-05-15 13:21:18.502580406 -0400 | 53837 | +++ linux-2.6.32.15/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-05-28 21:27:16.600259316 -0400 |
53809 | @@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( | 53838 | @@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( |
53810 | 53839 | ||
53811 | *len = 0; | 53840 | *len = 0; |
@@ -53815,9 +53844,9 @@ diff -urNp linux-2.6.32.13/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.1 | |||
53815 | if (*octets == NULL) { | 53844 | if (*octets == NULL) { |
53816 | if (net_ratelimit()) | 53845 | if (net_ratelimit()) |
53817 | printk("OOM in bsalg (%d)\n", __LINE__); | 53846 | printk("OOM in bsalg (%d)\n", __LINE__); |
53818 | diff -urNp linux-2.6.32.13/net/ipv4/tcp_ipv4.c linux-2.6.32.13/net/ipv4/tcp_ipv4.c | 53847 | diff -urNp linux-2.6.32.15/net/ipv4/tcp_ipv4.c linux-2.6.32.15/net/ipv4/tcp_ipv4.c |
53819 | --- linux-2.6.32.13/net/ipv4/tcp_ipv4.c 2010-03-15 11:52:04.000000000 -0400 | 53848 | --- linux-2.6.32.15/net/ipv4/tcp_ipv4.c 2010-03-15 11:52:04.000000000 -0400 |
53820 | +++ linux-2.6.32.13/net/ipv4/tcp_ipv4.c 2010-05-15 13:21:18.502580406 -0400 | 53849 | +++ linux-2.6.32.15/net/ipv4/tcp_ipv4.c 2010-05-28 21:27:16.600259316 -0400 |
53821 | @@ -84,6 +84,9 @@ | 53850 | @@ -84,6 +84,9 @@ |
53822 | int sysctl_tcp_tw_reuse __read_mostly; | 53851 | int sysctl_tcp_tw_reuse __read_mostly; |
53823 | int sysctl_tcp_low_latency __read_mostly; | 53852 | int sysctl_tcp_low_latency __read_mostly; |
@@ -53862,9 +53891,9 @@ diff -urNp linux-2.6.32.13/net/ipv4/tcp_ipv4.c linux-2.6.32.13/net/ipv4/tcp_ipv4 | |||
53862 | tcp_v4_send_reset(NULL, skb); | 53891 | tcp_v4_send_reset(NULL, skb); |
53863 | } | 53892 | } |
53864 | 53893 | ||
53865 | diff -urNp linux-2.6.32.13/net/ipv4/tcp_minisocks.c linux-2.6.32.13/net/ipv4/tcp_minisocks.c | 53894 | diff -urNp linux-2.6.32.15/net/ipv4/tcp_minisocks.c linux-2.6.32.15/net/ipv4/tcp_minisocks.c |
53866 | --- linux-2.6.32.13/net/ipv4/tcp_minisocks.c 2010-03-15 11:52:04.000000000 -0400 | 53895 | --- linux-2.6.32.15/net/ipv4/tcp_minisocks.c 2010-03-15 11:52:04.000000000 -0400 |
53867 | +++ linux-2.6.32.13/net/ipv4/tcp_minisocks.c 2010-05-15 13:21:18.502580406 -0400 | 53896 | +++ linux-2.6.32.15/net/ipv4/tcp_minisocks.c 2010-05-28 21:27:16.600259316 -0400 |
53868 | @@ -26,6 +26,10 @@ | 53897 | @@ -26,6 +26,10 @@ |
53869 | #include <net/inet_common.h> | 53898 | #include <net/inet_common.h> |
53870 | #include <net/xfrm.h> | 53899 | #include <net/xfrm.h> |
@@ -53887,9 +53916,9 @@ diff -urNp linux-2.6.32.13/net/ipv4/tcp_minisocks.c linux-2.6.32.13/net/ipv4/tcp | |||
53887 | if (!(flg & TCP_FLAG_RST)) | 53916 | if (!(flg & TCP_FLAG_RST)) |
53888 | req->rsk_ops->send_reset(sk, skb); | 53917 | req->rsk_ops->send_reset(sk, skb); |
53889 | 53918 | ||
53890 | diff -urNp linux-2.6.32.13/net/ipv4/tcp_probe.c linux-2.6.32.13/net/ipv4/tcp_probe.c | 53919 | diff -urNp linux-2.6.32.15/net/ipv4/tcp_probe.c linux-2.6.32.15/net/ipv4/tcp_probe.c |
53891 | --- linux-2.6.32.13/net/ipv4/tcp_probe.c 2010-03-15 11:52:04.000000000 -0400 | 53920 | --- linux-2.6.32.15/net/ipv4/tcp_probe.c 2010-03-15 11:52:04.000000000 -0400 |
53892 | +++ linux-2.6.32.13/net/ipv4/tcp_probe.c 2010-05-15 13:21:18.502580406 -0400 | 53921 | +++ linux-2.6.32.15/net/ipv4/tcp_probe.c 2010-05-28 21:27:16.600259316 -0400 |
53893 | @@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file | 53922 | @@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file |
53894 | if (cnt + width >= len) | 53923 | if (cnt + width >= len) |
53895 | break; | 53924 | break; |
@@ -53899,9 +53928,9 @@ diff -urNp linux-2.6.32.13/net/ipv4/tcp_probe.c linux-2.6.32.13/net/ipv4/tcp_pro | |||
53899 | return -EFAULT; | 53928 | return -EFAULT; |
53900 | cnt += width; | 53929 | cnt += width; |
53901 | } | 53930 | } |
53902 | diff -urNp linux-2.6.32.13/net/ipv4/tcp_timer.c linux-2.6.32.13/net/ipv4/tcp_timer.c | 53931 | diff -urNp linux-2.6.32.15/net/ipv4/tcp_timer.c linux-2.6.32.15/net/ipv4/tcp_timer.c |
53903 | --- linux-2.6.32.13/net/ipv4/tcp_timer.c 2010-03-15 11:52:04.000000000 -0400 | 53932 | --- linux-2.6.32.15/net/ipv4/tcp_timer.c 2010-03-15 11:52:04.000000000 -0400 |
53904 | +++ linux-2.6.32.13/net/ipv4/tcp_timer.c 2010-05-15 13:21:18.502580406 -0400 | 53933 | +++ linux-2.6.32.15/net/ipv4/tcp_timer.c 2010-05-28 21:27:16.600259316 -0400 |
53905 | @@ -21,6 +21,10 @@ | 53934 | @@ -21,6 +21,10 @@ |
53906 | #include <linux/module.h> | 53935 | #include <linux/module.h> |
53907 | #include <net/tcp.h> | 53936 | #include <net/tcp.h> |
@@ -53927,9 +53956,9 @@ diff -urNp linux-2.6.32.13/net/ipv4/tcp_timer.c linux-2.6.32.13/net/ipv4/tcp_tim | |||
53927 | if (retransmits_timed_out(sk, retry_until)) { | 53956 | if (retransmits_timed_out(sk, retry_until)) { |
53928 | /* Has it gone just too far? */ | 53957 | /* Has it gone just too far? */ |
53929 | tcp_write_err(sk); | 53958 | tcp_write_err(sk); |
53930 | diff -urNp linux-2.6.32.13/net/ipv4/udp.c linux-2.6.32.13/net/ipv4/udp.c | 53959 | diff -urNp linux-2.6.32.15/net/ipv4/udp.c linux-2.6.32.15/net/ipv4/udp.c |
53931 | --- linux-2.6.32.13/net/ipv4/udp.c 2010-03-15 11:52:04.000000000 -0400 | 53960 | --- linux-2.6.32.15/net/ipv4/udp.c 2010-05-28 20:16:44.458924952 -0400 |
53932 | +++ linux-2.6.32.13/net/ipv4/udp.c 2010-05-15 13:21:18.502580406 -0400 | 53961 | +++ linux-2.6.32.15/net/ipv4/udp.c 2010-05-28 21:27:16.624385427 -0400 |
53933 | @@ -86,6 +86,7 @@ | 53962 | @@ -86,6 +86,7 @@ |
53934 | #include <linux/types.h> | 53963 | #include <linux/types.h> |
53935 | #include <linux/fcntl.h> | 53964 | #include <linux/fcntl.h> |
@@ -53999,9 +54028,9 @@ diff -urNp linux-2.6.32.13/net/ipv4/udp.c linux-2.6.32.13/net/ipv4/udp.c | |||
53999 | icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); | 54028 | icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); |
54000 | 54029 | ||
54001 | /* | 54030 | /* |
54002 | diff -urNp linux-2.6.32.13/net/ipv6/exthdrs.c linux-2.6.32.13/net/ipv6/exthdrs.c | 54031 | diff -urNp linux-2.6.32.15/net/ipv6/exthdrs.c linux-2.6.32.15/net/ipv6/exthdrs.c |
54003 | --- linux-2.6.32.13/net/ipv6/exthdrs.c 2010-03-15 11:52:04.000000000 -0400 | 54032 | --- linux-2.6.32.15/net/ipv6/exthdrs.c 2010-03-15 11:52:04.000000000 -0400 |
54004 | +++ linux-2.6.32.13/net/ipv6/exthdrs.c 2010-05-15 13:21:18.502580406 -0400 | 54033 | +++ linux-2.6.32.15/net/ipv6/exthdrs.c 2010-05-28 21:27:16.624385427 -0400 |
54005 | @@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt | 54034 | @@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt |
54006 | .type = IPV6_TLV_JUMBO, | 54035 | .type = IPV6_TLV_JUMBO, |
54007 | .func = ipv6_hop_jumbo, | 54036 | .func = ipv6_hop_jumbo, |
@@ -54011,9 +54040,9 @@ diff -urNp linux-2.6.32.13/net/ipv6/exthdrs.c linux-2.6.32.13/net/ipv6/exthdrs.c | |||
54011 | }; | 54040 | }; |
54012 | 54041 | ||
54013 | int ipv6_parse_hopopts(struct sk_buff *skb) | 54042 | int ipv6_parse_hopopts(struct sk_buff *skb) |
54014 | diff -urNp linux-2.6.32.13/net/ipv6/raw.c linux-2.6.32.13/net/ipv6/raw.c | 54043 | diff -urNp linux-2.6.32.15/net/ipv6/raw.c linux-2.6.32.15/net/ipv6/raw.c |
54015 | --- linux-2.6.32.13/net/ipv6/raw.c 2010-03-15 11:52:04.000000000 -0400 | 54044 | --- linux-2.6.32.15/net/ipv6/raw.c 2010-03-15 11:52:04.000000000 -0400 |
54016 | +++ linux-2.6.32.13/net/ipv6/raw.c 2010-05-15 13:21:18.523941597 -0400 | 54045 | +++ linux-2.6.32.15/net/ipv6/raw.c 2010-05-28 21:27:16.624385427 -0400 |
54017 | @@ -600,7 +600,7 @@ out: | 54046 | @@ -600,7 +600,7 @@ out: |
54018 | return err; | 54047 | return err; |
54019 | } | 54048 | } |
@@ -54023,9 +54052,9 @@ diff -urNp linux-2.6.32.13/net/ipv6/raw.c linux-2.6.32.13/net/ipv6/raw.c | |||
54023 | struct flowi *fl, struct rt6_info *rt, | 54052 | struct flowi *fl, struct rt6_info *rt, |
54024 | unsigned int flags) | 54053 | unsigned int flags) |
54025 | { | 54054 | { |
54026 | diff -urNp linux-2.6.32.13/net/ipv6/tcp_ipv6.c linux-2.6.32.13/net/ipv6/tcp_ipv6.c | 54055 | diff -urNp linux-2.6.32.15/net/ipv6/tcp_ipv6.c linux-2.6.32.15/net/ipv6/tcp_ipv6.c |
54027 | --- linux-2.6.32.13/net/ipv6/tcp_ipv6.c 2010-03-15 11:52:04.000000000 -0400 | 54056 | --- linux-2.6.32.15/net/ipv6/tcp_ipv6.c 2010-03-15 11:52:04.000000000 -0400 |
54028 | +++ linux-2.6.32.13/net/ipv6/tcp_ipv6.c 2010-05-15 13:21:18.734776060 -0400 | 54057 | +++ linux-2.6.32.15/net/ipv6/tcp_ipv6.c 2010-05-28 21:27:16.624385427 -0400 |
54029 | @@ -1578,6 +1578,9 @@ static int tcp_v6_do_rcv(struct sock *sk | 54058 | @@ -1578,6 +1578,9 @@ static int tcp_v6_do_rcv(struct sock *sk |
54030 | return 0; | 54059 | return 0; |
54031 | 54060 | ||
@@ -54046,9 +54075,9 @@ diff -urNp linux-2.6.32.13/net/ipv6/tcp_ipv6.c linux-2.6.32.13/net/ipv6/tcp_ipv6 | |||
54046 | tcp_v6_send_reset(NULL, skb); | 54075 | tcp_v6_send_reset(NULL, skb); |
54047 | } | 54076 | } |
54048 | 54077 | ||
54049 | diff -urNp linux-2.6.32.13/net/ipv6/udp.c linux-2.6.32.13/net/ipv6/udp.c | 54078 | diff -urNp linux-2.6.32.15/net/ipv6/udp.c linux-2.6.32.15/net/ipv6/udp.c |
54050 | --- linux-2.6.32.13/net/ipv6/udp.c 2010-03-15 11:52:04.000000000 -0400 | 54079 | --- linux-2.6.32.15/net/ipv6/udp.c 2010-03-15 11:52:04.000000000 -0400 |
54051 | +++ linux-2.6.32.13/net/ipv6/udp.c 2010-05-15 13:21:18.734776060 -0400 | 54080 | +++ linux-2.6.32.15/net/ipv6/udp.c 2010-05-28 21:27:16.631258014 -0400 |
54052 | @@ -587,6 +587,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, | 54081 | @@ -587,6 +587,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, |
54053 | UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, | 54082 | UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, |
54054 | proto == IPPROTO_UDPLITE); | 54083 | proto == IPPROTO_UDPLITE); |
@@ -54059,9 +54088,9 @@ diff -urNp linux-2.6.32.13/net/ipv6/udp.c linux-2.6.32.13/net/ipv6/udp.c | |||
54059 | icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev); | 54088 | icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev); |
54060 | 54089 | ||
54061 | kfree_skb(skb); | 54090 | kfree_skb(skb); |
54062 | diff -urNp linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c | 54091 | diff -urNp linux-2.6.32.15/net/irda/ircomm/ircomm_tty.c linux-2.6.32.15/net/irda/ircomm/ircomm_tty.c |
54063 | --- linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c 2010-03-15 11:52:04.000000000 -0400 | 54092 | --- linux-2.6.32.15/net/irda/ircomm/ircomm_tty.c 2010-03-15 11:52:04.000000000 -0400 |
54064 | +++ linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c 2010-05-15 13:21:18.734776060 -0400 | 54093 | +++ linux-2.6.32.15/net/irda/ircomm/ircomm_tty.c 2010-05-28 21:27:16.634961077 -0400 |
54065 | @@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st | 54094 | @@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st |
54066 | add_wait_queue(&self->open_wait, &wait); | 54095 | add_wait_queue(&self->open_wait, &wait); |
54067 | 54096 | ||
@@ -54184,9 +54213,9 @@ diff -urNp linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c linux-2.6.32.13/net/irda | |||
54184 | seq_printf(m, "Max data size: %d\n", self->max_data_size); | 54213 | seq_printf(m, "Max data size: %d\n", self->max_data_size); |
54185 | seq_printf(m, "Max header size: %d\n", self->max_header_size); | 54214 | seq_printf(m, "Max header size: %d\n", self->max_header_size); |
54186 | 54215 | ||
54187 | diff -urNp linux-2.6.32.13/net/mac80211/ieee80211_i.h linux-2.6.32.13/net/mac80211/ieee80211_i.h | 54216 | diff -urNp linux-2.6.32.15/net/mac80211/ieee80211_i.h linux-2.6.32.15/net/mac80211/ieee80211_i.h |
54188 | --- linux-2.6.32.13/net/mac80211/ieee80211_i.h 2010-04-04 20:41:50.080541354 -0400 | 54217 | --- linux-2.6.32.15/net/mac80211/ieee80211_i.h 2010-04-04 20:41:50.080541354 -0400 |
54189 | +++ linux-2.6.32.13/net/mac80211/ieee80211_i.h 2010-05-15 13:21:18.734776060 -0400 | 54218 | +++ linux-2.6.32.15/net/mac80211/ieee80211_i.h 2010-05-28 21:27:16.639255900 -0400 |
54190 | @@ -635,7 +635,7 @@ struct ieee80211_local { | 54219 | @@ -635,7 +635,7 @@ struct ieee80211_local { |
54191 | /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ | 54220 | /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ |
54192 | spinlock_t queue_stop_reason_lock; | 54221 | spinlock_t queue_stop_reason_lock; |
@@ -54196,9 +54225,9 @@ diff -urNp linux-2.6.32.13/net/mac80211/ieee80211_i.h linux-2.6.32.13/net/mac802 | |||
54196 | int monitors, cooked_mntrs; | 54225 | int monitors, cooked_mntrs; |
54197 | /* number of interfaces with corresponding FIF_ flags */ | 54226 | /* number of interfaces with corresponding FIF_ flags */ |
54198 | int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll; | 54227 | int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll; |
54199 | diff -urNp linux-2.6.32.13/net/mac80211/iface.c linux-2.6.32.13/net/mac80211/iface.c | 54228 | diff -urNp linux-2.6.32.15/net/mac80211/iface.c linux-2.6.32.15/net/mac80211/iface.c |
54200 | --- linux-2.6.32.13/net/mac80211/iface.c 2010-03-15 11:52:04.000000000 -0400 | 54229 | --- linux-2.6.32.15/net/mac80211/iface.c 2010-03-15 11:52:04.000000000 -0400 |
54201 | +++ linux-2.6.32.13/net/mac80211/iface.c 2010-05-15 13:21:18.734776060 -0400 | 54230 | +++ linux-2.6.32.15/net/mac80211/iface.c 2010-05-28 21:27:16.650898496 -0400 |
54202 | @@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev | 54231 | @@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev |
54203 | break; | 54232 | break; |
54204 | } | 54233 | } |
@@ -54253,9 +54282,9 @@ diff -urNp linux-2.6.32.13/net/mac80211/iface.c linux-2.6.32.13/net/mac80211/ifa | |||
54253 | ieee80211_clear_tx_pending(local); | 54282 | ieee80211_clear_tx_pending(local); |
54254 | ieee80211_stop_device(local); | 54283 | ieee80211_stop_device(local); |
54255 | 54284 | ||
54256 | diff -urNp linux-2.6.32.13/net/mac80211/main.c linux-2.6.32.13/net/mac80211/main.c | 54285 | diff -urNp linux-2.6.32.15/net/mac80211/main.c linux-2.6.32.15/net/mac80211/main.c |
54257 | --- linux-2.6.32.13/net/mac80211/main.c 2010-04-04 20:41:50.080541354 -0400 | 54286 | --- linux-2.6.32.15/net/mac80211/main.c 2010-04-04 20:41:50.080541354 -0400 |
54258 | +++ linux-2.6.32.13/net/mac80211/main.c 2010-05-15 13:21:18.734776060 -0400 | 54287 | +++ linux-2.6.32.15/net/mac80211/main.c 2010-05-28 21:27:16.650898496 -0400 |
54259 | @@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211 | 54288 | @@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211 |
54260 | local->hw.conf.power_level = power; | 54289 | local->hw.conf.power_level = power; |
54261 | } | 54290 | } |
@@ -54265,9 +54294,9 @@ diff -urNp linux-2.6.32.13/net/mac80211/main.c linux-2.6.32.13/net/mac80211/main | |||
54265 | ret = drv_config(local, changed); | 54294 | ret = drv_config(local, changed); |
54266 | /* | 54295 | /* |
54267 | * Goal: | 54296 | * Goal: |
54268 | diff -urNp linux-2.6.32.13/net/mac80211/pm.c linux-2.6.32.13/net/mac80211/pm.c | 54297 | diff -urNp linux-2.6.32.15/net/mac80211/pm.c linux-2.6.32.15/net/mac80211/pm.c |
54269 | --- linux-2.6.32.13/net/mac80211/pm.c 2010-03-15 11:52:04.000000000 -0400 | 54298 | --- linux-2.6.32.15/net/mac80211/pm.c 2010-03-15 11:52:04.000000000 -0400 |
54270 | +++ linux-2.6.32.13/net/mac80211/pm.c 2010-05-15 13:21:18.734776060 -0400 | 54299 | +++ linux-2.6.32.15/net/mac80211/pm.c 2010-05-28 21:27:16.650898496 -0400 |
54271 | @@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211 | 54300 | @@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211 |
54272 | } | 54301 | } |
54273 | 54302 | ||
@@ -54277,9 +54306,9 @@ diff -urNp linux-2.6.32.13/net/mac80211/pm.c linux-2.6.32.13/net/mac80211/pm.c | |||
54277 | ieee80211_stop_device(local); | 54306 | ieee80211_stop_device(local); |
54278 | 54307 | ||
54279 | local->suspended = true; | 54308 | local->suspended = true; |
54280 | diff -urNp linux-2.6.32.13/net/mac80211/rate.c linux-2.6.32.13/net/mac80211/rate.c | 54309 | diff -urNp linux-2.6.32.15/net/mac80211/rate.c linux-2.6.32.15/net/mac80211/rate.c |
54281 | --- linux-2.6.32.13/net/mac80211/rate.c 2010-03-15 11:52:04.000000000 -0400 | 54310 | --- linux-2.6.32.15/net/mac80211/rate.c 2010-03-15 11:52:04.000000000 -0400 |
54282 | +++ linux-2.6.32.13/net/mac80211/rate.c 2010-05-15 13:21:18.734776060 -0400 | 54311 | +++ linux-2.6.32.15/net/mac80211/rate.c 2010-05-28 21:27:16.650898496 -0400 |
54283 | @@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct | 54312 | @@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct |
54284 | struct rate_control_ref *ref, *old; | 54313 | struct rate_control_ref *ref, *old; |
54285 | 54314 | ||
@@ -54289,9 +54318,9 @@ diff -urNp linux-2.6.32.13/net/mac80211/rate.c linux-2.6.32.13/net/mac80211/rate | |||
54289 | return -EBUSY; | 54318 | return -EBUSY; |
54290 | 54319 | ||
54291 | ref = rate_control_alloc(name, local); | 54320 | ref = rate_control_alloc(name, local); |
54292 | diff -urNp linux-2.6.32.13/net/mac80211/tx.c linux-2.6.32.13/net/mac80211/tx.c | 54321 | diff -urNp linux-2.6.32.15/net/mac80211/tx.c linux-2.6.32.15/net/mac80211/tx.c |
54293 | --- linux-2.6.32.13/net/mac80211/tx.c 2010-04-29 17:49:38.690617032 -0400 | 54322 | --- linux-2.6.32.15/net/mac80211/tx.c 2010-04-29 17:49:38.690617032 -0400 |
54294 | +++ linux-2.6.32.13/net/mac80211/tx.c 2010-05-15 13:21:18.734776060 -0400 | 54323 | +++ linux-2.6.32.15/net/mac80211/tx.c 2010-05-28 21:27:16.655282610 -0400 |
54295 | @@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct | 54324 | @@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct |
54296 | return cpu_to_le16(dur); | 54325 | return cpu_to_le16(dur); |
54297 | } | 54326 | } |
@@ -54301,9 +54330,9 @@ diff -urNp linux-2.6.32.13/net/mac80211/tx.c linux-2.6.32.13/net/mac80211/tx.c | |||
54301 | struct net_device *dev) | 54330 | struct net_device *dev) |
54302 | { | 54331 | { |
54303 | return local == wdev_priv(dev->ieee80211_ptr); | 54332 | return local == wdev_priv(dev->ieee80211_ptr); |
54304 | diff -urNp linux-2.6.32.13/net/mac80211/util.c linux-2.6.32.13/net/mac80211/util.c | 54333 | diff -urNp linux-2.6.32.15/net/mac80211/util.c linux-2.6.32.15/net/mac80211/util.c |
54305 | --- linux-2.6.32.13/net/mac80211/util.c 2010-04-29 17:49:38.690617032 -0400 | 54334 | --- linux-2.6.32.15/net/mac80211/util.c 2010-04-29 17:49:38.690617032 -0400 |
54306 | +++ linux-2.6.32.13/net/mac80211/util.c 2010-05-15 13:21:18.734776060 -0400 | 54335 | +++ linux-2.6.32.15/net/mac80211/util.c 2010-05-28 21:27:16.655282610 -0400 |
54307 | @@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_ | 54336 | @@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_ |
54308 | local->resuming = true; | 54337 | local->resuming = true; |
54309 | 54338 | ||
@@ -54321,9 +54350,9 @@ diff -urNp linux-2.6.32.13/net/mac80211/util.c linux-2.6.32.13/net/mac80211/util | |||
54321 | if (res) { | 54350 | if (res) { |
54322 | WARN(local->suspended, "Harware became unavailable " | 54351 | WARN(local->suspended, "Harware became unavailable " |
54323 | "upon resume. This is could be a software issue" | 54352 | "upon resume. This is could be a software issue" |
54324 | diff -urNp linux-2.6.32.13/net/sctp/socket.c linux-2.6.32.13/net/sctp/socket.c | 54353 | diff -urNp linux-2.6.32.15/net/sctp/socket.c linux-2.6.32.15/net/sctp/socket.c |
54325 | --- linux-2.6.32.13/net/sctp/socket.c 2010-03-15 11:52:04.000000000 -0400 | 54354 | --- linux-2.6.32.15/net/sctp/socket.c 2010-03-15 11:52:04.000000000 -0400 |
54326 | +++ linux-2.6.32.13/net/sctp/socket.c 2010-05-15 13:21:18.788974801 -0400 | 54355 | +++ linux-2.6.32.15/net/sctp/socket.c 2010-05-28 21:27:16.667233121 -0400 |
54327 | @@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc | 54356 | @@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc |
54328 | struct sctp_sndrcvinfo *sinfo; | 54357 | struct sctp_sndrcvinfo *sinfo; |
54329 | struct sctp_initmsg *sinit; | 54358 | struct sctp_initmsg *sinit; |
@@ -54341,9 +54370,9 @@ diff -urNp linux-2.6.32.13/net/sctp/socket.c linux-2.6.32.13/net/sctp/socket.c | |||
54341 | 54370 | ||
54342 | SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n"); | 54371 | SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n"); |
54343 | if (pp->fastreuse && sk->sk_reuse && | 54372 | if (pp->fastreuse && sk->sk_reuse && |
54344 | diff -urNp linux-2.6.32.13/net/socket.c linux-2.6.32.13/net/socket.c | 54373 | diff -urNp linux-2.6.32.15/net/socket.c linux-2.6.32.15/net/socket.c |
54345 | --- linux-2.6.32.13/net/socket.c 2010-03-15 11:52:04.000000000 -0400 | 54374 | --- linux-2.6.32.15/net/socket.c 2010-03-15 11:52:04.000000000 -0400 |
54346 | +++ linux-2.6.32.13/net/socket.c 2010-05-15 13:21:18.788974801 -0400 | 54375 | +++ linux-2.6.32.15/net/socket.c 2010-05-28 21:27:16.671255671 -0400 |
54347 | @@ -87,6 +87,7 @@ | 54376 | @@ -87,6 +87,7 @@ |
54348 | #include <linux/wireless.h> | 54377 | #include <linux/wireless.h> |
54349 | #include <linux/nsproxy.h> | 54378 | #include <linux/nsproxy.h> |
@@ -54498,9 +54527,9 @@ diff -urNp linux-2.6.32.13/net/socket.c linux-2.6.32.13/net/socket.c | |||
54498 | err = | 54527 | err = |
54499 | security_socket_connect(sock, (struct sockaddr *)&address, addrlen); | 54528 | security_socket_connect(sock, (struct sockaddr *)&address, addrlen); |
54500 | if (err) | 54529 | if (err) |
54501 | diff -urNp linux-2.6.32.13/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.13/net/sunrpc/xprtrdma/svc_rdma.c | 54530 | diff -urNp linux-2.6.32.15/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.15/net/sunrpc/xprtrdma/svc_rdma.c |
54502 | --- linux-2.6.32.13/net/sunrpc/xprtrdma/svc_rdma.c 2010-03-15 11:52:04.000000000 -0400 | 54531 | --- linux-2.6.32.15/net/sunrpc/xprtrdma/svc_rdma.c 2010-03-15 11:52:04.000000000 -0400 |
54503 | +++ linux-2.6.32.13/net/sunrpc/xprtrdma/svc_rdma.c 2010-05-15 13:21:18.790642809 -0400 | 54532 | +++ linux-2.6.32.15/net/sunrpc/xprtrdma/svc_rdma.c 2010-05-28 21:27:16.671255671 -0400 |
54504 | @@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta | 54533 | @@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta |
54505 | len -= *ppos; | 54534 | len -= *ppos; |
54506 | if (len > *lenp) | 54535 | if (len > *lenp) |
@@ -54510,9 +54539,9 @@ diff -urNp linux-2.6.32.13/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.13/net/su | |||
54510 | return -EFAULT; | 54539 | return -EFAULT; |
54511 | *lenp = len; | 54540 | *lenp = len; |
54512 | *ppos += len; | 54541 | *ppos += len; |
54513 | diff -urNp linux-2.6.32.13/net/sysctl_net.c linux-2.6.32.13/net/sysctl_net.c | 54542 | diff -urNp linux-2.6.32.15/net/sysctl_net.c linux-2.6.32.15/net/sysctl_net.c |
54514 | --- linux-2.6.32.13/net/sysctl_net.c 2010-03-15 11:52:04.000000000 -0400 | 54543 | --- linux-2.6.32.15/net/sysctl_net.c 2010-03-15 11:52:04.000000000 -0400 |
54515 | +++ linux-2.6.32.13/net/sysctl_net.c 2010-05-15 13:21:18.790642809 -0400 | 54544 | +++ linux-2.6.32.15/net/sysctl_net.c 2010-05-28 21:27:16.674940896 -0400 |
54516 | @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct | 54545 | @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct |
54517 | struct ctl_table *table) | 54546 | struct ctl_table *table) |
54518 | { | 54547 | { |
@@ -54522,9 +54551,9 @@ diff -urNp linux-2.6.32.13/net/sysctl_net.c linux-2.6.32.13/net/sysctl_net.c | |||
54522 | int mode = (table->mode >> 6) & 7; | 54551 | int mode = (table->mode >> 6) & 7; |
54523 | return (mode << 6) | (mode << 3) | mode; | 54552 | return (mode << 6) | (mode << 3) | mode; |
54524 | } | 54553 | } |
54525 | diff -urNp linux-2.6.32.13/net/tipc/socket.c linux-2.6.32.13/net/tipc/socket.c | 54554 | diff -urNp linux-2.6.32.15/net/tipc/socket.c linux-2.6.32.15/net/tipc/socket.c |
54526 | --- linux-2.6.32.13/net/tipc/socket.c 2010-03-15 11:52:04.000000000 -0400 | 54555 | --- linux-2.6.32.15/net/tipc/socket.c 2010-03-15 11:52:04.000000000 -0400 |
54527 | +++ linux-2.6.32.13/net/tipc/socket.c 2010-05-15 13:21:18.790642809 -0400 | 54556 | +++ linux-2.6.32.15/net/tipc/socket.c 2010-05-28 21:27:16.683249187 -0400 |
54528 | @@ -1449,8 +1449,9 @@ static int connect(struct socket *sock, | 54557 | @@ -1449,8 +1449,9 @@ static int connect(struct socket *sock, |
54529 | } else { | 54558 | } else { |
54530 | if (res == 0) | 54559 | if (res == 0) |
@@ -54537,9 +54566,9 @@ diff -urNp linux-2.6.32.13/net/tipc/socket.c linux-2.6.32.13/net/tipc/socket.c | |||
54537 | sock->state = SS_DISCONNECTING; | 54566 | sock->state = SS_DISCONNECTING; |
54538 | } | 54567 | } |
54539 | 54568 | ||
54540 | diff -urNp linux-2.6.32.13/net/unix/af_unix.c linux-2.6.32.13/net/unix/af_unix.c | 54569 | diff -urNp linux-2.6.32.15/net/unix/af_unix.c linux-2.6.32.15/net/unix/af_unix.c |
54541 | --- linux-2.6.32.13/net/unix/af_unix.c 2010-03-15 11:52:04.000000000 -0400 | 54570 | --- linux-2.6.32.15/net/unix/af_unix.c 2010-03-15 11:52:04.000000000 -0400 |
54542 | +++ linux-2.6.32.13/net/unix/af_unix.c 2010-05-15 13:21:18.790642809 -0400 | 54571 | +++ linux-2.6.32.15/net/unix/af_unix.c 2010-05-28 21:27:16.686916709 -0400 |
54543 | @@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru | 54572 | @@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru |
54544 | err = -ECONNREFUSED; | 54573 | err = -ECONNREFUSED; |
54545 | if (!S_ISSOCK(inode->i_mode)) | 54574 | if (!S_ISSOCK(inode->i_mode)) |
@@ -54597,9 +54626,22 @@ diff -urNp linux-2.6.32.13/net/unix/af_unix.c linux-2.6.32.13/net/unix/af_unix.c | |||
54597 | list = &unix_socket_table[addr->hash]; | 54626 | list = &unix_socket_table[addr->hash]; |
54598 | } else { | 54627 | } else { |
54599 | list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)]; | 54628 | list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)]; |
54600 | diff -urNp linux-2.6.32.13/net/xfrm/xfrm_policy.c linux-2.6.32.13/net/xfrm/xfrm_policy.c | 54629 | diff -urNp linux-2.6.32.15/net/wireless/wext.c linux-2.6.32.15/net/wireless/wext.c |
54601 | --- linux-2.6.32.13/net/xfrm/xfrm_policy.c 2010-03-15 11:52:04.000000000 -0400 | 54630 | --- linux-2.6.32.15/net/wireless/wext.c 2010-03-15 11:52:04.000000000 -0400 |
54602 | +++ linux-2.6.32.13/net/xfrm/xfrm_policy.c 2010-05-15 13:21:18.790642809 -0400 | 54631 | +++ linux-2.6.32.15/net/wireless/wext.c 2010-05-28 21:27:16.686916709 -0400 |
54632 | @@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc | ||
54633 | */ | ||
54634 | |||
54635 | /* Support for very large requests */ | ||
54636 | - if ((descr->flags & IW_DESCR_FLAG_NOMAX) && | ||
54637 | - (user_length > descr->max_tokens)) { | ||
54638 | + if (user_length > descr->max_tokens) { | ||
54639 | /* Allow userspace to GET more than max so | ||
54640 | * we can support any size GET requests. | ||
54641 | * There is still a limit : -ENOMEM. | ||
54642 | diff -urNp linux-2.6.32.15/net/xfrm/xfrm_policy.c linux-2.6.32.15/net/xfrm/xfrm_policy.c | ||
54643 | --- linux-2.6.32.15/net/xfrm/xfrm_policy.c 2010-03-15 11:52:04.000000000 -0400 | ||
54644 | +++ linux-2.6.32.15/net/xfrm/xfrm_policy.c 2010-05-28 21:27:16.686916709 -0400 | ||
54603 | @@ -1477,7 +1477,7 @@ free_dst: | 54645 | @@ -1477,7 +1477,7 @@ free_dst: |
54604 | goto out; | 54646 | goto out; |
54605 | } | 54647 | } |
@@ -54627,9 +54669,9 @@ diff -urNp linux-2.6.32.13/net/xfrm/xfrm_policy.c linux-2.6.32.13/net/xfrm/xfrm_ | |||
54627 | xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl) | 54669 | xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl) |
54628 | { | 54670 | { |
54629 | #ifdef CONFIG_XFRM_SUB_POLICY | 54671 | #ifdef CONFIG_XFRM_SUB_POLICY |
54630 | diff -urNp linux-2.6.32.13/samples/kobject/kset-example.c linux-2.6.32.13/samples/kobject/kset-example.c | 54672 | diff -urNp linux-2.6.32.15/samples/kobject/kset-example.c linux-2.6.32.15/samples/kobject/kset-example.c |
54631 | --- linux-2.6.32.13/samples/kobject/kset-example.c 2010-03-15 11:52:04.000000000 -0400 | 54673 | --- linux-2.6.32.15/samples/kobject/kset-example.c 2010-03-15 11:52:04.000000000 -0400 |
54632 | +++ linux-2.6.32.13/samples/kobject/kset-example.c 2010-05-15 13:21:18.790642809 -0400 | 54674 | +++ linux-2.6.32.15/samples/kobject/kset-example.c 2010-05-28 21:27:16.686916709 -0400 |
54633 | @@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob | 54675 | @@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob |
54634 | } | 54676 | } |
54635 | 54677 | ||
@@ -54639,9 +54681,9 @@ diff -urNp linux-2.6.32.13/samples/kobject/kset-example.c linux-2.6.32.13/sample | |||
54639 | .show = foo_attr_show, | 54681 | .show = foo_attr_show, |
54640 | .store = foo_attr_store, | 54682 | .store = foo_attr_store, |
54641 | }; | 54683 | }; |
54642 | diff -urNp linux-2.6.32.13/scripts/basic/fixdep.c linux-2.6.32.13/scripts/basic/fixdep.c | 54684 | diff -urNp linux-2.6.32.15/scripts/basic/fixdep.c linux-2.6.32.15/scripts/basic/fixdep.c |
54643 | --- linux-2.6.32.13/scripts/basic/fixdep.c 2010-03-15 11:52:04.000000000 -0400 | 54685 | --- linux-2.6.32.15/scripts/basic/fixdep.c 2010-03-15 11:52:04.000000000 -0400 |
54644 | +++ linux-2.6.32.13/scripts/basic/fixdep.c 2010-05-15 13:21:18.790642809 -0400 | 54686 | +++ linux-2.6.32.15/scripts/basic/fixdep.c 2010-05-28 21:27:16.686916709 -0400 |
54645 | @@ -222,9 +222,9 @@ static void use_config(char *m, int slen | 54687 | @@ -222,9 +222,9 @@ static void use_config(char *m, int slen |
54646 | 54688 | ||
54647 | static void parse_config_file(char *map, size_t len) | 54689 | static void parse_config_file(char *map, size_t len) |
@@ -54663,9 +54705,9 @@ diff -urNp linux-2.6.32.13/scripts/basic/fixdep.c linux-2.6.32.13/scripts/basic/ | |||
54663 | 54705 | ||
54664 | if (*p != INT_CONF) { | 54706 | if (*p != INT_CONF) { |
54665 | fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", | 54707 | fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", |
54666 | diff -urNp linux-2.6.32.13/scripts/kallsyms.c linux-2.6.32.13/scripts/kallsyms.c | 54708 | diff -urNp linux-2.6.32.15/scripts/kallsyms.c linux-2.6.32.15/scripts/kallsyms.c |
54667 | --- linux-2.6.32.13/scripts/kallsyms.c 2010-03-15 11:52:04.000000000 -0400 | 54709 | --- linux-2.6.32.15/scripts/kallsyms.c 2010-03-15 11:52:04.000000000 -0400 |
54668 | +++ linux-2.6.32.13/scripts/kallsyms.c 2010-05-15 13:21:18.790642809 -0400 | 54710 | +++ linux-2.6.32.15/scripts/kallsyms.c 2010-05-28 21:27:16.686916709 -0400 |
54669 | @@ -43,10 +43,10 @@ struct text_range { | 54711 | @@ -43,10 +43,10 @@ struct text_range { |
54670 | 54712 | ||
54671 | static unsigned long long _text; | 54713 | static unsigned long long _text; |
@@ -54681,9 +54723,9 @@ diff -urNp linux-2.6.32.13/scripts/kallsyms.c linux-2.6.32.13/scripts/kallsyms.c | |||
54681 | }; | 54723 | }; |
54682 | #define text_range_text (&text_ranges[0]) | 54724 | #define text_range_text (&text_ranges[0]) |
54683 | #define text_range_inittext (&text_ranges[1]) | 54725 | #define text_range_inittext (&text_ranges[1]) |
54684 | diff -urNp linux-2.6.32.13/scripts/mod/file2alias.c linux-2.6.32.13/scripts/mod/file2alias.c | 54726 | diff -urNp linux-2.6.32.15/scripts/mod/file2alias.c linux-2.6.32.15/scripts/mod/file2alias.c |
54685 | --- linux-2.6.32.13/scripts/mod/file2alias.c 2010-03-15 11:52:04.000000000 -0400 | 54727 | --- linux-2.6.32.15/scripts/mod/file2alias.c 2010-03-15 11:52:04.000000000 -0400 |
54686 | +++ linux-2.6.32.13/scripts/mod/file2alias.c 2010-05-15 13:21:18.790642809 -0400 | 54728 | +++ linux-2.6.32.15/scripts/mod/file2alias.c 2010-05-28 21:27:16.686916709 -0400 |
54687 | @@ -72,7 +72,7 @@ static void device_id_check(const char * | 54729 | @@ -72,7 +72,7 @@ static void device_id_check(const char * |
54688 | unsigned long size, unsigned long id_size, | 54730 | unsigned long size, unsigned long id_size, |
54689 | void *symval) | 54731 | void *symval) |
@@ -54738,9 +54780,9 @@ diff -urNp linux-2.6.32.13/scripts/mod/file2alias.c linux-2.6.32.13/scripts/mod/ | |||
54738 | 54780 | ||
54739 | sprintf(alias, "dmi*"); | 54781 | sprintf(alias, "dmi*"); |
54740 | 54782 | ||
54741 | diff -urNp linux-2.6.32.13/scripts/mod/modpost.c linux-2.6.32.13/scripts/mod/modpost.c | 54783 | diff -urNp linux-2.6.32.15/scripts/mod/modpost.c linux-2.6.32.15/scripts/mod/modpost.c |
54742 | --- linux-2.6.32.13/scripts/mod/modpost.c 2010-03-15 11:52:04.000000000 -0400 | 54784 | --- linux-2.6.32.15/scripts/mod/modpost.c 2010-03-15 11:52:04.000000000 -0400 |
54743 | +++ linux-2.6.32.13/scripts/mod/modpost.c 2010-05-15 13:21:18.814648703 -0400 | 54785 | +++ linux-2.6.32.15/scripts/mod/modpost.c 2010-05-28 21:27:16.694974041 -0400 |
54744 | @@ -835,6 +835,7 @@ enum mismatch { | 54786 | @@ -835,6 +835,7 @@ enum mismatch { |
54745 | INIT_TO_EXIT, | 54787 | INIT_TO_EXIT, |
54746 | EXIT_TO_INIT, | 54788 | EXIT_TO_INIT, |
@@ -54808,9 +54850,9 @@ diff -urNp linux-2.6.32.13/scripts/mod/modpost.c linux-2.6.32.13/scripts/mod/mod | |||
54808 | goto close_write; | 54850 | goto close_write; |
54809 | 54851 | ||
54810 | tmp = NOFAIL(malloc(b->pos)); | 54852 | tmp = NOFAIL(malloc(b->pos)); |
54811 | diff -urNp linux-2.6.32.13/scripts/mod/modpost.h linux-2.6.32.13/scripts/mod/modpost.h | 54853 | diff -urNp linux-2.6.32.15/scripts/mod/modpost.h linux-2.6.32.15/scripts/mod/modpost.h |
54812 | --- linux-2.6.32.13/scripts/mod/modpost.h 2010-03-15 11:52:04.000000000 -0400 | 54854 | --- linux-2.6.32.15/scripts/mod/modpost.h 2010-03-15 11:52:04.000000000 -0400 |
54813 | +++ linux-2.6.32.13/scripts/mod/modpost.h 2010-05-15 13:21:18.814648703 -0400 | 54855 | +++ linux-2.6.32.15/scripts/mod/modpost.h 2010-05-28 21:27:16.694974041 -0400 |
54814 | @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e | 54856 | @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e |
54815 | 54857 | ||
54816 | struct buffer { | 54858 | struct buffer { |
@@ -54830,9 +54872,9 @@ diff -urNp linux-2.6.32.13/scripts/mod/modpost.h linux-2.6.32.13/scripts/mod/mod | |||
54830 | 54872 | ||
54831 | struct module { | 54873 | struct module { |
54832 | struct module *next; | 54874 | struct module *next; |
54833 | diff -urNp linux-2.6.32.13/scripts/mod/sumversion.c linux-2.6.32.13/scripts/mod/sumversion.c | 54875 | diff -urNp linux-2.6.32.15/scripts/mod/sumversion.c linux-2.6.32.15/scripts/mod/sumversion.c |
54834 | --- linux-2.6.32.13/scripts/mod/sumversion.c 2010-03-15 11:52:04.000000000 -0400 | 54876 | --- linux-2.6.32.15/scripts/mod/sumversion.c 2010-03-15 11:52:04.000000000 -0400 |
54835 | +++ linux-2.6.32.13/scripts/mod/sumversion.c 2010-05-15 13:21:18.814648703 -0400 | 54877 | +++ linux-2.6.32.15/scripts/mod/sumversion.c 2010-05-28 21:27:16.694974041 -0400 |
54836 | @@ -455,7 +455,7 @@ static void write_version(const char *fi | 54878 | @@ -455,7 +455,7 @@ static void write_version(const char *fi |
54837 | goto out; | 54879 | goto out; |
54838 | } | 54880 | } |
@@ -54842,9 +54884,9 @@ diff -urNp linux-2.6.32.13/scripts/mod/sumversion.c linux-2.6.32.13/scripts/mod/ | |||
54842 | warn("writing sum in %s failed: %s\n", | 54884 | warn("writing sum in %s failed: %s\n", |
54843 | filename, strerror(errno)); | 54885 | filename, strerror(errno)); |
54844 | goto out; | 54886 | goto out; |
54845 | diff -urNp linux-2.6.32.13/scripts/pnmtologo.c linux-2.6.32.13/scripts/pnmtologo.c | 54887 | diff -urNp linux-2.6.32.15/scripts/pnmtologo.c linux-2.6.32.15/scripts/pnmtologo.c |
54846 | --- linux-2.6.32.13/scripts/pnmtologo.c 2010-03-15 11:52:04.000000000 -0400 | 54888 | --- linux-2.6.32.15/scripts/pnmtologo.c 2010-03-15 11:52:04.000000000 -0400 |
54847 | +++ linux-2.6.32.13/scripts/pnmtologo.c 2010-05-15 13:21:18.814648703 -0400 | 54889 | +++ linux-2.6.32.15/scripts/pnmtologo.c 2010-05-28 21:27:16.694974041 -0400 |
54848 | @@ -237,14 +237,14 @@ static void write_header(void) | 54890 | @@ -237,14 +237,14 @@ static void write_header(void) |
54849 | fprintf(out, " * Linux logo %s\n", logoname); | 54891 | fprintf(out, " * Linux logo %s\n", logoname); |
54850 | fputs(" */\n\n", out); | 54892 | fputs(" */\n\n", out); |
@@ -54871,9 +54913,9 @@ diff -urNp linux-2.6.32.13/scripts/pnmtologo.c linux-2.6.32.13/scripts/pnmtologo | |||
54871 | logoname); | 54913 | logoname); |
54872 | write_hex_cnt = 0; | 54914 | write_hex_cnt = 0; |
54873 | for (i = 0; i < logo_clutsize; i++) { | 54915 | for (i = 0; i < logo_clutsize; i++) { |
54874 | diff -urNp linux-2.6.32.13/security/commoncap.c linux-2.6.32.13/security/commoncap.c | 54916 | diff -urNp linux-2.6.32.15/security/commoncap.c linux-2.6.32.15/security/commoncap.c |
54875 | --- linux-2.6.32.13/security/commoncap.c 2010-03-15 11:52:04.000000000 -0400 | 54917 | --- linux-2.6.32.15/security/commoncap.c 2010-03-15 11:52:04.000000000 -0400 |
54876 | +++ linux-2.6.32.13/security/commoncap.c 2010-05-15 13:21:18.814648703 -0400 | 54918 | +++ linux-2.6.32.15/security/commoncap.c 2010-05-28 21:27:16.694974041 -0400 |
54877 | @@ -27,7 +27,7 @@ | 54919 | @@ -27,7 +27,7 @@ |
54878 | #include <linux/sched.h> | 54920 | #include <linux/sched.h> |
54879 | #include <linux/prctl.h> | 54921 | #include <linux/prctl.h> |
@@ -54896,9 +54938,9 @@ diff -urNp linux-2.6.32.13/security/commoncap.c linux-2.6.32.13/security/commonc | |||
54896 | return 0; | 54938 | return 0; |
54897 | } | 54939 | } |
54898 | 54940 | ||
54899 | diff -urNp linux-2.6.32.13/security/integrity/ima/ima_api.c linux-2.6.32.13/security/integrity/ima/ima_api.c | 54941 | diff -urNp linux-2.6.32.15/security/integrity/ima/ima_api.c linux-2.6.32.15/security/integrity/ima/ima_api.c |
54900 | --- linux-2.6.32.13/security/integrity/ima/ima_api.c 2010-03-15 11:52:04.000000000 -0400 | 54942 | --- linux-2.6.32.15/security/integrity/ima/ima_api.c 2010-03-15 11:52:04.000000000 -0400 |
54901 | +++ linux-2.6.32.13/security/integrity/ima/ima_api.c 2010-05-15 13:21:18.814648703 -0400 | 54943 | +++ linux-2.6.32.15/security/integrity/ima/ima_api.c 2010-05-28 21:27:16.694974041 -0400 |
54902 | @@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino | 54944 | @@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino |
54903 | int result; | 54945 | int result; |
54904 | 54946 | ||
@@ -54908,9 +54950,9 @@ diff -urNp linux-2.6.32.13/security/integrity/ima/ima_api.c linux-2.6.32.13/secu | |||
54908 | 54950 | ||
54909 | entry = kmalloc(sizeof(*entry), GFP_KERNEL); | 54951 | entry = kmalloc(sizeof(*entry), GFP_KERNEL); |
54910 | if (!entry) { | 54952 | if (!entry) { |
54911 | diff -urNp linux-2.6.32.13/security/integrity/ima/ima_fs.c linux-2.6.32.13/security/integrity/ima/ima_fs.c | 54953 | diff -urNp linux-2.6.32.15/security/integrity/ima/ima_fs.c linux-2.6.32.15/security/integrity/ima/ima_fs.c |
54912 | --- linux-2.6.32.13/security/integrity/ima/ima_fs.c 2010-03-15 11:52:04.000000000 -0400 | 54954 | --- linux-2.6.32.15/security/integrity/ima/ima_fs.c 2010-03-15 11:52:04.000000000 -0400 |
54913 | +++ linux-2.6.32.13/security/integrity/ima/ima_fs.c 2010-05-15 13:21:18.814648703 -0400 | 54955 | +++ linux-2.6.32.15/security/integrity/ima/ima_fs.c 2010-05-28 21:27:16.694974041 -0400 |
54914 | @@ -27,12 +27,12 @@ | 54956 | @@ -27,12 +27,12 @@ |
54915 | static int valid_policy = 1; | 54957 | static int valid_policy = 1; |
54916 | #define TMPBUFLEN 12 | 54958 | #define TMPBUFLEN 12 |
@@ -54926,9 +54968,9 @@ diff -urNp linux-2.6.32.13/security/integrity/ima/ima_fs.c linux-2.6.32.13/secur | |||
54926 | return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); | 54968 | return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); |
54927 | } | 54969 | } |
54928 | 54970 | ||
54929 | diff -urNp linux-2.6.32.13/security/integrity/ima/ima.h linux-2.6.32.13/security/integrity/ima/ima.h | 54971 | diff -urNp linux-2.6.32.15/security/integrity/ima/ima.h linux-2.6.32.15/security/integrity/ima/ima.h |
54930 | --- linux-2.6.32.13/security/integrity/ima/ima.h 2010-03-15 11:52:04.000000000 -0400 | 54972 | --- linux-2.6.32.15/security/integrity/ima/ima.h 2010-03-15 11:52:04.000000000 -0400 |
54931 | +++ linux-2.6.32.13/security/integrity/ima/ima.h 2010-05-15 13:21:18.814648703 -0400 | 54973 | +++ linux-2.6.32.15/security/integrity/ima/ima.h 2010-05-28 21:27:16.694974041 -0400 |
54932 | @@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino | 54974 | @@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino |
54933 | extern spinlock_t ima_queue_lock; | 54975 | extern spinlock_t ima_queue_lock; |
54934 | 54976 | ||
@@ -54940,9 +54982,9 @@ diff -urNp linux-2.6.32.13/security/integrity/ima/ima.h linux-2.6.32.13/security | |||
54940 | struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; | 54982 | struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; |
54941 | }; | 54983 | }; |
54942 | extern struct ima_h_table ima_htable; | 54984 | extern struct ima_h_table ima_htable; |
54943 | diff -urNp linux-2.6.32.13/security/integrity/ima/ima_queue.c linux-2.6.32.13/security/integrity/ima/ima_queue.c | 54985 | diff -urNp linux-2.6.32.15/security/integrity/ima/ima_queue.c linux-2.6.32.15/security/integrity/ima/ima_queue.c |
54944 | --- linux-2.6.32.13/security/integrity/ima/ima_queue.c 2010-03-15 11:52:04.000000000 -0400 | 54986 | --- linux-2.6.32.15/security/integrity/ima/ima_queue.c 2010-03-15 11:52:04.000000000 -0400 |
54945 | +++ linux-2.6.32.13/security/integrity/ima/ima_queue.c 2010-05-15 13:21:18.814648703 -0400 | 54987 | +++ linux-2.6.32.15/security/integrity/ima/ima_queue.c 2010-05-28 21:27:16.694974041 -0400 |
54946 | @@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i | 54988 | @@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i |
54947 | INIT_LIST_HEAD(&qe->later); | 54989 | INIT_LIST_HEAD(&qe->later); |
54948 | list_add_tail_rcu(&qe->later, &ima_measurements); | 54990 | list_add_tail_rcu(&qe->later, &ima_measurements); |
@@ -54952,9 +54994,9 @@ diff -urNp linux-2.6.32.13/security/integrity/ima/ima_queue.c linux-2.6.32.13/se | |||
54952 | key = ima_hash_key(entry->digest); | 54994 | key = ima_hash_key(entry->digest); |
54953 | hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); | 54995 | hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); |
54954 | return 0; | 54996 | return 0; |
54955 | diff -urNp linux-2.6.32.13/security/Kconfig linux-2.6.32.13/security/Kconfig | 54997 | diff -urNp linux-2.6.32.15/security/Kconfig linux-2.6.32.15/security/Kconfig |
54956 | --- linux-2.6.32.13/security/Kconfig 2010-03-15 11:52:04.000000000 -0400 | 54998 | --- linux-2.6.32.15/security/Kconfig 2010-03-15 11:52:04.000000000 -0400 |
54957 | +++ linux-2.6.32.13/security/Kconfig 2010-05-15 13:37:07.058702111 -0400 | 54999 | +++ linux-2.6.32.15/security/Kconfig 2010-05-28 21:27:16.694974041 -0400 |
54958 | @@ -4,6 +4,499 @@ | 55000 | @@ -4,6 +4,499 @@ |
54959 | 55001 | ||
54960 | menu "Security options" | 55002 | menu "Security options" |
@@ -55257,7 +55299,7 @@ diff -urNp linux-2.6.32.13/security/Kconfig linux-2.6.32.13/security/Kconfig | |||
55257 | +config PAX_KERNEXEC | 55299 | +config PAX_KERNEXEC |
55258 | + bool "Enforce non-executable kernel pages" | 55300 | + bool "Enforce non-executable kernel pages" |
55259 | + depends on PAX_NOEXEC && (PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN | 55301 | + depends on PAX_NOEXEC && (PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN |
55260 | + select PAX_PER_CPU_PGD if X86_64 || (X86_32 && X86_PAE) | 55302 | + select PAX_PER_CPU_PGD if X86_64 |
55261 | + help | 55303 | + help |
55262 | + This is the kernel land equivalent of PAGEEXEC and MPROTECT, | 55304 | + This is the kernel land equivalent of PAGEEXEC and MPROTECT, |
55263 | + that is, enabling this option will make it harder to inject | 55305 | + that is, enabling this option will make it harder to inject |
@@ -55464,9 +55506,9 @@ diff -urNp linux-2.6.32.13/security/Kconfig linux-2.6.32.13/security/Kconfig | |||
55464 | help | 55506 | help |
55465 | This is the portion of low virtual memory which should be protected | 55507 | This is the portion of low virtual memory which should be protected |
55466 | from userspace allocation. Keeping a user from writing to low pages | 55508 | from userspace allocation. Keeping a user from writing to low pages |
55467 | diff -urNp linux-2.6.32.13/security/min_addr.c linux-2.6.32.13/security/min_addr.c | 55509 | diff -urNp linux-2.6.32.15/security/min_addr.c linux-2.6.32.15/security/min_addr.c |
55468 | --- linux-2.6.32.13/security/min_addr.c 2010-04-04 20:41:50.084493253 -0400 | 55510 | --- linux-2.6.32.15/security/min_addr.c 2010-05-28 20:16:44.458924952 -0400 |
55469 | +++ linux-2.6.32.13/security/min_addr.c 2010-05-15 13:21:18.814648703 -0400 | 55511 | +++ linux-2.6.32.15/security/min_addr.c 2010-05-28 21:27:16.694974041 -0400 |
55470 | @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG | 55512 | @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG |
55471 | */ | 55513 | */ |
55472 | static void update_mmap_min_addr(void) | 55514 | static void update_mmap_min_addr(void) |
@@ -55483,9 +55525,9 @@ diff -urNp linux-2.6.32.13/security/min_addr.c linux-2.6.32.13/security/min_addr | |||
55483 | } | 55525 | } |
55484 | 55526 | ||
55485 | /* | 55527 | /* |
55486 | diff -urNp linux-2.6.32.13/sound/aoa/codecs/onyx.c linux-2.6.32.13/sound/aoa/codecs/onyx.c | 55528 | diff -urNp linux-2.6.32.15/sound/aoa/codecs/onyx.c linux-2.6.32.15/sound/aoa/codecs/onyx.c |
55487 | --- linux-2.6.32.13/sound/aoa/codecs/onyx.c 2010-03-15 11:52:04.000000000 -0400 | 55529 | --- linux-2.6.32.15/sound/aoa/codecs/onyx.c 2010-03-15 11:52:04.000000000 -0400 |
55488 | +++ linux-2.6.32.13/sound/aoa/codecs/onyx.c 2010-05-15 13:21:18.814648703 -0400 | 55530 | +++ linux-2.6.32.15/sound/aoa/codecs/onyx.c 2010-05-28 21:27:16.694974041 -0400 |
55489 | @@ -53,7 +53,7 @@ struct onyx { | 55531 | @@ -53,7 +53,7 @@ struct onyx { |
55490 | spdif_locked:1, | 55532 | spdif_locked:1, |
55491 | analog_locked:1, | 55533 | analog_locked:1, |
@@ -55514,9 +55556,9 @@ diff -urNp linux-2.6.32.13/sound/aoa/codecs/onyx.c linux-2.6.32.13/sound/aoa/cod | |||
55514 | onyx->spdif_locked = onyx->analog_locked = 0; | 55556 | onyx->spdif_locked = onyx->analog_locked = 0; |
55515 | mutex_unlock(&onyx->mutex); | 55557 | mutex_unlock(&onyx->mutex); |
55516 | 55558 | ||
55517 | diff -urNp linux-2.6.32.13/sound/core/oss/pcm_oss.c linux-2.6.32.13/sound/core/oss/pcm_oss.c | 55559 | diff -urNp linux-2.6.32.15/sound/core/oss/pcm_oss.c linux-2.6.32.15/sound/core/oss/pcm_oss.c |
55518 | --- linux-2.6.32.13/sound/core/oss/pcm_oss.c 2010-03-15 11:52:04.000000000 -0400 | 55560 | --- linux-2.6.32.15/sound/core/oss/pcm_oss.c 2010-03-15 11:52:04.000000000 -0400 |
55519 | +++ linux-2.6.32.13/sound/core/oss/pcm_oss.c 2010-05-15 13:21:18.814648703 -0400 | 55561 | +++ linux-2.6.32.15/sound/core/oss/pcm_oss.c 2010-05-28 21:27:16.698950213 -0400 |
55520 | @@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct | 55562 | @@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct |
55521 | } | 55563 | } |
55522 | } | 55564 | } |
@@ -55528,9 +55570,9 @@ diff -urNp linux-2.6.32.13/sound/core/oss/pcm_oss.c linux-2.6.32.13/sound/core/o | |||
55528 | #endif /* CONFIG_SND_VERBOSE_PROCFS */ | 55570 | #endif /* CONFIG_SND_VERBOSE_PROCFS */ |
55529 | 55571 | ||
55530 | /* | 55572 | /* |
55531 | diff -urNp linux-2.6.32.13/sound/core/seq/seq_lock.h linux-2.6.32.13/sound/core/seq/seq_lock.h | 55573 | diff -urNp linux-2.6.32.15/sound/core/seq/seq_lock.h linux-2.6.32.15/sound/core/seq/seq_lock.h |
55532 | --- linux-2.6.32.13/sound/core/seq/seq_lock.h 2010-03-15 11:52:04.000000000 -0400 | 55574 | --- linux-2.6.32.15/sound/core/seq/seq_lock.h 2010-03-15 11:52:04.000000000 -0400 |
55533 | +++ linux-2.6.32.13/sound/core/seq/seq_lock.h 2010-05-15 13:21:18.814648703 -0400 | 55575 | +++ linux-2.6.32.15/sound/core/seq/seq_lock.h 2010-05-28 21:27:16.698950213 -0400 |
55534 | @@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo | 55576 | @@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo |
55535 | #else /* SMP || CONFIG_SND_DEBUG */ | 55577 | #else /* SMP || CONFIG_SND_DEBUG */ |
55536 | 55578 | ||
@@ -55546,9 +55588,9 @@ diff -urNp linux-2.6.32.13/sound/core/seq/seq_lock.h linux-2.6.32.13/sound/core/ | |||
55546 | 55588 | ||
55547 | #endif /* SMP || CONFIG_SND_DEBUG */ | 55589 | #endif /* SMP || CONFIG_SND_DEBUG */ |
55548 | 55590 | ||
55549 | diff -urNp linux-2.6.32.13/sound/drivers/mts64.c linux-2.6.32.13/sound/drivers/mts64.c | 55591 | diff -urNp linux-2.6.32.15/sound/drivers/mts64.c linux-2.6.32.15/sound/drivers/mts64.c |
55550 | --- linux-2.6.32.13/sound/drivers/mts64.c 2010-03-15 11:52:04.000000000 -0400 | 55592 | --- linux-2.6.32.15/sound/drivers/mts64.c 2010-03-15 11:52:04.000000000 -0400 |
55551 | +++ linux-2.6.32.13/sound/drivers/mts64.c 2010-05-15 13:21:18.814648703 -0400 | 55593 | +++ linux-2.6.32.15/sound/drivers/mts64.c 2010-05-28 21:27:16.698950213 -0400 |
55552 | @@ -65,7 +65,7 @@ struct mts64 { | 55594 | @@ -65,7 +65,7 @@ struct mts64 { |
55553 | struct pardevice *pardev; | 55595 | struct pardevice *pardev; |
55554 | int pardev_claimed; | 55596 | int pardev_claimed; |
@@ -55597,9 +55639,9 @@ diff -urNp linux-2.6.32.13/sound/drivers/mts64.c linux-2.6.32.13/sound/drivers/m | |||
55597 | 55639 | ||
55598 | return 0; | 55640 | return 0; |
55599 | } | 55641 | } |
55600 | diff -urNp linux-2.6.32.13/sound/drivers/portman2x4.c linux-2.6.32.13/sound/drivers/portman2x4.c | 55642 | diff -urNp linux-2.6.32.15/sound/drivers/portman2x4.c linux-2.6.32.15/sound/drivers/portman2x4.c |
55601 | --- linux-2.6.32.13/sound/drivers/portman2x4.c 2010-03-15 11:52:04.000000000 -0400 | 55643 | --- linux-2.6.32.15/sound/drivers/portman2x4.c 2010-03-15 11:52:04.000000000 -0400 |
55602 | +++ linux-2.6.32.13/sound/drivers/portman2x4.c 2010-05-15 13:21:18.818605087 -0400 | 55644 | +++ linux-2.6.32.15/sound/drivers/portman2x4.c 2010-05-28 21:27:16.698950213 -0400 |
55603 | @@ -83,7 +83,7 @@ struct portman { | 55645 | @@ -83,7 +83,7 @@ struct portman { |
55604 | struct pardevice *pardev; | 55646 | struct pardevice *pardev; |
55605 | int pardev_claimed; | 55647 | int pardev_claimed; |
@@ -55609,9 +55651,9 @@ diff -urNp linux-2.6.32.13/sound/drivers/portman2x4.c linux-2.6.32.13/sound/driv | |||
55609 | int mode[PORTMAN_NUM_INPUT_PORTS]; | 55651 | int mode[PORTMAN_NUM_INPUT_PORTS]; |
55610 | struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; | 55652 | struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; |
55611 | }; | 55653 | }; |
55612 | diff -urNp linux-2.6.32.13/sound/oss/sb_audio.c linux-2.6.32.13/sound/oss/sb_audio.c | 55654 | diff -urNp linux-2.6.32.15/sound/oss/sb_audio.c linux-2.6.32.15/sound/oss/sb_audio.c |
55613 | --- linux-2.6.32.13/sound/oss/sb_audio.c 2010-03-15 11:52:04.000000000 -0400 | 55655 | --- linux-2.6.32.15/sound/oss/sb_audio.c 2010-03-15 11:52:04.000000000 -0400 |
55614 | +++ linux-2.6.32.13/sound/oss/sb_audio.c 2010-05-15 13:21:18.853427293 -0400 | 55656 | +++ linux-2.6.32.15/sound/oss/sb_audio.c 2010-05-28 21:27:16.698950213 -0400 |
55615 | @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, | 55657 | @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, |
55616 | buf16 = (signed short *)(localbuf + localoffs); | 55658 | buf16 = (signed short *)(localbuf + localoffs); |
55617 | while (c) | 55659 | while (c) |
@@ -55621,9 +55663,9 @@ diff -urNp linux-2.6.32.13/sound/oss/sb_audio.c linux-2.6.32.13/sound/oss/sb_aud | |||
55621 | if (copy_from_user(lbuf8, | 55663 | if (copy_from_user(lbuf8, |
55622 | userbuf+useroffs + p, | 55664 | userbuf+useroffs + p, |
55623 | locallen)) | 55665 | locallen)) |
55624 | diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_codec.c linux-2.6.32.13/sound/pci/ac97/ac97_codec.c | 55666 | diff -urNp linux-2.6.32.15/sound/pci/ac97/ac97_codec.c linux-2.6.32.15/sound/pci/ac97/ac97_codec.c |
55625 | --- linux-2.6.32.13/sound/pci/ac97/ac97_codec.c 2010-03-15 11:52:04.000000000 -0400 | 55667 | --- linux-2.6.32.15/sound/pci/ac97/ac97_codec.c 2010-03-15 11:52:04.000000000 -0400 |
55626 | +++ linux-2.6.32.13/sound/pci/ac97/ac97_codec.c 2010-05-15 13:21:18.897182507 -0400 | 55668 | +++ linux-2.6.32.15/sound/pci/ac97/ac97_codec.c 2010-05-28 21:27:16.698950213 -0400 |
55627 | @@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc | 55669 | @@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc |
55628 | } | 55670 | } |
55629 | 55671 | ||
@@ -55633,9 +55675,9 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_codec.c linux-2.6.32.13/sound/pci | |||
55633 | 55675 | ||
55634 | #ifdef CONFIG_SND_AC97_POWER_SAVE | 55676 | #ifdef CONFIG_SND_AC97_POWER_SAVE |
55635 | static void do_update_power(struct work_struct *work) | 55677 | static void do_update_power(struct work_struct *work) |
55636 | diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci/ac97/ac97_patch.c | 55678 | diff -urNp linux-2.6.32.15/sound/pci/ac97/ac97_patch.c linux-2.6.32.15/sound/pci/ac97/ac97_patch.c |
55637 | --- linux-2.6.32.13/sound/pci/ac97/ac97_patch.c 2010-04-04 20:41:50.084493253 -0400 | 55679 | --- linux-2.6.32.15/sound/pci/ac97/ac97_patch.c 2010-04-04 20:41:50.084493253 -0400 |
55638 | +++ linux-2.6.32.13/sound/pci/ac97/ac97_patch.c 2010-05-15 13:21:18.938590352 -0400 | 55680 | +++ linux-2.6.32.15/sound/pci/ac97/ac97_patch.c 2010-05-28 21:27:16.698950213 -0400 |
55639 | @@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd | 55681 | @@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd |
55640 | return 0; | 55682 | return 0; |
55641 | } | 55683 | } |
@@ -55942,9 +55984,9 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci | |||
55942 | .build_specific = patch_ucb1400_specific, | 55984 | .build_specific = patch_ucb1400_specific, |
55943 | }; | 55985 | }; |
55944 | 55986 | ||
55945 | diff -urNp linux-2.6.32.13/sound/pci/ens1370.c linux-2.6.32.13/sound/pci/ens1370.c | 55987 | diff -urNp linux-2.6.32.15/sound/pci/ens1370.c linux-2.6.32.15/sound/pci/ens1370.c |
55946 | --- linux-2.6.32.13/sound/pci/ens1370.c 2010-03-15 11:52:04.000000000 -0400 | 55988 | --- linux-2.6.32.15/sound/pci/ens1370.c 2010-03-15 11:52:04.000000000 -0400 |
55947 | +++ linux-2.6.32.13/sound/pci/ens1370.c 2010-05-15 13:21:18.938590352 -0400 | 55989 | +++ linux-2.6.32.15/sound/pci/ens1370.c 2010-05-28 21:27:16.698950213 -0400 |
55948 | @@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci | 55990 | @@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci |
55949 | { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ | 55991 | { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ |
55950 | { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */ | 55992 | { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */ |
@@ -55954,9 +55996,9 @@ diff -urNp linux-2.6.32.13/sound/pci/ens1370.c linux-2.6.32.13/sound/pci/ens1370 | |||
55954 | }; | 55996 | }; |
55955 | 55997 | ||
55956 | MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); | 55998 | MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); |
55957 | diff -urNp linux-2.6.32.13/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.13/sound/pci/hda/patch_intelhdmi.c | 55999 | diff -urNp linux-2.6.32.15/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.15/sound/pci/hda/patch_intelhdmi.c |
55958 | --- linux-2.6.32.13/sound/pci/hda/patch_intelhdmi.c 2010-03-15 11:52:04.000000000 -0400 | 56000 | --- linux-2.6.32.15/sound/pci/hda/patch_intelhdmi.c 2010-03-15 11:52:04.000000000 -0400 |
55959 | +++ linux-2.6.32.13/sound/pci/hda/patch_intelhdmi.c 2010-05-15 13:21:18.938590352 -0400 | 56001 | +++ linux-2.6.32.15/sound/pci/hda/patch_intelhdmi.c 2010-05-28 21:27:16.698950213 -0400 |
55960 | @@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str | 56002 | @@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str |
55961 | cp_ready); | 56003 | cp_ready); |
55962 | 56004 | ||
@@ -55972,9 +56014,9 @@ diff -urNp linux-2.6.32.13/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.13/sound | |||
55972 | } | 56014 | } |
55973 | 56015 | ||
55974 | 56016 | ||
55975 | diff -urNp linux-2.6.32.13/sound/pci/intel8x0.c linux-2.6.32.13/sound/pci/intel8x0.c | 56017 | diff -urNp linux-2.6.32.15/sound/pci/intel8x0.c linux-2.6.32.15/sound/pci/intel8x0.c |
55976 | --- linux-2.6.32.13/sound/pci/intel8x0.c 2010-03-15 11:52:04.000000000 -0400 | 56018 | --- linux-2.6.32.15/sound/pci/intel8x0.c 2010-03-15 11:52:04.000000000 -0400 |
55977 | +++ linux-2.6.32.13/sound/pci/intel8x0.c 2010-05-15 13:21:18.938590352 -0400 | 56019 | +++ linux-2.6.32.15/sound/pci/intel8x0.c 2010-05-28 21:27:16.698950213 -0400 |
55978 | @@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0 | 56020 | @@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0 |
55979 | { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ | 56021 | { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ |
55980 | { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */ | 56022 | { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */ |
@@ -55993,9 +56035,9 @@ diff -urNp linux-2.6.32.13/sound/pci/intel8x0.c linux-2.6.32.13/sound/pci/intel8 | |||
55993 | }; | 56035 | }; |
55994 | 56036 | ||
55995 | static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, | 56037 | static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, |
55996 | diff -urNp linux-2.6.32.13/sound/pci/intel8x0m.c linux-2.6.32.13/sound/pci/intel8x0m.c | 56038 | diff -urNp linux-2.6.32.15/sound/pci/intel8x0m.c linux-2.6.32.15/sound/pci/intel8x0m.c |
55997 | --- linux-2.6.32.13/sound/pci/intel8x0m.c 2010-03-15 11:52:04.000000000 -0400 | 56039 | --- linux-2.6.32.15/sound/pci/intel8x0m.c 2010-03-15 11:52:04.000000000 -0400 |
55998 | +++ linux-2.6.32.13/sound/pci/intel8x0m.c 2010-05-15 13:21:18.997275588 -0400 | 56040 | +++ linux-2.6.32.15/sound/pci/intel8x0m.c 2010-05-28 21:27:16.703208428 -0400 |
55999 | @@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0 | 56041 | @@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0 |
56000 | { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ | 56042 | { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ |
56001 | { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ | 56043 | { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ |
@@ -56014,9 +56056,9 @@ diff -urNp linux-2.6.32.13/sound/pci/intel8x0m.c linux-2.6.32.13/sound/pci/intel | |||
56014 | }; | 56056 | }; |
56015 | 56057 | ||
56016 | static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, | 56058 | static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, |
56017 | diff -urNp linux-2.6.32.13/usr/gen_init_cpio.c linux-2.6.32.13/usr/gen_init_cpio.c | 56059 | diff -urNp linux-2.6.32.15/usr/gen_init_cpio.c linux-2.6.32.15/usr/gen_init_cpio.c |
56018 | --- linux-2.6.32.13/usr/gen_init_cpio.c 2010-03-15 11:52:04.000000000 -0400 | 56060 | --- linux-2.6.32.15/usr/gen_init_cpio.c 2010-03-15 11:52:04.000000000 -0400 |
56019 | +++ linux-2.6.32.13/usr/gen_init_cpio.c 2010-05-15 13:21:18.997275588 -0400 | 56061 | +++ linux-2.6.32.15/usr/gen_init_cpio.c 2010-05-28 21:27:16.703208428 -0400 |
56020 | @@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, | 56062 | @@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, |
56021 | int retval; | 56063 | int retval; |
56022 | int rc = -1; | 56064 | int rc = -1; |
@@ -56039,9 +56081,9 @@ diff -urNp linux-2.6.32.13/usr/gen_init_cpio.c linux-2.6.32.13/usr/gen_init_cpio | |||
56039 | } else | 56081 | } else |
56040 | break; | 56082 | break; |
56041 | } | 56083 | } |
56042 | diff -urNp linux-2.6.32.13/virt/kvm/kvm_main.c linux-2.6.32.13/virt/kvm/kvm_main.c | 56084 | diff -urNp linux-2.6.32.15/virt/kvm/kvm_main.c linux-2.6.32.15/virt/kvm/kvm_main.c |
56043 | --- linux-2.6.32.13/virt/kvm/kvm_main.c 2010-04-29 17:49:38.869035092 -0400 | 56085 | --- linux-2.6.32.15/virt/kvm/kvm_main.c 2010-04-29 17:49:38.869035092 -0400 |
56044 | +++ linux-2.6.32.13/virt/kvm/kvm_main.c 2010-05-15 13:21:19.058665704 -0400 | 56086 | +++ linux-2.6.32.15/virt/kvm/kvm_main.c 2010-05-28 21:27:16.731271133 -0400 |
56045 | @@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode | 56087 | @@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode |
56046 | return 0; | 56088 | return 0; |
56047 | } | 56089 | } |
diff --git a/main/linux-grsec/hv-grsec.patch b/main/linux-grsec/hv-grsec.patch new file mode 100644 index 0000000000..6fde341990 --- /dev/null +++ b/main/linux-grsec/hv-grsec.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | diff --git a/drivers/staging/hv/Hv.c b/drivers/staging/hv/Hv.c | ||
2 | index b12237f..9d47edb 100644 | ||
3 | --- a/drivers/staging/hv/Hv.c | ||
4 | +++ b/drivers/staging/hv/Hv.c | ||
5 | @@ -133,7 +133,7 @@ static u64 HvDoHypercall(u64 Control, void *Input, void *Output) | ||
6 | u64 hvStatus = 0; | ||
7 | u64 inputAddress = (Input) ? virt_to_phys(Input) : 0; | ||
8 | u64 outputAddress = (Output) ? virt_to_phys(Output) : 0; | ||
9 | - volatile void *hypercallPage = gHvContext.HypercallPage; | ||
10 | + volatile void *hypercallPage = ktva_ktla(gHvContext.HypercallPage); | ||
11 | |||
12 | DPRINT_DBG(VMBUS, "Hypercall <control %llx input phys %llx virt %p " | ||
13 | "output phys %llx virt %p hypercall %p>", | ||
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index 13e508a9f9..d70107d29b 100644 --- a/main/linux-grsec/kernelconfig.x86 +++ b/main/linux-grsec/kernelconfig.x86 | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.32.9 | 3 | # Linux kernel version: 2.6.32.14 |
4 | # Mon Mar 15 14:11:23 2010 | 4 | # Wed Jun 2 07:39:39 2010 |
5 | # | 5 | # |
6 | # CONFIG_64BIT is not set | 6 | # CONFIG_64BIT is not set |
7 | CONFIG_X86_32=y | 7 | CONFIG_X86_32=y |
@@ -133,7 +133,6 @@ CONFIG_HAVE_PERF_EVENTS=y | |||
133 | # Kernel Performance Events And Counters | 133 | # Kernel Performance Events And Counters |
134 | # | 134 | # |
135 | CONFIG_PERF_EVENTS=y | 135 | CONFIG_PERF_EVENTS=y |
136 | # CONFIG_EVENT_PROFILE is not set | ||
137 | CONFIG_PERF_COUNTERS=y | 136 | CONFIG_PERF_COUNTERS=y |
138 | CONFIG_VM_EVENT_COUNTERS=y | 137 | CONFIG_VM_EVENT_COUNTERS=y |
139 | CONFIG_PCI_QUIRKS=y | 138 | CONFIG_PCI_QUIRKS=y |
@@ -143,7 +142,6 @@ CONFIG_PCI_QUIRKS=y | |||
143 | CONFIG_SLUB=y | 142 | CONFIG_SLUB=y |
144 | # CONFIG_SLOB is not set | 143 | # CONFIG_SLOB is not set |
145 | CONFIG_PROFILING=y | 144 | CONFIG_PROFILING=y |
146 | CONFIG_TRACEPOINTS=y | ||
147 | CONFIG_OPROFILE=m | 145 | CONFIG_OPROFILE=m |
148 | # CONFIG_OPROFILE_IBS is not set | 146 | # CONFIG_OPROFILE_IBS is not set |
149 | # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set | 147 | # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set |
@@ -305,6 +303,7 @@ CONFIG_HIGHMEM=y | |||
305 | CONFIG_ARCH_FLATMEM_ENABLE=y | 303 | CONFIG_ARCH_FLATMEM_ENABLE=y |
306 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 304 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
307 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 305 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
306 | CONFIG_ILLEGAL_POINTER_VALUE=0 | ||
308 | CONFIG_SELECT_MEMORY_MODEL=y | 307 | CONFIG_SELECT_MEMORY_MODEL=y |
309 | CONFIG_FLATMEM_MANUAL=y | 308 | CONFIG_FLATMEM_MANUAL=y |
310 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 309 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
@@ -931,7 +930,6 @@ CONFIG_NET_SCH_FIFO=y | |||
931 | # Network testing | 930 | # Network testing |
932 | # | 931 | # |
933 | CONFIG_NET_PKTGEN=m | 932 | CONFIG_NET_PKTGEN=m |
934 | # CONFIG_NET_DROP_MONITOR is not set | ||
935 | # CONFIG_HAMRADIO is not set | 933 | # CONFIG_HAMRADIO is not set |
936 | CONFIG_CAN=m | 934 | CONFIG_CAN=m |
937 | CONFIG_CAN_RAW=m | 935 | CONFIG_CAN_RAW=m |
@@ -3111,7 +3109,7 @@ CONFIG_DVB_TUNER_DIB0070=m | |||
3111 | CONFIG_DVB_LNBP21=m | 3109 | CONFIG_DVB_LNBP21=m |
3112 | CONFIG_DVB_ISL6405=m | 3110 | CONFIG_DVB_ISL6405=m |
3113 | CONFIG_DVB_ISL6421=m | 3111 | CONFIG_DVB_ISL6421=m |
3114 | CONFIG_DVB_LGS8GL5=m | 3112 | CONFIG_DVB_LGS8GXX=m |
3115 | CONFIG_DAB=y | 3113 | CONFIG_DAB=y |
3116 | CONFIG_USB_DABUSB=m | 3114 | CONFIG_USB_DABUSB=m |
3117 | 3115 | ||
@@ -3939,7 +3937,65 @@ CONFIG_UIO_SERCOS3=m | |||
3939 | # | 3937 | # |
3940 | # TI VLYNQ | 3938 | # TI VLYNQ |
3941 | # | 3939 | # |
3942 | # CONFIG_STAGING is not set | 3940 | CONFIG_STAGING=y |
3941 | # CONFIG_STAGING_EXCLUDE_BUILD is not set | ||
3942 | # CONFIG_ET131X is not set | ||
3943 | # CONFIG_SLICOSS is not set | ||
3944 | # CONFIG_VIDEO_GO7007 is not set | ||
3945 | # CONFIG_VIDEO_CX25821 is not set | ||
3946 | # CONFIG_USB_IP_COMMON is not set | ||
3947 | # CONFIG_W35UND is not set | ||
3948 | # CONFIG_PRISM2_USB is not set | ||
3949 | # CONFIG_ECHO is not set | ||
3950 | # CONFIG_POCH is not set | ||
3951 | # CONFIG_OTUS is not set | ||
3952 | # CONFIG_RT2860 is not set | ||
3953 | # CONFIG_RT2870 is not set | ||
3954 | # CONFIG_RT3090 is not set | ||
3955 | # CONFIG_COMEDI is not set | ||
3956 | # CONFIG_ASUS_OLED is not set | ||
3957 | # CONFIG_PANEL is not set | ||
3958 | # CONFIG_ALTERA_PCIE_CHDMA is not set | ||
3959 | # CONFIG_RTL8187SE is not set | ||
3960 | # CONFIG_RTL8192SU is not set | ||
3961 | # CONFIG_RTL8192E is not set | ||
3962 | # CONFIG_TRANZPORT is not set | ||
3963 | |||
3964 | # | ||
3965 | # Android | ||
3966 | # | ||
3967 | |||
3968 | # | ||
3969 | # Qualcomm MSM Camera And Video | ||
3970 | # | ||
3971 | |||
3972 | # | ||
3973 | # Camera Sensor Selection | ||
3974 | # | ||
3975 | # CONFIG_INPUT_GPIO is not set | ||
3976 | # CONFIG_DST is not set | ||
3977 | # CONFIG_POHMELFS is not set | ||
3978 | # CONFIG_B3DFG is not set | ||
3979 | # CONFIG_IDE_PHISON is not set | ||
3980 | # CONFIG_PLAN9AUTH is not set | ||
3981 | # CONFIG_LINE6_USB is not set | ||
3982 | # CONFIG_DRM_RADEON_KMS is not set | ||
3983 | # CONFIG_USB_SERIAL_QUATECH2 is not set | ||
3984 | # CONFIG_USB_SERIAL_QUATECH_USB2 is not set | ||
3985 | # CONFIG_VT6655 is not set | ||
3986 | # CONFIG_VT6656 is not set | ||
3987 | # CONFIG_FB_UDL is not set | ||
3988 | CONFIG_HYPERV=m | ||
3989 | CONFIG_HYPERV_STORAGE=m | ||
3990 | CONFIG_HYPERV_BLOCK=m | ||
3991 | CONFIG_HYPERV_NET=m | ||
3992 | # CONFIG_VME_BUS is not set | ||
3993 | |||
3994 | # | ||
3995 | # RAR Register Driver | ||
3996 | # | ||
3997 | # CONFIG_RAR_REGISTER is not set | ||
3998 | # CONFIG_IIO is not set | ||
3943 | CONFIG_X86_PLATFORM_DEVICES=y | 3999 | CONFIG_X86_PLATFORM_DEVICES=y |
3944 | CONFIG_ACER_WMI=m | 4000 | CONFIG_ACER_WMI=m |
3945 | CONFIG_ASUS_LAPTOP=m | 4001 | CONFIG_ASUS_LAPTOP=m |
@@ -4240,7 +4296,6 @@ CONFIG_FRAME_WARN=1024 | |||
4240 | CONFIG_DEBUG_FS=y | 4296 | CONFIG_DEBUG_FS=y |
4241 | # CONFIG_HEADERS_CHECK is not set | 4297 | # CONFIG_HEADERS_CHECK is not set |
4242 | # CONFIG_DEBUG_KERNEL is not set | 4298 | # CONFIG_DEBUG_KERNEL is not set |
4243 | CONFIG_STACKTRACE=y | ||
4244 | # CONFIG_DEBUG_BUGVERBOSE is not set | 4299 | # CONFIG_DEBUG_BUGVERBOSE is not set |
4245 | # CONFIG_DEBUG_MEMORY_INIT is not set | 4300 | # CONFIG_DEBUG_MEMORY_INIT is not set |
4246 | CONFIG_ARCH_WANT_FRAME_POINTERS=y | 4301 | CONFIG_ARCH_WANT_FRAME_POINTERS=y |
@@ -4249,7 +4304,6 @@ CONFIG_FRAME_POINTER=y | |||
4249 | # CONFIG_LATENCYTOP is not set | 4304 | # CONFIG_LATENCYTOP is not set |
4250 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 4305 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
4251 | CONFIG_USER_STACKTRACE_SUPPORT=y | 4306 | CONFIG_USER_STACKTRACE_SUPPORT=y |
4252 | CONFIG_NOP_TRACER=y | ||
4253 | CONFIG_HAVE_FUNCTION_TRACER=y | 4307 | CONFIG_HAVE_FUNCTION_TRACER=y |
4254 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | 4308 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y |
4255 | CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y | 4309 | CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y |
@@ -4258,10 +4312,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y | |||
4258 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 4312 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
4259 | CONFIG_HAVE_SYSCALL_TRACEPOINTS=y | 4313 | CONFIG_HAVE_SYSCALL_TRACEPOINTS=y |
4260 | CONFIG_RING_BUFFER=y | 4314 | CONFIG_RING_BUFFER=y |
4261 | CONFIG_EVENT_TRACING=y | ||
4262 | CONFIG_CONTEXT_SWITCH_TRACER=y | ||
4263 | CONFIG_RING_BUFFER_ALLOW_SWAP=y | 4315 | CONFIG_RING_BUFFER_ALLOW_SWAP=y |
4264 | CONFIG_TRACING=y | ||
4265 | CONFIG_TRACING_SUPPORT=y | 4316 | CONFIG_TRACING_SUPPORT=y |
4266 | # CONFIG_FTRACE is not set | 4317 | # CONFIG_FTRACE is not set |
4267 | # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set | 4318 | # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set |
@@ -4570,7 +4621,7 @@ CONFIG_VIRTIO=y | |||
4570 | CONFIG_VIRTIO_RING=y | 4621 | CONFIG_VIRTIO_RING=y |
4571 | CONFIG_VIRTIO_PCI=m | 4622 | CONFIG_VIRTIO_PCI=m |
4572 | CONFIG_VIRTIO_BALLOON=m | 4623 | CONFIG_VIRTIO_BALLOON=m |
4573 | CONFIG_BINARY_PRINTF=y | 4624 | # CONFIG_BINARY_PRINTF is not set |
4574 | 4625 | ||
4575 | # | 4626 | # |
4576 | # Library routines | 4627 | # Library routines |
diff --git a/main/linux-grsec/r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch b/main/linux-grsec/r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch new file mode 100644 index 0000000000..bd111e8772 --- /dev/null +++ b/main/linux-grsec/r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | From patchwork Wed Jun 9 05:22:10 2010 | ||
2 | Content-Type: text/plain; charset="utf-8" | ||
3 | MIME-Version: 1.0 | ||
4 | Content-Transfer-Encoding: 8bit | ||
5 | Subject: r8169: fix mdio_read and update mdio_write according to hw specs | ||
6 | Date: Tue, 08 Jun 2010 19:22:10 -0000 | ||
7 | From: =?utf-8?b?VGltbyBUZXLDpHMgPHRpbW8udGVyYXNAaWtpLmZpPg==?= | ||
8 | X-Patchwork-Id: 55049 | ||
9 | Message-Id: <1276060930-15697-1-git-send-email-timo.teras@iki.fi> | ||
10 | To: netdev@vger.kernel.org | ||
11 | Cc: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>, | ||
12 | Francois Romieu <romieu@fr.zoreil.com>, Hayeswang <hayeswang@realtek.com> | ||
13 | |||
14 | Realtek confirmed that a 20us delay is needed after mdio_read and | ||
15 | mdio_write operations. Reduce the delay in mdio_write, and add it | ||
16 | to mdio_read too. Also add a comment that the 20us is from hw specs. | ||
17 | |||
18 | Signed-off-by: Timo Teräs <timo.teras@iki.fi> | ||
19 | Cc: Francois Romieu <romieu@fr.zoreil.com> | ||
20 | Cc: Hayeswang <hayeswang@realtek.com> | ||
21 | |||
22 | --- | ||
23 | drivers/net/r8169.c | 12 +++++++++--- | ||
24 | 1 files changed, 9 insertions(+), 3 deletions(-) | ||
25 | |||
26 | diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c | ||
27 | index 03a8318..96b6cfb 100644 | ||
28 | --- a/drivers/net/r8169.c | ||
29 | +++ b/drivers/net/r8169.c | ||
30 | @@ -560,10 +560,10 @@ static void mdio_write(void __iomem *ioaddr, int reg_addr, int value) | ||
31 | udelay(25); | ||
32 | } | ||
33 | /* | ||
34 | - * Some configurations require a small delay even after the write | ||
35 | - * completed indication or the next write might fail. | ||
36 | + * According to hardware specs a 20us delay is required after write | ||
37 | + * complete indication, but before sending next command. | ||
38 | */ | ||
39 | - udelay(25); | ||
40 | + udelay(20); | ||
41 | } | ||
42 | |||
43 | static int mdio_read(void __iomem *ioaddr, int reg_addr) | ||
44 | @@ -583,6 +583,12 @@ static int mdio_read(void __iomem *ioaddr, int reg_addr) | ||
45 | } | ||
46 | udelay(25); | ||
47 | } | ||
48 | + /* | ||
49 | + * According to hardware specs a 20us delay is required after read | ||
50 | + * complete indication, but before sending next command. | ||
51 | + */ | ||
52 | + udelay(20); | ||
53 | + | ||
54 | return value; | ||
55 | } | ||
56 | |||
diff --git a/main/linux-grsec/r8169-fix-random-mdio_write-failures.patch b/main/linux-grsec/r8169-fix-random-mdio_write-failures.patch new file mode 100644 index 0000000000..1e2beadd0f --- /dev/null +++ b/main/linux-grsec/r8169-fix-random-mdio_write-failures.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From 024a07bacf8287a6ddfa83e9d5b951c5e8b4070e Mon Sep 17 00:00:00 2001 | ||
2 | From: =?utf8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Sun, 6 Jun 2010 15:38:47 -0700 | ||
4 | Subject: [PATCH 1/1] r8169: fix random mdio_write failures | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=utf8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Some configurations need delay between the "write completed" indication | ||
10 | and new write to work reliably. | ||
11 | |||
12 | Realtek driver seems to use longer delay when polling the "write complete" | ||
13 | bit, so it waits long enough between writes with high probability (but | ||
14 | could probably break too). This patch adds a new udelay to make sure we | ||
15 | wait unconditionally some time after the write complete indication. | ||
16 | |||
17 | This caused a regression with XID 18000000 boards when the board specific | ||
18 | phy configuration writing many mdio registers was added in commit | ||
19 | 2e955856ff (r8169: phy init for the 8169scd). Some of the configration | ||
20 | mdio writes would almost always fail, and depending on failure might leave | ||
21 | the PHY in non-working state. | ||
22 | |||
23 | Signed-off-by: Timo Teräs <timo.teras@iki.fi> | ||
24 | Acked-off-by: Francois Romieu <romieu@fr.zoreil.com> | ||
25 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
26 | --- | ||
27 | drivers/net/r8169.c | 5 +++++ | ||
28 | 1 files changed, 5 insertions(+), 0 deletions(-) | ||
29 | |||
30 | diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c | ||
31 | index 217e709..03a8318 100644 | ||
32 | --- a/drivers/net/r8169.c | ||
33 | +++ b/drivers/net/r8169.c | ||
34 | @@ -559,6 +559,11 @@ static void mdio_write(void __iomem *ioaddr, int reg_addr, int value) | ||
35 | break; | ||
36 | udelay(25); | ||
37 | } | ||
38 | + /* | ||
39 | + * Some configurations require a small delay even after the write | ||
40 | + * completed indication or the next write might fail. | ||
41 | + */ | ||
42 | + udelay(25); | ||
43 | } | ||
44 | |||
45 | static int mdio_read(void __iomem *ioaddr, int reg_addr) | ||
46 | -- | ||
47 | 1.7.1 | ||
48 | |||
diff --git a/main/linux-grsec/x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch b/main/linux-grsec/x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch new file mode 100644 index 0000000000..a4f94d7fa4 --- /dev/null +++ b/main/linux-grsec/x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From f1f6baf8f1df29be38003089787e378567ce0086 Mon Sep 17 00:00:00 2001 | ||
2 | From: H. Peter Anvin <hpa@zytor.com> | ||
3 | Date: Wed, 17 Feb 2010 18:32:06 -0800 | ||
4 | Subject: [PATCH] x86, setup: When restoring the screen, update boot_params.screen_info | ||
5 | |||
6 | When we restore the screen content after a mode change, we return the | ||
7 | cursor to its former position. However, we need to also update | ||
8 | boot_params.screen_info accordingly, so that the decompression code | ||
9 | knows where on the screen the cursor is. Just in case the video BIOS | ||
10 | does something extra screwy, read the cursor position back from the | ||
11 | BIOS instead of relying on it doing the right thing. | ||
12 | |||
13 | While we're at it, make sure we cap the cursor position to the new | ||
14 | screen coordinates. | ||
15 | |||
16 | Reported-by: Wim Osterholt <wim@djo.tudelft.nl> | ||
17 | Bugzilla-Reference: http://bugzilla.kernel.org/show_bug.cgi?id=15329 | ||
18 | Signed-off-by: H. Peter Anvin <hpa@zytor.com> | ||
19 | --- | ||
20 | arch/x86/boot/video.c | 7 +++++++ | ||
21 | 1 files changed, 7 insertions(+), 0 deletions(-) | ||
22 | |||
23 | diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c | ||
24 | index f767164..43eda28 100644 | ||
25 | --- a/arch/x86/boot/video.c | ||
26 | +++ b/arch/x86/boot/video.c | ||
27 | @@ -298,11 +298,18 @@ static void restore_screen(void) | ||
28 | } | ||
29 | |||
30 | /* Restore cursor position */ | ||
31 | + if (saved.curx >= xs) | ||
32 | + saved.curx = xs-1; | ||
33 | + if (saved.cury >= ys) | ||
34 | + saved.cury = ys-1; | ||
35 | + | ||
36 | initregs(&ireg); | ||
37 | ireg.ah = 0x02; /* Set cursor position */ | ||
38 | ireg.dh = saved.cury; | ||
39 | ireg.dl = saved.curx; | ||
40 | intcall(0x10, &ireg, NULL); | ||
41 | + | ||
42 | + store_cursor_position(); | ||
43 | } | ||
44 | |||
45 | void set_video(void) | ||
46 | -- | ||
47 | 1.7.1 | ||
48 | |||
diff --git a/main/linux-pae/0002-gre-fix-hard-header-destination-address-checking.patch b/main/linux-pae/0002-gre-fix-hard-header-destination-address-checking.patch new file mode 100644 index 0000000000..36a0ae449a --- /dev/null +++ b/main/linux-pae/0002-gre-fix-hard-header-destination-address-checking.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From 9082391046940c410eac3bad065c8701998b5cab Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Wed, 3 Mar 2010 04:01:13 +0000 | ||
4 | Subject: [PATCH 02/18] gre: fix hard header destination address checking | ||
5 | |||
6 | ipgre_header() can be called with zero daddr when the gre device is | ||
7 | configured as multipoint tunnel and still has the NOARP flag set (which is | ||
8 | typically cleared by the userspace arp daemon). If the NOARP packets are | ||
9 | not dropped, ipgre_tunnel_xmit() will take rt->rt_gateway (= NBMA IP) and | ||
10 | use that for route look up (and may lead to bogus xfrm acquires). | ||
11 | |||
12 | The multicast address check is removed as sending to multicast group should | ||
13 | be ok. In fact, if gre device has a multicast address as destination | ||
14 | ipgre_header is always called with multicast address. | ||
15 | |||
16 | Signed-off-by: Timo Teras <timo.teras@iki.fi> | ||
17 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
18 | (cherry picked from commit 6d55cb91a0020ac0d78edcad61efd6c8cf5785a3) | ||
19 | --- | ||
20 | net/ipv4/ip_gre.c | 7 ++----- | ||
21 | 1 files changed, 2 insertions(+), 5 deletions(-) | ||
22 | |||
23 | diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c | ||
24 | index 1433338..ac88ce5 100644 | ||
25 | --- a/net/ipv4/ip_gre.c | ||
26 | +++ b/net/ipv4/ip_gre.c | ||
27 | @@ -1137,12 +1137,9 @@ static int ipgre_header(struct sk_buff *skb, struct net_device *dev, | ||
28 | |||
29 | if (saddr) | ||
30 | memcpy(&iph->saddr, saddr, 4); | ||
31 | - | ||
32 | - if (daddr) { | ||
33 | + if (daddr) | ||
34 | memcpy(&iph->daddr, daddr, 4); | ||
35 | - return t->hlen; | ||
36 | - } | ||
37 | - if (iph->daddr && !ipv4_is_multicast(iph->daddr)) | ||
38 | + if (iph->daddr) | ||
39 | return t->hlen; | ||
40 | |||
41 | return -t->hlen; | ||
42 | -- | ||
43 | 1.7.0.2 | ||
44 | |||
diff --git a/main/linux-pae/0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch b/main/linux-pae/0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch new file mode 100644 index 0000000000..61d7c9a6c1 --- /dev/null +++ b/main/linux-pae/0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From cd0e9d08480e1e0648e17d099ecf50f6fd8714e5 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Sat, 20 Mar 2010 02:27:58 +0000 | ||
4 | Subject: [PATCH 03/18] ip_gre: include route header_len in max_headroom calculation | ||
5 | |||
6 | Taking route's header_len into account, and updating gre device | ||
7 | needed_headroom will give better hints on upper bound of required | ||
8 | headroom. This is useful if the gre traffic is xfrm'ed. | ||
9 | |||
10 | Signed-off-by: Timo Teras <timo.teras@iki.fi> | ||
11 | Acked-by: Herbert Xu <herbert@gondor.apana.org.au> | ||
12 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
13 | (cherry picked from commit 243aad830e8a4cdda261626fbaeddde16b08d04a) | ||
14 | --- | ||
15 | net/ipv4/ip_gre.c | 4 +++- | ||
16 | 1 files changed, 3 insertions(+), 1 deletions(-) | ||
17 | |||
18 | diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c | ||
19 | index ac88ce5..7f1ff73 100644 | ||
20 | --- a/net/ipv4/ip_gre.c | ||
21 | +++ b/net/ipv4/ip_gre.c | ||
22 | @@ -803,11 +803,13 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev | ||
23 | tunnel->err_count = 0; | ||
24 | } | ||
25 | |||
26 | - max_headroom = LL_RESERVED_SPACE(tdev) + gre_hlen; | ||
27 | + max_headroom = LL_RESERVED_SPACE(tdev) + gre_hlen + rt->u.dst.header_len; | ||
28 | |||
29 | if (skb_headroom(skb) < max_headroom || skb_shared(skb)|| | ||
30 | (skb_cloned(skb) && !skb_clone_writable(skb, 0))) { | ||
31 | struct sk_buff *new_skb = skb_realloc_headroom(skb, max_headroom); | ||
32 | + if (max_headroom > dev->needed_headroom) | ||
33 | + dev->needed_headroom = max_headroom; | ||
34 | if (!new_skb) { | ||
35 | ip_rt_put(rt); | ||
36 | stats->tx_dropped++; | ||
37 | -- | ||
38 | 1.7.0.2 | ||
39 | |||
diff --git a/main/linux-pae/0004-arp-flush-arp-cache-on-device-change.patch b/main/linux-pae/0004-arp-flush-arp-cache-on-device-change.patch new file mode 100644 index 0000000000..85161ea3a3 --- /dev/null +++ b/main/linux-pae/0004-arp-flush-arp-cache-on-device-change.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 8a0e3ea4924059a7268446177d6869e3399adbb2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Timo Teras <timo.teras@iki.fi> | ||
3 | Date: Mon, 12 Apr 2010 13:46:45 +0000 | ||
4 | Subject: [PATCH 04/18] arp: flush arp cache on device change | ||
5 | |||
6 | If IFF_NOARP is changed, we must flush the arp cache. | ||
7 | |||
8 | Signed-off-by: Timo Teras <timo.teras@iki.fi> | ||
9 | --- | ||
10 | net/ipv4/arp.c | 3 +++ | ||
11 | 1 files changed, 3 insertions(+), 0 deletions(-) | ||
12 | |||
13 | diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c | ||
14 | index 4e80f33..580bfc3 100644 | ||
15 | --- a/net/ipv4/arp.c | ||
16 | +++ b/net/ipv4/arp.c | ||
17 | @@ -1200,6 +1200,9 @@ static int arp_netdev_event(struct notifier_block *this, unsigned long event, vo | ||
18 | neigh_changeaddr(&arp_tbl, dev); | ||
19 | rt_cache_flush(dev_net(dev), 0); | ||
20 | break; | ||
21 | + case NETDEV_CHANGE: | ||
22 | + neigh_changeaddr(&arp_tbl, dev); | ||
23 | + break; | ||
24 | default: | ||
25 | break; | ||
26 | } | ||
27 | -- | ||
28 | 1.7.0.2 | ||
29 | |||
diff --git a/main/linux-pae/0007-r8169-Fix-rtl8169_rx_interrupt.patch b/main/linux-pae/0007-r8169-Fix-rtl8169_rx_interrupt.patch new file mode 100644 index 0000000000..fad2723284 --- /dev/null +++ b/main/linux-pae/0007-r8169-Fix-rtl8169_rx_interrupt.patch | |||
@@ -0,0 +1,89 @@ | |||
1 | From 26654a966adb674afc30d285f7e79535d03c2492 Mon Sep 17 00:00:00 2001 | ||
2 | From: Eric Dumazet <eric.dumazet@gmail.com> | ||
3 | Date: Wed, 31 Mar 2010 02:08:31 +0000 | ||
4 | Subject: [PATCH 07/18] r8169: Fix rtl8169_rx_interrupt() | ||
5 | |||
6 | In case a reset is performed, rtl8169_rx_interrupt() is called from | ||
7 | process context instead of softirq context. Special care must be taken | ||
8 | to call appropriate network core services (netif_rx() instead of | ||
9 | netif_receive_skb()). VLAN handling also corrected. | ||
10 | |||
11 | Reported-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> | ||
12 | Tested-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> | ||
13 | Diagnosed-by: Oleg Nesterov <oleg@redhat.com> | ||
14 | Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> | ||
15 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
16 | (cherry picked from commit 630b943c182d1aed69f244405131902fbcba7ec6) | ||
17 | --- | ||
18 | drivers/net/r8169.c | 22 +++++++++++++++++----- | ||
19 | 1 files changed, 17 insertions(+), 5 deletions(-) | ||
20 | |||
21 | diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c | ||
22 | index 1484528..bed1d47 100644 | ||
23 | --- a/drivers/net/r8169.c | ||
24 | +++ b/drivers/net/r8169.c | ||
25 | @@ -1047,14 +1047,14 @@ static void rtl8169_vlan_rx_register(struct net_device *dev, | ||
26 | } | ||
27 | |||
28 | static int rtl8169_rx_vlan_skb(struct rtl8169_private *tp, struct RxDesc *desc, | ||
29 | - struct sk_buff *skb) | ||
30 | + struct sk_buff *skb, int polling) | ||
31 | { | ||
32 | u32 opts2 = le32_to_cpu(desc->opts2); | ||
33 | struct vlan_group *vlgrp = tp->vlgrp; | ||
34 | int ret; | ||
35 | |||
36 | if (vlgrp && (opts2 & RxVlanTag)) { | ||
37 | - vlan_hwaccel_receive_skb(skb, vlgrp, swab16(opts2 & 0xffff)); | ||
38 | + __vlan_hwaccel_rx(skb, vlgrp, swab16(opts2 & 0xffff), polling); | ||
39 | ret = 0; | ||
40 | } else | ||
41 | ret = -1; | ||
42 | @@ -1071,7 +1071,7 @@ static inline u32 rtl8169_tx_vlan_tag(struct rtl8169_private *tp, | ||
43 | } | ||
44 | |||
45 | static int rtl8169_rx_vlan_skb(struct rtl8169_private *tp, struct RxDesc *desc, | ||
46 | - struct sk_buff *skb) | ||
47 | + struct sk_buff *skb, int polling) | ||
48 | { | ||
49 | return -1; | ||
50 | } | ||
51 | @@ -4480,12 +4480,20 @@ out: | ||
52 | return done; | ||
53 | } | ||
54 | |||
55 | +/* | ||
56 | + * Warning : rtl8169_rx_interrupt() might be called : | ||
57 | + * 1) from NAPI (softirq) context | ||
58 | + * (polling = 1 : we should call netif_receive_skb()) | ||
59 | + * 2) from process context (rtl8169_reset_task()) | ||
60 | + * (polling = 0 : we must call netif_rx() instead) | ||
61 | + */ | ||
62 | static int rtl8169_rx_interrupt(struct net_device *dev, | ||
63 | struct rtl8169_private *tp, | ||
64 | void __iomem *ioaddr, u32 budget) | ||
65 | { | ||
66 | unsigned int cur_rx, rx_left; | ||
67 | unsigned int delta, count; | ||
68 | + int polling = (budget != ~(u32)0) ? 1 : 0; | ||
69 | |||
70 | cur_rx = tp->cur_rx; | ||
71 | rx_left = NUM_RX_DESC + tp->dirty_rx - cur_rx; | ||
72 | @@ -4550,8 +4558,12 @@ static int rtl8169_rx_interrupt(struct net_device *dev, | ||
73 | skb_put(skb, pkt_size); | ||
74 | skb->protocol = eth_type_trans(skb, dev); | ||
75 | |||
76 | - if (rtl8169_rx_vlan_skb(tp, desc, skb) < 0) | ||
77 | - netif_receive_skb(skb); | ||
78 | + if (rtl8169_rx_vlan_skb(tp, desc, skb, polling) < 0) { | ||
79 | + if (likely(polling)) | ||
80 | + netif_receive_skb(skb); | ||
81 | + else | ||
82 | + netif_rx(skb); | ||
83 | + } | ||
84 | |||
85 | dev->stats.rx_bytes += pkt_size; | ||
86 | dev->stats.rx_packets++; | ||
87 | -- | ||
88 | 1.7.0.2 | ||
89 | |||
diff --git a/main/linux-pae/0009-ipsec-Fix-bogus-bundle-flowi.patch b/main/linux-pae/0009-ipsec-Fix-bogus-bundle-flowi.patch new file mode 100644 index 0000000000..d4de0e1d58 --- /dev/null +++ b/main/linux-pae/0009-ipsec-Fix-bogus-bundle-flowi.patch | |||
@@ -0,0 +1,110 @@ | |||
1 | From 21ee14f92ef1b6d4ca965c9b59135f3462919631 Mon Sep 17 00:00:00 2001 | ||
2 | From: Herbert Xu <herbert@gondor.apana.org.au> | ||
3 | Date: Tue, 2 Mar 2010 02:51:56 +0000 | ||
4 | Subject: [PATCH 09/18] ipsec: Fix bogus bundle flowi | ||
5 | |||
6 | When I merged the bundle creation code, I introduced a bogus | ||
7 | flowi value in the bundle. Instead of getting from the caller, | ||
8 | it was instead set to the flow in the route object, which is | ||
9 | totally different. | ||
10 | |||
11 | The end result is that the bundles we created never match, and | ||
12 | we instead end up with an ever growing bundle list. | ||
13 | |||
14 | Thanks to Jamal for find this problem. | ||
15 | |||
16 | Reported-by: Jamal Hadi Salim <hadi@cyberus.ca> | ||
17 | Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> | ||
18 | Acked-by: Steffen Klassert <steffen.klassert@secunet.com> | ||
19 | Acked-by: Jamal Hadi Salim <hadi@cyberus.ca> | ||
20 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
21 | (cherry picked from commit 87c1e12b5eeb7b30b4b41291bef8e0b41fc3dde9) | ||
22 | --- | ||
23 | include/net/xfrm.h | 3 ++- | ||
24 | net/ipv4/xfrm4_policy.c | 5 +++-- | ||
25 | net/ipv6/xfrm6_policy.c | 3 ++- | ||
26 | net/xfrm/xfrm_policy.c | 7 ++++--- | ||
27 | 4 files changed, 11 insertions(+), 7 deletions(-) | ||
28 | |||
29 | diff --git a/include/net/xfrm.h b/include/net/xfrm.h | ||
30 | index 223e90a..6960be2 100644 | ||
31 | --- a/include/net/xfrm.h | ||
32 | +++ b/include/net/xfrm.h | ||
33 | @@ -273,7 +273,8 @@ struct xfrm_policy_afinfo { | ||
34 | struct dst_entry *dst, | ||
35 | int nfheader_len); | ||
36 | int (*fill_dst)(struct xfrm_dst *xdst, | ||
37 | - struct net_device *dev); | ||
38 | + struct net_device *dev, | ||
39 | + struct flowi *fl); | ||
40 | }; | ||
41 | |||
42 | extern int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo); | ||
43 | diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c | ||
44 | index 74fb2eb..7009886 100644 | ||
45 | --- a/net/ipv4/xfrm4_policy.c | ||
46 | +++ b/net/ipv4/xfrm4_policy.c | ||
47 | @@ -92,11 +92,12 @@ static int xfrm4_init_path(struct xfrm_dst *path, struct dst_entry *dst, | ||
48 | return 0; | ||
49 | } | ||
50 | |||
51 | -static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev) | ||
52 | +static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev, | ||
53 | + struct flowi *fl) | ||
54 | { | ||
55 | struct rtable *rt = (struct rtable *)xdst->route; | ||
56 | |||
57 | - xdst->u.rt.fl = rt->fl; | ||
58 | + xdst->u.rt.fl = *fl; | ||
59 | |||
60 | xdst->u.dst.dev = dev; | ||
61 | dev_hold(dev); | ||
62 | diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c | ||
63 | index 8ec3d45..3f89ab7 100644 | ||
64 | --- a/net/ipv6/xfrm6_policy.c | ||
65 | +++ b/net/ipv6/xfrm6_policy.c | ||
66 | @@ -117,7 +117,8 @@ static int xfrm6_init_path(struct xfrm_dst *path, struct dst_entry *dst, | ||
67 | return 0; | ||
68 | } | ||
69 | |||
70 | -static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev) | ||
71 | +static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev, | ||
72 | + struct flowi *fl) | ||
73 | { | ||
74 | struct rt6_info *rt = (struct rt6_info*)xdst->route; | ||
75 | |||
76 | diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c | ||
77 | index cb81ca3..d75047c 100644 | ||
78 | --- a/net/xfrm/xfrm_policy.c | ||
79 | +++ b/net/xfrm/xfrm_policy.c | ||
80 | @@ -1341,7 +1341,8 @@ static inline int xfrm_init_path(struct xfrm_dst *path, struct dst_entry *dst, | ||
81 | return err; | ||
82 | } | ||
83 | |||
84 | -static inline int xfrm_fill_dst(struct xfrm_dst *xdst, struct net_device *dev) | ||
85 | +static inline int xfrm_fill_dst(struct xfrm_dst *xdst, struct net_device *dev, | ||
86 | + struct flowi *fl) | ||
87 | { | ||
88 | struct xfrm_policy_afinfo *afinfo = | ||
89 | xfrm_policy_get_afinfo(xdst->u.dst.ops->family); | ||
90 | @@ -1350,7 +1351,7 @@ static inline int xfrm_fill_dst(struct xfrm_dst *xdst, struct net_device *dev) | ||
91 | if (!afinfo) | ||
92 | return -EINVAL; | ||
93 | |||
94 | - err = afinfo->fill_dst(xdst, dev); | ||
95 | + err = afinfo->fill_dst(xdst, dev, fl); | ||
96 | |||
97 | xfrm_policy_put_afinfo(afinfo); | ||
98 | |||
99 | @@ -1454,7 +1455,7 @@ static struct dst_entry *xfrm_bundle_create(struct xfrm_policy *policy, | ||
100 | for (dst_prev = dst0; dst_prev != dst; dst_prev = dst_prev->child) { | ||
101 | struct xfrm_dst *xdst = (struct xfrm_dst *)dst_prev; | ||
102 | |||
103 | - err = xfrm_fill_dst(xdst, dev); | ||
104 | + err = xfrm_fill_dst(xdst, dev, fl); | ||
105 | if (err) | ||
106 | goto free_dst; | ||
107 | |||
108 | -- | ||
109 | 1.7.0.2 | ||
110 | |||
diff --git a/main/linux-pae/0010-xfrm-Remove-xfrm_state_genid.patch b/main/linux-pae/0010-xfrm-Remove-xfrm_state_genid.patch new file mode 100644 index 0000000000..8cfffd7398 --- /dev/null +++ b/main/linux-pae/0010-xfrm-Remove-xfrm_state_genid.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | From f2c59932757a06851bb740dc757ce2ba1961fc08 Mon Sep 17 00:00:00 2001 | ||
2 | From: Herbert Xu <herbert@gondor.apana.org.au> | ||
3 | Date: Wed, 31 Mar 2010 01:19:49 +0000 | ||
4 | Subject: [PATCH 10/18] xfrm: Remove xfrm_state_genid | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | The xfrm state genid only needs to be matched against the copy | ||
10 | saved in xfrm_dst. So we don't need a global genid at all. In | ||
11 | fact, we don't even need to initialise it. | ||
12 | |||
13 | Based on observation by Timo Teräs. | ||
14 | |||
15 | Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> | ||
16 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
17 | (cherry picked from commit 34996cb91dd72f0b0456d8fd3fef4aaee62232f2) | ||
18 | --- | ||
19 | net/xfrm/xfrm_state.c | 5 +---- | ||
20 | 1 files changed, 1 insertions(+), 4 deletions(-) | ||
21 | |||
22 | diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c | ||
23 | index f2f7c63..8ee733f 100644 | ||
24 | --- a/net/xfrm/xfrm_state.c | ||
25 | +++ b/net/xfrm/xfrm_state.c | ||
26 | @@ -34,7 +34,6 @@ | ||
27 | static DEFINE_SPINLOCK(xfrm_state_lock); | ||
28 | |||
29 | static unsigned int xfrm_state_hashmax __read_mostly = 1 * 1024 * 1024; | ||
30 | -static unsigned int xfrm_state_genid; | ||
31 | |||
32 | static struct xfrm_state_afinfo *xfrm_state_get_afinfo(unsigned int family); | ||
33 | static void xfrm_state_put_afinfo(struct xfrm_state_afinfo *afinfo); | ||
34 | @@ -903,8 +902,6 @@ static void __xfrm_state_insert(struct xfrm_state *x) | ||
35 | struct net *net = xs_net(x); | ||
36 | unsigned int h; | ||
37 | |||
38 | - x->genid = ++xfrm_state_genid; | ||
39 | - | ||
40 | list_add(&x->km.all, &net->xfrm.state_all); | ||
41 | |||
42 | h = xfrm_dst_hash(net, &x->id.daddr, &x->props.saddr, | ||
43 | @@ -948,7 +945,7 @@ static void __xfrm_state_bump_genids(struct xfrm_state *xnew) | ||
44 | x->props.reqid == reqid && | ||
45 | !xfrm_addr_cmp(&x->id.daddr, &xnew->id.daddr, family) && | ||
46 | !xfrm_addr_cmp(&x->props.saddr, &xnew->props.saddr, family)) | ||
47 | - x->genid = xfrm_state_genid; | ||
48 | + x->genid++; | ||
49 | } | ||
50 | } | ||
51 | |||
52 | -- | ||
53 | 1.7.0.2 | ||
54 | |||
diff --git a/main/linux-pae/0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch b/main/linux-pae/0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch new file mode 100644 index 0000000000..ae2a0f9100 --- /dev/null +++ b/main/linux-pae/0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 5b3e87bccb0e48f2f8b78695e949c015a3695f8e Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Wed, 31 Mar 2010 00:17:04 +0000 | ||
4 | Subject: [PATCH 11/18] xfrm_user: verify policy direction at XFRM_MSG_POLEXPIRE handler | ||
5 | |||
6 | Add missing check for policy direction verification. This is | ||
7 | especially important since without this xfrm_user may end up | ||
8 | deleting per-socket policy which is not allowed. | ||
9 | |||
10 | Signed-off-by: Timo Teras <timo.teras@iki.fi> | ||
11 | Acked-by: Herbert Xu <herbert@gondor.apana.org.au> | ||
12 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
13 | (cherry picked from commit c8bf4d04f970fafb3430d332533e1cf103f2a018) | ||
14 | --- | ||
15 | net/xfrm/xfrm_user.c | 4 ++++ | ||
16 | 1 files changed, 4 insertions(+), 0 deletions(-) | ||
17 | |||
18 | diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c | ||
19 | index b95a2d6..d1e9ee3 100644 | ||
20 | --- a/net/xfrm/xfrm_user.c | ||
21 | +++ b/net/xfrm/xfrm_user.c | ||
22 | @@ -1589,6 +1589,10 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh, | ||
23 | if (err) | ||
24 | return err; | ||
25 | |||
26 | + err = verify_policy_dir(p->dir); | ||
27 | + if (err) | ||
28 | + return err; | ||
29 | + | ||
30 | if (p->index) | ||
31 | xp = xfrm_policy_byid(net, type, p->dir, p->index, 0, &err); | ||
32 | else { | ||
33 | -- | ||
34 | 1.7.0.2 | ||
35 | |||
diff --git a/main/linux-pae/0012-xfrm-remove-policy-lock-when-accessing-policy-walk.d.patch b/main/linux-pae/0012-xfrm-remove-policy-lock-when-accessing-policy-walk.d.patch new file mode 100644 index 0000000000..222caaddfd --- /dev/null +++ b/main/linux-pae/0012-xfrm-remove-policy-lock-when-accessing-policy-walk.d.patch | |||
@@ -0,0 +1,105 @@ | |||
1 | From 7a400eb025dd53883c3560d0fdb069542f7ad3db Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Wed, 31 Mar 2010 00:17:05 +0000 | ||
4 | Subject: [PATCH 12/18] xfrm: remove policy lock when accessing policy->walk.dead | ||
5 | |||
6 | All of the code considers ->dead as a hint that the cached policy | ||
7 | needs to get refreshed. The read side can just drop the read lock | ||
8 | without any side effects. | ||
9 | |||
10 | The write side needs to make sure that it's written only exactly | ||
11 | once. Only possible race is at xfrm_policy_kill(). This is fixed | ||
12 | by checking result of __xfrm_policy_unlink() when needed. It will | ||
13 | always succeed if the policy object is looked up from the hash | ||
14 | list (so some checks are removed), but it needs to be checked if | ||
15 | we are trying to unlink policy via a reference (appropriate | ||
16 | checks added). | ||
17 | |||
18 | Since policy->walk.dead is written exactly once, it no longer | ||
19 | needs to be protected with a write lock. | ||
20 | |||
21 | Signed-off-by: Timo Teras <timo.teras@iki.fi> | ||
22 | Acked-by: Herbert Xu <herbert@gondor.apana.org.au> | ||
23 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
24 | (backported from commit ea2dea9dacc256fe927857feb423872051642ae7) | ||
25 | --- | ||
26 | net/xfrm/xfrm_policy.c | 20 +++++--------------- | ||
27 | net/xfrm/xfrm_user.c | 6 +----- | ||
28 | 2 files changed, 6 insertions(+), 20 deletions(-) | ||
29 | |||
30 | diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c | ||
31 | index d75047c..110184f 100644 | ||
32 | --- a/net/xfrm/xfrm_policy.c | ||
33 | +++ b/net/xfrm/xfrm_policy.c | ||
34 | @@ -156,7 +156,7 @@ static void xfrm_policy_timer(unsigned long data) | ||
35 | |||
36 | read_lock(&xp->lock); | ||
37 | |||
38 | - if (xp->walk.dead) | ||
39 | + if (unlikely(xp->walk.dead)) | ||
40 | goto out; | ||
41 | |||
42 | dir = xfrm_policy_id2dir(xp->index); | ||
43 | @@ -297,17 +297,7 @@ static DECLARE_WORK(xfrm_policy_gc_work, xfrm_policy_gc_task); | ||
44 | |||
45 | static void xfrm_policy_kill(struct xfrm_policy *policy) | ||
46 | { | ||
47 | - int dead; | ||
48 | - | ||
49 | - write_lock_bh(&policy->lock); | ||
50 | - dead = policy->walk.dead; | ||
51 | policy->walk.dead = 1; | ||
52 | - write_unlock_bh(&policy->lock); | ||
53 | - | ||
54 | - if (unlikely(dead)) { | ||
55 | - WARN_ON(1); | ||
56 | - return; | ||
57 | - } | ||
58 | |||
59 | spin_lock_bh(&xfrm_policy_gc_lock); | ||
60 | hlist_add_head(&policy->bydst, &xfrm_policy_gc_list); | ||
61 | @@ -1115,6 +1105,9 @@ int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol) | ||
62 | __xfrm_policy_link(pol, XFRM_POLICY_MAX+dir); | ||
63 | } | ||
64 | if (old_pol) | ||
65 | + /* Unlinking succeeds always. This is the only function | ||
66 | + * allowed to delete or replace socket policy. | ||
67 | + */ | ||
68 | __xfrm_policy_unlink(old_pol, XFRM_POLICY_MAX+dir); | ||
69 | write_unlock_bh(&xfrm_policy_lock); | ||
70 | |||
71 | @@ -1705,11 +1698,8 @@ restart: | ||
72 | goto error; | ||
73 | } | ||
74 | |||
75 | - for (pi = 0; pi < npols; pi++) { | ||
76 | - read_lock_bh(&pols[pi]->lock); | ||
77 | + for (pi = 0; pi < npols; pi++) | ||
78 | pol_dead |= pols[pi]->walk.dead; | ||
79 | - read_unlock_bh(&pols[pi]->lock); | ||
80 | - } | ||
81 | |||
82 | write_lock_bh(&policy->lock); | ||
83 | if (unlikely(pol_dead || stale_bundle(dst))) { | ||
84 | diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c | ||
85 | index d1e9ee3..f9c56e9 100644 | ||
86 | --- a/net/xfrm/xfrm_user.c | ||
87 | +++ b/net/xfrm/xfrm_user.c | ||
88 | @@ -1617,13 +1617,9 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh, | ||
89 | if (xp == NULL) | ||
90 | return -ENOENT; | ||
91 | |||
92 | - read_lock(&xp->lock); | ||
93 | - if (xp->walk.dead) { | ||
94 | - read_unlock(&xp->lock); | ||
95 | + if (unlikely(xp->walk.dead)) | ||
96 | goto out; | ||
97 | - } | ||
98 | |||
99 | - read_unlock(&xp->lock); | ||
100 | err = 0; | ||
101 | if (up->hard) { | ||
102 | uid_t loginuid = NETLINK_CB(skb).loginuid; | ||
103 | -- | ||
104 | 1.7.0.2 | ||
105 | |||
diff --git a/main/linux-pae/0013-flow-structurize-flow-cache.patch b/main/linux-pae/0013-flow-structurize-flow-cache.patch new file mode 100644 index 0000000000..68fa753a2c --- /dev/null +++ b/main/linux-pae/0013-flow-structurize-flow-cache.patch | |||
@@ -0,0 +1,395 @@ | |||
1 | From 884f6e44f0b405c06bd234b14cc228482291bb38 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Wed, 31 Mar 2010 00:17:06 +0000 | ||
4 | Subject: [PATCH 13/18] flow: structurize flow cache | ||
5 | |||
6 | Group all per-cpu data to one structure instead of having many | ||
7 | globals. Also prepare the internals so that we can have multiple | ||
8 | instances of the flow cache if needed. | ||
9 | |||
10 | Only the kmem_cache is left as a global as all flow caches share | ||
11 | the same element size, and benefit from using a common cache. | ||
12 | |||
13 | Signed-off-by: Timo Teras <timo.teras@iki.fi> | ||
14 | Acked-by: Herbert Xu <herbert@gondor.apana.org.au> | ||
15 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
16 | (cherry picked from commit d7997fe1f4584da12e9c29fb682c18e9bdc13b73) | ||
17 | --- | ||
18 | net/core/flow.c | 223 +++++++++++++++++++++++++++++-------------------------- | ||
19 | 1 files changed, 119 insertions(+), 104 deletions(-) | ||
20 | |||
21 | diff --git a/net/core/flow.c b/net/core/flow.c | ||
22 | index 9601587..1d27ca6 100644 | ||
23 | --- a/net/core/flow.c | ||
24 | +++ b/net/core/flow.c | ||
25 | @@ -35,104 +35,105 @@ struct flow_cache_entry { | ||
26 | atomic_t *object_ref; | ||
27 | }; | ||
28 | |||
29 | -atomic_t flow_cache_genid = ATOMIC_INIT(0); | ||
30 | - | ||
31 | -static u32 flow_hash_shift; | ||
32 | -#define flow_hash_size (1 << flow_hash_shift) | ||
33 | -static DEFINE_PER_CPU(struct flow_cache_entry **, flow_tables) = { NULL }; | ||
34 | - | ||
35 | -#define flow_table(cpu) (per_cpu(flow_tables, cpu)) | ||
36 | - | ||
37 | -static struct kmem_cache *flow_cachep __read_mostly; | ||
38 | - | ||
39 | -static int flow_lwm, flow_hwm; | ||
40 | - | ||
41 | -struct flow_percpu_info { | ||
42 | - int hash_rnd_recalc; | ||
43 | - u32 hash_rnd; | ||
44 | - int count; | ||
45 | +struct flow_cache_percpu { | ||
46 | + struct flow_cache_entry ** hash_table; | ||
47 | + int hash_count; | ||
48 | + u32 hash_rnd; | ||
49 | + int hash_rnd_recalc; | ||
50 | + struct tasklet_struct flush_tasklet; | ||
51 | }; | ||
52 | -static DEFINE_PER_CPU(struct flow_percpu_info, flow_hash_info) = { 0 }; | ||
53 | - | ||
54 | -#define flow_hash_rnd_recalc(cpu) \ | ||
55 | - (per_cpu(flow_hash_info, cpu).hash_rnd_recalc) | ||
56 | -#define flow_hash_rnd(cpu) \ | ||
57 | - (per_cpu(flow_hash_info, cpu).hash_rnd) | ||
58 | -#define flow_count(cpu) \ | ||
59 | - (per_cpu(flow_hash_info, cpu).count) | ||
60 | - | ||
61 | -static struct timer_list flow_hash_rnd_timer; | ||
62 | - | ||
63 | -#define FLOW_HASH_RND_PERIOD (10 * 60 * HZ) | ||
64 | |||
65 | struct flow_flush_info { | ||
66 | - atomic_t cpuleft; | ||
67 | - struct completion completion; | ||
68 | + struct flow_cache * cache; | ||
69 | + atomic_t cpuleft; | ||
70 | + struct completion completion; | ||
71 | }; | ||
72 | -static DEFINE_PER_CPU(struct tasklet_struct, flow_flush_tasklets) = { NULL }; | ||
73 | |||
74 | -#define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) | ||
75 | +struct flow_cache { | ||
76 | + u32 hash_shift; | ||
77 | + unsigned long order; | ||
78 | + struct flow_cache_percpu * percpu; | ||
79 | + struct notifier_block hotcpu_notifier; | ||
80 | + int low_watermark; | ||
81 | + int high_watermark; | ||
82 | + struct timer_list rnd_timer; | ||
83 | +}; | ||
84 | + | ||
85 | +atomic_t flow_cache_genid = ATOMIC_INIT(0); | ||
86 | +static struct flow_cache flow_cache_global; | ||
87 | +static struct kmem_cache *flow_cachep; | ||
88 | + | ||
89 | +#define flow_cache_hash_size(cache) (1 << (cache)->hash_shift) | ||
90 | +#define FLOW_HASH_RND_PERIOD (10 * 60 * HZ) | ||
91 | |||
92 | static void flow_cache_new_hashrnd(unsigned long arg) | ||
93 | { | ||
94 | + struct flow_cache *fc = (void *) arg; | ||
95 | int i; | ||
96 | |||
97 | for_each_possible_cpu(i) | ||
98 | - flow_hash_rnd_recalc(i) = 1; | ||
99 | + per_cpu_ptr(fc->percpu, i)->hash_rnd_recalc = 1; | ||
100 | |||
101 | - flow_hash_rnd_timer.expires = jiffies + FLOW_HASH_RND_PERIOD; | ||
102 | - add_timer(&flow_hash_rnd_timer); | ||
103 | + fc->rnd_timer.expires = jiffies + FLOW_HASH_RND_PERIOD; | ||
104 | + add_timer(&fc->rnd_timer); | ||
105 | } | ||
106 | |||
107 | -static void flow_entry_kill(int cpu, struct flow_cache_entry *fle) | ||
108 | +static void flow_entry_kill(struct flow_cache *fc, | ||
109 | + struct flow_cache_percpu *fcp, | ||
110 | + struct flow_cache_entry *fle) | ||
111 | { | ||
112 | if (fle->object) | ||
113 | atomic_dec(fle->object_ref); | ||
114 | kmem_cache_free(flow_cachep, fle); | ||
115 | - flow_count(cpu)--; | ||
116 | + fcp->hash_count--; | ||
117 | } | ||
118 | |||
119 | -static void __flow_cache_shrink(int cpu, int shrink_to) | ||
120 | +static void __flow_cache_shrink(struct flow_cache *fc, | ||
121 | + struct flow_cache_percpu *fcp, | ||
122 | + int shrink_to) | ||
123 | { | ||
124 | struct flow_cache_entry *fle, **flp; | ||
125 | int i; | ||
126 | |||
127 | - for (i = 0; i < flow_hash_size; i++) { | ||
128 | + for (i = 0; i < flow_cache_hash_size(fc); i++) { | ||
129 | int k = 0; | ||
130 | |||
131 | - flp = &flow_table(cpu)[i]; | ||
132 | + flp = &fcp->hash_table[i]; | ||
133 | while ((fle = *flp) != NULL && k < shrink_to) { | ||
134 | k++; | ||
135 | flp = &fle->next; | ||
136 | } | ||
137 | while ((fle = *flp) != NULL) { | ||
138 | *flp = fle->next; | ||
139 | - flow_entry_kill(cpu, fle); | ||
140 | + flow_entry_kill(fc, fcp, fle); | ||
141 | } | ||
142 | } | ||
143 | } | ||
144 | |||
145 | -static void flow_cache_shrink(int cpu) | ||
146 | +static void flow_cache_shrink(struct flow_cache *fc, | ||
147 | + struct flow_cache_percpu *fcp) | ||
148 | { | ||
149 | - int shrink_to = flow_lwm / flow_hash_size; | ||
150 | + int shrink_to = fc->low_watermark / flow_cache_hash_size(fc); | ||
151 | |||
152 | - __flow_cache_shrink(cpu, shrink_to); | ||
153 | + __flow_cache_shrink(fc, fcp, shrink_to); | ||
154 | } | ||
155 | |||
156 | -static void flow_new_hash_rnd(int cpu) | ||
157 | +static void flow_new_hash_rnd(struct flow_cache *fc, | ||
158 | + struct flow_cache_percpu *fcp) | ||
159 | { | ||
160 | - get_random_bytes(&flow_hash_rnd(cpu), sizeof(u32)); | ||
161 | - flow_hash_rnd_recalc(cpu) = 0; | ||
162 | - | ||
163 | - __flow_cache_shrink(cpu, 0); | ||
164 | + get_random_bytes(&fcp->hash_rnd, sizeof(u32)); | ||
165 | + fcp->hash_rnd_recalc = 0; | ||
166 | + __flow_cache_shrink(fc, fcp, 0); | ||
167 | } | ||
168 | |||
169 | -static u32 flow_hash_code(struct flowi *key, int cpu) | ||
170 | +static u32 flow_hash_code(struct flow_cache *fc, | ||
171 | + struct flow_cache_percpu *fcp, | ||
172 | + struct flowi *key) | ||
173 | { | ||
174 | u32 *k = (u32 *) key; | ||
175 | |||
176 | - return (jhash2(k, (sizeof(*key) / sizeof(u32)), flow_hash_rnd(cpu)) & | ||
177 | - (flow_hash_size - 1)); | ||
178 | + return (jhash2(k, (sizeof(*key) / sizeof(u32)), fcp->hash_rnd) | ||
179 | + & (flow_cache_hash_size(fc) - 1)); | ||
180 | } | ||
181 | |||
182 | #if (BITS_PER_LONG == 64) | ||
183 | @@ -168,24 +169,25 @@ static int flow_key_compare(struct flowi *key1, struct flowi *key2) | ||
184 | void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir, | ||
185 | flow_resolve_t resolver) | ||
186 | { | ||
187 | + struct flow_cache *fc = &flow_cache_global; | ||
188 | + struct flow_cache_percpu *fcp; | ||
189 | struct flow_cache_entry *fle, **head; | ||
190 | unsigned int hash; | ||
191 | - int cpu; | ||
192 | |||
193 | local_bh_disable(); | ||
194 | - cpu = smp_processor_id(); | ||
195 | + fcp = per_cpu_ptr(fc->percpu, smp_processor_id()); | ||
196 | |||
197 | fle = NULL; | ||
198 | /* Packet really early in init? Making flow_cache_init a | ||
199 | * pre-smp initcall would solve this. --RR */ | ||
200 | - if (!flow_table(cpu)) | ||
201 | + if (!fcp->hash_table) | ||
202 | goto nocache; | ||
203 | |||
204 | - if (flow_hash_rnd_recalc(cpu)) | ||
205 | - flow_new_hash_rnd(cpu); | ||
206 | - hash = flow_hash_code(key, cpu); | ||
207 | + if (fcp->hash_rnd_recalc) | ||
208 | + flow_new_hash_rnd(fc, fcp); | ||
209 | + hash = flow_hash_code(fc, fcp, key); | ||
210 | |||
211 | - head = &flow_table(cpu)[hash]; | ||
212 | + head = &fcp->hash_table[hash]; | ||
213 | for (fle = *head; fle; fle = fle->next) { | ||
214 | if (fle->family == family && | ||
215 | fle->dir == dir && | ||
216 | @@ -204,8 +206,8 @@ void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir, | ||
217 | } | ||
218 | |||
219 | if (!fle) { | ||
220 | - if (flow_count(cpu) > flow_hwm) | ||
221 | - flow_cache_shrink(cpu); | ||
222 | + if (fcp->hash_count > fc->high_watermark) | ||
223 | + flow_cache_shrink(fc, fcp); | ||
224 | |||
225 | fle = kmem_cache_alloc(flow_cachep, GFP_ATOMIC); | ||
226 | if (fle) { | ||
227 | @@ -215,7 +217,7 @@ void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir, | ||
228 | fle->dir = dir; | ||
229 | memcpy(&fle->key, key, sizeof(*key)); | ||
230 | fle->object = NULL; | ||
231 | - flow_count(cpu)++; | ||
232 | + fcp->hash_count++; | ||
233 | } | ||
234 | } | ||
235 | |||
236 | @@ -249,14 +251,15 @@ nocache: | ||
237 | static void flow_cache_flush_tasklet(unsigned long data) | ||
238 | { | ||
239 | struct flow_flush_info *info = (void *)data; | ||
240 | + struct flow_cache *fc = info->cache; | ||
241 | + struct flow_cache_percpu *fcp; | ||
242 | int i; | ||
243 | - int cpu; | ||
244 | |||
245 | - cpu = smp_processor_id(); | ||
246 | - for (i = 0; i < flow_hash_size; i++) { | ||
247 | + fcp = per_cpu_ptr(fc->percpu, smp_processor_id()); | ||
248 | + for (i = 0; i < flow_cache_hash_size(fc); i++) { | ||
249 | struct flow_cache_entry *fle; | ||
250 | |||
251 | - fle = flow_table(cpu)[i]; | ||
252 | + fle = fcp->hash_table[i]; | ||
253 | for (; fle; fle = fle->next) { | ||
254 | unsigned genid = atomic_read(&flow_cache_genid); | ||
255 | |||
256 | @@ -272,7 +275,6 @@ static void flow_cache_flush_tasklet(unsigned long data) | ||
257 | complete(&info->completion); | ||
258 | } | ||
259 | |||
260 | -static void flow_cache_flush_per_cpu(void *) __attribute__((__unused__)); | ||
261 | static void flow_cache_flush_per_cpu(void *data) | ||
262 | { | ||
263 | struct flow_flush_info *info = data; | ||
264 | @@ -280,8 +282,7 @@ static void flow_cache_flush_per_cpu(void *data) | ||
265 | struct tasklet_struct *tasklet; | ||
266 | |||
267 | cpu = smp_processor_id(); | ||
268 | - | ||
269 | - tasklet = flow_flush_tasklet(cpu); | ||
270 | + tasklet = &per_cpu_ptr(info->cache->percpu, cpu)->flush_tasklet; | ||
271 | tasklet->data = (unsigned long)info; | ||
272 | tasklet_schedule(tasklet); | ||
273 | } | ||
274 | @@ -294,6 +295,7 @@ void flow_cache_flush(void) | ||
275 | /* Don't want cpus going down or up during this. */ | ||
276 | get_online_cpus(); | ||
277 | mutex_lock(&flow_flush_sem); | ||
278 | + info.cache = &flow_cache_global; | ||
279 | atomic_set(&info.cpuleft, num_online_cpus()); | ||
280 | init_completion(&info.completion); | ||
281 | |||
282 | @@ -307,62 +309,75 @@ void flow_cache_flush(void) | ||
283 | put_online_cpus(); | ||
284 | } | ||
285 | |||
286 | -static void __init flow_cache_cpu_prepare(int cpu) | ||
287 | +static void __init flow_cache_cpu_prepare(struct flow_cache *fc, | ||
288 | + struct flow_cache_percpu *fcp) | ||
289 | { | ||
290 | - struct tasklet_struct *tasklet; | ||
291 | - unsigned long order; | ||
292 | - | ||
293 | - for (order = 0; | ||
294 | - (PAGE_SIZE << order) < | ||
295 | - (sizeof(struct flow_cache_entry *)*flow_hash_size); | ||
296 | - order++) | ||
297 | - /* NOTHING */; | ||
298 | - | ||
299 | - flow_table(cpu) = (struct flow_cache_entry **) | ||
300 | - __get_free_pages(GFP_KERNEL|__GFP_ZERO, order); | ||
301 | - if (!flow_table(cpu)) | ||
302 | - panic("NET: failed to allocate flow cache order %lu\n", order); | ||
303 | - | ||
304 | - flow_hash_rnd_recalc(cpu) = 1; | ||
305 | - flow_count(cpu) = 0; | ||
306 | - | ||
307 | - tasklet = flow_flush_tasklet(cpu); | ||
308 | - tasklet_init(tasklet, flow_cache_flush_tasklet, 0); | ||
309 | + fcp->hash_table = (struct flow_cache_entry **) | ||
310 | + __get_free_pages(GFP_KERNEL|__GFP_ZERO, fc->order); | ||
311 | + if (!fcp->hash_table) | ||
312 | + panic("NET: failed to allocate flow cache order %lu\n", fc->order); | ||
313 | + | ||
314 | + fcp->hash_rnd_recalc = 1; | ||
315 | + fcp->hash_count = 0; | ||
316 | + tasklet_init(&fcp->flush_tasklet, flow_cache_flush_tasklet, 0); | ||
317 | } | ||
318 | |||
319 | static int flow_cache_cpu(struct notifier_block *nfb, | ||
320 | unsigned long action, | ||
321 | void *hcpu) | ||
322 | { | ||
323 | + struct flow_cache *fc = container_of(nfb, struct flow_cache, hotcpu_notifier); | ||
324 | + int cpu = (unsigned long) hcpu; | ||
325 | + struct flow_cache_percpu *fcp = per_cpu_ptr(fc->percpu, cpu); | ||
326 | + | ||
327 | if (action == CPU_DEAD || action == CPU_DEAD_FROZEN) | ||
328 | - __flow_cache_shrink((unsigned long)hcpu, 0); | ||
329 | + __flow_cache_shrink(fc, fcp, 0); | ||
330 | return NOTIFY_OK; | ||
331 | } | ||
332 | |||
333 | -static int __init flow_cache_init(void) | ||
334 | +static int flow_cache_init(struct flow_cache *fc) | ||
335 | { | ||
336 | + unsigned long order; | ||
337 | int i; | ||
338 | |||
339 | - flow_cachep = kmem_cache_create("flow_cache", | ||
340 | - sizeof(struct flow_cache_entry), | ||
341 | - 0, SLAB_PANIC, | ||
342 | - NULL); | ||
343 | - flow_hash_shift = 10; | ||
344 | - flow_lwm = 2 * flow_hash_size; | ||
345 | - flow_hwm = 4 * flow_hash_size; | ||
346 | + fc->hash_shift = 10; | ||
347 | + fc->low_watermark = 2 * flow_cache_hash_size(fc); | ||
348 | + fc->high_watermark = 4 * flow_cache_hash_size(fc); | ||
349 | + | ||
350 | + for (order = 0; | ||
351 | + (PAGE_SIZE << order) < | ||
352 | + (sizeof(struct flow_cache_entry *)*flow_cache_hash_size(fc)); | ||
353 | + order++) | ||
354 | + /* NOTHING */; | ||
355 | + fc->order = order; | ||
356 | + fc->percpu = alloc_percpu(struct flow_cache_percpu); | ||
357 | |||
358 | - setup_timer(&flow_hash_rnd_timer, flow_cache_new_hashrnd, 0); | ||
359 | - flow_hash_rnd_timer.expires = jiffies + FLOW_HASH_RND_PERIOD; | ||
360 | - add_timer(&flow_hash_rnd_timer); | ||
361 | + setup_timer(&fc->rnd_timer, flow_cache_new_hashrnd, | ||
362 | + (unsigned long) fc); | ||
363 | + fc->rnd_timer.expires = jiffies + FLOW_HASH_RND_PERIOD; | ||
364 | + add_timer(&fc->rnd_timer); | ||
365 | |||
366 | for_each_possible_cpu(i) | ||
367 | - flow_cache_cpu_prepare(i); | ||
368 | + flow_cache_cpu_prepare(fc, per_cpu_ptr(fc->percpu, i)); | ||
369 | + | ||
370 | + fc->hotcpu_notifier = (struct notifier_block){ | ||
371 | + .notifier_call = flow_cache_cpu, | ||
372 | + }; | ||
373 | + register_hotcpu_notifier(&fc->hotcpu_notifier); | ||
374 | |||
375 | - hotcpu_notifier(flow_cache_cpu, 0); | ||
376 | return 0; | ||
377 | } | ||
378 | |||
379 | -module_init(flow_cache_init); | ||
380 | +static int __init flow_cache_init_global(void) | ||
381 | +{ | ||
382 | + flow_cachep = kmem_cache_create("flow_cache", | ||
383 | + sizeof(struct flow_cache_entry), | ||
384 | + 0, SLAB_PANIC, NULL); | ||
385 | + | ||
386 | + return flow_cache_init(&flow_cache_global); | ||
387 | +} | ||
388 | + | ||
389 | +module_init(flow_cache_init_global); | ||
390 | |||
391 | EXPORT_SYMBOL(flow_cache_genid); | ||
392 | EXPORT_SYMBOL(flow_cache_lookup); | ||
393 | -- | ||
394 | 1.7.0.2 | ||
395 | |||
diff --git a/main/linux-pae/0014-flow-virtualize-flow-cache-entry-methods.patch b/main/linux-pae/0014-flow-virtualize-flow-cache-entry-methods.patch new file mode 100644 index 0000000000..5c4a9ea594 --- /dev/null +++ b/main/linux-pae/0014-flow-virtualize-flow-cache-entry-methods.patch | |||
@@ -0,0 +1,513 @@ | |||
1 | From d56cd1c538e5448fe43acc69991aa842f382a622 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Wed, 7 Apr 2010 00:30:04 +0000 | ||
4 | Subject: [PATCH 14/18] flow: virtualize flow cache entry methods | ||
5 | |||
6 | This allows to validate the cached object before returning it. | ||
7 | It also allows to destruct object properly, if the last reference | ||
8 | was held in flow cache. This is also a prepartion for caching | ||
9 | bundles in the flow cache. | ||
10 | |||
11 | In return for virtualizing the methods, we save on: | ||
12 | - not having to regenerate the whole flow cache on policy removal: | ||
13 | each flow matching a killed policy gets refreshed as the getter | ||
14 | function notices it smartly. | ||
15 | - we do not have to call flow_cache_flush from policy gc, since the | ||
16 | flow cache now properly deletes the object if it had any references | ||
17 | |||
18 | Signed-off-by: Timo Teras <timo.teras@iki.fi> | ||
19 | Acked-by: Herbert Xu <herbert@gondor.apana.org.au> | ||
20 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
21 | (backported from commit fe1a5f031e76bd8761a7803d75b95ee96e84a574) | ||
22 | --- | ||
23 | include/net/flow.h | 23 +++++++-- | ||
24 | include/net/xfrm.h | 3 + | ||
25 | net/core/flow.c | 128 +++++++++++++++++++++++++---------------------- | ||
26 | net/xfrm/xfrm_policy.c | 111 ++++++++++++++++++++++++++++-------------- | ||
27 | 4 files changed, 164 insertions(+), 101 deletions(-) | ||
28 | |||
29 | diff --git a/include/net/flow.h b/include/net/flow.h | ||
30 | index 809970b..bb08692 100644 | ||
31 | --- a/include/net/flow.h | ||
32 | +++ b/include/net/flow.h | ||
33 | @@ -86,11 +86,26 @@ struct flowi { | ||
34 | |||
35 | struct net; | ||
36 | struct sock; | ||
37 | -typedef int (*flow_resolve_t)(struct net *net, struct flowi *key, u16 family, | ||
38 | - u8 dir, void **objp, atomic_t **obj_refp); | ||
39 | +struct flow_cache_ops; | ||
40 | + | ||
41 | +struct flow_cache_object { | ||
42 | + const struct flow_cache_ops *ops; | ||
43 | +}; | ||
44 | + | ||
45 | +struct flow_cache_ops { | ||
46 | + struct flow_cache_object *(*get)(struct flow_cache_object *); | ||
47 | + int (*check)(struct flow_cache_object *); | ||
48 | + void (*delete)(struct flow_cache_object *); | ||
49 | +}; | ||
50 | + | ||
51 | +typedef struct flow_cache_object *(*flow_resolve_t)( | ||
52 | + struct net *net, struct flowi *key, u16 family, | ||
53 | + u8 dir, struct flow_cache_object *oldobj, void *ctx); | ||
54 | + | ||
55 | +extern struct flow_cache_object *flow_cache_lookup( | ||
56 | + struct net *net, struct flowi *key, u16 family, | ||
57 | + u8 dir, flow_resolve_t resolver, void *ctx); | ||
58 | |||
59 | -extern void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, | ||
60 | - u8 dir, flow_resolve_t resolver); | ||
61 | extern void flow_cache_flush(void); | ||
62 | extern atomic_t flow_cache_genid; | ||
63 | |||
64 | diff --git a/include/net/xfrm.h b/include/net/xfrm.h | ||
65 | index 6960be2..6023a48 100644 | ||
66 | --- a/include/net/xfrm.h | ||
67 | +++ b/include/net/xfrm.h | ||
68 | @@ -19,6 +19,8 @@ | ||
69 | #include <net/route.h> | ||
70 | #include <net/ipv6.h> | ||
71 | #include <net/ip6_fib.h> | ||
72 | +#include <net/flow.h> | ||
73 | + | ||
74 | #ifdef CONFIG_XFRM_STATISTICS | ||
75 | #include <net/snmp.h> | ||
76 | #endif | ||
77 | @@ -482,6 +484,7 @@ struct xfrm_policy | ||
78 | atomic_t refcnt; | ||
79 | struct timer_list timer; | ||
80 | |||
81 | + struct flow_cache_object flo; | ||
82 | u32 priority; | ||
83 | u32 index; | ||
84 | struct xfrm_selector selector; | ||
85 | diff --git a/net/core/flow.c b/net/core/flow.c | ||
86 | index 1d27ca6..521df52 100644 | ||
87 | --- a/net/core/flow.c | ||
88 | +++ b/net/core/flow.c | ||
89 | @@ -26,17 +26,16 @@ | ||
90 | #include <linux/security.h> | ||
91 | |||
92 | struct flow_cache_entry { | ||
93 | - struct flow_cache_entry *next; | ||
94 | - u16 family; | ||
95 | - u8 dir; | ||
96 | - u32 genid; | ||
97 | - struct flowi key; | ||
98 | - void *object; | ||
99 | - atomic_t *object_ref; | ||
100 | + struct flow_cache_entry *next; | ||
101 | + u16 family; | ||
102 | + u8 dir; | ||
103 | + u32 genid; | ||
104 | + struct flowi key; | ||
105 | + struct flow_cache_object *object; | ||
106 | }; | ||
107 | |||
108 | struct flow_cache_percpu { | ||
109 | - struct flow_cache_entry ** hash_table; | ||
110 | + struct flow_cache_entry **hash_table; | ||
111 | int hash_count; | ||
112 | u32 hash_rnd; | ||
113 | int hash_rnd_recalc; | ||
114 | @@ -44,7 +43,7 @@ struct flow_cache_percpu { | ||
115 | }; | ||
116 | |||
117 | struct flow_flush_info { | ||
118 | - struct flow_cache * cache; | ||
119 | + struct flow_cache *cache; | ||
120 | atomic_t cpuleft; | ||
121 | struct completion completion; | ||
122 | }; | ||
123 | @@ -52,7 +51,7 @@ struct flow_flush_info { | ||
124 | struct flow_cache { | ||
125 | u32 hash_shift; | ||
126 | unsigned long order; | ||
127 | - struct flow_cache_percpu * percpu; | ||
128 | + struct flow_cache_percpu *percpu; | ||
129 | struct notifier_block hotcpu_notifier; | ||
130 | int low_watermark; | ||
131 | int high_watermark; | ||
132 | @@ -78,12 +77,21 @@ static void flow_cache_new_hashrnd(unsigned long arg) | ||
133 | add_timer(&fc->rnd_timer); | ||
134 | } | ||
135 | |||
136 | +static int flow_entry_valid(struct flow_cache_entry *fle) | ||
137 | +{ | ||
138 | + if (atomic_read(&flow_cache_genid) != fle->genid) | ||
139 | + return 0; | ||
140 | + if (fle->object && !fle->object->ops->check(fle->object)) | ||
141 | + return 0; | ||
142 | + return 1; | ||
143 | +} | ||
144 | + | ||
145 | static void flow_entry_kill(struct flow_cache *fc, | ||
146 | struct flow_cache_percpu *fcp, | ||
147 | struct flow_cache_entry *fle) | ||
148 | { | ||
149 | if (fle->object) | ||
150 | - atomic_dec(fle->object_ref); | ||
151 | + fle->object->ops->delete(fle->object); | ||
152 | kmem_cache_free(flow_cachep, fle); | ||
153 | fcp->hash_count--; | ||
154 | } | ||
155 | @@ -96,16 +104,18 @@ static void __flow_cache_shrink(struct flow_cache *fc, | ||
156 | int i; | ||
157 | |||
158 | for (i = 0; i < flow_cache_hash_size(fc); i++) { | ||
159 | - int k = 0; | ||
160 | + int saved = 0; | ||
161 | |||
162 | flp = &fcp->hash_table[i]; | ||
163 | - while ((fle = *flp) != NULL && k < shrink_to) { | ||
164 | - k++; | ||
165 | - flp = &fle->next; | ||
166 | - } | ||
167 | while ((fle = *flp) != NULL) { | ||
168 | - *flp = fle->next; | ||
169 | - flow_entry_kill(fc, fcp, fle); | ||
170 | + if (saved < shrink_to && | ||
171 | + flow_entry_valid(fle)) { | ||
172 | + saved++; | ||
173 | + flp = &fle->next; | ||
174 | + } else { | ||
175 | + *flp = fle->next; | ||
176 | + flow_entry_kill(fc, fcp, fle); | ||
177 | + } | ||
178 | } | ||
179 | } | ||
180 | } | ||
181 | @@ -166,18 +176,21 @@ static int flow_key_compare(struct flowi *key1, struct flowi *key2) | ||
182 | return 0; | ||
183 | } | ||
184 | |||
185 | -void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir, | ||
186 | - flow_resolve_t resolver) | ||
187 | +struct flow_cache_object * | ||
188 | +flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir, | ||
189 | + flow_resolve_t resolver, void *ctx) | ||
190 | { | ||
191 | struct flow_cache *fc = &flow_cache_global; | ||
192 | struct flow_cache_percpu *fcp; | ||
193 | struct flow_cache_entry *fle, **head; | ||
194 | + struct flow_cache_object *flo; | ||
195 | unsigned int hash; | ||
196 | |||
197 | local_bh_disable(); | ||
198 | fcp = per_cpu_ptr(fc->percpu, smp_processor_id()); | ||
199 | |||
200 | fle = NULL; | ||
201 | + flo = NULL; | ||
202 | /* Packet really early in init? Making flow_cache_init a | ||
203 | * pre-smp initcall would solve this. --RR */ | ||
204 | if (!fcp->hash_table) | ||
205 | @@ -185,27 +198,17 @@ void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir, | ||
206 | |||
207 | if (fcp->hash_rnd_recalc) | ||
208 | flow_new_hash_rnd(fc, fcp); | ||
209 | - hash = flow_hash_code(fc, fcp, key); | ||
210 | |||
211 | + hash = flow_hash_code(fc, fcp, key); | ||
212 | head = &fcp->hash_table[hash]; | ||
213 | for (fle = *head; fle; fle = fle->next) { | ||
214 | if (fle->family == family && | ||
215 | fle->dir == dir && | ||
216 | - flow_key_compare(key, &fle->key) == 0) { | ||
217 | - if (fle->genid == atomic_read(&flow_cache_genid)) { | ||
218 | - void *ret = fle->object; | ||
219 | - | ||
220 | - if (ret) | ||
221 | - atomic_inc(fle->object_ref); | ||
222 | - local_bh_enable(); | ||
223 | - | ||
224 | - return ret; | ||
225 | - } | ||
226 | + flow_key_compare(key, &fle->key) == 0) | ||
227 | break; | ||
228 | - } | ||
229 | } | ||
230 | |||
231 | - if (!fle) { | ||
232 | + if (unlikely(!fle)) { | ||
233 | if (fcp->hash_count > fc->high_watermark) | ||
234 | flow_cache_shrink(fc, fcp); | ||
235 | |||
236 | @@ -219,33 +222,39 @@ void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir, | ||
237 | fle->object = NULL; | ||
238 | fcp->hash_count++; | ||
239 | } | ||
240 | + } else if (likely(fle->genid == atomic_read(&flow_cache_genid))) { | ||
241 | + flo = fle->object; | ||
242 | + if (!flo) | ||
243 | + goto ret_object; | ||
244 | + flo = flo->ops->get(flo); | ||
245 | + if (flo) | ||
246 | + goto ret_object; | ||
247 | + } else if (fle->object) { | ||
248 | + flo = fle->object; | ||
249 | + flo->ops->delete(flo); | ||
250 | + fle->object = NULL; | ||
251 | } | ||
252 | |||
253 | nocache: | ||
254 | - { | ||
255 | - int err; | ||
256 | - void *obj; | ||
257 | - atomic_t *obj_ref; | ||
258 | - | ||
259 | - err = resolver(net, key, family, dir, &obj, &obj_ref); | ||
260 | - | ||
261 | - if (fle && !err) { | ||
262 | - fle->genid = atomic_read(&flow_cache_genid); | ||
263 | - | ||
264 | - if (fle->object) | ||
265 | - atomic_dec(fle->object_ref); | ||
266 | - | ||
267 | - fle->object = obj; | ||
268 | - fle->object_ref = obj_ref; | ||
269 | - if (obj) | ||
270 | - atomic_inc(fle->object_ref); | ||
271 | - } | ||
272 | - local_bh_enable(); | ||
273 | - | ||
274 | - if (err) | ||
275 | - obj = ERR_PTR(err); | ||
276 | - return obj; | ||
277 | + flo = NULL; | ||
278 | + if (fle) { | ||
279 | + flo = fle->object; | ||
280 | + fle->object = NULL; | ||
281 | + } | ||
282 | + flo = resolver(net, key, family, dir, flo, ctx); | ||
283 | + if (fle) { | ||
284 | + fle->genid = atomic_read(&flow_cache_genid); | ||
285 | + if (!IS_ERR(flo)) | ||
286 | + fle->object = flo; | ||
287 | + else | ||
288 | + fle->genid--; | ||
289 | + } else { | ||
290 | + if (flo && !IS_ERR(flo)) | ||
291 | + flo->ops->delete(flo); | ||
292 | } | ||
293 | +ret_object: | ||
294 | + local_bh_enable(); | ||
295 | + return flo; | ||
296 | } | ||
297 | |||
298 | static void flow_cache_flush_tasklet(unsigned long data) | ||
299 | @@ -261,13 +270,12 @@ static void flow_cache_flush_tasklet(unsigned long data) | ||
300 | |||
301 | fle = fcp->hash_table[i]; | ||
302 | for (; fle; fle = fle->next) { | ||
303 | - unsigned genid = atomic_read(&flow_cache_genid); | ||
304 | - | ||
305 | - if (!fle->object || fle->genid == genid) | ||
306 | + if (flow_entry_valid(fle)) | ||
307 | continue; | ||
308 | |||
309 | + if (fle->object) | ||
310 | + fle->object->ops->delete(fle->object); | ||
311 | fle->object = NULL; | ||
312 | - atomic_dec(fle->object_ref); | ||
313 | } | ||
314 | } | ||
315 | |||
316 | diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c | ||
317 | index 110184f..d1eb2b5 100644 | ||
318 | --- a/net/xfrm/xfrm_policy.c | ||
319 | +++ b/net/xfrm/xfrm_policy.c | ||
320 | @@ -216,6 +216,35 @@ expired: | ||
321 | xfrm_pol_put(xp); | ||
322 | } | ||
323 | |||
324 | +static struct flow_cache_object *xfrm_policy_flo_get(struct flow_cache_object *flo) | ||
325 | +{ | ||
326 | + struct xfrm_policy *pol = container_of(flo, struct xfrm_policy, flo); | ||
327 | + | ||
328 | + if (unlikely(pol->walk.dead)) | ||
329 | + flo = NULL; | ||
330 | + else | ||
331 | + xfrm_pol_hold(pol); | ||
332 | + | ||
333 | + return flo; | ||
334 | +} | ||
335 | + | ||
336 | +static int xfrm_policy_flo_check(struct flow_cache_object *flo) | ||
337 | +{ | ||
338 | + struct xfrm_policy *pol = container_of(flo, struct xfrm_policy, flo); | ||
339 | + | ||
340 | + return !pol->walk.dead; | ||
341 | +} | ||
342 | + | ||
343 | +static void xfrm_policy_flo_delete(struct flow_cache_object *flo) | ||
344 | +{ | ||
345 | + xfrm_pol_put(container_of(flo, struct xfrm_policy, flo)); | ||
346 | +} | ||
347 | + | ||
348 | +static const struct flow_cache_ops xfrm_policy_fc_ops = { | ||
349 | + .get = xfrm_policy_flo_get, | ||
350 | + .check = xfrm_policy_flo_check, | ||
351 | + .delete = xfrm_policy_flo_delete, | ||
352 | +}; | ||
353 | |||
354 | /* Allocate xfrm_policy. Not used here, it is supposed to be used by pfkeyv2 | ||
355 | * SPD calls. | ||
356 | @@ -236,6 +265,7 @@ struct xfrm_policy *xfrm_policy_alloc(struct net *net, gfp_t gfp) | ||
357 | atomic_set(&policy->refcnt, 1); | ||
358 | setup_timer(&policy->timer, xfrm_policy_timer, | ||
359 | (unsigned long)policy); | ||
360 | + policy->flo.ops = &xfrm_policy_fc_ops; | ||
361 | } | ||
362 | return policy; | ||
363 | } | ||
364 | @@ -269,9 +299,6 @@ static void xfrm_policy_gc_kill(struct xfrm_policy *policy) | ||
365 | if (del_timer(&policy->timer)) | ||
366 | atomic_dec(&policy->refcnt); | ||
367 | |||
368 | - if (atomic_read(&policy->refcnt) > 1) | ||
369 | - flow_cache_flush(); | ||
370 | - | ||
371 | xfrm_pol_put(policy); | ||
372 | } | ||
373 | |||
374 | @@ -658,10 +685,8 @@ struct xfrm_policy *xfrm_policy_bysel_ctx(struct net *net, u8 type, int dir, | ||
375 | } | ||
376 | write_unlock_bh(&xfrm_policy_lock); | ||
377 | |||
378 | - if (ret && delete) { | ||
379 | - atomic_inc(&flow_cache_genid); | ||
380 | + if (ret && delete) | ||
381 | xfrm_policy_kill(ret); | ||
382 | - } | ||
383 | return ret; | ||
384 | } | ||
385 | EXPORT_SYMBOL(xfrm_policy_bysel_ctx); | ||
386 | @@ -699,10 +724,8 @@ struct xfrm_policy *xfrm_policy_byid(struct net *net, u8 type, int dir, u32 id, | ||
387 | } | ||
388 | write_unlock_bh(&xfrm_policy_lock); | ||
389 | |||
390 | - if (ret && delete) { | ||
391 | - atomic_inc(&flow_cache_genid); | ||
392 | + if (ret && delete) | ||
393 | xfrm_policy_kill(ret); | ||
394 | - } | ||
395 | return ret; | ||
396 | } | ||
397 | EXPORT_SYMBOL(xfrm_policy_byid); | ||
398 | @@ -967,32 +990,35 @@ fail: | ||
399 | return ret; | ||
400 | } | ||
401 | |||
402 | -static int xfrm_policy_lookup(struct net *net, struct flowi *fl, u16 family, | ||
403 | - u8 dir, void **objp, atomic_t **obj_refp) | ||
404 | +static struct flow_cache_object * | ||
405 | +xfrm_policy_lookup(struct net *net, struct flowi *fl, u16 family, | ||
406 | + u8 dir, struct flow_cache_object *old_obj, void *ctx) | ||
407 | { | ||
408 | struct xfrm_policy *pol; | ||
409 | - int err = 0; | ||
410 | + | ||
411 | + if (old_obj) | ||
412 | + xfrm_pol_put(container_of(old_obj, struct xfrm_policy, flo)); | ||
413 | |||
414 | #ifdef CONFIG_XFRM_SUB_POLICY | ||
415 | pol = xfrm_policy_lookup_bytype(net, XFRM_POLICY_TYPE_SUB, fl, family, dir); | ||
416 | - if (IS_ERR(pol)) { | ||
417 | - err = PTR_ERR(pol); | ||
418 | - pol = NULL; | ||
419 | - } | ||
420 | - if (pol || err) | ||
421 | - goto end; | ||
422 | + if (IS_ERR(pol)) | ||
423 | + return ERR_CAST(pol); | ||
424 | + if (pol) | ||
425 | + goto found; | ||
426 | #endif | ||
427 | pol = xfrm_policy_lookup_bytype(net, XFRM_POLICY_TYPE_MAIN, fl, family, dir); | ||
428 | - if (IS_ERR(pol)) { | ||
429 | - err = PTR_ERR(pol); | ||
430 | - pol = NULL; | ||
431 | - } | ||
432 | -#ifdef CONFIG_XFRM_SUB_POLICY | ||
433 | -end: | ||
434 | -#endif | ||
435 | - if ((*objp = (void *) pol) != NULL) | ||
436 | - *obj_refp = &pol->refcnt; | ||
437 | - return err; | ||
438 | + if (IS_ERR(pol)) | ||
439 | + return ERR_CAST(pol); | ||
440 | + if (pol) | ||
441 | + goto found; | ||
442 | + return NULL; | ||
443 | + | ||
444 | +found: | ||
445 | + /* Resolver returns two references: | ||
446 | + * one for cache and one for caller of flow_cache_lookup() */ | ||
447 | + xfrm_pol_hold(pol); | ||
448 | + | ||
449 | + return &pol->flo; | ||
450 | } | ||
451 | |||
452 | static inline int policy_to_flow_dir(int dir) | ||
453 | @@ -1077,8 +1103,6 @@ int xfrm_policy_delete(struct xfrm_policy *pol, int dir) | ||
454 | pol = __xfrm_policy_unlink(pol, dir); | ||
455 | write_unlock_bh(&xfrm_policy_lock); | ||
456 | if (pol) { | ||
457 | - if (dir < XFRM_POLICY_MAX) | ||
458 | - atomic_inc(&flow_cache_genid); | ||
459 | xfrm_policy_kill(pol); | ||
460 | return 0; | ||
461 | } | ||
462 | @@ -1549,18 +1573,24 @@ restart: | ||
463 | } | ||
464 | |||
465 | if (!policy) { | ||
466 | + struct flow_cache_object *flo; | ||
467 | + | ||
468 | /* To accelerate a bit... */ | ||
469 | if ((dst_orig->flags & DST_NOXFRM) || | ||
470 | !net->xfrm.policy_count[XFRM_POLICY_OUT]) | ||
471 | goto nopol; | ||
472 | |||
473 | - policy = flow_cache_lookup(net, fl, dst_orig->ops->family, | ||
474 | - dir, xfrm_policy_lookup); | ||
475 | - err = PTR_ERR(policy); | ||
476 | - if (IS_ERR(policy)) { | ||
477 | + flo = flow_cache_lookup(net, fl, dst_orig->ops->family, | ||
478 | + dir, xfrm_policy_lookup, NULL); | ||
479 | + err = PTR_ERR(flo); | ||
480 | + if (IS_ERR(flo)) { | ||
481 | XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLERROR); | ||
482 | goto dropdst; | ||
483 | } | ||
484 | + if (flo) | ||
485 | + policy = container_of(flo, struct xfrm_policy, flo); | ||
486 | + else | ||
487 | + policy = NULL; | ||
488 | } | ||
489 | |||
490 | if (!policy) | ||
491 | @@ -1910,9 +1940,16 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb, | ||
492 | } | ||
493 | } | ||
494 | |||
495 | - if (!pol) | ||
496 | - pol = flow_cache_lookup(net, &fl, family, fl_dir, | ||
497 | - xfrm_policy_lookup); | ||
498 | + if (!pol) { | ||
499 | + struct flow_cache_object *flo; | ||
500 | + | ||
501 | + flo = flow_cache_lookup(net, &fl, family, fl_dir, | ||
502 | + xfrm_policy_lookup, NULL); | ||
503 | + if (flo == NULL || IS_ERR(flo)) | ||
504 | + pol = ERR_CAST(flo); | ||
505 | + else | ||
506 | + pol = container_of(flo, struct xfrm_policy, flo); | ||
507 | + } | ||
508 | |||
509 | if (IS_ERR(pol)) { | ||
510 | XFRM_INC_STATS(net, LINUX_MIB_XFRMINPOLERROR); | ||
511 | -- | ||
512 | 1.7.0.2 | ||
513 | |||
diff --git a/main/linux-pae/0015-xfrm-cache-bundles-instead-of-policies-for-outgoing-.patch b/main/linux-pae/0015-xfrm-cache-bundles-instead-of-policies-for-outgoing-.patch new file mode 100644 index 0000000000..0d066c84d9 --- /dev/null +++ b/main/linux-pae/0015-xfrm-cache-bundles-instead-of-policies-for-outgoing-.patch | |||
@@ -0,0 +1,1068 @@ | |||
1 | From f89d21648e6dc06db2aeabc8926c270894c41446 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Wed, 7 Apr 2010 00:30:05 +0000 | ||
4 | Subject: [PATCH 15/18] xfrm: cache bundles instead of policies for outgoing flows | ||
5 | |||
6 | __xfrm_lookup() is called for each packet transmitted out of | ||
7 | system. The xfrm_find_bundle() does a linear search which can | ||
8 | kill system performance depending on how many bundles are | ||
9 | required per policy. | ||
10 | |||
11 | This modifies __xfrm_lookup() to store bundles directly in | ||
12 | the flow cache. If we did not get a hit, we just create a new | ||
13 | bundle instead of doing slow search. This means that we can now | ||
14 | get multiple xfrm_dst's for same flow (on per-cpu basis). | ||
15 | |||
16 | Signed-off-by: Timo Teras <timo.teras@iki.fi> | ||
17 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
18 | (backported from commit 80c802f3073e84c956846e921e8a0b02dfa3755f) | ||
19 | --- | ||
20 | include/net/xfrm.h | 10 +- | ||
21 | net/ipv4/xfrm4_policy.c | 22 -- | ||
22 | net/ipv6/xfrm6_policy.c | 31 -- | ||
23 | net/xfrm/xfrm_policy.c | 710 +++++++++++++++++++++++++---------------------- | ||
24 | 4 files changed, 383 insertions(+), 390 deletions(-) | ||
25 | |||
26 | diff --git a/include/net/xfrm.h b/include/net/xfrm.h | ||
27 | index 6023a48..d51ef61 100644 | ||
28 | --- a/include/net/xfrm.h | ||
29 | +++ b/include/net/xfrm.h | ||
30 | @@ -266,7 +266,6 @@ struct xfrm_policy_afinfo { | ||
31 | xfrm_address_t *saddr, | ||
32 | xfrm_address_t *daddr); | ||
33 | int (*get_saddr)(struct net *net, xfrm_address_t *saddr, xfrm_address_t *daddr); | ||
34 | - struct dst_entry *(*find_bundle)(struct flowi *fl, struct xfrm_policy *policy); | ||
35 | void (*decode_session)(struct sk_buff *skb, | ||
36 | struct flowi *fl, | ||
37 | int reverse); | ||
38 | @@ -485,12 +484,12 @@ struct xfrm_policy | ||
39 | struct timer_list timer; | ||
40 | |||
41 | struct flow_cache_object flo; | ||
42 | + atomic_t genid; | ||
43 | u32 priority; | ||
44 | u32 index; | ||
45 | struct xfrm_selector selector; | ||
46 | struct xfrm_lifetime_cfg lft; | ||
47 | struct xfrm_lifetime_cur curlft; | ||
48 | - struct dst_entry *bundles; | ||
49 | struct xfrm_policy_walk_entry walk; | ||
50 | u8 type; | ||
51 | u8 action; | ||
52 | @@ -883,11 +882,15 @@ struct xfrm_dst | ||
53 | struct rt6_info rt6; | ||
54 | } u; | ||
55 | struct dst_entry *route; | ||
56 | + struct flow_cache_object flo; | ||
57 | + struct xfrm_policy *pols[XFRM_POLICY_TYPE_MAX]; | ||
58 | + int num_pols, num_xfrms; | ||
59 | #ifdef CONFIG_XFRM_SUB_POLICY | ||
60 | struct flowi *origin; | ||
61 | struct xfrm_selector *partner; | ||
62 | #endif | ||
63 | - u32 genid; | ||
64 | + u32 xfrm_genid; | ||
65 | + u32 policy_genid; | ||
66 | u32 route_mtu_cached; | ||
67 | u32 child_mtu_cached; | ||
68 | u32 route_cookie; | ||
69 | @@ -897,6 +900,7 @@ struct xfrm_dst | ||
70 | #ifdef CONFIG_XFRM | ||
71 | static inline void xfrm_dst_destroy(struct xfrm_dst *xdst) | ||
72 | { | ||
73 | + xfrm_pols_put(xdst->pols, xdst->num_pols); | ||
74 | dst_release(xdst->route); | ||
75 | if (likely(xdst->u.dst.xfrm)) | ||
76 | xfrm_state_put(xdst->u.dst.xfrm); | ||
77 | diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c | ||
78 | index 7009886..651a3e7 100644 | ||
79 | --- a/net/ipv4/xfrm4_policy.c | ||
80 | +++ b/net/ipv4/xfrm4_policy.c | ||
81 | @@ -60,27 +60,6 @@ static int xfrm4_get_saddr(struct net *net, | ||
82 | return 0; | ||
83 | } | ||
84 | |||
85 | -static struct dst_entry * | ||
86 | -__xfrm4_find_bundle(struct flowi *fl, struct xfrm_policy *policy) | ||
87 | -{ | ||
88 | - struct dst_entry *dst; | ||
89 | - | ||
90 | - read_lock_bh(&policy->lock); | ||
91 | - for (dst = policy->bundles; dst; dst = dst->next) { | ||
92 | - struct xfrm_dst *xdst = (struct xfrm_dst *)dst; | ||
93 | - if (xdst->u.rt.fl.oif == fl->oif && /*XXX*/ | ||
94 | - xdst->u.rt.fl.fl4_dst == fl->fl4_dst && | ||
95 | - xdst->u.rt.fl.fl4_src == fl->fl4_src && | ||
96 | - xdst->u.rt.fl.fl4_tos == fl->fl4_tos && | ||
97 | - xfrm_bundle_ok(policy, xdst, fl, AF_INET, 0)) { | ||
98 | - dst_clone(dst); | ||
99 | - break; | ||
100 | - } | ||
101 | - } | ||
102 | - read_unlock_bh(&policy->lock); | ||
103 | - return dst; | ||
104 | -} | ||
105 | - | ||
106 | static int xfrm4_get_tos(struct flowi *fl) | ||
107 | { | ||
108 | return fl->fl4_tos; | ||
109 | @@ -258,7 +237,6 @@ static struct xfrm_policy_afinfo xfrm4_policy_afinfo = { | ||
110 | .dst_ops = &xfrm4_dst_ops, | ||
111 | .dst_lookup = xfrm4_dst_lookup, | ||
112 | .get_saddr = xfrm4_get_saddr, | ||
113 | - .find_bundle = __xfrm4_find_bundle, | ||
114 | .decode_session = _decode_session4, | ||
115 | .get_tos = xfrm4_get_tos, | ||
116 | .init_path = xfrm4_init_path, | ||
117 | diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c | ||
118 | index 3f89ab7..fb2a5b7 100644 | ||
119 | --- a/net/ipv6/xfrm6_policy.c | ||
120 | +++ b/net/ipv6/xfrm6_policy.c | ||
121 | @@ -68,36 +68,6 @@ static int xfrm6_get_saddr(struct net *net, | ||
122 | return 0; | ||
123 | } | ||
124 | |||
125 | -static struct dst_entry * | ||
126 | -__xfrm6_find_bundle(struct flowi *fl, struct xfrm_policy *policy) | ||
127 | -{ | ||
128 | - struct dst_entry *dst; | ||
129 | - | ||
130 | - /* Still not clear if we should set fl->fl6_{src,dst}... */ | ||
131 | - read_lock_bh(&policy->lock); | ||
132 | - for (dst = policy->bundles; dst; dst = dst->next) { | ||
133 | - struct xfrm_dst *xdst = (struct xfrm_dst*)dst; | ||
134 | - struct in6_addr fl_dst_prefix, fl_src_prefix; | ||
135 | - | ||
136 | - ipv6_addr_prefix(&fl_dst_prefix, | ||
137 | - &fl->fl6_dst, | ||
138 | - xdst->u.rt6.rt6i_dst.plen); | ||
139 | - ipv6_addr_prefix(&fl_src_prefix, | ||
140 | - &fl->fl6_src, | ||
141 | - xdst->u.rt6.rt6i_src.plen); | ||
142 | - if (ipv6_addr_equal(&xdst->u.rt6.rt6i_dst.addr, &fl_dst_prefix) && | ||
143 | - ipv6_addr_equal(&xdst->u.rt6.rt6i_src.addr, &fl_src_prefix) && | ||
144 | - xfrm_bundle_ok(policy, xdst, fl, AF_INET6, | ||
145 | - (xdst->u.rt6.rt6i_dst.plen != 128 || | ||
146 | - xdst->u.rt6.rt6i_src.plen != 128))) { | ||
147 | - dst_clone(dst); | ||
148 | - break; | ||
149 | - } | ||
150 | - } | ||
151 | - read_unlock_bh(&policy->lock); | ||
152 | - return dst; | ||
153 | -} | ||
154 | - | ||
155 | static int xfrm6_get_tos(struct flowi *fl) | ||
156 | { | ||
157 | return 0; | ||
158 | @@ -290,7 +260,6 @@ static struct xfrm_policy_afinfo xfrm6_policy_afinfo = { | ||
159 | .dst_ops = &xfrm6_dst_ops, | ||
160 | .dst_lookup = xfrm6_dst_lookup, | ||
161 | .get_saddr = xfrm6_get_saddr, | ||
162 | - .find_bundle = __xfrm6_find_bundle, | ||
163 | .decode_session = _decode_session6, | ||
164 | .get_tos = xfrm6_get_tos, | ||
165 | .init_path = xfrm6_init_path, | ||
166 | diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c | ||
167 | index d1eb2b5..0379d82 100644 | ||
168 | --- a/net/xfrm/xfrm_policy.c | ||
169 | +++ b/net/xfrm/xfrm_policy.c | ||
170 | @@ -37,6 +37,8 @@ | ||
171 | DEFINE_MUTEX(xfrm_cfg_mutex); | ||
172 | EXPORT_SYMBOL(xfrm_cfg_mutex); | ||
173 | |||
174 | +static DEFINE_SPINLOCK(xfrm_policy_sk_bundle_lock); | ||
175 | +static struct dst_entry *xfrm_policy_sk_bundles; | ||
176 | static DEFINE_RWLOCK(xfrm_policy_lock); | ||
177 | |||
178 | static DEFINE_RWLOCK(xfrm_policy_afinfo_lock); | ||
179 | @@ -50,6 +52,7 @@ static DEFINE_SPINLOCK(xfrm_policy_gc_lock); | ||
180 | static struct xfrm_policy_afinfo *xfrm_policy_get_afinfo(unsigned short family); | ||
181 | static void xfrm_policy_put_afinfo(struct xfrm_policy_afinfo *afinfo); | ||
182 | static void xfrm_init_pmtu(struct dst_entry *dst); | ||
183 | +static int stale_bundle(struct dst_entry *dst); | ||
184 | |||
185 | static struct xfrm_policy *__xfrm_policy_unlink(struct xfrm_policy *pol, | ||
186 | int dir); | ||
187 | @@ -277,8 +280,6 @@ void xfrm_policy_destroy(struct xfrm_policy *policy) | ||
188 | { | ||
189 | BUG_ON(!policy->walk.dead); | ||
190 | |||
191 | - BUG_ON(policy->bundles); | ||
192 | - | ||
193 | if (del_timer(&policy->timer)) | ||
194 | BUG(); | ||
195 | |||
196 | @@ -289,12 +290,7 @@ EXPORT_SYMBOL(xfrm_policy_destroy); | ||
197 | |||
198 | static void xfrm_policy_gc_kill(struct xfrm_policy *policy) | ||
199 | { | ||
200 | - struct dst_entry *dst; | ||
201 | - | ||
202 | - while ((dst = policy->bundles) != NULL) { | ||
203 | - policy->bundles = dst->next; | ||
204 | - dst_free(dst); | ||
205 | - } | ||
206 | + atomic_inc(&policy->genid); | ||
207 | |||
208 | if (del_timer(&policy->timer)) | ||
209 | atomic_dec(&policy->refcnt); | ||
210 | @@ -572,7 +568,6 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl) | ||
211 | struct xfrm_policy *delpol; | ||
212 | struct hlist_head *chain; | ||
213 | struct hlist_node *entry, *newpos; | ||
214 | - struct dst_entry *gc_list; | ||
215 | |||
216 | write_lock_bh(&xfrm_policy_lock); | ||
217 | chain = policy_hash_bysel(net, &policy->selector, policy->family, dir); | ||
218 | @@ -620,34 +615,6 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl) | ||
219 | else if (xfrm_bydst_should_resize(net, dir, NULL)) | ||
220 | schedule_work(&net->xfrm.policy_hash_work); | ||
221 | |||
222 | - read_lock_bh(&xfrm_policy_lock); | ||
223 | - gc_list = NULL; | ||
224 | - entry = &policy->bydst; | ||
225 | - hlist_for_each_entry_continue(policy, entry, bydst) { | ||
226 | - struct dst_entry *dst; | ||
227 | - | ||
228 | - write_lock(&policy->lock); | ||
229 | - dst = policy->bundles; | ||
230 | - if (dst) { | ||
231 | - struct dst_entry *tail = dst; | ||
232 | - while (tail->next) | ||
233 | - tail = tail->next; | ||
234 | - tail->next = gc_list; | ||
235 | - gc_list = dst; | ||
236 | - | ||
237 | - policy->bundles = NULL; | ||
238 | - } | ||
239 | - write_unlock(&policy->lock); | ||
240 | - } | ||
241 | - read_unlock_bh(&xfrm_policy_lock); | ||
242 | - | ||
243 | - while (gc_list) { | ||
244 | - struct dst_entry *dst = gc_list; | ||
245 | - | ||
246 | - gc_list = dst->next; | ||
247 | - dst_free(dst); | ||
248 | - } | ||
249 | - | ||
250 | return 0; | ||
251 | } | ||
252 | EXPORT_SYMBOL(xfrm_policy_insert); | ||
253 | @@ -990,6 +957,19 @@ fail: | ||
254 | return ret; | ||
255 | } | ||
256 | |||
257 | +static struct xfrm_policy * | ||
258 | +__xfrm_policy_lookup(struct net *net, struct flowi *fl, u16 family, u8 dir) | ||
259 | +{ | ||
260 | +#ifdef CONFIG_XFRM_SUB_POLICY | ||
261 | + struct xfrm_policy *pol; | ||
262 | + | ||
263 | + pol = xfrm_policy_lookup_bytype(net, XFRM_POLICY_TYPE_SUB, fl, family, dir); | ||
264 | + if (pol != NULL) | ||
265 | + return pol; | ||
266 | +#endif | ||
267 | + return xfrm_policy_lookup_bytype(net, XFRM_POLICY_TYPE_MAIN, fl, family, dir); | ||
268 | +} | ||
269 | + | ||
270 | static struct flow_cache_object * | ||
271 | xfrm_policy_lookup(struct net *net, struct flowi *fl, u16 family, | ||
272 | u8 dir, struct flow_cache_object *old_obj, void *ctx) | ||
273 | @@ -999,21 +979,10 @@ xfrm_policy_lookup(struct net *net, struct flowi *fl, u16 family, | ||
274 | if (old_obj) | ||
275 | xfrm_pol_put(container_of(old_obj, struct xfrm_policy, flo)); | ||
276 | |||
277 | -#ifdef CONFIG_XFRM_SUB_POLICY | ||
278 | - pol = xfrm_policy_lookup_bytype(net, XFRM_POLICY_TYPE_SUB, fl, family, dir); | ||
279 | - if (IS_ERR(pol)) | ||
280 | + pol = __xfrm_policy_lookup(net, fl, family, dir); | ||
281 | + if (pol == NULL || IS_ERR(pol)) | ||
282 | return ERR_CAST(pol); | ||
283 | - if (pol) | ||
284 | - goto found; | ||
285 | -#endif | ||
286 | - pol = xfrm_policy_lookup_bytype(net, XFRM_POLICY_TYPE_MAIN, fl, family, dir); | ||
287 | - if (IS_ERR(pol)) | ||
288 | - return ERR_CAST(pol); | ||
289 | - if (pol) | ||
290 | - goto found; | ||
291 | - return NULL; | ||
292 | |||
293 | -found: | ||
294 | /* Resolver returns two references: | ||
295 | * one for cache and one for caller of flow_cache_lookup() */ | ||
296 | xfrm_pol_hold(pol); | ||
297 | @@ -1299,18 +1268,6 @@ xfrm_tmpl_resolve(struct xfrm_policy **pols, int npols, struct flowi *fl, | ||
298 | * still valid. | ||
299 | */ | ||
300 | |||
301 | -static struct dst_entry * | ||
302 | -xfrm_find_bundle(struct flowi *fl, struct xfrm_policy *policy, unsigned short family) | ||
303 | -{ | ||
304 | - struct dst_entry *x; | ||
305 | - struct xfrm_policy_afinfo *afinfo = xfrm_policy_get_afinfo(family); | ||
306 | - if (unlikely(afinfo == NULL)) | ||
307 | - return ERR_PTR(-EINVAL); | ||
308 | - x = afinfo->find_bundle(fl, policy); | ||
309 | - xfrm_policy_put_afinfo(afinfo); | ||
310 | - return x; | ||
311 | -} | ||
312 | - | ||
313 | static inline int xfrm_get_tos(struct flowi *fl, int family) | ||
314 | { | ||
315 | struct xfrm_policy_afinfo *afinfo = xfrm_policy_get_afinfo(family); | ||
316 | @@ -1326,6 +1283,54 @@ static inline int xfrm_get_tos(struct flowi *fl, int family) | ||
317 | return tos; | ||
318 | } | ||
319 | |||
320 | +static struct flow_cache_object *xfrm_bundle_flo_get(struct flow_cache_object *flo) | ||
321 | +{ | ||
322 | + struct xfrm_dst *xdst = container_of(flo, struct xfrm_dst, flo); | ||
323 | + struct dst_entry *dst = &xdst->u.dst; | ||
324 | + | ||
325 | + if (xdst->route == NULL) { | ||
326 | + /* Dummy bundle - if it has xfrms we were not | ||
327 | + * able to build bundle as template resolution failed. | ||
328 | + * It means we need to try again resolving. */ | ||
329 | + if (xdst->num_xfrms > 0) | ||
330 | + return NULL; | ||
331 | + } else { | ||
332 | + /* Real bundle */ | ||
333 | + if (stale_bundle(dst)) | ||
334 | + return NULL; | ||
335 | + } | ||
336 | + | ||
337 | + dst_hold(dst); | ||
338 | + return flo; | ||
339 | +} | ||
340 | + | ||
341 | +static int xfrm_bundle_flo_check(struct flow_cache_object *flo) | ||
342 | +{ | ||
343 | + struct xfrm_dst *xdst = container_of(flo, struct xfrm_dst, flo); | ||
344 | + struct dst_entry *dst = &xdst->u.dst; | ||
345 | + | ||
346 | + if (!xdst->route) | ||
347 | + return 0; | ||
348 | + if (stale_bundle(dst)) | ||
349 | + return 0; | ||
350 | + | ||
351 | + return 1; | ||
352 | +} | ||
353 | + | ||
354 | +static void xfrm_bundle_flo_delete(struct flow_cache_object *flo) | ||
355 | +{ | ||
356 | + struct xfrm_dst *xdst = container_of(flo, struct xfrm_dst, flo); | ||
357 | + struct dst_entry *dst = &xdst->u.dst; | ||
358 | + | ||
359 | + dst_free(dst); | ||
360 | +} | ||
361 | + | ||
362 | +static const struct flow_cache_ops xfrm_bundle_fc_ops = { | ||
363 | + .get = xfrm_bundle_flo_get, | ||
364 | + .check = xfrm_bundle_flo_check, | ||
365 | + .delete = xfrm_bundle_flo_delete, | ||
366 | +}; | ||
367 | + | ||
368 | static inline struct xfrm_dst *xfrm_alloc_dst(int family) | ||
369 | { | ||
370 | struct xfrm_policy_afinfo *afinfo = xfrm_policy_get_afinfo(family); | ||
371 | @@ -1338,6 +1343,8 @@ static inline struct xfrm_dst *xfrm_alloc_dst(int family) | ||
372 | |||
373 | xfrm_policy_put_afinfo(afinfo); | ||
374 | |||
375 | + xdst->flo.ops = &xfrm_bundle_fc_ops; | ||
376 | + | ||
377 | return xdst; | ||
378 | } | ||
379 | |||
380 | @@ -1375,6 +1382,7 @@ static inline int xfrm_fill_dst(struct xfrm_dst *xdst, struct net_device *dev, | ||
381 | return err; | ||
382 | } | ||
383 | |||
384 | + | ||
385 | /* Allocate chain of dst_entry's, attach known xfrm's, calculate | ||
386 | * all the metrics... Shortly, bundle a bundle. | ||
387 | */ | ||
388 | @@ -1437,7 +1445,7 @@ static struct dst_entry *xfrm_bundle_create(struct xfrm_policy *policy, | ||
389 | dst_hold(dst); | ||
390 | |||
391 | dst1->xfrm = xfrm[i]; | ||
392 | - xdst->genid = xfrm[i]->genid; | ||
393 | + xdst->xfrm_genid = xfrm[i]->genid; | ||
394 | |||
395 | dst1->obsolete = -1; | ||
396 | dst1->flags |= DST_HOST; | ||
397 | @@ -1530,7 +1538,186 @@ xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl) | ||
398 | #endif | ||
399 | } | ||
400 | |||
401 | -static int stale_bundle(struct dst_entry *dst); | ||
402 | +static int xfrm_expand_policies(struct flowi *fl, u16 family, | ||
403 | + struct xfrm_policy **pols, | ||
404 | + int *num_pols, int *num_xfrms) | ||
405 | +{ | ||
406 | + int i; | ||
407 | + | ||
408 | + if (*num_pols == 0 || !pols[0]) { | ||
409 | + *num_pols = 0; | ||
410 | + *num_xfrms = 0; | ||
411 | + return 0; | ||
412 | + } | ||
413 | + if (IS_ERR(pols[0])) | ||
414 | + return PTR_ERR(pols[0]); | ||
415 | + | ||
416 | + *num_xfrms = pols[0]->xfrm_nr; | ||
417 | + | ||
418 | +#ifdef CONFIG_XFRM_SUB_POLICY | ||
419 | + if (pols[0] && pols[0]->action == XFRM_POLICY_ALLOW && | ||
420 | + pols[0]->type != XFRM_POLICY_TYPE_MAIN) { | ||
421 | + pols[1] = xfrm_policy_lookup_bytype(xp_net(pols[0]), | ||
422 | + XFRM_POLICY_TYPE_MAIN, | ||
423 | + fl, family, | ||
424 | + XFRM_POLICY_OUT); | ||
425 | + if (pols[1]) { | ||
426 | + if (IS_ERR(pols[1])) { | ||
427 | + xfrm_pols_put(pols, *num_pols); | ||
428 | + return PTR_ERR(pols[1]); | ||
429 | + } | ||
430 | + (*num_pols) ++; | ||
431 | + (*num_xfrms) += pols[1]->xfrm_nr; | ||
432 | + } | ||
433 | + } | ||
434 | +#endif | ||
435 | + for (i = 0; i < *num_pols; i++) { | ||
436 | + if (pols[i]->action != XFRM_POLICY_ALLOW) { | ||
437 | + *num_xfrms = -1; | ||
438 | + break; | ||
439 | + } | ||
440 | + } | ||
441 | + | ||
442 | + return 0; | ||
443 | + | ||
444 | +} | ||
445 | + | ||
446 | +static struct xfrm_dst * | ||
447 | +xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols, | ||
448 | + struct flowi *fl, u16 family, | ||
449 | + struct dst_entry *dst_orig) | ||
450 | +{ | ||
451 | + struct net *net = xp_net(pols[0]); | ||
452 | + struct xfrm_state *xfrm[XFRM_MAX_DEPTH]; | ||
453 | + struct dst_entry *dst; | ||
454 | + struct xfrm_dst *xdst; | ||
455 | + int err; | ||
456 | + | ||
457 | + /* Try to instantiate a bundle */ | ||
458 | + err = xfrm_tmpl_resolve(pols, num_pols, fl, xfrm, family); | ||
459 | + if (err < 0) { | ||
460 | + if (err != -EAGAIN) | ||
461 | + XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLERROR); | ||
462 | + return ERR_PTR(err); | ||
463 | + } | ||
464 | + | ||
465 | + dst = xfrm_bundle_create(pols[0], xfrm, err, fl, dst_orig); | ||
466 | + if (IS_ERR(dst)) { | ||
467 | + XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTBUNDLEGENERROR); | ||
468 | + return ERR_CAST(dst); | ||
469 | + } | ||
470 | + | ||
471 | + xdst = (struct xfrm_dst *)dst; | ||
472 | + xdst->num_xfrms = err; | ||
473 | + if (num_pols > 1) | ||
474 | + err = xfrm_dst_update_parent(dst, &pols[1]->selector); | ||
475 | + else | ||
476 | + err = xfrm_dst_update_origin(dst, fl); | ||
477 | + if (unlikely(err)) { | ||
478 | + dst_free(dst); | ||
479 | + XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTBUNDLECHECKERROR); | ||
480 | + return ERR_PTR(err); | ||
481 | + } | ||
482 | + | ||
483 | + xdst->num_pols = num_pols; | ||
484 | + memcpy(xdst->pols, pols, sizeof(struct xfrm_policy*) * num_pols); | ||
485 | + xdst->policy_genid = atomic_read(&pols[0]->genid); | ||
486 | + | ||
487 | + return xdst; | ||
488 | +} | ||
489 | + | ||
490 | +static struct flow_cache_object * | ||
491 | +xfrm_bundle_lookup(struct net *net, struct flowi *fl, u16 family, u8 dir, | ||
492 | + struct flow_cache_object *oldflo, void *ctx) | ||
493 | +{ | ||
494 | + struct dst_entry *dst_orig = (struct dst_entry *)ctx; | ||
495 | + struct xfrm_policy *pols[XFRM_POLICY_TYPE_MAX]; | ||
496 | + struct xfrm_dst *xdst, *new_xdst; | ||
497 | + int num_pols = 0, num_xfrms = 0, i, err, pol_dead; | ||
498 | + | ||
499 | + /* Check if the policies from old bundle are usable */ | ||
500 | + xdst = NULL; | ||
501 | + if (oldflo) { | ||
502 | + xdst = container_of(oldflo, struct xfrm_dst, flo); | ||
503 | + num_pols = xdst->num_pols; | ||
504 | + num_xfrms = xdst->num_xfrms; | ||
505 | + pol_dead = 0; | ||
506 | + for (i = 0; i < num_pols; i++) { | ||
507 | + pols[i] = xdst->pols[i]; | ||
508 | + pol_dead |= pols[i]->walk.dead; | ||
509 | + } | ||
510 | + if (pol_dead) { | ||
511 | + dst_free(&xdst->u.dst); | ||
512 | + xdst = NULL; | ||
513 | + num_pols = 0; | ||
514 | + num_xfrms = 0; | ||
515 | + oldflo = NULL; | ||
516 | + } | ||
517 | + } | ||
518 | + | ||
519 | + /* Resolve policies to use if we couldn't get them from | ||
520 | + * previous cache entry */ | ||
521 | + if (xdst == NULL) { | ||
522 | + num_pols = 1; | ||
523 | + pols[0] = __xfrm_policy_lookup(net, fl, family, dir); | ||
524 | + err = xfrm_expand_policies(fl, family, pols, | ||
525 | + &num_pols, &num_xfrms); | ||
526 | + if (err < 0) | ||
527 | + goto inc_error; | ||
528 | + if (num_pols == 0) | ||
529 | + return NULL; | ||
530 | + if (num_xfrms <= 0) | ||
531 | + goto make_dummy_bundle; | ||
532 | + } | ||
533 | + | ||
534 | + new_xdst = xfrm_resolve_and_create_bundle(pols, num_pols, fl, family, dst_orig); | ||
535 | + if (IS_ERR(new_xdst)) { | ||
536 | + err = PTR_ERR(new_xdst); | ||
537 | + if (err != -EAGAIN) | ||
538 | + goto error; | ||
539 | + if (oldflo == NULL) | ||
540 | + goto make_dummy_bundle; | ||
541 | + dst_hold(&xdst->u.dst); | ||
542 | + return oldflo; | ||
543 | + } | ||
544 | + | ||
545 | + /* Kill the previous bundle */ | ||
546 | + if (xdst) { | ||
547 | + /* The policies were stolen for newly generated bundle */ | ||
548 | + xdst->num_pols = 0; | ||
549 | + dst_free(&xdst->u.dst); | ||
550 | + } | ||
551 | + | ||
552 | + /* Flow cache does not have reference, it dst_free()'s, | ||
553 | + * but we do need to return one reference for original caller */ | ||
554 | + dst_hold(&new_xdst->u.dst); | ||
555 | + return &new_xdst->flo; | ||
556 | + | ||
557 | +make_dummy_bundle: | ||
558 | + /* We found policies, but there's no bundles to instantiate: | ||
559 | + * either because the policy blocks, has no transformations or | ||
560 | + * we could not build template (no xfrm_states).*/ | ||
561 | + xdst = xfrm_alloc_dst(family); | ||
562 | + if (IS_ERR(xdst)) { | ||
563 | + xfrm_pols_put(pols, num_pols); | ||
564 | + return ERR_CAST(xdst); | ||
565 | + } | ||
566 | + xdst->num_pols = num_pols; | ||
567 | + xdst->num_xfrms = num_xfrms; | ||
568 | + memcpy(xdst->pols, pols, sizeof(struct xfrm_policy*) * num_pols); | ||
569 | + | ||
570 | + dst_hold(&xdst->u.dst); | ||
571 | + return &xdst->flo; | ||
572 | + | ||
573 | +inc_error: | ||
574 | + XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLERROR); | ||
575 | +error: | ||
576 | + if (xdst != NULL) | ||
577 | + dst_free(&xdst->u.dst); | ||
578 | + else | ||
579 | + xfrm_pols_put(pols, num_pols); | ||
580 | + return ERR_PTR(err); | ||
581 | +} | ||
582 | |||
583 | /* Main function: finds/creates a bundle for given flow. | ||
584 | * | ||
585 | @@ -1540,248 +1727,152 @@ static int stale_bundle(struct dst_entry *dst); | ||
586 | int __xfrm_lookup(struct net *net, struct dst_entry **dst_p, struct flowi *fl, | ||
587 | struct sock *sk, int flags) | ||
588 | { | ||
589 | - struct xfrm_policy *policy; | ||
590 | struct xfrm_policy *pols[XFRM_POLICY_TYPE_MAX]; | ||
591 | - int npols; | ||
592 | - int pol_dead; | ||
593 | - int xfrm_nr; | ||
594 | - int pi; | ||
595 | - struct xfrm_state *xfrm[XFRM_MAX_DEPTH]; | ||
596 | - struct dst_entry *dst, *dst_orig = *dst_p; | ||
597 | - int nx = 0; | ||
598 | - int err; | ||
599 | - u32 genid; | ||
600 | - u16 family; | ||
601 | + struct flow_cache_object *flo; | ||
602 | + struct xfrm_dst *xdst; | ||
603 | + struct dst_entry *dst, *dst_orig = *dst_p, *route; | ||
604 | + u16 family = dst_orig->ops->family; | ||
605 | u8 dir = policy_to_flow_dir(XFRM_POLICY_OUT); | ||
606 | + int i, err, num_pols, num_xfrms, drop_pols = 0; | ||
607 | |||
608 | restart: | ||
609 | - genid = atomic_read(&flow_cache_genid); | ||
610 | - policy = NULL; | ||
611 | - for (pi = 0; pi < ARRAY_SIZE(pols); pi++) | ||
612 | - pols[pi] = NULL; | ||
613 | - npols = 0; | ||
614 | - pol_dead = 0; | ||
615 | - xfrm_nr = 0; | ||
616 | + dst = NULL; | ||
617 | + xdst = NULL; | ||
618 | + route = NULL; | ||
619 | |||
620 | if (sk && sk->sk_policy[XFRM_POLICY_OUT]) { | ||
621 | - policy = xfrm_sk_policy_lookup(sk, XFRM_POLICY_OUT, fl); | ||
622 | - err = PTR_ERR(policy); | ||
623 | - if (IS_ERR(policy)) { | ||
624 | - XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLERROR); | ||
625 | + num_pols = 1; | ||
626 | + pols[0] = xfrm_sk_policy_lookup(sk, XFRM_POLICY_OUT, fl); | ||
627 | + err = xfrm_expand_policies(fl, family, pols, | ||
628 | + &num_pols, &num_xfrms); | ||
629 | + if (err < 0) | ||
630 | goto dropdst; | ||
631 | + | ||
632 | + if (num_pols) { | ||
633 | + if (num_xfrms <= 0) { | ||
634 | + drop_pols = num_pols; | ||
635 | + goto no_transform; | ||
636 | + } | ||
637 | + | ||
638 | + xdst = xfrm_resolve_and_create_bundle( | ||
639 | + pols, num_pols, fl, | ||
640 | + family, dst_orig); | ||
641 | + if (IS_ERR(xdst)) { | ||
642 | + xfrm_pols_put(pols, num_pols); | ||
643 | + err = PTR_ERR(xdst); | ||
644 | + goto dropdst; | ||
645 | + } | ||
646 | + | ||
647 | + spin_lock_bh(&xfrm_policy_sk_bundle_lock); | ||
648 | + xdst->u.dst.next = xfrm_policy_sk_bundles; | ||
649 | + xfrm_policy_sk_bundles = &xdst->u.dst; | ||
650 | + spin_unlock_bh(&xfrm_policy_sk_bundle_lock); | ||
651 | + | ||
652 | + route = xdst->route; | ||
653 | } | ||
654 | } | ||
655 | |||
656 | - if (!policy) { | ||
657 | - struct flow_cache_object *flo; | ||
658 | - | ||
659 | + if (xdst == NULL) { | ||
660 | /* To accelerate a bit... */ | ||
661 | if ((dst_orig->flags & DST_NOXFRM) || | ||
662 | !net->xfrm.policy_count[XFRM_POLICY_OUT]) | ||
663 | goto nopol; | ||
664 | |||
665 | - flo = flow_cache_lookup(net, fl, dst_orig->ops->family, | ||
666 | - dir, xfrm_policy_lookup, NULL); | ||
667 | - err = PTR_ERR(flo); | ||
668 | + flo = flow_cache_lookup(net, fl, family, dir, | ||
669 | + xfrm_bundle_lookup, dst_orig); | ||
670 | + if (flo == NULL) | ||
671 | + goto nopol; | ||
672 | if (IS_ERR(flo)) { | ||
673 | - XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLERROR); | ||
674 | + err = PTR_ERR(flo); | ||
675 | goto dropdst; | ||
676 | } | ||
677 | - if (flo) | ||
678 | - policy = container_of(flo, struct xfrm_policy, flo); | ||
679 | - else | ||
680 | - policy = NULL; | ||
681 | + xdst = container_of(flo, struct xfrm_dst, flo); | ||
682 | + | ||
683 | + num_pols = xdst->num_pols; | ||
684 | + num_xfrms = xdst->num_xfrms; | ||
685 | + memcpy(pols, xdst->pols, sizeof(struct xfrm_policy*) * num_pols); | ||
686 | + route = xdst->route; | ||
687 | + } | ||
688 | + | ||
689 | + dst = &xdst->u.dst; | ||
690 | + if (route == NULL && num_xfrms > 0) { | ||
691 | + /* The only case when xfrm_bundle_lookup() returns a | ||
692 | + * bundle with null route, is when the template could | ||
693 | + * not be resolved. It means policies are there, but | ||
694 | + * bundle could not be created, since we don't yet | ||
695 | + * have the xfrm_state's. We need to wait for KM to | ||
696 | + * negotiate new SA's or bail out with error.*/ | ||
697 | + if (net->xfrm.sysctl_larval_drop) { | ||
698 | + /* EREMOTE tells the caller to generate | ||
699 | + * a one-shot blackhole route. */ | ||
700 | + dst_release(dst); | ||
701 | + xfrm_pols_put(pols, num_pols); | ||
702 | + XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES); | ||
703 | + return -EREMOTE; | ||
704 | + } | ||
705 | + if (flags & XFRM_LOOKUP_WAIT) { | ||
706 | + DECLARE_WAITQUEUE(wait, current); | ||
707 | + | ||
708 | + add_wait_queue(&net->xfrm.km_waitq, &wait); | ||
709 | + set_current_state(TASK_INTERRUPTIBLE); | ||
710 | + schedule(); | ||
711 | + set_current_state(TASK_RUNNING); | ||
712 | + remove_wait_queue(&net->xfrm.km_waitq, &wait); | ||
713 | + | ||
714 | + if (!signal_pending(current)) { | ||
715 | + dst_release(dst); | ||
716 | + goto restart; | ||
717 | + } | ||
718 | + | ||
719 | + err = -ERESTART; | ||
720 | + } else | ||
721 | + err = -EAGAIN; | ||
722 | + | ||
723 | + XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES); | ||
724 | + goto error; | ||
725 | } | ||
726 | |||
727 | - if (!policy) | ||
728 | +no_transform: | ||
729 | + if (num_pols == 0) | ||
730 | goto nopol; | ||
731 | |||
732 | - family = dst_orig->ops->family; | ||
733 | - pols[0] = policy; | ||
734 | - npols ++; | ||
735 | - xfrm_nr += pols[0]->xfrm_nr; | ||
736 | - | ||
737 | - err = -ENOENT; | ||
738 | - if ((flags & XFRM_LOOKUP_ICMP) && !(policy->flags & XFRM_POLICY_ICMP)) | ||
739 | + if ((flags & XFRM_LOOKUP_ICMP) && | ||
740 | + !(pols[0]->flags & XFRM_POLICY_ICMP)) { | ||
741 | + err = -ENOENT; | ||
742 | goto error; | ||
743 | + } | ||
744 | |||
745 | - policy->curlft.use_time = get_seconds(); | ||
746 | + for (i = 0; i < num_pols; i++) | ||
747 | + pols[i]->curlft.use_time = get_seconds(); | ||
748 | |||
749 | - switch (policy->action) { | ||
750 | - default: | ||
751 | - case XFRM_POLICY_BLOCK: | ||
752 | + if (num_xfrms < 0) { | ||
753 | /* Prohibit the flow */ | ||
754 | XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLBLOCK); | ||
755 | err = -EPERM; | ||
756 | goto error; | ||
757 | - | ||
758 | - case XFRM_POLICY_ALLOW: | ||
759 | -#ifndef CONFIG_XFRM_SUB_POLICY | ||
760 | - if (policy->xfrm_nr == 0) { | ||
761 | - /* Flow passes not transformed. */ | ||
762 | - xfrm_pol_put(policy); | ||
763 | - return 0; | ||
764 | - } | ||
765 | -#endif | ||
766 | - | ||
767 | - /* Try to find matching bundle. | ||
768 | - * | ||
769 | - * LATER: help from flow cache. It is optional, this | ||
770 | - * is required only for output policy. | ||
771 | - */ | ||
772 | - dst = xfrm_find_bundle(fl, policy, family); | ||
773 | - if (IS_ERR(dst)) { | ||
774 | - XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTBUNDLECHECKERROR); | ||
775 | - err = PTR_ERR(dst); | ||
776 | - goto error; | ||
777 | - } | ||
778 | - | ||
779 | - if (dst) | ||
780 | - break; | ||
781 | - | ||
782 | -#ifdef CONFIG_XFRM_SUB_POLICY | ||
783 | - if (pols[0]->type != XFRM_POLICY_TYPE_MAIN) { | ||
784 | - pols[1] = xfrm_policy_lookup_bytype(net, | ||
785 | - XFRM_POLICY_TYPE_MAIN, | ||
786 | - fl, family, | ||
787 | - XFRM_POLICY_OUT); | ||
788 | - if (pols[1]) { | ||
789 | - if (IS_ERR(pols[1])) { | ||
790 | - XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLERROR); | ||
791 | - err = PTR_ERR(pols[1]); | ||
792 | - goto error; | ||
793 | - } | ||
794 | - if (pols[1]->action == XFRM_POLICY_BLOCK) { | ||
795 | - XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLBLOCK); | ||
796 | - err = -EPERM; | ||
797 | - goto error; | ||
798 | - } | ||
799 | - npols ++; | ||
800 | - xfrm_nr += pols[1]->xfrm_nr; | ||
801 | - } | ||
802 | - } | ||
803 | - | ||
804 | - /* | ||
805 | - * Because neither flowi nor bundle information knows about | ||
806 | - * transformation template size. On more than one policy usage | ||
807 | - * we can realize whether all of them is bypass or not after | ||
808 | - * they are searched. See above not-transformed bypass | ||
809 | - * is surrounded by non-sub policy configuration, too. | ||
810 | - */ | ||
811 | - if (xfrm_nr == 0) { | ||
812 | - /* Flow passes not transformed. */ | ||
813 | - xfrm_pols_put(pols, npols); | ||
814 | - return 0; | ||
815 | - } | ||
816 | - | ||
817 | -#endif | ||
818 | - nx = xfrm_tmpl_resolve(pols, npols, fl, xfrm, family); | ||
819 | - | ||
820 | - if (unlikely(nx<0)) { | ||
821 | - err = nx; | ||
822 | - if (err == -EAGAIN && net->xfrm.sysctl_larval_drop) { | ||
823 | - /* EREMOTE tells the caller to generate | ||
824 | - * a one-shot blackhole route. | ||
825 | - */ | ||
826 | - XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES); | ||
827 | - xfrm_pol_put(policy); | ||
828 | - return -EREMOTE; | ||
829 | - } | ||
830 | - if (err == -EAGAIN && (flags & XFRM_LOOKUP_WAIT)) { | ||
831 | - DECLARE_WAITQUEUE(wait, current); | ||
832 | - | ||
833 | - add_wait_queue(&net->xfrm.km_waitq, &wait); | ||
834 | - set_current_state(TASK_INTERRUPTIBLE); | ||
835 | - schedule(); | ||
836 | - set_current_state(TASK_RUNNING); | ||
837 | - remove_wait_queue(&net->xfrm.km_waitq, &wait); | ||
838 | - | ||
839 | - nx = xfrm_tmpl_resolve(pols, npols, fl, xfrm, family); | ||
840 | - | ||
841 | - if (nx == -EAGAIN && signal_pending(current)) { | ||
842 | - XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES); | ||
843 | - err = -ERESTART; | ||
844 | - goto error; | ||
845 | - } | ||
846 | - if (nx == -EAGAIN || | ||
847 | - genid != atomic_read(&flow_cache_genid)) { | ||
848 | - xfrm_pols_put(pols, npols); | ||
849 | - goto restart; | ||
850 | - } | ||
851 | - err = nx; | ||
852 | - } | ||
853 | - if (err < 0) { | ||
854 | - XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES); | ||
855 | - goto error; | ||
856 | - } | ||
857 | - } | ||
858 | - if (nx == 0) { | ||
859 | - /* Flow passes not transformed. */ | ||
860 | - xfrm_pols_put(pols, npols); | ||
861 | - return 0; | ||
862 | - } | ||
863 | - | ||
864 | - dst = xfrm_bundle_create(policy, xfrm, nx, fl, dst_orig); | ||
865 | - err = PTR_ERR(dst); | ||
866 | - if (IS_ERR(dst)) { | ||
867 | - XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTBUNDLEGENERROR); | ||
868 | - goto error; | ||
869 | - } | ||
870 | - | ||
871 | - for (pi = 0; pi < npols; pi++) | ||
872 | - pol_dead |= pols[pi]->walk.dead; | ||
873 | - | ||
874 | - write_lock_bh(&policy->lock); | ||
875 | - if (unlikely(pol_dead || stale_bundle(dst))) { | ||
876 | - /* Wow! While we worked on resolving, this | ||
877 | - * policy has gone. Retry. It is not paranoia, | ||
878 | - * we just cannot enlist new bundle to dead object. | ||
879 | - * We can't enlist stable bundles either. | ||
880 | - */ | ||
881 | - write_unlock_bh(&policy->lock); | ||
882 | - dst_free(dst); | ||
883 | - | ||
884 | - if (pol_dead) | ||
885 | - XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLDEAD); | ||
886 | - else | ||
887 | - XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTBUNDLECHECKERROR); | ||
888 | - err = -EHOSTUNREACH; | ||
889 | - goto error; | ||
890 | - } | ||
891 | - | ||
892 | - if (npols > 1) | ||
893 | - err = xfrm_dst_update_parent(dst, &pols[1]->selector); | ||
894 | - else | ||
895 | - err = xfrm_dst_update_origin(dst, fl); | ||
896 | - if (unlikely(err)) { | ||
897 | - write_unlock_bh(&policy->lock); | ||
898 | - dst_free(dst); | ||
899 | - XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTBUNDLECHECKERROR); | ||
900 | - goto error; | ||
901 | - } | ||
902 | - | ||
903 | - dst->next = policy->bundles; | ||
904 | - policy->bundles = dst; | ||
905 | - dst_hold(dst); | ||
906 | - write_unlock_bh(&policy->lock); | ||
907 | + } else if (num_xfrms > 0) { | ||
908 | + /* Flow transformed */ | ||
909 | + *dst_p = dst; | ||
910 | + dst_release(dst_orig); | ||
911 | + } else { | ||
912 | + /* Flow passes untransformed */ | ||
913 | + dst_release(dst); | ||
914 | } | ||
915 | - *dst_p = dst; | ||
916 | - dst_release(dst_orig); | ||
917 | - xfrm_pols_put(pols, npols); | ||
918 | +ok: | ||
919 | + xfrm_pols_put(pols, drop_pols); | ||
920 | return 0; | ||
921 | |||
922 | +nopol: | ||
923 | + if (!(flags & XFRM_LOOKUP_ICMP)) | ||
924 | + goto ok; | ||
925 | + err = -ENOENT; | ||
926 | error: | ||
927 | - xfrm_pols_put(pols, npols); | ||
928 | + dst_release(dst); | ||
929 | dropdst: | ||
930 | dst_release(dst_orig); | ||
931 | *dst_p = NULL; | ||
932 | + xfrm_pols_put(pols, drop_pols); | ||
933 | return err; | ||
934 | - | ||
935 | -nopol: | ||
936 | - err = -ENOENT; | ||
937 | - if (flags & XFRM_LOOKUP_ICMP) | ||
938 | - goto dropdst; | ||
939 | - return 0; | ||
940 | } | ||
941 | EXPORT_SYMBOL(__xfrm_lookup); | ||
942 | |||
943 | @@ -2134,71 +2225,24 @@ static struct dst_entry *xfrm_negative_advice(struct dst_entry *dst) | ||
944 | return dst; | ||
945 | } | ||
946 | |||
947 | -static void prune_one_bundle(struct xfrm_policy *pol, int (*func)(struct dst_entry *), struct dst_entry **gc_list_p) | ||
948 | -{ | ||
949 | - struct dst_entry *dst, **dstp; | ||
950 | - | ||
951 | - write_lock(&pol->lock); | ||
952 | - dstp = &pol->bundles; | ||
953 | - while ((dst=*dstp) != NULL) { | ||
954 | - if (func(dst)) { | ||
955 | - *dstp = dst->next; | ||
956 | - dst->next = *gc_list_p; | ||
957 | - *gc_list_p = dst; | ||
958 | - } else { | ||
959 | - dstp = &dst->next; | ||
960 | - } | ||
961 | - } | ||
962 | - write_unlock(&pol->lock); | ||
963 | -} | ||
964 | - | ||
965 | -static void xfrm_prune_bundles(struct net *net, int (*func)(struct dst_entry *)) | ||
966 | +static void __xfrm_garbage_collect(struct net *net) | ||
967 | { | ||
968 | - struct dst_entry *gc_list = NULL; | ||
969 | - int dir; | ||
970 | + struct dst_entry *head, *next; | ||
971 | |||
972 | - read_lock_bh(&xfrm_policy_lock); | ||
973 | - for (dir = 0; dir < XFRM_POLICY_MAX * 2; dir++) { | ||
974 | - struct xfrm_policy *pol; | ||
975 | - struct hlist_node *entry; | ||
976 | - struct hlist_head *table; | ||
977 | - int i; | ||
978 | + flow_cache_flush(); | ||
979 | |||
980 | - hlist_for_each_entry(pol, entry, | ||
981 | - &net->xfrm.policy_inexact[dir], bydst) | ||
982 | - prune_one_bundle(pol, func, &gc_list); | ||
983 | + spin_lock_bh(&xfrm_policy_sk_bundle_lock); | ||
984 | + head = xfrm_policy_sk_bundles; | ||
985 | + xfrm_policy_sk_bundles = NULL; | ||
986 | + spin_unlock_bh(&xfrm_policy_sk_bundle_lock); | ||
987 | |||
988 | - table = net->xfrm.policy_bydst[dir].table; | ||
989 | - for (i = net->xfrm.policy_bydst[dir].hmask; i >= 0; i--) { | ||
990 | - hlist_for_each_entry(pol, entry, table + i, bydst) | ||
991 | - prune_one_bundle(pol, func, &gc_list); | ||
992 | - } | ||
993 | - } | ||
994 | - read_unlock_bh(&xfrm_policy_lock); | ||
995 | - | ||
996 | - while (gc_list) { | ||
997 | - struct dst_entry *dst = gc_list; | ||
998 | - gc_list = dst->next; | ||
999 | - dst_free(dst); | ||
1000 | + while (head) { | ||
1001 | + next = head->next; | ||
1002 | + dst_free(head); | ||
1003 | + head = next; | ||
1004 | } | ||
1005 | } | ||
1006 | |||
1007 | -static int unused_bundle(struct dst_entry *dst) | ||
1008 | -{ | ||
1009 | - return !atomic_read(&dst->__refcnt); | ||
1010 | -} | ||
1011 | - | ||
1012 | -static void __xfrm_garbage_collect(struct net *net) | ||
1013 | -{ | ||
1014 | - xfrm_prune_bundles(net, unused_bundle); | ||
1015 | -} | ||
1016 | - | ||
1017 | -static int xfrm_flush_bundles(struct net *net) | ||
1018 | -{ | ||
1019 | - xfrm_prune_bundles(net, stale_bundle); | ||
1020 | - return 0; | ||
1021 | -} | ||
1022 | - | ||
1023 | static void xfrm_init_pmtu(struct dst_entry *dst) | ||
1024 | { | ||
1025 | do { | ||
1026 | @@ -2256,7 +2300,9 @@ int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *first, | ||
1027 | return 0; | ||
1028 | if (dst->xfrm->km.state != XFRM_STATE_VALID) | ||
1029 | return 0; | ||
1030 | - if (xdst->genid != dst->xfrm->genid) | ||
1031 | + if (xdst->xfrm_genid != dst->xfrm->genid) | ||
1032 | + return 0; | ||
1033 | + if (xdst->policy_genid != atomic_read(&xdst->pols[0]->genid)) | ||
1034 | return 0; | ||
1035 | |||
1036 | if (strict && fl && | ||
1037 | @@ -2383,7 +2429,7 @@ static int xfrm_dev_event(struct notifier_block *this, unsigned long event, void | ||
1038 | |||
1039 | switch (event) { | ||
1040 | case NETDEV_DOWN: | ||
1041 | - xfrm_flush_bundles(dev_net(dev)); | ||
1042 | + __xfrm_garbage_collect(dev_net(dev)); | ||
1043 | } | ||
1044 | return NOTIFY_DONE; | ||
1045 | } | ||
1046 | @@ -2714,7 +2760,6 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol, | ||
1047 | struct xfrm_migrate *m, int num_migrate) | ||
1048 | { | ||
1049 | struct xfrm_migrate *mp; | ||
1050 | - struct dst_entry *dst; | ||
1051 | int i, j, n = 0; | ||
1052 | |||
1053 | write_lock_bh(&pol->lock); | ||
1054 | @@ -2739,10 +2784,7 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol, | ||
1055 | sizeof(pol->xfrm_vec[i].saddr)); | ||
1056 | pol->xfrm_vec[i].encap_family = mp->new_family; | ||
1057 | /* flush bundles */ | ||
1058 | - while ((dst = pol->bundles) != NULL) { | ||
1059 | - pol->bundles = dst->next; | ||
1060 | - dst_free(dst); | ||
1061 | - } | ||
1062 | + atomic_inc(&pol->genid); | ||
1063 | } | ||
1064 | } | ||
1065 | |||
1066 | -- | ||
1067 | 1.7.0.2 | ||
1068 | |||
diff --git a/main/linux-pae/0016-xfrm-remove-policy-garbage-collection.patch b/main/linux-pae/0016-xfrm-remove-policy-garbage-collection.patch new file mode 100644 index 0000000000..4a45c7f40d --- /dev/null +++ b/main/linux-pae/0016-xfrm-remove-policy-garbage-collection.patch | |||
@@ -0,0 +1,91 @@ | |||
1 | From 4c53c9239069f48ec9a86f8e596c163b72e8bc4d Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Wed, 7 Apr 2010 00:30:06 +0000 | ||
4 | Subject: [PATCH 16/18] xfrm: remove policy garbage collection | ||
5 | |||
6 | Policies are now properly reference counted and destroyed from | ||
7 | all code paths. The delayed gc is just an overhead now and can | ||
8 | be removed. | ||
9 | |||
10 | Signed-off-by: Timo Teras <timo.teras@iki.fi> | ||
11 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
12 | (cherry picked from commit 285ead175c5dd5075cab5b6c94f35a3e6c0a3ae6) | ||
13 | --- | ||
14 | net/xfrm/xfrm_policy.c | 39 +++++---------------------------------- | ||
15 | 1 files changed, 5 insertions(+), 34 deletions(-) | ||
16 | |||
17 | diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c | ||
18 | index 0379d82..5606841 100644 | ||
19 | --- a/net/xfrm/xfrm_policy.c | ||
20 | +++ b/net/xfrm/xfrm_policy.c | ||
21 | @@ -46,9 +46,6 @@ static struct xfrm_policy_afinfo *xfrm_policy_afinfo[NPROTO]; | ||
22 | |||
23 | static struct kmem_cache *xfrm_dst_cache __read_mostly; | ||
24 | |||
25 | -static HLIST_HEAD(xfrm_policy_gc_list); | ||
26 | -static DEFINE_SPINLOCK(xfrm_policy_gc_lock); | ||
27 | - | ||
28 | static struct xfrm_policy_afinfo *xfrm_policy_get_afinfo(unsigned short family); | ||
29 | static void xfrm_policy_put_afinfo(struct xfrm_policy_afinfo *afinfo); | ||
30 | static void xfrm_init_pmtu(struct dst_entry *dst); | ||
31 | @@ -288,32 +285,6 @@ void xfrm_policy_destroy(struct xfrm_policy *policy) | ||
32 | } | ||
33 | EXPORT_SYMBOL(xfrm_policy_destroy); | ||
34 | |||
35 | -static void xfrm_policy_gc_kill(struct xfrm_policy *policy) | ||
36 | -{ | ||
37 | - atomic_inc(&policy->genid); | ||
38 | - | ||
39 | - if (del_timer(&policy->timer)) | ||
40 | - atomic_dec(&policy->refcnt); | ||
41 | - | ||
42 | - xfrm_pol_put(policy); | ||
43 | -} | ||
44 | - | ||
45 | -static void xfrm_policy_gc_task(struct work_struct *work) | ||
46 | -{ | ||
47 | - struct xfrm_policy *policy; | ||
48 | - struct hlist_node *entry, *tmp; | ||
49 | - struct hlist_head gc_list; | ||
50 | - | ||
51 | - spin_lock_bh(&xfrm_policy_gc_lock); | ||
52 | - gc_list.first = xfrm_policy_gc_list.first; | ||
53 | - INIT_HLIST_HEAD(&xfrm_policy_gc_list); | ||
54 | - spin_unlock_bh(&xfrm_policy_gc_lock); | ||
55 | - | ||
56 | - hlist_for_each_entry_safe(policy, entry, tmp, &gc_list, bydst) | ||
57 | - xfrm_policy_gc_kill(policy); | ||
58 | -} | ||
59 | -static DECLARE_WORK(xfrm_policy_gc_work, xfrm_policy_gc_task); | ||
60 | - | ||
61 | /* Rule must be locked. Release descentant resources, announce | ||
62 | * entry dead. The rule must be unlinked from lists to the moment. | ||
63 | */ | ||
64 | @@ -322,11 +293,12 @@ static void xfrm_policy_kill(struct xfrm_policy *policy) | ||
65 | { | ||
66 | policy->walk.dead = 1; | ||
67 | |||
68 | - spin_lock_bh(&xfrm_policy_gc_lock); | ||
69 | - hlist_add_head(&policy->bydst, &xfrm_policy_gc_list); | ||
70 | - spin_unlock_bh(&xfrm_policy_gc_lock); | ||
71 | + atomic_inc(&policy->genid); | ||
72 | |||
73 | - schedule_work(&xfrm_policy_gc_work); | ||
74 | + if (del_timer(&policy->timer)) | ||
75 | + xfrm_pol_put(policy); | ||
76 | + | ||
77 | + xfrm_pol_put(policy); | ||
78 | } | ||
79 | |||
80 | static unsigned int xfrm_policy_hashmax __read_mostly = 1 * 1024 * 1024; | ||
81 | @@ -2535,7 +2507,6 @@ static void xfrm_policy_fini(struct net *net) | ||
82 | audit_info.sessionid = -1; | ||
83 | audit_info.secid = 0; | ||
84 | xfrm_policy_flush(net, XFRM_POLICY_TYPE_MAIN, &audit_info); | ||
85 | - flush_work(&xfrm_policy_gc_work); | ||
86 | |||
87 | WARN_ON(!list_empty(&net->xfrm.policy_all)); | ||
88 | |||
89 | -- | ||
90 | 1.7.0.2 | ||
91 | |||
diff --git a/main/linux-pae/0017-flow-delayed-deletion-of-flow-cache-entries.patch b/main/linux-pae/0017-flow-delayed-deletion-of-flow-cache-entries.patch new file mode 100644 index 0000000000..7d17d41aed --- /dev/null +++ b/main/linux-pae/0017-flow-delayed-deletion-of-flow-cache-entries.patch | |||
@@ -0,0 +1,231 @@ | |||
1 | From fede05e99e2d860e97bc877b8b77fb9e63f55cc8 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Wed, 7 Apr 2010 00:30:07 +0000 | ||
4 | Subject: [PATCH 17/18] flow: delayed deletion of flow cache entries | ||
5 | |||
6 | Speed up lookups by freeing flow cache entries later. After | ||
7 | virtualizing flow cache entry operations, the flow cache may now | ||
8 | end up calling policy or bundle destructor which can be slowish. | ||
9 | |||
10 | As gc_list is more effective with double linked list, the flow cache | ||
11 | is converted to use common hlist and list macroes where appropriate. | ||
12 | |||
13 | Signed-off-by: Timo Teras <timo.teras@iki.fi> | ||
14 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
15 | (cherry picked from commit 8e4795605d1e1b39113818ad7c147b8a867a1f6a) | ||
16 | --- | ||
17 | net/core/flow.c | 100 ++++++++++++++++++++++++++++++++++++++----------------- | ||
18 | 1 files changed, 69 insertions(+), 31 deletions(-) | ||
19 | |||
20 | diff --git a/net/core/flow.c b/net/core/flow.c | ||
21 | index 521df52..1619006 100644 | ||
22 | --- a/net/core/flow.c | ||
23 | +++ b/net/core/flow.c | ||
24 | @@ -26,7 +26,10 @@ | ||
25 | #include <linux/security.h> | ||
26 | |||
27 | struct flow_cache_entry { | ||
28 | - struct flow_cache_entry *next; | ||
29 | + union { | ||
30 | + struct hlist_node hlist; | ||
31 | + struct list_head gc_list; | ||
32 | + } u; | ||
33 | u16 family; | ||
34 | u8 dir; | ||
35 | u32 genid; | ||
36 | @@ -35,7 +38,7 @@ struct flow_cache_entry { | ||
37 | }; | ||
38 | |||
39 | struct flow_cache_percpu { | ||
40 | - struct flow_cache_entry **hash_table; | ||
41 | + struct hlist_head *hash_table; | ||
42 | int hash_count; | ||
43 | u32 hash_rnd; | ||
44 | int hash_rnd_recalc; | ||
45 | @@ -62,6 +65,9 @@ atomic_t flow_cache_genid = ATOMIC_INIT(0); | ||
46 | static struct flow_cache flow_cache_global; | ||
47 | static struct kmem_cache *flow_cachep; | ||
48 | |||
49 | +static DEFINE_SPINLOCK(flow_cache_gc_lock); | ||
50 | +static LIST_HEAD(flow_cache_gc_list); | ||
51 | + | ||
52 | #define flow_cache_hash_size(cache) (1 << (cache)->hash_shift) | ||
53 | #define FLOW_HASH_RND_PERIOD (10 * 60 * HZ) | ||
54 | |||
55 | @@ -86,38 +92,66 @@ static int flow_entry_valid(struct flow_cache_entry *fle) | ||
56 | return 1; | ||
57 | } | ||
58 | |||
59 | -static void flow_entry_kill(struct flow_cache *fc, | ||
60 | - struct flow_cache_percpu *fcp, | ||
61 | - struct flow_cache_entry *fle) | ||
62 | +static void flow_entry_kill(struct flow_cache_entry *fle) | ||
63 | { | ||
64 | if (fle->object) | ||
65 | fle->object->ops->delete(fle->object); | ||
66 | kmem_cache_free(flow_cachep, fle); | ||
67 | - fcp->hash_count--; | ||
68 | +} | ||
69 | + | ||
70 | +static void flow_cache_gc_task(struct work_struct *work) | ||
71 | +{ | ||
72 | + struct list_head gc_list; | ||
73 | + struct flow_cache_entry *fce, *n; | ||
74 | + | ||
75 | + INIT_LIST_HEAD(&gc_list); | ||
76 | + spin_lock_bh(&flow_cache_gc_lock); | ||
77 | + list_splice_tail_init(&flow_cache_gc_list, &gc_list); | ||
78 | + spin_unlock_bh(&flow_cache_gc_lock); | ||
79 | + | ||
80 | + list_for_each_entry_safe(fce, n, &gc_list, u.gc_list) | ||
81 | + flow_entry_kill(fce); | ||
82 | +} | ||
83 | +static DECLARE_WORK(flow_cache_gc_work, flow_cache_gc_task); | ||
84 | + | ||
85 | +static void flow_cache_queue_garbage(struct flow_cache_percpu *fcp, | ||
86 | + int deleted, struct list_head *gc_list) | ||
87 | +{ | ||
88 | + if (deleted) { | ||
89 | + fcp->hash_count -= deleted; | ||
90 | + spin_lock_bh(&flow_cache_gc_lock); | ||
91 | + list_splice_tail(gc_list, &flow_cache_gc_list); | ||
92 | + spin_unlock_bh(&flow_cache_gc_lock); | ||
93 | + schedule_work(&flow_cache_gc_work); | ||
94 | + } | ||
95 | } | ||
96 | |||
97 | static void __flow_cache_shrink(struct flow_cache *fc, | ||
98 | struct flow_cache_percpu *fcp, | ||
99 | int shrink_to) | ||
100 | { | ||
101 | - struct flow_cache_entry *fle, **flp; | ||
102 | - int i; | ||
103 | + struct flow_cache_entry *fle; | ||
104 | + struct hlist_node *entry, *tmp; | ||
105 | + LIST_HEAD(gc_list); | ||
106 | + int i, deleted = 0; | ||
107 | |||
108 | for (i = 0; i < flow_cache_hash_size(fc); i++) { | ||
109 | int saved = 0; | ||
110 | |||
111 | - flp = &fcp->hash_table[i]; | ||
112 | - while ((fle = *flp) != NULL) { | ||
113 | + hlist_for_each_entry_safe(fle, entry, tmp, | ||
114 | + &fcp->hash_table[i], u.hlist) { | ||
115 | if (saved < shrink_to && | ||
116 | flow_entry_valid(fle)) { | ||
117 | saved++; | ||
118 | - flp = &fle->next; | ||
119 | } else { | ||
120 | - *flp = fle->next; | ||
121 | - flow_entry_kill(fc, fcp, fle); | ||
122 | + deleted++; | ||
123 | + hlist_del(&fle->u.hlist); | ||
124 | + list_add_tail(&fle->u.gc_list, &gc_list); | ||
125 | } | ||
126 | } | ||
127 | } | ||
128 | + | ||
129 | + flow_cache_queue_garbage(fcp, deleted, &gc_list); | ||
130 | } | ||
131 | |||
132 | static void flow_cache_shrink(struct flow_cache *fc, | ||
133 | @@ -182,7 +216,8 @@ flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir, | ||
134 | { | ||
135 | struct flow_cache *fc = &flow_cache_global; | ||
136 | struct flow_cache_percpu *fcp; | ||
137 | - struct flow_cache_entry *fle, **head; | ||
138 | + struct flow_cache_entry *fle, *tfle; | ||
139 | + struct hlist_node *entry; | ||
140 | struct flow_cache_object *flo; | ||
141 | unsigned int hash; | ||
142 | |||
143 | @@ -200,12 +235,13 @@ flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir, | ||
144 | flow_new_hash_rnd(fc, fcp); | ||
145 | |||
146 | hash = flow_hash_code(fc, fcp, key); | ||
147 | - head = &fcp->hash_table[hash]; | ||
148 | - for (fle = *head; fle; fle = fle->next) { | ||
149 | - if (fle->family == family && | ||
150 | - fle->dir == dir && | ||
151 | - flow_key_compare(key, &fle->key) == 0) | ||
152 | + hlist_for_each_entry(tfle, entry, &fcp->hash_table[hash], u.hlist) { | ||
153 | + if (tfle->family == family && | ||
154 | + tfle->dir == dir && | ||
155 | + flow_key_compare(key, &tfle->key) == 0) { | ||
156 | + fle = tfle; | ||
157 | break; | ||
158 | + } | ||
159 | } | ||
160 | |||
161 | if (unlikely(!fle)) { | ||
162 | @@ -214,12 +250,11 @@ flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir, | ||
163 | |||
164 | fle = kmem_cache_alloc(flow_cachep, GFP_ATOMIC); | ||
165 | if (fle) { | ||
166 | - fle->next = *head; | ||
167 | - *head = fle; | ||
168 | fle->family = family; | ||
169 | fle->dir = dir; | ||
170 | memcpy(&fle->key, key, sizeof(*key)); | ||
171 | fle->object = NULL; | ||
172 | + hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]); | ||
173 | fcp->hash_count++; | ||
174 | } | ||
175 | } else if (likely(fle->genid == atomic_read(&flow_cache_genid))) { | ||
176 | @@ -262,23 +297,26 @@ static void flow_cache_flush_tasklet(unsigned long data) | ||
177 | struct flow_flush_info *info = (void *)data; | ||
178 | struct flow_cache *fc = info->cache; | ||
179 | struct flow_cache_percpu *fcp; | ||
180 | - int i; | ||
181 | + struct flow_cache_entry *fle; | ||
182 | + struct hlist_node *entry, *tmp; | ||
183 | + LIST_HEAD(gc_list); | ||
184 | + int i, deleted = 0; | ||
185 | |||
186 | fcp = per_cpu_ptr(fc->percpu, smp_processor_id()); | ||
187 | for (i = 0; i < flow_cache_hash_size(fc); i++) { | ||
188 | - struct flow_cache_entry *fle; | ||
189 | - | ||
190 | - fle = fcp->hash_table[i]; | ||
191 | - for (; fle; fle = fle->next) { | ||
192 | + hlist_for_each_entry_safe(fle, entry, tmp, | ||
193 | + &fcp->hash_table[i], u.hlist) { | ||
194 | if (flow_entry_valid(fle)) | ||
195 | continue; | ||
196 | |||
197 | - if (fle->object) | ||
198 | - fle->object->ops->delete(fle->object); | ||
199 | - fle->object = NULL; | ||
200 | + deleted++; | ||
201 | + hlist_del(&fle->u.hlist); | ||
202 | + list_add_tail(&fle->u.gc_list, &gc_list); | ||
203 | } | ||
204 | } | ||
205 | |||
206 | + flow_cache_queue_garbage(fcp, deleted, &gc_list); | ||
207 | + | ||
208 | if (atomic_dec_and_test(&info->cpuleft)) | ||
209 | complete(&info->completion); | ||
210 | } | ||
211 | @@ -320,7 +358,7 @@ void flow_cache_flush(void) | ||
212 | static void __init flow_cache_cpu_prepare(struct flow_cache *fc, | ||
213 | struct flow_cache_percpu *fcp) | ||
214 | { | ||
215 | - fcp->hash_table = (struct flow_cache_entry **) | ||
216 | + fcp->hash_table = (struct hlist_head *) | ||
217 | __get_free_pages(GFP_KERNEL|__GFP_ZERO, fc->order); | ||
218 | if (!fcp->hash_table) | ||
219 | panic("NET: failed to allocate flow cache order %lu\n", fc->order); | ||
220 | @@ -354,7 +392,7 @@ static int flow_cache_init(struct flow_cache *fc) | ||
221 | |||
222 | for (order = 0; | ||
223 | (PAGE_SIZE << order) < | ||
224 | - (sizeof(struct flow_cache_entry *)*flow_cache_hash_size(fc)); | ||
225 | + (sizeof(struct hlist_head)*flow_cache_hash_size(fc)); | ||
226 | order++) | ||
227 | /* NOTHING */; | ||
228 | fc->order = order; | ||
229 | -- | ||
230 | 1.7.0.2 | ||
231 | |||
diff --git a/main/linux-pae/0018-xfrm-Fix-crashes-in-xfrm_lookup.patch b/main/linux-pae/0018-xfrm-Fix-crashes-in-xfrm_lookup.patch new file mode 100644 index 0000000000..6f0dc91286 --- /dev/null +++ b/main/linux-pae/0018-xfrm-Fix-crashes-in-xfrm_lookup.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From e0c0800740cdf64fe7b121c2ef235c01f1957af0 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Thu, 8 Apr 2010 11:27:42 -0700 | ||
4 | Subject: [PATCH 18/18] xfrm: Fix crashes in xfrm_lookup() | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | From: Timo Teräs <timo.teras@iki.fi> | ||
10 | |||
11 | Happens because CONFIG_XFRM_SUB_POLICY is not enabled, and one of | ||
12 | the helper functions I used did unexpected things in that case. | ||
13 | |||
14 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
15 | (cherry picked from commit e4077e018b5ead3de9951fc01d8bf12eeeeeefed) | ||
16 | --- | ||
17 | include/net/xfrm.h | 7 ------- | ||
18 | 1 files changed, 0 insertions(+), 7 deletions(-) | ||
19 | |||
20 | diff --git a/include/net/xfrm.h b/include/net/xfrm.h | ||
21 | index d51ef61..280f46f 100644 | ||
22 | --- a/include/net/xfrm.h | ||
23 | +++ b/include/net/xfrm.h | ||
24 | @@ -738,19 +738,12 @@ static inline void xfrm_pol_put(struct xfrm_policy *policy) | ||
25 | xfrm_policy_destroy(policy); | ||
26 | } | ||
27 | |||
28 | -#ifdef CONFIG_XFRM_SUB_POLICY | ||
29 | static inline void xfrm_pols_put(struct xfrm_policy **pols, int npols) | ||
30 | { | ||
31 | int i; | ||
32 | for (i = npols - 1; i >= 0; --i) | ||
33 | xfrm_pol_put(pols[i]); | ||
34 | } | ||
35 | -#else | ||
36 | -static inline void xfrm_pols_put(struct xfrm_policy **pols, int npols) | ||
37 | -{ | ||
38 | - xfrm_pol_put(pols[0]); | ||
39 | -} | ||
40 | -#endif | ||
41 | |||
42 | extern void __xfrm_state_destroy(struct xfrm_state *); | ||
43 | |||
44 | -- | ||
45 | 1.7.0.2 | ||
46 | |||
diff --git a/main/linux-pae/APKBUILD b/main/linux-pae/APKBUILD index 1f96f01eea..fa5b0431dd 100644 --- a/main/linux-pae/APKBUILD +++ b/main/linux-pae/APKBUILD | |||
@@ -2,9 +2,9 @@ | |||
2 | 2 | ||
3 | _flavor=pae | 3 | _flavor=pae |
4 | pkgname=linux-${_flavor} | 4 | pkgname=linux-${_flavor} |
5 | pkgver=2.6.32.10 | 5 | pkgver=2.6.32.15 |
6 | _kernver=2.6.32 | 6 | _kernver=2.6.32 |
7 | pkgrel=1 | 7 | pkgrel=0 |
8 | pkgdesc="Linux kernel with PAE enabled" | 8 | pkgdesc="Linux kernel with PAE enabled" |
9 | url=http://www.kernel.org | 9 | url=http://www.kernel.org |
10 | depends="mkinitfs linux-firmware" | 10 | depends="mkinitfs linux-firmware" |
@@ -14,12 +14,24 @@ _config=${config:-kernelconfig.${CARCH:-x86}} | |||
14 | install= | 14 | install= |
15 | source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 | 15 | source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 |
16 | ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 | 16 | ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 |
17 | ip_gre.patch | 17 | 0002-gre-fix-hard-header-destination-address-checking.patch |
18 | ip_gre2.patch | 18 | 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch |
19 | arp.patch | 19 | 0004-arp-flush-arp-cache-on-device-change.patch |
20 | xfrm-cache-size-revert.patch | 20 | 0007-r8169-Fix-rtl8169_rx_interrupt.patch |
21 | net-git-78f1cd-r8169-fix-broken-register-writes.patch | 21 | 0009-ipsec-Fix-bogus-bundle-flowi.patch |
22 | net-git-c0cd88-r8169-offical-fix-for-CVE-2009-4537-overlength-frame-DMAs.patch | 22 | 0010-xfrm-Remove-xfrm_state_genid.patch |
23 | 0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch | ||
24 | 0012-xfrm-remove-policy-lock-when-accessing-policy-walk.d.patch | ||
25 | 0013-flow-structurize-flow-cache.patch | ||
26 | 0014-flow-virtualize-flow-cache-entry-methods.patch | ||
27 | 0015-xfrm-cache-bundles-instead-of-policies-for-outgoing-.patch | ||
28 | 0016-xfrm-remove-policy-garbage-collection.patch | ||
29 | 0017-flow-delayed-deletion-of-flow-cache-entries.patch | ||
30 | 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch | ||
31 | xfrm-fix-policy-unreferencing-on-larval-drop.patch | ||
32 | r8169-fix-random-mdio_write-failures.patch | ||
33 | r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch | ||
34 | x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch | ||
23 | kernelconfig.x86 | 35 | kernelconfig.x86 |
24 | " | 36 | " |
25 | subpackages="$pkgname-dev" | 37 | subpackages="$pkgname-dev" |
@@ -33,16 +45,20 @@ prepare() { | |||
33 | bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 -N || return 1 | 45 | bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 -N || return 1 |
34 | fi | 46 | fi |
35 | 47 | ||
36 | for i in ../*.diff ../*.patch; do | 48 | # first apply patches in specified order |
37 | [ -f $i ] || continue | 49 | for i in $source; do |
38 | msg "Applying $i..." | 50 | case $i in |
39 | patch -s -p1 -N < $i || return 1 | 51 | *.patch) |
52 | msg "Applying $i..." | ||
53 | patch -s -p1 -N < "$srcdir"/$i || return 1 | ||
54 | ;; | ||
55 | esac | ||
40 | done | 56 | done |
41 | 57 | ||
42 | mkdir -p "$srcdir"/build | 58 | mkdir -p "$srcdir"/build |
43 | cp "$srcdir"/$_config "$srcdir"/build/.config | 59 | cp "$srcdir"/$_config "$srcdir"/build/.config |
44 | echo "-${_flavor}" > "$srcdir"/linux-$_kernver/localversion-${_flavor} | 60 | echo "-${_flavor}" > "$srcdir"/linux-$_kernver/localversion-${_flavor} |
45 | make -C "$srcdir"/linux-$_kernver O="$srcdir"/build HOSTCC="$CC" \ | 61 | make -C "$srcdir"/linux-$_kernver O="$srcdir"/build HOSTCC="${CC:-gcc}" \ |
46 | silentoldconfig | 62 | silentoldconfig |
47 | } | 63 | } |
48 | 64 | ||
@@ -55,7 +71,9 @@ menuconfig() { | |||
55 | 71 | ||
56 | build() { | 72 | build() { |
57 | cd "$srcdir"/build | 73 | cd "$srcdir"/build |
58 | make CC="$CC" || return 1 | 74 | make CC="${CC:--gcc}" \ |
75 | KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ | ||
76 | || return 1 | ||
59 | } | 77 | } |
60 | 78 | ||
61 | package() { | 79 | package() { |
@@ -88,7 +106,7 @@ dev() { | |||
88 | # external modules, and create the scripts | 106 | # external modules, and create the scripts |
89 | mkdir -p "$dir" | 107 | mkdir -p "$dir" |
90 | cp "$srcdir"/$_config "$dir"/.config | 108 | cp "$srcdir"/$_config "$dir"/.config |
91 | make -j1 -C "$srcdir"/linux-$_kernver O="$dir" HOSTCC="$CC" \ | 109 | make -j1 -C "$srcdir"/linux-$_kernver O="$dir" HOSTCC="${CC:-gcc}" \ |
92 | silentoldconfig prepare scripts | 110 | silentoldconfig prepare scripts |
93 | 111 | ||
94 | # remove the stuff that poits to real sources. we want 3rd party | 112 | # remove the stuff that poits to real sources. we want 3rd party |
@@ -120,11 +138,23 @@ dev() { | |||
120 | } | 138 | } |
121 | 139 | ||
122 | md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 | 140 | md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 |
123 | 0f1863836bf96fd0aab128d61eaa5693 patch-2.6.32.10.bz2 | 141 | 5c9251844c2819eddee4dba1293bd46d patch-2.6.32.15.bz2 |
124 | 3ef822f3a2723b9a80c3f12954457225 ip_gre.patch | 142 | 437317f88ec13ace8d39c31983a41696 0002-gre-fix-hard-header-destination-address-checking.patch |
125 | 13ca9e91700e459da269c957062bbea7 ip_gre2.patch | 143 | 151b29a161178ed39d62a08f21f3484d 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch |
126 | 4c39a161d918e7f274292ecfd168b891 arp.patch | 144 | 776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch |
127 | 329fcab881425e001d3243caa4648478 xfrm-cache-size-revert.patch | 145 | 5f8b9a76d95319c5b1aa26b54a42e6b5 0007-r8169-Fix-rtl8169_rx_interrupt.patch |
128 | 21ed38773d846097b7315e1e0801d87a net-git-78f1cd-r8169-fix-broken-register-writes.patch | 146 | cf168620efa63479a6e03da78906e32f 0009-ipsec-Fix-bogus-bundle-flowi.patch |
129 | 962a6dd7c639612fc8bdaeb836388b0b net-git-c0cd88-r8169-offical-fix-for-CVE-2009-4537-overlength-frame-DMAs.patch | 147 | 3af4b5ae1afae3278b0070f585b874e3 0010-xfrm-Remove-xfrm_state_genid.patch |
130 | bf15e3ee69e03319dab0d59e08b67195 kernelconfig.x86" | 148 | 9f284c3fd5ab38cef4544efc1f50c6ba 0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch |
149 | b035114e893883cf67530350678e00f5 0012-xfrm-remove-policy-lock-when-accessing-policy-walk.d.patch | ||
150 | 9dea03ec19aaf9a384e4f56f57009257 0013-flow-structurize-flow-cache.patch | ||
151 | fc9ab26abbfec0d3f20000b5e695620b 0014-flow-virtualize-flow-cache-entry-methods.patch | ||
152 | c09b82b89a49ba2a3836a0bc3a3312f4 0015-xfrm-cache-bundles-instead-of-policies-for-outgoing-.patch | ||
153 | 41618efb65ab9ddacfb59a1cde9b4edd 0016-xfrm-remove-policy-garbage-collection.patch | ||
154 | 3b83f0972ab715819d1119b120a987e7 0017-flow-delayed-deletion-of-flow-cache-entries.patch | ||
155 | 45a676c7a1759fec60b724d557b4e295 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch | ||
156 | c7e606c11c05ff03012b21c3fe0ece47 xfrm-fix-policy-unreferencing-on-larval-drop.patch | ||
157 | ce4a74190febe13713bab1b886dd5bee r8169-fix-random-mdio_write-failures.patch | ||
158 | b41ee19f13498fb25992fd60cd1126d4 r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch | ||
159 | a1bcf76870b63a4a4035a8948fb758e2 x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch | ||
160 | 970a1dc0f8c6c3e3227a77934eafd68e kernelconfig.x86" | ||
diff --git a/main/linux-pae/ip_gre.patch b/main/linux-pae/ip_gre.patch deleted file mode 100644 index ba5f19b300..0000000000 --- a/main/linux-pae/ip_gre.patch +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | --- a/net/ipv4/ip_gre.c.orig | ||
2 | +++ b/net/ipv4/ip_gre.c | ||
3 | @@ -1137,11 +1137,8 @@ | ||
4 | |||
5 | if (saddr) | ||
6 | memcpy(&iph->saddr, saddr, 4); | ||
7 | - | ||
8 | - if (daddr) { | ||
9 | + if (daddr) | ||
10 | memcpy(&iph->daddr, daddr, 4); | ||
11 | - return t->hlen; | ||
12 | - } | ||
13 | if (iph->daddr && !ipv4_is_multicast(iph->daddr)) | ||
14 | return t->hlen; | ||
15 | |||
diff --git a/main/linux-pae/ip_gre2.patch b/main/linux-pae/ip_gre2.patch deleted file mode 100644 index 52c44076d2..0000000000 --- a/main/linux-pae/ip_gre2.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | --- linux-2.6.32/net/ipv4/ip_gre.c.orig | ||
2 | +++ linux-2.6.32/net/ipv4/ip_gre.c | ||
3 | @@ -803,11 +803,13 @@ | ||
4 | tunnel->err_count = 0; | ||
5 | } | ||
6 | |||
7 | - max_headroom = LL_RESERVED_SPACE(tdev) + gre_hlen; | ||
8 | + max_headroom = LL_RESERVED_SPACE(tdev) + gre_hlen + rt->u.dst.header_len; | ||
9 | |||
10 | if (skb_headroom(skb) < max_headroom || skb_shared(skb)|| | ||
11 | (skb_cloned(skb) && !skb_clone_writable(skb, 0))) { | ||
12 | struct sk_buff *new_skb = skb_realloc_headroom(skb, max_headroom); | ||
13 | + if (max_headroom > dev->needed_headroom) | ||
14 | + dev->needed_headroom = max_headroom; | ||
15 | if (!new_skb) { | ||
16 | ip_rt_put(rt); | ||
17 | stats->tx_dropped++; | ||
diff --git a/main/linux-pae/kernelconfig.x86 b/main/linux-pae/kernelconfig.x86 index 2b424ce7ba..951f1f8860 100644 --- a/main/linux-pae/kernelconfig.x86 +++ b/main/linux-pae/kernelconfig.x86 | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.32.10 | 3 | # Linux kernel version: 2.6.32.15 |
4 | # Tue Mar 23 13:08:19 2010 | 4 | # Thu Jun 10 08:10:37 2010 |
5 | # | 5 | # |
6 | # CONFIG_64BIT is not set | 6 | # CONFIG_64BIT is not set |
7 | CONFIG_X86_32=y | 7 | CONFIG_X86_32=y |
@@ -311,6 +311,7 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y | |||
311 | CONFIG_ARCH_FLATMEM_ENABLE=y | 311 | CONFIG_ARCH_FLATMEM_ENABLE=y |
312 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 312 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
313 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 313 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
314 | CONFIG_ILLEGAL_POINTER_VALUE=0 | ||
314 | CONFIG_SELECT_MEMORY_MODEL=y | 315 | CONFIG_SELECT_MEMORY_MODEL=y |
315 | CONFIG_FLATMEM_MANUAL=y | 316 | CONFIG_FLATMEM_MANUAL=y |
316 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 317 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
@@ -3959,7 +3960,65 @@ CONFIG_XEN_DEV_EVTCHN=y | |||
3959 | CONFIG_XENFS=y | 3960 | CONFIG_XENFS=y |
3960 | CONFIG_XEN_COMPAT_XENFS=y | 3961 | CONFIG_XEN_COMPAT_XENFS=y |
3961 | CONFIG_XEN_SYS_HYPERVISOR=y | 3962 | CONFIG_XEN_SYS_HYPERVISOR=y |
3962 | # CONFIG_STAGING is not set | 3963 | CONFIG_STAGING=y |
3964 | # CONFIG_STAGING_EXCLUDE_BUILD is not set | ||
3965 | # CONFIG_ET131X is not set | ||
3966 | # CONFIG_SLICOSS is not set | ||
3967 | # CONFIG_VIDEO_GO7007 is not set | ||
3968 | # CONFIG_VIDEO_CX25821 is not set | ||
3969 | # CONFIG_USB_IP_COMMON is not set | ||
3970 | # CONFIG_W35UND is not set | ||
3971 | # CONFIG_PRISM2_USB is not set | ||
3972 | # CONFIG_ECHO is not set | ||
3973 | # CONFIG_POCH is not set | ||
3974 | # CONFIG_OTUS is not set | ||
3975 | # CONFIG_RT2860 is not set | ||
3976 | # CONFIG_RT2870 is not set | ||
3977 | # CONFIG_RT3090 is not set | ||
3978 | # CONFIG_COMEDI is not set | ||
3979 | # CONFIG_ASUS_OLED is not set | ||
3980 | # CONFIG_PANEL is not set | ||
3981 | # CONFIG_ALTERA_PCIE_CHDMA is not set | ||
3982 | # CONFIG_RTL8187SE is not set | ||
3983 | # CONFIG_RTL8192SU is not set | ||
3984 | # CONFIG_RTL8192E is not set | ||
3985 | # CONFIG_TRANZPORT is not set | ||
3986 | |||
3987 | # | ||
3988 | # Android | ||
3989 | # | ||
3990 | |||
3991 | # | ||
3992 | # Qualcomm MSM Camera And Video | ||
3993 | # | ||
3994 | |||
3995 | # | ||
3996 | # Camera Sensor Selection | ||
3997 | # | ||
3998 | # CONFIG_INPUT_GPIO is not set | ||
3999 | # CONFIG_DST is not set | ||
4000 | # CONFIG_POHMELFS is not set | ||
4001 | # CONFIG_B3DFG is not set | ||
4002 | # CONFIG_IDE_PHISON is not set | ||
4003 | # CONFIG_PLAN9AUTH is not set | ||
4004 | # CONFIG_LINE6_USB is not set | ||
4005 | # CONFIG_DRM_RADEON_KMS is not set | ||
4006 | # CONFIG_USB_SERIAL_QUATECH2 is not set | ||
4007 | # CONFIG_USB_SERIAL_QUATECH_USB2 is not set | ||
4008 | # CONFIG_VT6655 is not set | ||
4009 | # CONFIG_VT6656 is not set | ||
4010 | # CONFIG_FB_UDL is not set | ||
4011 | CONFIG_HYPERV=m | ||
4012 | CONFIG_HYPERV_STORAGE=m | ||
4013 | CONFIG_HYPERV_BLOCK=m | ||
4014 | CONFIG_HYPERV_NET=m | ||
4015 | # CONFIG_VME_BUS is not set | ||
4016 | |||
4017 | # | ||
4018 | # RAR Register Driver | ||
4019 | # | ||
4020 | # CONFIG_RAR_REGISTER is not set | ||
4021 | # CONFIG_IIO is not set | ||
3963 | CONFIG_X86_PLATFORM_DEVICES=y | 4022 | CONFIG_X86_PLATFORM_DEVICES=y |
3964 | CONFIG_ACER_WMI=m | 4023 | CONFIG_ACER_WMI=m |
3965 | CONFIG_ASUS_LAPTOP=m | 4024 | CONFIG_ASUS_LAPTOP=m |
diff --git a/main/linux-pae/net-git-78f1cd-r8169-fix-broken-register-writes.patch b/main/linux-pae/net-git-78f1cd-r8169-fix-broken-register-writes.patch deleted file mode 100644 index f5f72acc4b..0000000000 --- a/main/linux-pae/net-git-78f1cd-r8169-fix-broken-register-writes.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | From 78f1cd02457252e1ffbc6caa44a17424a45286b8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Francois Romieu <romieu@fr.zoreil.com> | ||
3 | Date: Sat, 27 Mar 2010 19:35:46 -0700 | ||
4 | Subject: [PATCH] r8169: fix broken register writes | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=utf8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | This is quite similar to b39fe41f481d20c201012e4483e76c203802dda7 | ||
10 | though said registers are not even documented as 64-bit registers | ||
11 | - as opposed to the initial TxDescStartAddress ones - but as single | ||
12 | bytes which must be combined into 32 bits at the MMIO read/write | ||
13 | level before being merged into a 64 bit logical entity. | ||
14 | |||
15 | Credits go to Ben Hutchings <ben@decadent.org.uk> for the MAR | ||
16 | registers (aka "multicast is broken for ages on ARM) and to | ||
17 | Timo Teräs <timo.teras@iki.fi> for the MAC registers. | ||
18 | |||
19 | Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> | ||
20 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
21 | --- | ||
22 | drivers/net/r8169.c | 4 ++-- | ||
23 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
24 | |||
25 | diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c | ||
26 | index b93fd23..7193afc 100644 | ||
27 | --- a/drivers/net/r8169.c | ||
28 | +++ b/drivers/net/r8169.c | ||
29 | @@ -2820,8 +2820,8 @@ static void rtl_rar_set(struct rtl8169_private *tp, u8 *addr) | ||
30 | spin_lock_irq(&tp->lock); | ||
31 | |||
32 | RTL_W8(Cfg9346, Cfg9346_Unlock); | ||
33 | - RTL_W32(MAC0, low); | ||
34 | RTL_W32(MAC4, high); | ||
35 | + RTL_W32(MAC0, low); | ||
36 | RTL_W8(Cfg9346, Cfg9346_Lock); | ||
37 | |||
38 | spin_unlock_irq(&tp->lock); | ||
39 | @@ -4747,8 +4747,8 @@ static void rtl_set_rx_mode(struct net_device *dev) | ||
40 | mc_filter[1] = swab32(data); | ||
41 | } | ||
42 | |||
43 | - RTL_W32(MAR0 + 0, mc_filter[0]); | ||
44 | RTL_W32(MAR0 + 4, mc_filter[1]); | ||
45 | + RTL_W32(MAR0 + 0, mc_filter[0]); | ||
46 | |||
47 | RTL_W32(RxConfig, tmp); | ||
48 | |||
49 | -- | ||
50 | 1.7.0.3 | ||
51 | |||
diff --git a/main/linux-pae/net-git-c0cd88-r8169-offical-fix-for-CVE-2009-4537-overlength-frame-DMAs.patch b/main/linux-pae/net-git-c0cd88-r8169-offical-fix-for-CVE-2009-4537-overlength-frame-DMAs.patch deleted file mode 100644 index 250c85d678..0000000000 --- a/main/linux-pae/net-git-c0cd88-r8169-offical-fix-for-CVE-2009-4537-overlength-frame-DMAs.patch +++ /dev/null | |||
@@ -1,119 +0,0 @@ | |||
1 | From c0cd884af045338476b8e69a61fceb3f34ff22f1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Neil Horman <nhorman@redhat.com> | ||
3 | Date: Mon, 29 Mar 2010 13:16:02 -0700 | ||
4 | Subject: [PATCH] r8169: offical fix for CVE-2009-4537 (overlength frame DMAs) | ||
5 | |||
6 | Official patch to fix the r8169 frame length check error. | ||
7 | |||
8 | Based on this initial thread: | ||
9 | http://marc.info/?l=linux-netdev&m=126202972828626&w=1 | ||
10 | This is the official patch to fix the frame length problems in the r8169 | ||
11 | driver. As noted in the previous thread, while this patch incurs a performance | ||
12 | hit on the driver, its possible to improve performance dynamically by updating | ||
13 | the mtu and rx_copybreak values at runtime to return performance to what it was | ||
14 | for those NICS which are unaffected by the ideosyncracy (if there are any). | ||
15 | |||
16 | Summary: | ||
17 | |||
18 | A while back Eric submitted a patch for r8169 in which the proper | ||
19 | allocated frame size was written to RXMaxSize to prevent the NIC from dmaing too | ||
20 | much data. This was done in commit fdd7b4c3302c93f6833e338903ea77245eb510b4. A | ||
21 | long time prior to that however, Francois posted | ||
22 | 126fa4b9ca5d9d7cb7d46f779ad3bd3631ca387c, which expiclitly disabled the MaxSize | ||
23 | setting due to the fact that the hardware behaved in odd ways when overlong | ||
24 | frames were received on NIC's supported by this driver. This was mentioned in a | ||
25 | security conference recently: | ||
26 | http://events.ccc.de/congress/2009/Fahrplan//events/3596.en.html | ||
27 | |||
28 | It seems that if we can't enable frame size filtering, then, as Eric correctly | ||
29 | noticed, we can find ourselves DMA-ing too much data to a buffer, causing | ||
30 | corruption. As a result is seems that we are forced to allocate a frame which | ||
31 | is ready to handle a maximally sized receive. | ||
32 | |||
33 | This obviously has performance issues with it, so to mitigate that issue, this | ||
34 | patch does two things: | ||
35 | |||
36 | 1) Raises the copybreak value to the frame allocation size, which should force | ||
37 | appropriately sized packets to get allocated on rx, rather than a full new 16k | ||
38 | buffer. | ||
39 | |||
40 | 2) This patch only disables frame filtering initially (i.e., during the NIC | ||
41 | open), changing the MTU results in ring buffer allocation of a size in relation | ||
42 | to the new mtu (along with a warning indicating that this is dangerous). | ||
43 | |||
44 | Because of item (2), individuals who can't cope with the performance hit (or can | ||
45 | otherwise filter frames to prevent the bug), or who have hardware they are sure | ||
46 | is unaffected by this issue, can manually lower the copybreak and reset the mtu | ||
47 | such that performance is restored easily. | ||
48 | |||
49 | Signed-off-by: Neil Horman <nhorman@redhat.com> | ||
50 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
51 | --- | ||
52 | drivers/net/r8169.c | 29 ++++++++++++++++++++++++----- | ||
53 | 1 files changed, 24 insertions(+), 5 deletions(-) | ||
54 | |||
55 | diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c | ||
56 | index 7193afc..9674005 100644 | ||
57 | --- a/drivers/net/r8169.c | ||
58 | +++ b/drivers/net/r8169.c | ||
59 | @@ -186,7 +186,12 @@ static DEFINE_PCI_DEVICE_TABLE(rtl8169_pci_tbl) = { | ||
60 | |||
61 | MODULE_DEVICE_TABLE(pci, rtl8169_pci_tbl); | ||
62 | |||
63 | -static int rx_copybreak = 200; | ||
64 | +/* | ||
65 | + * we set our copybreak very high so that we don't have | ||
66 | + * to allocate 16k frames all the time (see note in | ||
67 | + * rtl8169_open() | ||
68 | + */ | ||
69 | +static int rx_copybreak = 16383; | ||
70 | static int use_dac; | ||
71 | static struct { | ||
72 | u32 msg_enable; | ||
73 | @@ -3217,9 +3222,13 @@ static void __devexit rtl8169_remove_one(struct pci_dev *pdev) | ||
74 | } | ||
75 | |||
76 | static void rtl8169_set_rxbufsize(struct rtl8169_private *tp, | ||
77 | - struct net_device *dev) | ||
78 | + unsigned int mtu) | ||
79 | { | ||
80 | - unsigned int max_frame = dev->mtu + VLAN_ETH_HLEN + ETH_FCS_LEN; | ||
81 | + unsigned int max_frame = mtu + VLAN_ETH_HLEN + ETH_FCS_LEN; | ||
82 | + | ||
83 | + if (max_frame != 16383) | ||
84 | + printk(KERN_WARNING "WARNING! Changing of MTU on this NIC" | ||
85 | + "May lead to frame reception errors!\n"); | ||
86 | |||
87 | tp->rx_buf_sz = (max_frame > RX_BUF_SIZE) ? max_frame : RX_BUF_SIZE; | ||
88 | } | ||
89 | @@ -3231,7 +3240,17 @@ static int rtl8169_open(struct net_device *dev) | ||
90 | int retval = -ENOMEM; | ||
91 | |||
92 | |||
93 | - rtl8169_set_rxbufsize(tp, dev); | ||
94 | + /* | ||
95 | + * Note that we use a magic value here, its wierd I know | ||
96 | + * its done because, some subset of rtl8169 hardware suffers from | ||
97 | + * a problem in which frames received that are longer than | ||
98 | + * the size set in RxMaxSize register return garbage sizes | ||
99 | + * when received. To avoid this we need to turn off filtering, | ||
100 | + * which is done by setting a value of 16383 in the RxMaxSize register | ||
101 | + * and allocating 16k frames to handle the largest possible rx value | ||
102 | + * thats what the magic math below does. | ||
103 | + */ | ||
104 | + rtl8169_set_rxbufsize(tp, 16383 - VLAN_ETH_HLEN - ETH_FCS_LEN); | ||
105 | |||
106 | /* | ||
107 | * Rx and Tx desscriptors needs 256 bytes alignment. | ||
108 | @@ -3884,7 +3903,7 @@ static int rtl8169_change_mtu(struct net_device *dev, int new_mtu) | ||
109 | |||
110 | rtl8169_down(dev); | ||
111 | |||
112 | - rtl8169_set_rxbufsize(tp, dev); | ||
113 | + rtl8169_set_rxbufsize(tp, dev->mtu); | ||
114 | |||
115 | ret = rtl8169_init_ring(dev); | ||
116 | if (ret < 0) | ||
117 | -- | ||
118 | 1.7.0.3 | ||
119 | |||
diff --git a/main/linux-pae/r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch b/main/linux-pae/r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch new file mode 100644 index 0000000000..bd111e8772 --- /dev/null +++ b/main/linux-pae/r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | From patchwork Wed Jun 9 05:22:10 2010 | ||
2 | Content-Type: text/plain; charset="utf-8" | ||
3 | MIME-Version: 1.0 | ||
4 | Content-Transfer-Encoding: 8bit | ||
5 | Subject: r8169: fix mdio_read and update mdio_write according to hw specs | ||
6 | Date: Tue, 08 Jun 2010 19:22:10 -0000 | ||
7 | From: =?utf-8?b?VGltbyBUZXLDpHMgPHRpbW8udGVyYXNAaWtpLmZpPg==?= | ||
8 | X-Patchwork-Id: 55049 | ||
9 | Message-Id: <1276060930-15697-1-git-send-email-timo.teras@iki.fi> | ||
10 | To: netdev@vger.kernel.org | ||
11 | Cc: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>, | ||
12 | Francois Romieu <romieu@fr.zoreil.com>, Hayeswang <hayeswang@realtek.com> | ||
13 | |||
14 | Realtek confirmed that a 20us delay is needed after mdio_read and | ||
15 | mdio_write operations. Reduce the delay in mdio_write, and add it | ||
16 | to mdio_read too. Also add a comment that the 20us is from hw specs. | ||
17 | |||
18 | Signed-off-by: Timo Teräs <timo.teras@iki.fi> | ||
19 | Cc: Francois Romieu <romieu@fr.zoreil.com> | ||
20 | Cc: Hayeswang <hayeswang@realtek.com> | ||
21 | |||
22 | --- | ||
23 | drivers/net/r8169.c | 12 +++++++++--- | ||
24 | 1 files changed, 9 insertions(+), 3 deletions(-) | ||
25 | |||
26 | diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c | ||
27 | index 03a8318..96b6cfb 100644 | ||
28 | --- a/drivers/net/r8169.c | ||
29 | +++ b/drivers/net/r8169.c | ||
30 | @@ -560,10 +560,10 @@ static void mdio_write(void __iomem *ioaddr, int reg_addr, int value) | ||
31 | udelay(25); | ||
32 | } | ||
33 | /* | ||
34 | - * Some configurations require a small delay even after the write | ||
35 | - * completed indication or the next write might fail. | ||
36 | + * According to hardware specs a 20us delay is required after write | ||
37 | + * complete indication, but before sending next command. | ||
38 | */ | ||
39 | - udelay(25); | ||
40 | + udelay(20); | ||
41 | } | ||
42 | |||
43 | static int mdio_read(void __iomem *ioaddr, int reg_addr) | ||
44 | @@ -583,6 +583,12 @@ static int mdio_read(void __iomem *ioaddr, int reg_addr) | ||
45 | } | ||
46 | udelay(25); | ||
47 | } | ||
48 | + /* | ||
49 | + * According to hardware specs a 20us delay is required after read | ||
50 | + * complete indication, but before sending next command. | ||
51 | + */ | ||
52 | + udelay(20); | ||
53 | + | ||
54 | return value; | ||
55 | } | ||
56 | |||
diff --git a/main/linux-pae/r8169-fix-random-mdio_write-failures.patch b/main/linux-pae/r8169-fix-random-mdio_write-failures.patch new file mode 100644 index 0000000000..1e2beadd0f --- /dev/null +++ b/main/linux-pae/r8169-fix-random-mdio_write-failures.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From 024a07bacf8287a6ddfa83e9d5b951c5e8b4070e Mon Sep 17 00:00:00 2001 | ||
2 | From: =?utf8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Sun, 6 Jun 2010 15:38:47 -0700 | ||
4 | Subject: [PATCH 1/1] r8169: fix random mdio_write failures | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=utf8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Some configurations need delay between the "write completed" indication | ||
10 | and new write to work reliably. | ||
11 | |||
12 | Realtek driver seems to use longer delay when polling the "write complete" | ||
13 | bit, so it waits long enough between writes with high probability (but | ||
14 | could probably break too). This patch adds a new udelay to make sure we | ||
15 | wait unconditionally some time after the write complete indication. | ||
16 | |||
17 | This caused a regression with XID 18000000 boards when the board specific | ||
18 | phy configuration writing many mdio registers was added in commit | ||
19 | 2e955856ff (r8169: phy init for the 8169scd). Some of the configration | ||
20 | mdio writes would almost always fail, and depending on failure might leave | ||
21 | the PHY in non-working state. | ||
22 | |||
23 | Signed-off-by: Timo Teräs <timo.teras@iki.fi> | ||
24 | Acked-off-by: Francois Romieu <romieu@fr.zoreil.com> | ||
25 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
26 | --- | ||
27 | drivers/net/r8169.c | 5 +++++ | ||
28 | 1 files changed, 5 insertions(+), 0 deletions(-) | ||
29 | |||
30 | diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c | ||
31 | index 217e709..03a8318 100644 | ||
32 | --- a/drivers/net/r8169.c | ||
33 | +++ b/drivers/net/r8169.c | ||
34 | @@ -559,6 +559,11 @@ static void mdio_write(void __iomem *ioaddr, int reg_addr, int value) | ||
35 | break; | ||
36 | udelay(25); | ||
37 | } | ||
38 | + /* | ||
39 | + * Some configurations require a small delay even after the write | ||
40 | + * completed indication or the next write might fail. | ||
41 | + */ | ||
42 | + udelay(25); | ||
43 | } | ||
44 | |||
45 | static int mdio_read(void __iomem *ioaddr, int reg_addr) | ||
46 | -- | ||
47 | 1.7.1 | ||
48 | |||
diff --git a/main/linux-pae/x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch b/main/linux-pae/x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch new file mode 100644 index 0000000000..a4f94d7fa4 --- /dev/null +++ b/main/linux-pae/x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From f1f6baf8f1df29be38003089787e378567ce0086 Mon Sep 17 00:00:00 2001 | ||
2 | From: H. Peter Anvin <hpa@zytor.com> | ||
3 | Date: Wed, 17 Feb 2010 18:32:06 -0800 | ||
4 | Subject: [PATCH] x86, setup: When restoring the screen, update boot_params.screen_info | ||
5 | |||
6 | When we restore the screen content after a mode change, we return the | ||
7 | cursor to its former position. However, we need to also update | ||
8 | boot_params.screen_info accordingly, so that the decompression code | ||
9 | knows where on the screen the cursor is. Just in case the video BIOS | ||
10 | does something extra screwy, read the cursor position back from the | ||
11 | BIOS instead of relying on it doing the right thing. | ||
12 | |||
13 | While we're at it, make sure we cap the cursor position to the new | ||
14 | screen coordinates. | ||
15 | |||
16 | Reported-by: Wim Osterholt <wim@djo.tudelft.nl> | ||
17 | Bugzilla-Reference: http://bugzilla.kernel.org/show_bug.cgi?id=15329 | ||
18 | Signed-off-by: H. Peter Anvin <hpa@zytor.com> | ||
19 | --- | ||
20 | arch/x86/boot/video.c | 7 +++++++ | ||
21 | 1 files changed, 7 insertions(+), 0 deletions(-) | ||
22 | |||
23 | diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c | ||
24 | index f767164..43eda28 100644 | ||
25 | --- a/arch/x86/boot/video.c | ||
26 | +++ b/arch/x86/boot/video.c | ||
27 | @@ -298,11 +298,18 @@ static void restore_screen(void) | ||
28 | } | ||
29 | |||
30 | /* Restore cursor position */ | ||
31 | + if (saved.curx >= xs) | ||
32 | + saved.curx = xs-1; | ||
33 | + if (saved.cury >= ys) | ||
34 | + saved.cury = ys-1; | ||
35 | + | ||
36 | initregs(&ireg); | ||
37 | ireg.ah = 0x02; /* Set cursor position */ | ||
38 | ireg.dh = saved.cury; | ||
39 | ireg.dl = saved.curx; | ||
40 | intcall(0x10, &ireg, NULL); | ||
41 | + | ||
42 | + store_cursor_position(); | ||
43 | } | ||
44 | |||
45 | void set_video(void) | ||
46 | -- | ||
47 | 1.7.1 | ||
48 | |||
diff --git a/main/linux-pae/xfrm-cache-size-revert.patch b/main/linux-pae/xfrm-cache-size-revert.patch deleted file mode 100644 index c8fcbd0d79..0000000000 --- a/main/linux-pae/xfrm-cache-size-revert.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c | ||
2 | index 74fb2eb..e158860 100644 | ||
3 | --- a/net/ipv4/xfrm4_policy.c | ||
4 | +++ b/net/ipv4/xfrm4_policy.c | ||
5 | @@ -308,7 +308,6 @@ void __init xfrm4_init(int rt_max_size) | ||
6 | * That will let us store an ipsec connection per route table entry, | ||
7 | * and start cleaning when were 1/2 full | ||
8 | */ | ||
9 | - xfrm4_dst_ops.gc_thresh = rt_max_size/2; | ||
10 | #ifdef CONFIG_SYSCTL | ||
11 | sysctl_hdr = register_net_sysctl_table(&init_net, net_ipv4_ctl_path, | ||
12 | xfrm4_policy_table); | ||
diff --git a/main/linux-pae/xfrm-fix-policy-unreferencing-on-larval-drop.patch b/main/linux-pae/xfrm-fix-policy-unreferencing-on-larval-drop.patch new file mode 100644 index 0000000000..25dc0dcdc2 --- /dev/null +++ b/main/linux-pae/xfrm-fix-policy-unreferencing-on-larval-drop.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c | ||
2 | index 31f4ba4..f4ea3a0 100644 | ||
3 | --- a/net/xfrm/xfrm_policy.c | ||
4 | +++ b/net/xfrm/xfrm_policy.c | ||
5 | @@ -1805,7 +1805,7 @@ restart: | ||
6 | /* EREMOTE tells the caller to generate | ||
7 | * a one-shot blackhole route. */ | ||
8 | dst_release(dst); | ||
9 | - xfrm_pols_put(pols, num_pols); | ||
10 | + xfrm_pols_put(pols, drop_pols); | ||
11 | XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES); | ||
12 | return -EREMOTE; | ||
13 | } | ||
14 | |||
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD index 57f7ec0607..39b1453de2 100644 --- a/main/linux-vserver/APKBUILD +++ b/main/linux-vserver/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | _flavor=vserver | 3 | _flavor=vserver |
4 | pkgname=linux-${_flavor} | 4 | pkgname=linux-${_flavor} |
5 | pkgver=2.6.32.13 | 5 | pkgver=2.6.32.15 |
6 | 6 | ||
7 | _kernver=2.6.32 | 7 | _kernver=2.6.32 |
8 | pkgrel=0 | 8 | pkgrel=0 |
@@ -15,7 +15,7 @@ _config=${config:-kernelconfig.${CARCH:-x86}} | |||
15 | install= | 15 | install= |
16 | source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 | 16 | source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 |
17 | ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 | 17 | ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 |
18 | http://vserver.13thfloor.at/Experimental/patch-2.6.32.13-vs2.3.0.36.29.4.diff | 18 | http://vserver.13thfloor.at/Experimental/patch-2.6.32.15-vs2.3.0.36.29.4.diff |
19 | kernelconfig.x86 | 19 | kernelconfig.x86 |
20 | " | 20 | " |
21 | subpackages="$pkgname-dev" | 21 | subpackages="$pkgname-dev" |
@@ -50,7 +50,10 @@ menuconfig() { | |||
50 | 50 | ||
51 | build() { | 51 | build() { |
52 | cd "$srcdir"/build | 52 | cd "$srcdir"/build |
53 | make CC="${CC:-gcc}" || return 1 | 53 | make CC="${CC:-gcc}" \ |
54 | KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ | ||
55 | || return 1 | ||
56 | |||
54 | } | 57 | } |
55 | 58 | ||
56 | package() { | 59 | package() { |
@@ -115,6 +118,6 @@ dev() { | |||
115 | } | 118 | } |
116 | 119 | ||
117 | md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 | 120 | md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 |
118 | ba6abb1ffee513a1d4f831599ddae490 patch-2.6.32.13.bz2 | 121 | 5c9251844c2819eddee4dba1293bd46d patch-2.6.32.15.bz2 |
119 | ef893f851b25e3806f24f1460e11f9b5 patch-2.6.32.13-vs2.3.0.36.29.4.diff | 122 | 8680ecd1342691a5974fb08d7d60beb2 patch-2.6.32.15-vs2.3.0.36.29.4.diff |
120 | 42ce36a36e7c71ee54761e56d59d17ed kernelconfig.x86" | 123 | 42ce36a36e7c71ee54761e56d59d17ed kernelconfig.x86" |
diff --git a/testing/ltrace/APKBUILD b/main/ltrace/APKBUILD index 145c2a5454..145c2a5454 100644 --- a/testing/ltrace/APKBUILD +++ b/main/ltrace/APKBUILD | |||
diff --git a/main/lua-alt-getopt/APKBUILD b/main/lua-alt-getopt/APKBUILD new file mode 100644 index 0000000000..367097151d --- /dev/null +++ b/main/lua-alt-getopt/APKBUILD | |||
@@ -0,0 +1,28 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinlinux.org> | ||
2 | pkgname=lua-alt-getopt | ||
3 | pkgver=0.7.0 | ||
4 | pkgrel=0 | ||
5 | pkgdesc="Lua module for processing options similar to getopt_long(3)" | ||
6 | url="http://luaforge.net/projects/alt-getopt/" | ||
7 | license="MIT" | ||
8 | depends="lua" | ||
9 | makedepends= | ||
10 | install= | ||
11 | subpackages= | ||
12 | source="http://mova.org/~cheusov/pub/lua_alt_getopt/lua-alt-getopt-$pkgver.tar.gz" | ||
13 | |||
14 | _builddir="$srcdir"/$pkgname-$pkgver | ||
15 | prepare() { | ||
16 | cd "$_builddir" | ||
17 | } | ||
18 | |||
19 | build() { | ||
20 | cd "$_builddir" | ||
21 | } | ||
22 | |||
23 | package() { | ||
24 | cd "$_builddir" | ||
25 | install -Dm644 alt_getopt.lua "$pkgdir"/usr/share/lua/5.1/alt_getopt.lua | ||
26 | } | ||
27 | |||
28 | md5sums="f504578b1287ea02759add231b972812 lua-alt-getopt-0.7.0.tar.gz" | ||
diff --git a/testing/lua-stdlib/APKBUILD b/main/lua-stdlib/APKBUILD index e0f459d867..9d9f5a0214 100644 --- a/testing/lua-stdlib/APKBUILD +++ b/main/lua-stdlib/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natnae | 1 | # Maintainer: Natnae |
2 | pkgname=lua-stdlib | 2 | pkgname=lua-stdlib |
3 | pkgver=12 | 3 | pkgver=13 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="Lua library of modules for common programming tasks" | 5 | pkgdesc="Lua library of modules for common programming tasks" |
6 | url="http://luaforge.net/projects/stdlib/" | 6 | url="http://luaforge.net/projects/stdlib/" |
@@ -9,7 +9,7 @@ depends= | |||
9 | makedepends= | 9 | makedepends= |
10 | install= | 10 | install= |
11 | subpackages="$pkgname-doc" | 11 | subpackages="$pkgname-doc" |
12 | source="http://luaforge.net/frs/download.php/4232/stdlib-12.tar.gz" | 12 | source="http://luaforge.net/frs/download.php/4581/stdlib-13.tar.gz" |
13 | 13 | ||
14 | _builddir="$srcdir"/stdlib | 14 | _builddir="$srcdir"/stdlib |
15 | _luashare=/usr/share/lua/5.1 | 15 | _luashare=/usr/share/lua/5.1 |
@@ -25,4 +25,4 @@ package() { | |||
25 | install -m644 modules/*.html "$pkgdir"/usr/share/doc/$pkgname/ | 25 | install -m644 modules/*.html "$pkgdir"/usr/share/doc/$pkgname/ |
26 | } | 26 | } |
27 | 27 | ||
28 | md5sums="34b07fde9931279d265f23492a22483b stdlib-12.tar.gz" | 28 | md5sums="592cbfb622a0a9a7d8c6d7ca6657bc05 stdlib-13.tar.gz" |
diff --git a/main/lvm2/APKBUILD b/main/lvm2/APKBUILD index fb136497cf..4be2a3f9bb 100644 --- a/main/lvm2/APKBUILD +++ b/main/lvm2/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=lvm2 | 2 | pkgname=lvm2 |
3 | pkgver=2.02.64 | 3 | pkgver=2.02.66 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="Logical Volume Manager 2 utilities" | 5 | pkgdesc="Logical Volume Manager 2 utilities" |
6 | url="http://sourceware.org/lvm2/" | 6 | url="http://sourceware.org/lvm2/" |
7 | license="GPL" | 7 | license="GPL" |
@@ -47,6 +47,6 @@ dm() { | |||
47 | mv "$pkgdir"/sbin/dm* "$subpkgdir"/sbin/ | 47 | mv "$pkgdir"/sbin/dm* "$subpkgdir"/sbin/ |
48 | } | 48 | } |
49 | 49 | ||
50 | md5sums="59fc0f7f6703a8c7f12df6b7d2e509fb LVM2.2.02.64.tgz | 50 | md5sums="59766571610a4298f8bedf9f73839050 LVM2.2.02.66.tgz |
51 | 6f65f902cf19f144a42b8d6aceadf395 lvm.initd | 51 | 6f65f902cf19f144a42b8d6aceadf395 lvm.initd |
52 | ec36d5fe4561220304e406c5c797e71f lvm.confd" | 52 | ec36d5fe4561220304e406c5c797e71f lvm.confd" |
diff --git a/main/mercurial/APKBUILD b/main/mercurial/APKBUILD index f371183283..fbe899324a 100644 --- a/main/mercurial/APKBUILD +++ b/main/mercurial/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=mercurial | 2 | pkgname=mercurial |
3 | pkgver=1.5.3 | 3 | pkgver=1.5.4 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="A scalable distributed SCM tool" | 5 | pkgdesc="A scalable distributed SCM tool" |
6 | url="http://www.selenic.com/mercurial" | 6 | url="http://www.selenic.com/mercurial" |
@@ -29,4 +29,4 @@ package() { | |||
29 | install -Dm644 contrib/vim/HGAnnotate.vim \ | 29 | install -Dm644 contrib/vim/HGAnnotate.vim \ |
30 | "${vimpath}/syntax/HGAnnotate.vim" || return 1 | 30 | "${vimpath}/syntax/HGAnnotate.vim" || return 1 |
31 | } | 31 | } |
32 | md5sums="0969b8109f1b5a9c4debf985cca938f9 mercurial-1.5.3.tar.gz" | 32 | md5sums="db0d673000463fae1ca5cb8a202315ae mercurial-1.5.4.tar.gz" |
diff --git a/main/midori/APKBUILD b/main/midori/APKBUILD index 4b05196edf..d67b1b88b9 100644 --- a/main/midori/APKBUILD +++ b/main/midori/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=midori | 2 | pkgname=midori |
3 | pkgver=0.2.5 | 3 | pkgver=0.2.6 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="A lightweight web browser based on Gtk WebKit" | 5 | pkgdesc="A lightweight web browser based on Gtk WebKit" |
6 | url="http://www.twotoasts.de/index.php?/pages/midori_summary.html" | 6 | url="http://www.twotoasts.de/index.php?/pages/midori_summary.html" |
@@ -45,4 +45,4 @@ package() { | |||
45 | # PAX does not like the JIT | 45 | # PAX does not like the JIT |
46 | paxctl -c -m -p "$pkgdir"/usr/bin/midori | 46 | paxctl -c -m -p "$pkgdir"/usr/bin/midori |
47 | } | 47 | } |
48 | md5sums="3aeacd04d4d3e5c3bc16824696ff57b2 midori-0.2.5.tar.bz2" | 48 | md5sums="249ddb3485d8246e0fda25dd735953f0 midori-0.2.6.tar.bz2" |
diff --git a/main/mpd/APKBUILD b/main/mpd/APKBUILD index a549978c6b..3046c0002b 100644 --- a/main/mpd/APKBUILD +++ b/main/mpd/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Contributor: Sebastian Wicki <gandro@gmx.net> | 1 | # Contributor: Sebastian Wicki <gandro@gmx.net> |
2 | # Maintainer: Natanael Copa <natanael.copa@gmail.com> | 2 | # Maintainer: Natanael Copa <natanael.copa@gmail.com> |
3 | pkgname=mpd | 3 | pkgname=mpd |
4 | pkgver=0.15.9 | 4 | pkgver=0.15.10 |
5 | pkgrel=2 | 5 | pkgrel=0 |
6 | pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" | 6 | pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" |
7 | url="http://musicpd.org" | 7 | url="http://musicpd.org" |
8 | pkgusers="mpd" | 8 | pkgusers="mpd" |
@@ -47,6 +47,6 @@ package() { | |||
47 | "$pkgdir"/var/lib/mpd/playlists \ | 47 | "$pkgdir"/var/lib/mpd/playlists \ |
48 | "$pkgdir"/var/lib/mpd/music | 48 | "$pkgdir"/var/lib/mpd/music |
49 | } | 49 | } |
50 | md5sums="88f7bc0b17eac81d03b24929d12b8aa1 mpd-0.15.9.tar.bz2 | 50 | md5sums="fb18fa3ed5ff7e3719536a6603098df5 mpd-0.15.10.tar.bz2 |
51 | 31d1515232d688d610d1664a0fb2a6a0 mpd.initd | 51 | 31d1515232d688d610d1664a0fb2a6a0 mpd.initd |
52 | dbd301041953a5cf9c2b9de8f23eb6bb mpd.confd" | 52 | dbd301041953a5cf9c2b9de8f23eb6bb mpd.confd" |
diff --git a/main/mysql/APKBUILD b/main/mysql/APKBUILD index ff1776fde1..492767901f 100644 --- a/main/mysql/APKBUILD +++ b/main/mysql/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Contributor: Carlo Landmeter <clandmeter@gmail.com> | 1 | # Contributor: Carlo Landmeter <clandmeter@gmail.com> |
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
3 | pkgname=mysql | 3 | pkgname=mysql |
4 | pkgver=5.1.46 | 4 | pkgver=5.1.47 |
5 | pkgrel=1 | 5 | pkgrel=0 |
6 | pkgdesc="A fast SQL database server" | 6 | pkgdesc="A fast SQL database server" |
7 | url="http://www.mysql.com/" | 7 | url="http://www.mysql.com/" |
8 | license='GPL' | 8 | license='GPL' |
@@ -77,6 +77,6 @@ client() { | |||
77 | done | 77 | done |
78 | } | 78 | } |
79 | 79 | ||
80 | md5sums="04f7c1422199c73a88a3d408b9161b63 mysql-5.1.46.tar.gz | 80 | md5sums="02b9964b3966832f3d6bc87524bfd73f mysql-5.1.47.tar.gz |
81 | 25d08b02bff6aa379dc45859b7a3f28a mysql.initd | 81 | 25d08b02bff6aa379dc45859b7a3f28a mysql.initd |
82 | 15a7e3ddd6a40bf5a1eb3a8c69d9c34c mysql.mycnf" | 82 | 15a7e3ddd6a40bf5a1eb3a8c69d9c34c mysql.mycnf" |
diff --git a/testing/nagios/APKBUILD b/main/nagios/APKBUILD index 1bde07a882..37ac05db46 100644 --- a/testing/nagios/APKBUILD +++ b/main/nagios/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
2 | # Maintainer: Carlo Landmeter <clandmeter at gmail> | 2 | # Maintainer: Carlo Landmeter <clandmeter at gmail> |
3 | pkgname=nagios | 3 | pkgname=nagios |
4 | pkgver=3.2.1 | 4 | pkgver=3.2.1 |
5 | pkgrel=0 | 5 | pkgrel=1 |
6 | pkgdesc="Popular monitoring tool" | 6 | pkgdesc="Popular monitoring tool" |
7 | url="http://www.nagios.org/" | 7 | url="http://www.nagios.org/" |
8 | license="GPL-2" | 8 | license="GPL-2" |
@@ -50,7 +50,7 @@ web() { | |||
50 | #depends="php lighttpd" | 50 | #depends="php lighttpd" |
51 | mkdir -p "$subpkgdir"/usr | 51 | mkdir -p "$subpkgdir"/usr |
52 | mv "$pkgdir"/usr/share "$subpkgdir"/usr/ | 52 | mv "$pkgdir"/usr/share "$subpkgdir"/usr/ |
53 | install -m644 -D "$srcdir"/lighttpd-nagios.conf "$subpkgdir"/etc/lighttpd-nagios.conf | 53 | install -m644 -D "$srcdir"/lighttpd-nagios.conf "$subpkgdir"/etc/lighttpd/nagios.conf |
54 | } | 54 | } |
55 | 55 | ||
56 | md5sums="d4655ee8c95c9679fd4fd53dac34bbe3 nagios-3.2.1.tar.gz | 56 | md5sums="d4655ee8c95c9679fd4fd53dac34bbe3 nagios-3.2.1.tar.gz |
diff --git a/testing/nagios/lighttpd-nagios.conf b/main/nagios/lighttpd-nagios.conf index cb7081d841..cb7081d841 100644 --- a/testing/nagios/lighttpd-nagios.conf +++ b/main/nagios/lighttpd-nagios.conf | |||
diff --git a/testing/nagios/nagios.confd b/main/nagios/nagios.confd index 0abb80c6e8..0abb80c6e8 100644 --- a/testing/nagios/nagios.confd +++ b/main/nagios/nagios.confd | |||
diff --git a/testing/nagios/nagios.initd b/main/nagios/nagios.initd index e0b3bcf0c3..e0b3bcf0c3 100644 --- a/testing/nagios/nagios.initd +++ b/main/nagios/nagios.initd | |||
diff --git a/main/nano/APKBUILD b/main/nano/APKBUILD index 67e6ce8dbd..1c12ef0c48 100644 --- a/main/nano/APKBUILD +++ b/main/nano/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Contributor: Michael Mason <ms13sp@gmail.com> | 1 | # Contributor: Michael Mason <ms13sp@gmail.com> |
2 | # Maintainer: Michael Mason <ms13sp@gmail.com> | 2 | # Maintainer: Michael Mason <ms13sp@gmail.com> |
3 | pkgname=nano | 3 | pkgname=nano |
4 | pkgver=2.2.3 | 4 | pkgver=2.2.4 |
5 | pkgrel=1 | 5 | pkgrel=0 |
6 | pkgdesc="Text Editor. GNU nano is designed to be a free replacement for the Pico text editor." | 6 | pkgdesc="Text Editor. GNU nano is designed to be a free replacement for the Pico text editor." |
7 | url="http://www.nano-editor.org/" | 7 | url="http://www.nano-editor.org/" |
8 | license="GPL" | 8 | license="GPL" |
@@ -30,4 +30,4 @@ package() { | |||
30 | make DESTDIR="$pkgdir" install | 30 | make DESTDIR="$pkgdir" install |
31 | } | 31 | } |
32 | 32 | ||
33 | md5sums="91918a484f54f94fedaebe00dc393a50 nano-2.2.3.tar.gz" | 33 | md5sums="6304308afb1f7ef4a5e93eb99206632a nano-2.2.4.tar.gz" |
diff --git a/main/ngircd/APKBUILD b/main/ngircd/APKBUILD index 3b6dce216f..dfe18d979c 100644 --- a/main/ngircd/APKBUILD +++ b/main/ngircd/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=ngircd | 2 | pkgname=ngircd |
3 | pkgver=15 | 3 | pkgver=16 |
4 | pkgrel=2 | 4 | pkgrel=0 |
5 | pkgdesc="Next Generation IRC Daemon" | 5 | pkgdesc="Next Generation IRC Daemon" |
6 | url="http://ngircd.barton.de/" | 6 | url="http://ngircd.barton.de/" |
7 | license="GPL" | 7 | license="GPL" |
@@ -34,5 +34,5 @@ package() { | |||
34 | install -Dm755 ../$pkgname.initd "$pkgdir"/etc/init.d/$pkgname | 34 | install -Dm755 ../$pkgname.initd "$pkgdir"/etc/init.d/$pkgname |
35 | } | 35 | } |
36 | 36 | ||
37 | md5sums="c183a85eba6fe51255983848f099c8ae ngircd-15.tar.gz | 37 | md5sums="8c9e0382cd982b0ca77c05528ebe28eb ngircd-16.tar.gz |
38 | 50d8388540a2e3eb0630e8ac6369f394 ngircd.initd" | 38 | 50d8388540a2e3eb0630e8ac6369f394 ngircd.initd" |
diff --git a/testing/nspr/APKBUILD b/main/nspr/APKBUILD index 38f9d9c4d1..38f9d9c4d1 100644 --- a/testing/nspr/APKBUILD +++ b/main/nspr/APKBUILD | |||
diff --git a/testing/nspr/nspr-4.6.1-config-1.patch b/main/nspr/nspr-4.6.1-config-1.patch index b919c7930b..b919c7930b 100644 --- a/testing/nspr/nspr-4.6.1-config-1.patch +++ b/main/nspr/nspr-4.6.1-config-1.patch | |||
diff --git a/testing/nspr/nspr-4.7.0-prtime.patch b/main/nspr/nspr-4.7.0-prtime.patch index 74d5534d5a..74d5534d5a 100644 --- a/testing/nspr/nspr-4.7.0-prtime.patch +++ b/main/nspr/nspr-4.7.0-prtime.patch | |||
diff --git a/testing/nspr/nspr-4.8-config.patch b/main/nspr/nspr-4.8-config.patch index 4db2517e4e..4db2517e4e 100644 --- a/testing/nspr/nspr-4.8-config.patch +++ b/main/nspr/nspr-4.8-config.patch | |||
diff --git a/testing/nspr/nspr-4.8-pkgconfig-gentoo-3.patch b/main/nspr/nspr-4.8-pkgconfig-gentoo-3.patch index 2525928db4..2525928db4 100644 --- a/testing/nspr/nspr-4.8-pkgconfig-gentoo-3.patch +++ b/main/nspr/nspr-4.8-pkgconfig-gentoo-3.patch | |||
diff --git a/testing/nss/APKBUILD b/main/nss/APKBUILD index c795669ea7..c795669ea7 100644 --- a/testing/nss/APKBUILD +++ b/main/nss/APKBUILD | |||
diff --git a/testing/nss/add_spi+cacert_ca_certs.patch b/main/nss/add_spi+cacert_ca_certs.patch index a8969ee43f..a8969ee43f 100644 --- a/testing/nss/add_spi+cacert_ca_certs.patch +++ b/main/nss/add_spi+cacert_ca_certs.patch | |||
diff --git a/testing/nss/nss-config.in b/main/nss/nss-config.in index f8f893e71a..f8f893e71a 100644 --- a/testing/nss/nss-config.in +++ b/main/nss/nss-config.in | |||
diff --git a/testing/nss/nss-no-rpath.patch b/main/nss/nss-no-rpath.patch index 35ea573154..35ea573154 100644 --- a/testing/nss/nss-no-rpath.patch +++ b/main/nss/nss-no-rpath.patch | |||
diff --git a/testing/nss/nss-nolocalsql.patch b/main/nss/nss-nolocalsql.patch index dc75a223fc..dc75a223fc 100644 --- a/testing/nss/nss-nolocalsql.patch +++ b/main/nss/nss-nolocalsql.patch | |||
diff --git a/testing/nss/nss.pc.in b/main/nss/nss.pc.in index d47b9e1469..d47b9e1469 100644 --- a/testing/nss/nss.pc.in +++ b/main/nss/nss.pc.in | |||
diff --git a/testing/nss/ssl-renegotiate-transitional.patch b/main/nss/ssl-renegotiate-transitional.patch index f457c55518..f457c55518 100644 --- a/testing/nss/ssl-renegotiate-transitional.patch +++ b/main/nss/ssl-renegotiate-transitional.patch | |||
diff --git a/main/openssh/APKBUILD b/main/openssh/APKBUILD index 3fc470ae0c..f34efa31ed 100644 --- a/main/openssh/APKBUILD +++ b/main/openssh/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=openssh | 2 | pkgname=openssh |
3 | pkgver=5.4_p1 | 3 | pkgver=5.5_p1 |
4 | _myver=${pkgver%_*}${pkgver#*_} | 4 | _myver=${pkgver%_*}${pkgver#*_} |
5 | pkgrel=2 | 5 | pkgrel=0 |
6 | pkgdesc="Port of OpenBSD's free SSH release" | 6 | pkgdesc="Port of OpenBSD's free SSH release" |
7 | url="http://www.openssh.org/portable.html" | 7 | url="http://www.openssh.org/portable.html" |
8 | license="as-is" | 8 | license="as-is" |
@@ -62,6 +62,6 @@ client() { | |||
62 | "$subpkgdir"/etc/ssh/ | 62 | "$subpkgdir"/etc/ssh/ |
63 | } | 63 | } |
64 | 64 | ||
65 | md5sums="da10af8a789fa2e83e3635f3a1b76f5e openssh-5.4p1.tar.gz | 65 | md5sums="88633408f4cb1eb11ec7e2ec58b519eb openssh-5.5p1.tar.gz |
66 | d993cc91e9fab6c6012390874c28af0a sshd.initd | 66 | d993cc91e9fab6c6012390874c28af0a sshd.initd |
67 | b35e9f3829f4cfca07168fcba98749c7 sshd.confd" | 67 | b35e9f3829f4cfca07168fcba98749c7 sshd.confd" |
diff --git a/main/openssl/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch b/main/openssl/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch new file mode 100644 index 0000000000..514ed0d83a --- /dev/null +++ b/main/openssl/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch | |||
@@ -0,0 +1,82 @@ | |||
1 | From 16a40910dd3ae5ab702ee1274f9e2f08362e4474 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Fri, 4 Jun 2010 09:48:39 +0300 | ||
4 | Subject: [PATCH 1/3] crypto/hmac: support EVP_MD_CTX_FLAG_ONESHOT and set it properly | ||
5 | |||
6 | Some engines (namely VIA C7 Padlock) work only if EVP_MD_CTX_FLAG_ONESHOT | ||
7 | is set before final update. This is because some crypto accelerators cannot | ||
8 | perform non-finalizing transform of the digest. | ||
9 | |||
10 | The usage of EVP_MD_CTX_FLAG_ONESHOT is used semantically slightly | ||
11 | differently here. It is set before the final EVP_DigestUpdate call, not | ||
12 | necessarily before EVP_DigestInit call. This will not cause any problems | ||
13 | though. | ||
14 | --- | ||
15 | crypto/hmac/hmac.c | 14 +++++++++++--- | ||
16 | 1 files changed, 11 insertions(+), 3 deletions(-) | ||
17 | |||
18 | diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c | ||
19 | index 45015fe..7ce2a50 100644 | ||
20 | --- a/crypto/hmac/hmac.c | ||
21 | +++ b/crypto/hmac/hmac.c | ||
22 | @@ -66,6 +66,7 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, | ||
23 | { | ||
24 | int i,j,reset=0; | ||
25 | unsigned char pad[HMAC_MAX_MD_CBLOCK]; | ||
26 | + unsigned long flags; | ||
27 | |||
28 | if (md != NULL) | ||
29 | { | ||
30 | @@ -82,6 +83,7 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, | ||
31 | OPENSSL_assert(j <= (int)sizeof(ctx->key)); | ||
32 | if (j < len) | ||
33 | { | ||
34 | + EVP_MD_CTX_set_flags(&ctx->md_ctx, EVP_MD_CTX_FLAG_ONESHOT); | ||
35 | if (!EVP_DigestInit_ex(&ctx->md_ctx,md, impl)) | ||
36 | goto err; | ||
37 | if (!EVP_DigestUpdate(&ctx->md_ctx,key,len)) | ||
38 | @@ -105,17 +107,22 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, | ||
39 | { | ||
40 | for (i=0; i<HMAC_MAX_MD_CBLOCK; i++) | ||
41 | pad[i]=0x36^ctx->key[i]; | ||
42 | + flags = EVP_MD_CTX_test_flags(&ctx->i_ctx, EVP_MD_CTX_FLAG_ONESHOT); | ||
43 | + EVP_MD_CTX_clear_flags(&ctx->i_ctx, EVP_MD_CTX_FLAG_ONESHOT); | ||
44 | if (!EVP_DigestInit_ex(&ctx->i_ctx,md, impl)) | ||
45 | goto err; | ||
46 | if (!EVP_DigestUpdate(&ctx->i_ctx,pad,EVP_MD_block_size(md))) | ||
47 | goto err; | ||
48 | + EVP_MD_CTX_set_flags(&ctx->i_ctx, flags); | ||
49 | |||
50 | for (i=0; i<HMAC_MAX_MD_CBLOCK; i++) | ||
51 | pad[i]=0x5c^ctx->key[i]; | ||
52 | + EVP_MD_CTX_clear_flags(&ctx->o_ctx, EVP_MD_CTX_FLAG_ONESHOT); | ||
53 | if (!EVP_DigestInit_ex(&ctx->o_ctx,md, impl)) | ||
54 | goto err; | ||
55 | if (!EVP_DigestUpdate(&ctx->o_ctx,pad,EVP_MD_block_size(md))) | ||
56 | goto err; | ||
57 | + EVP_MD_CTX_set_flags(&ctx->o_ctx, EVP_MD_CTX_FLAG_ONESHOT); | ||
58 | } | ||
59 | if (!EVP_MD_CTX_copy_ex(&ctx->md_ctx,&ctx->i_ctx)) | ||
60 | goto err; | ||
61 | @@ -197,7 +204,8 @@ unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len, | ||
62 | |||
63 | if (md == NULL) md=m; | ||
64 | HMAC_CTX_init(&c); | ||
65 | - if (!HMAC_Init(&c,key,key_len,evp_md)) | ||
66 | + HMAC_CTX_set_flags(&c, EVP_MD_CTX_FLAG_ONESHOT); | ||
67 | + if (!HMAC_Init_ex(&c,key,key_len,evp_md,NULL)) | ||
68 | goto err; | ||
69 | if (!HMAC_Update(&c,d,n)) | ||
70 | goto err; | ||
71 | @@ -212,6 +220,6 @@ unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len, | ||
72 | void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags) | ||
73 | { | ||
74 | EVP_MD_CTX_set_flags(&ctx->i_ctx, flags); | ||
75 | - EVP_MD_CTX_set_flags(&ctx->o_ctx, flags); | ||
76 | - EVP_MD_CTX_set_flags(&ctx->md_ctx, flags); | ||
77 | + EVP_MD_CTX_set_flags(&ctx->o_ctx, flags & ~EVP_MD_CTX_FLAG_ONESHOT); | ||
78 | + EVP_MD_CTX_set_flags(&ctx->md_ctx, flags & ~EVP_MD_CTX_FLAG_ONESHOT); | ||
79 | } | ||
80 | -- | ||
81 | 1.7.0.4 | ||
82 | |||
diff --git a/main/openssl/0002-apps-speed-fix-digest-speed-measurement-and-add-hmac.patch b/main/openssl/0002-apps-speed-fix-digest-speed-measurement-and-add-hmac.patch new file mode 100644 index 0000000000..8859f40601 --- /dev/null +++ b/main/openssl/0002-apps-speed-fix-digest-speed-measurement-and-add-hmac.patch | |||
@@ -0,0 +1,392 @@ | |||
1 | From de61d5881a12b359dfb1b4fbbb53412460196553 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Thu, 3 Jun 2010 09:02:13 +0300 | ||
4 | Subject: [PATCH 2/3] apps/speed: fix digest speed measurement and add hmac-sha1 test | ||
5 | |||
6 | Merge the common code of testing digest speed, and make it reuse | ||
7 | existing context. Context creation can be heavy operation, and it's | ||
8 | speed depends on if engine is used or not. As we are measuring the | ||
9 | digest speed, the context creation overhead should not be included | ||
10 | like hmac tests do. | ||
11 | |||
12 | This also adds test for hmac-sha1 speed. | ||
13 | --- | ||
14 | apps/speed.c | 243 +++++++++++++++++++++------------------------------------- | ||
15 | 1 files changed, 86 insertions(+), 157 deletions(-) | ||
16 | |||
17 | diff --git a/apps/speed.c b/apps/speed.c | ||
18 | index 539bfff..f64289e 100644 | ||
19 | --- a/apps/speed.c | ||
20 | +++ b/apps/speed.c | ||
21 | @@ -214,7 +214,7 @@ static void print_result(int alg,int run_no,int count,double time_used); | ||
22 | static int do_multi(int multi); | ||
23 | #endif | ||
24 | |||
25 | -#define ALGOR_NUM 29 | ||
26 | +#define ALGOR_NUM 30 | ||
27 | #define SIZE_NUM 5 | ||
28 | #define RSA_NUM 4 | ||
29 | #define DSA_NUM 3 | ||
30 | @@ -229,9 +229,11 @@ static const char *names[ALGOR_NUM]={ | ||
31 | "aes-128 cbc","aes-192 cbc","aes-256 cbc", | ||
32 | "camellia-128 cbc","camellia-192 cbc","camellia-256 cbc", | ||
33 | "evp","sha256","sha512","whirlpool", | ||
34 | - "aes-128 ige","aes-192 ige","aes-256 ige"}; | ||
35 | + "aes-128 ige","aes-192 ige","aes-256 ige","hmac(sha1)"}; | ||
36 | static double results[ALGOR_NUM][SIZE_NUM]; | ||
37 | static int lengths[SIZE_NUM]={16,64,256,1024,8*1024}; | ||
38 | +static unsigned char *buf=NULL,*buf2=NULL; | ||
39 | +static long c[ALGOR_NUM][SIZE_NUM]; | ||
40 | #ifndef OPENSSL_NO_RSA | ||
41 | static double rsa_results[RSA_NUM][2]; | ||
42 | #endif | ||
43 | @@ -329,6 +331,66 @@ static void *KDF1_SHA1(const void *in, size_t inlen, void *out, size_t *outlen) | ||
44 | } | ||
45 | #endif /* OPENSSL_NO_ECDH */ | ||
46 | |||
47 | +#ifndef SIGALRM | ||
48 | +#define COND(d) (count < (d)) | ||
49 | +#else | ||
50 | +#define COND(c) (run) | ||
51 | +#endif /* SIGALRM */ | ||
52 | + | ||
53 | +static void Test_Digest(int digest, const EVP_MD *type) | ||
54 | +{ | ||
55 | + unsigned char md[EVP_MAX_MD_SIZE]; | ||
56 | + int j, count; | ||
57 | + double d=0.0; | ||
58 | + EVP_MD_CTX ctx; | ||
59 | + | ||
60 | + EVP_MD_CTX_init(&ctx); | ||
61 | + EVP_MD_CTX_set_flags(&ctx,EVP_MD_CTX_FLAG_ONESHOT); | ||
62 | + | ||
63 | + for (j=0; j<SIZE_NUM; j++) | ||
64 | + { | ||
65 | + print_message(names[digest],c[digest][j],lengths[j]); | ||
66 | + Time_F(START); | ||
67 | + for (count=0,run=1; COND(c[digest][j]); count++) | ||
68 | + { | ||
69 | + EVP_DigestInit_ex(&ctx, type, NULL); | ||
70 | + EVP_DigestUpdate(&ctx, buf, (unsigned long)lengths[j]); | ||
71 | + EVP_DigestFinal_ex(&ctx, md, NULL); | ||
72 | + } | ||
73 | + d=Time_F(STOP); | ||
74 | + print_result(digest,j,count,d); | ||
75 | + } | ||
76 | + | ||
77 | + EVP_MD_CTX_cleanup(&ctx); | ||
78 | +} | ||
79 | + | ||
80 | +static void Test_HMAC(int digest, const EVP_MD *type) | ||
81 | +{ | ||
82 | + unsigned char md[EVP_MAX_MD_SIZE]; | ||
83 | + HMAC_CTX hctx; | ||
84 | + int j, count; | ||
85 | + double d=0.0; | ||
86 | + | ||
87 | + HMAC_CTX_init(&hctx); | ||
88 | + HMAC_CTX_set_flags(&hctx, EVP_MD_CTX_FLAG_ONESHOT); | ||
89 | + HMAC_Init_ex(&hctx,(unsigned char *)"This is a key...", | ||
90 | + 16,type, NULL); | ||
91 | + | ||
92 | + for (j=0; j<SIZE_NUM; j++) | ||
93 | + { | ||
94 | + print_message(names[digest],c[digest][j],lengths[j]); | ||
95 | + Time_F(START); | ||
96 | + for (count=0,run=1; COND(c[digest][j]); count++) | ||
97 | + { | ||
98 | + HMAC_Init_ex(&hctx,NULL,0,NULL,NULL); | ||
99 | + HMAC_Update(&hctx,buf,lengths[j]); | ||
100 | + HMAC_Final(&hctx,md,NULL); | ||
101 | + } | ||
102 | + d=Time_F(STOP); | ||
103 | + print_result(digest,j,count,d); | ||
104 | + } | ||
105 | + HMAC_CTX_cleanup(&hctx); | ||
106 | +} | ||
107 | |||
108 | int MAIN(int, char **); | ||
109 | |||
110 | @@ -337,7 +399,6 @@ int MAIN(int argc, char **argv) | ||
111 | #ifndef OPENSSL_NO_ENGINE | ||
112 | ENGINE *e = NULL; | ||
113 | #endif | ||
114 | - unsigned char *buf=NULL,*buf2=NULL; | ||
115 | int mret=1; | ||
116 | long count=0,save_count=0; | ||
117 | int i,j,k; | ||
118 | @@ -348,34 +409,6 @@ int MAIN(int argc, char **argv) | ||
119 | unsigned rsa_num; | ||
120 | #endif | ||
121 | unsigned char md[EVP_MAX_MD_SIZE]; | ||
122 | -#ifndef OPENSSL_NO_MD2 | ||
123 | - unsigned char md2[MD2_DIGEST_LENGTH]; | ||
124 | -#endif | ||
125 | -#ifndef OPENSSL_NO_MDC2 | ||
126 | - unsigned char mdc2[MDC2_DIGEST_LENGTH]; | ||
127 | -#endif | ||
128 | -#ifndef OPENSSL_NO_MD4 | ||
129 | - unsigned char md4[MD4_DIGEST_LENGTH]; | ||
130 | -#endif | ||
131 | -#ifndef OPENSSL_NO_MD5 | ||
132 | - unsigned char md5[MD5_DIGEST_LENGTH]; | ||
133 | - unsigned char hmac[MD5_DIGEST_LENGTH]; | ||
134 | -#endif | ||
135 | -#ifndef OPENSSL_NO_SHA | ||
136 | - unsigned char sha[SHA_DIGEST_LENGTH]; | ||
137 | -#ifndef OPENSSL_NO_SHA256 | ||
138 | - unsigned char sha256[SHA256_DIGEST_LENGTH]; | ||
139 | -#endif | ||
140 | -#ifndef OPENSSL_NO_SHA512 | ||
141 | - unsigned char sha512[SHA512_DIGEST_LENGTH]; | ||
142 | -#endif | ||
143 | -#endif | ||
144 | -#ifndef OPENSSL_NO_WHIRLPOOL | ||
145 | - unsigned char whirlpool[WHIRLPOOL_DIGEST_LENGTH]; | ||
146 | -#endif | ||
147 | -#ifndef OPENSSL_NO_RIPEMD | ||
148 | - unsigned char rmd160[RIPEMD160_DIGEST_LENGTH]; | ||
149 | -#endif | ||
150 | #ifndef OPENSSL_NO_RC4 | ||
151 | RC4_KEY rc4_ks; | ||
152 | #endif | ||
153 | @@ -473,8 +506,8 @@ int MAIN(int argc, char **argv) | ||
154 | #define D_IGE_128_AES 26 | ||
155 | #define D_IGE_192_AES 27 | ||
156 | #define D_IGE_256_AES 28 | ||
157 | +#define D_HMAC_SHA1 29 | ||
158 | double d=0.0; | ||
159 | - long c[ALGOR_NUM][SIZE_NUM]; | ||
160 | #define R_DSA_512 0 | ||
161 | #define R_DSA_1024 1 | ||
162 | #define R_DSA_2048 2 | ||
163 | @@ -783,6 +816,8 @@ int MAIN(int argc, char **argv) | ||
164 | doit[D_SHA256]=1, | ||
165 | doit[D_SHA512]=1; | ||
166 | else | ||
167 | + if (strcmp(*argv,"hmac-sha1") == 0) doit[D_HMAC_SHA1]=1; | ||
168 | + else | ||
169 | #ifndef OPENSSL_NO_SHA256 | ||
170 | if (strcmp(*argv,"sha256") == 0) doit[D_SHA256]=1; | ||
171 | else | ||
172 | @@ -1000,6 +1035,9 @@ int MAIN(int argc, char **argv) | ||
173 | #endif | ||
174 | #ifndef OPENSSL_NO_SHA1 | ||
175 | BIO_printf(bio_err,"sha1 "); | ||
176 | +#ifndef OPENSSL_NO_HMAC | ||
177 | + BIO_printf(bio_err,"hmac-sha1 "); | ||
178 | +#endif | ||
179 | #endif | ||
180 | #ifndef OPENSSL_NO_SHA256 | ||
181 | BIO_printf(bio_err,"sha256 "); | ||
182 | @@ -1270,6 +1308,7 @@ int MAIN(int argc, char **argv) | ||
183 | c[D_IGE_128_AES][0]=count; | ||
184 | c[D_IGE_192_AES][0]=count; | ||
185 | c[D_IGE_256_AES][0]=count; | ||
186 | + c[D_HMAC_SHA1][0]=count; | ||
187 | |||
188 | for (i=1; i<SIZE_NUM; i++) | ||
189 | { | ||
190 | @@ -1283,6 +1322,7 @@ int MAIN(int argc, char **argv) | ||
191 | c[D_SHA256][i]=c[D_SHA256][0]*4*lengths[0]/lengths[i]; | ||
192 | c[D_SHA512][i]=c[D_SHA512][0]*4*lengths[0]/lengths[i]; | ||
193 | c[D_WHIRLPOOL][i]=c[D_WHIRLPOOL][0]*4*lengths[0]/lengths[i]; | ||
194 | + c[D_HMAC_SHA1][i]=c[D_HMAC_SHA1][0]*4*lengths[0]/lengths[i]; | ||
195 | } | ||
196 | for (i=1; i<SIZE_NUM; i++) | ||
197 | { | ||
198 | @@ -1457,15 +1497,11 @@ int MAIN(int argc, char **argv) | ||
199 | } | ||
200 | #endif | ||
201 | |||
202 | -#define COND(d) (count < (d)) | ||
203 | -#define COUNT(d) (d) | ||
204 | #else | ||
205 | /* not worth fixing */ | ||
206 | # error "You cannot disable DES on systems without SIGALRM." | ||
207 | #endif /* OPENSSL_NO_DES */ | ||
208 | #else | ||
209 | -#define COND(c) (run) | ||
210 | -#define COUNT(d) (count) | ||
211 | #ifndef _WIN32 | ||
212 | signal(SIGALRM,sig_done); | ||
213 | #endif | ||
214 | @@ -1473,161 +1509,54 @@ int MAIN(int argc, char **argv) | ||
215 | |||
216 | #ifndef OPENSSL_NO_MD2 | ||
217 | if (doit[D_MD2]) | ||
218 | - { | ||
219 | - for (j=0; j<SIZE_NUM; j++) | ||
220 | - { | ||
221 | - print_message(names[D_MD2],c[D_MD2][j],lengths[j]); | ||
222 | - Time_F(START); | ||
223 | - for (count=0,run=1; COND(c[D_MD2][j]); count++) | ||
224 | - EVP_Digest(buf,(unsigned long)lengths[j],&(md2[0]),NULL,EVP_md2(),NULL); | ||
225 | - d=Time_F(STOP); | ||
226 | - print_result(D_MD2,j,count,d); | ||
227 | - } | ||
228 | - } | ||
229 | + Test_Digest(D_MD2, EVP_md2()); | ||
230 | #endif | ||
231 | #ifndef OPENSSL_NO_MDC2 | ||
232 | if (doit[D_MDC2]) | ||
233 | - { | ||
234 | - for (j=0; j<SIZE_NUM; j++) | ||
235 | - { | ||
236 | - print_message(names[D_MDC2],c[D_MDC2][j],lengths[j]); | ||
237 | - Time_F(START); | ||
238 | - for (count=0,run=1; COND(c[D_MDC2][j]); count++) | ||
239 | - EVP_Digest(buf,(unsigned long)lengths[j],&(mdc2[0]),NULL,EVP_mdc2(),NULL); | ||
240 | - d=Time_F(STOP); | ||
241 | - print_result(D_MDC2,j,count,d); | ||
242 | - } | ||
243 | - } | ||
244 | + Test_Digest(D_MDC2, EVP_mdc2()); | ||
245 | #endif | ||
246 | |||
247 | #ifndef OPENSSL_NO_MD4 | ||
248 | if (doit[D_MD4]) | ||
249 | - { | ||
250 | - for (j=0; j<SIZE_NUM; j++) | ||
251 | - { | ||
252 | - print_message(names[D_MD4],c[D_MD4][j],lengths[j]); | ||
253 | - Time_F(START); | ||
254 | - for (count=0,run=1; COND(c[D_MD4][j]); count++) | ||
255 | - EVP_Digest(&(buf[0]),(unsigned long)lengths[j],&(md4[0]),NULL,EVP_md4(),NULL); | ||
256 | - d=Time_F(STOP); | ||
257 | - print_result(D_MD4,j,count,d); | ||
258 | - } | ||
259 | - } | ||
260 | + Test_Digest(D_MD4, EVP_md4()); | ||
261 | #endif | ||
262 | |||
263 | #ifndef OPENSSL_NO_MD5 | ||
264 | if (doit[D_MD5]) | ||
265 | - { | ||
266 | - for (j=0; j<SIZE_NUM; j++) | ||
267 | - { | ||
268 | - print_message(names[D_MD5],c[D_MD5][j],lengths[j]); | ||
269 | - Time_F(START); | ||
270 | - for (count=0,run=1; COND(c[D_MD5][j]); count++) | ||
271 | - EVP_Digest(&(buf[0]),(unsigned long)lengths[j],&(md5[0]),NULL,EVP_get_digestbyname("md5"),NULL); | ||
272 | - d=Time_F(STOP); | ||
273 | - print_result(D_MD5,j,count,d); | ||
274 | - } | ||
275 | - } | ||
276 | + Test_Digest(D_MD5, EVP_md5()); | ||
277 | #endif | ||
278 | |||
279 | #if !defined(OPENSSL_NO_MD5) && !defined(OPENSSL_NO_HMAC) | ||
280 | if (doit[D_HMAC]) | ||
281 | - { | ||
282 | - HMAC_CTX hctx; | ||
283 | - | ||
284 | - HMAC_CTX_init(&hctx); | ||
285 | - HMAC_Init_ex(&hctx,(unsigned char *)"This is a key...", | ||
286 | - 16,EVP_md5(), NULL); | ||
287 | - | ||
288 | - for (j=0; j<SIZE_NUM; j++) | ||
289 | - { | ||
290 | - print_message(names[D_HMAC],c[D_HMAC][j],lengths[j]); | ||
291 | - Time_F(START); | ||
292 | - for (count=0,run=1; COND(c[D_HMAC][j]); count++) | ||
293 | - { | ||
294 | - HMAC_Init_ex(&hctx,NULL,0,NULL,NULL); | ||
295 | - HMAC_Update(&hctx,buf,lengths[j]); | ||
296 | - HMAC_Final(&hctx,&(hmac[0]),NULL); | ||
297 | - } | ||
298 | - d=Time_F(STOP); | ||
299 | - print_result(D_HMAC,j,count,d); | ||
300 | - } | ||
301 | - HMAC_CTX_cleanup(&hctx); | ||
302 | - } | ||
303 | + Test_HMAC(D_HMAC, EVP_md5()); | ||
304 | +#endif | ||
305 | +#if !defined(OPENSSL_NO_SHA1) && !defined(OPENSSL_NO_HMAC) | ||
306 | + if (doit[D_HMAC_SHA1]) | ||
307 | + Test_HMAC(D_HMAC_SHA1, EVP_sha1()); | ||
308 | #endif | ||
309 | #ifndef OPENSSL_NO_SHA | ||
310 | if (doit[D_SHA1]) | ||
311 | - { | ||
312 | - for (j=0; j<SIZE_NUM; j++) | ||
313 | - { | ||
314 | - print_message(names[D_SHA1],c[D_SHA1][j],lengths[j]); | ||
315 | - Time_F(START); | ||
316 | - for (count=0,run=1; COND(c[D_SHA1][j]); count++) | ||
317 | - EVP_Digest(buf,(unsigned long)lengths[j],&(sha[0]),NULL,EVP_sha1(),NULL); | ||
318 | - d=Time_F(STOP); | ||
319 | - print_result(D_SHA1,j,count,d); | ||
320 | - } | ||
321 | - } | ||
322 | + Test_Digest(D_SHA1, EVP_sha1()); | ||
323 | |||
324 | #ifndef OPENSSL_NO_SHA256 | ||
325 | if (doit[D_SHA256]) | ||
326 | - { | ||
327 | - for (j=0; j<SIZE_NUM; j++) | ||
328 | - { | ||
329 | - print_message(names[D_SHA256],c[D_SHA256][j],lengths[j]); | ||
330 | - Time_F(START); | ||
331 | - for (count=0,run=1; COND(c[D_SHA256][j]); count++) | ||
332 | - SHA256(buf,lengths[j],sha256); | ||
333 | - d=Time_F(STOP); | ||
334 | - print_result(D_SHA256,j,count,d); | ||
335 | - } | ||
336 | - } | ||
337 | + Test_Digest(D_SHA256, EVP_sha256()); | ||
338 | #endif | ||
339 | |||
340 | #ifndef OPENSSL_NO_SHA512 | ||
341 | if (doit[D_SHA512]) | ||
342 | - { | ||
343 | - for (j=0; j<SIZE_NUM; j++) | ||
344 | - { | ||
345 | - print_message(names[D_SHA512],c[D_SHA512][j],lengths[j]); | ||
346 | - Time_F(START); | ||
347 | - for (count=0,run=1; COND(c[D_SHA512][j]); count++) | ||
348 | - SHA512(buf,lengths[j],sha512); | ||
349 | - d=Time_F(STOP); | ||
350 | - print_result(D_SHA512,j,count,d); | ||
351 | - } | ||
352 | - } | ||
353 | + Test_Digest(D_SHA512, EVP_sha512()); | ||
354 | #endif | ||
355 | #endif | ||
356 | |||
357 | #ifndef OPENSSL_NO_WHIRLPOOL | ||
358 | if (doit[D_WHIRLPOOL]) | ||
359 | - { | ||
360 | - for (j=0; j<SIZE_NUM; j++) | ||
361 | - { | ||
362 | - print_message(names[D_WHIRLPOOL],c[D_WHIRLPOOL][j],lengths[j]); | ||
363 | - Time_F(START); | ||
364 | - for (count=0,run=1; COND(c[D_WHIRLPOOL][j]); count++) | ||
365 | - WHIRLPOOL(buf,lengths[j],whirlpool); | ||
366 | - d=Time_F(STOP); | ||
367 | - print_result(D_WHIRLPOOL,j,count,d); | ||
368 | - } | ||
369 | - } | ||
370 | + Test_Digest(D_WHIRLPOOL, EVP_whirlpool()); | ||
371 | #endif | ||
372 | |||
373 | #ifndef OPENSSL_NO_RIPEMD | ||
374 | if (doit[D_RMD160]) | ||
375 | - { | ||
376 | - for (j=0; j<SIZE_NUM; j++) | ||
377 | - { | ||
378 | - print_message(names[D_RMD160],c[D_RMD160][j],lengths[j]); | ||
379 | - Time_F(START); | ||
380 | - for (count=0,run=1; COND(c[D_RMD160][j]); count++) | ||
381 | - EVP_Digest(buf,(unsigned long)lengths[j],&(rmd160[0]),NULL,EVP_ripemd160(),NULL); | ||
382 | - d=Time_F(STOP); | ||
383 | - print_result(D_RMD160,j,count,d); | ||
384 | - } | ||
385 | - } | ||
386 | + Test_Digest(D_RMD160, EVP_ripemd160()); | ||
387 | #endif | ||
388 | #ifndef OPENSSL_NO_RC4 | ||
389 | if (doit[D_RC4]) | ||
390 | -- | ||
391 | 1.7.0.4 | ||
392 | |||
diff --git a/main/openssl/0003-engine-padlock-implement-sha1-sha224-sha256-accelera.patch b/main/openssl/0003-engine-padlock-implement-sha1-sha224-sha256-accelera.patch new file mode 100644 index 0000000000..b25de7c16a --- /dev/null +++ b/main/openssl/0003-engine-padlock-implement-sha1-sha224-sha256-accelera.patch | |||
@@ -0,0 +1,701 @@ | |||
1 | From 11e9d19d7c6c3461cbab5e5670d66974cd7cf819 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Fri, 4 Jun 2010 15:48:16 +0300 | ||
4 | Subject: [PATCH 3/3] engine/padlock: implement sha1/sha224/sha256 acceleration | ||
5 | |||
6 | Limited support for VIA C7 that works only when EVP_MD_CTX_FLAG_ONESHOT | ||
7 | is used appropriately (as done by EVP_Digest, and my previous HMAC patch). | ||
8 | |||
9 | Full support for VIA Nano including partial transformation. | ||
10 | |||
11 | Benchmarks from VIA Nano 1.6GHz, done with including the previous HMAC and | ||
12 | apps/speed patches done. From single run, error margin of about 100-200k. | ||
13 | |||
14 | No padlock | ||
15 | |||
16 | type 16 bytes 64 bytes 256 bytes 1024 bytes 8192 bytes | ||
17 | sha1 20057.60k 51514.05k 99721.39k 130167.81k 142811.14k | ||
18 | sha256 7757.72k 16907.18k 28937.05k 35181.23k 37568.51k | ||
19 | hmac(sha1) 8582.53k 27644.69k 70402.30k 114602.67k 140167.85k | ||
20 | |||
21 | With the patch | ||
22 | |||
23 | sha1 37713.77k 114562.71k 259637.33k 379907.41k 438818.13k | ||
24 | sha256 34262.86k 103233.75k 232476.07k 338386.60k 389860.01k | ||
25 | hmac(sha1) 8424.70k 31475.11k 104036.10k 245559.30k 406667.26k | ||
26 | --- | ||
27 | engines/e_padlock.c | 596 +++++++++++++++++++++++++++++++++++++++++++++++---- | ||
28 | 1 files changed, 553 insertions(+), 43 deletions(-) | ||
29 | |||
30 | diff --git a/engines/e_padlock.c b/engines/e_padlock.c | ||
31 | index 381a746..2f8c72a 100644 | ||
32 | --- a/engines/e_padlock.c | ||
33 | +++ b/engines/e_padlock.c | ||
34 | @@ -3,6 +3,9 @@ | ||
35 | * Written by Michal Ludvig <michal@logix.cz> | ||
36 | * http://www.logix.cz/michal | ||
37 | * | ||
38 | + * SHA support by Timo Teras <timo.teras@iki.fi>. Portions based on | ||
39 | + * code originally written by Michal Ludvig. | ||
40 | + * | ||
41 | * Big thanks to Andy Polyakov for a help with optimization, | ||
42 | * assembler fixes, port to MS Windows and a lot of other | ||
43 | * valuable work on this engine! | ||
44 | @@ -74,12 +77,23 @@ | ||
45 | #ifndef OPENSSL_NO_AES | ||
46 | #include <openssl/aes.h> | ||
47 | #endif | ||
48 | +#ifndef OPENSSL_NO_SHA | ||
49 | +#include <openssl/sha.h> | ||
50 | +#endif | ||
51 | #include <openssl/rand.h> | ||
52 | #include <openssl/err.h> | ||
53 | |||
54 | #ifndef OPENSSL_NO_HW | ||
55 | #ifndef OPENSSL_NO_HW_PADLOCK | ||
56 | |||
57 | +/* PadLock RNG is disabled by default */ | ||
58 | +#define PADLOCK_NO_RNG 1 | ||
59 | + | ||
60 | +/* No ASM routines for SHA in MSC yet */ | ||
61 | +#ifdef _MSC_VER | ||
62 | +#define OPENSSL_NO_SHA | ||
63 | +#endif | ||
64 | + | ||
65 | /* Attempt to have a single source for both 0.9.7 and 0.9.8 :-) */ | ||
66 | #if (OPENSSL_VERSION_NUMBER >= 0x00908000L) | ||
67 | # ifndef OPENSSL_NO_DYNAMIC_ENGINE | ||
68 | @@ -140,58 +154,40 @@ static int padlock_available(void); | ||
69 | static int padlock_init(ENGINE *e); | ||
70 | |||
71 | /* RNG Stuff */ | ||
72 | +#ifndef PADLOCK_NO_RNG | ||
73 | static RAND_METHOD padlock_rand; | ||
74 | - | ||
75 | -/* Cipher Stuff */ | ||
76 | -#ifndef OPENSSL_NO_AES | ||
77 | -static int padlock_ciphers(ENGINE *e, const EVP_CIPHER **cipher, const int **nids, int nid); | ||
78 | #endif | ||
79 | |||
80 | /* Engine names */ | ||
81 | static const char *padlock_id = "padlock"; | ||
82 | static char padlock_name[100]; | ||
83 | |||
84 | -/* Available features */ | ||
85 | -static int padlock_use_ace = 0; /* Advanced Cryptography Engine */ | ||
86 | -static int padlock_use_rng = 0; /* Random Number Generator */ | ||
87 | -#ifndef OPENSSL_NO_AES | ||
88 | -static int padlock_aes_align_required = 1; | ||
89 | -#endif | ||
90 | +static int padlock_bind_helper(ENGINE *e); | ||
91 | |||
92 | -/* ===== Engine "management" functions ===== */ | ||
93 | - | ||
94 | -/* Prepare the ENGINE structure for registration */ | ||
95 | -static int | ||
96 | -padlock_bind_helper(ENGINE *e) | ||
97 | -{ | ||
98 | - /* Check available features */ | ||
99 | - padlock_available(); | ||
100 | - | ||
101 | -#if 1 /* disable RNG for now, see commentary in vicinity of RNG code */ | ||
102 | - padlock_use_rng=0; | ||
103 | -#endif | ||
104 | - | ||
105 | - /* Generate a nice engine name with available features */ | ||
106 | - BIO_snprintf(padlock_name, sizeof(padlock_name), | ||
107 | - "VIA PadLock (%s, %s)", | ||
108 | - padlock_use_rng ? "RNG" : "no-RNG", | ||
109 | - padlock_use_ace ? "ACE" : "no-ACE"); | ||
110 | + /* Available features */ | ||
111 | +enum padlock_flags { | ||
112 | + PADLOCK_RNG = 0x01, | ||
113 | + PADLOCK_ACE = 0x02, | ||
114 | + PADLOCK_ACE2 = 0x04, | ||
115 | + PADLOCK_PHE = 0x08, | ||
116 | + PADLOCK_PMM = 0x10, | ||
117 | + PADLOCK_NANO = 0x20, | ||
118 | +}; | ||
119 | +enum padlock_flags padlock_flags; | ||
120 | |||
121 | - /* Register everything or return with an error */ | ||
122 | - if (!ENGINE_set_id(e, padlock_id) || | ||
123 | - !ENGINE_set_name(e, padlock_name) || | ||
124 | +#define PADLOCK_HAVE_RNG (padlock_flags & PADLOCK_RNG) | ||
125 | +#define PADLOCK_HAVE_ACE (padlock_flags & (PADLOCK_ACE|PADLOCK_ACE2)) | ||
126 | +#define PADLOCK_HAVE_ACE1 (padlock_flags & PADLOCK_ACE) | ||
127 | +#define PADLOCK_HAVE_ACE2 (padlock_flags & PADLOCK_ACE2) | ||
128 | +#define PADLOCK_HAVE_PHE (padlock_flags & PADLOCK_PHE) | ||
129 | +#define PADLOCK_HAVE_PMM (padlock_flags & PADLOCK_PMM) | ||
130 | +#define PADLOCK_HAVE_NANO (padlock_flags & PADLOCK_NANO) | ||
131 | |||
132 | - !ENGINE_set_init_function(e, padlock_init) || | ||
133 | #ifndef OPENSSL_NO_AES | ||
134 | - (padlock_use_ace && !ENGINE_set_ciphers (e, padlock_ciphers)) || | ||
135 | +static int padlock_aes_align_required = 1; | ||
136 | #endif | ||
137 | - (padlock_use_rng && !ENGINE_set_RAND (e, &padlock_rand))) { | ||
138 | - return 0; | ||
139 | - } | ||
140 | |||
141 | - /* Everything looks good */ | ||
142 | - return 1; | ||
143 | -} | ||
144 | +/* ===== Engine "management" functions ===== */ | ||
145 | |||
146 | /* Constructor */ | ||
147 | static ENGINE * | ||
148 | @@ -215,7 +211,7 @@ ENGINE_padlock(void) | ||
149 | static int | ||
150 | padlock_init(ENGINE *e) | ||
151 | { | ||
152 | - return (padlock_use_rng || padlock_use_ace); | ||
153 | + return padlock_flags; | ||
154 | } | ||
155 | |||
156 | /* This stuff is needed if this ENGINE is being compiled into a self-contained | ||
157 | @@ -367,10 +363,20 @@ padlock_available(void) | ||
158 | : "+a"(eax), "=d"(edx) : : "ecx"); | ||
159 | |||
160 | /* Fill up some flags */ | ||
161 | - padlock_use_ace = ((edx & (0x3<<6)) == (0x3<<6)); | ||
162 | - padlock_use_rng = ((edx & (0x3<<2)) == (0x3<<2)); | ||
163 | + padlock_flags |= ((edx & (0x3<<3)) ? PADLOCK_RNG : 0); | ||
164 | + padlock_flags |= ((edx & (0x3<<7)) ? PADLOCK_ACE : 0); | ||
165 | + padlock_flags |= ((edx & (0x3<<9)) ? PADLOCK_ACE2 : 0); | ||
166 | + padlock_flags |= ((edx & (0x3<<11)) ? PADLOCK_PHE : 0); | ||
167 | + padlock_flags |= ((edx & (0x3<<13)) ? PADLOCK_PMM : 0); | ||
168 | + | ||
169 | + /* Check for VIA Nano CPU */ | ||
170 | + eax = 0x00000001; | ||
171 | + asm volatile ("pushl %%ebx; cpuid; popl %%ebx" | ||
172 | + : "+a"(eax) : : "ecx", "edx"); | ||
173 | + if ((eax | 0x000F) == 0x06FF) | ||
174 | + padlock_flags |= PADLOCK_NANO; | ||
175 | |||
176 | - return padlock_use_ace + padlock_use_rng; | ||
177 | + return padlock_flags; | ||
178 | } | ||
179 | |||
180 | #ifndef OPENSSL_NO_AES | ||
181 | @@ -1159,6 +1165,454 @@ padlock_aes_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg, | ||
182 | |||
183 | #endif /* OPENSSL_NO_AES */ | ||
184 | |||
185 | +#ifndef OPENSSL_NO_SHA | ||
186 | + | ||
187 | +static inline void | ||
188 | +padlock_copy_bswap(void *dst, void *src, size_t count) | ||
189 | +{ | ||
190 | + uint32_t *udst = dst, *usrc = src; | ||
191 | + unsigned int reg; | ||
192 | + int i = 0; | ||
193 | + | ||
194 | + for (i = 0; i < count; i++) { | ||
195 | + reg = usrc[i]; | ||
196 | + asm volatile("bswapl %0" : "+&r"(reg)); | ||
197 | + udst[i] = reg; | ||
198 | + } | ||
199 | +} | ||
200 | + | ||
201 | +#define PADLOCK_SHA_ALIGN(dd) (uint32_t*)(((uintptr_t)(dd) + 15) & ~15) | ||
202 | +#define PADLOCK_SHA_HWCTX (128+16) | ||
203 | + | ||
204 | +static void | ||
205 | +padlock_sha1(void *hwctx, const void *buf, uint32_t total, uint32_t now) | ||
206 | +{ | ||
207 | + uint32_t pos = total - now; | ||
208 | + | ||
209 | + asm volatile ("xsha1" | ||
210 | + : "+S"(buf), "+D"(hwctx), "+a"(pos), "+c"(total) | ||
211 | + : : "memory"); | ||
212 | +} | ||
213 | + | ||
214 | +static void | ||
215 | +padlock_sha1_partial(void *hwctx, const void *buf, uint32_t blocks) | ||
216 | +{ | ||
217 | + asm volatile ("xsha1" | ||
218 | + : "+S"(buf), "+D"(hwctx), "+c"(blocks) | ||
219 | + : "a"(-1) : "memory"); | ||
220 | +} | ||
221 | + | ||
222 | +static int padlock_sha1_init(EVP_MD_CTX *ctx) | ||
223 | +{ | ||
224 | + return SHA1_Init(ctx->md_data); | ||
225 | +} | ||
226 | + | ||
227 | +static int padlock_sha1_update(EVP_MD_CTX *ctx, const void *data, | ||
228 | + size_t len) | ||
229 | +{ | ||
230 | + unsigned char hwctx[PADLOCK_SHA_HWCTX]; | ||
231 | + uint32_t *aligned = PADLOCK_SHA_ALIGN(hwctx); | ||
232 | + SHA_CTX *c = ctx->md_data; | ||
233 | + uint_fast64_t total; | ||
234 | + const unsigned char *p = data; | ||
235 | + unsigned int l = 0; | ||
236 | + | ||
237 | + /* Calculate total length (Nl,Nh) is length in bits */ | ||
238 | + total = (((uint_fast64_t) c->Nh) << 29) + (c->Nl >> 3); | ||
239 | + total += len; | ||
240 | + | ||
241 | + if ((ctx->flags & EVP_MD_CTX_FLAG_ONESHOT) && | ||
242 | + (total <= 0xfffffffe)) { | ||
243 | + if (c->num != 0) { | ||
244 | + l = (len < SHA_CBLOCK) ? len : SHA_CBLOCK; | ||
245 | + if (!SHA1_Update(c, data, l)) | ||
246 | + return 0; | ||
247 | + p += l; | ||
248 | + if (c->num != 0) { | ||
249 | + p = (unsigned char *) c->data; | ||
250 | + len = c->num; | ||
251 | + l = 0; | ||
252 | + } | ||
253 | + } | ||
254 | + memcpy(aligned, &c->h0, 5 * sizeof(SHA_LONG)); | ||
255 | + padlock_sha1(aligned, p, total, len - l); | ||
256 | + memcpy(&c->h0, aligned, 5 * sizeof(SHA_LONG)); | ||
257 | + c->num = -1; | ||
258 | + return 1; | ||
259 | + } | ||
260 | + | ||
261 | + return SHA1_Update(c, data, len); | ||
262 | +} | ||
263 | + | ||
264 | +static int padlock_nano_sha1_update(EVP_MD_CTX *ctx, const void *data, | ||
265 | + size_t len) | ||
266 | +{ | ||
267 | + unsigned char hwctx[PADLOCK_SHA_HWCTX]; | ||
268 | + uint32_t *aligned = PADLOCK_SHA_ALIGN(hwctx); | ||
269 | + SHA_CTX *c = ctx->md_data; | ||
270 | + uint_fast64_t total; | ||
271 | + unsigned char *p; | ||
272 | + unsigned int n; | ||
273 | + | ||
274 | + /* Calculate total length (Nl,Nh) is length in bits */ | ||
275 | + total = (((uint_fast64_t) c->Nh) << 29) + (c->Nl >> 3); | ||
276 | + total += len; | ||
277 | + c->Nh = total >> 29; | ||
278 | + c->Nl = (total << 3) & 0xffffffffUL; | ||
279 | + | ||
280 | + memcpy(aligned, &c->h0, 5 * sizeof(SHA_LONG)); | ||
281 | + | ||
282 | + /* Check partial data */ | ||
283 | + n = c->num; | ||
284 | + if (n) { | ||
285 | + p = (unsigned char *) c->data; | ||
286 | + if (len >= SHA_CBLOCK || len+n >= SHA_CBLOCK) { | ||
287 | + memcpy(p+n, data, SHA_CBLOCK-n); | ||
288 | + padlock_sha1_partial(aligned, p, 1); | ||
289 | + n = SHA_CBLOCK - n; | ||
290 | + data += n; | ||
291 | + len -= n; | ||
292 | + c->num = 0; | ||
293 | + memset(p, 0, SHA_CBLOCK); | ||
294 | + } else { | ||
295 | + memcpy(p+n, data, len); | ||
296 | + c->num += (unsigned int)len; | ||
297 | + return 1; | ||
298 | + } | ||
299 | + } | ||
300 | + | ||
301 | + /* Can we finalize straight away? */ | ||
302 | + if ((ctx->flags & EVP_MD_CTX_FLAG_ONESHOT) && | ||
303 | + (total <= 0xfffffffe)) { | ||
304 | + padlock_sha1(aligned, data, total, len); | ||
305 | + memcpy(&c->h0, aligned, 5 * sizeof(SHA_LONG)); | ||
306 | + c->num = -1; | ||
307 | + return 1; | ||
308 | + } | ||
309 | + | ||
310 | + /* Use nonfinalizing update */ | ||
311 | + n = len / SHA_CBLOCK; | ||
312 | + if (n != 0) { | ||
313 | + padlock_sha1_partial(aligned, data, n); | ||
314 | + data += n * SHA_CBLOCK; | ||
315 | + len -= n * SHA_CBLOCK; | ||
316 | + } | ||
317 | + memcpy(&c->h0, aligned, 5 * sizeof(SHA_LONG)); | ||
318 | + | ||
319 | + /* Buffer remaining bytes */ | ||
320 | + if (len) { | ||
321 | + memcpy(c->data, data, len); | ||
322 | + c->num = len; | ||
323 | + } | ||
324 | + | ||
325 | + return 1; | ||
326 | +} | ||
327 | + | ||
328 | +static int padlock_sha1_final(EVP_MD_CTX *ctx, unsigned char *md) | ||
329 | +{ | ||
330 | + SHA_CTX *c = ctx->md_data; | ||
331 | + uint_fast64_t total; | ||
332 | + | ||
333 | + if (c->num == -1) { | ||
334 | + padlock_copy_bswap(md, &c->h0, 5); | ||
335 | + c->num = 0; | ||
336 | + return 1; | ||
337 | + } | ||
338 | + | ||
339 | + total = (((uint_fast64_t) c->Nh) << 29) + (c->Nl >> 3); | ||
340 | + if (total <= 0xfffffffe) { | ||
341 | + unsigned char hwctx[PADLOCK_SHA_HWCTX]; | ||
342 | + uint32_t *aligned = PADLOCK_SHA_ALIGN(hwctx); | ||
343 | + | ||
344 | + memcpy(aligned, &c->h0, 5 * sizeof(SHA_LONG)); | ||
345 | + padlock_sha1(aligned, c->data, total, c->num); | ||
346 | + padlock_copy_bswap(md, aligned, 5); | ||
347 | + c->num = 0; | ||
348 | + return 1; | ||
349 | + } | ||
350 | + | ||
351 | + return SHA1_Final(md, c); | ||
352 | +} | ||
353 | + | ||
354 | +static EVP_MD padlock_sha1_md = { | ||
355 | + NID_sha1, | ||
356 | + NID_sha1WithRSAEncryption, | ||
357 | + SHA_DIGEST_LENGTH, | ||
358 | + 0, | ||
359 | + padlock_sha1_init, | ||
360 | + padlock_sha1_update, | ||
361 | + padlock_sha1_final, | ||
362 | + NULL, | ||
363 | + NULL, | ||
364 | + EVP_PKEY_RSA_method, | ||
365 | + SHA_CBLOCK, | ||
366 | + sizeof(SHA_CTX), | ||
367 | +}; | ||
368 | + | ||
369 | +static EVP_MD padlock_dss1_md = { | ||
370 | + NID_dsa, | ||
371 | + NID_dsaWithSHA1, | ||
372 | + SHA_DIGEST_LENGTH, | ||
373 | + 0, | ||
374 | + padlock_sha1_init, | ||
375 | + padlock_sha1_update, | ||
376 | + padlock_sha1_final, | ||
377 | + NULL, | ||
378 | + NULL, | ||
379 | + EVP_PKEY_DSA_method, | ||
380 | + SHA_CBLOCK, | ||
381 | + sizeof(SHA_CTX), | ||
382 | +}; | ||
383 | + | ||
384 | + | ||
385 | +#if !defined(OPENSSL_NO_SHA256) | ||
386 | + | ||
387 | +static void | ||
388 | +padlock_sha256(void *hwctx, const void *buf, uint32_t total, uint32_t now) | ||
389 | +{ | ||
390 | + uint32_t pos = total - now; | ||
391 | + | ||
392 | + asm volatile ("xsha256" | ||
393 | + : "+S"(buf), "+D"(hwctx), "+a"(pos), "+c"(total) | ||
394 | + : : "memory"); | ||
395 | +} | ||
396 | + | ||
397 | +static void | ||
398 | +padlock_sha256_partial(void *hwctx, const void *buf, uint32_t blocks) | ||
399 | +{ | ||
400 | + asm volatile ("xsha256" | ||
401 | + : "+S"(buf), "+D"(hwctx), "+c"(blocks) | ||
402 | + : "a"(-1) : "memory"); | ||
403 | +} | ||
404 | + | ||
405 | +static int padlock_sha256_update(EVP_MD_CTX *ctx, const void *data, | ||
406 | + size_t len) | ||
407 | +{ | ||
408 | + unsigned char hwctx[PADLOCK_SHA_HWCTX]; | ||
409 | + uint32_t *aligned = PADLOCK_SHA_ALIGN(hwctx); | ||
410 | + SHA256_CTX *c = ctx->md_data; | ||
411 | + uint_fast64_t total; | ||
412 | + const unsigned char *p = data; | ||
413 | + unsigned int l = 0; | ||
414 | + | ||
415 | + /* Calculate total length (Nl,Nh) is length in bits */ | ||
416 | + total = (((uint_fast64_t) c->Nh) << 29) + (c->Nl >> 3); | ||
417 | + total += len; | ||
418 | + | ||
419 | + if ((ctx->flags & EVP_MD_CTX_FLAG_ONESHOT) && | ||
420 | + (total <= 0xfffffffe)) { | ||
421 | + if (c->num != 0) { | ||
422 | + l = (len < SHA256_CBLOCK) ? len : SHA256_CBLOCK; | ||
423 | + if (!SHA256_Update(c, data, l)) | ||
424 | + return 0; | ||
425 | + p += l; | ||
426 | + if (c->num != 0) { | ||
427 | + p = (unsigned char *) c->data; | ||
428 | + len = c->num; | ||
429 | + l = 0; | ||
430 | + } | ||
431 | + } | ||
432 | + memcpy(aligned, c->h, sizeof(c->h)); | ||
433 | + padlock_sha256(aligned, p, total, len - l); | ||
434 | + memcpy(c->h, aligned, sizeof(c->h)); | ||
435 | + c->num = -1; | ||
436 | + return 1; | ||
437 | + } | ||
438 | + | ||
439 | + return SHA256_Update(c, data, len); | ||
440 | +} | ||
441 | + | ||
442 | +static int padlock_nano_sha256_update(EVP_MD_CTX *ctx, const void *data, | ||
443 | + size_t len) | ||
444 | +{ | ||
445 | + unsigned char hwctx[PADLOCK_SHA_HWCTX]; | ||
446 | + uint32_t *aligned = PADLOCK_SHA_ALIGN(hwctx); | ||
447 | + SHA256_CTX *c = ctx->md_data; | ||
448 | + uint_fast64_t total; | ||
449 | + unsigned char *p; | ||
450 | + unsigned int n; | ||
451 | + | ||
452 | + /* Calculate total length (Nl,Nh) is length in bits */ | ||
453 | + total = (((uint_fast64_t) c->Nh) << 29) + (c->Nl >> 3); | ||
454 | + total += len; | ||
455 | + c->Nh = total >> 29; | ||
456 | + c->Nl = (total << 3) & 0xffffffffUL; | ||
457 | + | ||
458 | + memcpy(aligned, c->h, sizeof(c->h)); | ||
459 | + | ||
460 | + /* Check partial data */ | ||
461 | + n = c->num; | ||
462 | + if (n) { | ||
463 | + p = (unsigned char *) c->data; | ||
464 | + if (len >= SHA256_CBLOCK || len+n >= SHA256_CBLOCK) { | ||
465 | + memcpy(p+n, data, SHA256_CBLOCK-n); | ||
466 | + padlock_sha256_partial(aligned, p, 1); | ||
467 | + n = SHA256_CBLOCK - n; | ||
468 | + data += n; | ||
469 | + len -= n; | ||
470 | + c->num = 0; | ||
471 | + memset(p, 0, SHA256_CBLOCK); | ||
472 | + } else { | ||
473 | + memcpy(p+n, data, len); | ||
474 | + c->num += (unsigned int)len; | ||
475 | + return 1; | ||
476 | + } | ||
477 | + } | ||
478 | + | ||
479 | + /* Can we finalize straight away? */ | ||
480 | + if ((ctx->flags & EVP_MD_CTX_FLAG_ONESHOT) && | ||
481 | + (total <= 0xfffffffe)) { | ||
482 | + padlock_sha256(aligned, data, total, len); | ||
483 | + memcpy(c->h, aligned, sizeof(c->h)); | ||
484 | + c->num = -1; | ||
485 | + return 1; | ||
486 | + } | ||
487 | + | ||
488 | + /* Use nonfinalizing update */ | ||
489 | + n = len / SHA256_CBLOCK; | ||
490 | + if (n != 0) { | ||
491 | + padlock_sha256_partial(aligned, data, n); | ||
492 | + data += n * SHA256_CBLOCK; | ||
493 | + len -= n * SHA256_CBLOCK; | ||
494 | + } | ||
495 | + memcpy(c->h, aligned, sizeof(c->h)); | ||
496 | + | ||
497 | + /* Buffer remaining bytes */ | ||
498 | + if (len) { | ||
499 | + memcpy(c->data, data, len); | ||
500 | + c->num = len; | ||
501 | + } | ||
502 | + | ||
503 | + return 1; | ||
504 | +} | ||
505 | + | ||
506 | +static int padlock_sha256_final(EVP_MD_CTX *ctx, unsigned char *md) | ||
507 | +{ | ||
508 | + SHA256_CTX *c = ctx->md_data; | ||
509 | + uint_fast64_t total; | ||
510 | + | ||
511 | + if (c->num == -1) { | ||
512 | + padlock_copy_bswap(md, c->h, sizeof(c->h)/sizeof(c->h[0])); | ||
513 | + c->num = 0; | ||
514 | + return 1; | ||
515 | + } | ||
516 | + | ||
517 | + total = (((uint_fast64_t) c->Nh) << 29) + (c->Nl >> 3); | ||
518 | + if (total <= 0xfffffffe) { | ||
519 | + unsigned char hwctx[PADLOCK_SHA_HWCTX]; | ||
520 | + uint32_t *aligned = PADLOCK_SHA_ALIGN(hwctx); | ||
521 | + | ||
522 | + memcpy(aligned, c->h, sizeof(c->h)); | ||
523 | + padlock_sha256(aligned, c->data, total, c->num); | ||
524 | + padlock_copy_bswap(md, aligned, sizeof(c->h)/sizeof(c->h[0])); | ||
525 | + c->num = 0; | ||
526 | + return 1; | ||
527 | + } | ||
528 | + | ||
529 | + return SHA256_Final(md, c); | ||
530 | +} | ||
531 | + | ||
532 | +#if !defined(OPENSSL_NO_SHA224) | ||
533 | + | ||
534 | +static int padlock_sha224_init(EVP_MD_CTX *ctx) | ||
535 | +{ | ||
536 | + return SHA224_Init(ctx->md_data); | ||
537 | +} | ||
538 | + | ||
539 | +static EVP_MD padlock_sha224_md = { | ||
540 | + NID_sha224, | ||
541 | + NID_sha224WithRSAEncryption, | ||
542 | + SHA224_DIGEST_LENGTH, | ||
543 | + 0, | ||
544 | + padlock_sha224_init, | ||
545 | + padlock_sha256_update, | ||
546 | + padlock_sha256_final, | ||
547 | + NULL, | ||
548 | + NULL, | ||
549 | + EVP_PKEY_RSA_method, | ||
550 | + SHA_CBLOCK, | ||
551 | + sizeof(SHA256_CTX), | ||
552 | +}; | ||
553 | +#endif /* !OPENSSL_NO_SHA224 */ | ||
554 | + | ||
555 | +static int padlock_sha256_init(EVP_MD_CTX *ctx) | ||
556 | +{ | ||
557 | + return SHA256_Init(ctx->md_data); | ||
558 | +} | ||
559 | + | ||
560 | +static EVP_MD padlock_sha256_md = { | ||
561 | + NID_sha256, | ||
562 | + NID_sha256WithRSAEncryption, | ||
563 | + SHA256_DIGEST_LENGTH, | ||
564 | + 0, | ||
565 | + padlock_sha256_init, | ||
566 | + padlock_sha256_update, | ||
567 | + padlock_sha256_final, | ||
568 | + NULL, | ||
569 | + NULL, | ||
570 | + EVP_PKEY_RSA_method, | ||
571 | + SHA_CBLOCK, | ||
572 | + sizeof(SHA256_CTX), | ||
573 | +}; | ||
574 | +#endif /* !OPENSSL_NO_SHA256 */ | ||
575 | + | ||
576 | +static int padlock_digest_nids[] = { | ||
577 | +#if !defined(OPENSSL_NO_SHA) | ||
578 | + NID_sha1, | ||
579 | + NID_dsa, | ||
580 | +#endif | ||
581 | +#if !defined(OPENSSL_NO_SHA256) | ||
582 | +#if !defined(OPENSSL_NO_SHA224) | ||
583 | + NID_sha224, | ||
584 | +#endif | ||
585 | + NID_sha256, | ||
586 | +#endif | ||
587 | +}; | ||
588 | + | ||
589 | +static int padlock_digest_nids_num = sizeof(padlock_digest_nids)/sizeof(padlock_digest_nids[0]); | ||
590 | + | ||
591 | +static int | ||
592 | +padlock_digests (ENGINE *e, const EVP_MD **digest, const int **nids, int nid) | ||
593 | +{ | ||
594 | + /* No specific digest => return a list of supported nids ... */ | ||
595 | + if (!digest) { | ||
596 | + *nids = padlock_digest_nids; | ||
597 | + return padlock_digest_nids_num; | ||
598 | + } | ||
599 | + | ||
600 | + /* ... or the requested "digest" otherwise */ | ||
601 | + switch (nid) { | ||
602 | +#if !defined(OPENSSL_NO_SHA) | ||
603 | + case NID_sha1: | ||
604 | + *digest = &padlock_sha1_md; | ||
605 | + break; | ||
606 | + case NID_dsa: | ||
607 | + *digest = &padlock_dss1_md; | ||
608 | + break; | ||
609 | +#endif | ||
610 | +#if !defined(OPENSSL_NO_SHA256) | ||
611 | +#if !defined(OPENSSL_NO_SHA224) | ||
612 | + case NID_sha224: | ||
613 | + *digest = &padlock_sha224_md; | ||
614 | + break; | ||
615 | +#endif /* OPENSSL_NO_SHA224 */ | ||
616 | + case NID_sha256: | ||
617 | + *digest = &padlock_sha256_md; | ||
618 | + break; | ||
619 | +#endif /* OPENSSL_NO_SHA256 */ | ||
620 | + default: | ||
621 | + /* Sorry, we don't support this NID */ | ||
622 | + *digest = NULL; | ||
623 | + return 0; | ||
624 | + } | ||
625 | + | ||
626 | + return 1; | ||
627 | +} | ||
628 | + | ||
629 | +#endif /* OPENSSL_NO_SHA */ | ||
630 | + | ||
631 | +#ifndef PADLOCK_NO_RNG | ||
632 | + | ||
633 | /* ===== Random Number Generator ===== */ | ||
634 | /* | ||
635 | * This code is not engaged. The reason is that it does not comply | ||
636 | @@ -1215,6 +1669,62 @@ static RAND_METHOD padlock_rand = { | ||
637 | padlock_rand_status, /* rand status */ | ||
638 | }; | ||
639 | |||
640 | +#endif /* PADLOCK_NO_RNG */ | ||
641 | + | ||
642 | +/* Prepare the ENGINE structure for registration */ | ||
643 | +static int | ||
644 | +padlock_bind_helper(ENGINE *e) | ||
645 | +{ | ||
646 | + /* Check available features */ | ||
647 | + padlock_available(); | ||
648 | + | ||
649 | + /* Generate a nice engine name with available features */ | ||
650 | + BIO_snprintf(padlock_name, sizeof(padlock_name), | ||
651 | + "VIA PadLock: %s%s%s%s%s%s", | ||
652 | + padlock_flags ? "" : "not supported", | ||
653 | + PADLOCK_HAVE_RNG ? "RNG " : "", | ||
654 | + PADLOCK_HAVE_ACE ? (PADLOCK_HAVE_ACE2 ? "ACE2 " : "ACE ") : "", | ||
655 | + PADLOCK_HAVE_PHE ? "PHE " : "", | ||
656 | + PADLOCK_HAVE_PMM ? "PMM " : "", | ||
657 | + PADLOCK_HAVE_NANO ? "NANO " : "" | ||
658 | + ); | ||
659 | + | ||
660 | +#ifndef OPENSSL_NO_SHA | ||
661 | + /* Use Nano SHA acceleration? */ | ||
662 | + if (PADLOCK_HAVE_NANO) { | ||
663 | + padlock_sha1_md.update = padlock_nano_sha1_update; | ||
664 | + padlock_dss1_md.update = padlock_nano_sha1_update; | ||
665 | +#if !defined(OPENSSL_NO_SHA256) | ||
666 | +#if !defined(OPENSSL_NO_SHA224) | ||
667 | + padlock_sha224_md.update = padlock_nano_sha256_update; | ||
668 | +#endif | ||
669 | + padlock_sha256_md.update = padlock_nano_sha256_update; | ||
670 | +#endif | ||
671 | + } | ||
672 | +#endif | ||
673 | + | ||
674 | + /* Register everything or return with an error */ | ||
675 | + if (!ENGINE_set_id(e, padlock_id) || | ||
676 | + !ENGINE_set_name(e, padlock_name) || | ||
677 | + | ||
678 | + !ENGINE_set_init_function(e, padlock_init) | ||
679 | +#ifndef OPENSSL_NO_AES | ||
680 | + || (PADLOCK_HAVE_ACE && !ENGINE_set_ciphers (e, padlock_ciphers)) | ||
681 | +#endif | ||
682 | +#ifndef OPENSSL_NO_SHA | ||
683 | + || (PADLOCK_HAVE_PHE && !ENGINE_set_digests (e, padlock_digests)) | ||
684 | +#endif | ||
685 | +#ifndef PADLOCK_NO_RNG | ||
686 | + || (PADLOCK_HAVE_RNG && !ENGINE_set_RAND (e, &padlock_rand)) | ||
687 | +#endif | ||
688 | + ) { | ||
689 | + return 0; | ||
690 | + } | ||
691 | + | ||
692 | + /* Everything looks good */ | ||
693 | + return 1; | ||
694 | +} | ||
695 | + | ||
696 | #else /* !COMPILE_HW_PADLOCK */ | ||
697 | #ifndef OPENSSL_NO_DYNAMIC_ENGINE | ||
698 | OPENSSL_EXPORT | ||
699 | -- | ||
700 | 1.7.0.4 | ||
701 | |||
diff --git a/main/openssl/0004-crypto-engine-autoload-padlock-dynamic-engine.patch b/main/openssl/0004-crypto-engine-autoload-padlock-dynamic-engine.patch new file mode 100644 index 0000000000..c41d860ea5 --- /dev/null +++ b/main/openssl/0004-crypto-engine-autoload-padlock-dynamic-engine.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From f6a5204b8dc94d73521f962183ee302533b2a196 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Fri, 4 Jun 2010 18:02:39 +0300 | ||
4 | Subject: [PATCH 4/4] crypto/engine: autoload padlock dynamic engine | ||
5 | |||
6 | --- | ||
7 | crypto/engine/eng_all.c | 10 ++++++++++ | ||
8 | 1 files changed, 10 insertions(+), 0 deletions(-) | ||
9 | |||
10 | diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c | ||
11 | index 22c1204..827e447 100644 | ||
12 | --- a/crypto/engine/eng_all.c | ||
13 | +++ b/crypto/engine/eng_all.c | ||
14 | @@ -112,6 +112,16 @@ void ENGINE_load_builtin_engines(void) | ||
15 | ENGINE_load_capi(); | ||
16 | #endif | ||
17 | #endif | ||
18 | +#ifdef OPENSSL_NO_STATIC_ENGINE | ||
19 | + { | ||
20 | + ENGINE *e; | ||
21 | + e = ENGINE_by_id("padlock"); | ||
22 | + if (e != NULL) { | ||
23 | + ENGINE_add(e); | ||
24 | + ENGINE_free(e); | ||
25 | + } | ||
26 | + } | ||
27 | +#endif | ||
28 | } | ||
29 | |||
30 | #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) | ||
31 | -- | ||
32 | 1.7.0.4 | ||
33 | |||
diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD index 4a0f45f1a1..eb23f31fcb 100644 --- a/main/openssl/APKBUILD +++ b/main/openssl/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=openssl | 2 | pkgname=openssl |
3 | pkgver=1.0.0 | 3 | pkgver=1.0.0a |
4 | pkgrel=0 | 4 | pkgrel=1 |
5 | pkgdesc="Toolkit for SSL v2/v3 and TLS v1" | 5 | pkgdesc="Toolkit for SSL v2/v3 and TLS v1" |
6 | url="http://openssl.org" | 6 | url="http://openssl.org" |
7 | depends= | 7 | depends= |
@@ -13,6 +13,10 @@ subpackages="$pkgname-dev $pkgname-doc libcrypto1.0:libcrypto libssl1.0:libssl" | |||
13 | source="http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz | 13 | source="http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz |
14 | fix-manpages.patch | 14 | fix-manpages.patch |
15 | openssl-bb-basename.patch | 15 | openssl-bb-basename.patch |
16 | 0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch | ||
17 | 0002-apps-speed-fix-digest-speed-measurement-and-add-hmac.patch | ||
18 | 0003-engine-padlock-implement-sha1-sha224-sha256-accelera.patch | ||
19 | 0004-crypto-engine-autoload-padlock-dynamic-engine.patch | ||
16 | " | 20 | " |
17 | 21 | ||
18 | # openssl-0.9.8k-padlock-sha.patch | 22 | # openssl-0.9.8k-padlock-sha.patch |
@@ -41,13 +45,6 @@ package() { | |||
41 | make -j1 INSTALL_PREFIX="$pkgdir" MANDIR=/usr/share/man install | 45 | make -j1 INSTALL_PREFIX="$pkgdir" MANDIR=/usr/share/man install |
42 | } | 46 | } |
43 | 47 | ||
44 | dev() { | ||
45 | replaces="libcrypto openssl" | ||
46 | default_dev | ||
47 | # move symlinks | ||
48 | #mv "$pkgdir"/usr/lib/*.so "$subpkgdir"/usr/lib/ | ||
49 | } | ||
50 | |||
51 | libcrypto() { | 48 | libcrypto() { |
52 | pkgdesc="Crypto library from openssl" | 49 | pkgdesc="Crypto library from openssl" |
53 | replaces="openssl libcrypto" | 50 | replaces="openssl libcrypto" |
@@ -69,6 +66,10 @@ libssl() { | |||
69 | done | 66 | done |
70 | } | 67 | } |
71 | 68 | ||
72 | md5sums="89eaa86e25b2845f920ec00ae4c864ed openssl-1.0.0.tar.gz | 69 | md5sums="e3873edfffc783624cfbdb65e2249cbd openssl-1.0.0a.tar.gz |
73 | 115c481cd59b3dba631364e8fb1778f5 fix-manpages.patch | 70 | 115c481cd59b3dba631364e8fb1778f5 fix-manpages.patch |
74 | c6a9857a5dbd30cead0404aa7dd73977 openssl-bb-basename.patch" | 71 | c6a9857a5dbd30cead0404aa7dd73977 openssl-bb-basename.patch |
72 | ceae7d6166a455ecc41adc8f44f1a07e 0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch | ||
73 | 383c0c0305532f471bf583d6e05cbea9 0002-apps-speed-fix-digest-speed-measurement-and-add-hmac.patch | ||
74 | f687ab90b23587dc445eb0803a6eb1fb 0003-engine-padlock-implement-sha1-sha224-sha256-accelera.patch | ||
75 | f197ac9a2748e64b1cb15a12ddca3d61 0004-crypto-engine-autoload-padlock-dynamic-engine.patch" | ||
diff --git a/main/orage/APKBUILD b/main/orage/APKBUILD index 6a80beb219..fa102eedd7 100644 --- a/main/orage/APKBUILD +++ b/main/orage/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=orage | 2 | pkgname=orage |
3 | pkgver=4.6.1 | 3 | pkgver=4.6.1 |
4 | pkgrel=1 | 4 | pkgrel=2 |
5 | pkgdesc="A simple calendar application with reminders for Xfce" | 5 | pkgdesc="A simple calendar application with reminders for Xfce" |
6 | url="http://www.xfce.org/projects/orage/" | 6 | url="http://www.xfce.org/projects/orage/" |
7 | license="GPL-2" | 7 | license="GPL-2" |
@@ -9,12 +9,10 @@ subpackages="$pkgname-doc" | |||
9 | depends="hicolor-icon-theme" | 9 | depends="hicolor-icon-theme" |
10 | makedepends="pkgconfig xfce4-panel-dev libnotify-dev intltool gettext-dev | 10 | makedepends="pkgconfig xfce4-panel-dev libnotify-dev intltool gettext-dev |
11 | libiconv-dev libsm-dev expat-dev e2fsprogs-dev" | 11 | libiconv-dev libsm-dev expat-dev e2fsprogs-dev" |
12 | install="orage.post-install orage.post-deinstall" | 12 | install= |
13 | source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2 | 13 | source="http://archive.xfce.org/src/apps/orage/${pkgver%.*}/orage-$pkgver.tar.bz2" |
14 | $install" | ||
15 | 14 | ||
16 | build () | 15 | build() { |
17 | { | ||
18 | cd "$srcdir"/$pkgname-$pkgver | 16 | cd "$srcdir"/$pkgname-$pkgver |
19 | ./configure --prefix=/usr \ | 17 | ./configure --prefix=/usr \ |
20 | --sysconfdir=/etc \ | 18 | --sysconfdir=/etc \ |
@@ -22,9 +20,11 @@ build () | |||
22 | --localstatedir=/var \ | 20 | --localstatedir=/var \ |
23 | --disable-static || return 1 | 21 | --disable-static || return 1 |
24 | make || return 1 | 22 | make || return 1 |
23 | } | ||
24 | |||
25 | package() { | ||
26 | cd "$srcdir"/$pkgname-$pkgver | ||
25 | make DESTDIR="$pkgdir" install || return 1 | 27 | make DESTDIR="$pkgdir" install || return 1 |
26 | } | 28 | } |
27 | 29 | ||
28 | md5sums="24fa43dd86ec5af5a4766620fd972cf2 orage-4.6.1.tar.bz2 | 30 | md5sums="24fa43dd86ec5af5a4766620fd972cf2 orage-4.6.1.tar.bz2" |
29 | db51db79681eadc47be4932355a77c25 orage.post-install | ||
30 | db51db79681eadc47be4932355a77c25 orage.post-deinstall" | ||
diff --git a/main/orage/orage.post-deinstall b/main/orage/orage.post-deinstall deleted file mode 120000 index eef6db267a..0000000000 --- a/main/orage/orage.post-deinstall +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | orage.post-install \ No newline at end of file | ||
diff --git a/main/orage/orage.post-install b/main/orage/orage.post-install deleted file mode 100644 index c523d78da0..0000000000 --- a/main/orage/orage.post-install +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | gtk-update-icon-cache -q -t -f usr/share/icons/hicolor | ||
4 | |||
diff --git a/testing/osmo/APKBUILD b/main/osmo/APKBUILD index 489874e360..1413096803 100644 --- a/testing/osmo/APKBUILD +++ b/main/osmo/APKBUILD | |||
@@ -1,11 +1,11 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=osmo | 2 | pkgname=osmo |
3 | pkgver=0.2.10 | 3 | pkgver=0.2.10 |
4 | pkgrel=0 | 4 | pkgrel=1 |
5 | pkgdesc="A handy personal organizer" | 5 | pkgdesc="A handy personal organizer" |
6 | url="http://clayo.org/osmo/" | 6 | url="http://clayo.org/osmo/" |
7 | license="GPL" | 7 | license="GPL" |
8 | makedepends="gtk+-dev libnotify-dev libxml2-dev autoconf automake" | 8 | makedepends="gtk+-dev libnotify-dev libical-dev libxml2-dev autoconf automake" |
9 | install= | 9 | install= |
10 | subpackages="$pkgname-doc" | 10 | subpackages="$pkgname-doc" |
11 | source="http://downloads.sourceforge.net/$pkgname-pim/$pkgname-$pkgver.tar.gz | 11 | source="http://downloads.sourceforge.net/$pkgname-pim/$pkgname-$pkgver.tar.gz |
@@ -24,6 +24,7 @@ prepare() { | |||
24 | 24 | ||
25 | build() { | 25 | build() { |
26 | cd "$_builddir" | 26 | cd "$_builddir" |
27 | CFLAGS="$CFLAGS -I/usr/include/libical" | ||
27 | ./configure --prefix=/usr || return 1 | 28 | ./configure --prefix=/usr || return 1 |
28 | make || return 1 | 29 | make || return 1 |
29 | } | 30 | } |
diff --git a/testing/osmo/osmo-0.2.10-build-mo.patch b/main/osmo/osmo-0.2.10-build-mo.patch index ac1b9aa235..ac1b9aa235 100644 --- a/testing/osmo/osmo-0.2.10-build-mo.patch +++ b/main/osmo/osmo-0.2.10-build-mo.patch | |||
diff --git a/main/perl-test-pod/APKBUILD b/main/perl-test-pod/APKBUILD index 83e13d8f6b..65fc2adc86 100644 --- a/main/perl-test-pod/APKBUILD +++ b/main/perl-test-pod/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
2 | # Maintainer: Leonardo Arena <rnalrd@gmail.com> | 2 | # Maintainer: Leonardo Arena <rnalrd@gmail.com> |
3 | pkgname=perl-test-pod | 3 | pkgname=perl-test-pod |
4 | _realname=Test-Pod | 4 | _realname=Test-Pod |
5 | pkgver=1.26 | 5 | pkgver=1.44 |
6 | pkgrel=0 | 6 | pkgrel=0 |
7 | pkgdesc="Check for POD errors in files" | 7 | pkgdesc="Check for POD errors in files" |
8 | url="http://search.cpan.org/~petdance/Test-Pod-1.26/" | 8 | url="http://search.cpan.org/~petdance/Test-Pod-1.26/" |
@@ -11,7 +11,7 @@ depends="perl" | |||
11 | makedepends="perl-dev" | 11 | makedepends="perl-dev" |
12 | install= | 12 | install= |
13 | subpackages="$pkgname-doc" | 13 | subpackages="$pkgname-doc" |
14 | source="http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/$_realname-$pkgver.tar.gz" | 14 | source="http://search.cpan.org/CPAN/authors/id/D/DW/DWHEELER/$_realname-$pkgver.tar.gz" |
15 | 15 | ||
16 | build() { | 16 | build() { |
17 | cd "$srcdir/$_realname-$pkgver" | 17 | cd "$srcdir/$_realname-$pkgver" |
@@ -23,4 +23,4 @@ build() { | |||
23 | find "$pkgdir" -name perllocal.pod -delete | 23 | find "$pkgdir" -name perllocal.pod -delete |
24 | } | 24 | } |
25 | 25 | ||
26 | md5sums="2f259135656ac4549b65a4f14f07b7c6 Test-Pod-1.26.tar.gz" | 26 | md5sums="02380af5539521524d5df17273a57ae7 Test-Pod-1.44.tar.gz" |
diff --git a/testing/pidgin/APKBUILD b/main/pidgin/APKBUILD index bff483fc0d..bccd793c12 100644 --- a/testing/pidgin/APKBUILD +++ b/main/pidgin/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=pidgin | 2 | pkgname=pidgin |
3 | pkgver=2.7.0 | 3 | pkgver=2.7.1 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="graphical multi-protocol instant messaging client for X" | 5 | pkgdesc="graphical multi-protocol instant messaging client for X" |
6 | url="http://pidgin.im/" | 6 | url="http://pidgin.im/" |
7 | license="GPL" | 7 | license="GPL" |
@@ -11,12 +11,12 @@ makedepends="gtk+-dev intltool libsm-dev startup-notification-dev gtkspell-dev | |||
11 | cyrus-sasl-dev ncurses-dev nss-dev" | 11 | cyrus-sasl-dev ncurses-dev nss-dev" |
12 | subpackages="$pkgname-dev $pkgname-doc finch libpurple" | 12 | subpackages="$pkgname-dev $pkgname-doc finch libpurple" |
13 | source="http://downloads.sourceforge.net/pidgin/$pkgver/pidgin-$pkgver.tar.bz2 | 13 | source="http://downloads.sourceforge.net/pidgin/$pkgver/pidgin-$pkgver.tar.bz2 |
14 | msn_fix.patch" | 14 | icq_fix.patch" |
15 | 15 | ||
16 | _builddir="$srcdir"/$pkgname-$pkgver | 16 | _builddir="$srcdir"/$pkgname-$pkgver |
17 | prepare() { | 17 | prepare() { |
18 | cd "$_builddir" | 18 | cd "$_builddir" |
19 | patch -Np0 -i ""$srcdir"/msn_fix.patch" || return 1 | 19 | patch -p0 -i "$srcdir"/icq_fix.patch || return 1 |
20 | } | 20 | } |
21 | 21 | ||
22 | build() { | 22 | build() { |
@@ -60,5 +60,5 @@ libpurple() { | |||
60 | mv "$pkgdir"/usr/share/purple "$pkgdir"/usr/share/sounds \ | 60 | mv "$pkgdir"/usr/share/purple "$pkgdir"/usr/share/sounds \ |
61 | "$subpkgdir"/usr/share/ | 61 | "$subpkgdir"/usr/share/ |
62 | } | 62 | } |
63 | md5sums="63a36f91d29f5ac5a402ffd2d7dbbb72 pidgin-2.7.0.tar.bz2 | 63 | md5sums="0dd2adb9e8214ac960f956823c84e7e2 pidgin-2.7.1.tar.bz2 |
64 | bbf9d6f6fc19342af7e059dc13432d27 msn_fix.patch" | 64 | 2ce887cf36e698282b9241832850defd icq_fix.patch" |
diff --git a/main/pidgin/icq_fix.patch b/main/pidgin/icq_fix.patch new file mode 100644 index 0000000000..8bb87ef860 --- /dev/null +++ b/main/pidgin/icq_fix.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | # | ||
2 | # | ||
3 | # patch "libpurple/protocols/oscar/oscar.c" | ||
4 | # from [b448ff8a14ab7db9b3ad6ce2c8f17cac8159f702] | ||
5 | # to [6b8b45623896204448ac4b212a0c631655822ad1] | ||
6 | # | ||
7 | ============================================================ | ||
8 | --- libpurple/protocols/oscar/oscar.c b448ff8a14ab7db9b3ad6ce2c8f17cac8159f702 | ||
9 | +++ libpurple/protocols/oscar/oscar.c 6b8b45623896204448ac4b212a0c631655822ad1 | ||
10 | @@ -4651,7 +4651,8 @@ oscar_send_im(PurpleConnection *gc, cons | ||
11 | tmp2 = purple_markup_strip_html(tmp1); | ||
12 | is_html = FALSE; | ||
13 | } else { | ||
14 | - tmp2 = g_strdup(tmp1); | ||
15 | + /* ICQ 6 wants its HTML wrapped in these tags. Oblige it. */ | ||
16 | + tmp2 = g_strdup_printf("<HTML><BODY>%s</BODY></HTML>", tmp1); | ||
17 | is_html = TRUE; | ||
18 | } | ||
19 | g_free(tmp1); | ||
diff --git a/main/pixman/APKBUILD b/main/pixman/APKBUILD index 629130deb8..ab6d7a90e9 100644 --- a/main/pixman/APKBUILD +++ b/main/pixman/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=pixman | 2 | pkgname=pixman |
3 | pkgver=0.18.0 | 3 | pkgver=0.18.2 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="Pixman library" | 5 | pkgdesc="Pixman library" |
6 | url="http://xorg.freedesktop.org" | 6 | url="http://xorg.freedesktop.org" |
@@ -21,4 +21,4 @@ package() { | |||
21 | cd "$srcdir"/$pkgname-$pkgver | 21 | cd "$srcdir"/$pkgname-$pkgver |
22 | make DESTDIR="$pkgdir" install || return 1 | 22 | make DESTDIR="$pkgdir" install || return 1 |
23 | } | 23 | } |
24 | md5sums="a1b5a0a145cab653f5c1e8cf2f98f945 pixman-0.18.0.tar.bz2" | 24 | md5sums="8f0c47bbb12a0d9c0d14242596bf6bf9 pixman-0.18.2.tar.bz2" |
diff --git a/main/postfix/APKBUILD b/main/postfix/APKBUILD index 2367e98604..a2213c269d 100644 --- a/main/postfix/APKBUILD +++ b/main/postfix/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=postfix | 2 | pkgname=postfix |
3 | pkgver=2.6.5 | 3 | pkgver=2.7.0 |
4 | pkgrel=4 | 4 | pkgrel=0 |
5 | pkgdesc="Secure and fast drop-in replacement for Sendmail (MTA)" | 5 | pkgdesc="Secure and fast drop-in replacement for Sendmail (MTA)" |
6 | url="http://www.postfix.org/" | 6 | url="http://www.postfix.org/" |
7 | license="IPL-1" | 7 | license="IPL-1" |
@@ -12,7 +12,7 @@ subpackages="$pkgname-doc $pkgname-ldap $pkgname-mysql $pkgname-pcre | |||
12 | $pkgname-pgsql" | 12 | $pkgname-pgsql" |
13 | source="ftp://ftp.porcupine.org/mirrors/$pkgname-release/official/$pkgname-$pkgver.tar.gz | 13 | source="ftp://ftp.porcupine.org/mirrors/$pkgname-release/official/$pkgname-$pkgver.tar.gz |
14 | $pkgname.initd | 14 | $pkgname.initd |
15 | postfix-2.6.1-dynamicmaps.patch | 15 | postfix-2.7.0-dynamic-maps.patch |
16 | dynamicmaps.cf | 16 | dynamicmaps.cf |
17 | postfix-ldap.post-install | 17 | postfix-ldap.post-install |
18 | postfix-mysql.post-install | 18 | postfix-mysql.post-install |
@@ -145,9 +145,9 @@ mysql() { _mv_dict mysql ;} | |||
145 | pcre() { _mv_dict pcre ; } | 145 | pcre() { _mv_dict pcre ; } |
146 | pgsql() { _mv_dict pgsql ; } | 146 | pgsql() { _mv_dict pgsql ; } |
147 | 147 | ||
148 | md5sums="6b954cfb3eb6141dac1e773281211717 postfix-2.6.5.tar.gz | 148 | md5sums="df648f59421604e895cce56325f00bae postfix-2.7.0.tar.gz |
149 | 6bbabcd041aefaf40e1f3ee1fc1d6d7e postfix.initd | 149 | 6bbabcd041aefaf40e1f3ee1fc1d6d7e postfix.initd |
150 | d45552cfdcd911d0934c0cb7816c4011 postfix-2.6.1-dynamicmaps.patch | 150 | 4d9c373e8a35bfb5bfa9b899e64fb70a postfix-2.7.0-dynamic-maps.patch |
151 | 442efd1a95b0c061dfb8ab75456e0f24 dynamicmaps.cf | 151 | 442efd1a95b0c061dfb8ab75456e0f24 dynamicmaps.cf |
152 | 2ebe51a882eb9d6d7866583eb6af3969 postfix-ldap.post-install | 152 | 2ebe51a882eb9d6d7866583eb6af3969 postfix-ldap.post-install |
153 | 2ebe51a882eb9d6d7866583eb6af3969 postfix-mysql.post-install | 153 | 2ebe51a882eb9d6d7866583eb6af3969 postfix-mysql.post-install |
diff --git a/main/postfix/postfix-2.6.1-dynamicmaps.patch b/main/postfix/postfix-2.6.1-dynamicmaps.patch deleted file mode 100644 index 630abedc3b..0000000000 --- a/main/postfix/postfix-2.6.1-dynamicmaps.patch +++ /dev/null | |||
@@ -1,5273 +0,0 @@ | |||
1 | diff -ruN a/conf/postfix-files b/conf/postfix-files | ||
2 | --- a/conf/postfix-files 2009-06-01 12:27:42.000000000 +0000 | ||
3 | +++ b/conf/postfix-files 2009-06-01 13:08:26.000000000 +0000 | ||
4 | @@ -65,6 +65,10 @@ | ||
5 | $queue_directory/trace:d:$mail_owner:-:700:ucr | ||
6 | $daemon_directory/anvil:f:root:-:755 | ||
7 | $daemon_directory/bounce:f:root:-:755 | ||
8 | +$daemon_directory/dict_ldap.so:f:root:-:755 | ||
9 | +$daemon_directory/dict_pcre.so:f:root:-:755 | ||
10 | +$daemon_directory/dict_mysql.so:f:root:-:755 | ||
11 | +$daemon_directory/dict_pgsql.so:f:root:-:755 | ||
12 | $daemon_directory/cleanup:f:root:-:755 | ||
13 | $daemon_directory/discard:f:root:-:755 | ||
14 | $daemon_directory/error:f:root:-:755 | ||
15 | @@ -94,6 +98,11 @@ | ||
16 | $daemon_directory/trivial-rewrite:f:root:-:755 | ||
17 | $daemon_directory/verify:f:root:-:755 | ||
18 | $daemon_directory/virtual:f:root:-:755 | ||
19 | +/usr/lib/libpostfix-dns.so.1:f:root:-:755 | ||
20 | +/usr/lib/libpostfix-global.so.1:f:root:-:755 | ||
21 | +/usr/lib/libpostfix-tls.so.1:f:root:-:755 | ||
22 | +/usr/lib/libpostfix-master.so.1:f:root:-:755 | ||
23 | +/usr/lib/libpostfix-util.so.1:f:root:-:755 | ||
24 | $daemon_directory/nqmgr:h:$daemon_directory/qmgr | ||
25 | $daemon_directory/lmtp:h:$daemon_directory/smtp | ||
26 | $command_directory/postalias:f:root:-:755 | ||
27 | @@ -117,6 +126,7 @@ | ||
28 | $config_directory/aliases:f:root:-:644:p1 | ||
29 | $config_directory/bounce.cf.default:f:root:-:644:1 | ||
30 | $config_directory/canonical:f:root:-:644:p1 | ||
31 | +$config_directory/dynamicmaps.cf:f:root:-:644:p | ||
32 | $config_directory/cidr_table:f:root:-:644:o | ||
33 | $config_directory/generic:f:root:-:644:p1 | ||
34 | $config_directory/generics:f:root:-:644:o | ||
35 | diff -ruN a/src/dns/Makefile.in b/src/dns/Makefile.in | ||
36 | --- a/src/dns/Makefile.in 2009-06-01 12:27:43.000000000 +0000 | ||
37 | +++ b/src/dns/Makefile.in 2009-06-01 13:08:26.000000000 +0000 | ||
38 | @@ -14,7 +14,7 @@ | ||
39 | LIB_DIR = ../../lib | ||
40 | INC_DIR = ../../include | ||
41 | |||
42 | -.c.o:; $(CC) $(CFLAGS) -c $*.c | ||
43 | +.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c | ||
44 | |||
45 | all: $(LIB) | ||
46 | |||
47 | @@ -31,12 +31,10 @@ | ||
48 | root_tests: | ||
49 | |||
50 | $(LIB): $(OBJS) | ||
51 | - $(AR) $(ARFL) $(LIB) $? | ||
52 | - $(RANLIB) $(LIB) | ||
53 | + gcc -shared -Wl,-soname,libpostfix-dns.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) | ||
54 | |||
55 | $(LIB_DIR)/$(LIB): $(LIB) | ||
56 | cp $(LIB) $(LIB_DIR) | ||
57 | - $(RANLIB) $(LIB_DIR)/$(LIB) | ||
58 | |||
59 | update: $(LIB_DIR)/$(LIB) $(HDRS) | ||
60 | -for i in $(HDRS); \ | ||
61 | diff -ruN a/src/global/Makefile.in b/src/global/Makefile.in | ||
62 | --- a/src/global/Makefile.in 2009-06-01 12:27:43.000000000 +0000 | ||
63 | +++ b/src/global/Makefile.in 2009-06-01 13:08:26.000000000 +0000 | ||
64 | @@ -34,7 +34,7 @@ | ||
65 | canon_addr.o cfg_parser.o cleanup_strerror.o cleanup_strflags.o \ | ||
66 | clnt_stream.o conv_time.o db_common.o debug_peer.o debug_process.o \ | ||
67 | defer.o deliver_completed.o deliver_flock.o deliver_pass.o \ | ||
68 | - deliver_request.o dict_ldap.o dict_mysql.o dict_pgsql.o \ | ||
69 | + deliver_request.o \ | ||
70 | dict_proxy.o domain_list.o dot_lockfile.o dot_lockfile_as.o \ | ||
71 | dsb_scan.o dsn.o dsn_buf.o dsn_mask.o dsn_print.o dsn_util.o \ | ||
72 | ehlo_mask.o ext_prop.o file_id.o flush_clnt.o header_opts.o \ | ||
73 | @@ -103,10 +103,13 @@ | ||
74 | LIB_DIR = ../../lib | ||
75 | INC_DIR = ../../include | ||
76 | MAKES = | ||
77 | +LDAPSO = dict_ldap.so | ||
78 | +MYSQLSO = dict_mysql.so | ||
79 | +PGSQLSO = dict_pgsql.so | ||
80 | |||
81 | -.c.o:; $(CC) $(CFLAGS) -c $*.c | ||
82 | +.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c | ||
83 | |||
84 | -all: $(LIB) | ||
85 | +all: $(LIB) $(LDAPSO) $(MYSQLSO) $(PGSQLSO) | ||
86 | |||
87 | $(OBJS): ../../conf/makedefs.out | ||
88 | |||
89 | @@ -116,14 +119,30 @@ | ||
90 | test: $(TESTPROG) | ||
91 | |||
92 | $(LIB): $(OBJS) | ||
93 | - $(AR) $(ARFL) $(LIB) $? | ||
94 | - $(RANLIB) $(LIB) | ||
95 | + gcc -shared -Wl,-soname,libpostfix-global.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) | ||
96 | + | ||
97 | +$(LDAPSO): dict_ldap.o $(LIB) ../../lib/libglobal.a | ||
98 | + gcc -shared -Wl,-soname,dict_ldap.so -o $@ $? -lldap -llber -L../../lib -lutil -L. -lglobal | ||
99 | + | ||
100 | +$(MYSQLSO): dict_mysql.o $(LIB) ../../lib/libglobal.a | ||
101 | + gcc -shared -Wl,-soname,dict_mysql.so -o $@ $? -lmysqlclient -L. -lutil -lglobal | ||
102 | + | ||
103 | +$(PGSQLSO): dict_pgsql.o $(LIB) ../../lib/libglobal.a | ||
104 | + gcc -shared -Wl,-soname,dict_pgsql.so -o $@ $? -lpq -L. -lutil -lglobal | ||
105 | |||
106 | $(LIB_DIR)/$(LIB): $(LIB) | ||
107 | cp $(LIB) $(LIB_DIR) | ||
108 | - $(RANLIB) $(LIB_DIR)/$(LIB) | ||
109 | |||
110 | -update: $(LIB_DIR)/$(LIB) $(HDRS) | ||
111 | +../../libexec/$(LDAPSO): $(LDAPSO) | ||
112 | + cp $(LDAPSO) ../../libexec | ||
113 | + | ||
114 | +../../libexec/$(MYSQLSO): $(MYSQLSO) | ||
115 | + cp $(MYSQLSO) ../../libexec | ||
116 | + | ||
117 | +../../libexec/$(PGSQLSO): $(PGSQLSO) | ||
118 | + cp $(PGSQLSO) ../../libexec | ||
119 | + | ||
120 | +update: $(LIB_DIR)/$(LIB) ../../libexec/$(LDAPSO) ../../libexec/$(MYSQLSO) ../../libexec/$(PGSQLSO) $(HDRS) | ||
121 | -for i in $(HDRS); \ | ||
122 | do \ | ||
123 | cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \ | ||
124 | @@ -491,7 +510,7 @@ | ||
125 | lint $(DEFS) $(SRCS) $(LINTFIX) | ||
126 | |||
127 | clean: | ||
128 | - rm -f *.o $(LIB) *core $(TESTPROG) junk | ||
129 | + rm -f *.o $(LIB) $(LDAPSO) $(MYSQLSO) $(PGSQLSO) *core $(TESTPROG) junk | ||
130 | rm -rf printfck | ||
131 | |||
132 | tidy: clean | ||
133 | diff -ruN a/src/global/Makefile.in.orig b/src/global/Makefile.in.orig | ||
134 | --- a/src/global/Makefile.in.orig 1970-01-01 00:00:00.000000000 +0000 | ||
135 | +++ b/src/global/Makefile.in.orig 2009-06-01 13:07:56.000000000 +0000 | ||
136 | @@ -0,0 +1,2018 @@ | ||
137 | +SHELL = /bin/sh | ||
138 | +SRCS = abounce.c anvil_clnt.c been_here.c bounce.c bounce_log.c \ | ||
139 | + canon_addr.c cfg_parser.c cleanup_strerror.c cleanup_strflags.c \ | ||
140 | + clnt_stream.c conv_time.c db_common.c debug_peer.c debug_process.c \ | ||
141 | + defer.c deliver_completed.c deliver_flock.c deliver_pass.c \ | ||
142 | + deliver_request.c dict_ldap.c dict_mysql.c dict_pgsql.c \ | ||
143 | + dict_proxy.c domain_list.c dot_lockfile.c dot_lockfile_as.c \ | ||
144 | + dsb_scan.c dsn.c dsn_buf.c dsn_mask.c dsn_print.c dsn_util.c \ | ||
145 | + ehlo_mask.c ext_prop.c file_id.c flush_clnt.c header_opts.c \ | ||
146 | + header_token.c input_transp.c int_filt.c is_header.c log_adhoc.c \ | ||
147 | + mail_addr.c mail_addr_crunch.c mail_addr_find.c mail_addr_map.c \ | ||
148 | + mail_command_client.c mail_command_server.c mail_conf.c \ | ||
149 | + mail_conf_bool.c mail_conf_int.c mail_conf_long.c mail_conf_raw.c \ | ||
150 | + mail_conf_str.c mail_conf_time.c mail_connect.c mail_copy.c \ | ||
151 | + mail_date.c mail_dict.c mail_error.c mail_flush.c mail_open_ok.c \ | ||
152 | + mail_params.c mail_pathname.c mail_queue.c mail_run.c \ | ||
153 | + mail_scan_dir.c mail_stream.c mail_task.c mail_trigger.c maps.c \ | ||
154 | + mark_corrupt.c match_parent_style.c mbox_conf.c mbox_open.c \ | ||
155 | + mime_state.c mkmap_cdb.c mkmap_db.c mkmap_dbm.c mkmap_open.c \ | ||
156 | + mkmap_sdbm.c msg_stats_print.c msg_stats_scan.c mynetworks.c \ | ||
157 | + mypwd.c namadr_list.c off_cvt.c opened.c own_inet_addr.c \ | ||
158 | + pipe_command.c post_mail.c quote_821_local.c quote_822_local.c \ | ||
159 | + rcpt_buf.c rcpt_print.c rec_attr_map.c rec_streamlf.c rec_type.c \ | ||
160 | + recipient_list.c record.c remove.c resolve_clnt.c resolve_local.c \ | ||
161 | + rewrite_clnt.c scache_clnt.c scache_multi.c scache_single.c \ | ||
162 | + sent.c smtp_stream.c split_addr.c string_list.c strip_addr.c \ | ||
163 | + sys_exits.c timed_ipc.c tok822_find.c tok822_node.c tok822_parse.c \ | ||
164 | + tok822_resolve.c tok822_rewrite.c tok822_tree.c trace.c \ | ||
165 | + user_acl.c valid_mailhost_addr.c verify.c verify_clnt.c \ | ||
166 | + verp_sender.c wildcard_inet_addr.c xtext.c delivered_hdr.c \ | ||
167 | + fold_addr.c header_body_checks.c mkmap_proxy.c data_redirect.c \ | ||
168 | + match_service.c mail_conf_nint.c | ||
169 | +OBJS = abounce.o anvil_clnt.o been_here.o bounce.o bounce_log.o \ | ||
170 | + canon_addr.o cfg_parser.o cleanup_strerror.o cleanup_strflags.o \ | ||
171 | + clnt_stream.o conv_time.o db_common.o debug_peer.o debug_process.o \ | ||
172 | + defer.o deliver_completed.o deliver_flock.o deliver_pass.o \ | ||
173 | + deliver_request.o dict_ldap.o dict_mysql.o dict_pgsql.o \ | ||
174 | + dict_proxy.o domain_list.o dot_lockfile.o dot_lockfile_as.o \ | ||
175 | + dsb_scan.o dsn.o dsn_buf.o dsn_mask.o dsn_print.o dsn_util.o \ | ||
176 | + ehlo_mask.o ext_prop.o file_id.o flush_clnt.o header_opts.o \ | ||
177 | + header_token.o input_transp.o int_filt.o is_header.o log_adhoc.o \ | ||
178 | + mail_addr.o mail_addr_crunch.o mail_addr_find.o mail_addr_map.o \ | ||
179 | + mail_command_client.o mail_command_server.o mail_conf.o \ | ||
180 | + mail_conf_bool.o mail_conf_int.o mail_conf_long.o mail_conf_raw.o \ | ||
181 | + mail_conf_str.o mail_conf_time.o mail_connect.o mail_copy.o \ | ||
182 | + mail_date.o mail_dict.o mail_error.o mail_flush.o mail_open_ok.o \ | ||
183 | + mail_params.o mail_pathname.o mail_queue.o mail_run.o \ | ||
184 | + mail_scan_dir.o mail_stream.o mail_task.o mail_trigger.o maps.o \ | ||
185 | + mark_corrupt.o match_parent_style.o mbox_conf.o mbox_open.o \ | ||
186 | + mime_state.o mkmap_cdb.o mkmap_db.o mkmap_dbm.o mkmap_open.o \ | ||
187 | + mkmap_sdbm.o msg_stats_print.o msg_stats_scan.o mynetworks.o \ | ||
188 | + mypwd.o namadr_list.o off_cvt.o opened.o own_inet_addr.o \ | ||
189 | + pipe_command.o post_mail.o quote_821_local.o quote_822_local.o \ | ||
190 | + rcpt_buf.o rcpt_print.o rec_attr_map.o rec_streamlf.o rec_type.o \ | ||
191 | + recipient_list.o record.o remove.o resolve_clnt.o resolve_local.o \ | ||
192 | + rewrite_clnt.o scache_clnt.o scache_multi.o scache_single.o \ | ||
193 | + sent.o smtp_stream.o split_addr.o string_list.o strip_addr.o \ | ||
194 | + sys_exits.o timed_ipc.o tok822_find.o tok822_node.o tok822_parse.o \ | ||
195 | + tok822_resolve.o tok822_rewrite.o tok822_tree.o trace.o \ | ||
196 | + user_acl.o valid_mailhost_addr.o verify.o verify_clnt.o \ | ||
197 | + verp_sender.o wildcard_inet_addr.o xtext.o delivered_hdr.o \ | ||
198 | + fold_addr.o header_body_checks.o mkmap_proxy.o data_redirect.o \ | ||
199 | + match_service.o mail_conf_nint.o | ||
200 | +HDRS = abounce.h anvil_clnt.h been_here.h bounce.h bounce_log.h \ | ||
201 | + canon_addr.h cfg_parser.h cleanup_user.h clnt_stream.h config.h \ | ||
202 | + conv_time.h db_common.h debug_peer.h debug_process.h defer.h \ | ||
203 | + deliver_completed.h deliver_flock.h deliver_pass.h deliver_request.h \ | ||
204 | + dict_ldap.h dict_mysql.h dict_pgsql.h dict_proxy.h domain_list.h \ | ||
205 | + dot_lockfile.h dot_lockfile_as.h dsb_scan.h dsn.h dsn_buf.h \ | ||
206 | + dsn_mask.h dsn_print.h dsn_util.h ehlo_mask.h ext_prop.h \ | ||
207 | + file_id.h flush_clnt.h header_opts.h header_token.h input_transp.h \ | ||
208 | + int_filt.h is_header.h lex_822.h log_adhoc.h mail_addr.h \ | ||
209 | + mail_addr_crunch.h mail_addr_find.h mail_addr_map.h mail_conf.h \ | ||
210 | + mail_copy.h mail_date.h mail_dict.h mail_error.h mail_flush.h \ | ||
211 | + mail_open_ok.h mail_params.h mail_proto.h mail_queue.h mail_run.h \ | ||
212 | + mail_scan_dir.h mail_stream.h mail_task.h mail_version.h maps.h \ | ||
213 | + mark_corrupt.h match_parent_style.h mbox_conf.h mbox_open.h \ | ||
214 | + mime_state.h mkmap.h msg_stats.h mynetworks.h mypwd.h namadr_list.h \ | ||
215 | + off_cvt.h opened.h own_inet_addr.h pipe_command.h post_mail.h \ | ||
216 | + qmgr_user.h qmqp_proto.h quote_821_local.h quote_822_local.h \ | ||
217 | + quote_flags.h rcpt_buf.h rcpt_print.h rec_attr_map.h rec_streamlf.h \ | ||
218 | + rec_type.h recipient_list.h record.h resolve_clnt.h resolve_local.h \ | ||
219 | + rewrite_clnt.h scache.h sent.h smtp_stream.h split_addr.h \ | ||
220 | + string_list.h strip_addr.h sys_exits.h timed_ipc.h tok822.h \ | ||
221 | + trace.h user_acl.h valid_mailhost_addr.h verify.h verify_clnt.h \ | ||
222 | + verp_sender.h wildcard_inet_addr.h xtext.h delivered_hdr.h \ | ||
223 | + fold_addr.h header_body_checks.h data_redirect.h match_service.h | ||
224 | +TESTSRC = rec2stream.c stream2rec.c recdump.c | ||
225 | +DEFS = -I. -I$(INC_DIR) -D$(SYSTYPE) | ||
226 | +CFLAGS = $(DEBUG) $(OPT) $(DEFS) | ||
227 | +INCL = | ||
228 | +LIB = libglobal.a | ||
229 | +TESTPROG= domain_list dot_lockfile mail_addr_crunch mail_addr_find \ | ||
230 | + mail_addr_map mail_date maps mynetworks mypwd namadr_list \ | ||
231 | + off_cvt quote_822_local rec2stream recdump resolve_clnt \ | ||
232 | + resolve_local rewrite_clnt stream2rec string_list tok822_parse \ | ||
233 | + quote_821_local mail_conf_time mime_state strip_addr \ | ||
234 | + verify_clnt xtext anvil_clnt scache ehlo_mask \ | ||
235 | + valid_mailhost_addr own_inet_addr header_body_checks \ | ||
236 | + data_redirect | ||
237 | + | ||
238 | +LIBS = ../../lib/libutil.a | ||
239 | +LIB_DIR = ../../lib | ||
240 | +INC_DIR = ../../include | ||
241 | +MAKES = | ||
242 | + | ||
243 | +.c.o:; $(CC) $(CFLAGS) -c $*.c | ||
244 | + | ||
245 | +all: $(LIB) | ||
246 | + | ||
247 | +$(OBJS): ../../conf/makedefs.out | ||
248 | + | ||
249 | +Makefile: Makefile.in | ||
250 | + cat ../../conf/makedefs.out $? >$@ | ||
251 | + | ||
252 | +test: $(TESTPROG) | ||
253 | + | ||
254 | +$(LIB): $(OBJS) | ||
255 | + $(AR) $(ARFL) $(LIB) $? | ||
256 | + $(RANLIB) $(LIB) | ||
257 | + | ||
258 | +$(LIB_DIR)/$(LIB): $(LIB) | ||
259 | + cp $(LIB) $(LIB_DIR) | ||
260 | + $(RANLIB) $(LIB_DIR)/$(LIB) | ||
261 | + | ||
262 | +update: $(LIB_DIR)/$(LIB) $(HDRS) | ||
263 | + -for i in $(HDRS); \ | ||
264 | + do \ | ||
265 | + cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \ | ||
266 | + done | ||
267 | + cd $(INC_DIR); chmod 644 $(HDRS) | ||
268 | + | ||
269 | +dot_lockfile: $(LIB) $(LIBS) | ||
270 | + mv $@.o junk | ||
271 | + $(CC) -DTEST $(CFLAGS) -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
272 | + mv junk $@.o | ||
273 | + | ||
274 | +tok822_parse: $(LIB) $(LIBS) | ||
275 | + mv $@.o junk | ||
276 | + $(CC) -DTEST $(CFLAGS) -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
277 | + mv junk $@.o | ||
278 | + | ||
279 | +rec2stream: rec2stream.c $(LIB) $(LIBS) | ||
280 | + $(CC) $(CFLAGS) -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
281 | + | ||
282 | +stream2rec: stream2rec.c $(LIB) $(LIBS) | ||
283 | + $(CC) $(CFLAGS) -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
284 | + | ||
285 | +recdump: recdump.c $(LIB) $(LIBS) | ||
286 | + $(CC) $(CFLAGS) -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
287 | + | ||
288 | +namadr_list: $(LIB) $(LIBS) | ||
289 | + mv $@.o junk | ||
290 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
291 | + mv junk $@.o | ||
292 | + | ||
293 | +domain_list: $(LIB) $(LIBS) | ||
294 | + mv $@.o junk | ||
295 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
296 | + mv junk $@.o | ||
297 | + | ||
298 | +mynetworks: $(LIB) $(LIBS) | ||
299 | + mv $@.o junk | ||
300 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
301 | + mv junk $@.o | ||
302 | + | ||
303 | +resolve_clnt: $(LIB) $(LIBS) | ||
304 | + mv $@.o junk | ||
305 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
306 | + mv junk $@.o | ||
307 | + | ||
308 | +rewrite_clnt: $(LIB) $(LIBS) | ||
309 | + mv $@.o junk | ||
310 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
311 | + mv junk $@.o | ||
312 | + | ||
313 | +quote_822_local: $(LIB) $(LIBS) | ||
314 | + mv $@.o junk | ||
315 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
316 | + mv junk $@.o | ||
317 | + | ||
318 | +off_cvt: $(LIB) $(LIBS) | ||
319 | + mv $@.o junk | ||
320 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
321 | + mv junk $@.o | ||
322 | + | ||
323 | +mail_addr_map: $(LIB) $(LIBS) | ||
324 | + mv $@.o junk | ||
325 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
326 | + mv junk $@.o | ||
327 | + | ||
328 | +mail_addr_find: $(LIB) $(LIBS) | ||
329 | + mv $@.o junk | ||
330 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
331 | + mv junk $@.o | ||
332 | + | ||
333 | +maps: $(LIB) $(LIBS) | ||
334 | + mv $@.o junk | ||
335 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
336 | + mv junk $@.o | ||
337 | + | ||
338 | +mypwd: $(LIB) $(LIBS) | ||
339 | + mv $@.o junk | ||
340 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
341 | + mv junk $@.o | ||
342 | + | ||
343 | +mail_date: $(LIB) $(LIBS) | ||
344 | + mv $@.o junk | ||
345 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
346 | + mv junk $@.o | ||
347 | + | ||
348 | +resolve_local: $(LIB) $(LIBS) | ||
349 | + mv $@.o junk | ||
350 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
351 | + mv junk $@.o | ||
352 | + | ||
353 | +mail_addr_crunch: $(LIB) $(LIBS) | ||
354 | + mv $@.o junk | ||
355 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
356 | + mv junk $@.o | ||
357 | + | ||
358 | +string_list: $(LIB) $(LIBS) | ||
359 | + mv $@.o junk | ||
360 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
361 | + mv junk $@.o | ||
362 | + | ||
363 | +local_transport: $(LIB) $(LIBS) | ||
364 | + mv $@.o junk | ||
365 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
366 | + mv junk $@.o | ||
367 | + | ||
368 | +quote_821_local: quote_821_local.c $(LIBS) | ||
369 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIBS) $(SYSLIBS) | ||
370 | + | ||
371 | +mail_conf_time: $(LIB) $(LIBS) | ||
372 | + mv $@.o junk | ||
373 | + $(CC) -DTEST $(CFLAGS) -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
374 | + mv junk $@.o | ||
375 | + | ||
376 | +mime_state: $(LIB) $(LIBS) | ||
377 | + mv $@.o junk | ||
378 | + $(CC) -DTEST $(CFLAGS) -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
379 | + mv junk $@.o | ||
380 | + | ||
381 | +strip_addr: $(LIB) $(LIBS) | ||
382 | + mv $@.o junk | ||
383 | + $(CC) -DTEST $(CFLAGS) -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
384 | + mv junk $@.o | ||
385 | + | ||
386 | +verify_clnt: $(LIB) $(LIBS) | ||
387 | + mv $@.o junk | ||
388 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
389 | + mv junk $@.o | ||
390 | + | ||
391 | +xtext: $(LIB) $(LIBS) | ||
392 | + mv $@.o junk | ||
393 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
394 | + mv junk $@.o | ||
395 | + | ||
396 | +anvil_clnt: $(LIB) $(LIBS) | ||
397 | + mv $@.o junk | ||
398 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
399 | + mv junk $@.o | ||
400 | + | ||
401 | +scache: scache.c $(LIB) $(LIBS) | ||
402 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
403 | + | ||
404 | +ehlo_mask: ehlo_mask.c $(LIB) $(LIBS) | ||
405 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
406 | + | ||
407 | +valid_mailhost_addr: valid_mailhost_addr.c $(LIB) $(LIBS) | ||
408 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
409 | + | ||
410 | +own_inet_addr: own_inet_addr.c $(LIB) $(LIBS) | ||
411 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
412 | + | ||
413 | +header_body_checks: header_body_checks.c $(LIB) $(LIBS) | ||
414 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
415 | + | ||
416 | +data_redirect: data_redirect.c $(LIB) $(LIBS) | ||
417 | + $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) | ||
418 | + | ||
419 | +tests: tok822_test mime_tests strip_addr_test tok822_limit_test \ | ||
420 | + xtext_test scache_multi_test ehlo_mask_test \ | ||
421 | + namadr_list_test mail_conf_time_test header_body_checks_tests | ||
422 | + | ||
423 | +mime_tests: mime_test mime_nest mime_8bit mime_dom mime_trunc mime_cvt \ | ||
424 | + mime_cvt2 mime_cvt3 mime_garb1 mime_garb2 mime_garb3 mime_garb4 | ||
425 | + | ||
426 | +header_body_checks_tests: header_body_checks_null_test \ | ||
427 | + header_body_checks_warn_test header_body_checks_prepend_test \ | ||
428 | + header_body_checks_ignore_test header_body_checks_replace_test | ||
429 | + | ||
430 | +root_tests: rewrite_clnt_test resolve_clnt_test | ||
431 | + | ||
432 | +tok822_test: tok822_parse tok822_parse.in tok822_parse.ref | ||
433 | + ./tok822_parse <tok822_parse.in >tok822_parse.tmp 2>&1 | ||
434 | + diff tok822_parse.ref tok822_parse.tmp | ||
435 | + rm -f tok822_parse.tmp | ||
436 | + | ||
437 | +mime_test: mime_state mime_test.in mime_test.ref | ||
438 | + ./mime_state <mime_test.in >mime_test.tmp | ||
439 | + diff mime_test.ref mime_test.tmp | ||
440 | + rm -f mime_test.tmp | ||
441 | + | ||
442 | +mime_nest: mime_state mime_nest.in mime_nest.ref | ||
443 | + ./mime_state <mime_nest.in >mime_nest.tmp | ||
444 | + diff mime_nest.ref mime_nest.tmp | ||
445 | + rm -f mime_nest.tmp | ||
446 | + | ||
447 | +mime_8bit: mime_state mime_8bit.in mime_8bit.ref | ||
448 | + ./mime_state <mime_8bit.in >mime_8bit.tmp | ||
449 | + diff mime_8bit.ref mime_8bit.tmp | ||
450 | + rm -f mime_8bit.tmp | ||
451 | + | ||
452 | +mime_dom: mime_state mime_dom.in mime_dom.ref | ||
453 | + ./mime_state <mime_dom.in >mime_dom.tmp | ||
454 | + diff mime_dom.ref mime_dom.tmp | ||
455 | + rm -f mime_dom.tmp | ||
456 | + | ||
457 | +mime_trunc: mime_state mime_trunc.in mime_trunc.ref | ||
458 | + ./mime_state <mime_trunc.in >mime_trunc.tmp | ||
459 | + diff mime_trunc.ref mime_trunc.tmp | ||
460 | + rm -f mime_trunc.tmp | ||
461 | + | ||
462 | +mime_cvt: mime_state mime_cvt.in mime_cvt.ref | ||
463 | + ./mime_state <mime_cvt.in >mime_cvt.tmp | ||
464 | + diff mime_cvt.ref mime_cvt.tmp | ||
465 | + rm -f mime_cvt.tmp | ||
466 | + | ||
467 | +mime_cvt2: mime_state mime_cvt.in2 mime_cvt.ref2 | ||
468 | + ./mime_state <mime_cvt.in2 >mime_cvt.tmp | ||
469 | + diff mime_cvt.ref2 mime_cvt.tmp | ||
470 | + rm -f mime_cvt.tmp | ||
471 | + | ||
472 | +mime_cvt3: mime_state mime_cvt.in3 mime_cvt.ref3 | ||
473 | + ./mime_state <mime_cvt.in3 >mime_cvt.tmp | ||
474 | + diff mime_cvt.ref3 mime_cvt.tmp | ||
475 | + rm -f mime_cvt.tmp | ||
476 | + | ||
477 | +mime_garb1: mime_state mime_garb1.in mime_garb1.ref | ||
478 | + ./mime_state <mime_garb1.in >mime_cvt.tmp | ||
479 | + diff mime_garb1.ref mime_cvt.tmp | ||
480 | + rm -f mime_cvt.tmp | ||
481 | + | ||
482 | +mime_garb2: mime_state mime_garb2.in mime_garb2.ref | ||
483 | + ./mime_state <mime_garb2.in >mime_cvt.tmp | ||
484 | + diff mime_garb2.ref mime_cvt.tmp | ||
485 | + rm -f mime_cvt.tmp | ||
486 | + | ||
487 | +mime_garb3: mime_state mime_garb3.in mime_garb3.ref | ||
488 | + ./mime_state <mime_garb3.in >mime_cvt.tmp | ||
489 | + diff mime_garb3.ref mime_cvt.tmp | ||
490 | + rm -f mime_cvt.tmp | ||
491 | + | ||
492 | +mime_garb4: mime_state mime_garb4.in mime_garb4.ref | ||
493 | + ./mime_state <mime_garb4.in >mime_cvt.tmp | ||
494 | + diff mime_garb4.ref mime_cvt.tmp | ||
495 | + rm -f mime_cvt.tmp | ||
496 | + | ||
497 | +tok822_limit_test: tok822_parse tok822_limit.in tok822_limit.ref | ||
498 | + ./tok822_parse <tok822_limit.in >tok822_limit.tmp | ||
499 | + diff tok822_limit.ref tok822_limit.tmp | ||
500 | + rm -f tok822_limit.tmp | ||
501 | + | ||
502 | +strip_addr_test: strip_addr strip_addr.ref | ||
503 | + ./strip_addr 2>strip_addr.tmp | ||
504 | + diff strip_addr.ref strip_addr.tmp | ||
505 | + rm -f strip_addr.tmp | ||
506 | + | ||
507 | +xtext_test: xtext | ||
508 | + ./xtext <xtext.c | od -cb >xtext.tmp | ||
509 | + od -cb <xtext.c >xtext.ref | ||
510 | + cmp xtext.ref xtext.tmp | ||
511 | + rm -f xtext.ref xtext.tmp | ||
512 | + | ||
513 | +# Requires: Postfix running, root privileges | ||
514 | + | ||
515 | +rewrite_clnt_test: rewrite_clnt rewrite_clnt.in rewrite_clnt.ref | ||
516 | + @set -- `id`; case "$$1" in \ | ||
517 | + *"(root)") ;; \ | ||
518 | + *) echo 'This test requires root privilege'; exit 1;; \ | ||
519 | + esac | ||
520 | + @test -n "`postconf -h remote_header_rewrite_domain`" || { \ | ||
521 | + echo 'This test requires non-empty remote_header_rewrite_domain'; exit 1; } | ||
522 | + ./rewrite_clnt <rewrite_clnt.in >rewrite_clnt.tmp | ||
523 | + sed -e "s/MYDOMAIN/`postconf -h mydomain`/" \ | ||
524 | + -e "s/INVALID_DOMAIN/`postconf -h remote_header_rewrite_domain`/" \ | ||
525 | + rewrite_clnt.ref | diff - rewrite_clnt.tmp | ||
526 | + rm -f rewrite_clnt.tmp | ||
527 | + | ||
528 | +# Requires: Postfix, root, relayhost=$mydomain, no transport map | ||
529 | + | ||
530 | +resolve_clnt_test: resolve_clnt resolve_clnt.in resolve_clnt.ref | ||
531 | + @set -- `id`; case "$$1" in \ | ||
532 | + *"(root)") ;; \ | ||
533 | + *) echo 'This test requires root privilege'; exit 1;; \ | ||
534 | + esac | ||
535 | + @test "`postconf -h relayhost`" = '$$mydomain' || { \ | ||
536 | + echo 'This test requires relayhost=$$mydomain'; exit 1; } | ||
537 | + @test "`postconf -h transport_maps`" = "" || { \ | ||
538 | + echo 'This test requires no transport map'; exit 1; } | ||
539 | + sed -e "s/MYDOMAIN/`postconf -h mydomain`/g" \ | ||
540 | + -e "s/MYHOSTNAME/`postconf -h myhostname`/g" \ | ||
541 | + resolve_clnt.in | ./resolve_clnt >resolve_clnt.tmp | ||
542 | + sed -e "s/MYDOMAIN/`postconf -h mydomain`/g" \ | ||
543 | + -e "s/MYHOSTNAME/`postconf -h myhostname`/g" \ | ||
544 | + -e "s/RELAYHOST/`postconf -h mydomain`/g" \ | ||
545 | + resolve_clnt.ref | diff - resolve_clnt.tmp | ||
546 | + rm -f resolve_clnt.tmp | ||
547 | + | ||
548 | +scache_multi_test: scache scache_multi.in scache_multi.ref | ||
549 | + ./scache <scache_multi.in >scache_multi.tmp | ||
550 | + diff scache_multi.ref scache_multi.tmp | ||
551 | + rm -f scache_multi.tmp | ||
552 | + | ||
553 | +ehlo_mask_test: ehlo_mask ehlo_mask.in ehlo_mask.ref | ||
554 | + ./ehlo_mask <ehlo_mask.in >ehlo_mask.tmp | ||
555 | + diff ehlo_mask.ref ehlo_mask.tmp | ||
556 | + rm -f ehlo_mask.tmp | ||
557 | + | ||
558 | +namadr_list_test: namadr_list namadr_list.in namadr_list.ref | ||
559 | + -sh namadr_list.in >namadr_list.tmp 2>&1 | ||
560 | + diff namadr_list.ref namadr_list.tmp | ||
561 | + rm -f namadr_list.tmp | ||
562 | + | ||
563 | +mail_conf_time_test: mail_conf_time mail_conf_time.ref | ||
564 | + ./mail_conf_time >mail_conf_time.tmp | ||
565 | + diff mail_conf_time.ref mail_conf_time.tmp | ||
566 | + rm -f mail_conf_time.tmp | ||
567 | + | ||
568 | +header_body_checks_null_test: header_body_checks header_body_checks_null.ref | ||
569 | + ./header_body_checks "" "" "" "" \ | ||
570 | + <mime_test.in >header_body_checks_null.tmp 2>&1 | ||
571 | + cmp header_body_checks_null.ref header_body_checks_null.tmp | ||
572 | + ./header_body_checks static:dunno static:dunno static:dunno static:dunno \ | ||
573 | + <mime_test.in >header_body_checks_null.tmp 2>&1 | ||
574 | + cmp header_body_checks_null.ref header_body_checks_null.tmp | ||
575 | + ./header_body_checks static:ok static:ok static:ok static:ok \ | ||
576 | + <mime_test.in >header_body_checks_null.tmp 2>&1 | ||
577 | + cmp header_body_checks_null.ref header_body_checks_null.tmp | ||
578 | + rm -f header_body_checks_null.tmp | ||
579 | + | ||
580 | +header_body_checks_warn_test: header_body_checks header_body_checks_warn.ref | ||
581 | + ./header_body_checks static:warn static:warn static:warn static:warn \ | ||
582 | + <mime_test.in >header_body_checks_warn.tmp 2>&1 | ||
583 | + cmp header_body_checks_warn.ref header_body_checks_warn.tmp | ||
584 | + rm -f header_body_checks_warn.tmp | ||
585 | + | ||
586 | +header_body_checks_prepend_test: header_body_checks header_body_checks_prepend.ref | ||
587 | + echo /./ prepend header: head >header_body_checks_head | ||
588 | + echo /./ prepend header: mime >header_body_checks_mime | ||
589 | + echo /./ prepend header: nest >header_body_checks_nest | ||
590 | + echo /./ prepend body >header_body_checks_body | ||
591 | + ./header_body_checks regexp:header_body_checks_head regexp:header_body_checks_mime \ | ||
592 | + regexp:header_body_checks_nest regexp:header_body_checks_body \ | ||
593 | + <mime_test.in >header_body_checks_prepend.tmp 2>&1 | ||
594 | + cmp header_body_checks_prepend.ref header_body_checks_prepend.tmp | ||
595 | + rm -f header_body_checks_prepend.tmp header_body_checks_head header_body_checks_mime header_body_checks_nest header_body_checks_body | ||
596 | + | ||
597 | +# Note: the IGNORE action will not strip empty lines. Postfix maps | ||
598 | +# currently never see null query strings because some map types raise | ||
599 | +# errors. We can eliminate this restriction by allowing individual | ||
600 | +# map types to advertise whether they can handle null queries. | ||
601 | +header_body_checks_ignore_test: header_body_checks header_body_checks_ignore.ref | ||
602 | + ./header_body_checks static:ignore static:ignore static:ignore static:ignore \ | ||
603 | + <mime_test.in >header_body_checks_ignore.tmp 2>&1 | ||
604 | + cmp header_body_checks_ignore.ref header_body_checks_ignore.tmp | ||
605 | + rm -f header_body_checks_ignore.tmp header_body_checks_head header_body_checks_mime header_body_checks_nest header_body_checks_body | ||
606 | + | ||
607 | +header_body_checks_replace_test: header_body_checks header_body_checks_replace.ref | ||
608 | + echo /./ replace header: head >header_body_checks_head | ||
609 | + echo /./ replace header: mime >header_body_checks_mime | ||
610 | + echo /./ replace header: nest >header_body_checks_nest | ||
611 | + echo /./ replace body >header_body_checks_body | ||
612 | + ./header_body_checks regexp:header_body_checks_head regexp:header_body_checks_mime \ | ||
613 | + regexp:header_body_checks_nest regexp:header_body_checks_body \ | ||
614 | + <mime_test.in >header_body_checks_replace.tmp 2>&1 | ||
615 | + cmp header_body_checks_replace.ref header_body_checks_replace.tmp | ||
616 | + rm -f header_body_checks_replace.tmp header_body_checks_head header_body_checks_mime header_body_checks_nest header_body_checks_body | ||
617 | + | ||
618 | +printfck: $(OBJS) $(PROG) | ||
619 | + rm -rf printfck | ||
620 | + mkdir printfck | ||
621 | + cp *.h printfck | ||
622 | + sed '1,/^# do not edit/!d' Makefile >printfck/Makefile | ||
623 | + set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done | ||
624 | + cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o` | ||
625 | + | ||
626 | +lint: | ||
627 | + lint $(DEFS) $(SRCS) $(LINTFIX) | ||
628 | + | ||
629 | +clean: | ||
630 | + rm -f *.o $(LIB) *core $(TESTPROG) junk | ||
631 | + rm -rf printfck | ||
632 | + | ||
633 | +tidy: clean | ||
634 | + | ||
635 | +depend: $(MAKES) | ||
636 | + (sed '1,/^# do not edit/!d' Makefile.in; \ | ||
637 | + set -e; for i in [a-z][a-z0-9]*.c; do \ | ||
638 | + $(CC) -E $(DEFS) $(INCL) $$i | grep -v '[<>]' | sed -n -e '/^# *1 *"\([^"]*\)".*/{' \ | ||
639 | + -e 's//'`echo $$i|sed 's/c$$/o/'`': \1/' \ | ||
640 | + -e 's/o: \.\//o: /' -e p -e '}' ; \ | ||
641 | + done | sort -u) | grep -v '[.][o][:][ ][/]' >$$$$ && mv $$$$ Makefile.in | ||
642 | + @$(EXPORT) make -f Makefile.in Makefile 1>&2 | ||
643 | + | ||
644 | +# do not edit below this line - it is generated by 'make depend' | ||
645 | +abounce.o: ../../include/attr.h | ||
646 | +abounce.o: ../../include/events.h | ||
647 | +abounce.o: ../../include/iostuff.h | ||
648 | +abounce.o: ../../include/msg.h | ||
649 | +abounce.o: ../../include/mymalloc.h | ||
650 | +abounce.o: ../../include/sys_defs.h | ||
651 | +abounce.o: ../../include/vbuf.h | ||
652 | +abounce.o: ../../include/vstream.h | ||
653 | +abounce.o: ../../include/vstring.h | ||
654 | +abounce.o: abounce.c | ||
655 | +abounce.o: abounce.h | ||
656 | +abounce.o: bounce.h | ||
657 | +abounce.o: deliver_request.h | ||
658 | +abounce.o: dsn.h | ||
659 | +abounce.o: dsn_buf.h | ||
660 | +abounce.o: mail_params.h | ||
661 | +abounce.o: mail_proto.h | ||
662 | +abounce.o: msg_stats.h | ||
663 | +abounce.o: recipient_list.h | ||
664 | +anvil_clnt.o: ../../include/attr.h | ||
665 | +anvil_clnt.o: ../../include/attr_clnt.h | ||
666 | +anvil_clnt.o: ../../include/iostuff.h | ||
667 | +anvil_clnt.o: ../../include/msg.h | ||
668 | +anvil_clnt.o: ../../include/mymalloc.h | ||
669 | +anvil_clnt.o: ../../include/stringops.h | ||
670 | +anvil_clnt.o: ../../include/sys_defs.h | ||
671 | +anvil_clnt.o: ../../include/vbuf.h | ||
672 | +anvil_clnt.o: ../../include/vstream.h | ||
673 | +anvil_clnt.o: ../../include/vstring.h | ||
674 | +anvil_clnt.o: anvil_clnt.c | ||
675 | +anvil_clnt.o: anvil_clnt.h | ||
676 | +anvil_clnt.o: mail_params.h | ||
677 | +anvil_clnt.o: mail_proto.h | ||
678 | +been_here.o: ../../include/htable.h | ||
679 | +been_here.o: ../../include/msg.h | ||
680 | +been_here.o: ../../include/mymalloc.h | ||
681 | +been_here.o: ../../include/stringops.h | ||
682 | +been_here.o: ../../include/sys_defs.h | ||
683 | +been_here.o: ../../include/vbuf.h | ||
684 | +been_here.o: ../../include/vstring.h | ||
685 | +been_here.o: been_here.c | ||
686 | +been_here.o: been_here.h | ||
687 | +bounce.o: ../../include/attr.h | ||
688 | +bounce.o: ../../include/iostuff.h | ||
689 | +bounce.o: ../../include/msg.h | ||
690 | +bounce.o: ../../include/mymalloc.h | ||
691 | +bounce.o: ../../include/sys_defs.h | ||
692 | +bounce.o: ../../include/vbuf.h | ||
693 | +bounce.o: ../../include/vstream.h | ||
694 | +bounce.o: ../../include/vstring.h | ||
695 | +bounce.o: bounce.c | ||
696 | +bounce.o: bounce.h | ||
697 | +bounce.o: defer.h | ||
698 | +bounce.o: deliver_request.h | ||
699 | +bounce.o: dsn.h | ||
700 | +bounce.o: dsn_buf.h | ||
701 | +bounce.o: dsn_print.h | ||
702 | +bounce.o: dsn_util.h | ||
703 | +bounce.o: log_adhoc.h | ||
704 | +bounce.o: mail_params.h | ||
705 | +bounce.o: mail_proto.h | ||
706 | +bounce.o: msg_stats.h | ||
707 | +bounce.o: rcpt_print.h | ||
708 | +bounce.o: recipient_list.h | ||
709 | +bounce.o: trace.h | ||
710 | +bounce.o: verify.h | ||
711 | +bounce_log.o: ../../include/attr.h | ||
712 | +bounce_log.o: ../../include/iostuff.h | ||
713 | +bounce_log.o: ../../include/msg.h | ||
714 | +bounce_log.o: ../../include/mymalloc.h | ||
715 | +bounce_log.o: ../../include/stringops.h | ||
716 | +bounce_log.o: ../../include/sys_defs.h | ||
717 | +bounce_log.o: ../../include/vbuf.h | ||
718 | +bounce_log.o: ../../include/vstream.h | ||
719 | +bounce_log.o: ../../include/vstring.h | ||
720 | +bounce_log.o: ../../include/vstring_vstream.h | ||
721 | +bounce_log.o: bounce_log.c | ||
722 | +bounce_log.o: bounce_log.h | ||
723 | +bounce_log.o: dsn.h | ||
724 | +bounce_log.o: dsn_buf.h | ||
725 | +bounce_log.o: dsn_mask.h | ||
726 | +bounce_log.o: mail_params.h | ||
727 | +bounce_log.o: mail_proto.h | ||
728 | +bounce_log.o: mail_queue.h | ||
729 | +bounce_log.o: rcpt_buf.h | ||
730 | +bounce_log.o: recipient_list.h | ||
731 | +canon_addr.o: ../../include/attr.h | ||
732 | +canon_addr.o: ../../include/iostuff.h | ||
733 | +canon_addr.o: ../../include/mymalloc.h | ||
734 | +canon_addr.o: ../../include/sys_defs.h | ||
735 | +canon_addr.o: ../../include/vbuf.h | ||
736 | +canon_addr.o: ../../include/vstream.h | ||
737 | +canon_addr.o: ../../include/vstring.h | ||
738 | +canon_addr.o: canon_addr.c | ||
739 | +canon_addr.o: canon_addr.h | ||
740 | +canon_addr.o: mail_proto.h | ||
741 | +canon_addr.o: rewrite_clnt.h | ||
742 | +cfg_parser.o: ../../include/argv.h | ||
743 | +cfg_parser.o: ../../include/dict.h | ||
744 | +cfg_parser.o: ../../include/msg.h | ||
745 | +cfg_parser.o: ../../include/mymalloc.h | ||
746 | +cfg_parser.o: ../../include/sys_defs.h | ||
747 | +cfg_parser.o: ../../include/vbuf.h | ||
748 | +cfg_parser.o: ../../include/vstream.h | ||
749 | +cfg_parser.o: ../../include/vstring.h | ||
750 | +cfg_parser.o: cfg_parser.c | ||
751 | +cfg_parser.o: cfg_parser.h | ||
752 | +cfg_parser.o: mail_conf.h | ||
753 | +cleanup_strerror.o: ../../include/msg.h | ||
754 | +cleanup_strerror.o: ../../include/sys_defs.h | ||
755 | +cleanup_strerror.o: ../../include/vbuf.h | ||
756 | +cleanup_strerror.o: ../../include/vstring.h | ||
757 | +cleanup_strerror.o: cleanup_strerror.c | ||
758 | +cleanup_strerror.o: cleanup_user.h | ||
759 | +cleanup_strflags.o: ../../include/msg.h | ||
760 | +cleanup_strflags.o: ../../include/sys_defs.h | ||
761 | +cleanup_strflags.o: ../../include/vbuf.h | ||
762 | +cleanup_strflags.o: ../../include/vstring.h | ||
763 | +cleanup_strflags.o: cleanup_strflags.c | ||
764 | +cleanup_strflags.o: cleanup_user.h | ||
765 | +clnt_stream.o: ../../include/attr.h | ||
766 | +clnt_stream.o: ../../include/events.h | ||
767 | +clnt_stream.o: ../../include/iostuff.h | ||
768 | +clnt_stream.o: ../../include/msg.h | ||
769 | +clnt_stream.o: ../../include/mymalloc.h | ||
770 | +clnt_stream.o: ../../include/sys_defs.h | ||
771 | +clnt_stream.o: ../../include/vbuf.h | ||
772 | +clnt_stream.o: ../../include/vstream.h | ||
773 | +clnt_stream.o: clnt_stream.c | ||
774 | +clnt_stream.o: clnt_stream.h | ||
775 | +clnt_stream.o: mail_params.h | ||
776 | +clnt_stream.o: mail_proto.h | ||
777 | +conv_time.o: ../../include/msg.h | ||
778 | +conv_time.o: ../../include/sys_defs.h | ||
779 | +conv_time.o: conv_time.c | ||
780 | +conv_time.o: conv_time.h | ||
781 | +data_redirect.o: ../../include/argv.h | ||
782 | +data_redirect.o: ../../include/dict.h | ||
783 | +data_redirect.o: ../../include/dict_cdb.h | ||
784 | +data_redirect.o: ../../include/dict_db.h | ||
785 | +data_redirect.o: ../../include/dict_dbm.h | ||
786 | +data_redirect.o: ../../include/msg.h | ||
787 | +data_redirect.o: ../../include/name_code.h | ||
788 | +data_redirect.o: ../../include/split_at.h | ||
789 | +data_redirect.o: ../../include/stringops.h | ||
790 | +data_redirect.o: ../../include/sys_defs.h | ||
791 | +data_redirect.o: ../../include/vbuf.h | ||
792 | +data_redirect.o: ../../include/vstream.h | ||
793 | +data_redirect.o: ../../include/vstring.h | ||
794 | +data_redirect.o: data_redirect.c | ||
795 | +data_redirect.o: data_redirect.h | ||
796 | +data_redirect.o: dict_proxy.h | ||
797 | +data_redirect.o: mail_params.h | ||
798 | +db_common.o: ../../include/argv.h | ||
799 | +db_common.o: ../../include/dict.h | ||
800 | +db_common.o: ../../include/match_list.h | ||
801 | +db_common.o: ../../include/match_ops.h | ||
802 | +db_common.o: ../../include/msg.h | ||
803 | +db_common.o: ../../include/mymalloc.h | ||
804 | +db_common.o: ../../include/sys_defs.h | ||
805 | +db_common.o: ../../include/vbuf.h | ||
806 | +db_common.o: ../../include/vstream.h | ||
807 | +db_common.o: ../../include/vstring.h | ||
808 | +db_common.o: cfg_parser.h | ||
809 | +db_common.o: db_common.c | ||
810 | +db_common.o: db_common.h | ||
811 | +db_common.o: string_list.h | ||
812 | +debug_peer.o: ../../include/match_list.h | ||
813 | +debug_peer.o: ../../include/match_ops.h | ||
814 | +debug_peer.o: ../../include/msg.h | ||
815 | +debug_peer.o: ../../include/sys_defs.h | ||
816 | +debug_peer.o: debug_peer.c | ||
817 | +debug_peer.o: debug_peer.h | ||
818 | +debug_peer.o: mail_params.h | ||
819 | +debug_peer.o: match_parent_style.h | ||
820 | +debug_peer.o: namadr_list.h | ||
821 | +debug_process.o: ../../include/msg.h | ||
822 | +debug_process.o: ../../include/sys_defs.h | ||
823 | +debug_process.o: debug_process.c | ||
824 | +debug_process.o: debug_process.h | ||
825 | +debug_process.o: mail_conf.h | ||
826 | +debug_process.o: mail_params.h | ||
827 | +defer.o: ../../include/attr.h | ||
828 | +defer.o: ../../include/iostuff.h | ||
829 | +defer.o: ../../include/msg.h | ||
830 | +defer.o: ../../include/sys_defs.h | ||
831 | +defer.o: ../../include/vbuf.h | ||
832 | +defer.o: ../../include/vstream.h | ||
833 | +defer.o: ../../include/vstring.h | ||
834 | +defer.o: bounce.h | ||
835 | +defer.o: defer.c | ||
836 | +defer.o: defer.h | ||
837 | +defer.o: deliver_request.h | ||
838 | +defer.o: dsn.h | ||
839 | +defer.o: dsn_buf.h | ||
840 | +defer.o: dsn_print.h | ||
841 | +defer.o: dsn_util.h | ||
842 | +defer.o: flush_clnt.h | ||
843 | +defer.o: log_adhoc.h | ||
844 | +defer.o: mail_params.h | ||
845 | +defer.o: mail_proto.h | ||
846 | +defer.o: mail_queue.h | ||
847 | +defer.o: msg_stats.h | ||
848 | +defer.o: rcpt_print.h | ||
849 | +defer.o: recipient_list.h | ||
850 | +defer.o: trace.h | ||
851 | +defer.o: verify.h | ||
852 | +deliver_completed.o: ../../include/msg.h | ||
853 | +deliver_completed.o: ../../include/sys_defs.h | ||
854 | +deliver_completed.o: ../../include/vbuf.h | ||
855 | +deliver_completed.o: ../../include/vstream.h | ||
856 | +deliver_completed.o: ../../include/vstring.h | ||
857 | +deliver_completed.o: deliver_completed.c | ||
858 | +deliver_completed.o: deliver_completed.h | ||
859 | +deliver_completed.o: rec_type.h | ||
860 | +deliver_completed.o: record.h | ||
861 | +deliver_flock.o: ../../include/iostuff.h | ||
862 | +deliver_flock.o: ../../include/myflock.h | ||
863 | +deliver_flock.o: ../../include/sys_defs.h | ||
864 | +deliver_flock.o: ../../include/vbuf.h | ||
865 | +deliver_flock.o: ../../include/vstring.h | ||
866 | +deliver_flock.o: deliver_flock.c | ||
867 | +deliver_flock.o: deliver_flock.h | ||
868 | +deliver_flock.o: mail_params.h | ||
869 | +deliver_pass.o: ../../include/attr.h | ||
870 | +deliver_pass.o: ../../include/iostuff.h | ||
871 | +deliver_pass.o: ../../include/msg.h | ||
872 | +deliver_pass.o: ../../include/mymalloc.h | ||
873 | +deliver_pass.o: ../../include/split_at.h | ||
874 | +deliver_pass.o: ../../include/sys_defs.h | ||
875 | +deliver_pass.o: ../../include/vbuf.h | ||
876 | +deliver_pass.o: ../../include/vstream.h | ||
877 | +deliver_pass.o: ../../include/vstring.h | ||
878 | +deliver_pass.o: bounce.h | ||
879 | +deliver_pass.o: defer.h | ||
880 | +deliver_pass.o: deliver_pass.c | ||
881 | +deliver_pass.o: deliver_pass.h | ||
882 | +deliver_pass.o: deliver_request.h | ||
883 | +deliver_pass.o: dsb_scan.h | ||
884 | +deliver_pass.o: dsn.h | ||
885 | +deliver_pass.o: dsn_buf.h | ||
886 | +deliver_pass.o: mail_params.h | ||
887 | +deliver_pass.o: mail_proto.h | ||
888 | +deliver_pass.o: msg_stats.h | ||
889 | +deliver_pass.o: rcpt_print.h | ||
890 | +deliver_pass.o: recipient_list.h | ||
891 | +deliver_request.o: ../../include/attr.h | ||
892 | +deliver_request.o: ../../include/iostuff.h | ||
893 | +deliver_request.o: ../../include/msg.h | ||
894 | +deliver_request.o: ../../include/myflock.h | ||
895 | +deliver_request.o: ../../include/mymalloc.h | ||
896 | +deliver_request.o: ../../include/sys_defs.h | ||
897 | +deliver_request.o: ../../include/vbuf.h | ||
898 | +deliver_request.o: ../../include/vstream.h | ||
899 | +deliver_request.o: ../../include/vstring.h | ||
900 | +deliver_request.o: deliver_request.c | ||
901 | +deliver_request.o: deliver_request.h | ||
902 | +deliver_request.o: dsn.h | ||
903 | +deliver_request.o: dsn_print.h | ||
904 | +deliver_request.o: mail_open_ok.h | ||
905 | +deliver_request.o: mail_proto.h | ||
906 | +deliver_request.o: mail_queue.h | ||
907 | +deliver_request.o: msg_stats.h | ||
908 | +deliver_request.o: rcpt_buf.h | ||
909 | +deliver_request.o: recipient_list.h | ||
910 | +delivered_hdr.o: ../../include/htable.h | ||
911 | +delivered_hdr.o: ../../include/msg.h | ||
912 | +delivered_hdr.o: ../../include/mymalloc.h | ||
913 | +delivered_hdr.o: ../../include/stringops.h | ||
914 | +delivered_hdr.o: ../../include/sys_defs.h | ||
915 | +delivered_hdr.o: ../../include/vbuf.h | ||
916 | +delivered_hdr.o: ../../include/vstream.h | ||
917 | +delivered_hdr.o: ../../include/vstring.h | ||
918 | +delivered_hdr.o: ../../include/vstring_vstream.h | ||
919 | +delivered_hdr.o: delivered_hdr.c | ||
920 | +delivered_hdr.o: delivered_hdr.h | ||
921 | +delivered_hdr.o: fold_addr.h | ||
922 | +delivered_hdr.o: header_opts.h | ||
923 | +delivered_hdr.o: is_header.h | ||
924 | +delivered_hdr.o: quote_822_local.h | ||
925 | +delivered_hdr.o: quote_flags.h | ||
926 | +delivered_hdr.o: rec_type.h | ||
927 | +delivered_hdr.o: record.h | ||
928 | +dict_ldap.o: ../../include/argv.h | ||
929 | +dict_ldap.o: ../../include/binhash.h | ||
930 | +dict_ldap.o: ../../include/dict.h | ||
931 | +dict_ldap.o: ../../include/match_list.h | ||
932 | +dict_ldap.o: ../../include/match_ops.h | ||
933 | +dict_ldap.o: ../../include/msg.h | ||
934 | +dict_ldap.o: ../../include/mymalloc.h | ||
935 | +dict_ldap.o: ../../include/stringops.h | ||
936 | +dict_ldap.o: ../../include/sys_defs.h | ||
937 | +dict_ldap.o: ../../include/vbuf.h | ||
938 | +dict_ldap.o: ../../include/vstream.h | ||
939 | +dict_ldap.o: ../../include/vstring.h | ||
940 | +dict_ldap.o: cfg_parser.h | ||
941 | +dict_ldap.o: db_common.h | ||
942 | +dict_ldap.o: dict_ldap.c | ||
943 | +dict_ldap.o: dict_ldap.h | ||
944 | +dict_ldap.o: string_list.h | ||
945 | +dict_mysql.o: ../../include/argv.h | ||
946 | +dict_mysql.o: ../../include/dict.h | ||
947 | +dict_mysql.o: ../../include/events.h | ||
948 | +dict_mysql.o: ../../include/find_inet.h | ||
949 | +dict_mysql.o: ../../include/match_list.h | ||
950 | +dict_mysql.o: ../../include/match_ops.h | ||
951 | +dict_mysql.o: ../../include/msg.h | ||
952 | +dict_mysql.o: ../../include/mymalloc.h | ||
953 | +dict_mysql.o: ../../include/myrand.h | ||
954 | +dict_mysql.o: ../../include/split_at.h | ||
955 | +dict_mysql.o: ../../include/stringops.h | ||
956 | +dict_mysql.o: ../../include/sys_defs.h | ||
957 | +dict_mysql.o: ../../include/vbuf.h | ||
958 | +dict_mysql.o: ../../include/vstream.h | ||
959 | +dict_mysql.o: ../../include/vstring.h | ||
960 | +dict_mysql.o: cfg_parser.h | ||
961 | +dict_mysql.o: db_common.h | ||
962 | +dict_mysql.o: dict_mysql.c | ||
963 | +dict_mysql.o: dict_mysql.h | ||
964 | +dict_mysql.o: string_list.h | ||
965 | +dict_pgsql.o: ../../include/argv.h | ||
966 | +dict_pgsql.o: ../../include/dict.h | ||
967 | +dict_pgsql.o: ../../include/events.h | ||
968 | +dict_pgsql.o: ../../include/find_inet.h | ||
969 | +dict_pgsql.o: ../../include/match_list.h | ||
970 | +dict_pgsql.o: ../../include/match_ops.h | ||
971 | +dict_pgsql.o: ../../include/msg.h | ||
972 | +dict_pgsql.o: ../../include/mymalloc.h | ||
973 | +dict_pgsql.o: ../../include/myrand.h | ||
974 | +dict_pgsql.o: ../../include/split_at.h | ||
975 | +dict_pgsql.o: ../../include/stringops.h | ||
976 | +dict_pgsql.o: ../../include/sys_defs.h | ||
977 | +dict_pgsql.o: ../../include/vbuf.h | ||
978 | +dict_pgsql.o: ../../include/vstream.h | ||
979 | +dict_pgsql.o: ../../include/vstring.h | ||
980 | +dict_pgsql.o: cfg_parser.h | ||
981 | +dict_pgsql.o: db_common.h | ||
982 | +dict_pgsql.o: dict_pgsql.c | ||
983 | +dict_pgsql.o: dict_pgsql.h | ||
984 | +dict_pgsql.o: string_list.h | ||
985 | +dict_proxy.o: ../../include/argv.h | ||
986 | +dict_proxy.o: ../../include/attr.h | ||
987 | +dict_proxy.o: ../../include/dict.h | ||
988 | +dict_proxy.o: ../../include/iostuff.h | ||
989 | +dict_proxy.o: ../../include/msg.h | ||
990 | +dict_proxy.o: ../../include/mymalloc.h | ||
991 | +dict_proxy.o: ../../include/stringops.h | ||
992 | +dict_proxy.o: ../../include/sys_defs.h | ||
993 | +dict_proxy.o: ../../include/vbuf.h | ||
994 | +dict_proxy.o: ../../include/vstream.h | ||
995 | +dict_proxy.o: ../../include/vstring.h | ||
996 | +dict_proxy.o: clnt_stream.h | ||
997 | +dict_proxy.o: dict_proxy.c | ||
998 | +dict_proxy.o: dict_proxy.h | ||
999 | +dict_proxy.o: mail_params.h | ||
1000 | +dict_proxy.o: mail_proto.h | ||
1001 | +domain_list.o: ../../include/match_list.h | ||
1002 | +domain_list.o: ../../include/match_ops.h | ||
1003 | +domain_list.o: ../../include/sys_defs.h | ||
1004 | +domain_list.o: domain_list.c | ||
1005 | +domain_list.o: domain_list.h | ||
1006 | +dot_lockfile.o: ../../include/iostuff.h | ||
1007 | +dot_lockfile.o: ../../include/mymalloc.h | ||
1008 | +dot_lockfile.o: ../../include/stringops.h | ||
1009 | +dot_lockfile.o: ../../include/sys_defs.h | ||
1010 | +dot_lockfile.o: ../../include/vbuf.h | ||
1011 | +dot_lockfile.o: ../../include/vstring.h | ||
1012 | +dot_lockfile.o: dot_lockfile.c | ||
1013 | +dot_lockfile.o: dot_lockfile.h | ||
1014 | +dot_lockfile.o: mail_params.h | ||
1015 | +dot_lockfile_as.o: ../../include/msg.h | ||
1016 | +dot_lockfile_as.o: ../../include/set_eugid.h | ||
1017 | +dot_lockfile_as.o: ../../include/sys_defs.h | ||
1018 | +dot_lockfile_as.o: ../../include/vbuf.h | ||
1019 | +dot_lockfile_as.o: ../../include/vstring.h | ||
1020 | +dot_lockfile_as.o: dot_lockfile.h | ||
1021 | +dot_lockfile_as.o: dot_lockfile_as.c | ||
1022 | +dot_lockfile_as.o: dot_lockfile_as.h | ||
1023 | +dsb_scan.o: ../../include/attr.h | ||
1024 | +dsb_scan.o: ../../include/iostuff.h | ||
1025 | +dsb_scan.o: ../../include/sys_defs.h | ||
1026 | +dsb_scan.o: ../../include/vbuf.h | ||
1027 | +dsb_scan.o: ../../include/vstream.h | ||
1028 | +dsb_scan.o: ../../include/vstring.h | ||
1029 | +dsb_scan.o: dsb_scan.c | ||
1030 | +dsb_scan.o: dsb_scan.h | ||
1031 | +dsb_scan.o: dsn.h | ||
1032 | +dsb_scan.o: dsn_buf.h | ||
1033 | +dsb_scan.o: mail_proto.h | ||
1034 | +dsn.o: ../../include/msg.h | ||
1035 | +dsn.o: ../../include/mymalloc.h | ||
1036 | +dsn.o: ../../include/sys_defs.h | ||
1037 | +dsn.o: dsn.c | ||
1038 | +dsn.o: dsn.h | ||
1039 | +dsn_buf.o: ../../include/msg.h | ||
1040 | +dsn_buf.o: ../../include/mymalloc.h | ||
1041 | +dsn_buf.o: ../../include/sys_defs.h | ||
1042 | +dsn_buf.o: ../../include/vbuf.h | ||
1043 | +dsn_buf.o: ../../include/vstring.h | ||
1044 | +dsn_buf.o: dsn.h | ||
1045 | +dsn_buf.o: dsn_buf.c | ||
1046 | +dsn_buf.o: dsn_buf.h | ||
1047 | +dsn_mask.o: ../../include/msg.h | ||
1048 | +dsn_mask.o: ../../include/name_code.h | ||
1049 | +dsn_mask.o: ../../include/name_mask.h | ||
1050 | +dsn_mask.o: ../../include/sys_defs.h | ||
1051 | +dsn_mask.o: ../../include/vbuf.h | ||
1052 | +dsn_mask.o: ../../include/vstring.h | ||
1053 | +dsn_mask.o: dsn_mask.c | ||
1054 | +dsn_mask.o: dsn_mask.h | ||
1055 | +dsn_print.o: ../../include/attr.h | ||
1056 | +dsn_print.o: ../../include/iostuff.h | ||
1057 | +dsn_print.o: ../../include/sys_defs.h | ||
1058 | +dsn_print.o: ../../include/vbuf.h | ||
1059 | +dsn_print.o: ../../include/vstream.h | ||
1060 | +dsn_print.o: dsn.h | ||
1061 | +dsn_print.o: dsn_print.c | ||
1062 | +dsn_print.o: dsn_print.h | ||
1063 | +dsn_print.o: mail_proto.h | ||
1064 | +dsn_util.o: ../../include/msg.h | ||
1065 | +dsn_util.o: ../../include/mymalloc.h | ||
1066 | +dsn_util.o: ../../include/stringops.h | ||
1067 | +dsn_util.o: ../../include/sys_defs.h | ||
1068 | +dsn_util.o: ../../include/vbuf.h | ||
1069 | +dsn_util.o: ../../include/vstring.h | ||
1070 | +dsn_util.o: dsn_util.c | ||
1071 | +dsn_util.o: dsn_util.h | ||
1072 | +ehlo_mask.o: ../../include/name_mask.h | ||
1073 | +ehlo_mask.o: ../../include/sys_defs.h | ||
1074 | +ehlo_mask.o: ../../include/vbuf.h | ||
1075 | +ehlo_mask.o: ../../include/vstring.h | ||
1076 | +ehlo_mask.o: ehlo_mask.c | ||
1077 | +ehlo_mask.o: ehlo_mask.h | ||
1078 | +ext_prop.o: ../../include/name_mask.h | ||
1079 | +ext_prop.o: ../../include/sys_defs.h | ||
1080 | +ext_prop.o: ../../include/vbuf.h | ||
1081 | +ext_prop.o: ../../include/vstring.h | ||
1082 | +ext_prop.o: ext_prop.c | ||
1083 | +ext_prop.o: ext_prop.h | ||
1084 | +ext_prop.o: mail_params.h | ||
1085 | +file_id.o: ../../include/msg.h | ||
1086 | +file_id.o: ../../include/sys_defs.h | ||
1087 | +file_id.o: ../../include/vbuf.h | ||
1088 | +file_id.o: ../../include/vstring.h | ||
1089 | +file_id.o: file_id.c | ||
1090 | +file_id.o: file_id.h | ||
1091 | +flush_clnt.o: ../../include/attr.h | ||
1092 | +flush_clnt.o: ../../include/iostuff.h | ||
1093 | +flush_clnt.o: ../../include/match_list.h | ||
1094 | +flush_clnt.o: ../../include/match_ops.h | ||
1095 | +flush_clnt.o: ../../include/msg.h | ||
1096 | +flush_clnt.o: ../../include/sys_defs.h | ||
1097 | +flush_clnt.o: ../../include/vbuf.h | ||
1098 | +flush_clnt.o: ../../include/vstream.h | ||
1099 | +flush_clnt.o: domain_list.h | ||
1100 | +flush_clnt.o: flush_clnt.c | ||
1101 | +flush_clnt.o: flush_clnt.h | ||
1102 | +flush_clnt.o: mail_flush.h | ||
1103 | +flush_clnt.o: mail_params.h | ||
1104 | +flush_clnt.o: mail_proto.h | ||
1105 | +flush_clnt.o: match_parent_style.h | ||
1106 | +fold_addr.o: ../../include/stringops.h | ||
1107 | +fold_addr.o: ../../include/sys_defs.h | ||
1108 | +fold_addr.o: ../../include/vbuf.h | ||
1109 | +fold_addr.o: ../../include/vstring.h | ||
1110 | +fold_addr.o: fold_addr.c | ||
1111 | +fold_addr.o: fold_addr.h | ||
1112 | +header_body_checks.o: ../../include/argv.h | ||
1113 | +header_body_checks.o: ../../include/dict.h | ||
1114 | +header_body_checks.o: ../../include/msg.h | ||
1115 | +header_body_checks.o: ../../include/mymalloc.h | ||
1116 | +header_body_checks.o: ../../include/sys_defs.h | ||
1117 | +header_body_checks.o: ../../include/vbuf.h | ||
1118 | +header_body_checks.o: ../../include/vstream.h | ||
1119 | +header_body_checks.o: ../../include/vstring.h | ||
1120 | +header_body_checks.o: cleanup_user.h | ||
1121 | +header_body_checks.o: dsn_util.h | ||
1122 | +header_body_checks.o: header_body_checks.c | ||
1123 | +header_body_checks.o: header_body_checks.h | ||
1124 | +header_body_checks.o: header_opts.h | ||
1125 | +header_body_checks.o: is_header.h | ||
1126 | +header_body_checks.o: maps.h | ||
1127 | +header_body_checks.o: mime_state.h | ||
1128 | +header_body_checks.o: rec_type.h | ||
1129 | +header_opts.o: ../../include/htable.h | ||
1130 | +header_opts.o: ../../include/msg.h | ||
1131 | +header_opts.o: ../../include/stringops.h | ||
1132 | +header_opts.o: ../../include/sys_defs.h | ||
1133 | +header_opts.o: ../../include/vbuf.h | ||
1134 | +header_opts.o: ../../include/vstring.h | ||
1135 | +header_opts.o: header_opts.c | ||
1136 | +header_opts.o: header_opts.h | ||
1137 | +header_token.o: ../../include/msg.h | ||
1138 | +header_token.o: ../../include/sys_defs.h | ||
1139 | +header_token.o: ../../include/vbuf.h | ||
1140 | +header_token.o: ../../include/vstring.h | ||
1141 | +header_token.o: header_token.c | ||
1142 | +header_token.o: header_token.h | ||
1143 | +header_token.o: lex_822.h | ||
1144 | +input_transp.o: ../../include/msg.h | ||
1145 | +input_transp.o: ../../include/name_mask.h | ||
1146 | +input_transp.o: ../../include/sys_defs.h | ||
1147 | +input_transp.o: ../../include/vbuf.h | ||
1148 | +input_transp.o: ../../include/vstring.h | ||
1149 | +input_transp.o: cleanup_user.h | ||
1150 | +input_transp.o: input_transp.c | ||
1151 | +input_transp.o: input_transp.h | ||
1152 | +input_transp.o: mail_params.h | ||
1153 | +int_filt.o: ../../include/msg.h | ||
1154 | +int_filt.o: ../../include/name_mask.h | ||
1155 | +int_filt.o: ../../include/sys_defs.h | ||
1156 | +int_filt.o: ../../include/vbuf.h | ||
1157 | +int_filt.o: ../../include/vstring.h | ||
1158 | +int_filt.o: cleanup_user.h | ||
1159 | +int_filt.o: int_filt.c | ||
1160 | +int_filt.o: int_filt.h | ||
1161 | +int_filt.o: mail_params.h | ||
1162 | +is_header.o: ../../include/sys_defs.h | ||
1163 | +is_header.o: is_header.c | ||
1164 | +is_header.o: is_header.h | ||
1165 | +log_adhoc.o: ../../include/attr.h | ||
1166 | +log_adhoc.o: ../../include/format_tv.h | ||
1167 | +log_adhoc.o: ../../include/msg.h | ||
1168 | +log_adhoc.o: ../../include/sys_defs.h | ||
1169 | +log_adhoc.o: ../../include/vbuf.h | ||
1170 | +log_adhoc.o: ../../include/vstream.h | ||
1171 | +log_adhoc.o: ../../include/vstring.h | ||
1172 | +log_adhoc.o: dsn.h | ||
1173 | +log_adhoc.o: log_adhoc.c | ||
1174 | +log_adhoc.o: log_adhoc.h | ||
1175 | +log_adhoc.o: mail_params.h | ||
1176 | +log_adhoc.o: msg_stats.h | ||
1177 | +log_adhoc.o: recipient_list.h | ||
1178 | +mail_addr.o: ../../include/stringops.h | ||
1179 | +mail_addr.o: ../../include/sys_defs.h | ||
1180 | +mail_addr.o: ../../include/vbuf.h | ||
1181 | +mail_addr.o: ../../include/vstring.h | ||
1182 | +mail_addr.o: mail_addr.c | ||
1183 | +mail_addr.o: mail_addr.h | ||
1184 | +mail_addr.o: mail_params.h | ||
1185 | +mail_addr_crunch.o: ../../include/argv.h | ||
1186 | +mail_addr_crunch.o: ../../include/mymalloc.h | ||
1187 | +mail_addr_crunch.o: ../../include/sys_defs.h | ||
1188 | +mail_addr_crunch.o: ../../include/vbuf.h | ||
1189 | +mail_addr_crunch.o: ../../include/vstring.h | ||
1190 | +mail_addr_crunch.o: canon_addr.h | ||
1191 | +mail_addr_crunch.o: mail_addr_crunch.c | ||
1192 | +mail_addr_crunch.o: mail_addr_crunch.h | ||
1193 | +mail_addr_crunch.o: resolve_clnt.h | ||
1194 | +mail_addr_crunch.o: tok822.h | ||
1195 | +mail_addr_find.o: ../../include/argv.h | ||
1196 | +mail_addr_find.o: ../../include/dict.h | ||
1197 | +mail_addr_find.o: ../../include/msg.h | ||
1198 | +mail_addr_find.o: ../../include/mymalloc.h | ||
1199 | +mail_addr_find.o: ../../include/stringops.h | ||
1200 | +mail_addr_find.o: ../../include/sys_defs.h | ||
1201 | +mail_addr_find.o: ../../include/vbuf.h | ||
1202 | +mail_addr_find.o: ../../include/vstream.h | ||
1203 | +mail_addr_find.o: ../../include/vstring.h | ||
1204 | +mail_addr_find.o: mail_addr_find.c | ||
1205 | +mail_addr_find.o: mail_addr_find.h | ||
1206 | +mail_addr_find.o: mail_params.h | ||
1207 | +mail_addr_find.o: maps.h | ||
1208 | +mail_addr_find.o: resolve_local.h | ||
1209 | +mail_addr_find.o: strip_addr.h | ||
1210 | +mail_addr_map.o: ../../include/argv.h | ||
1211 | +mail_addr_map.o: ../../include/dict.h | ||
1212 | +mail_addr_map.o: ../../include/msg.h | ||
1213 | +mail_addr_map.o: ../../include/mymalloc.h | ||
1214 | +mail_addr_map.o: ../../include/sys_defs.h | ||
1215 | +mail_addr_map.o: ../../include/vbuf.h | ||
1216 | +mail_addr_map.o: ../../include/vstream.h | ||
1217 | +mail_addr_map.o: ../../include/vstring.h | ||
1218 | +mail_addr_map.o: mail_addr_crunch.h | ||
1219 | +mail_addr_map.o: mail_addr_find.h | ||
1220 | +mail_addr_map.o: mail_addr_map.c | ||
1221 | +mail_addr_map.o: mail_addr_map.h | ||
1222 | +mail_addr_map.o: maps.h | ||
1223 | +mail_command_client.o: ../../include/attr.h | ||
1224 | +mail_command_client.o: ../../include/iostuff.h | ||
1225 | +mail_command_client.o: ../../include/sys_defs.h | ||
1226 | +mail_command_client.o: ../../include/vbuf.h | ||
1227 | +mail_command_client.o: ../../include/vstream.h | ||
1228 | +mail_command_client.o: mail_command_client.c | ||
1229 | +mail_command_client.o: mail_proto.h | ||
1230 | +mail_command_server.o: ../../include/attr.h | ||
1231 | +mail_command_server.o: ../../include/iostuff.h | ||
1232 | +mail_command_server.o: ../../include/sys_defs.h | ||
1233 | +mail_command_server.o: ../../include/vbuf.h | ||
1234 | +mail_command_server.o: ../../include/vstream.h | ||
1235 | +mail_command_server.o: mail_command_server.c | ||
1236 | +mail_command_server.o: mail_proto.h | ||
1237 | +mail_conf.o: ../../include/argv.h | ||
1238 | +mail_conf.o: ../../include/dict.h | ||
1239 | +mail_conf.o: ../../include/msg.h | ||
1240 | +mail_conf.o: ../../include/mymalloc.h | ||
1241 | +mail_conf.o: ../../include/readlline.h | ||
1242 | +mail_conf.o: ../../include/safe.h | ||
1243 | +mail_conf.o: ../../include/stringops.h | ||
1244 | +mail_conf.o: ../../include/sys_defs.h | ||
1245 | +mail_conf.o: ../../include/vbuf.h | ||
1246 | +mail_conf.o: ../../include/vstream.h | ||
1247 | +mail_conf.o: ../../include/vstring.h | ||
1248 | +mail_conf.o: mail_conf.c | ||
1249 | +mail_conf.o: mail_conf.h | ||
1250 | +mail_conf.o: mail_params.h | ||
1251 | +mail_conf_bool.o: ../../include/argv.h | ||
1252 | +mail_conf_bool.o: ../../include/dict.h | ||
1253 | +mail_conf_bool.o: ../../include/msg.h | ||
1254 | +mail_conf_bool.o: ../../include/sys_defs.h | ||
1255 | +mail_conf_bool.o: ../../include/vbuf.h | ||
1256 | +mail_conf_bool.o: ../../include/vstream.h | ||
1257 | +mail_conf_bool.o: ../../include/vstring.h | ||
1258 | +mail_conf_bool.o: mail_conf.h | ||
1259 | +mail_conf_bool.o: mail_conf_bool.c | ||
1260 | +mail_conf_int.o: ../../include/argv.h | ||
1261 | +mail_conf_int.o: ../../include/dict.h | ||
1262 | +mail_conf_int.o: ../../include/msg.h | ||
1263 | +mail_conf_int.o: ../../include/mymalloc.h | ||
1264 | +mail_conf_int.o: ../../include/stringops.h | ||
1265 | +mail_conf_int.o: ../../include/sys_defs.h | ||
1266 | +mail_conf_int.o: ../../include/vbuf.h | ||
1267 | +mail_conf_int.o: ../../include/vstream.h | ||
1268 | +mail_conf_int.o: ../../include/vstring.h | ||
1269 | +mail_conf_int.o: mail_conf.h | ||
1270 | +mail_conf_int.o: mail_conf_int.c | ||
1271 | +mail_conf_long.o: ../../include/argv.h | ||
1272 | +mail_conf_long.o: ../../include/dict.h | ||
1273 | +mail_conf_long.o: ../../include/msg.h | ||
1274 | +mail_conf_long.o: ../../include/mymalloc.h | ||
1275 | +mail_conf_long.o: ../../include/stringops.h | ||
1276 | +mail_conf_long.o: ../../include/sys_defs.h | ||
1277 | +mail_conf_long.o: ../../include/vbuf.h | ||
1278 | +mail_conf_long.o: ../../include/vstream.h | ||
1279 | +mail_conf_long.o: ../../include/vstring.h | ||
1280 | +mail_conf_long.o: mail_conf.h | ||
1281 | +mail_conf_long.o: mail_conf_long.c | ||
1282 | +mail_conf_nint.o: ../../include/argv.h | ||
1283 | +mail_conf_nint.o: ../../include/dict.h | ||
1284 | +mail_conf_nint.o: ../../include/msg.h | ||
1285 | +mail_conf_nint.o: ../../include/mymalloc.h | ||
1286 | +mail_conf_nint.o: ../../include/stringops.h | ||
1287 | +mail_conf_nint.o: ../../include/sys_defs.h | ||
1288 | +mail_conf_nint.o: ../../include/vbuf.h | ||
1289 | +mail_conf_nint.o: ../../include/vstream.h | ||
1290 | +mail_conf_nint.o: ../../include/vstring.h | ||
1291 | +mail_conf_nint.o: mail_conf.h | ||
1292 | +mail_conf_nint.o: mail_conf_nint.c | ||
1293 | +mail_conf_raw.o: ../../include/msg.h | ||
1294 | +mail_conf_raw.o: ../../include/mymalloc.h | ||
1295 | +mail_conf_raw.o: ../../include/sys_defs.h | ||
1296 | +mail_conf_raw.o: mail_conf.h | ||
1297 | +mail_conf_raw.o: mail_conf_raw.c | ||
1298 | +mail_conf_str.o: ../../include/msg.h | ||
1299 | +mail_conf_str.o: ../../include/mymalloc.h | ||
1300 | +mail_conf_str.o: ../../include/stringops.h | ||
1301 | +mail_conf_str.o: ../../include/sys_defs.h | ||
1302 | +mail_conf_str.o: ../../include/vbuf.h | ||
1303 | +mail_conf_str.o: ../../include/vstring.h | ||
1304 | +mail_conf_str.o: mail_conf.h | ||
1305 | +mail_conf_str.o: mail_conf_str.c | ||
1306 | +mail_conf_time.o: ../../include/argv.h | ||
1307 | +mail_conf_time.o: ../../include/dict.h | ||
1308 | +mail_conf_time.o: ../../include/msg.h | ||
1309 | +mail_conf_time.o: ../../include/mymalloc.h | ||
1310 | +mail_conf_time.o: ../../include/stringops.h | ||
1311 | +mail_conf_time.o: ../../include/sys_defs.h | ||
1312 | +mail_conf_time.o: ../../include/vbuf.h | ||
1313 | +mail_conf_time.o: ../../include/vstream.h | ||
1314 | +mail_conf_time.o: ../../include/vstring.h | ||
1315 | +mail_conf_time.o: conv_time.h | ||
1316 | +mail_conf_time.o: mail_conf.h | ||
1317 | +mail_conf_time.o: mail_conf_time.c | ||
1318 | +mail_connect.o: ../../include/attr.h | ||
1319 | +mail_connect.o: ../../include/connect.h | ||
1320 | +mail_connect.o: ../../include/iostuff.h | ||
1321 | +mail_connect.o: ../../include/msg.h | ||
1322 | +mail_connect.o: ../../include/mymalloc.h | ||
1323 | +mail_connect.o: ../../include/stringops.h | ||
1324 | +mail_connect.o: ../../include/sys_defs.h | ||
1325 | +mail_connect.o: ../../include/vbuf.h | ||
1326 | +mail_connect.o: ../../include/vstream.h | ||
1327 | +mail_connect.o: ../../include/vstring.h | ||
1328 | +mail_connect.o: mail_connect.c | ||
1329 | +mail_connect.o: mail_proto.h | ||
1330 | +mail_connect.o: timed_ipc.h | ||
1331 | +mail_copy.o: ../../include/htable.h | ||
1332 | +mail_copy.o: ../../include/iostuff.h | ||
1333 | +mail_copy.o: ../../include/msg.h | ||
1334 | +mail_copy.o: ../../include/safe_open.h | ||
1335 | +mail_copy.o: ../../include/stringops.h | ||
1336 | +mail_copy.o: ../../include/sys_defs.h | ||
1337 | +mail_copy.o: ../../include/vbuf.h | ||
1338 | +mail_copy.o: ../../include/vstream.h | ||
1339 | +mail_copy.o: ../../include/vstring.h | ||
1340 | +mail_copy.o: ../../include/vstring_vstream.h | ||
1341 | +mail_copy.o: dsn.h | ||
1342 | +mail_copy.o: dsn_buf.h | ||
1343 | +mail_copy.o: mail_addr.h | ||
1344 | +mail_copy.o: mail_copy.c | ||
1345 | +mail_copy.o: mail_copy.h | ||
1346 | +mail_copy.o: mail_params.h | ||
1347 | +mail_copy.o: mail_queue.h | ||
1348 | +mail_copy.o: mark_corrupt.h | ||
1349 | +mail_copy.o: mbox_open.h | ||
1350 | +mail_copy.o: quote_822_local.h | ||
1351 | +mail_copy.o: quote_flags.h | ||
1352 | +mail_copy.o: rec_type.h | ||
1353 | +mail_copy.o: record.h | ||
1354 | +mail_copy.o: sys_exits.h | ||
1355 | +mail_date.o: ../../include/msg.h | ||
1356 | +mail_date.o: ../../include/sys_defs.h | ||
1357 | +mail_date.o: ../../include/vbuf.h | ||
1358 | +mail_date.o: ../../include/vstring.h | ||
1359 | +mail_date.o: mail_date.c | ||
1360 | +mail_date.o: mail_date.h | ||
1361 | +mail_dict.o: ../../include/argv.h | ||
1362 | +mail_dict.o: ../../include/dict.h | ||
1363 | +mail_dict.o: ../../include/msg.h | ||
1364 | +mail_dict.o: ../../include/sys_defs.h | ||
1365 | +mail_dict.o: ../../include/vbuf.h | ||
1366 | +mail_dict.o: ../../include/vstream.h | ||
1367 | +mail_dict.o: ../../include/vstring.h | ||
1368 | +mail_dict.o: dict_ldap.h | ||
1369 | +mail_dict.o: dict_mysql.h | ||
1370 | +mail_dict.o: dict_pgsql.h | ||
1371 | +mail_dict.o: dict_proxy.h | ||
1372 | +mail_dict.o: mail_dict.c | ||
1373 | +mail_dict.o: mail_dict.h | ||
1374 | +mail_error.o: ../../include/name_mask.h | ||
1375 | +mail_error.o: ../../include/sys_defs.h | ||
1376 | +mail_error.o: ../../include/vbuf.h | ||
1377 | +mail_error.o: ../../include/vstring.h | ||
1378 | +mail_error.o: mail_error.c | ||
1379 | +mail_error.o: mail_error.h | ||
1380 | +mail_flush.o: ../../include/attr.h | ||
1381 | +mail_flush.o: ../../include/iostuff.h | ||
1382 | +mail_flush.o: ../../include/sys_defs.h | ||
1383 | +mail_flush.o: ../../include/vbuf.h | ||
1384 | +mail_flush.o: ../../include/vstream.h | ||
1385 | +mail_flush.o: mail_flush.c | ||
1386 | +mail_flush.o: mail_flush.h | ||
1387 | +mail_flush.o: mail_params.h | ||
1388 | +mail_flush.o: mail_proto.h | ||
1389 | +mail_open_ok.o: ../../include/msg.h | ||
1390 | +mail_open_ok.o: ../../include/sys_defs.h | ||
1391 | +mail_open_ok.o: ../../include/vbuf.h | ||
1392 | +mail_open_ok.o: ../../include/vstream.h | ||
1393 | +mail_open_ok.o: ../../include/vstring.h | ||
1394 | +mail_open_ok.o: mail_open_ok.c | ||
1395 | +mail_open_ok.o: mail_open_ok.h | ||
1396 | +mail_open_ok.o: mail_queue.h | ||
1397 | +mail_params.o: ../../include/argv.h | ||
1398 | +mail_params.o: ../../include/attr.h | ||
1399 | +mail_params.o: ../../include/dict.h | ||
1400 | +mail_params.o: ../../include/dict_db.h | ||
1401 | +mail_params.o: ../../include/get_hostname.h | ||
1402 | +mail_params.o: ../../include/inet_addr_list.h | ||
1403 | +mail_params.o: ../../include/inet_proto.h | ||
1404 | +mail_params.o: ../../include/iostuff.h | ||
1405 | +mail_params.o: ../../include/msg.h | ||
1406 | +mail_params.o: ../../include/msg_syslog.h | ||
1407 | +mail_params.o: ../../include/myaddrinfo.h | ||
1408 | +mail_params.o: ../../include/mymalloc.h | ||
1409 | +mail_params.o: ../../include/safe.h | ||
1410 | +mail_params.o: ../../include/safe_open.h | ||
1411 | +mail_params.o: ../../include/stringops.h | ||
1412 | +mail_params.o: ../../include/sys_defs.h | ||
1413 | +mail_params.o: ../../include/valid_hostname.h | ||
1414 | +mail_params.o: ../../include/vbuf.h | ||
1415 | +mail_params.o: ../../include/vstream.h | ||
1416 | +mail_params.o: ../../include/vstring.h | ||
1417 | +mail_params.o: ../../include/vstring_vstream.h | ||
1418 | +mail_params.o: mail_conf.h | ||
1419 | +mail_params.o: mail_params.c | ||
1420 | +mail_params.o: mail_params.h | ||
1421 | +mail_params.o: mail_proto.h | ||
1422 | +mail_params.o: mail_version.h | ||
1423 | +mail_params.o: mynetworks.h | ||
1424 | +mail_params.o: own_inet_addr.h | ||
1425 | +mail_params.o: recipient_list.h | ||
1426 | +mail_params.o: verp_sender.h | ||
1427 | +mail_pathname.o: ../../include/attr.h | ||
1428 | +mail_pathname.o: ../../include/iostuff.h | ||
1429 | +mail_pathname.o: ../../include/stringops.h | ||
1430 | +mail_pathname.o: ../../include/sys_defs.h | ||
1431 | +mail_pathname.o: ../../include/vbuf.h | ||
1432 | +mail_pathname.o: ../../include/vstream.h | ||
1433 | +mail_pathname.o: ../../include/vstring.h | ||
1434 | +mail_pathname.o: mail_pathname.c | ||
1435 | +mail_pathname.o: mail_proto.h | ||
1436 | +mail_queue.o: ../../include/argv.h | ||
1437 | +mail_queue.o: ../../include/dir_forest.h | ||
1438 | +mail_queue.o: ../../include/make_dirs.h | ||
1439 | +mail_queue.o: ../../include/msg.h | ||
1440 | +mail_queue.o: ../../include/mymalloc.h | ||
1441 | +mail_queue.o: ../../include/sane_fsops.h | ||
1442 | +mail_queue.o: ../../include/split_at.h | ||
1443 | +mail_queue.o: ../../include/sys_defs.h | ||
1444 | +mail_queue.o: ../../include/valid_hostname.h | ||
1445 | +mail_queue.o: ../../include/vbuf.h | ||
1446 | +mail_queue.o: ../../include/vstream.h | ||
1447 | +mail_queue.o: ../../include/vstring.h | ||
1448 | +mail_queue.o: file_id.h | ||
1449 | +mail_queue.o: mail_params.h | ||
1450 | +mail_queue.o: mail_queue.c | ||
1451 | +mail_queue.o: mail_queue.h | ||
1452 | +mail_run.o: ../../include/msg.h | ||
1453 | +mail_run.o: ../../include/mymalloc.h | ||
1454 | +mail_run.o: ../../include/stringops.h | ||
1455 | +mail_run.o: ../../include/sys_defs.h | ||
1456 | +mail_run.o: ../../include/vbuf.h | ||
1457 | +mail_run.o: ../../include/vstring.h | ||
1458 | +mail_run.o: mail_params.h | ||
1459 | +mail_run.o: mail_run.c | ||
1460 | +mail_run.o: mail_run.h | ||
1461 | +mail_scan_dir.o: ../../include/scan_dir.h | ||
1462 | +mail_scan_dir.o: ../../include/sys_defs.h | ||
1463 | +mail_scan_dir.o: mail_scan_dir.c | ||
1464 | +mail_scan_dir.o: mail_scan_dir.h | ||
1465 | +mail_stream.o: ../../include/argv.h | ||
1466 | +mail_stream.o: ../../include/attr.h | ||
1467 | +mail_stream.o: ../../include/iostuff.h | ||
1468 | +mail_stream.o: ../../include/msg.h | ||
1469 | +mail_stream.o: ../../include/mymalloc.h | ||
1470 | +mail_stream.o: ../../include/sane_fsops.h | ||
1471 | +mail_stream.o: ../../include/stringops.h | ||
1472 | +mail_stream.o: ../../include/sys_defs.h | ||
1473 | +mail_stream.o: ../../include/vbuf.h | ||
1474 | +mail_stream.o: ../../include/vstream.h | ||
1475 | +mail_stream.o: ../../include/vstring.h | ||
1476 | +mail_stream.o: cleanup_user.h | ||
1477 | +mail_stream.o: mail_params.h | ||
1478 | +mail_stream.o: mail_proto.h | ||
1479 | +mail_stream.o: mail_queue.h | ||
1480 | +mail_stream.o: mail_stream.c | ||
1481 | +mail_stream.o: mail_stream.h | ||
1482 | +mail_stream.o: opened.h | ||
1483 | +mail_task.o: ../../include/safe.h | ||
1484 | +mail_task.o: ../../include/sys_defs.h | ||
1485 | +mail_task.o: ../../include/vbuf.h | ||
1486 | +mail_task.o: ../../include/vstring.h | ||
1487 | +mail_task.o: mail_conf.h | ||
1488 | +mail_task.o: mail_params.h | ||
1489 | +mail_task.o: mail_task.c | ||
1490 | +mail_task.o: mail_task.h | ||
1491 | +mail_trigger.o: ../../include/attr.h | ||
1492 | +mail_trigger.o: ../../include/iostuff.h | ||
1493 | +mail_trigger.o: ../../include/msg.h | ||
1494 | +mail_trigger.o: ../../include/mymalloc.h | ||
1495 | +mail_trigger.o: ../../include/sys_defs.h | ||
1496 | +mail_trigger.o: ../../include/trigger.h | ||
1497 | +mail_trigger.o: ../../include/vbuf.h | ||
1498 | +mail_trigger.o: ../../include/vstream.h | ||
1499 | +mail_trigger.o: mail_params.h | ||
1500 | +mail_trigger.o: mail_proto.h | ||
1501 | +mail_trigger.o: mail_trigger.c | ||
1502 | +mail_version.o: mail_version.c | ||
1503 | +maps.o: ../../include/argv.h | ||
1504 | +maps.o: ../../include/dict.h | ||
1505 | +maps.o: ../../include/msg.h | ||
1506 | +maps.o: ../../include/mymalloc.h | ||
1507 | +maps.o: ../../include/split_at.h | ||
1508 | +maps.o: ../../include/stringops.h | ||
1509 | +maps.o: ../../include/sys_defs.h | ||
1510 | +maps.o: ../../include/vbuf.h | ||
1511 | +maps.o: ../../include/vstream.h | ||
1512 | +maps.o: ../../include/vstring.h | ||
1513 | +maps.o: mail_conf.h | ||
1514 | +maps.o: maps.c | ||
1515 | +maps.o: maps.h | ||
1516 | +mark_corrupt.o: ../../include/attr.h | ||
1517 | +mark_corrupt.o: ../../include/msg.h | ||
1518 | +mark_corrupt.o: ../../include/set_eugid.h | ||
1519 | +mark_corrupt.o: ../../include/sys_defs.h | ||
1520 | +mark_corrupt.o: ../../include/vbuf.h | ||
1521 | +mark_corrupt.o: ../../include/vstream.h | ||
1522 | +mark_corrupt.o: ../../include/vstring.h | ||
1523 | +mark_corrupt.o: deliver_request.h | ||
1524 | +mark_corrupt.o: dsn.h | ||
1525 | +mark_corrupt.o: mail_params.h | ||
1526 | +mark_corrupt.o: mail_queue.h | ||
1527 | +mark_corrupt.o: mark_corrupt.c | ||
1528 | +mark_corrupt.o: mark_corrupt.h | ||
1529 | +mark_corrupt.o: msg_stats.h | ||
1530 | +mark_corrupt.o: recipient_list.h | ||
1531 | +match_parent_style.o: ../../include/match_list.h | ||
1532 | +match_parent_style.o: ../../include/match_ops.h | ||
1533 | +match_parent_style.o: ../../include/sys_defs.h | ||
1534 | +match_parent_style.o: mail_params.h | ||
1535 | +match_parent_style.o: match_parent_style.c | ||
1536 | +match_parent_style.o: match_parent_style.h | ||
1537 | +match_parent_style.o: string_list.h | ||
1538 | +match_service.o: ../../include/argv.h | ||
1539 | +match_service.o: ../../include/msg.h | ||
1540 | +match_service.o: ../../include/mymalloc.h | ||
1541 | +match_service.o: ../../include/stringops.h | ||
1542 | +match_service.o: ../../include/sys_defs.h | ||
1543 | +match_service.o: ../../include/vbuf.h | ||
1544 | +match_service.o: ../../include/vstring.h | ||
1545 | +match_service.o: match_service.c | ||
1546 | +match_service.o: match_service.h | ||
1547 | +mbox_conf.o: ../../include/argv.h | ||
1548 | +mbox_conf.o: ../../include/name_mask.h | ||
1549 | +mbox_conf.o: ../../include/sys_defs.h | ||
1550 | +mbox_conf.o: ../../include/vbuf.h | ||
1551 | +mbox_conf.o: ../../include/vstring.h | ||
1552 | +mbox_conf.o: mail_params.h | ||
1553 | +mbox_conf.o: mbox_conf.c | ||
1554 | +mbox_conf.o: mbox_conf.h | ||
1555 | +mbox_open.o: ../../include/argv.h | ||
1556 | +mbox_open.o: ../../include/iostuff.h | ||
1557 | +mbox_open.o: ../../include/msg.h | ||
1558 | +mbox_open.o: ../../include/myflock.h | ||
1559 | +mbox_open.o: ../../include/mymalloc.h | ||
1560 | +mbox_open.o: ../../include/safe_open.h | ||
1561 | +mbox_open.o: ../../include/sys_defs.h | ||
1562 | +mbox_open.o: ../../include/vbuf.h | ||
1563 | +mbox_open.o: ../../include/vstream.h | ||
1564 | +mbox_open.o: ../../include/vstring.h | ||
1565 | +mbox_open.o: deliver_flock.h | ||
1566 | +mbox_open.o: dot_lockfile.h | ||
1567 | +mbox_open.o: dsn.h | ||
1568 | +mbox_open.o: dsn_buf.h | ||
1569 | +mbox_open.o: mbox_conf.h | ||
1570 | +mbox_open.o: mbox_open.c | ||
1571 | +mbox_open.o: mbox_open.h | ||
1572 | +mime_state.o: ../../include/msg.h | ||
1573 | +mime_state.o: ../../include/mymalloc.h | ||
1574 | +mime_state.o: ../../include/sys_defs.h | ||
1575 | +mime_state.o: ../../include/vbuf.h | ||
1576 | +mime_state.o: ../../include/vstring.h | ||
1577 | +mime_state.o: header_opts.h | ||
1578 | +mime_state.o: header_token.h | ||
1579 | +mime_state.o: is_header.h | ||
1580 | +mime_state.o: lex_822.h | ||
1581 | +mime_state.o: mail_params.h | ||
1582 | +mime_state.o: mime_state.c | ||
1583 | +mime_state.o: mime_state.h | ||
1584 | +mime_state.o: rec_type.h | ||
1585 | +mkmap_cdb.o: ../../include/argv.h | ||
1586 | +mkmap_cdb.o: ../../include/dict.h | ||
1587 | +mkmap_cdb.o: ../../include/dict_cdb.h | ||
1588 | +mkmap_cdb.o: ../../include/mymalloc.h | ||
1589 | +mkmap_cdb.o: ../../include/sys_defs.h | ||
1590 | +mkmap_cdb.o: ../../include/vbuf.h | ||
1591 | +mkmap_cdb.o: ../../include/vstream.h | ||
1592 | +mkmap_cdb.o: ../../include/vstring.h | ||
1593 | +mkmap_cdb.o: mkmap.h | ||
1594 | +mkmap_cdb.o: mkmap_cdb.c | ||
1595 | +mkmap_db.o: ../../include/argv.h | ||
1596 | +mkmap_db.o: ../../include/dict.h | ||
1597 | +mkmap_db.o: ../../include/dict_db.h | ||
1598 | +mkmap_db.o: ../../include/msg.h | ||
1599 | +mkmap_db.o: ../../include/myflock.h | ||
1600 | +mkmap_db.o: ../../include/mymalloc.h | ||
1601 | +mkmap_db.o: ../../include/stringops.h | ||
1602 | +mkmap_db.o: ../../include/sys_defs.h | ||
1603 | +mkmap_db.o: ../../include/vbuf.h | ||
1604 | +mkmap_db.o: ../../include/vstream.h | ||
1605 | +mkmap_db.o: ../../include/vstring.h | ||
1606 | +mkmap_db.o: mail_params.h | ||
1607 | +mkmap_db.o: mkmap.h | ||
1608 | +mkmap_db.o: mkmap_db.c | ||
1609 | +mkmap_dbm.o: ../../include/argv.h | ||
1610 | +mkmap_dbm.o: ../../include/dict.h | ||
1611 | +mkmap_dbm.o: ../../include/dict_dbm.h | ||
1612 | +mkmap_dbm.o: ../../include/msg.h | ||
1613 | +mkmap_dbm.o: ../../include/myflock.h | ||
1614 | +mkmap_dbm.o: ../../include/mymalloc.h | ||
1615 | +mkmap_dbm.o: ../../include/stringops.h | ||
1616 | +mkmap_dbm.o: ../../include/sys_defs.h | ||
1617 | +mkmap_dbm.o: ../../include/vbuf.h | ||
1618 | +mkmap_dbm.o: ../../include/vstream.h | ||
1619 | +mkmap_dbm.o: ../../include/vstring.h | ||
1620 | +mkmap_dbm.o: mkmap.h | ||
1621 | +mkmap_dbm.o: mkmap_dbm.c | ||
1622 | +mkmap_open.o: ../../include/argv.h | ||
1623 | +mkmap_open.o: ../../include/dict.h | ||
1624 | +mkmap_open.o: ../../include/dict_cdb.h | ||
1625 | +mkmap_open.o: ../../include/dict_db.h | ||
1626 | +mkmap_open.o: ../../include/dict_dbm.h | ||
1627 | +mkmap_open.o: ../../include/dict_sdbm.h | ||
1628 | +mkmap_open.o: ../../include/msg.h | ||
1629 | +mkmap_open.o: ../../include/mymalloc.h | ||
1630 | +mkmap_open.o: ../../include/sigdelay.h | ||
1631 | +mkmap_open.o: ../../include/sys_defs.h | ||
1632 | +mkmap_open.o: ../../include/vbuf.h | ||
1633 | +mkmap_open.o: ../../include/vstream.h | ||
1634 | +mkmap_open.o: ../../include/vstring.h | ||
1635 | +mkmap_open.o: dict_proxy.h | ||
1636 | +mkmap_open.o: mkmap.h | ||
1637 | +mkmap_open.o: mkmap_open.c | ||
1638 | +mkmap_proxy.o: ../../include/argv.h | ||
1639 | +mkmap_proxy.o: ../../include/dict.h | ||
1640 | +mkmap_proxy.o: ../../include/mymalloc.h | ||
1641 | +mkmap_proxy.o: ../../include/sys_defs.h | ||
1642 | +mkmap_proxy.o: ../../include/vbuf.h | ||
1643 | +mkmap_proxy.o: ../../include/vstream.h | ||
1644 | +mkmap_proxy.o: ../../include/vstring.h | ||
1645 | +mkmap_proxy.o: dict_proxy.h | ||
1646 | +mkmap_proxy.o: mkmap.h | ||
1647 | +mkmap_proxy.o: mkmap_proxy.c | ||
1648 | +mkmap_sdbm.o: ../../include/argv.h | ||
1649 | +mkmap_sdbm.o: ../../include/dict.h | ||
1650 | +mkmap_sdbm.o: ../../include/dict_sdbm.h | ||
1651 | +mkmap_sdbm.o: ../../include/msg.h | ||
1652 | +mkmap_sdbm.o: ../../include/myflock.h | ||
1653 | +mkmap_sdbm.o: ../../include/mymalloc.h | ||
1654 | +mkmap_sdbm.o: ../../include/stringops.h | ||
1655 | +mkmap_sdbm.o: ../../include/sys_defs.h | ||
1656 | +mkmap_sdbm.o: ../../include/vbuf.h | ||
1657 | +mkmap_sdbm.o: ../../include/vstream.h | ||
1658 | +mkmap_sdbm.o: ../../include/vstring.h | ||
1659 | +mkmap_sdbm.o: mkmap.h | ||
1660 | +mkmap_sdbm.o: mkmap_sdbm.c | ||
1661 | +msg_stats_print.o: ../../include/attr.h | ||
1662 | +msg_stats_print.o: ../../include/iostuff.h | ||
1663 | +msg_stats_print.o: ../../include/sys_defs.h | ||
1664 | +msg_stats_print.o: ../../include/vbuf.h | ||
1665 | +msg_stats_print.o: ../../include/vstream.h | ||
1666 | +msg_stats_print.o: mail_proto.h | ||
1667 | +msg_stats_print.o: msg_stats.h | ||
1668 | +msg_stats_print.o: msg_stats_print.c | ||
1669 | +msg_stats_scan.o: ../../include/attr.h | ||
1670 | +msg_stats_scan.o: ../../include/iostuff.h | ||
1671 | +msg_stats_scan.o: ../../include/msg.h | ||
1672 | +msg_stats_scan.o: ../../include/sys_defs.h | ||
1673 | +msg_stats_scan.o: ../../include/vbuf.h | ||
1674 | +msg_stats_scan.o: ../../include/vstream.h | ||
1675 | +msg_stats_scan.o: ../../include/vstring.h | ||
1676 | +msg_stats_scan.o: mail_proto.h | ||
1677 | +msg_stats_scan.o: msg_stats.h | ||
1678 | +msg_stats_scan.o: msg_stats_scan.c | ||
1679 | +mynetworks.o: ../../include/argv.h | ||
1680 | +mynetworks.o: ../../include/inet_addr_list.h | ||
1681 | +mynetworks.o: ../../include/mask_addr.h | ||
1682 | +mynetworks.o: ../../include/msg.h | ||
1683 | +mynetworks.o: ../../include/myaddrinfo.h | ||
1684 | +mynetworks.o: ../../include/name_mask.h | ||
1685 | +mynetworks.o: ../../include/sock_addr.h | ||
1686 | +mynetworks.o: ../../include/sys_defs.h | ||
1687 | +mynetworks.o: ../../include/vbuf.h | ||
1688 | +mynetworks.o: ../../include/vstring.h | ||
1689 | +mynetworks.o: been_here.h | ||
1690 | +mynetworks.o: mail_params.h | ||
1691 | +mynetworks.o: mynetworks.c | ||
1692 | +mynetworks.o: mynetworks.h | ||
1693 | +mynetworks.o: own_inet_addr.h | ||
1694 | +mypwd.o: ../../include/binhash.h | ||
1695 | +mypwd.o: ../../include/htable.h | ||
1696 | +mypwd.o: ../../include/msg.h | ||
1697 | +mypwd.o: ../../include/mymalloc.h | ||
1698 | +mypwd.o: ../../include/sys_defs.h | ||
1699 | +mypwd.o: mypwd.c | ||
1700 | +mypwd.o: mypwd.h | ||
1701 | +namadr_list.o: ../../include/match_list.h | ||
1702 | +namadr_list.o: ../../include/match_ops.h | ||
1703 | +namadr_list.o: ../../include/sys_defs.h | ||
1704 | +namadr_list.o: namadr_list.c | ||
1705 | +namadr_list.o: namadr_list.h | ||
1706 | +off_cvt.o: ../../include/msg.h | ||
1707 | +off_cvt.o: ../../include/sys_defs.h | ||
1708 | +off_cvt.o: ../../include/vbuf.h | ||
1709 | +off_cvt.o: ../../include/vstring.h | ||
1710 | +off_cvt.o: off_cvt.c | ||
1711 | +off_cvt.o: off_cvt.h | ||
1712 | +opened.o: ../../include/msg.h | ||
1713 | +opened.o: ../../include/sys_defs.h | ||
1714 | +opened.o: ../../include/vbuf.h | ||
1715 | +opened.o: ../../include/vstring.h | ||
1716 | +opened.o: opened.c | ||
1717 | +opened.o: opened.h | ||
1718 | +own_inet_addr.o: ../../include/inet_addr_host.h | ||
1719 | +own_inet_addr.o: ../../include/inet_addr_list.h | ||
1720 | +own_inet_addr.o: ../../include/inet_addr_local.h | ||
1721 | +own_inet_addr.o: ../../include/inet_proto.h | ||
1722 | +own_inet_addr.o: ../../include/msg.h | ||
1723 | +own_inet_addr.o: ../../include/myaddrinfo.h | ||
1724 | +own_inet_addr.o: ../../include/mymalloc.h | ||
1725 | +own_inet_addr.o: ../../include/sock_addr.h | ||
1726 | +own_inet_addr.o: ../../include/stringops.h | ||
1727 | +own_inet_addr.o: ../../include/sys_defs.h | ||
1728 | +own_inet_addr.o: ../../include/vbuf.h | ||
1729 | +own_inet_addr.o: ../../include/vstring.h | ||
1730 | +own_inet_addr.o: mail_params.h | ||
1731 | +own_inet_addr.o: own_inet_addr.c | ||
1732 | +own_inet_addr.o: own_inet_addr.h | ||
1733 | +pipe_command.o: ../../include/argv.h | ||
1734 | +pipe_command.o: ../../include/chroot_uid.h | ||
1735 | +pipe_command.o: ../../include/clean_env.h | ||
1736 | +pipe_command.o: ../../include/exec_command.h | ||
1737 | +pipe_command.o: ../../include/iostuff.h | ||
1738 | +pipe_command.o: ../../include/msg.h | ||
1739 | +pipe_command.o: ../../include/msg_vstream.h | ||
1740 | +pipe_command.o: ../../include/set_eugid.h | ||
1741 | +pipe_command.o: ../../include/set_ugid.h | ||
1742 | +pipe_command.o: ../../include/stringops.h | ||
1743 | +pipe_command.o: ../../include/sys_defs.h | ||
1744 | +pipe_command.o: ../../include/timed_wait.h | ||
1745 | +pipe_command.o: ../../include/vbuf.h | ||
1746 | +pipe_command.o: ../../include/vstream.h | ||
1747 | +pipe_command.o: ../../include/vstring.h | ||
1748 | +pipe_command.o: dsn.h | ||
1749 | +pipe_command.o: dsn_buf.h | ||
1750 | +pipe_command.o: dsn_util.h | ||
1751 | +pipe_command.o: mail_copy.h | ||
1752 | +pipe_command.o: mail_params.h | ||
1753 | +pipe_command.o: pipe_command.c | ||
1754 | +pipe_command.o: pipe_command.h | ||
1755 | +pipe_command.o: sys_exits.h | ||
1756 | +post_mail.o: ../../include/attr.h | ||
1757 | +post_mail.o: ../../include/events.h | ||
1758 | +post_mail.o: ../../include/iostuff.h | ||
1759 | +post_mail.o: ../../include/msg.h | ||
1760 | +post_mail.o: ../../include/mymalloc.h | ||
1761 | +post_mail.o: ../../include/sys_defs.h | ||
1762 | +post_mail.o: ../../include/vbuf.h | ||
1763 | +post_mail.o: ../../include/vstream.h | ||
1764 | +post_mail.o: ../../include/vstring.h | ||
1765 | +post_mail.o: cleanup_user.h | ||
1766 | +post_mail.o: int_filt.h | ||
1767 | +post_mail.o: mail_date.h | ||
1768 | +post_mail.o: mail_params.h | ||
1769 | +post_mail.o: mail_proto.h | ||
1770 | +post_mail.o: post_mail.c | ||
1771 | +post_mail.o: post_mail.h | ||
1772 | +post_mail.o: rec_type.h | ||
1773 | +post_mail.o: record.h | ||
1774 | +quote_821_local.o: ../../include/sys_defs.h | ||
1775 | +quote_821_local.o: ../../include/vbuf.h | ||
1776 | +quote_821_local.o: ../../include/vstring.h | ||
1777 | +quote_821_local.o: quote_821_local.c | ||
1778 | +quote_821_local.o: quote_821_local.h | ||
1779 | +quote_821_local.o: quote_flags.h | ||
1780 | +quote_822_local.o: ../../include/sys_defs.h | ||
1781 | +quote_822_local.o: ../../include/vbuf.h | ||
1782 | +quote_822_local.o: ../../include/vstring.h | ||
1783 | +quote_822_local.o: quote_822_local.c | ||
1784 | +quote_822_local.o: quote_822_local.h | ||
1785 | +quote_822_local.o: quote_flags.h | ||
1786 | +rcpt_buf.o: ../../include/attr.h | ||
1787 | +rcpt_buf.o: ../../include/iostuff.h | ||
1788 | +rcpt_buf.o: ../../include/mymalloc.h | ||
1789 | +rcpt_buf.o: ../../include/sys_defs.h | ||
1790 | +rcpt_buf.o: ../../include/vbuf.h | ||
1791 | +rcpt_buf.o: ../../include/vstream.h | ||
1792 | +rcpt_buf.o: ../../include/vstring.h | ||
1793 | +rcpt_buf.o: mail_proto.h | ||
1794 | +rcpt_buf.o: rcpt_buf.c | ||
1795 | +rcpt_buf.o: rcpt_buf.h | ||
1796 | +rcpt_buf.o: recipient_list.h | ||
1797 | +rcpt_print.o: ../../include/attr.h | ||
1798 | +rcpt_print.o: ../../include/iostuff.h | ||
1799 | +rcpt_print.o: ../../include/sys_defs.h | ||
1800 | +rcpt_print.o: ../../include/vbuf.h | ||
1801 | +rcpt_print.o: ../../include/vstream.h | ||
1802 | +rcpt_print.o: mail_proto.h | ||
1803 | +rcpt_print.o: rcpt_print.c | ||
1804 | +rcpt_print.o: rcpt_print.h | ||
1805 | +rcpt_print.o: recipient_list.h | ||
1806 | +rec2stream.o: ../../include/sys_defs.h | ||
1807 | +rec2stream.o: ../../include/vbuf.h | ||
1808 | +rec2stream.o: ../../include/vstream.h | ||
1809 | +rec2stream.o: ../../include/vstring.h | ||
1810 | +rec2stream.o: rec2stream.c | ||
1811 | +rec2stream.o: rec_streamlf.h | ||
1812 | +rec2stream.o: rec_type.h | ||
1813 | +rec2stream.o: record.h | ||
1814 | +rec_attr_map.o: ../../include/attr.h | ||
1815 | +rec_attr_map.o: ../../include/iostuff.h | ||
1816 | +rec_attr_map.o: ../../include/sys_defs.h | ||
1817 | +rec_attr_map.o: ../../include/vbuf.h | ||
1818 | +rec_attr_map.o: ../../include/vstream.h | ||
1819 | +rec_attr_map.o: mail_proto.h | ||
1820 | +rec_attr_map.o: rec_attr_map.c | ||
1821 | +rec_attr_map.o: rec_attr_map.h | ||
1822 | +rec_attr_map.o: rec_type.h | ||
1823 | +rec_streamlf.o: ../../include/sys_defs.h | ||
1824 | +rec_streamlf.o: ../../include/vbuf.h | ||
1825 | +rec_streamlf.o: ../../include/vstream.h | ||
1826 | +rec_streamlf.o: ../../include/vstring.h | ||
1827 | +rec_streamlf.o: rec_streamlf.c | ||
1828 | +rec_streamlf.o: rec_streamlf.h | ||
1829 | +rec_streamlf.o: rec_type.h | ||
1830 | +rec_streamlf.o: record.h | ||
1831 | +rec_type.o: rec_type.c | ||
1832 | +rec_type.o: rec_type.h | ||
1833 | +recdump.o: ../../include/msg_vstream.h | ||
1834 | +recdump.o: ../../include/sys_defs.h | ||
1835 | +recdump.o: ../../include/vbuf.h | ||
1836 | +recdump.o: ../../include/vstream.h | ||
1837 | +recdump.o: ../../include/vstring.h | ||
1838 | +recdump.o: rec_streamlf.h | ||
1839 | +recdump.o: rec_type.h | ||
1840 | +recdump.o: recdump.c | ||
1841 | +recdump.o: record.h | ||
1842 | +recipient_list.o: ../../include/msg.h | ||
1843 | +recipient_list.o: ../../include/mymalloc.h | ||
1844 | +recipient_list.o: ../../include/sys_defs.h | ||
1845 | +recipient_list.o: recipient_list.c | ||
1846 | +recipient_list.o: recipient_list.h | ||
1847 | +record.o: ../../include/msg.h | ||
1848 | +record.o: ../../include/mymalloc.h | ||
1849 | +record.o: ../../include/stringops.h | ||
1850 | +record.o: ../../include/sys_defs.h | ||
1851 | +record.o: ../../include/vbuf.h | ||
1852 | +record.o: ../../include/vstream.h | ||
1853 | +record.o: ../../include/vstring.h | ||
1854 | +record.o: off_cvt.h | ||
1855 | +record.o: rec_type.h | ||
1856 | +record.o: record.c | ||
1857 | +record.o: record.h | ||
1858 | +remove.o: ../../include/sys_defs.h | ||
1859 | +remove.o: ../../include/vbuf.h | ||
1860 | +remove.o: ../../include/vstring.h | ||
1861 | +remove.o: mail_params.h | ||
1862 | +remove.o: remove.c | ||
1863 | +resolve_clnt.o: ../../include/attr.h | ||
1864 | +resolve_clnt.o: ../../include/events.h | ||
1865 | +resolve_clnt.o: ../../include/iostuff.h | ||
1866 | +resolve_clnt.o: ../../include/msg.h | ||
1867 | +resolve_clnt.o: ../../include/sys_defs.h | ||
1868 | +resolve_clnt.o: ../../include/vbuf.h | ||
1869 | +resolve_clnt.o: ../../include/vstream.h | ||
1870 | +resolve_clnt.o: ../../include/vstring.h | ||
1871 | +resolve_clnt.o: ../../include/vstring_vstream.h | ||
1872 | +resolve_clnt.o: clnt_stream.h | ||
1873 | +resolve_clnt.o: mail_params.h | ||
1874 | +resolve_clnt.o: mail_proto.h | ||
1875 | +resolve_clnt.o: resolve_clnt.c | ||
1876 | +resolve_clnt.o: resolve_clnt.h | ||
1877 | +resolve_local.o: ../../include/inet_addr_list.h | ||
1878 | +resolve_local.o: ../../include/match_list.h | ||
1879 | +resolve_local.o: ../../include/match_ops.h | ||
1880 | +resolve_local.o: ../../include/msg.h | ||
1881 | +resolve_local.o: ../../include/myaddrinfo.h | ||
1882 | +resolve_local.o: ../../include/mymalloc.h | ||
1883 | +resolve_local.o: ../../include/sys_defs.h | ||
1884 | +resolve_local.o: ../../include/valid_hostname.h | ||
1885 | +resolve_local.o: mail_params.h | ||
1886 | +resolve_local.o: own_inet_addr.h | ||
1887 | +resolve_local.o: resolve_local.c | ||
1888 | +resolve_local.o: resolve_local.h | ||
1889 | +resolve_local.o: string_list.h | ||
1890 | +resolve_local.o: valid_mailhost_addr.h | ||
1891 | +rewrite_clnt.o: ../../include/attr.h | ||
1892 | +rewrite_clnt.o: ../../include/events.h | ||
1893 | +rewrite_clnt.o: ../../include/iostuff.h | ||
1894 | +rewrite_clnt.o: ../../include/msg.h | ||
1895 | +rewrite_clnt.o: ../../include/sys_defs.h | ||
1896 | +rewrite_clnt.o: ../../include/vbuf.h | ||
1897 | +rewrite_clnt.o: ../../include/vstream.h | ||
1898 | +rewrite_clnt.o: ../../include/vstring.h | ||
1899 | +rewrite_clnt.o: ../../include/vstring_vstream.h | ||
1900 | +rewrite_clnt.o: clnt_stream.h | ||
1901 | +rewrite_clnt.o: mail_params.h | ||
1902 | +rewrite_clnt.o: mail_proto.h | ||
1903 | +rewrite_clnt.o: quote_822_local.h | ||
1904 | +rewrite_clnt.o: quote_flags.h | ||
1905 | +rewrite_clnt.o: rewrite_clnt.c | ||
1906 | +rewrite_clnt.o: rewrite_clnt.h | ||
1907 | +scache.o: ../../include/argv.h | ||
1908 | +scache.o: ../../include/events.h | ||
1909 | +scache.o: ../../include/msg.h | ||
1910 | +scache.o: ../../include/sys_defs.h | ||
1911 | +scache.o: ../../include/vbuf.h | ||
1912 | +scache.o: ../../include/vstream.h | ||
1913 | +scache.o: ../../include/vstring.h | ||
1914 | +scache.o: ../../include/vstring_vstream.h | ||
1915 | +scache.o: scache.c | ||
1916 | +scache.o: scache.h | ||
1917 | +scache_clnt.o: ../../include/attr.h | ||
1918 | +scache_clnt.o: ../../include/auto_clnt.h | ||
1919 | +scache_clnt.o: ../../include/iostuff.h | ||
1920 | +scache_clnt.o: ../../include/msg.h | ||
1921 | +scache_clnt.o: ../../include/mymalloc.h | ||
1922 | +scache_clnt.o: ../../include/stringops.h | ||
1923 | +scache_clnt.o: ../../include/sys_defs.h | ||
1924 | +scache_clnt.o: ../../include/vbuf.h | ||
1925 | +scache_clnt.o: ../../include/vstream.h | ||
1926 | +scache_clnt.o: ../../include/vstring.h | ||
1927 | +scache_clnt.o: mail_params.h | ||
1928 | +scache_clnt.o: mail_proto.h | ||
1929 | +scache_clnt.o: scache.h | ||
1930 | +scache_clnt.o: scache_clnt.c | ||
1931 | +scache_multi.o: ../../include/events.h | ||
1932 | +scache_multi.o: ../../include/htable.h | ||
1933 | +scache_multi.o: ../../include/msg.h | ||
1934 | +scache_multi.o: ../../include/mymalloc.h | ||
1935 | +scache_multi.o: ../../include/ring.h | ||
1936 | +scache_multi.o: ../../include/sys_defs.h | ||
1937 | +scache_multi.o: ../../include/vbuf.h | ||
1938 | +scache_multi.o: ../../include/vstring.h | ||
1939 | +scache_multi.o: scache.h | ||
1940 | +scache_multi.o: scache_multi.c | ||
1941 | +scache_single.o: ../../include/events.h | ||
1942 | +scache_single.o: ../../include/msg.h | ||
1943 | +scache_single.o: ../../include/mymalloc.h | ||
1944 | +scache_single.o: ../../include/sys_defs.h | ||
1945 | +scache_single.o: ../../include/vbuf.h | ||
1946 | +scache_single.o: ../../include/vstring.h | ||
1947 | +scache_single.o: scache.h | ||
1948 | +scache_single.o: scache_single.c | ||
1949 | +sent.o: ../../include/attr.h | ||
1950 | +sent.o: ../../include/msg.h | ||
1951 | +sent.o: ../../include/sys_defs.h | ||
1952 | +sent.o: ../../include/vbuf.h | ||
1953 | +sent.o: ../../include/vstream.h | ||
1954 | +sent.o: ../../include/vstring.h | ||
1955 | +sent.o: bounce.h | ||
1956 | +sent.o: defer.h | ||
1957 | +sent.o: deliver_request.h | ||
1958 | +sent.o: dsn.h | ||
1959 | +sent.o: dsn_buf.h | ||
1960 | +sent.o: dsn_mask.h | ||
1961 | +sent.o: dsn_util.h | ||
1962 | +sent.o: log_adhoc.h | ||
1963 | +sent.o: mail_params.h | ||
1964 | +sent.o: msg_stats.h | ||
1965 | +sent.o: recipient_list.h | ||
1966 | +sent.o: sent.c | ||
1967 | +sent.o: sent.h | ||
1968 | +sent.o: trace.h | ||
1969 | +sent.o: verify.h | ||
1970 | +smtp_stream.o: ../../include/iostuff.h | ||
1971 | +smtp_stream.o: ../../include/msg.h | ||
1972 | +smtp_stream.o: ../../include/sys_defs.h | ||
1973 | +smtp_stream.o: ../../include/vbuf.h | ||
1974 | +smtp_stream.o: ../../include/vstream.h | ||
1975 | +smtp_stream.o: ../../include/vstring.h | ||
1976 | +smtp_stream.o: ../../include/vstring_vstream.h | ||
1977 | +smtp_stream.o: smtp_stream.c | ||
1978 | +smtp_stream.o: smtp_stream.h | ||
1979 | +split_addr.o: ../../include/split_at.h | ||
1980 | +split_addr.o: ../../include/sys_defs.h | ||
1981 | +split_addr.o: mail_addr.h | ||
1982 | +split_addr.o: mail_params.h | ||
1983 | +split_addr.o: split_addr.c | ||
1984 | +split_addr.o: split_addr.h | ||
1985 | +stream2rec.o: ../../include/sys_defs.h | ||
1986 | +stream2rec.o: ../../include/vbuf.h | ||
1987 | +stream2rec.o: ../../include/vstream.h | ||
1988 | +stream2rec.o: ../../include/vstring.h | ||
1989 | +stream2rec.o: rec_streamlf.h | ||
1990 | +stream2rec.o: rec_type.h | ||
1991 | +stream2rec.o: record.h | ||
1992 | +stream2rec.o: stream2rec.c | ||
1993 | +string_list.o: ../../include/match_list.h | ||
1994 | +string_list.o: ../../include/match_ops.h | ||
1995 | +string_list.o: ../../include/sys_defs.h | ||
1996 | +string_list.o: string_list.c | ||
1997 | +string_list.o: string_list.h | ||
1998 | +strip_addr.o: ../../include/mymalloc.h | ||
1999 | +strip_addr.o: ../../include/sys_defs.h | ||
2000 | +strip_addr.o: split_addr.h | ||
2001 | +strip_addr.o: strip_addr.c | ||
2002 | +strip_addr.o: strip_addr.h | ||
2003 | +sys_exits.o: ../../include/msg.h | ||
2004 | +sys_exits.o: ../../include/sys_defs.h | ||
2005 | +sys_exits.o: ../../include/vbuf.h | ||
2006 | +sys_exits.o: ../../include/vstring.h | ||
2007 | +sys_exits.o: sys_exits.c | ||
2008 | +sys_exits.o: sys_exits.h | ||
2009 | +timed_ipc.o: ../../include/msg.h | ||
2010 | +timed_ipc.o: ../../include/sys_defs.h | ||
2011 | +timed_ipc.o: ../../include/vbuf.h | ||
2012 | +timed_ipc.o: ../../include/vstream.h | ||
2013 | +timed_ipc.o: mail_params.h | ||
2014 | +timed_ipc.o: timed_ipc.c | ||
2015 | +timed_ipc.o: timed_ipc.h | ||
2016 | +tok822_find.o: ../../include/sys_defs.h | ||
2017 | +tok822_find.o: ../../include/vbuf.h | ||
2018 | +tok822_find.o: ../../include/vstring.h | ||
2019 | +tok822_find.o: resolve_clnt.h | ||
2020 | +tok822_find.o: tok822.h | ||
2021 | +tok822_find.o: tok822_find.c | ||
2022 | +tok822_node.o: ../../include/mymalloc.h | ||
2023 | +tok822_node.o: ../../include/sys_defs.h | ||
2024 | +tok822_node.o: ../../include/vbuf.h | ||
2025 | +tok822_node.o: ../../include/vstring.h | ||
2026 | +tok822_node.o: resolve_clnt.h | ||
2027 | +tok822_node.o: tok822.h | ||
2028 | +tok822_node.o: tok822_node.c | ||
2029 | +tok822_parse.o: ../../include/msg.h | ||
2030 | +tok822_parse.o: ../../include/stringops.h | ||
2031 | +tok822_parse.o: ../../include/sys_defs.h | ||
2032 | +tok822_parse.o: ../../include/vbuf.h | ||
2033 | +tok822_parse.o: ../../include/vstring.h | ||
2034 | +tok822_parse.o: lex_822.h | ||
2035 | +tok822_parse.o: quote_822_local.h | ||
2036 | +tok822_parse.o: quote_flags.h | ||
2037 | +tok822_parse.o: resolve_clnt.h | ||
2038 | +tok822_parse.o: tok822.h | ||
2039 | +tok822_parse.o: tok822_parse.c | ||
2040 | +tok822_resolve.o: ../../include/msg.h | ||
2041 | +tok822_resolve.o: ../../include/sys_defs.h | ||
2042 | +tok822_resolve.o: ../../include/vbuf.h | ||
2043 | +tok822_resolve.o: ../../include/vstring.h | ||
2044 | +tok822_resolve.o: resolve_clnt.h | ||
2045 | +tok822_resolve.o: tok822.h | ||
2046 | +tok822_resolve.o: tok822_resolve.c | ||
2047 | +tok822_rewrite.o: ../../include/attr.h | ||
2048 | +tok822_rewrite.o: ../../include/iostuff.h | ||
2049 | +tok822_rewrite.o: ../../include/msg.h | ||
2050 | +tok822_rewrite.o: ../../include/sys_defs.h | ||
2051 | +tok822_rewrite.o: ../../include/vbuf.h | ||
2052 | +tok822_rewrite.o: ../../include/vstream.h | ||
2053 | +tok822_rewrite.o: ../../include/vstring.h | ||
2054 | +tok822_rewrite.o: mail_proto.h | ||
2055 | +tok822_rewrite.o: resolve_clnt.h | ||
2056 | +tok822_rewrite.o: rewrite_clnt.h | ||
2057 | +tok822_rewrite.o: tok822.h | ||
2058 | +tok822_rewrite.o: tok822_rewrite.c | ||
2059 | +tok822_tree.o: ../../include/mymalloc.h | ||
2060 | +tok822_tree.o: ../../include/sys_defs.h | ||
2061 | +tok822_tree.o: ../../include/vbuf.h | ||
2062 | +tok822_tree.o: ../../include/vstring.h | ||
2063 | +tok822_tree.o: resolve_clnt.h | ||
2064 | +tok822_tree.o: tok822.h | ||
2065 | +tok822_tree.o: tok822_tree.c | ||
2066 | +trace.o: ../../include/attr.h | ||
2067 | +trace.o: ../../include/iostuff.h | ||
2068 | +trace.o: ../../include/msg.h | ||
2069 | +trace.o: ../../include/sys_defs.h | ||
2070 | +trace.o: ../../include/vbuf.h | ||
2071 | +trace.o: ../../include/vstream.h | ||
2072 | +trace.o: ../../include/vstring.h | ||
2073 | +trace.o: bounce.h | ||
2074 | +trace.o: deliver_request.h | ||
2075 | +trace.o: dsn.h | ||
2076 | +trace.o: dsn_buf.h | ||
2077 | +trace.o: dsn_print.h | ||
2078 | +trace.o: log_adhoc.h | ||
2079 | +trace.o: mail_params.h | ||
2080 | +trace.o: mail_proto.h | ||
2081 | +trace.o: msg_stats.h | ||
2082 | +trace.o: rcpt_print.h | ||
2083 | +trace.o: recipient_list.h | ||
2084 | +trace.o: trace.c | ||
2085 | +trace.o: trace.h | ||
2086 | +user_acl.o: ../../include/match_list.h | ||
2087 | +user_acl.o: ../../include/match_ops.h | ||
2088 | +user_acl.o: ../../include/sys_defs.h | ||
2089 | +user_acl.o: ../../include/vbuf.h | ||
2090 | +user_acl.o: ../../include/vstring.h | ||
2091 | +user_acl.o: mail_params.h | ||
2092 | +user_acl.o: mypwd.h | ||
2093 | +user_acl.o: string_list.h | ||
2094 | +user_acl.o: user_acl.c | ||
2095 | +user_acl.o: user_acl.h | ||
2096 | +valid_mailhost_addr.o: ../../include/msg.h | ||
2097 | +valid_mailhost_addr.o: ../../include/myaddrinfo.h | ||
2098 | +valid_mailhost_addr.o: ../../include/sys_defs.h | ||
2099 | +valid_mailhost_addr.o: ../../include/valid_hostname.h | ||
2100 | +valid_mailhost_addr.o: valid_mailhost_addr.c | ||
2101 | +valid_mailhost_addr.o: valid_mailhost_addr.h | ||
2102 | +verify.o: ../../include/attr.h | ||
2103 | +verify.o: ../../include/iostuff.h | ||
2104 | +verify.o: ../../include/msg.h | ||
2105 | +verify.o: ../../include/sys_defs.h | ||
2106 | +verify.o: ../../include/vbuf.h | ||
2107 | +verify.o: ../../include/vstream.h | ||
2108 | +verify.o: ../../include/vstring.h | ||
2109 | +verify.o: deliver_request.h | ||
2110 | +verify.o: dsn.h | ||
2111 | +verify.o: log_adhoc.h | ||
2112 | +verify.o: mail_params.h | ||
2113 | +verify.o: mail_proto.h | ||
2114 | +verify.o: msg_stats.h | ||
2115 | +verify.o: recipient_list.h | ||
2116 | +verify.o: verify.c | ||
2117 | +verify.o: verify.h | ||
2118 | +verify.o: verify_clnt.h | ||
2119 | +verify_clnt.o: ../../include/attr.h | ||
2120 | +verify_clnt.o: ../../include/iostuff.h | ||
2121 | +verify_clnt.o: ../../include/msg.h | ||
2122 | +verify_clnt.o: ../../include/sys_defs.h | ||
2123 | +verify_clnt.o: ../../include/vbuf.h | ||
2124 | +verify_clnt.o: ../../include/vstream.h | ||
2125 | +verify_clnt.o: ../../include/vstring.h | ||
2126 | +verify_clnt.o: clnt_stream.h | ||
2127 | +verify_clnt.o: deliver_request.h | ||
2128 | +verify_clnt.o: dsn.h | ||
2129 | +verify_clnt.o: mail_params.h | ||
2130 | +verify_clnt.o: mail_proto.h | ||
2131 | +verify_clnt.o: msg_stats.h | ||
2132 | +verify_clnt.o: recipient_list.h | ||
2133 | +verify_clnt.o: verify_clnt.c | ||
2134 | +verify_clnt.o: verify_clnt.h | ||
2135 | +verp_sender.o: ../../include/sys_defs.h | ||
2136 | +verp_sender.o: ../../include/vbuf.h | ||
2137 | +verp_sender.o: ../../include/vstring.h | ||
2138 | +verp_sender.o: mail_params.h | ||
2139 | +verp_sender.o: recipient_list.h | ||
2140 | +verp_sender.o: verp_sender.c | ||
2141 | +verp_sender.o: verp_sender.h | ||
2142 | +wildcard_inet_addr.o: ../../include/inet_addr_host.h | ||
2143 | +wildcard_inet_addr.o: ../../include/inet_addr_list.h | ||
2144 | +wildcard_inet_addr.o: ../../include/msg.h | ||
2145 | +wildcard_inet_addr.o: ../../include/myaddrinfo.h | ||
2146 | +wildcard_inet_addr.o: ../../include/sys_defs.h | ||
2147 | +wildcard_inet_addr.o: wildcard_inet_addr.c | ||
2148 | +wildcard_inet_addr.o: wildcard_inet_addr.h | ||
2149 | +xtext.o: ../../include/msg.h | ||
2150 | +xtext.o: ../../include/sys_defs.h | ||
2151 | +xtext.o: ../../include/vbuf.h | ||
2152 | +xtext.o: ../../include/vstring.h | ||
2153 | +xtext.o: xtext.c | ||
2154 | +xtext.o: xtext.h | ||
2155 | diff -ruN a/src/global/mail_conf.c b/src/global/mail_conf.c | ||
2156 | --- a/src/global/mail_conf.c 2009-06-01 12:27:43.000000000 +0000 | ||
2157 | +++ b/src/global/mail_conf.c 2009-06-01 13:08:26.000000000 +0000 | ||
2158 | @@ -182,6 +182,13 @@ | ||
2159 | path = concatenate(var_config_dir, "/", "main.cf", (char *) 0); | ||
2160 | dict_load_file(CONFIG_DICT, path); | ||
2161 | myfree(path); | ||
2162 | + | ||
2163 | +#ifndef NO_DYNAMIC_MAPS | ||
2164 | + path = concatenate(var_config_dir, "/", "dynamicmaps.cf", (char *) 0); | ||
2165 | + dict_open_dlinfo(path); | ||
2166 | + myfree(path); | ||
2167 | +#endif | ||
2168 | + | ||
2169 | } | ||
2170 | |||
2171 | /* mail_conf_flush - discard configuration dictionary */ | ||
2172 | diff -ruN a/src/global/mail_conf.c.orig b/src/global/mail_conf.c.orig | ||
2173 | --- a/src/global/mail_conf.c.orig 1970-01-01 00:00:00.000000000 +0000 | ||
2174 | +++ b/src/global/mail_conf.c.orig 2009-06-01 13:07:56.000000000 +0000 | ||
2175 | @@ -0,0 +1,229 @@ | ||
2176 | +/*++ | ||
2177 | +/* NAME | ||
2178 | +/* mail_conf 3 | ||
2179 | +/* SUMMARY | ||
2180 | +/* global configuration parameter management | ||
2181 | +/* SYNOPSIS | ||
2182 | +/* #include <mail_conf.h> | ||
2183 | +/* | ||
2184 | +/* void mail_conf_read() | ||
2185 | +/* | ||
2186 | +/* void mail_conf_suck() | ||
2187 | +/* | ||
2188 | +/* void mail_conf_flush() | ||
2189 | +/* | ||
2190 | +/* void mail_conf_update(name, value) | ||
2191 | +/* const char *name; | ||
2192 | +/* const char *value; | ||
2193 | +/* | ||
2194 | +/* const char *mail_conf_lookup(name) | ||
2195 | +/* const char *name; | ||
2196 | +/* | ||
2197 | +/* const char *mail_conf_eval(string) | ||
2198 | +/* const char *string; | ||
2199 | +/* | ||
2200 | +/* const char *mail_conf_lookup_eval(name) | ||
2201 | +/* const char *name; | ||
2202 | +/* DESCRIPTION | ||
2203 | +/* mail_conf_suck() reads the global Postfix configuration file, and | ||
2204 | +/* stores its values into a global configuration dictionary. | ||
2205 | +/* | ||
2206 | +/* mail_conf_read() invokes mail_conf_suck() and assigns the values | ||
2207 | +/* to global variables by calling mail_params_init(). | ||
2208 | +/* | ||
2209 | +/* mail_conf_flush() discards the global configuration dictionary. | ||
2210 | +/* This is needed in programs that read main.cf multiple times, to | ||
2211 | +/* ensure that deleted parameter settings are handled properly. | ||
2212 | +/* | ||
2213 | +/* The following routines are wrappers around the generic dictionary | ||
2214 | +/* access routines. | ||
2215 | +/* | ||
2216 | +/* mail_conf_update() updates the named global parameter. This has | ||
2217 | +/* no effect on parameters whose value has already been looked up. | ||
2218 | +/* The update succeeds or the program terminates with fatal error. | ||
2219 | +/* | ||
2220 | +/* mail_conf_lookup() looks up the value of the named parameter. | ||
2221 | +/* A null pointer result means the parameter was not found. | ||
2222 | +/* The result is volatile and should be copied if it is to be | ||
2223 | +/* used for any appreciable amount of time. | ||
2224 | +/* | ||
2225 | +/* mail_conf_eval() recursively expands any $parameters in the | ||
2226 | +/* string argument. The result is volatile and should be copied | ||
2227 | +/* if it is to be used for any appreciable amount of time. | ||
2228 | +/* | ||
2229 | +/* mail_conf_lookup_eval() looks up the named parameter, and expands any | ||
2230 | +/* $parameters in the result. The result is volatile and should be | ||
2231 | +/* copied if it is to be used for any appreciable amount of time. | ||
2232 | +/* DIAGNOSTICS | ||
2233 | +/* Fatal errors: malformed numerical value. | ||
2234 | +/* ENVIRONMENT | ||
2235 | +/* MAIL_CONFIG, non-default configuration database | ||
2236 | +/* MAIL_VERBOSE, enable verbose mode | ||
2237 | +/* FILES | ||
2238 | +/* /etc/postfix: default Postfix configuration directory. | ||
2239 | +/* SEE ALSO | ||
2240 | +/* dict(3) generic dictionary manager | ||
2241 | +/* mail_conf_int(3) integer-valued parameters | ||
2242 | +/* mail_conf_str(3) string-valued parameters | ||
2243 | +/* LICENSE | ||
2244 | +/* .ad | ||
2245 | +/* .fi | ||
2246 | +/* The Secure Mailer license must be distributed with this software. | ||
2247 | +/* AUTHOR(S) | ||
2248 | +/* Wietse Venema | ||
2249 | +/* IBM T.J. Watson Research | ||
2250 | +/* P.O. Box 704 | ||
2251 | +/* Yorktown Heights, NY 10598, USA | ||
2252 | +/*--*/ | ||
2253 | + | ||
2254 | +/* System library. */ | ||
2255 | + | ||
2256 | +#include <sys_defs.h> | ||
2257 | +#include <unistd.h> | ||
2258 | +#include <stdlib.h> | ||
2259 | +#include <string.h> | ||
2260 | + | ||
2261 | +/* Utility library. */ | ||
2262 | + | ||
2263 | +#include <msg.h> | ||
2264 | +#include <mymalloc.h> | ||
2265 | +#include <vstream.h> | ||
2266 | +#include <vstring.h> | ||
2267 | +#include <dict.h> | ||
2268 | +#include <safe.h> | ||
2269 | +#include <stringops.h> | ||
2270 | +#include <readlline.h> | ||
2271 | + | ||
2272 | +/* Global library. */ | ||
2273 | + | ||
2274 | +#include "mail_params.h" | ||
2275 | +#include "mail_conf.h" | ||
2276 | + | ||
2277 | +/* mail_conf_checkdir - authorize non-default directory */ | ||
2278 | + | ||
2279 | +static void mail_conf_checkdir(const char *config_dir) | ||
2280 | +{ | ||
2281 | + VSTRING *buf; | ||
2282 | + VSTREAM *fp; | ||
2283 | + char *path; | ||
2284 | + char *name; | ||
2285 | + char *value; | ||
2286 | + char *cp; | ||
2287 | + int found = 0; | ||
2288 | + | ||
2289 | + /* | ||
2290 | + * If running set-[ug]id, require that a non-default configuration | ||
2291 | + * directory name is blessed as a bona fide configuration directory in | ||
2292 | + * the default main.cf file. | ||
2293 | + */ | ||
2294 | + path = concatenate(DEF_CONFIG_DIR, "/", "main.cf", (char *) 0); | ||
2295 | + if ((fp = vstream_fopen(path, O_RDONLY, 0)) == 0) | ||
2296 | + msg_fatal("open file %s: %m", path); | ||
2297 | + | ||
2298 | + buf = vstring_alloc(1); | ||
2299 | + while (found == 0 && readlline(buf, fp, (int *) 0)) { | ||
2300 | + if (split_nameval(vstring_str(buf), &name, &value) == 0 | ||
2301 | + && (strcmp(name, VAR_CONFIG_DIRS) == 0 | ||
2302 | + || strcmp(name, VAR_MULTI_CONF_DIRS) == 0)) { | ||
2303 | + while (found == 0 && (cp = mystrtok(&value, ", \t\r\n")) != 0) | ||
2304 | + if (strcmp(cp, config_dir) == 0) | ||
2305 | + found = 1; | ||
2306 | + } | ||
2307 | + } | ||
2308 | + if (vstream_fclose(fp)) | ||
2309 | + msg_fatal("read file %s: %m", path); | ||
2310 | + vstring_free(buf); | ||
2311 | + | ||
2312 | + if (found == 0) { | ||
2313 | + msg_error("untrusted configuration directory name: %s", config_dir); | ||
2314 | + msg_fatal("specify \"%s = %s\" in %s", | ||
2315 | + VAR_CONFIG_DIRS, config_dir, path); | ||
2316 | + } | ||
2317 | + myfree(path); | ||
2318 | +} | ||
2319 | + | ||
2320 | +/* mail_conf_read - read global configuration file */ | ||
2321 | + | ||
2322 | +void mail_conf_read(void) | ||
2323 | +{ | ||
2324 | + mail_conf_suck(); | ||
2325 | + mail_params_init(); | ||
2326 | +} | ||
2327 | + | ||
2328 | +/* mail_conf_suck - suck in the global configuration file */ | ||
2329 | + | ||
2330 | +void mail_conf_suck(void) | ||
2331 | +{ | ||
2332 | + char *config_dir; | ||
2333 | + char *path; | ||
2334 | + | ||
2335 | + /* | ||
2336 | + * Permit references to unknown configuration variable names. We rely on | ||
2337 | + * a separate configuration checking tool to spot misspelled names and | ||
2338 | + * other kinds of trouble. Enter the configuration directory into the | ||
2339 | + * default dictionary. | ||
2340 | + */ | ||
2341 | + dict_unknown_allowed = 1; | ||
2342 | + if (var_config_dir) | ||
2343 | + myfree(var_config_dir); | ||
2344 | + if ((config_dir = getenv(CONF_ENV_PATH)) == 0) | ||
2345 | + config_dir = DEF_CONFIG_DIR; | ||
2346 | + var_config_dir = mystrdup(config_dir); | ||
2347 | + set_mail_conf_str(VAR_CONFIG_DIR, var_config_dir); | ||
2348 | + | ||
2349 | + /* | ||
2350 | + * If the configuration directory name comes from a different trust | ||
2351 | + * domain, require that it is listed in the default main.cf file. | ||
2352 | + */ | ||
2353 | + if (strcmp(var_config_dir, DEF_CONFIG_DIR) != 0 /* non-default */ | ||
2354 | + && safe_getenv(CONF_ENV_PATH) == 0 /* non-default */ | ||
2355 | + && geteuid() != 0) /* untrusted */ | ||
2356 | + mail_conf_checkdir(var_config_dir); | ||
2357 | + path = concatenate(var_config_dir, "/", "main.cf", (char *) 0); | ||
2358 | + dict_load_file(CONFIG_DICT, path); | ||
2359 | + myfree(path); | ||
2360 | +} | ||
2361 | + | ||
2362 | +/* mail_conf_flush - discard configuration dictionary */ | ||
2363 | + | ||
2364 | +void mail_conf_flush(void) | ||
2365 | +{ | ||
2366 | + if (dict_handle(CONFIG_DICT) != 0) | ||
2367 | + dict_unregister(CONFIG_DICT); | ||
2368 | +} | ||
2369 | + | ||
2370 | +/* mail_conf_eval - expand macros in string */ | ||
2371 | + | ||
2372 | +const char *mail_conf_eval(const char *string) | ||
2373 | +{ | ||
2374 | +#define RECURSIVE 1 | ||
2375 | + | ||
2376 | + return (dict_eval(CONFIG_DICT, string, RECURSIVE)); | ||
2377 | +} | ||
2378 | + | ||
2379 | +/* mail_conf_lookup - lookup named variable */ | ||
2380 | + | ||
2381 | +const char *mail_conf_lookup(const char *name) | ||
2382 | +{ | ||
2383 | + return (dict_lookup(CONFIG_DICT, name)); | ||
2384 | +} | ||
2385 | + | ||
2386 | +/* mail_conf_lookup_eval - expand named variable */ | ||
2387 | + | ||
2388 | +const char *mail_conf_lookup_eval(const char *name) | ||
2389 | +{ | ||
2390 | + const char *value; | ||
2391 | + | ||
2392 | +#define RECURSIVE 1 | ||
2393 | + | ||
2394 | + if ((value = dict_lookup(CONFIG_DICT, name)) != 0) | ||
2395 | + value = dict_eval(CONFIG_DICT, value, RECURSIVE); | ||
2396 | + return (value); | ||
2397 | +} | ||
2398 | + | ||
2399 | +/* mail_conf_update - update parameter */ | ||
2400 | + | ||
2401 | +void mail_conf_update(const char *key, const char *value) | ||
2402 | +{ | ||
2403 | + dict_update(CONFIG_DICT, key, value); | ||
2404 | +} | ||
2405 | diff -ruN a/src/global/mail_dict.c b/src/global/mail_dict.c | ||
2406 | --- a/src/global/mail_dict.c 2009-06-01 12:27:43.000000000 +0000 | ||
2407 | +++ b/src/global/mail_dict.c 2009-06-01 13:08:26.000000000 +0000 | ||
2408 | @@ -45,6 +45,7 @@ | ||
2409 | |||
2410 | static const DICT_OPEN_INFO dict_open_info[] = { | ||
2411 | DICT_TYPE_PROXY, dict_proxy_open, | ||
2412 | +#ifdef NO_DYNAMIC_MAPS | ||
2413 | #ifdef HAS_LDAP | ||
2414 | DICT_TYPE_LDAP, dict_ldap_open, | ||
2415 | #endif | ||
2416 | @@ -54,6 +55,7 @@ | ||
2417 | #ifdef HAS_PGSQL | ||
2418 | DICT_TYPE_PGSQL, dict_pgsql_open, | ||
2419 | #endif | ||
2420 | +#endif /* NO_DYNAMIC_MAPS */ | ||
2421 | 0, | ||
2422 | }; | ||
2423 | |||
2424 | diff -ruN a/src/global/mail_params.c b/src/global/mail_params.c | ||
2425 | --- a/src/global/mail_params.c 2009-06-01 12:27:43.000000000 +0000 | ||
2426 | +++ b/src/global/mail_params.c 2009-06-01 13:08:26.000000000 +0000 | ||
2427 | @@ -79,6 +79,7 @@ | ||
2428 | /* char *var_export_environ; | ||
2429 | /* char *var_debug_peer_list; | ||
2430 | /* int var_debug_peer_level; | ||
2431 | +/* int var_command_maxtime; | ||
2432 | /* int var_in_flow_delay; | ||
2433 | /* int var_fault_inj_code; | ||
2434 | /* char *var_bounce_service; | ||
2435 | @@ -265,6 +266,7 @@ | ||
2436 | char *var_export_environ; | ||
2437 | char *var_debug_peer_list; | ||
2438 | int var_debug_peer_level; | ||
2439 | +int var_command_maxtime; | ||
2440 | int var_fault_inj_code; | ||
2441 | char *var_bounce_service; | ||
2442 | char *var_cleanup_service; | ||
2443 | @@ -276,6 +278,7 @@ | ||
2444 | char *var_error_service; | ||
2445 | char *var_flush_service; | ||
2446 | char *var_verify_service; | ||
2447 | +char *var_scache_service; | ||
2448 | char *var_trace_service; | ||
2449 | char *var_proxymap_service; | ||
2450 | char *var_proxywrite_service; | ||
2451 | diff -ruN a/src/global/mail_params.c.orig b/src/global/mail_params.c.orig | ||
2452 | --- a/src/global/mail_params.c.orig 1970-01-01 00:00:00.000000000 +0000 | ||
2453 | +++ b/src/global/mail_params.c.orig 2009-06-01 13:07:56.000000000 +0000 | ||
2454 | @@ -0,0 +1,752 @@ | ||
2455 | +/*++ | ||
2456 | +/* NAME | ||
2457 | +/* mail_params 3 | ||
2458 | +/* SUMMARY | ||
2459 | +/* global mail configuration parameters | ||
2460 | +/* SYNOPSIS | ||
2461 | +/* #include <mail_params.h> | ||
2462 | +/* | ||
2463 | +/* char *var_myhostname; | ||
2464 | +/* char *var_mydomain; | ||
2465 | +/* char *var_myorigin; | ||
2466 | +/* char *var_mydest; | ||
2467 | +/* char *var_relayhost; | ||
2468 | +/* char *var_transit_origin; | ||
2469 | +/* char *var_transit_dest; | ||
2470 | +/* char *var_mail_name; | ||
2471 | +/* int var_helpful_warnings; | ||
2472 | +/* char *var_syslog_name; | ||
2473 | +/* char *var_mail_owner; | ||
2474 | +/* uid_t var_owner_uid; | ||
2475 | +/* gid_t var_owner_gid; | ||
2476 | +/* char *var_sgid_group; | ||
2477 | +/* gid_t var_sgid_gid; | ||
2478 | +/* char *var_default_privs; | ||
2479 | +/* uid_t var_default_uid; | ||
2480 | +/* gid_t var_default_gid; | ||
2481 | +/* char *var_config_dir; | ||
2482 | +/* char *var_daemon_dir; | ||
2483 | +/* char *var_data_dir; | ||
2484 | +/* char *var_command_dir; | ||
2485 | +/* char *var_queue_dir; | ||
2486 | +/* int var_use_limit; | ||
2487 | +/* int var_idle_limit; | ||
2488 | +/* int var_event_drain; | ||
2489 | +/* int var_bundle_rcpt; | ||
2490 | +/* char *var_procname; | ||
2491 | +/* int var_pid; | ||
2492 | +/* int var_ipc_timeout; | ||
2493 | +/* char *var_pid_dir; | ||
2494 | +/* int var_dont_remove; | ||
2495 | +/* char *var_inet_interfaces; | ||
2496 | +/* char *var_proxy_interfaces; | ||
2497 | +/* char *var_inet_protocols; | ||
2498 | +/* char *var_mynetworks; | ||
2499 | +/* char *var_double_bounce_sender; | ||
2500 | +/* int var_line_limit; | ||
2501 | +/* char *var_alias_db_map; | ||
2502 | +/* int var_message_limit; | ||
2503 | +/* char *var_mail_release; | ||
2504 | +/* char *var_mail_version; | ||
2505 | +/* int var_ipc_idle_limit; | ||
2506 | +/* int var_ipc_ttl_limit; | ||
2507 | +/* char *var_db_type; | ||
2508 | +/* char *var_hash_queue_names; | ||
2509 | +/* int var_hash_queue_depth; | ||
2510 | +/* int var_trigger_timeout; | ||
2511 | +/* char *var_rcpt_delim; | ||
2512 | +/* int var_fork_tries; | ||
2513 | +/* int var_fork_delay; | ||
2514 | +/* int var_flock_tries; | ||
2515 | +/* int var_flock_delay; | ||
2516 | +/* int var_flock_stale; | ||
2517 | +/* int var_disable_dns; | ||
2518 | +/* int var_soft_bounce; | ||
2519 | +/* time_t var_starttime; | ||
2520 | +/* int var_ownreq_special; | ||
2521 | +/* int var_daemon_timeout; | ||
2522 | +/* char *var_syslog_facility; | ||
2523 | +/* char *var_relay_domains; | ||
2524 | +/* char *var_fflush_domains; | ||
2525 | +/* char *var_mynetworks_style; | ||
2526 | +/* char *var_verp_delims; | ||
2527 | +/* char *var_verp_filter; | ||
2528 | +/* char *var_par_dom_match; | ||
2529 | +/* char *var_config_dirs; | ||
2530 | +/* | ||
2531 | +/* int var_inet_windowsize; | ||
2532 | +/* char *var_import_environ; | ||
2533 | +/* char *var_export_environ; | ||
2534 | +/* char *var_debug_peer_list; | ||
2535 | +/* int var_debug_peer_level; | ||
2536 | +/* int var_in_flow_delay; | ||
2537 | +/* int var_fault_inj_code; | ||
2538 | +/* char *var_bounce_service; | ||
2539 | +/* char *var_cleanup_service; | ||
2540 | +/* char *var_defer_service; | ||
2541 | +/* char *var_pickup_service; | ||
2542 | +/* char *var_queue_service; | ||
2543 | +/* char *var_rewrite_service; | ||
2544 | +/* char *var_showq_service; | ||
2545 | +/* char *var_error_service; | ||
2546 | +/* char *var_flush_service; | ||
2547 | +/* char *var_verify_service; | ||
2548 | +/* char *var_trace_service; | ||
2549 | +/* char *var_proxymap_service; | ||
2550 | +/* char *var_proxywrite_service; | ||
2551 | +/* int var_db_create_buf; | ||
2552 | +/* int var_db_read_buf; | ||
2553 | +/* int var_mime_maxdepth; | ||
2554 | +/* int var_mime_bound_len; | ||
2555 | +/* int var_header_limit; | ||
2556 | +/* int var_token_limit; | ||
2557 | +/* int var_disable_mime_input; | ||
2558 | +/* int var_disable_mime_oconv; | ||
2559 | +/* int var_strict_8bitmime; | ||
2560 | +/* int var_strict_7bit_hdrs; | ||
2561 | +/* int var_strict_8bit_body; | ||
2562 | +/* int var_strict_encoding; | ||
2563 | +/* int var_verify_neg_cache; | ||
2564 | +/* int var_oldlog_compat; | ||
2565 | +/* int var_delay_max_res; | ||
2566 | +/* char *var_int_filt_classes; | ||
2567 | +/* int var_cyrus_sasl_authzid; | ||
2568 | +/* | ||
2569 | +/* char *var_multi_conf_dirs; | ||
2570 | +/* char *var_multi_wrapper; | ||
2571 | +/* char *var_multi_group; | ||
2572 | +/* char *var_multi_name; | ||
2573 | +/* bool var_multi_enable; | ||
2574 | +/* | ||
2575 | +/* void mail_params_init() | ||
2576 | +/* | ||
2577 | +/* const char null_format_string[1]; | ||
2578 | +/* DESCRIPTION | ||
2579 | +/* This module (actually the associated include file) define the names | ||
2580 | +/* and defaults of all mail configuration parameters. | ||
2581 | +/* | ||
2582 | +/* mail_params_init() initializes the built-in parameters listed above. | ||
2583 | +/* These parameters are relied upon by library routines, so they are | ||
2584 | +/* initialized globally so as to avoid hard-to-find errors due to | ||
2585 | +/* missing initialization. This routine must be called early, at | ||
2586 | +/* least before entering a chroot jail. | ||
2587 | +/* | ||
2588 | +/* null_format_string is a workaround for gcc compilers that complain | ||
2589 | +/* about empty or null format strings. | ||
2590 | +/* DIAGNOSTICS | ||
2591 | +/* Fatal errors: out of memory; null system or domain name. | ||
2592 | +/* LICENSE | ||
2593 | +/* .ad | ||
2594 | +/* .fi | ||
2595 | +/* The Secure Mailer license must be distributed with this software. | ||
2596 | +/* AUTHOR(S) | ||
2597 | +/* Wietse Venema | ||
2598 | +/* IBM T.J. Watson Research | ||
2599 | +/* P.O. Box 704 | ||
2600 | +/* Yorktown Heights, NY 10598, USA | ||
2601 | +/*--*/ | ||
2602 | + | ||
2603 | +/* System library. */ | ||
2604 | + | ||
2605 | +#include <sys_defs.h> | ||
2606 | +#include <unistd.h> | ||
2607 | +#include <stdlib.h> | ||
2608 | +#include <string.h> | ||
2609 | +#include <pwd.h> | ||
2610 | +#include <grp.h> | ||
2611 | +#include <time.h> | ||
2612 | +#include <ctype.h> | ||
2613 | + | ||
2614 | +#ifdef STRCASECMP_IN_STRINGS_H | ||
2615 | +#include <strings.h> | ||
2616 | +#endif | ||
2617 | + | ||
2618 | +/* Utility library. */ | ||
2619 | + | ||
2620 | +#include <msg.h> | ||
2621 | +#include <msg_syslog.h> | ||
2622 | +#include <get_hostname.h> | ||
2623 | +#include <valid_hostname.h> | ||
2624 | +#include <stringops.h> | ||
2625 | +#include <safe.h> | ||
2626 | +#include <safe_open.h> | ||
2627 | +#include <mymalloc.h> | ||
2628 | +#ifdef HAS_DB | ||
2629 | +#include <dict_db.h> | ||
2630 | +#endif | ||
2631 | +#include <inet_proto.h> | ||
2632 | +#include <vstring_vstream.h> | ||
2633 | +#include <iostuff.h> | ||
2634 | + | ||
2635 | +/* Global library. */ | ||
2636 | + | ||
2637 | +#include <mynetworks.h> | ||
2638 | +#include <mail_conf.h> | ||
2639 | +#include <mail_version.h> | ||
2640 | +#include <mail_proto.h> | ||
2641 | +#include <verp_sender.h> | ||
2642 | +#include <own_inet_addr.h> | ||
2643 | +#include <mail_params.h> | ||
2644 | + | ||
2645 | + /* | ||
2646 | + * Special configuration variables. | ||
2647 | + */ | ||
2648 | +char *var_myhostname; | ||
2649 | +char *var_mydomain; | ||
2650 | +char *var_myorigin; | ||
2651 | +char *var_mydest; | ||
2652 | +char *var_relayhost; | ||
2653 | +char *var_transit_origin; | ||
2654 | +char *var_transit_dest; | ||
2655 | +char *var_mail_name; | ||
2656 | +int var_helpful_warnings; | ||
2657 | +char *var_syslog_name; | ||
2658 | +char *var_mail_owner; | ||
2659 | +uid_t var_owner_uid; | ||
2660 | +gid_t var_owner_gid; | ||
2661 | +char *var_sgid_group; | ||
2662 | +gid_t var_sgid_gid; | ||
2663 | +char *var_default_privs; | ||
2664 | +uid_t var_default_uid; | ||
2665 | +gid_t var_default_gid; | ||
2666 | +char *var_config_dir; | ||
2667 | +char *var_daemon_dir; | ||
2668 | +char *var_data_dir; | ||
2669 | +char *var_command_dir; | ||
2670 | +char *var_queue_dir; | ||
2671 | +int var_use_limit; | ||
2672 | +int var_event_drain; | ||
2673 | +int var_idle_limit; | ||
2674 | +int var_bundle_rcpt; | ||
2675 | +char *var_procname; | ||
2676 | +int var_pid; | ||
2677 | +int var_ipc_timeout; | ||
2678 | +char *var_pid_dir; | ||
2679 | +int var_dont_remove; | ||
2680 | +char *var_inet_interfaces; | ||
2681 | +char *var_proxy_interfaces; | ||
2682 | +char *var_inet_protocols; | ||
2683 | +char *var_mynetworks; | ||
2684 | +char *var_double_bounce_sender; | ||
2685 | +int var_line_limit; | ||
2686 | +char *var_alias_db_map; | ||
2687 | +int var_message_limit; | ||
2688 | +char *var_mail_release; | ||
2689 | +char *var_mail_version; | ||
2690 | +int var_ipc_idle_limit; | ||
2691 | +int var_ipc_ttl_limit; | ||
2692 | +char *var_db_type; | ||
2693 | +char *var_hash_queue_names; | ||
2694 | +int var_hash_queue_depth; | ||
2695 | +int var_trigger_timeout; | ||
2696 | +char *var_rcpt_delim; | ||
2697 | +int var_fork_tries; | ||
2698 | +int var_fork_delay; | ||
2699 | +int var_flock_tries; | ||
2700 | +int var_flock_delay; | ||
2701 | +int var_flock_stale; | ||
2702 | +int var_disable_dns; | ||
2703 | +int var_soft_bounce; | ||
2704 | +time_t var_starttime; | ||
2705 | +int var_ownreq_special; | ||
2706 | +int var_daemon_timeout; | ||
2707 | +char *var_syslog_facility; | ||
2708 | +char *var_relay_domains; | ||
2709 | +char *var_fflush_domains; | ||
2710 | +char *var_mynetworks_style; | ||
2711 | +char *var_verp_delims; | ||
2712 | +char *var_verp_filter; | ||
2713 | +int var_in_flow_delay; | ||
2714 | +char *var_par_dom_match; | ||
2715 | +char *var_config_dirs; | ||
2716 | + | ||
2717 | +int var_inet_windowsize; | ||
2718 | +char *var_import_environ; | ||
2719 | +char *var_export_environ; | ||
2720 | +char *var_debug_peer_list; | ||
2721 | +int var_debug_peer_level; | ||
2722 | +int var_fault_inj_code; | ||
2723 | +char *var_bounce_service; | ||
2724 | +char *var_cleanup_service; | ||
2725 | +char *var_defer_service; | ||
2726 | +char *var_pickup_service; | ||
2727 | +char *var_queue_service; | ||
2728 | +char *var_rewrite_service; | ||
2729 | +char *var_showq_service; | ||
2730 | +char *var_error_service; | ||
2731 | +char *var_flush_service; | ||
2732 | +char *var_verify_service; | ||
2733 | +char *var_trace_service; | ||
2734 | +char *var_proxymap_service; | ||
2735 | +char *var_proxywrite_service; | ||
2736 | +int var_db_create_buf; | ||
2737 | +int var_db_read_buf; | ||
2738 | +int var_mime_maxdepth; | ||
2739 | +int var_mime_bound_len; | ||
2740 | +int var_header_limit; | ||
2741 | +int var_token_limit; | ||
2742 | +int var_disable_mime_input; | ||
2743 | +int var_disable_mime_oconv; | ||
2744 | +int var_strict_8bitmime; | ||
2745 | +int var_strict_7bit_hdrs; | ||
2746 | +int var_strict_8bit_body; | ||
2747 | +int var_strict_encoding; | ||
2748 | +int var_verify_neg_cache; | ||
2749 | +int var_oldlog_compat; | ||
2750 | +int var_delay_max_res; | ||
2751 | +char *var_int_filt_classes; | ||
2752 | +int var_cyrus_sasl_authzid; | ||
2753 | + | ||
2754 | +char *var_multi_conf_dirs; | ||
2755 | +char *var_multi_wrapper; | ||
2756 | +char *var_multi_group; | ||
2757 | +char *var_multi_name; | ||
2758 | +bool var_multi_enable; | ||
2759 | + | ||
2760 | +const char null_format_string[1] = ""; | ||
2761 | + | ||
2762 | +/* check_myhostname - lookup hostname and validate */ | ||
2763 | + | ||
2764 | +static const char *check_myhostname(void) | ||
2765 | +{ | ||
2766 | + static const char *name; | ||
2767 | + const char *dot; | ||
2768 | + const char *domain; | ||
2769 | + | ||
2770 | + /* | ||
2771 | + * Use cached result. | ||
2772 | + */ | ||
2773 | + if (name) | ||
2774 | + return (name); | ||
2775 | + | ||
2776 | + /* | ||
2777 | + * If the local machine name is not in FQDN form, try to append the | ||
2778 | + * contents of $mydomain. Use a default domain as a final workaround. | ||
2779 | + */ | ||
2780 | + name = get_hostname(); | ||
2781 | + if ((dot = strchr(name, '.')) == 0) { | ||
2782 | + if ((domain = mail_conf_lookup_eval(VAR_MYDOMAIN)) == 0) | ||
2783 | + domain = DEF_MYDOMAIN; | ||
2784 | + name = concatenate(name, ".", domain, (char *) 0); | ||
2785 | + } | ||
2786 | + return (name); | ||
2787 | +} | ||
2788 | + | ||
2789 | +/* check_mydomainname - lookup domain name and validate */ | ||
2790 | + | ||
2791 | +static const char *check_mydomainname(void) | ||
2792 | +{ | ||
2793 | + char *dot; | ||
2794 | + | ||
2795 | + /* | ||
2796 | + * Use a default domain when the hostname is not a FQDN ("foo"). | ||
2797 | + */ | ||
2798 | + if ((dot = strchr(var_myhostname, '.')) == 0) | ||
2799 | + return (DEF_MYDOMAIN); | ||
2800 | + return (dot + 1); | ||
2801 | +} | ||
2802 | + | ||
2803 | +/* check_default_privs - lookup default user attributes and validate */ | ||
2804 | + | ||
2805 | +static void check_default_privs(void) | ||
2806 | +{ | ||
2807 | + struct passwd *pwd; | ||
2808 | + | ||
2809 | + if ((pwd = getpwnam(var_default_privs)) == 0) | ||
2810 | + msg_fatal("file %s/%s: parameter %s: unknown user name value: %s", | ||
2811 | + var_config_dir, MAIN_CONF_FILE, | ||
2812 | + VAR_DEFAULT_PRIVS, var_default_privs); | ||
2813 | + if ((var_default_uid = pwd->pw_uid) == 0) | ||
2814 | + msg_fatal("file %s/%s: parameter %s: user %s has privileged user ID", | ||
2815 | + var_config_dir, MAIN_CONF_FILE, | ||
2816 | + VAR_DEFAULT_PRIVS, var_default_privs); | ||
2817 | + if ((var_default_gid = pwd->pw_gid) == 0) | ||
2818 | + msg_fatal("file %s/%s: parameter %s: user %s has privileged group ID", | ||
2819 | + var_config_dir, MAIN_CONF_FILE, | ||
2820 | + VAR_DEFAULT_PRIVS, var_default_privs); | ||
2821 | +} | ||
2822 | + | ||
2823 | +/* check_mail_owner - lookup owner user attributes and validate */ | ||
2824 | + | ||
2825 | +static void check_mail_owner(void) | ||
2826 | +{ | ||
2827 | + struct passwd *pwd; | ||
2828 | + | ||
2829 | + if ((pwd = getpwnam(var_mail_owner)) == 0) | ||
2830 | + msg_fatal("file %s/%s: parameter %s: unknown user name value: %s", | ||
2831 | + var_config_dir, MAIN_CONF_FILE, | ||
2832 | + VAR_MAIL_OWNER, var_mail_owner); | ||
2833 | + if ((var_owner_uid = pwd->pw_uid) == 0) | ||
2834 | + msg_fatal("file %s/%s: parameter %s: user %s has privileged user ID", | ||
2835 | + var_config_dir, MAIN_CONF_FILE, | ||
2836 | + VAR_MAIL_OWNER, var_mail_owner); | ||
2837 | + if ((var_owner_gid = pwd->pw_gid) == 0) | ||
2838 | + msg_fatal("file %s/%s: parameter %s: user %s has privileged group ID", | ||
2839 | + var_config_dir, MAIN_CONF_FILE, | ||
2840 | + VAR_MAIL_OWNER, var_mail_owner); | ||
2841 | + | ||
2842 | + /* | ||
2843 | + * This detects only some forms of sharing. Enumerating the entire | ||
2844 | + * password file name space could be expensive. The purpose of this code | ||
2845 | + * is to discourage user ID sharing by developers and package | ||
2846 | + * maintainers. | ||
2847 | + */ | ||
2848 | + if ((pwd = getpwuid(var_owner_uid)) != 0 | ||
2849 | + && strcmp(pwd->pw_name, var_mail_owner) != 0) | ||
2850 | + msg_fatal("file %s/%s: parameter %s: user %s has same user ID as %s", | ||
2851 | + var_config_dir, MAIN_CONF_FILE, | ||
2852 | + VAR_MAIL_OWNER, var_mail_owner, pwd->pw_name); | ||
2853 | +} | ||
2854 | + | ||
2855 | +/* check_sgid_group - lookup setgid group attributes and validate */ | ||
2856 | + | ||
2857 | +static void check_sgid_group(void) | ||
2858 | +{ | ||
2859 | + struct group *grp; | ||
2860 | + | ||
2861 | + if ((grp = getgrnam(var_sgid_group)) == 0) | ||
2862 | + msg_fatal("file %s/%s: parameter %s: unknown group name: %s", | ||
2863 | + var_config_dir, MAIN_CONF_FILE, | ||
2864 | + VAR_SGID_GROUP, var_sgid_group); | ||
2865 | + if ((var_sgid_gid = grp->gr_gid) == 0) | ||
2866 | + msg_fatal("file %s/%s: parameter %s: group %s has privileged group ID", | ||
2867 | + var_config_dir, MAIN_CONF_FILE, | ||
2868 | + VAR_SGID_GROUP, var_sgid_group); | ||
2869 | + | ||
2870 | + /* | ||
2871 | + * This detects only some forms of sharing. Enumerating the entire group | ||
2872 | + * file name space could be expensive. The purpose of this code is to | ||
2873 | + * discourage group ID sharing by developers and package maintainers. | ||
2874 | + */ | ||
2875 | + if ((grp = getgrgid(var_sgid_gid)) != 0 | ||
2876 | + && strcmp(grp->gr_name, var_sgid_group) != 0) | ||
2877 | + msg_fatal("file %s/%s: parameter %s: group %s has same group ID as %s", | ||
2878 | + var_config_dir, MAIN_CONF_FILE, | ||
2879 | + VAR_SGID_GROUP, var_sgid_group, grp->gr_name); | ||
2880 | +} | ||
2881 | + | ||
2882 | +/* check_overlap - disallow UID or GID sharing */ | ||
2883 | + | ||
2884 | +static void check_overlap(void) | ||
2885 | +{ | ||
2886 | + if (strcmp(var_default_privs, var_mail_owner) == 0) | ||
2887 | + msg_fatal("file %s/%s: parameters %s and %s specify the same user %s", | ||
2888 | + var_config_dir, MAIN_CONF_FILE, | ||
2889 | + VAR_DEFAULT_PRIVS, VAR_MAIL_OWNER, | ||
2890 | + var_default_privs); | ||
2891 | + if (var_default_uid == var_owner_uid) | ||
2892 | + msg_fatal("file %s/%s: parameters %s and %s: users %s and %s have the same user ID: %ld", | ||
2893 | + var_config_dir, MAIN_CONF_FILE, | ||
2894 | + VAR_DEFAULT_PRIVS, VAR_MAIL_OWNER, | ||
2895 | + var_default_privs, var_mail_owner, | ||
2896 | + (long) var_owner_uid); | ||
2897 | + if (var_default_gid == var_owner_gid) | ||
2898 | + msg_fatal("file %s/%s: parameters %s and %s: users %s and %s have the same group ID: %ld", | ||
2899 | + var_config_dir, MAIN_CONF_FILE, | ||
2900 | + VAR_DEFAULT_PRIVS, VAR_MAIL_OWNER, | ||
2901 | + var_default_privs, var_mail_owner, | ||
2902 | + (long) var_owner_gid); | ||
2903 | + if (var_default_gid == var_sgid_gid) | ||
2904 | + msg_fatal("file %s/%s: parameters %s and %s: user %s and group %s have the same group ID: %ld", | ||
2905 | + var_config_dir, MAIN_CONF_FILE, | ||
2906 | + VAR_DEFAULT_PRIVS, VAR_SGID_GROUP, | ||
2907 | + var_default_privs, var_sgid_group, | ||
2908 | + (long) var_sgid_gid); | ||
2909 | + if (var_owner_gid == var_sgid_gid) | ||
2910 | + msg_fatal("file %s/%s: parameters %s and %s: user %s and group %s have the same group ID: %ld", | ||
2911 | + var_config_dir, MAIN_CONF_FILE, | ||
2912 | + VAR_MAIL_OWNER, VAR_SGID_GROUP, | ||
2913 | + var_mail_owner, var_sgid_group, | ||
2914 | + (long) var_sgid_gid); | ||
2915 | +} | ||
2916 | + | ||
2917 | +#ifdef MYORIGIN_FROM_FILE | ||
2918 | + | ||
2919 | +/* read_param_from_file - read parameter value from file */ | ||
2920 | + | ||
2921 | +static char *read_param_from_file(const char *path) | ||
2922 | +{ | ||
2923 | + VSTRING *why = vstring_alloc(100); | ||
2924 | + VSTRING *buf = vstring_alloc(100); | ||
2925 | + VSTREAM *fp; | ||
2926 | + char *bp; | ||
2927 | + char *result; | ||
2928 | + | ||
2929 | + /* | ||
2930 | + * Ugly macros to make complex expressions less unreadable. | ||
2931 | + */ | ||
2932 | +#define SKIP(start, var, cond) \ | ||
2933 | + for (var = start; *var && (cond); var++); | ||
2934 | + | ||
2935 | +#define TRIM(s) { \ | ||
2936 | + char *p; \ | ||
2937 | + for (p = (s) + strlen(s); p > (s) && ISSPACE(p[-1]); p--); \ | ||
2938 | + *p = 0; \ | ||
2939 | + } | ||
2940 | + | ||
2941 | + fp = safe_open(path, O_RDONLY, 0, (struct stat *) 0, -1, -1, why); | ||
2942 | + if (fp == 0) | ||
2943 | + msg_fatal("%s: %s", path, vstring_str(why)); | ||
2944 | + vstring_get_nonl(buf, fp); | ||
2945 | + if (vstream_ferror(fp)) /* FIX 20070501 */ | ||
2946 | + msg_fatal("%s: read error: %m", path); | ||
2947 | + vstream_fclose(fp); | ||
2948 | + SKIP(vstring_str(buf), bp, ISSPACE(*bp)); | ||
2949 | + TRIM(bp); | ||
2950 | + result = mystrdup(bp); | ||
2951 | + | ||
2952 | + vstring_free(why); | ||
2953 | + vstring_free(buf); | ||
2954 | + return (result); | ||
2955 | +} | ||
2956 | + | ||
2957 | +#endif | ||
2958 | + | ||
2959 | +/* mail_params_init - configure built-in parameters */ | ||
2960 | + | ||
2961 | +void mail_params_init() | ||
2962 | +{ | ||
2963 | + static const CONFIG_STR_TABLE first_str_defaults[] = { | ||
2964 | + VAR_SYSLOG_FACILITY, DEF_SYSLOG_FACILITY, &var_syslog_facility, 1, 0, | ||
2965 | + VAR_INET_PROTOCOLS, DEF_INET_PROTOCOLS, &var_inet_protocols, 1, 0, | ||
2966 | + VAR_MULTI_CONF_DIRS, DEF_MULTI_CONF_DIRS, &var_multi_conf_dirs, 0, 0, | ||
2967 | + VAR_MULTI_WRAPPER, DEF_MULTI_WRAPPER, &var_multi_wrapper, 0, 0, | ||
2968 | + VAR_MULTI_GROUP, DEF_MULTI_GROUP, &var_multi_group, 0, 0, | ||
2969 | + VAR_MULTI_NAME, DEF_MULTI_NAME, &var_multi_name, 0, 0, | ||
2970 | + 0, | ||
2971 | + }; | ||
2972 | + static const CONFIG_STR_FN_TABLE function_str_defaults[] = { | ||
2973 | + VAR_MYHOSTNAME, check_myhostname, &var_myhostname, 1, 0, | ||
2974 | + VAR_MYDOMAIN, check_mydomainname, &var_mydomain, 1, 0, | ||
2975 | + 0, | ||
2976 | + }; | ||
2977 | + static const CONFIG_STR_TABLE other_str_defaults[] = { | ||
2978 | + VAR_MAIL_NAME, DEF_MAIL_NAME, &var_mail_name, 1, 0, | ||
2979 | + VAR_SYSLOG_NAME, DEF_SYSLOG_NAME, &var_syslog_name, 1, 0, | ||
2980 | + VAR_MAIL_OWNER, DEF_MAIL_OWNER, &var_mail_owner, 1, 0, | ||
2981 | + VAR_SGID_GROUP, DEF_SGID_GROUP, &var_sgid_group, 1, 0, | ||
2982 | + VAR_MYDEST, DEF_MYDEST, &var_mydest, 0, 0, | ||
2983 | + VAR_MYORIGIN, DEF_MYORIGIN, &var_myorigin, 1, 0, | ||
2984 | + VAR_RELAYHOST, DEF_RELAYHOST, &var_relayhost, 0, 0, | ||
2985 | + VAR_DAEMON_DIR, DEF_DAEMON_DIR, &var_daemon_dir, 1, 0, | ||
2986 | + VAR_DATA_DIR, DEF_DATA_DIR, &var_data_dir, 1, 0, | ||
2987 | + VAR_COMMAND_DIR, DEF_COMMAND_DIR, &var_command_dir, 1, 0, | ||
2988 | + VAR_QUEUE_DIR, DEF_QUEUE_DIR, &var_queue_dir, 1, 0, | ||
2989 | + VAR_PID_DIR, DEF_PID_DIR, &var_pid_dir, 1, 0, | ||
2990 | + VAR_INET_INTERFACES, DEF_INET_INTERFACES, &var_inet_interfaces, 1, 0, | ||
2991 | + VAR_PROXY_INTERFACES, DEF_PROXY_INTERFACES, &var_proxy_interfaces, 0, 0, | ||
2992 | + VAR_DOUBLE_BOUNCE, DEF_DOUBLE_BOUNCE, &var_double_bounce_sender, 1, 0, | ||
2993 | + VAR_DEFAULT_PRIVS, DEF_DEFAULT_PRIVS, &var_default_privs, 1, 0, | ||
2994 | + VAR_ALIAS_DB_MAP, DEF_ALIAS_DB_MAP, &var_alias_db_map, 0, 0, | ||
2995 | + VAR_MAIL_RELEASE, DEF_MAIL_RELEASE, &var_mail_release, 1, 0, | ||
2996 | + VAR_MAIL_VERSION, DEF_MAIL_VERSION, &var_mail_version, 1, 0, | ||
2997 | + VAR_DB_TYPE, DEF_DB_TYPE, &var_db_type, 1, 0, | ||
2998 | + VAR_HASH_QUEUE_NAMES, DEF_HASH_QUEUE_NAMES, &var_hash_queue_names, 1, 0, | ||
2999 | + VAR_RCPT_DELIM, DEF_RCPT_DELIM, &var_rcpt_delim, 0, 1, | ||
3000 | + VAR_RELAY_DOMAINS, DEF_RELAY_DOMAINS, &var_relay_domains, 0, 0, | ||
3001 | + VAR_FFLUSH_DOMAINS, DEF_FFLUSH_DOMAINS, &var_fflush_domains, 0, 0, | ||
3002 | + VAR_EXPORT_ENVIRON, DEF_EXPORT_ENVIRON, &var_export_environ, 0, 0, | ||
3003 | + VAR_IMPORT_ENVIRON, DEF_IMPORT_ENVIRON, &var_import_environ, 0, 0, | ||
3004 | + VAR_MYNETWORKS_STYLE, DEF_MYNETWORKS_STYLE, &var_mynetworks_style, 1, 0, | ||
3005 | + VAR_DEBUG_PEER_LIST, DEF_DEBUG_PEER_LIST, &var_debug_peer_list, 0, 0, | ||
3006 | + VAR_VERP_DELIMS, DEF_VERP_DELIMS, &var_verp_delims, 2, 2, | ||
3007 | + VAR_VERP_FILTER, DEF_VERP_FILTER, &var_verp_filter, 1, 0, | ||
3008 | + VAR_PAR_DOM_MATCH, DEF_PAR_DOM_MATCH, &var_par_dom_match, 0, 0, | ||
3009 | + VAR_CONFIG_DIRS, DEF_CONFIG_DIRS, &var_config_dirs, 0, 0, | ||
3010 | + VAR_BOUNCE_SERVICE, DEF_BOUNCE_SERVICE, &var_bounce_service, 1, 0, | ||
3011 | + VAR_CLEANUP_SERVICE, DEF_CLEANUP_SERVICE, &var_cleanup_service, 1, 0, | ||
3012 | + VAR_DEFER_SERVICE, DEF_DEFER_SERVICE, &var_defer_service, 1, 0, | ||
3013 | + VAR_PICKUP_SERVICE, DEF_PICKUP_SERVICE, &var_pickup_service, 1, 0, | ||
3014 | + VAR_QUEUE_SERVICE, DEF_QUEUE_SERVICE, &var_queue_service, 1, 0, | ||
3015 | + VAR_REWRITE_SERVICE, DEF_REWRITE_SERVICE, &var_rewrite_service, 1, 0, | ||
3016 | + VAR_SHOWQ_SERVICE, DEF_SHOWQ_SERVICE, &var_showq_service, 1, 0, | ||
3017 | + VAR_ERROR_SERVICE, DEF_ERROR_SERVICE, &var_error_service, 1, 0, | ||
3018 | + VAR_FLUSH_SERVICE, DEF_FLUSH_SERVICE, &var_flush_service, 1, 0, | ||
3019 | + VAR_VERIFY_SERVICE, DEF_VERIFY_SERVICE, &var_verify_service, 1, 0, | ||
3020 | + VAR_TRACE_SERVICE, DEF_TRACE_SERVICE, &var_trace_service, 1, 0, | ||
3021 | + VAR_PROXYMAP_SERVICE, DEF_PROXYMAP_SERVICE, &var_proxymap_service, 1, 0, | ||
3022 | + VAR_PROXYWRITE_SERVICE, DEF_PROXYWRITE_SERVICE, &var_proxywrite_service, 1, 0, | ||
3023 | + VAR_INT_FILT_CLASSES, DEF_INT_FILT_CLASSES, &var_int_filt_classes, 0, 0, | ||
3024 | + 0, | ||
3025 | + }; | ||
3026 | + static const CONFIG_STR_FN_TABLE function_str_defaults_2[] = { | ||
3027 | + VAR_MYNETWORKS, mynetworks, &var_mynetworks, 0, 0, | ||
3028 | + 0, | ||
3029 | + }; | ||
3030 | + static const CONFIG_INT_TABLE other_int_defaults[] = { | ||
3031 | + VAR_MAX_USE, DEF_MAX_USE, &var_use_limit, 1, 0, | ||
3032 | + VAR_DONT_REMOVE, DEF_DONT_REMOVE, &var_dont_remove, 0, 0, | ||
3033 | + VAR_LINE_LIMIT, DEF_LINE_LIMIT, &var_line_limit, 512, 0, | ||
3034 | + VAR_MESSAGE_LIMIT, DEF_MESSAGE_LIMIT, &var_message_limit, 0, 0, | ||
3035 | + VAR_HASH_QUEUE_DEPTH, DEF_HASH_QUEUE_DEPTH, &var_hash_queue_depth, 1, 0, | ||
3036 | + VAR_FORK_TRIES, DEF_FORK_TRIES, &var_fork_tries, 1, 0, | ||
3037 | + VAR_FLOCK_TRIES, DEF_FLOCK_TRIES, &var_flock_tries, 1, 0, | ||
3038 | + VAR_DEBUG_PEER_LEVEL, DEF_DEBUG_PEER_LEVEL, &var_debug_peer_level, 1, 0, | ||
3039 | + VAR_FAULT_INJ_CODE, DEF_FAULT_INJ_CODE, &var_fault_inj_code, 0, 0, | ||
3040 | + VAR_DB_CREATE_BUF, DEF_DB_CREATE_BUF, &var_db_create_buf, 1, 0, | ||
3041 | + VAR_DB_READ_BUF, DEF_DB_READ_BUF, &var_db_read_buf, 1, 0, | ||
3042 | + VAR_HEADER_LIMIT, DEF_HEADER_LIMIT, &var_header_limit, 1, 0, | ||
3043 | + VAR_TOKEN_LIMIT, DEF_TOKEN_LIMIT, &var_token_limit, 1, 0, | ||
3044 | + VAR_MIME_MAXDEPTH, DEF_MIME_MAXDEPTH, &var_mime_maxdepth, 1, 0, | ||
3045 | + VAR_MIME_BOUND_LEN, DEF_MIME_BOUND_LEN, &var_mime_bound_len, 1, 0, | ||
3046 | + VAR_DELAY_MAX_RES, DEF_DELAY_MAX_RES, &var_delay_max_res, MIN_DELAY_MAX_RES, MAX_DELAY_MAX_RES, | ||
3047 | + VAR_INET_WINDOW, DEF_INET_WINDOW, &var_inet_windowsize, 0, 0, | ||
3048 | + 0, | ||
3049 | + }; | ||
3050 | + static const CONFIG_TIME_TABLE time_defaults[] = { | ||
3051 | + VAR_EVENT_DRAIN, DEF_EVENT_DRAIN, &var_event_drain, 1, 0, | ||
3052 | + VAR_MAX_IDLE, DEF_MAX_IDLE, &var_idle_limit, 1, 0, | ||
3053 | + VAR_IPC_TIMEOUT, DEF_IPC_TIMEOUT, &var_ipc_timeout, 1, 0, | ||
3054 | + VAR_IPC_IDLE, DEF_IPC_IDLE, &var_ipc_idle_limit, 1, 0, | ||
3055 | + VAR_IPC_TTL, DEF_IPC_TTL, &var_ipc_ttl_limit, 1, 0, | ||
3056 | + VAR_TRIGGER_TIMEOUT, DEF_TRIGGER_TIMEOUT, &var_trigger_timeout, 1, 0, | ||
3057 | + VAR_FORK_DELAY, DEF_FORK_DELAY, &var_fork_delay, 1, 0, | ||
3058 | + VAR_FLOCK_DELAY, DEF_FLOCK_DELAY, &var_flock_delay, 1, 0, | ||
3059 | + VAR_FLOCK_STALE, DEF_FLOCK_STALE, &var_flock_stale, 1, 0, | ||
3060 | + VAR_DAEMON_TIMEOUT, DEF_DAEMON_TIMEOUT, &var_daemon_timeout, 1, 0, | ||
3061 | + VAR_IN_FLOW_DELAY, DEF_IN_FLOW_DELAY, &var_in_flow_delay, 0, 10, | ||
3062 | + 0, | ||
3063 | + }; | ||
3064 | + static const CONFIG_BOOL_TABLE bool_defaults[] = { | ||
3065 | + VAR_DISABLE_DNS, DEF_DISABLE_DNS, &var_disable_dns, | ||
3066 | + VAR_SOFT_BOUNCE, DEF_SOFT_BOUNCE, &var_soft_bounce, | ||
3067 | + VAR_OWNREQ_SPECIAL, DEF_OWNREQ_SPECIAL, &var_ownreq_special, | ||
3068 | + VAR_STRICT_8BITMIME, DEF_STRICT_8BITMIME, &var_strict_8bitmime, | ||
3069 | + VAR_STRICT_7BIT_HDRS, DEF_STRICT_7BIT_HDRS, &var_strict_7bit_hdrs, | ||
3070 | + VAR_STRICT_8BIT_BODY, DEF_STRICT_8BIT_BODY, &var_strict_8bit_body, | ||
3071 | + VAR_STRICT_ENCODING, DEF_STRICT_ENCODING, &var_strict_encoding, | ||
3072 | + VAR_DISABLE_MIME_INPUT, DEF_DISABLE_MIME_INPUT, &var_disable_mime_input, | ||
3073 | + VAR_DISABLE_MIME_OCONV, DEF_DISABLE_MIME_OCONV, &var_disable_mime_oconv, | ||
3074 | + VAR_VERIFY_NEG_CACHE, DEF_VERIFY_NEG_CACHE, &var_verify_neg_cache, | ||
3075 | + VAR_OLDLOG_COMPAT, DEF_OLDLOG_COMPAT, &var_oldlog_compat, | ||
3076 | + VAR_HELPFUL_WARNINGS, DEF_HELPFUL_WARNINGS, &var_helpful_warnings, | ||
3077 | + VAR_CYRUS_SASL_AUTHZID, DEF_CYRUS_SASL_AUTHZID, &var_cyrus_sasl_authzid, | ||
3078 | + VAR_MULTI_ENABLE, DEF_MULTI_ENABLE, &var_multi_enable, | ||
3079 | + 0, | ||
3080 | + }; | ||
3081 | + const char *cp; | ||
3082 | + INET_PROTO_INFO *proto_info; | ||
3083 | + | ||
3084 | + /* | ||
3085 | + * Extract syslog_facility early, so that from here on all errors are | ||
3086 | + * logged with the proper facility. | ||
3087 | + */ | ||
3088 | + get_mail_conf_str_table(first_str_defaults); | ||
3089 | + | ||
3090 | + if (!msg_syslog_facility(var_syslog_facility)) | ||
3091 | + msg_fatal("file %s/%s: parameter %s: unrecognized value: %s", | ||
3092 | + var_config_dir, MAIN_CONF_FILE, | ||
3093 | + VAR_SYSLOG_FACILITY, var_syslog_facility); | ||
3094 | + | ||
3095 | + /* | ||
3096 | + * What protocols should we attempt to support? The result is stored in | ||
3097 | + * the global inet_proto_table variable. | ||
3098 | + */ | ||
3099 | + proto_info = inet_proto_init(VAR_INET_PROTOCOLS, var_inet_protocols); | ||
3100 | + | ||
3101 | + /* | ||
3102 | + * Variables whose defaults are determined at runtime. Some sites use | ||
3103 | + * short hostnames in the host table; some sites name their system after | ||
3104 | + * the domain. | ||
3105 | + */ | ||
3106 | + get_mail_conf_str_fn_table(function_str_defaults); | ||
3107 | + if (!valid_hostname(var_myhostname, DO_GRIPE)) | ||
3108 | + msg_fatal("file %s/%s: parameter %s: bad parameter value: %s", | ||
3109 | + var_config_dir, MAIN_CONF_FILE, | ||
3110 | + VAR_MYHOSTNAME, var_myhostname); | ||
3111 | + if (!valid_hostname(var_mydomain, DO_GRIPE)) | ||
3112 | + msg_fatal("file %s/%s: parameter %s: bad parameter value: %s", | ||
3113 | + var_config_dir, MAIN_CONF_FILE, | ||
3114 | + VAR_MYDOMAIN, var_mydomain); | ||
3115 | + | ||
3116 | + /* | ||
3117 | + * Variables that are needed by almost every program. | ||
3118 | + * | ||
3119 | + * XXX Reading the myorigin value from file is originally a Debian Linux | ||
3120 | + * feature. This code is not enabled by default because of problems: 1) | ||
3121 | + * it re-implements its own parameter syntax checks, and 2) it does not | ||
3122 | + * implement $name expansions. | ||
3123 | + */ | ||
3124 | + get_mail_conf_str_table(other_str_defaults); | ||
3125 | +#ifdef MYORIGIN_FROM_FILE | ||
3126 | + if (*var_myorigin == '/') { | ||
3127 | + char *origin = read_param_from_file(var_myorigin); | ||
3128 | + | ||
3129 | + if (*origin == 0) | ||
3130 | + msg_fatal("%s file %s is empty", VAR_MYORIGIN, var_myorigin); | ||
3131 | + myfree(var_myorigin); /* FIX 20070501 */ | ||
3132 | + var_myorigin = origin; | ||
3133 | + } | ||
3134 | +#endif | ||
3135 | + get_mail_conf_int_table(other_int_defaults); | ||
3136 | + get_mail_conf_bool_table(bool_defaults); | ||
3137 | + get_mail_conf_time_table(time_defaults); | ||
3138 | + check_default_privs(); | ||
3139 | + check_mail_owner(); | ||
3140 | + check_sgid_group(); | ||
3141 | + check_overlap(); | ||
3142 | +#ifdef HAS_DB | ||
3143 | + dict_db_cache_size = var_db_read_buf; | ||
3144 | +#endif | ||
3145 | + inet_windowsize = var_inet_windowsize; | ||
3146 | + | ||
3147 | + /* | ||
3148 | + * Variables whose defaults are determined at runtime, after other | ||
3149 | + * variables have been set. This dependency is admittedly a bit tricky. | ||
3150 | + * XXX Perhaps we should just register variables, and let the evaluator | ||
3151 | + * figure out in what order to evaluate things. | ||
3152 | + */ | ||
3153 | + get_mail_conf_str_fn_table(function_str_defaults_2); | ||
3154 | + | ||
3155 | + /* | ||
3156 | + * FIX 200412 The IPv6 patch did not call own_inet_addr_list() before | ||
3157 | + * entering the chroot jail on Linux IPv6 systems. Linux has the IPv6 | ||
3158 | + * interface list in /proc, which is not available after chrooting. | ||
3159 | + */ | ||
3160 | + (void) own_inet_addr_list(); | ||
3161 | + | ||
3162 | + /* | ||
3163 | + * The PID variable cannot be set from the configuration file!! | ||
3164 | + */ | ||
3165 | + set_mail_conf_int(VAR_PID, var_pid = getpid()); | ||
3166 | + | ||
3167 | + /* | ||
3168 | + * Neither can the start time variable. It isn't even visible. | ||
3169 | + */ | ||
3170 | + time(&var_starttime); | ||
3171 | + | ||
3172 | + /* | ||
3173 | + * Export the syslog name so children can inherit and use it before they | ||
3174 | + * have initialized. | ||
3175 | + */ | ||
3176 | + if ((cp = safe_getenv(CONF_ENV_LOGTAG)) == 0 | ||
3177 | + || strcmp(cp, var_syslog_name) != 0) | ||
3178 | + if (setenv(CONF_ENV_LOGTAG, var_syslog_name, 1) < 0) | ||
3179 | + msg_fatal("setenv %s %s: %m", CONF_ENV_LOGTAG, var_syslog_name); | ||
3180 | + | ||
3181 | + /* | ||
3182 | + * I have seen this happen just too often. | ||
3183 | + */ | ||
3184 | + if (strcasecmp(var_myhostname, var_relayhost) == 0) | ||
3185 | + msg_fatal("%s and %s parameter settings must not be identical: %s", | ||
3186 | + VAR_MYHOSTNAME, VAR_RELAYHOST, var_myhostname); | ||
3187 | + | ||
3188 | + /* | ||
3189 | + * XXX These should be caught by a proper parameter parsing algorithm. | ||
3190 | + */ | ||
3191 | + if (var_myorigin[strcspn(var_myorigin, ", \t\r\n")]) | ||
3192 | + msg_fatal("%s parameter setting must not contain multiple values: %s", | ||
3193 | + VAR_MYORIGIN, var_myorigin); | ||
3194 | + | ||
3195 | + if (var_relayhost[strcspn(var_relayhost, ", \t\r\n")]) | ||
3196 | + msg_fatal("%s parameter setting must not contain multiple values: %s", | ||
3197 | + VAR_RELAYHOST, var_relayhost); | ||
3198 | + | ||
3199 | + /* | ||
3200 | + * One more sanity check. | ||
3201 | + */ | ||
3202 | + if ((cp = verp_delims_verify(var_verp_delims)) != 0) | ||
3203 | + msg_fatal("file %s/%s: parameters %s and %s: %s", | ||
3204 | + var_config_dir, MAIN_CONF_FILE, | ||
3205 | + VAR_VERP_DELIMS, VAR_VERP_FILTER, cp); | ||
3206 | +} | ||
3207 | diff -ruN a/src/global/mkmap_open.c b/src/global/mkmap_open.c | ||
3208 | --- a/src/global/mkmap_open.c 2009-06-01 12:27:44.000000000 +0000 | ||
3209 | +++ b/src/global/mkmap_open.c 2009-06-01 13:08:26.000000000 +0000 | ||
3210 | @@ -81,7 +81,7 @@ | ||
3211 | * We use a different table (in dict_open.c) when querying maps. | ||
3212 | */ | ||
3213 | typedef struct { | ||
3214 | - char *type; | ||
3215 | + const char *type; | ||
3216 | MKMAP *(*before_open) (const char *); | ||
3217 | } MKMAP_OPEN_INFO; | ||
3218 | |||
3219 | @@ -156,7 +156,16 @@ | ||
3220 | */ | ||
3221 | for (mp = mkmap_types; /* void */ ; mp++) { | ||
3222 | if (mp->type == 0) | ||
3223 | +#ifndef NO_DYNAMIC_MAPS | ||
3224 | + { | ||
3225 | + static MKMAP_OPEN_INFO oi; | ||
3226 | + oi.before_open=(MKMAP*(*)(const char*))dict_mkmap_func(type); | ||
3227 | + oi.type=type; | ||
3228 | + mp=&oi; | ||
3229 | + } | ||
3230 | +#else | ||
3231 | msg_fatal("unsupported map type: %s", type); | ||
3232 | +#endif | ||
3233 | if (strcmp(type, mp->type) == 0) | ||
3234 | break; | ||
3235 | } | ||
3236 | diff -ruN a/src/master/Makefile.in b/src/master/Makefile.in | ||
3237 | --- a/src/master/Makefile.in 2009-06-01 12:27:44.000000000 +0000 | ||
3238 | +++ b/src/master/Makefile.in 2009-06-01 13:08:26.000000000 +0000 | ||
3239 | @@ -20,7 +20,7 @@ | ||
3240 | INC_DIR = ../../include | ||
3241 | BIN_DIR = ../../libexec | ||
3242 | |||
3243 | -.c.o:; $(CC) $(CFLAGS) -c $*.c | ||
3244 | +.c.o:; $(CC) `for i in $(LIB_OBJ); do [ $$i = $@ ] && echo -fPIC; done` $(CFLAGS) -c $*.c | ||
3245 | |||
3246 | all: $(PROG) $(LIB) | ||
3247 | |||
3248 | @@ -39,12 +39,10 @@ | ||
3249 | root_tests: | ||
3250 | |||
3251 | $(LIB): $(LIB_OBJ) | ||
3252 | - $(AR) $(ARFL) $(LIB) $? | ||
3253 | - $(RANLIB) $(LIB) | ||
3254 | + gcc -shared -Wl,-soname,libpostfix-master.so.1 -o $(LIB) $(LIB_OBJ) $(LIBS) $(SYSLIBS) | ||
3255 | |||
3256 | $(LIB_DIR)/$(LIB): $(LIB) | ||
3257 | cp $(LIB) $(LIB_DIR)/$(LIB) | ||
3258 | - $(RANLIB) $(LIB_DIR)/$(LIB) | ||
3259 | |||
3260 | $(BIN_DIR)/$(PROG): $(PROG) | ||
3261 | cp $(PROG) $(BIN_DIR) | ||
3262 | diff -ruN a/src/milter/Makefile.in b/src/milter/Makefile.in | ||
3263 | --- a/src/milter/Makefile.in 2009-06-01 12:27:45.000000000 +0000 | ||
3264 | +++ b/src/milter/Makefile.in 2009-06-01 13:08:26.000000000 +0000 | ||
3265 | @@ -14,7 +14,7 @@ | ||
3266 | INC_DIR = ../../include | ||
3267 | MAKES = | ||
3268 | |||
3269 | -.c.o:; $(CC) $(CFLAGS) -c $*.c | ||
3270 | +.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c | ||
3271 | |||
3272 | all: $(LIB) | ||
3273 | |||
3274 | @@ -30,12 +30,10 @@ | ||
3275 | root_tests: | ||
3276 | |||
3277 | $(LIB): $(OBJS) | ||
3278 | - $(AR) $(ARFL) $(LIB) $? | ||
3279 | - $(RANLIB) $(LIB) | ||
3280 | + gcc -shared -Wl,-soname,libpostfix-milter.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) | ||
3281 | |||
3282 | $(LIB_DIR)/$(LIB): $(LIB) | ||
3283 | cp $(LIB) $(LIB_DIR) | ||
3284 | - $(RANLIB) $(LIB_DIR)/$(LIB) | ||
3285 | |||
3286 | update: $(LIB_DIR)/$(LIB) $(HDRS) | ||
3287 | -for i in $(HDRS); \ | ||
3288 | diff -ruN a/src/postconf/postconf.c b/src/postconf/postconf.c | ||
3289 | --- a/src/postconf/postconf.c 2009-06-01 12:27:45.000000000 +0000 | ||
3290 | +++ b/src/postconf/postconf.c 2009-06-01 13:08:26.000000000 +0000 | ||
3291 | @@ -962,6 +962,16 @@ | ||
3292 | { | ||
3293 | ARGV *maps_argv; | ||
3294 | int i; | ||
3295 | +#ifndef NO_DYNAMIC_MAPS | ||
3296 | + char *path; | ||
3297 | + char *config_dir; | ||
3298 | + | ||
3299 | + var_config_dir = mystrdup((config_dir = safe_getenv(CONF_ENV_PATH)) != 0 ? | ||
3300 | + config_dir : DEF_CONFIG_DIR); /* XXX */ | ||
3301 | + path = concatenate(var_config_dir, "/", "dynamicmaps.cf", (char *) 0); | ||
3302 | + dict_open_dlinfo(path); | ||
3303 | + myfree(path); | ||
3304 | +#endif | ||
3305 | |||
3306 | maps_argv = dict_mapnames(); | ||
3307 | for (i = 0; i < maps_argv->argc; i++) | ||
3308 | diff -ruN a/src/postconf/postconf.c.orig b/src/postconf/postconf.c.orig | ||
3309 | --- a/src/postconf/postconf.c.orig 1970-01-01 00:00:00.000000000 +0000 | ||
3310 | +++ b/src/postconf/postconf.c.orig 2009-06-01 13:07:57.000000000 +0000 | ||
3311 | @@ -0,0 +1,1218 @@ | ||
3312 | +/*++ | ||
3313 | +/* NAME | ||
3314 | +/* postconf 1 | ||
3315 | +/* SUMMARY | ||
3316 | +/* Postfix configuration utility | ||
3317 | +/* SYNOPSIS | ||
3318 | +/* .fi | ||
3319 | +/* \fBpostconf\fR [\fB-dhnv\fR] [\fB-c \fIconfig_dir\fR] | ||
3320 | +/* [\fIparameter ...\fR] | ||
3321 | +/* | ||
3322 | +/* \fBpostconf\fR [\fB-aAmlv\fR] [\fB-c \fIconfig_dir\fR] | ||
3323 | +/* | ||
3324 | +/* \fBpostconf\fR [\fB-ev\fR] [\fB-c \fIconfig_dir\fR] | ||
3325 | +/* [\fIparameter=value ...\fR] | ||
3326 | +/* | ||
3327 | +/* \fBpostconf\fR [\fB-#v\fR] [\fB-c \fIconfig_dir\fR] | ||
3328 | +/* [\fIparameter ...\fR] | ||
3329 | +/* | ||
3330 | +/* \fBpostconf\fR [\fB-btv\fR] [\fB-c \fIconfig_dir\fR] [\fItemplate_file\fR] | ||
3331 | +/* DESCRIPTION | ||
3332 | +/* The \fBpostconf\fR(1) command displays the actual values | ||
3333 | +/* of configuration parameters, changes configuration parameter | ||
3334 | +/* values, or displays other configuration information about | ||
3335 | +/* the Postfix mail system. | ||
3336 | +/* | ||
3337 | +/* Options: | ||
3338 | +/* .IP \fB-a\fR | ||
3339 | +/* List the available SASL server plug-in types. The SASL | ||
3340 | +/* plug-in type is selected with the \fBsmtpd_sasl_type\fR | ||
3341 | +/* configuration parameter by specifying one of the names | ||
3342 | +/* listed below. | ||
3343 | +/* .RS | ||
3344 | +/* .IP \fBcyrus\fR | ||
3345 | +/* This server plug-in is available when Postfix is built with | ||
3346 | +/* Cyrus SASL support. | ||
3347 | +/* .IP \fBdovecot\fR | ||
3348 | +/* This server plug-in uses the Dovecot authentication server, | ||
3349 | +/* and is available when Postfix is built with any form of SASL | ||
3350 | +/* support. | ||
3351 | +/* .RE | ||
3352 | +/* .IP | ||
3353 | +/* This feature is available with Postfix 2.3 and later. | ||
3354 | +/* .IP \fB-A\fR | ||
3355 | +/* List the available SASL client plug-in types. The SASL | ||
3356 | +/* plug-in type is selected with the \fBsmtp_sasl_type\fR or | ||
3357 | +/* \fBlmtp_sasl_type\fR configuration parameters by specifying | ||
3358 | +/* one of the names listed below. | ||
3359 | +/* .RS | ||
3360 | +/* .IP \fBcyrus\fR | ||
3361 | +/* This client plug-in is available when Postfix is built with | ||
3362 | +/* Cyrus SASL support. | ||
3363 | +/* .RE | ||
3364 | +/* .IP | ||
3365 | +/* This feature is available with Postfix 2.3 and later. | ||
3366 | +/* .IP "\fB-b\fR [\fItemplate_file\fR]" | ||
3367 | +/* Display the message text that appears at the beginning of | ||
3368 | +/* delivery status notification (DSN) messages, with $\fBname\fR | ||
3369 | +/* expressions replaced by actual values. To override the | ||
3370 | +/* built-in message text, specify a template file at the end | ||
3371 | +/* of the command line, or specify a template file in main.cf | ||
3372 | +/* with the \fBbounce_template_file\fR parameter. | ||
3373 | +/* To force selection of the built-in message text templates, | ||
3374 | +/* specify an empty template file name (in shell language: ""). | ||
3375 | +/* | ||
3376 | +/* This feature is available with Postfix 2.3 and later. | ||
3377 | +/* .IP "\fB-c \fIconfig_dir\fR" | ||
3378 | +/* The \fBmain.cf\fR configuration file is in the named directory | ||
3379 | +/* instead of the default configuration directory. | ||
3380 | +/* .IP \fB-d\fR | ||
3381 | +/* Print default parameter settings instead of actual settings. | ||
3382 | +/* .IP \fB-e\fR | ||
3383 | +/* Edit the \fBmain.cf\fR configuration file. The file is copied | ||
3384 | +/* to a temporary file then renamed into place. Parameters and | ||
3385 | +/* values are specified on the command line. Use quotes in order | ||
3386 | +/* to protect shell metacharacters and whitespace. | ||
3387 | +/* .IP \fB-h\fR | ||
3388 | +/* Show parameter values only, not the ``name = '' label | ||
3389 | +/* that normally precedes the value. | ||
3390 | +/* .IP \fB-l\fR | ||
3391 | +/* List the names of all supported mailbox locking methods. | ||
3392 | +/* Postfix supports the following methods: | ||
3393 | +/* .RS | ||
3394 | +/* .IP \fBflock\fR | ||
3395 | +/* A kernel-based advisory locking method for local files only. | ||
3396 | +/* This locking method is available on systems with a BSD | ||
3397 | +/* compatible library. | ||
3398 | +/* .IP \fBfcntl\fR | ||
3399 | +/* A kernel-based advisory locking method for local and remote files. | ||
3400 | +/* .IP \fBdotlock\fR | ||
3401 | +/* An application-level locking method. An application locks a file | ||
3402 | +/* named \fIfilename\fR by creating a file named \fIfilename\fB.lock\fR. | ||
3403 | +/* The application is expected to remove its own lock file, as well as | ||
3404 | +/* stale lock files that were left behind after abnormal termination. | ||
3405 | +/* .RE | ||
3406 | +/* .IP \fB-m\fR | ||
3407 | +/* List the names of all supported lookup table types. In Postfix | ||
3408 | +/* configuration files, | ||
3409 | +/* lookup tables are specified as \fItype\fB:\fIname\fR, where | ||
3410 | +/* \fItype\fR is one of the types listed below. The table \fIname\fR | ||
3411 | +/* syntax depends on the lookup table type as described in the | ||
3412 | +/* DATABASE_README document. | ||
3413 | +/* .RS | ||
3414 | +/* .IP \fBbtree\fR | ||
3415 | +/* A sorted, balanced tree structure. | ||
3416 | +/* This is available on systems with support for Berkeley DB | ||
3417 | +/* databases. | ||
3418 | +/* .IP \fBcdb\fR | ||
3419 | +/* A read-optimized structure with no support for incremental updates. | ||
3420 | +/* This is available on systems with support for CDB databases. | ||
3421 | +/* .IP \fBcidr\fR | ||
3422 | +/* A table that associates values with Classless Inter-Domain Routing | ||
3423 | +/* (CIDR) patterns. This is described in \fBcidr_table\fR(5). | ||
3424 | +/* .IP \fBdbm\fR | ||
3425 | +/* An indexed file type based on hashing. | ||
3426 | +/* This is available on systems with support for DBM databases. | ||
3427 | +/* .IP \fBenviron\fR | ||
3428 | +/* The UNIX process environment array. The lookup key is the variable | ||
3429 | +/* name. Originally implemented for testing, someone may find this | ||
3430 | +/* useful someday. | ||
3431 | +/* .IP \fBhash\fR | ||
3432 | +/* An indexed file type based on hashing. | ||
3433 | +/* This is available on systems with support for Berkeley DB | ||
3434 | +/* databases. | ||
3435 | +/* .IP "\fBldap\fR (read-only)" | ||
3436 | +/* Perform lookups using the LDAP protocol. This is described | ||
3437 | +/* in \fBldap_table\fR(5). | ||
3438 | +/* .IP "\fBmysql\fR (read-only)" | ||
3439 | +/* Perform lookups using the MYSQL protocol. This is described | ||
3440 | +/* in \fBmysql_table\fR(5). | ||
3441 | +/* .IP "\fBpcre\fR (read-only)" | ||
3442 | +/* A lookup table based on Perl Compatible Regular Expressions. The | ||
3443 | +/* file format is described in \fBpcre_table\fR(5). | ||
3444 | +/* .IP "\fBpgsql\fR (read-only)" | ||
3445 | +/* Perform lookups using the PostgreSQL protocol. This is described | ||
3446 | +/* in \fBpgsql_table\fR(5). | ||
3447 | +/* .IP "\fBproxy\fR (read-only)" | ||
3448 | +/* A lookup table that is implemented via the Postfix | ||
3449 | +/* \fBproxymap\fR(8) service. The table name syntax is | ||
3450 | +/* \fItype\fB:\fIname\fR. | ||
3451 | +/* .IP "\fBregexp\fR (read-only)" | ||
3452 | +/* A lookup table based on regular expressions. The file format is | ||
3453 | +/* described in \fBregexp_table\fR(5). | ||
3454 | +/* .IP \fBsdbm\fR | ||
3455 | +/* An indexed file type based on hashing. | ||
3456 | +/* This is available on systems with support for SDBM databases. | ||
3457 | +/* .IP "\fBstatic\fR (read-only)" | ||
3458 | +/* A table that always returns its name as lookup result. For example, | ||
3459 | +/* \fBstatic:foobar\fR always returns the string \fBfoobar\fR as lookup | ||
3460 | +/* result. | ||
3461 | +/* .IP "\fBtcp\fR (read-only)" | ||
3462 | +/* Perform lookups using a simple request-reply protocol that is | ||
3463 | +/* described in \fBtcp_table\fR(5). | ||
3464 | +/* This feature is not included with the stable Postfix release. | ||
3465 | +/* .IP "\fBunix\fR (read-only)" | ||
3466 | +/* A limited way to query the UNIX authentication database. The | ||
3467 | +/* following tables are implemented: | ||
3468 | +/* .RS | ||
3469 | +/*. IP \fBunix:passwd.byname\fR | ||
3470 | +/* The table is the UNIX password database. The key is a login name. | ||
3471 | +/* The result is a password file entry in \fBpasswd\fR(5) format. | ||
3472 | +/* .IP \fBunix:group.byname\fR | ||
3473 | +/* The table is the UNIX group database. The key is a group name. | ||
3474 | +/* The result is a group file entry in \fBgroup\fR(5) format. | ||
3475 | +/* .RE | ||
3476 | +/* .RE | ||
3477 | +/* .IP | ||
3478 | +/* Other table types may exist depending on how Postfix was built. | ||
3479 | +/* .IP \fB-n\fR | ||
3480 | +/* Print parameter settings that are not left at their built-in | ||
3481 | +/* default value, because they are explicitly specified in main.cf. | ||
3482 | +/* .IP "\fB-t\fR [\fItemplate_file\fR]" | ||
3483 | +/* Display the templates for delivery status notification (DSN) | ||
3484 | +/* messages. To override the built-in templates, specify a | ||
3485 | +/* template file at the end of the command line, or specify a | ||
3486 | +/* template file in main.cf with the \fBbounce_template_file\fR | ||
3487 | +/* parameter. To force selection of the built-in templates, | ||
3488 | +/* specify an empty template file name (in shell language: | ||
3489 | +/* ""). | ||
3490 | +/* | ||
3491 | +/* This feature is available with Postfix 2.3 and later. | ||
3492 | +/* .IP \fB-v\fR | ||
3493 | +/* Enable verbose logging for debugging purposes. Multiple \fB-v\fR | ||
3494 | +/* options make the software increasingly verbose. | ||
3495 | +/* .IP \fB-#\fR | ||
3496 | +/* Edit the \fBmain.cf\fR configuration file. The file is copied | ||
3497 | +/* to a temporary file then renamed into place. The parameters | ||
3498 | +/* specified on the command line are commented-out, so that they | ||
3499 | +/* revert to their default values. Specify a list of parameter | ||
3500 | +/* names, not name=value pairs. There is no \fBpostconf\fR command | ||
3501 | +/* to perform the reverse operation. | ||
3502 | +/* | ||
3503 | +/* This feature is available with Postfix 2.6 and later. | ||
3504 | +/* DIAGNOSTICS | ||
3505 | +/* Problems are reported to the standard error stream. | ||
3506 | +/* ENVIRONMENT | ||
3507 | +/* .ad | ||
3508 | +/* .fi | ||
3509 | +/* .IP \fBMAIL_CONFIG\fR | ||
3510 | +/* Directory with Postfix configuration files. | ||
3511 | +/* CONFIGURATION PARAMETERS | ||
3512 | +/* .ad | ||
3513 | +/* .fi | ||
3514 | +/* The following \fBmain.cf\fR parameters are especially relevant to | ||
3515 | +/* this program. | ||
3516 | +/* | ||
3517 | +/* The text below provides only a parameter summary. See | ||
3518 | +/* \fBpostconf\fR(5) for more details including examples. | ||
3519 | +/* .IP "\fBconfig_directory (see 'postconf -d' output)\fR" | ||
3520 | +/* The default location of the Postfix main.cf and master.cf | ||
3521 | +/* configuration files. | ||
3522 | +/* .IP "\fBbounce_template_file (empty)\fR" | ||
3523 | +/* Pathname of a configuration file with bounce message templates. | ||
3524 | +/* FILES | ||
3525 | +/* /etc/postfix/main.cf, Postfix configuration parameters | ||
3526 | +/* SEE ALSO | ||
3527 | +/* bounce(5), bounce template file format | ||
3528 | +/* postconf(5), configuration parameters | ||
3529 | +/* README FILES | ||
3530 | +/* .ad | ||
3531 | +/* .fi | ||
3532 | +/* Use "\fBpostconf readme_directory\fR" or | ||
3533 | +/* "\fBpostconf html_directory\fR" to locate this information. | ||
3534 | +/* .na | ||
3535 | +/* .nf | ||
3536 | +/* DATABASE_README, Postfix lookup table overview | ||
3537 | +/* LICENSE | ||
3538 | +/* .ad | ||
3539 | +/* .fi | ||
3540 | +/* The Secure Mailer license must be distributed with this software. | ||
3541 | +/* AUTHOR(S) | ||
3542 | +/* Wietse Venema | ||
3543 | +/* IBM T.J. Watson Research | ||
3544 | +/* P.O. Box 704 | ||
3545 | +/* Yorktown Heights, NY 10598, USA | ||
3546 | +/*--*/ | ||
3547 | + | ||
3548 | +/* System library. */ | ||
3549 | + | ||
3550 | +#include <sys_defs.h> | ||
3551 | +#include <sys/stat.h> | ||
3552 | +#include <stdio.h> /* rename() */ | ||
3553 | +#include <pwd.h> | ||
3554 | +#include <string.h> | ||
3555 | +#include <stdlib.h> | ||
3556 | +#include <unistd.h> | ||
3557 | +#include <ctype.h> | ||
3558 | + | ||
3559 | +#ifdef USE_PATHS_H | ||
3560 | +#include <paths.h> | ||
3561 | +#endif | ||
3562 | + | ||
3563 | +/* Utility library. */ | ||
3564 | + | ||
3565 | +#include <msg.h> | ||
3566 | +#include <vstream.h> | ||
3567 | +#include <msg_vstream.h> | ||
3568 | +#include <get_hostname.h> | ||
3569 | +#include <stringops.h> | ||
3570 | +#include <htable.h> | ||
3571 | +#include <dict.h> | ||
3572 | +#include <safe.h> | ||
3573 | +#include <mymalloc.h> | ||
3574 | +#include <argv.h> | ||
3575 | +#include <split_at.h> | ||
3576 | +#include <vstring_vstream.h> | ||
3577 | +#include <myflock.h> | ||
3578 | +#include <inet_proto.h> | ||
3579 | +#include <argv.h> | ||
3580 | +#include <edit_file.h> | ||
3581 | + | ||
3582 | +/* Global library. */ | ||
3583 | + | ||
3584 | +#include <mynetworks.h> | ||
3585 | +#include <mail_conf.h> | ||
3586 | +#include <mail_dict.h> | ||
3587 | +#include <mail_proto.h> | ||
3588 | +#include <mail_version.h> | ||
3589 | +#include <mail_params.h> | ||
3590 | +#include <mail_addr.h> | ||
3591 | +#include <mbox_conf.h> | ||
3592 | +#include <mail_run.h> | ||
3593 | + | ||
3594 | +/* XSASL library. */ | ||
3595 | + | ||
3596 | +#include <xsasl.h> | ||
3597 | + | ||
3598 | + /* | ||
3599 | + * What we're supposed to be doing. | ||
3600 | + */ | ||
3601 | +#define SHOW_NONDEF (1<<0) /* show non-default settings */ | ||
3602 | +#define SHOW_DEFS (1<<1) /* show default setting */ | ||
3603 | +#define SHOW_NAME (1<<2) /* show parameter name */ | ||
3604 | +#define SHOW_MAPS (1<<3) /* show map types */ | ||
3605 | +#define EDIT_MAIN (1<<4) /* edit main.cf */ | ||
3606 | +#define SHOW_LOCKS (1<<5) /* show mailbox lock methods */ | ||
3607 | +#define SHOW_EVAL (1<<6) /* expand right-hand sides */ | ||
3608 | +#define SHOW_SASL_SERV (1<<7) /* show server auth plugin types */ | ||
3609 | +#define SHOW_SASL_CLNT (1<<8) /* show client auth plugin types */ | ||
3610 | +#define COMMENT_OUT (1<<9) /* #-out selected main.cf entries */ | ||
3611 | + | ||
3612 | + /* | ||
3613 | + * Lookup table for in-core parameter info. | ||
3614 | + */ | ||
3615 | +HTABLE *param_table; | ||
3616 | + | ||
3617 | + /* | ||
3618 | + * Lookup table for external parameter info. | ||
3619 | + */ | ||
3620 | +DICT *text_table; | ||
3621 | + | ||
3622 | + /* | ||
3623 | + * Declarations generated by scanning actual C source files. | ||
3624 | + */ | ||
3625 | +#include "time_vars.h" | ||
3626 | +#include "bool_vars.h" | ||
3627 | +#include "int_vars.h" | ||
3628 | +#include "str_vars.h" | ||
3629 | +#include "raw_vars.h" | ||
3630 | +#include "nint_vars.h" | ||
3631 | + | ||
3632 | + /* | ||
3633 | + * Manually extracted. | ||
3634 | + */ | ||
3635 | +#include "auto_vars.h" | ||
3636 | +#include "install_vars.h" | ||
3637 | + | ||
3638 | + /* | ||
3639 | + * Lookup tables generated by scanning actual C source files. | ||
3640 | + */ | ||
3641 | +static const CONFIG_TIME_TABLE time_table[] = { | ||
3642 | +#include "time_table.h" | ||
3643 | + 0, | ||
3644 | +}; | ||
3645 | + | ||
3646 | +static const CONFIG_BOOL_TABLE bool_table[] = { | ||
3647 | +#include "bool_table.h" | ||
3648 | + 0, | ||
3649 | +}; | ||
3650 | + | ||
3651 | +static const CONFIG_INT_TABLE int_table[] = { | ||
3652 | +#include "int_table.h" | ||
3653 | + 0, | ||
3654 | +}; | ||
3655 | + | ||
3656 | +static const CONFIG_STR_TABLE str_table[] = { | ||
3657 | +#include "str_table.h" | ||
3658 | +#include "auto_table.h" /* XXX */ | ||
3659 | +#include "install_table.h" | ||
3660 | + 0, | ||
3661 | +}; | ||
3662 | + | ||
3663 | +static const CONFIG_RAW_TABLE raw_table[] = { | ||
3664 | +#include "raw_table.h" | ||
3665 | + 0, | ||
3666 | +}; | ||
3667 | + | ||
3668 | +static const CONFIG_NINT_TABLE nint_table[] = { | ||
3669 | +#include "nint_table.h" | ||
3670 | + 0, | ||
3671 | +}; | ||
3672 | + | ||
3673 | + /* | ||
3674 | + * Parameters with default values obtained via function calls. | ||
3675 | + */ | ||
3676 | +char *var_myhostname; | ||
3677 | +char *var_mydomain; | ||
3678 | +char *var_mynetworks; | ||
3679 | + | ||
3680 | +static const char *check_myhostname(void); | ||
3681 | +static const char *check_mydomainname(void); | ||
3682 | +static const char *check_mynetworks(void); | ||
3683 | + | ||
3684 | +static const CONFIG_STR_FN_TABLE str_fn_table[] = { | ||
3685 | + VAR_MYHOSTNAME, check_myhostname, &var_myhostname, 1, 0, | ||
3686 | + VAR_MYDOMAIN, check_mydomainname, &var_mydomain, 1, 0, | ||
3687 | + 0, | ||
3688 | +}; | ||
3689 | +static const CONFIG_STR_FN_TABLE str_fn_table_2[] = { | ||
3690 | + VAR_MYNETWORKS, check_mynetworks, &var_mynetworks, 1, 0, | ||
3691 | + 0, | ||
3692 | +}; | ||
3693 | + | ||
3694 | + /* | ||
3695 | + * XXX Global so that call-backs can see it. | ||
3696 | + */ | ||
3697 | +static int cmd_mode = SHOW_NAME; | ||
3698 | + | ||
3699 | +/* check_myhostname - lookup hostname and validate */ | ||
3700 | + | ||
3701 | +static const char *check_myhostname(void) | ||
3702 | +{ | ||
3703 | + static const char *name; | ||
3704 | + const char *dot; | ||
3705 | + const char *domain; | ||
3706 | + | ||
3707 | + /* | ||
3708 | + * Use cached result. | ||
3709 | + */ | ||
3710 | + if (name) | ||
3711 | + return (name); | ||
3712 | + | ||
3713 | + /* | ||
3714 | + * If the local machine name is not in FQDN form, try to append the | ||
3715 | + * contents of $mydomain. | ||
3716 | + */ | ||
3717 | + name = get_hostname(); | ||
3718 | + if ((dot = strchr(name, '.')) == 0) { | ||
3719 | + if ((domain = mail_conf_lookup_eval(VAR_MYDOMAIN)) == 0) | ||
3720 | + domain = DEF_MYDOMAIN; | ||
3721 | + name = concatenate(name, ".", domain, (char *) 0); | ||
3722 | + } | ||
3723 | + return (name); | ||
3724 | +} | ||
3725 | + | ||
3726 | +/* get_myhostname - look up and store my hostname */ | ||
3727 | + | ||
3728 | +static void get_myhostname(void) | ||
3729 | +{ | ||
3730 | + const char *name; | ||
3731 | + | ||
3732 | + if ((name = mail_conf_lookup_eval(VAR_MYHOSTNAME)) == 0) | ||
3733 | + name = check_myhostname(); | ||
3734 | + var_myhostname = mystrdup(name); | ||
3735 | +} | ||
3736 | + | ||
3737 | +/* check_mydomainname - lookup domain name and validate */ | ||
3738 | + | ||
3739 | +static const char *check_mydomainname(void) | ||
3740 | +{ | ||
3741 | + char *dot; | ||
3742 | + | ||
3743 | + /* | ||
3744 | + * Use the hostname when it is not a FQDN ("foo"), or when the hostname | ||
3745 | + * actually is a domain name ("foo.com"). | ||
3746 | + */ | ||
3747 | + if (var_myhostname == 0) | ||
3748 | + get_myhostname(); | ||
3749 | + if ((dot = strchr(var_myhostname, '.')) == 0 || strchr(dot + 1, '.') == 0) | ||
3750 | + return (DEF_MYDOMAIN); | ||
3751 | + return (dot + 1); | ||
3752 | +} | ||
3753 | + | ||
3754 | +/* check_mynetworks - lookup network address list */ | ||
3755 | + | ||
3756 | +static const char *check_mynetworks(void) | ||
3757 | +{ | ||
3758 | + INET_PROTO_INFO *proto_info; | ||
3759 | + const char *junk; | ||
3760 | + | ||
3761 | + if (var_inet_interfaces == 0) { | ||
3762 | + if ((cmd_mode & SHOW_DEFS) | ||
3763 | + || (junk = mail_conf_lookup_eval(VAR_INET_INTERFACES)) == 0) | ||
3764 | + junk = DEF_INET_INTERFACES; | ||
3765 | + var_inet_interfaces = mystrdup(junk); | ||
3766 | + } | ||
3767 | + if (var_mynetworks_style == 0) { | ||
3768 | + if ((cmd_mode & SHOW_DEFS) | ||
3769 | + || (junk = mail_conf_lookup_eval(VAR_MYNETWORKS_STYLE)) == 0) | ||
3770 | + junk = DEF_MYNETWORKS_STYLE; | ||
3771 | + var_mynetworks_style = mystrdup(junk); | ||
3772 | + } | ||
3773 | + if (var_inet_protocols == 0) { | ||
3774 | + if ((cmd_mode & SHOW_DEFS) | ||
3775 | + || (junk = mail_conf_lookup_eval(VAR_INET_PROTOCOLS)) == 0) | ||
3776 | + junk = DEF_INET_PROTOCOLS; | ||
3777 | + var_inet_protocols = mystrdup(junk); | ||
3778 | + proto_info = inet_proto_init(VAR_INET_PROTOCOLS, var_inet_protocols); | ||
3779 | + } | ||
3780 | + return (mynetworks()); | ||
3781 | +} | ||
3782 | + | ||
3783 | +/* edit_parameters - edit parameter file */ | ||
3784 | + | ||
3785 | +static void edit_parameters(int cmd_mode, int argc, char **argv) | ||
3786 | +{ | ||
3787 | + char *config_dir; | ||
3788 | + char *path; | ||
3789 | + EDIT_FILE *ep; | ||
3790 | + VSTREAM *src; | ||
3791 | + VSTREAM *dst; | ||
3792 | + VSTRING *buf = vstring_alloc(100); | ||
3793 | + VSTRING *key = vstring_alloc(10); | ||
3794 | + char *cp; | ||
3795 | + char *edit_key; | ||
3796 | + char *edit_val; | ||
3797 | + HTABLE *table; | ||
3798 | + struct cvalue { | ||
3799 | + char *value; | ||
3800 | + int found; | ||
3801 | + }; | ||
3802 | + struct cvalue *cvalue; | ||
3803 | + HTABLE_INFO **ht_info; | ||
3804 | + HTABLE_INFO **ht; | ||
3805 | + int interesting; | ||
3806 | + const char *err; | ||
3807 | + | ||
3808 | + /* | ||
3809 | + * Store command-line parameters for quick lookup. | ||
3810 | + */ | ||
3811 | + table = htable_create(argc); | ||
3812 | + while ((cp = *argv++) != 0) { | ||
3813 | + if (strchr(cp, '\n') != 0) | ||
3814 | + msg_fatal("-e or -# accepts no multi-line input"); | ||
3815 | + while (ISSPACE(*cp)) | ||
3816 | + cp++; | ||
3817 | + if (*cp == '#') | ||
3818 | + msg_fatal("-e or -# accepts no comment input"); | ||
3819 | + if (cmd_mode & EDIT_MAIN) { | ||
3820 | + if ((err = split_nameval(cp, &edit_key, &edit_val)) != 0) | ||
3821 | + msg_fatal("%s: \"%s\"", err, cp); | ||
3822 | + } else if (cmd_mode & COMMENT_OUT) { | ||
3823 | + if (*cp == 0) | ||
3824 | + msg_fatal("-# requires non-blank parameter names"); | ||
3825 | + if (strchr(cp, '=') != 0) | ||
3826 | + msg_fatal("-# requires parameter names only"); | ||
3827 | + edit_key = mystrdup(cp); | ||
3828 | + trimblanks(edit_key, 0); | ||
3829 | + edit_val = 0; | ||
3830 | + } else { | ||
3831 | + msg_panic("edit_parameters: unknown mode %d", cmd_mode); | ||
3832 | + } | ||
3833 | + cvalue = (struct cvalue *) mymalloc(sizeof(*cvalue)); | ||
3834 | + cvalue->value = edit_val; | ||
3835 | + cvalue->found = 0; | ||
3836 | + htable_enter(table, edit_key, (char *) cvalue); | ||
3837 | + } | ||
3838 | + | ||
3839 | + /* | ||
3840 | + * XXX Avoid code duplication by better code decomposition. | ||
3841 | + */ | ||
3842 | + if (var_config_dir) | ||
3843 | + myfree(var_config_dir); | ||
3844 | + var_config_dir = mystrdup((config_dir = safe_getenv(CONF_ENV_PATH)) != 0 ? | ||
3845 | + config_dir : DEF_CONFIG_DIR); /* XXX */ | ||
3846 | + set_mail_conf_str(VAR_CONFIG_DIR, var_config_dir); | ||
3847 | + | ||
3848 | + /* | ||
3849 | + * Open a temp file for the result. This uses a deterministic name so we | ||
3850 | + * don't leave behind thrash with random names. | ||
3851 | + */ | ||
3852 | + path = concatenate(var_config_dir, "/", "main.cf", (char *) 0); | ||
3853 | + if ((ep = edit_file_open(path, O_CREAT | O_WRONLY, 0644)) == 0) | ||
3854 | + msg_fatal("open %s%s: %m", path, EDIT_FILE_SUFFIX); | ||
3855 | + dst = ep->tmp_fp; | ||
3856 | + | ||
3857 | + /* | ||
3858 | + * Open the original file for input. | ||
3859 | + */ | ||
3860 | + if ((src = vstream_fopen(path, O_RDONLY, 0)) == 0) { | ||
3861 | + /* OK to delete, since we control the temp file name exclusively. */ | ||
3862 | + (void) unlink(ep->tmp_path); | ||
3863 | + msg_fatal("open %s for reading: %m", path); | ||
3864 | + } | ||
3865 | + | ||
3866 | + /* | ||
3867 | + * Copy original file to temp file, while replacing parameters on the | ||
3868 | + * fly. Issue warnings for names found multiple times. | ||
3869 | + */ | ||
3870 | +#define STR(x) vstring_str(x) | ||
3871 | + | ||
3872 | + interesting = 0; | ||
3873 | + while (vstring_get(buf, src) != VSTREAM_EOF) { | ||
3874 | + for (cp = STR(buf); ISSPACE(*cp) /* including newline */ ; cp++) | ||
3875 | + /* void */ ; | ||
3876 | + /* Copy comment, all-whitespace, or empty line. */ | ||
3877 | + if (*cp == '#' || *cp == 0) { | ||
3878 | + vstream_fputs(STR(buf), dst); | ||
3879 | + } | ||
3880 | + /* Copy, skip or replace continued text. */ | ||
3881 | + else if (cp > STR(buf)) { | ||
3882 | + if (interesting == 0) | ||
3883 | + vstream_fputs(STR(buf), dst); | ||
3884 | + else if (cmd_mode & COMMENT_OUT) | ||
3885 | + vstream_fprintf(dst, "#%s", STR(buf)); | ||
3886 | + } | ||
3887 | + /* Copy or replace start of logical line. */ | ||
3888 | + else { | ||
3889 | + vstring_strncpy(key, cp, strcspn(cp, " \t\r\n=")); | ||
3890 | + cvalue = (struct cvalue *) htable_find(table, STR(key)); | ||
3891 | + if ((interesting = !!cvalue) != 0) { | ||
3892 | + if (cvalue->found++ == 1) | ||
3893 | + msg_warn("%s: multiple entries for \"%s\"", path, STR(key)); | ||
3894 | + if (cmd_mode & EDIT_MAIN) | ||
3895 | + vstream_fprintf(dst, "%s = %s\n", STR(key), cvalue->value); | ||
3896 | + else if (cmd_mode & COMMENT_OUT) | ||
3897 | + vstream_fprintf(dst, "#%s", cp); | ||
3898 | + else | ||
3899 | + msg_panic("edit_parameters: unknown mode %d", cmd_mode); | ||
3900 | + } else { | ||
3901 | + vstream_fputs(STR(buf), dst); | ||
3902 | + } | ||
3903 | + } | ||
3904 | + } | ||
3905 | + | ||
3906 | + /* | ||
3907 | + * Generate new entries for parameters that were not found. | ||
3908 | + */ | ||
3909 | + if (cmd_mode & EDIT_MAIN) { | ||
3910 | + for (ht_info = ht = htable_list(table); *ht; ht++) { | ||
3911 | + cvalue = (struct cvalue *) ht[0]->value; | ||
3912 | + if (cvalue->found == 0) | ||
3913 | + vstream_fprintf(dst, "%s = %s\n", ht[0]->key, cvalue->value); | ||
3914 | + } | ||
3915 | + myfree((char *) ht_info); | ||
3916 | + } | ||
3917 | + | ||
3918 | + /* | ||
3919 | + * When all is well, rename the temp file to the original one. | ||
3920 | + */ | ||
3921 | + if (vstream_fclose(src)) | ||
3922 | + msg_fatal("read %s: %m", path); | ||
3923 | + if (edit_file_close(ep) != 0) | ||
3924 | + msg_fatal("close %s%s: %m", path, EDIT_FILE_SUFFIX); | ||
3925 | + | ||
3926 | + /* | ||
3927 | + * Cleanup. | ||
3928 | + */ | ||
3929 | + myfree(path); | ||
3930 | + vstring_free(buf); | ||
3931 | + vstring_free(key); | ||
3932 | + htable_free(table, myfree); | ||
3933 | +} | ||
3934 | + | ||
3935 | +/* read_parameters - read parameter info from file */ | ||
3936 | + | ||
3937 | +static void read_parameters(void) | ||
3938 | +{ | ||
3939 | + char *config_dir; | ||
3940 | + char *path; | ||
3941 | + | ||
3942 | + /* | ||
3943 | + * A direct rip-off of mail_conf_read(). XXX Avoid code duplication by | ||
3944 | + * better code decomposition. | ||
3945 | + */ | ||
3946 | + dict_unknown_allowed = 1; | ||
3947 | + if (var_config_dir) | ||
3948 | + myfree(var_config_dir); | ||
3949 | + var_config_dir = mystrdup((config_dir = safe_getenv(CONF_ENV_PATH)) != 0 ? | ||
3950 | + config_dir : DEF_CONFIG_DIR); /* XXX */ | ||
3951 | + set_mail_conf_str(VAR_CONFIG_DIR, var_config_dir); | ||
3952 | + path = concatenate(var_config_dir, "/", "main.cf", (char *) 0); | ||
3953 | + dict_load_file(CONFIG_DICT, path); | ||
3954 | + myfree(path); | ||
3955 | +} | ||
3956 | + | ||
3957 | +/* set_parameters - set parameter values from default or explicit setting */ | ||
3958 | + | ||
3959 | +static void set_parameters(void) | ||
3960 | +{ | ||
3961 | + | ||
3962 | + /* | ||
3963 | + * Populate the configuration parameter dictionary with default settings | ||
3964 | + * or with actual settings. | ||
3965 | + * | ||
3966 | + * Iterate over each entry in str_fn_table, str_fn_table_2, time_table, | ||
3967 | + * bool_table, int_table, str_table, and raw_table. Look up each | ||
3968 | + * parameter name in the configuration parameter dictionary. If the | ||
3969 | + * parameter is not set, take the default value, or take the value from | ||
3970 | + * main.cf, without doing $name expansions. This includes converting | ||
3971 | + * default values from numeric/boolean internal forms to external string | ||
3972 | + * form. | ||
3973 | + * | ||
3974 | + * Once the configuration parameter dictionary is populated, printing a | ||
3975 | + * parameter setting is a matter of querying the configuration parameter | ||
3976 | + * dictionary, optionally expanding of $name values, and printing the | ||
3977 | + * result. | ||
3978 | + */ | ||
3979 | +} | ||
3980 | + | ||
3981 | +/* hash_parameters - hash all parameter names so we can find and sort them */ | ||
3982 | + | ||
3983 | +static void hash_parameters(void) | ||
3984 | +{ | ||
3985 | + const CONFIG_TIME_TABLE *ctt; | ||
3986 | + const CONFIG_BOOL_TABLE *cbt; | ||
3987 | + const CONFIG_INT_TABLE *cit; | ||
3988 | + const CONFIG_STR_TABLE *cst; | ||
3989 | + const CONFIG_STR_FN_TABLE *csft; | ||
3990 | + const CONFIG_RAW_TABLE *rst; | ||
3991 | + const CONFIG_NINT_TABLE *nst; | ||
3992 | + | ||
3993 | + param_table = htable_create(100); | ||
3994 | + | ||
3995 | + for (ctt = time_table; ctt->name; ctt++) | ||
3996 | + htable_enter(param_table, ctt->name, (char *) ctt); | ||
3997 | + for (cbt = bool_table; cbt->name; cbt++) | ||
3998 | + htable_enter(param_table, cbt->name, (char *) cbt); | ||
3999 | + for (cit = int_table; cit->name; cit++) | ||
4000 | + htable_enter(param_table, cit->name, (char *) cit); | ||
4001 | + for (cst = str_table; cst->name; cst++) | ||
4002 | + htable_enter(param_table, cst->name, (char *) cst); | ||
4003 | + for (csft = str_fn_table; csft->name; csft++) | ||
4004 | + htable_enter(param_table, csft->name, (char *) csft); | ||
4005 | + for (csft = str_fn_table_2; csft->name; csft++) | ||
4006 | + htable_enter(param_table, csft->name, (char *) csft); | ||
4007 | + for (rst = raw_table; rst->name; rst++) | ||
4008 | + htable_enter(param_table, rst->name, (char *) rst); | ||
4009 | + for (nst = nint_table; nst->name; nst++) | ||
4010 | + htable_enter(param_table, nst->name, (char *) nst); | ||
4011 | +} | ||
4012 | + | ||
4013 | +/* show_strval - show string-valued parameter */ | ||
4014 | + | ||
4015 | +static void show_strval(int mode, const char *name, const char *value) | ||
4016 | +{ | ||
4017 | + if (mode & SHOW_EVAL) | ||
4018 | + value = mail_conf_eval(value); | ||
4019 | + | ||
4020 | + if (mode & SHOW_NAME) { | ||
4021 | + vstream_printf("%s = %s\n", name, value); | ||
4022 | + } else { | ||
4023 | + vstream_printf("%s\n", value); | ||
4024 | + } | ||
4025 | +} | ||
4026 | + | ||
4027 | +/* show_intval - show integer-valued parameter */ | ||
4028 | + | ||
4029 | +static void show_intval(int mode, const char *name, int value) | ||
4030 | +{ | ||
4031 | + if (mode & SHOW_NAME) { | ||
4032 | + vstream_printf("%s = %d\n", name, value); | ||
4033 | + } else { | ||
4034 | + vstream_printf("%d\n", value); | ||
4035 | + } | ||
4036 | +} | ||
4037 | + | ||
4038 | +/* print_bool - print boolean parameter */ | ||
4039 | + | ||
4040 | +static void print_bool(int mode, CONFIG_BOOL_TABLE *cbt) | ||
4041 | +{ | ||
4042 | + const char *value; | ||
4043 | + | ||
4044 | + if (mode & SHOW_DEFS) { | ||
4045 | + show_strval(mode, cbt->name, cbt->defval ? "yes" : "no"); | ||
4046 | + } else { | ||
4047 | + value = dict_lookup(CONFIG_DICT, cbt->name); | ||
4048 | + if ((mode & SHOW_NONDEF) == 0) { | ||
4049 | + if (value == 0) { | ||
4050 | + show_strval(mode, cbt->name, cbt->defval ? "yes" : "no"); | ||
4051 | + } else { | ||
4052 | + show_strval(mode, cbt->name, value); | ||
4053 | + } | ||
4054 | + } else { | ||
4055 | + if (value != 0) | ||
4056 | + show_strval(mode, cbt->name, value); | ||
4057 | + } | ||
4058 | + } | ||
4059 | +} | ||
4060 | + | ||
4061 | +/* print_time - print relative time parameter */ | ||
4062 | + | ||
4063 | +static void print_time(int mode, CONFIG_TIME_TABLE *ctt) | ||
4064 | +{ | ||
4065 | + const char *value; | ||
4066 | + | ||
4067 | + if (mode & SHOW_DEFS) { | ||
4068 | + show_strval(mode, ctt->name, ctt->defval); | ||
4069 | + } else { | ||
4070 | + value = dict_lookup(CONFIG_DICT, ctt->name); | ||
4071 | + if ((mode & SHOW_NONDEF) == 0) { | ||
4072 | + if (value == 0) { | ||
4073 | + show_strval(mode, ctt->name, ctt->defval); | ||
4074 | + } else { | ||
4075 | + show_strval(mode, ctt->name, value); | ||
4076 | + } | ||
4077 | + } else { | ||
4078 | + if (value != 0) | ||
4079 | + show_strval(mode, ctt->name, value); | ||
4080 | + } | ||
4081 | + } | ||
4082 | +} | ||
4083 | + | ||
4084 | +/* print_int - print integer parameter */ | ||
4085 | + | ||
4086 | +static void print_int(int mode, CONFIG_INT_TABLE *cit) | ||
4087 | +{ | ||
4088 | + const char *value; | ||
4089 | + | ||
4090 | + if (mode & SHOW_DEFS) { | ||
4091 | + show_intval(mode, cit->name, cit->defval); | ||
4092 | + } else { | ||
4093 | + value = dict_lookup(CONFIG_DICT, cit->name); | ||
4094 | + if ((mode & SHOW_NONDEF) == 0) { | ||
4095 | + if (value == 0) { | ||
4096 | + show_intval(mode, cit->name, cit->defval); | ||
4097 | + } else { | ||
4098 | + show_strval(mode, cit->name, value); | ||
4099 | + } | ||
4100 | + } else { | ||
4101 | + if (value != 0) | ||
4102 | + show_strval(mode, cit->name, value); | ||
4103 | + } | ||
4104 | + } | ||
4105 | +} | ||
4106 | + | ||
4107 | +/* print_str - print string parameter */ | ||
4108 | + | ||
4109 | +static void print_str(int mode, CONFIG_STR_TABLE *cst) | ||
4110 | +{ | ||
4111 | + const char *value; | ||
4112 | + | ||
4113 | + if (mode & SHOW_DEFS) { | ||
4114 | + show_strval(mode, cst->name, cst->defval); | ||
4115 | + } else { | ||
4116 | + value = dict_lookup(CONFIG_DICT, cst->name); | ||
4117 | + if ((mode & SHOW_NONDEF) == 0) { | ||
4118 | + if (value == 0) { | ||
4119 | + show_strval(mode, cst->name, cst->defval); | ||
4120 | + } else { | ||
4121 | + show_strval(mode, cst->name, value); | ||
4122 | + } | ||
4123 | + } else { | ||
4124 | + if (value != 0) | ||
4125 | + show_strval(mode, cst->name, value); | ||
4126 | + } | ||
4127 | + } | ||
4128 | +} | ||
4129 | + | ||
4130 | +/* print_str_fn - print string-function parameter */ | ||
4131 | + | ||
4132 | +static void print_str_fn(int mode, CONFIG_STR_FN_TABLE *csft) | ||
4133 | +{ | ||
4134 | + const char *value; | ||
4135 | + | ||
4136 | + if (mode & SHOW_DEFS) { | ||
4137 | + show_strval(mode, csft->name, csft->defval()); | ||
4138 | + } else { | ||
4139 | + value = dict_lookup(CONFIG_DICT, csft->name); | ||
4140 | + if ((mode & SHOW_NONDEF) == 0) { | ||
4141 | + if (value == 0) { | ||
4142 | + show_strval(mode, csft->name, csft->defval()); | ||
4143 | + } else { | ||
4144 | + show_strval(mode, csft->name, value); | ||
4145 | + } | ||
4146 | + } else { | ||
4147 | + if (value != 0) | ||
4148 | + show_strval(mode, csft->name, value); | ||
4149 | + } | ||
4150 | + } | ||
4151 | +} | ||
4152 | + | ||
4153 | +/* print_str_fn_2 - print string-function parameter */ | ||
4154 | + | ||
4155 | +static void print_str_fn_2(int mode, CONFIG_STR_FN_TABLE *csft) | ||
4156 | +{ | ||
4157 | + const char *value; | ||
4158 | + | ||
4159 | + if (mode & SHOW_DEFS) { | ||
4160 | + show_strval(mode, csft->name, csft->defval()); | ||
4161 | + } else { | ||
4162 | + value = dict_lookup(CONFIG_DICT, csft->name); | ||
4163 | + if ((mode & SHOW_NONDEF) == 0) { | ||
4164 | + if (value == 0) { | ||
4165 | + show_strval(mode, csft->name, csft->defval()); | ||
4166 | + } else { | ||
4167 | + show_strval(mode, csft->name, value); | ||
4168 | + } | ||
4169 | + } else { | ||
4170 | + if (value != 0) | ||
4171 | + show_strval(mode, csft->name, value); | ||
4172 | + } | ||
4173 | + } | ||
4174 | +} | ||
4175 | + | ||
4176 | +/* print_raw - print raw string parameter */ | ||
4177 | + | ||
4178 | +static void print_raw(int mode, CONFIG_RAW_TABLE * rst) | ||
4179 | +{ | ||
4180 | + const char *value; | ||
4181 | + | ||
4182 | + if (mode & SHOW_EVAL) | ||
4183 | + msg_warn("parameter %s expands at run-time", rst->name); | ||
4184 | + mode &= ~SHOW_EVAL; | ||
4185 | + | ||
4186 | + if (mode & SHOW_DEFS) { | ||
4187 | + show_strval(mode, rst->name, rst->defval); | ||
4188 | + } else { | ||
4189 | + value = dict_lookup(CONFIG_DICT, rst->name); | ||
4190 | + if ((mode & SHOW_NONDEF) == 0) { | ||
4191 | + if (value == 0) { | ||
4192 | + show_strval(mode, rst->name, rst->defval); | ||
4193 | + } else { | ||
4194 | + show_strval(mode, rst->name, value); | ||
4195 | + } | ||
4196 | + } else { | ||
4197 | + if (value != 0) | ||
4198 | + show_strval(mode, rst->name, value); | ||
4199 | + } | ||
4200 | + } | ||
4201 | +} | ||
4202 | + | ||
4203 | +/* print_nint - print new integer parameter */ | ||
4204 | + | ||
4205 | +static void print_nint(int mode, CONFIG_NINT_TABLE * rst) | ||
4206 | +{ | ||
4207 | + const char *value; | ||
4208 | + | ||
4209 | + if (mode & SHOW_EVAL) | ||
4210 | + msg_warn("parameter %s expands at run-time", rst->name); | ||
4211 | + mode &= ~SHOW_EVAL; | ||
4212 | + | ||
4213 | + if (mode & SHOW_DEFS) { | ||
4214 | + show_strval(mode, rst->name, rst->defval); | ||
4215 | + } else { | ||
4216 | + value = dict_lookup(CONFIG_DICT, rst->name); | ||
4217 | + if ((mode & SHOW_NONDEF) == 0) { | ||
4218 | + if (value == 0) { | ||
4219 | + show_strval(mode, rst->name, rst->defval); | ||
4220 | + } else { | ||
4221 | + show_strval(mode, rst->name, value); | ||
4222 | + } | ||
4223 | + } else { | ||
4224 | + if (value != 0) | ||
4225 | + show_strval(mode, rst->name, value); | ||
4226 | + } | ||
4227 | + } | ||
4228 | +} | ||
4229 | + | ||
4230 | +/* print_parameter - show specific parameter */ | ||
4231 | + | ||
4232 | +static void print_parameter(int mode, char *ptr) | ||
4233 | +{ | ||
4234 | + | ||
4235 | +#define INSIDE(p,t) (ptr >= (char *) t && ptr < ((char *) t) + sizeof(t)) | ||
4236 | + | ||
4237 | + /* | ||
4238 | + * This is gross, but the best we can do on short notice. | ||
4239 | + */ | ||
4240 | + if (INSIDE(ptr, time_table)) | ||
4241 | + print_time(mode, (CONFIG_TIME_TABLE *) ptr); | ||
4242 | + if (INSIDE(ptr, bool_table)) | ||
4243 | + print_bool(mode, (CONFIG_BOOL_TABLE *) ptr); | ||
4244 | + if (INSIDE(ptr, int_table)) | ||
4245 | + print_int(mode, (CONFIG_INT_TABLE *) ptr); | ||
4246 | + if (INSIDE(ptr, str_table)) | ||
4247 | + print_str(mode, (CONFIG_STR_TABLE *) ptr); | ||
4248 | + if (INSIDE(ptr, str_fn_table)) | ||
4249 | + print_str_fn(mode, (CONFIG_STR_FN_TABLE *) ptr); | ||
4250 | + if (INSIDE(ptr, str_fn_table_2)) | ||
4251 | + print_str_fn_2(mode, (CONFIG_STR_FN_TABLE *) ptr); | ||
4252 | + if (INSIDE(ptr, raw_table)) | ||
4253 | + print_raw(mode, (CONFIG_RAW_TABLE *) ptr); | ||
4254 | + if (INSIDE(ptr, nint_table)) | ||
4255 | + print_nint(mode, (CONFIG_NINT_TABLE *) ptr); | ||
4256 | + if (msg_verbose) | ||
4257 | + vstream_fflush(VSTREAM_OUT); | ||
4258 | +} | ||
4259 | + | ||
4260 | +/* comp_names - qsort helper */ | ||
4261 | + | ||
4262 | +static int comp_names(const void *a, const void *b) | ||
4263 | +{ | ||
4264 | + HTABLE_INFO **ap = (HTABLE_INFO **) a; | ||
4265 | + HTABLE_INFO **bp = (HTABLE_INFO **) b; | ||
4266 | + | ||
4267 | + return (strcmp(ap[0]->key, bp[0]->key)); | ||
4268 | +} | ||
4269 | + | ||
4270 | +/* show_maps - show available maps */ | ||
4271 | + | ||
4272 | +static void show_maps(void) | ||
4273 | +{ | ||
4274 | + ARGV *maps_argv; | ||
4275 | + int i; | ||
4276 | + | ||
4277 | + maps_argv = dict_mapnames(); | ||
4278 | + for (i = 0; i < maps_argv->argc; i++) | ||
4279 | + vstream_printf("%s\n", maps_argv->argv[i]); | ||
4280 | + argv_free(maps_argv); | ||
4281 | +} | ||
4282 | + | ||
4283 | +/* show_locks - show available mailbox locking methods */ | ||
4284 | + | ||
4285 | +static void show_locks(void) | ||
4286 | +{ | ||
4287 | + ARGV *locks_argv; | ||
4288 | + int i; | ||
4289 | + | ||
4290 | + locks_argv = mbox_lock_names(); | ||
4291 | + for (i = 0; i < locks_argv->argc; i++) | ||
4292 | + vstream_printf("%s\n", locks_argv->argv[i]); | ||
4293 | + argv_free(locks_argv); | ||
4294 | +} | ||
4295 | + | ||
4296 | +/* show_sasl - show SASL plug-in types */ | ||
4297 | + | ||
4298 | +static void show_sasl(int what) | ||
4299 | +{ | ||
4300 | + ARGV *sasl_argv; | ||
4301 | + int i; | ||
4302 | + | ||
4303 | + sasl_argv = (what & SHOW_SASL_SERV) ? xsasl_server_types() : | ||
4304 | + xsasl_client_types(); | ||
4305 | + for (i = 0; i < sasl_argv->argc; i++) | ||
4306 | + vstream_printf("%s\n", sasl_argv->argv[i]); | ||
4307 | + argv_free(sasl_argv); | ||
4308 | +} | ||
4309 | + | ||
4310 | +/* show_parameters - show parameter info */ | ||
4311 | + | ||
4312 | +static void show_parameters(int mode, char **names) | ||
4313 | +{ | ||
4314 | + HTABLE_INFO **list; | ||
4315 | + HTABLE_INFO **ht; | ||
4316 | + char **namep; | ||
4317 | + char *value; | ||
4318 | + | ||
4319 | + /* | ||
4320 | + * Show all parameters. | ||
4321 | + */ | ||
4322 | + if (*names == 0) { | ||
4323 | + list = htable_list(param_table); | ||
4324 | + qsort((char *) list, param_table->used, sizeof(*list), comp_names); | ||
4325 | + for (ht = list; *ht; ht++) | ||
4326 | + print_parameter(mode, ht[0]->value); | ||
4327 | + myfree((char *) list); | ||
4328 | + return; | ||
4329 | + } | ||
4330 | + | ||
4331 | + /* | ||
4332 | + * Show named parameters. | ||
4333 | + */ | ||
4334 | + for (namep = names; *namep; namep++) { | ||
4335 | + if ((value = htable_find(param_table, *namep)) == 0) { | ||
4336 | + msg_warn("%s: unknown parameter", *namep); | ||
4337 | + } else { | ||
4338 | + print_parameter(mode, value); | ||
4339 | + } | ||
4340 | + } | ||
4341 | +} | ||
4342 | + | ||
4343 | +MAIL_VERSION_STAMP_DECLARE; | ||
4344 | + | ||
4345 | +/* main */ | ||
4346 | + | ||
4347 | +int main(int argc, char **argv) | ||
4348 | +{ | ||
4349 | + int ch; | ||
4350 | + int fd; | ||
4351 | + struct stat st; | ||
4352 | + int junk; | ||
4353 | + ARGV *ext_argv = 0; | ||
4354 | + | ||
4355 | + /* | ||
4356 | + * Fingerprint executables and core dumps. | ||
4357 | + */ | ||
4358 | + MAIL_VERSION_STAMP_ALLOCATE; | ||
4359 | + | ||
4360 | + /* | ||
4361 | + * Be consistent with file permissions. | ||
4362 | + */ | ||
4363 | + umask(022); | ||
4364 | + | ||
4365 | + /* | ||
4366 | + * To minimize confusion, make sure that the standard file descriptors | ||
4367 | + * are open before opening anything else. XXX Work around for 44BSD where | ||
4368 | + * fstat can return EBADF on an open file descriptor. | ||
4369 | + */ | ||
4370 | + for (fd = 0; fd < 3; fd++) | ||
4371 | + if (fstat(fd, &st) == -1 | ||
4372 | + && (close(fd), open("/dev/null", O_RDWR, 0)) != fd) | ||
4373 | + msg_fatal("open /dev/null: %m"); | ||
4374 | + | ||
4375 | + /* | ||
4376 | + * Set up logging. | ||
4377 | + */ | ||
4378 | + msg_vstream_init(argv[0], VSTREAM_ERR); | ||
4379 | + | ||
4380 | + /* | ||
4381 | + * Parse JCL. | ||
4382 | + */ | ||
4383 | + while ((ch = GETOPT(argc, argv, "aAbc:deE#hmlntv")) > 0) { | ||
4384 | + switch (ch) { | ||
4385 | + case 'a': | ||
4386 | + cmd_mode |= SHOW_SASL_SERV; | ||
4387 | + break; | ||
4388 | + case 'A': | ||
4389 | + cmd_mode |= SHOW_SASL_CLNT; | ||
4390 | + break; | ||
4391 | + case 'b': | ||
4392 | + if (ext_argv) | ||
4393 | + msg_fatal("specify one of -b and -t"); | ||
4394 | + ext_argv = argv_alloc(2); | ||
4395 | + argv_add(ext_argv, "bounce", "-SVnexpand_templates", (char *) 0); | ||
4396 | + break; | ||
4397 | + case 'c': | ||
4398 | + if (setenv(CONF_ENV_PATH, optarg, 1) < 0) | ||
4399 | + msg_fatal("out of memory"); | ||
4400 | + break; | ||
4401 | + case 'd': | ||
4402 | + cmd_mode |= SHOW_DEFS; | ||
4403 | + break; | ||
4404 | + case 'e': | ||
4405 | + cmd_mode |= EDIT_MAIN; | ||
4406 | + break; | ||
4407 | + | ||
4408 | + /* | ||
4409 | + * People, this does not work unless you properly handle default | ||
4410 | + * settings. For example, fast_flush_domains = $relay_domains | ||
4411 | + * must not evaluate to the empty string when relay_domains is | ||
4412 | + * left at its default setting of $mydestination. | ||
4413 | + */ | ||
4414 | +#if 0 | ||
4415 | + case 'E': | ||
4416 | + cmd_mode |= SHOW_EVAL; | ||
4417 | + break; | ||
4418 | +#endif | ||
4419 | + case '#': | ||
4420 | + cmd_mode = COMMENT_OUT; | ||
4421 | + break; | ||
4422 | + | ||
4423 | + case 'h': | ||
4424 | + cmd_mode &= ~SHOW_NAME; | ||
4425 | + break; | ||
4426 | + case 'l': | ||
4427 | + cmd_mode |= SHOW_LOCKS; | ||
4428 | + break; | ||
4429 | + case 'm': | ||
4430 | + cmd_mode |= SHOW_MAPS; | ||
4431 | + break; | ||
4432 | + case 'n': | ||
4433 | + cmd_mode |= SHOW_NONDEF; | ||
4434 | + break; | ||
4435 | + case 't': | ||
4436 | + if (ext_argv) | ||
4437 | + msg_fatal("specify one of -b and -t"); | ||
4438 | + ext_argv = argv_alloc(2); | ||
4439 | + argv_add(ext_argv, "bounce", "-SVndump_templates", (char *) 0); | ||
4440 | + break; | ||
4441 | + case 'v': | ||
4442 | + msg_verbose++; | ||
4443 | + break; | ||
4444 | + default: | ||
4445 | + msg_fatal("usage: %s [-a (server SASL types)] [-A (client SASL types)] [-b (bounce templates)] [-c config_dir] [-d (defaults)] [-e (edit)] [-# (comment-out)] [-h (no names)] [-l (lock types)] [-m (map types)] [-n (non-defaults)] [-v] [name...]", argv[0]); | ||
4446 | + } | ||
4447 | + } | ||
4448 | + | ||
4449 | + /* | ||
4450 | + * Sanity check. | ||
4451 | + */ | ||
4452 | + junk = (cmd_mode & (SHOW_DEFS | SHOW_NONDEF | SHOW_MAPS | SHOW_LOCKS | EDIT_MAIN | SHOW_SASL_SERV | SHOW_SASL_CLNT | COMMENT_OUT)); | ||
4453 | + if (junk != 0 && ((junk != SHOW_DEFS && junk != SHOW_NONDEF | ||
4454 | + && junk != SHOW_MAPS && junk != SHOW_LOCKS && junk != EDIT_MAIN | ||
4455 | + && junk != SHOW_SASL_SERV && junk != SHOW_SASL_CLNT | ||
4456 | + && junk != COMMENT_OUT) | ||
4457 | + || ext_argv != 0)) | ||
4458 | + msg_fatal("specify one of -a, -A, -b, -d, -e, -#, -m, -l and -n"); | ||
4459 | + | ||
4460 | + /* | ||
4461 | + * Display bounce template information and exit. | ||
4462 | + */ | ||
4463 | + if (ext_argv) { | ||
4464 | + if (argv[optind]) { | ||
4465 | + if (argv[optind + 1]) | ||
4466 | + msg_fatal("options -b and -t require at most one template file"); | ||
4467 | + argv_add(ext_argv, "-o", | ||
4468 | + concatenate(VAR_BOUNCE_TMPL, "=", | ||
4469 | + argv[optind], (char *) 0), | ||
4470 | + (char *) 0); | ||
4471 | + } | ||
4472 | + /* Grr... */ | ||
4473 | + argv_add(ext_argv, "-o", | ||
4474 | + concatenate(VAR_QUEUE_DIR, "=", ".", (char *) 0), | ||
4475 | + (char *) 0); | ||
4476 | + mail_conf_read(); | ||
4477 | + mail_run_replace(var_daemon_dir, ext_argv->argv); | ||
4478 | + /* NOTREACHED */ | ||
4479 | + } | ||
4480 | + | ||
4481 | + /* | ||
4482 | + * If showing map types, show them and exit | ||
4483 | + */ | ||
4484 | + if (cmd_mode & SHOW_MAPS) { | ||
4485 | + mail_dict_init(); | ||
4486 | + show_maps(); | ||
4487 | + } | ||
4488 | + | ||
4489 | + /* | ||
4490 | + * If showing locking methods, show them and exit | ||
4491 | + */ | ||
4492 | + else if (cmd_mode & SHOW_LOCKS) { | ||
4493 | + show_locks(); | ||
4494 | + } | ||
4495 | + | ||
4496 | + /* | ||
4497 | + * If showing SASL plug-in types, show them and exit | ||
4498 | + */ | ||
4499 | + else if (cmd_mode & SHOW_SASL_SERV) { | ||
4500 | + show_sasl(SHOW_SASL_SERV); | ||
4501 | + } else if (cmd_mode & SHOW_SASL_CLNT) { | ||
4502 | + show_sasl(SHOW_SASL_CLNT); | ||
4503 | + } | ||
4504 | + | ||
4505 | + /* | ||
4506 | + * Edit main.cf. | ||
4507 | + */ | ||
4508 | + else if (cmd_mode & (EDIT_MAIN | COMMENT_OUT)) { | ||
4509 | + edit_parameters(cmd_mode, argc - optind, argv + optind); | ||
4510 | + } | ||
4511 | + | ||
4512 | + /* | ||
4513 | + * If showing non-default values, read main.cf. | ||
4514 | + */ | ||
4515 | + else { | ||
4516 | + if ((cmd_mode & SHOW_DEFS) == 0) { | ||
4517 | + read_parameters(); | ||
4518 | + set_parameters(); | ||
4519 | + } | ||
4520 | + | ||
4521 | + /* | ||
4522 | + * Throw together all parameters and show the asked values. | ||
4523 | + */ | ||
4524 | + hash_parameters(); | ||
4525 | + show_parameters(cmd_mode, argv + optind); | ||
4526 | + } | ||
4527 | + vstream_fflush(VSTREAM_OUT); | ||
4528 | + exit(0); | ||
4529 | +} | ||
4530 | diff -ruN a/src/postmap/postmap.c b/src/postmap/postmap.c | ||
4531 | --- a/src/postmap/postmap.c 2009-06-01 12:27:45.000000000 +0000 | ||
4532 | +++ b/src/postmap/postmap.c 2009-06-01 13:08:26.000000000 +0000 | ||
4533 | @@ -5,7 +5,7 @@ | ||
4534 | /* Postfix lookup table management | ||
4535 | /* SYNOPSIS | ||
4536 | /* .fi | ||
4537 | -/* \fBpostmap\fR [\fB-Nbfhimnoprsvw\fR] [\fB-c \fIconfig_dir\fR] | ||
4538 | +/* \fBpostmap\fR [\fB-Nbfhimnoprsuvw\fR] [\fB-c \fIconfig_dir\fR] | ||
4539 | /* [\fB-d \fIkey\fR] [\fB-q \fIkey\fR] | ||
4540 | /* [\fIfile_type\fR:]\fIfile_name\fR ... | ||
4541 | /* DESCRIPTION | ||
4542 | @@ -151,6 +151,8 @@ | ||
4543 | /* .sp | ||
4544 | /* This feature is available in Postfix version 2.2 and later, | ||
4545 | /* and is not available for all database types. | ||
4546 | +/* .IP \fB-u\fR | ||
4547 | +/* Upgrade the database to the current version. | ||
4548 | /* .IP \fB-v\fR | ||
4549 | /* Enable verbose logging for debugging purposes. Multiple \fB-v\fR | ||
4550 | /* options make the software increasingly verbose. | ||
4551 | @@ -723,6 +725,18 @@ | ||
4552 | dict_close(dict); | ||
4553 | } | ||
4554 | |||
4555 | +/* postmap_upgrade - upgrade a map */ | ||
4556 | + | ||
4557 | +static int postmap_upgrade(const char *map_type, const char *map_name) | ||
4558 | +{ | ||
4559 | + DICT *dict; | ||
4560 | + | ||
4561 | + dict = dict_open3(map_type, map_name, O_RDWR, | ||
4562 | + DICT_FLAG_LOCK|DICT_FLAG_UPGRADE); | ||
4563 | + dict_close(dict); | ||
4564 | + return (dict != 0); | ||
4565 | +} | ||
4566 | + | ||
4567 | /* usage - explain */ | ||
4568 | |||
4569 | static NORETURN usage(char *myname) | ||
4570 | @@ -743,6 +757,7 @@ | ||
4571 | int postmap_flags = POSTMAP_FLAG_AS_OWNER | POSTMAP_FLAG_SAVE_PERM; | ||
4572 | int open_flags = O_RDWR | O_CREAT | O_TRUNC; | ||
4573 | int dict_flags = DICT_FLAG_DUP_WARN | DICT_FLAG_FOLD_FIX; | ||
4574 | + int upgrade = 0; | ||
4575 | char *query = 0; | ||
4576 | char *delkey = 0; | ||
4577 | int sequence = 0; | ||
4578 | @@ -787,7 +802,7 @@ | ||
4579 | /* | ||
4580 | * Parse JCL. | ||
4581 | */ | ||
4582 | - while ((ch = GETOPT(argc, argv, "Nbc:d:fhimnopq:rsvw")) > 0) { | ||
4583 | + while ((ch = GETOPT(argc, argv, "Nbc:d:fhimnopq:rsuvw")) > 0) { | ||
4584 | switch (ch) { | ||
4585 | default: | ||
4586 | usage(argv[0]); | ||
4587 | @@ -804,8 +819,8 @@ | ||
4588 | msg_fatal("out of memory"); | ||
4589 | break; | ||
4590 | case 'd': | ||
4591 | - if (sequence || query || delkey) | ||
4592 | - msg_fatal("specify only one of -s -q or -d"); | ||
4593 | + if (sequence || query || delkey || upgrade) | ||
4594 | + msg_fatal("specify only one of -s -q -u or -d"); | ||
4595 | delkey = optarg; | ||
4596 | break; | ||
4597 | case 'f': | ||
4598 | @@ -831,8 +846,8 @@ | ||
4599 | postmap_flags &= ~POSTMAP_FLAG_SAVE_PERM; | ||
4600 | break; | ||
4601 | case 'q': | ||
4602 | - if (sequence || query || delkey) | ||
4603 | - msg_fatal("specify only one of -s -q or -d"); | ||
4604 | + if (sequence || query || delkey || upgrade) | ||
4605 | + msg_fatal("specify only one of -s -q -u or -d"); | ||
4606 | query = optarg; | ||
4607 | break; | ||
4608 | case 'r': | ||
4609 | @@ -840,10 +855,15 @@ | ||
4610 | dict_flags |= DICT_FLAG_DUP_REPLACE; | ||
4611 | break; | ||
4612 | case 's': | ||
4613 | - if (query || delkey) | ||
4614 | - msg_fatal("specify only one of -s or -q or -d"); | ||
4615 | + if (query || delkey || upgrade) | ||
4616 | + msg_fatal("specify only one of -s or -q or -u or -d"); | ||
4617 | sequence = 1; | ||
4618 | break; | ||
4619 | + case 'u': | ||
4620 | + if (sequence || query || delkey || upgrade) | ||
4621 | + msg_fatal("specify only one of -s -q -u or -d"); | ||
4622 | + upgrade=1; | ||
4623 | + break; | ||
4624 | case 'v': | ||
4625 | msg_verbose++; | ||
4626 | break; | ||
4627 | @@ -914,6 +934,21 @@ | ||
4628 | exit(0); | ||
4629 | } | ||
4630 | exit(1); | ||
4631 | + } else if (upgrade) { /* Upgrade the map(s) */ | ||
4632 | + int success = 1; | ||
4633 | + if (optind + 1 > argc) | ||
4634 | + usage(argv[0]); | ||
4635 | + while (optind < argc) { | ||
4636 | + if ((path_name = split_at(argv[optind], ':')) != 0) { | ||
4637 | + success &= postmap_upgrade(argv[optind], path_name); | ||
4638 | + } else { | ||
4639 | + success &= postmap_upgrade(var_db_type, path_name); | ||
4640 | + } | ||
4641 | + if (!success) | ||
4642 | + exit(1); | ||
4643 | + optind++; | ||
4644 | + } | ||
4645 | + exit(0); | ||
4646 | } else { /* create/update map(s) */ | ||
4647 | if (optind + 1 > argc) | ||
4648 | usage(argv[0]); | ||
4649 | diff -ruN a/src/tls/Makefile.in b/src/tls/Makefile.in | ||
4650 | --- a/src/tls/Makefile.in 2009-06-01 12:27:45.000000000 +0000 | ||
4651 | +++ b/src/tls/Makefile.in 2009-06-01 13:08:26.000000000 +0000 | ||
4652 | @@ -22,7 +22,7 @@ | ||
4653 | INC_DIR = ../../include | ||
4654 | MAKES = | ||
4655 | |||
4656 | -.c.o:; $(CC) $(CFLAGS) -c $*.c | ||
4657 | +.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c | ||
4658 | |||
4659 | all: $(LIB) | ||
4660 | |||
4661 | @@ -38,12 +38,10 @@ | ||
4662 | root_tests: | ||
4663 | |||
4664 | $(LIB): $(OBJS) | ||
4665 | - $(AR) $(ARFL) $(LIB) $? | ||
4666 | - $(RANLIB) $(LIB) | ||
4667 | + gcc -shared -Wl,-soname,libpostfix-tls.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) | ||
4668 | |||
4669 | $(LIB_DIR)/$(LIB): $(LIB) | ||
4670 | cp $(LIB) $(LIB_DIR) | ||
4671 | - $(RANLIB) $(LIB_DIR)/$(LIB) | ||
4672 | |||
4673 | update: $(LIB_DIR)/$(LIB) $(HDRS) | ||
4674 | -for i in $(HDRS); \ | ||
4675 | diff -ruN a/src/util/Makefile.in b/src/util/Makefile.in | ||
4676 | --- a/src/util/Makefile.in 2009-06-01 12:27:45.000000000 +0000 | ||
4677 | +++ b/src/util/Makefile.in 2009-06-01 13:08:26.000000000 +0000 | ||
4678 | @@ -31,21 +31,23 @@ | ||
4679 | vstream_popen.c vstring.c vstring_vstream.c watchdog.c writable.c \ | ||
4680 | write_buf.c write_wait.c sane_basename.c format_tv.c allspace.c \ | ||
4681 | allascii.c load_file.c killme_after.c vstream_tweak.c upass_connect.c \ | ||
4682 | - upass_listen.c upass_trigger.c edit_file.c inet_windowsize.c | ||
4683 | + upass_listen.c upass_trigger.c edit_file.c inet_windowsize.c \ | ||
4684 | + load_lib.c | ||
4685 | OBJS = alldig.o allprint.o argv.o argv_split.o attr_clnt.o attr_print0.o \ | ||
4686 | attr_print64.o attr_print_plain.o attr_scan0.o attr_scan64.o \ | ||
4687 | attr_scan_plain.o auto_clnt.o base64_code.o basename.o binhash.o \ | ||
4688 | chroot_uid.o cidr_match.o clean_env.o close_on_exec.o concatenate.o \ | ||
4689 | ctable.o dict.o dict_alloc.o dict_cdb.o dict_cidr.o dict_db.o \ | ||
4690 | dict_dbm.o dict_debug.o dict_env.o dict_ht.o dict_ni.o dict_nis.o \ | ||
4691 | - dict_nisplus.o dict_open.o dict_pcre.o dict_regexp.o dict_sdbm.o \ | ||
4692 | - dict_static.o dict_tcp.o dict_unix.o dir_forest.o doze.o dummy_read.o \ | ||
4693 | + dict_nisplus.o dict_open.o dict_regexp.o \ | ||
4694 | + dict_static.o dict_unix.o dir_forest.o doze.o dummy_read.o \ | ||
4695 | dummy_write.o duplex_pipe.o environ.o events.o exec_command.o \ | ||
4696 | fifo_listen.o fifo_trigger.o file_limit.o find_inet.o fsspace.o \ | ||
4697 | fullname.o get_domainname.o get_hostname.o hex_code.o hex_quote.o \ | ||
4698 | host_port.o htable.o inet_addr_host.o inet_addr_list.o \ | ||
4699 | inet_addr_local.o inet_connect.o inet_listen.o inet_proto.o \ | ||
4700 | inet_trigger.o line_wrap.o lowercase.o lstat_as.o mac_expand.o \ | ||
4701 | + load_lib.o \ | ||
4702 | mac_parse.o make_dirs.o mask_addr.o match_list.o match_ops.o msg.o \ | ||
4703 | msg_output.o msg_syslog.o msg_vstream.o mvect.o myaddrinfo.o myflock.o \ | ||
4704 | mymalloc.o myrand.o mystrtok.o name_code.o name_mask.o netstring.o \ | ||
4705 | @@ -78,7 +80,7 @@ | ||
4706 | msg_output.h msg_syslog.h msg_vstream.h mvect.h myaddrinfo.h myflock.h \ | ||
4707 | mymalloc.h myrand.h name_code.h name_mask.h netstring.h nvtable.h \ | ||
4708 | open_as.h open_lock.h percentm.h posix_signals.h readlline.h ring.h \ | ||
4709 | - safe.h safe_open.h sane_accept.h sane_connect.h sane_fsops.h \ | ||
4710 | + safe.h safe_open.h sane_accept.h sane_connect.h sane_fsops.h load_lib.h \ | ||
4711 | sane_socketpair.h sane_time.h scan_dir.h set_eugid.h set_ugid.h \ | ||
4712 | sigdelay.h sock_addr.h spawn_command.h split_at.h stat_as.h \ | ||
4713 | stringops.h sys_defs.h timed_connect.h timed_wait.h trigger.h \ | ||
4714 | @@ -91,6 +93,7 @@ | ||
4715 | CFLAGS = $(DEBUG) $(OPT) $(DEFS) | ||
4716 | FILES = Makefile $(SRCS) $(HDRS) | ||
4717 | INCL = | ||
4718 | +PCRESO = dict_pcre.so | ||
4719 | LIB = libutil.a | ||
4720 | TESTPROG= dict_open dup2_pass_on_exec events exec_command fifo_open \ | ||
4721 | fifo_rdonly_bug fifo_rdwr_bug fifo_trigger fsspace fullname \ | ||
4722 | @@ -105,10 +108,11 @@ | ||
4723 | |||
4724 | LIB_DIR = ../../lib | ||
4725 | INC_DIR = ../../include | ||
4726 | +LIBS = $(LIB_DIR)/$(LIB) $(PCRESO) | ||
4727 | |||
4728 | -.c.o:; $(CC) $(CFLAGS) -c $*.c | ||
4729 | +.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c | ||
4730 | |||
4731 | -all: $(LIB) | ||
4732 | +all: $(LIB) $(PCRESO) | ||
4733 | |||
4734 | $(OBJS): ../../conf/makedefs.out | ||
4735 | |||
4736 | @@ -117,15 +121,19 @@ | ||
4737 | |||
4738 | test: $(TESTPROG) | ||
4739 | |||
4740 | +$(PCRESO): dict_pcre.o libutil.a | ||
4741 | + gcc -shared -Wl,-soname,dict_pcre.so -o $@ $? -lpcre -L. -lutil | ||
4742 | + | ||
4743 | $(LIB): $(OBJS) | ||
4744 | - $(AR) $(ARFL) $(LIB) $? | ||
4745 | - $(RANLIB) $(LIB) | ||
4746 | + gcc -shared -Wl,-soname,libpostfix-util.so.1 -o $(LIB) $(OBJS) -ldl $(SYSLIBS) | ||
4747 | |||
4748 | $(LIB_DIR)/$(LIB): $(LIB) | ||
4749 | cp $(LIB) $(LIB_DIR) | ||
4750 | - $(RANLIB) $(LIB_DIR)/$(LIB) | ||
4751 | |||
4752 | -update: $(LIB_DIR)/$(LIB) $(HDRS) | ||
4753 | +../../libexec/$(PCRESO): $(PCRESO) | ||
4754 | + cp $(PCRESO) ../../libexec | ||
4755 | + | ||
4756 | +update: $(LIBS) ../../libexec/$(PCRESO) $(HDRS) | ||
4757 | -for i in $(HDRS); \ | ||
4758 | do \ | ||
4759 | cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \ | ||
4760 | @@ -147,7 +155,8 @@ | ||
4761 | lint $(SRCS) | ||
4762 | |||
4763 | clean: | ||
4764 | - rm -f *.o $(LIB) *core $(TESTPROG) junk $(MAKES) *.tmp | ||
4765 | + rm -f *.o $(LIB) $(PCRESO) *core $(TESTPROG) \ | ||
4766 | + junk $(MAKES) *.tmp | ||
4767 | rm -rf printfck | ||
4768 | |||
4769 | tidy: clean | ||
4770 | diff -ruN a/src/util/dict.h b/src/util/dict.h | ||
4771 | --- a/src/util/dict.h 2009-06-01 12:27:45.000000000 +0000 | ||
4772 | +++ b/src/util/dict.h 2009-06-01 13:08:26.000000000 +0000 | ||
4773 | @@ -66,6 +66,7 @@ | ||
4774 | #define DICT_FLAG_NO_UNAUTH (1<<13) /* disallow unauthenticated data */ | ||
4775 | #define DICT_FLAG_FOLD_FIX (1<<14) /* case-fold key with fixed-case map */ | ||
4776 | #define DICT_FLAG_FOLD_MUL (1<<15) /* case-fold key with multi-case map */ | ||
4777 | +#define DICT_FLAG_UPGRADE (1<<30) /* Upgrade the db */ | ||
4778 | #define DICT_FLAG_FOLD_ANY (DICT_FLAG_FOLD_FIX | DICT_FLAG_FOLD_MUL) | ||
4779 | |||
4780 | /* IMPORTANT: Update the dict_mask[] table when the above changes */ | ||
4781 | @@ -138,6 +139,11 @@ | ||
4782 | extern DICT *dict_open(const char *, int, int); | ||
4783 | extern DICT *dict_open3(const char *, const char *, int, int); | ||
4784 | extern void dict_open_register(const char *, DICT *(*) (const char *, int, int)); | ||
4785 | +#ifndef NO_DYNAMIC_MAPS | ||
4786 | +extern void dict_open_dlinfo(const char *path); | ||
4787 | +typedef void* (*dict_mkmap_func_t)(const char *); | ||
4788 | +dict_mkmap_func_t dict_mkmap_func(const char *dict_type); | ||
4789 | +#endif | ||
4790 | |||
4791 | #define dict_get(dp, key) ((const char *) (dp)->lookup((dp), (key))) | ||
4792 | #define dict_put(dp, key, val) (dp)->update((dp), (key), (val)) | ||
4793 | diff -ruN a/src/util/dict_db.c b/src/util/dict_db.c | ||
4794 | --- a/src/util/dict_db.c 2009-06-01 12:27:45.000000000 +0000 | ||
4795 | +++ b/src/util/dict_db.c 2009-06-01 13:08:26.000000000 +0000 | ||
4796 | @@ -664,6 +664,12 @@ | ||
4797 | msg_fatal("set DB cache size %d: %m", dict_db_cache_size); | ||
4798 | if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0) | ||
4799 | msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM); | ||
4800 | + if (dict_flags & DICT_FLAG_UPGRADE) { | ||
4801 | + if (msg_verbose) | ||
4802 | + msg_info("upgrading database %s",db_path); | ||
4803 | + if ((errno = db->upgrade(db,db_path,0)) != 0) | ||
4804 | + msg_fatal("upgrade of database %s: %m",db_path); | ||
4805 | + } | ||
4806 | #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) | ||
4807 | if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 0) | ||
4808 | msg_fatal("open database %s: %m", db_path); | ||
4809 | diff -ruN a/src/util/dict_dbm.c b/src/util/dict_dbm.c | ||
4810 | --- a/src/util/dict_dbm.c 2009-06-01 12:27:45.000000000 +0000 | ||
4811 | +++ b/src/util/dict_dbm.c 2009-06-01 13:08:26.000000000 +0000 | ||
4812 | @@ -407,6 +407,10 @@ | ||
4813 | char *dbm_path; | ||
4814 | int lock_fd; | ||
4815 | |||
4816 | +#ifdef HAVE_GDBM | ||
4817 | + msg_fatal("%s: gdbm maps use locking that is incompatible with postfix. Use a hash map instead.", | ||
4818 | + path); | ||
4819 | +#endif | ||
4820 | /* | ||
4821 | * Note: DICT_FLAG_LOCK is used only by programs that do fine-grained (in | ||
4822 | * the time domain) locking while accessing individual database records. | ||
4823 | diff -ruN a/src/util/dict_open.c b/src/util/dict_open.c | ||
4824 | --- a/src/util/dict_open.c 2009-06-01 12:27:45.000000000 +0000 | ||
4825 | +++ b/src/util/dict_open.c 2009-06-01 13:08:26.000000000 +0000 | ||
4826 | @@ -44,6 +44,8 @@ | ||
4827 | /* DICT *(*open) (const char *, int, int); | ||
4828 | /* | ||
4829 | /* ARGV *dict_mapnames() | ||
4830 | +/* | ||
4831 | +/* void (*)() dict_mkmap_func(const char *dict_type) | ||
4832 | /* DESCRIPTION | ||
4833 | /* This module implements a low-level interface to multiple | ||
4834 | /* physical dictionary types. | ||
4835 | @@ -159,6 +161,9 @@ | ||
4836 | /* | ||
4837 | /* dict_mapnames() returns a sorted list with the names of all available | ||
4838 | /* dictionary types. | ||
4839 | +/* | ||
4840 | +/* dict_mkmap_func() returns a pointer to the mkmap setup function | ||
4841 | +/* for the given map type, as given in /etc/dynamicmaps.cf | ||
4842 | /* DIAGNOSTICS | ||
4843 | /* Fatal error: open error, unsupported dictionary type, attempt to | ||
4844 | /* update non-writable dictionary. | ||
4845 | @@ -183,6 +188,9 @@ | ||
4846 | #include <strings.h> | ||
4847 | #endif | ||
4848 | |||
4849 | +#include <sys/stat.h> | ||
4850 | +#include <unistd.h> | ||
4851 | + | ||
4852 | /* Utility library. */ | ||
4853 | |||
4854 | #include <argv.h> | ||
4855 | @@ -207,6 +215,27 @@ | ||
4856 | #include <split_at.h> | ||
4857 | #include <htable.h> | ||
4858 | |||
4859 | +#ifndef NO_DYNAMIC_MAPS | ||
4860 | +#include <load_lib.h> | ||
4861 | +#include <vstring.h> | ||
4862 | +#include <vstream.h> | ||
4863 | +#include <vstring_vstream.h> | ||
4864 | +#include <mvect.h> | ||
4865 | + | ||
4866 | + /* | ||
4867 | + * Interface for dynamic map loading. | ||
4868 | + */ | ||
4869 | +typedef struct { | ||
4870 | + const char *pattern; | ||
4871 | + const char *soname; | ||
4872 | + const char *openfunc; | ||
4873 | + const char *mkmapfunc; | ||
4874 | +} DLINFO; | ||
4875 | + | ||
4876 | +static DLINFO *dict_dlinfo; | ||
4877 | +static DLINFO *dict_open_dlfind(const char *type); | ||
4878 | +#endif | ||
4879 | + | ||
4880 | /* | ||
4881 | * lookup table for available map types. | ||
4882 | */ | ||
4883 | @@ -221,9 +250,11 @@ | ||
4884 | #endif | ||
4885 | DICT_TYPE_ENVIRON, dict_env_open, | ||
4886 | DICT_TYPE_UNIX, dict_unix_open, | ||
4887 | +#ifdef NO_DYNAMIC_MAPS | ||
4888 | #ifdef SNAPSHOT | ||
4889 | DICT_TYPE_TCP, dict_tcp_open, | ||
4890 | #endif | ||
4891 | +#endif | ||
4892 | #ifdef HAS_SDBM | ||
4893 | DICT_TYPE_SDBM, dict_sdbm_open, | ||
4894 | #endif | ||
4895 | @@ -243,9 +274,11 @@ | ||
4896 | #ifdef HAS_NETINFO | ||
4897 | DICT_TYPE_NETINFO, dict_ni_open, | ||
4898 | #endif | ||
4899 | +#ifdef NO_DYNAMIC_MAPS | ||
4900 | #ifdef HAS_PCRE | ||
4901 | DICT_TYPE_PCRE, dict_pcre_open, | ||
4902 | #endif | ||
4903 | +#endif /* NO_DYNAMIC_MAPS */ | ||
4904 | #ifdef HAS_POSIX_REGEXP | ||
4905 | DICT_TYPE_REGEXP, dict_regexp_open, | ||
4906 | #endif | ||
4907 | @@ -303,8 +336,31 @@ | ||
4908 | dict_type, dict_name); | ||
4909 | if (dict_open_hash == 0) | ||
4910 | dict_open_init(); | ||
4911 | - if ((dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type)) == 0) | ||
4912 | - msg_fatal("unsupported dictionary type: %s", dict_type); | ||
4913 | + if ((dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type)) == 0) { | ||
4914 | +#ifdef NO_DYNAMIC_MAPS | ||
4915 | + msg_fatal("%s: unsupported dictionary type: %s", myname, dict_type); | ||
4916 | +#else | ||
4917 | + struct stat st; | ||
4918 | + LIB_FN fn[2]; | ||
4919 | + DICT *(*open) (const char *, int, int); | ||
4920 | + DLINFO *dl=dict_open_dlfind(dict_type); | ||
4921 | + if (!dl) | ||
4922 | + msg_fatal("%s: unsupported dictionary type: %s: Is the postfix-%s package installed?", myname, dict_type, dict_type); | ||
4923 | + if (stat(dl->soname,&st) < 0) { | ||
4924 | + msg_fatal("%s: unsupported dictionary type: %s (%s not found. Is the postfix-%s package installed?)", | ||
4925 | + myname, dict_type, dl->soname, dict_type); | ||
4926 | + } | ||
4927 | + fn[0].name = dl->openfunc; | ||
4928 | + fn[0].ptr = (void**)&open; | ||
4929 | + fn[1].name = NULL; | ||
4930 | + load_library_symbols(dl->soname, fn, NULL); | ||
4931 | + dict_open_register(dict_type, open); | ||
4932 | + dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type); | ||
4933 | +#endif | ||
4934 | + } | ||
4935 | + if (msg_verbose>1) { | ||
4936 | + msg_info("%s: calling %s open routine",myname,dict_type); | ||
4937 | + } | ||
4938 | if ((dict = dp->open(dict_name, open_flags, dict_flags)) == 0) | ||
4939 | msg_fatal("opening %s:%s %m", dict_type, dict_name); | ||
4940 | if (msg_verbose) | ||
4941 | @@ -312,6 +368,36 @@ | ||
4942 | return (dict); | ||
4943 | } | ||
4944 | |||
4945 | +dict_mkmap_func_t dict_mkmap_func(const char *dict_type) | ||
4946 | +{ | ||
4947 | + char *myname="dict_mkmap_func"; | ||
4948 | + struct stat st; | ||
4949 | + LIB_FN fn[2]; | ||
4950 | + dict_mkmap_func_t mkmap; | ||
4951 | + DLINFO *dl; | ||
4952 | +#ifndef NO_DYNAMIC_MAPS | ||
4953 | + if (!dict_dlinfo) | ||
4954 | + msg_fatal("dlinfo==NULL"); | ||
4955 | + dl=dict_open_dlfind(dict_type); | ||
4956 | + if (!dl) | ||
4957 | + msg_fatal("%s: unsupported dictionary type: %s: Is the postfix-%s package installed?", myname, dict_type, dict_type); | ||
4958 | + if (stat(dl->soname,&st) < 0) { | ||
4959 | + msg_fatal("%s: unsupported dictionary type: %s (%s not found. Is the postfix-%s package installed?)", | ||
4960 | + myname, dict_type, dl->soname, dict_type); | ||
4961 | + } | ||
4962 | + if (!dl->mkmapfunc) | ||
4963 | + msg_fatal("%s: unsupported dictionary type: %s does not allow map creation.", myname, dict_type); | ||
4964 | + | ||
4965 | + fn[0].name = dl->mkmapfunc; | ||
4966 | + fn[0].ptr = (void**)&mkmap; | ||
4967 | + fn[1].name = NULL; | ||
4968 | + load_library_symbols(dl->soname, fn, NULL); | ||
4969 | + return mkmap; | ||
4970 | +#else | ||
4971 | + return (void(*)())NULL; | ||
4972 | +#endif | ||
4973 | +} | ||
4974 | + | ||
4975 | /* dict_open_register - register dictionary type */ | ||
4976 | |||
4977 | void dict_open_register(const char *type, | ||
4978 | @@ -345,6 +431,9 @@ | ||
4979 | HTABLE_INFO **ht; | ||
4980 | DICT_OPEN_INFO *dp; | ||
4981 | ARGV *mapnames; | ||
4982 | +#ifndef NO_DYNAMIC_MAPS | ||
4983 | + DLINFO *dlp; | ||
4984 | +#endif | ||
4985 | |||
4986 | if (dict_open_hash == 0) | ||
4987 | dict_open_init(); | ||
4988 | @@ -353,6 +442,13 @@ | ||
4989 | dp = (DICT_OPEN_INFO *) ht[0]->value; | ||
4990 | argv_add(mapnames, dp->type, ARGV_END); | ||
4991 | } | ||
4992 | +#ifndef NO_DYNAMIC_MAPS | ||
4993 | + if (!dict_dlinfo) | ||
4994 | + msg_fatal("dlinfo==NULL"); | ||
4995 | + for (dlp=dict_dlinfo; dlp->pattern; dlp++) { | ||
4996 | + argv_add(mapnames, dlp->pattern, ARGV_END); | ||
4997 | + } | ||
4998 | +#endif | ||
4999 | qsort((void *) mapnames->argv, mapnames->argc, sizeof(mapnames->argv[0]), | ||
5000 | dict_sort_alpha_cpp); | ||
5001 | myfree((char *) ht_info); | ||
5002 | @@ -360,6 +456,87 @@ | ||
5003 | return mapnames; | ||
5004 | } | ||
5005 | |||
5006 | +#ifndef NO_DYNAMIC_MAPS | ||
5007 | +#define STREQ(x,y) (x == y || (x[0] == y[0] && strcmp(x,y) == 0)) | ||
5008 | + | ||
5009 | +void dict_open_dlinfo(const char *path) | ||
5010 | +{ | ||
5011 | + char *myname="dict_open_dlinfo"; | ||
5012 | + VSTREAM *conf_fp=vstream_fopen(path,O_RDONLY,0); | ||
5013 | + VSTRING *buf = vstring_alloc(100); | ||
5014 | + char *cp; | ||
5015 | + ARGV *argv; | ||
5016 | + MVECT vector; | ||
5017 | + int nelm=0; | ||
5018 | + int linenum=0; | ||
5019 | + | ||
5020 | + dict_dlinfo=(DLINFO*)mvect_alloc(&vector,sizeof(DLINFO),3,NULL,NULL); | ||
5021 | + | ||
5022 | + if (!conf_fp) { | ||
5023 | + msg_warn("%s: cannot open %s. No dynamic maps will be allowed.", | ||
5024 | + myname, path); | ||
5025 | + } else { | ||
5026 | + while (vstring_get_nonl(buf,conf_fp) != VSTREAM_EOF) { | ||
5027 | + cp = vstring_str(buf); | ||
5028 | + linenum++; | ||
5029 | + if (*cp == '#' || *cp == '\0') | ||
5030 | + continue; | ||
5031 | + argv = argv_split(cp, " \t"); | ||
5032 | + if (argv->argc != 3 && argv->argc != 4) { | ||
5033 | + msg_fatal("%s: Expected \"pattern .so-name open-function [mkmap-function]\" at line %d", | ||
5034 | + myname, linenum); | ||
5035 | + } | ||
5036 | + if (STREQ(argv->argv[0],"*")) { | ||
5037 | + msg_warn("%s: wildcard dynamic map entry no longer supported.", | ||
5038 | + myname); | ||
5039 | + continue; | ||
5040 | + } | ||
5041 | + if (argv->argv[1][0] != '/') { | ||
5042 | + msg_fatal("%s: .so name must begin with a \"/\" at line %d", | ||
5043 | + myname, linenum); | ||
5044 | + } | ||
5045 | + if (nelm >= vector.nelm) { | ||
5046 | + dict_dlinfo=(DLINFO*)mvect_realloc(&vector,vector.nelm+3); | ||
5047 | + } | ||
5048 | + dict_dlinfo[nelm].pattern = mystrdup(argv->argv[0]); | ||
5049 | + dict_dlinfo[nelm].soname = mystrdup(argv->argv[1]); | ||
5050 | + dict_dlinfo[nelm].openfunc = mystrdup(argv->argv[2]); | ||
5051 | + if (argv->argc==4) | ||
5052 | + dict_dlinfo[nelm].mkmapfunc = mystrdup(argv->argv[3]); | ||
5053 | + else | ||
5054 | + dict_dlinfo[nelm].mkmapfunc = NULL; | ||
5055 | + nelm++; | ||
5056 | + argv_free(argv); | ||
5057 | + } | ||
5058 | + } | ||
5059 | + if (nelm >= vector.nelm) { | ||
5060 | + dict_dlinfo=(DLINFO*)mvect_realloc(&vector,vector.nelm+1); | ||
5061 | + } | ||
5062 | + dict_dlinfo[nelm].pattern = NULL; | ||
5063 | + dict_dlinfo[nelm].soname = NULL; | ||
5064 | + dict_dlinfo[nelm].openfunc = NULL; | ||
5065 | + dict_dlinfo[nelm].mkmapfunc = NULL; | ||
5066 | + if (conf_fp) | ||
5067 | + vstream_fclose(conf_fp); | ||
5068 | + vstring_free(buf); | ||
5069 | +} | ||
5070 | + | ||
5071 | +static DLINFO *dict_open_dlfind(const char *type) | ||
5072 | +{ | ||
5073 | + DLINFO *dp; | ||
5074 | + | ||
5075 | + if (!dict_dlinfo) | ||
5076 | + return NULL; | ||
5077 | + | ||
5078 | + for (dp=dict_dlinfo; dp->pattern; dp++) { | ||
5079 | + if (STREQ(dp->pattern,type)) | ||
5080 | + return dp; | ||
5081 | + } | ||
5082 | + return NULL; | ||
5083 | +} | ||
5084 | + | ||
5085 | +#endif /* !NO_DYNAMIC_MAPS */ | ||
5086 | + | ||
5087 | #ifdef TEST | ||
5088 | |||
5089 | /* | ||
5090 | diff -ruN a/src/util/load_lib.c b/src/util/load_lib.c | ||
5091 | --- a/src/util/load_lib.c 1970-01-01 00:00:00.000000000 +0000 | ||
5092 | +++ b/src/util/load_lib.c 2009-06-01 13:08:26.000000000 +0000 | ||
5093 | @@ -0,0 +1,135 @@ | ||
5094 | +/*++ | ||
5095 | +/* NAME | ||
5096 | +/* load_lib 3 | ||
5097 | +/* SUMMARY | ||
5098 | +/* library loading wrappers | ||
5099 | +/* SYNOPSIS | ||
5100 | +/* #include <load_lib.h> | ||
5101 | +/* | ||
5102 | +/* extern int load_library_symbols(const char *, LIB_FN *, LIB_FN *); | ||
5103 | +/* const char *libname; | ||
5104 | +/* LIB_FN *libfuncs; | ||
5105 | +/* LIB_FN *libdata; | ||
5106 | +/* | ||
5107 | +/* DESCRIPTION | ||
5108 | +/* This module loads functions from libraries, returnine pointers | ||
5109 | +/* to the named functions. | ||
5110 | +/* | ||
5111 | +/* load_library_symbols() loads all of the desired functions, and | ||
5112 | +/* returns zero for success, or exits via msg_fatal(). | ||
5113 | +/* | ||
5114 | +/* SEE ALSO | ||
5115 | +/* msg(3) diagnostics interface | ||
5116 | +/* DIAGNOSTICS | ||
5117 | +/* Problems are reported via the msg(3) diagnostics routines: | ||
5118 | +/* library not found, symbols not found, other fatal errors. | ||
5119 | +/* LICENSE | ||
5120 | +/* .ad | ||
5121 | +/* .fi | ||
5122 | +/* The Secure Mailer license must be distributed with this software. | ||
5123 | +/* AUTHOR(S) | ||
5124 | +/* LaMont Jones | ||
5125 | +/* Hewlett-Packard Company | ||
5126 | +/* 3404 Harmony Road | ||
5127 | +/* Fort Collins, CO 80528, USA | ||
5128 | +/* | ||
5129 | +/* Wietse Venema | ||
5130 | +/* IBM T.J. Watson Research | ||
5131 | +/* P.O. Box 704 | ||
5132 | +/* Yorktown Heights, NY 10598, USA | ||
5133 | +/*--*/ | ||
5134 | + | ||
5135 | +/* System libraries. */ | ||
5136 | + | ||
5137 | +#include "sys_defs.h" | ||
5138 | +#include <stdlib.h> | ||
5139 | +#include <stddef.h> | ||
5140 | +#include <string.h> | ||
5141 | +#if defined(HAS_DLOPEN) | ||
5142 | +#include <dlfcn.h> | ||
5143 | +#elif defined(HAS_SHL_LOAD) | ||
5144 | +#include <dl.h> | ||
5145 | +#endif | ||
5146 | + | ||
5147 | +/* Application-specific. */ | ||
5148 | + | ||
5149 | +#include "msg.h" | ||
5150 | +#include "load_lib.h" | ||
5151 | + | ||
5152 | +extern int load_library_symbols(const char * libname, LIB_FN * libfuncs, LIB_FN * libdata) | ||
5153 | +{ | ||
5154 | + char *myname = "load_library_symbols"; | ||
5155 | + LIB_FN *fn; | ||
5156 | + | ||
5157 | +#if defined(HAS_DLOPEN) | ||
5158 | + void *handle; | ||
5159 | + char *emsg; | ||
5160 | + | ||
5161 | + handle=dlopen(libname,RTLD_NOW); | ||
5162 | + emsg=dlerror(); | ||
5163 | + if (emsg) { | ||
5164 | + msg_fatal("%s: dlopen failure loading %s: %s", myname, libname, emsg); | ||
5165 | + } | ||
5166 | + | ||
5167 | + if (libfuncs) { | ||
5168 | + for (fn=libfuncs; fn->name; fn++) { | ||
5169 | + *(fn->ptr) = dlsym(handle,fn->name); | ||
5170 | + emsg=dlerror(); | ||
5171 | + if (emsg) { | ||
5172 | + msg_fatal("%s: dlsym failure looking up %s in %s: %s", myname, | ||
5173 | + fn->name, libname, emsg); | ||
5174 | + } | ||
5175 | + if (msg_verbose>1) { | ||
5176 | + msg_info("loaded %s = %lx",fn->name, *((long*)(fn->ptr))); | ||
5177 | + } | ||
5178 | + } | ||
5179 | + } | ||
5180 | + | ||
5181 | + if (libdata) { | ||
5182 | + for (fn=libdata; fn->name; fn++) { | ||
5183 | + *(fn->ptr) = dlsym(handle,fn->name); | ||
5184 | + emsg=dlerror(); | ||
5185 | + if (emsg) { | ||
5186 | + msg_fatal("%s: dlsym failure looking up %s in %s: %s", myname, | ||
5187 | + fn->name, libname, emsg); | ||
5188 | + } | ||
5189 | + if (msg_verbose>1) { | ||
5190 | + msg_info("loaded %s = %lx",fn->name, *((long*)(fn->ptr))); | ||
5191 | + } | ||
5192 | + } | ||
5193 | + } | ||
5194 | +#elif defined(HAS_SHL_LOAD) | ||
5195 | + shl_t handle; | ||
5196 | + | ||
5197 | + handle = shl_load(libname,BIND_IMMEDIATE,0); | ||
5198 | + | ||
5199 | + if (libfuncs) { | ||
5200 | + for (fn=libfuncs; fn->name; fn++) { | ||
5201 | + if (shl_findsym(&handle,fn->name,TYPE_PROCEDURE,fn->ptr) != 0) { | ||
5202 | + msg_fatal("%s: shl_findsym failure looking up %s in %s: %m", | ||
5203 | + myname, fn->name, libname); | ||
5204 | + } | ||
5205 | + if (msg_verbose>1) { | ||
5206 | + msg_info("loaded %s = %x",fn->name, *((long*)(fn->ptr))); | ||
5207 | + } | ||
5208 | + } | ||
5209 | + } | ||
5210 | + | ||
5211 | + if (libdata) { | ||
5212 | + for (fn=libdata; fn->name; fn++) { | ||
5213 | + if (shl_findsym(&handle,fn->name,TYPE_DATA,fn->ptr) != 0) { | ||
5214 | + msg_fatal("%s: shl_findsym failure looking up %s in %s: %m", | ||
5215 | + myname, fn->name, libname); | ||
5216 | + } | ||
5217 | + if (msg_verbose>1) { | ||
5218 | + msg_info("loaded %s = %x",fn->name, *((long*)(fn->ptr))); | ||
5219 | + } | ||
5220 | + } | ||
5221 | + } | ||
5222 | + | ||
5223 | +#else | ||
5224 | + msg_fatal("%s: need dlopen or shl_load support for dynamic libraries", | ||
5225 | + myname); | ||
5226 | +#endif | ||
5227 | + return 0; | ||
5228 | +} | ||
5229 | diff -ruN a/src/util/load_lib.h b/src/util/load_lib.h | ||
5230 | --- a/src/util/load_lib.h 1970-01-01 00:00:00.000000000 +0000 | ||
5231 | +++ b/src/util/load_lib.h 2009-06-01 13:08:26.000000000 +0000 | ||
5232 | @@ -0,0 +1,41 @@ | ||
5233 | +#ifndef _LOAD_LIB_H_INCLUDED_ | ||
5234 | +#define _LOAD_LIB_H_INCLUDED_ | ||
5235 | + | ||
5236 | +/*++ | ||
5237 | +/* NAME | ||
5238 | +/* load_lib 3h | ||
5239 | +/* SUMMARY | ||
5240 | +/* library loading wrappers | ||
5241 | +/* SYNOPSIS | ||
5242 | +/* #include "load_lib.h" | ||
5243 | +/* DESCRIPTION | ||
5244 | +/* .nf | ||
5245 | + | ||
5246 | + /* | ||
5247 | + * External interface. | ||
5248 | + */ | ||
5249 | +/* NULL name terminates list */ | ||
5250 | +typedef struct LIB_FN { | ||
5251 | + const char *name; | ||
5252 | + void **ptr; | ||
5253 | +} LIB_FN; | ||
5254 | + | ||
5255 | +extern int load_library_symbols(const char *, LIB_FN *, LIB_FN *); | ||
5256 | + | ||
5257 | +/* LICENSE | ||
5258 | +/* .ad | ||
5259 | +/* .fi | ||
5260 | +/* The Secure Mailer license must be distributed with this software. | ||
5261 | +/* AUTHOR(S) | ||
5262 | +/* LaMont Jones | ||
5263 | +/* Hewlett-Packard Company | ||
5264 | +/* 3404 Harmony Road | ||
5265 | +/* Fort Collins, CO 80528, USA | ||
5266 | +/* | ||
5267 | +/* Wietse Venema | ||
5268 | +/* IBM T.J. Watson Research | ||
5269 | +/* P.O. Box 704 | ||
5270 | +/* Yorktown Heights, NY 10598, USA | ||
5271 | +/*--*/ | ||
5272 | + | ||
5273 | +#endif | ||
diff --git a/main/postfix/postfix-2.7.0-dynamic-maps.patch b/main/postfix/postfix-2.7.0-dynamic-maps.patch new file mode 100644 index 0000000000..da1c799bec --- /dev/null +++ b/main/postfix/postfix-2.7.0-dynamic-maps.patch | |||
@@ -0,0 +1,1064 @@ | |||
1 | commit 98599e6387147a26d8433e85a4a61ef5c4240e83 | ||
2 | Author: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Mon May 31 14:49:38 2010 +0000 | ||
4 | |||
5 | added dynamic maps | ||
6 | |||
7 | diff --git a/conf/postfix-files b/conf/postfix-files | ||
8 | index 7ff93ea..7cae109 100644 | ||
9 | --- a/conf/postfix-files | ||
10 | +++ b/conf/postfix-files | ||
11 | @@ -65,6 +65,10 @@ $queue_directory/saved:d:$mail_owner:-:700:ucr | ||
12 | $queue_directory/trace:d:$mail_owner:-:700:ucr | ||
13 | $daemon_directory/anvil:f:root:-:755 | ||
14 | $daemon_directory/bounce:f:root:-:755 | ||
15 | +$daemon_directory/dict_ldap.so:f:root:-:755 | ||
16 | +$daemon_directory/dict_pcre.so:f:root:-:755 | ||
17 | +$daemon_directory/dict_mysql.so:f:root:-:755 | ||
18 | +$daemon_directory/dict_pgsql.so:f:root:-:755 | ||
19 | $daemon_directory/cleanup:f:root:-:755 | ||
20 | $daemon_directory/discard:f:root:-:755 | ||
21 | $daemon_directory/error:f:root:-:755 | ||
22 | @@ -94,6 +98,11 @@ $daemon_directory/tlsmgr:f:root:-:755 | ||
23 | $daemon_directory/trivial-rewrite:f:root:-:755 | ||
24 | $daemon_directory/verify:f:root:-:755 | ||
25 | $daemon_directory/virtual:f:root:-:755 | ||
26 | +/usr/lib/libpostfix-dns.so.1:f:root:-:755 | ||
27 | +/usr/lib/libpostfix-global.so.1:f:root:-:755 | ||
28 | +/usr/lib/libpostfix-tls.so.1:f:root:-:755 | ||
29 | +/usr/lib/libpostfix-master.so.1:f:root:-:755 | ||
30 | +/usr/lib/libpostfix-util.so.1:f:root:-:755 | ||
31 | $daemon_directory/nqmgr:h:$daemon_directory/qmgr | ||
32 | $daemon_directory/lmtp:h:$daemon_directory/smtp | ||
33 | $command_directory/postalias:f:root:-:755 | ||
34 | @@ -117,6 +126,7 @@ $config_directory/access:f:root:-:644:p1 | ||
35 | $config_directory/aliases:f:root:-:644:p1 | ||
36 | $config_directory/bounce.cf.default:f:root:-:644:1 | ||
37 | $config_directory/canonical:f:root:-:644:p1 | ||
38 | +$config_directory/dynamicmaps.cf:f:root:-:644:p | ||
39 | $config_directory/cidr_table:f:root:-:644:o | ||
40 | $config_directory/generic:f:root:-:644:p1 | ||
41 | $config_directory/generics:f:root:-:644:o | ||
42 | diff --git a/src/dns/Makefile.in b/src/dns/Makefile.in | ||
43 | index bbc5e98..f70cb96 100644 | ||
44 | --- a/src/dns/Makefile.in | ||
45 | +++ b/src/dns/Makefile.in | ||
46 | @@ -14,7 +14,7 @@ LIBS = ../../lib/libutil.a | ||
47 | LIB_DIR = ../../lib | ||
48 | INC_DIR = ../../include | ||
49 | |||
50 | -.c.o:; $(CC) $(CFLAGS) -c $*.c | ||
51 | +.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c | ||
52 | |||
53 | all: $(LIB) | ||
54 | |||
55 | @@ -31,12 +31,10 @@ tests: test dns_rr_to_pa_test dns_rr_to_sa_test dns_sa_to_rr_test \ | ||
56 | root_tests: | ||
57 | |||
58 | $(LIB): $(OBJS) | ||
59 | - $(AR) $(ARFL) $(LIB) $? | ||
60 | - $(RANLIB) $(LIB) | ||
61 | + gcc -shared -Wl,-soname,libpostfix-dns.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) | ||
62 | |||
63 | $(LIB_DIR)/$(LIB): $(LIB) | ||
64 | cp $(LIB) $(LIB_DIR) | ||
65 | - $(RANLIB) $(LIB_DIR)/$(LIB) | ||
66 | |||
67 | update: $(LIB_DIR)/$(LIB) $(HDRS) | ||
68 | -for i in $(HDRS); \ | ||
69 | diff --git a/src/global/Makefile.in b/src/global/Makefile.in | ||
70 | index 56c9b6c..b0c83d6 100644 | ||
71 | --- a/src/global/Makefile.in | ||
72 | +++ b/src/global/Makefile.in | ||
73 | @@ -34,7 +34,7 @@ OBJS = abounce.o anvil_clnt.o been_here.o bounce.o bounce_log.o \ | ||
74 | canon_addr.o cfg_parser.o cleanup_strerror.o cleanup_strflags.o \ | ||
75 | clnt_stream.o conv_time.o db_common.o debug_peer.o debug_process.o \ | ||
76 | defer.o deliver_completed.o deliver_flock.o deliver_pass.o \ | ||
77 | - deliver_request.o dict_ldap.o dict_mysql.o dict_pgsql.o \ | ||
78 | + deliver_request.o \ | ||
79 | dict_proxy.o domain_list.o dot_lockfile.o dot_lockfile_as.o \ | ||
80 | dsb_scan.o dsn.o dsn_buf.o dsn_mask.o dsn_print.o dsn_util.o \ | ||
81 | ehlo_mask.o ext_prop.o file_id.o flush_clnt.o header_opts.o \ | ||
82 | @@ -104,10 +104,13 @@ LIBS = ../../lib/libutil.a | ||
83 | LIB_DIR = ../../lib | ||
84 | INC_DIR = ../../include | ||
85 | MAKES = | ||
86 | +LDAPSO = dict_ldap.so | ||
87 | +MYSQLSO = dict_mysql.so | ||
88 | +PGSQLSO = dict_pgsql.so | ||
89 | |||
90 | -.c.o:; $(CC) $(CFLAGS) -c $*.c | ||
91 | +.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c | ||
92 | |||
93 | -all: $(LIB) | ||
94 | +all: $(LIB) $(LDAPSO) $(MYSQLSO) $(PGSQLSO) | ||
95 | |||
96 | $(OBJS): ../../conf/makedefs.out | ||
97 | |||
98 | @@ -117,14 +120,30 @@ Makefile: Makefile.in | ||
99 | test: $(TESTPROG) | ||
100 | |||
101 | $(LIB): $(OBJS) | ||
102 | - $(AR) $(ARFL) $(LIB) $? | ||
103 | - $(RANLIB) $(LIB) | ||
104 | + gcc -shared -Wl,-soname,libpostfix-global.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) | ||
105 | + | ||
106 | +$(LDAPSO): dict_ldap.o $(LIB) ../../lib/libglobal.a | ||
107 | + gcc -shared -Wl,-soname,dict_ldap.so -o $@ $? -lldap -llber -L../../lib -lutil -L. -lglobal | ||
108 | + | ||
109 | +$(MYSQLSO): dict_mysql.o $(LIB) ../../lib/libglobal.a | ||
110 | + gcc -shared -Wl,-soname,dict_mysql.so -o $@ $? -lmysqlclient -L. -lutil -lglobal | ||
111 | + | ||
112 | +$(PGSQLSO): dict_pgsql.o $(LIB) ../../lib/libglobal.a | ||
113 | + gcc -shared -Wl,-soname,dict_pgsql.so -o $@ $? -lpq -L. -lutil -lglobal | ||
114 | |||
115 | $(LIB_DIR)/$(LIB): $(LIB) | ||
116 | cp $(LIB) $(LIB_DIR) | ||
117 | - $(RANLIB) $(LIB_DIR)/$(LIB) | ||
118 | |||
119 | -update: $(LIB_DIR)/$(LIB) $(HDRS) | ||
120 | +../../libexec/$(LDAPSO): $(LDAPSO) | ||
121 | + cp $(LDAPSO) ../../libexec | ||
122 | + | ||
123 | +../../libexec/$(MYSQLSO): $(MYSQLSO) | ||
124 | + cp $(MYSQLSO) ../../libexec | ||
125 | + | ||
126 | +../../libexec/$(PGSQLSO): $(PGSQLSO) | ||
127 | + cp $(PGSQLSO) ../../libexec | ||
128 | + | ||
129 | +update: $(LIB_DIR)/$(LIB) ../../libexec/$(LDAPSO) ../../libexec/$(MYSQLSO) ../../libexec/$(PGSQLSO) $(HDRS) | ||
130 | -for i in $(HDRS); \ | ||
131 | do \ | ||
132 | cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \ | ||
133 | @@ -492,7 +511,7 @@ lint: | ||
134 | lint $(DEFS) $(SRCS) $(LINTFIX) | ||
135 | |||
136 | clean: | ||
137 | - rm -f *.o $(LIB) *core $(TESTPROG) junk | ||
138 | + rm -f *.o $(LIB) $(LDAPSO) $(MYSQLSO) $(PGSQLSO) *core $(TESTPROG) junk | ||
139 | rm -rf printfck | ||
140 | |||
141 | tidy: clean | ||
142 | diff --git a/src/global/mail_conf.c b/src/global/mail_conf.c | ||
143 | index c5d3d43..feb7d66 100644 | ||
144 | --- a/src/global/mail_conf.c | ||
145 | +++ b/src/global/mail_conf.c | ||
146 | @@ -182,6 +182,13 @@ void mail_conf_suck(void) | ||
147 | path = concatenate(var_config_dir, "/", "main.cf", (char *) 0); | ||
148 | dict_load_file(CONFIG_DICT, path); | ||
149 | myfree(path); | ||
150 | + | ||
151 | +#ifndef NO_DYNAMIC_MAPS | ||
152 | + path = concatenate(var_config_dir, "/", "dynamicmaps.cf", (char *) 0); | ||
153 | + dict_open_dlinfo(path); | ||
154 | + myfree(path); | ||
155 | +#endif | ||
156 | + | ||
157 | } | ||
158 | |||
159 | /* mail_conf_flush - discard configuration dictionary */ | ||
160 | diff --git a/src/global/mail_dict.c b/src/global/mail_dict.c | ||
161 | index 35ecffb..c1ff165 100644 | ||
162 | --- a/src/global/mail_dict.c | ||
163 | +++ b/src/global/mail_dict.c | ||
164 | @@ -45,6 +45,7 @@ typedef struct { | ||
165 | |||
166 | static const DICT_OPEN_INFO dict_open_info[] = { | ||
167 | DICT_TYPE_PROXY, dict_proxy_open, | ||
168 | +#ifdef NO_DYNAMIC_MAPS | ||
169 | #ifdef HAS_LDAP | ||
170 | DICT_TYPE_LDAP, dict_ldap_open, | ||
171 | #endif | ||
172 | @@ -54,6 +55,7 @@ static const DICT_OPEN_INFO dict_open_info[] = { | ||
173 | #ifdef HAS_PGSQL | ||
174 | DICT_TYPE_PGSQL, dict_pgsql_open, | ||
175 | #endif | ||
176 | +#endif /* NO_DYNAMIC_MAPS */ | ||
177 | 0, | ||
178 | }; | ||
179 | |||
180 | diff --git a/src/global/mail_params.c b/src/global/mail_params.c | ||
181 | index f5350a1..1bbad7a 100644 | ||
182 | --- a/src/global/mail_params.c | ||
183 | +++ b/src/global/mail_params.c | ||
184 | @@ -79,6 +79,7 @@ | ||
185 | /* char *var_export_environ; | ||
186 | /* char *var_debug_peer_list; | ||
187 | /* int var_debug_peer_level; | ||
188 | +/* int var_command_maxtime; | ||
189 | /* int var_in_flow_delay; | ||
190 | /* int var_fault_inj_code; | ||
191 | /* char *var_bounce_service; | ||
192 | @@ -265,6 +266,7 @@ char *var_import_environ; | ||
193 | char *var_export_environ; | ||
194 | char *var_debug_peer_list; | ||
195 | int var_debug_peer_level; | ||
196 | +int var_command_maxtime; | ||
197 | int var_fault_inj_code; | ||
198 | char *var_bounce_service; | ||
199 | char *var_cleanup_service; | ||
200 | @@ -276,6 +278,7 @@ char *var_showq_service; | ||
201 | char *var_error_service; | ||
202 | char *var_flush_service; | ||
203 | char *var_verify_service; | ||
204 | +char *var_scache_service; | ||
205 | char *var_trace_service; | ||
206 | char *var_proxymap_service; | ||
207 | char *var_proxywrite_service; | ||
208 | diff --git a/src/global/mkmap_open.c b/src/global/mkmap_open.c | ||
209 | index 69a0d57..eb8de71 100644 | ||
210 | --- a/src/global/mkmap_open.c | ||
211 | +++ b/src/global/mkmap_open.c | ||
212 | @@ -81,7 +81,7 @@ | ||
213 | * We use a different table (in dict_open.c) when querying maps. | ||
214 | */ | ||
215 | typedef struct { | ||
216 | - char *type; | ||
217 | + const char *type; | ||
218 | MKMAP *(*before_open) (const char *); | ||
219 | } MKMAP_OPEN_INFO; | ||
220 | |||
221 | @@ -156,7 +156,16 @@ MKMAP *mkmap_open(const char *type, const char *path, | ||
222 | */ | ||
223 | for (mp = mkmap_types; /* void */ ; mp++) { | ||
224 | if (mp->type == 0) | ||
225 | +#ifndef NO_DYNAMIC_MAPS | ||
226 | + { | ||
227 | + static MKMAP_OPEN_INFO oi; | ||
228 | + oi.before_open=(MKMAP*(*)(const char*))dict_mkmap_func(type); | ||
229 | + oi.type=type; | ||
230 | + mp=&oi; | ||
231 | + } | ||
232 | +#else | ||
233 | msg_fatal("unsupported map type: %s", type); | ||
234 | +#endif | ||
235 | if (strcmp(type, mp->type) == 0) | ||
236 | break; | ||
237 | } | ||
238 | diff --git a/src/master/Makefile.in b/src/master/Makefile.in | ||
239 | index 53f65bd..48ca35e 100644 | ||
240 | --- a/src/master/Makefile.in | ||
241 | +++ b/src/master/Makefile.in | ||
242 | @@ -20,7 +20,7 @@ LIB_DIR = ../../lib | ||
243 | INC_DIR = ../../include | ||
244 | BIN_DIR = ../../libexec | ||
245 | |||
246 | -.c.o:; $(CC) $(CFLAGS) -c $*.c | ||
247 | +.c.o:; $(CC) `for i in $(LIB_OBJ); do [ $$i = $@ ] && echo -fPIC; done` $(CFLAGS) -c $*.c | ||
248 | |||
249 | all: $(PROG) $(LIB) | ||
250 | |||
251 | @@ -39,12 +39,10 @@ tests: | ||
252 | root_tests: | ||
253 | |||
254 | $(LIB): $(LIB_OBJ) | ||
255 | - $(AR) $(ARFL) $(LIB) $? | ||
256 | - $(RANLIB) $(LIB) | ||
257 | + gcc -shared -Wl,-soname,libpostfix-master.so.1 -o $(LIB) $(LIB_OBJ) $(LIBS) $(SYSLIBS) | ||
258 | |||
259 | $(LIB_DIR)/$(LIB): $(LIB) | ||
260 | cp $(LIB) $(LIB_DIR)/$(LIB) | ||
261 | - $(RANLIB) $(LIB_DIR)/$(LIB) | ||
262 | |||
263 | $(BIN_DIR)/$(PROG): $(PROG) | ||
264 | cp $(PROG) $(BIN_DIR) | ||
265 | diff --git a/src/milter/Makefile.in b/src/milter/Makefile.in | ||
266 | index c28263a..549b868 100644 | ||
267 | --- a/src/milter/Makefile.in | ||
268 | +++ b/src/milter/Makefile.in | ||
269 | @@ -14,7 +14,7 @@ LIB_DIR = ../../lib | ||
270 | INC_DIR = ../../include | ||
271 | MAKES = | ||
272 | |||
273 | -.c.o:; $(CC) $(CFLAGS) -c $*.c | ||
274 | +.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c | ||
275 | |||
276 | all: $(LIB) | ||
277 | |||
278 | @@ -30,12 +30,10 @@ tests: | ||
279 | root_tests: | ||
280 | |||
281 | $(LIB): $(OBJS) | ||
282 | - $(AR) $(ARFL) $(LIB) $? | ||
283 | - $(RANLIB) $(LIB) | ||
284 | + gcc -shared -Wl,-soname,libpostfix-milter.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) | ||
285 | |||
286 | $(LIB_DIR)/$(LIB): $(LIB) | ||
287 | cp $(LIB) $(LIB_DIR) | ||
288 | - $(RANLIB) $(LIB_DIR)/$(LIB) | ||
289 | |||
290 | update: $(LIB_DIR)/$(LIB) $(HDRS) | ||
291 | -for i in $(HDRS); \ | ||
292 | diff --git a/src/postconf/postconf.c b/src/postconf/postconf.c | ||
293 | index d1ae434..dd604bb 100644 | ||
294 | --- a/src/postconf/postconf.c | ||
295 | +++ b/src/postconf/postconf.c | ||
296 | @@ -965,6 +965,16 @@ static void show_maps(void) | ||
297 | { | ||
298 | ARGV *maps_argv; | ||
299 | int i; | ||
300 | +#ifndef NO_DYNAMIC_MAPS | ||
301 | + char *path; | ||
302 | + char *config_dir; | ||
303 | + | ||
304 | + var_config_dir = mystrdup((config_dir = safe_getenv(CONF_ENV_PATH)) != 0 ? | ||
305 | + config_dir : DEF_CONFIG_DIR); /* XXX */ | ||
306 | + path = concatenate(var_config_dir, "/", "dynamicmaps.cf", (char *) 0); | ||
307 | + dict_open_dlinfo(path); | ||
308 | + myfree(path); | ||
309 | +#endif | ||
310 | |||
311 | maps_argv = dict_mapnames(); | ||
312 | for (i = 0; i < maps_argv->argc; i++) | ||
313 | diff --git a/src/postmap/postmap.c b/src/postmap/postmap.c | ||
314 | index e956aed..712d041 100644 | ||
315 | --- a/src/postmap/postmap.c | ||
316 | +++ b/src/postmap/postmap.c | ||
317 | @@ -5,7 +5,7 @@ | ||
318 | /* Postfix lookup table management | ||
319 | /* SYNOPSIS | ||
320 | /* .fi | ||
321 | -/* \fBpostmap\fR [\fB-Nbfhimnoprsvw\fR] [\fB-c \fIconfig_dir\fR] | ||
322 | +/* \fBpostmap\fR [\fB-Nbfhimnoprsuvw\fR] [\fB-c \fIconfig_dir\fR] | ||
323 | /* [\fB-d \fIkey\fR] [\fB-q \fIkey\fR] | ||
324 | /* [\fIfile_type\fR:]\fIfile_name\fR ... | ||
325 | /* DESCRIPTION | ||
326 | @@ -151,6 +151,8 @@ | ||
327 | /* .sp | ||
328 | /* This feature is available in Postfix version 2.2 and later, | ||
329 | /* and is not available for all database types. | ||
330 | +/* .IP \fB-u\fR | ||
331 | +/* Upgrade the database to the current version. | ||
332 | /* .IP \fB-v\fR | ||
333 | /* Enable verbose logging for debugging purposes. Multiple \fB-v\fR | ||
334 | /* options make the software increasingly verbose. | ||
335 | @@ -723,6 +725,18 @@ static void postmap_seq(const char *map_type, const char *map_name, | ||
336 | dict_close(dict); | ||
337 | } | ||
338 | |||
339 | +/* postmap_upgrade - upgrade a map */ | ||
340 | + | ||
341 | +static int postmap_upgrade(const char *map_type, const char *map_name) | ||
342 | +{ | ||
343 | + DICT *dict; | ||
344 | + | ||
345 | + dict = dict_open3(map_type, map_name, O_RDWR, | ||
346 | + DICT_FLAG_LOCK|DICT_FLAG_UPGRADE); | ||
347 | + dict_close(dict); | ||
348 | + return (dict != 0); | ||
349 | +} | ||
350 | + | ||
351 | /* usage - explain */ | ||
352 | |||
353 | static NORETURN usage(char *myname) | ||
354 | @@ -743,6 +757,7 @@ int main(int argc, char **argv) | ||
355 | int postmap_flags = POSTMAP_FLAG_AS_OWNER | POSTMAP_FLAG_SAVE_PERM; | ||
356 | int open_flags = O_RDWR | O_CREAT | O_TRUNC; | ||
357 | int dict_flags = DICT_FLAG_DUP_WARN | DICT_FLAG_FOLD_FIX; | ||
358 | + int upgrade = 0; | ||
359 | char *query = 0; | ||
360 | char *delkey = 0; | ||
361 | int sequence = 0; | ||
362 | @@ -787,7 +802,7 @@ int main(int argc, char **argv) | ||
363 | /* | ||
364 | * Parse JCL. | ||
365 | */ | ||
366 | - while ((ch = GETOPT(argc, argv, "Nbc:d:fhimnopq:rsvw")) > 0) { | ||
367 | + while ((ch = GETOPT(argc, argv, "Nbc:d:fhimnopq:rsuvw")) > 0) { | ||
368 | switch (ch) { | ||
369 | default: | ||
370 | usage(argv[0]); | ||
371 | @@ -804,8 +819,8 @@ int main(int argc, char **argv) | ||
372 | msg_fatal("out of memory"); | ||
373 | break; | ||
374 | case 'd': | ||
375 | - if (sequence || query || delkey) | ||
376 | - msg_fatal("specify only one of -s -q or -d"); | ||
377 | + if (sequence || query || delkey || upgrade) | ||
378 | + msg_fatal("specify only one of -s -q -u or -d"); | ||
379 | delkey = optarg; | ||
380 | break; | ||
381 | case 'f': | ||
382 | @@ -831,8 +846,8 @@ int main(int argc, char **argv) | ||
383 | postmap_flags &= ~POSTMAP_FLAG_SAVE_PERM; | ||
384 | break; | ||
385 | case 'q': | ||
386 | - if (sequence || query || delkey) | ||
387 | - msg_fatal("specify only one of -s -q or -d"); | ||
388 | + if (sequence || query || delkey || upgrade) | ||
389 | + msg_fatal("specify only one of -s -q -u or -d"); | ||
390 | query = optarg; | ||
391 | break; | ||
392 | case 'r': | ||
393 | @@ -840,10 +855,15 @@ int main(int argc, char **argv) | ||
394 | dict_flags |= DICT_FLAG_DUP_REPLACE; | ||
395 | break; | ||
396 | case 's': | ||
397 | - if (query || delkey) | ||
398 | - msg_fatal("specify only one of -s or -q or -d"); | ||
399 | + if (query || delkey || upgrade) | ||
400 | + msg_fatal("specify only one of -s or -q or -u or -d"); | ||
401 | sequence = 1; | ||
402 | break; | ||
403 | + case 'u': | ||
404 | + if (sequence || query || delkey || upgrade) | ||
405 | + msg_fatal("specify only one of -s -q -u or -d"); | ||
406 | + upgrade=1; | ||
407 | + break; | ||
408 | case 'v': | ||
409 | msg_verbose++; | ||
410 | break; | ||
411 | @@ -914,6 +934,21 @@ int main(int argc, char **argv) | ||
412 | exit(0); | ||
413 | } | ||
414 | exit(1); | ||
415 | + } else if (upgrade) { /* Upgrade the map(s) */ | ||
416 | + int success = 1; | ||
417 | + if (optind + 1 > argc) | ||
418 | + usage(argv[0]); | ||
419 | + while (optind < argc) { | ||
420 | + if ((path_name = split_at(argv[optind], ':')) != 0) { | ||
421 | + success &= postmap_upgrade(argv[optind], path_name); | ||
422 | + } else { | ||
423 | + success &= postmap_upgrade(var_db_type, path_name); | ||
424 | + } | ||
425 | + if (!success) | ||
426 | + exit(1); | ||
427 | + optind++; | ||
428 | + } | ||
429 | + exit(0); | ||
430 | } else { /* create/update map(s) */ | ||
431 | if (optind + 1 > argc) | ||
432 | usage(argv[0]); | ||
433 | diff --git a/src/tls/Makefile.in b/src/tls/Makefile.in | ||
434 | index 1a8e26d..1f26fd8 100644 | ||
435 | --- a/src/tls/Makefile.in | ||
436 | +++ b/src/tls/Makefile.in | ||
437 | @@ -22,7 +22,7 @@ LIB_DIR = ../../lib | ||
438 | INC_DIR = ../../include | ||
439 | MAKES = | ||
440 | |||
441 | -.c.o:; $(CC) $(CFLAGS) -c $*.c | ||
442 | +.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c | ||
443 | |||
444 | all: $(LIB) | ||
445 | |||
446 | @@ -38,12 +38,10 @@ tests: | ||
447 | root_tests: | ||
448 | |||
449 | $(LIB): $(OBJS) | ||
450 | - $(AR) $(ARFL) $(LIB) $? | ||
451 | - $(RANLIB) $(LIB) | ||
452 | + gcc -shared -Wl,-soname,libpostfix-tls.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) | ||
453 | |||
454 | $(LIB_DIR)/$(LIB): $(LIB) | ||
455 | cp $(LIB) $(LIB_DIR) | ||
456 | - $(RANLIB) $(LIB_DIR)/$(LIB) | ||
457 | |||
458 | update: $(LIB_DIR)/$(LIB) $(HDRS) | ||
459 | -for i in $(HDRS); \ | ||
460 | diff --git a/src/util/Makefile.in b/src/util/Makefile.in | ||
461 | index 653919c..21e918a 100644 | ||
462 | --- a/src/util/Makefile.in | ||
463 | +++ b/src/util/Makefile.in | ||
464 | @@ -32,21 +32,22 @@ SRCS = alldig.c allprint.c argv.c argv_split.c attr_clnt.c attr_print0.c \ | ||
465 | write_buf.c write_wait.c sane_basename.c format_tv.c allspace.c \ | ||
466 | allascii.c load_file.c killme_after.c vstream_tweak.c upass_connect.c \ | ||
467 | upass_listen.c upass_trigger.c edit_file.c inet_windowsize.c \ | ||
468 | - unix_pass_fd_fix.c dict_cache.c | ||
469 | + unix_pass_fd_fix.c dict_cache.c load_lib.c | ||
470 | OBJS = alldig.o allprint.o argv.o argv_split.o attr_clnt.o attr_print0.o \ | ||
471 | attr_print64.o attr_print_plain.o attr_scan0.o attr_scan64.o \ | ||
472 | attr_scan_plain.o auto_clnt.o base64_code.o basename.o binhash.o \ | ||
473 | chroot_uid.o cidr_match.o clean_env.o close_on_exec.o concatenate.o \ | ||
474 | ctable.o dict.o dict_alloc.o dict_cdb.o dict_cidr.o dict_db.o \ | ||
475 | dict_dbm.o dict_debug.o dict_env.o dict_ht.o dict_ni.o dict_nis.o \ | ||
476 | - dict_nisplus.o dict_open.o dict_pcre.o dict_regexp.o dict_sdbm.o \ | ||
477 | - dict_static.o dict_tcp.o dict_unix.o dir_forest.o doze.o dummy_read.o \ | ||
478 | + dict_nisplus.o dict_open.o dict_regexp.o \ | ||
479 | + dict_static.o dict_unix.o dir_forest.o doze.o dummy_read.o \ | ||
480 | dummy_write.o duplex_pipe.o environ.o events.o exec_command.o \ | ||
481 | fifo_listen.o fifo_trigger.o file_limit.o find_inet.o fsspace.o \ | ||
482 | fullname.o get_domainname.o get_hostname.o hex_code.o hex_quote.o \ | ||
483 | host_port.o htable.o inet_addr_host.o inet_addr_list.o \ | ||
484 | inet_addr_local.o inet_connect.o inet_listen.o inet_proto.o \ | ||
485 | inet_trigger.o line_wrap.o lowercase.o lstat_as.o mac_expand.o \ | ||
486 | + load_lib.o \ | ||
487 | mac_parse.o make_dirs.o mask_addr.o match_list.o match_ops.o msg.o \ | ||
488 | msg_output.o msg_syslog.o msg_vstream.o mvect.o myaddrinfo.o myflock.o \ | ||
489 | mymalloc.o myrand.o mystrtok.o name_code.o name_mask.o netstring.o \ | ||
490 | @@ -80,7 +81,7 @@ HDRS = argv.h attr.h attr_clnt.h auto_clnt.h base64_code.h binhash.h \ | ||
491 | msg_output.h msg_syslog.h msg_vstream.h mvect.h myaddrinfo.h myflock.h \ | ||
492 | mymalloc.h myrand.h name_code.h name_mask.h netstring.h nvtable.h \ | ||
493 | open_as.h open_lock.h percentm.h posix_signals.h readlline.h ring.h \ | ||
494 | - safe.h safe_open.h sane_accept.h sane_connect.h sane_fsops.h \ | ||
495 | + safe.h safe_open.h sane_accept.h sane_connect.h sane_fsops.h load_lib.h \ | ||
496 | sane_socketpair.h sane_time.h scan_dir.h set_eugid.h set_ugid.h \ | ||
497 | sigdelay.h sock_addr.h spawn_command.h split_at.h stat_as.h \ | ||
498 | stringops.h sys_defs.h timed_connect.h timed_wait.h trigger.h \ | ||
499 | @@ -93,6 +94,7 @@ DEFS = -I. -D$(SYSTYPE) | ||
500 | CFLAGS = $(DEBUG) $(OPT) $(DEFS) | ||
501 | FILES = Makefile $(SRCS) $(HDRS) | ||
502 | INCL = | ||
503 | +PCRESO = dict_pcre.so | ||
504 | LIB = libutil.a | ||
505 | TESTPROG= dict_open dup2_pass_on_exec events exec_command fifo_open \ | ||
506 | fifo_rdonly_bug fifo_rdwr_bug fifo_trigger fsspace fullname \ | ||
507 | @@ -108,10 +110,11 @@ TESTPROG= dict_open dup2_pass_on_exec events exec_command fifo_open \ | ||
508 | |||
509 | LIB_DIR = ../../lib | ||
510 | INC_DIR = ../../include | ||
511 | +LIBS = $(LIB_DIR)/$(LIB) $(PCRESO) | ||
512 | |||
513 | -.c.o:; $(CC) $(CFLAGS) -c $*.c | ||
514 | +.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c | ||
515 | |||
516 | -all: $(LIB) | ||
517 | +all: $(LIB) $(PCRESO) | ||
518 | |||
519 | $(OBJS): ../../conf/makedefs.out | ||
520 | |||
521 | @@ -120,15 +123,19 @@ Makefile: Makefile.in | ||
522 | |||
523 | test: $(TESTPROG) | ||
524 | |||
525 | +$(PCRESO): dict_pcre.o libutil.a | ||
526 | + gcc -shared -Wl,-soname,dict_pcre.so -o $@ $? -lpcre -L. -lutil | ||
527 | + | ||
528 | $(LIB): $(OBJS) | ||
529 | - $(AR) $(ARFL) $(LIB) $? | ||
530 | - $(RANLIB) $(LIB) | ||
531 | + gcc -shared -Wl,-soname,libpostfix-util.so.1 -o $(LIB) $(OBJS) -ldl $(SYSLIBS) | ||
532 | |||
533 | $(LIB_DIR)/$(LIB): $(LIB) | ||
534 | cp $(LIB) $(LIB_DIR) | ||
535 | - $(RANLIB) $(LIB_DIR)/$(LIB) | ||
536 | |||
537 | -update: $(LIB_DIR)/$(LIB) $(HDRS) | ||
538 | +../../libexec/$(PCRESO): $(PCRESO) | ||
539 | + cp $(PCRESO) ../../libexec | ||
540 | + | ||
541 | +update: $(LIBS) ../../libexec/$(PCRESO) $(HDRS) | ||
542 | -for i in $(HDRS); \ | ||
543 | do \ | ||
544 | cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \ | ||
545 | @@ -150,7 +157,8 @@ lint: | ||
546 | lint $(SRCS) | ||
547 | |||
548 | clean: | ||
549 | - rm -f *.o $(LIB) *core $(TESTPROG) junk $(MAKES) *.tmp | ||
550 | + rm -f *.o $(LIB) $(PCRESO) *core $(TESTPROG) \ | ||
551 | + junk $(MAKES) *.tmp | ||
552 | rm -rf printfck | ||
553 | |||
554 | tidy: clean | ||
555 | diff --git a/src/util/dict.h b/src/util/dict.h | ||
556 | index 9829d28..d7dc53c 100644 | ||
557 | --- a/src/util/dict.h | ||
558 | +++ b/src/util/dict.h | ||
559 | @@ -66,6 +66,7 @@ extern DICT *dict_debug(DICT *); | ||
560 | #define DICT_FLAG_NO_UNAUTH (1<<13) /* disallow unauthenticated data */ | ||
561 | #define DICT_FLAG_FOLD_FIX (1<<14) /* case-fold key with fixed-case map */ | ||
562 | #define DICT_FLAG_FOLD_MUL (1<<15) /* case-fold key with multi-case map */ | ||
563 | +#define DICT_FLAG_UPGRADE (1<<30) /* Upgrade the db */ | ||
564 | #define DICT_FLAG_FOLD_ANY (DICT_FLAG_FOLD_FIX | DICT_FLAG_FOLD_MUL) | ||
565 | |||
566 | /* IMPORTANT: Update the dict_mask[] table when the above changes */ | ||
567 | @@ -138,6 +139,11 @@ extern const char *dict_eval(const char *, const char *, int); | ||
568 | extern DICT *dict_open(const char *, int, int); | ||
569 | extern DICT *dict_open3(const char *, const char *, int, int); | ||
570 | extern void dict_open_register(const char *, DICT *(*) (const char *, int, int)); | ||
571 | +#ifndef NO_DYNAMIC_MAPS | ||
572 | +extern void dict_open_dlinfo(const char *path); | ||
573 | +typedef void* (*dict_mkmap_func_t)(const char *); | ||
574 | +dict_mkmap_func_t dict_mkmap_func(const char *dict_type); | ||
575 | +#endif | ||
576 | |||
577 | #define dict_get(dp, key) ((const char *) (dp)->lookup((dp), (key))) | ||
578 | #define dict_put(dp, key, val) (dp)->update((dp), (key), (val)) | ||
579 | diff --git a/src/util/dict_db.c b/src/util/dict_db.c | ||
580 | index e4b301d..8dc9c9d 100644 | ||
581 | --- a/src/util/dict_db.c | ||
582 | +++ b/src/util/dict_db.c | ||
583 | @@ -675,6 +675,12 @@ static DICT *dict_db_open(const char *class, const char *path, int open_flags, | ||
584 | msg_fatal("set DB cache size %d: %m", dict_db_cache_size); | ||
585 | if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0) | ||
586 | msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM); | ||
587 | + if (dict_flags & DICT_FLAG_UPGRADE) { | ||
588 | + if (msg_verbose) | ||
589 | + msg_info("upgrading database %s",db_path); | ||
590 | + if ((errno = db->upgrade(db,db_path,0)) != 0) | ||
591 | + msg_fatal("upgrade of database %s: %m",db_path); | ||
592 | + } | ||
593 | #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) | ||
594 | if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 0) | ||
595 | msg_fatal("open database %s: %m", db_path); | ||
596 | diff --git a/src/util/dict_dbm.c b/src/util/dict_dbm.c | ||
597 | index 3603e44..adc5258 100644 | ||
598 | --- a/src/util/dict_dbm.c | ||
599 | +++ b/src/util/dict_dbm.c | ||
600 | @@ -409,6 +409,10 @@ DICT *dict_dbm_open(const char *path, int open_flags, int dict_flags) | ||
601 | char *dbm_path; | ||
602 | int lock_fd; | ||
603 | |||
604 | +#ifdef HAVE_GDBM | ||
605 | + msg_fatal("%s: gdbm maps use locking that is incompatible with postfix. Use a hash map instead.", | ||
606 | + path); | ||
607 | +#endif | ||
608 | /* | ||
609 | * Note: DICT_FLAG_LOCK is used only by programs that do fine-grained (in | ||
610 | * the time domain) locking while accessing individual database records. | ||
611 | diff --git a/src/util/dict_open.c b/src/util/dict_open.c | ||
612 | index b807bc2..0f4e382 100644 | ||
613 | --- a/src/util/dict_open.c | ||
614 | +++ b/src/util/dict_open.c | ||
615 | @@ -44,6 +44,8 @@ | ||
616 | /* DICT *(*open) (const char *, int, int); | ||
617 | /* | ||
618 | /* ARGV *dict_mapnames() | ||
619 | +/* | ||
620 | +/* void (*)() dict_mkmap_func(const char *dict_type) | ||
621 | /* DESCRIPTION | ||
622 | /* This module implements a low-level interface to multiple | ||
623 | /* physical dictionary types. | ||
624 | @@ -159,6 +161,9 @@ | ||
625 | /* | ||
626 | /* dict_mapnames() returns a sorted list with the names of all available | ||
627 | /* dictionary types. | ||
628 | +/* | ||
629 | +/* dict_mkmap_func() returns a pointer to the mkmap setup function | ||
630 | +/* for the given map type, as given in /etc/dynamicmaps.cf | ||
631 | /* DIAGNOSTICS | ||
632 | /* Fatal error: open error, unsupported dictionary type, attempt to | ||
633 | /* update non-writable dictionary. | ||
634 | @@ -183,6 +188,9 @@ | ||
635 | #include <strings.h> | ||
636 | #endif | ||
637 | |||
638 | +#include <sys/stat.h> | ||
639 | +#include <unistd.h> | ||
640 | + | ||
641 | /* Utility library. */ | ||
642 | |||
643 | #include <argv.h> | ||
644 | @@ -208,6 +216,27 @@ | ||
645 | #include <split_at.h> | ||
646 | #include <htable.h> | ||
647 | |||
648 | +#ifndef NO_DYNAMIC_MAPS | ||
649 | +#include <load_lib.h> | ||
650 | +#include <vstring.h> | ||
651 | +#include <vstream.h> | ||
652 | +#include <vstring_vstream.h> | ||
653 | +#include <mvect.h> | ||
654 | + | ||
655 | + /* | ||
656 | + * Interface for dynamic map loading. | ||
657 | + */ | ||
658 | +typedef struct { | ||
659 | + const char *pattern; | ||
660 | + const char *soname; | ||
661 | + const char *openfunc; | ||
662 | + const char *mkmapfunc; | ||
663 | +} DLINFO; | ||
664 | + | ||
665 | +static DLINFO *dict_dlinfo; | ||
666 | +static DLINFO *dict_open_dlfind(const char *type); | ||
667 | +#endif | ||
668 | + | ||
669 | /* | ||
670 | * lookup table for available map types. | ||
671 | */ | ||
672 | @@ -223,7 +252,9 @@ static const DICT_OPEN_INFO dict_open_info[] = { | ||
673 | DICT_TYPE_ENVIRON, dict_env_open, | ||
674 | DICT_TYPE_HT, dict_ht_open, | ||
675 | DICT_TYPE_UNIX, dict_unix_open, | ||
676 | +#ifdef NO_DYNAMIC_MAPS | ||
677 | DICT_TYPE_TCP, dict_tcp_open, | ||
678 | +#endif | ||
679 | #ifdef HAS_SDBM | ||
680 | DICT_TYPE_SDBM, dict_sdbm_open, | ||
681 | #endif | ||
682 | @@ -243,9 +274,11 @@ static const DICT_OPEN_INFO dict_open_info[] = { | ||
683 | #ifdef HAS_NETINFO | ||
684 | DICT_TYPE_NETINFO, dict_ni_open, | ||
685 | #endif | ||
686 | +#ifdef NO_DYNAMIC_MAPS | ||
687 | #ifdef HAS_PCRE | ||
688 | DICT_TYPE_PCRE, dict_pcre_open, | ||
689 | #endif | ||
690 | +#endif /* NO_DYNAMIC_MAPS */ | ||
691 | #ifdef HAS_POSIX_REGEXP | ||
692 | DICT_TYPE_REGEXP, dict_regexp_open, | ||
693 | #endif | ||
694 | @@ -303,8 +336,31 @@ DICT *dict_open3(const char *dict_type, const char *dict_name, | ||
695 | dict_type, dict_name); | ||
696 | if (dict_open_hash == 0) | ||
697 | dict_open_init(); | ||
698 | - if ((dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type)) == 0) | ||
699 | - msg_fatal("unsupported dictionary type: %s", dict_type); | ||
700 | + if ((dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type)) == 0) { | ||
701 | +#ifdef NO_DYNAMIC_MAPS | ||
702 | + msg_fatal("%s: unsupported dictionary type: %s", myname, dict_type); | ||
703 | +#else | ||
704 | + struct stat st; | ||
705 | + LIB_FN fn[2]; | ||
706 | + DICT *(*open) (const char *, int, int); | ||
707 | + DLINFO *dl=dict_open_dlfind(dict_type); | ||
708 | + if (!dl) | ||
709 | + msg_fatal("%s: unsupported dictionary type: %s: Is the postfix-%s package installed?", myname, dict_type, dict_type); | ||
710 | + if (stat(dl->soname,&st) < 0) { | ||
711 | + msg_fatal("%s: unsupported dictionary type: %s (%s not found. Is the postfix-%s package installed?)", | ||
712 | + myname, dict_type, dl->soname, dict_type); | ||
713 | + } | ||
714 | + fn[0].name = dl->openfunc; | ||
715 | + fn[0].ptr = (void**)&open; | ||
716 | + fn[1].name = NULL; | ||
717 | + load_library_symbols(dl->soname, fn, NULL); | ||
718 | + dict_open_register(dict_type, open); | ||
719 | + dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type); | ||
720 | +#endif | ||
721 | + } | ||
722 | + if (msg_verbose>1) { | ||
723 | + msg_info("%s: calling %s open routine",myname,dict_type); | ||
724 | + } | ||
725 | if ((dict = dp->open(dict_name, open_flags, dict_flags)) == 0) | ||
726 | msg_fatal("opening %s:%s %m", dict_type, dict_name); | ||
727 | if (msg_verbose) | ||
728 | @@ -312,6 +368,36 @@ DICT *dict_open3(const char *dict_type, const char *dict_name, | ||
729 | return (dict); | ||
730 | } | ||
731 | |||
732 | +dict_mkmap_func_t dict_mkmap_func(const char *dict_type) | ||
733 | +{ | ||
734 | + char *myname="dict_mkmap_func"; | ||
735 | + struct stat st; | ||
736 | + LIB_FN fn[2]; | ||
737 | + dict_mkmap_func_t mkmap; | ||
738 | + DLINFO *dl; | ||
739 | +#ifndef NO_DYNAMIC_MAPS | ||
740 | + if (!dict_dlinfo) | ||
741 | + msg_fatal("dlinfo==NULL"); | ||
742 | + dl=dict_open_dlfind(dict_type); | ||
743 | + if (!dl) | ||
744 | + msg_fatal("%s: unsupported dictionary type: %s: Is the postfix-%s package installed?", myname, dict_type, dict_type); | ||
745 | + if (stat(dl->soname,&st) < 0) { | ||
746 | + msg_fatal("%s: unsupported dictionary type: %s (%s not found. Is the postfix-%s package installed?)", | ||
747 | + myname, dict_type, dl->soname, dict_type); | ||
748 | + } | ||
749 | + if (!dl->mkmapfunc) | ||
750 | + msg_fatal("%s: unsupported dictionary type: %s does not allow map creation.", myname, dict_type); | ||
751 | + | ||
752 | + fn[0].name = dl->mkmapfunc; | ||
753 | + fn[0].ptr = (void**)&mkmap; | ||
754 | + fn[1].name = NULL; | ||
755 | + load_library_symbols(dl->soname, fn, NULL); | ||
756 | + return mkmap; | ||
757 | +#else | ||
758 | + return (void(*)())NULL; | ||
759 | +#endif | ||
760 | +} | ||
761 | + | ||
762 | /* dict_open_register - register dictionary type */ | ||
763 | |||
764 | void dict_open_register(const char *type, | ||
765 | @@ -345,6 +431,9 @@ ARGV *dict_mapnames() | ||
766 | HTABLE_INFO **ht; | ||
767 | DICT_OPEN_INFO *dp; | ||
768 | ARGV *mapnames; | ||
769 | +#ifndef NO_DYNAMIC_MAPS | ||
770 | + DLINFO *dlp; | ||
771 | +#endif | ||
772 | |||
773 | if (dict_open_hash == 0) | ||
774 | dict_open_init(); | ||
775 | @@ -353,6 +442,13 @@ ARGV *dict_mapnames() | ||
776 | dp = (DICT_OPEN_INFO *) ht[0]->value; | ||
777 | argv_add(mapnames, dp->type, ARGV_END); | ||
778 | } | ||
779 | +#ifndef NO_DYNAMIC_MAPS | ||
780 | + if (!dict_dlinfo) | ||
781 | + msg_fatal("dlinfo==NULL"); | ||
782 | + for (dlp=dict_dlinfo; dlp->pattern; dlp++) { | ||
783 | + argv_add(mapnames, dlp->pattern, ARGV_END); | ||
784 | + } | ||
785 | +#endif | ||
786 | qsort((void *) mapnames->argv, mapnames->argc, sizeof(mapnames->argv[0]), | ||
787 | dict_sort_alpha_cpp); | ||
788 | myfree((char *) ht_info); | ||
789 | @@ -360,6 +456,87 @@ ARGV *dict_mapnames() | ||
790 | return mapnames; | ||
791 | } | ||
792 | |||
793 | +#ifndef NO_DYNAMIC_MAPS | ||
794 | +#define STREQ(x,y) (x == y || (x[0] == y[0] && strcmp(x,y) == 0)) | ||
795 | + | ||
796 | +void dict_open_dlinfo(const char *path) | ||
797 | +{ | ||
798 | + char *myname="dict_open_dlinfo"; | ||
799 | + VSTREAM *conf_fp=vstream_fopen(path,O_RDONLY,0); | ||
800 | + VSTRING *buf = vstring_alloc(100); | ||
801 | + char *cp; | ||
802 | + ARGV *argv; | ||
803 | + MVECT vector; | ||
804 | + int nelm=0; | ||
805 | + int linenum=0; | ||
806 | + | ||
807 | + dict_dlinfo=(DLINFO*)mvect_alloc(&vector,sizeof(DLINFO),3,NULL,NULL); | ||
808 | + | ||
809 | + if (!conf_fp) { | ||
810 | + msg_warn("%s: cannot open %s. No dynamic maps will be allowed.", | ||
811 | + myname, path); | ||
812 | + } else { | ||
813 | + while (vstring_get_nonl(buf,conf_fp) != VSTREAM_EOF) { | ||
814 | + cp = vstring_str(buf); | ||
815 | + linenum++; | ||
816 | + if (*cp == '#' || *cp == '\0') | ||
817 | + continue; | ||
818 | + argv = argv_split(cp, " \t"); | ||
819 | + if (argv->argc != 3 && argv->argc != 4) { | ||
820 | + msg_fatal("%s: Expected \"pattern .so-name open-function [mkmap-function]\" at line %d", | ||
821 | + myname, linenum); | ||
822 | + } | ||
823 | + if (STREQ(argv->argv[0],"*")) { | ||
824 | + msg_warn("%s: wildcard dynamic map entry no longer supported.", | ||
825 | + myname); | ||
826 | + continue; | ||
827 | + } | ||
828 | + if (argv->argv[1][0] != '/') { | ||
829 | + msg_fatal("%s: .so name must begin with a \"/\" at line %d", | ||
830 | + myname, linenum); | ||
831 | + } | ||
832 | + if (nelm >= vector.nelm) { | ||
833 | + dict_dlinfo=(DLINFO*)mvect_realloc(&vector,vector.nelm+3); | ||
834 | + } | ||
835 | + dict_dlinfo[nelm].pattern = mystrdup(argv->argv[0]); | ||
836 | + dict_dlinfo[nelm].soname = mystrdup(argv->argv[1]); | ||
837 | + dict_dlinfo[nelm].openfunc = mystrdup(argv->argv[2]); | ||
838 | + if (argv->argc==4) | ||
839 | + dict_dlinfo[nelm].mkmapfunc = mystrdup(argv->argv[3]); | ||
840 | + else | ||
841 | + dict_dlinfo[nelm].mkmapfunc = NULL; | ||
842 | + nelm++; | ||
843 | + argv_free(argv); | ||
844 | + } | ||
845 | + } | ||
846 | + if (nelm >= vector.nelm) { | ||
847 | + dict_dlinfo=(DLINFO*)mvect_realloc(&vector,vector.nelm+1); | ||
848 | + } | ||
849 | + dict_dlinfo[nelm].pattern = NULL; | ||
850 | + dict_dlinfo[nelm].soname = NULL; | ||
851 | + dict_dlinfo[nelm].openfunc = NULL; | ||
852 | + dict_dlinfo[nelm].mkmapfunc = NULL; | ||
853 | + if (conf_fp) | ||
854 | + vstream_fclose(conf_fp); | ||
855 | + vstring_free(buf); | ||
856 | +} | ||
857 | + | ||
858 | +static DLINFO *dict_open_dlfind(const char *type) | ||
859 | +{ | ||
860 | + DLINFO *dp; | ||
861 | + | ||
862 | + if (!dict_dlinfo) | ||
863 | + return NULL; | ||
864 | + | ||
865 | + for (dp=dict_dlinfo; dp->pattern; dp++) { | ||
866 | + if (STREQ(dp->pattern,type)) | ||
867 | + return dp; | ||
868 | + } | ||
869 | + return NULL; | ||
870 | +} | ||
871 | + | ||
872 | +#endif /* !NO_DYNAMIC_MAPS */ | ||
873 | + | ||
874 | #ifdef TEST | ||
875 | |||
876 | /* | ||
877 | diff --git a/src/util/load_lib.c b/src/util/load_lib.c | ||
878 | new file mode 100644 | ||
879 | index 0000000..b6526ef | ||
880 | --- /dev/null | ||
881 | +++ b/src/util/load_lib.c | ||
882 | @@ -0,0 +1,135 @@ | ||
883 | +/*++ | ||
884 | +/* NAME | ||
885 | +/* load_lib 3 | ||
886 | +/* SUMMARY | ||
887 | +/* library loading wrappers | ||
888 | +/* SYNOPSIS | ||
889 | +/* #include <load_lib.h> | ||
890 | +/* | ||
891 | +/* extern int load_library_symbols(const char *, LIB_FN *, LIB_FN *); | ||
892 | +/* const char *libname; | ||
893 | +/* LIB_FN *libfuncs; | ||
894 | +/* LIB_FN *libdata; | ||
895 | +/* | ||
896 | +/* DESCRIPTION | ||
897 | +/* This module loads functions from libraries, returnine pointers | ||
898 | +/* to the named functions. | ||
899 | +/* | ||
900 | +/* load_library_symbols() loads all of the desired functions, and | ||
901 | +/* returns zero for success, or exits via msg_fatal(). | ||
902 | +/* | ||
903 | +/* SEE ALSO | ||
904 | +/* msg(3) diagnostics interface | ||
905 | +/* DIAGNOSTICS | ||
906 | +/* Problems are reported via the msg(3) diagnostics routines: | ||
907 | +/* library not found, symbols not found, other fatal errors. | ||
908 | +/* LICENSE | ||
909 | +/* .ad | ||
910 | +/* .fi | ||
911 | +/* The Secure Mailer license must be distributed with this software. | ||
912 | +/* AUTHOR(S) | ||
913 | +/* LaMont Jones | ||
914 | +/* Hewlett-Packard Company | ||
915 | +/* 3404 Harmony Road | ||
916 | +/* Fort Collins, CO 80528, USA | ||
917 | +/* | ||
918 | +/* Wietse Venema | ||
919 | +/* IBM T.J. Watson Research | ||
920 | +/* P.O. Box 704 | ||
921 | +/* Yorktown Heights, NY 10598, USA | ||
922 | +/*--*/ | ||
923 | + | ||
924 | +/* System libraries. */ | ||
925 | + | ||
926 | +#include "sys_defs.h" | ||
927 | +#include <stdlib.h> | ||
928 | +#include <stddef.h> | ||
929 | +#include <string.h> | ||
930 | +#if defined(HAS_DLOPEN) | ||
931 | +#include <dlfcn.h> | ||
932 | +#elif defined(HAS_SHL_LOAD) | ||
933 | +#include <dl.h> | ||
934 | +#endif | ||
935 | + | ||
936 | +/* Application-specific. */ | ||
937 | + | ||
938 | +#include "msg.h" | ||
939 | +#include "load_lib.h" | ||
940 | + | ||
941 | +extern int load_library_symbols(const char * libname, LIB_FN * libfuncs, LIB_FN * libdata) | ||
942 | +{ | ||
943 | + char *myname = "load_library_symbols"; | ||
944 | + LIB_FN *fn; | ||
945 | + | ||
946 | +#if defined(HAS_DLOPEN) | ||
947 | + void *handle; | ||
948 | + char *emsg; | ||
949 | + | ||
950 | + handle=dlopen(libname,RTLD_NOW); | ||
951 | + emsg=dlerror(); | ||
952 | + if (emsg) { | ||
953 | + msg_fatal("%s: dlopen failure loading %s: %s", myname, libname, emsg); | ||
954 | + } | ||
955 | + | ||
956 | + if (libfuncs) { | ||
957 | + for (fn=libfuncs; fn->name; fn++) { | ||
958 | + *(fn->ptr) = dlsym(handle,fn->name); | ||
959 | + emsg=dlerror(); | ||
960 | + if (emsg) { | ||
961 | + msg_fatal("%s: dlsym failure looking up %s in %s: %s", myname, | ||
962 | + fn->name, libname, emsg); | ||
963 | + } | ||
964 | + if (msg_verbose>1) { | ||
965 | + msg_info("loaded %s = %lx",fn->name, *((long*)(fn->ptr))); | ||
966 | + } | ||
967 | + } | ||
968 | + } | ||
969 | + | ||
970 | + if (libdata) { | ||
971 | + for (fn=libdata; fn->name; fn++) { | ||
972 | + *(fn->ptr) = dlsym(handle,fn->name); | ||
973 | + emsg=dlerror(); | ||
974 | + if (emsg) { | ||
975 | + msg_fatal("%s: dlsym failure looking up %s in %s: %s", myname, | ||
976 | + fn->name, libname, emsg); | ||
977 | + } | ||
978 | + if (msg_verbose>1) { | ||
979 | + msg_info("loaded %s = %lx",fn->name, *((long*)(fn->ptr))); | ||
980 | + } | ||
981 | + } | ||
982 | + } | ||
983 | +#elif defined(HAS_SHL_LOAD) | ||
984 | + shl_t handle; | ||
985 | + | ||
986 | + handle = shl_load(libname,BIND_IMMEDIATE,0); | ||
987 | + | ||
988 | + if (libfuncs) { | ||
989 | + for (fn=libfuncs; fn->name; fn++) { | ||
990 | + if (shl_findsym(&handle,fn->name,TYPE_PROCEDURE,fn->ptr) != 0) { | ||
991 | + msg_fatal("%s: shl_findsym failure looking up %s in %s: %m", | ||
992 | + myname, fn->name, libname); | ||
993 | + } | ||
994 | + if (msg_verbose>1) { | ||
995 | + msg_info("loaded %s = %x",fn->name, *((long*)(fn->ptr))); | ||
996 | + } | ||
997 | + } | ||
998 | + } | ||
999 | + | ||
1000 | + if (libdata) { | ||
1001 | + for (fn=libdata; fn->name; fn++) { | ||
1002 | + if (shl_findsym(&handle,fn->name,TYPE_DATA,fn->ptr) != 0) { | ||
1003 | + msg_fatal("%s: shl_findsym failure looking up %s in %s: %m", | ||
1004 | + myname, fn->name, libname); | ||
1005 | + } | ||
1006 | + if (msg_verbose>1) { | ||
1007 | + msg_info("loaded %s = %x",fn->name, *((long*)(fn->ptr))); | ||
1008 | + } | ||
1009 | + } | ||
1010 | + } | ||
1011 | + | ||
1012 | +#else | ||
1013 | + msg_fatal("%s: need dlopen or shl_load support for dynamic libraries", | ||
1014 | + myname); | ||
1015 | +#endif | ||
1016 | + return 0; | ||
1017 | +} | ||
1018 | diff --git a/src/util/load_lib.h b/src/util/load_lib.h | ||
1019 | new file mode 100644 | ||
1020 | index 0000000..adebd25 | ||
1021 | --- /dev/null | ||
1022 | +++ b/src/util/load_lib.h | ||
1023 | @@ -0,0 +1,41 @@ | ||
1024 | +#ifndef _LOAD_LIB_H_INCLUDED_ | ||
1025 | +#define _LOAD_LIB_H_INCLUDED_ | ||
1026 | + | ||
1027 | +/*++ | ||
1028 | +/* NAME | ||
1029 | +/* load_lib 3h | ||
1030 | +/* SUMMARY | ||
1031 | +/* library loading wrappers | ||
1032 | +/* SYNOPSIS | ||
1033 | +/* #include "load_lib.h" | ||
1034 | +/* DESCRIPTION | ||
1035 | +/* .nf | ||
1036 | + | ||
1037 | + /* | ||
1038 | + * External interface. | ||
1039 | + */ | ||
1040 | +/* NULL name terminates list */ | ||
1041 | +typedef struct LIB_FN { | ||
1042 | + const char *name; | ||
1043 | + void **ptr; | ||
1044 | +} LIB_FN; | ||
1045 | + | ||
1046 | +extern int load_library_symbols(const char *, LIB_FN *, LIB_FN *); | ||
1047 | + | ||
1048 | +/* LICENSE | ||
1049 | +/* .ad | ||
1050 | +/* .fi | ||
1051 | +/* The Secure Mailer license must be distributed with this software. | ||
1052 | +/* AUTHOR(S) | ||
1053 | +/* LaMont Jones | ||
1054 | +/* Hewlett-Packard Company | ||
1055 | +/* 3404 Harmony Road | ||
1056 | +/* Fort Collins, CO 80528, USA | ||
1057 | +/* | ||
1058 | +/* Wietse Venema | ||
1059 | +/* IBM T.J. Watson Research | ||
1060 | +/* P.O. Box 704 | ||
1061 | +/* Yorktown Heights, NY 10598, USA | ||
1062 | +/*--*/ | ||
1063 | + | ||
1064 | +#endif | ||
diff --git a/main/postgresql/APKBUILD b/main/postgresql/APKBUILD index ca034faedb..69592378b0 100644 --- a/main/postgresql/APKBUILD +++ b/main/postgresql/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=postgresql | 2 | pkgname=postgresql |
3 | pkgver=8.4.3 | 3 | pkgver=8.4.4 |
4 | pkgrel=3 | 4 | pkgrel=0 |
5 | pkgdesc="A sophisticated object-relational DBMS" | 5 | pkgdesc="A sophisticated object-relational DBMS" |
6 | url="http://www.postgresql.org/" | 6 | url="http://www.postgresql.org/" |
7 | license="BSD" | 7 | license="BSD" |
@@ -56,7 +56,7 @@ client() { | |||
56 | } | 56 | } |
57 | 57 | ||
58 | 58 | ||
59 | md5sums="7f70e7b140fb190f268837255582b07e postgresql-8.4.3.tar.bz2 | 59 | md5sums="4bf2448ad965bca3940df648c02194df postgresql-8.4.4.tar.bz2 |
60 | 66c197b8186a6df0752fe2aed40c90c4 postgresql.initd | 60 | 66c197b8186a6df0752fe2aed40c90c4 postgresql.initd |
61 | 12199d445bfa42aafc2a958012737107 postgresql.confd | 61 | 12199d445bfa42aafc2a958012737107 postgresql.confd |
62 | 7f8de63848c51c8a30c39bec6b1b1606 pg-restore.initd | 62 | 7f8de63848c51c8a30c39bec6b1b1606 pg-restore.initd |
diff --git a/testing/privoxy/APKBUILD b/main/privoxy/APKBUILD index 3499e91725..d7417ec027 100644 --- a/testing/privoxy/APKBUILD +++ b/main/privoxy/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=privoxy | 2 | pkgname=privoxy |
3 | pkgver=3.0.16 | 3 | pkgver=3.0.16 |
4 | pkgrel=0 | 4 | pkgrel=1 |
5 | pkgdesc="A web proxy with advanced filtering capabilities" | 5 | pkgdesc="A web proxy with advanced filtering capabilities" |
6 | url="http://www.privoxy.org" | 6 | url="http://www.privoxy.org" |
7 | license="GPL" | 7 | license="GPL" |
@@ -46,7 +46,8 @@ package() { | |||
46 | "$pkgdir"/etc/logrotate.d/privoxy | 46 | "$pkgdir"/etc/logrotate.d/privoxy |
47 | find "$pkgdir"/etc/privoxy/ -type d | xargs chmod 770 | 47 | find "$pkgdir"/etc/privoxy/ -type d | xargs chmod 770 |
48 | find "$pkgdir"/etc/privoxy/ -type f | xargs chmod 660 | 48 | find "$pkgdir"/etc/privoxy/ -type f | xargs chmod 660 |
49 | chown -R privoxy:privoxy "$pkgdir"/var/log/privoxy | 49 | chown -R privoxy:privoxy "$pkgdir"/var/log/privoxy \ |
50 | "$pkgdir"/etc/privoxy | ||
50 | } | 51 | } |
51 | 52 | ||
52 | md5sums="64d3ffcdf8307e04a375773bb4eb255e privoxy-3.0.16-stable-src.tar.gz | 53 | md5sums="64d3ffcdf8307e04a375773bb4eb255e privoxy-3.0.16-stable-src.tar.gz |
diff --git a/testing/privoxy/privoxy-3.0.16-gentoo.patch b/main/privoxy/privoxy-3.0.16-gentoo.patch index d445ec1b01..d445ec1b01 100644 --- a/testing/privoxy/privoxy-3.0.16-gentoo.patch +++ b/main/privoxy/privoxy-3.0.16-gentoo.patch | |||
diff --git a/testing/privoxy/privoxy.initd b/main/privoxy/privoxy.initd index ef984ea3df..ef984ea3df 100644 --- a/testing/privoxy/privoxy.initd +++ b/main/privoxy/privoxy.initd | |||
diff --git a/testing/privoxy/privoxy.logrotate b/main/privoxy/privoxy.logrotate index aa7463bd57..aa7463bd57 100644 --- a/testing/privoxy/privoxy.logrotate +++ b/main/privoxy/privoxy.logrotate | |||
diff --git a/testing/privoxy/privoxy.pre-install b/main/privoxy/privoxy.pre-install index 38db002881..38db002881 100644 --- a/testing/privoxy/privoxy.pre-install +++ b/main/privoxy/privoxy.pre-install | |||
diff --git a/main/py-genshi/APKBUILD b/main/py-genshi/APKBUILD new file mode 100644 index 0000000000..7d7f5c0af6 --- /dev/null +++ b/main/py-genshi/APKBUILD | |||
@@ -0,0 +1,26 @@ | |||
1 | # Contributor: Mika Havela <mika.havela@gmail.com> | ||
2 | # Maintainer: Mika Havela <mika.havela@gmail.com> | ||
3 | pkgname=py-genshi | ||
4 | _realname=Genshi | ||
5 | pkgver=0.6 | ||
6 | pkgrel=0 | ||
7 | pkgdesc="Python toolkit for stream-based generation of output for the web." | ||
8 | url="http://genshi.edgewall.org/" | ||
9 | license="BSD" | ||
10 | depends="python" | ||
11 | makedepends="py-setuptools python-dev" | ||
12 | install= | ||
13 | source="http://ftp.edgewall.com/pub/genshi/$_realname-$pkgver.tar.gz" | ||
14 | |||
15 | _builddir="$srcdir"/$_realname-$pkgver | ||
16 | |||
17 | build() { | ||
18 | return 0 | ||
19 | } | ||
20 | |||
21 | package() { | ||
22 | cd "$_builddir" | ||
23 | python setup.py install --root="$pkgdir" | ||
24 | } | ||
25 | |||
26 | md5sums="604e8b23b4697655d36a69c2d8ef7187 Genshi-0.6.tar.gz" | ||
diff --git a/testing/py-setuptools/APKBUILD b/main/py-setuptools/APKBUILD index 2ccca3b4cd..2ccca3b4cd 100644 --- a/testing/py-setuptools/APKBUILD +++ b/main/py-setuptools/APKBUILD | |||
diff --git a/main/py-sqlite/APKBUILD b/main/py-sqlite/APKBUILD new file mode 100644 index 0000000000..a0ae27156a --- /dev/null +++ b/main/py-sqlite/APKBUILD | |||
@@ -0,0 +1,26 @@ | |||
1 | # Contributor: Mika Havela <mika.havela@gmail.com> | ||
2 | # Maintainer: Mika Havela <mika.havela@gmail.com> | ||
3 | pkgname=py-sqlite | ||
4 | _realname=pysqlite | ||
5 | pkgver=2.6.0 | ||
6 | pkgrel=0 | ||
7 | pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational database engine" | ||
8 | url="http://code.google.com/p/pysqlite/" | ||
9 | license="MIT" | ||
10 | depends="python sqlite" | ||
11 | makedepends="sqlite-dev python-dev" | ||
12 | install= | ||
13 | source="http://pysqlite.googlecode.com/files/${_realname}-${pkgver}.tar.gz" | ||
14 | |||
15 | _builddir="$srcdir"/$_realname-$pkgver | ||
16 | |||
17 | build() { | ||
18 | return 0 | ||
19 | } | ||
20 | |||
21 | package() { | ||
22 | cd "$_builddir" | ||
23 | python setup.py install --root="$pkgdir" | ||
24 | } | ||
25 | |||
26 | md5sums="fc92618b3b39d02e6ff10dc467c36640 pysqlite-2.6.0.tar.gz" | ||
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD index 864ed9bedb..580fd54108 100644 --- a/main/samba/APKBUILD +++ b/main/samba/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=samba | 2 | pkgname=samba |
3 | pkgver=3.5.2 | 3 | pkgver=3.5.3 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="Tools to access a server's filespace and printers via SMB" | 5 | pkgdesc="Tools to access a server's filespace and printers via SMB" |
6 | url="http://www.samba.org" | 6 | url="http://www.samba.org" |
@@ -117,7 +117,7 @@ tdb() { | |||
117 | usr/bin/tdb* | 117 | usr/bin/tdb* |
118 | } | 118 | } |
119 | 119 | ||
120 | md5sums="6f8cf649207ccd8c2c17e28c335f4e9d samba-3.5.2.tar.gz | 120 | md5sums="7c8d2a34b649380d5df838c3e030dbec samba-3.5.3.tar.gz |
121 | c8a7f6ac5df2f73dbf023e25ea39927b samba.initd | 121 | c8a7f6ac5df2f73dbf023e25ea39927b samba.initd |
122 | c150433426e18261e6e3eed3930e1a76 samba.confd | 122 | c150433426e18261e6e3eed3930e1a76 samba.confd |
123 | b7cafabfb4fa5b3ab5f2e857d8d1c733 samba.logrotate | 123 | b7cafabfb4fa5b3ab5f2e857d8d1c733 samba.logrotate |
diff --git a/main/startup-notification/APKBUILD b/main/startup-notification/APKBUILD index 94bc8f0028..c9414d4ec8 100644 --- a/main/startup-notification/APKBUILD +++ b/main/startup-notification/APKBUILD | |||
@@ -1,23 +1,27 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=startup-notification | 2 | pkgname=startup-notification |
3 | pkgver=0.10 | 3 | pkgver=0.10 |
4 | pkgrel=1 | 4 | pkgrel=2 |
5 | pkgdesc="Monitor and display application startup" | 5 | pkgdesc="Monitor and display application startup" |
6 | url="http://www.freedesktop.org" | 6 | url="http://www.freedesktop.org" |
7 | license="LGPL" | 7 | license="LGPL" |
8 | subpackages="$pkgname-dev" | 8 | subpackages="$pkgname-dev" |
9 | depends="libx11 libsm xcb-util" | 9 | depends= |
10 | makedepends="libx11-dev libsm-dev xcb-util-dev" | 10 | makedepends="libx11-dev libsm-dev xcb-util-dev" |
11 | source="http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.gz" | 11 | source="http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.gz" |
12 | 12 | ||
13 | build () | 13 | depends_dev="libsm-dev xcb-util-dev" |
14 | { | 14 | build() { |
15 | cd "$srcdir"/$pkgname-$pkgver | 15 | cd "$srcdir"/$pkgname-$pkgver |
16 | ./configure --prefix=/usr \ | 16 | ./configure --prefix=/usr \ |
17 | --localstatedir=/var \ | 17 | --localstatedir=/var \ |
18 | --sysconfdir=/etc \ | 18 | --sysconfdir=/etc \ |
19 | || return 1 | 19 | || return 1 |
20 | make || return 1 | 20 | make || return 1 |
21 | } | ||
22 | |||
23 | package() { | ||
24 | cd "$srcdir"/$pkgname-$pkgver | ||
21 | make DESTDIR="$pkgdir" install || return 1 | 25 | make DESTDIR="$pkgdir" install || return 1 |
22 | } | 26 | } |
23 | md5sums="bca0ed1c74bc4e483ea2ed12a5717354 startup-notification-0.10.tar.gz" | 27 | md5sums="bca0ed1c74bc4e483ea2ed12a5717354 startup-notification-0.10.tar.gz" |
diff --git a/main/sudo/APKBUILD b/main/sudo/APKBUILD index b5d54fd034..1beaa580e7 100644 --- a/main/sudo/APKBUILD +++ b/main/sudo/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=sudo | 2 | pkgname=sudo |
3 | pkgver=1.7.2_p6 | 3 | pkgver=1.7.2_p7 |
4 | _realver=${pkgver%_*}${pkgver#*_} | 4 | _realver=${pkgver%_*}${pkgver#*_} |
5 | pkgrel=1 | 5 | pkgrel=0 |
6 | pkgdesc="Give certain users the ability to run some commands as root" | 6 | pkgdesc="Give certain users the ability to run some commands as root" |
7 | url="http://www.sudo.ws/sudo/" | 7 | url="http://www.sudo.ws/sudo/" |
8 | license='custom ISC' | 8 | license='custom ISC' |
@@ -27,4 +27,4 @@ package() { | |||
27 | make -j1 DESTDIR="$pkgdir" install || return 1 | 27 | make -j1 DESTDIR="$pkgdir" install || return 1 |
28 | } | 28 | } |
29 | 29 | ||
30 | md5sums="c4f1a43e8ba94f6bf06d2211442148c4 sudo-1.7.2p6.tar.gz" | 30 | md5sums="3ac78668427a53e12d7639fdfab2f1af sudo-1.7.2p7.tar.gz" |
diff --git a/main/sysklogd/APKBUILD b/main/sysklogd/APKBUILD index 681ac7d890..3e0fecdab1 100644 --- a/main/sysklogd/APKBUILD +++ b/main/sysklogd/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=sysklogd | 2 | pkgname=sysklogd |
3 | pkgver=1.5 | 3 | pkgver=1.5 |
4 | pkgrel=5 | 4 | pkgrel=6 |
5 | pkgdesc="System and kernel log daemons" | 5 | pkgdesc="System and kernel log daemons" |
6 | url="http://www.infodrom.org/projects/sysklogd/" | 6 | url="http://www.infodrom.org/projects/sysklogd/" |
7 | license="GPL BSD" | 7 | license="GPL BSD" |
@@ -48,7 +48,7 @@ build () | |||
48 | } | 48 | } |
49 | md5sums="e053094e8103165f98ddafe828f6ae4b sysklogd-1.5.tar.gz | 49 | md5sums="e053094e8103165f98ddafe828f6ae4b sysklogd-1.5.tar.gz |
50 | 6bc1d1c65076b104a8f78d0fb4f21db7 sysklogd.logrotate | 50 | 6bc1d1c65076b104a8f78d0fb4f21db7 sysklogd.logrotate |
51 | c9274a06835b95feb8aab31523418847 sysklogd.daily | 51 | 5ba669cf356796bdef20962a143eca72 sysklogd.daily |
52 | e4c9a51499f1eb8d45dfdfe0d52737a5 sysklogd.initd | 52 | e4c9a51499f1eb8d45dfdfe0d52737a5 sysklogd.initd |
53 | e25d7b583b7e4bd8be503b89e1771e90 sysklogd.confd | 53 | e25d7b583b7e4bd8be503b89e1771e90 sysklogd.confd |
54 | 3b7ba3aa6519f96f11165a7d5900a8b1 sysklogd-1.4.2-caen-owl-klogd-drop-root.diff | 54 | 3b7ba3aa6519f96f11165a7d5900a8b1 sysklogd-1.4.2-caen-owl-klogd-drop-root.diff |
diff --git a/main/sysklogd/sysklogd.daily b/main/sysklogd/sysklogd.daily index 79e85fb468..ccd63d61e4 100755 --- a/main/sysklogd/sysklogd.daily +++ b/main/sysklogd/sysklogd.daily | |||
@@ -17,13 +17,14 @@ syslogd_listfiles() { | |||
17 | # the sed (in order)- | 17 | # the sed (in order)- |
18 | # strips comments; | 18 | # strips comments; |
19 | # collapses spaces/tabs to 1 space; | 19 | # collapses spaces/tabs to 1 space; |
20 | # deletes the "-" in front of the filename; | 20 | # deletes the "-" in front of the filename; |
21 | # deletes whitespace before ';' | ||
21 | # deletes lines that have the "skip" facility | 22 | # deletes lines that have the "skip" facility |
22 | # deletes the facility (leaving just the filename) | 23 | # deletes the facility (leaving just the filename) |
23 | # deletes lines that are not filenames with leading "/" | 24 | # deletes lines that are not filenames with leading "/" |
24 | while read a ; do echo "$a"; done < $CONF |\ | 25 | while read a ; do echo "$a"; done < $CONF |\ |
25 | sed -n "/^ *#/D; /^[ ]*$/D; s/[ ]\+/ /g; \ | 26 | sed -n "/^[ \t]*#/D; /^[ \t]*$/D; s/[ \t]\+/ /g; \ |
26 | s+ -/+ /+g; /^.*\($skip\)[^ ]* /D; \ | 27 | s+ -/+ /+g; s/ *; */;/; /^.*\($skip\)[^ ]* /D; \ |
27 | s/^[^ ]* //; /^[^\\/]/D; P" |\ | 28 | s/^[^ ]* //; /^[^\\/]/D; P" |\ |
28 | sort | uniq | 29 | sort | uniq |
29 | } | 30 | } |
diff --git a/main/syslinux/APKBUILD b/main/syslinux/APKBUILD index 739e99558f..d4d8ca0002 100644 --- a/main/syslinux/APKBUILD +++ b/main/syslinux/APKBUILD | |||
@@ -7,7 +7,7 @@ url="http://syslinux.org" | |||
7 | license="GPL" | 7 | license="GPL" |
8 | makedepends="nasm perl" | 8 | makedepends="nasm perl" |
9 | depends="mtools" | 9 | depends="mtools" |
10 | source="http://www.kernel.org/pub/linux/utils/boot/$pkgname/$pkgname-$pkgver.tar.bz2 | 10 | source="http://www.kernel.org/pub/linux/utils/boot/syslinux/3.xx/$pkgname-$pkgver.tar.bz2 |
11 | $pkgname-3.86-nopie.patch | 11 | $pkgname-3.86-nopie.patch |
12 | " | 12 | " |
13 | subpackages="$pkgname-doc" | 13 | subpackages="$pkgname-doc" |
diff --git a/main/terminal/APKBUILD b/main/terminal/APKBUILD index 2f159f0812..620d3535de 100644 --- a/main/terminal/APKBUILD +++ b/main/terminal/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=terminal | 2 | pkgname=terminal |
3 | pkgver=0.4.4 | 3 | pkgver=0.4.5 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment" | 5 | pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment" |
6 | url="http://www.xfce.org/projects/terminal/" | 6 | url="http://www.xfce.org/projects/terminal/" |
7 | license="GPL-2" | 7 | license="GPL-2" |
@@ -28,4 +28,4 @@ package() { | |||
28 | cd "$srcdir"/Terminal-$pkgver | 28 | cd "$srcdir"/Terminal-$pkgver |
29 | make DESTDIR="$pkgdir" install || return 1 | 29 | make DESTDIR="$pkgdir" install || return 1 |
30 | } | 30 | } |
31 | md5sums="eba7da9acca699d168f4cc11ee9ed7a9 Terminal-0.4.4.tar.bz2" | 31 | md5sums="3c707628e2e97c6d9566cd74d400036a Terminal-0.4.5.tar.bz2" |
diff --git a/main/thunar-media-tags-plugin/APKBUILD b/main/thunar-media-tags-plugin/APKBUILD new file mode 100644 index 0000000000..cbcb46ac39 --- /dev/null +++ b/main/thunar-media-tags-plugin/APKBUILD | |||
@@ -0,0 +1,36 @@ | |||
1 | # Contributor: | ||
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | pkgname=thunar-media-tags-plugin | ||
4 | pkgver=0.1.2 | ||
5 | pkgrel=0 | ||
6 | pkgdesc="Media tags plugin for Thunar file manager" | ||
7 | url="http://thunar.xfce.org/pwiki/projects/thunar-media-tags-plugin" | ||
8 | license="GPL" | ||
9 | depends= | ||
10 | makedepends="thunar-dev taglib-dev" | ||
11 | install= | ||
12 | subpackages= | ||
13 | source="http://mocha.xfce.org/archive/src/thunar-plugins/thunar-media-tags-plugin/${pkgver%.*}/thunar-media-tags-plugin-$pkgver.tar.bz2" | ||
14 | |||
15 | _builddir="$srcdir"/$pkgname-$pkgver | ||
16 | prepare() { | ||
17 | cd "$_builddir" | ||
18 | } | ||
19 | |||
20 | build() { | ||
21 | cd "$_builddir" | ||
22 | ./configure --prefix=/usr \ | ||
23 | --sysconfdir=/etc \ | ||
24 | --mandir=/usr/share/man \ | ||
25 | --infodir=/usr/share/info \ | ||
26 | --disable-static | ||
27 | make || return 1 | ||
28 | } | ||
29 | |||
30 | package() { | ||
31 | cd "$_builddir" | ||
32 | make DESTDIR="$pkgdir" install | ||
33 | rm -r "$pkgdir"/usr/lib/*/*.la | ||
34 | } | ||
35 | |||
36 | md5sums="8a95f0ea4df6f757c1c94eb5442d2ff5 thunar-media-tags-plugin-0.1.2.tar.bz2" | ||
diff --git a/main/thunar/APKBUILD b/main/thunar/APKBUILD index 0c2db0a103..7dcc1b2964 100644 --- a/main/thunar/APKBUILD +++ b/main/thunar/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=thunar | 2 | pkgname=thunar |
3 | pkgver=1.0.1 | 3 | pkgver=1.0.2 |
4 | pkgrel=7 | 4 | pkgrel=1 |
5 | pkgdesc="File manager for Xfce" | 5 | pkgdesc="File manager for Xfce" |
6 | url="http://thunar.xfce.org" | 6 | url="http://thunar.xfce.org" |
7 | license="GPL2 LGPL2" | 7 | license="GPL2 LGPL2" |
@@ -11,15 +11,13 @@ makedepends="pkgconfig libexif-dev xfce4-panel-dev exo-dev pcre-dev | |||
11 | intltool gettext-dev libiconv-dev expat-dev startup-notification-dev | 11 | intltool gettext-dev libiconv-dev expat-dev startup-notification-dev |
12 | libsm-dev e2fsprogs-dev gamin-dev libexif-dev jpeg-dev" | 12 | libsm-dev e2fsprogs-dev gamin-dev libexif-dev jpeg-dev" |
13 | install= | 13 | install= |
14 | source="http://archive.xfce.org/src/xfce/thunar/${pkgver%.*}/Thunar-$pkgver.tar.bz2 | 14 | source="http://archive.xfce.org/src/xfce/thunar/${pkgver%.*}/Thunar-$pkgver.tar.bz2" |
15 | libpng-1.4.patch" | ||
16 | 15 | ||
17 | depends_dev="exo-dev glib-dev gamin-dev jpeg-dev" | 16 | depends_dev="exo-dev glib-dev gamin-dev jpeg-dev startup-notification-dev" |
18 | _builddir="$srcdir"/Thunar-$pkgver | 17 | _builddir="$srcdir"/Thunar-$pkgver |
19 | 18 | ||
20 | prepare() { | 19 | prepare() { |
21 | cd "$_builddir" | 20 | cd "$_builddir" |
22 | patch -p1 -i "$srcdir"/libpng-1.4.patch | ||
23 | } | 21 | } |
24 | 22 | ||
25 | build() { | 23 | build() { |
@@ -41,5 +39,4 @@ package() { | |||
41 | sed -i 's:x-directory/gnome-default-handler;::' "$pkgdir"/usr/share/applications/Thunar-folder-handler.desktop | 39 | sed -i 's:x-directory/gnome-default-handler;::' "$pkgdir"/usr/share/applications/Thunar-folder-handler.desktop |
42 | } | 40 | } |
43 | 41 | ||
44 | md5sums="218373aa45d74b6ba8c69c4d5af3bb19 Thunar-1.0.1.tar.bz2 | 42 | md5sums="c91073202d373a1f9951a1240083c36d Thunar-1.0.2.tar.bz2" |
45 | ee998c20ba13d0cb18741da8b7d67328 libpng-1.4.patch" | ||
diff --git a/main/thunar/libpng-1.4.patch b/main/thunar/libpng-1.4.patch deleted file mode 100644 index 7f38165f77..0000000000 --- a/main/thunar/libpng-1.4.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | diff -Naur Thunar-1.0.1.orig/thunar-vfs/thunar-vfs-thumb.c Thunar-1.0.1/thunar-vfs/thunar-vfs-thumb.c | ||
2 | --- Thunar-1.0.1.orig/thunar-vfs/thunar-vfs-thumb.c 2010-01-20 21:31:35.000000000 -0500 | ||
3 | +++ Thunar-1.0.1/thunar-vfs/thunar-vfs-thumb.c 2010-01-20 21:34:51.000000000 -0500 | ||
4 | @@ -1169,7 +1169,7 @@ | ||
5 | goto done0; | ||
6 | |||
7 | /* verify the png signature */ | ||
8 | - if (G_LIKELY (png_check_sig ((png_bytep) signature, sizeof (signature)))) | ||
9 | + if (G_LIKELY (!png_sig_cmp ((png_bytep) signature, 0, sizeof (signature)))) | ||
10 | rewind (fp); | ||
11 | else | ||
12 | goto done0; | ||
diff --git a/main/tiff/APKBUILD b/main/tiff/APKBUILD index c13e26a46b..e2fff0cf0a 100644 --- a/main/tiff/APKBUILD +++ b/main/tiff/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Contributor: Michael Mason <ms13sp@gmail.com> | 1 | # Contributor: Leonardo Arena <rnalrd@gmail.com> |
2 | # Maintainer: Michael Mason <ms13sp@gmail.com> | 2 | # Maintainer: Michael Mason <ms13sp@gmail.com> |
3 | pkgname=tiff | 3 | pkgname=tiff |
4 | pkgver=3.8.2 | 4 | pkgver=3.8.2 |
5 | pkgrel=2 | 5 | pkgrel=3 |
6 | pkgdesc="Provides support for the Tag Image File Format or TIFF" | 6 | pkgdesc="Provides support for the Tag Image File Format or TIFF" |
7 | url="http://www.libtiff.org/" | 7 | url="http://www.libtiff.org/" |
8 | license="GPL" | 8 | license="GPL" |
@@ -16,6 +16,7 @@ source="ftp://ftp.remotesensing.org/pub/lib$pkgname/$pkgname-$pkgver.tar.gz | |||
16 | tiff2pdf-compression.patch | 16 | tiff2pdf-compression.patch |
17 | tiff2pdf-octal-printf.patch | 17 | tiff2pdf-octal-printf.patch |
18 | tiffsplit-fname-overflow.patch | 18 | tiffsplit-fname-overflow.patch |
19 | tiff-jpegfix.patch | ||
19 | " | 20 | " |
20 | 21 | ||
21 | build() { | 22 | build() { |
@@ -28,6 +29,7 @@ build() { | |||
28 | patch -p1 < ../tiff-3.8.2-CVE-2008-2327.patch || return 1 | 29 | patch -p1 < ../tiff-3.8.2-CVE-2008-2327.patch || return 1 |
29 | patch -p1 < ../libtiff-CVE-2009-2285.patch || return 1 | 30 | patch -p1 < ../libtiff-CVE-2009-2285.patch || return 1 |
30 | patch -p1 < ../tiff-3.8.2-CVE-2009-2347.patch || return 1 | 31 | patch -p1 < ../tiff-3.8.2-CVE-2009-2347.patch || return 1 |
32 | patch -p1 < ../tiff-jpegfix.patch || return 1 | ||
31 | 33 | ||
32 | ./configure --prefix=/usr \ | 34 | ./configure --prefix=/usr \ |
33 | --sysconfdir=/etc \ | 35 | --sysconfdir=/etc \ |
@@ -46,4 +48,5 @@ c2c2e22557d9c63011df5777dda6a86b tiff-3.8.2-CVE-2008-2327.patch | |||
46 | d3b02693cca83e63005b162edd43016b tiff-3.8.2-CVE-2009-2347.patch | 48 | d3b02693cca83e63005b162edd43016b tiff-3.8.2-CVE-2009-2347.patch |
47 | b443ffca9d498bb3a88c17da0200025b tiff2pdf-compression.patch | 49 | b443ffca9d498bb3a88c17da0200025b tiff2pdf-compression.patch |
48 | d54368687d2645ffbbe6c2df384b11bf tiff2pdf-octal-printf.patch | 50 | d54368687d2645ffbbe6c2df384b11bf tiff2pdf-octal-printf.patch |
49 | 323352fd60a7bd3ffac8724c3c031669 tiffsplit-fname-overflow.patch" | 51 | 323352fd60a7bd3ffac8724c3c031669 tiffsplit-fname-overflow.patch |
52 | 3353687eba89179f55f027bd571a63f5 tiff-jpegfix.patch" | ||
diff --git a/main/tiff/tiff-jpegfix.patch b/main/tiff/tiff-jpegfix.patch new file mode 100644 index 0000000000..ca57191dff --- /dev/null +++ b/main/tiff/tiff-jpegfix.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | diff -Nru tiff-3.9.2.orig/libtiff/tif_jpeg.c tiff-3.9.2/libtiff/tif_jpeg.c | ||
2 | --- tiff-3.9.2.orig/libtiff/tif_jpeg.c 2009-12-22 12:45:49.969811264 -0800 | ||
3 | +++ tiff-3.9.2/libtiff/tif_jpeg.c 2009-12-22 12:47:04.433491064 -0800 | ||
4 | @@ -2014,7 +2014,14 @@ | ||
5 | if( tif->tif_diroff == 0 ) | ||
6 | { | ||
7 | #define SIZE_OF_JPEGTABLES 2000 | ||
8 | +/* | ||
9 | +The following line assumes incorrectly that all JPEG-in-TIFF files will have | ||
10 | +a JPEGTABLES tag generated and causes null-filled JPEGTABLES tags to be written | ||
11 | +when the JPEG data is placed with TIFFWriteRawStrip. The field bit should be | ||
12 | +set, anyway, later when actual JPEGTABLES header is generated, so removing it | ||
13 | +here hopefully is harmless. | ||
14 | TIFFSetFieldBit(tif, FIELD_JPEGTABLES); | ||
15 | +*/ | ||
16 | sp->jpegtables_length = SIZE_OF_JPEGTABLES; | ||
17 | sp->jpegtables = (void *) _TIFFmalloc(sp->jpegtables_length); | ||
18 | _TIFFmemset(sp->jpegtables, 0, SIZE_OF_JPEGTABLES); | ||
19 | diff -Nru tiff-3.9.2.orig/tools/tiff2pdf.c tiff-3.9.2/tools/tiff2pdf.c | ||
20 | --- tiff-3.9.2.orig/tools/tiff2pdf.c 2009-12-22 12:45:49.873825856 -0800 | ||
21 | +++ tiff-3.9.2/tools/tiff2pdf.c 2009-12-22 12:48:16.558526392 -0800 | ||
22 | @@ -3320,6 +3320,9 @@ | ||
23 | while(i<(*striplength)){ | ||
24 | switch( strip[i] ){ | ||
25 | case 0xd8: | ||
26 | + /* SOI - start of image */ | ||
27 | + _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), 2); | ||
28 | + *bufferoffset+=2; | ||
29 | i+=2; | ||
30 | break; | ||
31 | case 0xc0: | ||
diff --git a/main/trac/APKBUILD b/main/trac/APKBUILD new file mode 100644 index 0000000000..d4e09e554e --- /dev/null +++ b/main/trac/APKBUILD | |||
@@ -0,0 +1,35 @@ | |||
1 | # Contributor: Michael Mason <ms13sp@gmail.com> | ||
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | pkgname=trac | ||
4 | _realname=Trac | ||
5 | pkgver=0.11.7 | ||
6 | pkgrel=1 | ||
7 | pkgusers="tracd" | ||
8 | pkggroups="tracd" | ||
9 | pkgdesc="Trac is a minimalistic web-based project management, wiki and bug/issue tracking system." | ||
10 | url="http://trac.edgewall.com/" | ||
11 | license="GPL" | ||
12 | depends="python py-setuptools py-genshi py-sqlite" | ||
13 | makedepends="python-dev" | ||
14 | install="$pkgname.pre-install" | ||
15 | source="ftp://ftp.edgewall.com/pub/$pkgname/$_realname-$pkgver.tar.gz | ||
16 | tracd.confd | ||
17 | tracd.initd" | ||
18 | |||
19 | _builddir="$srcdir"/$_realname-$pkgver | ||
20 | |||
21 | build() { | ||
22 | cd "$_builddir" | ||
23 | python setup.py install --prefix=/usr --root="$pkgdir" | ||
24 | } | ||
25 | |||
26 | package() { | ||
27 | cd "$_builddir" | ||
28 | install -d -o tracd -g tracd "$pkgdir"/var/lib/trac | ||
29 | install -m755 -D "$srcdir"/tracd.initd "$pkgdir"/etc/init.d/tracd | ||
30 | install -m644 -D "$srcdir"/tracd.confd "$pkgdir"/etc/conf.d/tracd | ||
31 | } | ||
32 | |||
33 | md5sums="3cd96dad0e4f25d977c422fd6e985e99 Trac-0.11.7.tar.gz | ||
34 | 95b1311ca65e1ffcd51a191542f45ba4 tracd.confd | ||
35 | e53761b1e84c5d68c8e6c4b837e57008 tracd.initd" | ||
diff --git a/main/trac/trac.pre-install b/main/trac/trac.pre-install new file mode 100644 index 0000000000..05c659552b --- /dev/null +++ b/main/trac/trac.pre-install | |||
@@ -0,0 +1,5 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | addgroup tracd 2>/dev/null | ||
4 | adduser -s /bin/false -G tracd -D -H tracd 2>/dev/null | ||
5 | exit 0 | ||
diff --git a/main/trac/tracd.confd b/main/trac/tracd.confd new file mode 100644 index 0000000000..2cb9d292a7 --- /dev/null +++ b/main/trac/tracd.confd | |||
@@ -0,0 +1,13 @@ | |||
1 | # The commented variables in this file are the defaults that are used | ||
2 | # in the init-script. You don't need to uncomment them except to | ||
3 | # customize them to different values. | ||
4 | |||
5 | # Port for tracd | ||
6 | #TRACD_PORT="8000" | ||
7 | |||
8 | # Options for tracd | ||
9 | #TRACD_OPTS="--env-parent-dir /var/lib/trac/" | ||
10 | |||
11 | # User and group as which to run tracd | ||
12 | #TRACD_USER="tracd" | ||
13 | #TRACD_GROUP="tracd" | ||
diff --git a/main/trac/tracd.initd b/main/trac/tracd.initd new file mode 100755 index 0000000000..83f84052d3 --- /dev/null +++ b/main/trac/tracd.initd | |||
@@ -0,0 +1,27 @@ | |||
1 | #!/sbin/runscript | ||
2 | # Copyright 1999-2006 Gentoo Foundation | ||
3 | # Distributed under the terms of the GNU General Public License, v2 or later | ||
4 | # $Header: /var/cvsroot/gentoo-x86/www-apps/trac/files/tracd.initd,v 1.4 2010/05/28 14:43:40 arfrever Exp $ | ||
5 | |||
6 | depend() { | ||
7 | need net | ||
8 | } | ||
9 | |||
10 | start() { | ||
11 | ebegin "Starting tracd" | ||
12 | # tracd fails to create pidfile if started as non-root user, thus we are asking | ||
13 | # s-s-d to do that. To have correct pid we avoid -d option of tracd and use | ||
14 | # --background option of s-s-d. | ||
15 | start-stop-daemon --start --chuid ${TRACD_USER:-tracd}:${TRACD_GROUP:-tracd} \ | ||
16 | --pidfile /var/run/tracd.pid --make-pidfile --background \ | ||
17 | --env PYTHON_EGG_CACHE="/var/lib/trac/egg-cache" \ | ||
18 | --exec /usr/bin/python -- /usr/bin/tracd \ | ||
19 | -p ${TRACD_PORT:-8000} ${TRACD_OPTS:---env-parent-dir /var/lib/trac/} | ||
20 | eend $? | ||
21 | } | ||
22 | |||
23 | stop() { | ||
24 | ebegin "Stopping tracd" | ||
25 | start-stop-daemon --stop --quiet --pidfile /var/run/tracd.pid | ||
26 | eend $? | ||
27 | } | ||
diff --git a/main/transmission/APKBUILD b/main/transmission/APKBUILD index 1e8f07b85b..71ced6a53c 100644 --- a/main/transmission/APKBUILD +++ b/main/transmission/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer:Carlo Landmeter | 1 | # Maintainer:Carlo Landmeter |
2 | pkgname=transmission | 2 | pkgname=transmission |
3 | pkgver=1.74 | 3 | pkgver=1.93 |
4 | pkgrel=2 | 4 | pkgrel=0 |
5 | pkgdesc="Lightweight GTK BitTorrent client" | 5 | pkgdesc="Lightweight GTK BitTorrent client" |
6 | url="http://www.tansmissionbt.com" | 6 | url="http://www.tansmissionbt.com" |
7 | install="$pkgname.pre-install" | 7 | install="$pkgname.pre-install" |
@@ -46,6 +46,6 @@ cli() { | |||
46 | "$subpkgdir"/usr/bin/ | 46 | "$subpkgdir"/usr/bin/ |
47 | } | 47 | } |
48 | 48 | ||
49 | md5sums="6b1080800c62308179cfc7a691c82d63 transmission-1.74.tar.bz2 | 49 | md5sums="f68358d03e46bec5704bbaa894990152 transmission-1.93.tar.bz2 |
50 | f65b8ae46f8ac89b35844109b3aa0c18 transmission-daemon.initd | 50 | f65b8ae46f8ac89b35844109b3aa0c18 transmission-daemon.initd |
51 | 89478a70fcd93463e1dd8d751da994da transmission-daemon.confd" | 51 | 89478a70fcd93463e1dd8d751da994da transmission-daemon.confd" |
diff --git a/testing/ttf-linux-libertine/APKBUILD b/main/ttf-linux-libertine/APKBUILD index 2837358cd2..2837358cd2 100644 --- a/testing/ttf-linux-libertine/APKBUILD +++ b/main/ttf-linux-libertine/APKBUILD | |||
diff --git a/testing/umix/APKBUILD b/main/umix/APKBUILD index d057b39081..d057b39081 100644 --- a/testing/umix/APKBUILD +++ b/main/umix/APKBUILD | |||
diff --git a/main/usbutils/APKBUILD b/main/usbutils/APKBUILD index a6f579b969..663a97d8ac 100644 --- a/main/usbutils/APKBUILD +++ b/main/usbutils/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=usbutils | 2 | pkgname=usbutils |
3 | pkgver=0.87 | 3 | pkgver=0.87 |
4 | pkgrel=1 | 4 | pkgrel=2 |
5 | pkgdesc="USB Device Utilities" | 5 | pkgdesc="USB Device Utilities" |
6 | url="http://linux-usb.sourceforge.net/" | 6 | url="http://linux-usb.sourceforge.net/" |
7 | license="GPL" | 7 | license="GPL" |
@@ -23,6 +23,9 @@ build() { | |||
23 | package() { | 23 | package() { |
24 | cd "$srcdir"/$pkgname-$pkgver | 24 | cd "$srcdir"/$pkgname-$pkgver |
25 | make DESTDIR="$pkgdir" install | 25 | make DESTDIR="$pkgdir" install |
26 | mkdir -p "$pkgdir"/usr/lib/pkgconfig | ||
27 | mv "$pkgdir"/usr/share/hwdata/pkgconfig/usbutils.pc \ | ||
28 | "$pkgdir"/usr/lib/pkgconfig | ||
26 | } | 29 | } |
27 | 30 | ||
28 | md5sums="c19a11092dd0f5a5c6a93b0599740fe5 usbutils-0.87.tar.gz" | 31 | md5sums="c19a11092dd0f5a5c6a93b0599740fe5 usbutils-0.87.tar.gz" |
diff --git a/main/wireshark/APKBUILD b/main/wireshark/APKBUILD index bd315fa3b8..7aeb2803ea 100644 --- a/main/wireshark/APKBUILD +++ b/main/wireshark/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com> | 1 | # Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com> |
2 | # Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com> | 2 | # Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com> |
3 | pkgname=wireshark | 3 | pkgname=wireshark |
4 | pkgver=1.2.6 | 4 | pkgver=1.2.8 |
5 | pkgrel=2 | 5 | pkgrel=0 |
6 | pkgdesc="network protocol analyzer - GTK version" | 6 | pkgdesc="network protocol analyzer - GTK version" |
7 | url="http://www.wireshark.org" | 7 | url="http://www.wireshark.org" |
8 | license="GPLv2" | 8 | license="GPLv2" |
@@ -12,10 +12,19 @@ makedepends="bison flex perl glib glib-dev pkgconfig libpcap-dev libcap-dev | |||
12 | install="" | 12 | install="" |
13 | subpackages="$pkgname-dev $pkgname-doc $pkgname-common tshark" | 13 | subpackages="$pkgname-dev $pkgname-doc $pkgname-common tshark" |
14 | source="http://www.wireshark.org/download/src/${pkgname}-${pkgver}.tar.bz2 | 14 | source="http://www.wireshark.org/download/src/${pkgname}-${pkgver}.tar.bz2 |
15 | wireshark-1.1.2--as-needed.patch | ||
16 | wireshark-1.2.8-zlib-1.2.5-capture.patch | ||
15 | wireshark.desktop | 17 | wireshark.desktop |
16 | wireshark.png" | 18 | wireshark.png" |
17 | 19 | ||
18 | # depends_dev="somepackage-dev" | 20 | # depends_dev="somepackage-dev" |
21 | prepare() { | ||
22 | cd "$srcdir"/$pkgname-$pkgver | ||
23 | for i in "$srcdir"/*.patch; do | ||
24 | msg "Applying $i" | ||
25 | patch -p1 -i "$i" || return 1 | ||
26 | done | ||
27 | } | ||
19 | 28 | ||
20 | build() { | 29 | build() { |
21 | cd "$srcdir"/$pkgname-$pkgver | 30 | cd "$srcdir"/$pkgname-$pkgver |
@@ -64,6 +73,8 @@ tshark() { | |||
64 | mv "$pkgdir"/usr/bin/tshark "$subpkgdir"/usr/bin/tshark | 73 | mv "$pkgdir"/usr/bin/tshark "$subpkgdir"/usr/bin/tshark |
65 | } | 74 | } |
66 | 75 | ||
67 | md5sums="f3e0917ed393366bbf96c53b58cb0931 wireshark-1.2.6.tar.bz2 | 76 | md5sums="3a75d4f62317e52b8b39a1e9e37f1553 wireshark-1.2.8.tar.bz2 |
77 | cc87d7eb31f256df751b3371b1c426e9 wireshark-1.1.2--as-needed.patch | ||
78 | cc4fbe2db149f2ee42dd0593944a69fe wireshark-1.2.8-zlib-1.2.5-capture.patch | ||
68 | 504ede44c02b2a52f6cbd3bffdf93b8d wireshark.desktop | 79 | 504ede44c02b2a52f6cbd3bffdf93b8d wireshark.desktop |
69 | e771800a8c977fe223583a453bc27397 wireshark.png" | 80 | e771800a8c977fe223583a453bc27397 wireshark.png" |
diff --git a/main/wireshark/wireshark-1.1.2--as-needed.patch b/main/wireshark/wireshark-1.1.2--as-needed.patch new file mode 100644 index 0000000000..7da659c099 --- /dev/null +++ b/main/wireshark/wireshark-1.1.2--as-needed.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | diff --git a/epan/Makefile.am b/epan/Makefile.am | ||
2 | index b2a569d..717e233 100644 | ||
3 | --- a/epan/Makefile.am | ||
4 | +++ b/epan/Makefile.am | ||
5 | @@ -130,6 +130,7 @@ libwireshark_la_LIBADD = \ | ||
6 | dissectors/libdirtydissectors.la $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ \ | ||
7 | @C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \ | ||
8 | @KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ @GEOIP_LIBS@ \ | ||
9 | + ${top_builddir}/wiretap/libwiretap.la \ | ||
10 | ${top_builddir}/wsutil/libwsutil.la -lm | ||
11 | |||
12 | libwireshark_la_DEPENDENCIES = \ | ||
13 | @@ -137,6 +138,7 @@ libwireshark_la_DEPENDENCIES = \ | ||
14 | libwireshark_asmopt.la crypt/libairpdcap.la ftypes/libftypes.la \ | ||
15 | dfilter/libdfilter.la dissectors/libdissectors.la \ | ||
16 | dissectors/libdirtydissectors.la $(wslua_lib) \ | ||
17 | + ${top_builddir}/wiretap/libwiretap.la \ | ||
18 | ${top_builddir}/wsutil/libwsutil.la | ||
19 | |||
20 | #EXTRA_PROGRAMS = reassemble_test | ||
diff --git a/main/wireshark/wireshark-1.2.8-zlib-1.2.5-capture.patch b/main/wireshark/wireshark-1.2.8-zlib-1.2.5-capture.patch new file mode 100644 index 0000000000..3120027400 --- /dev/null +++ b/main/wireshark/wireshark-1.2.8-zlib-1.2.5-capture.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | http://anonsvn.wireshark.org/viewvc?view=rev&revision=32715 | ||
2 | |||
3 | --- trunk/wiretap/wtap.c 2010/05/07 19:24:32 32714 | ||
4 | +++ trunk/wiretap/wtap.c 2010/05/07 19:45:47 32715 | ||
5 | @@ -35,6 +35,10 @@ | ||
6 | #include <unistd.h> | ||
7 | #endif | ||
8 | |||
9 | +#ifdef HAVE_LIBZ | ||
10 | +#include <zlib.h> | ||
11 | +#endif | ||
12 | + | ||
13 | #include "wtap-int.h" | ||
14 | #include "wtap.h" | ||
15 | |||
16 | @@ -646,6 +650,14 @@ | ||
17 | */ | ||
18 | wth->phdr.pkt_encap = wth->file_encap; | ||
19 | |||
20 | +#if defined(ZLIB_VERNUM) && ZLIB_VERNUM == 0x1250 | ||
21 | + /* Reset EOF */ | ||
22 | + /* g_log(NULL, G_LOG_LEVEL_DEBUG, "wtap_read: eof before seek: %d", gzeof(wth->fh)); */ | ||
23 | + if (gzeof(wth->fh)) | ||
24 | + gzseek(wth->fh, 0, SEEK_CUR); | ||
25 | + /* g_log(NULL, G_LOG_LEVEL_DEBUG, "wtap_read: eof after seek: %d", gzeof(wth->fh)); */ | ||
26 | +#endif | ||
27 | + | ||
28 | if (!wth->subtype_read(wth, err, err_info, data_offset)) | ||
29 | return FALSE; /* failure */ | ||
30 | |||
diff --git a/main/xchat/APKBUILD b/main/xchat/APKBUILD index 9fe4bbe2c3..c5c67a59d0 100644 --- a/main/xchat/APKBUILD +++ b/main/xchat/APKBUILD | |||
@@ -1,23 +1,23 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=xchat | 2 | pkgname=xchat |
3 | pkgver=2.8.6 | 3 | pkgver=2.8.8 |
4 | pkgrel=4 | 4 | pkgrel=0 |
5 | pkgdesc="A GTK+ based IRC client" | 5 | pkgdesc="A GTK+ based IRC client" |
6 | url="http://www.xchat.org/" | 6 | url="http://www.xchat.org/" |
7 | license="GPL" | 7 | license="GPL" |
8 | makedepends="pkgconfig gtk+-dev openssl-dev dbus-glib-dev perl-dev | 8 | makedepends="pkgconfig gtk+-dev openssl-dev dbus-glib-dev perl-dev |
9 | libxext-dev" | 9 | libxext-dev" |
10 | source="http://www.$pkgname.org/files/source/2.8/$pkgname-$pkgver.tar.bz2 | 10 | source="http://www.$pkgname.org/files/source/2.8/$pkgname-$pkgver.tar.bz2 |
11 | http://www.$pkgname.org/files/source/2.8/patches/xc286-smallfixes.diff | 11 | " |
12 | depreciated-macros.patch | ||
13 | $pkgname-gtk2.patch" | ||
14 | 12 | ||
15 | _builddir="$srcdir"/$pkgname-$pkgver | 13 | _builddir="$srcdir"/$pkgname-$pkgver |
16 | prepare() { | 14 | prepare() { |
17 | cd "$_builddir" | 15 | cd "$_builddir" |
18 | patch -p1 < ../xc286-smallfixes.diff || return 1 | 16 | for i in "$srcdir"/*.patch; do |
19 | patch -p1 -i "$srcdir"/depreciated-macros.patch || return 1 | 17 | [ -r "$i" ] || continue |
20 | patch -p1 < ../xchat-gtk2.patch || return 1 | 18 | msg "Applying $i" |
19 | patch -p1 -i "$i" || return 1 | ||
20 | done | ||
21 | } | 21 | } |
22 | 22 | ||
23 | 23 | ||
@@ -42,7 +42,4 @@ package() { | |||
42 | make DESTDIR="$pkgdir" install || return 1 | 42 | make DESTDIR="$pkgdir" install || return 1 |
43 | } | 43 | } |
44 | 44 | ||
45 | md5sums="1f2670865d43a23a9abc596dde999aca xchat-2.8.6.tar.bz2 | 45 | md5sums="6775c44f38e84d06c06c336b32c4a452 xchat-2.8.8.tar.bz2" |
46 | eb68b6261bf6740cb5f223627eb8f384 xc286-smallfixes.diff | ||
47 | daee42354f95ca54a84248c3cb690fee depreciated-macros.patch | ||
48 | f3fe00982c0bec93152ed0b32438ef87 xchat-gtk2.patch" | ||
diff --git a/main/xchat/depreciated-macros.patch b/main/xchat/depreciated-macros.patch deleted file mode 100644 index 1b86be2f1b..0000000000 --- a/main/xchat/depreciated-macros.patch +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | --- a/src/fe-gtk/fe-gtk.c 2008-02-24 08:39:44.000000000 +0000 | ||
2 | +++ b/src/fe-gtk/fe-gtk.c.new 2010-04-01 18:10:31.840778707 +0000 | ||
3 | @@ -819,7 +819,8 @@ | ||
4 | switch (info_type) | ||
5 | { | ||
6 | case 0: /* window status */ | ||
7 | - if (!GTK_WIDGET_VISIBLE (GTK_WINDOW (sess->gui->window))) | ||
8 | + if (!gtk_widget_get_visible (GTK_WINDOW (sess->gui->window))) | ||
9 | + | ||
10 | return 2; /* hidden (iconified or systray) */ | ||
11 | #if GTK_CHECK_VERSION(2,4,0) | ||
12 | if (gtk_window_is_active (GTK_WINDOW (sess->gui->window))) | ||
13 | --- a/src/fe-gtk/menu.c 2008-06-08 07:59:37.000000000 +0000 | ||
14 | +++ b/src/fe-gtk/menu.c.new 2010-04-01 18:15:54.527573869 +0000 | ||
15 | @@ -1670,7 +1670,7 @@ | ||
16 | menu_canacaccel (GtkWidget *widget, guint signal_id, gpointer user_data) | ||
17 | { | ||
18 | /* GTK2.2 behaviour */ | ||
19 | - return GTK_WIDGET_IS_SENSITIVE (widget); | ||
20 | + return gtk_widget_is_sensitive (widget); | ||
21 | } | ||
22 | |||
23 | #endif | ||
24 | --- a/src/fe-gtk/maingui.c 2008-04-01 08:53:41.000000000 +0000 | ||
25 | +++ b/src/fe-gtk/maingui.c.new 2010-04-01 18:21:56.400181435 +0000 | ||
26 | @@ -599,7 +599,7 @@ | ||
27 | int num; | ||
28 | GtkWidget *f = NULL; | ||
29 | |||
30 | - if (current_sess && GTK_WIDGET_HAS_FOCUS (current_sess->gui->input_box)) | ||
31 | + if (current_sess && gtk_widget_has_focus (current_sess->gui->input_box)) | ||
32 | f = current_sess->gui->input_box; | ||
33 | |||
34 | num = gtk_notebook_page_num (GTK_NOTEBOOK (mg_gui->note_book), box); | ||
35 | @@ -809,8 +809,8 @@ | ||
36 | static void | ||
37 | mg_hide_empty_pane (GtkPaned *pane) | ||
38 | { | ||
39 | - if ((pane->child1 == NULL || !GTK_WIDGET_VISIBLE (pane->child1)) && | ||
40 | - (pane->child2 == NULL || !GTK_WIDGET_VISIBLE (pane->child2))) | ||
41 | + if ((pane->child1 == NULL || !gtk_widget_get_visible (pane->child1)) && | ||
42 | + (pane->child2 == NULL || !gtk_widget_get_visible (pane->child2))) | ||
43 | { | ||
44 | gtk_widget_hide (GTK_WIDGET (pane)); | ||
45 | return; | ||
46 | @@ -2563,9 +2563,9 @@ | ||
47 | { | ||
48 | int handle_size; | ||
49 | |||
50 | -/* if (pane->child1 == NULL || (!GTK_WIDGET_VISIBLE (pane->child1))) | ||
51 | +/* if (pane->child1 == NULL || (!gtk_widget_get_visible (pane->child1))) | ||
52 | return; | ||
53 | - if (pane->child2 == NULL || (!GTK_WIDGET_VISIBLE (pane->child2))) | ||
54 | + if (pane->child2 == NULL || (!gtk_widget_get_visible (pane->child2))) | ||
55 | return;*/ | ||
56 | |||
57 | gtk_widget_style_get (GTK_WIDGET (pane), "handle-size", &handle_size, NULL); | ||
diff --git a/main/xchat/xchat-gtk2.patch b/main/xchat/xchat-gtk2.patch deleted file mode 100644 index 4e13a2cf5d..0000000000 --- a/main/xchat/xchat-gtk2.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | --- xchat-2.8.6/src/fe-gtk/xtext.h.orig 2008-02-24 | ||
2 | 05:48:02.000000000 +0100 | ||
3 | +++ xchat-2.8.6/src/fe-gtk/xtext.h 2008-09-06 | ||
4 | 02:18:39.000000000 +0200 | ||
5 | @@ -270,6 +270,6 @@ | ||
6 | xtext_buffer *gtk_xtext_buffer_new (GtkXText *xtext); | ||
7 | void gtk_xtext_buffer_free (xtext_buffer *buf); | ||
8 | void gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render); | ||
9 | -GtkType gtk_xtext_get_type (void); | ||
10 | +GType gtk_xtext_get_type (void); | ||
11 | |||
12 | #endif | ||
diff --git a/main/xe-guest-utilities/APKBUILD b/main/xe-guest-utilities/APKBUILD index 5b4e481058..02b2115bd5 100644 --- a/main/xe-guest-utilities/APKBUILD +++ b/main/xe-guest-utilities/APKBUILD | |||
@@ -1,5 +1,5 @@ | |||
1 | # Contributor: Cedric Schieli <cschieli@gmail.com> | 1 | # Contributor: Cedric Schieli <cschieli@gmail.com> |
2 | # Maintainer: Citrix | 2 | # Maintainer: Cedric Schieli <cschieli@gmail.com> |
3 | pkgname=xe-guest-utilities | 3 | pkgname=xe-guest-utilities |
4 | _major=5.5.0 | 4 | _major=5.5.0 |
5 | _minor=458 | 5 | _minor=458 |
diff --git a/main/xfce-utils/APKBUILD b/main/xfce-utils/APKBUILD index 600ee7fb53..00dee69161 100644 --- a/main/xfce-utils/APKBUILD +++ b/main/xfce-utils/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=xfce-utils | 2 | pkgname=xfce-utils |
3 | pkgver=4.6.1 | 3 | pkgver=4.6.2 |
4 | pkgrel=2 | 4 | pkgrel=0 |
5 | pkgdesc="Utilities for Xfce" | 5 | pkgdesc="Utilities for Xfce" |
6 | url="http://www.xfce.org/" | 6 | url="http://www.xfce.org/" |
7 | license="GPL2" | 7 | license="GPL2" |
@@ -10,10 +10,9 @@ depends="hicolor-icon-theme" | |||
10 | makedepends="pkgconfig libxfcegui4-dev intltool gettext-dev libiconv-dev | 10 | makedepends="pkgconfig libxfcegui4-dev intltool gettext-dev libiconv-dev |
11 | libsm-dev expat-dev e2fsprogs-dev" | 11 | libsm-dev expat-dev e2fsprogs-dev" |
12 | install= | 12 | install= |
13 | source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2" | 13 | source="http://archive.xfce.org/src/xfce/$pkgname/4.6/$pkgname-$pkgver.tar.bz2" |
14 | 14 | ||
15 | build () | 15 | build () { |
16 | { | ||
17 | cd "$srcdir"/$pkgname-$pkgver | 16 | cd "$srcdir"/$pkgname-$pkgver |
18 | sed -i -e "s/share\/xsessions/sessions/g" Makefile.in || return 1 | 17 | sed -i -e "s/share\/xsessions/sessions/g" Makefile.in || return 1 |
19 | ./configure --prefix=/usr \ | 18 | ./configure --prefix=/usr \ |
@@ -23,6 +22,10 @@ build () | |||
23 | --disable-static \ | 22 | --disable-static \ |
24 | --with-xsession-prefix=/etc/X11/ | 23 | --with-xsession-prefix=/etc/X11/ |
25 | make || return 1 | 24 | make || return 1 |
25 | } | ||
26 | |||
27 | package() { | ||
28 | cd "$srcdir"/$pkgname-$pkgver | ||
26 | make DESTDIR="$pkgdir" install || return 1 | 29 | make DESTDIR="$pkgdir" install || return 1 |
27 | } | 30 | } |
28 | md5sums="1aa2362b11e79e56d52ce0d265faf1b6 xfce-utils-4.6.1.tar.bz2" | 31 | md5sums="5d23407700d7e8c9751e17a5bc955109 xfce-utils-4.6.2.tar.bz2" |
diff --git a/main/xfce4-appfinder/APKBUILD b/main/xfce4-appfinder/APKBUILD index 64238984d1..5787f36ed9 100644 --- a/main/xfce4-appfinder/APKBUILD +++ b/main/xfce4-appfinder/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=xfce4-appfinder | 2 | pkgname=xfce4-appfinder |
3 | pkgver=4.6.1 | 3 | pkgver=4.6.2 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="Xfce application finder" | 5 | pkgdesc="Xfce application finder" |
6 | url="http://www.xfce.org/" | 6 | url="http://www.xfce.org/" |
7 | license="GPL-2" | 7 | license="GPL-2" |
@@ -10,11 +10,9 @@ makedepends="pkgconfig thunar-dev libxfce4menu-dev intltool gtk+-dev | |||
10 | libxfce4util-dev libxfcegui4-dev gettext-dev libiconv-dev | 10 | libxfce4util-dev libxfcegui4-dev gettext-dev libiconv-dev |
11 | startup-notification-dev libsm-dev expat-dev e2fsprogs-dev" | 11 | startup-notification-dev libsm-dev expat-dev e2fsprogs-dev" |
12 | install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" | 12 | install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" |
13 | source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2 | 13 | source="http://archive.xfce.org/src/xfce/$pkgname/4.6/$pkgname-$pkgver.tar.bz2" |
14 | $install" | ||
15 | 14 | ||
16 | build () | 15 | build () { |
17 | { | ||
18 | cd "$srcdir"/$pkgname-$pkgver | 16 | cd "$srcdir"/$pkgname-$pkgver |
19 | ./configure --prefix=/usr \ | 17 | ./configure --prefix=/usr \ |
20 | --sysconfdir=/etc \ | 18 | --sysconfdir=/etc \ |
@@ -22,9 +20,10 @@ build () | |||
22 | --localstatedir=/var \ | 20 | --localstatedir=/var \ |
23 | --disable-static || return 1 | 21 | --disable-static || return 1 |
24 | make || return 1 | 22 | make || return 1 |
23 | } | ||
24 | |||
25 | package() { | ||
26 | cd "$srcdir"/$pkgname-$pkgver | ||
25 | make DESTDIR="$pkgdir" install || return 1 | 27 | make DESTDIR="$pkgdir" install || return 1 |
26 | } | 28 | } |
27 | md5sums="a1bc7d88100cfd92714a300be531589b xfce4-appfinder-4.6.1.tar.bz2 | 29 | md5sums="7752e43578b821e35010bcd3762da166 xfce4-appfinder-4.6.2.tar.bz2" |
28 | db51db79681eadc47be4932355a77c25 xfce4-appfinder.post-install | ||
29 | db51db79681eadc47be4932355a77c25 xfce4-appfinder.post-upgrade | ||
30 | db51db79681eadc47be4932355a77c25 xfce4-appfinder.post-deinstall" | ||
diff --git a/main/xfce4-mixer/APKBUILD b/main/xfce4-mixer/APKBUILD index b68c6fa1eb..c27b254ce0 100644 --- a/main/xfce4-mixer/APKBUILD +++ b/main/xfce4-mixer/APKBUILD | |||
@@ -1,19 +1,18 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=xfce4-mixer | 2 | pkgname=xfce4-mixer |
3 | pkgver=4.6.1 | 3 | pkgver=4.6.1 |
4 | pkgrel=1 | 4 | pkgrel=2 |
5 | pkgdesc="The volume control plugin for the Xfce panel" | 5 | pkgdesc="The volume control plugin for the Xfce panel" |
6 | url="http://www.xfce.org/" | 6 | url="http://www.xfce.org/" |
7 | license="GPL2" | 7 | license="GPL2" |
8 | depends="hicolor-icon-theme" | 8 | depends="hicolor-icon-theme" |
9 | makedepends="pkgconfig xfce4-panel-dev gstreamer-dev intltool | 9 | makedepends="pkgconfig xfce4-panel-dev gstreamer-dev intltool |
10 | gst-plugins-base-dev expat-dev libsm-dev e2fsprogs-dev" | 10 | gst-plugins-base-dev expat-dev libsm-dev e2fsprogs-dev" |
11 | install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" | 11 | install= |
12 | source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2 | 12 | source="http://archive.xfce.org/src/apps/xfce4-mixer/4.6/xfce4-mixer-$pkgver.tar.bz2 |
13 | $install" | 13 | " |
14 | 14 | ||
15 | build () | 15 | build() { |
16 | { | ||
17 | cd "$srcdir"/$pkgname-$pkgver | 16 | cd "$srcdir"/$pkgname-$pkgver |
18 | ./configure --prefix=/usr \ | 17 | ./configure --prefix=/usr \ |
19 | --sysconfdir=/etc \ | 18 | --sysconfdir=/etc \ |
@@ -22,9 +21,10 @@ build () | |||
22 | --disable-static \ | 21 | --disable-static \ |
23 | --with-sound=alsa || return 1 | 22 | --with-sound=alsa || return 1 |
24 | make || return 1 | 23 | make || return 1 |
24 | } | ||
25 | |||
26 | package() { | ||
27 | cd "$srcdir"/$pkgname-$pkgver | ||
25 | make DESTDIR="$pkgdir" install || return 1 | 28 | make DESTDIR="$pkgdir" install || return 1 |
26 | } | 29 | } |
27 | md5sums="a99e2455445480ef5081fe69454a46fc xfce4-mixer-4.6.1.tar.bz2 | 30 | md5sums="a99e2455445480ef5081fe69454a46fc xfce4-mixer-4.6.1.tar.bz2" |
28 | db51db79681eadc47be4932355a77c25 xfce4-mixer.post-install | ||
29 | db51db79681eadc47be4932355a77c25 xfce4-mixer.post-upgrade | ||
30 | db51db79681eadc47be4932355a77c25 xfce4-mixer.post-deinstall" | ||
diff --git a/main/xfce4-mixer/xfce4-mixer.post-deinstall b/main/xfce4-mixer/xfce4-mixer.post-deinstall deleted file mode 120000 index 59bfac9d75..0000000000 --- a/main/xfce4-mixer/xfce4-mixer.post-deinstall +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | xfce4-mixer.post-install \ No newline at end of file | ||
diff --git a/main/xfce4-mixer/xfce4-mixer.post-install b/main/xfce4-mixer/xfce4-mixer.post-install deleted file mode 100644 index c523d78da0..0000000000 --- a/main/xfce4-mixer/xfce4-mixer.post-install +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | gtk-update-icon-cache -q -t -f usr/share/icons/hicolor | ||
4 | |||
diff --git a/main/xfce4-mixer/xfce4-mixer.post-upgrade b/main/xfce4-mixer/xfce4-mixer.post-upgrade deleted file mode 120000 index 59bfac9d75..0000000000 --- a/main/xfce4-mixer/xfce4-mixer.post-upgrade +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | xfce4-mixer.post-install \ No newline at end of file | ||
diff --git a/main/xfce4-notes-plugin/APKBUILD b/main/xfce4-notes-plugin/APKBUILD new file mode 100644 index 0000000000..6b4be6b4da --- /dev/null +++ b/main/xfce4-notes-plugin/APKBUILD | |||
@@ -0,0 +1,36 @@ | |||
1 | # Contributor: | ||
2 | # Maintainer: | ||
3 | pkgname=xfce4-notes-plugin | ||
4 | pkgver=1.7.6 | ||
5 | pkgrel=0 | ||
6 | pkgdesc="Notes plugin for the Xfce4 desktop" | ||
7 | url="http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin" | ||
8 | license="GPL" | ||
9 | depends= | ||
10 | makedepends="xfce4-panel-dev libunique-dev" | ||
11 | install= | ||
12 | subpackages= | ||
13 | source="http://archive.xfce.org/src/panel-plugins/xfce4-notes-plugin/1.7/xfce4-notes-plugin-$pkgver.tar.bz2" | ||
14 | |||
15 | _builddir="$srcdir"/$pkgname-$pkgver | ||
16 | |||
17 | prepare() { | ||
18 | cd "$_builddir" | ||
19 | # apply patches here | ||
20 | } | ||
21 | |||
22 | build() { | ||
23 | cd "$_builddir" | ||
24 | ./configure --prefix=/usr \ | ||
25 | --sysconfdir=/etc \ | ||
26 | --mandir=/usr/share/man \ | ||
27 | --infodir=/usr/share/info | ||
28 | make || return 1 | ||
29 | } | ||
30 | |||
31 | package() { | ||
32 | cd "$_builddir" | ||
33 | make DESTDIR="$pkgdir" install | ||
34 | } | ||
35 | |||
36 | md5sums="a9fff3633f2d0b87f57f4aa93a8a3784 xfce4-notes-plugin-1.7.6.tar.bz2" | ||
diff --git a/main/xfce4-panel/APKBUILD b/main/xfce4-panel/APKBUILD index deac0568ec..4094d48d36 100644 --- a/main/xfce4-panel/APKBUILD +++ b/main/xfce4-panel/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=xfce4-panel | 2 | pkgname=xfce4-panel |
3 | pkgver=4.6.3 | 3 | pkgver=4.6.4 |
4 | pkgrel=2 | 4 | pkgrel=0 |
5 | pkgdesc="Panel for the Xfce desktop environment" | 5 | pkgdesc="Panel for the Xfce desktop environment" |
6 | url="http://www.xfce.org/" | 6 | url="http://www.xfce.org/" |
7 | license="GPL-2" | 7 | license="GPL-2" |
@@ -29,4 +29,4 @@ package() { | |||
29 | make DESTDIR="$pkgdir" install || return 1 | 29 | make DESTDIR="$pkgdir" install || return 1 |
30 | } | 30 | } |
31 | 31 | ||
32 | md5sums="0b715abb929220f136483ccd7303ff62 xfce4-panel-4.6.3.tar.bz2" | 32 | md5sums="82f10a42aefca4cc26a6633e7478cc65 xfce4-panel-4.6.4.tar.bz2" |
diff --git a/main/xfce4-session/APKBUILD b/main/xfce4-session/APKBUILD index 8eb92efd55..d5ddddebc4 100644 --- a/main/xfce4-session/APKBUILD +++ b/main/xfce4-session/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=xfce4-session | 2 | pkgname=xfce4-session |
3 | pkgver=4.6.1 | 3 | pkgver=4.6.2 |
4 | pkgrel=3 | 4 | pkgrel=0 |
5 | pkgdesc="A session manager for Xfce" | 5 | pkgdesc="A session manager for Xfce" |
6 | url="http://www.xfce.org/" | 6 | url="http://www.xfce.org/" |
7 | license="GPL2" | 7 | license="GPL2" |
@@ -11,7 +11,7 @@ makedepends="pkgconfig libxfcegui4-dev libwnck-dev libglade-dev intltool | |||
11 | e2fsprogs-dev zlib-dev" | 11 | e2fsprogs-dev zlib-dev" |
12 | depends="hicolor-icon-theme" | 12 | depends="hicolor-icon-theme" |
13 | install= | 13 | install= |
14 | source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2 | 14 | source="http://archive.xfce.org/src/xfce/$pkgname/4.6/$pkgname-$pkgver.tar.bz2 |
15 | busybox-shutdown.patch" | 15 | busybox-shutdown.patch" |
16 | 16 | ||
17 | depends_dev="libxfcegui4-dev xfconf-dev" | 17 | depends_dev="libxfcegui4-dev xfconf-dev" |
@@ -41,5 +41,5 @@ package() { | |||
41 | "$pkgdir"/usr/bin/xfce4-tips | 41 | "$pkgdir"/usr/bin/xfce4-tips |
42 | } | 42 | } |
43 | 43 | ||
44 | md5sums="7628be41ed3511a20cff5673d9d39858 xfce4-session-4.6.1.tar.bz2 | 44 | md5sums="9d9890130e45e0e9476591ed9ba2c9d5 xfce4-session-4.6.2.tar.bz2 |
45 | bfd9132f08f4a92efbe982fb911c511c busybox-shutdown.patch" | 45 | bfd9132f08f4a92efbe982fb911c511c busybox-shutdown.patch" |
diff --git a/main/xfce4-settings/APKBUILD b/main/xfce4-settings/APKBUILD index b627280230..e6bab01dd9 100644 --- a/main/xfce4-settings/APKBUILD +++ b/main/xfce4-settings/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=xfce4-settings | 2 | pkgname=xfce4-settings |
3 | pkgver=4.6.4 | 3 | pkgver=4.6.5 |
4 | pkgrel=2 | 4 | pkgrel=0 |
5 | pkgdesc="Settings manager for xfce" | 5 | pkgdesc="Settings manager for xfce" |
6 | url="http://www.xfce.org/" | 6 | url="http://www.xfce.org/" |
7 | license="GPL-2" | 7 | license="GPL-2" |
@@ -11,7 +11,6 @@ makedepends="exo-dev libnotify-dev libxfcegui4-dev libxklavier-dev libwnck-dev | |||
11 | libxi-dev libsm-dev e2fsprogs-dev libxkbfile-dev libxrandr-dev | 11 | libxi-dev libsm-dev e2fsprogs-dev libxkbfile-dev libxrandr-dev |
12 | autoconf automake libtool" | 12 | autoconf automake libtool" |
13 | source="http://archive.xfce.org/src/xfce/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 | 13 | source="http://archive.xfce.org/src/xfce/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 |
14 | xfce4-settings-4.7.1-libxklavier.patch | ||
15 | " | 14 | " |
16 | 15 | ||
17 | _builddir="$srcdir"/$pkgname-$pkgver | 16 | _builddir="$srcdir"/$pkgname-$pkgver |
@@ -49,5 +48,4 @@ package() { | |||
49 | make DESTDIR="$pkgdir" install || return 1 | 48 | make DESTDIR="$pkgdir" install || return 1 |
50 | } | 49 | } |
51 | 50 | ||
52 | md5sums="04985407e8e5b916c44780314a177e96 xfce4-settings-4.6.4.tar.bz2 | 51 | md5sums="f988cb732913b5fbc115ad7105d2231e xfce4-settings-4.6.5.tar.bz2" |
53 | 9a03696ed6200801d296c8adf6816a06 xfce4-settings-4.7.1-libxklavier.patch" | ||
diff --git a/main/xfconf/APKBUILD b/main/xfconf/APKBUILD index c267f24d73..704099fb97 100644 --- a/main/xfconf/APKBUILD +++ b/main/xfconf/APKBUILD | |||
@@ -1,13 +1,14 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=xfconf | 2 | pkgname=xfconf |
3 | pkgver=4.6.1 | 3 | pkgver=4.6.2 |
4 | pkgrel=2 | 4 | pkgrel=0 |
5 | pkgdesc="xfconf.. thingie" | 5 | pkgdesc="xfconf.. thingie" |
6 | url="http://www.xfce.org/" | 6 | url="http://www.xfce.org/" |
7 | license="GPL-2" | 7 | license="GPL-2" |
8 | subpackages="$pkgname-dev $pkgname-doc" | 8 | subpackages="$pkgname-dev $pkgname-doc" |
9 | depends= | 9 | depends= |
10 | makedepends="pkgconfig dbus-glib-dev libxfce4util-dev gettext-dev libiconv-dev" | 10 | makedepends="pkgconfig dbus-glib-dev libxfce4util-dev gettext-dev libiconv-dev |
11 | intltool" | ||
11 | source="http://mocha.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2" | 12 | source="http://mocha.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2" |
12 | 13 | ||
13 | depends_dev="glib-dev dbus-dev dbus-glib-dev" | 14 | depends_dev="glib-dev dbus-dev dbus-glib-dev" |
@@ -27,4 +28,4 @@ package() { | |||
27 | cd "$_builddir" | 28 | cd "$_builddir" |
28 | make DESTDIR="$pkgdir" install || return 1 | 29 | make DESTDIR="$pkgdir" install || return 1 |
29 | } | 30 | } |
30 | md5sums="d4d3018767ea9eb4b57cc57d4038023b xfconf-4.6.1.tar.bz2" | 31 | md5sums="5ff93c15077c6dbbcd38c437bc1ab2ef xfconf-4.6.2.tar.bz2" |
diff --git a/main/xfdesktop/APKBUILD b/main/xfdesktop/APKBUILD index f0a66cc0ff..5374a44795 100644 --- a/main/xfdesktop/APKBUILD +++ b/main/xfdesktop/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=xfdesktop | 2 | pkgname=xfdesktop |
3 | pkgver=4.6.1 | 3 | pkgver=4.6.2 |
4 | pkgrel=3 | 4 | pkgrel=0 |
5 | pkgdesc="A desktop manager for Xfce" | 5 | pkgdesc="A desktop manager for Xfce" |
6 | url="http://www.xfce.org/" | 6 | url="http://www.xfce.org/" |
7 | license="GPL-2" | 7 | license="GPL-2" |
@@ -12,7 +12,7 @@ makedepends="pkgconfig libxfce4menu-dev thunar-dev intltool gettext-dev | |||
12 | libglade-dev xfce4-panel-dev libsm-dev libice-dev expat-dev | 12 | libglade-dev xfce4-panel-dev libsm-dev libice-dev expat-dev |
13 | e2fsprogs-dev" | 13 | e2fsprogs-dev" |
14 | install= | 14 | install= |
15 | source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2" | 15 | source="http://archive.xfce.org/src/xfce/$pkgname/4.6/$pkgname-$pkgver.tar.bz2" |
16 | 16 | ||
17 | _builddir="$srcdir"/$pkgname-$pkgver | 17 | _builddir="$srcdir"/$pkgname-$pkgver |
18 | build() { | 18 | build() { |
@@ -30,4 +30,4 @@ package() { | |||
30 | make DESTDIR="$pkgdir" install || return 1 | 30 | make DESTDIR="$pkgdir" install || return 1 |
31 | } | 31 | } |
32 | 32 | ||
33 | md5sums="ae15cacc3e3834cca7238a8e1035c50d xfdesktop-4.6.1.tar.bz2" | 33 | md5sums="e800ea9fee7a5c5eaf2ae96e23a83e3a xfdesktop-4.6.2.tar.bz2" |
diff --git a/main/xfwm4-themes/APKBUILD b/main/xfwm4-themes/APKBUILD index 78d9a68687..8d711760b5 100644 --- a/main/xfwm4-themes/APKBUILD +++ b/main/xfwm4-themes/APKBUILD | |||
@@ -8,10 +8,9 @@ license="GPL2" | |||
8 | depends="xfwm4" | 8 | depends="xfwm4" |
9 | makedepends="pkgconfig" | 9 | makedepends="pkgconfig" |
10 | options="!strip" | 10 | options="!strip" |
11 | source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2" | 11 | source="http://archive.xfce.org/src/art/xfwm4-themes/4.6/xfwm4-themes-${pkgver}.tar.bz2" |
12 | 12 | ||
13 | build () | 13 | build() { |
14 | { | ||
15 | cd "$srcdir"/$pkgname-$pkgver | 14 | cd "$srcdir"/$pkgname-$pkgver |
16 | ./configure --prefix=/usr \ | 15 | ./configure --prefix=/usr \ |
17 | --sysconfdir=/etc \ | 16 | --sysconfdir=/etc \ |
@@ -19,6 +18,10 @@ build () | |||
19 | --localstatedir=/var \ | 18 | --localstatedir=/var \ |
20 | --disable-static | 19 | --disable-static |
21 | make || return 1 | 20 | make || return 1 |
21 | } | ||
22 | |||
23 | package() { | ||
24 | cd "$srcdir"/$pkgname-$pkgver | ||
22 | make DESTDIR="$pkgdir" install || return 1 | 25 | make DESTDIR="$pkgdir" install || return 1 |
23 | } | 26 | } |
24 | md5sums="4dc5cb29cbd40e3b9dece12a85e20854 xfwm4-themes-4.6.0.tar.bz2" | 27 | md5sums="4dc5cb29cbd40e3b9dece12a85e20854 xfwm4-themes-4.6.0.tar.bz2" |
diff --git a/main/xfwm4/APKBUILD b/main/xfwm4/APKBUILD index 9ca4fa568f..2fdc517086 100644 --- a/main/xfwm4/APKBUILD +++ b/main/xfwm4/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=xfwm4 | 2 | pkgname=xfwm4 |
3 | pkgver=4.6.1 | 3 | pkgver=4.6.2 |
4 | pkgrel=1 | 4 | pkgrel=1 |
5 | pkgdesc="Xfce window manager, compatible with Gnome, Gnome2, KDE2, and KDE3" | 5 | pkgdesc="Xfce window manager, compatible with Gnome, Gnome2, KDE2, and KDE3" |
6 | url="http://www.xfce.org/" | 6 | url="http://www.xfce.org/" |
@@ -8,12 +8,10 @@ license="GPL-2" | |||
8 | depends="hicolor-icon-theme" | 8 | depends="hicolor-icon-theme" |
9 | makedepends="pkgconfig libxfcegui4-dev libwnck-dev intltool gettext-dev | 9 | makedepends="pkgconfig libxfcegui4-dev libwnck-dev intltool gettext-dev |
10 | libiconv-dev libglade-dev expat-dev libsm-dev e2fsprogs" | 10 | libiconv-dev libglade-dev expat-dev libsm-dev e2fsprogs" |
11 | install="xfwm4.post-install xfwm4.post-upgrade xfwm4.post-deinstall" | 11 | install= |
12 | source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2 | 12 | source="http://archive.xfce.org/src/xfce/xfwm4/4.6/xfwm4-$pkgver.tar.bz2" |
13 | $install" | ||
14 | 13 | ||
15 | build () | 14 | build () { |
16 | { | ||
17 | cd "$srcdir"/$pkgname-$pkgver | 15 | cd "$srcdir"/$pkgname-$pkgver |
18 | ./configure --prefix=/usr \ | 16 | ./configure --prefix=/usr \ |
19 | --sysconfdir=/etc \ | 17 | --sysconfdir=/etc \ |
@@ -23,9 +21,10 @@ build () | |||
23 | --enable-compositor \ | 21 | --enable-compositor \ |
24 | --enable-xsync || return 1 | 22 | --enable-xsync || return 1 |
25 | make || return 1 | 23 | make || return 1 |
24 | } | ||
25 | |||
26 | package() { | ||
27 | cd "$srcdir"/$pkgname-$pkgver | ||
26 | make DESTDIR="$pkgdir" install || return 1 | 28 | make DESTDIR="$pkgdir" install || return 1 |
27 | } | 29 | } |
28 | md5sums="538ff2554a23bf877d336e573884da9a xfwm4-4.6.1.tar.bz2 | 30 | md5sums="3e6c0c54b028b6ea60e865e55ecdf3f8 xfwm4-4.6.2.tar.bz2" |
29 | db51db79681eadc47be4932355a77c25 xfwm4.post-install | ||
30 | db51db79681eadc47be4932355a77c25 xfwm4.post-upgrade | ||
31 | db51db79681eadc47be4932355a77c25 xfwm4.post-deinstall" | ||
diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD index 1dbb5b188e..2ae98aba28 100644 --- a/main/xorg-server/APKBUILD +++ b/main/xorg-server/APKBUILD | |||
@@ -1,11 +1,11 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=xorg-server | 2 | pkgname=xorg-server |
3 | pkgver=1.7.6 | 3 | pkgver=1.7.7 |
4 | pkgrel=2 | 4 | pkgrel=0 |
5 | pkgdesc="X.Org X servers" | 5 | pkgdesc="X.Org X servers" |
6 | url="http://xorg.freedesktop.org" | 6 | url="http://xorg.freedesktop.org" |
7 | license="custom" | 7 | license="custom" |
8 | subpackages="$pkgname-dev $pkgname-doc xfbdev" | 8 | subpackages="$pkgname-dev $pkgname-doc xfbdev xvfb" |
9 | depends=" | 9 | depends=" |
10 | font-misc-misc | 10 | font-misc-misc |
11 | font-cursor-misc | 11 | font-cursor-misc |
@@ -112,6 +112,7 @@ build() { | |||
112 | package() { | 112 | package() { |
113 | cd "$srcdir"/$pkgname-$pkgver | 113 | cd "$srcdir"/$pkgname-$pkgver |
114 | make -j1 DESTDIR="$pkgdir" install || return 1 | 114 | make -j1 DESTDIR="$pkgdir" install || return 1 |
115 | chmod u+s "$pkgdir"/usr/bin/Xorg | ||
115 | 116 | ||
116 | install -m755 -d "$pkgdir"/etc/X11 || return 1 | 117 | install -m755 -d "$pkgdir"/etc/X11 || return 1 |
117 | install -m755 -d "$pkgdir"/var/lib/xkb || return 1 | 118 | install -m755 -d "$pkgdir"/var/lib/xkb || return 1 |
@@ -126,6 +127,12 @@ xfbdev() { | |||
126 | mv "$pkgdir"/usr/bin/Xfbdev "$subpkgdir"/usr/bin/ | 127 | mv "$pkgdir"/usr/bin/Xfbdev "$subpkgdir"/usr/bin/ |
127 | } | 128 | } |
128 | 129 | ||
130 | xvfb() { | ||
131 | pkgdesc="Virtual Framebuffer 'fake' X server" | ||
132 | mkdir -p "$subpkgdir"/usr/bin | ||
133 | mv "$pkgdir"/usr/bin/Xvfb "$subpkgdir"/usr/bin/ | ||
134 | } | ||
135 | |||
129 | xephyr() { | 136 | xephyr() { |
130 | pkgdesc="kdrive based X Server which targets a window on a host X Server as its framebuffer" | 137 | pkgdesc="kdrive based X Server which targets a window on a host X Server as its framebuffer" |
131 | depends= | 138 | depends= |
@@ -133,5 +140,5 @@ xephyr() { | |||
133 | mv "$pkgdir"/usr/bin/Xephyr "$subpkgdir"/usr/bin/ | 140 | mv "$pkgdir"/usr/bin/Xephyr "$subpkgdir"/usr/bin/ |
134 | } | 141 | } |
135 | 142 | ||
136 | md5sums="178225f499ec10fa9d312d1c339e6a39 xorg-server-1.7.6.tar.bz2 | 143 | md5sums="8c0146330fb155c23d947ac37d431d4b xorg-server-1.7.7.tar.bz2 |
137 | 222de594206d1148a90eddfda4f7a11a xorg-redhat-die-ugly-pattern-die-die-die.patch" | 144 | 222de594206d1148a90eddfda4f7a11a xorg-redhat-die-ugly-pattern-die-die-die.patch" |
diff --git a/main/yasm/APKBUILD b/main/yasm/APKBUILD index f024570a41..34e6e30e43 100644 --- a/main/yasm/APKBUILD +++ b/main/yasm/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=yasm | 2 | pkgname=yasm |
3 | pkgver=0.8.0 | 3 | pkgver=1.0.1 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, GAS, etc.)" | 5 | pkgdesc="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, GAS, etc.)" |
6 | url="http://www.tortall.net/projects/yasm/" | 6 | url="http://www.tortall.net/projects/yasm/" |
7 | license="custom" | 7 | license="custom" |
@@ -22,4 +22,4 @@ package() { | |||
22 | make DESTDIR="$pkgdir" install | 22 | make DESTDIR="$pkgdir" install |
23 | install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING | 23 | install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING |
24 | } | 24 | } |
25 | md5sums="84a72204c9b452a00b39b1b00495163f yasm-0.8.0.tar.gz" | 25 | md5sums="2174fc3b6b74de07667f42d47514c336 yasm-1.0.1.tar.gz" |
diff --git a/testing/cairomm/APKBUILD b/testing/cairomm/APKBUILD new file mode 100644 index 0000000000..ad8c64c4a6 --- /dev/null +++ b/testing/cairomm/APKBUILD | |||
@@ -0,0 +1,26 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
2 | pkgname=cairomm | ||
3 | pkgver=1.8.4 | ||
4 | pkgrel=0 | ||
5 | pkgdesc="C++ bindings to Cairo vector graphics library" | ||
6 | url="http://www.cairographics.org" | ||
7 | license="LGPL MPL" | ||
8 | depends="" | ||
9 | makedepends="cairo-dev libsigc++-dev" | ||
10 | depends_dev="$makedepends" | ||
11 | subpackages="$pkgname-dev $pkgname-doc" | ||
12 | source="http://www.cairographics.org/releases/cairomm-$pkgver.tar.gz" | ||
13 | |||
14 | _builddir="$srcdir"/$pkgname-$pkgver | ||
15 | build() { | ||
16 | cd "$_builddir" | ||
17 | ./configure --prefix=/usr || return 1 | ||
18 | make || return 1 | ||
19 | } | ||
20 | |||
21 | package() { | ||
22 | cd "$_builddir" | ||
23 | make DESTDIR="$pkgdir" install || return 1 | ||
24 | } | ||
25 | |||
26 | md5sums="559afbc47484ba3fad265e38a3dafe90 cairomm-1.8.4.tar.gz" | ||
diff --git a/testing/gc/APKBUILD b/testing/gc/APKBUILD new file mode 100644 index 0000000000..065fba140b --- /dev/null +++ b/testing/gc/APKBUILD | |||
@@ -0,0 +1,38 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
2 | pkgname=gc | ||
3 | pkgver=7.1 | ||
4 | pkgrel=0 | ||
5 | pkgdesc="A garbage collector for C and C++" | ||
6 | url="http://www.hpl.hp.com/personal/Hans_Boehm/gc/" | ||
7 | license="GPL" | ||
8 | depends= | ||
9 | makedepends= | ||
10 | subpackages="$pkgname-dev $pkgname-doc libgc++:libgccpp" | ||
11 | source="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-$pkgver.tar.gz | ||
12 | uclibc-getcontext.patch" | ||
13 | |||
14 | prepare() { | ||
15 | cd "$srcdir"/$pkgname-$pkgver | ||
16 | patch -p1 -i "$srcdir"/uclibc-getcontext.patch || return 1 | ||
17 | } | ||
18 | |||
19 | build() { | ||
20 | cd "$srcdir"/$pkgname-$pkgver | ||
21 | ./configure --prefix=/usr \ | ||
22 | --datadir=/usr/share/doc/gc \ | ||
23 | --enable-cplusplus || return 1 | ||
24 | make || return 1 | ||
25 | } | ||
26 | |||
27 | package() { | ||
28 | cd "$srcdir"/$pkgname-$pkgver | ||
29 | make DESTDIR="$pkgdir" install || return 1 | ||
30 | } | ||
31 | |||
32 | libgccpp() { | ||
33 | install -d "$subpkgdir"/usr/lib | ||
34 | mv "$pkgdir"/usr/lib/libgccpp.* "$subpkgdir"/usr/lib/ | ||
35 | } | ||
36 | |||
37 | md5sums="2ff9924c7249ef7f736ecfe6f08f3f9b gc-7.1.tar.gz | ||
38 | bce75c75bf0cdb295ac0bf7ba0f6e267 uclibc-getcontext.patch" | ||
diff --git a/testing/gc/uclibc-getcontext.patch b/testing/gc/uclibc-getcontext.patch new file mode 100644 index 0000000000..de48fc0183 --- /dev/null +++ b/testing/gc/uclibc-getcontext.patch | |||
@@ -0,0 +1,11 @@ | |||
1 | --- ./mach_dep.c.orig | ||
2 | +++ ./mach_dep.c | ||
3 | @@ -175,7 +175,7 @@ | ||
4 | # if defined(HAVE_PUSH_REGS) | ||
5 | GC_push_regs(); | ||
6 | # elif defined(UNIX_LIKE) && !defined(DARWIN) && !defined(ARM32) && \ | ||
7 | - !defined(HURD) | ||
8 | + !defined(HURD) && !defined(__UCLIBC__) | ||
9 | /* Older versions of Darwin seem to lack getcontext(). */ | ||
10 | /* ARM Linux often doesn't support a real getcontext(). */ | ||
11 | ucontext_t ctxt; | ||
diff --git a/testing/gdl/APKBUILD b/testing/gdl/APKBUILD new file mode 100644 index 0000000000..7149885412 --- /dev/null +++ b/testing/gdl/APKBUILD | |||
@@ -0,0 +1,26 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
2 | pkgname=gdl | ||
3 | pkgver=2.30.0 | ||
4 | pkgrel=0 | ||
5 | pkgdesc="Gnome Devtool Libraries" | ||
6 | url="http://www.gnome.org/" | ||
7 | license="GPL" | ||
8 | makedepends="gtk+-dev libxml2-dev intltool" | ||
9 | subpackages="$pkgname-dev $pkgname-doc" | ||
10 | source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/2.30/$pkgname-$pkgver.tar.bz2" | ||
11 | |||
12 | build() { | ||
13 | cd "$srcdir"/$pkgname-$pkgver | ||
14 | ./configure --prefix=/usr \ | ||
15 | --sysconfdir=/etc \ | ||
16 | --localstatedir=/var \ | ||
17 | --disable-static \ | ||
18 | || return 1 | ||
19 | make || return 1 | ||
20 | } | ||
21 | |||
22 | package() { | ||
23 | cd "$srcdir"/$pkgname-$pkgver | ||
24 | make DESTDIR="$pkgdir" install || return 1 | ||
25 | } | ||
26 | md5sums="ce4eef03a36bf6abd9f8cbad4806d7b8 gdl-2.30.0.tar.bz2" | ||
diff --git a/testing/glibmm/APKBUILD b/testing/glibmm/APKBUILD new file mode 100644 index 0000000000..e87bffa31b --- /dev/null +++ b/testing/glibmm/APKBUILD | |||
@@ -0,0 +1,25 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
2 | pkgname=glibmm | ||
3 | pkgver=2.24.2 | ||
4 | pkgrel=0 | ||
5 | pkgdesc="C++ wrapper for the GLib toolkit" | ||
6 | url="http://gtkmm.sourceforge.net/" | ||
7 | license="LGPL" | ||
8 | depends= | ||
9 | makedepends="glib-dev libsigc++-dev" | ||
10 | subpackages="$pkgname-dev $pkgname-doc" | ||
11 | depends_dev="libsigc++-dev" | ||
12 | source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/2.24/$pkgname-$pkgver.tar.bz2" | ||
13 | |||
14 | build() { | ||
15 | cd "$srcdir"/$pkgname-$pkgver | ||
16 | ./configure --prefix=/usr || return 1 | ||
17 | make || return 1 | ||
18 | } | ||
19 | |||
20 | package() { | ||
21 | cd "$srcdir"/$pkgname-$pkgver | ||
22 | make DESTDIR="$pkgdir" install | ||
23 | } | ||
24 | |||
25 | md5sums="48861fec006c2bd8e301d8e44cd12d3c glibmm-2.24.2.tar.bz2" | ||
diff --git a/testing/gsl/APKBUILD b/testing/gsl/APKBUILD new file mode 100644 index 0000000000..fd4ba6ff8c --- /dev/null +++ b/testing/gsl/APKBUILD | |||
@@ -0,0 +1,25 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
2 | pkgname=gsl | ||
3 | pkgver=1.14 | ||
4 | pkgrel=0 | ||
5 | pkgdesc="The GNU Scientific Library (GSL) is a modern numerical library for C and C++ programmers" | ||
6 | url="http://www.gnu.org/software/gsl/gsl.html" | ||
7 | license="GPL" | ||
8 | depends= | ||
9 | makedepends= | ||
10 | install= | ||
11 | subpackages="$pkgname-dev $pkgname-doc" | ||
12 | source="http://ftp.belnet.be/mirror/ftp.gnu.org/gnu/gsl/gsl-$pkgver.tar.gz" | ||
13 | |||
14 | _builddir="$srcdir"/$pkgname-$pkgver | ||
15 | build() { | ||
16 | cd "$_builddir" | ||
17 | ./configure --prefix=/usr | ||
18 | make || return 1 | ||
19 | } | ||
20 | |||
21 | package() { | ||
22 | cd "$_builddir" | ||
23 | make DESTDIR="$pkgdir" install || return 1 | ||
24 | } | ||
25 | md5sums="d55e7b141815412a072a3f0e12442042 gsl-1.14.tar.gz" | ||
diff --git a/testing/gtkmm/APKBUILD b/testing/gtkmm/APKBUILD new file mode 100644 index 0000000000..6268ca0a3d --- /dev/null +++ b/testing/gtkmm/APKBUILD | |||
@@ -0,0 +1,24 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
2 | pkgname=gtkmm | ||
3 | pkgver=2.20.3 | ||
4 | pkgrel=0 | ||
5 | pkgdesc="C++ wrappers for GTK+" | ||
6 | url="http://gtkmm.sourceforge.net/" | ||
7 | license="LGPL" | ||
8 | depends="" | ||
9 | makedepends="gtk+-dev intltool glibmm-dev pangomm-dev" | ||
10 | depends_dev="atk-dev gtk+-dev glibmm-dev pangomm-dev" | ||
11 | subpackages="$pkgname-dev $pkgname-doc" | ||
12 | source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/2.20/$pkgname-$pkgver.tar.bz2" | ||
13 | |||
14 | build() { | ||
15 | cd "$srcdir"/gtkmm-$pkgver | ||
16 | ./configure --prefix=/usr || return 1 | ||
17 | make || return 1 | ||
18 | } | ||
19 | |||
20 | package() { | ||
21 | cd "$srcdir"/gtkmm-$pkgver | ||
22 | make install DESTDIR="$pkgdir" | ||
23 | } | ||
24 | md5sums="c35f236091b4f96fe45c53b4107400a9 gtkmm-2.20.3.tar.bz2" | ||
diff --git a/testing/gtksourceview/APKBUILD b/testing/gtksourceview/APKBUILD index 78f48202d7..8e080b2077 100644 --- a/testing/gtksourceview/APKBUILD +++ b/testing/gtksourceview/APKBUILD | |||
@@ -1,14 +1,14 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=gtksourceview | 2 | pkgname=gtksourceview |
3 | pkgver=2.8.2 | 3 | pkgver=2.10.2 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="A text widget adding syntax highlighting and more to GNOME" | 5 | pkgdesc="A text widget adding syntax highlighting and more to GNOME" |
6 | url="http://live.gnome.org/GtkSourceView" | 6 | url="http://live.gnome.org/GtkSourceView" |
7 | license="GPL" | 7 | license="GPL" |
8 | depends= | 8 | depends= |
9 | makedepends="gtk+-dev intltool libxml2-dev" | 9 | makedepends="gtk+-dev intltool libxml2-dev gobject-introspection" |
10 | subpackages="$pkgname-dev $pkgname-doc" | 10 | subpackages="$pkgname-dev $pkgname-doc" |
11 | source="http://ftp.gnome.org/pub/gnome/sources/gtksourceview/2.8/gtksourceview-$pkgver.tar.bz2" | 11 | source="http://ftp.gnome.org/pub/gnome/sources/gtksourceview/${pkgver%.*}/gtksourceview-$pkgver.tar.bz2" |
12 | 12 | ||
13 | build() { | 13 | build() { |
14 | cd "$srcdir"/gtksourceview-$pkgver | 14 | cd "$srcdir"/gtksourceview-$pkgver |
@@ -23,4 +23,4 @@ package() { | |||
23 | cd "$srcdir"/gtksourceview-$pkgver | 23 | cd "$srcdir"/gtksourceview-$pkgver |
24 | make DESTDIR="$pkgdir" install || return 1 | 24 | make DESTDIR="$pkgdir" install || return 1 |
25 | } | 25 | } |
26 | md5sums="5ce481d3aa7d639fe4508530b184158c gtksourceview-2.8.2.tar.bz2" | 26 | md5sums="56c849c0adea56228287abbabc7b70b9 gtksourceview-2.10.2.tar.bz2" |
diff --git a/testing/hardinfo/APKBUILD b/testing/hardinfo/APKBUILD index 30b5794916..8b6db2bf40 100644 --- a/testing/hardinfo/APKBUILD +++ b/testing/hardinfo/APKBUILD | |||
@@ -1,19 +1,21 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=hardinfo | 2 | pkgname=hardinfo |
3 | pkgver=0.5.1 | 3 | pkgver=0.5.1 |
4 | pkgrel=1 | 4 | pkgrel=2 |
5 | pkgdesc="A system information and benchmark tool." | 5 | pkgdesc="A system information and benchmark tool." |
6 | url="http://hardinfo.berlios.de/wiki/index.php/Main_Page" | 6 | url="http://hardinfo.berlios.de/wiki/index.php/Main_Page" |
7 | license="GPL-2" | 7 | license="GPL-2" |
8 | makedepends="gtk+-dev libsoup-dev>=2.4.0 gnutls-dev>=2.4.1" | 8 | makedepends="gtk+-dev libsoup-dev>=2.4.0 gnutls-dev>=2.4.1" |
9 | depends= | 9 | depends= |
10 | source="http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.bz2 | 10 | source="http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.bz2 |
11 | fixsensors.patch" | 11 | fixsensors.patch |
12 | hardinfo-alpine.patch" | ||
12 | 13 | ||
13 | _builddir="$srcdir"/$pkgname-$pkgver | 14 | _builddir="$srcdir"/$pkgname-$pkgver |
14 | prepare() { | 15 | prepare() { |
15 | cd "$_builddir" | 16 | cd "$_builddir" |
16 | patch -p1 < "$srcdir"/fixsensors.patch || return 1 | 17 | patch -p1 -i "$srcdir"/fixsensors.patch || return 1 |
18 | patch -p1 -i "$srcdir"/hardinfo-alpine.patch || return 1 | ||
17 | # configure scrip says bash but bb ash works just fine | 19 | # configure scrip says bash but bb ash works just fine |
18 | sed -i -e '1,1s/bash/sh/' configure | 20 | sed -i -e '1,1s/bash/sh/' configure |
19 | } | 21 | } |
@@ -31,4 +33,5 @@ package() { | |||
31 | echo "Alpine Linux" > "$pkgdir"/etc/hardinfo.distro | 33 | echo "Alpine Linux" > "$pkgdir"/etc/hardinfo.distro |
32 | } | 34 | } |
33 | md5sums="6fb38992e140f2fab16518ae1f38e188 hardinfo-0.5.1.tar.bz2 | 35 | md5sums="6fb38992e140f2fab16518ae1f38e188 hardinfo-0.5.1.tar.bz2 |
34 | 05c212db07b9f152cdea052ff7bb28fa fixsensors.patch" | 36 | 05c212db07b9f152cdea052ff7bb28fa fixsensors.patch |
37 | ae8d38e5b35fb2c9c5f425dde3ba27cb hardinfo-alpine.patch" | ||
diff --git a/testing/hardinfo/hardinfo-alpine.patch b/testing/hardinfo/hardinfo-alpine.patch new file mode 100644 index 0000000000..279aa5d539 --- /dev/null +++ b/testing/hardinfo/hardinfo-alpine.patch | |||
@@ -0,0 +1,10 @@ | |||
1 | --- ./computer.h.orig | ||
2 | +++ ./computer.h | ||
3 | @@ -23,6 +23,7 @@ | ||
4 | static struct { | ||
5 | gchar *file, *codename; | ||
6 | } distro_db[] = { | ||
7 | + { DB_PREFIX "alpine-version", "al" }, | ||
8 | { DB_PREFIX "debian_version", "deb" }, | ||
9 | { DB_PREFIX "slackware-version", "slk" }, | ||
10 | { DB_PREFIX "mandrake-release", "mdk" }, | ||
diff --git a/testing/inkscape/50-poppler-API.patch b/testing/inkscape/50-poppler-API.patch new file mode 100644 index 0000000000..b97969de1d --- /dev/null +++ b/testing/inkscape/50-poppler-API.patch | |||
@@ -0,0 +1,97 @@ | |||
1 | #! /bin/sh /usr/share/dpatch/dpatch-run | ||
2 | ## 50-poppler-API.patch.dpatch by Kees Cook <kees@ubuntu.com> | ||
3 | ## | ||
4 | ## All lines beginning with `## DP:' are a description of the patch. | ||
5 | ## DP: https://bugs.launchpad.net/inkscape/+bug/487038 | ||
6 | |||
7 | @DPATCH@ | ||
8 | diff -urNad inkscape~/src/extension/internal/pdfinput/pdf-parser.cpp inkscape/src/extension/internal/pdfinput/pdf-parser.cpp | ||
9 | --- inkscape~/src/extension/internal/pdfinput/pdf-parser.cpp 2009-10-10 12:17:47.000000000 -0700 | ||
10 | +++ inkscape/src/extension/internal/pdfinput/pdf-parser.cpp 2009-12-23 22:34:13.000000000 -0800 | ||
11 | @@ -809,7 +809,7 @@ | ||
12 | blendingColorSpace = NULL; | ||
13 | isolated = knockout = gFalse; | ||
14 | if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) { | ||
15 | - blendingColorSpace = GfxColorSpace::parse(&obj5); | ||
16 | + blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); | ||
17 | } | ||
18 | obj5.free(); | ||
19 | if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) { | ||
20 | @@ -1009,9 +1009,9 @@ | ||
21 | state->setFillPattern(NULL); | ||
22 | res->lookupColorSpace(args[0].getName(), &obj); | ||
23 | if (obj.isNull()) { | ||
24 | - colorSpace = GfxColorSpace::parse(&args[0]); | ||
25 | + colorSpace = GfxColorSpace::parse(&args[0], NULL); | ||
26 | } else { | ||
27 | - colorSpace = GfxColorSpace::parse(&obj); | ||
28 | + colorSpace = GfxColorSpace::parse(&obj, NULL); | ||
29 | } | ||
30 | obj.free(); | ||
31 | if (colorSpace) { | ||
32 | @@ -1032,9 +1032,9 @@ | ||
33 | state->setStrokePattern(NULL); | ||
34 | res->lookupColorSpace(args[0].getName(), &obj); | ||
35 | if (obj.isNull()) { | ||
36 | - colorSpace = GfxColorSpace::parse(&args[0]); | ||
37 | + colorSpace = GfxColorSpace::parse(&args[0], NULL); | ||
38 | } else { | ||
39 | - colorSpace = GfxColorSpace::parse(&obj); | ||
40 | + colorSpace = GfxColorSpace::parse(&obj, NULL); | ||
41 | } | ||
42 | obj.free(); | ||
43 | if (colorSpace) { | ||
44 | @@ -1101,7 +1101,7 @@ | ||
45 | builder->updateStyle(state); | ||
46 | } | ||
47 | if (args[numArgs-1].isName() && | ||
48 | - (pattern = res->lookupPattern(args[numArgs-1].getName()))) { | ||
49 | + (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { | ||
50 | state->setFillPattern(pattern); | ||
51 | builder->updateStyle(state); | ||
52 | } | ||
53 | @@ -1145,7 +1145,7 @@ | ||
54 | builder->updateStyle(state); | ||
55 | } | ||
56 | if (args[numArgs-1].isName() && | ||
57 | - (pattern = res->lookupPattern(args[numArgs-1].getName()))) { | ||
58 | + (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { | ||
59 | state->setStrokePattern(pattern); | ||
60 | builder->updateStyle(state); | ||
61 | } | ||
62 | @@ -1543,7 +1543,7 @@ | ||
63 | double *matrix = NULL; | ||
64 | GBool savedState = gFalse; | ||
65 | |||
66 | - if (!(shading = res->lookupShading(args[0].getName()))) { | ||
67 | + if (!(shading = res->lookupShading(args[0].getName(), NULL))) { | ||
68 | return; | ||
69 | } | ||
70 | |||
71 | @@ -2507,7 +2507,7 @@ | ||
72 | } | ||
73 | } | ||
74 | if (!obj1.isNull()) { | ||
75 | - colorSpace = GfxColorSpace::parse(&obj1); | ||
76 | + colorSpace = GfxColorSpace::parse(&obj1, NULL); | ||
77 | } else if (csMode == streamCSDeviceGray) { | ||
78 | colorSpace = new GfxDeviceGrayColorSpace(); | ||
79 | } else if (csMode == streamCSDeviceRGB) { | ||
80 | @@ -2592,7 +2592,7 @@ | ||
81 | obj2.free(); | ||
82 | } | ||
83 | } | ||
84 | - maskColorSpace = GfxColorSpace::parse(&obj1); | ||
85 | + maskColorSpace = GfxColorSpace::parse(&obj1, NULL); | ||
86 | obj1.free(); | ||
87 | if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) { | ||
88 | goto err1; | ||
89 | @@ -2767,7 +2767,7 @@ | ||
90 | if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) { | ||
91 | transpGroup = gTrue; | ||
92 | if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) { | ||
93 | - blendingColorSpace = GfxColorSpace::parse(&obj3); | ||
94 | + blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); | ||
95 | } | ||
96 | obj3.free(); | ||
97 | if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) { | ||
diff --git a/testing/inkscape/APKBUILD b/testing/inkscape/APKBUILD new file mode 100644 index 0000000000..d8c5f2452f --- /dev/null +++ b/testing/inkscape/APKBUILD | |||
@@ -0,0 +1,53 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
2 | pkgname=inkscape | ||
3 | pkgver=0.47 | ||
4 | pkgrel=1 | ||
5 | pkgdesc="A vector-based drawing program - svg compliant" | ||
6 | url="http://inkscape.sourceforge.net/" | ||
7 | license="GPL LGPL" | ||
8 | makedepends=" | ||
9 | poppler-gtk-dev | ||
10 | imagemagick-dev | ||
11 | gtkspell-dev | ||
12 | gc-dev | ||
13 | gtkmm-dev | ||
14 | libxslt-dev | ||
15 | gsl-dev | ||
16 | py-xml | ||
17 | popt-dev | ||
18 | lcms-dev | ||
19 | libxml2-dev | ||
20 | boost-dev | ||
21 | " | ||
22 | depends="desktop-file-utils" | ||
23 | install= | ||
24 | source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz | ||
25 | 50-poppler-API.patch" | ||
26 | |||
27 | _builddir="$srcdir"/$pkgname-$pkgver | ||
28 | |||
29 | prepare() { | ||
30 | cd "$_builddir" | ||
31 | patch -p1 -i "$srcdir"/50-poppler-API.patch || return 1 | ||
32 | } | ||
33 | |||
34 | build() { | ||
35 | cd "$_builddir" | ||
36 | ./configure --prefix=/usr \ | ||
37 | --with-python \ | ||
38 | --with-perl \ | ||
39 | --without-gnome-vfs \ | ||
40 | --with-xft \ | ||
41 | --enable-lcms \ | ||
42 | --enable-poppler-cairo \ | ||
43 | --disable-dependency-tracking \ | ||
44 | || return 1 | ||
45 | make || return 1 | ||
46 | } | ||
47 | |||
48 | package() { | ||
49 | cd "$_builddir" | ||
50 | make DESTDIR="$pkgdir" install || return 1 | ||
51 | } | ||
52 | md5sums="916c85b501bcfb0ae61fcf7318f36348 inkscape-0.47.tar.gz | ||
53 | b447272c9b282b49e86dca24c2581065 50-poppler-API.patch" | ||
diff --git a/testing/iscsi-scst-svn/APKBUILD b/testing/iscsi-scst-svn/APKBUILD new file mode 100644 index 0000000000..f322407eb9 --- /dev/null +++ b/testing/iscsi-scst-svn/APKBUILD | |||
@@ -0,0 +1,40 @@ | |||
1 | # Contributor: Carlo Landmeter | ||
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | |||
4 | pkgname=iscsi-scst-svn | ||
5 | pkgver=1713 | ||
6 | pkgrel=0 | ||
7 | pkgdesc="ISCSI target for SCST - userspace tools" | ||
8 | url="http://iscsi-scst.sourceforge.net/" | ||
9 | license="GPL-2" | ||
10 | depends= | ||
11 | install= | ||
12 | makedepends="openssl-dev scst-svn-scst-dev bash" | ||
13 | subpackages= | ||
14 | source="http://alpine.nethq.org/clandmeter/src/$pkgname-$pkgver.tar.gz | ||
15 | iscsi-scst.initd | ||
16 | " | ||
17 | |||
18 | _builddir="$srcdir"/iscsi-scst | ||
19 | prepare() { | ||
20 | cd "$_builddir" | ||
21 | # we need the headre file. fix dependency in makefile | ||
22 | sed -i -e 's/^\(progs:.*\)/\1 include\/iscsi_scst_itf_ver.h/' Makefile | ||
23 | } | ||
24 | |||
25 | build() { | ||
26 | cd "$_builddir" | ||
27 | make progs \ | ||
28 | SCST_INC_DIR=/usr/include/scst | ||
29 | } | ||
30 | |||
31 | package() { | ||
32 | cd "$_builddir" | ||
33 | # make install is broken | ||
34 | install -D usr/iscsi-scstd "$pkgdir"/usr/sbin/iscsi-scstd | ||
35 | install -D usr/iscsi-scst-adm "$pkgdir"/usr/sbin/iscsi-scst-adm | ||
36 | install -D -m 755 "$srcdir"/iscsi-scst.initd "$pkgdir"/etc/init.d/iscsi-scst | ||
37 | } | ||
38 | |||
39 | md5sums="cf046db4f7cd9cf969b054dc055922d6 iscsi-scst-svn-1713.tar.gz | ||
40 | 3132fae1ec2f9bcc72476d9e9f36d326 iscsi-scst.initd" | ||
diff --git a/testing/iscsi-scst-svn/iscsi-scst.initd b/testing/iscsi-scst-svn/iscsi-scst.initd new file mode 100644 index 0000000000..4d4cd76b59 --- /dev/null +++ b/testing/iscsi-scst-svn/iscsi-scst.initd | |||
@@ -0,0 +1,23 @@ | |||
1 | #!/sbin/runscript | ||
2 | # | ||
3 | # Start the iSCSI-SCST Target. | ||
4 | # | ||
5 | |||
6 | depend() { | ||
7 | need net | ||
8 | afer firewall | ||
9 | } | ||
10 | |||
11 | start() { | ||
12 | modprobe -q crc32c | ||
13 | modprobe -q iscsi-scst | ||
14 | ebegin "Starting iscsi-scstd" | ||
15 | start-stop-daemon --start --exec /usr/sbin/iscsi-scstd | ||
16 | eend 0 | ||
17 | } | ||
18 | |||
19 | stop() { | ||
20 | ebegin "Stopping iscsi-scstd" | ||
21 | start-stop-daemon --stop --exec /usr/sbin/iscsi-scstd | ||
22 | eend 0 | ||
23 | } | ||
diff --git a/testing/kamailio/APKBUILD b/testing/kamailio/APKBUILD index fff2908231..aee29ffc05 100644 --- a/testing/kamailio/APKBUILD +++ b/testing/kamailio/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Contributor: Michael Mason <ms13sp@gmail.com> | 1 | # Contributor: Michael Mason <ms13sp@gmail.com> |
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
3 | pkgname=kamailio | 3 | pkgname=kamailio |
4 | pkgver=3.0.1 | 4 | pkgver=3.0.2 |
5 | pkgrel=1 | 5 | pkgrel=0 |
6 | pkgdesc="Open Source SIP Server" | 6 | pkgdesc="Open Source SIP Server" |
7 | url="http://www.kamailio.org/" | 7 | url="http://www.kamailio.org/" |
8 | pkgusers="kamailio" | 8 | pkgusers="kamailio" |
@@ -144,7 +144,7 @@ unixodbc() { | |||
144 | _mv_mod_k db_unixodbc | 144 | _mv_mod_k db_unixodbc |
145 | } | 145 | } |
146 | 146 | ||
147 | md5sums="c0e488ab240f9a4668c10068e3fb2cae kamailio-3.0.1_src.tar.gz | 147 | md5sums="dd039e078a77032a423fb15f9685ad31 kamailio-3.0.2_src.tar.gz |
148 | eb665248ee39cf755a247286affc5cbb kamailio.cfg | 148 | eb665248ee39cf755a247286affc5cbb kamailio.cfg |
149 | 81100c479890a2a8c2628db22fdd1a0c kamailio.initd | 149 | 81100c479890a2a8c2628db22fdd1a0c kamailio.initd |
150 | c646af2dd31f5c4289a2f802c873d98f kamailio.pre-install | 150 | c646af2dd31f5c4289a2f802c873d98f kamailio.pre-install |
diff --git a/testing/kqemu-grsec/APKBUILD b/testing/kqemu-grsec/APKBUILD deleted file mode 100644 index 66a0ea09dd..0000000000 --- a/testing/kqemu-grsec/APKBUILD +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
2 | |||
3 | _flavor=grsec | ||
4 | _realname=kqemu | ||
5 | # source the kernel version | ||
6 | if [ -f ../../main/linux-$_flavor/APKBUILD ]; then | ||
7 | . ../../main/linux-$_flavor/APKBUILD | ||
8 | fi | ||
9 | _kernelver=$pkgver-r$pkgrel | ||
10 | _abi_release=$pkgver-${_flavor} | ||
11 | _kpkgrel=$pkgrel | ||
12 | |||
13 | pkgname=${_realname}-${_flavor} | ||
14 | pkgver=$pkgver | ||
15 | _realver=1.4.0pre1 | ||
16 | _mypkgrel=0 | ||
17 | pkgrel=$(($_kpkgrel + $_mypkgrel)) | ||
18 | pkgdesc="$_flavor kernel modules for kemu $_realver" | ||
19 | url="http://www.nongnu.org/qemu/" | ||
20 | license="GPL" | ||
21 | depends="linux-${_flavor}=${_kernelver}" | ||
22 | install= | ||
23 | makedepends="linux-${_flavor}-dev=${_kernelver}" | ||
24 | subpackages= | ||
25 | source="http://www.nongnu.org/qemu/kqemu-$_realver.tar.gz" | ||
26 | |||
27 | # override kernel APKBUILD's prepare | ||
28 | prepare() { | ||
29 | : | ||
30 | } | ||
31 | |||
32 | build() { | ||
33 | cd "$srcdir"/$_realname-$_realver | ||
34 | ./configure --kernel-path=/lib/modules/${_abi_release}/build | ||
35 | make || return 1 | ||
36 | } | ||
37 | |||
38 | package() { | ||
39 | cd "$srcdir"/$_realname-$_realver | ||
40 | install -D -m644 kqemu.ko \ | ||
41 | "$pkgdir"/lib/modules/${_abi_release}/misc/kqemu.ko \ | ||
42 | || return 1 | ||
43 | } | ||
44 | md5sums="d738d8ca7332211ab716ec3213d82ee1 kqemu-1.4.0pre1.tar.gz" | ||
diff --git a/testing/lcms/APKBUILD b/testing/lcms/APKBUILD new file mode 100644 index 0000000000..7d3d4ca994 --- /dev/null +++ b/testing/lcms/APKBUILD | |||
@@ -0,0 +1,31 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
2 | pkgname=lcms | ||
3 | pkgver=1.19 | ||
4 | pkgrel=0 | ||
5 | pkgdesc="Lightweight color management development library/engine" | ||
6 | url="http://www.littlecms.com" | ||
7 | license="custom" | ||
8 | depends= | ||
9 | makedepends="tiff-dev jpeg-dev zlib-dev" | ||
10 | subpackages="$pkgname-dev $pkgname-doc liblcms" | ||
11 | source="http://downloads.sourceforge.net/project/lcms/lcms/$pkgver/lcms-$pkgver.tar.gz" | ||
12 | |||
13 | _builddir="$srcdir"/$pkgname-$pkgver | ||
14 | build() { | ||
15 | cd "$_builddir" | ||
16 | ./configure --prefix=/usr | ||
17 | make || return 1 | ||
18 | } | ||
19 | |||
20 | package() { | ||
21 | cd "$_builddir" | ||
22 | make DESTDIR="$pkgdir" install || return 1 | ||
23 | install -Dm 644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE | ||
24 | } | ||
25 | |||
26 | liblcms() { | ||
27 | mkdir -p "$subpkgdir"/usr/lib | ||
28 | mv "$pkgdir"/usr/lib/liblcms.so.* "$subpkgdir"/usr/lib/ | ||
29 | } | ||
30 | |||
31 | md5sums="8af94611baf20d9646c7c2c285859818 lcms-1.19.tar.gz" | ||
diff --git a/testing/libsigc++/APKBUILD b/testing/libsigc++/APKBUILD new file mode 100644 index 0000000000..bac91a5844 --- /dev/null +++ b/testing/libsigc++/APKBUILD | |||
@@ -0,0 +1,24 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
2 | pkgname=libsigc++ | ||
3 | pkgver=2.2.8 | ||
4 | pkgrel=0 | ||
5 | pkgdesc="type-safe Signal Framework for C++" | ||
6 | url="http://libsigc.sourceforge.net/" | ||
7 | license="LGPL" | ||
8 | depends= | ||
9 | makedepends="m4" | ||
10 | subpackages="$pkgname-dev $pkgname-doc" | ||
11 | source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/2.2/$pkgname-$pkgver.tar.bz2" | ||
12 | |||
13 | build() { | ||
14 | cd ""$srcdir"/$pkgname-$pkgver" | ||
15 | ./configure --prefix=/usr || return 1 | ||
16 | make || return 1 | ||
17 | } | ||
18 | |||
19 | package() { | ||
20 | cd "$srcdir"/$pkgname-$pkgver | ||
21 | make DESTDIR="$pkgdir" install | ||
22 | } | ||
23 | |||
24 | md5sums="1198425eab9fd605721a278c651b8dd8 libsigc++-2.2.8.tar.bz2" | ||
diff --git a/testing/linux-scst/APKBUILD b/testing/linux-scst/APKBUILD new file mode 100644 index 0000000000..bbcd830c7d --- /dev/null +++ b/testing/linux-scst/APKBUILD | |||
@@ -0,0 +1,122 @@ | |||
1 | _flavor=scst | ||
2 | pkgname=linux-${_flavor} | ||
3 | pkgver=2.6.34 | ||
4 | _kernver=$pkgver | ||
5 | pkgrel=0 | ||
6 | pkgdesc="Linux kernel with scst" | ||
7 | url="http://www.kernel.org" | ||
8 | depends="mkinitfs linux-firmware" | ||
9 | makedepends="perl installkernel" | ||
10 | options="!strip" | ||
11 | _config=${config:-kernelconfig.${CARCH:-x86}} | ||
12 | install= | ||
13 | source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$pkgver.tar.bz2 | ||
14 | arp.patch | ||
15 | kernelconfig.x86 | ||
16 | put_page_callback-2.6.34.patch | ||
17 | scst_exec_req_fifo-2.6.34.patch | ||
18 | " | ||
19 | # no need to patch now | ||
20 | #ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 | ||
21 | subpackages="$pkgname-dev" | ||
22 | license="GPL-2" | ||
23 | |||
24 | _abi_release=${pkgver}-${_flavor} | ||
25 | |||
26 | prepare() { | ||
27 | cd "$srcdir"/linux-$_kernver | ||
28 | if [ "$_kernver" != "$pkgver" ]; then | ||
29 | bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 -N || return 1 | ||
30 | fi | ||
31 | |||
32 | for i in ../*.diff ../*.patch; do | ||
33 | [ -f $i ] || continue | ||
34 | msg "Applying $i..." | ||
35 | patch -s -p1 -N < $i || return 1 | ||
36 | done | ||
37 | |||
38 | mkdir -p "$srcdir"/build | ||
39 | cp "$srcdir"/$_config "$srcdir"/build/.config | ||
40 | echo "-${_flavor}" > "$srcdir"/linux-$_kernver/localversion-${_flavor} | ||
41 | make -C "$srcdir"/linux-$_kernver O="$srcdir"/build HOSTCC="$CC" \ | ||
42 | silentoldconfig | ||
43 | } | ||
44 | |||
45 | # this is so we can do: 'abuild menuconfig' to reconfigure kernel | ||
46 | menuconfig() { | ||
47 | cd "$srcdir"/build || return 1 | ||
48 | make menuconfig | ||
49 | cp .config "$startdir"/$_config | ||
50 | } | ||
51 | |||
52 | build() { | ||
53 | cd "$srcdir"/build | ||
54 | make CC="$CC" || return 1 | ||
55 | } | ||
56 | |||
57 | package() { | ||
58 | cd "$srcdir"/build | ||
59 | mkdir -p "$pkgdir"/boot "$pkgdir"/lib/modules | ||
60 | make modules_install install \ | ||
61 | INSTALL_MOD_PATH="$pkgdir" \ | ||
62 | INSTALL_PATH="$pkgdir"/boot | ||
63 | |||
64 | rm -f "$pkgdir"/lib/modules/${_abi_release}/build \ | ||
65 | "$pkgdir"/lib/modules/${_abi_release}/source | ||
66 | rm -rf "$pkgdir"/lib/firmware | ||
67 | |||
68 | install -D include/config/kernel.release \ | ||
69 | "$pkgdir"/usr/share/kernel/$_flavor/kernel.release | ||
70 | } | ||
71 | |||
72 | dev() { | ||
73 | # copy the only the parts that we really need for build 3rd party | ||
74 | # kernel modules and install those as /usr/src/linux-headers, | ||
75 | # simlar to what ubuntu does | ||
76 | # | ||
77 | # this way you dont need to install the 300-400 kernel sources to | ||
78 | # build a tiny kernel module | ||
79 | # | ||
80 | pkgdesc="Headers and script for third party modules for $pkgname kernel" | ||
81 | local dir="$subpkgdir"/usr/src/linux-headers-${_abi_release} | ||
82 | |||
83 | # first we import config, run prepare to set up for building | ||
84 | # external modules, and create the scripts | ||
85 | mkdir -p "$dir" | ||
86 | cp "$srcdir"/$_config "$dir"/.config | ||
87 | make -j1 -C "$srcdir"/linux-$_kernver O="$dir" HOSTCC="$CC" \ | ||
88 | silentoldconfig prepare scripts | ||
89 | |||
90 | # remove the stuff that poits to real sources. we want 3rd party | ||
91 | # modules to believe this is the soruces | ||
92 | rm "$dir"/Makefile "$dir"/source | ||
93 | |||
94 | # copy the needed stuff from real sources | ||
95 | # | ||
96 | # this is taken from ubuntu kernel build script | ||
97 | # http://kernel.ubuntu.com/git?p=ubuntu/ubuntu-jaunty.git;a=blob;f=debian/rules.d/3-binary-indep.mk;hb=HEAD | ||
98 | cd "$srcdir"/linux-$_kernver | ||
99 | find . -path './include/*' -prune -o -path './scripts/*' -prune \ | ||
100 | -o -type f \( -name 'Makefile*' -o -name 'Kconfig*' \ | ||
101 | -o -name 'Kbuild*' -o -name '*.sh' -o -name '*.pl' \ | ||
102 | -o -name '*.lds' \) | cpio -pdm "$dir" | ||
103 | cp -a drivers/media/dvb/dvb-core/*.h "$dir"/drivers/media/dvb/dvb-core | ||
104 | cp -a drivers/media/video/*.h "$dir"/drivers/media/video | ||
105 | cp -a drivers/media/dvb/frontends/*.h "$dir"/drivers/media/dvb/frontends | ||
106 | cp -a scripts include "$dir" | ||
107 | find $(find arch -name include -type d -print) -type f \ | ||
108 | | cpio -pdm "$dir" | ||
109 | |||
110 | install -Dm644 "$srcdir"/build/Module.symvers \ | ||
111 | "$dir"/Module.symvers | ||
112 | |||
113 | mkdir -p "$subpkgdir"/lib/modules/${_abi_release} | ||
114 | ln -sf /usr/src/linux-headers-${_abi_release} \ | ||
115 | "$subpkgdir"/lib/modules/${_abi_release}/build | ||
116 | } | ||
117 | |||
118 | md5sums="10eebcb0178fb4540e2165bfd7efc7ad linux-2.6.34.tar.bz2 | ||
119 | 4c39a161d918e7f274292ecfd168b891 arp.patch | ||
120 | 2a08789db4977397f529a2933bc7b787 kernelconfig.x86 | ||
121 | 06e9b200ec4fe252dc1478b5f8137e9e put_page_callback-2.6.34.patch | ||
122 | f9ea26d08807c41407a7758ce53fc633 scst_exec_req_fifo-2.6.34.patch" | ||
diff --git a/main/linux-pae/arp.patch b/testing/linux-scst/arp.patch index d2682690f5..d2682690f5 100644 --- a/main/linux-pae/arp.patch +++ b/testing/linux-scst/arp.patch | |||
diff --git a/testing/linux-scst/kernelconfig.x86 b/testing/linux-scst/kernelconfig.x86 new file mode 100644 index 0000000000..84aa9734b1 --- /dev/null +++ b/testing/linux-scst/kernelconfig.x86 | |||
@@ -0,0 +1,4674 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.34 | ||
4 | # Tue May 25 13:28:42 2010 | ||
5 | # | ||
6 | # CONFIG_64BIT is not set | ||
7 | CONFIG_X86_32=y | ||
8 | # CONFIG_X86_64 is not set | ||
9 | CONFIG_X86=y | ||
10 | CONFIG_OUTPUT_FORMAT="elf32-i386" | ||
11 | CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" | ||
12 | CONFIG_GENERIC_TIME=y | ||
13 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
14 | CONFIG_CLOCKSOURCE_WATCHDOG=y | ||
15 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
16 | CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y | ||
17 | CONFIG_LOCKDEP_SUPPORT=y | ||
18 | CONFIG_STACKTRACE_SUPPORT=y | ||
19 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
20 | CONFIG_MMU=y | ||
21 | CONFIG_ZONE_DMA=y | ||
22 | # CONFIG_NEED_DMA_MAP_STATE is not set | ||
23 | CONFIG_GENERIC_ISA_DMA=y | ||
24 | CONFIG_GENERIC_IOMAP=y | ||
25 | CONFIG_GENERIC_BUG=y | ||
26 | CONFIG_GENERIC_HWEIGHT=y | ||
27 | CONFIG_GENERIC_GPIO=y | ||
28 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | ||
29 | # CONFIG_RWSEM_GENERIC_SPINLOCK is not set | ||
30 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | ||
31 | CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y | ||
32 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
33 | # CONFIG_GENERIC_TIME_VSYSCALL is not set | ||
34 | CONFIG_ARCH_HAS_CPU_RELAX=y | ||
35 | CONFIG_ARCH_HAS_DEFAULT_IDLE=y | ||
36 | CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y | ||
37 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | ||
38 | CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y | ||
39 | CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y | ||
40 | # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set | ||
41 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
42 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
43 | # CONFIG_ZONE_DMA32 is not set | ||
44 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
45 | # CONFIG_AUDIT_ARCH is not set | ||
46 | CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y | ||
47 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
48 | CONFIG_HAVE_EARLY_RES=y | ||
49 | CONFIG_GENERIC_HARDIRQS=y | ||
50 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
51 | CONFIG_GENERIC_IRQ_PROBE=y | ||
52 | CONFIG_GENERIC_PENDING_IRQ=y | ||
53 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
54 | CONFIG_X86_32_SMP=y | ||
55 | CONFIG_X86_HT=y | ||
56 | CONFIG_X86_TRAMPOLINE=y | ||
57 | CONFIG_X86_32_LAZY_GS=y | ||
58 | CONFIG_KTIME_SCALAR=y | ||
59 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
60 | CONFIG_CONSTRUCTORS=y | ||
61 | |||
62 | # | ||
63 | # General setup | ||
64 | # | ||
65 | CONFIG_EXPERIMENTAL=y | ||
66 | CONFIG_LOCK_KERNEL=y | ||
67 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
68 | CONFIG_LOCALVERSION="" | ||
69 | # CONFIG_LOCALVERSION_AUTO is not set | ||
70 | CONFIG_HAVE_KERNEL_GZIP=y | ||
71 | CONFIG_HAVE_KERNEL_BZIP2=y | ||
72 | CONFIG_HAVE_KERNEL_LZMA=y | ||
73 | CONFIG_HAVE_KERNEL_LZO=y | ||
74 | CONFIG_KERNEL_GZIP=y | ||
75 | # CONFIG_KERNEL_BZIP2 is not set | ||
76 | # CONFIG_KERNEL_LZMA is not set | ||
77 | # CONFIG_KERNEL_LZO is not set | ||
78 | CONFIG_SWAP=y | ||
79 | CONFIG_SYSVIPC=y | ||
80 | CONFIG_SYSVIPC_SYSCTL=y | ||
81 | # CONFIG_POSIX_MQUEUE is not set | ||
82 | CONFIG_BSD_PROCESS_ACCT=y | ||
83 | CONFIG_BSD_PROCESS_ACCT_V3=y | ||
84 | # CONFIG_TASKSTATS is not set | ||
85 | # CONFIG_AUDIT is not set | ||
86 | |||
87 | # | ||
88 | # RCU Subsystem | ||
89 | # | ||
90 | CONFIG_TREE_RCU=y | ||
91 | # CONFIG_TREE_PREEMPT_RCU is not set | ||
92 | # CONFIG_TINY_RCU is not set | ||
93 | # CONFIG_RCU_TRACE is not set | ||
94 | CONFIG_RCU_FANOUT=32 | ||
95 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
96 | # CONFIG_RCU_FAST_NO_HZ is not set | ||
97 | # CONFIG_TREE_RCU_TRACE is not set | ||
98 | CONFIG_IKCONFIG=m | ||
99 | CONFIG_IKCONFIG_PROC=y | ||
100 | CONFIG_LOG_BUF_SHIFT=14 | ||
101 | CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y | ||
102 | # CONFIG_CGROUPS is not set | ||
103 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
104 | # CONFIG_RELAY is not set | ||
105 | # CONFIG_NAMESPACES is not set | ||
106 | CONFIG_BLK_DEV_INITRD=y | ||
107 | CONFIG_INITRAMFS_SOURCE="" | ||
108 | CONFIG_RD_GZIP=y | ||
109 | CONFIG_RD_BZIP2=y | ||
110 | CONFIG_RD_LZMA=y | ||
111 | # CONFIG_RD_LZO is not set | ||
112 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
113 | CONFIG_SYSCTL=y | ||
114 | CONFIG_ANON_INODES=y | ||
115 | CONFIG_EMBEDDED=y | ||
116 | CONFIG_UID16=y | ||
117 | CONFIG_SYSCTL_SYSCALL=y | ||
118 | # CONFIG_KALLSYMS is not set | ||
119 | CONFIG_HOTPLUG=y | ||
120 | CONFIG_PRINTK=y | ||
121 | CONFIG_BUG=y | ||
122 | CONFIG_ELF_CORE=y | ||
123 | CONFIG_PCSPKR_PLATFORM=y | ||
124 | CONFIG_BASE_FULL=y | ||
125 | CONFIG_FUTEX=y | ||
126 | CONFIG_EPOLL=y | ||
127 | CONFIG_SIGNALFD=y | ||
128 | CONFIG_TIMERFD=y | ||
129 | CONFIG_EVENTFD=y | ||
130 | CONFIG_SHMEM=y | ||
131 | CONFIG_AIO=y | ||
132 | CONFIG_HAVE_PERF_EVENTS=y | ||
133 | |||
134 | # | ||
135 | # Kernel Performance Events And Counters | ||
136 | # | ||
137 | CONFIG_PERF_EVENTS=y | ||
138 | CONFIG_PERF_COUNTERS=y | ||
139 | CONFIG_VM_EVENT_COUNTERS=y | ||
140 | CONFIG_PCI_QUIRKS=y | ||
141 | # CONFIG_SLUB_DEBUG is not set | ||
142 | # CONFIG_COMPAT_BRK is not set | ||
143 | # CONFIG_SLAB is not set | ||
144 | CONFIG_SLUB=y | ||
145 | # CONFIG_SLOB is not set | ||
146 | CONFIG_PROFILING=y | ||
147 | CONFIG_OPROFILE=m | ||
148 | # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set | ||
149 | CONFIG_HAVE_OPROFILE=y | ||
150 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
151 | CONFIG_USER_RETURN_NOTIFIER=y | ||
152 | CONFIG_HAVE_IOREMAP_PROT=y | ||
153 | CONFIG_HAVE_KPROBES=y | ||
154 | CONFIG_HAVE_KRETPROBES=y | ||
155 | CONFIG_HAVE_OPTPROBES=y | ||
156 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
157 | CONFIG_HAVE_DMA_ATTRS=y | ||
158 | CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y | ||
159 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
160 | CONFIG_HAVE_HW_BREAKPOINT=y | ||
161 | CONFIG_HAVE_USER_RETURN_NOTIFIER=y | ||
162 | |||
163 | # | ||
164 | # GCOV-based kernel profiling | ||
165 | # | ||
166 | # CONFIG_GCOV_KERNEL is not set | ||
167 | CONFIG_SLOW_WORK=y | ||
168 | # CONFIG_SLOW_WORK_DEBUG is not set | ||
169 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | ||
170 | CONFIG_RT_MUTEXES=y | ||
171 | CONFIG_BASE_SMALL=0 | ||
172 | CONFIG_MODULES=y | ||
173 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
174 | CONFIG_MODULE_UNLOAD=y | ||
175 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
176 | CONFIG_MODVERSIONS=y | ||
177 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
178 | CONFIG_STOP_MACHINE=y | ||
179 | CONFIG_BLOCK=y | ||
180 | CONFIG_LBDAF=y | ||
181 | CONFIG_BLK_DEV_BSG=y | ||
182 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
183 | |||
184 | # | ||
185 | # IO Schedulers | ||
186 | # | ||
187 | CONFIG_IOSCHED_NOOP=y | ||
188 | CONFIG_IOSCHED_DEADLINE=m | ||
189 | CONFIG_IOSCHED_CFQ=y | ||
190 | # CONFIG_DEFAULT_DEADLINE is not set | ||
191 | CONFIG_DEFAULT_CFQ=y | ||
192 | # CONFIG_DEFAULT_NOOP is not set | ||
193 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
194 | CONFIG_PREEMPT_NOTIFIERS=y | ||
195 | CONFIG_PADATA=y | ||
196 | # CONFIG_INLINE_SPIN_TRYLOCK is not set | ||
197 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set | ||
198 | # CONFIG_INLINE_SPIN_LOCK is not set | ||
199 | # CONFIG_INLINE_SPIN_LOCK_BH is not set | ||
200 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set | ||
201 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
202 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
203 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
204 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
205 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
206 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
207 | # CONFIG_INLINE_READ_LOCK is not set | ||
208 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
209 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
210 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
211 | CONFIG_INLINE_READ_UNLOCK=y | ||
212 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
213 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
214 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
215 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
216 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
217 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
218 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
219 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
220 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
221 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
222 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
223 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
224 | CONFIG_MUTEX_SPIN_ON_OWNER=y | ||
225 | CONFIG_FREEZER=y | ||
226 | |||
227 | # | ||
228 | # Processor type and features | ||
229 | # | ||
230 | CONFIG_TICK_ONESHOT=y | ||
231 | CONFIG_NO_HZ=y | ||
232 | CONFIG_HIGH_RES_TIMERS=y | ||
233 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
234 | CONFIG_SMP=y | ||
235 | # CONFIG_SPARSE_IRQ is not set | ||
236 | CONFIG_X86_MPPARSE=y | ||
237 | # CONFIG_X86_BIGSMP is not set | ||
238 | CONFIG_X86_EXTENDED_PLATFORM=y | ||
239 | # CONFIG_X86_ELAN is not set | ||
240 | # CONFIG_X86_MRST is not set | ||
241 | # CONFIG_X86_RDC321X is not set | ||
242 | # CONFIG_X86_32_NON_STANDARD is not set | ||
243 | CONFIG_SCHED_OMIT_FRAME_POINTER=y | ||
244 | CONFIG_PARAVIRT_GUEST=y | ||
245 | CONFIG_XEN=y | ||
246 | CONFIG_XEN_MAX_DOMAIN_MEMORY=8 | ||
247 | CONFIG_XEN_SAVE_RESTORE=y | ||
248 | # CONFIG_XEN_DEBUG_FS is not set | ||
249 | CONFIG_VMI=y | ||
250 | CONFIG_KVM_CLOCK=y | ||
251 | CONFIG_KVM_GUEST=y | ||
252 | CONFIG_LGUEST_GUEST=y | ||
253 | CONFIG_PARAVIRT=y | ||
254 | # CONFIG_PARAVIRT_SPINLOCKS is not set | ||
255 | CONFIG_PARAVIRT_CLOCK=y | ||
256 | CONFIG_NO_BOOTMEM=y | ||
257 | # CONFIG_MEMTEST is not set | ||
258 | # CONFIG_M386 is not set | ||
259 | # CONFIG_M486 is not set | ||
260 | # CONFIG_M586 is not set | ||
261 | CONFIG_M586TSC=y | ||
262 | # CONFIG_M586MMX is not set | ||
263 | # CONFIG_M686 is not set | ||
264 | # CONFIG_MPENTIUMII is not set | ||
265 | # CONFIG_MPENTIUMIII is not set | ||
266 | # CONFIG_MPENTIUMM is not set | ||
267 | # CONFIG_MPENTIUM4 is not set | ||
268 | # CONFIG_MK6 is not set | ||
269 | # CONFIG_MK7 is not set | ||
270 | # CONFIG_MK8 is not set | ||
271 | # CONFIG_MCRUSOE is not set | ||
272 | # CONFIG_MEFFICEON is not set | ||
273 | # CONFIG_MWINCHIPC6 is not set | ||
274 | # CONFIG_MWINCHIP3D is not set | ||
275 | # CONFIG_MGEODEGX1 is not set | ||
276 | # CONFIG_MGEODE_LX is not set | ||
277 | # CONFIG_MCYRIXIII is not set | ||
278 | # CONFIG_MVIAC3_2 is not set | ||
279 | # CONFIG_MVIAC7 is not set | ||
280 | # CONFIG_MPSC is not set | ||
281 | # CONFIG_MCORE2 is not set | ||
282 | # CONFIG_MATOM is not set | ||
283 | # CONFIG_GENERIC_CPU is not set | ||
284 | CONFIG_X86_GENERIC=y | ||
285 | CONFIG_X86_CPU=y | ||
286 | CONFIG_X86_INTERNODE_CACHE_SHIFT=6 | ||
287 | CONFIG_X86_CMPXCHG=y | ||
288 | CONFIG_X86_L1_CACHE_SHIFT=6 | ||
289 | CONFIG_X86_XADD=y | ||
290 | # CONFIG_X86_PPRO_FENCE is not set | ||
291 | CONFIG_X86_F00F_BUG=y | ||
292 | CONFIG_X86_WP_WORKS_OK=y | ||
293 | CONFIG_X86_INVLPG=y | ||
294 | CONFIG_X86_BSWAP=y | ||
295 | CONFIG_X86_POPAD_OK=y | ||
296 | CONFIG_X86_ALIGNMENT_16=y | ||
297 | CONFIG_X86_INTEL_USERCOPY=y | ||
298 | CONFIG_X86_TSC=y | ||
299 | CONFIG_X86_CMPXCHG64=y | ||
300 | CONFIG_X86_MINIMUM_CPU_FAMILY=5 | ||
301 | # CONFIG_PROCESSOR_SELECT is not set | ||
302 | CONFIG_CPU_SUP_INTEL=y | ||
303 | CONFIG_CPU_SUP_CYRIX_32=y | ||
304 | CONFIG_CPU_SUP_AMD=y | ||
305 | CONFIG_CPU_SUP_CENTAUR=y | ||
306 | CONFIG_CPU_SUP_TRANSMETA_32=y | ||
307 | CONFIG_CPU_SUP_UMC_32=y | ||
308 | CONFIG_HPET_TIMER=y | ||
309 | CONFIG_HPET_EMULATE_RTC=y | ||
310 | CONFIG_DMI=y | ||
311 | # CONFIG_IOMMU_HELPER is not set | ||
312 | # CONFIG_IOMMU_API is not set | ||
313 | CONFIG_NR_CPUS=8 | ||
314 | CONFIG_SCHED_SMT=y | ||
315 | CONFIG_SCHED_MC=y | ||
316 | # CONFIG_PREEMPT_NONE is not set | ||
317 | CONFIG_PREEMPT_VOLUNTARY=y | ||
318 | # CONFIG_PREEMPT is not set | ||
319 | CONFIG_X86_LOCAL_APIC=y | ||
320 | CONFIG_X86_IO_APIC=y | ||
321 | # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set | ||
322 | # CONFIG_X86_MCE is not set | ||
323 | CONFIG_VM86=y | ||
324 | CONFIG_TOSHIBA=m | ||
325 | CONFIG_I8K=m | ||
326 | CONFIG_X86_REBOOTFIXUPS=y | ||
327 | CONFIG_MICROCODE=m | ||
328 | CONFIG_MICROCODE_INTEL=y | ||
329 | CONFIG_MICROCODE_AMD=y | ||
330 | CONFIG_MICROCODE_OLD_INTERFACE=y | ||
331 | CONFIG_X86_MSR=m | ||
332 | CONFIG_X86_CPUID=m | ||
333 | # CONFIG_NOHIGHMEM is not set | ||
334 | # CONFIG_HIGHMEM4G is not set | ||
335 | CONFIG_HIGHMEM64G=y | ||
336 | CONFIG_VMSPLIT_3G=y | ||
337 | # CONFIG_VMSPLIT_3G_OPT is not set | ||
338 | # CONFIG_VMSPLIT_2G is not set | ||
339 | # CONFIG_VMSPLIT_2G_OPT is not set | ||
340 | # CONFIG_VMSPLIT_1G is not set | ||
341 | CONFIG_PAGE_OFFSET=0xC0000000 | ||
342 | CONFIG_HIGHMEM=y | ||
343 | CONFIG_X86_PAE=y | ||
344 | CONFIG_ARCH_PHYS_ADDR_T_64BIT=y | ||
345 | CONFIG_ARCH_FLATMEM_ENABLE=y | ||
346 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | ||
347 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | ||
348 | CONFIG_ILLEGAL_POINTER_VALUE=0 | ||
349 | CONFIG_SELECT_MEMORY_MODEL=y | ||
350 | CONFIG_FLATMEM_MANUAL=y | ||
351 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
352 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
353 | CONFIG_FLATMEM=y | ||
354 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
355 | CONFIG_SPARSEMEM_STATIC=y | ||
356 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
357 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
358 | CONFIG_PHYS_ADDR_T_64BIT=y | ||
359 | CONFIG_ZONE_DMA_FLAG=1 | ||
360 | CONFIG_BOUNCE=y | ||
361 | CONFIG_VIRT_TO_BUS=y | ||
362 | CONFIG_MMU_NOTIFIER=y | ||
363 | # CONFIG_KSM is not set | ||
364 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
365 | # CONFIG_HIGHPTE is not set | ||
366 | # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set | ||
367 | CONFIG_X86_RESERVE_LOW_64K=y | ||
368 | CONFIG_MATH_EMULATION=y | ||
369 | CONFIG_MTRR=y | ||
370 | CONFIG_MTRR_SANITIZER=y | ||
371 | CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 | ||
372 | CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 | ||
373 | CONFIG_X86_PAT=y | ||
374 | CONFIG_ARCH_USES_PG_UNCACHED=y | ||
375 | # CONFIG_EFI is not set | ||
376 | # CONFIG_SECCOMP is not set | ||
377 | # CONFIG_CC_STACKPROTECTOR is not set | ||
378 | # CONFIG_HZ_100 is not set | ||
379 | # CONFIG_HZ_250 is not set | ||
380 | CONFIG_HZ_300=y | ||
381 | # CONFIG_HZ_1000 is not set | ||
382 | CONFIG_HZ=300 | ||
383 | CONFIG_SCHED_HRTICK=y | ||
384 | # CONFIG_KEXEC is not set | ||
385 | # CONFIG_CRASH_DUMP is not set | ||
386 | CONFIG_PHYSICAL_START=0x1000000 | ||
387 | # CONFIG_RELOCATABLE is not set | ||
388 | CONFIG_PHYSICAL_ALIGN=0x1000000 | ||
389 | CONFIG_HOTPLUG_CPU=y | ||
390 | CONFIG_COMPAT_VDSO=y | ||
391 | # CONFIG_CMDLINE_BOOL is not set | ||
392 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | ||
393 | |||
394 | # | ||
395 | # Power management and ACPI options | ||
396 | # | ||
397 | CONFIG_PM=y | ||
398 | # CONFIG_PM_DEBUG is not set | ||
399 | CONFIG_PM_SLEEP_SMP=y | ||
400 | CONFIG_PM_SLEEP=y | ||
401 | CONFIG_SUSPEND=y | ||
402 | CONFIG_SUSPEND_FREEZER=y | ||
403 | # CONFIG_HIBERNATION is not set | ||
404 | # CONFIG_PM_RUNTIME is not set | ||
405 | CONFIG_PM_OPS=y | ||
406 | CONFIG_ACPI=y | ||
407 | CONFIG_ACPI_SLEEP=y | ||
408 | CONFIG_ACPI_PROCFS=y | ||
409 | CONFIG_ACPI_PROCFS_POWER=y | ||
410 | # CONFIG_ACPI_POWER_METER is not set | ||
411 | CONFIG_ACPI_SYSFS_POWER=y | ||
412 | CONFIG_ACPI_PROC_EVENT=y | ||
413 | CONFIG_ACPI_AC=m | ||
414 | CONFIG_ACPI_BATTERY=m | ||
415 | CONFIG_ACPI_BUTTON=m | ||
416 | CONFIG_ACPI_VIDEO=m | ||
417 | CONFIG_ACPI_FAN=m | ||
418 | CONFIG_ACPI_DOCK=y | ||
419 | CONFIG_ACPI_PROCESSOR=m | ||
420 | CONFIG_ACPI_HOTPLUG_CPU=y | ||
421 | # CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set | ||
422 | CONFIG_ACPI_THERMAL=m | ||
423 | # CONFIG_ACPI_CUSTOM_DSDT is not set | ||
424 | CONFIG_ACPI_BLACKLIST_YEAR=2000 | ||
425 | # CONFIG_ACPI_DEBUG is not set | ||
426 | CONFIG_ACPI_PCI_SLOT=m | ||
427 | CONFIG_X86_PM_TIMER=y | ||
428 | CONFIG_ACPI_CONTAINER=m | ||
429 | CONFIG_ACPI_SBS=m | ||
430 | # CONFIG_SFI is not set | ||
431 | # CONFIG_APM is not set | ||
432 | |||
433 | # | ||
434 | # CPU Frequency scaling | ||
435 | # | ||
436 | CONFIG_CPU_FREQ=y | ||
437 | CONFIG_CPU_FREQ_TABLE=m | ||
438 | # CONFIG_CPU_FREQ_DEBUG is not set | ||
439 | CONFIG_CPU_FREQ_STAT=m | ||
440 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | ||
441 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | ||
442 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
443 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | ||
444 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | ||
445 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | ||
446 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | ||
447 | CONFIG_CPU_FREQ_GOV_POWERSAVE=m | ||
448 | CONFIG_CPU_FREQ_GOV_USERSPACE=m | ||
449 | CONFIG_CPU_FREQ_GOV_ONDEMAND=m | ||
450 | CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m | ||
451 | |||
452 | # | ||
453 | # CPUFreq processor drivers | ||
454 | # | ||
455 | # CONFIG_X86_PCC_CPUFREQ is not set | ||
456 | CONFIG_X86_ACPI_CPUFREQ=m | ||
457 | CONFIG_X86_POWERNOW_K6=m | ||
458 | CONFIG_X86_POWERNOW_K7=m | ||
459 | CONFIG_X86_POWERNOW_K7_ACPI=y | ||
460 | CONFIG_X86_POWERNOW_K8=m | ||
461 | CONFIG_X86_GX_SUSPMOD=m | ||
462 | CONFIG_X86_SPEEDSTEP_CENTRINO=m | ||
463 | CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y | ||
464 | CONFIG_X86_SPEEDSTEP_ICH=m | ||
465 | CONFIG_X86_SPEEDSTEP_SMI=m | ||
466 | CONFIG_X86_P4_CLOCKMOD=m | ||
467 | CONFIG_X86_CPUFREQ_NFORCE2=m | ||
468 | CONFIG_X86_LONGRUN=m | ||
469 | CONFIG_X86_LONGHAUL=m | ||
470 | CONFIG_X86_E_POWERSAVER=m | ||
471 | |||
472 | # | ||
473 | # shared options | ||
474 | # | ||
475 | CONFIG_X86_SPEEDSTEP_LIB=m | ||
476 | CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y | ||
477 | CONFIG_CPU_IDLE=y | ||
478 | CONFIG_CPU_IDLE_GOV_LADDER=y | ||
479 | CONFIG_CPU_IDLE_GOV_MENU=y | ||
480 | |||
481 | # | ||
482 | # Bus options (PCI etc.) | ||
483 | # | ||
484 | CONFIG_PCI=y | ||
485 | # CONFIG_PCI_GOBIOS is not set | ||
486 | # CONFIG_PCI_GOMMCONFIG is not set | ||
487 | # CONFIG_PCI_GODIRECT is not set | ||
488 | # CONFIG_PCI_GOOLPC is not set | ||
489 | CONFIG_PCI_GOANY=y | ||
490 | CONFIG_PCI_BIOS=y | ||
491 | CONFIG_PCI_DIRECT=y | ||
492 | CONFIG_PCI_MMCONFIG=y | ||
493 | CONFIG_PCI_DOMAINS=y | ||
494 | CONFIG_PCIEPORTBUS=y | ||
495 | CONFIG_HOTPLUG_PCI_PCIE=m | ||
496 | # CONFIG_PCIEAER is not set | ||
497 | CONFIG_PCIEASPM=y | ||
498 | # CONFIG_PCIEASPM_DEBUG is not set | ||
499 | CONFIG_ARCH_SUPPORTS_MSI=y | ||
500 | # CONFIG_PCI_MSI is not set | ||
501 | CONFIG_PCI_STUB=m | ||
502 | CONFIG_HT_IRQ=y | ||
503 | # CONFIG_PCI_IOV is not set | ||
504 | CONFIG_PCI_IOAPIC=y | ||
505 | CONFIG_ISA_DMA_API=y | ||
506 | CONFIG_ISA=y | ||
507 | # CONFIG_EISA is not set | ||
508 | # CONFIG_MCA is not set | ||
509 | CONFIG_SCx200=m | ||
510 | CONFIG_SCx200HR_TIMER=m | ||
511 | # CONFIG_OLPC is not set | ||
512 | CONFIG_K8_NB=y | ||
513 | CONFIG_PCCARD=m | ||
514 | CONFIG_PCMCIA=m | ||
515 | CONFIG_PCMCIA_LOAD_CIS=y | ||
516 | CONFIG_CARDBUS=y | ||
517 | |||
518 | # | ||
519 | # PC-card bridges | ||
520 | # | ||
521 | CONFIG_YENTA=m | ||
522 | CONFIG_YENTA_O2=y | ||
523 | CONFIG_YENTA_RICOH=y | ||
524 | CONFIG_YENTA_TI=y | ||
525 | CONFIG_YENTA_ENE_TUNE=y | ||
526 | CONFIG_YENTA_TOSHIBA=y | ||
527 | CONFIG_PD6729=m | ||
528 | CONFIG_I82092=m | ||
529 | CONFIG_I82365=m | ||
530 | CONFIG_TCIC=m | ||
531 | CONFIG_PCMCIA_PROBE=y | ||
532 | CONFIG_PCCARD_NONSTATIC=m | ||
533 | CONFIG_HOTPLUG_PCI=m | ||
534 | CONFIG_HOTPLUG_PCI_FAKE=m | ||
535 | CONFIG_HOTPLUG_PCI_COMPAQ=m | ||
536 | # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set | ||
537 | CONFIG_HOTPLUG_PCI_IBM=m | ||
538 | CONFIG_HOTPLUG_PCI_ACPI=m | ||
539 | CONFIG_HOTPLUG_PCI_ACPI_IBM=m | ||
540 | CONFIG_HOTPLUG_PCI_CPCI=y | ||
541 | CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m | ||
542 | CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m | ||
543 | CONFIG_HOTPLUG_PCI_SHPC=m | ||
544 | |||
545 | # | ||
546 | # Executable file formats / Emulations | ||
547 | # | ||
548 | CONFIG_BINFMT_ELF=y | ||
549 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
550 | CONFIG_HAVE_AOUT=y | ||
551 | CONFIG_BINFMT_AOUT=m | ||
552 | CONFIG_BINFMT_MISC=m | ||
553 | CONFIG_HAVE_ATOMIC_IOMAP=y | ||
554 | CONFIG_NET=y | ||
555 | |||
556 | # | ||
557 | # Networking options | ||
558 | # | ||
559 | CONFIG_PACKET=m | ||
560 | CONFIG_UNIX=y | ||
561 | CONFIG_XFRM=y | ||
562 | CONFIG_XFRM_USER=m | ||
563 | CONFIG_XFRM_SUB_POLICY=y | ||
564 | CONFIG_XFRM_MIGRATE=y | ||
565 | # CONFIG_XFRM_STATISTICS is not set | ||
566 | CONFIG_XFRM_IPCOMP=m | ||
567 | CONFIG_NET_KEY=m | ||
568 | CONFIG_NET_KEY_MIGRATE=y | ||
569 | CONFIG_INET=y | ||
570 | CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION=y | ||
571 | CONFIG_IP_MULTICAST=y | ||
572 | CONFIG_IP_ADVANCED_ROUTER=y | ||
573 | CONFIG_ASK_IP_FIB_HASH=y | ||
574 | # CONFIG_IP_FIB_TRIE is not set | ||
575 | CONFIG_IP_FIB_HASH=y | ||
576 | CONFIG_IP_MULTIPLE_TABLES=y | ||
577 | CONFIG_IP_ROUTE_MULTIPATH=y | ||
578 | CONFIG_IP_ROUTE_VERBOSE=y | ||
579 | CONFIG_IP_PNP=y | ||
580 | CONFIG_IP_PNP_DHCP=y | ||
581 | CONFIG_IP_PNP_BOOTP=y | ||
582 | CONFIG_IP_PNP_RARP=y | ||
583 | CONFIG_NET_IPIP=m | ||
584 | CONFIG_NET_IPGRE=m | ||
585 | CONFIG_NET_IPGRE_BROADCAST=y | ||
586 | CONFIG_IP_MROUTE=y | ||
587 | # CONFIG_IP_PIMSM_V1 is not set | ||
588 | CONFIG_IP_PIMSM_V2=y | ||
589 | CONFIG_ARPD=y | ||
590 | CONFIG_SYN_COOKIES=y | ||
591 | CONFIG_INET_AH=m | ||
592 | CONFIG_INET_ESP=m | ||
593 | CONFIG_INET_IPCOMP=m | ||
594 | CONFIG_INET_XFRM_TUNNEL=m | ||
595 | CONFIG_INET_TUNNEL=m | ||
596 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | ||
597 | CONFIG_INET_XFRM_MODE_TUNNEL=m | ||
598 | CONFIG_INET_XFRM_MODE_BEET=m | ||
599 | CONFIG_INET_LRO=y | ||
600 | CONFIG_INET_DIAG=m | ||
601 | CONFIG_INET_TCP_DIAG=m | ||
602 | CONFIG_TCP_CONG_ADVANCED=y | ||
603 | CONFIG_TCP_CONG_BIC=m | ||
604 | CONFIG_TCP_CONG_CUBIC=y | ||
605 | CONFIG_TCP_CONG_WESTWOOD=m | ||
606 | CONFIG_TCP_CONG_HTCP=m | ||
607 | CONFIG_TCP_CONG_HSTCP=m | ||
608 | CONFIG_TCP_CONG_HYBLA=m | ||
609 | CONFIG_TCP_CONG_VEGAS=m | ||
610 | CONFIG_TCP_CONG_SCALABLE=m | ||
611 | CONFIG_TCP_CONG_LP=m | ||
612 | CONFIG_TCP_CONG_VENO=m | ||
613 | CONFIG_TCP_CONG_YEAH=m | ||
614 | CONFIG_TCP_CONG_ILLINOIS=m | ||
615 | # CONFIG_DEFAULT_BIC is not set | ||
616 | CONFIG_DEFAULT_CUBIC=y | ||
617 | # CONFIG_DEFAULT_HTCP is not set | ||
618 | # CONFIG_DEFAULT_VEGAS is not set | ||
619 | # CONFIG_DEFAULT_WESTWOOD is not set | ||
620 | # CONFIG_DEFAULT_RENO is not set | ||
621 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
622 | CONFIG_TCP_MD5SIG=y | ||
623 | CONFIG_IPV6=m | ||
624 | CONFIG_IPV6_PRIVACY=y | ||
625 | CONFIG_IPV6_ROUTER_PREF=y | ||
626 | CONFIG_IPV6_ROUTE_INFO=y | ||
627 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
628 | CONFIG_INET6_AH=m | ||
629 | CONFIG_INET6_ESP=m | ||
630 | CONFIG_INET6_IPCOMP=m | ||
631 | CONFIG_IPV6_MIP6=m | ||
632 | CONFIG_INET6_XFRM_TUNNEL=m | ||
633 | CONFIG_INET6_TUNNEL=m | ||
634 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | ||
635 | CONFIG_INET6_XFRM_MODE_TUNNEL=m | ||
636 | CONFIG_INET6_XFRM_MODE_BEET=m | ||
637 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | ||
638 | CONFIG_IPV6_SIT=m | ||
639 | # CONFIG_IPV6_SIT_6RD is not set | ||
640 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
641 | CONFIG_IPV6_TUNNEL=m | ||
642 | CONFIG_IPV6_MULTIPLE_TABLES=y | ||
643 | CONFIG_IPV6_SUBTREES=y | ||
644 | CONFIG_IPV6_MROUTE=y | ||
645 | CONFIG_IPV6_PIMSM_V2=y | ||
646 | CONFIG_NETLABEL=y | ||
647 | CONFIG_NETWORK_SECMARK=y | ||
648 | CONFIG_NETFILTER=y | ||
649 | # CONFIG_NETFILTER_DEBUG is not set | ||
650 | CONFIG_NETFILTER_ADVANCED=y | ||
651 | CONFIG_BRIDGE_NETFILTER=y | ||
652 | |||
653 | # | ||
654 | # Core Netfilter Configuration | ||
655 | # | ||
656 | CONFIG_NETFILTER_NETLINK=m | ||
657 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
658 | CONFIG_NETFILTER_NETLINK_LOG=m | ||
659 | CONFIG_NF_CONNTRACK=m | ||
660 | CONFIG_NF_CT_ACCT=y | ||
661 | CONFIG_NF_CONNTRACK_MARK=y | ||
662 | CONFIG_NF_CONNTRACK_SECMARK=y | ||
663 | # CONFIG_NF_CONNTRACK_ZONES is not set | ||
664 | CONFIG_NF_CONNTRACK_EVENTS=y | ||
665 | CONFIG_NF_CT_PROTO_DCCP=m | ||
666 | CONFIG_NF_CT_PROTO_GRE=m | ||
667 | CONFIG_NF_CT_PROTO_SCTP=m | ||
668 | CONFIG_NF_CT_PROTO_UDPLITE=m | ||
669 | CONFIG_NF_CONNTRACK_AMANDA=m | ||
670 | CONFIG_NF_CONNTRACK_FTP=m | ||
671 | CONFIG_NF_CONNTRACK_H323=m | ||
672 | CONFIG_NF_CONNTRACK_IRC=m | ||
673 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | ||
674 | CONFIG_NF_CONNTRACK_PPTP=m | ||
675 | CONFIG_NF_CONNTRACK_SANE=m | ||
676 | CONFIG_NF_CONNTRACK_SIP=m | ||
677 | CONFIG_NF_CONNTRACK_TFTP=m | ||
678 | CONFIG_NF_CT_NETLINK=m | ||
679 | CONFIG_NETFILTER_TPROXY=m | ||
680 | CONFIG_NETFILTER_XTABLES=m | ||
681 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | ||
682 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | ||
683 | CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m | ||
684 | CONFIG_NETFILTER_XT_TARGET_CT=m | ||
685 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | ||
686 | CONFIG_NETFILTER_XT_TARGET_HL=m | ||
687 | CONFIG_NETFILTER_XT_TARGET_LED=m | ||
688 | CONFIG_NETFILTER_XT_TARGET_MARK=m | ||
689 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | ||
690 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
691 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
692 | CONFIG_NETFILTER_XT_TARGET_RATEEST=m | ||
693 | CONFIG_NETFILTER_XT_TARGET_TPROXY=m | ||
694 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | ||
695 | CONFIG_NETFILTER_XT_TARGET_SECMARK=m | ||
696 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | ||
697 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | ||
698 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | ||
699 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | ||
700 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | ||
701 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | ||
702 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | ||
703 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | ||
704 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | ||
705 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | ||
706 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
707 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
708 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | ||
709 | CONFIG_NETFILTER_XT_MATCH_HL=m | ||
710 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | ||
711 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | ||
712 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | ||
713 | CONFIG_NETFILTER_XT_MATCH_MAC=m | ||
714 | CONFIG_NETFILTER_XT_MATCH_MARK=m | ||
715 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
716 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | ||
717 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
718 | CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m | ||
719 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | ||
720 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | ||
721 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | ||
722 | CONFIG_NETFILTER_XT_MATCH_REALM=m | ||
723 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
724 | # CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set | ||
725 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | ||
726 | CONFIG_NETFILTER_XT_MATCH_SOCKET=m | ||
727 | CONFIG_NETFILTER_XT_MATCH_STATE=m | ||
728 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | ||
729 | CONFIG_NETFILTER_XT_MATCH_STRING=m | ||
730 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | ||
731 | CONFIG_NETFILTER_XT_MATCH_TIME=m | ||
732 | CONFIG_NETFILTER_XT_MATCH_U32=m | ||
733 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
734 | CONFIG_IP_VS=m | ||
735 | CONFIG_IP_VS_IPV6=y | ||
736 | # CONFIG_IP_VS_DEBUG is not set | ||
737 | CONFIG_IP_VS_TAB_BITS=12 | ||
738 | |||
739 | # | ||
740 | # IPVS transport protocol load balancing support | ||
741 | # | ||
742 | CONFIG_IP_VS_PROTO_TCP=y | ||
743 | CONFIG_IP_VS_PROTO_UDP=y | ||
744 | CONFIG_IP_VS_PROTO_AH_ESP=y | ||
745 | CONFIG_IP_VS_PROTO_ESP=y | ||
746 | CONFIG_IP_VS_PROTO_AH=y | ||
747 | # CONFIG_IP_VS_PROTO_SCTP is not set | ||
748 | |||
749 | # | ||
750 | # IPVS scheduler | ||
751 | # | ||
752 | CONFIG_IP_VS_RR=m | ||
753 | CONFIG_IP_VS_WRR=m | ||
754 | CONFIG_IP_VS_LC=m | ||
755 | CONFIG_IP_VS_WLC=m | ||
756 | CONFIG_IP_VS_LBLC=m | ||
757 | CONFIG_IP_VS_LBLCR=m | ||
758 | CONFIG_IP_VS_DH=m | ||
759 | CONFIG_IP_VS_SH=m | ||
760 | CONFIG_IP_VS_SED=m | ||
761 | CONFIG_IP_VS_NQ=m | ||
762 | |||
763 | # | ||
764 | # IPVS application helper | ||
765 | # | ||
766 | CONFIG_IP_VS_FTP=m | ||
767 | |||
768 | # | ||
769 | # IP: Netfilter Configuration | ||
770 | # | ||
771 | CONFIG_NF_DEFRAG_IPV4=m | ||
772 | CONFIG_NF_CONNTRACK_IPV4=m | ||
773 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | ||
774 | CONFIG_IP_NF_QUEUE=m | ||
775 | CONFIG_IP_NF_IPTABLES=m | ||
776 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
777 | CONFIG_IP_NF_MATCH_AH=m | ||
778 | CONFIG_IP_NF_MATCH_ECN=m | ||
779 | CONFIG_IP_NF_MATCH_TTL=m | ||
780 | CONFIG_IP_NF_FILTER=m | ||
781 | CONFIG_IP_NF_TARGET_REJECT=m | ||
782 | CONFIG_IP_NF_TARGET_LOG=m | ||
783 | CONFIG_IP_NF_TARGET_ULOG=m | ||
784 | CONFIG_NF_NAT=m | ||
785 | CONFIG_NF_NAT_NEEDED=y | ||
786 | CONFIG_IP_NF_TARGET_MASQUERADE=m | ||
787 | CONFIG_IP_NF_TARGET_NETMAP=m | ||
788 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
789 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
790 | CONFIG_NF_NAT_PROTO_DCCP=m | ||
791 | CONFIG_NF_NAT_PROTO_GRE=m | ||
792 | CONFIG_NF_NAT_PROTO_UDPLITE=m | ||
793 | CONFIG_NF_NAT_PROTO_SCTP=m | ||
794 | CONFIG_NF_NAT_FTP=m | ||
795 | CONFIG_NF_NAT_IRC=m | ||
796 | CONFIG_NF_NAT_TFTP=m | ||
797 | CONFIG_NF_NAT_AMANDA=m | ||
798 | CONFIG_NF_NAT_PPTP=m | ||
799 | CONFIG_NF_NAT_H323=m | ||
800 | CONFIG_NF_NAT_SIP=m | ||
801 | CONFIG_IP_NF_MANGLE=m | ||
802 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
803 | CONFIG_IP_NF_TARGET_ECN=m | ||
804 | CONFIG_IP_NF_TARGET_TTL=m | ||
805 | CONFIG_IP_NF_RAW=m | ||
806 | CONFIG_IP_NF_SECURITY=m | ||
807 | CONFIG_IP_NF_ARPTABLES=m | ||
808 | CONFIG_IP_NF_ARPFILTER=m | ||
809 | CONFIG_IP_NF_ARP_MANGLE=m | ||
810 | |||
811 | # | ||
812 | # IPv6: Netfilter Configuration | ||
813 | # | ||
814 | CONFIG_NF_CONNTRACK_IPV6=m | ||
815 | CONFIG_IP6_NF_QUEUE=m | ||
816 | CONFIG_IP6_NF_IPTABLES=m | ||
817 | CONFIG_IP6_NF_MATCH_AH=m | ||
818 | CONFIG_IP6_NF_MATCH_EUI64=m | ||
819 | CONFIG_IP6_NF_MATCH_FRAG=m | ||
820 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
821 | CONFIG_IP6_NF_MATCH_HL=m | ||
822 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | ||
823 | CONFIG_IP6_NF_MATCH_MH=m | ||
824 | CONFIG_IP6_NF_MATCH_RT=m | ||
825 | CONFIG_IP6_NF_TARGET_HL=m | ||
826 | CONFIG_IP6_NF_TARGET_LOG=m | ||
827 | CONFIG_IP6_NF_FILTER=m | ||
828 | CONFIG_IP6_NF_TARGET_REJECT=m | ||
829 | CONFIG_IP6_NF_MANGLE=m | ||
830 | CONFIG_IP6_NF_RAW=m | ||
831 | CONFIG_IP6_NF_SECURITY=m | ||
832 | |||
833 | # | ||
834 | # DECnet: Netfilter Configuration | ||
835 | # | ||
836 | CONFIG_DECNET_NF_GRABULATOR=m | ||
837 | CONFIG_BRIDGE_NF_EBTABLES=m | ||
838 | CONFIG_BRIDGE_EBT_BROUTE=m | ||
839 | CONFIG_BRIDGE_EBT_T_FILTER=m | ||
840 | CONFIG_BRIDGE_EBT_T_NAT=m | ||
841 | CONFIG_BRIDGE_EBT_802_3=m | ||
842 | CONFIG_BRIDGE_EBT_AMONG=m | ||
843 | CONFIG_BRIDGE_EBT_ARP=m | ||
844 | CONFIG_BRIDGE_EBT_IP=m | ||
845 | CONFIG_BRIDGE_EBT_IP6=m | ||
846 | CONFIG_BRIDGE_EBT_LIMIT=m | ||
847 | CONFIG_BRIDGE_EBT_MARK=m | ||
848 | CONFIG_BRIDGE_EBT_PKTTYPE=m | ||
849 | CONFIG_BRIDGE_EBT_STP=m | ||
850 | CONFIG_BRIDGE_EBT_VLAN=m | ||
851 | CONFIG_BRIDGE_EBT_ARPREPLY=m | ||
852 | CONFIG_BRIDGE_EBT_DNAT=m | ||
853 | CONFIG_BRIDGE_EBT_MARK_T=m | ||
854 | CONFIG_BRIDGE_EBT_REDIRECT=m | ||
855 | CONFIG_BRIDGE_EBT_SNAT=m | ||
856 | CONFIG_BRIDGE_EBT_LOG=m | ||
857 | CONFIG_BRIDGE_EBT_ULOG=m | ||
858 | CONFIG_BRIDGE_EBT_NFLOG=m | ||
859 | CONFIG_IP_DCCP=m | ||
860 | CONFIG_INET_DCCP_DIAG=m | ||
861 | |||
862 | # | ||
863 | # DCCP CCIDs Configuration (EXPERIMENTAL) | ||
864 | # | ||
865 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | ||
866 | CONFIG_IP_DCCP_CCID3=y | ||
867 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
868 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
869 | CONFIG_IP_DCCP_TFRC_LIB=y | ||
870 | CONFIG_IP_SCTP=m | ||
871 | # CONFIG_SCTP_DBG_MSG is not set | ||
872 | # CONFIG_SCTP_DBG_OBJCNT is not set | ||
873 | # CONFIG_SCTP_HMAC_NONE is not set | ||
874 | CONFIG_SCTP_HMAC_SHA1=y | ||
875 | # CONFIG_SCTP_HMAC_MD5 is not set | ||
876 | CONFIG_RDS=m | ||
877 | # CONFIG_RDS_RDMA is not set | ||
878 | # CONFIG_RDS_TCP is not set | ||
879 | # CONFIG_RDS_DEBUG is not set | ||
880 | CONFIG_TIPC=m | ||
881 | # CONFIG_TIPC_ADVANCED is not set | ||
882 | # CONFIG_TIPC_DEBUG is not set | ||
883 | CONFIG_ATM=m | ||
884 | CONFIG_ATM_CLIP=m | ||
885 | # CONFIG_ATM_CLIP_NO_ICMP is not set | ||
886 | CONFIG_ATM_LANE=m | ||
887 | CONFIG_ATM_MPOA=m | ||
888 | CONFIG_ATM_BR2684=m | ||
889 | # CONFIG_ATM_BR2684_IPFILTER is not set | ||
890 | CONFIG_STP=m | ||
891 | CONFIG_BRIDGE=m | ||
892 | CONFIG_BRIDGE_IGMP_SNOOPING=y | ||
893 | # CONFIG_NET_DSA is not set | ||
894 | CONFIG_VLAN_8021Q=m | ||
895 | # CONFIG_VLAN_8021Q_GVRP is not set | ||
896 | CONFIG_DECNET=m | ||
897 | CONFIG_DECNET_ROUTER=y | ||
898 | CONFIG_LLC=m | ||
899 | CONFIG_LLC2=m | ||
900 | CONFIG_IPX=m | ||
901 | # CONFIG_IPX_INTERN is not set | ||
902 | CONFIG_ATALK=m | ||
903 | CONFIG_DEV_APPLETALK=m | ||
904 | CONFIG_LTPC=m | ||
905 | CONFIG_COPS=m | ||
906 | CONFIG_COPS_DAYNA=y | ||
907 | CONFIG_COPS_TANGENT=y | ||
908 | CONFIG_IPDDP=m | ||
909 | CONFIG_IPDDP_ENCAP=y | ||
910 | CONFIG_IPDDP_DECAP=y | ||
911 | CONFIG_X25=m | ||
912 | CONFIG_LAPB=m | ||
913 | CONFIG_ECONET=m | ||
914 | CONFIG_ECONET_AUNUDP=y | ||
915 | CONFIG_ECONET_NATIVE=y | ||
916 | CONFIG_WAN_ROUTER=m | ||
917 | CONFIG_PHONET=m | ||
918 | CONFIG_IEEE802154=m | ||
919 | CONFIG_NET_SCHED=y | ||
920 | |||
921 | # | ||
922 | # Queueing/Scheduling | ||
923 | # | ||
924 | CONFIG_NET_SCH_CBQ=m | ||
925 | CONFIG_NET_SCH_HTB=m | ||
926 | CONFIG_NET_SCH_HFSC=m | ||
927 | CONFIG_NET_SCH_ATM=m | ||
928 | CONFIG_NET_SCH_PRIO=m | ||
929 | CONFIG_NET_SCH_MULTIQ=m | ||
930 | CONFIG_NET_SCH_RED=m | ||
931 | CONFIG_NET_SCH_SFQ=m | ||
932 | CONFIG_NET_SCH_TEQL=m | ||
933 | CONFIG_NET_SCH_TBF=m | ||
934 | CONFIG_NET_SCH_GRED=m | ||
935 | CONFIG_NET_SCH_DSMARK=m | ||
936 | CONFIG_NET_SCH_NETEM=m | ||
937 | CONFIG_NET_SCH_DRR=m | ||
938 | CONFIG_NET_SCH_INGRESS=m | ||
939 | |||
940 | # | ||
941 | # Classification | ||
942 | # | ||
943 | CONFIG_NET_CLS=y | ||
944 | CONFIG_NET_CLS_BASIC=m | ||
945 | CONFIG_NET_CLS_TCINDEX=m | ||
946 | CONFIG_NET_CLS_ROUTE4=m | ||
947 | CONFIG_NET_CLS_ROUTE=y | ||
948 | CONFIG_NET_CLS_FW=m | ||
949 | CONFIG_NET_CLS_U32=m | ||
950 | CONFIG_CLS_U32_PERF=y | ||
951 | CONFIG_CLS_U32_MARK=y | ||
952 | CONFIG_NET_CLS_RSVP=m | ||
953 | CONFIG_NET_CLS_RSVP6=m | ||
954 | CONFIG_NET_CLS_FLOW=m | ||
955 | CONFIG_NET_EMATCH=y | ||
956 | CONFIG_NET_EMATCH_STACK=32 | ||
957 | CONFIG_NET_EMATCH_CMP=m | ||
958 | CONFIG_NET_EMATCH_NBYTE=m | ||
959 | CONFIG_NET_EMATCH_U32=m | ||
960 | CONFIG_NET_EMATCH_META=m | ||
961 | CONFIG_NET_EMATCH_TEXT=m | ||
962 | CONFIG_NET_CLS_ACT=y | ||
963 | CONFIG_NET_ACT_POLICE=m | ||
964 | CONFIG_NET_ACT_GACT=m | ||
965 | CONFIG_GACT_PROB=y | ||
966 | CONFIG_NET_ACT_MIRRED=m | ||
967 | CONFIG_NET_ACT_IPT=m | ||
968 | CONFIG_NET_ACT_NAT=m | ||
969 | CONFIG_NET_ACT_PEDIT=m | ||
970 | CONFIG_NET_ACT_SIMP=m | ||
971 | CONFIG_NET_ACT_SKBEDIT=m | ||
972 | # CONFIG_NET_CLS_IND is not set | ||
973 | CONFIG_NET_SCH_FIFO=y | ||
974 | # CONFIG_DCB is not set | ||
975 | |||
976 | # | ||
977 | # Network testing | ||
978 | # | ||
979 | CONFIG_NET_PKTGEN=m | ||
980 | # CONFIG_HAMRADIO is not set | ||
981 | CONFIG_CAN=m | ||
982 | CONFIG_CAN_RAW=m | ||
983 | CONFIG_CAN_BCM=m | ||
984 | |||
985 | # | ||
986 | # CAN Device Drivers | ||
987 | # | ||
988 | CONFIG_CAN_VCAN=m | ||
989 | CONFIG_CAN_DEV=m | ||
990 | # CONFIG_CAN_CALC_BITTIMING is not set | ||
991 | CONFIG_CAN_MCP251X=m | ||
992 | CONFIG_CAN_SJA1000=m | ||
993 | # CONFIG_CAN_SJA1000_ISA is not set | ||
994 | CONFIG_CAN_SJA1000_PLATFORM=m | ||
995 | CONFIG_CAN_EMS_PCI=m | ||
996 | CONFIG_CAN_KVASER_PCI=m | ||
997 | CONFIG_CAN_PLX_PCI=m | ||
998 | |||
999 | # | ||
1000 | # CAN USB interfaces | ||
1001 | # | ||
1002 | # CONFIG_CAN_EMS_USB is not set | ||
1003 | # CONFIG_CAN_DEBUG_DEVICES is not set | ||
1004 | CONFIG_IRDA=m | ||
1005 | |||
1006 | # | ||
1007 | # IrDA protocols | ||
1008 | # | ||
1009 | CONFIG_IRLAN=m | ||
1010 | CONFIG_IRNET=m | ||
1011 | CONFIG_IRCOMM=m | ||
1012 | CONFIG_IRDA_ULTRA=y | ||
1013 | |||
1014 | # | ||
1015 | # IrDA options | ||
1016 | # | ||
1017 | CONFIG_IRDA_CACHE_LAST_LSAP=y | ||
1018 | CONFIG_IRDA_FAST_RR=y | ||
1019 | # CONFIG_IRDA_DEBUG is not set | ||
1020 | |||
1021 | # | ||
1022 | # Infrared-port device drivers | ||
1023 | # | ||
1024 | |||
1025 | # | ||
1026 | # SIR device drivers | ||
1027 | # | ||
1028 | CONFIG_IRTTY_SIR=m | ||
1029 | |||
1030 | # | ||
1031 | # Dongle support | ||
1032 | # | ||
1033 | CONFIG_DONGLE=y | ||
1034 | CONFIG_ESI_DONGLE=m | ||
1035 | CONFIG_ACTISYS_DONGLE=m | ||
1036 | CONFIG_TEKRAM_DONGLE=m | ||
1037 | CONFIG_TOIM3232_DONGLE=m | ||
1038 | CONFIG_LITELINK_DONGLE=m | ||
1039 | CONFIG_MA600_DONGLE=m | ||
1040 | CONFIG_GIRBIL_DONGLE=m | ||
1041 | CONFIG_MCP2120_DONGLE=m | ||
1042 | CONFIG_OLD_BELKIN_DONGLE=m | ||
1043 | CONFIG_ACT200L_DONGLE=m | ||
1044 | CONFIG_KINGSUN_DONGLE=m | ||
1045 | CONFIG_KSDAZZLE_DONGLE=m | ||
1046 | CONFIG_KS959_DONGLE=m | ||
1047 | |||
1048 | # | ||
1049 | # FIR device drivers | ||
1050 | # | ||
1051 | CONFIG_USB_IRDA=m | ||
1052 | CONFIG_SIGMATEL_FIR=m | ||
1053 | CONFIG_NSC_FIR=m | ||
1054 | CONFIG_WINBOND_FIR=m | ||
1055 | CONFIG_TOSHIBA_FIR=m | ||
1056 | CONFIG_SMC_IRCC_FIR=m | ||
1057 | CONFIG_ALI_FIR=m | ||
1058 | CONFIG_VLSI_FIR=m | ||
1059 | CONFIG_VIA_FIR=m | ||
1060 | CONFIG_MCS_FIR=m | ||
1061 | CONFIG_BT=m | ||
1062 | CONFIG_BT_L2CAP=m | ||
1063 | CONFIG_BT_SCO=m | ||
1064 | CONFIG_BT_RFCOMM=m | ||
1065 | CONFIG_BT_RFCOMM_TTY=y | ||
1066 | CONFIG_BT_BNEP=m | ||
1067 | CONFIG_BT_BNEP_MC_FILTER=y | ||
1068 | CONFIG_BT_BNEP_PROTO_FILTER=y | ||
1069 | CONFIG_BT_CMTP=m | ||
1070 | CONFIG_BT_HIDP=m | ||
1071 | |||
1072 | # | ||
1073 | # Bluetooth device drivers | ||
1074 | # | ||
1075 | CONFIG_BT_HCIBTUSB=m | ||
1076 | CONFIG_BT_HCIBTSDIO=m | ||
1077 | CONFIG_BT_HCIUART=m | ||
1078 | CONFIG_BT_HCIUART_H4=y | ||
1079 | CONFIG_BT_HCIUART_BCSP=y | ||
1080 | CONFIG_BT_HCIUART_LL=y | ||
1081 | CONFIG_BT_HCIBCM203X=m | ||
1082 | CONFIG_BT_HCIBPA10X=m | ||
1083 | CONFIG_BT_HCIBFUSB=m | ||
1084 | CONFIG_BT_HCIDTL1=m | ||
1085 | CONFIG_BT_HCIBT3C=m | ||
1086 | CONFIG_BT_HCIBLUECARD=m | ||
1087 | CONFIG_BT_HCIBTUART=m | ||
1088 | CONFIG_BT_HCIVHCI=m | ||
1089 | # CONFIG_BT_MRVL is not set | ||
1090 | CONFIG_BT_ATH3K=m | ||
1091 | CONFIG_AF_RXRPC=m | ||
1092 | # CONFIG_AF_RXRPC_DEBUG is not set | ||
1093 | CONFIG_RXKAD=m | ||
1094 | CONFIG_FIB_RULES=y | ||
1095 | CONFIG_WIRELESS=y | ||
1096 | CONFIG_WIRELESS_EXT=y | ||
1097 | CONFIG_WEXT_CORE=y | ||
1098 | CONFIG_WEXT_PROC=y | ||
1099 | CONFIG_WEXT_SPY=y | ||
1100 | CONFIG_WEXT_PRIV=y | ||
1101 | CONFIG_CFG80211=m | ||
1102 | # CONFIG_NL80211_TESTMODE is not set | ||
1103 | # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set | ||
1104 | # CONFIG_CFG80211_REG_DEBUG is not set | ||
1105 | CONFIG_CFG80211_DEFAULT_PS=y | ||
1106 | # CONFIG_CFG80211_DEBUGFS is not set | ||
1107 | # CONFIG_CFG80211_INTERNAL_REGDB is not set | ||
1108 | CONFIG_CFG80211_WEXT=y | ||
1109 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
1110 | CONFIG_LIB80211=m | ||
1111 | CONFIG_LIB80211_CRYPT_WEP=m | ||
1112 | CONFIG_LIB80211_CRYPT_CCMP=m | ||
1113 | CONFIG_LIB80211_CRYPT_TKIP=m | ||
1114 | # CONFIG_LIB80211_DEBUG is not set | ||
1115 | CONFIG_MAC80211=m | ||
1116 | CONFIG_MAC80211_RC_PID=y | ||
1117 | CONFIG_MAC80211_RC_MINSTREL=y | ||
1118 | CONFIG_MAC80211_RC_DEFAULT_PID=y | ||
1119 | # CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set | ||
1120 | CONFIG_MAC80211_RC_DEFAULT="pid" | ||
1121 | # CONFIG_MAC80211_MESH is not set | ||
1122 | CONFIG_MAC80211_LEDS=y | ||
1123 | # CONFIG_MAC80211_DEBUGFS is not set | ||
1124 | # CONFIG_MAC80211_DEBUG_MENU is not set | ||
1125 | CONFIG_WIMAX=m | ||
1126 | CONFIG_WIMAX_DEBUG_LEVEL=8 | ||
1127 | CONFIG_RFKILL=m | ||
1128 | CONFIG_RFKILL_LEDS=y | ||
1129 | # CONFIG_RFKILL_INPUT is not set | ||
1130 | CONFIG_NET_9P=m | ||
1131 | CONFIG_NET_9P_VIRTIO=m | ||
1132 | CONFIG_NET_9P_RDMA=m | ||
1133 | # CONFIG_NET_9P_DEBUG is not set | ||
1134 | |||
1135 | # | ||
1136 | # Device Drivers | ||
1137 | # | ||
1138 | |||
1139 | # | ||
1140 | # Generic Driver Options | ||
1141 | # | ||
1142 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
1143 | # CONFIG_DEVTMPFS is not set | ||
1144 | CONFIG_STANDALONE=y | ||
1145 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | ||
1146 | CONFIG_FW_LOADER=m | ||
1147 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
1148 | CONFIG_EXTRA_FIRMWARE="" | ||
1149 | CONFIG_SYS_HYPERVISOR=y | ||
1150 | CONFIG_CONNECTOR=m | ||
1151 | CONFIG_MTD=m | ||
1152 | # CONFIG_MTD_DEBUG is not set | ||
1153 | CONFIG_MTD_TESTS=m | ||
1154 | CONFIG_MTD_CONCAT=m | ||
1155 | CONFIG_MTD_PARTITIONS=y | ||
1156 | CONFIG_MTD_REDBOOT_PARTS=m | ||
1157 | CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 | ||
1158 | # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set | ||
1159 | # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set | ||
1160 | CONFIG_MTD_AR7_PARTS=m | ||
1161 | |||
1162 | # | ||
1163 | # User Modules And Translation Layers | ||
1164 | # | ||
1165 | CONFIG_MTD_CHAR=m | ||
1166 | CONFIG_HAVE_MTD_OTP=y | ||
1167 | CONFIG_MTD_BLKDEVS=m | ||
1168 | CONFIG_MTD_BLOCK=m | ||
1169 | CONFIG_MTD_BLOCK_RO=m | ||
1170 | CONFIG_FTL=m | ||
1171 | CONFIG_NFTL=m | ||
1172 | CONFIG_NFTL_RW=y | ||
1173 | CONFIG_INFTL=m | ||
1174 | CONFIG_RFD_FTL=m | ||
1175 | CONFIG_SSFDC=m | ||
1176 | CONFIG_MTD_OOPS=m | ||
1177 | |||
1178 | # | ||
1179 | # RAM/ROM/Flash chip drivers | ||
1180 | # | ||
1181 | CONFIG_MTD_CFI=m | ||
1182 | CONFIG_MTD_JEDECPROBE=m | ||
1183 | CONFIG_MTD_GEN_PROBE=m | ||
1184 | # CONFIG_MTD_CFI_ADV_OPTIONS is not set | ||
1185 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
1186 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
1187 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
1188 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
1189 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
1190 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
1191 | CONFIG_MTD_CFI_I1=y | ||
1192 | CONFIG_MTD_CFI_I2=y | ||
1193 | # CONFIG_MTD_CFI_I4 is not set | ||
1194 | # CONFIG_MTD_CFI_I8 is not set | ||
1195 | CONFIG_MTD_CFI_INTELEXT=m | ||
1196 | CONFIG_MTD_CFI_AMDSTD=m | ||
1197 | CONFIG_MTD_CFI_STAA=m | ||
1198 | CONFIG_MTD_CFI_UTIL=m | ||
1199 | CONFIG_MTD_RAM=m | ||
1200 | CONFIG_MTD_ROM=m | ||
1201 | CONFIG_MTD_ABSENT=m | ||
1202 | |||
1203 | # | ||
1204 | # Mapping drivers for chip access | ||
1205 | # | ||
1206 | CONFIG_MTD_COMPLEX_MAPPINGS=y | ||
1207 | CONFIG_MTD_PHYSMAP=m | ||
1208 | # CONFIG_MTD_PHYSMAP_COMPAT is not set | ||
1209 | CONFIG_MTD_SC520CDP=m | ||
1210 | CONFIG_MTD_NETSC520=m | ||
1211 | CONFIG_MTD_TS5500=m | ||
1212 | CONFIG_MTD_SBC_GXX=m | ||
1213 | CONFIG_MTD_SCx200_DOCFLASH=m | ||
1214 | CONFIG_MTD_AMD76XROM=m | ||
1215 | CONFIG_MTD_ICHXROM=m | ||
1216 | CONFIG_MTD_ESB2ROM=m | ||
1217 | CONFIG_MTD_CK804XROM=m | ||
1218 | CONFIG_MTD_SCB2_FLASH=m | ||
1219 | CONFIG_MTD_NETtel=m | ||
1220 | CONFIG_MTD_L440GX=m | ||
1221 | CONFIG_MTD_PCI=m | ||
1222 | # CONFIG_MTD_GPIO_ADDR is not set | ||
1223 | CONFIG_MTD_INTEL_VR_NOR=m | ||
1224 | CONFIG_MTD_PLATRAM=m | ||
1225 | |||
1226 | # | ||
1227 | # Self-contained MTD device drivers | ||
1228 | # | ||
1229 | CONFIG_MTD_PMC551=m | ||
1230 | CONFIG_MTD_PMC551_BUGFIX=y | ||
1231 | # CONFIG_MTD_PMC551_DEBUG is not set | ||
1232 | CONFIG_MTD_DATAFLASH=m | ||
1233 | # CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set | ||
1234 | # CONFIG_MTD_DATAFLASH_OTP is not set | ||
1235 | CONFIG_MTD_M25P80=m | ||
1236 | CONFIG_M25PXX_USE_FAST_READ=y | ||
1237 | # CONFIG_MTD_SST25L is not set | ||
1238 | CONFIG_MTD_SLRAM=m | ||
1239 | CONFIG_MTD_PHRAM=m | ||
1240 | CONFIG_MTD_MTDRAM=m | ||
1241 | CONFIG_MTDRAM_TOTAL_SIZE=4096 | ||
1242 | CONFIG_MTDRAM_ERASE_SIZE=128 | ||
1243 | CONFIG_MTD_BLOCK2MTD=m | ||
1244 | |||
1245 | # | ||
1246 | # Disk-On-Chip Device Drivers | ||
1247 | # | ||
1248 | CONFIG_MTD_DOC2000=m | ||
1249 | CONFIG_MTD_DOC2001=m | ||
1250 | CONFIG_MTD_DOC2001PLUS=m | ||
1251 | CONFIG_MTD_DOCPROBE=m | ||
1252 | CONFIG_MTD_DOCECC=m | ||
1253 | CONFIG_MTD_DOCPROBE_ADVANCED=y | ||
1254 | CONFIG_MTD_DOCPROBE_ADDRESS=0x0000 | ||
1255 | # CONFIG_MTD_DOCPROBE_HIGH is not set | ||
1256 | # CONFIG_MTD_DOCPROBE_55AA is not set | ||
1257 | CONFIG_MTD_NAND=m | ||
1258 | # CONFIG_MTD_NAND_VERIFY_WRITE is not set | ||
1259 | CONFIG_MTD_NAND_ECC_SMC=y | ||
1260 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | ||
1261 | CONFIG_MTD_NAND_IDS=m | ||
1262 | CONFIG_MTD_NAND_DISKONCHIP=m | ||
1263 | # CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set | ||
1264 | CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 | ||
1265 | # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set | ||
1266 | CONFIG_MTD_NAND_CAFE=m | ||
1267 | CONFIG_MTD_NAND_CS553X=m | ||
1268 | CONFIG_MTD_NAND_NANDSIM=m | ||
1269 | CONFIG_MTD_NAND_PLATFORM=m | ||
1270 | CONFIG_MTD_ALAUDA=m | ||
1271 | CONFIG_MTD_ONENAND=m | ||
1272 | # CONFIG_MTD_ONENAND_VERIFY_WRITE is not set | ||
1273 | # CONFIG_MTD_ONENAND_GENERIC is not set | ||
1274 | CONFIG_MTD_ONENAND_OTP=y | ||
1275 | CONFIG_MTD_ONENAND_2X_PROGRAM=y | ||
1276 | CONFIG_MTD_ONENAND_SIM=m | ||
1277 | |||
1278 | # | ||
1279 | # LPDDR flash memory drivers | ||
1280 | # | ||
1281 | CONFIG_MTD_LPDDR=m | ||
1282 | CONFIG_MTD_QINFO_PROBE=m | ||
1283 | |||
1284 | # | ||
1285 | # UBI - Unsorted block images | ||
1286 | # | ||
1287 | CONFIG_MTD_UBI=m | ||
1288 | CONFIG_MTD_UBI_WL_THRESHOLD=4096 | ||
1289 | CONFIG_MTD_UBI_BEB_RESERVE=1 | ||
1290 | # CONFIG_MTD_UBI_GLUEBI is not set | ||
1291 | |||
1292 | # | ||
1293 | # UBI debugging options | ||
1294 | # | ||
1295 | # CONFIG_MTD_UBI_DEBUG is not set | ||
1296 | CONFIG_PARPORT=m | ||
1297 | CONFIG_PARPORT_PC=m | ||
1298 | CONFIG_PARPORT_SERIAL=m | ||
1299 | # CONFIG_PARPORT_PC_FIFO is not set | ||
1300 | # CONFIG_PARPORT_PC_SUPERIO is not set | ||
1301 | CONFIG_PARPORT_PC_PCMCIA=m | ||
1302 | # CONFIG_PARPORT_GSC is not set | ||
1303 | CONFIG_PARPORT_AX88796=m | ||
1304 | # CONFIG_PARPORT_1284 is not set | ||
1305 | CONFIG_PARPORT_NOT_PC=y | ||
1306 | CONFIG_PNP=y | ||
1307 | # CONFIG_PNP_DEBUG_MESSAGES is not set | ||
1308 | |||
1309 | # | ||
1310 | # Protocols | ||
1311 | # | ||
1312 | CONFIG_ISAPNP=y | ||
1313 | CONFIG_PNPBIOS=y | ||
1314 | # CONFIG_PNPBIOS_PROC_FS is not set | ||
1315 | CONFIG_PNPACPI=y | ||
1316 | CONFIG_BLK_DEV=y | ||
1317 | CONFIG_BLK_DEV_FD=m | ||
1318 | CONFIG_BLK_DEV_XD=m | ||
1319 | # CONFIG_PARIDE is not set | ||
1320 | CONFIG_BLK_CPQ_DA=m | ||
1321 | CONFIG_BLK_CPQ_CISS_DA=m | ||
1322 | CONFIG_CISS_SCSI_TAPE=y | ||
1323 | CONFIG_BLK_DEV_DAC960=m | ||
1324 | CONFIG_BLK_DEV_UMEM=m | ||
1325 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
1326 | CONFIG_BLK_DEV_LOOP=m | ||
1327 | CONFIG_BLK_DEV_CRYPTOLOOP=m | ||
1328 | CONFIG_BLK_DEV_DRBD=m | ||
1329 | # CONFIG_DRBD_FAULT_INJECTION is not set | ||
1330 | CONFIG_BLK_DEV_NBD=m | ||
1331 | CONFIG_BLK_DEV_OSD=m | ||
1332 | CONFIG_BLK_DEV_SX8=m | ||
1333 | CONFIG_BLK_DEV_UB=m | ||
1334 | CONFIG_BLK_DEV_RAM=y | ||
1335 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
1336 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
1337 | # CONFIG_BLK_DEV_XIP is not set | ||
1338 | CONFIG_CDROM_PKTCDVD=m | ||
1339 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | ||
1340 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | ||
1341 | CONFIG_ATA_OVER_ETH=m | ||
1342 | CONFIG_XEN_BLKDEV_FRONTEND=y | ||
1343 | CONFIG_VIRTIO_BLK=m | ||
1344 | # CONFIG_BLK_DEV_HD is not set | ||
1345 | CONFIG_MISC_DEVICES=y | ||
1346 | CONFIG_AD525X_DPOT=m | ||
1347 | CONFIG_IBM_ASM=m | ||
1348 | CONFIG_PHANTOM=m | ||
1349 | CONFIG_SGI_IOC4=m | ||
1350 | CONFIG_TIFM_CORE=m | ||
1351 | CONFIG_TIFM_7XX1=m | ||
1352 | CONFIG_ICS932S401=m | ||
1353 | CONFIG_ENCLOSURE_SERVICES=m | ||
1354 | CONFIG_CS5535_MFGPT=m | ||
1355 | CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 | ||
1356 | CONFIG_CS5535_CLOCK_EVENT_SRC=m | ||
1357 | CONFIG_HP_ILO=m | ||
1358 | CONFIG_ISL29003=m | ||
1359 | CONFIG_SENSORS_TSL2550=m | ||
1360 | CONFIG_DS1682=m | ||
1361 | CONFIG_TI_DAC7512=m | ||
1362 | CONFIG_VMWARE_BALLOON=m | ||
1363 | CONFIG_C2PORT=m | ||
1364 | CONFIG_C2PORT_DURAMAR_2150=m | ||
1365 | |||
1366 | # | ||
1367 | # EEPROM support | ||
1368 | # | ||
1369 | CONFIG_EEPROM_AT24=m | ||
1370 | CONFIG_EEPROM_AT25=m | ||
1371 | CONFIG_EEPROM_LEGACY=m | ||
1372 | CONFIG_EEPROM_MAX6875=m | ||
1373 | CONFIG_EEPROM_93CX6=m | ||
1374 | CONFIG_CB710_CORE=m | ||
1375 | # CONFIG_CB710_DEBUG is not set | ||
1376 | CONFIG_CB710_DEBUG_ASSUMPTIONS=y | ||
1377 | CONFIG_IWMC3200TOP=m | ||
1378 | # CONFIG_IWMC3200TOP_DEBUG is not set | ||
1379 | # CONFIG_IWMC3200TOP_DEBUGFS is not set | ||
1380 | CONFIG_HAVE_IDE=y | ||
1381 | # CONFIG_IDE is not set | ||
1382 | |||
1383 | # | ||
1384 | # SCSI device support | ||
1385 | # | ||
1386 | CONFIG_SCSI_MOD=m | ||
1387 | CONFIG_RAID_ATTRS=m | ||
1388 | CONFIG_SCSI=m | ||
1389 | CONFIG_SCSI_DMA=y | ||
1390 | CONFIG_SCSI_TGT=m | ||
1391 | CONFIG_SCSI_NETLINK=y | ||
1392 | CONFIG_SCSI_PROC_FS=y | ||
1393 | |||
1394 | # | ||
1395 | # SCSI support type (disk, tape, CD-ROM) | ||
1396 | # | ||
1397 | CONFIG_BLK_DEV_SD=m | ||
1398 | CONFIG_CHR_DEV_ST=m | ||
1399 | CONFIG_CHR_DEV_OSST=m | ||
1400 | CONFIG_BLK_DEV_SR=m | ||
1401 | CONFIG_BLK_DEV_SR_VENDOR=y | ||
1402 | CONFIG_CHR_DEV_SG=m | ||
1403 | CONFIG_CHR_DEV_SCH=m | ||
1404 | CONFIG_SCSI_ENCLOSURE=m | ||
1405 | CONFIG_SCSI_MULTI_LUN=y | ||
1406 | # CONFIG_SCSI_CONSTANTS is not set | ||
1407 | # CONFIG_SCSI_LOGGING is not set | ||
1408 | CONFIG_SCSI_SCAN_ASYNC=y | ||
1409 | CONFIG_SCSI_WAIT_SCAN=m | ||
1410 | |||
1411 | # | ||
1412 | # SCSI Transports | ||
1413 | # | ||
1414 | CONFIG_SCSI_SPI_ATTRS=m | ||
1415 | CONFIG_SCSI_FC_ATTRS=m | ||
1416 | CONFIG_SCSI_FC_TGT_ATTRS=y | ||
1417 | CONFIG_SCSI_ISCSI_ATTRS=m | ||
1418 | CONFIG_SCSI_SAS_ATTRS=m | ||
1419 | CONFIG_SCSI_SAS_LIBSAS=m | ||
1420 | CONFIG_SCSI_SAS_ATA=y | ||
1421 | CONFIG_SCSI_SAS_HOST_SMP=y | ||
1422 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
1423 | CONFIG_SCSI_SRP_ATTRS=m | ||
1424 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
1425 | CONFIG_SCSI_LOWLEVEL=y | ||
1426 | CONFIG_ISCSI_TCP=m | ||
1427 | CONFIG_SCSI_CXGB3_ISCSI=m | ||
1428 | CONFIG_SCSI_BNX2_ISCSI=m | ||
1429 | # CONFIG_BE2ISCSI is not set | ||
1430 | CONFIG_BLK_DEV_3W_XXXX_RAID=m | ||
1431 | CONFIG_SCSI_HPSA=m | ||
1432 | CONFIG_SCSI_3W_9XXX=m | ||
1433 | CONFIG_SCSI_3W_SAS=m | ||
1434 | CONFIG_SCSI_7000FASST=m | ||
1435 | CONFIG_SCSI_ACARD=m | ||
1436 | CONFIG_SCSI_AHA152X=m | ||
1437 | CONFIG_SCSI_AHA1542=m | ||
1438 | CONFIG_SCSI_AACRAID=m | ||
1439 | CONFIG_SCSI_AIC7XXX=m | ||
1440 | CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 | ||
1441 | CONFIG_AIC7XXX_RESET_DELAY_MS=15000 | ||
1442 | # CONFIG_AIC7XXX_BUILD_FIRMWARE is not set | ||
1443 | CONFIG_AIC7XXX_DEBUG_ENABLE=y | ||
1444 | CONFIG_AIC7XXX_DEBUG_MASK=0 | ||
1445 | CONFIG_AIC7XXX_REG_PRETTY_PRINT=y | ||
1446 | CONFIG_SCSI_AIC7XXX_OLD=m | ||
1447 | CONFIG_SCSI_AIC79XX=m | ||
1448 | CONFIG_AIC79XX_CMDS_PER_DEVICE=32 | ||
1449 | CONFIG_AIC79XX_RESET_DELAY_MS=15000 | ||
1450 | # CONFIG_AIC79XX_BUILD_FIRMWARE is not set | ||
1451 | CONFIG_AIC79XX_DEBUG_ENABLE=y | ||
1452 | CONFIG_AIC79XX_DEBUG_MASK=0 | ||
1453 | CONFIG_AIC79XX_REG_PRETTY_PRINT=y | ||
1454 | CONFIG_SCSI_AIC94XX=m | ||
1455 | # CONFIG_AIC94XX_DEBUG is not set | ||
1456 | CONFIG_SCSI_MVSAS=m | ||
1457 | CONFIG_SCSI_MVSAS_DEBUG=y | ||
1458 | CONFIG_SCSI_DPT_I2O=m | ||
1459 | CONFIG_SCSI_ADVANSYS=m | ||
1460 | CONFIG_SCSI_IN2000=m | ||
1461 | CONFIG_SCSI_ARCMSR=m | ||
1462 | CONFIG_MEGARAID_NEWGEN=y | ||
1463 | CONFIG_MEGARAID_MM=m | ||
1464 | CONFIG_MEGARAID_MAILBOX=m | ||
1465 | CONFIG_MEGARAID_LEGACY=m | ||
1466 | CONFIG_MEGARAID_SAS=m | ||
1467 | CONFIG_SCSI_MPT2SAS=m | ||
1468 | CONFIG_SCSI_MPT2SAS_MAX_SGE=128 | ||
1469 | # CONFIG_SCSI_MPT2SAS_LOGGING is not set | ||
1470 | CONFIG_SCSI_HPTIOP=m | ||
1471 | CONFIG_SCSI_BUSLOGIC=m | ||
1472 | CONFIG_SCSI_FLASHPOINT=y | ||
1473 | CONFIG_VMWARE_PVSCSI=m | ||
1474 | CONFIG_LIBFC=m | ||
1475 | CONFIG_LIBFCOE=m | ||
1476 | CONFIG_FCOE=m | ||
1477 | CONFIG_FCOE_FNIC=m | ||
1478 | CONFIG_SCSI_DMX3191D=m | ||
1479 | CONFIG_SCSI_DTC3280=m | ||
1480 | CONFIG_SCSI_EATA=m | ||
1481 | # CONFIG_SCSI_EATA_TAGGED_QUEUE is not set | ||
1482 | # CONFIG_SCSI_EATA_LINKED_COMMANDS is not set | ||
1483 | CONFIG_SCSI_EATA_MAX_TAGS=16 | ||
1484 | CONFIG_SCSI_FUTURE_DOMAIN=m | ||
1485 | CONFIG_SCSI_GDTH=m | ||
1486 | CONFIG_SCSI_GENERIC_NCR5380=m | ||
1487 | CONFIG_SCSI_GENERIC_NCR5380_MMIO=m | ||
1488 | CONFIG_SCSI_GENERIC_NCR53C400=y | ||
1489 | CONFIG_SCSI_IPS=m | ||
1490 | CONFIG_SCSI_INITIO=m | ||
1491 | CONFIG_SCSI_INIA100=m | ||
1492 | CONFIG_SCSI_PPA=m | ||
1493 | CONFIG_SCSI_IMM=m | ||
1494 | # CONFIG_SCSI_IZIP_EPP16 is not set | ||
1495 | # CONFIG_SCSI_IZIP_SLOW_CTR is not set | ||
1496 | CONFIG_SCSI_NCR53C406A=m | ||
1497 | CONFIG_SCSI_STEX=m | ||
1498 | CONFIG_SCSI_SYM53C8XX_2=m | ||
1499 | CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 | ||
1500 | CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 | ||
1501 | CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 | ||
1502 | CONFIG_SCSI_SYM53C8XX_MMIO=y | ||
1503 | CONFIG_SCSI_IPR=m | ||
1504 | CONFIG_SCSI_IPR_TRACE=y | ||
1505 | # CONFIG_SCSI_IPR_DUMP is not set | ||
1506 | CONFIG_SCSI_PAS16=m | ||
1507 | CONFIG_SCSI_QLOGIC_FAS=m | ||
1508 | CONFIG_SCSI_QLOGIC_1280=m | ||
1509 | CONFIG_SCSI_QLA_FC=m | ||
1510 | CONFIG_SCSI_QLA_ISCSI=m | ||
1511 | CONFIG_SCSI_LPFC=m | ||
1512 | # CONFIG_SCSI_LPFC_DEBUG_FS is not set | ||
1513 | CONFIG_SCSI_SYM53C416=m | ||
1514 | CONFIG_SCSI_DC395x=m | ||
1515 | CONFIG_SCSI_DC390T=m | ||
1516 | CONFIG_SCSI_T128=m | ||
1517 | CONFIG_SCSI_U14_34F=m | ||
1518 | # CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set | ||
1519 | # CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set | ||
1520 | CONFIG_SCSI_U14_34F_MAX_TAGS=8 | ||
1521 | CONFIG_SCSI_ULTRASTOR=m | ||
1522 | CONFIG_SCSI_NSP32=m | ||
1523 | CONFIG_SCSI_DEBUG=m | ||
1524 | # CONFIG_SCSI_PMCRAID is not set | ||
1525 | CONFIG_SCSI_PM8001=m | ||
1526 | CONFIG_SCSI_SRP=m | ||
1527 | # CONFIG_SCSI_BFA_FC is not set | ||
1528 | CONFIG_SCSI_LOWLEVEL_PCMCIA=y | ||
1529 | CONFIG_PCMCIA_AHA152X=m | ||
1530 | CONFIG_PCMCIA_FDOMAIN=m | ||
1531 | CONFIG_PCMCIA_NINJA_SCSI=m | ||
1532 | CONFIG_PCMCIA_QLOGIC=m | ||
1533 | CONFIG_PCMCIA_SYM53C500=m | ||
1534 | CONFIG_SCSI_DH=m | ||
1535 | CONFIG_SCSI_DH_RDAC=m | ||
1536 | CONFIG_SCSI_DH_HP_SW=m | ||
1537 | CONFIG_SCSI_DH_EMC=m | ||
1538 | CONFIG_SCSI_DH_ALUA=m | ||
1539 | CONFIG_SCSI_OSD_INITIATOR=m | ||
1540 | CONFIG_SCSI_OSD_ULD=m | ||
1541 | CONFIG_SCSI_OSD_DPRINT_SENSE=1 | ||
1542 | # CONFIG_SCSI_OSD_DEBUG is not set | ||
1543 | CONFIG_ATA=m | ||
1544 | # CONFIG_ATA_NONSTANDARD is not set | ||
1545 | CONFIG_ATA_VERBOSE_ERROR=y | ||
1546 | CONFIG_ATA_ACPI=y | ||
1547 | CONFIG_SATA_PMP=y | ||
1548 | CONFIG_SATA_AHCI=m | ||
1549 | CONFIG_SATA_SIL24=m | ||
1550 | CONFIG_ATA_SFF=y | ||
1551 | CONFIG_SATA_SVW=m | ||
1552 | CONFIG_ATA_PIIX=m | ||
1553 | CONFIG_SATA_MV=m | ||
1554 | CONFIG_SATA_NV=m | ||
1555 | CONFIG_PDC_ADMA=m | ||
1556 | CONFIG_SATA_QSTOR=m | ||
1557 | CONFIG_SATA_PROMISE=m | ||
1558 | CONFIG_SATA_SX4=m | ||
1559 | CONFIG_SATA_SIL=m | ||
1560 | CONFIG_SATA_SIS=m | ||
1561 | CONFIG_SATA_ULI=m | ||
1562 | CONFIG_SATA_VIA=m | ||
1563 | CONFIG_SATA_VITESSE=m | ||
1564 | CONFIG_SATA_INIC162X=m | ||
1565 | CONFIG_PATA_ACPI=m | ||
1566 | CONFIG_PATA_ALI=m | ||
1567 | CONFIG_PATA_AMD=m | ||
1568 | CONFIG_PATA_ARTOP=m | ||
1569 | CONFIG_PATA_ATP867X=m | ||
1570 | CONFIG_PATA_ATIIXP=m | ||
1571 | CONFIG_PATA_CMD640_PCI=m | ||
1572 | CONFIG_PATA_CMD64X=m | ||
1573 | CONFIG_PATA_CS5520=m | ||
1574 | CONFIG_PATA_CS5530=m | ||
1575 | CONFIG_PATA_CS5535=m | ||
1576 | CONFIG_PATA_CS5536=m | ||
1577 | CONFIG_PATA_CYPRESS=m | ||
1578 | CONFIG_PATA_EFAR=m | ||
1579 | CONFIG_ATA_GENERIC=m | ||
1580 | CONFIG_PATA_HPT366=m | ||
1581 | CONFIG_PATA_HPT37X=m | ||
1582 | CONFIG_PATA_HPT3X2N=m | ||
1583 | CONFIG_PATA_HPT3X3=m | ||
1584 | CONFIG_PATA_HPT3X3_DMA=y | ||
1585 | CONFIG_PATA_ISAPNP=m | ||
1586 | CONFIG_PATA_IT821X=m | ||
1587 | CONFIG_PATA_IT8213=m | ||
1588 | CONFIG_PATA_JMICRON=m | ||
1589 | CONFIG_PATA_LEGACY=m | ||
1590 | CONFIG_PATA_TRIFLEX=m | ||
1591 | CONFIG_PATA_MARVELL=m | ||
1592 | CONFIG_PATA_MPIIX=m | ||
1593 | CONFIG_PATA_OLDPIIX=m | ||
1594 | CONFIG_PATA_NETCELL=m | ||
1595 | CONFIG_PATA_NINJA32=m | ||
1596 | CONFIG_PATA_NS87410=m | ||
1597 | CONFIG_PATA_NS87415=m | ||
1598 | CONFIG_PATA_OPTI=m | ||
1599 | CONFIG_PATA_OPTIDMA=m | ||
1600 | CONFIG_PATA_PCMCIA=m | ||
1601 | CONFIG_PATA_PDC2027X=m | ||
1602 | CONFIG_PATA_PDC_OLD=m | ||
1603 | CONFIG_PATA_QDI=m | ||
1604 | CONFIG_PATA_RADISYS=m | ||
1605 | CONFIG_PATA_RDC=m | ||
1606 | CONFIG_PATA_RZ1000=m | ||
1607 | CONFIG_PATA_SC1200=m | ||
1608 | CONFIG_PATA_SERVERWORKS=m | ||
1609 | CONFIG_PATA_SIL680=m | ||
1610 | CONFIG_PATA_SIS=m | ||
1611 | CONFIG_PATA_TOSHIBA=m | ||
1612 | CONFIG_PATA_VIA=m | ||
1613 | CONFIG_PATA_WINBOND=m | ||
1614 | CONFIG_PATA_WINBOND_VLB=m | ||
1615 | CONFIG_PATA_PLATFORM=m | ||
1616 | CONFIG_PATA_SCH=m | ||
1617 | CONFIG_MD=y | ||
1618 | CONFIG_BLK_DEV_MD=y | ||
1619 | # CONFIG_MD_AUTODETECT is not set | ||
1620 | CONFIG_MD_LINEAR=m | ||
1621 | CONFIG_MD_RAID0=m | ||
1622 | CONFIG_MD_RAID1=m | ||
1623 | CONFIG_MD_RAID10=m | ||
1624 | CONFIG_MD_RAID456=m | ||
1625 | # CONFIG_MULTICORE_RAID456 is not set | ||
1626 | CONFIG_MD_RAID6_PQ=m | ||
1627 | # CONFIG_ASYNC_RAID6_TEST is not set | ||
1628 | CONFIG_MD_MULTIPATH=m | ||
1629 | CONFIG_MD_FAULTY=m | ||
1630 | CONFIG_BLK_DEV_DM=m | ||
1631 | # CONFIG_DM_DEBUG is not set | ||
1632 | CONFIG_DM_CRYPT=m | ||
1633 | CONFIG_DM_SNAPSHOT=m | ||
1634 | CONFIG_DM_MIRROR=m | ||
1635 | CONFIG_DM_LOG_USERSPACE=m | ||
1636 | CONFIG_DM_ZERO=m | ||
1637 | CONFIG_DM_MULTIPATH=m | ||
1638 | CONFIG_DM_MULTIPATH_QL=m | ||
1639 | CONFIG_DM_MULTIPATH_ST=m | ||
1640 | CONFIG_DM_DELAY=m | ||
1641 | # CONFIG_DM_UEVENT is not set | ||
1642 | CONFIG_FUSION=y | ||
1643 | CONFIG_FUSION_SPI=m | ||
1644 | CONFIG_FUSION_FC=m | ||
1645 | CONFIG_FUSION_SAS=m | ||
1646 | CONFIG_FUSION_MAX_SGE=128 | ||
1647 | CONFIG_FUSION_CTL=m | ||
1648 | # CONFIG_FUSION_LOGGING is not set | ||
1649 | |||
1650 | # | ||
1651 | # IEEE 1394 (FireWire) support | ||
1652 | # | ||
1653 | |||
1654 | # | ||
1655 | # You can enable one or both FireWire driver stacks. | ||
1656 | # | ||
1657 | |||
1658 | # | ||
1659 | # The newer stack is recommended. | ||
1660 | # | ||
1661 | CONFIG_FIREWIRE=m | ||
1662 | CONFIG_FIREWIRE_OHCI=m | ||
1663 | CONFIG_FIREWIRE_OHCI_DEBUG=y | ||
1664 | CONFIG_FIREWIRE_SBP2=m | ||
1665 | CONFIG_FIREWIRE_NET=m | ||
1666 | CONFIG_IEEE1394=m | ||
1667 | CONFIG_IEEE1394_OHCI1394=m | ||
1668 | CONFIG_IEEE1394_PCILYNX=m | ||
1669 | CONFIG_IEEE1394_SBP2=m | ||
1670 | # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set | ||
1671 | CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y | ||
1672 | CONFIG_IEEE1394_ETH1394=m | ||
1673 | CONFIG_IEEE1394_RAWIO=m | ||
1674 | CONFIG_IEEE1394_VIDEO1394=m | ||
1675 | CONFIG_IEEE1394_DV1394=m | ||
1676 | # CONFIG_IEEE1394_VERBOSEDEBUG is not set | ||
1677 | CONFIG_I2O=m | ||
1678 | CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y | ||
1679 | CONFIG_I2O_EXT_ADAPTEC=y | ||
1680 | CONFIG_I2O_EXT_ADAPTEC_DMA64=y | ||
1681 | CONFIG_I2O_CONFIG=m | ||
1682 | CONFIG_I2O_CONFIG_OLD_IOCTL=y | ||
1683 | CONFIG_I2O_BUS=m | ||
1684 | CONFIG_I2O_BLOCK=m | ||
1685 | CONFIG_I2O_SCSI=m | ||
1686 | CONFIG_I2O_PROC=m | ||
1687 | # CONFIG_MACINTOSH_DRIVERS is not set | ||
1688 | CONFIG_NETDEVICES=y | ||
1689 | CONFIG_IFB=m | ||
1690 | CONFIG_DUMMY=m | ||
1691 | CONFIG_BONDING=m | ||
1692 | CONFIG_MACVLAN=m | ||
1693 | CONFIG_MACVTAP=m | ||
1694 | CONFIG_EQUALIZER=m | ||
1695 | CONFIG_TUN=m | ||
1696 | CONFIG_VETH=m | ||
1697 | CONFIG_NET_SB1000=m | ||
1698 | CONFIG_ARCNET=m | ||
1699 | CONFIG_ARCNET_1201=m | ||
1700 | CONFIG_ARCNET_1051=m | ||
1701 | CONFIG_ARCNET_RAW=m | ||
1702 | CONFIG_ARCNET_CAP=m | ||
1703 | CONFIG_ARCNET_COM90xx=m | ||
1704 | CONFIG_ARCNET_COM90xxIO=m | ||
1705 | CONFIG_ARCNET_RIM_I=m | ||
1706 | CONFIG_ARCNET_COM20020=m | ||
1707 | CONFIG_ARCNET_COM20020_ISA=m | ||
1708 | CONFIG_ARCNET_COM20020_PCI=m | ||
1709 | CONFIG_PHYLIB=m | ||
1710 | |||
1711 | # | ||
1712 | # MII PHY device drivers | ||
1713 | # | ||
1714 | CONFIG_MARVELL_PHY=m | ||
1715 | CONFIG_DAVICOM_PHY=m | ||
1716 | CONFIG_QSEMI_PHY=m | ||
1717 | CONFIG_LXT_PHY=m | ||
1718 | CONFIG_CICADA_PHY=m | ||
1719 | CONFIG_VITESSE_PHY=m | ||
1720 | CONFIG_SMSC_PHY=m | ||
1721 | CONFIG_BROADCOM_PHY=m | ||
1722 | CONFIG_ICPLUS_PHY=m | ||
1723 | CONFIG_REALTEK_PHY=m | ||
1724 | CONFIG_NATIONAL_PHY=m | ||
1725 | CONFIG_STE10XP=m | ||
1726 | CONFIG_LSI_ET1011C_PHY=m | ||
1727 | CONFIG_MICREL_PHY=m | ||
1728 | CONFIG_MDIO_BITBANG=m | ||
1729 | CONFIG_MDIO_GPIO=m | ||
1730 | CONFIG_NET_ETHERNET=y | ||
1731 | CONFIG_MII=m | ||
1732 | CONFIG_HAPPYMEAL=m | ||
1733 | CONFIG_SUNGEM=m | ||
1734 | CONFIG_CASSINI=m | ||
1735 | CONFIG_NET_VENDOR_3COM=y | ||
1736 | CONFIG_EL1=m | ||
1737 | CONFIG_EL2=m | ||
1738 | CONFIG_ELPLUS=m | ||
1739 | CONFIG_EL16=m | ||
1740 | CONFIG_EL3=m | ||
1741 | CONFIG_3C515=m | ||
1742 | CONFIG_VORTEX=m | ||
1743 | CONFIG_TYPHOON=m | ||
1744 | CONFIG_LANCE=m | ||
1745 | CONFIG_NET_VENDOR_SMC=y | ||
1746 | CONFIG_WD80x3=m | ||
1747 | CONFIG_ULTRA=m | ||
1748 | CONFIG_SMC9194=m | ||
1749 | CONFIG_ENC28J60=m | ||
1750 | # CONFIG_ENC28J60_WRITEVERIFY is not set | ||
1751 | CONFIG_ETHOC=m | ||
1752 | CONFIG_NET_VENDOR_RACAL=y | ||
1753 | CONFIG_NI52=m | ||
1754 | CONFIG_NI65=m | ||
1755 | CONFIG_DNET=m | ||
1756 | CONFIG_NET_TULIP=y | ||
1757 | CONFIG_DE2104X=m | ||
1758 | CONFIG_DE2104X_DSL=0 | ||
1759 | CONFIG_TULIP=m | ||
1760 | # CONFIG_TULIP_MWI is not set | ||
1761 | # CONFIG_TULIP_MMIO is not set | ||
1762 | # CONFIG_TULIP_NAPI is not set | ||
1763 | CONFIG_DE4X5=m | ||
1764 | CONFIG_WINBOND_840=m | ||
1765 | CONFIG_DM9102=m | ||
1766 | CONFIG_ULI526X=m | ||
1767 | CONFIG_PCMCIA_XIRCOM=m | ||
1768 | CONFIG_AT1700=m | ||
1769 | CONFIG_DEPCA=m | ||
1770 | CONFIG_HP100=m | ||
1771 | CONFIG_NET_ISA=y | ||
1772 | CONFIG_E2100=m | ||
1773 | CONFIG_EWRK3=m | ||
1774 | CONFIG_EEXPRESS=m | ||
1775 | CONFIG_EEXPRESS_PRO=m | ||
1776 | CONFIG_HPLAN_PLUS=m | ||
1777 | CONFIG_HPLAN=m | ||
1778 | CONFIG_LP486E=m | ||
1779 | CONFIG_ETH16I=m | ||
1780 | CONFIG_NE2000=m | ||
1781 | CONFIG_ZNET=m | ||
1782 | CONFIG_SEEQ8005=m | ||
1783 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
1784 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
1785 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
1786 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
1787 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
1788 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
1789 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
1790 | CONFIG_NET_PCI=y | ||
1791 | CONFIG_PCNET32=m | ||
1792 | CONFIG_AMD8111_ETH=m | ||
1793 | CONFIG_ADAPTEC_STARFIRE=m | ||
1794 | CONFIG_AC3200=m | ||
1795 | CONFIG_KSZ884X_PCI=m | ||
1796 | CONFIG_APRICOT=m | ||
1797 | CONFIG_B44=m | ||
1798 | CONFIG_B44_PCI_AUTOSELECT=y | ||
1799 | CONFIG_B44_PCICORE_AUTOSELECT=y | ||
1800 | CONFIG_B44_PCI=y | ||
1801 | CONFIG_FORCEDETH=m | ||
1802 | # CONFIG_FORCEDETH_NAPI is not set | ||
1803 | CONFIG_CS89x0=m | ||
1804 | CONFIG_E100=m | ||
1805 | CONFIG_FEALNX=m | ||
1806 | CONFIG_NATSEMI=m | ||
1807 | CONFIG_NE2K_PCI=m | ||
1808 | CONFIG_8139CP=m | ||
1809 | CONFIG_8139TOO=m | ||
1810 | CONFIG_8139TOO_PIO=y | ||
1811 | # CONFIG_8139TOO_TUNE_TWISTER is not set | ||
1812 | # CONFIG_8139TOO_8129 is not set | ||
1813 | # CONFIG_8139_OLD_RX_RESET is not set | ||
1814 | CONFIG_R6040=m | ||
1815 | CONFIG_SIS900=m | ||
1816 | CONFIG_EPIC100=m | ||
1817 | CONFIG_SMSC9420=m | ||
1818 | CONFIG_SUNDANCE=m | ||
1819 | # CONFIG_SUNDANCE_MMIO is not set | ||
1820 | CONFIG_TLAN=m | ||
1821 | CONFIG_KS8842=m | ||
1822 | CONFIG_KS8851=m | ||
1823 | CONFIG_KS8851_MLL=m | ||
1824 | CONFIG_VIA_RHINE=m | ||
1825 | # CONFIG_VIA_RHINE_MMIO is not set | ||
1826 | CONFIG_SC92031=m | ||
1827 | CONFIG_NET_POCKET=y | ||
1828 | CONFIG_ATP=m | ||
1829 | CONFIG_DE600=m | ||
1830 | CONFIG_DE620=m | ||
1831 | CONFIG_ATL2=m | ||
1832 | CONFIG_NETDEV_1000=y | ||
1833 | CONFIG_ACENIC=m | ||
1834 | # CONFIG_ACENIC_OMIT_TIGON_I is not set | ||
1835 | CONFIG_DL2K=m | ||
1836 | CONFIG_E1000=m | ||
1837 | CONFIG_E1000E=m | ||
1838 | CONFIG_IP1000=m | ||
1839 | CONFIG_IGB=m | ||
1840 | CONFIG_IGB_DCA=y | ||
1841 | CONFIG_IGBVF=m | ||
1842 | CONFIG_NS83820=m | ||
1843 | CONFIG_HAMACHI=m | ||
1844 | CONFIG_YELLOWFIN=m | ||
1845 | CONFIG_R8169=m | ||
1846 | CONFIG_R8169_VLAN=y | ||
1847 | CONFIG_SIS190=m | ||
1848 | CONFIG_SKGE=m | ||
1849 | # CONFIG_SKGE_DEBUG is not set | ||
1850 | CONFIG_SKY2=m | ||
1851 | # CONFIG_SKY2_DEBUG is not set | ||
1852 | CONFIG_VIA_VELOCITY=m | ||
1853 | CONFIG_TIGON3=m | ||
1854 | CONFIG_BNX2=m | ||
1855 | CONFIG_CNIC=m | ||
1856 | CONFIG_QLA3XXX=m | ||
1857 | CONFIG_ATL1=m | ||
1858 | CONFIG_ATL1E=m | ||
1859 | CONFIG_ATL1C=m | ||
1860 | CONFIG_JME=m | ||
1861 | CONFIG_NETDEV_10000=y | ||
1862 | CONFIG_MDIO=m | ||
1863 | CONFIG_CHELSIO_T1=m | ||
1864 | CONFIG_CHELSIO_T1_1G=y | ||
1865 | CONFIG_CHELSIO_T3_DEPENDS=y | ||
1866 | CONFIG_CHELSIO_T3=m | ||
1867 | CONFIG_CHELSIO_T4_DEPENDS=y | ||
1868 | CONFIG_CHELSIO_T4=m | ||
1869 | CONFIG_ENIC=m | ||
1870 | CONFIG_IXGBE=m | ||
1871 | CONFIG_IXGBE_DCA=y | ||
1872 | CONFIG_IXGB=m | ||
1873 | CONFIG_S2IO=m | ||
1874 | CONFIG_VXGE=m | ||
1875 | # CONFIG_VXGE_DEBUG_TRACE_ALL is not set | ||
1876 | CONFIG_MYRI10GE=m | ||
1877 | CONFIG_MYRI10GE_DCA=y | ||
1878 | CONFIG_NETXEN_NIC=m | ||
1879 | CONFIG_NIU=m | ||
1880 | CONFIG_MLX4_EN=m | ||
1881 | CONFIG_MLX4_CORE=m | ||
1882 | CONFIG_MLX4_DEBUG=y | ||
1883 | CONFIG_TEHUTI=m | ||
1884 | CONFIG_BNX2X=m | ||
1885 | CONFIG_QLCNIC=m | ||
1886 | CONFIG_QLGE=m | ||
1887 | CONFIG_SFC=m | ||
1888 | CONFIG_SFC_MTD=y | ||
1889 | CONFIG_BE2NET=m | ||
1890 | # CONFIG_TR is not set | ||
1891 | CONFIG_WLAN=y | ||
1892 | CONFIG_PCMCIA_RAYCS=m | ||
1893 | CONFIG_LIBERTAS_THINFIRM=m | ||
1894 | CONFIG_LIBERTAS_THINFIRM_USB=m | ||
1895 | CONFIG_AIRO=m | ||
1896 | CONFIG_ATMEL=m | ||
1897 | CONFIG_PCI_ATMEL=m | ||
1898 | CONFIG_PCMCIA_ATMEL=m | ||
1899 | CONFIG_AT76C50X_USB=m | ||
1900 | CONFIG_AIRO_CS=m | ||
1901 | CONFIG_PCMCIA_WL3501=m | ||
1902 | CONFIG_PRISM54=m | ||
1903 | CONFIG_USB_ZD1201=m | ||
1904 | CONFIG_USB_NET_RNDIS_WLAN=m | ||
1905 | CONFIG_RTL8180=m | ||
1906 | CONFIG_RTL8187=m | ||
1907 | CONFIG_RTL8187_LEDS=y | ||
1908 | CONFIG_ADM8211=m | ||
1909 | CONFIG_MAC80211_HWSIM=m | ||
1910 | CONFIG_MWL8K=m | ||
1911 | CONFIG_ATH_COMMON=m | ||
1912 | # CONFIG_ATH_DEBUG is not set | ||
1913 | CONFIG_ATH5K=m | ||
1914 | # CONFIG_ATH5K_DEBUG is not set | ||
1915 | CONFIG_ATH9K_HW=m | ||
1916 | CONFIG_ATH9K_COMMON=m | ||
1917 | CONFIG_ATH9K=m | ||
1918 | # CONFIG_ATH9K_DEBUGFS is not set | ||
1919 | CONFIG_AR9170_USB=m | ||
1920 | CONFIG_AR9170_LEDS=y | ||
1921 | CONFIG_B43=m | ||
1922 | CONFIG_B43_PCI_AUTOSELECT=y | ||
1923 | CONFIG_B43_PCICORE_AUTOSELECT=y | ||
1924 | CONFIG_B43_PCMCIA=y | ||
1925 | CONFIG_B43_SDIO=y | ||
1926 | CONFIG_B43_PIO=y | ||
1927 | CONFIG_B43_PHY_LP=y | ||
1928 | CONFIG_B43_LEDS=y | ||
1929 | CONFIG_B43_HWRNG=y | ||
1930 | # CONFIG_B43_DEBUG is not set | ||
1931 | CONFIG_B43LEGACY=m | ||
1932 | CONFIG_B43LEGACY_PCI_AUTOSELECT=y | ||
1933 | CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y | ||
1934 | CONFIG_B43LEGACY_LEDS=y | ||
1935 | CONFIG_B43LEGACY_HWRNG=y | ||
1936 | CONFIG_B43LEGACY_DEBUG=y | ||
1937 | CONFIG_B43LEGACY_DMA=y | ||
1938 | CONFIG_B43LEGACY_PIO=y | ||
1939 | CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y | ||
1940 | # CONFIG_B43LEGACY_DMA_MODE is not set | ||
1941 | # CONFIG_B43LEGACY_PIO_MODE is not set | ||
1942 | CONFIG_HOSTAP=m | ||
1943 | CONFIG_HOSTAP_FIRMWARE=y | ||
1944 | CONFIG_HOSTAP_FIRMWARE_NVRAM=y | ||
1945 | CONFIG_HOSTAP_PLX=m | ||
1946 | CONFIG_HOSTAP_PCI=m | ||
1947 | CONFIG_HOSTAP_CS=m | ||
1948 | CONFIG_IPW2100=m | ||
1949 | CONFIG_IPW2100_MONITOR=y | ||
1950 | # CONFIG_IPW2100_DEBUG is not set | ||
1951 | CONFIG_IPW2200=m | ||
1952 | CONFIG_IPW2200_MONITOR=y | ||
1953 | CONFIG_IPW2200_RADIOTAP=y | ||
1954 | CONFIG_IPW2200_PROMISCUOUS=y | ||
1955 | CONFIG_IPW2200_QOS=y | ||
1956 | # CONFIG_IPW2200_DEBUG is not set | ||
1957 | CONFIG_LIBIPW=m | ||
1958 | # CONFIG_LIBIPW_DEBUG is not set | ||
1959 | CONFIG_IWLWIFI=m | ||
1960 | # CONFIG_IWLWIFI_DEBUG is not set | ||
1961 | CONFIG_IWLAGN=m | ||
1962 | CONFIG_IWL4965=y | ||
1963 | CONFIG_IWL5000=y | ||
1964 | CONFIG_IWL3945=m | ||
1965 | CONFIG_IWM=m | ||
1966 | # CONFIG_IWM_DEBUG is not set | ||
1967 | CONFIG_LIBERTAS=m | ||
1968 | CONFIG_LIBERTAS_USB=m | ||
1969 | CONFIG_LIBERTAS_CS=m | ||
1970 | CONFIG_LIBERTAS_SDIO=m | ||
1971 | CONFIG_LIBERTAS_SPI=m | ||
1972 | # CONFIG_LIBERTAS_DEBUG is not set | ||
1973 | # CONFIG_LIBERTAS_MESH is not set | ||
1974 | CONFIG_HERMES=m | ||
1975 | CONFIG_HERMES_CACHE_FW_ON_INIT=y | ||
1976 | CONFIG_PLX_HERMES=m | ||
1977 | CONFIG_TMD_HERMES=m | ||
1978 | CONFIG_NORTEL_HERMES=m | ||
1979 | CONFIG_PCI_HERMES=m | ||
1980 | CONFIG_PCMCIA_HERMES=m | ||
1981 | CONFIG_PCMCIA_SPECTRUM=m | ||
1982 | CONFIG_P54_COMMON=m | ||
1983 | CONFIG_P54_USB=m | ||
1984 | CONFIG_P54_PCI=m | ||
1985 | CONFIG_P54_SPI=m | ||
1986 | CONFIG_P54_LEDS=y | ||
1987 | CONFIG_RT2X00=m | ||
1988 | CONFIG_RT2400PCI=m | ||
1989 | CONFIG_RT2500PCI=m | ||
1990 | CONFIG_RT61PCI=m | ||
1991 | CONFIG_RT2800PCI_PCI=y | ||
1992 | CONFIG_RT2800PCI=m | ||
1993 | # CONFIG_RT2800PCI_RT30XX is not set | ||
1994 | # CONFIG_RT2800PCI_RT35XX is not set | ||
1995 | CONFIG_RT2500USB=m | ||
1996 | CONFIG_RT73USB=m | ||
1997 | CONFIG_RT2800USB=m | ||
1998 | # CONFIG_RT2800USB_RT30XX is not set | ||
1999 | # CONFIG_RT2800USB_RT35XX is not set | ||
2000 | # CONFIG_RT2800USB_UNKNOWN is not set | ||
2001 | CONFIG_RT2800_LIB=m | ||
2002 | CONFIG_RT2X00_LIB_PCI=m | ||
2003 | CONFIG_RT2X00_LIB_USB=m | ||
2004 | CONFIG_RT2X00_LIB=m | ||
2005 | CONFIG_RT2X00_LIB_HT=y | ||
2006 | CONFIG_RT2X00_LIB_FIRMWARE=y | ||
2007 | CONFIG_RT2X00_LIB_CRYPTO=y | ||
2008 | CONFIG_RT2X00_LIB_LEDS=y | ||
2009 | # CONFIG_RT2X00_DEBUG is not set | ||
2010 | CONFIG_WL12XX=m | ||
2011 | CONFIG_WL1251=m | ||
2012 | CONFIG_WL1251_SPI=m | ||
2013 | CONFIG_WL1251_SDIO=m | ||
2014 | CONFIG_WL1271=m | ||
2015 | CONFIG_ZD1211RW=m | ||
2016 | # CONFIG_ZD1211RW_DEBUG is not set | ||
2017 | |||
2018 | # | ||
2019 | # WiMAX Wireless Broadband devices | ||
2020 | # | ||
2021 | CONFIG_WIMAX_I2400M=m | ||
2022 | CONFIG_WIMAX_I2400M_USB=m | ||
2023 | CONFIG_WIMAX_I2400M_SDIO=m | ||
2024 | # CONFIG_WIMAX_IWMC3200_SDIO is not set | ||
2025 | CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 | ||
2026 | |||
2027 | # | ||
2028 | # USB Network Adapters | ||
2029 | # | ||
2030 | CONFIG_USB_CATC=m | ||
2031 | CONFIG_USB_KAWETH=m | ||
2032 | CONFIG_USB_PEGASUS=m | ||
2033 | CONFIG_USB_RTL8150=m | ||
2034 | CONFIG_USB_USBNET=m | ||
2035 | CONFIG_USB_NET_AX8817X=m | ||
2036 | CONFIG_USB_NET_CDCETHER=m | ||
2037 | CONFIG_USB_NET_CDC_EEM=m | ||
2038 | CONFIG_USB_NET_DM9601=m | ||
2039 | CONFIG_USB_NET_SMSC75XX=m | ||
2040 | CONFIG_USB_NET_SMSC95XX=m | ||
2041 | CONFIG_USB_NET_GL620A=m | ||
2042 | CONFIG_USB_NET_NET1080=m | ||
2043 | CONFIG_USB_NET_PLUSB=m | ||
2044 | CONFIG_USB_NET_MCS7830=m | ||
2045 | CONFIG_USB_NET_RNDIS_HOST=m | ||
2046 | CONFIG_USB_NET_CDC_SUBSET=m | ||
2047 | CONFIG_USB_ALI_M5632=y | ||
2048 | CONFIG_USB_AN2720=y | ||
2049 | CONFIG_USB_BELKIN=y | ||
2050 | CONFIG_USB_ARMLINUX=y | ||
2051 | CONFIG_USB_EPSON2888=y | ||
2052 | CONFIG_USB_KC2190=y | ||
2053 | CONFIG_USB_NET_ZAURUS=m | ||
2054 | CONFIG_USB_HSO=m | ||
2055 | CONFIG_USB_NET_INT51X1=m | ||
2056 | CONFIG_USB_CDC_PHONET=m | ||
2057 | CONFIG_USB_IPHETH=m | ||
2058 | CONFIG_USB_SIERRA_NET=m | ||
2059 | CONFIG_NET_PCMCIA=y | ||
2060 | CONFIG_PCMCIA_3C589=m | ||
2061 | CONFIG_PCMCIA_3C574=m | ||
2062 | CONFIG_PCMCIA_FMVJ18X=m | ||
2063 | CONFIG_PCMCIA_PCNET=m | ||
2064 | CONFIG_PCMCIA_NMCLAN=m | ||
2065 | CONFIG_PCMCIA_SMC91C92=m | ||
2066 | CONFIG_PCMCIA_XIRC2PS=m | ||
2067 | CONFIG_PCMCIA_AXNET=m | ||
2068 | CONFIG_ARCNET_COM20020_CS=m | ||
2069 | CONFIG_WAN=y | ||
2070 | CONFIG_HOSTESS_SV11=m | ||
2071 | CONFIG_COSA=m | ||
2072 | CONFIG_LANMEDIA=m | ||
2073 | CONFIG_SEALEVEL_4021=m | ||
2074 | CONFIG_HDLC=m | ||
2075 | CONFIG_HDLC_RAW=m | ||
2076 | CONFIG_HDLC_RAW_ETH=m | ||
2077 | CONFIG_HDLC_CISCO=m | ||
2078 | CONFIG_HDLC_FR=m | ||
2079 | CONFIG_HDLC_PPP=m | ||
2080 | CONFIG_HDLC_X25=m | ||
2081 | CONFIG_PCI200SYN=m | ||
2082 | CONFIG_WANXL=m | ||
2083 | # CONFIG_WANXL_BUILD_FIRMWARE is not set | ||
2084 | CONFIG_PC300TOO=m | ||
2085 | CONFIG_N2=m | ||
2086 | CONFIG_C101=m | ||
2087 | CONFIG_FARSYNC=m | ||
2088 | CONFIG_DSCC4=m | ||
2089 | CONFIG_DSCC4_PCISYNC=y | ||
2090 | CONFIG_DSCC4_PCI_RST=y | ||
2091 | CONFIG_DLCI=m | ||
2092 | CONFIG_DLCI_MAX=8 | ||
2093 | CONFIG_SDLA=m | ||
2094 | CONFIG_WAN_ROUTER_DRIVERS=m | ||
2095 | CONFIG_CYCLADES_SYNC=m | ||
2096 | CONFIG_CYCLOMX_X25=y | ||
2097 | CONFIG_LAPBETHER=m | ||
2098 | CONFIG_X25_ASY=m | ||
2099 | CONFIG_SBNI=m | ||
2100 | CONFIG_SBNI_MULTILINE=y | ||
2101 | CONFIG_ATM_DRIVERS=y | ||
2102 | CONFIG_ATM_DUMMY=m | ||
2103 | CONFIG_ATM_TCP=m | ||
2104 | CONFIG_ATM_LANAI=m | ||
2105 | CONFIG_ATM_ENI=m | ||
2106 | # CONFIG_ATM_ENI_DEBUG is not set | ||
2107 | # CONFIG_ATM_ENI_TUNE_BURST is not set | ||
2108 | CONFIG_ATM_FIRESTREAM=m | ||
2109 | CONFIG_ATM_ZATM=m | ||
2110 | # CONFIG_ATM_ZATM_DEBUG is not set | ||
2111 | CONFIG_ATM_NICSTAR=m | ||
2112 | CONFIG_ATM_NICSTAR_USE_SUNI=y | ||
2113 | CONFIG_ATM_NICSTAR_USE_IDT77105=y | ||
2114 | CONFIG_ATM_IDT77252=m | ||
2115 | # CONFIG_ATM_IDT77252_DEBUG is not set | ||
2116 | # CONFIG_ATM_IDT77252_RCV_ALL is not set | ||
2117 | CONFIG_ATM_IDT77252_USE_SUNI=y | ||
2118 | CONFIG_ATM_AMBASSADOR=m | ||
2119 | # CONFIG_ATM_AMBASSADOR_DEBUG is not set | ||
2120 | CONFIG_ATM_HORIZON=m | ||
2121 | # CONFIG_ATM_HORIZON_DEBUG is not set | ||
2122 | CONFIG_ATM_IA=m | ||
2123 | # CONFIG_ATM_IA_DEBUG is not set | ||
2124 | CONFIG_ATM_FORE200E=m | ||
2125 | CONFIG_ATM_FORE200E_USE_TASKLET=y | ||
2126 | CONFIG_ATM_FORE200E_TX_RETRY=16 | ||
2127 | CONFIG_ATM_FORE200E_DEBUG=0 | ||
2128 | CONFIG_ATM_HE=m | ||
2129 | CONFIG_ATM_HE_USE_SUNI=y | ||
2130 | CONFIG_ATM_SOLOS=m | ||
2131 | CONFIG_IEEE802154_DRIVERS=m | ||
2132 | CONFIG_IEEE802154_FAKEHARD=m | ||
2133 | CONFIG_XEN_NETDEV_FRONTEND=y | ||
2134 | CONFIG_FDDI=y | ||
2135 | CONFIG_DEFXX=m | ||
2136 | # CONFIG_DEFXX_MMIO is not set | ||
2137 | CONFIG_SKFP=m | ||
2138 | CONFIG_HIPPI=y | ||
2139 | CONFIG_ROADRUNNER=m | ||
2140 | # CONFIG_ROADRUNNER_LARGE_RINGS is not set | ||
2141 | CONFIG_PLIP=m | ||
2142 | CONFIG_PPP=m | ||
2143 | CONFIG_PPP_MULTILINK=y | ||
2144 | CONFIG_PPP_FILTER=y | ||
2145 | CONFIG_PPP_ASYNC=m | ||
2146 | CONFIG_PPP_SYNC_TTY=m | ||
2147 | CONFIG_PPP_DEFLATE=m | ||
2148 | CONFIG_PPP_BSDCOMP=m | ||
2149 | CONFIG_PPP_MPPE=m | ||
2150 | CONFIG_PPPOE=m | ||
2151 | CONFIG_PPPOATM=m | ||
2152 | CONFIG_PPPOL2TP=m | ||
2153 | CONFIG_SLIP=m | ||
2154 | CONFIG_SLIP_COMPRESSED=y | ||
2155 | CONFIG_SLHC=m | ||
2156 | CONFIG_SLIP_SMART=y | ||
2157 | CONFIG_SLIP_MODE_SLIP6=y | ||
2158 | # CONFIG_NET_FC is not set | ||
2159 | CONFIG_NETCONSOLE=m | ||
2160 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
2161 | CONFIG_NETPOLL=y | ||
2162 | # CONFIG_NETPOLL_TRAP is not set | ||
2163 | CONFIG_NET_POLL_CONTROLLER=y | ||
2164 | CONFIG_VIRTIO_NET=m | ||
2165 | CONFIG_VMXNET3=m | ||
2166 | CONFIG_ISDN=y | ||
2167 | # CONFIG_ISDN_I4L is not set | ||
2168 | CONFIG_ISDN_CAPI=m | ||
2169 | # CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set | ||
2170 | # CONFIG_CAPI_TRACE is not set | ||
2171 | CONFIG_ISDN_CAPI_MIDDLEWARE=y | ||
2172 | CONFIG_ISDN_CAPI_CAPI20=m | ||
2173 | CONFIG_ISDN_CAPI_CAPIFS_BOOL=y | ||
2174 | CONFIG_ISDN_CAPI_CAPIFS=m | ||
2175 | |||
2176 | # | ||
2177 | # CAPI hardware drivers | ||
2178 | # | ||
2179 | CONFIG_CAPI_AVM=y | ||
2180 | CONFIG_ISDN_DRV_AVMB1_B1ISA=m | ||
2181 | CONFIG_ISDN_DRV_AVMB1_B1PCI=m | ||
2182 | CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y | ||
2183 | CONFIG_ISDN_DRV_AVMB1_T1ISA=m | ||
2184 | CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m | ||
2185 | CONFIG_ISDN_DRV_AVMB1_AVM_CS=m | ||
2186 | CONFIG_ISDN_DRV_AVMB1_T1PCI=m | ||
2187 | CONFIG_ISDN_DRV_AVMB1_C4=m | ||
2188 | CONFIG_CAPI_EICON=y | ||
2189 | CONFIG_ISDN_DIVAS=m | ||
2190 | CONFIG_ISDN_DIVAS_BRIPCI=y | ||
2191 | CONFIG_ISDN_DIVAS_PRIPCI=y | ||
2192 | CONFIG_ISDN_DIVAS_DIVACAPI=m | ||
2193 | CONFIG_ISDN_DIVAS_USERIDI=m | ||
2194 | CONFIG_ISDN_DIVAS_MAINT=m | ||
2195 | CONFIG_ISDN_DRV_GIGASET=m | ||
2196 | CONFIG_GIGASET_CAPI=y | ||
2197 | # CONFIG_GIGASET_DUMMYLL is not set | ||
2198 | CONFIG_GIGASET_BASE=m | ||
2199 | CONFIG_GIGASET_M105=m | ||
2200 | CONFIG_GIGASET_M101=m | ||
2201 | # CONFIG_GIGASET_DEBUG is not set | ||
2202 | CONFIG_HYSDN=m | ||
2203 | # CONFIG_HYSDN_CAPI is not set | ||
2204 | CONFIG_MISDN=m | ||
2205 | CONFIG_MISDN_DSP=m | ||
2206 | CONFIG_MISDN_L1OIP=m | ||
2207 | |||
2208 | # | ||
2209 | # mISDN hardware drivers | ||
2210 | # | ||
2211 | CONFIG_MISDN_HFCPCI=m | ||
2212 | CONFIG_MISDN_HFCMULTI=m | ||
2213 | CONFIG_MISDN_HFCUSB=m | ||
2214 | CONFIG_MISDN_AVMFRITZ=m | ||
2215 | # CONFIG_MISDN_SPEEDFAX is not set | ||
2216 | # CONFIG_MISDN_INFINEON is not set | ||
2217 | # CONFIG_MISDN_W6692 is not set | ||
2218 | # CONFIG_MISDN_NETJET is not set | ||
2219 | CONFIG_MISDN_IPAC=m | ||
2220 | # CONFIG_PHONE is not set | ||
2221 | |||
2222 | # | ||
2223 | # Input device support | ||
2224 | # | ||
2225 | CONFIG_INPUT=y | ||
2226 | CONFIG_INPUT_FF_MEMLESS=m | ||
2227 | CONFIG_INPUT_POLLDEV=m | ||
2228 | CONFIG_INPUT_SPARSEKMAP=m | ||
2229 | |||
2230 | # | ||
2231 | # Userland interfaces | ||
2232 | # | ||
2233 | CONFIG_INPUT_MOUSEDEV=m | ||
2234 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
2235 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
2236 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
2237 | CONFIG_INPUT_JOYDEV=m | ||
2238 | CONFIG_INPUT_EVDEV=m | ||
2239 | CONFIG_INPUT_EVBUG=m | ||
2240 | CONFIG_XEN_KBDDEV_FRONTEND=m | ||
2241 | |||
2242 | # | ||
2243 | # Input Device Drivers | ||
2244 | # | ||
2245 | CONFIG_INPUT_KEYBOARD=y | ||
2246 | # CONFIG_KEYBOARD_ADP5588 is not set | ||
2247 | CONFIG_KEYBOARD_ATKBD=y | ||
2248 | CONFIG_QT2160=m | ||
2249 | CONFIG_KEYBOARD_LKKBD=m | ||
2250 | CONFIG_KEYBOARD_GPIO=m | ||
2251 | CONFIG_KEYBOARD_MATRIX=m | ||
2252 | CONFIG_KEYBOARD_LM8323=m | ||
2253 | # CONFIG_KEYBOARD_MAX7359 is not set | ||
2254 | CONFIG_KEYBOARD_NEWTON=m | ||
2255 | # CONFIG_KEYBOARD_OPENCORES is not set | ||
2256 | CONFIG_KEYBOARD_STOWAWAY=m | ||
2257 | CONFIG_KEYBOARD_SUNKBD=m | ||
2258 | CONFIG_KEYBOARD_XTKBD=m | ||
2259 | CONFIG_INPUT_MOUSE=y | ||
2260 | CONFIG_MOUSE_PS2=m | ||
2261 | CONFIG_MOUSE_PS2_ALPS=y | ||
2262 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
2263 | CONFIG_MOUSE_PS2_SYNAPTICS=y | ||
2264 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
2265 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
2266 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
2267 | # CONFIG_MOUSE_PS2_SENTELIC is not set | ||
2268 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
2269 | CONFIG_MOUSE_SERIAL=m | ||
2270 | CONFIG_MOUSE_APPLETOUCH=m | ||
2271 | CONFIG_MOUSE_BCM5974=m | ||
2272 | CONFIG_MOUSE_INPORT=m | ||
2273 | # CONFIG_MOUSE_ATIXL is not set | ||
2274 | CONFIG_MOUSE_LOGIBM=m | ||
2275 | CONFIG_MOUSE_PC110PAD=m | ||
2276 | CONFIG_MOUSE_VSXXXAA=m | ||
2277 | CONFIG_MOUSE_GPIO=m | ||
2278 | CONFIG_MOUSE_SYNAPTICS_I2C=m | ||
2279 | # CONFIG_INPUT_JOYSTICK is not set | ||
2280 | # CONFIG_INPUT_TABLET is not set | ||
2281 | CONFIG_INPUT_TOUCHSCREEN=y | ||
2282 | CONFIG_TOUCHSCREEN_ADS7846=m | ||
2283 | CONFIG_TOUCHSCREEN_AD7877=m | ||
2284 | CONFIG_TOUCHSCREEN_AD7879_I2C=m | ||
2285 | CONFIG_TOUCHSCREEN_AD7879=m | ||
2286 | CONFIG_TOUCHSCREEN_DYNAPRO=m | ||
2287 | CONFIG_TOUCHSCREEN_EETI=m | ||
2288 | CONFIG_TOUCHSCREEN_FUJITSU=m | ||
2289 | CONFIG_TOUCHSCREEN_GUNZE=m | ||
2290 | CONFIG_TOUCHSCREEN_ELO=m | ||
2291 | CONFIG_TOUCHSCREEN_WACOM_W8001=m | ||
2292 | # CONFIG_TOUCHSCREEN_MCS5000 is not set | ||
2293 | CONFIG_TOUCHSCREEN_MTOUCH=m | ||
2294 | CONFIG_TOUCHSCREEN_INEXIO=m | ||
2295 | CONFIG_TOUCHSCREEN_MK712=m | ||
2296 | CONFIG_TOUCHSCREEN_HTCPEN=m | ||
2297 | CONFIG_TOUCHSCREEN_PENMOUNT=m | ||
2298 | CONFIG_TOUCHSCREEN_TOUCHRIGHT=m | ||
2299 | CONFIG_TOUCHSCREEN_TOUCHWIN=m | ||
2300 | CONFIG_TOUCHSCREEN_UCB1400=m | ||
2301 | CONFIG_TOUCHSCREEN_WM97XX=m | ||
2302 | CONFIG_TOUCHSCREEN_WM9705=y | ||
2303 | CONFIG_TOUCHSCREEN_WM9712=y | ||
2304 | CONFIG_TOUCHSCREEN_WM9713=y | ||
2305 | CONFIG_TOUCHSCREEN_USB_COMPOSITE=m | ||
2306 | CONFIG_TOUCHSCREEN_USB_EGALAX=y | ||
2307 | CONFIG_TOUCHSCREEN_USB_PANJIT=y | ||
2308 | CONFIG_TOUCHSCREEN_USB_3M=y | ||
2309 | CONFIG_TOUCHSCREEN_USB_ITM=y | ||
2310 | CONFIG_TOUCHSCREEN_USB_ETURBO=y | ||
2311 | CONFIG_TOUCHSCREEN_USB_GUNZE=y | ||
2312 | CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y | ||
2313 | CONFIG_TOUCHSCREEN_USB_IRTOUCH=y | ||
2314 | CONFIG_TOUCHSCREEN_USB_IDEALTEK=y | ||
2315 | CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y | ||
2316 | CONFIG_TOUCHSCREEN_USB_GOTOP=y | ||
2317 | CONFIG_TOUCHSCREEN_USB_JASTEC=y | ||
2318 | CONFIG_TOUCHSCREEN_USB_E2I=y | ||
2319 | CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y | ||
2320 | CONFIG_TOUCHSCREEN_USB_ETT_TC5UH=y | ||
2321 | CONFIG_TOUCHSCREEN_USB_NEXIO=y | ||
2322 | CONFIG_TOUCHSCREEN_TOUCHIT213=m | ||
2323 | CONFIG_TOUCHSCREEN_TSC2007=m | ||
2324 | CONFIG_INPUT_MISC=y | ||
2325 | CONFIG_INPUT_PCSPKR=m | ||
2326 | CONFIG_INPUT_APANEL=m | ||
2327 | CONFIG_INPUT_WISTRON_BTNS=m | ||
2328 | CONFIG_INPUT_ATLAS_BTNS=m | ||
2329 | CONFIG_INPUT_ATI_REMOTE=m | ||
2330 | CONFIG_INPUT_ATI_REMOTE2=m | ||
2331 | CONFIG_INPUT_KEYSPAN_REMOTE=m | ||
2332 | CONFIG_INPUT_POWERMATE=m | ||
2333 | CONFIG_INPUT_YEALINK=m | ||
2334 | CONFIG_INPUT_CM109=m | ||
2335 | CONFIG_INPUT_UINPUT=m | ||
2336 | CONFIG_INPUT_WINBOND_CIR=m | ||
2337 | CONFIG_INPUT_PCF50633_PMU=m | ||
2338 | CONFIG_INPUT_GPIO_ROTARY_ENCODER=m | ||
2339 | |||
2340 | # | ||
2341 | # Hardware I/O ports | ||
2342 | # | ||
2343 | CONFIG_SERIO=y | ||
2344 | CONFIG_SERIO_I8042=y | ||
2345 | CONFIG_SERIO_SERPORT=m | ||
2346 | CONFIG_SERIO_CT82C710=m | ||
2347 | CONFIG_SERIO_PARKBD=m | ||
2348 | CONFIG_SERIO_PCIPS2=m | ||
2349 | CONFIG_SERIO_LIBPS2=y | ||
2350 | CONFIG_SERIO_RAW=m | ||
2351 | CONFIG_SERIO_ALTERA_PS2=m | ||
2352 | # CONFIG_GAMEPORT is not set | ||
2353 | |||
2354 | # | ||
2355 | # Character devices | ||
2356 | # | ||
2357 | CONFIG_VT=y | ||
2358 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
2359 | CONFIG_VT_CONSOLE=y | ||
2360 | CONFIG_HW_CONSOLE=y | ||
2361 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
2362 | # CONFIG_DEVKMEM is not set | ||
2363 | CONFIG_SERIAL_NONSTANDARD=y | ||
2364 | CONFIG_COMPUTONE=m | ||
2365 | CONFIG_ROCKETPORT=m | ||
2366 | CONFIG_CYCLADES=m | ||
2367 | # CONFIG_CYZ_INTR is not set | ||
2368 | CONFIG_DIGIEPCA=m | ||
2369 | CONFIG_MOXA_INTELLIO=m | ||
2370 | CONFIG_MOXA_SMARTIO=m | ||
2371 | CONFIG_ISI=m | ||
2372 | CONFIG_SYNCLINK=m | ||
2373 | CONFIG_SYNCLINKMP=m | ||
2374 | CONFIG_SYNCLINK_GT=m | ||
2375 | CONFIG_N_HDLC=m | ||
2376 | CONFIG_RISCOM8=m | ||
2377 | CONFIG_SPECIALIX=m | ||
2378 | CONFIG_STALDRV=y | ||
2379 | CONFIG_STALLION=m | ||
2380 | CONFIG_ISTALLION=m | ||
2381 | CONFIG_NOZOMI=m | ||
2382 | |||
2383 | # | ||
2384 | # Serial drivers | ||
2385 | # | ||
2386 | CONFIG_SERIAL_8250=y | ||
2387 | CONFIG_SERIAL_8250_CONSOLE=y | ||
2388 | CONFIG_FIX_EARLYCON_MEM=y | ||
2389 | CONFIG_SERIAL_8250_PCI=y | ||
2390 | CONFIG_SERIAL_8250_PNP=y | ||
2391 | CONFIG_SERIAL_8250_CS=m | ||
2392 | CONFIG_SERIAL_8250_NR_UARTS=16 | ||
2393 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
2394 | CONFIG_SERIAL_8250_EXTENDED=y | ||
2395 | CONFIG_SERIAL_8250_MANY_PORTS=y | ||
2396 | CONFIG_SERIAL_8250_FOURPORT=m | ||
2397 | CONFIG_SERIAL_8250_ACCENT=m | ||
2398 | CONFIG_SERIAL_8250_BOCA=m | ||
2399 | CONFIG_SERIAL_8250_EXAR_ST16C554=m | ||
2400 | CONFIG_SERIAL_8250_HUB6=m | ||
2401 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
2402 | # CONFIG_SERIAL_8250_DETECT_IRQ is not set | ||
2403 | CONFIG_SERIAL_8250_RSA=y | ||
2404 | |||
2405 | # | ||
2406 | # Non-8250 serial port support | ||
2407 | # | ||
2408 | CONFIG_SERIAL_MAX3100=m | ||
2409 | CONFIG_SERIAL_UARTLITE=m | ||
2410 | CONFIG_SERIAL_CORE=y | ||
2411 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
2412 | CONFIG_SERIAL_JSM=m | ||
2413 | CONFIG_SERIAL_TIMBERDALE=m | ||
2414 | CONFIG_UNIX98_PTYS=y | ||
2415 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
2416 | # CONFIG_LEGACY_PTYS is not set | ||
2417 | CONFIG_PRINTER=m | ||
2418 | # CONFIG_LP_CONSOLE is not set | ||
2419 | CONFIG_PPDEV=m | ||
2420 | CONFIG_HVC_DRIVER=y | ||
2421 | CONFIG_HVC_IRQ=y | ||
2422 | CONFIG_HVC_XEN=y | ||
2423 | CONFIG_VIRTIO_CONSOLE=y | ||
2424 | CONFIG_IPMI_HANDLER=m | ||
2425 | # CONFIG_IPMI_PANIC_EVENT is not set | ||
2426 | CONFIG_IPMI_DEVICE_INTERFACE=m | ||
2427 | CONFIG_IPMI_SI=m | ||
2428 | CONFIG_IPMI_WATCHDOG=m | ||
2429 | CONFIG_IPMI_POWEROFF=m | ||
2430 | CONFIG_HW_RANDOM=m | ||
2431 | CONFIG_HW_RANDOM_TIMERIOMEM=m | ||
2432 | CONFIG_HW_RANDOM_INTEL=m | ||
2433 | CONFIG_HW_RANDOM_AMD=m | ||
2434 | CONFIG_HW_RANDOM_GEODE=m | ||
2435 | CONFIG_HW_RANDOM_VIA=m | ||
2436 | CONFIG_HW_RANDOM_VIRTIO=m | ||
2437 | CONFIG_NVRAM=m | ||
2438 | CONFIG_DTLK=m | ||
2439 | CONFIG_R3964=m | ||
2440 | CONFIG_APPLICOM=m | ||
2441 | CONFIG_SONYPI=m | ||
2442 | |||
2443 | # | ||
2444 | # PCMCIA character devices | ||
2445 | # | ||
2446 | CONFIG_SYNCLINK_CS=m | ||
2447 | CONFIG_CARDMAN_4000=m | ||
2448 | CONFIG_CARDMAN_4040=m | ||
2449 | CONFIG_IPWIRELESS=m | ||
2450 | CONFIG_MWAVE=m | ||
2451 | CONFIG_SCx200_GPIO=m | ||
2452 | CONFIG_PC8736x_GPIO=m | ||
2453 | CONFIG_NSC_GPIO=m | ||
2454 | CONFIG_CS5535_GPIO=m | ||
2455 | CONFIG_RAW_DRIVER=m | ||
2456 | CONFIG_MAX_RAW_DEVS=256 | ||
2457 | CONFIG_HPET=y | ||
2458 | CONFIG_HPET_MMAP=y | ||
2459 | CONFIG_HANGCHECK_TIMER=m | ||
2460 | CONFIG_TCG_TPM=m | ||
2461 | CONFIG_TCG_TIS=m | ||
2462 | CONFIG_TCG_NSC=m | ||
2463 | CONFIG_TCG_ATMEL=m | ||
2464 | CONFIG_TCG_INFINEON=m | ||
2465 | CONFIG_TELCLOCK=m | ||
2466 | CONFIG_DEVPORT=y | ||
2467 | CONFIG_I2C=m | ||
2468 | CONFIG_I2C_BOARDINFO=y | ||
2469 | CONFIG_I2C_COMPAT=y | ||
2470 | CONFIG_I2C_CHARDEV=m | ||
2471 | CONFIG_I2C_HELPER_AUTO=y | ||
2472 | CONFIG_I2C_SMBUS=m | ||
2473 | CONFIG_I2C_ALGOBIT=m | ||
2474 | CONFIG_I2C_ALGOPCA=m | ||
2475 | |||
2476 | # | ||
2477 | # I2C Hardware Bus support | ||
2478 | # | ||
2479 | |||
2480 | # | ||
2481 | # PC SMBus host controller drivers | ||
2482 | # | ||
2483 | CONFIG_I2C_ALI1535=m | ||
2484 | CONFIG_I2C_ALI1563=m | ||
2485 | CONFIG_I2C_ALI15X3=m | ||
2486 | CONFIG_I2C_AMD756=m | ||
2487 | CONFIG_I2C_AMD756_S4882=m | ||
2488 | CONFIG_I2C_AMD8111=m | ||
2489 | CONFIG_I2C_I801=m | ||
2490 | CONFIG_I2C_ISCH=m | ||
2491 | CONFIG_I2C_PIIX4=m | ||
2492 | CONFIG_I2C_NFORCE2=m | ||
2493 | CONFIG_I2C_NFORCE2_S4985=m | ||
2494 | CONFIG_I2C_SIS5595=m | ||
2495 | CONFIG_I2C_SIS630=m | ||
2496 | CONFIG_I2C_SIS96X=m | ||
2497 | CONFIG_I2C_VIA=m | ||
2498 | CONFIG_I2C_VIAPRO=m | ||
2499 | |||
2500 | # | ||
2501 | # ACPI drivers | ||
2502 | # | ||
2503 | CONFIG_I2C_SCMI=m | ||
2504 | |||
2505 | # | ||
2506 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
2507 | # | ||
2508 | CONFIG_I2C_GPIO=m | ||
2509 | CONFIG_I2C_OCORES=m | ||
2510 | CONFIG_I2C_SIMTEC=m | ||
2511 | CONFIG_I2C_XILINX=m | ||
2512 | |||
2513 | # | ||
2514 | # External I2C/SMBus adapter drivers | ||
2515 | # | ||
2516 | CONFIG_I2C_PARPORT=m | ||
2517 | CONFIG_I2C_PARPORT_LIGHT=m | ||
2518 | CONFIG_I2C_TAOS_EVM=m | ||
2519 | CONFIG_I2C_TINY_USB=m | ||
2520 | |||
2521 | # | ||
2522 | # Other I2C/SMBus bus drivers | ||
2523 | # | ||
2524 | CONFIG_I2C_PCA_ISA=m | ||
2525 | CONFIG_I2C_PCA_PLATFORM=m | ||
2526 | CONFIG_I2C_STUB=m | ||
2527 | CONFIG_SCx200_I2C=m | ||
2528 | CONFIG_SCx200_I2C_SCL=12 | ||
2529 | CONFIG_SCx200_I2C_SDA=13 | ||
2530 | CONFIG_SCx200_ACB=m | ||
2531 | # CONFIG_I2C_DEBUG_CORE is not set | ||
2532 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
2533 | # CONFIG_I2C_DEBUG_BUS is not set | ||
2534 | CONFIG_SPI=y | ||
2535 | CONFIG_SPI_MASTER=y | ||
2536 | |||
2537 | # | ||
2538 | # SPI Master Controller Drivers | ||
2539 | # | ||
2540 | CONFIG_SPI_BITBANG=m | ||
2541 | CONFIG_SPI_BUTTERFLY=m | ||
2542 | CONFIG_SPI_GPIO=m | ||
2543 | CONFIG_SPI_LM70_LLP=m | ||
2544 | CONFIG_SPI_XILINX=m | ||
2545 | CONFIG_SPI_XILINX_PLTFM=m | ||
2546 | CONFIG_SPI_DESIGNWARE=m | ||
2547 | CONFIG_SPI_DW_PCI=m | ||
2548 | |||
2549 | # | ||
2550 | # SPI Protocol Masters | ||
2551 | # | ||
2552 | CONFIG_SPI_SPIDEV=m | ||
2553 | CONFIG_SPI_TLE62X0=m | ||
2554 | |||
2555 | # | ||
2556 | # PPS support | ||
2557 | # | ||
2558 | # CONFIG_PPS is not set | ||
2559 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
2560 | CONFIG_GPIOLIB=y | ||
2561 | # CONFIG_GPIO_SYSFS is not set | ||
2562 | CONFIG_GPIO_MAX730X=m | ||
2563 | |||
2564 | # | ||
2565 | # Memory mapped GPIO expanders: | ||
2566 | # | ||
2567 | CONFIG_GPIO_IT8761E=m | ||
2568 | CONFIG_GPIO_SCH=m | ||
2569 | |||
2570 | # | ||
2571 | # I2C GPIO expanders: | ||
2572 | # | ||
2573 | CONFIG_GPIO_MAX7300=m | ||
2574 | CONFIG_GPIO_MAX732X=m | ||
2575 | CONFIG_GPIO_PCA953X=m | ||
2576 | CONFIG_GPIO_PCF857X=m | ||
2577 | CONFIG_GPIO_WM8994=m | ||
2578 | CONFIG_GPIO_ADP5588=m | ||
2579 | |||
2580 | # | ||
2581 | # PCI GPIO expanders: | ||
2582 | # | ||
2583 | CONFIG_GPIO_CS5535=m | ||
2584 | # CONFIG_GPIO_LANGWELL is not set | ||
2585 | # CONFIG_GPIO_TIMBERDALE is not set | ||
2586 | |||
2587 | # | ||
2588 | # SPI GPIO expanders: | ||
2589 | # | ||
2590 | CONFIG_GPIO_MAX7301=m | ||
2591 | CONFIG_GPIO_MCP23S08=m | ||
2592 | # CONFIG_GPIO_MC33880 is not set | ||
2593 | |||
2594 | # | ||
2595 | # AC97 GPIO expanders: | ||
2596 | # | ||
2597 | # CONFIG_GPIO_UCB1400 is not set | ||
2598 | CONFIG_W1=m | ||
2599 | CONFIG_W1_CON=y | ||
2600 | |||
2601 | # | ||
2602 | # 1-wire Bus Masters | ||
2603 | # | ||
2604 | CONFIG_W1_MASTER_MATROX=m | ||
2605 | CONFIG_W1_MASTER_DS2490=m | ||
2606 | CONFIG_W1_MASTER_DS2482=m | ||
2607 | CONFIG_W1_MASTER_GPIO=m | ||
2608 | |||
2609 | # | ||
2610 | # 1-wire Slaves | ||
2611 | # | ||
2612 | CONFIG_W1_SLAVE_THERM=m | ||
2613 | CONFIG_W1_SLAVE_SMEM=m | ||
2614 | CONFIG_W1_SLAVE_DS2431=m | ||
2615 | CONFIG_W1_SLAVE_DS2433=m | ||
2616 | # CONFIG_W1_SLAVE_DS2433_CRC is not set | ||
2617 | CONFIG_W1_SLAVE_DS2760=m | ||
2618 | CONFIG_W1_SLAVE_BQ27000=m | ||
2619 | CONFIG_POWER_SUPPLY=y | ||
2620 | # CONFIG_POWER_SUPPLY_DEBUG is not set | ||
2621 | CONFIG_PDA_POWER=m | ||
2622 | CONFIG_BATTERY_DS2760=m | ||
2623 | CONFIG_BATTERY_DS2782=m | ||
2624 | CONFIG_BATTERY_BQ27x00=m | ||
2625 | CONFIG_BATTERY_MAX17040=m | ||
2626 | CONFIG_CHARGER_PCF50633=m | ||
2627 | CONFIG_HWMON=m | ||
2628 | CONFIG_HWMON_VID=m | ||
2629 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
2630 | |||
2631 | # | ||
2632 | # Native drivers | ||
2633 | # | ||
2634 | CONFIG_SENSORS_ABITUGURU=m | ||
2635 | CONFIG_SENSORS_ABITUGURU3=m | ||
2636 | CONFIG_SENSORS_AD7414=m | ||
2637 | CONFIG_SENSORS_AD7418=m | ||
2638 | CONFIG_SENSORS_ADCXX=m | ||
2639 | CONFIG_SENSORS_ADM1021=m | ||
2640 | CONFIG_SENSORS_ADM1025=m | ||
2641 | CONFIG_SENSORS_ADM1026=m | ||
2642 | CONFIG_SENSORS_ADM1029=m | ||
2643 | CONFIG_SENSORS_ADM1031=m | ||
2644 | CONFIG_SENSORS_ADM9240=m | ||
2645 | CONFIG_SENSORS_ADT7411=m | ||
2646 | CONFIG_SENSORS_ADT7462=m | ||
2647 | CONFIG_SENSORS_ADT7470=m | ||
2648 | CONFIG_SENSORS_ADT7475=m | ||
2649 | CONFIG_SENSORS_ASC7621=m | ||
2650 | CONFIG_SENSORS_K8TEMP=m | ||
2651 | CONFIG_SENSORS_K10TEMP=m | ||
2652 | CONFIG_SENSORS_ASB100=m | ||
2653 | CONFIG_SENSORS_ATXP1=m | ||
2654 | CONFIG_SENSORS_DS1621=m | ||
2655 | CONFIG_SENSORS_I5K_AMB=m | ||
2656 | CONFIG_SENSORS_F71805F=m | ||
2657 | CONFIG_SENSORS_F71882FG=m | ||
2658 | CONFIG_SENSORS_F75375S=m | ||
2659 | CONFIG_SENSORS_FSCHMD=m | ||
2660 | CONFIG_SENSORS_G760A=m | ||
2661 | CONFIG_SENSORS_GL518SM=m | ||
2662 | CONFIG_SENSORS_GL520SM=m | ||
2663 | CONFIG_SENSORS_CORETEMP=m | ||
2664 | CONFIG_SENSORS_IBMAEM=m | ||
2665 | CONFIG_SENSORS_IBMPEX=m | ||
2666 | CONFIG_SENSORS_IT87=m | ||
2667 | CONFIG_SENSORS_LM63=m | ||
2668 | CONFIG_SENSORS_LM70=m | ||
2669 | CONFIG_SENSORS_LM73=m | ||
2670 | CONFIG_SENSORS_LM75=m | ||
2671 | CONFIG_SENSORS_LM77=m | ||
2672 | CONFIG_SENSORS_LM78=m | ||
2673 | CONFIG_SENSORS_LM80=m | ||
2674 | CONFIG_SENSORS_LM83=m | ||
2675 | CONFIG_SENSORS_LM85=m | ||
2676 | CONFIG_SENSORS_LM87=m | ||
2677 | CONFIG_SENSORS_LM90=m | ||
2678 | CONFIG_SENSORS_LM92=m | ||
2679 | CONFIG_SENSORS_LM93=m | ||
2680 | CONFIG_SENSORS_LTC4215=m | ||
2681 | CONFIG_SENSORS_LTC4245=m | ||
2682 | CONFIG_SENSORS_LM95241=m | ||
2683 | CONFIG_SENSORS_MAX1111=m | ||
2684 | CONFIG_SENSORS_MAX1619=m | ||
2685 | CONFIG_SENSORS_MAX6650=m | ||
2686 | CONFIG_SENSORS_PC87360=m | ||
2687 | CONFIG_SENSORS_PC87427=m | ||
2688 | CONFIG_SENSORS_PCF8591=m | ||
2689 | CONFIG_SENSORS_SHT15=m | ||
2690 | CONFIG_SENSORS_SIS5595=m | ||
2691 | CONFIG_SENSORS_DME1737=m | ||
2692 | CONFIG_SENSORS_SMSC47M1=m | ||
2693 | CONFIG_SENSORS_SMSC47M192=m | ||
2694 | CONFIG_SENSORS_SMSC47B397=m | ||
2695 | CONFIG_SENSORS_ADS7828=m | ||
2696 | CONFIG_SENSORS_AMC6821=m | ||
2697 | CONFIG_SENSORS_THMC50=m | ||
2698 | CONFIG_SENSORS_TMP401=m | ||
2699 | CONFIG_SENSORS_TMP421=m | ||
2700 | CONFIG_SENSORS_VIA_CPUTEMP=m | ||
2701 | CONFIG_SENSORS_VIA686A=m | ||
2702 | CONFIG_SENSORS_VT1211=m | ||
2703 | CONFIG_SENSORS_VT8231=m | ||
2704 | CONFIG_SENSORS_W83781D=m | ||
2705 | CONFIG_SENSORS_W83791D=m | ||
2706 | CONFIG_SENSORS_W83792D=m | ||
2707 | CONFIG_SENSORS_W83793=m | ||
2708 | CONFIG_SENSORS_W83L785TS=m | ||
2709 | CONFIG_SENSORS_W83L786NG=m | ||
2710 | CONFIG_SENSORS_W83627HF=m | ||
2711 | CONFIG_SENSORS_W83627EHF=m | ||
2712 | CONFIG_SENSORS_HDAPS=m | ||
2713 | CONFIG_SENSORS_LIS3_I2C=m | ||
2714 | CONFIG_SENSORS_APPLESMC=m | ||
2715 | |||
2716 | # | ||
2717 | # ACPI drivers | ||
2718 | # | ||
2719 | CONFIG_SENSORS_ATK0110=m | ||
2720 | CONFIG_SENSORS_LIS3LV02D=m | ||
2721 | CONFIG_THERMAL=y | ||
2722 | CONFIG_WATCHDOG=y | ||
2723 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
2724 | |||
2725 | # | ||
2726 | # Watchdog Device Drivers | ||
2727 | # | ||
2728 | CONFIG_SOFT_WATCHDOG=m | ||
2729 | CONFIG_ACQUIRE_WDT=m | ||
2730 | CONFIG_ADVANTECH_WDT=m | ||
2731 | CONFIG_ALIM1535_WDT=m | ||
2732 | CONFIG_ALIM7101_WDT=m | ||
2733 | CONFIG_GEODE_WDT=m | ||
2734 | CONFIG_SC520_WDT=m | ||
2735 | # CONFIG_SBC_FITPC2_WATCHDOG is not set | ||
2736 | CONFIG_EUROTECH_WDT=m | ||
2737 | CONFIG_IB700_WDT=m | ||
2738 | CONFIG_IBMASR=m | ||
2739 | CONFIG_WAFER_WDT=m | ||
2740 | CONFIG_I6300ESB_WDT=m | ||
2741 | CONFIG_ITCO_WDT=m | ||
2742 | CONFIG_ITCO_VENDOR_SUPPORT=y | ||
2743 | CONFIG_IT8712F_WDT=m | ||
2744 | CONFIG_IT87_WDT=m | ||
2745 | # CONFIG_HP_WATCHDOG is not set | ||
2746 | CONFIG_SC1200_WDT=m | ||
2747 | CONFIG_SCx200_WDT=m | ||
2748 | CONFIG_PC87413_WDT=m | ||
2749 | CONFIG_60XX_WDT=m | ||
2750 | CONFIG_SBC8360_WDT=m | ||
2751 | CONFIG_SBC7240_WDT=m | ||
2752 | CONFIG_CPU5_WDT=m | ||
2753 | CONFIG_SMSC_SCH311X_WDT=m | ||
2754 | CONFIG_SMSC37B787_WDT=m | ||
2755 | CONFIG_W83627HF_WDT=m | ||
2756 | CONFIG_W83697HF_WDT=m | ||
2757 | CONFIG_W83697UG_WDT=m | ||
2758 | CONFIG_W83877F_WDT=m | ||
2759 | CONFIG_W83977F_WDT=m | ||
2760 | CONFIG_MACHZ_WDT=m | ||
2761 | CONFIG_SBC_EPX_C3_WATCHDOG=m | ||
2762 | |||
2763 | # | ||
2764 | # ISA-based Watchdog Cards | ||
2765 | # | ||
2766 | CONFIG_PCWATCHDOG=m | ||
2767 | CONFIG_MIXCOMWD=m | ||
2768 | CONFIG_WDT=m | ||
2769 | |||
2770 | # | ||
2771 | # PCI-based Watchdog Cards | ||
2772 | # | ||
2773 | CONFIG_PCIPCWATCHDOG=m | ||
2774 | CONFIG_WDTPCI=m | ||
2775 | |||
2776 | # | ||
2777 | # USB-based Watchdog Cards | ||
2778 | # | ||
2779 | CONFIG_USBPCWATCHDOG=m | ||
2780 | CONFIG_SSB_POSSIBLE=y | ||
2781 | |||
2782 | # | ||
2783 | # Sonics Silicon Backplane | ||
2784 | # | ||
2785 | CONFIG_SSB=m | ||
2786 | CONFIG_SSB_SPROM=y | ||
2787 | CONFIG_SSB_BLOCKIO=y | ||
2788 | CONFIG_SSB_PCIHOST_POSSIBLE=y | ||
2789 | CONFIG_SSB_PCIHOST=y | ||
2790 | CONFIG_SSB_B43_PCI_BRIDGE=y | ||
2791 | CONFIG_SSB_PCMCIAHOST_POSSIBLE=y | ||
2792 | CONFIG_SSB_PCMCIAHOST=y | ||
2793 | CONFIG_SSB_SDIOHOST_POSSIBLE=y | ||
2794 | CONFIG_SSB_SDIOHOST=y | ||
2795 | # CONFIG_SSB_SILENT is not set | ||
2796 | # CONFIG_SSB_DEBUG is not set | ||
2797 | CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y | ||
2798 | CONFIG_SSB_DRIVER_PCICORE=y | ||
2799 | |||
2800 | # | ||
2801 | # Multifunction device drivers | ||
2802 | # | ||
2803 | CONFIG_MFD_CORE=m | ||
2804 | CONFIG_MFD_SM501=m | ||
2805 | # CONFIG_MFD_SM501_GPIO is not set | ||
2806 | CONFIG_HTC_PASIC3=m | ||
2807 | CONFIG_UCB1400_CORE=m | ||
2808 | CONFIG_TPS65010=m | ||
2809 | # CONFIG_MFD_TMIO is not set | ||
2810 | CONFIG_MFD_WM8400=m | ||
2811 | CONFIG_MFD_WM8994=m | ||
2812 | CONFIG_MFD_PCF50633=m | ||
2813 | # CONFIG_MFD_MC13783 is not set | ||
2814 | CONFIG_PCF50633_ADC=m | ||
2815 | CONFIG_PCF50633_GPIO=m | ||
2816 | # CONFIG_EZX_PCAP is not set | ||
2817 | CONFIG_AB4500_CORE=m | ||
2818 | CONFIG_MFD_TIMBERDALE=m | ||
2819 | CONFIG_LPC_SCH=m | ||
2820 | CONFIG_REGULATOR=y | ||
2821 | # CONFIG_REGULATOR_DEBUG is not set | ||
2822 | # CONFIG_REGULATOR_DUMMY is not set | ||
2823 | # CONFIG_REGULATOR_FIXED_VOLTAGE is not set | ||
2824 | CONFIG_REGULATOR_VIRTUAL_CONSUMER=m | ||
2825 | CONFIG_REGULATOR_USERSPACE_CONSUMER=m | ||
2826 | CONFIG_REGULATOR_BQ24022=m | ||
2827 | CONFIG_REGULATOR_MAX1586=m | ||
2828 | CONFIG_REGULATOR_MAX8649=m | ||
2829 | CONFIG_REGULATOR_MAX8660=m | ||
2830 | CONFIG_REGULATOR_WM8400=m | ||
2831 | CONFIG_REGULATOR_WM8994=m | ||
2832 | CONFIG_REGULATOR_PCF50633=m | ||
2833 | CONFIG_REGULATOR_LP3971=m | ||
2834 | # CONFIG_REGULATOR_TPS65023 is not set | ||
2835 | # CONFIG_REGULATOR_TPS6507X is not set | ||
2836 | CONFIG_MEDIA_SUPPORT=m | ||
2837 | |||
2838 | # | ||
2839 | # Multimedia core support | ||
2840 | # | ||
2841 | CONFIG_VIDEO_DEV=m | ||
2842 | CONFIG_VIDEO_V4L2_COMMON=m | ||
2843 | # CONFIG_VIDEO_ALLOW_V4L1 is not set | ||
2844 | CONFIG_VIDEO_V4L1_COMPAT=y | ||
2845 | CONFIG_DVB_CORE=m | ||
2846 | CONFIG_VIDEO_MEDIA=m | ||
2847 | |||
2848 | # | ||
2849 | # Multimedia drivers | ||
2850 | # | ||
2851 | CONFIG_VIDEO_SAA7146=m | ||
2852 | CONFIG_VIDEO_SAA7146_VV=m | ||
2853 | CONFIG_IR_CORE=m | ||
2854 | CONFIG_VIDEO_IR=m | ||
2855 | # CONFIG_MEDIA_ATTACH is not set | ||
2856 | CONFIG_MEDIA_TUNER=m | ||
2857 | # CONFIG_MEDIA_TUNER_CUSTOMISE is not set | ||
2858 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
2859 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
2860 | CONFIG_MEDIA_TUNER_TDA827X=m | ||
2861 | CONFIG_MEDIA_TUNER_TDA18271=m | ||
2862 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
2863 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
2864 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
2865 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
2866 | CONFIG_MEDIA_TUNER_MT2060=m | ||
2867 | CONFIG_MEDIA_TUNER_MT2266=m | ||
2868 | CONFIG_MEDIA_TUNER_MT2131=m | ||
2869 | CONFIG_MEDIA_TUNER_QT1010=m | ||
2870 | CONFIG_MEDIA_TUNER_XC2028=m | ||
2871 | CONFIG_MEDIA_TUNER_XC5000=m | ||
2872 | CONFIG_MEDIA_TUNER_MXL5005S=m | ||
2873 | CONFIG_MEDIA_TUNER_MXL5007T=m | ||
2874 | CONFIG_MEDIA_TUNER_MC44S803=m | ||
2875 | CONFIG_MEDIA_TUNER_MAX2165=m | ||
2876 | CONFIG_VIDEO_V4L2=m | ||
2877 | CONFIG_VIDEOBUF_GEN=m | ||
2878 | CONFIG_VIDEOBUF_DMA_SG=m | ||
2879 | CONFIG_VIDEOBUF_VMALLOC=m | ||
2880 | CONFIG_VIDEOBUF_DVB=m | ||
2881 | CONFIG_VIDEO_BTCX=m | ||
2882 | CONFIG_VIDEO_TVEEPROM=m | ||
2883 | CONFIG_VIDEO_TUNER=m | ||
2884 | CONFIG_VIDEO_CAPTURE_DRIVERS=y | ||
2885 | # CONFIG_VIDEO_ADV_DEBUG is not set | ||
2886 | # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set | ||
2887 | # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set | ||
2888 | CONFIG_VIDEO_IR_I2C=m | ||
2889 | |||
2890 | # | ||
2891 | # Encoders/decoders and other helper chips | ||
2892 | # | ||
2893 | |||
2894 | # | ||
2895 | # Audio decoders | ||
2896 | # | ||
2897 | CONFIG_VIDEO_TVAUDIO=m | ||
2898 | CONFIG_VIDEO_TDA7432=m | ||
2899 | CONFIG_VIDEO_TDA9840=m | ||
2900 | CONFIG_VIDEO_TDA9875=m | ||
2901 | CONFIG_VIDEO_TEA6415C=m | ||
2902 | CONFIG_VIDEO_TEA6420=m | ||
2903 | CONFIG_VIDEO_MSP3400=m | ||
2904 | CONFIG_VIDEO_CS5345=m | ||
2905 | CONFIG_VIDEO_CS53L32A=m | ||
2906 | CONFIG_VIDEO_M52790=m | ||
2907 | CONFIG_VIDEO_TLV320AIC23B=m | ||
2908 | CONFIG_VIDEO_WM8775=m | ||
2909 | CONFIG_VIDEO_WM8739=m | ||
2910 | CONFIG_VIDEO_VP27SMPX=m | ||
2911 | |||
2912 | # | ||
2913 | # RDS decoders | ||
2914 | # | ||
2915 | CONFIG_VIDEO_SAA6588=m | ||
2916 | |||
2917 | # | ||
2918 | # Video decoders | ||
2919 | # | ||
2920 | # CONFIG_VIDEO_ADV7180 is not set | ||
2921 | CONFIG_VIDEO_BT819=m | ||
2922 | CONFIG_VIDEO_BT856=m | ||
2923 | CONFIG_VIDEO_BT866=m | ||
2924 | CONFIG_VIDEO_KS0127=m | ||
2925 | CONFIG_VIDEO_OV7670=m | ||
2926 | CONFIG_VIDEO_MT9V011=m | ||
2927 | CONFIG_VIDEO_TCM825X=m | ||
2928 | CONFIG_VIDEO_SAA7110=m | ||
2929 | CONFIG_VIDEO_SAA711X=m | ||
2930 | CONFIG_VIDEO_SAA717X=m | ||
2931 | CONFIG_VIDEO_SAA7191=m | ||
2932 | CONFIG_VIDEO_TVP514X=m | ||
2933 | CONFIG_VIDEO_TVP5150=m | ||
2934 | CONFIG_VIDEO_TVP7002=m | ||
2935 | CONFIG_VIDEO_VPX3220=m | ||
2936 | |||
2937 | # | ||
2938 | # Video and audio decoders | ||
2939 | # | ||
2940 | CONFIG_VIDEO_CX25840=m | ||
2941 | |||
2942 | # | ||
2943 | # MPEG video encoders | ||
2944 | # | ||
2945 | CONFIG_VIDEO_CX2341X=m | ||
2946 | |||
2947 | # | ||
2948 | # Video encoders | ||
2949 | # | ||
2950 | CONFIG_VIDEO_SAA7127=m | ||
2951 | CONFIG_VIDEO_SAA7185=m | ||
2952 | CONFIG_VIDEO_ADV7170=m | ||
2953 | CONFIG_VIDEO_ADV7175=m | ||
2954 | CONFIG_VIDEO_THS7303=m | ||
2955 | CONFIG_VIDEO_ADV7343=m | ||
2956 | |||
2957 | # | ||
2958 | # Video improvement chips | ||
2959 | # | ||
2960 | CONFIG_VIDEO_UPD64031A=m | ||
2961 | CONFIG_VIDEO_UPD64083=m | ||
2962 | CONFIG_VIDEO_VIVI=m | ||
2963 | CONFIG_VIDEO_BT848=m | ||
2964 | CONFIG_VIDEO_BT848_DVB=y | ||
2965 | CONFIG_VIDEO_PMS=m | ||
2966 | CONFIG_VIDEO_SAA5246A=m | ||
2967 | CONFIG_VIDEO_SAA5249=m | ||
2968 | CONFIG_VIDEO_ZORAN=m | ||
2969 | CONFIG_VIDEO_ZORAN_DC30=m | ||
2970 | CONFIG_VIDEO_ZORAN_ZR36060=m | ||
2971 | CONFIG_VIDEO_ZORAN_BUZ=m | ||
2972 | CONFIG_VIDEO_ZORAN_DC10=m | ||
2973 | CONFIG_VIDEO_ZORAN_LML33=m | ||
2974 | CONFIG_VIDEO_ZORAN_LML33R10=m | ||
2975 | CONFIG_VIDEO_ZORAN_AVS6EYES=m | ||
2976 | CONFIG_VIDEO_SAA7134=m | ||
2977 | CONFIG_VIDEO_SAA7134_ALSA=m | ||
2978 | CONFIG_VIDEO_SAA7134_DVB=m | ||
2979 | CONFIG_VIDEO_MXB=m | ||
2980 | CONFIG_VIDEO_HEXIUM_ORION=m | ||
2981 | CONFIG_VIDEO_HEXIUM_GEMINI=m | ||
2982 | CONFIG_VIDEO_CX88=m | ||
2983 | CONFIG_VIDEO_CX88_ALSA=m | ||
2984 | CONFIG_VIDEO_CX88_BLACKBIRD=m | ||
2985 | CONFIG_VIDEO_CX88_DVB=m | ||
2986 | CONFIG_VIDEO_CX88_MPEG=m | ||
2987 | CONFIG_VIDEO_CX88_VP3054=m | ||
2988 | CONFIG_VIDEO_CX23885=m | ||
2989 | CONFIG_VIDEO_AU0828=m | ||
2990 | CONFIG_VIDEO_IVTV=m | ||
2991 | CONFIG_VIDEO_FB_IVTV=m | ||
2992 | CONFIG_VIDEO_CX18=m | ||
2993 | CONFIG_VIDEO_CX18_ALSA=m | ||
2994 | CONFIG_VIDEO_SAA7164=m | ||
2995 | CONFIG_VIDEO_CAFE_CCIC=m | ||
2996 | CONFIG_SOC_CAMERA=m | ||
2997 | CONFIG_SOC_CAMERA_MT9M001=m | ||
2998 | CONFIG_SOC_CAMERA_MT9M111=m | ||
2999 | CONFIG_SOC_CAMERA_MT9T031=m | ||
3000 | CONFIG_SOC_CAMERA_MT9T112=m | ||
3001 | CONFIG_SOC_CAMERA_MT9V022=m | ||
3002 | CONFIG_SOC_CAMERA_RJ54N1=m | ||
3003 | CONFIG_SOC_CAMERA_TW9910=m | ||
3004 | CONFIG_SOC_CAMERA_PLATFORM=m | ||
3005 | CONFIG_SOC_CAMERA_OV772X=m | ||
3006 | CONFIG_SOC_CAMERA_OV9640=m | ||
3007 | CONFIG_V4L_USB_DRIVERS=y | ||
3008 | CONFIG_USB_VIDEO_CLASS=m | ||
3009 | CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y | ||
3010 | CONFIG_USB_GSPCA=m | ||
3011 | CONFIG_USB_M5602=m | ||
3012 | CONFIG_USB_STV06XX=m | ||
3013 | CONFIG_USB_GL860=m | ||
3014 | CONFIG_USB_GSPCA_BENQ=m | ||
3015 | CONFIG_USB_GSPCA_CONEX=m | ||
3016 | CONFIG_USB_GSPCA_CPIA1=m | ||
3017 | CONFIG_USB_GSPCA_ETOMS=m | ||
3018 | CONFIG_USB_GSPCA_FINEPIX=m | ||
3019 | CONFIG_USB_GSPCA_JEILINJ=m | ||
3020 | CONFIG_USB_GSPCA_MARS=m | ||
3021 | CONFIG_USB_GSPCA_MR97310A=m | ||
3022 | CONFIG_USB_GSPCA_OV519=m | ||
3023 | CONFIG_USB_GSPCA_OV534=m | ||
3024 | CONFIG_USB_GSPCA_OV534_9=m | ||
3025 | CONFIG_USB_GSPCA_PAC207=m | ||
3026 | CONFIG_USB_GSPCA_PAC7302=m | ||
3027 | CONFIG_USB_GSPCA_PAC7311=m | ||
3028 | CONFIG_USB_GSPCA_SN9C2028=m | ||
3029 | CONFIG_USB_GSPCA_SN9C20X=m | ||
3030 | CONFIG_USB_GSPCA_SN9C20X_EVDEV=y | ||
3031 | CONFIG_USB_GSPCA_SONIXB=m | ||
3032 | CONFIG_USB_GSPCA_SONIXJ=m | ||
3033 | CONFIG_USB_GSPCA_SPCA500=m | ||
3034 | CONFIG_USB_GSPCA_SPCA501=m | ||
3035 | CONFIG_USB_GSPCA_SPCA505=m | ||
3036 | CONFIG_USB_GSPCA_SPCA506=m | ||
3037 | CONFIG_USB_GSPCA_SPCA508=m | ||
3038 | CONFIG_USB_GSPCA_SPCA561=m | ||
3039 | CONFIG_USB_GSPCA_SQ905=m | ||
3040 | CONFIG_USB_GSPCA_SQ905C=m | ||
3041 | CONFIG_USB_GSPCA_STK014=m | ||
3042 | CONFIG_USB_GSPCA_STV0680=m | ||
3043 | CONFIG_USB_GSPCA_SUNPLUS=m | ||
3044 | CONFIG_USB_GSPCA_T613=m | ||
3045 | CONFIG_USB_GSPCA_TV8532=m | ||
3046 | CONFIG_USB_GSPCA_VC032X=m | ||
3047 | CONFIG_USB_GSPCA_ZC3XX=m | ||
3048 | CONFIG_VIDEO_PVRUSB2=m | ||
3049 | CONFIG_VIDEO_PVRUSB2_SYSFS=y | ||
3050 | CONFIG_VIDEO_PVRUSB2_DVB=y | ||
3051 | # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set | ||
3052 | CONFIG_VIDEO_HDPVR=m | ||
3053 | CONFIG_VIDEO_EM28XX=m | ||
3054 | CONFIG_VIDEO_EM28XX_ALSA=m | ||
3055 | CONFIG_VIDEO_EM28XX_DVB=m | ||
3056 | CONFIG_VIDEO_TLG2300=m | ||
3057 | CONFIG_VIDEO_CX231XX=m | ||
3058 | CONFIG_VIDEO_CX231XX_ALSA=m | ||
3059 | CONFIG_VIDEO_CX231XX_DVB=m | ||
3060 | CONFIG_VIDEO_USBVISION=m | ||
3061 | CONFIG_USB_ET61X251=m | ||
3062 | CONFIG_USB_SN9C102=m | ||
3063 | CONFIG_USB_ZC0301=m | ||
3064 | CONFIG_USB_PWC_INPUT_EVDEV=y | ||
3065 | CONFIG_USB_ZR364XX=m | ||
3066 | CONFIG_USB_STKWEBCAM=m | ||
3067 | CONFIG_USB_S2255=m | ||
3068 | CONFIG_RADIO_ADAPTERS=y | ||
3069 | CONFIG_RADIO_CADET=m | ||
3070 | CONFIG_RADIO_RTRACK=m | ||
3071 | CONFIG_RADIO_RTRACK2=m | ||
3072 | CONFIG_RADIO_AZTECH=m | ||
3073 | CONFIG_RADIO_GEMTEK=m | ||
3074 | CONFIG_RADIO_GEMTEK_PCI=m | ||
3075 | CONFIG_RADIO_MAXIRADIO=m | ||
3076 | CONFIG_RADIO_MAESTRO=m | ||
3077 | CONFIG_RADIO_MIROPCM20=m | ||
3078 | CONFIG_RADIO_SF16FMI=m | ||
3079 | CONFIG_RADIO_SF16FMR2=m | ||
3080 | CONFIG_RADIO_TERRATEC=m | ||
3081 | CONFIG_RADIO_TRUST=m | ||
3082 | CONFIG_RADIO_TYPHOON=m | ||
3083 | CONFIG_RADIO_ZOLTRIX=m | ||
3084 | # CONFIG_I2C_SI4713 is not set | ||
3085 | # CONFIG_RADIO_SI4713 is not set | ||
3086 | CONFIG_USB_DSBR=m | ||
3087 | # CONFIG_RADIO_SI470X is not set | ||
3088 | CONFIG_USB_MR800=m | ||
3089 | CONFIG_RADIO_TEA5764=m | ||
3090 | CONFIG_RADIO_SAA7706H=m | ||
3091 | CONFIG_RADIO_TEF6862=m | ||
3092 | CONFIG_RADIO_TIMBERDALE=m | ||
3093 | CONFIG_DVB_MAX_ADAPTERS=8 | ||
3094 | # CONFIG_DVB_DYNAMIC_MINORS is not set | ||
3095 | CONFIG_DVB_CAPTURE_DRIVERS=y | ||
3096 | |||
3097 | # | ||
3098 | # Supported SAA7146 based PCI Adapters | ||
3099 | # | ||
3100 | CONFIG_TTPCI_EEPROM=m | ||
3101 | CONFIG_DVB_AV7110=m | ||
3102 | CONFIG_DVB_AV7110_OSD=y | ||
3103 | CONFIG_DVB_BUDGET_CORE=m | ||
3104 | CONFIG_DVB_BUDGET=m | ||
3105 | CONFIG_DVB_BUDGET_CI=m | ||
3106 | CONFIG_DVB_BUDGET_AV=m | ||
3107 | CONFIG_DVB_BUDGET_PATCH=m | ||
3108 | |||
3109 | # | ||
3110 | # Supported USB Adapters | ||
3111 | # | ||
3112 | CONFIG_DVB_USB=m | ||
3113 | # CONFIG_DVB_USB_DEBUG is not set | ||
3114 | CONFIG_DVB_USB_A800=m | ||
3115 | CONFIG_DVB_USB_DIBUSB_MB=m | ||
3116 | # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set | ||
3117 | CONFIG_DVB_USB_DIBUSB_MC=m | ||
3118 | CONFIG_DVB_USB_DIB0700=m | ||
3119 | CONFIG_DVB_USB_UMT_010=m | ||
3120 | CONFIG_DVB_USB_CXUSB=m | ||
3121 | CONFIG_DVB_USB_M920X=m | ||
3122 | CONFIG_DVB_USB_GL861=m | ||
3123 | CONFIG_DVB_USB_AU6610=m | ||
3124 | CONFIG_DVB_USB_DIGITV=m | ||
3125 | CONFIG_DVB_USB_VP7045=m | ||
3126 | CONFIG_DVB_USB_VP702X=m | ||
3127 | CONFIG_DVB_USB_GP8PSK=m | ||
3128 | CONFIG_DVB_USB_NOVA_T_USB2=m | ||
3129 | CONFIG_DVB_USB_TTUSB2=m | ||
3130 | CONFIG_DVB_USB_DTT200U=m | ||
3131 | CONFIG_DVB_USB_OPERA1=m | ||
3132 | CONFIG_DVB_USB_AF9005=m | ||
3133 | CONFIG_DVB_USB_AF9005_REMOTE=m | ||
3134 | CONFIG_DVB_USB_DW2102=m | ||
3135 | CONFIG_DVB_USB_CINERGY_T2=m | ||
3136 | CONFIG_DVB_USB_ANYSEE=m | ||
3137 | CONFIG_DVB_USB_DTV5100=m | ||
3138 | CONFIG_DVB_USB_AF9015=m | ||
3139 | CONFIG_DVB_USB_CE6230=m | ||
3140 | # CONFIG_DVB_USB_FRIIO is not set | ||
3141 | CONFIG_DVB_USB_EC168=m | ||
3142 | CONFIG_DVB_USB_AZ6027=m | ||
3143 | CONFIG_DVB_TTUSB_BUDGET=m | ||
3144 | CONFIG_DVB_TTUSB_DEC=m | ||
3145 | CONFIG_SMS_SIANO_MDTV=m | ||
3146 | |||
3147 | # | ||
3148 | # Siano module components | ||
3149 | # | ||
3150 | CONFIG_SMS_USB_DRV=m | ||
3151 | CONFIG_SMS_SDIO_DRV=m | ||
3152 | |||
3153 | # | ||
3154 | # Supported FlexCopII (B2C2) Adapters | ||
3155 | # | ||
3156 | CONFIG_DVB_B2C2_FLEXCOP=m | ||
3157 | CONFIG_DVB_B2C2_FLEXCOP_PCI=m | ||
3158 | CONFIG_DVB_B2C2_FLEXCOP_USB=m | ||
3159 | # CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set | ||
3160 | |||
3161 | # | ||
3162 | # Supported BT878 Adapters | ||
3163 | # | ||
3164 | CONFIG_DVB_BT8XX=m | ||
3165 | |||
3166 | # | ||
3167 | # Supported Pluto2 Adapters | ||
3168 | # | ||
3169 | CONFIG_DVB_PLUTO2=m | ||
3170 | |||
3171 | # | ||
3172 | # Supported SDMC DM1105 Adapters | ||
3173 | # | ||
3174 | CONFIG_DVB_DM1105=m | ||
3175 | |||
3176 | # | ||
3177 | # Supported FireWire (IEEE 1394) Adapters | ||
3178 | # | ||
3179 | CONFIG_DVB_FIREDTV=m | ||
3180 | CONFIG_DVB_FIREDTV_FIREWIRE=y | ||
3181 | CONFIG_DVB_FIREDTV_IEEE1394=y | ||
3182 | CONFIG_DVB_FIREDTV_INPUT=y | ||
3183 | |||
3184 | # | ||
3185 | # Supported Earthsoft PT1 Adapters | ||
3186 | # | ||
3187 | # CONFIG_DVB_PT1 is not set | ||
3188 | |||
3189 | # | ||
3190 | # Supported Mantis Adapters | ||
3191 | # | ||
3192 | CONFIG_MANTIS_CORE=m | ||
3193 | CONFIG_DVB_MANTIS=m | ||
3194 | CONFIG_DVB_HOPPER=m | ||
3195 | |||
3196 | # | ||
3197 | # Supported nGene Adapters | ||
3198 | # | ||
3199 | CONFIG_DVB_NGENE=m | ||
3200 | |||
3201 | # | ||
3202 | # Supported DVB Frontends | ||
3203 | # | ||
3204 | # CONFIG_DVB_FE_CUSTOMISE is not set | ||
3205 | CONFIG_DVB_STB0899=m | ||
3206 | CONFIG_DVB_STB6100=m | ||
3207 | CONFIG_DVB_STV090x=m | ||
3208 | CONFIG_DVB_STV6110x=m | ||
3209 | CONFIG_DVB_CX24110=m | ||
3210 | CONFIG_DVB_CX24123=m | ||
3211 | CONFIG_DVB_MT312=m | ||
3212 | CONFIG_DVB_ZL10036=m | ||
3213 | CONFIG_DVB_ZL10039=m | ||
3214 | CONFIG_DVB_S5H1420=m | ||
3215 | CONFIG_DVB_STV0288=m | ||
3216 | CONFIG_DVB_STB6000=m | ||
3217 | CONFIG_DVB_STV0299=m | ||
3218 | CONFIG_DVB_STV6110=m | ||
3219 | CONFIG_DVB_STV0900=m | ||
3220 | CONFIG_DVB_TDA8083=m | ||
3221 | CONFIG_DVB_TDA10086=m | ||
3222 | CONFIG_DVB_TDA8261=m | ||
3223 | CONFIG_DVB_VES1X93=m | ||
3224 | CONFIG_DVB_TUNER_ITD1000=m | ||
3225 | CONFIG_DVB_TUNER_CX24113=m | ||
3226 | CONFIG_DVB_TDA826X=m | ||
3227 | CONFIG_DVB_TUA6100=m | ||
3228 | CONFIG_DVB_CX24116=m | ||
3229 | CONFIG_DVB_SI21XX=m | ||
3230 | CONFIG_DVB_DS3000=m | ||
3231 | CONFIG_DVB_MB86A16=m | ||
3232 | CONFIG_DVB_SP8870=m | ||
3233 | CONFIG_DVB_SP887X=m | ||
3234 | CONFIG_DVB_CX22700=m | ||
3235 | CONFIG_DVB_CX22702=m | ||
3236 | CONFIG_DVB_L64781=m | ||
3237 | CONFIG_DVB_TDA1004X=m | ||
3238 | CONFIG_DVB_NXT6000=m | ||
3239 | CONFIG_DVB_MT352=m | ||
3240 | CONFIG_DVB_ZL10353=m | ||
3241 | CONFIG_DVB_DIB3000MB=m | ||
3242 | CONFIG_DVB_DIB3000MC=m | ||
3243 | CONFIG_DVB_DIB7000M=m | ||
3244 | CONFIG_DVB_DIB7000P=m | ||
3245 | CONFIG_DVB_TDA10048=m | ||
3246 | CONFIG_DVB_AF9013=m | ||
3247 | CONFIG_DVB_EC100=m | ||
3248 | CONFIG_DVB_VES1820=m | ||
3249 | CONFIG_DVB_TDA10021=m | ||
3250 | CONFIG_DVB_TDA10023=m | ||
3251 | CONFIG_DVB_STV0297=m | ||
3252 | CONFIG_DVB_NXT200X=m | ||
3253 | CONFIG_DVB_OR51211=m | ||
3254 | CONFIG_DVB_OR51132=m | ||
3255 | CONFIG_DVB_BCM3510=m | ||
3256 | CONFIG_DVB_LGDT330X=m | ||
3257 | CONFIG_DVB_LGDT3305=m | ||
3258 | CONFIG_DVB_S5H1409=m | ||
3259 | CONFIG_DVB_AU8522=m | ||
3260 | CONFIG_DVB_S5H1411=m | ||
3261 | CONFIG_DVB_DIB8000=m | ||
3262 | CONFIG_DVB_PLL=m | ||
3263 | CONFIG_DVB_TUNER_DIB0070=m | ||
3264 | CONFIG_DVB_LNBP21=m | ||
3265 | CONFIG_DVB_ISL6405=m | ||
3266 | CONFIG_DVB_ISL6421=m | ||
3267 | CONFIG_DVB_LGS8GXX=m | ||
3268 | CONFIG_DVB_ATBM8830=m | ||
3269 | CONFIG_DAB=y | ||
3270 | CONFIG_USB_DABUSB=m | ||
3271 | |||
3272 | # | ||
3273 | # Graphics support | ||
3274 | # | ||
3275 | CONFIG_AGP=m | ||
3276 | CONFIG_AGP_ALI=m | ||
3277 | CONFIG_AGP_ATI=m | ||
3278 | CONFIG_AGP_AMD=m | ||
3279 | CONFIG_AGP_AMD64=m | ||
3280 | CONFIG_AGP_INTEL=m | ||
3281 | CONFIG_AGP_NVIDIA=m | ||
3282 | CONFIG_AGP_SIS=m | ||
3283 | CONFIG_AGP_SWORKS=m | ||
3284 | CONFIG_AGP_VIA=m | ||
3285 | CONFIG_AGP_EFFICEON=m | ||
3286 | # CONFIG_VGA_ARB is not set | ||
3287 | # CONFIG_VGA_SWITCHEROO is not set | ||
3288 | CONFIG_DRM=m | ||
3289 | CONFIG_DRM_KMS_HELPER=m | ||
3290 | CONFIG_DRM_TTM=m | ||
3291 | CONFIG_DRM_TDFX=m | ||
3292 | CONFIG_DRM_R128=m | ||
3293 | CONFIG_DRM_RADEON=m | ||
3294 | # CONFIG_DRM_RADEON_KMS is not set | ||
3295 | CONFIG_DRM_I810=m | ||
3296 | CONFIG_DRM_I830=m | ||
3297 | CONFIG_DRM_I915=m | ||
3298 | # CONFIG_DRM_I915_KMS is not set | ||
3299 | CONFIG_DRM_MGA=m | ||
3300 | CONFIG_DRM_SIS=m | ||
3301 | CONFIG_DRM_VIA=m | ||
3302 | CONFIG_DRM_SAVAGE=m | ||
3303 | CONFIG_VGASTATE=m | ||
3304 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
3305 | CONFIG_FB=m | ||
3306 | # CONFIG_FIRMWARE_EDID is not set | ||
3307 | CONFIG_FB_DDC=m | ||
3308 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
3309 | CONFIG_FB_CFB_FILLRECT=m | ||
3310 | CONFIG_FB_CFB_COPYAREA=m | ||
3311 | CONFIG_FB_CFB_IMAGEBLIT=m | ||
3312 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
3313 | CONFIG_FB_SYS_FILLRECT=m | ||
3314 | CONFIG_FB_SYS_COPYAREA=m | ||
3315 | CONFIG_FB_SYS_IMAGEBLIT=m | ||
3316 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
3317 | CONFIG_FB_SYS_FOPS=m | ||
3318 | CONFIG_FB_DEFERRED_IO=y | ||
3319 | CONFIG_FB_HECUBA=m | ||
3320 | CONFIG_FB_SVGALIB=m | ||
3321 | # CONFIG_FB_MACMODES is not set | ||
3322 | CONFIG_FB_BACKLIGHT=y | ||
3323 | CONFIG_FB_MODE_HELPERS=y | ||
3324 | CONFIG_FB_TILEBLITTING=y | ||
3325 | |||
3326 | # | ||
3327 | # Frame buffer hardware drivers | ||
3328 | # | ||
3329 | CONFIG_FB_CIRRUS=m | ||
3330 | CONFIG_FB_PM2=m | ||
3331 | CONFIG_FB_PM2_FIFO_DISCONNECT=y | ||
3332 | CONFIG_FB_CYBER2000=m | ||
3333 | CONFIG_FB_ARC=m | ||
3334 | CONFIG_FB_VGA16=m | ||
3335 | CONFIG_FB_UVESA=m | ||
3336 | CONFIG_FB_N411=m | ||
3337 | CONFIG_FB_HGA=m | ||
3338 | # CONFIG_FB_HGA_ACCEL is not set | ||
3339 | CONFIG_FB_S1D13XXX=m | ||
3340 | CONFIG_FB_NVIDIA=m | ||
3341 | CONFIG_FB_NVIDIA_I2C=y | ||
3342 | # CONFIG_FB_NVIDIA_DEBUG is not set | ||
3343 | CONFIG_FB_NVIDIA_BACKLIGHT=y | ||
3344 | CONFIG_FB_RIVA=m | ||
3345 | CONFIG_FB_RIVA_I2C=y | ||
3346 | # CONFIG_FB_RIVA_DEBUG is not set | ||
3347 | CONFIG_FB_RIVA_BACKLIGHT=y | ||
3348 | CONFIG_FB_I810=m | ||
3349 | CONFIG_FB_I810_GTF=y | ||
3350 | CONFIG_FB_I810_I2C=y | ||
3351 | CONFIG_FB_LE80578=m | ||
3352 | CONFIG_FB_CARILLO_RANCH=m | ||
3353 | CONFIG_FB_INTEL=m | ||
3354 | # CONFIG_FB_INTEL_DEBUG is not set | ||
3355 | CONFIG_FB_INTEL_I2C=y | ||
3356 | CONFIG_FB_MATROX=m | ||
3357 | CONFIG_FB_MATROX_MILLENIUM=y | ||
3358 | CONFIG_FB_MATROX_MYSTIQUE=y | ||
3359 | CONFIG_FB_MATROX_G=y | ||
3360 | CONFIG_FB_MATROX_I2C=m | ||
3361 | CONFIG_FB_MATROX_MAVEN=m | ||
3362 | CONFIG_FB_RADEON=m | ||
3363 | CONFIG_FB_RADEON_I2C=y | ||
3364 | CONFIG_FB_RADEON_BACKLIGHT=y | ||
3365 | # CONFIG_FB_RADEON_DEBUG is not set | ||
3366 | CONFIG_FB_ATY128=m | ||
3367 | CONFIG_FB_ATY128_BACKLIGHT=y | ||
3368 | CONFIG_FB_ATY=m | ||
3369 | CONFIG_FB_ATY_CT=y | ||
3370 | CONFIG_FB_ATY_GENERIC_LCD=y | ||
3371 | CONFIG_FB_ATY_GX=y | ||
3372 | CONFIG_FB_ATY_BACKLIGHT=y | ||
3373 | CONFIG_FB_S3=m | ||
3374 | CONFIG_FB_SAVAGE=m | ||
3375 | CONFIG_FB_SAVAGE_I2C=y | ||
3376 | CONFIG_FB_SAVAGE_ACCEL=y | ||
3377 | CONFIG_FB_SIS=m | ||
3378 | CONFIG_FB_SIS_300=y | ||
3379 | CONFIG_FB_SIS_315=y | ||
3380 | CONFIG_FB_VIA=m | ||
3381 | CONFIG_FB_NEOMAGIC=m | ||
3382 | CONFIG_FB_KYRO=m | ||
3383 | CONFIG_FB_3DFX=m | ||
3384 | CONFIG_FB_3DFX_ACCEL=y | ||
3385 | CONFIG_FB_3DFX_I2C=y | ||
3386 | CONFIG_FB_VOODOO1=m | ||
3387 | CONFIG_FB_VT8623=m | ||
3388 | CONFIG_FB_TRIDENT=m | ||
3389 | CONFIG_FB_ARK=m | ||
3390 | CONFIG_FB_PM3=m | ||
3391 | CONFIG_FB_CARMINE=m | ||
3392 | CONFIG_FB_CARMINE_DRAM_EVAL=y | ||
3393 | # CONFIG_CARMINE_DRAM_CUSTOM is not set | ||
3394 | CONFIG_FB_GEODE=y | ||
3395 | CONFIG_FB_GEODE_LX=m | ||
3396 | CONFIG_FB_GEODE_GX=m | ||
3397 | CONFIG_FB_GEODE_GX1=m | ||
3398 | CONFIG_FB_TMIO=m | ||
3399 | CONFIG_FB_TMIO_ACCELL=y | ||
3400 | CONFIG_FB_SM501=m | ||
3401 | # CONFIG_FB_VIRTUAL is not set | ||
3402 | CONFIG_XEN_FBDEV_FRONTEND=m | ||
3403 | CONFIG_FB_METRONOME=m | ||
3404 | CONFIG_FB_MB862XX=m | ||
3405 | # CONFIG_FB_MB862XX_PCI_GDC is not set | ||
3406 | CONFIG_FB_BROADSHEET=m | ||
3407 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
3408 | CONFIG_LCD_CLASS_DEVICE=m | ||
3409 | CONFIG_LCD_L4F00242T03=m | ||
3410 | CONFIG_LCD_LMS283GF05=m | ||
3411 | CONFIG_LCD_LTV350QV=m | ||
3412 | CONFIG_LCD_ILI9320=m | ||
3413 | CONFIG_LCD_TDO24M=m | ||
3414 | CONFIG_LCD_VGG2432A4=m | ||
3415 | CONFIG_LCD_PLATFORM=m | ||
3416 | CONFIG_BACKLIGHT_CLASS_DEVICE=m | ||
3417 | CONFIG_BACKLIGHT_GENERIC=m | ||
3418 | CONFIG_BACKLIGHT_PROGEAR=m | ||
3419 | CONFIG_BACKLIGHT_CARILLO_RANCH=m | ||
3420 | CONFIG_BACKLIGHT_MBP_NVIDIA=m | ||
3421 | CONFIG_BACKLIGHT_SAHARA=m | ||
3422 | |||
3423 | # | ||
3424 | # Display device support | ||
3425 | # | ||
3426 | CONFIG_DISPLAY_SUPPORT=m | ||
3427 | |||
3428 | # | ||
3429 | # Display hardware drivers | ||
3430 | # | ||
3431 | |||
3432 | # | ||
3433 | # Console display driver support | ||
3434 | # | ||
3435 | CONFIG_VGA_CONSOLE=y | ||
3436 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | ||
3437 | CONFIG_MDA_CONSOLE=m | ||
3438 | CONFIG_DUMMY_CONSOLE=y | ||
3439 | CONFIG_FRAMEBUFFER_CONSOLE=m | ||
3440 | CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y | ||
3441 | CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y | ||
3442 | # CONFIG_FONTS is not set | ||
3443 | CONFIG_FONT_8x8=y | ||
3444 | CONFIG_FONT_8x16=y | ||
3445 | # CONFIG_LOGO is not set | ||
3446 | CONFIG_SOUND=m | ||
3447 | CONFIG_SOUND_OSS_CORE=y | ||
3448 | CONFIG_SOUND_OSS_CORE_PRECLAIM=y | ||
3449 | CONFIG_SND=m | ||
3450 | CONFIG_SND_TIMER=m | ||
3451 | CONFIG_SND_PCM=m | ||
3452 | CONFIG_SND_HWDEP=m | ||
3453 | CONFIG_SND_RAWMIDI=m | ||
3454 | CONFIG_SND_JACK=y | ||
3455 | CONFIG_SND_SEQUENCER=m | ||
3456 | CONFIG_SND_SEQ_DUMMY=m | ||
3457 | CONFIG_SND_OSSEMUL=y | ||
3458 | CONFIG_SND_MIXER_OSS=m | ||
3459 | CONFIG_SND_PCM_OSS=m | ||
3460 | CONFIG_SND_PCM_OSS_PLUGINS=y | ||
3461 | CONFIG_SND_SEQUENCER_OSS=y | ||
3462 | CONFIG_SND_HRTIMER=m | ||
3463 | CONFIG_SND_SEQ_HRTIMER_DEFAULT=y | ||
3464 | CONFIG_SND_DYNAMIC_MINORS=y | ||
3465 | # CONFIG_SND_SUPPORT_OLD_API is not set | ||
3466 | # CONFIG_SND_VERBOSE_PROCFS is not set | ||
3467 | # CONFIG_SND_VERBOSE_PRINTK is not set | ||
3468 | # CONFIG_SND_DEBUG is not set | ||
3469 | CONFIG_SND_VMASTER=y | ||
3470 | CONFIG_SND_DMA_SGBUF=y | ||
3471 | CONFIG_SND_RAWMIDI_SEQ=m | ||
3472 | CONFIG_SND_OPL3_LIB_SEQ=m | ||
3473 | CONFIG_SND_OPL4_LIB_SEQ=m | ||
3474 | CONFIG_SND_SBAWE_SEQ=m | ||
3475 | CONFIG_SND_EMU10K1_SEQ=m | ||
3476 | CONFIG_SND_MPU401_UART=m | ||
3477 | CONFIG_SND_OPL3_LIB=m | ||
3478 | CONFIG_SND_OPL4_LIB=m | ||
3479 | CONFIG_SND_VX_LIB=m | ||
3480 | CONFIG_SND_AC97_CODEC=m | ||
3481 | CONFIG_SND_DRIVERS=y | ||
3482 | CONFIG_SND_PCSP=m | ||
3483 | CONFIG_SND_DUMMY=m | ||
3484 | CONFIG_SND_VIRMIDI=m | ||
3485 | CONFIG_SND_MTPAV=m | ||
3486 | CONFIG_SND_MTS64=m | ||
3487 | CONFIG_SND_SERIAL_U16550=m | ||
3488 | CONFIG_SND_MPU401=m | ||
3489 | CONFIG_SND_PORTMAN2X4=m | ||
3490 | CONFIG_SND_AC97_POWER_SAVE=y | ||
3491 | CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 | ||
3492 | CONFIG_SND_WSS_LIB=m | ||
3493 | CONFIG_SND_SB_COMMON=m | ||
3494 | CONFIG_SND_SB8_DSP=m | ||
3495 | CONFIG_SND_SB16_DSP=m | ||
3496 | CONFIG_SND_ISA=y | ||
3497 | CONFIG_SND_ADLIB=m | ||
3498 | CONFIG_SND_AD1816A=m | ||
3499 | CONFIG_SND_AD1848=m | ||
3500 | CONFIG_SND_ALS100=m | ||
3501 | CONFIG_SND_AZT2320=m | ||
3502 | CONFIG_SND_CMI8330=m | ||
3503 | CONFIG_SND_CS4231=m | ||
3504 | CONFIG_SND_CS4236=m | ||
3505 | CONFIG_SND_ES968=m | ||
3506 | CONFIG_SND_ES1688=m | ||
3507 | CONFIG_SND_ES18XX=m | ||
3508 | CONFIG_SND_SC6000=m | ||
3509 | CONFIG_SND_GUSCLASSIC=m | ||
3510 | CONFIG_SND_GUSEXTREME=m | ||
3511 | CONFIG_SND_GUSMAX=m | ||
3512 | CONFIG_SND_INTERWAVE=m | ||
3513 | CONFIG_SND_INTERWAVE_STB=m | ||
3514 | CONFIG_SND_JAZZ16=m | ||
3515 | CONFIG_SND_OPL3SA2=m | ||
3516 | CONFIG_SND_OPTI92X_AD1848=m | ||
3517 | CONFIG_SND_OPTI92X_CS4231=m | ||
3518 | CONFIG_SND_OPTI93X=m | ||
3519 | CONFIG_SND_MIRO=m | ||
3520 | CONFIG_SND_SB8=m | ||
3521 | CONFIG_SND_SB16=m | ||
3522 | CONFIG_SND_SBAWE=m | ||
3523 | CONFIG_SND_SB16_CSP=y | ||
3524 | CONFIG_SND_SGALAXY=m | ||
3525 | CONFIG_SND_SSCAPE=m | ||
3526 | CONFIG_SND_WAVEFRONT=m | ||
3527 | CONFIG_SND_MSND_PINNACLE=m | ||
3528 | CONFIG_SND_MSND_CLASSIC=m | ||
3529 | CONFIG_SND_PCI=y | ||
3530 | CONFIG_SND_AD1889=m | ||
3531 | CONFIG_SND_ALS300=m | ||
3532 | CONFIG_SND_ALS4000=m | ||
3533 | CONFIG_SND_ALI5451=m | ||
3534 | CONFIG_SND_ATIIXP=m | ||
3535 | CONFIG_SND_ATIIXP_MODEM=m | ||
3536 | CONFIG_SND_AU8810=m | ||
3537 | CONFIG_SND_AU8820=m | ||
3538 | CONFIG_SND_AU8830=m | ||
3539 | CONFIG_SND_AW2=m | ||
3540 | CONFIG_SND_AZT3328=m | ||
3541 | CONFIG_SND_BT87X=m | ||
3542 | # CONFIG_SND_BT87X_OVERCLOCK is not set | ||
3543 | CONFIG_SND_CA0106=m | ||
3544 | CONFIG_SND_CMIPCI=m | ||
3545 | CONFIG_SND_OXYGEN_LIB=m | ||
3546 | CONFIG_SND_OXYGEN=m | ||
3547 | CONFIG_SND_CS4281=m | ||
3548 | CONFIG_SND_CS46XX=m | ||
3549 | CONFIG_SND_CS46XX_NEW_DSP=y | ||
3550 | CONFIG_SND_CS5530=m | ||
3551 | CONFIG_SND_CS5535AUDIO=m | ||
3552 | CONFIG_SND_CTXFI=m | ||
3553 | CONFIG_SND_DARLA20=m | ||
3554 | CONFIG_SND_GINA20=m | ||
3555 | CONFIG_SND_LAYLA20=m | ||
3556 | CONFIG_SND_DARLA24=m | ||
3557 | CONFIG_SND_GINA24=m | ||
3558 | CONFIG_SND_LAYLA24=m | ||
3559 | CONFIG_SND_MONA=m | ||
3560 | CONFIG_SND_MIA=m | ||
3561 | CONFIG_SND_ECHO3G=m | ||
3562 | CONFIG_SND_INDIGO=m | ||
3563 | CONFIG_SND_INDIGOIO=m | ||
3564 | CONFIG_SND_INDIGODJ=m | ||
3565 | CONFIG_SND_INDIGOIOX=m | ||
3566 | CONFIG_SND_INDIGODJX=m | ||
3567 | CONFIG_SND_EMU10K1=m | ||
3568 | CONFIG_SND_EMU10K1X=m | ||
3569 | CONFIG_SND_ENS1370=m | ||
3570 | CONFIG_SND_ENS1371=m | ||
3571 | CONFIG_SND_ES1938=m | ||
3572 | CONFIG_SND_ES1968=m | ||
3573 | CONFIG_SND_FM801=m | ||
3574 | # CONFIG_SND_FM801_TEA575X_BOOL is not set | ||
3575 | CONFIG_SND_HDA_INTEL=m | ||
3576 | CONFIG_SND_HDA_HWDEP=y | ||
3577 | # CONFIG_SND_HDA_RECONFIG is not set | ||
3578 | CONFIG_SND_HDA_INPUT_BEEP=y | ||
3579 | CONFIG_SND_HDA_INPUT_BEEP_MODE=1 | ||
3580 | CONFIG_SND_HDA_INPUT_JACK=y | ||
3581 | # CONFIG_SND_HDA_PATCH_LOADER is not set | ||
3582 | CONFIG_SND_HDA_CODEC_REALTEK=y | ||
3583 | CONFIG_SND_HDA_CODEC_ANALOG=y | ||
3584 | CONFIG_SND_HDA_CODEC_SIGMATEL=y | ||
3585 | CONFIG_SND_HDA_CODEC_VIA=y | ||
3586 | CONFIG_SND_HDA_CODEC_ATIHDMI=y | ||
3587 | CONFIG_SND_HDA_CODEC_NVHDMI=y | ||
3588 | CONFIG_SND_HDA_CODEC_INTELHDMI=y | ||
3589 | CONFIG_SND_HDA_ELD=y | ||
3590 | CONFIG_SND_HDA_CODEC_CIRRUS=y | ||
3591 | CONFIG_SND_HDA_CODEC_CONEXANT=y | ||
3592 | CONFIG_SND_HDA_CODEC_CA0110=y | ||
3593 | CONFIG_SND_HDA_CODEC_CMEDIA=y | ||
3594 | CONFIG_SND_HDA_CODEC_SI3054=y | ||
3595 | CONFIG_SND_HDA_GENERIC=y | ||
3596 | # CONFIG_SND_HDA_POWER_SAVE is not set | ||
3597 | CONFIG_SND_HDSP=m | ||
3598 | CONFIG_SND_HDSPM=m | ||
3599 | CONFIG_SND_HIFIER=m | ||
3600 | CONFIG_SND_ICE1712=m | ||
3601 | CONFIG_SND_ICE1724=m | ||
3602 | CONFIG_SND_INTEL8X0=m | ||
3603 | CONFIG_SND_INTEL8X0M=m | ||
3604 | CONFIG_SND_KORG1212=m | ||
3605 | CONFIG_SND_LX6464ES=m | ||
3606 | CONFIG_SND_MAESTRO3=m | ||
3607 | CONFIG_SND_MIXART=m | ||
3608 | CONFIG_SND_NM256=m | ||
3609 | CONFIG_SND_PCXHR=m | ||
3610 | CONFIG_SND_RIPTIDE=m | ||
3611 | CONFIG_SND_RME32=m | ||
3612 | CONFIG_SND_RME96=m | ||
3613 | CONFIG_SND_RME9652=m | ||
3614 | CONFIG_SND_SIS7019=m | ||
3615 | CONFIG_SND_SONICVIBES=m | ||
3616 | CONFIG_SND_TRIDENT=m | ||
3617 | CONFIG_SND_VIA82XX=m | ||
3618 | CONFIG_SND_VIA82XX_MODEM=m | ||
3619 | CONFIG_SND_VIRTUOSO=m | ||
3620 | CONFIG_SND_VX222=m | ||
3621 | CONFIG_SND_YMFPCI=m | ||
3622 | CONFIG_SND_SPI=y | ||
3623 | CONFIG_SND_USB=y | ||
3624 | CONFIG_SND_USB_AUDIO=m | ||
3625 | CONFIG_SND_USB_UA101=m | ||
3626 | CONFIG_SND_USB_USX2Y=m | ||
3627 | CONFIG_SND_USB_CAIAQ=m | ||
3628 | # CONFIG_SND_USB_CAIAQ_INPUT is not set | ||
3629 | CONFIG_SND_USB_US122L=m | ||
3630 | CONFIG_SND_PCMCIA=y | ||
3631 | CONFIG_SND_VXPOCKET=m | ||
3632 | CONFIG_SND_PDAUDIOCF=m | ||
3633 | CONFIG_SND_SOC=m | ||
3634 | CONFIG_SND_SOC_I2C_AND_SPI=m | ||
3635 | CONFIG_SND_SOC_ALL_CODECS=m | ||
3636 | CONFIG_SND_SOC_WM_HUBS=m | ||
3637 | CONFIG_SND_SOC_AD1836=m | ||
3638 | CONFIG_SND_SOC_AD1938=m | ||
3639 | CONFIG_SND_SOC_AD73311=m | ||
3640 | CONFIG_SND_SOC_ADS117X=m | ||
3641 | CONFIG_SND_SOC_AK4104=m | ||
3642 | CONFIG_SND_SOC_AK4535=m | ||
3643 | CONFIG_SND_SOC_AK4642=m | ||
3644 | CONFIG_SND_SOC_AK4671=m | ||
3645 | CONFIG_SND_SOC_CS4270=m | ||
3646 | CONFIG_SND_SOC_DA7210=m | ||
3647 | CONFIG_SND_SOC_L3=m | ||
3648 | CONFIG_SND_SOC_PCM3008=m | ||
3649 | CONFIG_SND_SOC_SPDIF=m | ||
3650 | CONFIG_SND_SOC_SSM2602=m | ||
3651 | CONFIG_SND_SOC_TLV320AIC23=m | ||
3652 | CONFIG_SND_SOC_TLV320AIC26=m | ||
3653 | CONFIG_SND_SOC_TLV320AIC3X=m | ||
3654 | CONFIG_SND_SOC_TLV320DAC33=m | ||
3655 | CONFIG_SND_SOC_UDA134X=m | ||
3656 | CONFIG_SND_SOC_UDA1380=m | ||
3657 | CONFIG_SND_SOC_WM8400=m | ||
3658 | CONFIG_SND_SOC_WM8510=m | ||
3659 | CONFIG_SND_SOC_WM8523=m | ||
3660 | CONFIG_SND_SOC_WM8580=m | ||
3661 | CONFIG_SND_SOC_WM8711=m | ||
3662 | CONFIG_SND_SOC_WM8727=m | ||
3663 | CONFIG_SND_SOC_WM8728=m | ||
3664 | CONFIG_SND_SOC_WM8731=m | ||
3665 | CONFIG_SND_SOC_WM8750=m | ||
3666 | CONFIG_SND_SOC_WM8753=m | ||
3667 | CONFIG_SND_SOC_WM8776=m | ||
3668 | CONFIG_SND_SOC_WM8900=m | ||
3669 | CONFIG_SND_SOC_WM8903=m | ||
3670 | CONFIG_SND_SOC_WM8904=m | ||
3671 | CONFIG_SND_SOC_WM8940=m | ||
3672 | CONFIG_SND_SOC_WM8955=m | ||
3673 | CONFIG_SND_SOC_WM8960=m | ||
3674 | CONFIG_SND_SOC_WM8961=m | ||
3675 | CONFIG_SND_SOC_WM8971=m | ||
3676 | CONFIG_SND_SOC_WM8974=m | ||
3677 | CONFIG_SND_SOC_WM8978=m | ||
3678 | CONFIG_SND_SOC_WM8988=m | ||
3679 | CONFIG_SND_SOC_WM8990=m | ||
3680 | CONFIG_SND_SOC_WM8993=m | ||
3681 | CONFIG_SND_SOC_WM8994=m | ||
3682 | CONFIG_SND_SOC_WM9081=m | ||
3683 | CONFIG_SND_SOC_MAX9877=m | ||
3684 | CONFIG_SND_SOC_TPA6130A2=m | ||
3685 | CONFIG_SND_SOC_WM2000=m | ||
3686 | # CONFIG_SOUND_PRIME is not set | ||
3687 | CONFIG_AC97_BUS=m | ||
3688 | CONFIG_HID_SUPPORT=y | ||
3689 | CONFIG_HID=m | ||
3690 | CONFIG_HIDRAW=y | ||
3691 | |||
3692 | # | ||
3693 | # USB Input Devices | ||
3694 | # | ||
3695 | CONFIG_USB_HID=m | ||
3696 | # CONFIG_HID_PID is not set | ||
3697 | # CONFIG_USB_HIDDEV is not set | ||
3698 | |||
3699 | # | ||
3700 | # USB HID Boot Protocol drivers | ||
3701 | # | ||
3702 | CONFIG_USB_KBD=m | ||
3703 | CONFIG_USB_MOUSE=m | ||
3704 | |||
3705 | # | ||
3706 | # Special HID drivers | ||
3707 | # | ||
3708 | CONFIG_HID_3M_PCT=m | ||
3709 | # CONFIG_HID_A4TECH is not set | ||
3710 | # CONFIG_HID_APPLE is not set | ||
3711 | # CONFIG_HID_BELKIN is not set | ||
3712 | # CONFIG_HID_CHERRY is not set | ||
3713 | # CONFIG_HID_CHICONY is not set | ||
3714 | # CONFIG_HID_CYPRESS is not set | ||
3715 | # CONFIG_HID_DRAGONRISE is not set | ||
3716 | # CONFIG_HID_EZKEY is not set | ||
3717 | # CONFIG_HID_KYE is not set | ||
3718 | # CONFIG_HID_GYRATION is not set | ||
3719 | # CONFIG_HID_TWINHAN is not set | ||
3720 | # CONFIG_HID_KENSINGTON is not set | ||
3721 | # CONFIG_HID_LOGITECH is not set | ||
3722 | CONFIG_HID_MAGICMOUSE=m | ||
3723 | # CONFIG_HID_MICROSOFT is not set | ||
3724 | CONFIG_HID_MOSART=m | ||
3725 | # CONFIG_HID_MONTEREY is not set | ||
3726 | # CONFIG_HID_NTRIG is not set | ||
3727 | CONFIG_HID_ORTEK=m | ||
3728 | # CONFIG_HID_PANTHERLORD is not set | ||
3729 | # CONFIG_HID_PETALYNX is not set | ||
3730 | CONFIG_HID_QUANTA=m | ||
3731 | # CONFIG_HID_SAMSUNG is not set | ||
3732 | # CONFIG_HID_SONY is not set | ||
3733 | CONFIG_HID_STANTUM=m | ||
3734 | # CONFIG_HID_SUNPLUS is not set | ||
3735 | # CONFIG_HID_GREENASIA is not set | ||
3736 | # CONFIG_HID_SMARTJOYPLUS is not set | ||
3737 | # CONFIG_HID_TOPSEED is not set | ||
3738 | # CONFIG_HID_THRUSTMASTER is not set | ||
3739 | # CONFIG_HID_WACOM is not set | ||
3740 | # CONFIG_HID_ZEROPLUS is not set | ||
3741 | CONFIG_USB_SUPPORT=y | ||
3742 | CONFIG_USB_ARCH_HAS_HCD=y | ||
3743 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
3744 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
3745 | CONFIG_USB=m | ||
3746 | # CONFIG_USB_DEBUG is not set | ||
3747 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y | ||
3748 | |||
3749 | # | ||
3750 | # Miscellaneous USB options | ||
3751 | # | ||
3752 | CONFIG_USB_DEVICEFS=y | ||
3753 | CONFIG_USB_DEVICE_CLASS=y | ||
3754 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
3755 | # CONFIG_USB_OTG_WHITELIST is not set | ||
3756 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
3757 | CONFIG_USB_MON=m | ||
3758 | CONFIG_USB_WUSB=m | ||
3759 | CONFIG_USB_WUSB_CBAF=m | ||
3760 | # CONFIG_USB_WUSB_CBAF_DEBUG is not set | ||
3761 | |||
3762 | # | ||
3763 | # USB Host Controller Drivers | ||
3764 | # | ||
3765 | CONFIG_USB_C67X00_HCD=m | ||
3766 | CONFIG_USB_XHCI_HCD=m | ||
3767 | # CONFIG_USB_XHCI_HCD_DEBUGGING is not set | ||
3768 | CONFIG_USB_EHCI_HCD=m | ||
3769 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | ||
3770 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | ||
3771 | CONFIG_USB_OXU210HP_HCD=m | ||
3772 | CONFIG_USB_ISP116X_HCD=m | ||
3773 | CONFIG_USB_ISP1760_HCD=m | ||
3774 | CONFIG_USB_ISP1362_HCD=m | ||
3775 | CONFIG_USB_OHCI_HCD=m | ||
3776 | CONFIG_USB_OHCI_HCD_SSB=y | ||
3777 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
3778 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
3779 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
3780 | CONFIG_USB_UHCI_HCD=m | ||
3781 | CONFIG_USB_U132_HCD=m | ||
3782 | CONFIG_USB_SL811_HCD=m | ||
3783 | CONFIG_USB_SL811_CS=m | ||
3784 | CONFIG_USB_R8A66597_HCD=m | ||
3785 | CONFIG_USB_WHCI_HCD=m | ||
3786 | CONFIG_USB_HWA_HCD=m | ||
3787 | |||
3788 | # | ||
3789 | # Enable Host or Gadget support to see Inventra options | ||
3790 | # | ||
3791 | |||
3792 | # | ||
3793 | # USB Device Class drivers | ||
3794 | # | ||
3795 | CONFIG_USB_ACM=m | ||
3796 | CONFIG_USB_PRINTER=m | ||
3797 | CONFIG_USB_WDM=m | ||
3798 | CONFIG_USB_TMC=m | ||
3799 | |||
3800 | # | ||
3801 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may | ||
3802 | # | ||
3803 | |||
3804 | # | ||
3805 | # also be needed; see USB_STORAGE Help for more info | ||
3806 | # | ||
3807 | CONFIG_USB_STORAGE=m | ||
3808 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
3809 | CONFIG_USB_STORAGE_DATAFAB=m | ||
3810 | CONFIG_USB_STORAGE_FREECOM=m | ||
3811 | CONFIG_USB_STORAGE_ISD200=m | ||
3812 | CONFIG_USB_STORAGE_USBAT=m | ||
3813 | CONFIG_USB_STORAGE_SDDR09=m | ||
3814 | CONFIG_USB_STORAGE_SDDR55=m | ||
3815 | CONFIG_USB_STORAGE_JUMPSHOT=m | ||
3816 | CONFIG_USB_STORAGE_ALAUDA=m | ||
3817 | CONFIG_USB_STORAGE_ONETOUCH=m | ||
3818 | CONFIG_USB_STORAGE_KARMA=m | ||
3819 | CONFIG_USB_STORAGE_CYPRESS_ATACB=m | ||
3820 | CONFIG_USB_LIBUSUAL=y | ||
3821 | |||
3822 | # | ||
3823 | # USB Imaging devices | ||
3824 | # | ||
3825 | # CONFIG_USB_MDC800 is not set | ||
3826 | # CONFIG_USB_MICROTEK is not set | ||
3827 | |||
3828 | # | ||
3829 | # USB port drivers | ||
3830 | # | ||
3831 | CONFIG_USB_USS720=m | ||
3832 | CONFIG_USB_SERIAL=m | ||
3833 | CONFIG_USB_EZUSB=y | ||
3834 | CONFIG_USB_SERIAL_GENERIC=y | ||
3835 | CONFIG_USB_SERIAL_AIRCABLE=m | ||
3836 | CONFIG_USB_SERIAL_ARK3116=m | ||
3837 | CONFIG_USB_SERIAL_BELKIN=m | ||
3838 | CONFIG_USB_SERIAL_CH341=m | ||
3839 | CONFIG_USB_SERIAL_WHITEHEAT=m | ||
3840 | CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m | ||
3841 | CONFIG_USB_SERIAL_CP210X=m | ||
3842 | CONFIG_USB_SERIAL_CYPRESS_M8=m | ||
3843 | CONFIG_USB_SERIAL_EMPEG=m | ||
3844 | CONFIG_USB_SERIAL_FTDI_SIO=m | ||
3845 | CONFIG_USB_SERIAL_FUNSOFT=m | ||
3846 | CONFIG_USB_SERIAL_VISOR=m | ||
3847 | CONFIG_USB_SERIAL_IPAQ=m | ||
3848 | CONFIG_USB_SERIAL_IR=m | ||
3849 | CONFIG_USB_SERIAL_EDGEPORT=m | ||
3850 | CONFIG_USB_SERIAL_EDGEPORT_TI=m | ||
3851 | CONFIG_USB_SERIAL_GARMIN=m | ||
3852 | CONFIG_USB_SERIAL_IPW=m | ||
3853 | CONFIG_USB_SERIAL_IUU=m | ||
3854 | CONFIG_USB_SERIAL_KEYSPAN_PDA=m | ||
3855 | CONFIG_USB_SERIAL_KEYSPAN=m | ||
3856 | CONFIG_USB_SERIAL_KLSI=m | ||
3857 | CONFIG_USB_SERIAL_KOBIL_SCT=m | ||
3858 | CONFIG_USB_SERIAL_MCT_U232=m | ||
3859 | CONFIG_USB_SERIAL_MOS7720=m | ||
3860 | CONFIG_USB_SERIAL_MOS7840=m | ||
3861 | CONFIG_USB_SERIAL_MOTOROLA=m | ||
3862 | CONFIG_USB_SERIAL_NAVMAN=m | ||
3863 | CONFIG_USB_SERIAL_PL2303=m | ||
3864 | CONFIG_USB_SERIAL_OTI6858=m | ||
3865 | CONFIG_USB_SERIAL_QCAUX=m | ||
3866 | CONFIG_USB_SERIAL_QUALCOMM=m | ||
3867 | CONFIG_USB_SERIAL_SPCP8X5=m | ||
3868 | CONFIG_USB_SERIAL_HP4X=m | ||
3869 | CONFIG_USB_SERIAL_SAFE=m | ||
3870 | CONFIG_USB_SERIAL_SAFE_PADDED=y | ||
3871 | CONFIG_USB_SERIAL_SIEMENS_MPI=m | ||
3872 | CONFIG_USB_SERIAL_SIERRAWIRELESS=m | ||
3873 | CONFIG_USB_SERIAL_SYMBOL=m | ||
3874 | CONFIG_USB_SERIAL_TI=m | ||
3875 | CONFIG_USB_SERIAL_CYBERJACK=m | ||
3876 | CONFIG_USB_SERIAL_XIRCOM=m | ||
3877 | CONFIG_USB_SERIAL_OPTION=m | ||
3878 | CONFIG_USB_SERIAL_OMNINET=m | ||
3879 | CONFIG_USB_SERIAL_OPTICON=m | ||
3880 | CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m | ||
3881 | CONFIG_USB_SERIAL_DEBUG=m | ||
3882 | |||
3883 | # | ||
3884 | # USB Miscellaneous drivers | ||
3885 | # | ||
3886 | CONFIG_USB_EMI62=m | ||
3887 | CONFIG_USB_EMI26=m | ||
3888 | CONFIG_USB_ADUTUX=m | ||
3889 | CONFIG_USB_SEVSEG=m | ||
3890 | CONFIG_USB_RIO500=m | ||
3891 | # CONFIG_USB_LEGOTOWER is not set | ||
3892 | CONFIG_USB_LCD=m | ||
3893 | CONFIG_USB_LED=m | ||
3894 | CONFIG_USB_CYPRESS_CY7C63=m | ||
3895 | CONFIG_USB_CYTHERM=m | ||
3896 | CONFIG_USB_IDMOUSE=m | ||
3897 | CONFIG_USB_FTDI_ELAN=m | ||
3898 | # CONFIG_USB_APPLEDISPLAY is not set | ||
3899 | CONFIG_USB_SISUSBVGA=m | ||
3900 | CONFIG_USB_SISUSBVGA_CON=y | ||
3901 | CONFIG_USB_LD=m | ||
3902 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
3903 | CONFIG_USB_IOWARRIOR=m | ||
3904 | CONFIG_USB_TEST=m | ||
3905 | CONFIG_USB_ISIGHTFW=m | ||
3906 | CONFIG_USB_ATM=m | ||
3907 | CONFIG_USB_SPEEDTOUCH=m | ||
3908 | CONFIG_USB_CXACRU=m | ||
3909 | CONFIG_USB_UEAGLEATM=m | ||
3910 | CONFIG_USB_XUSBATM=m | ||
3911 | # CONFIG_USB_GADGET is not set | ||
3912 | |||
3913 | # | ||
3914 | # OTG and related infrastructure | ||
3915 | # | ||
3916 | CONFIG_USB_OTG_UTILS=y | ||
3917 | CONFIG_USB_GPIO_VBUS=m | ||
3918 | CONFIG_NOP_USB_XCEIV=m | ||
3919 | CONFIG_UWB=m | ||
3920 | CONFIG_UWB_HWA=m | ||
3921 | CONFIG_UWB_WHCI=m | ||
3922 | CONFIG_UWB_WLP=m | ||
3923 | CONFIG_UWB_I1480U=m | ||
3924 | CONFIG_UWB_I1480U_WLP=m | ||
3925 | CONFIG_MMC=m | ||
3926 | # CONFIG_MMC_DEBUG is not set | ||
3927 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
3928 | |||
3929 | # | ||
3930 | # MMC/SD/SDIO Card Drivers | ||
3931 | # | ||
3932 | CONFIG_MMC_BLOCK=m | ||
3933 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
3934 | CONFIG_SDIO_UART=m | ||
3935 | CONFIG_MMC_TEST=m | ||
3936 | |||
3937 | # | ||
3938 | # MMC/SD/SDIO Host Controller Drivers | ||
3939 | # | ||
3940 | CONFIG_MMC_SDHCI=m | ||
3941 | CONFIG_MMC_SDHCI_PCI=m | ||
3942 | # CONFIG_MMC_RICOH_MMC is not set | ||
3943 | CONFIG_MMC_SDHCI_PLTFM=m | ||
3944 | CONFIG_MMC_WBSD=m | ||
3945 | CONFIG_MMC_TIFM_SD=m | ||
3946 | CONFIG_MMC_SDRICOH_CS=m | ||
3947 | CONFIG_MMC_CB710=m | ||
3948 | CONFIG_MMC_VIA_SDMMC=m | ||
3949 | CONFIG_MEMSTICK=m | ||
3950 | # CONFIG_MEMSTICK_DEBUG is not set | ||
3951 | |||
3952 | # | ||
3953 | # MemoryStick drivers | ||
3954 | # | ||
3955 | # CONFIG_MEMSTICK_UNSAFE_RESUME is not set | ||
3956 | CONFIG_MSPRO_BLOCK=m | ||
3957 | |||
3958 | # | ||
3959 | # MemoryStick Host Controller Drivers | ||
3960 | # | ||
3961 | CONFIG_MEMSTICK_TIFM_MS=m | ||
3962 | CONFIG_MEMSTICK_JMICRON_38X=m | ||
3963 | CONFIG_NEW_LEDS=y | ||
3964 | CONFIG_LEDS_CLASS=m | ||
3965 | |||
3966 | # | ||
3967 | # LED drivers | ||
3968 | # | ||
3969 | CONFIG_LEDS_NET48XX=m | ||
3970 | CONFIG_LEDS_WRAP=m | ||
3971 | CONFIG_LEDS_ALIX2=m | ||
3972 | CONFIG_LEDS_PCA9532=m | ||
3973 | CONFIG_LEDS_GPIO=m | ||
3974 | CONFIG_LEDS_GPIO_PLATFORM=y | ||
3975 | CONFIG_LEDS_LP3944=m | ||
3976 | CONFIG_LEDS_CLEVO_MAIL=m | ||
3977 | CONFIG_LEDS_PCA955X=m | ||
3978 | CONFIG_LEDS_DAC124S085=m | ||
3979 | CONFIG_LEDS_REGULATOR=m | ||
3980 | CONFIG_LEDS_BD2802=m | ||
3981 | CONFIG_LEDS_INTEL_SS4200=m | ||
3982 | CONFIG_LEDS_LT3593=m | ||
3983 | CONFIG_LEDS_DELL_NETBOOKS=m | ||
3984 | CONFIG_LEDS_TRIGGERS=y | ||
3985 | |||
3986 | # | ||
3987 | # LED Triggers | ||
3988 | # | ||
3989 | CONFIG_LEDS_TRIGGER_TIMER=m | ||
3990 | CONFIG_LEDS_TRIGGER_HEARTBEAT=m | ||
3991 | CONFIG_LEDS_TRIGGER_BACKLIGHT=m | ||
3992 | CONFIG_LEDS_TRIGGER_GPIO=m | ||
3993 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=m | ||
3994 | |||
3995 | # | ||
3996 | # iptables trigger is under Netfilter config (LED target) | ||
3997 | # | ||
3998 | CONFIG_ACCESSIBILITY=y | ||
3999 | # CONFIG_A11Y_BRAILLE_CONSOLE is not set | ||
4000 | CONFIG_INFINIBAND=m | ||
4001 | CONFIG_INFINIBAND_USER_MAD=m | ||
4002 | CONFIG_INFINIBAND_USER_ACCESS=m | ||
4003 | CONFIG_INFINIBAND_USER_MEM=y | ||
4004 | CONFIG_INFINIBAND_ADDR_TRANS=y | ||
4005 | CONFIG_INFINIBAND_MTHCA=m | ||
4006 | # CONFIG_INFINIBAND_MTHCA_DEBUG is not set | ||
4007 | CONFIG_INFINIBAND_AMSO1100=m | ||
4008 | # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set | ||
4009 | CONFIG_INFINIBAND_CXGB3=m | ||
4010 | # CONFIG_INFINIBAND_CXGB3_DEBUG is not set | ||
4011 | CONFIG_MLX4_INFINIBAND=m | ||
4012 | CONFIG_INFINIBAND_NES=m | ||
4013 | # CONFIG_INFINIBAND_NES_DEBUG is not set | ||
4014 | CONFIG_INFINIBAND_IPOIB=m | ||
4015 | # CONFIG_INFINIBAND_IPOIB_CM is not set | ||
4016 | # CONFIG_INFINIBAND_IPOIB_DEBUG is not set | ||
4017 | CONFIG_INFINIBAND_SRP=m | ||
4018 | CONFIG_INFINIBAND_ISER=m | ||
4019 | # CONFIG_EDAC is not set | ||
4020 | CONFIG_RTC_LIB=m | ||
4021 | CONFIG_RTC_CLASS=m | ||
4022 | |||
4023 | # | ||
4024 | # RTC interfaces | ||
4025 | # | ||
4026 | CONFIG_RTC_INTF_SYSFS=y | ||
4027 | CONFIG_RTC_INTF_PROC=y | ||
4028 | CONFIG_RTC_INTF_DEV=y | ||
4029 | CONFIG_RTC_INTF_DEV_UIE_EMUL=y | ||
4030 | CONFIG_RTC_DRV_TEST=m | ||
4031 | |||
4032 | # | ||
4033 | # I2C RTC drivers | ||
4034 | # | ||
4035 | CONFIG_RTC_DRV_DS1307=m | ||
4036 | CONFIG_RTC_DRV_DS1374=m | ||
4037 | CONFIG_RTC_DRV_DS1672=m | ||
4038 | CONFIG_RTC_DRV_MAX6900=m | ||
4039 | CONFIG_RTC_DRV_RS5C372=m | ||
4040 | CONFIG_RTC_DRV_ISL1208=m | ||
4041 | CONFIG_RTC_DRV_X1205=m | ||
4042 | CONFIG_RTC_DRV_PCF8563=m | ||
4043 | CONFIG_RTC_DRV_PCF8583=m | ||
4044 | CONFIG_RTC_DRV_M41T80=m | ||
4045 | CONFIG_RTC_DRV_M41T80_WDT=y | ||
4046 | CONFIG_RTC_DRV_BQ32K=m | ||
4047 | CONFIG_RTC_DRV_S35390A=m | ||
4048 | CONFIG_RTC_DRV_FM3130=m | ||
4049 | CONFIG_RTC_DRV_RX8581=m | ||
4050 | CONFIG_RTC_DRV_RX8025=m | ||
4051 | |||
4052 | # | ||
4053 | # SPI RTC drivers | ||
4054 | # | ||
4055 | CONFIG_RTC_DRV_M41T94=m | ||
4056 | CONFIG_RTC_DRV_DS1305=m | ||
4057 | CONFIG_RTC_DRV_DS1390=m | ||
4058 | CONFIG_RTC_DRV_MAX6902=m | ||
4059 | CONFIG_RTC_DRV_R9701=m | ||
4060 | CONFIG_RTC_DRV_RS5C348=m | ||
4061 | CONFIG_RTC_DRV_DS3234=m | ||
4062 | CONFIG_RTC_DRV_PCF2123=m | ||
4063 | |||
4064 | # | ||
4065 | # Platform RTC drivers | ||
4066 | # | ||
4067 | CONFIG_RTC_DRV_CMOS=m | ||
4068 | CONFIG_RTC_DRV_DS1286=m | ||
4069 | CONFIG_RTC_DRV_DS1511=m | ||
4070 | CONFIG_RTC_DRV_DS1553=m | ||
4071 | CONFIG_RTC_DRV_DS1742=m | ||
4072 | CONFIG_RTC_DRV_STK17TA8=m | ||
4073 | CONFIG_RTC_DRV_M48T86=m | ||
4074 | CONFIG_RTC_DRV_M48T35=m | ||
4075 | CONFIG_RTC_DRV_M48T59=m | ||
4076 | CONFIG_RTC_DRV_MSM6242=m | ||
4077 | CONFIG_RTC_DRV_BQ4802=m | ||
4078 | CONFIG_RTC_DRV_RP5C01=m | ||
4079 | CONFIG_RTC_DRV_V3020=m | ||
4080 | CONFIG_RTC_DRV_PCF50633=m | ||
4081 | |||
4082 | # | ||
4083 | # on-CPU RTC drivers | ||
4084 | # | ||
4085 | CONFIG_DMADEVICES=y | ||
4086 | # CONFIG_DMADEVICES_DEBUG is not set | ||
4087 | |||
4088 | # | ||
4089 | # DMA Devices | ||
4090 | # | ||
4091 | CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH=y | ||
4092 | CONFIG_INTEL_IOATDMA=m | ||
4093 | CONFIG_DMA_ENGINE=y | ||
4094 | |||
4095 | # | ||
4096 | # DMA Clients | ||
4097 | # | ||
4098 | CONFIG_NET_DMA=y | ||
4099 | # CONFIG_ASYNC_TX_DMA is not set | ||
4100 | CONFIG_DMATEST=m | ||
4101 | CONFIG_DCA=m | ||
4102 | CONFIG_AUXDISPLAY=y | ||
4103 | CONFIG_KS0108=m | ||
4104 | CONFIG_KS0108_PORT=0x378 | ||
4105 | CONFIG_KS0108_DELAY=2 | ||
4106 | CONFIG_CFAG12864B=m | ||
4107 | CONFIG_CFAG12864B_RATE=20 | ||
4108 | CONFIG_UIO=m | ||
4109 | CONFIG_UIO_CIF=m | ||
4110 | CONFIG_UIO_PDRV=m | ||
4111 | CONFIG_UIO_PDRV_GENIRQ=m | ||
4112 | CONFIG_UIO_AEC=m | ||
4113 | CONFIG_UIO_SERCOS3=m | ||
4114 | # CONFIG_UIO_PCI_GENERIC is not set | ||
4115 | CONFIG_UIO_NETX=m | ||
4116 | |||
4117 | # | ||
4118 | # TI VLYNQ | ||
4119 | # | ||
4120 | |||
4121 | # | ||
4122 | # Xen driver support | ||
4123 | # | ||
4124 | CONFIG_XEN_BALLOON=y | ||
4125 | CONFIG_XEN_SCRUB_PAGES=y | ||
4126 | CONFIG_XEN_DEV_EVTCHN=y | ||
4127 | CONFIG_XENFS=y | ||
4128 | CONFIG_XEN_COMPAT_XENFS=y | ||
4129 | CONFIG_XEN_SYS_HYPERVISOR=y | ||
4130 | # CONFIG_STAGING is not set | ||
4131 | CONFIG_X86_PLATFORM_DEVICES=y | ||
4132 | CONFIG_ACER_WMI=m | ||
4133 | CONFIG_ASUS_LAPTOP=m | ||
4134 | CONFIG_DELL_LAPTOP=m | ||
4135 | CONFIG_DELL_WMI=m | ||
4136 | CONFIG_FUJITSU_LAPTOP=m | ||
4137 | # CONFIG_FUJITSU_LAPTOP_DEBUG is not set | ||
4138 | CONFIG_TC1100_WMI=m | ||
4139 | CONFIG_HP_WMI=m | ||
4140 | CONFIG_MSI_LAPTOP=m | ||
4141 | CONFIG_PANASONIC_LAPTOP=m | ||
4142 | CONFIG_COMPAL_LAPTOP=m | ||
4143 | CONFIG_SONY_LAPTOP=m | ||
4144 | # CONFIG_SONYPI_COMPAT is not set | ||
4145 | CONFIG_THINKPAD_ACPI=m | ||
4146 | CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y | ||
4147 | # CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set | ||
4148 | # CONFIG_THINKPAD_ACPI_DEBUG is not set | ||
4149 | # CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set | ||
4150 | CONFIG_THINKPAD_ACPI_VIDEO=y | ||
4151 | CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y | ||
4152 | CONFIG_INTEL_MENLOW=m | ||
4153 | CONFIG_EEEPC_LAPTOP=m | ||
4154 | CONFIG_EEEPC_WMI=m | ||
4155 | CONFIG_ACPI_WMI=m | ||
4156 | CONFIG_MSI_WMI=m | ||
4157 | CONFIG_ACPI_ASUS=m | ||
4158 | # CONFIG_TOPSTAR_LAPTOP is not set | ||
4159 | CONFIG_ACPI_TOSHIBA=m | ||
4160 | CONFIG_TOSHIBA_BT_RFKILL=m | ||
4161 | CONFIG_ACPI_CMPC=m | ||
4162 | |||
4163 | # | ||
4164 | # Firmware Drivers | ||
4165 | # | ||
4166 | CONFIG_EDD=m | ||
4167 | # CONFIG_EDD_OFF is not set | ||
4168 | CONFIG_FIRMWARE_MEMMAP=y | ||
4169 | CONFIG_DELL_RBU=m | ||
4170 | CONFIG_DCDBAS=m | ||
4171 | CONFIG_DMIID=y | ||
4172 | # CONFIG_ISCSI_IBFT_FIND is not set | ||
4173 | |||
4174 | # | ||
4175 | # File systems | ||
4176 | # | ||
4177 | CONFIG_EXT2_FS=m | ||
4178 | CONFIG_EXT2_FS_XATTR=y | ||
4179 | CONFIG_EXT2_FS_POSIX_ACL=y | ||
4180 | CONFIG_EXT2_FS_SECURITY=y | ||
4181 | CONFIG_EXT2_FS_XIP=y | ||
4182 | CONFIG_EXT3_FS=m | ||
4183 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
4184 | CONFIG_EXT3_FS_XATTR=y | ||
4185 | CONFIG_EXT3_FS_POSIX_ACL=y | ||
4186 | CONFIG_EXT3_FS_SECURITY=y | ||
4187 | CONFIG_EXT4_FS=m | ||
4188 | CONFIG_EXT4_FS_XATTR=y | ||
4189 | CONFIG_EXT4_FS_POSIX_ACL=y | ||
4190 | CONFIG_EXT4_FS_SECURITY=y | ||
4191 | # CONFIG_EXT4_DEBUG is not set | ||
4192 | CONFIG_FS_XIP=y | ||
4193 | CONFIG_JBD=m | ||
4194 | # CONFIG_JBD_DEBUG is not set | ||
4195 | CONFIG_JBD2=m | ||
4196 | # CONFIG_JBD2_DEBUG is not set | ||
4197 | CONFIG_FS_MBCACHE=m | ||
4198 | CONFIG_REISERFS_FS=m | ||
4199 | # CONFIG_REISERFS_CHECK is not set | ||
4200 | CONFIG_REISERFS_PROC_INFO=y | ||
4201 | CONFIG_REISERFS_FS_XATTR=y | ||
4202 | CONFIG_REISERFS_FS_POSIX_ACL=y | ||
4203 | # CONFIG_REISERFS_FS_SECURITY is not set | ||
4204 | CONFIG_JFS_FS=m | ||
4205 | CONFIG_JFS_POSIX_ACL=y | ||
4206 | CONFIG_JFS_SECURITY=y | ||
4207 | # CONFIG_JFS_DEBUG is not set | ||
4208 | CONFIG_JFS_STATISTICS=y | ||
4209 | CONFIG_FS_POSIX_ACL=y | ||
4210 | CONFIG_XFS_FS=m | ||
4211 | CONFIG_XFS_QUOTA=y | ||
4212 | CONFIG_XFS_POSIX_ACL=y | ||
4213 | CONFIG_XFS_RT=y | ||
4214 | # CONFIG_XFS_DEBUG is not set | ||
4215 | CONFIG_GFS2_FS=m | ||
4216 | CONFIG_GFS2_FS_LOCKING_DLM=y | ||
4217 | CONFIG_OCFS2_FS=m | ||
4218 | CONFIG_OCFS2_FS_O2CB=m | ||
4219 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | ||
4220 | CONFIG_OCFS2_FS_STATS=y | ||
4221 | CONFIG_OCFS2_DEBUG_MASKLOG=y | ||
4222 | # CONFIG_OCFS2_DEBUG_FS is not set | ||
4223 | CONFIG_BTRFS_FS=m | ||
4224 | CONFIG_BTRFS_FS_POSIX_ACL=y | ||
4225 | CONFIG_NILFS2_FS=m | ||
4226 | CONFIG_FILE_LOCKING=y | ||
4227 | CONFIG_FSNOTIFY=y | ||
4228 | # CONFIG_DNOTIFY is not set | ||
4229 | CONFIG_INOTIFY=y | ||
4230 | CONFIG_INOTIFY_USER=y | ||
4231 | CONFIG_QUOTA=y | ||
4232 | CONFIG_QUOTA_NETLINK_INTERFACE=y | ||
4233 | # CONFIG_PRINT_QUOTA_WARNING is not set | ||
4234 | # CONFIG_QUOTA_DEBUG is not set | ||
4235 | CONFIG_QUOTA_TREE=m | ||
4236 | CONFIG_QFMT_V1=m | ||
4237 | CONFIG_QFMT_V2=m | ||
4238 | CONFIG_QUOTACTL=y | ||
4239 | CONFIG_AUTOFS_FS=m | ||
4240 | CONFIG_AUTOFS4_FS=m | ||
4241 | CONFIG_FUSE_FS=m | ||
4242 | # CONFIG_CUSE is not set | ||
4243 | |||
4244 | # | ||
4245 | # Caches | ||
4246 | # | ||
4247 | CONFIG_FSCACHE=m | ||
4248 | CONFIG_FSCACHE_STATS=y | ||
4249 | CONFIG_FSCACHE_HISTOGRAM=y | ||
4250 | # CONFIG_FSCACHE_DEBUG is not set | ||
4251 | # CONFIG_FSCACHE_OBJECT_LIST is not set | ||
4252 | CONFIG_CACHEFILES=m | ||
4253 | # CONFIG_CACHEFILES_DEBUG is not set | ||
4254 | # CONFIG_CACHEFILES_HISTOGRAM is not set | ||
4255 | |||
4256 | # | ||
4257 | # CD-ROM/DVD Filesystems | ||
4258 | # | ||
4259 | CONFIG_ISO9660_FS=m | ||
4260 | CONFIG_JOLIET=y | ||
4261 | CONFIG_ZISOFS=y | ||
4262 | CONFIG_UDF_FS=m | ||
4263 | CONFIG_UDF_NLS=y | ||
4264 | |||
4265 | # | ||
4266 | # DOS/FAT/NT Filesystems | ||
4267 | # | ||
4268 | CONFIG_FAT_FS=m | ||
4269 | CONFIG_MSDOS_FS=m | ||
4270 | CONFIG_VFAT_FS=m | ||
4271 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
4272 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
4273 | CONFIG_NTFS_FS=m | ||
4274 | # CONFIG_NTFS_DEBUG is not set | ||
4275 | CONFIG_NTFS_RW=y | ||
4276 | |||
4277 | # | ||
4278 | # Pseudo filesystems | ||
4279 | # | ||
4280 | CONFIG_PROC_FS=y | ||
4281 | # CONFIG_PROC_KCORE is not set | ||
4282 | CONFIG_PROC_SYSCTL=y | ||
4283 | CONFIG_PROC_PAGE_MONITOR=y | ||
4284 | CONFIG_SYSFS=y | ||
4285 | CONFIG_TMPFS=y | ||
4286 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
4287 | # CONFIG_HUGETLBFS is not set | ||
4288 | # CONFIG_HUGETLB_PAGE is not set | ||
4289 | CONFIG_CONFIGFS_FS=m | ||
4290 | CONFIG_MISC_FILESYSTEMS=y | ||
4291 | # CONFIG_ADFS_FS is not set | ||
4292 | # CONFIG_AFFS_FS is not set | ||
4293 | CONFIG_ECRYPT_FS=m | ||
4294 | CONFIG_HFS_FS=m | ||
4295 | CONFIG_HFSPLUS_FS=m | ||
4296 | # CONFIG_BEFS_FS is not set | ||
4297 | # CONFIG_BFS_FS is not set | ||
4298 | CONFIG_EFS_FS=m | ||
4299 | CONFIG_JFFS2_FS=m | ||
4300 | CONFIG_JFFS2_FS_DEBUG=0 | ||
4301 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
4302 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
4303 | CONFIG_JFFS2_SUMMARY=y | ||
4304 | CONFIG_JFFS2_FS_XATTR=y | ||
4305 | CONFIG_JFFS2_FS_POSIX_ACL=y | ||
4306 | CONFIG_JFFS2_FS_SECURITY=y | ||
4307 | CONFIG_JFFS2_COMPRESSION_OPTIONS=y | ||
4308 | CONFIG_JFFS2_ZLIB=y | ||
4309 | CONFIG_JFFS2_LZO=y | ||
4310 | CONFIG_JFFS2_RTIME=y | ||
4311 | CONFIG_JFFS2_RUBIN=y | ||
4312 | # CONFIG_JFFS2_CMODE_NONE is not set | ||
4313 | CONFIG_JFFS2_CMODE_PRIORITY=y | ||
4314 | # CONFIG_JFFS2_CMODE_SIZE is not set | ||
4315 | # CONFIG_JFFS2_CMODE_FAVOURLZO is not set | ||
4316 | CONFIG_UBIFS_FS=m | ||
4317 | # CONFIG_UBIFS_FS_XATTR is not set | ||
4318 | # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set | ||
4319 | CONFIG_UBIFS_FS_LZO=y | ||
4320 | CONFIG_UBIFS_FS_ZLIB=y | ||
4321 | # CONFIG_UBIFS_FS_DEBUG is not set | ||
4322 | CONFIG_LOGFS=m | ||
4323 | CONFIG_CRAMFS=m | ||
4324 | CONFIG_SQUASHFS=m | ||
4325 | # CONFIG_SQUASHFS_EMBEDDED is not set | ||
4326 | CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 | ||
4327 | # CONFIG_VXFS_FS is not set | ||
4328 | CONFIG_MINIX_FS=m | ||
4329 | CONFIG_OMFS_FS=m | ||
4330 | CONFIG_HPFS_FS=m | ||
4331 | # CONFIG_QNX4FS_FS is not set | ||
4332 | CONFIG_ROMFS_FS=m | ||
4333 | CONFIG_ROMFS_BACKED_BY_BLOCK=y | ||
4334 | # CONFIG_ROMFS_BACKED_BY_MTD is not set | ||
4335 | # CONFIG_ROMFS_BACKED_BY_BOTH is not set | ||
4336 | CONFIG_ROMFS_ON_BLOCK=y | ||
4337 | CONFIG_SYSV_FS=m | ||
4338 | CONFIG_UFS_FS=m | ||
4339 | # CONFIG_UFS_FS_WRITE is not set | ||
4340 | # CONFIG_UFS_DEBUG is not set | ||
4341 | CONFIG_EXOFS_FS=m | ||
4342 | # CONFIG_EXOFS_DEBUG is not set | ||
4343 | CONFIG_NETWORK_FILESYSTEMS=y | ||
4344 | CONFIG_NFS_FS=m | ||
4345 | CONFIG_NFS_V3=y | ||
4346 | # CONFIG_NFS_V3_ACL is not set | ||
4347 | CONFIG_NFS_V4=y | ||
4348 | # CONFIG_NFS_V4_1 is not set | ||
4349 | # CONFIG_NFS_FSCACHE is not set | ||
4350 | CONFIG_NFSD=m | ||
4351 | CONFIG_NFSD_V3=y | ||
4352 | # CONFIG_NFSD_V3_ACL is not set | ||
4353 | CONFIG_NFSD_V4=y | ||
4354 | CONFIG_LOCKD=m | ||
4355 | CONFIG_LOCKD_V4=y | ||
4356 | CONFIG_EXPORTFS=m | ||
4357 | CONFIG_NFS_COMMON=y | ||
4358 | CONFIG_SUNRPC=m | ||
4359 | CONFIG_SUNRPC_GSS=m | ||
4360 | CONFIG_SUNRPC_XPRT_RDMA=m | ||
4361 | CONFIG_RPCSEC_GSS_KRB5=m | ||
4362 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
4363 | # CONFIG_SMB_FS is not set | ||
4364 | CONFIG_CEPH_FS=m | ||
4365 | # CONFIG_CEPH_FS_PRETTYDEBUG is not set | ||
4366 | CONFIG_CIFS=m | ||
4367 | # CONFIG_CIFS_STATS is not set | ||
4368 | # CONFIG_CIFS_WEAK_PW_HASH is not set | ||
4369 | # CONFIG_CIFS_UPCALL is not set | ||
4370 | CONFIG_CIFS_XATTR=y | ||
4371 | CONFIG_CIFS_POSIX=y | ||
4372 | # CONFIG_CIFS_DEBUG2 is not set | ||
4373 | CONFIG_CIFS_DFS_UPCALL=y | ||
4374 | CONFIG_CIFS_EXPERIMENTAL=y | ||
4375 | # CONFIG_NCP_FS is not set | ||
4376 | # CONFIG_CODA_FS is not set | ||
4377 | # CONFIG_AFS_FS is not set | ||
4378 | # CONFIG_9P_FS is not set | ||
4379 | |||
4380 | # | ||
4381 | # Partition Types | ||
4382 | # | ||
4383 | # CONFIG_PARTITION_ADVANCED is not set | ||
4384 | CONFIG_MSDOS_PARTITION=y | ||
4385 | CONFIG_NLS=m | ||
4386 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
4387 | CONFIG_NLS_CODEPAGE_437=m | ||
4388 | CONFIG_NLS_CODEPAGE_737=m | ||
4389 | CONFIG_NLS_CODEPAGE_775=m | ||
4390 | CONFIG_NLS_CODEPAGE_850=m | ||
4391 | CONFIG_NLS_CODEPAGE_852=m | ||
4392 | CONFIG_NLS_CODEPAGE_855=m | ||
4393 | CONFIG_NLS_CODEPAGE_857=m | ||
4394 | CONFIG_NLS_CODEPAGE_860=m | ||
4395 | CONFIG_NLS_CODEPAGE_861=m | ||
4396 | CONFIG_NLS_CODEPAGE_862=m | ||
4397 | CONFIG_NLS_CODEPAGE_863=m | ||
4398 | CONFIG_NLS_CODEPAGE_864=m | ||
4399 | CONFIG_NLS_CODEPAGE_865=m | ||
4400 | CONFIG_NLS_CODEPAGE_866=m | ||
4401 | CONFIG_NLS_CODEPAGE_869=m | ||
4402 | CONFIG_NLS_CODEPAGE_936=m | ||
4403 | CONFIG_NLS_CODEPAGE_950=m | ||
4404 | CONFIG_NLS_CODEPAGE_932=m | ||
4405 | CONFIG_NLS_CODEPAGE_949=m | ||
4406 | CONFIG_NLS_CODEPAGE_874=m | ||
4407 | CONFIG_NLS_ISO8859_8=m | ||
4408 | CONFIG_NLS_CODEPAGE_1250=m | ||
4409 | CONFIG_NLS_CODEPAGE_1251=m | ||
4410 | CONFIG_NLS_ASCII=m | ||
4411 | CONFIG_NLS_ISO8859_1=m | ||
4412 | CONFIG_NLS_ISO8859_2=m | ||
4413 | CONFIG_NLS_ISO8859_3=m | ||
4414 | CONFIG_NLS_ISO8859_4=m | ||
4415 | CONFIG_NLS_ISO8859_5=m | ||
4416 | CONFIG_NLS_ISO8859_6=m | ||
4417 | CONFIG_NLS_ISO8859_7=m | ||
4418 | CONFIG_NLS_ISO8859_9=m | ||
4419 | CONFIG_NLS_ISO8859_13=m | ||
4420 | CONFIG_NLS_ISO8859_14=m | ||
4421 | CONFIG_NLS_ISO8859_15=m | ||
4422 | CONFIG_NLS_KOI8_R=m | ||
4423 | CONFIG_NLS_KOI8_U=m | ||
4424 | CONFIG_NLS_UTF8=m | ||
4425 | CONFIG_DLM=m | ||
4426 | # CONFIG_DLM_DEBUG is not set | ||
4427 | |||
4428 | # | ||
4429 | # Kernel hacking | ||
4430 | # | ||
4431 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
4432 | # CONFIG_PRINTK_TIME is not set | ||
4433 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
4434 | # CONFIG_ENABLE_MUST_CHECK is not set | ||
4435 | CONFIG_FRAME_WARN=1024 | ||
4436 | # CONFIG_MAGIC_SYSRQ is not set | ||
4437 | # CONFIG_STRIP_ASM_SYMS is not set | ||
4438 | # CONFIG_UNUSED_SYMBOLS is not set | ||
4439 | CONFIG_DEBUG_FS=y | ||
4440 | # CONFIG_HEADERS_CHECK is not set | ||
4441 | # CONFIG_DEBUG_KERNEL is not set | ||
4442 | CONFIG_DEBUG_BUGVERBOSE=y | ||
4443 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
4444 | CONFIG_ARCH_WANT_FRAME_POINTERS=y | ||
4445 | CONFIG_FRAME_POINTER=y | ||
4446 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
4447 | CONFIG_LKDTM=m | ||
4448 | # CONFIG_LATENCYTOP is not set | ||
4449 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
4450 | CONFIG_USER_STACKTRACE_SUPPORT=y | ||
4451 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
4452 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
4453 | CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y | ||
4454 | CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y | ||
4455 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
4456 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | ||
4457 | CONFIG_HAVE_SYSCALL_TRACEPOINTS=y | ||
4458 | CONFIG_RING_BUFFER=y | ||
4459 | CONFIG_RING_BUFFER_ALLOW_SWAP=y | ||
4460 | CONFIG_TRACING_SUPPORT=y | ||
4461 | # CONFIG_FTRACE is not set | ||
4462 | # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set | ||
4463 | # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set | ||
4464 | # CONFIG_DYNAMIC_DEBUG is not set | ||
4465 | # CONFIG_DMA_API_DEBUG is not set | ||
4466 | # CONFIG_SAMPLES is not set | ||
4467 | CONFIG_HAVE_ARCH_KGDB=y | ||
4468 | CONFIG_HAVE_ARCH_KMEMCHECK=y | ||
4469 | CONFIG_STRICT_DEVMEM=y | ||
4470 | # CONFIG_X86_VERBOSE_BOOTUP is not set | ||
4471 | # CONFIG_EARLY_PRINTK is not set | ||
4472 | # CONFIG_4KSTACKS is not set | ||
4473 | # CONFIG_DOUBLEFAULT is not set | ||
4474 | # CONFIG_IOMMU_STRESS is not set | ||
4475 | CONFIG_HAVE_MMIOTRACE_SUPPORT=y | ||
4476 | CONFIG_IO_DELAY_TYPE_0X80=0 | ||
4477 | CONFIG_IO_DELAY_TYPE_0XED=1 | ||
4478 | CONFIG_IO_DELAY_TYPE_UDELAY=2 | ||
4479 | CONFIG_IO_DELAY_TYPE_NONE=3 | ||
4480 | CONFIG_IO_DELAY_0X80=y | ||
4481 | # CONFIG_IO_DELAY_0XED is not set | ||
4482 | # CONFIG_IO_DELAY_UDELAY is not set | ||
4483 | # CONFIG_IO_DELAY_NONE is not set | ||
4484 | CONFIG_DEFAULT_IO_DELAY_TYPE=0 | ||
4485 | # CONFIG_OPTIMIZE_INLINING is not set | ||
4486 | |||
4487 | # | ||
4488 | # Security options | ||
4489 | # | ||
4490 | CONFIG_KEYS=y | ||
4491 | # CONFIG_KEYS_DEBUG_PROC_KEYS is not set | ||
4492 | CONFIG_SECURITY=y | ||
4493 | CONFIG_SECURITYFS=y | ||
4494 | # CONFIG_SECURITY_NETWORK is not set | ||
4495 | # CONFIG_SECURITY_PATH is not set | ||
4496 | # CONFIG_SECURITY_TOMOYO is not set | ||
4497 | # CONFIG_IMA is not set | ||
4498 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set | ||
4499 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
4500 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
4501 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
4502 | CONFIG_DEFAULT_SECURITY="" | ||
4503 | CONFIG_XOR_BLOCKS=m | ||
4504 | CONFIG_ASYNC_CORE=m | ||
4505 | CONFIG_ASYNC_MEMCPY=m | ||
4506 | CONFIG_ASYNC_XOR=m | ||
4507 | CONFIG_ASYNC_PQ=m | ||
4508 | CONFIG_ASYNC_RAID6_RECOV=m | ||
4509 | CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y | ||
4510 | CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y | ||
4511 | CONFIG_CRYPTO=y | ||
4512 | |||
4513 | # | ||
4514 | # Crypto core or helper | ||
4515 | # | ||
4516 | CONFIG_CRYPTO_FIPS=y | ||
4517 | CONFIG_CRYPTO_ALGAPI=y | ||
4518 | CONFIG_CRYPTO_ALGAPI2=y | ||
4519 | CONFIG_CRYPTO_AEAD=m | ||
4520 | CONFIG_CRYPTO_AEAD2=y | ||
4521 | CONFIG_CRYPTO_BLKCIPHER=m | ||
4522 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
4523 | CONFIG_CRYPTO_HASH=y | ||
4524 | CONFIG_CRYPTO_HASH2=y | ||
4525 | CONFIG_CRYPTO_RNG=m | ||
4526 | CONFIG_CRYPTO_RNG2=y | ||
4527 | CONFIG_CRYPTO_PCOMP=y | ||
4528 | CONFIG_CRYPTO_MANAGER=m | ||
4529 | CONFIG_CRYPTO_MANAGER2=y | ||
4530 | CONFIG_CRYPTO_GF128MUL=m | ||
4531 | CONFIG_CRYPTO_NULL=m | ||
4532 | CONFIG_CRYPTO_PCRYPT=m | ||
4533 | CONFIG_CRYPTO_WORKQUEUE=y | ||
4534 | CONFIG_CRYPTO_CRYPTD=m | ||
4535 | CONFIG_CRYPTO_AUTHENC=m | ||
4536 | CONFIG_CRYPTO_TEST=m | ||
4537 | |||
4538 | # | ||
4539 | # Authenticated Encryption with Associated Data | ||
4540 | # | ||
4541 | CONFIG_CRYPTO_CCM=m | ||
4542 | CONFIG_CRYPTO_GCM=m | ||
4543 | CONFIG_CRYPTO_SEQIV=m | ||
4544 | |||
4545 | # | ||
4546 | # Block modes | ||
4547 | # | ||
4548 | CONFIG_CRYPTO_CBC=m | ||
4549 | CONFIG_CRYPTO_CTR=m | ||
4550 | CONFIG_CRYPTO_CTS=m | ||
4551 | CONFIG_CRYPTO_ECB=m | ||
4552 | CONFIG_CRYPTO_LRW=m | ||
4553 | CONFIG_CRYPTO_PCBC=m | ||
4554 | CONFIG_CRYPTO_XTS=m | ||
4555 | |||
4556 | # | ||
4557 | # Hash modes | ||
4558 | # | ||
4559 | CONFIG_CRYPTO_HMAC=m | ||
4560 | CONFIG_CRYPTO_XCBC=m | ||
4561 | CONFIG_CRYPTO_VMAC=m | ||
4562 | |||
4563 | # | ||
4564 | # Digest | ||
4565 | # | ||
4566 | CONFIG_CRYPTO_CRC32C=m | ||
4567 | CONFIG_CRYPTO_CRC32C_INTEL=m | ||
4568 | CONFIG_CRYPTO_GHASH=m | ||
4569 | CONFIG_CRYPTO_MD4=m | ||
4570 | CONFIG_CRYPTO_MD5=y | ||
4571 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
4572 | CONFIG_CRYPTO_RMD128=m | ||
4573 | CONFIG_CRYPTO_RMD160=m | ||
4574 | CONFIG_CRYPTO_RMD256=m | ||
4575 | CONFIG_CRYPTO_RMD320=m | ||
4576 | CONFIG_CRYPTO_SHA1=m | ||
4577 | CONFIG_CRYPTO_SHA256=y | ||
4578 | CONFIG_CRYPTO_SHA512=m | ||
4579 | CONFIG_CRYPTO_TGR192=m | ||
4580 | CONFIG_CRYPTO_WP512=m | ||
4581 | |||
4582 | # | ||
4583 | # Ciphers | ||
4584 | # | ||
4585 | CONFIG_CRYPTO_AES=m | ||
4586 | CONFIG_CRYPTO_AES_586=m | ||
4587 | CONFIG_CRYPTO_ANUBIS=m | ||
4588 | CONFIG_CRYPTO_ARC4=m | ||
4589 | CONFIG_CRYPTO_BLOWFISH=m | ||
4590 | CONFIG_CRYPTO_CAMELLIA=m | ||
4591 | CONFIG_CRYPTO_CAST5=m | ||
4592 | CONFIG_CRYPTO_CAST6=m | ||
4593 | CONFIG_CRYPTO_DES=m | ||
4594 | CONFIG_CRYPTO_FCRYPT=m | ||
4595 | CONFIG_CRYPTO_KHAZAD=m | ||
4596 | CONFIG_CRYPTO_SALSA20=m | ||
4597 | CONFIG_CRYPTO_SALSA20_586=m | ||
4598 | CONFIG_CRYPTO_SEED=m | ||
4599 | CONFIG_CRYPTO_SERPENT=m | ||
4600 | CONFIG_CRYPTO_TEA=m | ||
4601 | CONFIG_CRYPTO_TWOFISH=m | ||
4602 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
4603 | CONFIG_CRYPTO_TWOFISH_586=m | ||
4604 | |||
4605 | # | ||
4606 | # Compression | ||
4607 | # | ||
4608 | CONFIG_CRYPTO_DEFLATE=m | ||
4609 | CONFIG_CRYPTO_ZLIB=m | ||
4610 | CONFIG_CRYPTO_LZO=m | ||
4611 | |||
4612 | # | ||
4613 | # Random Number Generation | ||
4614 | # | ||
4615 | CONFIG_CRYPTO_ANSI_CPRNG=m | ||
4616 | CONFIG_CRYPTO_HW=y | ||
4617 | CONFIG_CRYPTO_DEV_PADLOCK=m | ||
4618 | CONFIG_CRYPTO_DEV_PADLOCK_AES=m | ||
4619 | CONFIG_CRYPTO_DEV_PADLOCK_SHA=m | ||
4620 | CONFIG_CRYPTO_DEV_GEODE=m | ||
4621 | CONFIG_CRYPTO_DEV_HIFN_795X=m | ||
4622 | CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y | ||
4623 | CONFIG_HAVE_KVM=y | ||
4624 | CONFIG_HAVE_KVM_IRQCHIP=y | ||
4625 | CONFIG_HAVE_KVM_EVENTFD=y | ||
4626 | CONFIG_KVM_APIC_ARCHITECTURE=y | ||
4627 | CONFIG_KVM_MMIO=y | ||
4628 | CONFIG_VIRTUALIZATION=y | ||
4629 | CONFIG_KVM=m | ||
4630 | CONFIG_KVM_INTEL=m | ||
4631 | CONFIG_KVM_AMD=m | ||
4632 | CONFIG_VHOST_NET=m | ||
4633 | CONFIG_LGUEST=m | ||
4634 | CONFIG_VIRTIO=y | ||
4635 | CONFIG_VIRTIO_RING=y | ||
4636 | CONFIG_VIRTIO_PCI=m | ||
4637 | CONFIG_VIRTIO_BALLOON=m | ||
4638 | # CONFIG_BINARY_PRINTF is not set | ||
4639 | |||
4640 | # | ||
4641 | # Library routines | ||
4642 | # | ||
4643 | CONFIG_BITREVERSE=m | ||
4644 | CONFIG_GENERIC_FIND_FIRST_BIT=y | ||
4645 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
4646 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
4647 | CONFIG_CRC_CCITT=m | ||
4648 | CONFIG_CRC16=m | ||
4649 | CONFIG_CRC_T10DIF=m | ||
4650 | CONFIG_CRC_ITU_T=m | ||
4651 | CONFIG_CRC32=m | ||
4652 | CONFIG_CRC7=m | ||
4653 | CONFIG_LIBCRC32C=m | ||
4654 | CONFIG_ZLIB_INFLATE=y | ||
4655 | CONFIG_ZLIB_DEFLATE=m | ||
4656 | CONFIG_LZO_COMPRESS=m | ||
4657 | CONFIG_LZO_DECOMPRESS=m | ||
4658 | CONFIG_DECOMPRESS_GZIP=y | ||
4659 | CONFIG_DECOMPRESS_BZIP2=y | ||
4660 | CONFIG_DECOMPRESS_LZMA=y | ||
4661 | CONFIG_GENERIC_ALLOCATOR=y | ||
4662 | CONFIG_REED_SOLOMON=m | ||
4663 | CONFIG_REED_SOLOMON_DEC16=y | ||
4664 | CONFIG_TEXTSEARCH=y | ||
4665 | CONFIG_TEXTSEARCH_KMP=m | ||
4666 | CONFIG_TEXTSEARCH_BM=m | ||
4667 | CONFIG_TEXTSEARCH_FSM=m | ||
4668 | CONFIG_BTREE=y | ||
4669 | CONFIG_HAS_IOMEM=y | ||
4670 | CONFIG_HAS_IOPORT=y | ||
4671 | CONFIG_HAS_DMA=y | ||
4672 | CONFIG_CHECK_SIGNATURE=y | ||
4673 | CONFIG_NLATTR=y | ||
4674 | CONFIG_LRU_CACHE=m | ||
diff --git a/testing/linux-scst/put_page_callback-2.6.34.patch b/testing/linux-scst/put_page_callback-2.6.34.patch new file mode 100644 index 0000000000..97d6f7f0af --- /dev/null +++ b/testing/linux-scst/put_page_callback-2.6.34.patch | |||
@@ -0,0 +1,390 @@ | |||
1 | diff -upkr linux-2.6.34/include/linux/mm_types.h linux-2.6.34/include/linux/mm_types.h | ||
2 | --- linux-2.6.34/include/linux/mm_types.h 2010-05-17 01:17:36.000000000 +0400 | ||
3 | +++ linux-2.6.34/include/linux/mm_types.h 2010-05-24 14:51:40.000000000 +0400 | ||
4 | @@ -100,6 +100,18 @@ struct page { | ||
5 | */ | ||
6 | void *shadow; | ||
7 | #endif | ||
8 | + | ||
9 | +#if defined(CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION) | ||
10 | + /* | ||
11 | + * Used to implement support for notification on zero-copy TCP transfer | ||
12 | + * completion. It might look as not good to have this field here and | ||
13 | + * it's better to have it in struct sk_buff, but it would make the code | ||
14 | + * much more complicated and fragile, since all skb then would have to | ||
15 | + * contain only pages with the same value in this field. | ||
16 | + */ | ||
17 | + void *net_priv; | ||
18 | +#endif | ||
19 | + | ||
20 | }; | ||
21 | |||
22 | /* | ||
23 | diff -upkr linux-2.6.34/include/linux/net.h linux-2.6.34/include/linux/net.h | ||
24 | --- linux-2.6.34/include/linux/net.h 2010-05-17 01:17:36.000000000 +0400 | ||
25 | +++ linux-2.6.34/include/linux/net.h 2010-05-24 14:51:40.000000000 +0400 | ||
26 | @@ -20,6 +20,7 @@ | ||
27 | |||
28 | #include <linux/socket.h> | ||
29 | #include <asm/socket.h> | ||
30 | +#include <linux/mm.h> | ||
31 | |||
32 | #define NPROTO AF_MAX | ||
33 | |||
34 | @@ -288,5 +289,44 @@ extern int kernel_sock_shutdown(struct s | ||
35 | extern struct ratelimit_state net_ratelimit_state; | ||
36 | #endif | ||
37 | |||
38 | +#if defined(CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION) | ||
39 | +/* Support for notification on zero-copy TCP transfer completion */ | ||
40 | +typedef void (*net_get_page_callback_t)(struct page *page); | ||
41 | +typedef void (*net_put_page_callback_t)(struct page *page); | ||
42 | + | ||
43 | +extern net_get_page_callback_t net_get_page_callback; | ||
44 | +extern net_put_page_callback_t net_put_page_callback; | ||
45 | + | ||
46 | +extern int net_set_get_put_page_callbacks( | ||
47 | + net_get_page_callback_t get_callback, | ||
48 | + net_put_page_callback_t put_callback); | ||
49 | + | ||
50 | +/* | ||
51 | + * See comment for net_set_get_put_page_callbacks() why those functions | ||
52 | + * don't need any protection. | ||
53 | + */ | ||
54 | +static inline void net_get_page(struct page *page) | ||
55 | +{ | ||
56 | + if (page->net_priv != 0) | ||
57 | + net_get_page_callback(page); | ||
58 | + get_page(page); | ||
59 | +} | ||
60 | +static inline void net_put_page(struct page *page) | ||
61 | +{ | ||
62 | + if (page->net_priv != 0) | ||
63 | + net_put_page_callback(page); | ||
64 | + put_page(page); | ||
65 | +} | ||
66 | +#else | ||
67 | +static inline void net_get_page(struct page *page) | ||
68 | +{ | ||
69 | + get_page(page); | ||
70 | +} | ||
71 | +static inline void net_put_page(struct page *page) | ||
72 | +{ | ||
73 | + put_page(page); | ||
74 | +} | ||
75 | +#endif /* CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION */ | ||
76 | + | ||
77 | #endif /* __KERNEL__ */ | ||
78 | #endif /* _LINUX_NET_H */ | ||
79 | diff -upkr linux-2.6.34/net/core/dev.c linux-2.6.34/net/core/dev.c | ||
80 | --- linux-2.6.34/net/core/dev.c 2010-05-17 01:17:36.000000000 +0400 | ||
81 | +++ linux-2.6.34/net/core/dev.c 2010-05-24 14:51:40.000000000 +0400 | ||
82 | @@ -2732,7 +2732,7 @@ pull: | ||
83 | skb_shinfo(skb)->frags[0].size -= grow; | ||
84 | |||
85 | if (unlikely(!skb_shinfo(skb)->frags[0].size)) { | ||
86 | - put_page(skb_shinfo(skb)->frags[0].page); | ||
87 | + net_put_page(skb_shinfo(skb)->frags[0].page); | ||
88 | memmove(skb_shinfo(skb)->frags, | ||
89 | skb_shinfo(skb)->frags + 1, | ||
90 | --skb_shinfo(skb)->nr_frags); | ||
91 | diff -upkr linux-2.6.34/net/core/skbuff.c linux-2.6.34/net/core/skbuff.c | ||
92 | --- linux-2.6.34/net/core/skbuff.c 2010-05-17 01:17:36.000000000 +0400 | ||
93 | +++ linux-2.6.34/net/core/skbuff.c 2010-05-24 14:51:40.000000000 +0400 | ||
94 | @@ -76,13 +76,13 @@ static struct kmem_cache *skbuff_fclone_ | ||
95 | static void sock_pipe_buf_release(struct pipe_inode_info *pipe, | ||
96 | struct pipe_buffer *buf) | ||
97 | { | ||
98 | - put_page(buf->page); | ||
99 | + net_put_page(buf->page); | ||
100 | } | ||
101 | |||
102 | static void sock_pipe_buf_get(struct pipe_inode_info *pipe, | ||
103 | struct pipe_buffer *buf) | ||
104 | { | ||
105 | - get_page(buf->page); | ||
106 | + net_get_page(buf->page); | ||
107 | } | ||
108 | |||
109 | static int sock_pipe_buf_steal(struct pipe_inode_info *pipe, | ||
110 | @@ -344,7 +344,7 @@ static void skb_release_data(struct sk_b | ||
111 | if (skb_shinfo(skb)->nr_frags) { | ||
112 | int i; | ||
113 | for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) | ||
114 | - put_page(skb_shinfo(skb)->frags[i].page); | ||
115 | + net_put_page(skb_shinfo(skb)->frags[i].page); | ||
116 | } | ||
117 | |||
118 | if (skb_has_frags(skb)) | ||
119 | @@ -765,7 +765,7 @@ struct sk_buff *pskb_copy(struct sk_buff | ||
120 | |||
121 | for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { | ||
122 | skb_shinfo(n)->frags[i] = skb_shinfo(skb)->frags[i]; | ||
123 | - get_page(skb_shinfo(n)->frags[i].page); | ||
124 | + net_get_page(skb_shinfo(n)->frags[i].page); | ||
125 | } | ||
126 | skb_shinfo(n)->nr_frags = i; | ||
127 | } | ||
128 | @@ -831,7 +831,7 @@ int pskb_expand_head(struct sk_buff *skb | ||
129 | sizeof(struct skb_shared_info)); | ||
130 | |||
131 | for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) | ||
132 | - get_page(skb_shinfo(skb)->frags[i].page); | ||
133 | + net_get_page(skb_shinfo(skb)->frags[i].page); | ||
134 | |||
135 | if (skb_has_frags(skb)) | ||
136 | skb_clone_fraglist(skb); | ||
137 | @@ -1105,7 +1105,7 @@ drop_pages: | ||
138 | skb_shinfo(skb)->nr_frags = i; | ||
139 | |||
140 | for (; i < nfrags; i++) | ||
141 | - put_page(skb_shinfo(skb)->frags[i].page); | ||
142 | + net_put_page(skb_shinfo(skb)->frags[i].page); | ||
143 | |||
144 | if (skb_has_frags(skb)) | ||
145 | skb_drop_fraglist(skb); | ||
146 | @@ -1274,7 +1274,7 @@ pull_pages: | ||
147 | k = 0; | ||
148 | for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { | ||
149 | if (skb_shinfo(skb)->frags[i].size <= eat) { | ||
150 | - put_page(skb_shinfo(skb)->frags[i].page); | ||
151 | + net_put_page(skb_shinfo(skb)->frags[i].page); | ||
152 | eat -= skb_shinfo(skb)->frags[i].size; | ||
153 | } else { | ||
154 | skb_shinfo(skb)->frags[k] = skb_shinfo(skb)->frags[i]; | ||
155 | @@ -1375,7 +1375,7 @@ EXPORT_SYMBOL(skb_copy_bits); | ||
156 | */ | ||
157 | static void sock_spd_release(struct splice_pipe_desc *spd, unsigned int i) | ||
158 | { | ||
159 | - put_page(spd->pages[i]); | ||
160 | + net_put_page(spd->pages[i]); | ||
161 | } | ||
162 | |||
163 | static inline struct page *linear_to_page(struct page *page, unsigned int *len, | ||
164 | @@ -1399,7 +1399,7 @@ new_page: | ||
165 | off = sk->sk_sndmsg_off; | ||
166 | mlen = PAGE_SIZE - off; | ||
167 | if (mlen < 64 && mlen < *len) { | ||
168 | - put_page(p); | ||
169 | + net_put_page(p); | ||
170 | goto new_page; | ||
171 | } | ||
172 | |||
173 | @@ -1409,7 +1409,7 @@ new_page: | ||
174 | memcpy(page_address(p) + off, page_address(page) + *offset, *len); | ||
175 | sk->sk_sndmsg_off += *len; | ||
176 | *offset = off; | ||
177 | - get_page(p); | ||
178 | + net_get_page(p); | ||
179 | |||
180 | return p; | ||
181 | } | ||
182 | @@ -1430,7 +1430,7 @@ static inline int spd_fill_page(struct s | ||
183 | if (!page) | ||
184 | return 1; | ||
185 | } else | ||
186 | - get_page(page); | ||
187 | + net_get_page(page); | ||
188 | |||
189 | spd->pages[spd->nr_pages] = page; | ||
190 | spd->partial[spd->nr_pages].len = *len; | ||
191 | @@ -2060,7 +2060,7 @@ static inline void skb_split_no_header(s | ||
192 | * where splitting is expensive. | ||
193 | * 2. Split is accurately. We make this. | ||
194 | */ | ||
195 | - get_page(skb_shinfo(skb)->frags[i].page); | ||
196 | + net_get_page(skb_shinfo(skb)->frags[i].page); | ||
197 | skb_shinfo(skb1)->frags[0].page_offset += len - pos; | ||
198 | skb_shinfo(skb1)->frags[0].size -= len - pos; | ||
199 | skb_shinfo(skb)->frags[i].size = len - pos; | ||
200 | @@ -2182,7 +2182,7 @@ int skb_shift(struct sk_buff *tgt, struc | ||
201 | to++; | ||
202 | |||
203 | } else { | ||
204 | - get_page(fragfrom->page); | ||
205 | + net_get_page(fragfrom->page); | ||
206 | fragto->page = fragfrom->page; | ||
207 | fragto->page_offset = fragfrom->page_offset; | ||
208 | fragto->size = todo; | ||
209 | @@ -2204,7 +2204,7 @@ int skb_shift(struct sk_buff *tgt, struc | ||
210 | fragto = &skb_shinfo(tgt)->frags[merge]; | ||
211 | |||
212 | fragto->size += fragfrom->size; | ||
213 | - put_page(fragfrom->page); | ||
214 | + net_put_page(fragfrom->page); | ||
215 | } | ||
216 | |||
217 | /* Reposition in the original skb */ | ||
218 | @@ -2602,7 +2602,7 @@ struct sk_buff *skb_segment(struct sk_bu | ||
219 | |||
220 | while (pos < offset + len && i < nfrags) { | ||
221 | *frag = skb_shinfo(skb)->frags[i]; | ||
222 | - get_page(frag->page); | ||
223 | + net_get_page(frag->page); | ||
224 | size = frag->size; | ||
225 | |||
226 | if (pos < offset) { | ||
227 | diff -upkr linux-2.6.34/net/ipv4/ip_output.c linux-2.6.34/net/ipv4/ip_output.c | ||
228 | --- linux-2.6.34/net/ipv4/ip_output.c 2010-05-17 01:17:36.000000000 +0400 | ||
229 | +++ linux-2.6.34/net/ipv4/ip_output.c 2010-05-24 14:51:40.000000000 +0400 | ||
230 | @@ -1024,7 +1024,7 @@ alloc_new_skb: | ||
231 | err = -EMSGSIZE; | ||
232 | goto error; | ||
233 | } | ||
234 | - get_page(page); | ||
235 | + net_get_page(page); | ||
236 | skb_fill_page_desc(skb, i, page, sk->sk_sndmsg_off, 0); | ||
237 | frag = &skb_shinfo(skb)->frags[i]; | ||
238 | } | ||
239 | @@ -1182,7 +1182,7 @@ ssize_t ip_append_page(struct sock *sk, | ||
240 | if (skb_can_coalesce(skb, i, page, offset)) { | ||
241 | skb_shinfo(skb)->frags[i-1].size += len; | ||
242 | } else if (i < MAX_SKB_FRAGS) { | ||
243 | - get_page(page); | ||
244 | + net_get_page(page); | ||
245 | skb_fill_page_desc(skb, i, page, offset, len); | ||
246 | } else { | ||
247 | err = -EMSGSIZE; | ||
248 | diff -upkr linux-2.6.34/net/ipv4/Makefile linux-2.6.34/net/ipv4/Makefile | ||
249 | --- linux-2.6.34/net/ipv4/Makefile 2010-05-17 01:17:36.000000000 +0400 | ||
250 | +++ linux-2.6.34/net/ipv4/Makefile 2010-05-24 14:51:40.000000000 +0400 | ||
251 | @@ -49,6 +49,7 @@ obj-$(CONFIG_TCP_CONG_LP) += tcp_lp.o | ||
252 | obj-$(CONFIG_TCP_CONG_YEAH) += tcp_yeah.o | ||
253 | obj-$(CONFIG_TCP_CONG_ILLINOIS) += tcp_illinois.o | ||
254 | obj-$(CONFIG_NETLABEL) += cipso_ipv4.o | ||
255 | +obj-$(CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION) += tcp_zero_copy.o | ||
256 | |||
257 | obj-$(CONFIG_XFRM) += xfrm4_policy.o xfrm4_state.o xfrm4_input.o \ | ||
258 | xfrm4_output.o | ||
259 | diff -upkr linux-2.6.34/net/ipv4/tcp.c linux-2.6.34/net/ipv4/tcp.c | ||
260 | --- linux-2.6.34/net/ipv4/tcp.c 2010-05-17 01:17:36.000000000 +0400 | ||
261 | +++ linux-2.6.34/net/ipv4/tcp.c 2010-05-24 14:51:40.000000000 +0400 | ||
262 | @@ -800,7 +800,7 @@ new_segment: | ||
263 | if (can_coalesce) { | ||
264 | skb_shinfo(skb)->frags[i - 1].size += copy; | ||
265 | } else { | ||
266 | - get_page(page); | ||
267 | + net_get_page(page); | ||
268 | skb_fill_page_desc(skb, i, page, offset, copy); | ||
269 | } | ||
270 | |||
271 | @@ -1009,7 +1009,7 @@ new_segment: | ||
272 | goto new_segment; | ||
273 | } else if (page) { | ||
274 | if (off == PAGE_SIZE) { | ||
275 | - put_page(page); | ||
276 | + net_put_page(page); | ||
277 | TCP_PAGE(sk) = page = NULL; | ||
278 | off = 0; | ||
279 | } | ||
280 | @@ -1050,9 +1050,9 @@ new_segment: | ||
281 | } else { | ||
282 | skb_fill_page_desc(skb, i, page, off, copy); | ||
283 | if (TCP_PAGE(sk)) { | ||
284 | - get_page(page); | ||
285 | + net_get_page(page); | ||
286 | } else if (off + copy < PAGE_SIZE) { | ||
287 | - get_page(page); | ||
288 | + net_get_page(page); | ||
289 | TCP_PAGE(sk) = page; | ||
290 | } | ||
291 | } | ||
292 | diff -upkr linux-2.6.34/net/ipv4/tcp_output.c linux-2.6.34/net/ipv4/tcp_output.c | ||
293 | --- linux-2.6.34/net/ipv4/tcp_output.c 2010-05-17 01:17:36.000000000 +0400 | ||
294 | +++ linux-2.6.34/net/ipv4/tcp_output.c 2010-05-24 14:51:40.000000000 +0400 | ||
295 | @@ -1084,7 +1084,7 @@ static void __pskb_trim_head(struct sk_b | ||
296 | k = 0; | ||
297 | for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { | ||
298 | if (skb_shinfo(skb)->frags[i].size <= eat) { | ||
299 | - put_page(skb_shinfo(skb)->frags[i].page); | ||
300 | + net_put_page(skb_shinfo(skb)->frags[i].page); | ||
301 | eat -= skb_shinfo(skb)->frags[i].size; | ||
302 | } else { | ||
303 | skb_shinfo(skb)->frags[k] = skb_shinfo(skb)->frags[i]; | ||
304 | diff -upkr linux-2.6.34/net/ipv4/tcp_zero_copy.c linux-2.6.34/net/ipv4/tcp_zero_copy.c | ||
305 | --- linux-2.6.34/net/ipv4/tcp_zero_copy.c 2010-03-01 17:30:31.000000000 +0300 | ||
306 | +++ linux-2.6.34/net/ipv4/tcp_zero_copy.c 2010-05-24 14:51:40.000000000 +0400 | ||
307 | @@ -0,0 +1,49 @@ | ||
308 | +/* | ||
309 | + * Support routines for TCP zero copy transmit | ||
310 | + * | ||
311 | + * Created by Vladislav Bolkhovitin | ||
312 | + * | ||
313 | + * This program is free software; you can redistribute it and/or | ||
314 | + * modify it under the terms of the GNU General Public License | ||
315 | + * version 2 as published by the Free Software Foundation. | ||
316 | + */ | ||
317 | + | ||
318 | +#include <linux/skbuff.h> | ||
319 | + | ||
320 | +net_get_page_callback_t net_get_page_callback __read_mostly; | ||
321 | +EXPORT_SYMBOL(net_get_page_callback); | ||
322 | + | ||
323 | +net_put_page_callback_t net_put_page_callback __read_mostly; | ||
324 | +EXPORT_SYMBOL(net_put_page_callback); | ||
325 | + | ||
326 | +/* | ||
327 | + * Caller of this function must ensure that at the moment when it's called | ||
328 | + * there are no pages in the system with net_priv field set to non-zero | ||
329 | + * value. Hence, this function, as well as net_get_page() and net_put_page(), | ||
330 | + * don't need any protection. | ||
331 | + */ | ||
332 | +int net_set_get_put_page_callbacks( | ||
333 | + net_get_page_callback_t get_callback, | ||
334 | + net_put_page_callback_t put_callback) | ||
335 | +{ | ||
336 | + int res = 0; | ||
337 | + | ||
338 | + if ((net_get_page_callback != NULL) && (get_callback != NULL) && | ||
339 | + (net_get_page_callback != get_callback)) { | ||
340 | + res = -EBUSY; | ||
341 | + goto out; | ||
342 | + } | ||
343 | + | ||
344 | + if ((net_put_page_callback != NULL) && (put_callback != NULL) && | ||
345 | + (net_put_page_callback != put_callback)) { | ||
346 | + res = -EBUSY; | ||
347 | + goto out; | ||
348 | + } | ||
349 | + | ||
350 | + net_get_page_callback = get_callback; | ||
351 | + net_put_page_callback = put_callback; | ||
352 | + | ||
353 | +out: | ||
354 | + return res; | ||
355 | +} | ||
356 | +EXPORT_SYMBOL(net_set_get_put_page_callbacks); | ||
357 | diff -upkr linux-2.6.34/net/ipv6/ip6_output.c linux-2.6.34/net/ipv6/ip6_output.c | ||
358 | --- linux-2.6.34/net/ipv6/ip6_output.c 2010-05-17 01:17:36.000000000 +0400 | ||
359 | +++ linux-2.6.34/net/ipv6/ip6_output.c 2010-05-24 14:51:40.000000000 +0400 | ||
360 | @@ -1382,7 +1382,7 @@ alloc_new_skb: | ||
361 | err = -EMSGSIZE; | ||
362 | goto error; | ||
363 | } | ||
364 | - get_page(page); | ||
365 | + net_get_page(page); | ||
366 | skb_fill_page_desc(skb, i, page, sk->sk_sndmsg_off, 0); | ||
367 | frag = &skb_shinfo(skb)->frags[i]; | ||
368 | } | ||
369 | diff -upkr linux-2.6.34/net/Kconfig linux-2.6.34/net/Kconfig | ||
370 | --- linux-2.6.34/net/Kconfig 2010-05-17 01:17:36.000000000 +0400 | ||
371 | +++ linux-2.6.34/net/Kconfig 2010-05-24 14:51:40.000000000 +0400 | ||
372 | @@ -72,6 +72,18 @@ config INET | ||
373 | |||
374 | Short answer: say Y. | ||
375 | |||
376 | +config TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION | ||
377 | + bool "TCP/IP zero-copy transfer completion notification" | ||
378 | + depends on INET | ||
379 | + default SCST_ISCSI | ||
380 | + ---help--- | ||
381 | + Adds support for sending a notification upon completion of a | ||
382 | + zero-copy TCP/IP transfer. This can speed up certain TCP/IP | ||
383 | + software. Currently this is only used by the iSCSI target driver | ||
384 | + iSCSI-SCST. | ||
385 | + | ||
386 | + If unsure, say N. | ||
387 | + | ||
388 | if INET | ||
389 | source "net/ipv4/Kconfig" | ||
390 | source "net/ipv6/Kconfig" | ||
diff --git a/testing/linux-scst/scst_exec_req_fifo-2.6.34.patch b/testing/linux-scst/scst_exec_req_fifo-2.6.34.patch new file mode 100644 index 0000000000..3a734bb645 --- /dev/null +++ b/testing/linux-scst/scst_exec_req_fifo-2.6.34.patch | |||
@@ -0,0 +1,529 @@ | |||
1 | diff -upkr linux-2.6.34/block/blk-map.c linux-2.6.34/block/blk-map.c | ||
2 | --- linux-2.6.34/block/blk-map.c 2010-05-17 01:17:36.000000000 +0400 | ||
3 | +++ linux-2.6.34/block/blk-map.c 2010-05-24 15:19:49.000000000 +0400 | ||
4 | @@ -5,6 +5,8 @@ | ||
5 | #include <linux/module.h> | ||
6 | #include <linux/bio.h> | ||
7 | #include <linux/blkdev.h> | ||
8 | +#include <linux/scatterlist.h> | ||
9 | +#include <linux/slab.h> | ||
10 | #include <scsi/sg.h> /* for struct sg_iovec */ | ||
11 | |||
12 | #include "blk.h" | ||
13 | @@ -271,6 +273,336 @@ int blk_rq_unmap_user(struct bio *bio) | ||
14 | } | ||
15 | EXPORT_SYMBOL(blk_rq_unmap_user); | ||
16 | |||
17 | +struct blk_kern_sg_work { | ||
18 | + atomic_t bios_inflight; | ||
19 | + struct sg_table sg_table; | ||
20 | + struct scatterlist *src_sgl; | ||
21 | +}; | ||
22 | + | ||
23 | +static void blk_free_kern_sg_work(struct blk_kern_sg_work *bw) | ||
24 | +{ | ||
25 | + sg_free_table(&bw->sg_table); | ||
26 | + kfree(bw); | ||
27 | + return; | ||
28 | +} | ||
29 | + | ||
30 | +static void blk_bio_map_kern_endio(struct bio *bio, int err) | ||
31 | +{ | ||
32 | + struct blk_kern_sg_work *bw = bio->bi_private; | ||
33 | + | ||
34 | + if (bw != NULL) { | ||
35 | + /* Decrement the bios in processing and, if zero, free */ | ||
36 | + BUG_ON(atomic_read(&bw->bios_inflight) <= 0); | ||
37 | + if (atomic_dec_and_test(&bw->bios_inflight)) { | ||
38 | + if ((bio_data_dir(bio) == READ) && (err == 0)) { | ||
39 | + unsigned long flags; | ||
40 | + | ||
41 | + local_irq_save(flags); /* to protect KMs */ | ||
42 | + sg_copy(bw->src_sgl, bw->sg_table.sgl, 0, 0, | ||
43 | + KM_BIO_DST_IRQ, KM_BIO_SRC_IRQ); | ||
44 | + local_irq_restore(flags); | ||
45 | + } | ||
46 | + blk_free_kern_sg_work(bw); | ||
47 | + } | ||
48 | + } | ||
49 | + | ||
50 | + bio_put(bio); | ||
51 | + return; | ||
52 | +} | ||
53 | + | ||
54 | +static int blk_rq_copy_kern_sg(struct request *rq, struct scatterlist *sgl, | ||
55 | + int nents, struct blk_kern_sg_work **pbw, | ||
56 | + gfp_t gfp, gfp_t page_gfp) | ||
57 | +{ | ||
58 | + int res = 0, i; | ||
59 | + struct scatterlist *sg; | ||
60 | + struct scatterlist *new_sgl; | ||
61 | + int new_sgl_nents; | ||
62 | + size_t len = 0, to_copy; | ||
63 | + struct blk_kern_sg_work *bw; | ||
64 | + | ||
65 | + bw = kzalloc(sizeof(*bw), gfp); | ||
66 | + if (bw == NULL) | ||
67 | + goto out; | ||
68 | + | ||
69 | + bw->src_sgl = sgl; | ||
70 | + | ||
71 | + for_each_sg(sgl, sg, nents, i) | ||
72 | + len += sg->length; | ||
73 | + to_copy = len; | ||
74 | + | ||
75 | + new_sgl_nents = PFN_UP(len); | ||
76 | + | ||
77 | + res = sg_alloc_table(&bw->sg_table, new_sgl_nents, gfp); | ||
78 | + if (res != 0) | ||
79 | + goto out_free_bw; | ||
80 | + | ||
81 | + new_sgl = bw->sg_table.sgl; | ||
82 | + | ||
83 | + for_each_sg(new_sgl, sg, new_sgl_nents, i) { | ||
84 | + struct page *pg; | ||
85 | + | ||
86 | + pg = alloc_page(page_gfp); | ||
87 | + if (pg == NULL) | ||
88 | + goto err_free_new_sgl; | ||
89 | + | ||
90 | + sg_assign_page(sg, pg); | ||
91 | + sg->length = min_t(size_t, PAGE_SIZE, len); | ||
92 | + | ||
93 | + len -= PAGE_SIZE; | ||
94 | + } | ||
95 | + | ||
96 | + if (rq_data_dir(rq) == WRITE) { | ||
97 | + /* | ||
98 | + * We need to limit amount of copied data to to_copy, because | ||
99 | + * sgl might have the last element in sgl not marked as last in | ||
100 | + * SG chaining. | ||
101 | + */ | ||
102 | + sg_copy(new_sgl, sgl, 0, to_copy, | ||
103 | + KM_USER0, KM_USER1); | ||
104 | + } | ||
105 | + | ||
106 | + *pbw = bw; | ||
107 | + /* | ||
108 | + * REQ_COPY_USER name is misleading. It should be something like | ||
109 | + * REQ_HAS_TAIL_SPACE_FOR_PADDING. | ||
110 | + */ | ||
111 | + rq->cmd_flags |= REQ_COPY_USER; | ||
112 | + | ||
113 | +out: | ||
114 | + return res; | ||
115 | + | ||
116 | +err_free_new_sgl: | ||
117 | + for_each_sg(new_sgl, sg, new_sgl_nents, i) { | ||
118 | + struct page *pg = sg_page(sg); | ||
119 | + if (pg == NULL) | ||
120 | + break; | ||
121 | + __free_page(pg); | ||
122 | + } | ||
123 | + sg_free_table(&bw->sg_table); | ||
124 | + | ||
125 | +out_free_bw: | ||
126 | + kfree(bw); | ||
127 | + res = -ENOMEM; | ||
128 | + goto out; | ||
129 | +} | ||
130 | + | ||
131 | +static int __blk_rq_map_kern_sg(struct request *rq, struct scatterlist *sgl, | ||
132 | + int nents, struct blk_kern_sg_work *bw, gfp_t gfp) | ||
133 | +{ | ||
134 | + int res; | ||
135 | + struct request_queue *q = rq->q; | ||
136 | + int rw = rq_data_dir(rq); | ||
137 | + int max_nr_vecs, i; | ||
138 | + size_t tot_len; | ||
139 | + bool need_new_bio; | ||
140 | + struct scatterlist *sg, *prev_sg = NULL; | ||
141 | + struct bio *bio = NULL, *hbio = NULL, *tbio = NULL; | ||
142 | + int bios; | ||
143 | + | ||
144 | + if (unlikely((sgl == NULL) || (sgl->length == 0) || (nents <= 0))) { | ||
145 | + WARN_ON(1); | ||
146 | + res = -EINVAL; | ||
147 | + goto out; | ||
148 | + } | ||
149 | + | ||
150 | + /* | ||
151 | + * Let's keep each bio allocation inside a single page to decrease | ||
152 | + * probability of failure. | ||
153 | + */ | ||
154 | + max_nr_vecs = min_t(size_t, | ||
155 | + ((PAGE_SIZE - sizeof(struct bio)) / sizeof(struct bio_vec)), | ||
156 | + BIO_MAX_PAGES); | ||
157 | + | ||
158 | + need_new_bio = true; | ||
159 | + tot_len = 0; | ||
160 | + bios = 0; | ||
161 | + for_each_sg(sgl, sg, nents, i) { | ||
162 | + struct page *page = sg_page(sg); | ||
163 | + void *page_addr = page_address(page); | ||
164 | + size_t len = sg->length, l; | ||
165 | + size_t offset = sg->offset; | ||
166 | + | ||
167 | + tot_len += len; | ||
168 | + prev_sg = sg; | ||
169 | + | ||
170 | + /* | ||
171 | + * Each segment must be aligned on DMA boundary and | ||
172 | + * not on stack. The last one may have unaligned | ||
173 | + * length as long as the total length is aligned to | ||
174 | + * DMA padding alignment. | ||
175 | + */ | ||
176 | + if (i == nents - 1) | ||
177 | + l = 0; | ||
178 | + else | ||
179 | + l = len; | ||
180 | + if (((sg->offset | l) & queue_dma_alignment(q)) || | ||
181 | + (page_addr && object_is_on_stack(page_addr + sg->offset))) { | ||
182 | + res = -EINVAL; | ||
183 | + goto out_free_bios; | ||
184 | + } | ||
185 | + | ||
186 | + while (len > 0) { | ||
187 | + size_t bytes; | ||
188 | + int rc; | ||
189 | + | ||
190 | + if (need_new_bio) { | ||
191 | + bio = bio_kmalloc(gfp, max_nr_vecs); | ||
192 | + if (bio == NULL) { | ||
193 | + res = -ENOMEM; | ||
194 | + goto out_free_bios; | ||
195 | + } | ||
196 | + | ||
197 | + if (rw == WRITE) | ||
198 | + bio->bi_rw |= 1 << BIO_RW; | ||
199 | + | ||
200 | + bios++; | ||
201 | + bio->bi_private = bw; | ||
202 | + bio->bi_end_io = blk_bio_map_kern_endio; | ||
203 | + | ||
204 | + if (hbio == NULL) | ||
205 | + hbio = tbio = bio; | ||
206 | + else | ||
207 | + tbio = tbio->bi_next = bio; | ||
208 | + } | ||
209 | + | ||
210 | + bytes = min_t(size_t, len, PAGE_SIZE - offset); | ||
211 | + | ||
212 | + rc = bio_add_pc_page(q, bio, page, bytes, offset); | ||
213 | + if (rc < bytes) { | ||
214 | + if (unlikely(need_new_bio || (rc < 0))) { | ||
215 | + if (rc < 0) | ||
216 | + res = rc; | ||
217 | + else | ||
218 | + res = -EIO; | ||
219 | + goto out_free_bios; | ||
220 | + } else { | ||
221 | + need_new_bio = true; | ||
222 | + len -= rc; | ||
223 | + offset += rc; | ||
224 | + continue; | ||
225 | + } | ||
226 | + } | ||
227 | + | ||
228 | + need_new_bio = false; | ||
229 | + offset = 0; | ||
230 | + len -= bytes; | ||
231 | + page = nth_page(page, 1); | ||
232 | + } | ||
233 | + } | ||
234 | + | ||
235 | + if (hbio == NULL) { | ||
236 | + res = -EINVAL; | ||
237 | + goto out_free_bios; | ||
238 | + } | ||
239 | + | ||
240 | + /* Total length must be aligned on DMA padding alignment */ | ||
241 | + if ((tot_len & q->dma_pad_mask) && | ||
242 | + !(rq->cmd_flags & REQ_COPY_USER)) { | ||
243 | + res = -EINVAL; | ||
244 | + goto out_free_bios; | ||
245 | + } | ||
246 | + | ||
247 | + if (bw != NULL) | ||
248 | + atomic_set(&bw->bios_inflight, bios); | ||
249 | + | ||
250 | + while (hbio != NULL) { | ||
251 | + bio = hbio; | ||
252 | + hbio = hbio->bi_next; | ||
253 | + bio->bi_next = NULL; | ||
254 | + | ||
255 | + blk_queue_bounce(q, &bio); | ||
256 | + | ||
257 | + res = blk_rq_append_bio(q, rq, bio); | ||
258 | + if (unlikely(res != 0)) { | ||
259 | + bio->bi_next = hbio; | ||
260 | + hbio = bio; | ||
261 | + /* We can have one or more bios bounced */ | ||
262 | + goto out_unmap_bios; | ||
263 | + } | ||
264 | + } | ||
265 | + | ||
266 | + rq->buffer = NULL; | ||
267 | +out: | ||
268 | + return res; | ||
269 | + | ||
270 | +out_free_bios: | ||
271 | + while (hbio != NULL) { | ||
272 | + bio = hbio; | ||
273 | + hbio = hbio->bi_next; | ||
274 | + bio_put(bio); | ||
275 | + } | ||
276 | + goto out; | ||
277 | + | ||
278 | +out_unmap_bios: | ||
279 | + blk_rq_unmap_kern_sg(rq, res); | ||
280 | + goto out; | ||
281 | +} | ||
282 | + | ||
283 | +/** | ||
284 | + * blk_rq_map_kern_sg - map kernel data to a request, for REQ_TYPE_BLOCK_PC | ||
285 | + * @rq: request to fill | ||
286 | + * @sgl: area to map | ||
287 | + * @nents: number of elements in @sgl | ||
288 | + * @gfp: memory allocation flags | ||
289 | + * | ||
290 | + * Description: | ||
291 | + * Data will be mapped directly if possible. Otherwise a bounce | ||
292 | + * buffer will be used. | ||
293 | + */ | ||
294 | +int blk_rq_map_kern_sg(struct request *rq, struct scatterlist *sgl, | ||
295 | + int nents, gfp_t gfp) | ||
296 | +{ | ||
297 | + int res; | ||
298 | + | ||
299 | + res = __blk_rq_map_kern_sg(rq, sgl, nents, NULL, gfp); | ||
300 | + if (unlikely(res != 0)) { | ||
301 | + struct blk_kern_sg_work *bw = NULL; | ||
302 | + | ||
303 | + res = blk_rq_copy_kern_sg(rq, sgl, nents, &bw, | ||
304 | + gfp, rq->q->bounce_gfp | gfp); | ||
305 | + if (unlikely(res != 0)) | ||
306 | + goto out; | ||
307 | + | ||
308 | + res = __blk_rq_map_kern_sg(rq, bw->sg_table.sgl, | ||
309 | + bw->sg_table.nents, bw, gfp); | ||
310 | + if (res != 0) { | ||
311 | + blk_free_kern_sg_work(bw); | ||
312 | + goto out; | ||
313 | + } | ||
314 | + } | ||
315 | + | ||
316 | + rq->buffer = NULL; | ||
317 | + | ||
318 | +out: | ||
319 | + return res; | ||
320 | +} | ||
321 | +EXPORT_SYMBOL(blk_rq_map_kern_sg); | ||
322 | + | ||
323 | +/** | ||
324 | + * blk_rq_unmap_kern_sg - unmap a request with kernel sg | ||
325 | + * @rq: request to unmap | ||
326 | + * @err: non-zero error code | ||
327 | + * | ||
328 | + * Description: | ||
329 | + * Unmap a rq previously mapped by blk_rq_map_kern_sg(). Must be called | ||
330 | + * only in case of an error! | ||
331 | + */ | ||
332 | +void blk_rq_unmap_kern_sg(struct request *rq, int err) | ||
333 | +{ | ||
334 | + struct bio *bio = rq->bio; | ||
335 | + | ||
336 | + while (bio) { | ||
337 | + struct bio *b = bio; | ||
338 | + bio = bio->bi_next; | ||
339 | + b->bi_end_io(b, err); | ||
340 | + } | ||
341 | + rq->bio = NULL; | ||
342 | + | ||
343 | + return; | ||
344 | +} | ||
345 | +EXPORT_SYMBOL(blk_rq_unmap_kern_sg); | ||
346 | + | ||
347 | /** | ||
348 | * blk_rq_map_kern - map kernel data to a request, for REQ_TYPE_BLOCK_PC usage | ||
349 | * @q: request queue where request should be inserted | ||
350 | diff -upkr linux-2.6.34/include/linux/blkdev.h linux-2.6.34/include/linux/blkdev.h | ||
351 | --- linux-2.6.34/include/linux/blkdev.h 2010-05-17 01:17:36.000000000 +0400 | ||
352 | +++ linux-2.6.34/include/linux/blkdev.h 2010-05-24 14:51:22.000000000 +0400 | ||
353 | @@ -713,6 +713,8 @@ extern unsigned long blk_max_low_pfn, bl | ||
354 | #define BLK_DEFAULT_SG_TIMEOUT (60 * HZ) | ||
355 | #define BLK_MIN_SG_TIMEOUT (7 * HZ) | ||
356 | |||
357 | +#define SCSI_EXEC_REQ_FIFO_DEFINED | ||
358 | + | ||
359 | #ifdef CONFIG_BOUNCE | ||
360 | extern int init_emergency_isa_pool(void); | ||
361 | extern void blk_queue_bounce(struct request_queue *q, struct bio **bio); | ||
362 | @@ -828,6 +830,9 @@ extern int blk_rq_map_kern(struct reques | ||
363 | extern int blk_rq_map_user_iov(struct request_queue *, struct request *, | ||
364 | struct rq_map_data *, struct sg_iovec *, int, | ||
365 | unsigned int, gfp_t); | ||
366 | +extern int blk_rq_map_kern_sg(struct request *rq, struct scatterlist *sgl, | ||
367 | + int nents, gfp_t gfp); | ||
368 | +extern void blk_rq_unmap_kern_sg(struct request *rq, int err); | ||
369 | extern int blk_execute_rq(struct request_queue *, struct gendisk *, | ||
370 | struct request *, int); | ||
371 | extern void blk_execute_rq_nowait(struct request_queue *, struct gendisk *, | ||
372 | diff -upkr linux-2.6.34/include/linux/scatterlist.h linux-2.6.34/include/linux/scatterlist.h | ||
373 | --- linux-2.6.34/include/linux/scatterlist.h 2010-05-17 01:17:36.000000000 +0400 | ||
374 | +++ linux-2.6.34/include/linux/scatterlist.h 2010-05-24 14:51:22.000000000 +0400 | ||
375 | @@ -3,6 +3,7 @@ | ||
376 | |||
377 | #include <asm/types.h> | ||
378 | #include <asm/scatterlist.h> | ||
379 | +#include <asm/kmap_types.h> | ||
380 | #include <linux/mm.h> | ||
381 | #include <linux/string.h> | ||
382 | #include <asm/io.h> | ||
383 | @@ -218,6 +219,10 @@ size_t sg_copy_from_buffer(struct scatte | ||
384 | size_t sg_copy_to_buffer(struct scatterlist *sgl, unsigned int nents, | ||
385 | void *buf, size_t buflen); | ||
386 | |||
387 | +int sg_copy(struct scatterlist *dst_sg, struct scatterlist *src_sg, | ||
388 | + int nents_to_copy, size_t copy_len, | ||
389 | + enum km_type d_km_type, enum km_type s_km_type); | ||
390 | + | ||
391 | /* | ||
392 | * Maximum number of entries that will be allocated in one piece, if | ||
393 | * a list larger than this is required then chaining will be utilized. | ||
394 | diff -upkr linux-2.6.34/lib/scatterlist.c linux-2.6.34/lib/scatterlist.c | ||
395 | --- linux-2.6.34/lib/scatterlist.c 2010-05-17 01:17:36.000000000 +0400 | ||
396 | +++ linux-2.6.34/lib/scatterlist.c 2010-05-24 14:51:22.000000000 +0400 | ||
397 | @@ -494,3 +494,132 @@ size_t sg_copy_to_buffer(struct scatterl | ||
398 | return sg_copy_buffer(sgl, nents, buf, buflen, 1); | ||
399 | } | ||
400 | EXPORT_SYMBOL(sg_copy_to_buffer); | ||
401 | + | ||
402 | +/* | ||
403 | + * Can switch to the next dst_sg element, so, to copy to strictly only | ||
404 | + * one dst_sg element, it must be either last in the chain, or | ||
405 | + * copy_len == dst_sg->length. | ||
406 | + */ | ||
407 | +static int sg_copy_elem(struct scatterlist **pdst_sg, size_t *pdst_len, | ||
408 | + size_t *pdst_offs, struct scatterlist *src_sg, | ||
409 | + size_t copy_len, | ||
410 | + enum km_type d_km_type, enum km_type s_km_type) | ||
411 | +{ | ||
412 | + int res = 0; | ||
413 | + struct scatterlist *dst_sg; | ||
414 | + size_t src_len, dst_len, src_offs, dst_offs; | ||
415 | + struct page *src_page, *dst_page; | ||
416 | + | ||
417 | + dst_sg = *pdst_sg; | ||
418 | + dst_len = *pdst_len; | ||
419 | + dst_offs = *pdst_offs; | ||
420 | + dst_page = sg_page(dst_sg); | ||
421 | + | ||
422 | + src_page = sg_page(src_sg); | ||
423 | + src_len = src_sg->length; | ||
424 | + src_offs = src_sg->offset; | ||
425 | + | ||
426 | + do { | ||
427 | + void *saddr, *daddr; | ||
428 | + size_t n; | ||
429 | + | ||
430 | + saddr = kmap_atomic(src_page + | ||
431 | + (src_offs >> PAGE_SHIFT), s_km_type) + | ||
432 | + (src_offs & ~PAGE_MASK); | ||
433 | + daddr = kmap_atomic(dst_page + | ||
434 | + (dst_offs >> PAGE_SHIFT), d_km_type) + | ||
435 | + (dst_offs & ~PAGE_MASK); | ||
436 | + | ||
437 | + if (((src_offs & ~PAGE_MASK) == 0) && | ||
438 | + ((dst_offs & ~PAGE_MASK) == 0) && | ||
439 | + (src_len >= PAGE_SIZE) && (dst_len >= PAGE_SIZE) && | ||
440 | + (copy_len >= PAGE_SIZE)) { | ||
441 | + copy_page(daddr, saddr); | ||
442 | + n = PAGE_SIZE; | ||
443 | + } else { | ||
444 | + n = min_t(size_t, PAGE_SIZE - (dst_offs & ~PAGE_MASK), | ||
445 | + PAGE_SIZE - (src_offs & ~PAGE_MASK)); | ||
446 | + n = min(n, src_len); | ||
447 | + n = min(n, dst_len); | ||
448 | + n = min_t(size_t, n, copy_len); | ||
449 | + memcpy(daddr, saddr, n); | ||
450 | + } | ||
451 | + dst_offs += n; | ||
452 | + src_offs += n; | ||
453 | + | ||
454 | + kunmap_atomic(saddr, s_km_type); | ||
455 | + kunmap_atomic(daddr, d_km_type); | ||
456 | + | ||
457 | + res += n; | ||
458 | + copy_len -= n; | ||
459 | + if (copy_len == 0) | ||
460 | + goto out; | ||
461 | + | ||
462 | + src_len -= n; | ||
463 | + dst_len -= n; | ||
464 | + if (dst_len == 0) { | ||
465 | + dst_sg = sg_next(dst_sg); | ||
466 | + if (dst_sg == NULL) | ||
467 | + goto out; | ||
468 | + dst_page = sg_page(dst_sg); | ||
469 | + dst_len = dst_sg->length; | ||
470 | + dst_offs = dst_sg->offset; | ||
471 | + } | ||
472 | + } while (src_len > 0); | ||
473 | + | ||
474 | +out: | ||
475 | + *pdst_sg = dst_sg; | ||
476 | + *pdst_len = dst_len; | ||
477 | + *pdst_offs = dst_offs; | ||
478 | + return res; | ||
479 | +} | ||
480 | + | ||
481 | +/** | ||
482 | + * sg_copy - copy one SG vector to another | ||
483 | + * @dst_sg: destination SG | ||
484 | + * @src_sg: source SG | ||
485 | + * @nents_to_copy: maximum number of entries to copy | ||
486 | + * @copy_len: maximum amount of data to copy. If 0, then copy all. | ||
487 | + * @d_km_type: kmap_atomic type for the destination SG | ||
488 | + * @s_km_type: kmap_atomic type for the source SG | ||
489 | + * | ||
490 | + * Description: | ||
491 | + * Data from the source SG vector will be copied to the destination SG | ||
492 | + * vector. End of the vectors will be determined by sg_next() returning | ||
493 | + * NULL. Returns number of bytes copied. | ||
494 | + */ | ||
495 | +int sg_copy(struct scatterlist *dst_sg, struct scatterlist *src_sg, | ||
496 | + int nents_to_copy, size_t copy_len, | ||
497 | + enum km_type d_km_type, enum km_type s_km_type) | ||
498 | +{ | ||
499 | + int res = 0; | ||
500 | + size_t dst_len, dst_offs; | ||
501 | + | ||
502 | + if (copy_len == 0) | ||
503 | + copy_len = 0x7FFFFFFF; /* copy all */ | ||
504 | + | ||
505 | + if (nents_to_copy == 0) | ||
506 | + nents_to_copy = 0x7FFFFFFF; /* copy all */ | ||
507 | + | ||
508 | + dst_len = dst_sg->length; | ||
509 | + dst_offs = dst_sg->offset; | ||
510 | + | ||
511 | + do { | ||
512 | + int copied = sg_copy_elem(&dst_sg, &dst_len, &dst_offs, | ||
513 | + src_sg, copy_len, d_km_type, s_km_type); | ||
514 | + copy_len -= copied; | ||
515 | + res += copied; | ||
516 | + if ((copy_len == 0) || (dst_sg == NULL)) | ||
517 | + goto out; | ||
518 | + | ||
519 | + nents_to_copy--; | ||
520 | + if (nents_to_copy == 0) | ||
521 | + goto out; | ||
522 | + | ||
523 | + src_sg = sg_next(src_sg); | ||
524 | + } while (src_sg != NULL); | ||
525 | + | ||
526 | +out: | ||
527 | + return res; | ||
528 | +} | ||
529 | +EXPORT_SYMBOL(sg_copy); | ||
diff --git a/testing/mrtg/APKBUILD b/testing/mrtg/APKBUILD new file mode 100644 index 0000000000..9334db7a47 --- /dev/null +++ b/testing/mrtg/APKBUILD | |||
@@ -0,0 +1,34 @@ | |||
1 | # Contributor: Jeff Bilyk<jbilyk at gmail> | ||
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | pkgname=mrtg | ||
4 | pkgver=2.16.4 | ||
5 | pkgrel=1 | ||
6 | pkgdesc="MRTG Network Latency Monitoring" | ||
7 | url="http://oss.oetiker.ch/mrtg/" | ||
8 | source="http://oss.oetiker.ch/mrtg/pub/$pkgname-$pkgver.tar.gz | ||
9 | mrtg.initd mrtg.confd" | ||
10 | subpackages="$pkgname-doc" | ||
11 | depends="perl" | ||
12 | makedepends="gd-dev libpng-dev zlib-dev" | ||
13 | license="GPL" | ||
14 | |||
15 | _builddir="$srcdir"/$pkgname-$pkgver | ||
16 | |||
17 | build() { | ||
18 | cd "$_builddir" | ||
19 | ./configure --bindir=/usr/bin \ | ||
20 | --libdir=/usr/lib \ | ||
21 | --datadir=/usr/share/doc \ | ||
22 | --mandir=/usr/share/doc/man \ | ||
23 | || return 1 | ||
24 | make | ||
25 | } | ||
26 | |||
27 | package() { | ||
28 | cd "$_builddir" | ||
29 | make install DESTDIR="$pkgdir" | ||
30 | } | ||
31 | |||
32 | md5sums="ec298200d239832ff1648fba488e1a9e mrtg-2.16.4.tar.gz | ||
33 | 47053d5e51ac8eefe3807d5168219f78 mrtg.initd | ||
34 | a8d246d324b90fd1e37cc912d4651372 mrtg.confd" | ||
diff --git a/testing/mrtg/mrtg.confd b/testing/mrtg/mrtg.confd new file mode 100644 index 0000000000..f3be157baf --- /dev/null +++ b/testing/mrtg/mrtg.confd | |||
@@ -0,0 +1,17 @@ | |||
1 | # Copyright 1999-2005 Gentoo Foundation | ||
2 | # Distributed under the terms of the GNU General Public License v2 | ||
3 | # $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/files/mrtg.confd,v 1.1 2005/01/26 10:35:05 ka0ttic Exp $ | ||
4 | |||
5 | MRTG_CONF="/etc/mrtg.conf" | ||
6 | MRTG_PID="/var/run/mrtg.pid" | ||
7 | |||
8 | # uncomment and set the following, if you'd like to run mrtg as a | ||
9 | # different user/group | ||
10 | #MRTG_USER="" | ||
11 | #MRTG_GROUP="" | ||
12 | |||
13 | # uncomment if you'd like to enable logging | ||
14 | #MRTG_LOG="/var/log/mrtg.log" | ||
15 | |||
16 | # set any extra options here | ||
17 | MRTG_OPTS="" | ||
diff --git a/testing/mrtg/mrtg.initd b/testing/mrtg/mrtg.initd new file mode 100644 index 0000000000..31adb2cf0a --- /dev/null +++ b/testing/mrtg/mrtg.initd | |||
@@ -0,0 +1,53 @@ | |||
1 | #!/sbin/runscript | ||
2 | # Copyright 1999-2005 Gentoo Foundation | ||
3 | # Distributed under the terms of the GNU General Public License v2 | ||
4 | # $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/files/mrtg.rc,v 1.7 2007/04/19 19:08:08 cedk Exp $ | ||
5 | |||
6 | depend() { | ||
7 | need net | ||
8 | |||
9 | # if monitoring snmp variables on this machine: | ||
10 | # use net-snmpd | ||
11 | } | ||
12 | |||
13 | checkconfig() { | ||
14 | if ! [ -f "${MRTG_CONF} ]; then | ||
15 | eerror "Please create ${MRTG_CONF} (try man cfgmaker)" | ||
16 | return 1 | ||
17 | fi | ||
18 | |||
19 | mrtg --check ${MRTG_CONF} | ||
20 | return $? | ||
21 | } | ||
22 | |||
23 | start() { | ||
24 | # mrtg will not run if LANG=*utf8 | ||
25 | # use grep instead of bash regexp for bug #159786 | ||
26 | echo $LANG | grep -q -E '((^[A-Za-z0-9\_\@\-]+\.)|(^))([uU][tT][fF]-?8)$' && LANG='C' | ||
27 | |||
28 | checkconfig || return $? | ||
29 | |||
30 | # enable logging? | ||
31 | [ -n "${MRTG_LOG}" ] && \ | ||
32 | MRTG_OPTS="${MRTG_OPTS} --logging ${MRTG_LOG}" | ||
33 | |||
34 | # run as a different user? | ||
35 | [ -n "${MRTG_USER}" ] && \ | ||
36 | MRTG_OPTS="${MRTG_OPTS} --user ${MRTG_USER}" | ||
37 | |||
38 | # run as a different group? | ||
39 | [ -n "${MRTG_GROUP}" ] && \ | ||
40 | MRTG_OPTS="${MRTG_OPTS} --group ${MRTG_GROUP}" | ||
41 | |||
42 | ebegin "Starting mrtg" | ||
43 | start-stop-daemon --start --quiet --pidfile ${MRTG_PID} --name mrtg\ | ||
44 | --exec /usr/bin/mrtg -- --daemon --pid-file=${MRTG_PID} \ | ||
45 | ${MRTG_OPTS} ${MRTG_CONF} >/dev/null | ||
46 | eend $? "Failed to start mrtg" | ||
47 | } | ||
48 | |||
49 | stop() { | ||
50 | ebegin "Stopping mrtg" | ||
51 | start-stop-daemon --stop --quiet --pidfile ${MRTG_PID} | ||
52 | eend $? "Failed to stop mrtg" | ||
53 | } | ||
diff --git a/testing/needbump b/testing/needbump deleted file mode 100644 index 66f21c4703..0000000000 --- a/testing/needbump +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | alsa-utils | ||
2 | bacula | ||
3 | bacula-client | ||
4 | cherokee | ||
5 | collectd | ||
6 | cryptsetup | ||
7 | daemontools | ||
8 | dspam | ||
9 | ebtables | ||
10 | fuse | ||
11 | gtksourceview | ||
12 | hardinfo | ||
13 | hdparm | ||
14 | hping3 | ||
15 | icecast | ||
16 | iproute2 | ||
17 | ircii | ||
18 | ircservices | ||
19 | iscsi-scst | ||
20 | kamailio | ||
21 | libgssglue | ||
22 | libtirpc | ||
23 | libunique | ||
24 | libwmf | ||
25 | live-media | ||
26 | lua-crypto | ||
27 | lua-curl | ||
28 | lua-filesystem | ||
29 | lua-nixio | ||
30 | lua-rexlib | ||
31 | madplay | ||
32 | madwimax | ||
33 | mediaproxy | ||
34 | mplayer | ||
35 | mtx | ||
36 | open-iscsi | ||
37 | osmo | ||
38 | pmacct | ||
39 | pptpclient | ||
40 | prosody | ||
41 | psqlodbc | ||
42 | python-cjson | ||
43 | python-gnutls | ||
44 | qemu | ||
45 | rrdbot | ||
46 | rtapd | ||
47 | rtnppd | ||
48 | sems | ||
49 | sircbot | ||
50 | sisctrl | ||
51 | smartmontools | ||
52 | swish-e | ||
53 | ucspi-tcp | ||
54 | udev | ||
55 | umix | ||
56 | wine | ||
57 | |||
diff --git a/testing/pangomm/APKBUILD b/testing/pangomm/APKBUILD new file mode 100644 index 0000000000..e4ff082e49 --- /dev/null +++ b/testing/pangomm/APKBUILD | |||
@@ -0,0 +1,26 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
2 | pkgname=pangomm | ||
3 | pkgver=2.26.2 | ||
4 | pkgrel=0 | ||
5 | pkgdesc="C++ bindings for pango" | ||
6 | url="http://gtkmm.sourceforge.net/" | ||
7 | license="LGPL" | ||
8 | depends="" | ||
9 | makedepends="pango-dev glibmm-dev cairomm-dev" | ||
10 | depends_dev="$makedepends" | ||
11 | subpackages="$pkgname-dev $pkgname-doc" | ||
12 | source="http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.26/pangomm-$pkgver.tar.bz2" | ||
13 | |||
14 | _builddir="$srcdir"/$pkgname-$pkgver | ||
15 | build() { | ||
16 | cd "$srcdir/$pkgname-$pkgver" | ||
17 | ./configure --prefix=/usr || return 1 | ||
18 | make || return 1 | ||
19 | } | ||
20 | |||
21 | package() { | ||
22 | cd "$_builddir" | ||
23 | make DESTDIR="$pkgdir" install || return 1 | ||
24 | } | ||
25 | |||
26 | md5sums="b363b09faf884db8bf8d1458d719ff00 pangomm-2.26.2.tar.bz2" | ||
diff --git a/testing/pekwm/APKBUILD b/testing/pekwm/APKBUILD new file mode 100644 index 0000000000..dcdd920f46 --- /dev/null +++ b/testing/pekwm/APKBUILD | |||
@@ -0,0 +1,36 @@ | |||
1 | # Contributor: | ||
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | pkgname=pekwm | ||
4 | pkgver=0.1.12 | ||
5 | pkgrel=0 | ||
6 | pkgdesc="Fast & Light Window Manager" | ||
7 | url="http://pekwm.org/projects/pekwm" | ||
8 | license="GPL" | ||
9 | depends= | ||
10 | makedepends="libiconv-dev libx11-dev" | ||
11 | install= | ||
12 | subpackages="$pkgname-doc" | ||
13 | source="http://pekwm.org/projects/pekwm/files/pekwm-$pkgver.tar.gz" | ||
14 | |||
15 | _builddir="$srcdir"/$pkgname-$pkgver | ||
16 | |||
17 | prepare() { | ||
18 | cd "$_builddir" | ||
19 | # apply patches here | ||
20 | } | ||
21 | |||
22 | build() { | ||
23 | cd "$_builddir" | ||
24 | ./configure --prefix=/usr \ | ||
25 | --sysconfdir=/etc \ | ||
26 | --mandir=/usr/share/man \ | ||
27 | --infodir=/usr/share/info | ||
28 | make || return 1 | ||
29 | } | ||
30 | |||
31 | package() { | ||
32 | cd "$_builddir" | ||
33 | make DESTDIR="$pkgdir" install | ||
34 | } | ||
35 | |||
36 | md5sums="1f7f9ed32cc03f565a3ad30fd6045c1f pekwm-0.1.12.tar.gz" | ||
diff --git a/testing/pidgin/msn_fix.patch b/testing/pidgin/msn_fix.patch deleted file mode 100644 index f93fef8a45..0000000000 --- a/testing/pidgin/msn_fix.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | # | ||
2 | # | ||
3 | # patch "libpurple/protocols/msn/slplink.c" | ||
4 | # from [a96a53635871463de0177e5a99fe4ebdc2c7d577] | ||
5 | # to [87ada76abf90c44e615679efc5f8128bb941bba1] | ||
6 | # | ||
7 | ============================================================ | ||
8 | --- libpurple/protocols/msn/slplink.c a96a53635871463de0177e5a99fe4ebdc2c7d577 | ||
9 | +++ libpurple/protocols/msn/slplink.c 87ada76abf90c44e615679efc5f8128bb941bba1 | ||
10 | @@ -383,6 +383,7 @@ msn_slplink_release_slpmsg(MsnSlpLink *s | ||
11 | msn_slplink_release_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg) | ||
12 | { | ||
13 | MsnMessage *msg; | ||
14 | + const char *passport; | ||
15 | |||
16 | slpmsg->msg = msg = msn_message_new_msnslp(); | ||
17 | |||
18 | @@ -421,7 +422,8 @@ msn_slplink_release_slpmsg(MsnSlpLink *s | ||
19 | |||
20 | msg->msnslp_header.total_size = slpmsg->size; | ||
21 | |||
22 | - msn_message_set_attr(msg, "P2P-Dest", slplink->remote_user); | ||
23 | + passport = purple_normalize(slplink->session->account, slplink->remote_user); | ||
24 | + msn_message_set_attr(msg, "P2P-Dest", passport); | ||
25 | |||
26 | msg->ack_cb = msg_ack; | ||
27 | msg->nak_cb = msg_nak; | ||
28 | |||
diff --git a/testing/py-twisted/APKBUILD b/testing/py-twisted/APKBUILD index bc21c236f9..04e8812cbe 100644 --- a/testing/py-twisted/APKBUILD +++ b/testing/py-twisted/APKBUILD | |||
@@ -1,16 +1,15 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=py-twisted | 2 | pkgname=py-twisted |
3 | pkgver=8.2.0 | 3 | pkgver=10.0.0 |
4 | pkgrel=2 | 4 | pkgrel=0 |
5 | pkgdesc="Asynchronous networking framework written in Python." | 5 | pkgdesc="Asynchronous networking framework written in Python." |
6 | url="http://twistedmatrix.com/" | 6 | url="http://twistedmatrix.com/" |
7 | license="MIT" | 7 | license="MIT" |
8 | depends="python py-crypto py-zope-interface" | 8 | depends="python py-crypto py-zope-interface" |
9 | makedepends="python-dev" | 9 | makedepends="python-dev" |
10 | source="http://tmrc.mit.edu/mirror/$pkgname/Twisted/8.2/Twisted-$pkgver.tar.bz2" | 10 | source="http://tmrc.mit.edu/mirror/twisted/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2" |
11 | 11 | ||
12 | build () | 12 | build() { |
13 | { | ||
14 | cd "$srcdir"/Twisted-$pkgver | 13 | cd "$srcdir"/Twisted-$pkgver |
15 | python setup.py build || return 1 | 14 | python setup.py build || return 1 |
16 | } | 15 | } |
@@ -20,4 +19,4 @@ package() { | |||
20 | python setup.py install --prefix=/usr --root="$pkgdir" || return 1 | 19 | python setup.py install --prefix=/usr --root="$pkgdir" || return 1 |
21 | install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE | 20 | install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE |
22 | } | 21 | } |
23 | md5sums="c85f151999df3ecf04c49a781b4438d2 Twisted-8.2.0.tar.bz2" | 22 | md5sums="3b226af1a19b25e3b3e93cc6edf5e284 Twisted-10.0.0.tar.bz2" |
diff --git a/testing/py-xml/APKBUILD b/testing/py-xml/APKBUILD new file mode 100644 index 0000000000..1dd549da07 --- /dev/null +++ b/testing/py-xml/APKBUILD | |||
@@ -0,0 +1,27 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
2 | pkgname=py-xml | ||
3 | pkgver=0.8.4 | ||
4 | pkgrel=0 | ||
5 | pkgdesc="Python XML parsing library." | ||
6 | url="http://pyxml.sourceforge.net/" | ||
7 | license="custom" | ||
8 | depends= | ||
9 | makedepends="python-dev" | ||
10 | source="http://downloads.sourceforge.net/sourceforge/pyxml/PyXML-$pkgver.tar.gz | ||
11 | fix-python2.6.patch" | ||
12 | |||
13 | _builddir="$srcdir"/PyXML-$pkgver | ||
14 | build() { | ||
15 | cd "$_builddir" | ||
16 | patch -Np1 -i "$srcdir/fix-python2.6.patch" || return 1 | ||
17 | python setup.py build || return 1 | ||
18 | } | ||
19 | |||
20 | package() { | ||
21 | cd "$_builddir" | ||
22 | python setup.py install --prefix=/usr --root="$pkgdir" || return 1 | ||
23 | install -D -m644 LICENCE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" || return 1 | ||
24 | } | ||
25 | |||
26 | md5sums="1f7655050cebbb664db976405fdba209 PyXML-0.8.4.tar.gz | ||
27 | 4b652e0c866e3cca7e2386e8e383d5ba fix-python2.6.patch" | ||
diff --git a/testing/py-xml/fix-python2.6.patch b/testing/py-xml/fix-python2.6.patch new file mode 100644 index 0000000000..7bf1c46fc9 --- /dev/null +++ b/testing/py-xml/fix-python2.6.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | diff -ur a/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py b/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py | ||
2 | --- a/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py 2003-03-11 15:01:34.000000000 +0100 | ||
3 | +++ b/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py 2009-05-25 16:32:26.000000000 +0200 | ||
4 | @@ -24,8 +24,8 @@ | ||
5 | self._rel = rel | ||
6 | nt = ParsedNodeTest.ParsedNodeTest('node', '') | ||
7 | ppl = ParsedPredicateList.ParsedPredicateList([]) | ||
8 | - as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') | ||
9 | - self._step = ParsedStep.ParsedStep(as, nt, ppl) | ||
10 | + asp = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') | ||
11 | + self._step = ParsedStep.ParsedStep(asp, nt, ppl) | ||
12 | return | ||
13 | |||
14 | def evaluate(self, context): | ||
15 | diff -ur a/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py b/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py | ||
16 | --- a/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py 2003-03-11 15:01:34.000000000 +0100 | ||
17 | +++ b/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py 2009-05-25 16:27:55.000000000 +0200 | ||
18 | @@ -28,8 +28,8 @@ | ||
19 | self._right = right | ||
20 | nt = ParsedNodeTest.ParsedNodeTest('node','') | ||
21 | ppl = ParsedPredicateList.ParsedPredicateList([]) | ||
22 | - as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') | ||
23 | - self._middle = ParsedStep.ParsedStep(as, nt, ppl) | ||
24 | + asp = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') | ||
25 | + self._middle = ParsedStep.ParsedStep(asp, nt, ppl) | ||
26 | |||
27 | def evaluate(self, context): | ||
28 | res = [] | ||
diff --git a/testing/scst-svn-scst/APKBUILD b/testing/scst-svn-scst/APKBUILD new file mode 100644 index 0000000000..b7cda1ad71 --- /dev/null +++ b/testing/scst-svn-scst/APKBUILD | |||
@@ -0,0 +1,82 @@ | |||
1 | # Contributor: Carlo Landmeter | ||
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | |||
4 | _flavor=${FLAVOR:-scst} | ||
5 | _realname=scst-svn | ||
6 | # source the kernel version | ||
7 | if [ -f ../../testing/linux-$_flavor/APKBUILD ]; then | ||
8 | . ../../testing/linux-$_flavor/APKBUILD | ||
9 | fi | ||
10 | _kver=$pkgver | ||
11 | _kernelver=$pkgver-r$pkgrel | ||
12 | _abi_release=$pkgver-${_flavor} | ||
13 | _kpkgrel=$pkgrel | ||
14 | |||
15 | # We need to build iscsi together with scst because it needs some files from its builddir | ||
16 | _iscsiname=iscsi-scst-svn | ||
17 | _iscsidir="$srcdir"/iscsi-scst | ||
18 | |||
19 | _realver=1713 | ||
20 | pkgname=${_realname}-${_flavor} | ||
21 | pkgver=$_kver | ||
22 | _mypkgrel=0 | ||
23 | pkgrel=$(($_kpkgrel + $_mypkgrel)) | ||
24 | pkgdesc="$_flavor kernel modules for SCST $_realver" | ||
25 | url="http://scst.sourceforge.net/" | ||
26 | license="GPL-2" | ||
27 | depends="linux-${_flavor}=${_kernelver}" | ||
28 | install= | ||
29 | makedepends="linux-${_flavor}-dev=${_kernelver} sed bash" | ||
30 | subpackages="$pkgname-dev $_iscsiname-scst:iscsi" | ||
31 | source="http://alpine.nethq.org/clandmeter/src/$_realname-$_realver.tar.gz | ||
32 | http://alpine.nethq.org/clandmeter/src/$_iscsiname-$_realver.tar.gz" | ||
33 | |||
34 | _ksrc=/usr/src/linux-headers-${_abi_release} | ||
35 | |||
36 | _builddir="$srcdir"/scst | ||
37 | |||
38 | prepare() { | ||
39 | # we are disabling proc and enabling sysfs control and disabling debug. | ||
40 | cd "$_builddir" | ||
41 | make disable_proc | ||
42 | make debug2release | ||
43 | |||
44 | cd "$_iscsidir" | ||
45 | make disable_proc | ||
46 | make debug2release | ||
47 | sed -i -e 's/^\(mods: .*\)/\1 include\/iscsi_scst_itf_ver.h/' Makefile | ||
48 | } | ||
49 | |||
50 | build() { | ||
51 | unset ARCH | ||
52 | |||
53 | cd "$_builddir" | ||
54 | make KDIR="$_ksrc" || return 1 | ||
55 | |||
56 | cd "$_iscsidir" | ||
57 | make mods KDIR="$_ksrc" || return 1 | ||
58 | } | ||
59 | |||
60 | package() { | ||
61 | cd "$_builddir" | ||
62 | make KDIR="$_ksrc" \ | ||
63 | INSTALL_MOD_PATH="$pkgdir" \ | ||
64 | INSTALL_DIR_H="$pkgdir"/usr/include/scst \ | ||
65 | install || return 1 | ||
66 | } | ||
67 | |||
68 | # we sourced kernel apkbuild above so we need to override the dev() func | ||
69 | dev() { | ||
70 | default_dev | ||
71 | } | ||
72 | |||
73 | iscsi() { | ||
74 | pkgdesc="SCST iscsi kernel module" | ||
75 | cd "$_iscsidir" | ||
76 | install -D -m 644 kernel/iscsi-scst.ko \ | ||
77 | "$subpkgdir"/lib/modules/$_abi_release/extra/iscsi-scst.ko | ||
78 | |||
79 | } | ||
80 | |||
81 | md5sums="38424f48c9fd65624e316195186fb6a7 scst-svn-1713.tar.gz | ||
82 | cf046db4f7cd9cf969b054dc055922d6 iscsi-scst-svn-1713.tar.gz" | ||
diff --git a/testing/scstadmin-svn/APKBUILD b/testing/scstadmin-svn/APKBUILD new file mode 100644 index 0000000000..e20ad1cb9e --- /dev/null +++ b/testing/scstadmin-svn/APKBUILD | |||
@@ -0,0 +1,30 @@ | |||
1 | # Contributor: | ||
2 | # Maintainer: | ||
3 | pkgname=scstadmin-svn | ||
4 | pkgver=1713 | ||
5 | pkgrel=0 | ||
6 | pkgdesc="SCST administration tool written in perl" | ||
7 | url="http://scst.sourceforge.net" | ||
8 | license="GPL-2" | ||
9 | depends="perl" | ||
10 | makedepends="perl-dev" | ||
11 | install= | ||
12 | subpackages="$pkgname-doc" | ||
13 | source="http://alpine.nethq.org/clandmeter/src/$pkgname-$pkgver.tar.gz" | ||
14 | |||
15 | _builddir="$srcdir"/scstadmin | ||
16 | |||
17 | prepare() { | ||
18 | cd "$_builddir"/scst-0.9.00 | ||
19 | PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 | ||
20 | } | ||
21 | |||
22 | package() { | ||
23 | cd "$_builddir"/scst-0.9.00 | ||
24 | make DESTDIR="$pkgdir" install || return 1 | ||
25 | cd "$_builddir" | ||
26 | install -Dm755 scstadmin.sysfs "$pkgdir"/usr/sbin/scstadmin || return 1 | ||
27 | install -Dm755 init.d/scst.gentoo "$pkgdir"/etc/init.d/scstadmin | ||
28 | } | ||
29 | |||
30 | md5sums="5c78c6d4d4079a8d2c2b55f3e3119105 scstadmin-svn-1713.tar.gz" | ||
diff --git a/testing/valide/APKBUILD b/testing/valide/APKBUILD new file mode 100644 index 0000000000..d26afd2a6e --- /dev/null +++ b/testing/valide/APKBUILD | |||
@@ -0,0 +1,38 @@ | |||
1 | # Contributor: | ||
2 | # Maintainer: | ||
3 | pkgname=valide | ||
4 | pkgver=0.7.0 | ||
5 | pkgrel=0 | ||
6 | pkgdesc="Val(a)IDE is an Integrated Development Environment (IDE) for the Vala programming language" | ||
7 | url="http://www.valaide.org/" | ||
8 | license="GPL" | ||
9 | depends="vala" | ||
10 | makedepends="gtk+-dev intltool gtksourceview-dev libunique-dev python | ||
11 | libxml2-dev gdl-dev" | ||
12 | install= | ||
13 | subpackages="$pkgname-dev $pkgname-doc" | ||
14 | source="http://valide.googlecode.com/files/valide-$pkgver.tar.gz" | ||
15 | |||
16 | # append extra dependencies to -dev subpackage | ||
17 | # remove if not used. | ||
18 | # depends_dev="somepackage-dev" | ||
19 | |||
20 | _builddir="$srcdir"/$pkgname-$pkgver | ||
21 | |||
22 | prepare() { | ||
23 | cd "$_builddir" | ||
24 | # apply patches here | ||
25 | } | ||
26 | |||
27 | build() { | ||
28 | cd "$_builddir" | ||
29 | ./waf -j ${JOBS:-2} configure --prefix=/usr || return 1 | ||
30 | ./waf -j ${JOBS:-2} | ||
31 | } | ||
32 | |||
33 | package() { | ||
34 | cd "$_builddir" | ||
35 | ./waf -j ${JOBS:-2} --destdir="$pkgdir" install | ||
36 | } | ||
37 | |||
38 | md5sums="d9e7d36266af3bd4c3ca592a8955285e valide-0.7.0.tar.gz" | ||
diff --git a/unstable/genshi/APKBUILD b/unstable/genshi/APKBUILD deleted file mode 100644 index 65e4923903..0000000000 --- a/unstable/genshi/APKBUILD +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | # Contributor: Michael Mason <ms13sp@gmail.com> | ||
2 | # Maintainer: Michael Mason <ms13sp@gmail.com> | ||
3 | pkgname=genshi | ||
4 | _altname=Genshi | ||
5 | pkgver=0.5.1 | ||
6 | pkgrel=0 | ||
7 | pkgdesc="Python toolkit for stream-based generation of output for the web." | ||
8 | url="http://genshi.edgewall.org/" | ||
9 | license="GPL" | ||
10 | depends="python setuptools" | ||
11 | makedepends="" | ||
12 | install= | ||
13 | subpackages="$pkgname-dev $pkgname-doc" | ||
14 | source="http://ftp.edgewall.com/pub/genshi/Genshi-0.5.1.tar.bz2" | ||
15 | |||
16 | build() { | ||
17 | cd "$srcdir"/$pkgname-$pkgver | ||
18 | |||
19 | ./configure --prefix=/usr \ | ||
20 | --sysconfdir=/etc \ | ||
21 | --mandir=/usr/share/man \ | ||
22 | --infodir=/usr/share/info | ||
23 | make || return 1 | ||
24 | make DESTDIR="$pkgdir" install | ||
25 | |||
26 | # remove the 2 lines below (and this) if there is no init.d script | ||
27 | # install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname | ||
28 | # install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname | ||
29 | } | ||
30 | |||
31 | md5sums="" #generate with 'abuild checksum' | ||
diff --git a/unstable/setuptools/APKBUILD b/unstable/setuptools/APKBUILD deleted file mode 100644 index c7c5899b4c..0000000000 --- a/unstable/setuptools/APKBUILD +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | # Contributor: Michael Mason <ms13sp@gmail.com> | ||
2 | # Maintainer: Michael Mason <ms13sp@gmail.com> | ||
3 | pkgname=setuptools | ||
4 | _altname=distribute | ||
5 | pkgver=0.6.4 | ||
6 | pkgrel=0 | ||
7 | pkgdesc="" | ||
8 | url="http://pypi.python.org/pypi/distribute" | ||
9 | license="PSF-2.2" | ||
10 | depends="python" | ||
11 | makedepends="" | ||
12 | install= | ||
13 | subpackages="$pkgname-dev $pkgname-doc" | ||
14 | source="http://pypi.python.org/packages/source/d/distribute/$_altname-$pkgver.tar.gz" | ||
15 | |||
16 | # append extra dependencies to -dev subpackage | ||
17 | # remove if not used. | ||
18 | # depends_dev="somepackage-dev" | ||
19 | |||
20 | build() { | ||
21 | cd "$srcdir"/$_altname-$pkgver | ||
22 | |||
23 | python setup.py build | ||
24 | # make || return 1 | ||
25 | # make DESTDIR="$pkgdir" install | ||
26 | |||
27 | } | ||
28 | |||
29 | md5sums="7a963679fddc64a0e363b2ccf8024952 distribute-0.6.4.tar.gz" | ||