diff options
author | Andrew Manison <amanison@anselsystems.com> | 2010-07-14 15:39:29 +0000 |
---|---|---|
committer | Andrew Manison <amanison@anselsystems.com> | 2010-07-14 15:39:29 +0000 |
commit | 6e8020140bbfb5e42802eed7c1491e675924cc01 (patch) | |
tree | cc54f3cce7238609561da3b2de59e2d3780c1085 | |
parent | 4ae2c3d81c309f93d2c41e22e71c5cf445123896 (diff) | |
parent | daa6e0d05fff7a0d1216fd6719e32d5426b24e8b (diff) | |
download | alpine_aports-6e8020140bbfb5e42802eed7c1491e675924cc01.tar.bz2 alpine_aports-6e8020140bbfb5e42802eed7c1491e675924cc01.tar.xz alpine_aports-6e8020140bbfb5e42802eed7c1491e675924cc01.zip |
Merge remote branch 'alpine/master'
Conflicts:
main/man-pages/APKBUILD
123 files changed, 6858 insertions, 4573 deletions
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 4ad26188c4..2ffd75e9fd 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD | |||
@@ -1,11 +1,10 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgdesc="Script to build Alpine Packages" | 2 | pkgdesc="Script to build Alpine Packages" |
3 | pkgname=abuild | 3 | pkgname=abuild |
4 | pkgver=2.3 | 4 | pkgver=2.4 |
5 | pkgrel=1 | 5 | pkgrel=0 |
6 | url=http://git.alpinelinux.org/cgit/abuild/ | 6 | url=http://git.alpinelinux.org/cgit/abuild/ |
7 | source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2 | 7 | source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2 |
8 | abuild-conflict-message.patch | ||
9 | " | 8 | " |
10 | depends="fakeroot file sudo pax-utils openssl apk-tools" | 9 | depends="fakeroot file sudo pax-utils openssl apk-tools" |
11 | makedepends="openssl-dev pkgconfig" | 10 | makedepends="openssl-dev pkgconfig" |
@@ -34,5 +33,4 @@ package() { | |||
34 | install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf | 33 | install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf |
35 | } | 34 | } |
36 | 35 | ||
37 | md5sums="7c738e0018202160366b8329ec693502 abuild-2.3.tar.bz2 | 36 | md5sums="84cde3b9c263b91b2381591a6342aaa6 abuild-2.4.tar.bz2" |
38 | 45ee7aa6e00732a8c36d7740fb8d2aeb abuild-conflict-message.patch" | ||
diff --git a/main/alpine-base/APKBUILD b/main/alpine-base/APKBUILD index 36e96a1f99..af0cc45612 100644 --- a/main/alpine-base/APKBUILD +++ b/main/alpine-base/APKBUILD | |||
@@ -2,12 +2,12 @@ | |||
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
3 | pkgname=alpine-base | 3 | pkgname=alpine-base |
4 | pkgver=2.0 | 4 | pkgver=2.0 |
5 | pkgrel=2 | 5 | pkgrel=3 |
6 | pkgdesc="Meta package for minimal alpine base" | 6 | pkgdesc="Meta package for minimal alpine base" |
7 | url="http://alpinelinux.org" | 7 | url="http://alpinelinux.org" |
8 | license="GPL" | 8 | license="GPL" |
9 | depends="alpine-baselayout alpine-conf apk-tools busybox busybox-initscripts | 9 | depends="alpine-baselayout alpine-conf apk-tools busybox busybox-initscripts |
10 | openrc uclibc-utils" | 10 | openrc uclibc-utils bbsuid" |
11 | makedepends= | 11 | makedepends= |
12 | install= | 12 | install= |
13 | subpackages= | 13 | subpackages= |
diff --git a/main/autoconf/0001-Fix-regression-of-AC_CONFIG_SUBDIRS-with-multiple-ar.patch b/main/autoconf/0001-Fix-regression-of-AC_CONFIG_SUBDIRS-with-multiple-ar.patch new file mode 100644 index 0000000000..ca73d2d34f --- /dev/null +++ b/main/autoconf/0001-Fix-regression-of-AC_CONFIG_SUBDIRS-with-multiple-ar.patch | |||
@@ -0,0 +1,122 @@ | |||
1 | From 49a6f8a8b52060d8fe0f97aa6f1d5c47b40b65c1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | ||
3 | Date: Tue, 6 Jul 2010 22:31:33 +0200 | ||
4 | Subject: [PATCH 1/5] Fix regression of AC_CONFIG_SUBDIRS with multiple arguments. | ||
5 | |||
6 | * lib/autoconf/status.m4 (AC_CONFIG_SUBDIRS): Do not assume the | ||
7 | argument is a single word. | ||
8 | * tests/torture.at (Deep Package): Extend test to cover this. | ||
9 | (Non-literal AC_CONFIG_SUBDIRS): New test. | ||
10 | * doc/autoconf.texi (Subdirectories): Add example marker. | ||
11 | * NEWS: Update. | ||
12 | Report by Bruno Haible. | ||
13 | |||
14 | Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | ||
15 | --- | ||
16 | ChangeLog | 12 ++++++++++ | ||
17 | NEWS | 2 + | ||
18 | doc/autoconf.texi | 1 + | ||
19 | lib/autoconf/status.m4 | 2 +- | ||
20 | tests/torture.at | 54 +++++++++++++++++++++++++++++++++++++++++++++++- | ||
21 | 5 files changed, 69 insertions(+), 2 deletions(-) | ||
22 | |||
23 | diff --git a/doc/autoconf.texi b/doc/autoconf.texi | ||
24 | index 0c106c7..39c2ba6 100644 | ||
25 | --- a/doc/autoconf.texi | ||
26 | +++ b/doc/autoconf.texi | ||
27 | @@ -3617,6 +3617,7 @@ Make @code{AC_OUTPUT} run @command{configure} in each subdirectory | ||
28 | be a literal, i.e., please do not use: | ||
29 | |||
30 | @example | ||
31 | +@c If you change this example, adjust tests/torture.at:Non-literal AC_CONFIG_SUBDIRS. | ||
32 | if test "x$package_foo_enabled" = xyes; then | ||
33 | my_subdirs="$my_subdirs foo" | ||
34 | fi | ||
35 | diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4 | ||
36 | index 52b7a3d..b9e7026 100644 | ||
37 | --- a/lib/autoconf/status.m4 | ||
38 | +++ b/lib/autoconf/status.m4 | ||
39 | @@ -1102,7 +1102,7 @@ AC_DEFUN([AC_CONFIG_SUBDIRS], | ||
40 | _AC_CONFIG_COMPUTE_DEST(], [))])]dnl | ||
41 | [m4_append([_AC_LIST_SUBDIRS], [$1], [ | ||
42 | ])]dnl | ||
43 | -[AS_LITERAL_WORD_IF([$1], [], | ||
44 | +[AS_LITERAL_IF([$1], [], | ||
45 | [AC_DIAGNOSE([syntax], [$0: you should use literals])])]dnl | ||
46 | [AC_SUBST([subdirs], ["$subdirs m4_normalize([$1])"])]) | ||
47 | |||
48 | diff --git a/tests/torture.at b/tests/torture.at | ||
49 | index 5f13874..e7f61ed 100644 | ||
50 | --- a/tests/torture.at | ||
51 | +++ b/tests/torture.at | ||
52 | @@ -1567,7 +1567,9 @@ AC_ARG_VAR([INNER2], [an inner2 variable]) | ||
53 | AC_OUTPUT | ||
54 | ]]) | ||
55 | |||
56 | -AT_CHECK([autoreconf -Wall -v], [0], [ignore], [ignore]) | ||
57 | +AT_CHECK([autoreconf -Wall -v], [0], [ignore], [stderr]) | ||
58 | +# We should not warn about nonliteral argument to AC_CONFIG_SUBDIRS here. | ||
59 | +AT_CHECK([grep 'AC_CONFIG_SUBDIRS:.*literals' stderr], [1]) | ||
60 | AT_CHECK([test -f inner/configure]) | ||
61 | AT_CHECK([test -f inner/innermost/configure]) | ||
62 | AT_CHECK([test -f inner/innermost/config.hin]) | ||
63 | @@ -1693,6 +1695,56 @@ AT_CHECK([test -f inner/myfile], 0) | ||
64 | AT_CLEANUP | ||
65 | |||
66 | |||
67 | +## ------------------------------- ## | ||
68 | +## Non-literal AC_CONFIG_SUBDIRS. ## | ||
69 | +## ------------------------------- ## | ||
70 | + | ||
71 | +AT_SETUP([Non-literal AC_CONFIG_SUBDIRS]) | ||
72 | +AT_KEYWORDS([autoreconf]) | ||
73 | + | ||
74 | +# We use aclocal (via autoreconf). | ||
75 | +AT_CHECK([aclocal --version || exit 77], [], [ignore], [ignore]) | ||
76 | + | ||
77 | +AT_DATA([install-sh], []) | ||
78 | +AT_DATA([configure.in], | ||
79 | +[[AC_INIT(GNU Outer, 1.0) | ||
80 | + | ||
81 | +my_subdirs= | ||
82 | +# Taken from autoconf.texi:Subdirectories. | ||
83 | +if test "x$package_foo_enabled" = xyes; then | ||
84 | + my_subdirs="$my_subdirs foo" | ||
85 | +fi | ||
86 | +AC_CONFIG_SUBDIRS([$my_subdirs]) | ||
87 | +AC_OUTPUT | ||
88 | +]]) | ||
89 | + | ||
90 | +AS_MKDIR_P([foo]) | ||
91 | + | ||
92 | +AT_DATA([foo/configure], | ||
93 | +[[#! /bin/sh | ||
94 | +touch innerfile | ||
95 | +exit 0 | ||
96 | +]]) | ||
97 | +chmod +x foo/configure | ||
98 | + | ||
99 | +# autoreconf should warn without -Wno-syntax, but should not fail without -Werror. | ||
100 | +AT_CHECK([autoreconf -Werror -v], [1], [ignore], [stderr]) | ||
101 | +AT_CHECK([grep 'AC_CONFIG_SUBDIRS:.*literals' stderr], [0], [ignore]) | ||
102 | +AT_CHECK([autoreconf -v], [0], [ignore], [stderr]) | ||
103 | +AT_CHECK([grep 'AC_CONFIG_SUBDIRS:.*literals' stderr], [0], [ignore]) | ||
104 | +# We cannot assume aclocal won't warn (aclocal-1.9 does not understand -W* | ||
105 | +# options), so check autoconf only. | ||
106 | +AT_CHECK([autoconf --force -Wno-syntax], 0, [ignore], [stderr]) | ||
107 | +AT_CHECK([grep 'AC_CONFIG_SUBDIRS:.*literals' stderr], [1]) | ||
108 | + | ||
109 | +AT_CHECK([./configure $configure_options], [0], [ignore]) | ||
110 | +AT_CHECK([test ! -f foo/innerfile]) | ||
111 | +# Running the outer configure should trigger the inner. | ||
112 | +AT_CHECK([./configure $configure_options package_foo_enabled=yes], [0], [ignore]) | ||
113 | +AT_CHECK([test -f foo/innerfile]) | ||
114 | + | ||
115 | +AT_CLEANUP | ||
116 | + | ||
117 | |||
118 | ## ----------------- ## | ||
119 | ## Empty directory. ## | ||
120 | -- | ||
121 | 1.7.1.1 | ||
122 | |||
diff --git a/main/autoconf/0002-Fix-regression-of-AC_CHECK_SIZEOF-on-pointer-types.patch b/main/autoconf/0002-Fix-regression-of-AC_CHECK_SIZEOF-on-pointer-types.patch new file mode 100644 index 0000000000..c19783933c --- /dev/null +++ b/main/autoconf/0002-Fix-regression-of-AC_CHECK_SIZEOF-on-pointer-types.patch | |||
@@ -0,0 +1,111 @@ | |||
1 | From dfda4402552ac26ce91399e2a812aee4772a512e Mon Sep 17 00:00:00 2001 | ||
2 | From: Eric Blake <eblake@redhat.com> | ||
3 | Date: Tue, 6 Jul 2010 22:00:44 +0200 | ||
4 | Subject: [PATCH 2/5] Fix regression of AC_CHECK_SIZEOF on pointer types. | ||
5 | |||
6 | * lib/autoconf/types.m4 (AC_CHECK_SIZEOF): Translate `*' to `p' | ||
7 | when checking literal-ness of the type, for pointer types. | ||
8 | * lib/m4sugar/m4sh.m4 (_AS_TR_SH): Also consider `*' as literal. | ||
9 | (_AS_TR_CPP): Likewise. | ||
10 | * tests/semantics.at (AC_CHECK_ALIGNOF struct): When checking | ||
11 | for numeric answer, be sure to not allow variable references. | ||
12 | (AC_CHECK_SIZEOF struct): Likewise. Also, test the | ||
13 | `AC_CHECK_SIZEOF([int *])' example from the manual. | ||
14 | * doc/autoconf.texi (Generic Compiler Characteristics): Add | ||
15 | example marker. | ||
16 | * NEWS: Update. | ||
17 | Reports by Nishio Futoshi and Roberto Bagnara. | ||
18 | |||
19 | Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | ||
20 | --- | ||
21 | ChangeLog | 17 +++++++++++++++++ | ||
22 | NEWS | 3 +++ | ||
23 | doc/autoconf.texi | 1 + | ||
24 | lib/autoconf/types.m4 | 2 +- | ||
25 | lib/m4sugar/m4sh.m4 | 4 ++-- | ||
26 | tests/semantics.at | 10 +++++++--- | ||
27 | 6 files changed, 31 insertions(+), 6 deletions(-) | ||
28 | |||
29 | diff --git a/doc/autoconf.texi b/doc/autoconf.texi | ||
30 | index 39c2ba6..76b01c9 100644 | ||
31 | --- a/doc/autoconf.texi | ||
32 | +++ b/doc/autoconf.texi | ||
33 | @@ -6957,6 +6957,7 @@ argument was used when cross-compiling. | ||
34 | For example, the call | ||
35 | |||
36 | @example | ||
37 | +@c If you change this example, adjust tests/semantics.at:AC_F77_DUMMY_MAIN usage. | ||
38 | AC_CHECK_SIZEOF([int *]) | ||
39 | @end example | ||
40 | |||
41 | diff --git a/lib/autoconf/types.m4 b/lib/autoconf/types.m4 | ||
42 | index ee07148..9f482da 100644 | ||
43 | --- a/lib/autoconf/types.m4 | ||
44 | +++ b/lib/autoconf/types.m4 | ||
45 | @@ -763,7 +763,7 @@ Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.]) | ||
46 | # AC_CHECK_SIZEOF(TYPE, [IGNORED], [INCLUDES = DEFAULT-INCLUDES]) | ||
47 | # --------------------------------------------------------------- | ||
48 | AC_DEFUN([AC_CHECK_SIZEOF], | ||
49 | -[AS_LITERAL_IF([$1], [], | ||
50 | +[AS_LITERAL_IF(m4_translit([[$1]], [*], [p]), [], | ||
51 | [m4_fatal([$0: requires literal arguments])])]dnl | ||
52 | [# The cast to long int works around a bug in the HP C Compiler | ||
53 | # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects | ||
54 | diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4 | ||
55 | index e1d03d9..6fbc9e1 100644 | ||
56 | --- a/lib/m4sugar/m4sh.m4 | ||
57 | +++ b/lib/m4sugar/m4sh.m4 | ||
58 | @@ -1779,7 +1779,7 @@ m4_defun_init([AS_TR_SH], | ||
59 | [_$0(m4_expand([$1]))]) | ||
60 | |||
61 | m4_define([_AS_TR_SH], | ||
62 | -[_AS_LITERAL_IF([$1], [ ][ | ||
63 | +[_AS_LITERAL_IF([$1], [*][ ][ | ||
64 | ])([], [$0_INDIR], [$0_LITERAL])([$1])]) | ||
65 | |||
66 | m4_define([_AS_TR_SH_LITERAL], | ||
67 | @@ -1812,7 +1812,7 @@ m4_defun_init([AS_TR_CPP], | ||
68 | [_$0(m4_expand([$1]))]) | ||
69 | |||
70 | m4_define([_AS_TR_CPP], | ||
71 | -[_AS_LITERAL_IF([$1], [ ][ | ||
72 | +[_AS_LITERAL_IF([$1], [*][ ][ | ||
73 | ])([], [$0_INDIR], [$0_LITERAL])([$1])]) | ||
74 | |||
75 | m4_define([_AS_TR_CPP_LITERAL], | ||
76 | diff --git a/tests/semantics.at b/tests/semantics.at | ||
77 | index b703fd4..48136cd 100644 | ||
78 | --- a/tests/semantics.at | ||
79 | +++ b/tests/semantics.at | ||
80 | @@ -350,7 +350,7 @@ AT_CHECK_MACRO_CROSS([AC_CHECK_ALIGNOF struct], | ||
81 | [[AC_CHECK_ALIGNOF([struct { char c; }]) | ||
82 | AC_CHECK_ALIGNOF([struct nosuchstruct]) | ||
83 | ]], | ||
84 | -[AT_CHECK([[grep "#define ALIGNOF_STRUCT___CHAR_C___ [^0]" config.h]], | ||
85 | +[AT_CHECK([[grep "#define ALIGNOF_STRUCT___CHAR_C___ [1-9]" config.h]], | ||
86 | 0, ignore) | ||
87 | AT_CHECK([[grep "#define ALIGNOF_STRUCT_NOSUCHSTRUCT 0" config.h]], | ||
88 | 0, ignore) | ||
89 | @@ -379,13 +379,17 @@ AT_CHECK_MACRO_CROSS([AC_CHECK_SIZEOF struct], | ||
90 | AC_CHECK_SIZEOF([struct x], [], [struct x { char c; int x; };]) | ||
91 | AC_CHECK_SIZEOF([const struct x], [], [struct x { const char *p; int x; };]) | ||
92 | AC_CHECK_SIZEOF([struct nosuchstruct]) | ||
93 | +# Taken from autoconf.texi:Generic Compiler Characteristics. | ||
94 | +AC_CHECK_SIZEOF([int *]) | ||
95 | ]], | ||
96 | -[AT_CHECK([[grep "#define SIZEOF_STRUCT_X [^0]" config.h]], | ||
97 | +[AT_CHECK([[grep "#define SIZEOF_STRUCT_X [1-9]" config.h]], | ||
98 | 0, ignore) | ||
99 | -AT_CHECK([[grep "#define SIZEOF_CONST_STRUCT_X [^0]" config.h]], | ||
100 | +AT_CHECK([[grep "#define SIZEOF_CONST_STRUCT_X [1-9]" config.h]], | ||
101 | 0, ignore) | ||
102 | AT_CHECK([[grep "#define SIZEOF_STRUCT_NOSUCHSTRUCT 0" config.h]], | ||
103 | 0, ignore) | ||
104 | +AT_CHECK([[grep "#define SIZEOF_INT_P [1-9]" config.h]], | ||
105 | + 0, ignore) | ||
106 | ]) | ||
107 | |||
108 | |||
109 | -- | ||
110 | 1.7.1.1 | ||
111 | |||
diff --git a/main/autoconf/APKBUILD b/main/autoconf/APKBUILD index a74d9ae07d..5478f3e79c 100644 --- a/main/autoconf/APKBUILD +++ b/main/autoconf/APKBUILD | |||
@@ -1,22 +1,42 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=autoconf | 2 | pkgname=autoconf |
3 | pkgver=2.64 | 3 | pkgver=2.66 |
4 | pkgrel=0 | 4 | pkgrel=1 |
5 | pkgdesc="A GNU tool for automatically configuring source code" | 5 | pkgdesc="A GNU tool for automatically configuring source code" |
6 | license="GPL2 GPL3" | 6 | license="GPL2 GPL3" |
7 | url="http://www.gnu.org/software/autoconf" | 7 | url="http://www.gnu.org/software/autoconf" |
8 | depends="m4 perl" | 8 | depends="m4 perl" |
9 | source="ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz" | 9 | source="ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz |
10 | 0001-Fix-regression-of-AC_CONFIG_SUBDIRS-with-multiple-ar.patch | ||
11 | 0002-Fix-regression-of-AC_CHECK_SIZEOF-on-pointer-types.patch | ||
12 | " | ||
10 | subpackages="$pkgname-doc" | 13 | subpackages="$pkgname-doc" |
11 | 14 | ||
15 | prepare() { | ||
16 | cd "$srcdir"/$pkgname-$pkgver | ||
17 | for i in $source; do | ||
18 | case $i in | ||
19 | *.patch) | ||
20 | msg "Applying $i" | ||
21 | patch -p1 -i "$srcdir"/$i || return 1 | ||
22 | esac | ||
23 | done | ||
24 | } | ||
25 | |||
12 | build() { | 26 | build() { |
13 | cd "$srcdir"/$pkgname-$pkgver | 27 | cd "$srcdir"/$pkgname-$pkgver |
14 | M4=/usr/bin/m4 ./configure --prefix=/usr | 28 | M4=/usr/bin/m4 ./configure --prefix=/usr |
15 | make || return 1 | 29 | make || return 1 |
30 | } | ||
31 | |||
32 | package() { | ||
33 | cd "$srcdir"/$pkgname-$pkgver | ||
16 | make DESTDIR="$pkgdir" install || return 1 | 34 | make DESTDIR="$pkgdir" install || return 1 |
17 | rm -f "$pkgdir"/usr/share/info/dir | 35 | rm -f "$pkgdir"/usr/share/info/dir |
18 | # conflict with bintuils | 36 | # conflict with bintuils |
19 | rm -f "$pkgdir"/usr/share/info/standards.info | 37 | rm -f "$pkgdir"/usr/share/info/standards.info |
20 | } | 38 | } |
21 | 39 | ||
22 | md5sums="30a198cef839471dd4926e92ab485361 autoconf-2.64.tar.gz" | 40 | md5sums="fb00d77cbc468994c55919298af1ff02 autoconf-2.66.tar.gz |
41 | f01c3e92881326c68e62c1cf57aad0ad 0001-Fix-regression-of-AC_CONFIG_SUBDIRS-with-multiple-ar.patch | ||
42 | 89fd929761deaaaaa1f1926ddb99085c 0002-Fix-regression-of-AC_CHECK_SIZEOF-on-pointer-types.patch" | ||
diff --git a/main/bacula/APKBUILD b/main/bacula/APKBUILD index ff4161ea1c..ab85b86bf9 100644 --- a/main/bacula/APKBUILD +++ b/main/bacula/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
2 | # Maintainer: Leonardo Arena <rnalrd@gmail.com> | 2 | # Maintainer: Leonardo Arena <rnalrd@gmail.com> |
3 | pkgname="bacula" | 3 | pkgname="bacula" |
4 | pkgver=5.0.1 | 4 | pkgver=5.0.1 |
5 | pkgrel=3 | 5 | pkgrel=4 |
6 | pkgdesc="Enterprise ready, network based backup program" | 6 | pkgdesc="Enterprise ready, network based backup program" |
7 | url="http://www.bacula.org" | 7 | url="http://www.bacula.org" |
8 | license="GPL2" | 8 | license="GPL2" |
@@ -29,11 +29,8 @@ prepare () { | |||
29 | build() { | 29 | build() { |
30 | cd "$srcdir/$pkgname-$pkgver" | 30 | cd "$srcdir/$pkgname-$pkgver" |
31 | export LDFLAGS= | 31 | export LDFLAGS= |
32 | # Need to run configure at least once | ||
33 | # in order to do not go into an infinite loop | 32 | # in order to do not go into an infinite loop |
34 | ./configure | 33 | aclocal && autoconf && automake |
35 | make configure | ||
36 | make distclean | ||
37 | 34 | ||
38 | ./configure --prefix=/usr \ | 35 | ./configure --prefix=/usr \ |
39 | --sysconfdir=/etc/bacula \ | 36 | --sysconfdir=/etc/bacula \ |
@@ -56,11 +53,7 @@ build() { | |||
56 | --with-sd-user=bacula \ | 53 | --with-sd-user=bacula \ |
57 | --with-sd-group=bacula \ | 54 | --with-sd-group=bacula \ |
58 | --with-fd-user=root \ | 55 | --with-fd-user=root \ |
59 | --with-fd-group=root \ | 56 | --with-fd-group=root |
60 | --with-dir-password=PuemReTsKKObLe3TTaU73a3dPWwISW \ | ||
61 | --with-fd-password=Mbh1ujsgZ2ogRFVjPWD9TAVMFP6o8E \ | ||
62 | --with-sd-password=icpaksuq0gpDStLT8Uqgk1HIozFnx1 \ | ||
63 | --with-db-password=BQrlfPPfdXdMHlJID0HrGHZde2Lqd9 | ||
64 | 57 | ||
65 | make || return 1 | 58 | make || return 1 |
66 | } | 59 | } |
diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD index 93a3047206..e7657e01ce 100644 --- a/main/bind/APKBUILD +++ b/main/bind/APKBUILD | |||
@@ -1,10 +1,10 @@ | |||
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=bind | 3 | pkgname=bind |
4 | pkgver=9.7.0_p1 | 4 | pkgver=9.7.1 |
5 | _ver=${pkgver%_p*} | 5 | _ver=${pkgver%_p*} |
6 | _p=${pkgver#*_p} | 6 | _p=${pkgver#*_p} |
7 | pkgrel=2 | 7 | pkgrel=0 |
8 | pkgdesc="BIND - Berkeley Internet Name Domain - Name Server and tools" | 8 | pkgdesc="BIND - Berkeley Internet Name Domain - Name Server and tools" |
9 | url="http://www.isc.org" | 9 | url="http://www.isc.org" |
10 | license="as-is" | 10 | license="as-is" |
@@ -12,7 +12,7 @@ depends= | |||
12 | makedepends="openssl-dev perl" | 12 | makedepends="openssl-dev perl" |
13 | install="$pkgname.pre-install $pkgname.post-install" | 13 | install="$pkgname.pre-install $pkgname.post-install" |
14 | subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-tools" | 14 | subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-tools" |
15 | source="http://ftp.isc.org/isc/bind9/${_ver}-P${_p}/bind-${_ver}-P${_p}.tar.gz | 15 | source="http://ftp.isc.org/isc/bind9/${_ver}/bind-${_ver}.tar.gz |
16 | bind.so_bsdcompat.patch | 16 | bind.so_bsdcompat.patch |
17 | $pkgname.initd | 17 | $pkgname.initd |
18 | $pkgname.confd | 18 | $pkgname.confd |
@@ -22,7 +22,7 @@ source="http://ftp.isc.org/isc/bind9/${_ver}-P${_p}/bind-${_ver}-P${_p}.tar.gz | |||
22 | $pkgname.named.ca | 22 | $pkgname.named.ca |
23 | " | 23 | " |
24 | 24 | ||
25 | _builddir="$srcdir/bind-${_ver}-P${_p}" | 25 | _builddir="$srcdir/bind-${_ver}" |
26 | 26 | ||
27 | prepare() { | 27 | prepare() { |
28 | cd "$_builddir" | 28 | cd "$_builddir" |
@@ -92,7 +92,7 @@ tools() { | |||
92 | done | 92 | done |
93 | } | 93 | } |
94 | 94 | ||
95 | md5sums="78e3e38c6252e41ded1afa1aeb183622 bind-9.7.0-P1.tar.gz | 95 | md5sums="712c425e59cb4aa9309bc4716283742f bind-9.7.1.tar.gz |
96 | f270a5b0a28ab6e818840c5c368ddbcc bind.so_bsdcompat.patch | 96 | f270a5b0a28ab6e818840c5c368ddbcc bind.so_bsdcompat.patch |
97 | 92914193cc603d8d81ef00534ce9c1c9 bind.initd | 97 | 92914193cc603d8d81ef00534ce9c1c9 bind.initd |
98 | 8b05a287976d66d51c18b73ee7523671 bind.confd | 98 | 8b05a287976d66d51c18b73ee7523671 bind.confd |
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index d379e5a87c..9ec44618a3 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=busybox | 2 | pkgname=busybox |
3 | pkgver=1.16.1 | 3 | pkgver=1.16.2 |
4 | pkgrel=4 | 4 | pkgrel=2 |
5 | pkgdesc="Size optimized toolbox of many common UNIX utilities" | 5 | pkgdesc="Size optimized toolbox of many common UNIX utilities" |
6 | url=http://busybox.net | 6 | url=http://busybox.net |
7 | license="GPL-2" | 7 | license="GPL-2" |
@@ -11,14 +11,8 @@ subpackages="$pkgname-static" | |||
11 | triggers="busybox.trigger:/bin /usr/bin /sbin /usr/sbin /lib/modules/*" | 11 | triggers="busybox.trigger:/bin /usr/bin /sbin /usr/sbin /lib/modules/*" |
12 | source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 | 12 | source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 |
13 | $pkgname-1.11.1-bb.patch | 13 | $pkgname-1.11.1-bb.patch |
14 | diff.patch | ||
14 | flock-bb.patch | 15 | flock-bb.patch |
15 | http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-ash.patch | ||
16 | http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-cpio.patch | ||
17 | http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-dhcpd.patch | ||
18 | http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-dnsd.patch | ||
19 | http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-hwclock.patch | ||
20 | http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-indexcgi.patch | ||
21 | http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-sed.patch | ||
22 | busyboxconfig" | 16 | busyboxconfig" |
23 | 17 | ||
24 | _builddir="$srcdir"/$pkgname-$pkgver | 18 | _builddir="$srcdir"/$pkgname-$pkgver |
@@ -74,14 +68,8 @@ static() { | |||
74 | 68 | ||
75 | } | 69 | } |
76 | 70 | ||
77 | md5sums="319486ec65078d07fde26eb620fecde7 busybox-1.16.1.tar.bz2 | 71 | md5sums="2ba980f720a5bdce4ec05423519acc35 busybox-1.16.2.tar.bz2 |
78 | 4c0f3b486eaa0674961b7ddcd0c60a9b busybox-1.11.1-bb.patch | 72 | 4c0f3b486eaa0674961b7ddcd0c60a9b busybox-1.11.1-bb.patch |
73 | 5ce533f9727761c31de5b5f9df568f2f diff.patch | ||
79 | 20d9beea7d0c0aaca14553a8f98fee12 flock-bb.patch | 74 | 20d9beea7d0c0aaca14553a8f98fee12 flock-bb.patch |
80 | b328c15e90c58c44f283838f224c3c97 busybox-1.16.1-ash.patch | ||
81 | 301feec832c938c235d370ae09f90713 busybox-1.16.1-cpio.patch | ||
82 | 54607ef7a80b6c3aa397788ce9166cc3 busybox-1.16.1-dhcpd.patch | ||
83 | 9fd18c9833253119996039429bee1992 busybox-1.16.1-dnsd.patch | ||
84 | b16ad6491dcb4f053f84ae2c4064918d busybox-1.16.1-hwclock.patch | ||
85 | c3bc34309334c456b6f905f0708c914f busybox-1.16.1-indexcgi.patch | ||
86 | 8e1ef2dc70aaaa6f1af1d5e0541de103 busybox-1.16.1-sed.patch | ||
87 | 4bc85af9dd659cbb83c9a819b3481a47 busyboxconfig" | 75 | 4bc85af9dd659cbb83c9a819b3481a47 busyboxconfig" |
diff --git a/main/busybox/diff.patch b/main/busybox/diff.patch new file mode 100644 index 0000000000..702c66ca29 --- /dev/null +++ b/main/busybox/diff.patch | |||
@@ -0,0 +1,83 @@ | |||
1 | commit 61f5f7823c4f217dd9bad2f1df547f81b9338c76 | ||
2 | Author: Matheus Izvekov <mizvekov@gmail.com> | ||
3 | Date: Fri Jul 9 19:40:00 2010 +0200 | ||
4 | |||
5 | diff: fix "diff dir1 dir2/". Closes bug 2203 | ||
6 | |||
7 | Signed-off-by: Matheus Izvekov <mizvekov@gmail.com> | ||
8 | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> | ||
9 | |||
10 | diff --git a/editors/diff.c b/editors/diff.c | ||
11 | index 07594e8..8d91b83 100644 | ||
12 | --- a/editors/diff.c | ||
13 | +++ b/editors/diff.c | ||
14 | @@ -760,9 +760,11 @@ static int FAST_FUNC add_to_dirlist(const char *filename, | ||
15 | void *userdata, int depth UNUSED_PARAM) | ||
16 | { | ||
17 | struct dlist *const l = userdata; | ||
18 | + const char *file = filename + l->len; | ||
19 | l->dl = xrealloc_vector(l->dl, 6, l->e); | ||
20 | - /* + 1 skips "/" after dirname */ | ||
21 | - l->dl[l->e] = xstrdup(filename + l->len + 1); | ||
22 | + while(*file == '/') | ||
23 | + file++; | ||
24 | + l->dl[l->e] = xstrdup(file); | ||
25 | l->e++; | ||
26 | return TRUE; | ||
27 | } | ||
28 | diff --git a/testsuite/diff.tests b/testsuite/diff.tests | ||
29 | index 06d5a4f..27a4b33 100755 | ||
30 | --- a/testsuite/diff.tests | ||
31 | +++ b/testsuite/diff.tests | ||
32 | @@ -4,7 +4,7 @@ | ||
33 | |||
34 | . ./testing.sh | ||
35 | |||
36 | -# testing "test name" "options" "expected result" "file input" "stdin" | ||
37 | +# testing "test name" "commands" "expected result" "file input" "stdin" | ||
38 | |||
39 | # diff outputs date/time in the header, which should not be analysed | ||
40 | # NB: sed has tab character in s command! | ||
41 | @@ -100,9 +100,11 @@ testing "diff always takes context from old file" \ | ||
42 | "abc\na c\ndef\n" \ | ||
43 | "a c\n" | ||
44 | |||
45 | -# testing "test name" "options" "expected result" "file input" "stdin" | ||
46 | +# testing "test name" "commands" "expected result" "file input" "stdin" | ||
47 | |||
48 | +# clean up | ||
49 | rm -rf diff1 diff2 | ||
50 | + | ||
51 | mkdir diff1 diff2 diff2/subdir | ||
52 | echo qwe >diff1/- | ||
53 | echo asd >diff2/subdir/- | ||
54 | @@ -187,4 +189,29 @@ SKIP= | ||
55 | # clean up | ||
56 | rm -rf diff1 diff2 | ||
57 | |||
58 | +# NOT using directory structure from prev test... | ||
59 | +mkdir diff1 diff2 | ||
60 | +echo qwe >diff1/- | ||
61 | +echo rty >diff2/- | ||
62 | +optional FEATURE_DIFF_DIR | ||
63 | +testing "diff diff1 diff2/" \ | ||
64 | + "diff -ur diff1 diff2/ | $TRIM_TAB; diff -ur .///diff1 diff2//// | $TRIM_TAB" \ | ||
65 | +"\ | ||
66 | +--- diff1/- | ||
67 | ++++ diff2/- | ||
68 | +@@ -1 +1 @@ | ||
69 | +-qwe | ||
70 | ++rty | ||
71 | +--- .///diff1/- | ||
72 | ++++ diff2////- | ||
73 | +@@ -1 +1 @@ | ||
74 | +-qwe | ||
75 | ++rty | ||
76 | +" \ | ||
77 | + "" "" | ||
78 | +SKIP= | ||
79 | + | ||
80 | +# clean up | ||
81 | +rm -rf diff1 diff2 | ||
82 | + | ||
83 | exit $FAILCOUNT | ||
diff --git a/main/c-ares/APKBUILD b/main/c-ares/APKBUILD index d0af1f04b2..ea4e22ebc4 100644 --- a/main/c-ares/APKBUILD +++ b/main/c-ares/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Contributor: Carlo Landmeter <clandmeter@gmail.com> | 1 | # Contributor: Carlo Landmeter <clandmeter@gmail.com> |
2 | # Maintainer: Carlo Landmeter <clandmeter@gmail.com> | 2 | # Maintainer: Carlo Landmeter <clandmeter@gmail.com> |
3 | pkgname=c-ares | 3 | pkgname=c-ares |
4 | pkgver=1.7.0 | 4 | pkgver=1.7.3 |
5 | pkgrel=1 | 5 | pkgrel=0 |
6 | pkgdesc="An asynchronously DNS/names resolver library" | 6 | pkgdesc="An asynchronously DNS/names resolver library" |
7 | url="http://c-ares.haxx.se/" | 7 | url="http://c-ares.haxx.se/" |
8 | license="GPL" | 8 | license="GPL" |
@@ -26,4 +26,4 @@ package() { | |||
26 | make DESTDIR="$pkgdir" install | 26 | make DESTDIR="$pkgdir" install |
27 | } | 27 | } |
28 | 28 | ||
29 | md5sums="15ab7852306b554b0b1145f41005a3bb c-ares-1.7.0.tar.gz" | 29 | md5sums="97ebef758804a6e9b6c0bc65d3c2c25a c-ares-1.7.3.tar.gz" |
diff --git a/main/collectd/APKBUILD b/main/collectd/APKBUILD index 617accbd9d..3e31d564a9 100644 --- a/main/collectd/APKBUILD +++ b/main/collectd/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Contributor: | 1 | # Contributor: |
2 | # Maintainer: | 2 | # Maintainer: |
3 | pkgname=collectd | 3 | pkgname=collectd |
4 | pkgver=4.9.1 | 4 | pkgver=4.10.1 |
5 | pkgrel=3 | 5 | pkgrel=0 |
6 | pkgdesc="The system statistics collection daemon" | 6 | pkgdesc="The system statistics collection daemon" |
7 | url="http://collectd.org" | 7 | url="http://collectd.org" |
8 | license="GPL" | 8 | license="GPL" |
@@ -79,5 +79,5 @@ postgresql() { _plugin postgresql; } | |||
79 | mysql() { _plugin mysql; } | 79 | mysql() { _plugin mysql; } |
80 | network() { _plugin network; } | 80 | network() { _plugin network; } |
81 | 81 | ||
82 | md5sums="5753496651c8c84afaea1fe290876bfc collectd-4.9.1.tar.bz2 | 82 | md5sums="8cd79b4ebdb9dbeb51ba52d3463a06ef collectd-4.10.1.tar.bz2 |
83 | 13a36ae2f92634b5619ab94224e1b77d collectd.initd" | 83 | 13a36ae2f92634b5619ab94224e1b77d collectd.initd" |
diff --git a/main/coreutils/APKBUILD b/main/coreutils/APKBUILD index 7ffc066670..445091bde3 100644 --- a/main/coreutils/APKBUILD +++ b/main/coreutils/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
3 | pkgname=coreutils | 3 | pkgname=coreutils |
4 | pkgver=8.5 | 4 | pkgver=8.5 |
5 | pkgrel=0 | 5 | pkgrel=1 |
6 | pkgdesc="The basic file, shell and text manipulation utilities" | 6 | pkgdesc="The basic file, shell and text manipulation utilities" |
7 | url="http://www.gnu.org/software/coreutils/" | 7 | url="http://www.gnu.org/software/coreutils/" |
8 | license="GPL" | 8 | license="GPL" |
@@ -19,7 +19,9 @@ build() { | |||
19 | --mandir=/usr/share/man \ | 19 | --mandir=/usr/share/man \ |
20 | --infodir=/usr/share/info \ | 20 | --infodir=/usr/share/info \ |
21 | --disable-nls \ | 21 | --disable-nls \ |
22 | --without-gmp | 22 | --without-gmp \ |
23 | --enable-no-install-program=arch,hostname,su,kill,uptime \ | ||
24 | || return 1 | ||
23 | make || return 1 | 25 | make || return 1 |
24 | } | 26 | } |
25 | 27 | ||
diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD index 5b3c7d63d0..caf32b7685 100644 --- a/main/dhcp/APKBUILD +++ b/main/dhcp/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=dhcp | 2 | pkgname=dhcp |
3 | pkgver=4.1.0_p1 | 3 | pkgver=4.1.1_p1 |
4 | _realver=4.1.0p1 | 4 | _realver=4.1.1-P1 |
5 | pkgrel=10 | 5 | pkgrel=1 |
6 | pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)" | 6 | pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)" |
7 | url="https://www.isc.org/" | 7 | url="https://www.isc.org/" |
8 | license="GPL" | 8 | license="GPL" |
@@ -21,7 +21,7 @@ source="http://ftp.isc.org/isc/dhcp/dhcp-4.1-history/$pkgname-$_realver.tar.gz | |||
21 | prepare() { | 21 | prepare() { |
22 | cd "$srcdir/$pkgname-$_realver" | 22 | cd "$srcdir/$pkgname-$_realver" |
23 | patch -p1 -i "$srcdir"/dhcp-3.0-fix-perms.patch || return 1 | 23 | patch -p1 -i "$srcdir"/dhcp-3.0-fix-perms.patch || return 1 |
24 | patch -p1 -i ../linux_ipv6_discover.patch || return 1 | 24 | # patch -p1 -i ../linux_ipv6_discover.patch || return 1 |
25 | } | 25 | } |
26 | 26 | ||
27 | build() { | 27 | build() { |
@@ -74,7 +74,7 @@ dhcrelay() { | |||
74 | "$subpkgdir"/etc/conf.d/dhcrelay | 74 | "$subpkgdir"/etc/conf.d/dhcrelay |
75 | } | 75 | } |
76 | 76 | ||
77 | md5sums="325ff8338c5a21f89d5304ac13ffebdf dhcp-4.1.0p1.tar.gz | 77 | md5sums="ee390a35687dd75dbfc32c856c0938d1 dhcp-4.1.1-P1.tar.gz |
78 | 37abf1fb047a353e91b022fafdabf39a linux_ipv6_discover.patch | 78 | 37abf1fb047a353e91b022fafdabf39a linux_ipv6_discover.patch |
79 | a9eaf182dae3984670da52f20ae10fba dhcp-3.0-fix-perms.patch | 79 | a9eaf182dae3984670da52f20ae10fba dhcp-3.0-fix-perms.patch |
80 | 1597c012bb1a2c0828254c87f0a904ad dhcrelay.initd | 80 | 1597c012bb1a2c0828254c87f0a904ad dhcrelay.initd |
diff --git a/main/dhcpcd-ui/APKBUILD b/main/dhcpcd-ui/APKBUILD index eb6d6ebd0d..79830a69c4 100644 --- a/main/dhcpcd-ui/APKBUILD +++ b/main/dhcpcd-ui/APKBUILD | |||
@@ -1,18 +1,19 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=dhcpcd-ui | 2 | pkgname=dhcpcd-ui |
3 | pkgver=0.4.3 | 3 | pkgver=0.5.1 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="A GTK+ monitor and configuration GUI for dhcpcd" | 5 | pkgdesc="A GTK+ monitor and configuration GUI for dhcpcd" |
6 | url="http://roy.marples.name/projects/dhcpcd-dbus" | 6 | url="http://roy.marples.name/projects/dhcpcd-ui" |
7 | license="BSD-2" | 7 | license="BSD-2" |
8 | depends="dhcpcd-dbus" | 8 | depends="dhcpcd-dbus" |
9 | makedepends="glib-dev gtk+-dev dbus-dev libnotify-dev pkgconfig" | 9 | makedepends="glib-dev gtk+-dev dbus-dev libnotify-dev pkgconfig" |
10 | install= | 10 | install= |
11 | subpackages= | 11 | subpackages="$pkgname-doc" |
12 | source="http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2" | 12 | source="http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2" |
13 | 13 | ||
14 | build() { | 14 | build() { |
15 | cd "$srcdir"/$pkgname-$pkgver | 15 | cd "$srcdir"/$pkgname-$pkgver |
16 | ./configure --prefix=/usr | ||
16 | make PREFIX=/usr | 17 | make PREFIX=/usr |
17 | } | 18 | } |
18 | 19 | ||
@@ -22,4 +23,4 @@ package() { | |||
22 | install | 23 | install |
23 | } | 24 | } |
24 | 25 | ||
25 | md5sums="2a01fa94c79699807131c488b47d9dc8 dhcpcd-ui-0.4.3.tar.bz2" | 26 | md5sums="a42b15650de093bcd3dd60fb94a483f7 dhcpcd-ui-0.5.1.tar.bz2" |
diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD index ec04e0ac77..5f85d9f86c 100644 --- a/main/dhcpcd/APKBUILD +++ b/main/dhcpcd/APKBUILD | |||
@@ -2,15 +2,16 @@ | |||
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
3 | pkgname=dhcpcd | 3 | pkgname=dhcpcd |
4 | pkgver=5.2.5 | 4 | pkgver=5.2.5 |
5 | pkgrel=0 | 5 | pkgrel=1 |
6 | pkgdesc="RFC2131 compliant DHCP client" | 6 | pkgdesc="RFC2131 compliant DHCP client" |
7 | url="http://roy.marples.name/projects/dhcpcd/" | 7 | url="http://roy.marples.name/projects/dhcpcd/" |
8 | license="BSD-2" | 8 | license="BSD-2" |
9 | depends= | 9 | depends= |
10 | makedepends="" | 10 | makedepends= |
11 | install= | 11 | install= |
12 | subpackages="$pkgname-doc" | 12 | subpackages="$pkgname-doc" |
13 | source="http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2" | 13 | source="http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2 |
14 | dhcpcd.initd" | ||
14 | 15 | ||
15 | build() { | 16 | build() { |
16 | cd "$srcdir/$pkgname-$pkgver" | 17 | cd "$srcdir/$pkgname-$pkgver" |
@@ -23,6 +24,8 @@ build() { | |||
23 | package() { | 24 | package() { |
24 | cd "$srcdir"/$pkgname-$pkgver | 25 | cd "$srcdir"/$pkgname-$pkgver |
25 | make DESTDIR="$pkgdir" install | 26 | make DESTDIR="$pkgdir" install |
27 | install -Dm755 "$srcdir"/dhcpcd.initd "$pkgdir"/etc/init.d/dhcpcd | ||
26 | } | 28 | } |
27 | 29 | ||
28 | md5sums="79f5452252026c0547886f89ab87adf1 dhcpcd-5.2.5.tar.bz2" | 30 | md5sums="79f5452252026c0547886f89ab87adf1 dhcpcd-5.2.5.tar.bz2 |
31 | ecbd807cf3f87d7c5b6095bf63f26894 dhcpcd.initd" | ||
diff --git a/main/dhcpcd/dhcpcd.initd b/main/dhcpcd/dhcpcd.initd new file mode 100644 index 0000000000..d88b0610dd --- /dev/null +++ b/main/dhcpcd/dhcpcd.initd | |||
@@ -0,0 +1,17 @@ | |||
1 | #!/sbin/runscript | ||
2 | # Copyright 2007-2008 Roy Marples <roy@marples.name> | ||
3 | # All rights reserved. Released under the 2-clause BSD license. | ||
4 | |||
5 | command=/sbin/dhcpcd | ||
6 | pidfile=/var/run/dhcpcd.pid | ||
7 | command_args=-q | ||
8 | name="DHCP Client Daemon" | ||
9 | |||
10 | depend() | ||
11 | { | ||
12 | provide net | ||
13 | need localmount | ||
14 | use logger network | ||
15 | after bootmisc modules | ||
16 | before dns | ||
17 | } | ||
diff --git a/main/djbdns/APKBUILD b/main/djbdns/APKBUILD index c52201a906..5124689f0d 100644 --- a/main/djbdns/APKBUILD +++ b/main/djbdns/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=djbdns | 2 | pkgname=djbdns |
3 | pkgver=1.05 | 3 | pkgver=1.05 |
4 | pkgrel=36 | 4 | pkgrel=37 |
5 | pkgdesc="Excellent high-performance DNS services" | 5 | pkgdesc="Excellent high-performance DNS services" |
6 | url="http://cr.yp.to/djbdns.html" | 6 | url="http://cr.yp.to/djbdns.html" |
7 | license="public-domain" | 7 | license="public-domain" |
@@ -101,4 +101,4 @@ fe48165a920cf843ceb9a4ee50bf74c0 tinydns.initd | |||
101 | e09c3a6ba6917e16f4736ab5c070dbe9 dnscache.pre-install | 101 | e09c3a6ba6917e16f4736ab5c070dbe9 dnscache.pre-install |
102 | e5cada3b032da84c4a0e41ef8b3108cb dnscache.initd | 102 | e5cada3b032da84c4a0e41ef8b3108cb dnscache.initd |
103 | 2b3d02e88f70603c760bf368ab3ed636 dnscache.confd | 103 | 2b3d02e88f70603c760bf368ab3ed636 dnscache.confd |
104 | 805b6989f945d727788f1908fe3fce81 dnscache.monthly" | 104 | 8173f85e0d9b4496de389d1b43993d95 dnscache.monthly" |
diff --git a/main/djbdns/dnscache.monthly b/main/djbdns/dnscache.monthly index 4e53fd6fde..574d56f01d 100755 --- a/main/djbdns/dnscache.monthly +++ b/main/djbdns/dnscache.monthly | |||
@@ -19,7 +19,7 @@ for ZONEFILE in $ZONES; do | |||
19 | cp -f "$DST" "$ZONEFILE" | 19 | cp -f "$DST" "$ZONEFILE" |
20 | fi | 20 | fi |
21 | 21 | ||
22 | if [ "$ZONE" == "@" ]; then | 22 | if [ "$ZONE" = "@" ]; then |
23 | ZONE="." | 23 | ZONE="." |
24 | fi | 24 | fi |
25 | 25 | ||
@@ -28,9 +28,7 @@ for ZONEFILE in $ZONES; do | |||
28 | 28 | ||
29 | # Refresh zone info | 29 | # Refresh zone info |
30 | dnsqr ns $ZONE | awk '/^answer: ./ { print $5 }' | sort -u | xargs dnsip > $TMPF | 30 | dnsqr ns $ZONE | awk '/^answer: ./ { print $5 }' | sort -u | xargs dnsip > $TMPF |
31 | 31 | if egrep -q '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' $TMPF; then | |
32 | grep "^$" $TMPF 1> /dev/null | ||
33 | if [ $? != 0 ]; then | ||
34 | cmp -s $ZONEFILE $TMPF | 32 | cmp -s $ZONEFILE $TMPF |
35 | if [ "$?" != 0 ]; then | 33 | if [ "$?" != 0 ]; then |
36 | NEEDRESTART=yes | 34 | NEEDRESTART=yes |
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD index 1250503b59..9246417c89 100644 --- a/main/dovecot/APKBUILD +++ b/main/dovecot/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
3 | pkgname=dovecot | 3 | pkgname=dovecot |
4 | pkgver=1.2.12 | 4 | pkgver=1.2.12 |
5 | pkgrel=0 | 5 | pkgrel=3 |
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" |
diff --git a/main/dovecot/dovecot.post-install b/main/dovecot/dovecot.post-install index a7cccddfd8..d75f01ea20 100644 --- a/main/dovecot/dovecot.post-install +++ b/main/dovecot/dovecot.post-install | |||
@@ -3,7 +3,6 @@ | |||
3 | # based on doc/mkcert.sh | 3 | # based on doc/mkcert.sh |
4 | 4 | ||
5 | # Generates a self-signed certificate. | 5 | # Generates a self-signed certificate. |
6 | # Edit dovecot-openssl.cnf before running this. | ||
7 | 6 | ||
8 | OPENSSL=${OPENSSL-openssl} | 7 | OPENSSL=${OPENSSL-openssl} |
9 | SSLDIR=${SSLDIR-/etc/ssl/dovecot} | 8 | SSLDIR=${SSLDIR-/etc/ssl/dovecot} |
@@ -12,8 +11,17 @@ OPENSSLCONFIG=${OPENSSLCONFIG-/etc/dovecot/dovecot-openssl.cnf} | |||
12 | CERTDIR=$SSLDIR | 11 | CERTDIR=$SSLDIR |
13 | KEYDIR=$SSLDIR | 12 | KEYDIR=$SSLDIR |
14 | 13 | ||
15 | CERTFILE=$CERTDIR/server.pem | 14 | # parse cert and key file from dovecot.conf |
16 | KEYFILE=$KEYDIR/server.key | 15 | dovecot_conf=/etc/dovecot/dovecot.conf |
16 | ssl_cert_file= | ||
17 | ssl_key_file= | ||
18 | if [ -r "$dovecot_conf" ]; then | ||
19 | ssl_cert_file=$(awk -F'[[:space:]]*=[[:space:]]*' '/^ssl_cert_file/ { print $2}' $dovecot_conf) | ||
20 | ssl_cert_file=$(awk -F'[[:space:]]*=[[:space:]]*' '/^ssl_key_file/ { print $2}' $dovecot_conf) | ||
21 | fi | ||
22 | |||
23 | CERTFILE=${ssl_cert_file:-$CERTDIR/server.pem} | ||
24 | KEYFILE=${ssl_key_file:-$KEYDIR/server.key} | ||
17 | 25 | ||
18 | if [ -e "$CERTFILE" ]; then | 26 | if [ -e "$CERTFILE" ]; then |
19 | echo "Keeiping existing $CERTFILE" | 27 | echo "Keeiping existing $CERTFILE" |
@@ -25,6 +33,11 @@ if [ -e "$KEYFILE" ]; then | |||
25 | exit 0 | 33 | exit 0 |
26 | fi | 34 | fi |
27 | 35 | ||
36 | if [ ! -c /dev/urandom ] && [ ! -c /dev/random ]; then | ||
37 | echo "No /dev/urandom or /dev/random so ssl cert not created" | ||
38 | exit 1 | ||
39 | fi | ||
40 | |||
28 | $OPENSSL req -new -x509 -nodes -config $OPENSSLCONFIG -out $CERTFILE -keyout $KEYFILE -days 365 || exit 2 | 41 | $OPENSSL req -new -x509 -nodes -config $OPENSSLCONFIG -out $CERTFILE -keyout $KEYFILE -days 365 || exit 2 |
29 | chmod 0600 $KEYFILE | 42 | chmod 0600 $KEYFILE |
30 | echo | 43 | echo |
diff --git a/main/feh/APKBUILD b/main/feh/APKBUILD index 44fca8ada3..981b688b92 100644 --- a/main/feh/APKBUILD +++ b/main/feh/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=feh | 2 | pkgname=feh |
3 | pkgver=1.7 | 3 | pkgver=1.8 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="feh is a fast, lightweight image viewer which uses imlib2" | 5 | pkgdesc="feh is a fast, lightweight image viewer which uses imlib2" |
6 | url="http://www.linuxbrit.co.uk/feh/" | 6 | url="http://www.linuxbrit.co.uk/feh/" |
@@ -23,4 +23,4 @@ package() { | |||
23 | make DESTDIR=$pkgdir docsdir=/usr/share/doc/feh install || return 1 | 23 | make DESTDIR=$pkgdir docsdir=/usr/share/doc/feh install || return 1 |
24 | install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE | 24 | install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE |
25 | } | 25 | } |
26 | md5sums="59181976384d1f5bddae016b39334e2e feh-1.7.tar.bz2" | 26 | md5sums="fe81334805f4da9b5f1e35b45c444a1a feh-1.8.tar.bz2" |
diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD index 6d1dcd4d54..1c98611263 100644 --- a/main/ffmpeg/APKBUILD +++ b/main/ffmpeg/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=ffmpeg | 2 | pkgname=ffmpeg |
3 | pkgver=0.6 | 3 | pkgver=0.6 |
4 | pkgrel=0 | 4 | pkgrel=1 |
5 | pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" | 5 | pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" |
6 | url="http://ffmpeg.mplayerhq.hu/" | 6 | url="http://ffmpeg.mplayerhq.hu/" |
7 | license="GPL" | 7 | license="GPL" |
diff --git a/main/freetype/APKBUILD b/main/freetype/APKBUILD index f88da34b87..7303e8832b 100644 --- a/main/freetype/APKBUILD +++ b/main/freetype/APKBUILD | |||
@@ -1,12 +1,12 @@ | |||
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=freetype | 3 | pkgname=freetype |
4 | pkgver=2.3.8 | 4 | pkgver=2.3.12 |
5 | pkgrel=1 | 5 | pkgrel=0 |
6 | pkgdesc="TrueType font rendering library" | 6 | pkgdesc="TrueType font rendering library" |
7 | url="http://freetype.sourceforge.net" | 7 | url="http://freetype.sourceforge.net" |
8 | license="GPL" | 8 | license="GPL" |
9 | depends="zlib" | 9 | depends= |
10 | makedepends="zlib-dev" | 10 | makedepends="zlib-dev" |
11 | subpackages="$pkgname-dev" | 11 | subpackages="$pkgname-dev" |
12 | source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz | 12 | source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz |
@@ -16,25 +16,32 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz | |||
16 | 40-memcpy-fix.patch | 16 | 40-memcpy-fix.patch |
17 | " | 17 | " |
18 | 18 | ||
19 | build() { | 19 | _builddir="$srcdir/$pkgname-$pkgver" |
20 | cd "$srcdir/$pkgname-$pkgver" | ||
21 | 20 | ||
21 | prepare() { | ||
22 | cd "$_builddir" | ||
22 | for i in "$srcdir"/*.patch; do | 23 | for i in "$srcdir"/*.patch; do |
23 | msg "Applying ${i}" | 24 | msg "Applying ${i}" |
24 | patch -p0 -i $i || return 1 | 25 | patch -p0 -i $i || return 1 |
25 | done | 26 | done |
27 | } | ||
26 | 28 | ||
29 | build() { | ||
30 | cd "$_builddir" | ||
27 | ./configure --prefix=/usr \ | 31 | ./configure --prefix=/usr \ |
28 | --sysconfdir=/etc \ | 32 | --sysconfdir=/etc \ |
29 | --mandir=/usr/share/man \ | 33 | --mandir=/usr/share/man \ |
30 | --infodir=/usr/share/info \ | 34 | --infodir=/usr/share/info \ |
31 | --disable-static | 35 | --disable-static |
32 | make || return 1 | 36 | make || return 1 |
33 | make -j1 DESTDIR="$pkgdir" install | 37 | } |
34 | 38 | ||
39 | package() { | ||
40 | cd "$_builddir" | ||
41 | make -j1 DESTDIR="$pkgdir" install | ||
35 | } | 42 | } |
36 | 43 | ||
37 | md5sums="ebd7d255fd72b7f86c94501b80c50009 freetype-2.3.8.tar.gz | 44 | md5sums="6fc690d9b34154b51a919ff466cea90c freetype-2.3.12.tar.gz |
38 | 9ff19e742968c29e3ba52b08d6bf0a50 10-bytecode.patch | 45 | 9ff19e742968c29e3ba52b08d6bf0a50 10-bytecode.patch |
39 | 376b94c06b113a62a3437e4130bb3fc3 20-enable-spr.patch | 46 | 376b94c06b113a62a3437e4130bb3fc3 20-enable-spr.patch |
40 | 3f6c5739843dcbc110ee0f243c4f6bdb 30-enable-valid.patch | 47 | 3f6c5739843dcbc110ee0f243c4f6bdb 30-enable-valid.patch |
diff --git a/main/gimp/APKBUILD b/main/gimp/APKBUILD index ca145889ac..8af43dd1b6 100644 --- a/main/gimp/APKBUILD +++ b/main/gimp/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=gimp | 2 | pkgname=gimp |
3 | pkgver=2.6.9 | 3 | pkgver=2.6.10 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="GNU Image Manipulation Program" | 5 | pkgdesc="GNU Image Manipulation Program" |
6 | url="http://www.gimp.org/" | 6 | url="http://www.gimp.org/" |
@@ -37,4 +37,4 @@ package() { | |||
37 | make DESTDIR="$pkgdir" install || return 1 | 37 | make DESTDIR="$pkgdir" install || return 1 |
38 | ln -s gimptool-2.0 "$pkgdir/usr/bin/gimptool" || return 1 | 38 | ln -s gimptool-2.0 "$pkgdir/usr/bin/gimptool" || return 1 |
39 | } | 39 | } |
40 | md5sums="e5d0cc6f3ce127e51d7f3d3124b16a99 gimp-2.6.9.tar.bz2" | 40 | md5sums="b92710ad9f1b52fec98554d765473819 gimp-2.6.10.tar.bz2" |
diff --git a/main/gnumeric/APKBUILD b/main/gnumeric/APKBUILD index 622cdd64bc..9ea9b97183 100644 --- a/main/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.6 | 3 | pkgver=1.10.7 |
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="2c83cafd6e2b69d10122d9e4343bf4ba gnumeric-1.10.6.tar.bz2" | 30 | md5sums="86869fcada3840afdbd861693a9ab30e gnumeric-1.10.7.tar.bz2" |
diff --git a/main/gpicview/APKBUILD b/main/gpicview/APKBUILD index 6c2062c309..b79fd82be9 100644 --- a/main/gpicview/APKBUILD +++ b/main/gpicview/APKBUILD | |||
@@ -1,11 +1,12 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=gpicview | 2 | pkgname=gpicview |
3 | pkgver=0.2.1 | 3 | pkgver=0.2.1 |
4 | pkgrel=1 | 4 | pkgrel=2 |
5 | pkgdesc="Picture viewer of the LXDE Desktop" | 5 | pkgdesc="Picture viewer of the LXDE Desktop" |
6 | url="http://wiki.lxde.org/en/GPicView" | 6 | url="http://wiki.lxde.org/en/GPicView" |
7 | license="GPL-2" | 7 | license="GPL-2" |
8 | depends="gtk+-dev intltool jpeg-dev" | 8 | depends= |
9 | makedepends="gtk+-dev intltool jpeg-dev" | ||
9 | source="http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.gz" | 10 | source="http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.gz" |
10 | 11 | ||
11 | build() { | 12 | build() { |
diff --git a/main/gst-plugins-ugly/APKBUILD b/main/gst-plugins-ugly/APKBUILD index 7642d78a0f..28aabdd10e 100644 --- a/main/gst-plugins-ugly/APKBUILD +++ b/main/gst-plugins-ugly/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=gst-plugins-ugly | 2 | pkgname=gst-plugins-ugly |
3 | pkgver=0.10.15 | 3 | pkgver=0.10.15 |
4 | pkgrel=0 | 4 | pkgrel=1 |
5 | pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)" | 5 | pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)" |
6 | url="http://gstreamer.freedesktop.org/" | 6 | url="http://gstreamer.freedesktop.org/" |
7 | license="LGPL" | 7 | license="LGPL" |
@@ -9,7 +9,7 @@ depends= #"gstreamer0.10-ugly>=0.10.11 libdvdread>=4.1.3 lame>=3.98.2 libmpeg2>= | |||
9 | makedepends="pkgconfig lame-dev libmpeg2-dev a52dec-dev libid3tag-dev | 9 | makedepends="pkgconfig lame-dev libmpeg2-dev a52dec-dev libid3tag-dev |
10 | libmad-dev glib-dev liboil-dev gstreamer-dev gst-plugins-base-dev | 10 | libmad-dev glib-dev liboil-dev gstreamer-dev gst-plugins-base-dev |
11 | x264-dev" | 11 | x264-dev" |
12 | source="http://gstreamer.freedesktop.org//src/gst-plugins-ugly/gst-plugins-ugly-$pkgver.tar.bz2" | 12 | source="http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-$pkgver.tar.bz2" |
13 | 13 | ||
14 | build() { | 14 | build() { |
15 | cd "$srcdir"/$pkgname-$pkgver | 15 | cd "$srcdir"/$pkgname-$pkgver |
diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD index 60ecebbec5..d0e6925302 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.2.0 | 4 | pkgver=6.6.3.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="d84ec4e436b0b4f79812ac89703777a6 ImageMagick-6.6.2-0.tar.gz" | 50 | md5sums="555e1f70bd244b79d74e57895bff6c05 ImageMagick-6.6.3-0.tar.gz" |
diff --git a/main/ircii/APKBUILD b/main/ircii/APKBUILD index bcb44899ba..4ba4164016 100644 --- a/main/ircii/APKBUILD +++ b/main/ircii/APKBUILD | |||
@@ -1,23 +1,31 @@ | |||
1 | # Contributor: Michael Mason <ms13sp@gmail.com> | ||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=ircii | 3 | pkgname=ircii |
3 | pkgver=20060725 | 4 | pkgver=20080314 |
4 | pkgrel=1 | 5 | pkgrel=2 |
5 | pkgdesc="ircII is an IRC and ICB client that runs under most UNIX platforms." | 6 | pkgdesc="Universal IRC for Unix systems" |
6 | url="http://www.eterna.com.au/ircii/" | 7 | url="http://www.eterna.com.au/ircii/" |
7 | license="GPL-2" | 8 | license="GPL" |
8 | subpackages="$pkgname-doc" | ||
9 | depends= | 9 | depends= |
10 | # original source seems to be dead. use gentoo. | 10 | makedepends="ncurses-dev" |
11 | #source="ftp://ircii.warped.com/pub/ircII/$pkgname-$pkgver.tar.bz2" | 11 | install= |
12 | source="http://distfiles.gentoo.org/distfiles/$pkgname-$pkgver.tar.bz2" | 12 | subpackages="$pkgname-doc $pkgname-dev" |
13 | source="ftp://ircii.warped.com/pub/ircII/ircii-20080314.tar.bz2" | ||
13 | 14 | ||
14 | build() { | 15 | build() { |
15 | cd "$srcdir"/$pkgname-$pkgver | 16 | cd "$srcdir/$pkgname-$pkgver" |
16 | ./configure --prefix=/usr \ | 17 | ./configure --prefix=/usr \ |
18 | --sysconfdir=/etc \ | ||
17 | --mandir=/usr/share/man \ | 19 | --mandir=/usr/share/man \ |
18 | --enable-ipv6 | 20 | --infodir=/usr/share/info \ |
21 | --with-default-server=irc.freenode.net \ | ||
22 | || return 1 | ||
19 | make || return 1 | 23 | make || return 1 |
20 | make -j1 DESTDIR="$pkgdir" install || return 1 | ||
21 | } | 24 | } |
22 | 25 | ||
23 | md5sums="280ae54367627591c1c43c765eb9d59b ircii-20060725.tar.bz2" | 26 | package() { |
27 | cd "$srcdir/$pkgname-$pkgver" | ||
28 | make -j1 DESTDIR="$pkgdir" install | ||
29 | } | ||
30 | |||
31 | md5sums="da7fcf2a442bd25f303778eb6466eb19 ircii-20080314.tar.bz2" | ||
diff --git a/testing/ircservices/APKBUILD b/main/ircservices/APKBUILD index 57d36e7099..46a07c3c36 100644 --- a/testing/ircservices/APKBUILD +++ b/main/ircservices/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=ircservices | 2 | pkgname=ircservices |
3 | pkgver=5.1.21 | 3 | pkgver=5.1.23 |
4 | pkgrel=1 | 4 | pkgrel=1 |
5 | pkgdesc="Services for IRC (NickServ, ChanServ, MemoServ)" | 5 | pkgdesc="Services for IRC (NickServ, ChanServ, MemoServ)" |
6 | url="http://www.ircservices.za.net/" | 6 | url="http://www.ircservices.za.net/" |
@@ -14,6 +14,14 @@ subpackages="$pkgname-doc" | |||
14 | source="http://www.ircservices.za.net/download/$pkgname-$pkgver.tar.gz | 14 | source="http://www.ircservices.za.net/download/$pkgname-$pkgver.tar.gz |
15 | $pkgname.initd" | 15 | $pkgname.initd" |
16 | 16 | ||
17 | prepare() { | ||
18 | cd "$srcdir"/$pkgname-$pkgver | ||
19 | sed -i \ | ||
20 | -e "s/-m 750/-m 755/" \ | ||
21 | -e "s/-m 640/-m 644/" \ | ||
22 | configure | ||
23 | } | ||
24 | |||
17 | build() { | 25 | build() { |
18 | cd "$srcdir"/$pkgname-$pkgver | 26 | cd "$srcdir"/$pkgname-$pkgver |
19 | RUNGROUP=ircservices ./configure \ | 27 | RUNGROUP=ircservices ./configure \ |
@@ -74,5 +82,5 @@ package() { | |||
74 | etc/ircservices/modules.conf | 82 | etc/ircservices/modules.conf |
75 | } | 83 | } |
76 | 84 | ||
77 | md5sums="3db58bb1645423a23872e8d1f51a8a99 ircservices-5.1.21.tar.gz | 85 | md5sums="666351f44adf57effc310a7a5943c9a2 ircservices-5.1.23.tar.gz |
78 | 279ea42c5d97b47787b5959c9981fbaa ircservices.initd" | 86 | 279ea42c5d97b47787b5959c9981fbaa ircservices.initd" |
diff --git a/testing/ircservices/ircservices.confd b/main/ircservices/ircservices.confd index 31cc902d21..31cc902d21 100644 --- a/testing/ircservices/ircservices.confd +++ b/main/ircservices/ircservices.confd | |||
diff --git a/testing/ircservices/ircservices.initd b/main/ircservices/ircservices.initd index 8c2a11e8ba..8c2a11e8ba 100644 --- a/testing/ircservices/ircservices.initd +++ b/main/ircservices/ircservices.initd | |||
diff --git a/testing/ircservices/ircservices.pre-install b/main/ircservices/ircservices.pre-install index 093f888563..093f888563 100644 --- a/testing/ircservices/ircservices.pre-install +++ b/main/ircservices/ircservices.pre-install | |||
diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD index 84355bb18a..fe066f4663 100644 --- a/main/kamailio/APKBUILD +++ b/main/kamailio/APKBUILD | |||
@@ -1,33 +1,54 @@ | |||
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=1.5.4 | 4 | pkgver=3.0.2 |
5 | pkgrel=1 | 5 | pkgrel=4 |
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" |
9 | pkggroups="kamailio" | 9 | pkggroups="kamailio" |
10 | license="GPL" | 10 | license="GPL" |
11 | depends= | 11 | depends= |
12 | makedepends="bison flex expat-dev postgresql-dev mysql-dev pcre-dev | 12 | makedepends="bison flex expat-dev postgresql-dev pcre-dev mysql-dev |
13 | libxml2-dev curl-dev unixodbc-dev confuse-dev" | 13 | libxml2-dev curl-dev unixodbc-dev confuse-dev" |
14 | install="$pkgname.pre-install $pkgname.post-install" | 14 | install= |
15 | subpackages="$pkgname-doc $pkgname-mysql $pkgname-postgres $pkgname-pcre | 15 | subpackages="$pkgname-doc $pkgname-postgres $pkgname-presence $pkgname-pcre |
16 | $pkgname-presence $pkgname-mediaproxy $pkgname-unixodbc" | 16 | $pkgname-mediaproxy $pkgname-unixodbc $pkgname-mysql" |
17 | source="http://www.kamailio.org/pub/kamailio/$pkgver/src/$pkgname-$pkgver-notls_src.tar.gz | 17 | source="http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src.tar.gz |
18 | kamailio.cfg | 18 | kamailio.cfg |
19 | kamailio.initd | 19 | kamailio.initd |
20 | kamailio-backslash.patch | 20 | kamailio.pre-install |
21 | kamailio.post-install | ||
22 | kamailio-3-backslash.patch | ||
21 | " | 23 | " |
22 | 24 | ||
25 | _builddir="$srcdir"/$pkgname-$pkgver | ||
26 | |||
27 | |||
28 | _default="carrierroute xmlrpc tm" | ||
29 | _presence="presence presence_xml presence_mwi pua pua_bla pua_mi pua_usrloc pua_xmpp rls xcap_client presence_dialoginfo pua_dialoginfo" | ||
30 | _pcre="dialplan lcr regex" | ||
31 | _postgres="db_postgres" | ||
32 | _mysql="db_mysql" | ||
33 | _mediaproxy="mediaproxy" | ||
34 | _odbc="db_unixodbc" | ||
35 | # Makefile does not handle newline | ||
36 | _modules="$_default $_postgres $_mediaproxy $_odbc $_presence $_mysql $_pcre" | ||
37 | |||
38 | |||
23 | prepare() { | 39 | prepare() { |
24 | cd "$srcdir/$pkgname-$pkgver-notls" | 40 | cd "$_builddir" |
25 | patch -p1 -i "$srcdir"/kamailio-backslash.patch || return 1 | 41 | patch -p1 -i "$srcdir"/kamailio-3-backslash.patch || return 1 |
26 | 42 | ||
27 | sed -i -e 's:^cfg-target.*:cfg-target = $(cfg-dir):' \ | 43 | sed -i \ |
28 | -e 's:^cfg-prefix.*:cfg-prefix = $(basedir):' Makefile.defs \ | 44 | -e "s:-O9 -funroll-loops:$CFLAGS:g" \ |
45 | Makefile.defs \ | ||
29 | || return 1 | 46 | || return 1 |
30 | cd scripts | 47 | |
48 | # -e 's:^cfg-target.*:cfg-target = $(cfg-dir):' \ | ||
49 | # -e 's:^cfg-prefix.*:cfg-prefix = $(basedir):' \ | ||
50 | |||
51 | cd utils/kamctl/ | ||
31 | sed -i -e 's:/var/run/kamailio.pid:/var/run/kamailio/kamailio.pid:g' \ | 52 | sed -i -e 's:/var/run/kamailio.pid:/var/run/kamailio/kamailio.pid:g' \ |
32 | kamctl.base kamctlrc || return 1 | 53 | kamctl.base kamctlrc || return 1 |
33 | # we actually dont need bash | 54 | # we actually dont need bash |
@@ -37,32 +58,37 @@ prepare() { | |||
37 | cd dbtext/kamailio | 58 | cd dbtext/kamailio |
38 | sed -i -e 's:email_address(string):email_address(string,null):' subscriber \ | 59 | sed -i -e 's:email_address(string):email_address(string,null):' subscriber \ |
39 | || return 1 | 60 | || return 1 |
61 | |||
40 | } | 62 | } |
41 | 63 | ||
42 | build() { | 64 | build() { |
43 | cd "$srcdir/$pkgname-$pkgver-notls" | 65 | cd "$_builddir" |
44 | make prefix=/usr \ | 66 | |
45 | cfg-dir=/etc/kamailio/ \ | 67 | # workaround parallel build issue |
68 | make -C lib/kcore strcommon.o || return 1 | ||
69 | |||
70 | make LOCALBASE=/usr \ | ||
71 | cfg_target=/etc/kamailio/ \ | ||
46 | MODS_MYSQL=yes \ | 72 | MODS_MYSQL=yes \ |
47 | MODS_PCRE=yes \ | 73 | MODS_PCRE=yes \ |
48 | MODS_PRESENCE=yes \ | ||
49 | MODS_RADIUS= \ | 74 | MODS_RADIUS= \ |
50 | TLS= \ | 75 | TLS= \ |
51 | include_modules="db_postgres mediaproxy db_unixodbc carrierroute" \ | 76 | include_modules="$_modules" \ |
52 | all || return 1 | 77 | all || return 1 |
53 | } | 78 | } |
54 | 79 | ||
55 | package() { | 80 | package() { |
56 | cd "$srcdir/$pkgname-$pkgver-notls" | 81 | cd "$_builddir" |
57 | make prefix=/usr \ | 82 | make LOCALBASE=/usr \ |
58 | cfg-dir=/etc/kamailio/ \ | 83 | cfg_target=/etc/kamailio/ \ |
59 | MODS_MYSQL=yes \ | 84 | MODS_MYSQL=yes \ |
60 | MODS_PCRE=yes \ | 85 | MODS_PCRE=yes \ |
61 | MODS_PRESENCE=yes \ | ||
62 | MODS_RADIUS= \ | 86 | MODS_RADIUS= \ |
63 | TLS= \ | 87 | TLS= \ |
64 | include_modules="db_postgres mediaproxy db_unixodbc carrierroute" \ | 88 | include_modules="$_modules" \ |
65 | basedir="$pkgdir" install || return 1 | 89 | basedir="$pkgdir" \ |
90 | cfg_prefix="$pkgdir" \ | ||
91 | install || return 1 | ||
66 | 92 | ||
67 | # move default config to -doc package and use our own default config | 93 | # move default config to -doc package and use our own default config |
68 | 94 | ||
@@ -83,6 +109,14 @@ _mv_mod() { | |||
83 | done | 109 | done |
84 | } | 110 | } |
85 | 111 | ||
112 | _mv_mod_k() { | ||
113 | local moddir=usr/lib/kamailio/modules_k i= | ||
114 | mkdir -p "$subpkgdir"/$moddir | ||
115 | for i in $@; do | ||
116 | mv "$pkgdir"/$moddir/$i.so "$subpkgdir"/$moddir/ || return 1 | ||
117 | done | ||
118 | } | ||
119 | |||
86 | 120 | ||
87 | mysql() { | 121 | mysql() { |
88 | pkgdesc="MySQL support for kamailio" | 122 | pkgdesc="MySQL support for kamailio" |
@@ -104,29 +138,30 @@ postgres() { | |||
104 | 138 | ||
105 | pcre() { | 139 | pcre() { |
106 | pkgdesc="Regular expressions support for kamailio" | 140 | pkgdesc="Regular expressions support for kamailio" |
107 | _mv_mod dialplan lcr regex | 141 | _mv_mod dialplan lcr |
142 | _mv_mod_k regex | ||
108 | } | 143 | } |
109 | 144 | ||
110 | presence() { | 145 | presence() { |
111 | pkgdesc="Precense support for kamailio" | 146 | pkgdesc="Presence support for kamailio" |
112 | _mv_mod presence presence_xml presence_mwi pua pua_bla pua_mi \ | 147 | _mv_mod_k $_presence |
113 | pua_usrloc pua_xmpp rls xcap_client presence_dialoginfo \ | ||
114 | pua_dialoginfo | ||
115 | } | 148 | } |
116 | 149 | ||
117 | mediaproxy() { | 150 | mediaproxy() { |
118 | pkgdesc="Mediaproxy support for kamailio" | 151 | pkgdesc="Mediaproxy support for kamailio" |
119 | depends="kamailio" | 152 | depends="kamailio" |
120 | _mv_mod mediaproxy | 153 | _mv_mod $_mediaproxy |
121 | } | 154 | } |
122 | 155 | ||
123 | unixodbc() { | 156 | unixodbc() { |
124 | pkgdesc="UnixODBC support for kamailio" | 157 | pkgdesc="UnixODBC support for kamailio" |
125 | depends="kamailio" | 158 | depends="kamailio" |
126 | _mv_mod db_unixodbc | 159 | _mv_mod_k $_odbc |
127 | } | 160 | } |
128 | 161 | ||
129 | md5sums="127233aff2f20566b54f84555602132d kamailio-1.5.4-notls_src.tar.gz | 162 | md5sums="dd039e078a77032a423fb15f9685ad31 kamailio-3.0.2_src.tar.gz |
130 | eb665248ee39cf755a247286affc5cbb kamailio.cfg | 163 | a3c959ec568c43a905710e7d25cd8c25 kamailio.cfg |
131 | 8ac6c260f090aea0ca344f18f9a2a904 kamailio.initd | 164 | 81100c479890a2a8c2628db22fdd1a0c kamailio.initd |
132 | 3259980a45d9ad3fc6fca83414021d07 kamailio-backslash.patch" | 165 | c646af2dd31f5c4289a2f802c873d98f kamailio.pre-install |
166 | 3fbaf633ff1620d0d526fc4047c7bed9 kamailio.post-install | ||
167 | 36f81be3a082a81497e261ac8e6c5414 kamailio-3-backslash.patch" | ||
diff --git a/testing/kamailio/kamailio-3-backslash.patch b/main/kamailio/kamailio-3-backslash.patch index f132aebab4..f132aebab4 100644 --- a/testing/kamailio/kamailio-3-backslash.patch +++ b/main/kamailio/kamailio-3-backslash.patch | |||
diff --git a/main/kamailio/kamailio-backslash.patch b/main/kamailio/kamailio-backslash.patch deleted file mode 100644 index 9cc6036895..0000000000 --- a/main/kamailio/kamailio-backslash.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | diff --git a/scripts/kamdbctl.base b/scripts/kamdbctl.base | ||
2 | index 83f5a8a..5b640be 100644 | ||
3 | --- a/scripts/kamdbctl.base | ||
4 | +++ b/scripts/kamdbctl.base | ||
5 | @@ -32,13 +32,13 @@ INSTALL_PRESENCE_TABLES=${INSTALL_PRESENCE_TABLES:-ask} | ||
6 | |||
7 | # Used by dbtext and db_berkeley to define tables to be created, used by | ||
8 | # postgres to do the grants | ||
9 | -STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases lcr domain grp | ||
10 | - uri speed_dial gw pdt subscriber location re_grp trusted | ||
11 | - address missed_calls usr_preferences aliases silo dialog | ||
12 | +STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases lcr domain grp \ | ||
13 | + uri speed_dial gw pdt subscriber location re_grp trusted \ | ||
14 | + address missed_calls usr_preferences aliases silo dialog \ | ||
15 | dispatcher dialplan} | ||
16 | -EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy carrierroute | ||
17 | +EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy carrierroute \ | ||
18 | carrier_name domain_name carrierfailureroute userblacklist globalblacklist htable purplemap} | ||
19 | -PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap | ||
20 | +PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap \ | ||
21 | pua rls_presentity rls_watchers} | ||
22 | |||
23 | # SQL definitions | ||
24 | @@ -61,9 +61,9 @@ GREP=${GREP:-grep} | ||
25 | SED=${SED:-sed} | ||
26 | |||
27 | # define what modules should be installed | ||
28 | -STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group permissions | ||
29 | - registrar usrloc msilo alias_db uri_db | ||
30 | - speeddial avpops auth_db pdt dialog dispatcher | ||
31 | +STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group permissions \ | ||
32 | + registrar usrloc msilo alias_db uri_db \ | ||
33 | + speeddial avpops auth_db pdt dialog dispatcher \ | ||
34 | dialplan} | ||
35 | EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute userblacklist htable purple} | ||
36 | |||
diff --git a/main/kamailio/kamailio.cfg b/main/kamailio/kamailio.cfg index 9c101a871f..1558cce9ca 100644 --- a/main/kamailio/kamailio.cfg +++ b/main/kamailio/kamailio.cfg | |||
@@ -1,34 +1,39 @@ | |||
1 | # Demonstration Kamailio Configuration for AlpineLinux | 1 | # Sample Kamailio Configuration |
2 | 2 | # 23 June 2010 - For Alpine Linux | |
3 | # Accepts all registrations; routes calls to any registered AOR | ||
3 | 4 | ||
4 | #-------------------------------------------------------- | 5 | #-------------------------------------------------------- |
5 | # Section 1: Global Definitions | 6 | # Section 1: Global Definitions |
6 | #-------------------------------------------------------- | 7 | #-------------------------------------------------------- |
7 | debug = 3 | 8 | debug = 2 |
8 | fork = yes | 9 | fork = yes |
9 | log_stderror = no | 10 | log_stderror = no |
10 | listen = 0.0.0.0 | 11 | # listen = 0.0.0.0 |
11 | port = 5060 | 12 | port = 5060 |
12 | children = 4 | 13 | children = 4 |
13 | 14 | ||
14 | dns = no | 15 | dns = no |
15 | rev_dns = no | 16 | rev_dns = no |
16 | 17 | ||
17 | mpath = "/usr/lib/kamailio/modules/" | 18 | mpath = "/usr/lib/kamailio/modules_k/:/usr/lib/kamailio/modules/" |
19 | |||
18 | #-------------------------------------------------------- | 20 | #-------------------------------------------------------- |
19 | # Section 2: Modules | 21 | # Section 2: Modules |
20 | #-------------------------------------------------------- | 22 | #-------------------------------------------------------- |
21 | 23 | ||
22 | loadmodule "sl.so" | ||
23 | loadmodule "tm.so" | 24 | loadmodule "tm.so" |
25 | loadmodule "sl.so" | ||
26 | loadmodule "tmx.so" | ||
24 | loadmodule "rr.so" | 27 | loadmodule "rr.so" |
25 | loadmodule "maxfwd.so" | 28 | loadmodule "maxfwd.so" |
26 | loadmodule "usrloc.so" | 29 | loadmodule "usrloc.so" |
27 | loadmodule "registrar.so" | 30 | loadmodule "registrar.so" |
28 | loadmodule "mi_fifo.so" | 31 | loadmodule "mi_fifo.so" |
32 | loadmodule "pv.so" | ||
33 | loadmodule "xlog.so" | ||
29 | 34 | ||
30 | #-------------------------------------------------------- | 35 | #-------------------------------------------------------- |
31 | # Section 1: Module Configuration | 36 | # Section 3: Module Configuration |
32 | #-------------------------------------------------------- | 37 | #-------------------------------------------------------- |
33 | 38 | ||
34 | modparam ( "usrloc", "db_mode", 0 ) | 39 | modparam ( "usrloc", "db_mode", 0 ) |
@@ -36,26 +41,30 @@ modparam ( "rr", "enable_full_lr", 1 ) | |||
36 | modparam ( "mi_fifo", "fifo_name", "/tmp/kamailio_fifo") | 41 | modparam ( "mi_fifo", "fifo_name", "/tmp/kamailio_fifo") |
37 | 42 | ||
38 | #-------------------------------------------------------- | 43 | #-------------------------------------------------------- |
39 | # Section 1: Main Route Block | 44 | # Section 4: Main Route Block |
40 | #-------------------------------------------------------- | 45 | #-------------------------------------------------------- |
41 | 46 | ||
42 | route | 47 | route |
43 | { | 48 | { |
49 | # Uncomment next line if you want to see | ||
50 | # each incoming message | ||
51 | xlog( "L_INFO", "$rm: $fu -> $ru" ); | ||
52 | |||
44 | if (!mf_process_maxfwd_header("10")) | 53 | if (!mf_process_maxfwd_header("10")) |
45 | { | 54 | { |
46 | sl_send_reply("483", "Too Many Hops"); | 55 | sl_send_reply("483", "Too Many Hops"); |
47 | return; | 56 | return; |
48 | } | 57 | } |
49 | 58 | ||
50 | if (msg:len > max_len) | 59 | if (msg:len > 4096) |
51 | { | 60 | { |
52 | sl_send_reply("513", "Message Overflow"); | 61 | sl_send_reply("513", "Message too big" ); |
53 | return; | 62 | return; |
54 | } | 63 | } |
55 | 64 | ||
56 | if (method == "REGISTER" ) | 65 | if (method == "REGISTER" ) |
57 | { | 66 | { |
58 | route(2); | 67 | route(REGISTER); |
59 | return; | 68 | return; |
60 | } | 69 | } |
61 | 70 | ||
@@ -66,42 +75,33 @@ route | |||
66 | return; | 75 | return; |
67 | } | 76 | } |
68 | 77 | ||
69 | route(1); | 78 | route(RELAY); |
70 | 79 | ||
71 | } | 80 | } |
72 | #-------------------------------------------------------- | 81 | #-------------------------------------------------------- |
73 | # Section 1: Secondary Route Blocks | 82 | # Section 5: Secondary Route Blocks |
74 | #-------------------------------------------------------- | 83 | #-------------------------------------------------------- |
75 | 84 | ||
76 | # - Default message handler | 85 | # - Default message handler |
77 | route[1] { | 86 | route[RELAY] { |
78 | if (!t_relay()) { | 87 | if (!t_relay()) { |
79 | sl_reply_error(); | 88 | sl_reply_error(); |
80 | } | 89 | } |
81 | } | 90 | } |
82 | 91 | ||
83 | #- Registration Request | 92 | #- Registration Request |
84 | route[2] { | 93 | route[REGISTER] { |
85 | if (!save("location")) { | 94 | if (!save("location")) { |
86 | sl_reply_error(); | 95 | sl_reply_error(); |
87 | } | 96 | } |
88 | } | 97 | } |
89 | 98 | ||
90 | #-------------------------------------------------------- | 99 | #-------------------------------------------------------- |
91 | # Section 1: Reply Route Block | 100 | # Section 6: Reply Route Block |
92 | #-------------------------------------------------------- | 101 | #-------------------------------------------------------- |
93 | 102 | ||
94 | 103 | ||
95 | #-------------------------------------------------------- | 104 | #-------------------------------------------------------- |
96 | # Section 1: Failure Route Block | 105 | # Section 7: Failure Route Block |
97 | #-------------------------------------------------------- | 106 | #-------------------------------------------------------- |
98 | 107 | ||
99 | |||
100 | |||
101 | |||
102 | |||
103 | |||
104 | |||
105 | |||
106 | |||
107 | |||
diff --git a/main/kamailio/kamailio.initd b/main/kamailio/kamailio.initd index a70b1781e8..ee4e2ecef1 100644 --- a/main/kamailio/kamailio.initd +++ b/main/kamailio/kamailio.initd | |||
@@ -4,7 +4,7 @@ daemon=/usr/sbin/kamailio | |||
4 | pidfile=/var/run/kamailio/kamailio.pid | 4 | pidfile=/var/run/kamailio/kamailio.pid |
5 | 5 | ||
6 | depend() { | 6 | depend() { |
7 | need net logger | 7 | need net |
8 | after firewall | 8 | after firewall |
9 | } | 9 | } |
10 | 10 | ||
diff --git a/main/kamailio/kamailio.pre-install b/main/kamailio/kamailio.pre-install index f0ed06b7fa..78dfa38bf3 100644 --- a/main/kamailio/kamailio.pre-install +++ b/main/kamailio/kamailio.pre-install | |||
@@ -1,5 +1,5 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | addgroup kamailio 2>/dev/null | 3 | adduser -H -h /var/empty -s /bin/false -D kamailio 2>/dev/null |
4 | adduser -G kamailio -h /var/run/kamailio -s /bin/false -S -D -H kamailio 2>/dev/null | 4 | |
5 | exit 0 | 5 | exit 0 |
diff --git a/main/libcap-ng/APKBUILD b/main/libcap-ng/APKBUILD new file mode 100644 index 0000000000..3abe2e2317 --- /dev/null +++ b/main/libcap-ng/APKBUILD | |||
@@ -0,0 +1,41 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
2 | pkgname=libcap-ng | ||
3 | pkgver=0.6.4 | ||
4 | pkgrel=0 | ||
5 | pkgdesc="posix capabilities library" | ||
6 | url="http://people.redhat.com/sgrubb/libcap-ng/index.html" | ||
7 | license="GPL" | ||
8 | depends= | ||
9 | makedepends="python" | ||
10 | install= | ||
11 | subpackages="$pkgname-dev $pkgname-doc $pkgname-utils" | ||
12 | source="http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-$pkgver.tar.gz" | ||
13 | |||
14 | _builddir="$srcdir"/$pkgname-$pkgver | ||
15 | |||
16 | prepare() { | ||
17 | cd "$_builddir" | ||
18 | # apply patches here | ||
19 | } | ||
20 | |||
21 | build() { | ||
22 | cd "$_builddir" | ||
23 | ./configure --prefix=/usr \ | ||
24 | --sysconfdir=/etc \ | ||
25 | --mandir=/usr/share/man \ | ||
26 | --infodir=/usr/share/info | ||
27 | make || return 1 | ||
28 | } | ||
29 | |||
30 | package() { | ||
31 | cd "$_builddir" | ||
32 | make DESTDIR="$pkgdir" install | ||
33 | } | ||
34 | |||
35 | utils() { | ||
36 | pkgdesc="posix capabilities utils" | ||
37 | mkdir -p "$subpkgdir"/usr/bin | ||
38 | mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/ | ||
39 | } | ||
40 | |||
41 | md5sums="ae817cd585ca11db257330b392003ed6 libcap-ng-0.6.4.tar.gz" | ||
diff --git a/main/libpri/APKBUILD b/main/libpri/APKBUILD index 231787c4f6..65ab764caa 100644 --- a/main/libpri/APKBUILD +++ b/main/libpri/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
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.2 | 4 | pkgver=1.4.11.3 |
5 | pkgrel=0 | 5 | pkgrel=0 |
6 | pkgdesc="Primary Rate ISDN (PRI) library" | 6 | pkgdesc="Primary Rate ISDN (PRI) library" |
7 | url="http://www.asterisk.orig" | 7 | url="http://www.asterisk.orig" |
@@ -28,4 +28,4 @@ package() { | |||
28 | make LDCONFIG="echo" INSTALL_PREFIX="$pkgdir" install | 28 | make LDCONFIG="echo" INSTALL_PREFIX="$pkgdir" install |
29 | } | 29 | } |
30 | 30 | ||
31 | md5sums="320d55151e180b2fc13abfee8e2e73d8 libpri-1.4.11.2.tar.gz" | 31 | md5sums="f3ad31bc623b8335c65b8e85d46117b4 libpri-1.4.11.3.tar.gz" |
diff --git a/testing/libtirpc/APKBUILD b/main/libtirpc/APKBUILD index d77553d5b2..ecac43adc3 100644 --- a/testing/libtirpc/APKBUILD +++ b/main/libtirpc/APKBUILD | |||
@@ -1,24 +1,33 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=libtirpc | 2 | pkgname=libtirpc |
3 | pkgver=0.2.1 | 3 | pkgver=0.2.1 |
4 | pkgrel=1 | 4 | pkgrel=2 |
5 | pkgdesc="Transport Independent RPC library (SunRPC replacement)" | 5 | pkgdesc="Transport Independent RPC library (SunRPC replacement)" |
6 | url="http://libtirpc.sourceforge.net/" | 6 | url="http://libtirpc.sourceforge.net/" |
7 | license="GPL2" | 7 | license="GPL2" |
8 | depends= | 8 | depends= |
9 | makedepends="libgssglue-dev heimdal-dev" | 9 | makedepends="libgssglue-dev heimdal-dev autoconf automake libtool" |
10 | subpackages="$pkgname-dev $pkgname-doc" | 10 | subpackages="$pkgname-dev $pkgname-doc" |
11 | source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 | 11 | source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 |
12 | nis.h" | 12 | nis.h |
13 | libtirpc-no-des.patch" | ||
13 | 14 | ||
14 | depends_dev="libgssglue-dev heimdal-dev" | 15 | depends_dev="libgssglue-dev heimdal-dev" |
15 | prepare() { | 16 | prepare() { |
16 | cd "$srcdir"/$pkgname-$pkgver | 17 | cd "$srcdir"/$pkgname-$pkgver |
18 | for i in $source; do | ||
19 | case $i in | ||
20 | *.patch) | ||
21 | msg "Applying $i" | ||
22 | patch -p1 -i "$srcdir"/$i || return 1 | ||
23 | ;; | ||
24 | esac | ||
25 | done | ||
17 | # uclibc does not provide nis.h so provide our own | 26 | # uclibc does not provide nis.h so provide our own |
18 | mkdir src/rpcsvc | 27 | mkdir src/rpcsvc |
19 | cp "$srcdir"/nis.h src/rpcsvc/ | 28 | cp "$srcdir"/nis.h src/rpcsvc/ |
20 | # we dont have nsl | 29 | |
21 | sed -i -e "/^libtirpc_la_LDFLAGS/s/-lnsl//" src/Makefile.in | 30 | sh bootstrap && libtoolize |
22 | } | 31 | } |
23 | 32 | ||
24 | build() { | 33 | build() { |
@@ -34,4 +43,5 @@ package() { | |||
34 | install -D -m644 doc/etc_netconfig "$pkgdir"/etc/netconfig | 43 | install -D -m644 doc/etc_netconfig "$pkgdir"/etc/netconfig |
35 | } | 44 | } |
36 | md5sums="d77eb15f464bf9d6e66259eaf78b2a4e libtirpc-0.2.1.tar.bz2 | 45 | md5sums="d77eb15f464bf9d6e66259eaf78b2a4e libtirpc-0.2.1.tar.bz2 |
37 | 082dff1bc78bdcbac6d305c1534fe3c0 nis.h" | 46 | 082dff1bc78bdcbac6d305c1534fe3c0 nis.h |
47 | e386d2893527ed313686eca6314d6675 libtirpc-no-des.patch" | ||
diff --git a/main/libtirpc/libtirpc-no-des.patch b/main/libtirpc/libtirpc-no-des.patch new file mode 100644 index 0000000000..8c59de21f8 --- /dev/null +++ b/main/libtirpc/libtirpc-no-des.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | --- ./src/Makefile.am.orig | ||
2 | +++ ./src/Makefile.am | ||
3 | @@ -40,7 +40,7 @@ | ||
4 | # release number of your package. This is an abuse that only fosters | ||
5 | # misunderstanding of the purpose of library versions." | ||
6 | # | ||
7 | -libtirpc_la_LDFLAGS = -lnsl -lpthread -version-info 1:10:0 | ||
8 | +libtirpc_la_LDFLAGS = -lpthread -version-info 1:10:0 | ||
9 | |||
10 | libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \ | ||
11 | clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \ | ||
12 | @@ -50,7 +50,7 @@ | ||
13 | rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ | ||
14 | rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_generic.c \ | ||
15 | svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ | ||
16 | - auth_time.c auth_des.c authdes_prot.c | ||
17 | + auth_time.c | ||
18 | |||
19 | ## XDR | ||
20 | libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c | ||
21 | --- ./src/rpc_soc.c.orig | ||
22 | +++ ./src/rpc_soc.c | ||
23 | @@ -479,6 +479,7 @@ | ||
24 | (resultproc_t) rpc_wrap_bcast, "udp"); | ||
25 | } | ||
26 | |||
27 | +#if 0 | ||
28 | /* | ||
29 | * Create the client des authentication object. Obsoleted by | ||
30 | * authdes_seccreate(). | ||
31 | @@ -511,6 +512,7 @@ | ||
32 | return (dummy); | ||
33 | } | ||
34 | |||
35 | +#endif | ||
36 | /* | ||
37 | * Create a client handle for a unix connection. Obsoleted by clnt_vc_create() | ||
38 | */ | ||
diff --git a/testing/libtirpc/nis.h b/main/libtirpc/nis.h index a03a25f37b..a03a25f37b 100644 --- a/testing/libtirpc/nis.h +++ b/main/libtirpc/nis.h | |||
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index b9667cd346..83697b369d 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.15 | 5 | pkgver=2.6.32.16 |
6 | _kernver=2.6.32 | 6 | _kernver=2.6.32 |
7 | pkgrel=9 | 7 | pkgrel=1 |
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.2.0-2.6.32.15-201006271253.patch | 17 | grsecurity-2.2.0-2.6.32.16-201007112149.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 |
@@ -147,8 +147,8 @@ firmware() { | |||
147 | } | 147 | } |
148 | 148 | ||
149 | md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 | 149 | md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 |
150 | 5c9251844c2819eddee4dba1293bd46d patch-2.6.32.15.bz2 | 150 | 744890f9651962ceae7663d44b19df65 patch-2.6.32.16.bz2 |
151 | 98a8ab1e328d67e40657ef5e4b9d1b37 grsecurity-2.2.0-2.6.32.15-201006271253.patch | 151 | 34e3f7fe893034d29530ec1bd5584a33 grsecurity-2.2.0-2.6.32.16-201007112149.patch |
152 | 1d247140abec49b96250aec9aa59b324 0001-grsec-revert-conflicting-flow-cache-changes.patch | 152 | 1d247140abec49b96250aec9aa59b324 0001-grsec-revert-conflicting-flow-cache-changes.patch |
153 | 437317f88ec13ace8d39c31983a41696 0002-gre-fix-hard-header-destination-address-checking.patch | 153 | 437317f88ec13ace8d39c31983a41696 0002-gre-fix-hard-header-destination-address-checking.patch |
154 | 151b29a161178ed39d62a08f21f3484d 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch | 154 | 151b29a161178ed39d62a08f21f3484d 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch |
diff --git a/main/linux-grsec/grsecurity-2.2.0-2.6.32.15-201006271253.patch b/main/linux-grsec/grsecurity-2.2.0-2.6.32.16-201007112149.patch index 722e01f379..e9f38fe06a 100644 --- a/main/linux-grsec/grsecurity-2.2.0-2.6.32.15-201006271253.patch +++ b/main/linux-grsec/grsecurity-2.2.0-2.6.32.16-201007112149.patch | |||
@@ -1,6 +1,6 @@ | |||
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 | 1 | diff -urNp linux-2.6.32.16/arch/alpha/include/asm/elf.h linux-2.6.32.16/arch/alpha/include/asm/elf.h |
2 | --- linux-2.6.32.15/arch/alpha/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 | 2 | --- linux-2.6.32.16/arch/alpha/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 |
3 | +++ linux-2.6.32.15/arch/alpha/include/asm/elf.h 2010-05-28 21:27:14.402915497 -0400 | 3 | +++ linux-2.6.32.16/arch/alpha/include/asm/elf.h 2010-07-09 14:50:34.000000000 -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.15/arch/alpha/include/asm/elf.h linux-2.6.32.15/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.15/arch/alpha/include/asm/pgtable.h linux-2.6.32.15/arch/alpha/include/asm/pgtable.h | 18 | diff -urNp linux-2.6.32.16/arch/alpha/include/asm/pgtable.h linux-2.6.32.16/arch/alpha/include/asm/pgtable.h |
19 | --- linux-2.6.32.15/arch/alpha/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 | 19 | --- linux-2.6.32.16/arch/alpha/include/asm/pgtable.h 2010-07-05 14:14:00.000000000 -0400 |
20 | +++ linux-2.6.32.15/arch/alpha/include/asm/pgtable.h 2010-05-28 21:27:14.420270024 -0400 | 20 | +++ linux-2.6.32.16/arch/alpha/include/asm/pgtable.h 2010-07-09 14:50:34.000000000 -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.15/arch/alpha/include/asm/pgtable.h linux-2.6.32.15/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.15/arch/alpha/kernel/module.c linux-2.6.32.15/arch/alpha/kernel/module.c | 39 | diff -urNp linux-2.6.32.16/arch/alpha/kernel/module.c linux-2.6.32.16/arch/alpha/kernel/module.c |
40 | --- linux-2.6.32.15/arch/alpha/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 | 40 | --- linux-2.6.32.16/arch/alpha/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 |
41 | +++ linux-2.6.32.15/arch/alpha/kernel/module.c 2010-05-28 21:27:14.523207400 -0400 | 41 | +++ linux-2.6.32.16/arch/alpha/kernel/module.c 2010-07-09 14:50:34.000000000 -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.15/arch/alpha/kernel/module.c linux-2.6.32.15/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.15/arch/alpha/kernel/osf_sys.c linux-2.6.32.15/arch/alpha/kernel/osf_sys.c | 51 | diff -urNp linux-2.6.32.16/arch/alpha/kernel/osf_sys.c linux-2.6.32.16/arch/alpha/kernel/osf_sys.c |
52 | --- linux-2.6.32.15/arch/alpha/kernel/osf_sys.c 2010-03-15 11:52:04.000000000 -0400 | 52 | --- linux-2.6.32.16/arch/alpha/kernel/osf_sys.c 2010-07-05 14:14:00.000000000 -0400 |
53 | +++ linux-2.6.32.15/arch/alpha/kernel/osf_sys.c 2010-05-28 21:27:14.523207400 -0400 | 53 | +++ linux-2.6.32.16/arch/alpha/kernel/osf_sys.c 2010-07-09 14:50:34.000000000 -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.15/arch/alpha/kernel/osf_sys.c linux-2.6.32.15/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.15/arch/alpha/mm/fault.c linux-2.6.32.15/arch/alpha/mm/fault.c | 76 | diff -urNp linux-2.6.32.16/arch/alpha/mm/fault.c linux-2.6.32.16/arch/alpha/mm/fault.c |
77 | --- linux-2.6.32.15/arch/alpha/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 | 77 | --- linux-2.6.32.16/arch/alpha/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 |
78 | +++ linux-2.6.32.15/arch/alpha/mm/fault.c 2010-05-28 21:27:14.523207400 -0400 | 78 | +++ linux-2.6.32.16/arch/alpha/mm/fault.c 2010-07-09 14:50:34.000000000 -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.15/arch/alpha/mm/fault.c linux-2.6.32.15/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.15/arch/arm/include/asm/elf.h linux-2.6.32.15/arch/arm/include/asm/elf.h | 235 | diff -urNp linux-2.6.32.16/arch/arm/include/asm/elf.h linux-2.6.32.16/arch/arm/include/asm/elf.h |
236 | --- linux-2.6.32.15/arch/arm/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 | 236 | --- linux-2.6.32.16/arch/arm/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 |
237 | +++ linux-2.6.32.15/arch/arm/include/asm/elf.h 2010-05-28 21:27:14.523207400 -0400 | 237 | +++ linux-2.6.32.16/arch/arm/include/asm/elf.h 2010-07-09 14:50:34.000000000 -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.15/arch/arm/include/asm/elf.h linux-2.6.32.15/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.15/arch/arm/include/asm/kmap_types.h linux-2.6.32.15/arch/arm/include/asm/kmap_types.h | 254 | diff -urNp linux-2.6.32.16/arch/arm/include/asm/kmap_types.h linux-2.6.32.16/arch/arm/include/asm/kmap_types.h |
255 | --- linux-2.6.32.15/arch/arm/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 | 255 | --- linux-2.6.32.16/arch/arm/include/asm/kmap_types.h 2010-07-05 14:14:00.000000000 -0400 |
256 | +++ linux-2.6.32.15/arch/arm/include/asm/kmap_types.h 2010-05-28 21:27:14.523207400 -0400 | 256 | +++ linux-2.6.32.16/arch/arm/include/asm/kmap_types.h 2010-07-09 14:50:34.000000000 -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.15/arch/arm/include/asm/kmap_types.h linux-2.6.32.15/arc | |||
262 | KM_TYPE_NR | 262 | KM_TYPE_NR |
263 | }; | 263 | }; |
264 | 264 | ||
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 | 265 | diff -urNp linux-2.6.32.16/arch/arm/include/asm/uaccess.h linux-2.6.32.16/arch/arm/include/asm/uaccess.h |
266 | --- linux-2.6.32.15/arch/arm/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 | 266 | --- linux-2.6.32.16/arch/arm/include/asm/uaccess.h 2010-07-05 14:14:00.000000000 -0400 |
267 | +++ linux-2.6.32.15/arch/arm/include/asm/uaccess.h 2010-05-28 21:27:14.539151073 -0400 | 267 | +++ linux-2.6.32.16/arch/arm/include/asm/uaccess.h 2010-07-09 14:50:34.000000000 -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.15/arch/arm/include/asm/uaccess.h linux-2.6.32.15/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.15/arch/arm/kernel/kgdb.c linux-2.6.32.15/arch/arm/kernel/kgdb.c | 288 | diff -urNp linux-2.6.32.16/arch/arm/kernel/kgdb.c linux-2.6.32.16/arch/arm/kernel/kgdb.c |
289 | --- linux-2.6.32.15/arch/arm/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 | 289 | --- linux-2.6.32.16/arch/arm/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 |
290 | +++ linux-2.6.32.15/arch/arm/kernel/kgdb.c 2010-05-28 21:27:14.539151073 -0400 | 290 | +++ linux-2.6.32.16/arch/arm/kernel/kgdb.c 2010-07-09 14:50:34.000000000 -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.15/arch/arm/kernel/kgdb.c linux-2.6.32.15/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.15/arch/arm/mach-at91/pm.c linux-2.6.32.15/arch/arm/mach-at91/pm.c | 300 | diff -urNp linux-2.6.32.16/arch/arm/mach-at91/pm.c linux-2.6.32.16/arch/arm/mach-at91/pm.c |
301 | --- linux-2.6.32.15/arch/arm/mach-at91/pm.c 2010-03-15 11:52:04.000000000 -0400 | 301 | --- linux-2.6.32.16/arch/arm/mach-at91/pm.c 2010-07-05 14:14:00.000000000 -0400 |
302 | +++ linux-2.6.32.15/arch/arm/mach-at91/pm.c 2010-05-28 21:27:14.600189804 -0400 | 302 | +++ linux-2.6.32.16/arch/arm/mach-at91/pm.c 2010-07-09 14:50:34.000000000 -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.15/arch/arm/mach-at91/pm.c linux-2.6.32.15/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.15/arch/arm/mach-omap1/pm.c linux-2.6.32.15/arch/arm/mach-omap1/pm.c | 312 | diff -urNp linux-2.6.32.16/arch/arm/mach-omap1/pm.c linux-2.6.32.16/arch/arm/mach-omap1/pm.c |
313 | --- linux-2.6.32.15/arch/arm/mach-omap1/pm.c 2010-03-15 11:52:04.000000000 -0400 | 313 | --- linux-2.6.32.16/arch/arm/mach-omap1/pm.c 2010-07-05 14:14:00.000000000 -0400 |
314 | +++ linux-2.6.32.15/arch/arm/mach-omap1/pm.c 2010-05-28 21:27:14.600189804 -0400 | 314 | +++ linux-2.6.32.16/arch/arm/mach-omap1/pm.c 2010-07-09 14:50:34.000000000 -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.15/arch/arm/mach-omap1/pm.c linux-2.6.32.15/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.15/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.15/arch/arm/mach-omap2/pm24xx.c | 324 | diff -urNp linux-2.6.32.16/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.16/arch/arm/mach-omap2/pm24xx.c |
325 | --- linux-2.6.32.15/arch/arm/mach-omap2/pm24xx.c 2010-03-15 11:52:04.000000000 -0400 | 325 | --- linux-2.6.32.16/arch/arm/mach-omap2/pm24xx.c 2010-07-05 14:14:00.000000000 -0400 |
326 | +++ linux-2.6.32.15/arch/arm/mach-omap2/pm24xx.c 2010-05-28 21:27:14.650418612 -0400 | 326 | +++ linux-2.6.32.16/arch/arm/mach-omap2/pm24xx.c 2010-07-09 14:50:34.000000000 -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.15/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.15/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.15/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.15/arch/arm/mach-omap2/pm34xx.c | 336 | diff -urNp linux-2.6.32.16/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.16/arch/arm/mach-omap2/pm34xx.c |
337 | --- linux-2.6.32.15/arch/arm/mach-omap2/pm34xx.c 2010-03-15 11:52:04.000000000 -0400 | 337 | --- linux-2.6.32.16/arch/arm/mach-omap2/pm34xx.c 2010-07-05 14:14:00.000000000 -0400 |
338 | +++ linux-2.6.32.15/arch/arm/mach-omap2/pm34xx.c 2010-05-28 21:27:14.651073283 -0400 | 338 | +++ linux-2.6.32.16/arch/arm/mach-omap2/pm34xx.c 2010-07-09 14:50:34.000000000 -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.15/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.15/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.15/arch/arm/mach-pnx4008/pm.c linux-2.6.32.15/arch/arm/mach-pnx4008/pm.c | 348 | diff -urNp linux-2.6.32.16/arch/arm/mach-pnx4008/pm.c linux-2.6.32.16/arch/arm/mach-pnx4008/pm.c |
349 | --- linux-2.6.32.15/arch/arm/mach-pnx4008/pm.c 2010-03-15 11:52:04.000000000 -0400 | 349 | --- linux-2.6.32.16/arch/arm/mach-pnx4008/pm.c 2010-07-05 14:14:00.000000000 -0400 |
350 | +++ linux-2.6.32.15/arch/arm/mach-pnx4008/pm.c 2010-05-28 21:27:14.651073283 -0400 | 350 | +++ linux-2.6.32.16/arch/arm/mach-pnx4008/pm.c 2010-07-09 14:50:34.000000000 -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.15/arch/arm/mach-pnx4008/pm.c linux-2.6.32.15/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.15/arch/arm/mach-pxa/pm.c linux-2.6.32.15/arch/arm/mach-pxa/pm.c | 360 | diff -urNp linux-2.6.32.16/arch/arm/mach-pxa/pm.c linux-2.6.32.16/arch/arm/mach-pxa/pm.c |
361 | --- linux-2.6.32.15/arch/arm/mach-pxa/pm.c 2010-03-15 11:52:04.000000000 -0400 | 361 | --- linux-2.6.32.16/arch/arm/mach-pxa/pm.c 2010-07-05 14:14:00.000000000 -0400 |
362 | +++ linux-2.6.32.15/arch/arm/mach-pxa/pm.c 2010-05-28 21:27:14.651073283 -0400 | 362 | +++ linux-2.6.32.16/arch/arm/mach-pxa/pm.c 2010-07-09 14:50:34.000000000 -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.15/arch/arm/mach-pxa/pm.c linux-2.6.32.15/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.15/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.15/arch/arm/mach-pxa/sharpsl_pm.c | 372 | diff -urNp linux-2.6.32.16/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.16/arch/arm/mach-pxa/sharpsl_pm.c |
373 | --- linux-2.6.32.15/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-15 11:52:04.000000000 -0400 | 373 | --- linux-2.6.32.16/arch/arm/mach-pxa/sharpsl_pm.c 2010-07-05 14:14:00.000000000 -0400 |
374 | +++ linux-2.6.32.15/arch/arm/mach-pxa/sharpsl_pm.c 2010-05-28 21:27:14.674954367 -0400 | 374 | +++ linux-2.6.32.16/arch/arm/mach-pxa/sharpsl_pm.c 2010-07-09 14:50:34.000000000 -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.15/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.15/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.15/arch/arm/mach-sa1100/pm.c linux-2.6.32.15/arch/arm/mach-sa1100/pm.c | 384 | diff -urNp linux-2.6.32.16/arch/arm/mach-sa1100/pm.c linux-2.6.32.16/arch/arm/mach-sa1100/pm.c |
385 | --- linux-2.6.32.15/arch/arm/mach-sa1100/pm.c 2010-03-15 11:52:04.000000000 -0400 | 385 | --- linux-2.6.32.16/arch/arm/mach-sa1100/pm.c 2010-07-05 14:14:00.000000000 -0400 |
386 | +++ linux-2.6.32.15/arch/arm/mach-sa1100/pm.c 2010-05-28 21:27:14.674954367 -0400 | 386 | +++ linux-2.6.32.16/arch/arm/mach-sa1100/pm.c 2010-07-09 14:50:34.000000000 -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.15/arch/arm/mach-sa1100/pm.c linux-2.6.32.15/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.15/arch/arm/mm/fault.c linux-2.6.32.15/arch/arm/mm/fault.c | 396 | diff -urNp linux-2.6.32.16/arch/arm/mm/fault.c linux-2.6.32.16/arch/arm/mm/fault.c |
397 | --- linux-2.6.32.15/arch/arm/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 | 397 | --- linux-2.6.32.16/arch/arm/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 |
398 | +++ linux-2.6.32.15/arch/arm/mm/fault.c 2010-05-28 21:27:14.683127211 -0400 | 398 | +++ linux-2.6.32.16/arch/arm/mm/fault.c 2010-07-09 14:50:34.000000000 -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.15/arch/arm/mm/fault.c linux-2.6.32.15/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.15/arch/arm/mm/mmap.c linux-2.6.32.15/arch/arm/mm/mmap.c | 447 | diff -urNp linux-2.6.32.16/arch/arm/mm/mmap.c linux-2.6.32.16/arch/arm/mm/mmap.c |
448 | --- linux-2.6.32.15/arch/arm/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 | 448 | --- linux-2.6.32.16/arch/arm/mm/mmap.c 2010-07-05 14:14:00.000000000 -0400 |
449 | +++ linux-2.6.32.15/arch/arm/mm/mmap.c 2010-05-28 21:27:14.704140649 -0400 | 449 | +++ linux-2.6.32.16/arch/arm/mm/mmap.c 2010-07-09 14:50:34.000000000 -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.15/arch/arm/mm/mmap.c linux-2.6.32.15/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.15/arch/arm/plat-s3c/pm.c linux-2.6.32.15/arch/arm/plat-s3c/pm.c | 486 | diff -urNp linux-2.6.32.16/arch/arm/plat-s3c/pm.c linux-2.6.32.16/arch/arm/plat-s3c/pm.c |
487 | --- linux-2.6.32.15/arch/arm/plat-s3c/pm.c 2010-03-15 11:52:04.000000000 -0400 | 487 | --- linux-2.6.32.16/arch/arm/plat-s3c/pm.c 2010-07-05 14:14:00.000000000 -0400 |
488 | +++ linux-2.6.32.15/arch/arm/plat-s3c/pm.c 2010-05-28 21:27:14.704140649 -0400 | 488 | +++ linux-2.6.32.16/arch/arm/plat-s3c/pm.c 2010-07-09 14:50:34.000000000 -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.15/arch/arm/plat-s3c/pm.c linux-2.6.32.15/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.15/arch/avr32/include/asm/elf.h linux-2.6.32.15/arch/avr32/include/asm/elf.h | 498 | diff -urNp linux-2.6.32.16/arch/avr32/include/asm/elf.h linux-2.6.32.16/arch/avr32/include/asm/elf.h |
499 | --- linux-2.6.32.15/arch/avr32/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 | 499 | --- linux-2.6.32.16/arch/avr32/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 |
500 | +++ linux-2.6.32.15/arch/avr32/include/asm/elf.h 2010-05-28 21:27:14.704140649 -0400 | 500 | +++ linux-2.6.32.16/arch/avr32/include/asm/elf.h 2010-07-09 14:50:34.000000000 -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.15/arch/avr32/include/asm/elf.h linux-2.6.32.15/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.15/arch/avr32/include/asm/kmap_types.h linux-2.6.32.15/arch/avr32/include/asm/kmap_types.h | 517 | diff -urNp linux-2.6.32.16/arch/avr32/include/asm/kmap_types.h linux-2.6.32.16/arch/avr32/include/asm/kmap_types.h |
518 | --- linux-2.6.32.15/arch/avr32/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 | 518 | --- linux-2.6.32.16/arch/avr32/include/asm/kmap_types.h 2010-07-05 14:14:00.000000000 -0400 |
519 | +++ linux-2.6.32.15/arch/avr32/include/asm/kmap_types.h 2010-05-28 21:27:14.706951400 -0400 | 519 | +++ linux-2.6.32.16/arch/avr32/include/asm/kmap_types.h 2010-07-09 14:50:34.000000000 -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.15/arch/avr32/include/asm/kmap_types.h linux-2.6.32.15/a | |||
527 | }; | 527 | }; |
528 | 528 | ||
529 | #undef D | 529 | #undef D |
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 | 530 | diff -urNp linux-2.6.32.16/arch/avr32/mach-at32ap/pm.c linux-2.6.32.16/arch/avr32/mach-at32ap/pm.c |
531 | --- linux-2.6.32.15/arch/avr32/mach-at32ap/pm.c 2010-03-15 11:52:04.000000000 -0400 | 531 | --- linux-2.6.32.16/arch/avr32/mach-at32ap/pm.c 2010-07-05 14:14:00.000000000 -0400 |
532 | +++ linux-2.6.32.15/arch/avr32/mach-at32ap/pm.c 2010-05-28 21:27:14.706951400 -0400 | 532 | +++ linux-2.6.32.16/arch/avr32/mach-at32ap/pm.c 2010-07-09 14:50:34.000000000 -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.15/arch/avr32/mach-at32ap/pm.c linux-2.6.32.15/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.15/arch/avr32/mm/fault.c linux-2.6.32.15/arch/avr32/mm/fault.c | 542 | diff -urNp linux-2.6.32.16/arch/avr32/mm/fault.c linux-2.6.32.16/arch/avr32/mm/fault.c |
543 | --- linux-2.6.32.15/arch/avr32/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 | 543 | --- linux-2.6.32.16/arch/avr32/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 |
544 | +++ linux-2.6.32.15/arch/avr32/mm/fault.c 2010-05-28 21:27:14.706951400 -0400 | 544 | +++ linux-2.6.32.16/arch/avr32/mm/fault.c 2010-07-09 14:50:34.000000000 -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.15/arch/avr32/mm/fault.c linux-2.6.32.15/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.15/arch/blackfin/kernel/kgdb.c linux-2.6.32.15/arch/blackfin/kernel/kgdb.c | 586 | diff -urNp linux-2.6.32.16/arch/blackfin/kernel/kgdb.c linux-2.6.32.16/arch/blackfin/kernel/kgdb.c |
587 | --- linux-2.6.32.15/arch/blackfin/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 | 587 | --- linux-2.6.32.16/arch/blackfin/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 |
588 | +++ linux-2.6.32.15/arch/blackfin/kernel/kgdb.c 2010-05-28 21:27:14.706951400 -0400 | 588 | +++ linux-2.6.32.16/arch/blackfin/kernel/kgdb.c 2010-07-09 14:50:34.000000000 -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.15/arch/blackfin/kernel/kgdb.c linux-2.6.32.15/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.15/arch/blackfin/mach-common/pm.c linux-2.6.32.15/arch/blackfin/mach-common/pm.c | 598 | diff -urNp linux-2.6.32.16/arch/blackfin/mach-common/pm.c linux-2.6.32.16/arch/blackfin/mach-common/pm.c |
599 | --- linux-2.6.32.15/arch/blackfin/mach-common/pm.c 2010-03-15 11:52:04.000000000 -0400 | 599 | --- linux-2.6.32.16/arch/blackfin/mach-common/pm.c 2010-07-05 14:14:00.000000000 -0400 |
600 | +++ linux-2.6.32.15/arch/blackfin/mach-common/pm.c 2010-05-28 21:27:14.706951400 -0400 | 600 | +++ linux-2.6.32.16/arch/blackfin/mach-common/pm.c 2010-07-09 14:50:34.000000000 -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.15/arch/blackfin/mach-common/pm.c linux-2.6.32.15/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.15/arch/frv/include/asm/kmap_types.h linux-2.6.32.15/arch/frv/include/asm/kmap_types.h | 610 | diff -urNp linux-2.6.32.16/arch/frv/include/asm/kmap_types.h linux-2.6.32.16/arch/frv/include/asm/kmap_types.h |
611 | --- linux-2.6.32.15/arch/frv/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 | 611 | --- linux-2.6.32.16/arch/frv/include/asm/kmap_types.h 2010-07-05 14:14:00.000000000 -0400 |
612 | +++ linux-2.6.32.15/arch/frv/include/asm/kmap_types.h 2010-05-28 21:27:14.706951400 -0400 | 612 | +++ linux-2.6.32.16/arch/frv/include/asm/kmap_types.h 2010-07-09 14:50:34.000000000 -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.15/arch/frv/include/asm/kmap_types.h linux-2.6.32.15/arc | |||
618 | KM_TYPE_NR | 618 | KM_TYPE_NR |
619 | }; | 619 | }; |
620 | 620 | ||
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 | 621 | diff -urNp linux-2.6.32.16/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.16/arch/ia64/hp/common/hwsw_iommu.c |
622 | --- linux-2.6.32.15/arch/ia64/hp/common/hwsw_iommu.c 2010-03-15 11:52:04.000000000 -0400 | 622 | --- linux-2.6.32.16/arch/ia64/hp/common/hwsw_iommu.c 2010-07-05 14:14:00.000000000 -0400 |
623 | +++ linux-2.6.32.15/arch/ia64/hp/common/hwsw_iommu.c 2010-05-28 21:27:14.706951400 -0400 | 623 | +++ linux-2.6.32.16/arch/ia64/hp/common/hwsw_iommu.c 2010-07-09 14:50:34.000000000 -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.15/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.15/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.15/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.15/arch/ia64/hp/common/sba_iommu.c | 642 | diff -urNp linux-2.6.32.16/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.16/arch/ia64/hp/common/sba_iommu.c |
643 | --- linux-2.6.32.15/arch/ia64/hp/common/sba_iommu.c 2010-03-15 11:52:04.000000000 -0400 | 643 | --- linux-2.6.32.16/arch/ia64/hp/common/sba_iommu.c 2010-07-05 14:14:00.000000000 -0400 |
644 | +++ linux-2.6.32.15/arch/ia64/hp/common/sba_iommu.c 2010-05-28 21:27:14.706951400 -0400 | 644 | +++ linux-2.6.32.16/arch/ia64/hp/common/sba_iommu.c 2010-07-09 14:50:34.000000000 -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.15/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.15/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.15/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.15/arch/ia64/ia32/binfmt_elf32.c | 663 | diff -urNp linux-2.6.32.16/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.16/arch/ia64/ia32/binfmt_elf32.c |
664 | --- linux-2.6.32.15/arch/ia64/ia32/binfmt_elf32.c 2010-03-15 11:52:04.000000000 -0400 | 664 | --- linux-2.6.32.16/arch/ia64/ia32/binfmt_elf32.c 2010-07-05 14:14:00.000000000 -0400 |
665 | +++ linux-2.6.32.15/arch/ia64/ia32/binfmt_elf32.c 2010-05-28 21:27:14.706951400 -0400 | 665 | +++ linux-2.6.32.16/arch/ia64/ia32/binfmt_elf32.c 2010-07-09 14:50:34.000000000 -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.15/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.15/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.15/arch/ia64/ia32/ia32priv.h linux-2.6.32.15/arch/ia64/ia32/ia32priv.h | 680 | diff -urNp linux-2.6.32.16/arch/ia64/ia32/ia32priv.h linux-2.6.32.16/arch/ia64/ia32/ia32priv.h |
681 | --- linux-2.6.32.15/arch/ia64/ia32/ia32priv.h 2010-03-15 11:52:04.000000000 -0400 | 681 | --- linux-2.6.32.16/arch/ia64/ia32/ia32priv.h 2010-07-05 14:14:00.000000000 -0400 |
682 | +++ linux-2.6.32.15/arch/ia64/ia32/ia32priv.h 2010-05-28 21:27:14.716122970 -0400 | 682 | +++ linux-2.6.32.16/arch/ia64/ia32/ia32priv.h 2010-07-09 14:50:34.000000000 -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.15/arch/ia64/ia32/ia32priv.h linux-2.6.32.15/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.15/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.15/arch/ia64/include/asm/dma-mapping.h | 699 | diff -urNp linux-2.6.32.16/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.16/arch/ia64/include/asm/dma-mapping.h |
700 | --- linux-2.6.32.15/arch/ia64/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 | 700 | --- linux-2.6.32.16/arch/ia64/include/asm/dma-mapping.h 2010-07-05 14:14:00.000000000 -0400 |
701 | +++ linux-2.6.32.15/arch/ia64/include/asm/dma-mapping.h 2010-05-28 21:27:14.716122970 -0400 | 701 | +++ linux-2.6.32.16/arch/ia64/include/asm/dma-mapping.h 2010-07-09 14:50:34.000000000 -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.15/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.15/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.15/arch/ia64/include/asm/elf.h linux-2.6.32.15/arch/ia64/include/asm/elf.h | 745 | diff -urNp linux-2.6.32.16/arch/ia64/include/asm/elf.h linux-2.6.32.16/arch/ia64/include/asm/elf.h |
746 | --- linux-2.6.32.15/arch/ia64/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 | 746 | --- linux-2.6.32.16/arch/ia64/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 |
747 | +++ linux-2.6.32.15/arch/ia64/include/asm/elf.h 2010-05-28 21:27:14.716122970 -0400 | 747 | +++ linux-2.6.32.16/arch/ia64/include/asm/elf.h 2010-07-09 14:50:34.000000000 -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.15/arch/ia64/include/asm/elf.h linux-2.6.32.15/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.15/arch/ia64/include/asm/machvec.h linux-2.6.32.15/arch/ia64/include/asm/machvec.h | 762 | diff -urNp linux-2.6.32.16/arch/ia64/include/asm/machvec.h linux-2.6.32.16/arch/ia64/include/asm/machvec.h |
763 | --- linux-2.6.32.15/arch/ia64/include/asm/machvec.h 2010-03-15 11:52:04.000000000 -0400 | 763 | --- linux-2.6.32.16/arch/ia64/include/asm/machvec.h 2010-07-05 14:14:00.000000000 -0400 |
764 | +++ linux-2.6.32.15/arch/ia64/include/asm/machvec.h 2010-05-28 21:27:14.716122970 -0400 | 764 | +++ linux-2.6.32.16/arch/ia64/include/asm/machvec.h 2010-07-09 14:50:34.000000000 -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.15/arch/ia64/include/asm/machvec.h linux-2.6.32.15/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.15/arch/ia64/include/asm/pgtable.h linux-2.6.32.15/arch/ia64/include/asm/pgtable.h | 783 | diff -urNp linux-2.6.32.16/arch/ia64/include/asm/pgtable.h linux-2.6.32.16/arch/ia64/include/asm/pgtable.h |
784 | --- linux-2.6.32.15/arch/ia64/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 | 784 | --- linux-2.6.32.16/arch/ia64/include/asm/pgtable.h 2010-07-05 14:14:00.000000000 -0400 |
785 | +++ linux-2.6.32.15/arch/ia64/include/asm/pgtable.h 2010-05-28 21:27:14.716122970 -0400 | 785 | +++ linux-2.6.32.16/arch/ia64/include/asm/pgtable.h 2010-07-09 14:50:34.000000000 -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.15/arch/ia64/include/asm/pgtable.h linux-2.6.32.15/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.15/arch/ia64/include/asm/uaccess.h linux-2.6.32.15/arch/ia64/include/asm/uaccess.h | 804 | diff -urNp linux-2.6.32.16/arch/ia64/include/asm/uaccess.h linux-2.6.32.16/arch/ia64/include/asm/uaccess.h |
805 | --- linux-2.6.32.15/arch/ia64/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 | 805 | --- linux-2.6.32.16/arch/ia64/include/asm/uaccess.h 2010-07-05 14:14:00.000000000 -0400 |
806 | +++ linux-2.6.32.15/arch/ia64/include/asm/uaccess.h 2010-05-28 21:27:14.728159079 -0400 | 806 | +++ linux-2.6.32.16/arch/ia64/include/asm/uaccess.h 2010-07-09 14:50:34.000000000 -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.15/arch/ia64/include/asm/uaccess.h linux-2.6.32.15/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.15/arch/ia64/kernel/dma-mapping.c linux-2.6.32.15/arch/ia64/kernel/dma-mapping.c | 825 | diff -urNp linux-2.6.32.16/arch/ia64/kernel/dma-mapping.c linux-2.6.32.16/arch/ia64/kernel/dma-mapping.c |
826 | --- linux-2.6.32.15/arch/ia64/kernel/dma-mapping.c 2010-03-15 11:52:04.000000000 -0400 | 826 | --- linux-2.6.32.16/arch/ia64/kernel/dma-mapping.c 2010-07-05 14:14:00.000000000 -0400 |
827 | +++ linux-2.6.32.15/arch/ia64/kernel/dma-mapping.c 2010-05-28 21:27:14.731127928 -0400 | 827 | +++ linux-2.6.32.16/arch/ia64/kernel/dma-mapping.c 2010-07-09 14:50:34.000000000 -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.15/arch/ia64/kernel/dma-mapping.c linux-2.6.32.15/arch/i | |||
843 | { | 843 | { |
844 | return dma_ops; | 844 | return dma_ops; |
845 | } | 845 | } |
846 | diff -urNp linux-2.6.32.15/arch/ia64/kernel/module.c linux-2.6.32.15/arch/ia64/kernel/module.c | 846 | diff -urNp linux-2.6.32.16/arch/ia64/kernel/module.c linux-2.6.32.16/arch/ia64/kernel/module.c |
847 | --- linux-2.6.32.15/arch/ia64/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 | 847 | --- linux-2.6.32.16/arch/ia64/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 |
848 | +++ linux-2.6.32.15/arch/ia64/kernel/module.c 2010-05-28 21:27:14.734962469 -0400 | 848 | +++ linux-2.6.32.16/arch/ia64/kernel/module.c 2010-07-09 14:50:34.000000000 -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.15/arch/ia64/kernel/module.c linux-2.6.32.15/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.15/arch/ia64/kernel/pci-dma.c linux-2.6.32.15/arch/ia64/kernel/pci-dma.c | 937 | diff -urNp linux-2.6.32.16/arch/ia64/kernel/pci-dma.c linux-2.6.32.16/arch/ia64/kernel/pci-dma.c |
938 | --- linux-2.6.32.15/arch/ia64/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400 | 938 | --- linux-2.6.32.16/arch/ia64/kernel/pci-dma.c 2010-07-05 14:14:00.000000000 -0400 |
939 | +++ linux-2.6.32.15/arch/ia64/kernel/pci-dma.c 2010-05-28 21:27:14.734962469 -0400 | 939 | +++ linux-2.6.32.16/arch/ia64/kernel/pci-dma.c 2010-07-09 14:50:44.000000000 -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,51 @@ diff -urNp linux-2.6.32.15/arch/ia64/kernel/pci-dma.c linux-2.6.32.15/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.15/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.15/arch/ia64/kernel/pci-swiotlb.c | 949 | @@ -96,15 +96,34 @@ int iommu_dma_supported(struct device *d |
950 | --- linux-2.6.32.15/arch/ia64/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 | 950 | } |
951 | +++ linux-2.6.32.15/arch/ia64/kernel/pci-swiotlb.c 2010-05-28 21:27:14.734962469 -0400 | 951 | EXPORT_SYMBOL(iommu_dma_supported); |
952 | |||
953 | +extern void *intel_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t *dma_handle, gfp_t flags); | ||
954 | +extern void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr, dma_addr_t dma_handle); | ||
955 | +extern int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int nelems, enum dma_data_direction dir, struct dma_attrs *attrs); | ||
956 | +extern void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist, int nelems, enum dma_data_direction dir, struct dma_attrs *attrs); | ||
957 | +extern dma_addr_t intel_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, enum dma_data_direction dir, struct dma_attrs *attrs); | ||
958 | +extern void intel_unmap_page(struct device *dev, dma_addr_t dev_addr, size_t size, enum dma_data_direction dir, struct dma_attrs *attrs); | ||
959 | +extern int intel_mapping_error(struct device *dev, dma_addr_t dma_addr); | ||
960 | + | ||
961 | +static const struct dma_map_ops intel_iommu_dma_ops = { | ||
962 | + /* from drivers/pci/intel-iommu.c:intel_dma_ops */ | ||
963 | + .alloc_coherent = intel_alloc_coherent, | ||
964 | + .free_coherent = intel_free_coherent, | ||
965 | + .map_sg = intel_map_sg, | ||
966 | + .unmap_sg = intel_unmap_sg, | ||
967 | + .map_page = intel_map_page, | ||
968 | + .unmap_page = intel_unmap_page, | ||
969 | + .mapping_error = intel_mapping_error, | ||
970 | + | ||
971 | + .sync_single_for_cpu = machvec_dma_sync_single, | ||
972 | + .sync_sg_for_cpu = machvec_dma_sync_sg, | ||
973 | + .sync_single_for_device = machvec_dma_sync_single, | ||
974 | + .sync_sg_for_device = machvec_dma_sync_sg, | ||
975 | + .dma_supported = iommu_dma_supported, | ||
976 | +}; | ||
977 | + | ||
978 | void __init pci_iommu_alloc(void) | ||
979 | { | ||
980 | - dma_ops = &intel_dma_ops; | ||
981 | - | ||
982 | - dma_ops->sync_single_for_cpu = machvec_dma_sync_single; | ||
983 | - dma_ops->sync_sg_for_cpu = machvec_dma_sync_sg; | ||
984 | - dma_ops->sync_single_for_device = machvec_dma_sync_single; | ||
985 | - dma_ops->sync_sg_for_device = machvec_dma_sync_sg; | ||
986 | - dma_ops->dma_supported = iommu_dma_supported; | ||
987 | + dma_ops = &intel_iommu_dma_ops; | ||
988 | |||
989 | /* | ||
990 | * The order of these functions is important for | ||
991 | diff -urNp linux-2.6.32.16/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.16/arch/ia64/kernel/pci-swiotlb.c | ||
992 | --- linux-2.6.32.16/arch/ia64/kernel/pci-swiotlb.c 2010-07-05 14:14:00.000000000 -0400 | ||
993 | +++ linux-2.6.32.16/arch/ia64/kernel/pci-swiotlb.c 2010-07-09 14:50:34.000000000 -0400 | ||
952 | @@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent | 994 | @@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent |
953 | return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); | 995 | return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); |
954 | } | 996 | } |
@@ -958,9 +1000,9 @@ diff -urNp linux-2.6.32.15/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.15/arch/i | |||
958 | .alloc_coherent = ia64_swiotlb_alloc_coherent, | 1000 | .alloc_coherent = ia64_swiotlb_alloc_coherent, |
959 | .free_coherent = swiotlb_free_coherent, | 1001 | .free_coherent = swiotlb_free_coherent, |
960 | .map_page = swiotlb_map_page, | 1002 | .map_page = swiotlb_map_page, |
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 | 1003 | diff -urNp linux-2.6.32.16/arch/ia64/kernel/sys_ia64.c linux-2.6.32.16/arch/ia64/kernel/sys_ia64.c |
962 | --- linux-2.6.32.15/arch/ia64/kernel/sys_ia64.c 2010-03-15 11:52:04.000000000 -0400 | 1004 | --- linux-2.6.32.16/arch/ia64/kernel/sys_ia64.c 2010-07-05 14:14:00.000000000 -0400 |
963 | +++ linux-2.6.32.15/arch/ia64/kernel/sys_ia64.c 2010-05-28 21:27:14.734962469 -0400 | 1005 | +++ linux-2.6.32.16/arch/ia64/kernel/sys_ia64.c 2010-07-09 14:50:34.000000000 -0400 |
964 | @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil | 1006 | @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil |
965 | if (REGION_NUMBER(addr) == RGN_HPAGE) | 1007 | if (REGION_NUMBER(addr) == RGN_HPAGE) |
966 | addr = 0; | 1008 | addr = 0; |
@@ -987,9 +1029,9 @@ diff -urNp linux-2.6.32.15/arch/ia64/kernel/sys_ia64.c linux-2.6.32.15/arch/ia64 | |||
987 | goto full_search; | 1029 | goto full_search; |
988 | } | 1030 | } |
989 | return -ENOMEM; | 1031 | return -ENOMEM; |
990 | diff -urNp linux-2.6.32.15/arch/ia64/kernel/topology.c linux-2.6.32.15/arch/ia64/kernel/topology.c | 1032 | diff -urNp linux-2.6.32.16/arch/ia64/kernel/topology.c linux-2.6.32.16/arch/ia64/kernel/topology.c |
991 | --- linux-2.6.32.15/arch/ia64/kernel/topology.c 2010-03-15 11:52:04.000000000 -0400 | 1033 | --- linux-2.6.32.16/arch/ia64/kernel/topology.c 2010-07-05 14:14:00.000000000 -0400 |
992 | +++ linux-2.6.32.15/arch/ia64/kernel/topology.c 2010-05-28 21:27:14.743147071 -0400 | 1034 | +++ linux-2.6.32.16/arch/ia64/kernel/topology.c 2010-07-09 14:50:34.000000000 -0400 |
993 | @@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject | 1035 | @@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject |
994 | return ret; | 1036 | return ret; |
995 | } | 1037 | } |
@@ -999,9 +1041,9 @@ diff -urNp linux-2.6.32.15/arch/ia64/kernel/topology.c linux-2.6.32.15/arch/ia64 | |||
999 | .show = cache_show | 1041 | .show = cache_show |
1000 | }; | 1042 | }; |
1001 | 1043 | ||
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 | 1044 | diff -urNp linux-2.6.32.16/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.16/arch/ia64/kernel/vmlinux.lds.S |
1003 | --- linux-2.6.32.15/arch/ia64/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400 | 1045 | --- linux-2.6.32.16/arch/ia64/kernel/vmlinux.lds.S 2010-07-05 14:14:00.000000000 -0400 |
1004 | +++ linux-2.6.32.15/arch/ia64/kernel/vmlinux.lds.S 2010-05-28 21:27:14.743147071 -0400 | 1046 | +++ linux-2.6.32.16/arch/ia64/kernel/vmlinux.lds.S 2010-07-09 14:50:34.000000000 -0400 |
1005 | @@ -190,7 +190,7 @@ SECTIONS | 1047 | @@ -190,7 +190,7 @@ SECTIONS |
1006 | /* Per-cpu data: */ | 1048 | /* Per-cpu data: */ |
1007 | . = ALIGN(PERCPU_PAGE_SIZE); | 1049 | . = ALIGN(PERCPU_PAGE_SIZE); |
@@ -1011,9 +1053,9 @@ diff -urNp linux-2.6.32.15/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.15/arch/i | |||
1011 | . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits | 1053 | . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits |
1012 | * into percpu page size | 1054 | * into percpu page size |
1013 | */ | 1055 | */ |
1014 | diff -urNp linux-2.6.32.15/arch/ia64/mm/fault.c linux-2.6.32.15/arch/ia64/mm/fault.c | 1056 | diff -urNp linux-2.6.32.16/arch/ia64/mm/fault.c linux-2.6.32.16/arch/ia64/mm/fault.c |
1015 | --- linux-2.6.32.15/arch/ia64/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 | 1057 | --- linux-2.6.32.16/arch/ia64/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 |
1016 | +++ linux-2.6.32.15/arch/ia64/mm/fault.c 2010-05-28 21:27:14.743147071 -0400 | 1058 | +++ linux-2.6.32.16/arch/ia64/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 |
1017 | @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned | 1059 | @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned |
1018 | return pte_present(pte); | 1060 | return pte_present(pte); |
1019 | } | 1061 | } |
@@ -1063,9 +1105,9 @@ diff -urNp linux-2.6.32.15/arch/ia64/mm/fault.c linux-2.6.32.15/arch/ia64/mm/fau | |||
1063 | survive: | 1105 | survive: |
1064 | /* | 1106 | /* |
1065 | * If for any reason at all we couldn't handle the fault, make | 1107 | * If for any reason at all we couldn't handle the fault, make |
1066 | diff -urNp linux-2.6.32.15/arch/ia64/mm/init.c linux-2.6.32.15/arch/ia64/mm/init.c | 1108 | diff -urNp linux-2.6.32.16/arch/ia64/mm/init.c linux-2.6.32.16/arch/ia64/mm/init.c |
1067 | --- linux-2.6.32.15/arch/ia64/mm/init.c 2010-03-15 11:52:04.000000000 -0400 | 1109 | --- linux-2.6.32.16/arch/ia64/mm/init.c 2010-07-05 14:14:00.000000000 -0400 |
1068 | +++ linux-2.6.32.15/arch/ia64/mm/init.c 2010-05-28 21:27:14.755165915 -0400 | 1110 | +++ linux-2.6.32.16/arch/ia64/mm/init.c 2010-07-09 14:50:34.000000000 -0400 |
1069 | @@ -122,6 +122,19 @@ ia64_init_addr_space (void) | 1111 | @@ -122,6 +122,19 @@ ia64_init_addr_space (void) |
1070 | vma->vm_start = current->thread.rbs_bot & PAGE_MASK; | 1112 | vma->vm_start = current->thread.rbs_bot & PAGE_MASK; |
1071 | vma->vm_end = vma->vm_start + PAGE_SIZE; | 1113 | vma->vm_end = vma->vm_start + PAGE_SIZE; |
@@ -1086,9 +1128,9 @@ diff -urNp linux-2.6.32.15/arch/ia64/mm/init.c linux-2.6.32.15/arch/ia64/mm/init | |||
1086 | vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); | 1128 | vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); |
1087 | down_write(¤t->mm->mmap_sem); | 1129 | down_write(¤t->mm->mmap_sem); |
1088 | if (insert_vm_struct(current->mm, vma)) { | 1130 | if (insert_vm_struct(current->mm, vma)) { |
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 | 1131 | diff -urNp linux-2.6.32.16/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.16/arch/ia64/sn/pci/pci_dma.c |
1090 | --- linux-2.6.32.15/arch/ia64/sn/pci/pci_dma.c 2010-03-15 11:52:04.000000000 -0400 | 1132 | --- linux-2.6.32.16/arch/ia64/sn/pci/pci_dma.c 2010-07-05 14:14:00.000000000 -0400 |
1091 | +++ linux-2.6.32.15/arch/ia64/sn/pci/pci_dma.c 2010-05-28 21:27:14.755165915 -0400 | 1133 | +++ linux-2.6.32.16/arch/ia64/sn/pci/pci_dma.c 2010-07-09 14:50:34.000000000 -0400 |
1092 | @@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus * | 1134 | @@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus * |
1093 | return ret; | 1135 | return ret; |
1094 | } | 1136 | } |
@@ -1098,9 +1140,9 @@ diff -urNp linux-2.6.32.15/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.15/arch/ia64/ | |||
1098 | .alloc_coherent = sn_dma_alloc_coherent, | 1140 | .alloc_coherent = sn_dma_alloc_coherent, |
1099 | .free_coherent = sn_dma_free_coherent, | 1141 | .free_coherent = sn_dma_free_coherent, |
1100 | .map_page = sn_dma_map_page, | 1142 | .map_page = sn_dma_map_page, |
1101 | diff -urNp linux-2.6.32.15/arch/m32r/lib/usercopy.c linux-2.6.32.15/arch/m32r/lib/usercopy.c | 1143 | diff -urNp linux-2.6.32.16/arch/m32r/lib/usercopy.c linux-2.6.32.16/arch/m32r/lib/usercopy.c |
1102 | --- linux-2.6.32.15/arch/m32r/lib/usercopy.c 2010-03-15 11:52:04.000000000 -0400 | 1144 | --- linux-2.6.32.16/arch/m32r/lib/usercopy.c 2010-07-05 14:14:00.000000000 -0400 |
1103 | +++ linux-2.6.32.15/arch/m32r/lib/usercopy.c 2010-05-28 21:27:14.755165915 -0400 | 1145 | +++ linux-2.6.32.16/arch/m32r/lib/usercopy.c 2010-07-09 14:50:34.000000000 -0400 |
1104 | @@ -14,6 +14,9 @@ | 1146 | @@ -14,6 +14,9 @@ |
1105 | unsigned long | 1147 | unsigned long |
1106 | __generic_copy_to_user(void __user *to, const void *from, unsigned long n) | 1148 | __generic_copy_to_user(void __user *to, const void *from, unsigned long n) |
@@ -1121,9 +1163,9 @@ diff -urNp linux-2.6.32.15/arch/m32r/lib/usercopy.c linux-2.6.32.15/arch/m32r/li | |||
1121 | prefetchw(to); | 1163 | prefetchw(to); |
1122 | if (access_ok(VERIFY_READ, from, n)) | 1164 | if (access_ok(VERIFY_READ, from, n)) |
1123 | __copy_user_zeroing(to,from,n); | 1165 | __copy_user_zeroing(to,from,n); |
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 | 1166 | diff -urNp linux-2.6.32.16/arch/mips/alchemy/devboards/pm.c linux-2.6.32.16/arch/mips/alchemy/devboards/pm.c |
1125 | --- linux-2.6.32.15/arch/mips/alchemy/devboards/pm.c 2010-03-15 11:52:04.000000000 -0400 | 1167 | --- linux-2.6.32.16/arch/mips/alchemy/devboards/pm.c 2010-07-05 14:14:00.000000000 -0400 |
1126 | +++ linux-2.6.32.15/arch/mips/alchemy/devboards/pm.c 2010-05-28 21:27:14.755165915 -0400 | 1168 | +++ linux-2.6.32.16/arch/mips/alchemy/devboards/pm.c 2010-07-09 14:50:34.000000000 -0400 |
1127 | @@ -78,7 +78,7 @@ static void db1x_pm_end(void) | 1169 | @@ -78,7 +78,7 @@ static void db1x_pm_end(void) |
1128 | 1170 | ||
1129 | } | 1171 | } |
@@ -1133,9 +1175,9 @@ diff -urNp linux-2.6.32.15/arch/mips/alchemy/devboards/pm.c linux-2.6.32.15/arch | |||
1133 | .valid = suspend_valid_only_mem, | 1175 | .valid = suspend_valid_only_mem, |
1134 | .begin = db1x_pm_begin, | 1176 | .begin = db1x_pm_begin, |
1135 | .enter = db1x_pm_enter, | 1177 | .enter = db1x_pm_enter, |
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 | 1178 | diff -urNp linux-2.6.32.16/arch/mips/include/asm/elf.h linux-2.6.32.16/arch/mips/include/asm/elf.h |
1137 | --- linux-2.6.32.15/arch/mips/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 | 1179 | --- linux-2.6.32.16/arch/mips/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 |
1138 | +++ linux-2.6.32.15/arch/mips/include/asm/elf.h 2010-05-28 21:27:14.755165915 -0400 | 1180 | +++ linux-2.6.32.16/arch/mips/include/asm/elf.h 2010-07-09 14:50:34.000000000 -0400 |
1139 | @@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str | 1181 | @@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str |
1140 | #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) | 1182 | #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) |
1141 | #endif | 1183 | #endif |
@@ -1148,9 +1190,9 @@ diff -urNp linux-2.6.32.15/arch/mips/include/asm/elf.h linux-2.6.32.15/arch/mips | |||
1148 | +#endif | 1190 | +#endif |
1149 | + | 1191 | + |
1150 | #endif /* _ASM_ELF_H */ | 1192 | #endif /* _ASM_ELF_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 | 1193 | diff -urNp linux-2.6.32.16/arch/mips/include/asm/page.h linux-2.6.32.16/arch/mips/include/asm/page.h |
1152 | --- linux-2.6.32.15/arch/mips/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 | 1194 | --- linux-2.6.32.16/arch/mips/include/asm/page.h 2010-07-05 14:14:00.000000000 -0400 |
1153 | +++ linux-2.6.32.15/arch/mips/include/asm/page.h 2010-05-28 21:27:14.755165915 -0400 | 1195 | +++ linux-2.6.32.16/arch/mips/include/asm/page.h 2010-07-09 14:50:34.000000000 -0400 |
1154 | @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa | 1196 | @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa |
1155 | #ifdef CONFIG_CPU_MIPS32 | 1197 | #ifdef CONFIG_CPU_MIPS32 |
1156 | typedef struct { unsigned long pte_low, pte_high; } pte_t; | 1198 | typedef struct { unsigned long pte_low, pte_high; } pte_t; |
@@ -1160,9 +1202,9 @@ diff -urNp linux-2.6.32.15/arch/mips/include/asm/page.h linux-2.6.32.15/arch/mip | |||
1160 | #else | 1202 | #else |
1161 | typedef struct { unsigned long long pte; } pte_t; | 1203 | typedef struct { unsigned long long pte; } pte_t; |
1162 | #define pte_val(x) ((x).pte) | 1204 | #define pte_val(x) ((x).pte) |
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 | 1205 | diff -urNp linux-2.6.32.16/arch/mips/include/asm/system.h linux-2.6.32.16/arch/mips/include/asm/system.h |
1164 | --- linux-2.6.32.15/arch/mips/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400 | 1206 | --- linux-2.6.32.16/arch/mips/include/asm/system.h 2010-07-05 14:14:00.000000000 -0400 |
1165 | +++ linux-2.6.32.15/arch/mips/include/asm/system.h 2010-05-28 21:27:14.755165915 -0400 | 1207 | +++ linux-2.6.32.16/arch/mips/include/asm/system.h 2010-07-09 14:50:34.000000000 -0400 |
1166 | @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); | 1208 | @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); |
1167 | */ | 1209 | */ |
1168 | #define __ARCH_WANT_UNLOCKED_CTXSW | 1210 | #define __ARCH_WANT_UNLOCKED_CTXSW |
@@ -1171,9 +1213,9 @@ diff -urNp linux-2.6.32.15/arch/mips/include/asm/system.h linux-2.6.32.15/arch/m | |||
1171 | +#define arch_align_stack(x) ((x) & ALMASK) | 1213 | +#define arch_align_stack(x) ((x) & ALMASK) |
1172 | 1214 | ||
1173 | #endif /* _ASM_SYSTEM_H */ | 1215 | #endif /* _ASM_SYSTEM_H */ |
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 | 1216 | diff -urNp linux-2.6.32.16/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.16/arch/mips/kernel/binfmt_elfn32.c |
1175 | --- linux-2.6.32.15/arch/mips/kernel/binfmt_elfn32.c 2010-03-15 11:52:04.000000000 -0400 | 1217 | --- linux-2.6.32.16/arch/mips/kernel/binfmt_elfn32.c 2010-07-05 14:14:00.000000000 -0400 |
1176 | +++ linux-2.6.32.15/arch/mips/kernel/binfmt_elfn32.c 2010-05-28 21:27:14.755165915 -0400 | 1218 | +++ linux-2.6.32.16/arch/mips/kernel/binfmt_elfn32.c 2010-07-09 14:50:34.000000000 -0400 |
1177 | @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N | 1219 | @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N |
1178 | #undef ELF_ET_DYN_BASE | 1220 | #undef ELF_ET_DYN_BASE |
1179 | #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) | 1221 | #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) |
@@ -1188,9 +1230,9 @@ diff -urNp linux-2.6.32.15/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.15/arch | |||
1188 | #include <asm/processor.h> | 1230 | #include <asm/processor.h> |
1189 | #include <linux/module.h> | 1231 | #include <linux/module.h> |
1190 | #include <linux/elfcore.h> | 1232 | #include <linux/elfcore.h> |
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 | 1233 | diff -urNp linux-2.6.32.16/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.16/arch/mips/kernel/binfmt_elfo32.c |
1192 | --- linux-2.6.32.15/arch/mips/kernel/binfmt_elfo32.c 2010-03-15 11:52:04.000000000 -0400 | 1234 | --- linux-2.6.32.16/arch/mips/kernel/binfmt_elfo32.c 2010-07-05 14:14:00.000000000 -0400 |
1193 | +++ linux-2.6.32.15/arch/mips/kernel/binfmt_elfo32.c 2010-05-28 21:27:14.755165915 -0400 | 1235 | +++ linux-2.6.32.16/arch/mips/kernel/binfmt_elfo32.c 2010-07-09 14:50:34.000000000 -0400 |
1194 | @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N | 1236 | @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N |
1195 | #undef ELF_ET_DYN_BASE | 1237 | #undef ELF_ET_DYN_BASE |
1196 | #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) | 1238 | #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) |
@@ -1205,9 +1247,9 @@ diff -urNp linux-2.6.32.15/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.15/arch | |||
1205 | #include <asm/processor.h> | 1247 | #include <asm/processor.h> |
1206 | 1248 | ||
1207 | /* | 1249 | /* |
1208 | diff -urNp linux-2.6.32.15/arch/mips/kernel/kgdb.c linux-2.6.32.15/arch/mips/kernel/kgdb.c | 1250 | diff -urNp linux-2.6.32.16/arch/mips/kernel/kgdb.c linux-2.6.32.16/arch/mips/kernel/kgdb.c |
1209 | --- linux-2.6.32.15/arch/mips/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 | 1251 | --- linux-2.6.32.16/arch/mips/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 |
1210 | +++ linux-2.6.32.15/arch/mips/kernel/kgdb.c 2010-05-28 21:27:14.771146775 -0400 | 1252 | +++ linux-2.6.32.16/arch/mips/kernel/kgdb.c 2010-07-09 14:50:34.000000000 -0400 |
1211 | @@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto | 1253 | @@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto |
1212 | return -1; | 1254 | return -1; |
1213 | } | 1255 | } |
@@ -1216,9 +1258,9 @@ diff -urNp linux-2.6.32.15/arch/mips/kernel/kgdb.c linux-2.6.32.15/arch/mips/ker | |||
1216 | struct kgdb_arch arch_kgdb_ops; | 1258 | struct kgdb_arch arch_kgdb_ops; |
1217 | 1259 | ||
1218 | /* | 1260 | /* |
1219 | diff -urNp linux-2.6.32.15/arch/mips/kernel/process.c linux-2.6.32.15/arch/mips/kernel/process.c | 1261 | diff -urNp linux-2.6.32.16/arch/mips/kernel/process.c linux-2.6.32.16/arch/mips/kernel/process.c |
1220 | --- linux-2.6.32.15/arch/mips/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 | 1262 | --- linux-2.6.32.16/arch/mips/kernel/process.c 2010-07-05 14:14:00.000000000 -0400 |
1221 | +++ linux-2.6.32.15/arch/mips/kernel/process.c 2010-05-28 21:27:14.796819534 -0400 | 1263 | +++ linux-2.6.32.16/arch/mips/kernel/process.c 2010-07-09 14:50:34.000000000 -0400 |
1222 | @@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru | 1264 | @@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru |
1223 | out: | 1265 | out: |
1224 | return pc; | 1266 | return pc; |
@@ -1235,9 +1277,9 @@ diff -urNp linux-2.6.32.15/arch/mips/kernel/process.c linux-2.6.32.15/arch/mips/ | |||
1235 | - | 1277 | - |
1236 | - return sp & ALMASK; | 1278 | - return sp & ALMASK; |
1237 | -} | 1279 | -} |
1238 | diff -urNp linux-2.6.32.15/arch/mips/kernel/syscall.c linux-2.6.32.15/arch/mips/kernel/syscall.c | 1280 | diff -urNp linux-2.6.32.16/arch/mips/kernel/syscall.c linux-2.6.32.16/arch/mips/kernel/syscall.c |
1239 | --- linux-2.6.32.15/arch/mips/kernel/syscall.c 2010-03-15 11:52:04.000000000 -0400 | 1281 | --- linux-2.6.32.16/arch/mips/kernel/syscall.c 2010-07-05 14:14:00.000000000 -0400 |
1240 | +++ linux-2.6.32.15/arch/mips/kernel/syscall.c 2010-05-28 21:27:14.796819534 -0400 | 1282 | +++ linux-2.6.32.16/arch/mips/kernel/syscall.c 2010-07-09 14:50:34.000000000 -0400 |
1241 | @@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str | 1283 | @@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str |
1242 | do_color_align = 0; | 1284 | do_color_align = 0; |
1243 | if (filp || (flags & MAP_SHARED)) | 1285 | if (filp || (flags & MAP_SHARED)) |
@@ -1259,9 +1301,9 @@ diff -urNp linux-2.6.32.15/arch/mips/kernel/syscall.c linux-2.6.32.15/arch/mips/ | |||
1259 | if (do_color_align) | 1301 | if (do_color_align) |
1260 | addr = COLOUR_ALIGN(addr, pgoff); | 1302 | addr = COLOUR_ALIGN(addr, pgoff); |
1261 | else | 1303 | else |
1262 | diff -urNp linux-2.6.32.15/arch/mips/mm/fault.c linux-2.6.32.15/arch/mips/mm/fault.c | 1304 | diff -urNp linux-2.6.32.16/arch/mips/mm/fault.c linux-2.6.32.16/arch/mips/mm/fault.c |
1263 | --- linux-2.6.32.15/arch/mips/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 | 1305 | --- linux-2.6.32.16/arch/mips/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 |
1264 | +++ linux-2.6.32.15/arch/mips/mm/fault.c 2010-05-28 21:27:14.796819534 -0400 | 1306 | +++ linux-2.6.32.16/arch/mips/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 |
1265 | @@ -26,6 +26,23 @@ | 1307 | @@ -26,6 +26,23 @@ |
1266 | #include <asm/ptrace.h> | 1308 | #include <asm/ptrace.h> |
1267 | #include <asm/highmem.h> /* For VMALLOC_END */ | 1309 | #include <asm/highmem.h> /* For VMALLOC_END */ |
@@ -1286,9 +1328,9 @@ diff -urNp linux-2.6.32.15/arch/mips/mm/fault.c linux-2.6.32.15/arch/mips/mm/fau | |||
1286 | /* | 1328 | /* |
1287 | * This routine handles page faults. It determines the address, | 1329 | * This routine handles page faults. It determines the address, |
1288 | * and the problem, and then passes it off to one of the appropriate | 1330 | * and the problem, and then passes it off to one of the appropriate |
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 | 1331 | diff -urNp linux-2.6.32.16/arch/parisc/include/asm/elf.h linux-2.6.32.16/arch/parisc/include/asm/elf.h |
1290 | --- linux-2.6.32.15/arch/parisc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 | 1332 | --- linux-2.6.32.16/arch/parisc/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 |
1291 | +++ linux-2.6.32.15/arch/parisc/include/asm/elf.h 2010-05-28 21:27:14.796819534 -0400 | 1333 | +++ linux-2.6.32.16/arch/parisc/include/asm/elf.h 2010-07-09 14:50:34.000000000 -0400 |
1292 | @@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration.. | 1334 | @@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration.. |
1293 | 1335 | ||
1294 | #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) | 1336 | #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) |
@@ -1303,9 +1345,9 @@ diff -urNp linux-2.6.32.15/arch/parisc/include/asm/elf.h linux-2.6.32.15/arch/pa | |||
1303 | /* This yields a mask that user programs can use to figure out what | 1345 | /* 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, | 1346 | 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. */ | 1347 | but it's not easy, and we've already done it here. */ |
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 | 1348 | diff -urNp linux-2.6.32.16/arch/parisc/include/asm/pgtable.h linux-2.6.32.16/arch/parisc/include/asm/pgtable.h |
1307 | --- linux-2.6.32.15/arch/parisc/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 | 1349 | --- linux-2.6.32.16/arch/parisc/include/asm/pgtable.h 2010-07-05 14:14:00.000000000 -0400 |
1308 | +++ linux-2.6.32.15/arch/parisc/include/asm/pgtable.h 2010-05-28 21:27:14.796819534 -0400 | 1350 | +++ linux-2.6.32.16/arch/parisc/include/asm/pgtable.h 2010-07-09 14:50:34.000000000 -0400 |
1309 | @@ -207,6 +207,17 @@ | 1351 | @@ -207,6 +207,17 @@ |
1310 | #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) | 1352 | #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) |
1311 | #define PAGE_COPY PAGE_EXECREAD | 1353 | #define PAGE_COPY PAGE_EXECREAD |
@@ -1324,9 +1366,9 @@ diff -urNp linux-2.6.32.15/arch/parisc/include/asm/pgtable.h linux-2.6.32.15/arc | |||
1324 | #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) | 1366 | #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) |
1325 | #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) | 1367 | #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) |
1326 | #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) | 1368 | #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) |
1327 | diff -urNp linux-2.6.32.15/arch/parisc/kernel/module.c linux-2.6.32.15/arch/parisc/kernel/module.c | 1369 | diff -urNp linux-2.6.32.16/arch/parisc/kernel/module.c linux-2.6.32.16/arch/parisc/kernel/module.c |
1328 | --- linux-2.6.32.15/arch/parisc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 | 1370 | --- linux-2.6.32.16/arch/parisc/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 |
1329 | +++ linux-2.6.32.15/arch/parisc/kernel/module.c 2010-05-28 21:27:14.796819534 -0400 | 1371 | +++ linux-2.6.32.16/arch/parisc/kernel/module.c 2010-07-09 14:50:34.000000000 -0400 |
1330 | @@ -95,16 +95,38 @@ | 1372 | @@ -95,16 +95,38 @@ |
1331 | 1373 | ||
1332 | /* three functions to determine where in the module core | 1374 | /* three functions to determine where in the module core |
@@ -1427,9 +1469,9 @@ diff -urNp linux-2.6.32.15/arch/parisc/kernel/module.c linux-2.6.32.15/arch/pari | |||
1427 | 1469 | ||
1428 | DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n", | 1470 | DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n", |
1429 | me->arch.unwind_section, table, end, gp); | 1471 | me->arch.unwind_section, table, end, gp); |
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 | 1472 | diff -urNp linux-2.6.32.16/arch/parisc/kernel/sys_parisc.c linux-2.6.32.16/arch/parisc/kernel/sys_parisc.c |
1431 | --- linux-2.6.32.15/arch/parisc/kernel/sys_parisc.c 2010-03-15 11:52:04.000000000 -0400 | 1473 | --- linux-2.6.32.16/arch/parisc/kernel/sys_parisc.c 2010-07-05 14:14:00.000000000 -0400 |
1432 | +++ linux-2.6.32.15/arch/parisc/kernel/sys_parisc.c 2010-05-28 21:27:14.796819534 -0400 | 1474 | +++ linux-2.6.32.16/arch/parisc/kernel/sys_parisc.c 2010-07-09 14:50:34.000000000 -0400 |
1433 | @@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str | 1475 | @@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str |
1434 | if (flags & MAP_FIXED) | 1476 | if (flags & MAP_FIXED) |
1435 | return addr; | 1477 | return addr; |
@@ -1439,9 +1481,9 @@ diff -urNp linux-2.6.32.15/arch/parisc/kernel/sys_parisc.c linux-2.6.32.15/arch/ | |||
1439 | 1481 | ||
1440 | if (filp) { | 1482 | if (filp) { |
1441 | addr = get_shared_area(filp->f_mapping, addr, len, pgoff); | 1483 | addr = get_shared_area(filp->f_mapping, addr, len, pgoff); |
1442 | diff -urNp linux-2.6.32.15/arch/parisc/kernel/traps.c linux-2.6.32.15/arch/parisc/kernel/traps.c | 1484 | diff -urNp linux-2.6.32.16/arch/parisc/kernel/traps.c linux-2.6.32.16/arch/parisc/kernel/traps.c |
1443 | --- linux-2.6.32.15/arch/parisc/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400 | 1485 | --- linux-2.6.32.16/arch/parisc/kernel/traps.c 2010-07-05 14:14:00.000000000 -0400 |
1444 | +++ linux-2.6.32.15/arch/parisc/kernel/traps.c 2010-05-28 21:27:14.796819534 -0400 | 1486 | +++ linux-2.6.32.16/arch/parisc/kernel/traps.c 2010-07-09 14:50:34.000000000 -0400 |
1445 | @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod | 1487 | @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod |
1446 | 1488 | ||
1447 | down_read(¤t->mm->mmap_sem); | 1489 | down_read(¤t->mm->mmap_sem); |
@@ -1453,9 +1495,9 @@ diff -urNp linux-2.6.32.15/arch/parisc/kernel/traps.c linux-2.6.32.15/arch/paris | |||
1453 | fault_address = regs->iaoq[0]; | 1495 | fault_address = regs->iaoq[0]; |
1454 | fault_space = regs->iasq[0]; | 1496 | fault_space = regs->iasq[0]; |
1455 | 1497 | ||
1456 | diff -urNp linux-2.6.32.15/arch/parisc/mm/fault.c linux-2.6.32.15/arch/parisc/mm/fault.c | 1498 | diff -urNp linux-2.6.32.16/arch/parisc/mm/fault.c linux-2.6.32.16/arch/parisc/mm/fault.c |
1457 | --- linux-2.6.32.15/arch/parisc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 | 1499 | --- linux-2.6.32.16/arch/parisc/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 |
1458 | +++ linux-2.6.32.15/arch/parisc/mm/fault.c 2010-05-28 21:27:14.796819534 -0400 | 1500 | +++ linux-2.6.32.16/arch/parisc/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 |
1459 | @@ -15,6 +15,7 @@ | 1501 | @@ -15,6 +15,7 @@ |
1460 | #include <linux/sched.h> | 1502 | #include <linux/sched.h> |
1461 | #include <linux/interrupt.h> | 1503 | #include <linux/interrupt.h> |
@@ -1625,9 +1667,9 @@ diff -urNp linux-2.6.32.15/arch/parisc/mm/fault.c linux-2.6.32.15/arch/parisc/mm | |||
1625 | 1667 | ||
1626 | /* | 1668 | /* |
1627 | * If for any reason at all we couldn't handle the fault, make | 1669 | * If for any reason at all we couldn't handle the fault, make |
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 | 1670 | diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/device.h linux-2.6.32.16/arch/powerpc/include/asm/device.h |
1629 | --- linux-2.6.32.15/arch/powerpc/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400 | 1671 | --- linux-2.6.32.16/arch/powerpc/include/asm/device.h 2010-07-05 14:14:00.000000000 -0400 |
1630 | +++ linux-2.6.32.15/arch/powerpc/include/asm/device.h 2010-05-28 21:27:14.796819534 -0400 | 1672 | +++ linux-2.6.32.16/arch/powerpc/include/asm/device.h 2010-07-09 14:50:34.000000000 -0400 |
1631 | @@ -14,7 +14,7 @@ struct dev_archdata { | 1673 | @@ -14,7 +14,7 @@ struct dev_archdata { |
1632 | struct device_node *of_node; | 1674 | struct device_node *of_node; |
1633 | 1675 | ||
@@ -1637,9 +1679,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/device.h linux-2.6.32.15/arc | |||
1637 | 1679 | ||
1638 | /* | 1680 | /* |
1639 | * When an iommu is in use, dma_data is used as a ptr to the base of the | 1681 | * 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.15/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.15/arch/powerpc/include/asm/dma-mapping.h | 1682 | diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.16/arch/powerpc/include/asm/dma-mapping.h |
1641 | --- linux-2.6.32.15/arch/powerpc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 | 1683 | --- linux-2.6.32.16/arch/powerpc/include/asm/dma-mapping.h 2010-07-05 14:14:00.000000000 -0400 |
1642 | +++ linux-2.6.32.15/arch/powerpc/include/asm/dma-mapping.h 2010-05-28 21:27:14.796819534 -0400 | 1684 | +++ linux-2.6.32.16/arch/powerpc/include/asm/dma-mapping.h 2010-07-09 14:50:34.000000000 -0400 |
1643 | @@ -69,9 +69,9 @@ static inline unsigned long device_to_ma | 1685 | @@ -69,9 +69,9 @@ static inline unsigned long device_to_ma |
1644 | #ifdef CONFIG_PPC64 | 1686 | #ifdef CONFIG_PPC64 |
1645 | extern struct dma_map_ops dma_iommu_ops; | 1687 | extern struct dma_map_ops dma_iommu_ops; |
@@ -1706,9 +1748,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.1 | |||
1706 | 1748 | ||
1707 | if (dma_ops->mapping_error) | 1749 | if (dma_ops->mapping_error) |
1708 | return dma_ops->mapping_error(dev, dma_addr); | 1750 | return dma_ops->mapping_error(dev, dma_addr); |
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 | 1751 | diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/elf.h linux-2.6.32.16/arch/powerpc/include/asm/elf.h |
1710 | --- linux-2.6.32.15/arch/powerpc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 | 1752 | --- linux-2.6.32.16/arch/powerpc/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 |
1711 | +++ linux-2.6.32.15/arch/powerpc/include/asm/elf.h 2010-05-28 21:27:14.799129463 -0400 | 1753 | +++ linux-2.6.32.16/arch/powerpc/include/asm/elf.h 2010-07-09 14:50:34.000000000 -0400 |
1712 | @@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E | 1754 | @@ -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 | 1755 | 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. */ | 1756 | that it will "exec", and that there is sufficient room for the brk. */ |
@@ -1741,9 +1783,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/elf.h linux-2.6.32.15/arch/p | |||
1741 | #endif /* __KERNEL__ */ | 1783 | #endif /* __KERNEL__ */ |
1742 | 1784 | ||
1743 | /* | 1785 | /* |
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 | 1786 | diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/iommu.h linux-2.6.32.16/arch/powerpc/include/asm/iommu.h |
1745 | --- linux-2.6.32.15/arch/powerpc/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400 | 1787 | --- linux-2.6.32.16/arch/powerpc/include/asm/iommu.h 2010-07-05 14:14:00.000000000 -0400 |
1746 | +++ linux-2.6.32.15/arch/powerpc/include/asm/iommu.h 2010-05-28 21:27:14.799129463 -0400 | 1788 | +++ linux-2.6.32.16/arch/powerpc/include/asm/iommu.h 2010-07-09 14:50:34.000000000 -0400 |
1747 | @@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi | 1789 | @@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi |
1748 | extern void iommu_init_early_dart(void); | 1790 | extern void iommu_init_early_dart(void); |
1749 | extern void iommu_init_early_pasemi(void); | 1791 | extern void iommu_init_early_pasemi(void); |
@@ -1754,9 +1796,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/iommu.h linux-2.6.32.15/arch | |||
1754 | #ifdef CONFIG_PCI | 1796 | #ifdef CONFIG_PCI |
1755 | extern void pci_iommu_init(void); | 1797 | extern void pci_iommu_init(void); |
1756 | extern void pci_direct_iommu_init(void); | 1798 | extern void pci_direct_iommu_init(void); |
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 | 1799 | diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.16/arch/powerpc/include/asm/kmap_types.h |
1758 | --- linux-2.6.32.15/arch/powerpc/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 | 1800 | --- linux-2.6.32.16/arch/powerpc/include/asm/kmap_types.h 2010-07-05 14:14:00.000000000 -0400 |
1759 | +++ linux-2.6.32.15/arch/powerpc/include/asm/kmap_types.h 2010-05-28 21:27:14.799129463 -0400 | 1801 | +++ linux-2.6.32.16/arch/powerpc/include/asm/kmap_types.h 2010-07-09 14:50:34.000000000 -0400 |
1760 | @@ -26,6 +26,7 @@ enum km_type { | 1802 | @@ -26,6 +26,7 @@ enum km_type { |
1761 | KM_SOFTIRQ1, | 1803 | KM_SOFTIRQ1, |
1762 | KM_PPC_SYNC_PAGE, | 1804 | KM_PPC_SYNC_PAGE, |
@@ -1765,9 +1807,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.15 | |||
1765 | KM_TYPE_NR | 1807 | KM_TYPE_NR |
1766 | }; | 1808 | }; |
1767 | 1809 | ||
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 | 1810 | diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/page_64.h linux-2.6.32.16/arch/powerpc/include/asm/page_64.h |
1769 | --- linux-2.6.32.15/arch/powerpc/include/asm/page_64.h 2010-03-15 11:52:04.000000000 -0400 | 1811 | --- linux-2.6.32.16/arch/powerpc/include/asm/page_64.h 2010-07-05 14:14:00.000000000 -0400 |
1770 | +++ linux-2.6.32.15/arch/powerpc/include/asm/page_64.h 2010-05-28 21:27:14.799129463 -0400 | 1812 | +++ linux-2.6.32.16/arch/powerpc/include/asm/page_64.h 2010-07-09 14:50:34.000000000 -0400 |
1771 | @@ -180,15 +180,18 @@ do { \ | 1813 | @@ -180,15 +180,18 @@ do { \ |
1772 | * stack by default, so in the absense of a PT_GNU_STACK program header | 1814 | * stack by default, so in the absense of a PT_GNU_STACK program header |
1773 | * we turn execute permission off. | 1815 | * we turn execute permission off. |
@@ -1789,9 +1831,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/page_64.h linux-2.6.32.15/ar | |||
1789 | 1831 | ||
1790 | #include <asm-generic/getorder.h> | 1832 | #include <asm-generic/getorder.h> |
1791 | 1833 | ||
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 | 1834 | diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/page.h linux-2.6.32.16/arch/powerpc/include/asm/page.h |
1793 | --- linux-2.6.32.15/arch/powerpc/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 | 1835 | --- linux-2.6.32.16/arch/powerpc/include/asm/page.h 2010-07-05 14:14:00.000000000 -0400 |
1794 | +++ linux-2.6.32.15/arch/powerpc/include/asm/page.h 2010-05-28 21:27:14.799129463 -0400 | 1836 | +++ linux-2.6.32.16/arch/powerpc/include/asm/page.h 2010-07-09 14:50:34.000000000 -0400 |
1795 | @@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr; | 1837 | @@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr; |
1796 | * and needs to be executable. This means the whole heap ends | 1838 | * and needs to be executable. This means the whole heap ends |
1797 | * up being executable. | 1839 | * up being executable. |
@@ -1814,9 +1856,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/page.h linux-2.6.32.15/arch/ | |||
1814 | #ifndef __ASSEMBLY__ | 1856 | #ifndef __ASSEMBLY__ |
1815 | 1857 | ||
1816 | #undef STRICT_MM_TYPECHECKS | 1858 | #undef STRICT_MM_TYPECHECKS |
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 | 1859 | diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/pci.h linux-2.6.32.16/arch/powerpc/include/asm/pci.h |
1818 | --- linux-2.6.32.15/arch/powerpc/include/asm/pci.h 2010-03-15 11:52:04.000000000 -0400 | 1860 | --- linux-2.6.32.16/arch/powerpc/include/asm/pci.h 2010-07-05 14:14:00.000000000 -0400 |
1819 | +++ linux-2.6.32.15/arch/powerpc/include/asm/pci.h 2010-05-28 21:27:14.803145185 -0400 | 1861 | +++ linux-2.6.32.16/arch/powerpc/include/asm/pci.h 2010-07-09 14:50:34.000000000 -0400 |
1820 | @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq | 1862 | @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq |
1821 | } | 1863 | } |
1822 | 1864 | ||
@@ -1828,9 +1870,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/pci.h linux-2.6.32.15/arch/p | |||
1828 | #else /* CONFIG_PCI */ | 1870 | #else /* CONFIG_PCI */ |
1829 | #define set_pci_dma_ops(d) | 1871 | #define set_pci_dma_ops(d) |
1830 | #define get_pci_dma_ops() NULL | 1872 | #define get_pci_dma_ops() NULL |
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 | 1873 | diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.16/arch/powerpc/include/asm/pte-hash32.h |
1832 | --- linux-2.6.32.15/arch/powerpc/include/asm/pte-hash32.h 2010-03-15 11:52:04.000000000 -0400 | 1874 | --- linux-2.6.32.16/arch/powerpc/include/asm/pte-hash32.h 2010-07-05 14:14:00.000000000 -0400 |
1833 | +++ linux-2.6.32.15/arch/powerpc/include/asm/pte-hash32.h 2010-05-28 21:27:14.803145185 -0400 | 1875 | +++ linux-2.6.32.16/arch/powerpc/include/asm/pte-hash32.h 2010-07-09 14:50:34.000000000 -0400 |
1834 | @@ -21,6 +21,7 @@ | 1876 | @@ -21,6 +21,7 @@ |
1835 | #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ | 1877 | #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ |
1836 | #define _PAGE_USER 0x004 /* usermode access allowed */ | 1878 | #define _PAGE_USER 0x004 /* usermode access allowed */ |
@@ -1839,9 +1881,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.15 | |||
1839 | #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */ | 1881 | #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */ |
1840 | #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ | 1882 | #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ |
1841 | #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ | 1883 | #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ |
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 | 1884 | diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/reg.h linux-2.6.32.16/arch/powerpc/include/asm/reg.h |
1843 | --- linux-2.6.32.15/arch/powerpc/include/asm/reg.h 2010-03-15 11:52:04.000000000 -0400 | 1885 | --- linux-2.6.32.16/arch/powerpc/include/asm/reg.h 2010-07-05 14:14:00.000000000 -0400 |
1844 | +++ linux-2.6.32.15/arch/powerpc/include/asm/reg.h 2010-05-28 21:27:14.803145185 -0400 | 1886 | +++ linux-2.6.32.16/arch/powerpc/include/asm/reg.h 2010-07-09 14:50:34.000000000 -0400 |
1845 | @@ -191,6 +191,7 @@ | 1887 | @@ -191,6 +191,7 @@ |
1846 | #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ | 1888 | #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ |
1847 | #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ | 1889 | #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ |
@@ -1850,9 +1892,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/reg.h linux-2.6.32.15/arch/p | |||
1850 | #define DSISR_PROTFAULT 0x08000000 /* protection fault */ | 1892 | #define DSISR_PROTFAULT 0x08000000 /* protection fault */ |
1851 | #define DSISR_ISSTORE 0x02000000 /* access was a store */ | 1893 | #define DSISR_ISSTORE 0x02000000 /* access was a store */ |
1852 | #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ | 1894 | #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ |
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 | 1895 | diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.16/arch/powerpc/include/asm/swiotlb.h |
1854 | --- linux-2.6.32.15/arch/powerpc/include/asm/swiotlb.h 2010-03-15 11:52:04.000000000 -0400 | 1896 | --- linux-2.6.32.16/arch/powerpc/include/asm/swiotlb.h 2010-07-05 14:14:00.000000000 -0400 |
1855 | +++ linux-2.6.32.15/arch/powerpc/include/asm/swiotlb.h 2010-05-28 21:27:14.803145185 -0400 | 1897 | +++ linux-2.6.32.16/arch/powerpc/include/asm/swiotlb.h 2010-07-09 14:50:34.000000000 -0400 |
1856 | @@ -13,7 +13,7 @@ | 1898 | @@ -13,7 +13,7 @@ |
1857 | 1899 | ||
1858 | #include <linux/swiotlb.h> | 1900 | #include <linux/swiotlb.h> |
@@ -1862,10 +1904,19 @@ diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.15/ar | |||
1862 | 1904 | ||
1863 | static inline void dma_mark_clean(void *addr, size_t size) {} | 1905 | static inline void dma_mark_clean(void *addr, size_t size) {} |
1864 | 1906 | ||
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 | 1907 | diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/uaccess.h linux-2.6.32.16/arch/powerpc/include/asm/uaccess.h |
1866 | --- linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 | 1908 | --- linux-2.6.32.16/arch/powerpc/include/asm/uaccess.h 2010-07-05 14:14:00.000000000 -0400 |
1867 | +++ linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h 2010-05-28 21:27:14.803145185 -0400 | 1909 | +++ linux-2.6.32.16/arch/powerpc/include/asm/uaccess.h 2010-07-09 14:50:34.000000000 -0400 |
1868 | @@ -327,52 +327,6 @@ do { \ | 1910 | @@ -13,6 +13,8 @@ |
1911 | #define VERIFY_READ 0 | ||
1912 | #define VERIFY_WRITE 1 | ||
1913 | |||
1914 | +extern void check_object_size(const void *ptr, unsigned long n, bool to); | ||
1915 | + | ||
1916 | /* | ||
1917 | * The fs value determines whether argument validity checking should be | ||
1918 | * performed or not. If get_fs() == USER_DS, checking is performed, with | ||
1919 | @@ -327,52 +329,6 @@ do { \ | ||
1869 | extern unsigned long __copy_tofrom_user(void __user *to, | 1920 | extern unsigned long __copy_tofrom_user(void __user *to, |
1870 | const void __user *from, unsigned long size); | 1921 | const void __user *from, unsigned long size); |
1871 | 1922 | ||
@@ -1918,7 +1969,7 @@ diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h linux-2.6.32.15/ar | |||
1918 | static inline unsigned long __copy_from_user_inatomic(void *to, | 1969 | static inline unsigned long __copy_from_user_inatomic(void *to, |
1919 | const void __user *from, unsigned long n) | 1970 | const void __user *from, unsigned long n) |
1920 | { | 1971 | { |
1921 | @@ -396,6 +350,10 @@ static inline unsigned long __copy_from_ | 1972 | @@ -396,6 +352,10 @@ static inline unsigned long __copy_from_ |
1922 | if (ret == 0) | 1973 | if (ret == 0) |
1923 | return 0; | 1974 | return 0; |
1924 | } | 1975 | } |
@@ -1929,7 +1980,7 @@ diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h linux-2.6.32.15/ar | |||
1929 | return __copy_tofrom_user((__force void __user *)to, from, n); | 1980 | return __copy_tofrom_user((__force void __user *)to, from, n); |
1930 | } | 1981 | } |
1931 | 1982 | ||
1932 | @@ -422,6 +380,10 @@ static inline unsigned long __copy_to_us | 1983 | @@ -422,6 +382,10 @@ static inline unsigned long __copy_to_us |
1933 | if (ret == 0) | 1984 | if (ret == 0) |
1934 | return 0; | 1985 | return 0; |
1935 | } | 1986 | } |
@@ -1940,7 +1991,7 @@ diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h linux-2.6.32.15/ar | |||
1940 | return __copy_tofrom_user(to, (__force const void __user *)from, n); | 1991 | return __copy_tofrom_user(to, (__force const void __user *)from, n); |
1941 | } | 1992 | } |
1942 | 1993 | ||
1943 | @@ -439,6 +401,92 @@ static inline unsigned long __copy_to_us | 1994 | @@ -439,6 +403,92 @@ static inline unsigned long __copy_to_us |
1944 | return __copy_to_user_inatomic(to, from, size); | 1995 | return __copy_to_user_inatomic(to, from, size); |
1945 | } | 1996 | } |
1946 | 1997 | ||
@@ -2033,9 +2084,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h linux-2.6.32.15/ar | |||
2033 | extern unsigned long __clear_user(void __user *addr, unsigned long size); | 2084 | extern unsigned long __clear_user(void __user *addr, unsigned long size); |
2034 | 2085 | ||
2035 | static inline unsigned long clear_user(void __user *addr, unsigned long size) | 2086 | static inline unsigned long clear_user(void __user *addr, unsigned long size) |
2036 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.15/arch/powerpc/kernel/cacheinfo.c | 2087 | diff -urNp linux-2.6.32.16/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.16/arch/powerpc/kernel/cacheinfo.c |
2037 | --- linux-2.6.32.15/arch/powerpc/kernel/cacheinfo.c 2010-03-15 11:52:04.000000000 -0400 | 2088 | --- linux-2.6.32.16/arch/powerpc/kernel/cacheinfo.c 2010-07-05 14:14:00.000000000 -0400 |
2038 | +++ linux-2.6.32.15/arch/powerpc/kernel/cacheinfo.c 2010-05-28 21:27:14.807143556 -0400 | 2089 | +++ linux-2.6.32.16/arch/powerpc/kernel/cacheinfo.c 2010-07-09 14:50:34.000000000 -0400 |
2039 | @@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde | 2090 | @@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde |
2040 | &cache_assoc_attr, | 2091 | &cache_assoc_attr, |
2041 | }; | 2092 | }; |
@@ -2045,9 +2096,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.15/arch/ | |||
2045 | .show = cache_index_show, | 2096 | .show = cache_index_show, |
2046 | }; | 2097 | }; |
2047 | 2098 | ||
2048 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/dma.c linux-2.6.32.15/arch/powerpc/kernel/dma.c | 2099 | diff -urNp linux-2.6.32.16/arch/powerpc/kernel/dma.c linux-2.6.32.16/arch/powerpc/kernel/dma.c |
2049 | --- linux-2.6.32.15/arch/powerpc/kernel/dma.c 2010-03-15 11:52:04.000000000 -0400 | 2100 | --- linux-2.6.32.16/arch/powerpc/kernel/dma.c 2010-07-05 14:14:00.000000000 -0400 |
2050 | +++ linux-2.6.32.15/arch/powerpc/kernel/dma.c 2010-05-28 21:27:14.807143556 -0400 | 2101 | +++ linux-2.6.32.16/arch/powerpc/kernel/dma.c 2010-07-09 14:50:34.000000000 -0400 |
2051 | @@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl | 2102 | @@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl |
2052 | } | 2103 | } |
2053 | #endif | 2104 | #endif |
@@ -2057,9 +2108,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/dma.c linux-2.6.32.15/arch/powerp | |||
2057 | .alloc_coherent = dma_direct_alloc_coherent, | 2108 | .alloc_coherent = dma_direct_alloc_coherent, |
2058 | .free_coherent = dma_direct_free_coherent, | 2109 | .free_coherent = dma_direct_free_coherent, |
2059 | .map_sg = dma_direct_map_sg, | 2110 | .map_sg = dma_direct_map_sg, |
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 | 2111 | diff -urNp linux-2.6.32.16/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.16/arch/powerpc/kernel/dma-iommu.c |
2061 | --- linux-2.6.32.15/arch/powerpc/kernel/dma-iommu.c 2010-03-15 11:52:04.000000000 -0400 | 2112 | --- linux-2.6.32.16/arch/powerpc/kernel/dma-iommu.c 2010-07-05 14:14:00.000000000 -0400 |
2062 | +++ linux-2.6.32.15/arch/powerpc/kernel/dma-iommu.c 2010-05-28 21:27:14.807143556 -0400 | 2113 | +++ linux-2.6.32.16/arch/powerpc/kernel/dma-iommu.c 2010-07-09 14:50:34.000000000 -0400 |
2063 | @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de | 2114 | @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de |
2064 | } | 2115 | } |
2065 | 2116 | ||
@@ -2069,9 +2120,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.15/arch/ | |||
2069 | { | 2120 | { |
2070 | struct iommu_table *tbl = get_iommu_table_base(dev); | 2121 | struct iommu_table *tbl = get_iommu_table_base(dev); |
2071 | 2122 | ||
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 | 2123 | diff -urNp linux-2.6.32.16/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.16/arch/powerpc/kernel/dma-swiotlb.c |
2073 | --- linux-2.6.32.15/arch/powerpc/kernel/dma-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 | 2124 | --- linux-2.6.32.16/arch/powerpc/kernel/dma-swiotlb.c 2010-07-05 14:14:00.000000000 -0400 |
2074 | +++ linux-2.6.32.15/arch/powerpc/kernel/dma-swiotlb.c 2010-05-28 21:27:14.807143556 -0400 | 2125 | +++ linux-2.6.32.16/arch/powerpc/kernel/dma-swiotlb.c 2010-07-09 14:50:34.000000000 -0400 |
2075 | @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; | 2126 | @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; |
2076 | * map_page, and unmap_page on highmem, use normal dma_ops | 2127 | * map_page, and unmap_page on highmem, use normal dma_ops |
2077 | * for everything else. | 2128 | * for everything else. |
@@ -2081,9 +2132,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.15/arc | |||
2081 | .alloc_coherent = dma_direct_alloc_coherent, | 2132 | .alloc_coherent = dma_direct_alloc_coherent, |
2082 | .free_coherent = dma_direct_free_coherent, | 2133 | .free_coherent = dma_direct_free_coherent, |
2083 | .map_sg = swiotlb_map_sg_attrs, | 2134 | .map_sg = swiotlb_map_sg_attrs, |
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 | 2135 | diff -urNp linux-2.6.32.16/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.16/arch/powerpc/kernel/exceptions-64e.S |
2085 | --- linux-2.6.32.15/arch/powerpc/kernel/exceptions-64e.S 2010-03-15 11:52:04.000000000 -0400 | 2136 | --- linux-2.6.32.16/arch/powerpc/kernel/exceptions-64e.S 2010-07-05 14:14:00.000000000 -0400 |
2086 | +++ linux-2.6.32.15/arch/powerpc/kernel/exceptions-64e.S 2010-05-28 21:27:14.823138187 -0400 | 2137 | +++ linux-2.6.32.16/arch/powerpc/kernel/exceptions-64e.S 2010-07-09 14:50:34.000000000 -0400 |
2087 | @@ -455,6 +455,7 @@ storage_fault_common: | 2138 | @@ -455,6 +455,7 @@ storage_fault_common: |
2088 | std r14,_DAR(r1) | 2139 | std r14,_DAR(r1) |
2089 | std r15,_DSISR(r1) | 2140 | std r15,_DSISR(r1) |
@@ -2102,9 +2153,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.15/ | |||
2102 | addi r3,r1,STACK_FRAME_OVERHEAD | 2153 | addi r3,r1,STACK_FRAME_OVERHEAD |
2103 | ld r4,_DAR(r1) | 2154 | ld r4,_DAR(r1) |
2104 | bl .bad_page_fault | 2155 | bl .bad_page_fault |
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 | 2156 | diff -urNp linux-2.6.32.16/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.16/arch/powerpc/kernel/exceptions-64s.S |
2106 | --- linux-2.6.32.15/arch/powerpc/kernel/exceptions-64s.S 2010-03-15 11:52:04.000000000 -0400 | 2157 | --- linux-2.6.32.16/arch/powerpc/kernel/exceptions-64s.S 2010-07-05 14:14:00.000000000 -0400 |
2107 | +++ linux-2.6.32.15/arch/powerpc/kernel/exceptions-64s.S 2010-05-28 21:27:14.834966791 -0400 | 2158 | +++ linux-2.6.32.16/arch/powerpc/kernel/exceptions-64s.S 2010-07-09 14:50:34.000000000 -0400 |
2108 | @@ -818,10 +818,10 @@ handle_page_fault: | 2159 | @@ -818,10 +818,10 @@ handle_page_fault: |
2109 | 11: ld r4,_DAR(r1) | 2160 | 11: ld r4,_DAR(r1) |
2110 | ld r5,_DSISR(r1) | 2161 | ld r5,_DSISR(r1) |
@@ -2117,9 +2168,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.15/ | |||
2117 | mr r5,r3 | 2168 | mr r5,r3 |
2118 | addi r3,r1,STACK_FRAME_OVERHEAD | 2169 | addi r3,r1,STACK_FRAME_OVERHEAD |
2119 | lwz r4,_DAR(r1) | 2170 | lwz r4,_DAR(r1) |
2120 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/ibmebus.c linux-2.6.32.15/arch/powerpc/kernel/ibmebus.c | 2171 | diff -urNp linux-2.6.32.16/arch/powerpc/kernel/ibmebus.c linux-2.6.32.16/arch/powerpc/kernel/ibmebus.c |
2121 | --- linux-2.6.32.15/arch/powerpc/kernel/ibmebus.c 2010-03-15 11:52:04.000000000 -0400 | 2172 | --- linux-2.6.32.16/arch/powerpc/kernel/ibmebus.c 2010-07-05 14:14:00.000000000 -0400 |
2122 | +++ linux-2.6.32.15/arch/powerpc/kernel/ibmebus.c 2010-05-28 21:27:14.834966791 -0400 | 2173 | +++ linux-2.6.32.16/arch/powerpc/kernel/ibmebus.c 2010-07-09 14:50:34.000000000 -0400 |
2123 | @@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct | 2174 | @@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct |
2124 | return 1; | 2175 | return 1; |
2125 | } | 2176 | } |
@@ -2129,9 +2180,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/ibmebus.c linux-2.6.32.15/arch/po | |||
2129 | .alloc_coherent = ibmebus_alloc_coherent, | 2180 | .alloc_coherent = ibmebus_alloc_coherent, |
2130 | .free_coherent = ibmebus_free_coherent, | 2181 | .free_coherent = ibmebus_free_coherent, |
2131 | .map_sg = ibmebus_map_sg, | 2182 | .map_sg = ibmebus_map_sg, |
2132 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/kgdb.c linux-2.6.32.15/arch/powerpc/kernel/kgdb.c | 2183 | diff -urNp linux-2.6.32.16/arch/powerpc/kernel/kgdb.c linux-2.6.32.16/arch/powerpc/kernel/kgdb.c |
2133 | --- linux-2.6.32.15/arch/powerpc/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 | 2184 | --- linux-2.6.32.16/arch/powerpc/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 |
2134 | +++ linux-2.6.32.15/arch/powerpc/kernel/kgdb.c 2010-05-28 21:27:14.834966791 -0400 | 2185 | +++ linux-2.6.32.16/arch/powerpc/kernel/kgdb.c 2010-07-09 14:50:34.000000000 -0400 |
2135 | @@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct | 2186 | @@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct |
2136 | if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0) | 2187 | if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0) |
2137 | return 0; | 2188 | return 0; |
@@ -2150,9 +2201,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/kgdb.c linux-2.6.32.15/arch/power | |||
2150 | .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08}, | 2201 | .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08}, |
2151 | }; | 2202 | }; |
2152 | 2203 | ||
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 | 2204 | diff -urNp linux-2.6.32.16/arch/powerpc/kernel/module_32.c linux-2.6.32.16/arch/powerpc/kernel/module_32.c |
2154 | --- linux-2.6.32.15/arch/powerpc/kernel/module_32.c 2010-03-15 11:52:04.000000000 -0400 | 2205 | --- linux-2.6.32.16/arch/powerpc/kernel/module_32.c 2010-07-05 14:14:00.000000000 -0400 |
2155 | +++ linux-2.6.32.15/arch/powerpc/kernel/module_32.c 2010-05-28 21:27:14.841132469 -0400 | 2206 | +++ linux-2.6.32.16/arch/powerpc/kernel/module_32.c 2010-07-09 14:50:34.000000000 -0400 |
2156 | @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr | 2207 | @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr |
2157 | me->arch.core_plt_section = i; | 2208 | me->arch.core_plt_section = i; |
2158 | } | 2209 | } |
@@ -2182,9 +2233,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/module_32.c linux-2.6.32.15/arch/ | |||
2182 | 2233 | ||
2183 | /* Find this entry, or if that fails, the next avail. entry */ | 2234 | /* Find this entry, or if that fails, the next avail. entry */ |
2184 | while (entry->jump[0]) { | 2235 | while (entry->jump[0]) { |
2185 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/module.c linux-2.6.32.15/arch/powerpc/kernel/module.c | 2236 | diff -urNp linux-2.6.32.16/arch/powerpc/kernel/module.c linux-2.6.32.16/arch/powerpc/kernel/module.c |
2186 | --- linux-2.6.32.15/arch/powerpc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 | 2237 | --- linux-2.6.32.16/arch/powerpc/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 |
2187 | +++ linux-2.6.32.15/arch/powerpc/kernel/module.c 2010-05-28 21:27:14.841132469 -0400 | 2238 | +++ linux-2.6.32.16/arch/powerpc/kernel/module.c 2010-07-09 14:50:34.000000000 -0400 |
2188 | @@ -31,11 +31,24 @@ | 2239 | @@ -31,11 +31,24 @@ |
2189 | 2240 | ||
2190 | LIST_HEAD(module_bug_list); | 2241 | LIST_HEAD(module_bug_list); |
@@ -2224,9 +2275,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/module.c linux-2.6.32.15/arch/pow | |||
2224 | static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, | 2275 | static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, |
2225 | const Elf_Shdr *sechdrs, | 2276 | const Elf_Shdr *sechdrs, |
2226 | const char *name) | 2277 | const char *name) |
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 | 2278 | diff -urNp linux-2.6.32.16/arch/powerpc/kernel/pci-common.c linux-2.6.32.16/arch/powerpc/kernel/pci-common.c |
2228 | --- linux-2.6.32.15/arch/powerpc/kernel/pci-common.c 2010-03-15 11:52:04.000000000 -0400 | 2279 | --- linux-2.6.32.16/arch/powerpc/kernel/pci-common.c 2010-07-05 14:14:00.000000000 -0400 |
2229 | +++ linux-2.6.32.15/arch/powerpc/kernel/pci-common.c 2010-05-28 21:27:14.841132469 -0400 | 2280 | +++ linux-2.6.32.16/arch/powerpc/kernel/pci-common.c 2010-07-09 14:50:34.000000000 -0400 |
2230 | @@ -50,14 +50,14 @@ resource_size_t isa_mem_base; | 2281 | @@ -50,14 +50,14 @@ resource_size_t isa_mem_base; |
2231 | unsigned int ppc_pci_flags = 0; | 2282 | unsigned int ppc_pci_flags = 0; |
2232 | 2283 | ||
@@ -2245,9 +2296,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/pci-common.c linux-2.6.32.15/arch | |||
2245 | { | 2296 | { |
2246 | return pci_dma_ops; | 2297 | return pci_dma_ops; |
2247 | } | 2298 | } |
2248 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/process.c linux-2.6.32.15/arch/powerpc/kernel/process.c | 2299 | diff -urNp linux-2.6.32.16/arch/powerpc/kernel/process.c linux-2.6.32.16/arch/powerpc/kernel/process.c |
2249 | --- linux-2.6.32.15/arch/powerpc/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 | 2300 | --- linux-2.6.32.16/arch/powerpc/kernel/process.c 2010-07-05 14:14:00.000000000 -0400 |
2250 | +++ linux-2.6.32.15/arch/powerpc/kernel/process.c 2010-05-28 21:27:14.843133123 -0400 | 2301 | +++ linux-2.6.32.16/arch/powerpc/kernel/process.c 2010-07-09 14:50:34.000000000 -0400 |
2251 | @@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned | 2302 | @@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned |
2252 | sp -= get_random_int() & ~PAGE_MASK; | 2303 | sp -= get_random_int() & ~PAGE_MASK; |
2253 | return sp & ~0xf; | 2304 | return sp & ~0xf; |
@@ -2300,9 +2351,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/process.c linux-2.6.32.15/arch/po | |||
2300 | - | 2351 | - |
2301 | - return ret; | 2352 | - return ret; |
2302 | -} | 2353 | -} |
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 | 2354 | diff -urNp linux-2.6.32.16/arch/powerpc/kernel/signal_32.c linux-2.6.32.16/arch/powerpc/kernel/signal_32.c |
2304 | --- linux-2.6.32.15/arch/powerpc/kernel/signal_32.c 2010-03-15 11:52:04.000000000 -0400 | 2355 | --- linux-2.6.32.16/arch/powerpc/kernel/signal_32.c 2010-07-05 14:14:00.000000000 -0400 |
2305 | +++ linux-2.6.32.15/arch/powerpc/kernel/signal_32.c 2010-05-28 21:27:14.843133123 -0400 | 2356 | +++ linux-2.6.32.16/arch/powerpc/kernel/signal_32.c 2010-07-09 14:50:34.000000000 -0400 |
2306 | @@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig | 2357 | @@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig |
2307 | /* Save user registers on the stack */ | 2358 | /* Save user registers on the stack */ |
2308 | frame = &rt_sf->uc.uc_mcontext; | 2359 | frame = &rt_sf->uc.uc_mcontext; |
@@ -2312,9 +2363,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/signal_32.c linux-2.6.32.15/arch/ | |||
2312 | if (save_user_regs(regs, frame, 0, 1)) | 2363 | if (save_user_regs(regs, frame, 0, 1)) |
2313 | goto badframe; | 2364 | goto badframe; |
2314 | regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; | 2365 | regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; |
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 | 2366 | diff -urNp linux-2.6.32.16/arch/powerpc/kernel/signal_64.c linux-2.6.32.16/arch/powerpc/kernel/signal_64.c |
2316 | --- linux-2.6.32.15/arch/powerpc/kernel/signal_64.c 2010-03-15 11:52:04.000000000 -0400 | 2367 | --- linux-2.6.32.16/arch/powerpc/kernel/signal_64.c 2010-07-05 14:14:00.000000000 -0400 |
2317 | +++ linux-2.6.32.15/arch/powerpc/kernel/signal_64.c 2010-05-28 21:27:14.843133123 -0400 | 2368 | +++ linux-2.6.32.16/arch/powerpc/kernel/signal_64.c 2010-07-09 14:50:34.000000000 -0400 |
2318 | @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct | 2369 | @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct |
2319 | current->thread.fpscr.val = 0; | 2370 | current->thread.fpscr.val = 0; |
2320 | 2371 | ||
@@ -2324,9 +2375,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/signal_64.c linux-2.6.32.15/arch/ | |||
2324 | regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; | 2375 | regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; |
2325 | } else { | 2376 | } else { |
2326 | err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); | 2377 | err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); |
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 | 2378 | diff -urNp linux-2.6.32.16/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.16/arch/powerpc/kernel/sys_ppc32.c |
2328 | --- linux-2.6.32.15/arch/powerpc/kernel/sys_ppc32.c 2010-03-15 11:52:04.000000000 -0400 | 2379 | --- linux-2.6.32.16/arch/powerpc/kernel/sys_ppc32.c 2010-07-05 14:14:00.000000000 -0400 |
2329 | +++ linux-2.6.32.15/arch/powerpc/kernel/sys_ppc32.c 2010-05-28 21:27:14.843133123 -0400 | 2380 | +++ linux-2.6.32.16/arch/powerpc/kernel/sys_ppc32.c 2010-07-09 14:50:34.000000000 -0400 |
2330 | @@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct | 2381 | @@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct |
2331 | if (oldlenp) { | 2382 | if (oldlenp) { |
2332 | if (!error) { | 2383 | if (!error) { |
@@ -2340,9 +2391,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.15/arch/ | |||
2340 | } | 2391 | } |
2341 | return error; | 2392 | return error; |
2342 | } | 2393 | } |
2343 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/vdso.c linux-2.6.32.15/arch/powerpc/kernel/vdso.c | 2394 | diff -urNp linux-2.6.32.16/arch/powerpc/kernel/vdso.c linux-2.6.32.16/arch/powerpc/kernel/vdso.c |
2344 | --- linux-2.6.32.15/arch/powerpc/kernel/vdso.c 2010-03-15 11:52:04.000000000 -0400 | 2395 | --- linux-2.6.32.16/arch/powerpc/kernel/vdso.c 2010-07-05 14:14:00.000000000 -0400 |
2345 | +++ linux-2.6.32.15/arch/powerpc/kernel/vdso.c 2010-05-28 21:27:14.843133123 -0400 | 2396 | +++ linux-2.6.32.16/arch/powerpc/kernel/vdso.c 2010-07-09 14:50:34.000000000 -0400 |
2346 | @@ -36,6 +36,7 @@ | 2397 | @@ -36,6 +36,7 @@ |
2347 | #include <asm/firmware.h> | 2398 | #include <asm/firmware.h> |
2348 | #include <asm/vdso.h> | 2399 | #include <asm/vdso.h> |
@@ -2369,9 +2420,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/vdso.c linux-2.6.32.15/arch/power | |||
2369 | if (IS_ERR_VALUE(vdso_base)) { | 2420 | if (IS_ERR_VALUE(vdso_base)) { |
2370 | rc = vdso_base; | 2421 | rc = vdso_base; |
2371 | goto fail_mmapsem; | 2422 | goto fail_mmapsem; |
2372 | diff -urNp linux-2.6.32.15/arch/powerpc/kernel/vio.c linux-2.6.32.15/arch/powerpc/kernel/vio.c | 2423 | diff -urNp linux-2.6.32.16/arch/powerpc/kernel/vio.c linux-2.6.32.16/arch/powerpc/kernel/vio.c |
2373 | --- linux-2.6.32.15/arch/powerpc/kernel/vio.c 2010-03-15 11:52:04.000000000 -0400 | 2424 | --- linux-2.6.32.16/arch/powerpc/kernel/vio.c 2010-07-05 14:14:00.000000000 -0400 |
2374 | +++ linux-2.6.32.15/arch/powerpc/kernel/vio.c 2010-05-28 21:27:14.843133123 -0400 | 2425 | +++ linux-2.6.32.16/arch/powerpc/kernel/vio.c 2010-07-09 14:50:34.000000000 -0400 |
2375 | @@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc | 2426 | @@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc |
2376 | vio_cmo_dealloc(viodev, alloc_size); | 2427 | vio_cmo_dealloc(viodev, alloc_size); |
2377 | } | 2428 | } |
@@ -2394,9 +2445,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/vio.c linux-2.6.32.15/arch/powerp | |||
2394 | viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops; | 2445 | viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops; |
2395 | } | 2446 | } |
2396 | 2447 | ||
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 | 2448 | diff -urNp linux-2.6.32.16/arch/powerpc/lib/usercopy_64.c linux-2.6.32.16/arch/powerpc/lib/usercopy_64.c |
2398 | --- linux-2.6.32.15/arch/powerpc/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400 | 2449 | --- linux-2.6.32.16/arch/powerpc/lib/usercopy_64.c 2010-07-05 14:14:00.000000000 -0400 |
2399 | +++ linux-2.6.32.15/arch/powerpc/lib/usercopy_64.c 2010-05-28 21:27:14.843133123 -0400 | 2450 | +++ linux-2.6.32.16/arch/powerpc/lib/usercopy_64.c 2010-07-09 14:50:34.000000000 -0400 |
2400 | @@ -9,22 +9,6 @@ | 2451 | @@ -9,22 +9,6 @@ |
2401 | #include <linux/module.h> | 2452 | #include <linux/module.h> |
2402 | #include <asm/uaccess.h> | 2453 | #include <asm/uaccess.h> |
@@ -2428,9 +2479,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/lib/usercopy_64.c linux-2.6.32.15/arch/p | |||
2428 | -EXPORT_SYMBOL(copy_to_user); | 2479 | -EXPORT_SYMBOL(copy_to_user); |
2429 | EXPORT_SYMBOL(copy_in_user); | 2480 | EXPORT_SYMBOL(copy_in_user); |
2430 | 2481 | ||
2431 | diff -urNp linux-2.6.32.15/arch/powerpc/mm/fault.c linux-2.6.32.15/arch/powerpc/mm/fault.c | 2482 | diff -urNp linux-2.6.32.16/arch/powerpc/mm/fault.c linux-2.6.32.16/arch/powerpc/mm/fault.c |
2432 | --- linux-2.6.32.15/arch/powerpc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 | 2483 | --- linux-2.6.32.16/arch/powerpc/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 |
2433 | +++ linux-2.6.32.15/arch/powerpc/mm/fault.c 2010-05-28 21:27:14.843133123 -0400 | 2484 | +++ linux-2.6.32.16/arch/powerpc/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 |
2434 | @@ -30,6 +30,10 @@ | 2485 | @@ -30,6 +30,10 @@ |
2435 | #include <linux/kprobes.h> | 2486 | #include <linux/kprobes.h> |
2436 | #include <linux/kdebug.h> | 2487 | #include <linux/kdebug.h> |
@@ -2535,9 +2586,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/mm/fault.c linux-2.6.32.15/arch/powerpc/ | |||
2535 | _exception(SIGSEGV, regs, code, address); | 2586 | _exception(SIGSEGV, regs, code, address); |
2536 | return 0; | 2587 | return 0; |
2537 | } | 2588 | } |
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 | 2589 | diff -urNp linux-2.6.32.16/arch/powerpc/mm/mmap_64.c linux-2.6.32.16/arch/powerpc/mm/mmap_64.c |
2539 | --- linux-2.6.32.15/arch/powerpc/mm/mmap_64.c 2010-03-15 11:52:04.000000000 -0400 | 2590 | --- linux-2.6.32.16/arch/powerpc/mm/mmap_64.c 2010-07-05 14:14:00.000000000 -0400 |
2540 | +++ linux-2.6.32.15/arch/powerpc/mm/mmap_64.c 2010-05-28 21:27:14.843133123 -0400 | 2591 | +++ linux-2.6.32.16/arch/powerpc/mm/mmap_64.c 2010-07-09 14:50:34.000000000 -0400 |
2541 | @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str | 2592 | @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str |
2542 | */ | 2593 | */ |
2543 | if (mmap_is_legacy()) { | 2594 | if (mmap_is_legacy()) { |
@@ -2561,9 +2612,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/mm/mmap_64.c linux-2.6.32.15/arch/powerp | |||
2561 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; | 2612 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; |
2562 | mm->unmap_area = arch_unmap_area_topdown; | 2613 | mm->unmap_area = arch_unmap_area_topdown; |
2563 | } | 2614 | } |
2564 | diff -urNp linux-2.6.32.15/arch/powerpc/mm/slice.c linux-2.6.32.15/arch/powerpc/mm/slice.c | 2615 | diff -urNp linux-2.6.32.16/arch/powerpc/mm/slice.c linux-2.6.32.16/arch/powerpc/mm/slice.c |
2565 | --- linux-2.6.32.15/arch/powerpc/mm/slice.c 2010-03-15 11:52:04.000000000 -0400 | 2616 | --- linux-2.6.32.16/arch/powerpc/mm/slice.c 2010-07-05 14:14:00.000000000 -0400 |
2566 | +++ linux-2.6.32.15/arch/powerpc/mm/slice.c 2010-05-28 21:27:14.843133123 -0400 | 2617 | +++ linux-2.6.32.16/arch/powerpc/mm/slice.c 2010-07-09 14:50:34.000000000 -0400 |
2567 | @@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un | 2618 | @@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un |
2568 | if (fixed && addr > (mm->task_size - len)) | 2619 | if (fixed && addr > (mm->task_size - len)) |
2569 | return -EINVAL; | 2620 | return -EINVAL; |
@@ -2576,9 +2627,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/mm/slice.c linux-2.6.32.15/arch/powerpc/ | |||
2576 | /* If hint, make sure it matches our alignment restrictions */ | 2627 | /* If hint, make sure it matches our alignment restrictions */ |
2577 | if (!fixed && addr) { | 2628 | if (!fixed && addr) { |
2578 | addr = _ALIGN_UP(addr, 1ul << pshift); | 2629 | addr = _ALIGN_UP(addr, 1ul << pshift); |
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 | 2630 | diff -urNp linux-2.6.32.16/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.16/arch/powerpc/platforms/52xx/lite5200_pm.c |
2580 | --- linux-2.6.32.15/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-03-15 11:52:04.000000000 -0400 | 2631 | --- linux-2.6.32.16/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-07-05 14:14:00.000000000 -0400 |
2581 | +++ linux-2.6.32.15/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-05-28 21:27:14.843133123 -0400 | 2632 | +++ linux-2.6.32.16/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-07-09 14:50:34.000000000 -0400 |
2582 | @@ -235,7 +235,7 @@ static void lite5200_pm_end(void) | 2633 | @@ -235,7 +235,7 @@ static void lite5200_pm_end(void) |
2583 | lite5200_pm_target_state = PM_SUSPEND_ON; | 2634 | lite5200_pm_target_state = PM_SUSPEND_ON; |
2584 | } | 2635 | } |
@@ -2588,9 +2639,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.3 | |||
2588 | .valid = lite5200_pm_valid, | 2639 | .valid = lite5200_pm_valid, |
2589 | .begin = lite5200_pm_begin, | 2640 | .begin = lite5200_pm_begin, |
2590 | .prepare = lite5200_pm_prepare, | 2641 | .prepare = lite5200_pm_prepare, |
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 | 2642 | diff -urNp linux-2.6.32.16/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.16/arch/powerpc/platforms/52xx/mpc52xx_pm.c |
2592 | --- linux-2.6.32.15/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-03-15 11:52:04.000000000 -0400 | 2643 | --- linux-2.6.32.16/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-07-05 14:14:00.000000000 -0400 |
2593 | +++ linux-2.6.32.15/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-05-28 21:27:14.843133123 -0400 | 2644 | +++ linux-2.6.32.16/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-07-09 14:50:34.000000000 -0400 |
2594 | @@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void) | 2645 | @@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void) |
2595 | iounmap(mbar); | 2646 | iounmap(mbar); |
2596 | } | 2647 | } |
@@ -2600,9 +2651,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32 | |||
2600 | .valid = mpc52xx_pm_valid, | 2651 | .valid = mpc52xx_pm_valid, |
2601 | .prepare = mpc52xx_pm_prepare, | 2652 | .prepare = mpc52xx_pm_prepare, |
2602 | .enter = mpc52xx_pm_enter, | 2653 | .enter = mpc52xx_pm_enter, |
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 | 2654 | diff -urNp linux-2.6.32.16/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.16/arch/powerpc/platforms/83xx/suspend.c |
2604 | --- linux-2.6.32.15/arch/powerpc/platforms/83xx/suspend.c 2010-03-15 11:52:04.000000000 -0400 | 2655 | --- linux-2.6.32.16/arch/powerpc/platforms/83xx/suspend.c 2010-07-05 14:14:00.000000000 -0400 |
2605 | +++ linux-2.6.32.15/arch/powerpc/platforms/83xx/suspend.c 2010-05-28 21:27:14.843133123 -0400 | 2656 | +++ linux-2.6.32.16/arch/powerpc/platforms/83xx/suspend.c 2010-07-09 14:50:34.000000000 -0400 |
2606 | @@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void) | 2657 | @@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void) |
2607 | return ret; | 2658 | return ret; |
2608 | } | 2659 | } |
@@ -2612,9 +2663,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.15 | |||
2612 | .valid = mpc83xx_suspend_valid, | 2663 | .valid = mpc83xx_suspend_valid, |
2613 | .begin = mpc83xx_suspend_begin, | 2664 | .begin = mpc83xx_suspend_begin, |
2614 | .enter = mpc83xx_suspend_enter, | 2665 | .enter = mpc83xx_suspend_enter, |
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 | 2666 | diff -urNp linux-2.6.32.16/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.16/arch/powerpc/platforms/cell/iommu.c |
2616 | --- linux-2.6.32.15/arch/powerpc/platforms/cell/iommu.c 2010-03-15 11:52:04.000000000 -0400 | 2667 | --- linux-2.6.32.16/arch/powerpc/platforms/cell/iommu.c 2010-07-05 14:14:00.000000000 -0400 |
2617 | +++ linux-2.6.32.15/arch/powerpc/platforms/cell/iommu.c 2010-05-28 21:27:14.864087018 -0400 | 2668 | +++ linux-2.6.32.16/arch/powerpc/platforms/cell/iommu.c 2010-07-09 14:50:34.000000000 -0400 |
2618 | @@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc | 2669 | @@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc |
2619 | 2670 | ||
2620 | static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); | 2671 | static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); |
@@ -2624,9 +2675,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.15/a | |||
2624 | .alloc_coherent = dma_fixed_alloc_coherent, | 2675 | .alloc_coherent = dma_fixed_alloc_coherent, |
2625 | .free_coherent = dma_fixed_free_coherent, | 2676 | .free_coherent = dma_fixed_free_coherent, |
2626 | .map_sg = dma_fixed_map_sg, | 2677 | .map_sg = dma_fixed_map_sg, |
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 | 2678 | diff -urNp linux-2.6.32.16/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.16/arch/powerpc/platforms/ps3/system-bus.c |
2628 | --- linux-2.6.32.15/arch/powerpc/platforms/ps3/system-bus.c 2010-03-15 11:52:04.000000000 -0400 | 2679 | --- linux-2.6.32.16/arch/powerpc/platforms/ps3/system-bus.c 2010-07-05 14:14:00.000000000 -0400 |
2629 | +++ linux-2.6.32.15/arch/powerpc/platforms/ps3/system-bus.c 2010-05-28 21:27:14.867153288 -0400 | 2680 | +++ linux-2.6.32.16/arch/powerpc/platforms/ps3/system-bus.c 2010-07-09 14:50:34.000000000 -0400 |
2630 | @@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi | 2681 | @@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi |
2631 | return mask >= DMA_BIT_MASK(32); | 2682 | return mask >= DMA_BIT_MASK(32); |
2632 | } | 2683 | } |
@@ -2645,9 +2696,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32. | |||
2645 | .alloc_coherent = ps3_alloc_coherent, | 2696 | .alloc_coherent = ps3_alloc_coherent, |
2646 | .free_coherent = ps3_free_coherent, | 2697 | .free_coherent = ps3_free_coherent, |
2647 | .map_sg = ps3_ioc0_map_sg, | 2698 | .map_sg = ps3_ioc0_map_sg, |
2648 | diff -urNp linux-2.6.32.15/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.15/arch/powerpc/platforms/pseries/Kconfig | 2699 | diff -urNp linux-2.6.32.16/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.16/arch/powerpc/platforms/pseries/Kconfig |
2649 | --- linux-2.6.32.15/arch/powerpc/platforms/pseries/Kconfig 2010-03-15 11:52:04.000000000 -0400 | 2700 | --- linux-2.6.32.16/arch/powerpc/platforms/pseries/Kconfig 2010-07-05 14:14:00.000000000 -0400 |
2650 | +++ linux-2.6.32.15/arch/powerpc/platforms/pseries/Kconfig 2010-05-28 21:27:14.867153288 -0400 | 2701 | +++ linux-2.6.32.16/arch/powerpc/platforms/pseries/Kconfig 2010-07-09 14:50:34.000000000 -0400 |
2651 | @@ -2,6 +2,8 @@ config PPC_PSERIES | 2702 | @@ -2,6 +2,8 @@ config PPC_PSERIES |
2652 | depends on PPC64 && PPC_BOOK3S | 2703 | depends on PPC64 && PPC_BOOK3S |
2653 | bool "IBM pSeries & new (POWER5-based) iSeries" | 2704 | bool "IBM pSeries & new (POWER5-based) iSeries" |
@@ -2657,9 +2708,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.1 | |||
2657 | select PPC_I8259 | 2708 | select PPC_I8259 |
2658 | select PPC_RTAS | 2709 | select PPC_RTAS |
2659 | select RTAS_ERROR_LOGGING | 2710 | select RTAS_ERROR_LOGGING |
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 | 2711 | diff -urNp linux-2.6.32.16/arch/s390/include/asm/elf.h linux-2.6.32.16/arch/s390/include/asm/elf.h |
2661 | --- linux-2.6.32.15/arch/s390/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 | 2712 | --- linux-2.6.32.16/arch/s390/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 |
2662 | +++ linux-2.6.32.15/arch/s390/include/asm/elf.h 2010-05-28 21:27:14.871031796 -0400 | 2713 | +++ linux-2.6.32.16/arch/s390/include/asm/elf.h 2010-07-09 14:50:35.000000000 -0400 |
2663 | @@ -164,6 +164,13 @@ extern unsigned int vdso_enabled; | 2714 | @@ -164,6 +164,13 @@ extern unsigned int vdso_enabled; |
2664 | that it will "exec", and that there is sufficient room for the brk. */ | 2715 | that it will "exec", and that there is sufficient room for the brk. */ |
2665 | #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2) | 2716 | #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2) |
@@ -2674,9 +2725,9 @@ diff -urNp linux-2.6.32.15/arch/s390/include/asm/elf.h linux-2.6.32.15/arch/s390 | |||
2674 | /* This yields a mask that user programs can use to figure out what | 2725 | /* This yields a mask that user programs can use to figure out what |
2675 | instruction set this CPU supports. */ | 2726 | instruction set this CPU supports. */ |
2676 | 2727 | ||
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 | 2728 | diff -urNp linux-2.6.32.16/arch/s390/include/asm/setup.h linux-2.6.32.16/arch/s390/include/asm/setup.h |
2678 | --- linux-2.6.32.15/arch/s390/include/asm/setup.h 2010-03-15 11:52:04.000000000 -0400 | 2729 | --- linux-2.6.32.16/arch/s390/include/asm/setup.h 2010-07-05 14:14:00.000000000 -0400 |
2679 | +++ linux-2.6.32.15/arch/s390/include/asm/setup.h 2010-05-28 21:27:14.871031796 -0400 | 2730 | +++ linux-2.6.32.16/arch/s390/include/asm/setup.h 2010-07-09 14:50:35.000000000 -0400 |
2680 | @@ -50,13 +50,13 @@ extern unsigned long memory_end; | 2731 | @@ -50,13 +50,13 @@ extern unsigned long memory_end; |
2681 | void detect_memory_layout(struct mem_chunk chunk[]); | 2732 | void detect_memory_layout(struct mem_chunk chunk[]); |
2682 | 2733 | ||
@@ -2693,9 +2744,9 @@ diff -urNp linux-2.6.32.15/arch/s390/include/asm/setup.h linux-2.6.32.15/arch/s3 | |||
2693 | #else | 2744 | #else |
2694 | #define s390_noexec (0) | 2745 | #define s390_noexec (0) |
2695 | #endif | 2746 | #endif |
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 | 2747 | diff -urNp linux-2.6.32.16/arch/s390/include/asm/uaccess.h linux-2.6.32.16/arch/s390/include/asm/uaccess.h |
2697 | --- linux-2.6.32.15/arch/s390/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 | 2748 | --- linux-2.6.32.16/arch/s390/include/asm/uaccess.h 2010-07-05 14:14:00.000000000 -0400 |
2698 | +++ linux-2.6.32.15/arch/s390/include/asm/uaccess.h 2010-05-28 21:27:14.871031796 -0400 | 2749 | +++ linux-2.6.32.16/arch/s390/include/asm/uaccess.h 2010-07-09 14:50:35.000000000 -0400 |
2699 | @@ -232,6 +232,10 @@ static inline unsigned long __must_check | 2750 | @@ -232,6 +232,10 @@ static inline unsigned long __must_check |
2700 | copy_to_user(void __user *to, const void *from, unsigned long n) | 2751 | copy_to_user(void __user *to, const void *from, unsigned long n) |
2701 | { | 2752 | { |
@@ -2728,9 +2779,9 @@ diff -urNp linux-2.6.32.15/arch/s390/include/asm/uaccess.h linux-2.6.32.15/arch/ | |||
2728 | if (access_ok(VERIFY_READ, from, n)) | 2779 | if (access_ok(VERIFY_READ, from, n)) |
2729 | n = __copy_from_user(to, from, n); | 2780 | n = __copy_from_user(to, from, n); |
2730 | else | 2781 | else |
2731 | diff -urNp linux-2.6.32.15/arch/s390/Kconfig linux-2.6.32.15/arch/s390/Kconfig | 2782 | diff -urNp linux-2.6.32.16/arch/s390/Kconfig linux-2.6.32.16/arch/s390/Kconfig |
2732 | --- linux-2.6.32.15/arch/s390/Kconfig 2010-03-15 11:52:04.000000000 -0400 | 2783 | --- linux-2.6.32.16/arch/s390/Kconfig 2010-07-05 14:14:00.000000000 -0400 |
2733 | +++ linux-2.6.32.15/arch/s390/Kconfig 2010-05-28 21:27:14.871031796 -0400 | 2784 | +++ linux-2.6.32.16/arch/s390/Kconfig 2010-07-09 14:50:35.000000000 -0400 |
2734 | @@ -194,28 +194,26 @@ config AUDIT_ARCH | 2785 | @@ -194,28 +194,26 @@ config AUDIT_ARCH |
2735 | 2786 | ||
2736 | config S390_SWITCH_AMODE | 2787 | config S390_SWITCH_AMODE |
@@ -2768,9 +2819,9 @@ diff -urNp linux-2.6.32.15/arch/s390/Kconfig linux-2.6.32.15/arch/s390/Kconfig | |||
2768 | 2819 | ||
2769 | comment "Code generation options" | 2820 | comment "Code generation options" |
2770 | 2821 | ||
2771 | diff -urNp linux-2.6.32.15/arch/s390/kernel/module.c linux-2.6.32.15/arch/s390/kernel/module.c | 2822 | diff -urNp linux-2.6.32.16/arch/s390/kernel/module.c linux-2.6.32.16/arch/s390/kernel/module.c |
2772 | --- linux-2.6.32.15/arch/s390/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 | 2823 | --- linux-2.6.32.16/arch/s390/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 |
2773 | +++ linux-2.6.32.15/arch/s390/kernel/module.c 2010-05-28 21:27:14.871031796 -0400 | 2824 | +++ linux-2.6.32.16/arch/s390/kernel/module.c 2010-07-09 14:50:35.000000000 -0400 |
2774 | @@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, | 2825 | @@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, |
2775 | 2826 | ||
2776 | /* Increase core size by size of got & plt and set start | 2827 | /* Increase core size by size of got & plt and set start |
@@ -2842,9 +2893,9 @@ diff -urNp linux-2.6.32.15/arch/s390/kernel/module.c linux-2.6.32.15/arch/s390/k | |||
2842 | rela->r_addend - loc; | 2893 | rela->r_addend - loc; |
2843 | if (r_type == R_390_GOTPC) | 2894 | if (r_type == R_390_GOTPC) |
2844 | *(unsigned int *) loc = val; | 2895 | *(unsigned int *) loc = val; |
2845 | diff -urNp linux-2.6.32.15/arch/s390/kernel/setup.c linux-2.6.32.15/arch/s390/kernel/setup.c | 2896 | diff -urNp linux-2.6.32.16/arch/s390/kernel/setup.c linux-2.6.32.16/arch/s390/kernel/setup.c |
2846 | --- linux-2.6.32.15/arch/s390/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400 | 2897 | --- linux-2.6.32.16/arch/s390/kernel/setup.c 2010-07-05 14:14:00.000000000 -0400 |
2847 | +++ linux-2.6.32.15/arch/s390/kernel/setup.c 2010-05-28 21:27:14.871031796 -0400 | 2898 | +++ linux-2.6.32.16/arch/s390/kernel/setup.c 2010-07-09 14:50:35.000000000 -0400 |
2848 | @@ -306,9 +306,6 @@ static int __init early_parse_mem(char * | 2899 | @@ -306,9 +306,6 @@ static int __init early_parse_mem(char * |
2849 | early_param("mem", early_parse_mem); | 2900 | early_param("mem", early_parse_mem); |
2850 | 2901 | ||
@@ -2898,9 +2949,9 @@ diff -urNp linux-2.6.32.15/arch/s390/kernel/setup.c linux-2.6.32.15/arch/s390/ke | |||
2898 | static void setup_addressing_mode(void) | 2949 | static void setup_addressing_mode(void) |
2899 | { | 2950 | { |
2900 | if (s390_noexec) { | 2951 | if (s390_noexec) { |
2901 | diff -urNp linux-2.6.32.15/arch/s390/mm/mmap.c linux-2.6.32.15/arch/s390/mm/mmap.c | 2952 | diff -urNp linux-2.6.32.16/arch/s390/mm/mmap.c linux-2.6.32.16/arch/s390/mm/mmap.c |
2902 | --- linux-2.6.32.15/arch/s390/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 | 2953 | --- linux-2.6.32.16/arch/s390/mm/mmap.c 2010-07-05 14:14:00.000000000 -0400 |
2903 | +++ linux-2.6.32.15/arch/s390/mm/mmap.c 2010-05-28 21:27:14.871031796 -0400 | 2954 | +++ linux-2.6.32.16/arch/s390/mm/mmap.c 2010-07-09 14:50:35.000000000 -0400 |
2904 | @@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str | 2955 | @@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str |
2905 | */ | 2956 | */ |
2906 | if (mmap_is_legacy()) { | 2957 | if (mmap_is_legacy()) { |
@@ -2947,9 +2998,9 @@ diff -urNp linux-2.6.32.15/arch/s390/mm/mmap.c linux-2.6.32.15/arch/s390/mm/mmap | |||
2947 | mm->get_unmapped_area = s390_get_unmapped_area_topdown; | 2998 | mm->get_unmapped_area = s390_get_unmapped_area_topdown; |
2948 | mm->unmap_area = arch_unmap_area_topdown; | 2999 | mm->unmap_area = arch_unmap_area_topdown; |
2949 | } | 3000 | } |
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 | 3001 | diff -urNp linux-2.6.32.16/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.16/arch/sh/boards/mach-hp6xx/pm.c |
2951 | --- linux-2.6.32.15/arch/sh/boards/mach-hp6xx/pm.c 2010-03-15 11:52:04.000000000 -0400 | 3002 | --- linux-2.6.32.16/arch/sh/boards/mach-hp6xx/pm.c 2010-07-05 14:14:00.000000000 -0400 |
2952 | +++ linux-2.6.32.15/arch/sh/boards/mach-hp6xx/pm.c 2010-05-28 21:27:14.871031796 -0400 | 3003 | +++ linux-2.6.32.16/arch/sh/boards/mach-hp6xx/pm.c 2010-07-09 14:50:35.000000000 -0400 |
2953 | @@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_ | 3004 | @@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_ |
2954 | return 0; | 3005 | return 0; |
2955 | } | 3006 | } |
@@ -2959,9 +3010,9 @@ diff -urNp linux-2.6.32.15/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.15/arch/s | |||
2959 | .enter = hp6x0_pm_enter, | 3010 | .enter = hp6x0_pm_enter, |
2960 | .valid = suspend_valid_only_mem, | 3011 | .valid = suspend_valid_only_mem, |
2961 | }; | 3012 | }; |
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 | 3013 | diff -urNp linux-2.6.32.16/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.16/arch/sh/kernel/cpu/sh4/sq.c |
2963 | --- linux-2.6.32.15/arch/sh/kernel/cpu/sh4/sq.c 2010-03-15 11:52:04.000000000 -0400 | 3014 | --- linux-2.6.32.16/arch/sh/kernel/cpu/sh4/sq.c 2010-07-05 14:14:00.000000000 -0400 |
2964 | +++ linux-2.6.32.15/arch/sh/kernel/cpu/sh4/sq.c 2010-05-28 21:27:14.871031796 -0400 | 3015 | +++ linux-2.6.32.16/arch/sh/kernel/cpu/sh4/sq.c 2010-07-09 14:50:35.000000000 -0400 |
2965 | @@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[ | 3016 | @@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[ |
2966 | NULL, | 3017 | NULL, |
2967 | }; | 3018 | }; |
@@ -2971,9 +3022,9 @@ diff -urNp linux-2.6.32.15/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.15/arch/sh/k | |||
2971 | .show = sq_sysfs_show, | 3022 | .show = sq_sysfs_show, |
2972 | .store = sq_sysfs_store, | 3023 | .store = sq_sysfs_store, |
2973 | }; | 3024 | }; |
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 | 3025 | diff -urNp linux-2.6.32.16/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.16/arch/sh/kernel/cpu/shmobile/pm.c |
2975 | --- linux-2.6.32.15/arch/sh/kernel/cpu/shmobile/pm.c 2010-03-15 11:52:04.000000000 -0400 | 3026 | --- linux-2.6.32.16/arch/sh/kernel/cpu/shmobile/pm.c 2010-07-05 14:14:00.000000000 -0400 |
2976 | +++ linux-2.6.32.15/arch/sh/kernel/cpu/shmobile/pm.c 2010-05-28 21:27:14.871031796 -0400 | 3027 | +++ linux-2.6.32.16/arch/sh/kernel/cpu/shmobile/pm.c 2010-07-09 14:50:35.000000000 -0400 |
2977 | @@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s | 3028 | @@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s |
2978 | return 0; | 3029 | return 0; |
2979 | } | 3030 | } |
@@ -2983,9 +3034,9 @@ diff -urNp linux-2.6.32.15/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.15/arch | |||
2983 | .enter = sh_pm_enter, | 3034 | .enter = sh_pm_enter, |
2984 | .valid = suspend_valid_only_mem, | 3035 | .valid = suspend_valid_only_mem, |
2985 | }; | 3036 | }; |
2986 | diff -urNp linux-2.6.32.15/arch/sh/kernel/kgdb.c linux-2.6.32.15/arch/sh/kernel/kgdb.c | 3037 | diff -urNp linux-2.6.32.16/arch/sh/kernel/kgdb.c linux-2.6.32.16/arch/sh/kernel/kgdb.c |
2987 | --- linux-2.6.32.15/arch/sh/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 | 3038 | --- linux-2.6.32.16/arch/sh/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 |
2988 | +++ linux-2.6.32.15/arch/sh/kernel/kgdb.c 2010-05-28 21:27:14.871031796 -0400 | 3039 | +++ linux-2.6.32.16/arch/sh/kernel/kgdb.c 2010-07-09 14:50:35.000000000 -0400 |
2989 | @@ -271,7 +271,7 @@ void kgdb_arch_exit(void) | 3040 | @@ -271,7 +271,7 @@ void kgdb_arch_exit(void) |
2990 | { | 3041 | { |
2991 | } | 3042 | } |
@@ -2995,10 +3046,10 @@ diff -urNp linux-2.6.32.15/arch/sh/kernel/kgdb.c linux-2.6.32.15/arch/sh/kernel/ | |||
2995 | /* Breakpoint instruction: trapa #0x3c */ | 3046 | /* Breakpoint instruction: trapa #0x3c */ |
2996 | #ifdef CONFIG_CPU_LITTLE_ENDIAN | 3047 | #ifdef CONFIG_CPU_LITTLE_ENDIAN |
2997 | .gdb_bpt_instr = { 0x3c, 0xc3 }, | 3048 | .gdb_bpt_instr = { 0x3c, 0xc3 }, |
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 | 3049 | diff -urNp linux-2.6.32.16/arch/sparc/include/asm/atomic_64.h linux-2.6.32.16/arch/sparc/include/asm/atomic_64.h |
2999 | --- linux-2.6.32.15/arch/sparc/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400 | 3050 | --- linux-2.6.32.16/arch/sparc/include/asm/atomic_64.h 2010-07-05 14:14:00.000000000 -0400 |
3000 | +++ linux-2.6.32.15/arch/sparc/include/asm/atomic_64.h 2010-05-28 21:27:14.871031796 -0400 | 3051 | +++ linux-2.6.32.16/arch/sparc/include/asm/atomic_64.h 2010-07-09 14:50:35.000000000 -0400 |
3001 | @@ -14,18 +14,38 @@ | 3052 | @@ -14,18 +14,39 @@ |
3002 | #define ATOMIC64_INIT(i) { (i) } | 3053 | #define ATOMIC64_INIT(i) { (i) } |
3003 | 3054 | ||
3004 | #define atomic_read(v) ((v)->counter) | 3055 | #define atomic_read(v) ((v)->counter) |
@@ -3030,6 +3081,7 @@ diff -urNp linux-2.6.32.15/arch/sparc/include/asm/atomic_64.h linux-2.6.32.15/ar | |||
3030 | extern void atomic_sub(int, atomic_t *); | 3081 | extern void atomic_sub(int, atomic_t *); |
3031 | +extern void atomic_sub_unchecked(int, atomic_unchecked_t *); | 3082 | +extern void atomic_sub_unchecked(int, atomic_unchecked_t *); |
3032 | extern void atomic64_sub(int, atomic64_t *); | 3083 | extern void atomic64_sub(int, atomic64_t *); |
3084 | +extern void atomic64_sub_unchecked(int, atomic64_unchecked_t *); | ||
3033 | 3085 | ||
3034 | extern int atomic_add_ret(int, atomic_t *); | 3086 | extern int atomic_add_ret(int, atomic_t *); |
3035 | extern int atomic64_add_ret(int, atomic64_t *); | 3087 | extern int atomic64_add_ret(int, atomic64_t *); |
@@ -3037,7 +3089,7 @@ diff -urNp linux-2.6.32.15/arch/sparc/include/asm/atomic_64.h linux-2.6.32.15/ar | |||
3037 | extern int atomic_sub_ret(int, atomic_t *); | 3089 | extern int atomic_sub_ret(int, atomic_t *); |
3038 | extern int atomic64_sub_ret(int, atomic64_t *); | 3090 | extern int atomic64_sub_ret(int, atomic64_t *); |
3039 | 3091 | ||
3040 | @@ -34,6 +54,7 @@ extern int atomic64_sub_ret(int, atomic6 | 3092 | @@ -34,6 +55,7 @@ extern int atomic64_sub_ret(int, atomic6 |
3041 | 3093 | ||
3042 | #define atomic_inc_return(v) atomic_add_ret(1, v) | 3094 | #define atomic_inc_return(v) atomic_add_ret(1, v) |
3043 | #define atomic64_inc_return(v) atomic64_add_ret(1, v) | 3095 | #define atomic64_inc_return(v) atomic64_add_ret(1, v) |
@@ -3045,7 +3097,7 @@ diff -urNp linux-2.6.32.15/arch/sparc/include/asm/atomic_64.h linux-2.6.32.15/ar | |||
3045 | 3097 | ||
3046 | #define atomic_sub_return(i, v) atomic_sub_ret(i, v) | 3098 | #define atomic_sub_return(i, v) atomic_sub_ret(i, v) |
3047 | #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v) | 3099 | #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v) |
3048 | @@ -59,7 +80,15 @@ extern int atomic64_sub_ret(int, atomic6 | 3100 | @@ -59,10 +81,26 @@ extern int atomic64_sub_ret(int, atomic6 |
3049 | #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0) | 3101 | #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0) |
3050 | 3102 | ||
3051 | #define atomic_inc(v) atomic_add(1, v) | 3103 | #define atomic_inc(v) atomic_add(1, v) |
@@ -3060,8 +3112,19 @@ diff -urNp linux-2.6.32.15/arch/sparc/include/asm/atomic_64.h linux-2.6.32.15/ar | |||
3060 | +} | 3112 | +} |
3061 | 3113 | ||
3062 | #define atomic_dec(v) atomic_sub(1, v) | 3114 | #define atomic_dec(v) atomic_sub(1, v) |
3115 | +static inline void atomic_dec_unchecked(atomic_unchecked_t *v) | ||
3116 | +{ | ||
3117 | + atomic_sub_unchecked(1, v); | ||
3118 | +} | ||
3063 | #define atomic64_dec(v) atomic64_sub(1, v) | 3119 | #define atomic64_dec(v) atomic64_sub(1, v) |
3064 | @@ -72,17 +101,28 @@ extern int atomic64_sub_ret(int, atomic6 | 3120 | +static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v) |
3121 | +{ | ||
3122 | + atomic64_sub_unchecked(1, v); | ||
3123 | +} | ||
3124 | |||
3125 | #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0) | ||
3126 | #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0) | ||
3127 | @@ -72,17 +110,28 @@ extern int atomic64_sub_ret(int, atomic6 | ||
3065 | 3128 | ||
3066 | static inline int atomic_add_unless(atomic_t *v, int a, int u) | 3129 | static inline int atomic_add_unless(atomic_t *v, int a, int u) |
3067 | { | 3130 | { |
@@ -3094,7 +3157,7 @@ diff -urNp linux-2.6.32.15/arch/sparc/include/asm/atomic_64.h linux-2.6.32.15/ar | |||
3094 | } | 3157 | } |
3095 | 3158 | ||
3096 | #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) | 3159 | #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) |
3097 | @@ -93,17 +133,28 @@ static inline int atomic_add_unless(atom | 3160 | @@ -93,17 +142,28 @@ static inline int atomic_add_unless(atom |
3098 | 3161 | ||
3099 | static inline int atomic64_add_unless(atomic64_t *v, long a, long u) | 3162 | static inline int atomic64_add_unless(atomic64_t *v, long a, long u) |
3100 | { | 3163 | { |
@@ -3127,9 +3190,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/include/asm/atomic_64.h linux-2.6.32.15/ar | |||
3127 | } | 3190 | } |
3128 | 3191 | ||
3129 | #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) | 3192 | #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) |
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 | 3193 | diff -urNp linux-2.6.32.16/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.16/arch/sparc/include/asm/dma-mapping.h |
3131 | --- linux-2.6.32.15/arch/sparc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 | 3194 | --- linux-2.6.32.16/arch/sparc/include/asm/dma-mapping.h 2010-07-05 14:14:00.000000000 -0400 |
3132 | +++ linux-2.6.32.15/arch/sparc/include/asm/dma-mapping.h 2010-05-28 21:27:14.871031796 -0400 | 3195 | +++ linux-2.6.32.16/arch/sparc/include/asm/dma-mapping.h 2010-07-09 14:50:35.000000000 -0400 |
3133 | @@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d | 3196 | @@ -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) | 3197 | #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) |
3135 | #define dma_is_consistent(d, h) (1) | 3198 | #define dma_is_consistent(d, h) (1) |
@@ -3161,9 +3224,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.15/ | |||
3161 | 3224 | ||
3162 | debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); | 3225 | debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); |
3163 | ops->free_coherent(dev, size, cpu_addr, dma_handle); | 3226 | ops->free_coherent(dev, size, cpu_addr, dma_handle); |
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 | 3227 | diff -urNp linux-2.6.32.16/arch/sparc/include/asm/elf_32.h linux-2.6.32.16/arch/sparc/include/asm/elf_32.h |
3165 | --- linux-2.6.32.15/arch/sparc/include/asm/elf_32.h 2010-03-15 11:52:04.000000000 -0400 | 3228 | --- linux-2.6.32.16/arch/sparc/include/asm/elf_32.h 2010-07-05 14:14:00.000000000 -0400 |
3166 | +++ linux-2.6.32.15/arch/sparc/include/asm/elf_32.h 2010-05-28 21:27:14.871031796 -0400 | 3229 | +++ linux-2.6.32.16/arch/sparc/include/asm/elf_32.h 2010-07-09 14:50:35.000000000 -0400 |
3167 | @@ -116,6 +116,13 @@ typedef struct { | 3230 | @@ -116,6 +116,13 @@ typedef struct { |
3168 | 3231 | ||
3169 | #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) | 3232 | #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) |
@@ -3178,9 +3241,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/include/asm/elf_32.h linux-2.6.32.15/arch/ | |||
3178 | /* This yields a mask that user programs can use to figure out what | 3241 | /* 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 | 3242 | instruction set this cpu supports. This can NOT be done in userspace |
3180 | on Sparc. */ | 3243 | on Sparc. */ |
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 | 3244 | diff -urNp linux-2.6.32.16/arch/sparc/include/asm/elf_64.h linux-2.6.32.16/arch/sparc/include/asm/elf_64.h |
3182 | --- linux-2.6.32.15/arch/sparc/include/asm/elf_64.h 2010-03-15 11:52:04.000000000 -0400 | 3245 | --- linux-2.6.32.16/arch/sparc/include/asm/elf_64.h 2010-07-05 14:14:00.000000000 -0400 |
3183 | +++ linux-2.6.32.15/arch/sparc/include/asm/elf_64.h 2010-05-28 21:27:14.871031796 -0400 | 3246 | +++ linux-2.6.32.16/arch/sparc/include/asm/elf_64.h 2010-07-09 14:50:35.000000000 -0400 |
3184 | @@ -163,6 +163,12 @@ typedef struct { | 3247 | @@ -163,6 +163,12 @@ typedef struct { |
3185 | #define ELF_ET_DYN_BASE 0x0000010000000000UL | 3248 | #define ELF_ET_DYN_BASE 0x0000010000000000UL |
3186 | #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL | 3249 | #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL |
@@ -3194,9 +3257,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/include/asm/elf_64.h linux-2.6.32.15/arch/ | |||
3194 | 3257 | ||
3195 | /* This yields a mask that user programs can use to figure out what | 3258 | /* This yields a mask that user programs can use to figure out what |
3196 | instruction set this cpu supports. */ | 3259 | instruction set this cpu supports. */ |
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 | 3260 | diff -urNp linux-2.6.32.16/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.16/arch/sparc/include/asm/pgtable_32.h |
3198 | --- linux-2.6.32.15/arch/sparc/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400 | 3261 | --- linux-2.6.32.16/arch/sparc/include/asm/pgtable_32.h 2010-07-05 14:14:00.000000000 -0400 |
3199 | +++ linux-2.6.32.15/arch/sparc/include/asm/pgtable_32.h 2010-05-28 21:27:14.871031796 -0400 | 3262 | +++ linux-2.6.32.16/arch/sparc/include/asm/pgtable_32.h 2010-07-09 14:50:35.000000000 -0400 |
3200 | @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) | 3263 | @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) |
3201 | BTFIXUPDEF_INT(page_none) | 3264 | BTFIXUPDEF_INT(page_none) |
3202 | BTFIXUPDEF_INT(page_copy) | 3265 | BTFIXUPDEF_INT(page_copy) |
@@ -3228,9 +3291,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.15/a | |||
3228 | extern unsigned long page_kernel; | 3291 | extern unsigned long page_kernel; |
3229 | 3292 | ||
3230 | #ifdef MODULE | 3293 | #ifdef MODULE |
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 | 3294 | diff -urNp linux-2.6.32.16/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.16/arch/sparc/include/asm/pgtsrmmu.h |
3232 | --- linux-2.6.32.15/arch/sparc/include/asm/pgtsrmmu.h 2010-03-15 11:52:04.000000000 -0400 | 3295 | --- linux-2.6.32.16/arch/sparc/include/asm/pgtsrmmu.h 2010-07-05 14:14:00.000000000 -0400 |
3233 | +++ linux-2.6.32.15/arch/sparc/include/asm/pgtsrmmu.h 2010-05-28 21:27:14.871031796 -0400 | 3296 | +++ linux-2.6.32.16/arch/sparc/include/asm/pgtsrmmu.h 2010-07-09 14:50:35.000000000 -0400 |
3234 | @@ -115,6 +115,13 @@ | 3297 | @@ -115,6 +115,13 @@ |
3235 | SRMMU_EXEC | SRMMU_REF) | 3298 | SRMMU_EXEC | SRMMU_REF) |
3236 | #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ | 3299 | #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ |
@@ -3245,9 +3308,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.15/arc | |||
3245 | #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ | 3308 | #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ |
3246 | SRMMU_DIRTY | SRMMU_REF) | 3309 | SRMMU_DIRTY | SRMMU_REF) |
3247 | 3310 | ||
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 | 3311 | diff -urNp linux-2.6.32.16/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.16/arch/sparc/include/asm/spinlock_64.h |
3249 | --- linux-2.6.32.15/arch/sparc/include/asm/spinlock_64.h 2010-03-15 11:52:04.000000000 -0400 | 3312 | --- linux-2.6.32.16/arch/sparc/include/asm/spinlock_64.h 2010-07-05 14:14:00.000000000 -0400 |
3250 | +++ linux-2.6.32.15/arch/sparc/include/asm/spinlock_64.h 2010-05-28 21:27:14.871031796 -0400 | 3313 | +++ linux-2.6.32.16/arch/sparc/include/asm/spinlock_64.h 2010-07-09 14:50:35.000000000 -0400 |
3251 | @@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw | 3314 | @@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw |
3252 | __asm__ __volatile__ ( | 3315 | __asm__ __volatile__ ( |
3253 | "1: ldsw [%2], %0\n" | 3316 | "1: ldsw [%2], %0\n" |
@@ -3299,9 +3362,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.15/ | |||
3299 | " cas [%2], %0, %1\n" | 3362 | " cas [%2], %0, %1\n" |
3300 | " cmp %0, %1\n" | 3363 | " cmp %0, %1\n" |
3301 | " bne,pn %%xcc, 1b\n" | 3364 | " bne,pn %%xcc, 1b\n" |
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 | 3365 | diff -urNp linux-2.6.32.16/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.16/arch/sparc/include/asm/uaccess_32.h |
3303 | --- linux-2.6.32.15/arch/sparc/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400 | 3366 | --- linux-2.6.32.16/arch/sparc/include/asm/uaccess_32.h 2010-07-05 14:14:00.000000000 -0400 |
3304 | +++ linux-2.6.32.15/arch/sparc/include/asm/uaccess_32.h 2010-05-28 21:27:14.871031796 -0400 | 3367 | +++ linux-2.6.32.16/arch/sparc/include/asm/uaccess_32.h 2010-07-09 14:50:35.000000000 -0400 |
3305 | @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __ | 3368 | @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __ |
3306 | 3369 | ||
3307 | static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n) | 3370 | static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n) |
@@ -3353,9 +3416,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.15/a | |||
3353 | return __copy_user((__force void __user *) to, from, n); | 3416 | return __copy_user((__force void __user *) to, from, n); |
3354 | } | 3417 | } |
3355 | 3418 | ||
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 | 3419 | diff -urNp linux-2.6.32.16/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.16/arch/sparc/include/asm/uaccess_64.h |
3357 | --- linux-2.6.32.15/arch/sparc/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400 | 3420 | --- linux-2.6.32.16/arch/sparc/include/asm/uaccess_64.h 2010-07-05 14:14:00.000000000 -0400 |
3358 | +++ linux-2.6.32.15/arch/sparc/include/asm/uaccess_64.h 2010-05-28 21:27:14.871031796 -0400 | 3421 | +++ linux-2.6.32.16/arch/sparc/include/asm/uaccess_64.h 2010-07-09 14:50:35.000000000 -0400 |
3359 | @@ -9,6 +9,7 @@ | 3422 | @@ -9,6 +9,7 @@ |
3360 | #include <linux/compiler.h> | 3423 | #include <linux/compiler.h> |
3361 | #include <linux/string.h> | 3424 | #include <linux/string.h> |
@@ -3364,15 +3427,7 @@ diff -urNp linux-2.6.32.15/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.15/a | |||
3364 | #include <asm/asi.h> | 3427 | #include <asm/asi.h> |
3365 | #include <asm/system.h> | 3428 | #include <asm/system.h> |
3366 | #include <asm/spitfire.h> | 3429 | #include <asm/spitfire.h> |
3367 | @@ -203,6 +204,7 @@ __asm__ __volatile__( \ | 3430 | @@ -212,8 +213,15 @@ extern unsigned long copy_from_user_fixu |
3368 | : "=r" (x) : "r" (__m(addr)), "i" (retval)) | ||
3369 | |||
3370 | extern int __get_user_bad(void); | ||
3371 | +extern void check_object_size(const void *ptr, unsigned long n, bool to); | ||
3372 | |||
3373 | extern unsigned long __must_check ___copy_from_user(void *to, | ||
3374 | const void __user *from, | ||
3375 | @@ -212,8 +214,15 @@ extern unsigned long copy_from_user_fixu | ||
3376 | static inline unsigned long __must_check | 3431 | static inline unsigned long __must_check |
3377 | copy_from_user(void *to, const void __user *from, unsigned long size) | 3432 | copy_from_user(void *to, const void __user *from, unsigned long size) |
3378 | { | 3433 | { |
@@ -3389,7 +3444,7 @@ diff -urNp linux-2.6.32.15/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.15/a | |||
3389 | if (unlikely(ret)) | 3444 | if (unlikely(ret)) |
3390 | ret = copy_from_user_fixup(to, from, size); | 3445 | ret = copy_from_user_fixup(to, from, size); |
3391 | return ret; | 3446 | return ret; |
3392 | @@ -228,8 +237,15 @@ extern unsigned long copy_to_user_fixup( | 3447 | @@ -228,8 +236,15 @@ extern unsigned long copy_to_user_fixup( |
3393 | static inline unsigned long __must_check | 3448 | static inline unsigned long __must_check |
3394 | copy_to_user(void __user *to, const void *from, unsigned long size) | 3449 | copy_to_user(void __user *to, const void *from, unsigned long size) |
3395 | { | 3450 | { |
@@ -3406,9 +3461,21 @@ diff -urNp linux-2.6.32.15/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.15/a | |||
3406 | if (unlikely(ret)) | 3461 | if (unlikely(ret)) |
3407 | ret = copy_to_user_fixup(to, from, size); | 3462 | ret = copy_to_user_fixup(to, from, size); |
3408 | return ret; | 3463 | return ret; |
3409 | diff -urNp linux-2.6.32.15/arch/sparc/kernel/iommu.c linux-2.6.32.15/arch/sparc/kernel/iommu.c | 3464 | diff -urNp linux-2.6.32.16/arch/sparc/include/asm/uaccess.h linux-2.6.32.16/arch/sparc/include/asm/uaccess.h |
3410 | --- linux-2.6.32.15/arch/sparc/kernel/iommu.c 2010-03-15 11:52:04.000000000 -0400 | 3465 | --- linux-2.6.32.16/arch/sparc/include/asm/uaccess.h 2010-07-05 14:14:00.000000000 -0400 |
3411 | +++ linux-2.6.32.15/arch/sparc/kernel/iommu.c 2010-05-28 21:27:14.874960218 -0400 | 3466 | +++ linux-2.6.32.16/arch/sparc/include/asm/uaccess.h 2010-07-09 14:50:35.000000000 -0400 |
3467 | @@ -1,5 +1,8 @@ | ||
3468 | #ifndef ___ASM_SPARC_UACCESS_H | ||
3469 | #define ___ASM_SPARC_UACCESS_H | ||
3470 | + | ||
3471 | +extern void check_object_size(const void *ptr, unsigned long n, bool to); | ||
3472 | + | ||
3473 | #if defined(__sparc__) && defined(__arch64__) | ||
3474 | #include <asm/uaccess_64.h> | ||
3475 | #else | ||
3476 | diff -urNp linux-2.6.32.16/arch/sparc/kernel/iommu.c linux-2.6.32.16/arch/sparc/kernel/iommu.c | ||
3477 | --- linux-2.6.32.16/arch/sparc/kernel/iommu.c 2010-07-05 14:14:00.000000000 -0400 | ||
3478 | +++ linux-2.6.32.16/arch/sparc/kernel/iommu.c 2010-07-09 14:50:35.000000000 -0400 | ||
3412 | @@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc | 3479 | @@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc |
3413 | spin_unlock_irqrestore(&iommu->lock, flags); | 3480 | spin_unlock_irqrestore(&iommu->lock, flags); |
3414 | } | 3481 | } |
@@ -3427,9 +3494,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/kernel/iommu.c linux-2.6.32.15/arch/sparc/ | |||
3427 | EXPORT_SYMBOL(dma_ops); | 3494 | EXPORT_SYMBOL(dma_ops); |
3428 | 3495 | ||
3429 | extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); | 3496 | extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); |
3430 | diff -urNp linux-2.6.32.15/arch/sparc/kernel/ioport.c linux-2.6.32.15/arch/sparc/kernel/ioport.c | 3497 | diff -urNp linux-2.6.32.16/arch/sparc/kernel/ioport.c linux-2.6.32.16/arch/sparc/kernel/ioport.c |
3431 | --- linux-2.6.32.15/arch/sparc/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400 | 3498 | --- linux-2.6.32.16/arch/sparc/kernel/ioport.c 2010-07-05 14:14:00.000000000 -0400 |
3432 | +++ linux-2.6.32.15/arch/sparc/kernel/ioport.c 2010-05-28 21:27:14.874960218 -0400 | 3499 | +++ linux-2.6.32.16/arch/sparc/kernel/ioport.c 2010-07-09 14:50:35.000000000 -0400 |
3433 | @@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru | 3500 | @@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru |
3434 | BUG(); | 3501 | BUG(); |
3435 | } | 3502 | } |
@@ -3457,9 +3524,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/kernel/ioport.c linux-2.6.32.15/arch/sparc | |||
3457 | .alloc_coherent = pci32_alloc_coherent, | 3524 | .alloc_coherent = pci32_alloc_coherent, |
3458 | .free_coherent = pci32_free_coherent, | 3525 | .free_coherent = pci32_free_coherent, |
3459 | .map_page = pci32_map_page, | 3526 | .map_page = pci32_map_page, |
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 | 3527 | diff -urNp linux-2.6.32.16/arch/sparc/kernel/kgdb_32.c linux-2.6.32.16/arch/sparc/kernel/kgdb_32.c |
3461 | --- linux-2.6.32.15/arch/sparc/kernel/kgdb_32.c 2010-03-15 11:52:04.000000000 -0400 | 3528 | --- linux-2.6.32.16/arch/sparc/kernel/kgdb_32.c 2010-07-05 14:14:00.000000000 -0400 |
3462 | +++ linux-2.6.32.15/arch/sparc/kernel/kgdb_32.c 2010-05-28 21:27:14.874960218 -0400 | 3529 | +++ linux-2.6.32.16/arch/sparc/kernel/kgdb_32.c 2010-07-09 14:50:35.000000000 -0400 |
3463 | @@ -158,7 +158,7 @@ void kgdb_arch_exit(void) | 3530 | @@ -158,7 +158,7 @@ void kgdb_arch_exit(void) |
3464 | { | 3531 | { |
3465 | } | 3532 | } |
@@ -3469,9 +3536,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/kernel/kgdb_32.c linux-2.6.32.15/arch/spar | |||
3469 | /* Breakpoint instruction: ta 0x7d */ | 3536 | /* Breakpoint instruction: ta 0x7d */ |
3470 | .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, | 3537 | .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, |
3471 | }; | 3538 | }; |
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 | 3539 | diff -urNp linux-2.6.32.16/arch/sparc/kernel/kgdb_64.c linux-2.6.32.16/arch/sparc/kernel/kgdb_64.c |
3473 | --- linux-2.6.32.15/arch/sparc/kernel/kgdb_64.c 2010-03-15 11:52:04.000000000 -0400 | 3540 | --- linux-2.6.32.16/arch/sparc/kernel/kgdb_64.c 2010-07-05 14:14:00.000000000 -0400 |
3474 | +++ linux-2.6.32.15/arch/sparc/kernel/kgdb_64.c 2010-05-28 21:27:14.874960218 -0400 | 3541 | +++ linux-2.6.32.16/arch/sparc/kernel/kgdb_64.c 2010-07-09 14:50:35.000000000 -0400 |
3475 | @@ -180,7 +180,7 @@ void kgdb_arch_exit(void) | 3542 | @@ -180,7 +180,7 @@ void kgdb_arch_exit(void) |
3476 | { | 3543 | { |
3477 | } | 3544 | } |
@@ -3481,9 +3548,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/kernel/kgdb_64.c linux-2.6.32.15/arch/spar | |||
3481 | /* Breakpoint instruction: ta 0x72 */ | 3548 | /* Breakpoint instruction: ta 0x72 */ |
3482 | .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, | 3549 | .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, |
3483 | }; | 3550 | }; |
3484 | diff -urNp linux-2.6.32.15/arch/sparc/kernel/Makefile linux-2.6.32.15/arch/sparc/kernel/Makefile | 3551 | diff -urNp linux-2.6.32.16/arch/sparc/kernel/Makefile linux-2.6.32.16/arch/sparc/kernel/Makefile |
3485 | --- linux-2.6.32.15/arch/sparc/kernel/Makefile 2010-03-15 11:52:04.000000000 -0400 | 3552 | --- linux-2.6.32.16/arch/sparc/kernel/Makefile 2010-07-05 14:14:00.000000000 -0400 |
3486 | +++ linux-2.6.32.15/arch/sparc/kernel/Makefile 2010-05-28 21:27:14.874960218 -0400 | 3553 | +++ linux-2.6.32.16/arch/sparc/kernel/Makefile 2010-07-09 14:50:35.000000000 -0400 |
3487 | @@ -3,7 +3,7 @@ | 3554 | @@ -3,7 +3,7 @@ |
3488 | # | 3555 | # |
3489 | 3556 | ||
@@ -3493,9 +3560,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/kernel/Makefile linux-2.6.32.15/arch/sparc | |||
3493 | 3560 | ||
3494 | extra-y := head_$(BITS).o | 3561 | extra-y := head_$(BITS).o |
3495 | extra-y += init_task.o | 3562 | extra-y += init_task.o |
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 | 3563 | diff -urNp linux-2.6.32.16/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.16/arch/sparc/kernel/pci_sun4v.c |
3497 | --- linux-2.6.32.15/arch/sparc/kernel/pci_sun4v.c 2010-03-15 11:52:04.000000000 -0400 | 3564 | --- linux-2.6.32.16/arch/sparc/kernel/pci_sun4v.c 2010-07-05 14:14:00.000000000 -0400 |
3498 | +++ linux-2.6.32.15/arch/sparc/kernel/pci_sun4v.c 2010-05-28 21:27:14.874960218 -0400 | 3565 | +++ linux-2.6.32.16/arch/sparc/kernel/pci_sun4v.c 2010-07-09 14:50:35.000000000 -0400 |
3499 | @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic | 3566 | @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic |
3500 | spin_unlock_irqrestore(&iommu->lock, flags); | 3567 | spin_unlock_irqrestore(&iommu->lock, flags); |
3501 | } | 3568 | } |
@@ -3505,9 +3572,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.15/arch/sp | |||
3505 | .alloc_coherent = dma_4v_alloc_coherent, | 3572 | .alloc_coherent = dma_4v_alloc_coherent, |
3506 | .free_coherent = dma_4v_free_coherent, | 3573 | .free_coherent = dma_4v_free_coherent, |
3507 | .map_page = dma_4v_map_page, | 3574 | .map_page = dma_4v_map_page, |
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 | 3575 | diff -urNp linux-2.6.32.16/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.16/arch/sparc/kernel/sys_sparc_32.c |
3509 | --- linux-2.6.32.15/arch/sparc/kernel/sys_sparc_32.c 2010-03-15 11:52:04.000000000 -0400 | 3576 | --- linux-2.6.32.16/arch/sparc/kernel/sys_sparc_32.c 2010-07-05 14:14:00.000000000 -0400 |
3510 | +++ linux-2.6.32.15/arch/sparc/kernel/sys_sparc_32.c 2010-05-28 21:27:14.874960218 -0400 | 3577 | +++ linux-2.6.32.16/arch/sparc/kernel/sys_sparc_32.c 2010-07-09 14:50:35.000000000 -0400 |
3511 | @@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str | 3578 | @@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str |
3512 | if (ARCH_SUN4C && len > 0x20000000) | 3579 | if (ARCH_SUN4C && len > 0x20000000) |
3513 | return -ENOMEM; | 3580 | return -ENOMEM; |
@@ -3517,9 +3584,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.15/arch | |||
3517 | 3584 | ||
3518 | if (flags & MAP_SHARED) | 3585 | if (flags & MAP_SHARED) |
3519 | addr = COLOUR_ALIGN(addr); | 3586 | addr = COLOUR_ALIGN(addr); |
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 | 3587 | diff -urNp linux-2.6.32.16/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.16/arch/sparc/kernel/sys_sparc_64.c |
3521 | --- linux-2.6.32.15/arch/sparc/kernel/sys_sparc_64.c 2010-03-15 11:52:04.000000000 -0400 | 3588 | --- linux-2.6.32.16/arch/sparc/kernel/sys_sparc_64.c 2010-07-05 14:14:00.000000000 -0400 |
3522 | +++ linux-2.6.32.15/arch/sparc/kernel/sys_sparc_64.c 2010-05-28 21:27:14.874960218 -0400 | 3589 | +++ linux-2.6.32.16/arch/sparc/kernel/sys_sparc_64.c 2010-07-09 14:50:35.000000000 -0400 |
3523 | @@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str | 3590 | @@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str |
3524 | /* We do not accept a shared mapping if it would violate | 3591 | /* We do not accept a shared mapping if it would violate |
3525 | * cache aliasing constraints. | 3592 | * cache aliasing constraints. |
@@ -3598,9 +3665,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.15/arch | |||
3598 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; | 3665 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; |
3599 | mm->unmap_area = arch_unmap_area_topdown; | 3666 | mm->unmap_area = arch_unmap_area_topdown; |
3600 | } | 3667 | } |
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 | 3668 | diff -urNp linux-2.6.32.16/arch/sparc/kernel/traps_64.c linux-2.6.32.16/arch/sparc/kernel/traps_64.c |
3602 | --- linux-2.6.32.15/arch/sparc/kernel/traps_64.c 2010-03-15 11:52:04.000000000 -0400 | 3669 | --- linux-2.6.32.16/arch/sparc/kernel/traps_64.c 2010-07-05 14:14:00.000000000 -0400 |
3603 | +++ linux-2.6.32.15/arch/sparc/kernel/traps_64.c 2010-05-28 21:27:14.874960218 -0400 | 3670 | +++ linux-2.6.32.16/arch/sparc/kernel/traps_64.c 2010-07-09 14:50:35.000000000 -0400 |
3604 | @@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long | 3671 | @@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long |
3605 | 3672 | ||
3606 | lvl -= 0x100; | 3673 | lvl -= 0x100; |
@@ -3632,9 +3699,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/kernel/traps_64.c linux-2.6.32.15/arch/spa | |||
3632 | dump_tl1_traplog((struct tl1_traplog *)(regs + 1)); | 3699 | dump_tl1_traplog((struct tl1_traplog *)(regs + 1)); |
3633 | 3700 | ||
3634 | sprintf (buffer, "Bad trap %lx at tl>0", lvl); | 3701 | sprintf (buffer, "Bad trap %lx at tl>0", lvl); |
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 | 3702 | diff -urNp linux-2.6.32.16/arch/sparc/lib/atomic_64.S linux-2.6.32.16/arch/sparc/lib/atomic_64.S |
3636 | --- linux-2.6.32.15/arch/sparc/lib/atomic_64.S 2010-03-15 11:52:04.000000000 -0400 | 3703 | --- linux-2.6.32.16/arch/sparc/lib/atomic_64.S 2010-07-05 14:14:00.000000000 -0400 |
3637 | +++ linux-2.6.32.15/arch/sparc/lib/atomic_64.S 2010-05-28 21:27:14.874960218 -0400 | 3704 | +++ linux-2.6.32.16/arch/sparc/lib/atomic_64.S 2010-07-09 14:50:35.000000000 -0400 |
3638 | @@ -18,7 +18,12 @@ | 3705 | @@ -18,7 +18,12 @@ |
3639 | atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ | 3706 | atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ |
3640 | BACKOFF_SETUP(%o2) | 3707 | BACKOFF_SETUP(%o2) |
@@ -3779,7 +3846,27 @@ diff -urNp linux-2.6.32.15/arch/sparc/lib/atomic_64.S linux-2.6.32.15/arch/sparc | |||
3779 | casx [%o1], %g1, %g7 | 3846 | casx [%o1], %g1, %g7 |
3780 | cmp %g1, %g7 | 3847 | cmp %g1, %g7 |
3781 | bne,pn %xcc, 2f | 3848 | bne,pn %xcc, 2f |
3782 | @@ -110,7 +185,12 @@ atomic64_sub: /* %o0 = decrement, %o1 = | 3849 | @@ -105,12 +180,32 @@ atomic64_sub: /* %o0 = decrement, %o1 = |
3850 | 2: BACKOFF_SPIN(%o2, %o3, 1b) | ||
3851 | .size atomic64_sub, .-atomic64_sub | ||
3852 | |||
3853 | + .globl atomic64_sub_unchecked | ||
3854 | + .type atomic64_sub_unchecked,#function | ||
3855 | +atomic64_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */ | ||
3856 | + BACKOFF_SETUP(%o2) | ||
3857 | +1: ldx [%o1], %g1 | ||
3858 | + subcc %g1, %o0, %g7 | ||
3859 | + casx [%o1], %g1, %g7 | ||
3860 | + cmp %g1, %g7 | ||
3861 | + bne,pn %xcc, 2f | ||
3862 | + nop | ||
3863 | + retl | ||
3864 | + nop | ||
3865 | +2: BACKOFF_SPIN(%o2, %o3, 1b) | ||
3866 | + .size atomic64_sub_unchecked, .-atomic64_sub_unchecked | ||
3867 | + | ||
3868 | .globl atomic64_add_ret | ||
3869 | .type atomic64_add_ret,#function | ||
3783 | atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */ | 3870 | atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */ |
3784 | BACKOFF_SETUP(%o2) | 3871 | BACKOFF_SETUP(%o2) |
3785 | 1: ldx [%o1], %g1 | 3872 | 1: ldx [%o1], %g1 |
@@ -3793,7 +3880,7 @@ diff -urNp linux-2.6.32.15/arch/sparc/lib/atomic_64.S linux-2.6.32.15/arch/sparc | |||
3793 | casx [%o1], %g1, %g7 | 3880 | casx [%o1], %g1, %g7 |
3794 | cmp %g1, %g7 | 3881 | cmp %g1, %g7 |
3795 | bne,pn %xcc, 2f | 3882 | bne,pn %xcc, 2f |
3796 | @@ -121,12 +201,33 @@ atomic64_add_ret: /* %o0 = increment, %o | 3883 | @@ -121,12 +216,33 @@ atomic64_add_ret: /* %o0 = increment, %o |
3797 | 2: BACKOFF_SPIN(%o2, %o3, 1b) | 3884 | 2: BACKOFF_SPIN(%o2, %o3, 1b) |
3798 | .size atomic64_add_ret, .-atomic64_add_ret | 3885 | .size atomic64_add_ret, .-atomic64_add_ret |
3799 | 3886 | ||
@@ -3828,10 +3915,10 @@ diff -urNp linux-2.6.32.15/arch/sparc/lib/atomic_64.S linux-2.6.32.15/arch/sparc | |||
3828 | casx [%o1], %g1, %g7 | 3915 | casx [%o1], %g1, %g7 |
3829 | cmp %g1, %g7 | 3916 | cmp %g1, %g7 |
3830 | bne,pn %xcc, 2f | 3917 | bne,pn %xcc, 2f |
3831 | diff -urNp linux-2.6.32.15/arch/sparc/lib/ksyms.c linux-2.6.32.15/arch/sparc/lib/ksyms.c | 3918 | diff -urNp linux-2.6.32.16/arch/sparc/lib/ksyms.c linux-2.6.32.16/arch/sparc/lib/ksyms.c |
3832 | --- linux-2.6.32.15/arch/sparc/lib/ksyms.c 2010-03-15 11:52:04.000000000 -0400 | 3919 | --- linux-2.6.32.16/arch/sparc/lib/ksyms.c 2010-07-05 14:14:00.000000000 -0400 |
3833 | +++ linux-2.6.32.15/arch/sparc/lib/ksyms.c 2010-05-28 21:27:14.874960218 -0400 | 3920 | +++ linux-2.6.32.16/arch/sparc/lib/ksyms.c 2010-07-09 14:50:35.000000000 -0400 |
3834 | @@ -144,8 +144,10 @@ EXPORT_SYMBOL(__downgrade_write); | 3921 | @@ -144,12 +144,15 @@ EXPORT_SYMBOL(__downgrade_write); |
3835 | 3922 | ||
3836 | /* Atomic counter implementation. */ | 3923 | /* Atomic counter implementation. */ |
3837 | EXPORT_SYMBOL(atomic_add); | 3924 | EXPORT_SYMBOL(atomic_add); |
@@ -3842,9 +3929,14 @@ diff -urNp linux-2.6.32.15/arch/sparc/lib/ksyms.c linux-2.6.32.15/arch/sparc/lib | |||
3842 | EXPORT_SYMBOL(atomic_sub_ret); | 3929 | EXPORT_SYMBOL(atomic_sub_ret); |
3843 | EXPORT_SYMBOL(atomic64_add); | 3930 | EXPORT_SYMBOL(atomic64_add); |
3844 | EXPORT_SYMBOL(atomic64_add_ret); | 3931 | EXPORT_SYMBOL(atomic64_add_ret); |
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 | 3932 | EXPORT_SYMBOL(atomic64_sub); |
3846 | --- linux-2.6.32.15/arch/sparc/lib/rwsem_64.S 2010-03-15 11:52:04.000000000 -0400 | 3933 | +EXPORT_SYMBOL(atomic64_sub_unchecked); |
3847 | +++ linux-2.6.32.15/arch/sparc/lib/rwsem_64.S 2010-05-28 21:27:14.874960218 -0400 | 3934 | EXPORT_SYMBOL(atomic64_sub_ret); |
3935 | |||
3936 | /* Atomic bit operations. */ | ||
3937 | diff -urNp linux-2.6.32.16/arch/sparc/lib/rwsem_64.S linux-2.6.32.16/arch/sparc/lib/rwsem_64.S | ||
3938 | --- linux-2.6.32.16/arch/sparc/lib/rwsem_64.S 2010-07-05 14:14:00.000000000 -0400 | ||
3939 | +++ linux-2.6.32.16/arch/sparc/lib/rwsem_64.S 2010-07-09 14:50:35.000000000 -0400 | ||
3848 | @@ -11,7 +11,12 @@ | 3940 | @@ -11,7 +11,12 @@ |
3849 | .globl __down_read | 3941 | .globl __down_read |
3850 | __down_read: | 3942 | __down_read: |
@@ -3943,9 +4035,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/lib/rwsem_64.S linux-2.6.32.15/arch/sparc/ | |||
3943 | cas [%o0], %g3, %g7 | 4035 | cas [%o0], %g3, %g7 |
3944 | cmp %g3, %g7 | 4036 | cmp %g3, %g7 |
3945 | bne,pn %icc, 1b | 4037 | bne,pn %icc, 1b |
3946 | diff -urNp linux-2.6.32.15/arch/sparc/Makefile linux-2.6.32.15/arch/sparc/Makefile | 4038 | diff -urNp linux-2.6.32.16/arch/sparc/Makefile linux-2.6.32.16/arch/sparc/Makefile |
3947 | --- linux-2.6.32.15/arch/sparc/Makefile 2010-03-15 11:52:04.000000000 -0400 | 4039 | --- linux-2.6.32.16/arch/sparc/Makefile 2010-07-05 14:14:00.000000000 -0400 |
3948 | +++ linux-2.6.32.15/arch/sparc/Makefile 2010-05-28 21:27:14.874960218 -0400 | 4040 | +++ linux-2.6.32.16/arch/sparc/Makefile 2010-07-09 14:50:35.000000000 -0400 |
3949 | @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc | 4041 | @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc |
3950 | # Export what is needed by arch/sparc/boot/Makefile | 4042 | # Export what is needed by arch/sparc/boot/Makefile |
3951 | export VMLINUX_INIT VMLINUX_MAIN | 4043 | export VMLINUX_INIT VMLINUX_MAIN |
@@ -3955,9 +4047,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/Makefile linux-2.6.32.15/arch/sparc/Makefi | |||
3955 | VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) | 4047 | VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) |
3956 | VMLINUX_MAIN += $(drivers-y) $(net-y) | 4048 | VMLINUX_MAIN += $(drivers-y) $(net-y) |
3957 | 4049 | ||
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 | 4050 | diff -urNp linux-2.6.32.16/arch/sparc/mm/fault_32.c linux-2.6.32.16/arch/sparc/mm/fault_32.c |
3959 | --- linux-2.6.32.15/arch/sparc/mm/fault_32.c 2010-03-15 11:52:04.000000000 -0400 | 4051 | --- linux-2.6.32.16/arch/sparc/mm/fault_32.c 2010-07-05 14:14:00.000000000 -0400 |
3960 | +++ linux-2.6.32.15/arch/sparc/mm/fault_32.c 2010-05-28 21:27:14.874960218 -0400 | 4052 | +++ linux-2.6.32.16/arch/sparc/mm/fault_32.c 2010-07-09 14:50:35.000000000 -0400 |
3961 | @@ -21,6 +21,9 @@ | 4053 | @@ -21,6 +21,9 @@ |
3962 | #include <linux/interrupt.h> | 4054 | #include <linux/interrupt.h> |
3963 | #include <linux/module.h> | 4055 | #include <linux/module.h> |
@@ -4261,9 +4353,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/mm/fault_32.c linux-2.6.32.15/arch/sparc/m | |||
4261 | /* Allow reads even for write-only mappings */ | 4353 | /* Allow reads even for write-only mappings */ |
4262 | if(!(vma->vm_flags & (VM_READ | VM_EXEC))) | 4354 | if(!(vma->vm_flags & (VM_READ | VM_EXEC))) |
4263 | goto bad_area; | 4355 | goto bad_area; |
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 | 4356 | diff -urNp linux-2.6.32.16/arch/sparc/mm/fault_64.c linux-2.6.32.16/arch/sparc/mm/fault_64.c |
4265 | --- linux-2.6.32.15/arch/sparc/mm/fault_64.c 2010-03-15 11:52:04.000000000 -0400 | 4357 | --- linux-2.6.32.16/arch/sparc/mm/fault_64.c 2010-07-05 14:14:00.000000000 -0400 |
4266 | +++ linux-2.6.32.15/arch/sparc/mm/fault_64.c 2010-05-28 21:27:14.878908357 -0400 | 4358 | +++ linux-2.6.32.16/arch/sparc/mm/fault_64.c 2010-07-09 14:50:35.000000000 -0400 |
4267 | @@ -20,6 +20,9 @@ | 4359 | @@ -20,6 +20,9 @@ |
4268 | #include <linux/kprobes.h> | 4360 | #include <linux/kprobes.h> |
4269 | #include <linux/kdebug.h> | 4361 | #include <linux/kdebug.h> |
@@ -4761,9 +4853,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/mm/fault_64.c linux-2.6.32.15/arch/sparc/m | |||
4761 | /* Pure DTLB misses do not tell us whether the fault causing | 4853 | /* 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 | 4854 | * 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 | 4855 | * was no match. So in such a case we (carefully) read the |
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 | 4856 | diff -urNp linux-2.6.32.16/arch/sparc/mm/init_32.c linux-2.6.32.16/arch/sparc/mm/init_32.c |
4765 | --- linux-2.6.32.15/arch/sparc/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400 | 4857 | --- linux-2.6.32.16/arch/sparc/mm/init_32.c 2010-07-05 14:14:00.000000000 -0400 |
4766 | +++ linux-2.6.32.15/arch/sparc/mm/init_32.c 2010-05-28 21:27:14.878908357 -0400 | 4858 | +++ linux-2.6.32.16/arch/sparc/mm/init_32.c 2010-07-09 14:50:35.000000000 -0400 |
4767 | @@ -317,6 +317,9 @@ extern void device_scan(void); | 4859 | @@ -317,6 +317,9 @@ extern void device_scan(void); |
4768 | pgprot_t PAGE_SHARED __read_mostly; | 4860 | pgprot_t PAGE_SHARED __read_mostly; |
4769 | EXPORT_SYMBOL(PAGE_SHARED); | 4861 | EXPORT_SYMBOL(PAGE_SHARED); |
@@ -4798,9 +4890,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/mm/init_32.c linux-2.6.32.15/arch/sparc/mm | |||
4798 | protection_map[12] = PAGE_READONLY; | 4890 | protection_map[12] = PAGE_READONLY; |
4799 | protection_map[13] = PAGE_READONLY; | 4891 | protection_map[13] = PAGE_READONLY; |
4800 | protection_map[14] = PAGE_SHARED; | 4892 | protection_map[14] = PAGE_SHARED; |
4801 | diff -urNp linux-2.6.32.15/arch/sparc/mm/Makefile linux-2.6.32.15/arch/sparc/mm/Makefile | 4893 | diff -urNp linux-2.6.32.16/arch/sparc/mm/Makefile linux-2.6.32.16/arch/sparc/mm/Makefile |
4802 | --- linux-2.6.32.15/arch/sparc/mm/Makefile 2010-03-15 11:52:04.000000000 -0400 | 4894 | --- linux-2.6.32.16/arch/sparc/mm/Makefile 2010-07-05 14:14:00.000000000 -0400 |
4803 | +++ linux-2.6.32.15/arch/sparc/mm/Makefile 2010-05-28 21:27:14.878908357 -0400 | 4895 | +++ linux-2.6.32.16/arch/sparc/mm/Makefile 2010-07-09 14:50:35.000000000 -0400 |
4804 | @@ -2,7 +2,7 @@ | 4896 | @@ -2,7 +2,7 @@ |
4805 | # | 4897 | # |
4806 | 4898 | ||
@@ -4810,9 +4902,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/mm/Makefile linux-2.6.32.15/arch/sparc/mm/ | |||
4810 | 4902 | ||
4811 | obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o | 4903 | obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o |
4812 | obj-y += fault_$(BITS).o | 4904 | obj-y += fault_$(BITS).o |
4813 | diff -urNp linux-2.6.32.15/arch/sparc/mm/srmmu.c linux-2.6.32.15/arch/sparc/mm/srmmu.c | 4905 | diff -urNp linux-2.6.32.16/arch/sparc/mm/srmmu.c linux-2.6.32.16/arch/sparc/mm/srmmu.c |
4814 | --- linux-2.6.32.15/arch/sparc/mm/srmmu.c 2010-03-15 11:52:04.000000000 -0400 | 4906 | --- linux-2.6.32.16/arch/sparc/mm/srmmu.c 2010-07-05 14:14:00.000000000 -0400 |
4815 | +++ linux-2.6.32.15/arch/sparc/mm/srmmu.c 2010-05-28 21:27:14.878908357 -0400 | 4907 | +++ linux-2.6.32.16/arch/sparc/mm/srmmu.c 2010-07-09 14:50:35.000000000 -0400 |
4816 | @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void) | 4908 | @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void) |
4817 | PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); | 4909 | PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); |
4818 | BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); | 4910 | BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); |
@@ -4827,9 +4919,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/mm/srmmu.c linux-2.6.32.15/arch/sparc/mm/s | |||
4827 | BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); | 4919 | BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); |
4828 | page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); | 4920 | page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); |
4829 | 4921 | ||
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 | 4922 | diff -urNp linux-2.6.32.16/arch/um/include/asm/kmap_types.h linux-2.6.32.16/arch/um/include/asm/kmap_types.h |
4831 | --- linux-2.6.32.15/arch/um/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 | 4923 | --- linux-2.6.32.16/arch/um/include/asm/kmap_types.h 2010-07-05 14:14:00.000000000 -0400 |
4832 | +++ linux-2.6.32.15/arch/um/include/asm/kmap_types.h 2010-05-28 21:27:14.883145356 -0400 | 4924 | +++ linux-2.6.32.16/arch/um/include/asm/kmap_types.h 2010-07-09 14:50:35.000000000 -0400 |
4833 | @@ -23,6 +23,7 @@ enum km_type { | 4925 | @@ -23,6 +23,7 @@ enum km_type { |
4834 | KM_IRQ1, | 4926 | KM_IRQ1, |
4835 | KM_SOFTIRQ0, | 4927 | KM_SOFTIRQ0, |
@@ -4838,9 +4930,9 @@ diff -urNp linux-2.6.32.15/arch/um/include/asm/kmap_types.h linux-2.6.32.15/arch | |||
4838 | KM_TYPE_NR | 4930 | KM_TYPE_NR |
4839 | }; | 4931 | }; |
4840 | 4932 | ||
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 | 4933 | diff -urNp linux-2.6.32.16/arch/um/include/asm/page.h linux-2.6.32.16/arch/um/include/asm/page.h |
4842 | --- linux-2.6.32.15/arch/um/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 | 4934 | --- linux-2.6.32.16/arch/um/include/asm/page.h 2010-07-05 14:14:00.000000000 -0400 |
4843 | +++ linux-2.6.32.15/arch/um/include/asm/page.h 2010-05-28 21:27:14.883145356 -0400 | 4935 | +++ linux-2.6.32.16/arch/um/include/asm/page.h 2010-07-09 14:50:35.000000000 -0400 |
4844 | @@ -14,6 +14,9 @@ | 4936 | @@ -14,6 +14,9 @@ |
4845 | #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) | 4937 | #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) |
4846 | #define PAGE_MASK (~(PAGE_SIZE-1)) | 4938 | #define PAGE_MASK (~(PAGE_SIZE-1)) |
@@ -4851,9 +4943,9 @@ diff -urNp linux-2.6.32.15/arch/um/include/asm/page.h linux-2.6.32.15/arch/um/in | |||
4851 | #ifndef __ASSEMBLY__ | 4943 | #ifndef __ASSEMBLY__ |
4852 | 4944 | ||
4853 | struct page; | 4945 | struct page; |
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 | 4946 | diff -urNp linux-2.6.32.16/arch/um/sys-i386/syscalls.c linux-2.6.32.16/arch/um/sys-i386/syscalls.c |
4855 | --- linux-2.6.32.15/arch/um/sys-i386/syscalls.c 2010-03-15 11:52:04.000000000 -0400 | 4947 | --- linux-2.6.32.16/arch/um/sys-i386/syscalls.c 2010-07-05 14:14:00.000000000 -0400 |
4856 | +++ linux-2.6.32.15/arch/um/sys-i386/syscalls.c 2010-05-28 21:27:14.883145356 -0400 | 4948 | +++ linux-2.6.32.16/arch/um/sys-i386/syscalls.c 2010-07-09 14:50:35.000000000 -0400 |
4857 | @@ -11,6 +11,21 @@ | 4949 | @@ -11,6 +11,21 @@ |
4858 | #include "asm/uaccess.h" | 4950 | #include "asm/uaccess.h" |
4859 | #include "asm/unistd.h" | 4951 | #include "asm/unistd.h" |
@@ -4876,9 +4968,9 @@ diff -urNp linux-2.6.32.15/arch/um/sys-i386/syscalls.c linux-2.6.32.15/arch/um/s | |||
4876 | /* | 4968 | /* |
4877 | * Perform the select(nd, in, out, ex, tv) and mmap() system | 4969 | * 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 | 4970 | * calls. Linux/i386 didn't use to be able to handle more than |
4879 | diff -urNp linux-2.6.32.15/arch/x86/boot/bitops.h linux-2.6.32.15/arch/x86/boot/bitops.h | 4971 | diff -urNp linux-2.6.32.16/arch/x86/boot/bitops.h linux-2.6.32.16/arch/x86/boot/bitops.h |
4880 | --- linux-2.6.32.15/arch/x86/boot/bitops.h 2010-03-15 11:52:04.000000000 -0400 | 4972 | --- linux-2.6.32.16/arch/x86/boot/bitops.h 2010-07-05 14:14:00.000000000 -0400 |
4881 | +++ linux-2.6.32.15/arch/x86/boot/bitops.h 2010-05-28 21:27:14.891136655 -0400 | 4973 | +++ linux-2.6.32.16/arch/x86/boot/bitops.h 2010-07-09 14:50:35.000000000 -0400 |
4882 | @@ -26,7 +26,7 @@ static inline int variable_test_bit(int | 4974 | @@ -26,7 +26,7 @@ static inline int variable_test_bit(int |
4883 | u8 v; | 4975 | u8 v; |
4884 | const u32 *p = (const u32 *)addr; | 4976 | const u32 *p = (const u32 *)addr; |
@@ -4897,9 +4989,9 @@ diff -urNp linux-2.6.32.15/arch/x86/boot/bitops.h linux-2.6.32.15/arch/x86/boot/ | |||
4897 | } | 4989 | } |
4898 | 4990 | ||
4899 | #endif /* BOOT_BITOPS_H */ | 4991 | #endif /* BOOT_BITOPS_H */ |
4900 | diff -urNp linux-2.6.32.15/arch/x86/boot/boot.h linux-2.6.32.15/arch/x86/boot/boot.h | 4992 | diff -urNp linux-2.6.32.16/arch/x86/boot/boot.h linux-2.6.32.16/arch/x86/boot/boot.h |
4901 | --- linux-2.6.32.15/arch/x86/boot/boot.h 2010-03-15 11:52:04.000000000 -0400 | 4993 | --- linux-2.6.32.16/arch/x86/boot/boot.h 2010-07-05 14:14:00.000000000 -0400 |
4902 | +++ linux-2.6.32.15/arch/x86/boot/boot.h 2010-05-28 21:27:14.891136655 -0400 | 4994 | +++ linux-2.6.32.16/arch/x86/boot/boot.h 2010-07-09 14:50:35.000000000 -0400 |
4903 | @@ -82,7 +82,7 @@ static inline void io_delay(void) | 4995 | @@ -82,7 +82,7 @@ static inline void io_delay(void) |
4904 | static inline u16 ds(void) | 4996 | static inline u16 ds(void) |
4905 | { | 4997 | { |
@@ -4918,9 +5010,9 @@ diff -urNp linux-2.6.32.15/arch/x86/boot/boot.h linux-2.6.32.15/arch/x86/boot/bo | |||
4918 | : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); | 5010 | : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); |
4919 | return diff; | 5011 | return diff; |
4920 | } | 5012 | } |
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 | 5013 | diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/head_32.S linux-2.6.32.16/arch/x86/boot/compressed/head_32.S |
4922 | --- linux-2.6.32.15/arch/x86/boot/compressed/head_32.S 2010-03-15 11:52:04.000000000 -0400 | 5014 | --- linux-2.6.32.16/arch/x86/boot/compressed/head_32.S 2010-07-05 14:14:00.000000000 -0400 |
4923 | +++ linux-2.6.32.15/arch/x86/boot/compressed/head_32.S 2010-05-28 21:27:14.891136655 -0400 | 5015 | +++ linux-2.6.32.16/arch/x86/boot/compressed/head_32.S 2010-07-09 14:50:35.000000000 -0400 |
4924 | @@ -76,7 +76,7 @@ ENTRY(startup_32) | 5016 | @@ -76,7 +76,7 @@ ENTRY(startup_32) |
4925 | notl %eax | 5017 | notl %eax |
4926 | andl %eax, %ebx | 5018 | andl %eax, %ebx |
@@ -4949,9 +5041,9 @@ diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/head_32.S linux-2.6.32.15/ar | |||
4949 | addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) | 5041 | addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) |
4950 | jmp 1b | 5042 | jmp 1b |
4951 | 2: | 5043 | 2: |
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 | 5044 | diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/head_64.S linux-2.6.32.16/arch/x86/boot/compressed/head_64.S |
4953 | --- linux-2.6.32.15/arch/x86/boot/compressed/head_64.S 2010-03-15 11:52:04.000000000 -0400 | 5045 | --- linux-2.6.32.16/arch/x86/boot/compressed/head_64.S 2010-07-05 14:14:00.000000000 -0400 |
4954 | +++ linux-2.6.32.15/arch/x86/boot/compressed/head_64.S 2010-05-28 21:27:14.891136655 -0400 | 5046 | +++ linux-2.6.32.16/arch/x86/boot/compressed/head_64.S 2010-07-09 14:50:35.000000000 -0400 |
4955 | @@ -91,7 +91,7 @@ ENTRY(startup_32) | 5047 | @@ -91,7 +91,7 @@ ENTRY(startup_32) |
4956 | notl %eax | 5048 | notl %eax |
4957 | andl %eax, %ebx | 5049 | andl %eax, %ebx |
@@ -4970,9 +5062,9 @@ diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/head_64.S linux-2.6.32.15/ar | |||
4970 | #endif | 5062 | #endif |
4971 | 5063 | ||
4972 | /* Target address to relocate to for decompression */ | 5064 | /* Target address to relocate to for decompression */ |
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 | 5065 | diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/misc.c linux-2.6.32.16/arch/x86/boot/compressed/misc.c |
4974 | --- linux-2.6.32.15/arch/x86/boot/compressed/misc.c 2010-03-15 11:52:04.000000000 -0400 | 5066 | --- linux-2.6.32.16/arch/x86/boot/compressed/misc.c 2010-07-05 14:14:00.000000000 -0400 |
4975 | +++ linux-2.6.32.15/arch/x86/boot/compressed/misc.c 2010-05-28 21:27:14.895019280 -0400 | 5067 | +++ linux-2.6.32.16/arch/x86/boot/compressed/misc.c 2010-07-09 14:50:35.000000000 -0400 |
4976 | @@ -288,7 +288,7 @@ static void parse_elf(void *output) | 5068 | @@ -288,7 +288,7 @@ static void parse_elf(void *output) |
4977 | case PT_LOAD: | 5069 | case PT_LOAD: |
4978 | #ifdef CONFIG_RELOCATABLE | 5070 | #ifdef CONFIG_RELOCATABLE |
@@ -4991,9 +5083,9 @@ diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/misc.c linux-2.6.32.15/arch/ | |||
4991 | error("Wrong destination address"); | 5083 | error("Wrong destination address"); |
4992 | #endif | 5084 | #endif |
4993 | 5085 | ||
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 | 5086 | diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.16/arch/x86/boot/compressed/mkpiggy.c |
4995 | --- linux-2.6.32.15/arch/x86/boot/compressed/mkpiggy.c 2010-03-15 11:52:04.000000000 -0400 | 5087 | --- linux-2.6.32.16/arch/x86/boot/compressed/mkpiggy.c 2010-07-05 14:14:00.000000000 -0400 |
4996 | +++ linux-2.6.32.15/arch/x86/boot/compressed/mkpiggy.c 2010-05-28 21:27:14.895019280 -0400 | 5088 | +++ linux-2.6.32.16/arch/x86/boot/compressed/mkpiggy.c 2010-07-09 14:50:35.000000000 -0400 |
4997 | @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) | 5089 | @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) |
4998 | 5090 | ||
4999 | offs = (olen > ilen) ? olen - ilen : 0; | 5091 | offs = (olen > ilen) ? olen - ilen : 0; |
@@ -5003,9 +5095,9 @@ diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.15/ar | |||
5003 | offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ | 5095 | offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ |
5004 | 5096 | ||
5005 | printf(".section \".rodata.compressed\",\"a\",@progbits\n"); | 5097 | printf(".section \".rodata.compressed\",\"a\",@progbits\n"); |
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 | 5098 | diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/relocs.c linux-2.6.32.16/arch/x86/boot/compressed/relocs.c |
5007 | --- linux-2.6.32.15/arch/x86/boot/compressed/relocs.c 2010-03-15 11:52:04.000000000 -0400 | 5099 | --- linux-2.6.32.16/arch/x86/boot/compressed/relocs.c 2010-07-05 14:14:00.000000000 -0400 |
5008 | +++ linux-2.6.32.15/arch/x86/boot/compressed/relocs.c 2010-05-28 21:27:14.895019280 -0400 | 5100 | +++ linux-2.6.32.16/arch/x86/boot/compressed/relocs.c 2010-07-09 14:50:44.000000000 -0400 |
5009 | @@ -10,8 +10,11 @@ | 5101 | @@ -10,8 +10,11 @@ |
5010 | #define USE_BSD | 5102 | #define USE_BSD |
5011 | #include <endian.h> | 5103 | #include <endian.h> |
@@ -5177,7 +5269,7 @@ diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/relocs.c linux-2.6.32.15/arc | |||
5177 | + | 5269 | + |
5178 | +#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_X86_32) | 5270 | +#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_X86_32) |
5179 | + /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */ | 5271 | + /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */ |
5180 | + if (!strcmp(sec_name(sym->st_shndx), ".data") && !strcmp(sym_name(sym_strtab, sym), "_etext")) | 5272 | + if (!strcmp(sec_name(sym->st_shndx), ".module.text") && !strcmp(sym_name(sym_strtab, sym), "_etext")) |
5181 | + continue; | 5273 | + continue; |
5182 | + if (!strcmp(sec_name(sym->st_shndx), ".init.text")) | 5274 | + if (!strcmp(sec_name(sym->st_shndx), ".init.text")) |
5183 | + continue; | 5275 | + continue; |
@@ -5206,9 +5298,9 @@ diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/relocs.c linux-2.6.32.15/arc | |||
5206 | read_shdrs(fp); | 5298 | read_shdrs(fp); |
5207 | read_strtabs(fp); | 5299 | read_strtabs(fp); |
5208 | read_symtabs(fp); | 5300 | read_symtabs(fp); |
5209 | diff -urNp linux-2.6.32.15/arch/x86/boot/cpucheck.c linux-2.6.32.15/arch/x86/boot/cpucheck.c | 5301 | diff -urNp linux-2.6.32.16/arch/x86/boot/cpucheck.c linux-2.6.32.16/arch/x86/boot/cpucheck.c |
5210 | --- linux-2.6.32.15/arch/x86/boot/cpucheck.c 2010-03-15 11:52:04.000000000 -0400 | 5302 | --- linux-2.6.32.16/arch/x86/boot/cpucheck.c 2010-07-05 14:14:00.000000000 -0400 |
5211 | +++ linux-2.6.32.15/arch/x86/boot/cpucheck.c 2010-05-28 21:27:14.895019280 -0400 | 5303 | +++ linux-2.6.32.16/arch/x86/boot/cpucheck.c 2010-07-09 14:50:35.000000000 -0400 |
5212 | @@ -74,7 +74,7 @@ static int has_fpu(void) | 5304 | @@ -74,7 +74,7 @@ static int has_fpu(void) |
5213 | u16 fcw = -1, fsw = -1; | 5305 | u16 fcw = -1, fsw = -1; |
5214 | u32 cr0; | 5306 | u32 cr0; |
@@ -5304,9 +5396,9 @@ diff -urNp linux-2.6.32.15/arch/x86/boot/cpucheck.c linux-2.6.32.15/arch/x86/boo | |||
5304 | 5396 | ||
5305 | err = check_flags(); | 5397 | err = check_flags(); |
5306 | } | 5398 | } |
5307 | diff -urNp linux-2.6.32.15/arch/x86/boot/header.S linux-2.6.32.15/arch/x86/boot/header.S | 5399 | diff -urNp linux-2.6.32.16/arch/x86/boot/header.S linux-2.6.32.16/arch/x86/boot/header.S |
5308 | --- linux-2.6.32.15/arch/x86/boot/header.S 2010-03-15 11:52:04.000000000 -0400 | 5400 | --- linux-2.6.32.16/arch/x86/boot/header.S 2010-07-05 14:14:00.000000000 -0400 |
5309 | +++ linux-2.6.32.15/arch/x86/boot/header.S 2010-05-28 21:27:14.895019280 -0400 | 5401 | +++ linux-2.6.32.16/arch/x86/boot/header.S 2010-07-09 14:50:35.000000000 -0400 |
5310 | @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical | 5402 | @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical |
5311 | # single linked list of | 5403 | # single linked list of |
5312 | # struct setup_data | 5404 | # struct setup_data |
@@ -5316,9 +5408,9 @@ diff -urNp linux-2.6.32.15/arch/x86/boot/header.S linux-2.6.32.15/arch/x86/boot/ | |||
5316 | 5408 | ||
5317 | #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) | 5409 | #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) |
5318 | #define VO_INIT_SIZE (VO__end - VO__text) | 5410 | #define VO_INIT_SIZE (VO__end - VO__text) |
5319 | diff -urNp linux-2.6.32.15/arch/x86/boot/memory.c linux-2.6.32.15/arch/x86/boot/memory.c | 5411 | diff -urNp linux-2.6.32.16/arch/x86/boot/memory.c linux-2.6.32.16/arch/x86/boot/memory.c |
5320 | --- linux-2.6.32.15/arch/x86/boot/memory.c 2010-03-15 11:52:04.000000000 -0400 | 5412 | --- linux-2.6.32.16/arch/x86/boot/memory.c 2010-07-05 14:14:00.000000000 -0400 |
5321 | +++ linux-2.6.32.15/arch/x86/boot/memory.c 2010-05-28 21:27:14.895019280 -0400 | 5413 | +++ linux-2.6.32.16/arch/x86/boot/memory.c 2010-07-09 14:50:35.000000000 -0400 |
5322 | @@ -19,7 +19,7 @@ | 5414 | @@ -19,7 +19,7 @@ |
5323 | 5415 | ||
5324 | static int detect_memory_e820(void) | 5416 | static int detect_memory_e820(void) |
@@ -5328,9 +5420,9 @@ diff -urNp linux-2.6.32.15/arch/x86/boot/memory.c linux-2.6.32.15/arch/x86/boot/ | |||
5328 | struct biosregs ireg, oreg; | 5420 | struct biosregs ireg, oreg; |
5329 | struct e820entry *desc = boot_params.e820_map; | 5421 | struct e820entry *desc = boot_params.e820_map; |
5330 | static struct e820entry buf; /* static so it is zeroed */ | 5422 | static struct e820entry buf; /* static so it is zeroed */ |
5331 | diff -urNp linux-2.6.32.15/arch/x86/boot/video.c linux-2.6.32.15/arch/x86/boot/video.c | 5423 | diff -urNp linux-2.6.32.16/arch/x86/boot/video.c linux-2.6.32.16/arch/x86/boot/video.c |
5332 | --- linux-2.6.32.15/arch/x86/boot/video.c 2010-03-15 11:52:04.000000000 -0400 | 5424 | --- linux-2.6.32.16/arch/x86/boot/video.c 2010-07-05 14:14:00.000000000 -0400 |
5333 | +++ linux-2.6.32.15/arch/x86/boot/video.c 2010-05-28 21:27:14.895019280 -0400 | 5425 | +++ linux-2.6.32.16/arch/x86/boot/video.c 2010-07-09 14:50:35.000000000 -0400 |
5334 | @@ -90,7 +90,7 @@ static void store_mode_params(void) | 5426 | @@ -90,7 +90,7 @@ static void store_mode_params(void) |
5335 | static unsigned int get_entry(void) | 5427 | static unsigned int get_entry(void) |
5336 | { | 5428 | { |
@@ -5340,9 +5432,9 @@ diff -urNp linux-2.6.32.15/arch/x86/boot/video.c linux-2.6.32.15/arch/x86/boot/v | |||
5340 | int key; | 5432 | int key; |
5341 | unsigned int v; | 5433 | unsigned int v; |
5342 | 5434 | ||
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 | 5435 | diff -urNp linux-2.6.32.16/arch/x86/boot/video-vesa.c linux-2.6.32.16/arch/x86/boot/video-vesa.c |
5344 | --- linux-2.6.32.15/arch/x86/boot/video-vesa.c 2010-03-15 11:52:04.000000000 -0400 | 5436 | --- linux-2.6.32.16/arch/x86/boot/video-vesa.c 2010-07-05 14:14:00.000000000 -0400 |
5345 | +++ linux-2.6.32.15/arch/x86/boot/video-vesa.c 2010-05-28 21:27:14.895019280 -0400 | 5437 | +++ linux-2.6.32.16/arch/x86/boot/video-vesa.c 2010-07-09 14:50:35.000000000 -0400 |
5346 | @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) | 5438 | @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) |
5347 | 5439 | ||
5348 | boot_params.screen_info.vesapm_seg = oreg.es; | 5440 | boot_params.screen_info.vesapm_seg = oreg.es; |
@@ -5351,9 +5443,9 @@ diff -urNp linux-2.6.32.15/arch/x86/boot/video-vesa.c linux-2.6.32.15/arch/x86/b | |||
5351 | } | 5443 | } |
5352 | 5444 | ||
5353 | /* | 5445 | /* |
5354 | diff -urNp linux-2.6.32.15/arch/x86/ia32/ia32entry.S linux-2.6.32.15/arch/x86/ia32/ia32entry.S | 5446 | diff -urNp linux-2.6.32.16/arch/x86/ia32/ia32entry.S linux-2.6.32.16/arch/x86/ia32/ia32entry.S |
5355 | --- linux-2.6.32.15/arch/x86/ia32/ia32entry.S 2010-03-15 11:52:04.000000000 -0400 | 5447 | --- linux-2.6.32.16/arch/x86/ia32/ia32entry.S 2010-07-05 14:14:00.000000000 -0400 |
5356 | +++ linux-2.6.32.15/arch/x86/ia32/ia32entry.S 2010-05-28 21:27:14.895019280 -0400 | 5448 | +++ linux-2.6.32.16/arch/x86/ia32/ia32entry.S 2010-07-09 14:50:35.000000000 -0400 |
5357 | @@ -13,6 +13,7 @@ | 5449 | @@ -13,6 +13,7 @@ |
5358 | #include <asm/thread_info.h> | 5450 | #include <asm/thread_info.h> |
5359 | #include <asm/segment.h> | 5451 | #include <asm/segment.h> |
@@ -5448,9 +5540,9 @@ diff -urNp linux-2.6.32.15/arch/x86/ia32/ia32entry.S linux-2.6.32.15/arch/x86/ia | |||
5448 | /* | 5540 | /* |
5449 | * No need to follow this irqs on/off section: the syscall | 5541 | * No need to follow this irqs on/off section: the syscall |
5450 | * disabled irqs and here we enable it straight after entry: | 5542 | * disabled irqs and here we enable it straight after entry: |
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 | 5543 | diff -urNp linux-2.6.32.16/arch/x86/ia32/ia32_signal.c linux-2.6.32.16/arch/x86/ia32/ia32_signal.c |
5452 | --- linux-2.6.32.15/arch/x86/ia32/ia32_signal.c 2010-03-15 11:52:04.000000000 -0400 | 5544 | --- linux-2.6.32.16/arch/x86/ia32/ia32_signal.c 2010-07-05 14:14:00.000000000 -0400 |
5453 | +++ linux-2.6.32.15/arch/x86/ia32/ia32_signal.c 2010-05-28 21:27:14.895019280 -0400 | 5545 | +++ linux-2.6.32.16/arch/x86/ia32/ia32_signal.c 2010-07-09 14:50:35.000000000 -0400 |
5454 | @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct | 5546 | @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct |
5455 | sp -= frame_size; | 5547 | sp -= frame_size; |
5456 | /* Align the stack pointer according to the i386 ABI, | 5548 | /* Align the stack pointer according to the i386 ABI, |
@@ -5469,9 +5561,9 @@ diff -urNp linux-2.6.32.15/arch/x86/ia32/ia32_signal.c linux-2.6.32.15/arch/x86/ | |||
5469 | }; | 5561 | }; |
5470 | 5562 | ||
5471 | frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); | 5563 | frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); |
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 | 5564 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/alternative.h linux-2.6.32.16/arch/x86/include/asm/alternative.h |
5473 | --- linux-2.6.32.15/arch/x86/include/asm/alternative.h 2010-03-15 11:52:04.000000000 -0400 | 5565 | --- linux-2.6.32.16/arch/x86/include/asm/alternative.h 2010-07-05 14:14:00.000000000 -0400 |
5474 | +++ linux-2.6.32.15/arch/x86/include/asm/alternative.h 2010-05-28 21:27:14.895019280 -0400 | 5566 | +++ linux-2.6.32.16/arch/x86/include/asm/alternative.h 2010-07-09 14:50:35.000000000 -0400 |
5475 | @@ -85,7 +85,7 @@ static inline void alternatives_smp_swit | 5567 | @@ -85,7 +85,7 @@ static inline void alternatives_smp_swit |
5476 | " .byte 662b-661b\n" /* sourcelen */ \ | 5568 | " .byte 662b-661b\n" /* sourcelen */ \ |
5477 | " .byte 664f-663f\n" /* replacementlen */ \ | 5569 | " .byte 664f-663f\n" /* replacementlen */ \ |
@@ -5481,9 +5573,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/alternative.h linux-2.6.32.15/ar | |||
5481 | "663:\n\t" newinstr "\n664:\n" /* replacement */ \ | 5573 | "663:\n\t" newinstr "\n664:\n" /* replacement */ \ |
5482 | ".previous" | 5574 | ".previous" |
5483 | 5575 | ||
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 | 5576 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/apm.h linux-2.6.32.16/arch/x86/include/asm/apm.h |
5485 | --- linux-2.6.32.15/arch/x86/include/asm/apm.h 2010-03-15 11:52:04.000000000 -0400 | 5577 | --- linux-2.6.32.16/arch/x86/include/asm/apm.h 2010-07-05 14:14:00.000000000 -0400 |
5486 | +++ linux-2.6.32.15/arch/x86/include/asm/apm.h 2010-05-28 21:27:14.903156603 -0400 | 5578 | +++ linux-2.6.32.16/arch/x86/include/asm/apm.h 2010-07-09 14:50:35.000000000 -0400 |
5487 | @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 | 5579 | @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 |
5488 | __asm__ __volatile__(APM_DO_ZERO_SEGS | 5580 | __asm__ __volatile__(APM_DO_ZERO_SEGS |
5489 | "pushl %%edi\n\t" | 5581 | "pushl %%edi\n\t" |
@@ -5502,9 +5594,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/apm.h linux-2.6.32.15/arch/x86/i | |||
5502 | "setc %%bl\n\t" | 5594 | "setc %%bl\n\t" |
5503 | "popl %%ebp\n\t" | 5595 | "popl %%ebp\n\t" |
5504 | "popl %%edi\n\t" | 5596 | "popl %%edi\n\t" |
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 | 5597 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/atomic_32.h linux-2.6.32.16/arch/x86/include/asm/atomic_32.h |
5506 | --- linux-2.6.32.15/arch/x86/include/asm/atomic_32.h 2010-03-15 11:52:04.000000000 -0400 | 5598 | --- linux-2.6.32.16/arch/x86/include/asm/atomic_32.h 2010-07-05 14:14:00.000000000 -0400 |
5507 | +++ linux-2.6.32.15/arch/x86/include/asm/atomic_32.h 2010-05-28 21:27:14.903156603 -0400 | 5599 | +++ linux-2.6.32.16/arch/x86/include/asm/atomic_32.h 2010-07-09 14:50:35.000000000 -0400 |
5508 | @@ -25,6 +25,17 @@ static inline int atomic_read(const atom | 5600 | @@ -25,6 +25,17 @@ static inline int atomic_read(const atom |
5509 | } | 5601 | } |
5510 | 5602 | ||
@@ -5654,7 +5746,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_32.h linux-2.6.32.15/arch | |||
5654 | : "+m" (v->counter)); | 5746 | : "+m" (v->counter)); |
5655 | } | 5747 | } |
5656 | 5748 | ||
5657 | @@ -103,7 +202,18 @@ static inline void atomic_inc(atomic_t * | 5749 | @@ -103,7 +202,30 @@ static inline void atomic_inc(atomic_t * |
5658 | */ | 5750 | */ |
5659 | static inline void atomic_dec(atomic_t *v) | 5751 | static inline void atomic_dec(atomic_t *v) |
5660 | { | 5752 | { |
@@ -5671,10 +5763,22 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_32.h linux-2.6.32.15/arch | |||
5671 | + _ASM_EXTABLE(0b, 1b) | 5763 | + _ASM_EXTABLE(0b, 1b) |
5672 | +#endif | 5764 | +#endif |
5673 | + | 5765 | + |
5766 | + : "+m" (v->counter)); | ||
5767 | +} | ||
5768 | + | ||
5769 | +/** | ||
5770 | + * atomic_dec_unchecked - decrement atomic variable | ||
5771 | + * @v: pointer of type atomic_t | ||
5772 | + * | ||
5773 | + * Atomically decrements @v by 1. | ||
5774 | + */ | ||
5775 | +static inline void atomic_dec_unchecked(atomic_unchecked_t *v) | ||
5776 | +{ | ||
5777 | + asm volatile(LOCK_PREFIX "decl %0\n" | ||
5674 | : "+m" (v->counter)); | 5778 | : "+m" (v->counter)); |
5675 | } | 5779 | } |
5676 | 5780 | ||
5677 | @@ -119,7 +229,19 @@ static inline int atomic_dec_and_test(at | 5781 | @@ -119,7 +241,19 @@ static inline int atomic_dec_and_test(at |
5678 | { | 5782 | { |
5679 | unsigned char c; | 5783 | unsigned char c; |
5680 | 5784 | ||
@@ -5695,7 +5799,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_32.h linux-2.6.32.15/arch | |||
5695 | : "+m" (v->counter), "=qm" (c) | 5799 | : "+m" (v->counter), "=qm" (c) |
5696 | : : "memory"); | 5800 | : : "memory"); |
5697 | return c != 0; | 5801 | return c != 0; |
5698 | @@ -137,7 +259,19 @@ static inline int atomic_inc_and_test(at | 5802 | @@ -137,7 +271,19 @@ static inline int atomic_inc_and_test(at |
5699 | { | 5803 | { |
5700 | unsigned char c; | 5804 | unsigned char c; |
5701 | 5805 | ||
@@ -5716,7 +5820,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_32.h linux-2.6.32.15/arch | |||
5716 | : "+m" (v->counter), "=qm" (c) | 5820 | : "+m" (v->counter), "=qm" (c) |
5717 | : : "memory"); | 5821 | : : "memory"); |
5718 | return c != 0; | 5822 | return c != 0; |
5719 | @@ -156,7 +290,16 @@ static inline int atomic_add_negative(in | 5823 | @@ -156,7 +302,16 @@ static inline int atomic_add_negative(in |
5720 | { | 5824 | { |
5721 | unsigned char c; | 5825 | unsigned char c; |
5722 | 5826 | ||
@@ -5734,7 +5838,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_32.h linux-2.6.32.15/arch | |||
5734 | : "+m" (v->counter), "=qm" (c) | 5838 | : "+m" (v->counter), "=qm" (c) |
5735 | : "ir" (i) : "memory"); | 5839 | : "ir" (i) : "memory"); |
5736 | return c; | 5840 | return c; |
5737 | @@ -179,6 +322,46 @@ static inline int atomic_add_return(int | 5841 | @@ -179,6 +334,46 @@ static inline int atomic_add_return(int |
5738 | #endif | 5842 | #endif |
5739 | /* Modern 486+ processor */ | 5843 | /* Modern 486+ processor */ |
5740 | __i = i; | 5844 | __i = i; |
@@ -5781,7 +5885,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_32.h linux-2.6.32.15/arch | |||
5781 | asm volatile(LOCK_PREFIX "xaddl %0, %1" | 5885 | asm volatile(LOCK_PREFIX "xaddl %0, %1" |
5782 | : "+r" (i), "+m" (v->counter) | 5886 | : "+r" (i), "+m" (v->counter) |
5783 | : : "memory"); | 5887 | : : "memory"); |
5784 | @@ -227,22 +410,34 @@ static inline int atomic_xchg(atomic_t * | 5888 | @@ -227,22 +422,34 @@ static inline int atomic_xchg(atomic_t * |
5785 | */ | 5889 | */ |
5786 | static inline int atomic_add_unless(atomic_t *v, int a, int u) | 5890 | static inline int atomic_add_unless(atomic_t *v, int a, int u) |
5787 | { | 5891 | { |
@@ -5820,7 +5924,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_32.h linux-2.6.32.15/arch | |||
5820 | #define atomic_dec_return(v) (atomic_sub_return(1, v)) | 5924 | #define atomic_dec_return(v) (atomic_sub_return(1, v)) |
5821 | 5925 | ||
5822 | /* These are x86-specific, used by some header files */ | 5926 | /* These are x86-specific, used by some header files */ |
5823 | @@ -266,6 +461,14 @@ typedef struct { | 5927 | @@ -266,6 +473,14 @@ typedef struct { |
5824 | u64 __aligned(8) counter; | 5928 | u64 __aligned(8) counter; |
5825 | } atomic64_t; | 5929 | } atomic64_t; |
5826 | 5930 | ||
@@ -5835,9 +5939,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_32.h linux-2.6.32.15/arch | |||
5835 | #define ATOMIC64_INIT(val) { (val) } | 5939 | #define ATOMIC64_INIT(val) { (val) } |
5836 | 5940 | ||
5837 | extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val); | 5941 | extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val); |
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 | 5942 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/atomic_64.h linux-2.6.32.16/arch/x86/include/asm/atomic_64.h |
5839 | --- linux-2.6.32.15/arch/x86/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400 | 5943 | --- linux-2.6.32.16/arch/x86/include/asm/atomic_64.h 2010-07-05 14:14:00.000000000 -0400 |
5840 | +++ linux-2.6.32.15/arch/x86/include/asm/atomic_64.h 2010-05-28 21:27:14.906924566 -0400 | 5944 | +++ linux-2.6.32.16/arch/x86/include/asm/atomic_64.h 2010-07-09 14:50:35.000000000 -0400 |
5841 | @@ -24,6 +24,17 @@ static inline int atomic_read(const atom | 5945 | @@ -24,6 +24,17 @@ static inline int atomic_read(const atom |
5842 | } | 5946 | } |
5843 | 5947 | ||
@@ -5989,7 +6093,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch | |||
5989 | : "=m" (v->counter) | 6093 | : "=m" (v->counter) |
5990 | : "m" (v->counter)); | 6094 | : "m" (v->counter)); |
5991 | } | 6095 | } |
5992 | @@ -103,7 +204,19 @@ static inline void atomic_inc(atomic_t * | 6096 | @@ -103,7 +204,32 @@ static inline void atomic_inc(atomic_t * |
5993 | */ | 6097 | */ |
5994 | static inline void atomic_dec(atomic_t *v) | 6098 | static inline void atomic_dec(atomic_t *v) |
5995 | { | 6099 | { |
@@ -6007,10 +6111,23 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch | |||
6007 | + _ASM_EXTABLE(0b, 1b) | 6111 | + _ASM_EXTABLE(0b, 1b) |
6008 | +#endif | 6112 | +#endif |
6009 | + | 6113 | + |
6114 | + : "=m" (v->counter) | ||
6115 | + : "m" (v->counter)); | ||
6116 | +} | ||
6117 | + | ||
6118 | +/** | ||
6119 | + * atomic_dec_unchecked - decrement atomic variable | ||
6120 | + * @v: pointer of type atomic_t | ||
6121 | + * | ||
6122 | + * Atomically decrements @v by 1. | ||
6123 | + */ | ||
6124 | +static inline void atomic_dec_unchecked(atomic_unchecked_t *v) | ||
6125 | +{ | ||
6126 | + asm volatile(LOCK_PREFIX "decl %0\n" | ||
6010 | : "=m" (v->counter) | 6127 | : "=m" (v->counter) |
6011 | : "m" (v->counter)); | 6128 | : "m" (v->counter)); |
6012 | } | 6129 | } |
6013 | @@ -120,7 +233,20 @@ static inline int atomic_dec_and_test(at | 6130 | @@ -120,7 +246,20 @@ static inline int atomic_dec_and_test(at |
6014 | { | 6131 | { |
6015 | unsigned char c; | 6132 | unsigned char c; |
6016 | 6133 | ||
@@ -6032,7 +6149,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch | |||
6032 | : "=m" (v->counter), "=qm" (c) | 6149 | : "=m" (v->counter), "=qm" (c) |
6033 | : "m" (v->counter) : "memory"); | 6150 | : "m" (v->counter) : "memory"); |
6034 | return c != 0; | 6151 | return c != 0; |
6035 | @@ -138,7 +264,20 @@ static inline int atomic_inc_and_test(at | 6152 | @@ -138,7 +277,20 @@ static inline int atomic_inc_and_test(at |
6036 | { | 6153 | { |
6037 | unsigned char c; | 6154 | unsigned char c; |
6038 | 6155 | ||
@@ -6054,7 +6171,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch | |||
6054 | : "=m" (v->counter), "=qm" (c) | 6171 | : "=m" (v->counter), "=qm" (c) |
6055 | : "m" (v->counter) : "memory"); | 6172 | : "m" (v->counter) : "memory"); |
6056 | return c != 0; | 6173 | return c != 0; |
6057 | @@ -157,7 +296,16 @@ static inline int atomic_add_negative(in | 6174 | @@ -157,7 +309,16 @@ static inline int atomic_add_negative(in |
6058 | { | 6175 | { |
6059 | unsigned char c; | 6176 | unsigned char c; |
6060 | 6177 | ||
@@ -6072,7 +6189,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch | |||
6072 | : "=m" (v->counter), "=qm" (c) | 6189 | : "=m" (v->counter), "=qm" (c) |
6073 | : "ir" (i), "m" (v->counter) : "memory"); | 6190 | : "ir" (i), "m" (v->counter) : "memory"); |
6074 | return c; | 6191 | return c; |
6075 | @@ -173,7 +321,15 @@ static inline int atomic_add_negative(in | 6192 | @@ -173,7 +334,15 @@ static inline int atomic_add_negative(in |
6076 | static inline int atomic_add_return(int i, atomic_t *v) | 6193 | static inline int atomic_add_return(int i, atomic_t *v) |
6077 | { | 6194 | { |
6078 | int __i = i; | 6195 | int __i = i; |
@@ -6089,7 +6206,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch | |||
6089 | : "+r" (i), "+m" (v->counter) | 6206 | : "+r" (i), "+m" (v->counter) |
6090 | : : "memory"); | 6207 | : : "memory"); |
6091 | return i + __i; | 6208 | return i + __i; |
6092 | @@ -204,6 +360,18 @@ static inline long atomic64_read(const a | 6209 | @@ -204,6 +373,18 @@ static inline long atomic64_read(const a |
6093 | } | 6210 | } |
6094 | 6211 | ||
6095 | /** | 6212 | /** |
@@ -6108,7 +6225,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch | |||
6108 | * atomic64_set - set atomic64 variable | 6225 | * atomic64_set - set atomic64 variable |
6109 | * @v: pointer to type atomic64_t | 6226 | * @v: pointer to type atomic64_t |
6110 | * @i: required value | 6227 | * @i: required value |
6111 | @@ -216,6 +384,18 @@ static inline void atomic64_set(atomic64 | 6228 | @@ -216,6 +397,18 @@ static inline void atomic64_set(atomic64 |
6112 | } | 6229 | } |
6113 | 6230 | ||
6114 | /** | 6231 | /** |
@@ -6127,7 +6244,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch | |||
6127 | * atomic64_add - add integer to atomic64 variable | 6244 | * atomic64_add - add integer to atomic64 variable |
6128 | * @i: integer value to add | 6245 | * @i: integer value to add |
6129 | * @v: pointer to type atomic64_t | 6246 | * @v: pointer to type atomic64_t |
6130 | @@ -224,6 +404,28 @@ static inline void atomic64_set(atomic64 | 6247 | @@ -224,6 +417,28 @@ static inline void atomic64_set(atomic64 |
6131 | */ | 6248 | */ |
6132 | static inline void atomic64_add(long i, atomic64_t *v) | 6249 | static inline void atomic64_add(long i, atomic64_t *v) |
6133 | { | 6250 | { |
@@ -6156,7 +6273,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch | |||
6156 | asm volatile(LOCK_PREFIX "addq %1,%0" | 6273 | asm volatile(LOCK_PREFIX "addq %1,%0" |
6157 | : "=m" (v->counter) | 6274 | : "=m" (v->counter) |
6158 | : "er" (i), "m" (v->counter)); | 6275 | : "er" (i), "m" (v->counter)); |
6159 | @@ -238,7 +440,15 @@ static inline void atomic64_add(long i, | 6276 | @@ -238,7 +453,15 @@ static inline void atomic64_add(long i, |
6160 | */ | 6277 | */ |
6161 | static inline void atomic64_sub(long i, atomic64_t *v) | 6278 | static inline void atomic64_sub(long i, atomic64_t *v) |
6162 | { | 6279 | { |
@@ -6173,7 +6290,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch | |||
6173 | : "=m" (v->counter) | 6290 | : "=m" (v->counter) |
6174 | : "er" (i), "m" (v->counter)); | 6291 | : "er" (i), "m" (v->counter)); |
6175 | } | 6292 | } |
6176 | @@ -256,7 +466,16 @@ static inline int atomic64_sub_and_test( | 6293 | @@ -256,7 +479,16 @@ static inline int atomic64_sub_and_test( |
6177 | { | 6294 | { |
6178 | unsigned char c; | 6295 | unsigned char c; |
6179 | 6296 | ||
@@ -6191,7 +6308,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch | |||
6191 | : "=m" (v->counter), "=qm" (c) | 6308 | : "=m" (v->counter), "=qm" (c) |
6192 | : "er" (i), "m" (v->counter) : "memory"); | 6309 | : "er" (i), "m" (v->counter) : "memory"); |
6193 | return c; | 6310 | return c; |
6194 | @@ -270,6 +489,31 @@ static inline int atomic64_sub_and_test( | 6311 | @@ -270,6 +502,31 @@ static inline int atomic64_sub_and_test( |
6195 | */ | 6312 | */ |
6196 | static inline void atomic64_inc(atomic64_t *v) | 6313 | static inline void atomic64_inc(atomic64_t *v) |
6197 | { | 6314 | { |
@@ -6223,7 +6340,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch | |||
6223 | asm volatile(LOCK_PREFIX "incq %0" | 6340 | asm volatile(LOCK_PREFIX "incq %0" |
6224 | : "=m" (v->counter) | 6341 | : "=m" (v->counter) |
6225 | : "m" (v->counter)); | 6342 | : "m" (v->counter)); |
6226 | @@ -283,7 +527,19 @@ static inline void atomic64_inc(atomic64 | 6343 | @@ -283,7 +540,32 @@ static inline void atomic64_inc(atomic64 |
6227 | */ | 6344 | */ |
6228 | static inline void atomic64_dec(atomic64_t *v) | 6345 | static inline void atomic64_dec(atomic64_t *v) |
6229 | { | 6346 | { |
@@ -6241,10 +6358,23 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch | |||
6241 | + _ASM_EXTABLE(0b, 1b) | 6358 | + _ASM_EXTABLE(0b, 1b) |
6242 | +#endif | 6359 | +#endif |
6243 | + | 6360 | + |
6361 | + : "=m" (v->counter) | ||
6362 | + : "m" (v->counter)); | ||
6363 | +} | ||
6364 | + | ||
6365 | +/** | ||
6366 | + * atomic64_dec_unchecked - decrement atomic64 variable | ||
6367 | + * @v: pointer to type atomic64_t | ||
6368 | + * | ||
6369 | + * Atomically decrements @v by 1. | ||
6370 | + */ | ||
6371 | +static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v) | ||
6372 | +{ | ||
6373 | + asm volatile(LOCK_PREFIX "decq %0\n" | ||
6244 | : "=m" (v->counter) | 6374 | : "=m" (v->counter) |
6245 | : "m" (v->counter)); | 6375 | : "m" (v->counter)); |
6246 | } | 6376 | } |
6247 | @@ -300,7 +556,20 @@ static inline int atomic64_dec_and_test( | 6377 | @@ -300,7 +582,20 @@ static inline int atomic64_dec_and_test( |
6248 | { | 6378 | { |
6249 | unsigned char c; | 6379 | unsigned char c; |
6250 | 6380 | ||
@@ -6266,7 +6396,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch | |||
6266 | : "=m" (v->counter), "=qm" (c) | 6396 | : "=m" (v->counter), "=qm" (c) |
6267 | : "m" (v->counter) : "memory"); | 6397 | : "m" (v->counter) : "memory"); |
6268 | return c != 0; | 6398 | return c != 0; |
6269 | @@ -318,7 +587,20 @@ static inline int atomic64_inc_and_test( | 6399 | @@ -318,7 +613,20 @@ static inline int atomic64_inc_and_test( |
6270 | { | 6400 | { |
6271 | unsigned char c; | 6401 | unsigned char c; |
6272 | 6402 | ||
@@ -6288,7 +6418,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch | |||
6288 | : "=m" (v->counter), "=qm" (c) | 6418 | : "=m" (v->counter), "=qm" (c) |
6289 | : "m" (v->counter) : "memory"); | 6419 | : "m" (v->counter) : "memory"); |
6290 | return c != 0; | 6420 | return c != 0; |
6291 | @@ -337,7 +619,16 @@ static inline int atomic64_add_negative( | 6421 | @@ -337,7 +645,16 @@ static inline int atomic64_add_negative( |
6292 | { | 6422 | { |
6293 | unsigned char c; | 6423 | unsigned char c; |
6294 | 6424 | ||
@@ -6306,7 +6436,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch | |||
6306 | : "=m" (v->counter), "=qm" (c) | 6436 | : "=m" (v->counter), "=qm" (c) |
6307 | : "er" (i), "m" (v->counter) : "memory"); | 6437 | : "er" (i), "m" (v->counter) : "memory"); |
6308 | return c; | 6438 | return c; |
6309 | @@ -353,7 +644,31 @@ static inline int atomic64_add_negative( | 6439 | @@ -353,7 +670,31 @@ static inline int atomic64_add_negative( |
6310 | static inline long atomic64_add_return(long i, atomic64_t *v) | 6440 | static inline long atomic64_add_return(long i, atomic64_t *v) |
6311 | { | 6441 | { |
6312 | long __i = i; | 6442 | long __i = i; |
@@ -6339,7 +6469,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch | |||
6339 | : "+r" (i), "+m" (v->counter) | 6469 | : "+r" (i), "+m" (v->counter) |
6340 | : : "memory"); | 6470 | : : "memory"); |
6341 | return i + __i; | 6471 | return i + __i; |
6342 | @@ -365,6 +680,7 @@ static inline long atomic64_sub_return(l | 6472 | @@ -365,6 +706,7 @@ static inline long atomic64_sub_return(l |
6343 | } | 6473 | } |
6344 | 6474 | ||
6345 | #define atomic64_inc_return(v) (atomic64_add_return(1, (v))) | 6475 | #define atomic64_inc_return(v) (atomic64_add_return(1, (v))) |
@@ -6347,7 +6477,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch | |||
6347 | #define atomic64_dec_return(v) (atomic64_sub_return(1, (v))) | 6477 | #define atomic64_dec_return(v) (atomic64_sub_return(1, (v))) |
6348 | 6478 | ||
6349 | static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new) | 6479 | static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new) |
6350 | @@ -398,17 +714,29 @@ static inline long atomic_xchg(atomic_t | 6480 | @@ -398,17 +740,29 @@ static inline long atomic_xchg(atomic_t |
6351 | */ | 6481 | */ |
6352 | static inline int atomic_add_unless(atomic_t *v, int a, int u) | 6482 | static inline int atomic_add_unless(atomic_t *v, int a, int u) |
6353 | { | 6483 | { |
@@ -6381,7 +6511,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch | |||
6381 | } | 6511 | } |
6382 | 6512 | ||
6383 | #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) | 6513 | #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) |
6384 | @@ -424,17 +752,29 @@ static inline int atomic_add_unless(atom | 6514 | @@ -424,17 +778,29 @@ static inline int atomic_add_unless(atom |
6385 | */ | 6515 | */ |
6386 | static inline int atomic64_add_unless(atomic64_t *v, long a, long u) | 6516 | static inline int atomic64_add_unless(atomic64_t *v, long a, long u) |
6387 | { | 6517 | { |
@@ -6405,7 +6535,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch | |||
6405 | + : "=r" (new) | 6535 | + : "=r" (new) |
6406 | + : "0" (c), "er" (a)); | 6536 | + : "0" (c), "er" (a)); |
6407 | + | 6537 | + |
6408 | + old = atomic64_cmpxchg((v), c, new); | 6538 | + old = atomic64_cmpxchg(v, c, new); |
6409 | if (likely(old == c)) | 6539 | if (likely(old == c)) |
6410 | break; | 6540 | break; |
6411 | c = old; | 6541 | c = old; |
@@ -6415,9 +6545,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch | |||
6415 | } | 6545 | } |
6416 | 6546 | ||
6417 | /** | 6547 | /** |
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 | 6548 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/boot.h linux-2.6.32.16/arch/x86/include/asm/boot.h |
6419 | --- linux-2.6.32.15/arch/x86/include/asm/boot.h 2010-03-15 11:52:04.000000000 -0400 | 6549 | --- linux-2.6.32.16/arch/x86/include/asm/boot.h 2010-07-05 14:14:00.000000000 -0400 |
6420 | +++ linux-2.6.32.15/arch/x86/include/asm/boot.h 2010-05-28 21:27:14.906924566 -0400 | 6550 | +++ linux-2.6.32.16/arch/x86/include/asm/boot.h 2010-07-09 14:50:35.000000000 -0400 |
6421 | @@ -11,10 +11,15 @@ | 6551 | @@ -11,10 +11,15 @@ |
6422 | #include <asm/pgtable_types.h> | 6552 | #include <asm/pgtable_types.h> |
6423 | 6553 | ||
@@ -6435,9 +6565,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/boot.h linux-2.6.32.15/arch/x86/ | |||
6435 | /* Minimum kernel alignment, as a power of two */ | 6565 | /* Minimum kernel alignment, as a power of two */ |
6436 | #ifdef CONFIG_X86_64 | 6566 | #ifdef CONFIG_X86_64 |
6437 | #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT | 6567 | #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT |
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 | 6568 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/cacheflush.h linux-2.6.32.16/arch/x86/include/asm/cacheflush.h |
6439 | --- linux-2.6.32.15/arch/x86/include/asm/cacheflush.h 2010-03-15 11:52:04.000000000 -0400 | 6569 | --- linux-2.6.32.16/arch/x86/include/asm/cacheflush.h 2010-07-05 14:14:00.000000000 -0400 |
6440 | +++ linux-2.6.32.15/arch/x86/include/asm/cacheflush.h 2010-05-28 21:27:14.906924566 -0400 | 6570 | +++ linux-2.6.32.16/arch/x86/include/asm/cacheflush.h 2010-07-09 14:50:35.000000000 -0400 |
6441 | @@ -60,7 +60,7 @@ PAGEFLAG(WC, WC) | 6571 | @@ -60,7 +60,7 @@ PAGEFLAG(WC, WC) |
6442 | static inline unsigned long get_page_memtype(struct page *pg) | 6572 | static inline unsigned long get_page_memtype(struct page *pg) |
6443 | { | 6573 | { |
@@ -6456,9 +6586,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/cacheflush.h linux-2.6.32.15/arc | |||
6456 | ClearPageUncached(pg); | 6586 | ClearPageUncached(pg); |
6457 | ClearPageWC(pg); | 6587 | ClearPageWC(pg); |
6458 | break; | 6588 | break; |
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 | 6589 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/cache.h linux-2.6.32.16/arch/x86/include/asm/cache.h |
6460 | --- linux-2.6.32.15/arch/x86/include/asm/cache.h 2010-03-15 11:52:04.000000000 -0400 | 6590 | --- linux-2.6.32.16/arch/x86/include/asm/cache.h 2010-07-05 14:14:00.000000000 -0400 |
6461 | +++ linux-2.6.32.15/arch/x86/include/asm/cache.h 2010-05-28 21:27:14.906924566 -0400 | 6591 | +++ linux-2.6.32.16/arch/x86/include/asm/cache.h 2010-07-09 14:50:35.000000000 -0400 |
6462 | @@ -8,6 +8,7 @@ | 6592 | @@ -8,6 +8,7 @@ |
6463 | #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) | 6593 | #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) |
6464 | 6594 | ||
@@ -6467,9 +6597,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/cache.h linux-2.6.32.15/arch/x86 | |||
6467 | 6597 | ||
6468 | #ifdef CONFIG_X86_VSMP | 6598 | #ifdef CONFIG_X86_VSMP |
6469 | /* vSMP Internode cacheline shift */ | 6599 | /* vSMP Internode cacheline shift */ |
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 | 6600 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/checksum_32.h linux-2.6.32.16/arch/x86/include/asm/checksum_32.h |
6471 | --- linux-2.6.32.15/arch/x86/include/asm/checksum_32.h 2010-03-15 11:52:04.000000000 -0400 | 6601 | --- linux-2.6.32.16/arch/x86/include/asm/checksum_32.h 2010-07-05 14:14:00.000000000 -0400 |
6472 | +++ linux-2.6.32.15/arch/x86/include/asm/checksum_32.h 2010-05-28 21:27:14.906924566 -0400 | 6602 | +++ linux-2.6.32.16/arch/x86/include/asm/checksum_32.h 2010-07-09 14:50:35.000000000 -0400 |
6473 | @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene | 6603 | @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene |
6474 | int len, __wsum sum, | 6604 | int len, __wsum sum, |
6475 | int *src_err_ptr, int *dst_err_ptr); | 6605 | int *src_err_ptr, int *dst_err_ptr); |
@@ -6503,9 +6633,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/checksum_32.h linux-2.6.32.15/ar | |||
6503 | len, sum, NULL, err_ptr); | 6633 | len, sum, NULL, err_ptr); |
6504 | 6634 | ||
6505 | if (len) | 6635 | if (len) |
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 | 6636 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/desc.h linux-2.6.32.16/arch/x86/include/asm/desc.h |
6507 | --- linux-2.6.32.15/arch/x86/include/asm/desc.h 2010-03-15 11:52:04.000000000 -0400 | 6637 | --- linux-2.6.32.16/arch/x86/include/asm/desc.h 2010-07-05 14:14:00.000000000 -0400 |
6508 | +++ linux-2.6.32.15/arch/x86/include/asm/desc.h 2010-05-28 21:27:14.906924566 -0400 | 6638 | +++ linux-2.6.32.16/arch/x86/include/asm/desc.h 2010-07-09 14:50:35.000000000 -0400 |
6509 | @@ -4,6 +4,7 @@ | 6639 | @@ -4,6 +4,7 @@ |
6510 | #include <asm/desc_defs.h> | 6640 | #include <asm/desc_defs.h> |
6511 | #include <asm/ldt.h> | 6641 | #include <asm/ldt.h> |
@@ -6675,9 +6805,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/desc.h linux-2.6.32.15/arch/x86/ | |||
6675 | +#endif | 6805 | +#endif |
6676 | + | 6806 | + |
6677 | #endif /* _ASM_X86_DESC_H */ | 6807 | #endif /* _ASM_X86_DESC_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 | 6808 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/device.h linux-2.6.32.16/arch/x86/include/asm/device.h |
6679 | --- linux-2.6.32.15/arch/x86/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400 | 6809 | --- linux-2.6.32.16/arch/x86/include/asm/device.h 2010-07-05 14:14:00.000000000 -0400 |
6680 | +++ linux-2.6.32.15/arch/x86/include/asm/device.h 2010-05-28 21:27:14.911025615 -0400 | 6810 | +++ linux-2.6.32.16/arch/x86/include/asm/device.h 2010-07-09 14:50:35.000000000 -0400 |
6681 | @@ -6,7 +6,7 @@ struct dev_archdata { | 6811 | @@ -6,7 +6,7 @@ struct dev_archdata { |
6682 | void *acpi_handle; | 6812 | void *acpi_handle; |
6683 | #endif | 6813 | #endif |
@@ -6687,9 +6817,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/device.h linux-2.6.32.15/arch/x8 | |||
6687 | #endif | 6817 | #endif |
6688 | #ifdef CONFIG_DMAR | 6818 | #ifdef CONFIG_DMAR |
6689 | void *iommu; /* hook for IOMMU specific extension */ | 6819 | void *iommu; /* hook for IOMMU specific extension */ |
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 | 6820 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/dma-mapping.h linux-2.6.32.16/arch/x86/include/asm/dma-mapping.h |
6691 | --- linux-2.6.32.15/arch/x86/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 | 6821 | --- linux-2.6.32.16/arch/x86/include/asm/dma-mapping.h 2010-07-05 14:14:00.000000000 -0400 |
6692 | +++ linux-2.6.32.15/arch/x86/include/asm/dma-mapping.h 2010-05-28 21:27:14.911025615 -0400 | 6822 | +++ linux-2.6.32.16/arch/x86/include/asm/dma-mapping.h 2010-07-09 14:50:35.000000000 -0400 |
6693 | @@ -25,9 +25,9 @@ extern int iommu_merge; | 6823 | @@ -25,9 +25,9 @@ extern int iommu_merge; |
6694 | extern struct device x86_dma_fallback_dev; | 6824 | extern struct device x86_dma_fallback_dev; |
6695 | extern int panic_on_overflow; | 6825 | extern int panic_on_overflow; |
@@ -6729,9 +6859,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/dma-mapping.h linux-2.6.32.15/ar | |||
6729 | 6859 | ||
6730 | WARN_ON(irqs_disabled()); /* for portability */ | 6860 | WARN_ON(irqs_disabled()); /* for portability */ |
6731 | 6861 | ||
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 | 6862 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/e820.h linux-2.6.32.16/arch/x86/include/asm/e820.h |
6733 | --- linux-2.6.32.15/arch/x86/include/asm/e820.h 2010-03-15 11:52:04.000000000 -0400 | 6863 | --- linux-2.6.32.16/arch/x86/include/asm/e820.h 2010-07-05 14:14:00.000000000 -0400 |
6734 | +++ linux-2.6.32.15/arch/x86/include/asm/e820.h 2010-05-28 21:27:14.911025615 -0400 | 6864 | +++ linux-2.6.32.16/arch/x86/include/asm/e820.h 2010-07-09 14:50:35.000000000 -0400 |
6735 | @@ -133,7 +133,7 @@ extern char *default_machine_specific_me | 6865 | @@ -133,7 +133,7 @@ extern char *default_machine_specific_me |
6736 | #define ISA_END_ADDRESS 0x100000 | 6866 | #define ISA_END_ADDRESS 0x100000 |
6737 | #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS) | 6867 | #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS) |
@@ -6741,9 +6871,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/e820.h linux-2.6.32.15/arch/x86/ | |||
6741 | #define BIOS_END 0x00100000 | 6871 | #define BIOS_END 0x00100000 |
6742 | 6872 | ||
6743 | #ifdef __KERNEL__ | 6873 | #ifdef __KERNEL__ |
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 | 6874 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/elf.h linux-2.6.32.16/arch/x86/include/asm/elf.h |
6745 | --- linux-2.6.32.15/arch/x86/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 | 6875 | --- linux-2.6.32.16/arch/x86/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 |
6746 | +++ linux-2.6.32.15/arch/x86/include/asm/elf.h 2010-05-28 21:27:14.911025615 -0400 | 6876 | +++ linux-2.6.32.16/arch/x86/include/asm/elf.h 2010-07-09 14:50:35.000000000 -0400 |
6747 | @@ -257,7 +257,25 @@ extern int force_personality32; | 6877 | @@ -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 | 6878 | 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. */ | 6879 | that it will "exec", and that there is sufficient room for the brk. */ |
@@ -6797,9 +6927,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/elf.h linux-2.6.32.15/arch/x86/i | |||
6797 | -#define arch_randomize_brk arch_randomize_brk | 6927 | -#define arch_randomize_brk arch_randomize_brk |
6798 | - | 6928 | - |
6799 | #endif /* _ASM_X86_ELF_H */ | 6929 | #endif /* _ASM_X86_ELF_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 | 6930 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/futex.h linux-2.6.32.16/arch/x86/include/asm/futex.h |
6801 | --- linux-2.6.32.15/arch/x86/include/asm/futex.h 2010-03-15 11:52:04.000000000 -0400 | 6931 | --- linux-2.6.32.16/arch/x86/include/asm/futex.h 2010-07-05 14:14:00.000000000 -0400 |
6802 | +++ linux-2.6.32.15/arch/x86/include/asm/futex.h 2010-05-28 21:27:14.911025615 -0400 | 6932 | +++ linux-2.6.32.16/arch/x86/include/asm/futex.h 2010-07-09 14:50:35.000000000 -0400 |
6803 | @@ -11,17 +11,54 @@ | 6933 | @@ -11,17 +11,54 @@ |
6804 | #include <asm/processor.h> | 6934 | #include <asm/processor.h> |
6805 | #include <asm/system.h> | 6935 | #include <asm/system.h> |
@@ -6936,9 +7066,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/futex.h linux-2.6.32.15/arch/x86 | |||
6936 | : "memory" | 7066 | : "memory" |
6937 | ); | 7067 | ); |
6938 | 7068 | ||
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 | 7069 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/i387.h linux-2.6.32.16/arch/x86/include/asm/i387.h |
6940 | --- linux-2.6.32.15/arch/x86/include/asm/i387.h 2010-03-15 11:52:04.000000000 -0400 | 7070 | --- linux-2.6.32.16/arch/x86/include/asm/i387.h 2010-07-05 14:14:00.000000000 -0400 |
6941 | +++ linux-2.6.32.15/arch/x86/include/asm/i387.h 2010-05-28 21:27:14.911025615 -0400 | 7071 | +++ linux-2.6.32.16/arch/x86/include/asm/i387.h 2010-07-09 14:50:35.000000000 -0400 |
6942 | @@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc | 7072 | @@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc |
6943 | { | 7073 | { |
6944 | int err; | 7074 | int err; |
@@ -6979,9 +7109,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/i387.h linux-2.6.32.15/arch/x86/ | |||
6979 | 7109 | ||
6980 | /* | 7110 | /* |
6981 | * These must be called with preempt disabled | 7111 | * These must be called with preempt disabled |
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 | 7112 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/io_64.h linux-2.6.32.16/arch/x86/include/asm/io_64.h |
6983 | --- linux-2.6.32.15/arch/x86/include/asm/io_64.h 2010-03-15 11:52:04.000000000 -0400 | 7113 | --- linux-2.6.32.16/arch/x86/include/asm/io_64.h 2010-07-05 14:14:00.000000000 -0400 |
6984 | +++ linux-2.6.32.15/arch/x86/include/asm/io_64.h 2010-05-28 21:27:14.911025615 -0400 | 7114 | +++ linux-2.6.32.16/arch/x86/include/asm/io_64.h 2010-07-09 14:50:35.000000000 -0400 |
6985 | @@ -140,6 +140,17 @@ __OUTS(l) | 7115 | @@ -140,6 +140,17 @@ __OUTS(l) |
6986 | 7116 | ||
6987 | #include <linux/vmalloc.h> | 7117 | #include <linux/vmalloc.h> |
@@ -7000,9 +7130,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/io_64.h linux-2.6.32.15/arch/x86 | |||
7000 | #include <asm-generic/iomap.h> | 7130 | #include <asm-generic/iomap.h> |
7001 | 7131 | ||
7002 | void __memcpy_fromio(void *, unsigned long, unsigned); | 7132 | void __memcpy_fromio(void *, unsigned long, unsigned); |
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 | 7133 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/iommu.h linux-2.6.32.16/arch/x86/include/asm/iommu.h |
7004 | --- linux-2.6.32.15/arch/x86/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400 | 7134 | --- linux-2.6.32.16/arch/x86/include/asm/iommu.h 2010-07-05 14:14:00.000000000 -0400 |
7005 | +++ linux-2.6.32.15/arch/x86/include/asm/iommu.h 2010-05-28 21:27:14.911025615 -0400 | 7135 | +++ linux-2.6.32.16/arch/x86/include/asm/iommu.h 2010-07-09 14:50:35.000000000 -0400 |
7006 | @@ -3,7 +3,7 @@ | 7136 | @@ -3,7 +3,7 @@ |
7007 | 7137 | ||
7008 | extern void pci_iommu_shutdown(void); | 7138 | extern void pci_iommu_shutdown(void); |
@@ -7012,9 +7142,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/iommu.h linux-2.6.32.15/arch/x86 | |||
7012 | extern int force_iommu, no_iommu; | 7142 | extern int force_iommu, no_iommu; |
7013 | extern int iommu_detected; | 7143 | extern int iommu_detected; |
7014 | extern int iommu_pass_through; | 7144 | extern int iommu_pass_through; |
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 | 7145 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/irqflags.h linux-2.6.32.16/arch/x86/include/asm/irqflags.h |
7016 | --- linux-2.6.32.15/arch/x86/include/asm/irqflags.h 2010-03-15 11:52:04.000000000 -0400 | 7146 | --- linux-2.6.32.16/arch/x86/include/asm/irqflags.h 2010-07-05 14:14:00.000000000 -0400 |
7017 | +++ linux-2.6.32.15/arch/x86/include/asm/irqflags.h 2010-05-28 21:27:14.911025615 -0400 | 7147 | +++ linux-2.6.32.16/arch/x86/include/asm/irqflags.h 2010-07-09 14:50:35.000000000 -0400 |
7018 | @@ -142,6 +142,11 @@ static inline unsigned long __raw_local_ | 7148 | @@ -142,6 +142,11 @@ static inline unsigned long __raw_local_ |
7019 | sti; \ | 7149 | sti; \ |
7020 | sysexit | 7150 | sysexit |
@@ -7027,10 +7157,10 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/irqflags.h linux-2.6.32.15/arch/ | |||
7027 | #else | 7157 | #else |
7028 | #define INTERRUPT_RETURN iret | 7158 | #define INTERRUPT_RETURN iret |
7029 | #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit | 7159 | #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit |
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 | 7160 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/kvm_host.h linux-2.6.32.16/arch/x86/include/asm/kvm_host.h |
7031 | --- linux-2.6.32.15/arch/x86/include/asm/kvm_host.h 2010-04-29 17:49:37.497949072 -0400 | 7161 | --- linux-2.6.32.16/arch/x86/include/asm/kvm_host.h 2010-07-05 14:14:00.000000000 -0400 |
7032 | +++ linux-2.6.32.15/arch/x86/include/asm/kvm_host.h 2010-05-28 21:27:14.911025615 -0400 | 7162 | +++ linux-2.6.32.16/arch/x86/include/asm/kvm_host.h 2010-07-09 14:50:35.000000000 -0400 |
7033 | @@ -532,7 +532,7 @@ struct kvm_x86_ops { | 7163 | @@ -533,7 +533,7 @@ struct kvm_x86_ops { |
7034 | const struct trace_print_flags *exit_reasons_str; | 7164 | const struct trace_print_flags *exit_reasons_str; |
7035 | }; | 7165 | }; |
7036 | 7166 | ||
@@ -7039,9 +7169,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/kvm_host.h linux-2.6.32.15/arch/ | |||
7039 | 7169 | ||
7040 | int kvm_mmu_module_init(void); | 7170 | int kvm_mmu_module_init(void); |
7041 | void kvm_mmu_module_exit(void); | 7171 | void kvm_mmu_module_exit(void); |
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 | 7172 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/local.h linux-2.6.32.16/arch/x86/include/asm/local.h |
7043 | --- linux-2.6.32.15/arch/x86/include/asm/local.h 2010-03-15 11:52:04.000000000 -0400 | 7173 | --- linux-2.6.32.16/arch/x86/include/asm/local.h 2010-07-05 14:14:00.000000000 -0400 |
7044 | +++ linux-2.6.32.15/arch/x86/include/asm/local.h 2010-05-28 21:27:14.911025615 -0400 | 7174 | +++ linux-2.6.32.16/arch/x86/include/asm/local.h 2010-07-09 14:50:35.000000000 -0400 |
7045 | @@ -18,26 +18,90 @@ typedef struct { | 7175 | @@ -18,26 +18,90 @@ typedef struct { |
7046 | 7176 | ||
7047 | static inline void local_inc(local_t *l) | 7177 | static inline void local_inc(local_t *l) |
@@ -7266,9 +7396,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/local.h linux-2.6.32.15/arch/x86 | |||
7266 | : "+r" (i), "+m" (l->a.counter) | 7396 | : "+r" (i), "+m" (l->a.counter) |
7267 | : : "memory"); | 7397 | : : "memory"); |
7268 | return i + __i; | 7398 | return i + __i; |
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 | 7399 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.16/arch/x86/include/asm/mc146818rtc.h |
7270 | --- linux-2.6.32.15/arch/x86/include/asm/mc146818rtc.h 2010-03-15 11:52:04.000000000 -0400 | 7400 | --- linux-2.6.32.16/arch/x86/include/asm/mc146818rtc.h 2010-07-05 14:14:00.000000000 -0400 |
7271 | +++ linux-2.6.32.15/arch/x86/include/asm/mc146818rtc.h 2010-05-28 21:27:14.911025615 -0400 | 7401 | +++ linux-2.6.32.16/arch/x86/include/asm/mc146818rtc.h 2010-07-09 14:50:35.000000000 -0400 |
7272 | @@ -81,8 +81,8 @@ static inline unsigned char current_lock | 7402 | @@ -81,8 +81,8 @@ static inline unsigned char current_lock |
7273 | #else | 7403 | #else |
7274 | #define lock_cmos_prefix(reg) do {} while (0) | 7404 | #define lock_cmos_prefix(reg) do {} while (0) |
@@ -7280,9 +7410,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.15/ar | |||
7280 | #define do_i_have_lock_cmos() 0 | 7410 | #define do_i_have_lock_cmos() 0 |
7281 | #define current_lock_cmos_reg() 0 | 7411 | #define current_lock_cmos_reg() 0 |
7282 | #endif | 7412 | #endif |
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 | 7413 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/microcode.h linux-2.6.32.16/arch/x86/include/asm/microcode.h |
7284 | --- linux-2.6.32.15/arch/x86/include/asm/microcode.h 2010-03-15 11:52:04.000000000 -0400 | 7414 | --- linux-2.6.32.16/arch/x86/include/asm/microcode.h 2010-07-05 14:14:00.000000000 -0400 |
7285 | +++ linux-2.6.32.15/arch/x86/include/asm/microcode.h 2010-05-28 21:27:14.911025615 -0400 | 7415 | +++ linux-2.6.32.16/arch/x86/include/asm/microcode.h 2010-07-09 14:50:35.000000000 -0400 |
7286 | @@ -12,13 +12,13 @@ struct device; | 7416 | @@ -12,13 +12,13 @@ struct device; |
7287 | enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; | 7417 | enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; |
7288 | 7418 | ||
@@ -7323,9 +7453,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/microcode.h linux-2.6.32.15/arch | |||
7323 | { | 7453 | { |
7324 | return NULL; | 7454 | return NULL; |
7325 | } | 7455 | } |
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 | 7456 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/mman.h linux-2.6.32.16/arch/x86/include/asm/mman.h |
7327 | --- linux-2.6.32.15/arch/x86/include/asm/mman.h 2010-03-15 11:52:04.000000000 -0400 | 7457 | --- linux-2.6.32.16/arch/x86/include/asm/mman.h 2010-07-05 14:14:00.000000000 -0400 |
7328 | +++ linux-2.6.32.15/arch/x86/include/asm/mman.h 2010-05-28 21:27:14.911025615 -0400 | 7458 | +++ linux-2.6.32.16/arch/x86/include/asm/mman.h 2010-07-09 14:50:35.000000000 -0400 |
7329 | @@ -5,4 +5,14 @@ | 7459 | @@ -5,4 +5,14 @@ |
7330 | 7460 | ||
7331 | #include <asm-generic/mman.h> | 7461 | #include <asm-generic/mman.h> |
@@ -7341,9 +7471,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/mman.h linux-2.6.32.15/arch/x86/ | |||
7341 | +#endif | 7471 | +#endif |
7342 | + | 7472 | + |
7343 | #endif /* _ASM_X86_MMAN_H */ | 7473 | #endif /* _ASM_X86_MMAN_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 | 7474 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/mmu_context.h linux-2.6.32.16/arch/x86/include/asm/mmu_context.h |
7345 | --- linux-2.6.32.15/arch/x86/include/asm/mmu_context.h 2010-03-15 11:52:04.000000000 -0400 | 7475 | --- linux-2.6.32.16/arch/x86/include/asm/mmu_context.h 2010-07-05 14:14:00.000000000 -0400 |
7346 | +++ linux-2.6.32.15/arch/x86/include/asm/mmu_context.h 2010-05-28 21:27:14.915041226 -0400 | 7476 | +++ linux-2.6.32.16/arch/x86/include/asm/mmu_context.h 2010-07-09 14:50:35.000000000 -0400 |
7347 | @@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m | 7477 | @@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m |
7348 | 7478 | ||
7349 | static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) | 7479 | static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) |
@@ -7468,9 +7598,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/mmu_context.h linux-2.6.32.15/ar | |||
7468 | } | 7598 | } |
7469 | 7599 | ||
7470 | #define activate_mm(prev, next) \ | 7600 | #define activate_mm(prev, next) \ |
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 | 7601 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/mmu.h linux-2.6.32.16/arch/x86/include/asm/mmu.h |
7472 | --- linux-2.6.32.15/arch/x86/include/asm/mmu.h 2010-03-15 11:52:04.000000000 -0400 | 7602 | --- linux-2.6.32.16/arch/x86/include/asm/mmu.h 2010-07-05 14:14:00.000000000 -0400 |
7473 | +++ linux-2.6.32.15/arch/x86/include/asm/mmu.h 2010-05-28 21:27:14.915041226 -0400 | 7603 | +++ linux-2.6.32.16/arch/x86/include/asm/mmu.h 2010-07-09 14:50:35.000000000 -0400 |
7474 | @@ -9,10 +9,23 @@ | 7604 | @@ -9,10 +9,23 @@ |
7475 | * we put the segment information here. | 7605 | * we put the segment information here. |
7476 | */ | 7606 | */ |
@@ -7497,9 +7627,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/mmu.h linux-2.6.32.15/arch/x86/i | |||
7497 | } mm_context_t; | 7627 | } mm_context_t; |
7498 | 7628 | ||
7499 | #ifdef CONFIG_SMP | 7629 | #ifdef CONFIG_SMP |
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 | 7630 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/module.h linux-2.6.32.16/arch/x86/include/asm/module.h |
7501 | --- linux-2.6.32.15/arch/x86/include/asm/module.h 2010-03-15 11:52:04.000000000 -0400 | 7631 | --- linux-2.6.32.16/arch/x86/include/asm/module.h 2010-07-05 14:14:00.000000000 -0400 |
7502 | +++ linux-2.6.32.15/arch/x86/include/asm/module.h 2010-05-28 21:27:14.915041226 -0400 | 7632 | +++ linux-2.6.32.16/arch/x86/include/asm/module.h 2010-07-09 14:50:35.000000000 -0400 |
7503 | @@ -59,13 +59,31 @@ | 7633 | @@ -59,13 +59,31 @@ |
7504 | #error unknown processor family | 7634 | #error unknown processor family |
7505 | #endif | 7635 | #endif |
@@ -7533,9 +7663,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/module.h linux-2.6.32.15/arch/x8 | |||
7533 | #endif | 7663 | #endif |
7534 | 7664 | ||
7535 | #endif /* _ASM_X86_MODULE_H */ | 7665 | #endif /* _ASM_X86_MODULE_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 | 7666 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/page_32_types.h linux-2.6.32.16/arch/x86/include/asm/page_32_types.h |
7537 | --- linux-2.6.32.15/arch/x86/include/asm/page_32_types.h 2010-03-15 11:52:04.000000000 -0400 | 7667 | --- linux-2.6.32.16/arch/x86/include/asm/page_32_types.h 2010-07-05 14:14:00.000000000 -0400 |
7538 | +++ linux-2.6.32.15/arch/x86/include/asm/page_32_types.h 2010-05-28 21:27:14.915041226 -0400 | 7668 | +++ linux-2.6.32.16/arch/x86/include/asm/page_32_types.h 2010-07-09 14:50:35.000000000 -0400 |
7539 | @@ -15,6 +15,10 @@ | 7669 | @@ -15,6 +15,10 @@ |
7540 | */ | 7670 | */ |
7541 | #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) | 7671 | #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) |
@@ -7547,9 +7677,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/page_32_types.h linux-2.6.32.15/ | |||
7547 | #ifdef CONFIG_4KSTACKS | 7677 | #ifdef CONFIG_4KSTACKS |
7548 | #define THREAD_ORDER 0 | 7678 | #define THREAD_ORDER 0 |
7549 | #else | 7679 | #else |
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 | 7680 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/page_64_types.h linux-2.6.32.16/arch/x86/include/asm/page_64_types.h |
7551 | --- linux-2.6.32.15/arch/x86/include/asm/page_64_types.h 2010-03-15 11:52:04.000000000 -0400 | 7681 | --- linux-2.6.32.16/arch/x86/include/asm/page_64_types.h 2010-07-05 14:14:00.000000000 -0400 |
7552 | +++ linux-2.6.32.15/arch/x86/include/asm/page_64_types.h 2010-05-28 21:27:14.915041226 -0400 | 7682 | +++ linux-2.6.32.16/arch/x86/include/asm/page_64_types.h 2010-07-09 14:50:35.000000000 -0400 |
7553 | @@ -39,6 +39,9 @@ | 7683 | @@ -39,6 +39,9 @@ |
7554 | #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START) | 7684 | #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START) |
7555 | #define __START_KERNEL_map _AC(0xffffffff80000000, UL) | 7685 | #define __START_KERNEL_map _AC(0xffffffff80000000, UL) |
@@ -7560,9 +7690,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/page_64_types.h linux-2.6.32.15/ | |||
7560 | /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */ | 7690 | /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */ |
7561 | #define __PHYSICAL_MASK_SHIFT 46 | 7691 | #define __PHYSICAL_MASK_SHIFT 46 |
7562 | #define __VIRTUAL_MASK_SHIFT 47 | 7692 | #define __VIRTUAL_MASK_SHIFT 47 |
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 | 7693 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/paravirt.h linux-2.6.32.16/arch/x86/include/asm/paravirt.h |
7564 | --- linux-2.6.32.15/arch/x86/include/asm/paravirt.h 2010-03-15 11:52:04.000000000 -0400 | 7694 | --- linux-2.6.32.16/arch/x86/include/asm/paravirt.h 2010-07-05 14:14:00.000000000 -0400 |
7565 | +++ linux-2.6.32.15/arch/x86/include/asm/paravirt.h 2010-06-19 10:03:50.008525890 -0400 | 7695 | +++ linux-2.6.32.16/arch/x86/include/asm/paravirt.h 2010-07-09 14:50:35.000000000 -0400 |
7566 | @@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned | 7696 | @@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned |
7567 | pv_mmu_ops.set_fixmap(idx, phys, flags); | 7697 | pv_mmu_ops.set_fixmap(idx, phys, flags); |
7568 | } | 7698 | } |
@@ -7570,12 +7700,12 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/paravirt.h linux-2.6.32.15/arch/ | |||
7570 | +#ifdef CONFIG_PAX_KERNEXEC | 7700 | +#ifdef CONFIG_PAX_KERNEXEC |
7571 | +static inline unsigned long pax_open_kernel(void) | 7701 | +static inline unsigned long pax_open_kernel(void) |
7572 | +{ | 7702 | +{ |
7573 | + return pv_mmu_ops.pax_open_kernel(); | 7703 | + return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel); |
7574 | +} | 7704 | +} |
7575 | + | 7705 | + |
7576 | +static inline unsigned long pax_close_kernel(void) | 7706 | +static inline unsigned long pax_close_kernel(void) |
7577 | +{ | 7707 | +{ |
7578 | + return pv_mmu_ops.pax_close_kernel(); | 7708 | + return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel); |
7579 | +} | 7709 | +} |
7580 | +#else | 7710 | +#else |
7581 | +static inline unsigned long pax_open_kernel(void) { return 0; } | 7711 | +static inline unsigned long pax_open_kernel(void) { return 0; } |
@@ -7616,9 +7746,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/paravirt.h linux-2.6.32.15/arch/ | |||
7616 | #endif /* CONFIG_X86_32 */ | 7746 | #endif /* CONFIG_X86_32 */ |
7617 | 7747 | ||
7618 | #endif /* __ASSEMBLY__ */ | 7748 | #endif /* __ASSEMBLY__ */ |
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 | 7749 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/paravirt_types.h linux-2.6.32.16/arch/x86/include/asm/paravirt_types.h |
7620 | --- linux-2.6.32.15/arch/x86/include/asm/paravirt_types.h 2010-03-15 11:52:04.000000000 -0400 | 7750 | --- linux-2.6.32.16/arch/x86/include/asm/paravirt_types.h 2010-07-05 14:14:00.000000000 -0400 |
7621 | +++ linux-2.6.32.15/arch/x86/include/asm/paravirt_types.h 2010-05-28 21:27:14.915041226 -0400 | 7751 | +++ linux-2.6.32.16/arch/x86/include/asm/paravirt_types.h 2010-07-09 14:50:35.000000000 -0400 |
7622 | @@ -316,6 +316,12 @@ struct pv_mmu_ops { | 7752 | @@ -316,6 +316,12 @@ struct pv_mmu_ops { |
7623 | an mfn. We can tell which is which from the index. */ | 7753 | an mfn. We can tell which is which from the index. */ |
7624 | void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, | 7754 | void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, |
@@ -7632,9 +7762,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/paravirt_types.h linux-2.6.32.15 | |||
7632 | }; | 7762 | }; |
7633 | 7763 | ||
7634 | struct raw_spinlock; | 7764 | struct raw_spinlock; |
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 | 7765 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/pci_x86.h linux-2.6.32.16/arch/x86/include/asm/pci_x86.h |
7636 | --- linux-2.6.32.15/arch/x86/include/asm/pci_x86.h 2010-03-15 11:52:04.000000000 -0400 | 7766 | --- linux-2.6.32.16/arch/x86/include/asm/pci_x86.h 2010-07-05 14:14:00.000000000 -0400 |
7637 | +++ linux-2.6.32.15/arch/x86/include/asm/pci_x86.h 2010-05-28 21:27:14.915041226 -0400 | 7767 | +++ linux-2.6.32.16/arch/x86/include/asm/pci_x86.h 2010-07-09 14:50:35.000000000 -0400 |
7638 | @@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct | 7768 | @@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct |
7639 | extern void (*pcibios_disable_irq)(struct pci_dev *dev); | 7769 | extern void (*pcibios_disable_irq)(struct pci_dev *dev); |
7640 | 7770 | ||
@@ -7657,9 +7787,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/pci_x86.h linux-2.6.32.15/arch/x | |||
7657 | extern bool port_cf9_safe; | 7787 | extern bool port_cf9_safe; |
7658 | 7788 | ||
7659 | /* arch_initcall level */ | 7789 | /* arch_initcall level */ |
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 | 7790 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgalloc.h linux-2.6.32.16/arch/x86/include/asm/pgalloc.h |
7661 | --- linux-2.6.32.15/arch/x86/include/asm/pgalloc.h 2010-03-15 11:52:04.000000000 -0400 | 7791 | --- linux-2.6.32.16/arch/x86/include/asm/pgalloc.h 2010-07-05 14:14:00.000000000 -0400 |
7662 | +++ linux-2.6.32.15/arch/x86/include/asm/pgalloc.h 2010-05-28 21:27:14.915041226 -0400 | 7792 | +++ linux-2.6.32.16/arch/x86/include/asm/pgalloc.h 2010-07-09 14:50:35.000000000 -0400 |
7663 | @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s | 7793 | @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s |
7664 | pmd_t *pmd, pte_t *pte) | 7794 | pmd_t *pmd, pte_t *pte) |
7665 | { | 7795 | { |
@@ -7674,9 +7804,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgalloc.h linux-2.6.32.15/arch/x | |||
7674 | set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); | 7804 | set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); |
7675 | } | 7805 | } |
7676 | 7806 | ||
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 | 7807 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.16/arch/x86/include/asm/pgtable-2level.h |
7678 | --- linux-2.6.32.15/arch/x86/include/asm/pgtable-2level.h 2010-03-15 11:52:04.000000000 -0400 | 7808 | --- linux-2.6.32.16/arch/x86/include/asm/pgtable-2level.h 2010-07-05 14:14:00.000000000 -0400 |
7679 | +++ linux-2.6.32.15/arch/x86/include/asm/pgtable-2level.h 2010-05-28 21:27:14.915041226 -0400 | 7809 | +++ linux-2.6.32.16/arch/x86/include/asm/pgtable-2level.h 2010-07-09 14:50:35.000000000 -0400 |
7680 | @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t | 7810 | @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t |
7681 | 7811 | ||
7682 | static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) | 7812 | static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) |
@@ -7687,9 +7817,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.15 | |||
7687 | } | 7817 | } |
7688 | 7818 | ||
7689 | static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) | 7819 | static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) |
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 | 7820 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable_32.h linux-2.6.32.16/arch/x86/include/asm/pgtable_32.h |
7691 | --- linux-2.6.32.15/arch/x86/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400 | 7821 | --- linux-2.6.32.16/arch/x86/include/asm/pgtable_32.h 2010-07-05 14:14:00.000000000 -0400 |
7692 | +++ linux-2.6.32.15/arch/x86/include/asm/pgtable_32.h 2010-05-28 21:27:14.915041226 -0400 | 7822 | +++ linux-2.6.32.16/arch/x86/include/asm/pgtable_32.h 2010-07-09 14:50:35.000000000 -0400 |
7693 | @@ -26,8 +26,6 @@ | 7823 | @@ -26,8 +26,6 @@ |
7694 | struct mm_struct; | 7824 | struct mm_struct; |
7695 | struct vm_area_struct; | 7825 | struct vm_area_struct; |
@@ -7731,9 +7861,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable_32.h linux-2.6.32.15/arc | |||
7731 | /* | 7861 | /* |
7732 | * kern_addr_valid() is (1) for FLATMEM and (0) for | 7862 | * kern_addr_valid() is (1) for FLATMEM and (0) for |
7733 | * SPARSEMEM and DISCONTIGMEM | 7863 | * SPARSEMEM and DISCONTIGMEM |
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 | 7864 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.16/arch/x86/include/asm/pgtable_32_types.h |
7735 | --- linux-2.6.32.15/arch/x86/include/asm/pgtable_32_types.h 2010-03-15 11:52:04.000000000 -0400 | 7865 | --- linux-2.6.32.16/arch/x86/include/asm/pgtable_32_types.h 2010-07-05 14:14:00.000000000 -0400 |
7736 | +++ linux-2.6.32.15/arch/x86/include/asm/pgtable_32_types.h 2010-05-28 21:27:14.915041226 -0400 | 7866 | +++ linux-2.6.32.16/arch/x86/include/asm/pgtable_32_types.h 2010-07-09 14:50:35.000000000 -0400 |
7737 | @@ -8,7 +8,7 @@ | 7867 | @@ -8,7 +8,7 @@ |
7738 | */ | 7868 | */ |
7739 | #ifdef CONFIG_X86_PAE | 7869 | #ifdef CONFIG_X86_PAE |
@@ -7763,9 +7893,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32. | |||
7763 | #define MODULES_VADDR VMALLOC_START | 7893 | #define MODULES_VADDR VMALLOC_START |
7764 | #define MODULES_END VMALLOC_END | 7894 | #define MODULES_END VMALLOC_END |
7765 | #define MODULES_LEN (MODULES_VADDR - MODULES_END) | 7895 | #define MODULES_LEN (MODULES_VADDR - MODULES_END) |
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 | 7896 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.16/arch/x86/include/asm/pgtable-3level.h |
7767 | --- linux-2.6.32.15/arch/x86/include/asm/pgtable-3level.h 2010-03-15 11:52:04.000000000 -0400 | 7897 | --- linux-2.6.32.16/arch/x86/include/asm/pgtable-3level.h 2010-07-05 14:14:00.000000000 -0400 |
7768 | +++ linux-2.6.32.15/arch/x86/include/asm/pgtable-3level.h 2010-06-19 10:03:50.008525890 -0400 | 7898 | +++ linux-2.6.32.16/arch/x86/include/asm/pgtable-3level.h 2010-07-09 14:50:35.000000000 -0400 |
7769 | @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic | 7899 | @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic |
7770 | 7900 | ||
7771 | static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) | 7901 | static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) |
@@ -7783,9 +7913,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.15 | |||
7783 | } | 7913 | } |
7784 | 7914 | ||
7785 | /* | 7915 | /* |
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 | 7916 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable_64.h linux-2.6.32.16/arch/x86/include/asm/pgtable_64.h |
7787 | --- linux-2.6.32.15/arch/x86/include/asm/pgtable_64.h 2010-03-15 11:52:04.000000000 -0400 | 7917 | --- linux-2.6.32.16/arch/x86/include/asm/pgtable_64.h 2010-07-05 14:14:00.000000000 -0400 |
7788 | +++ linux-2.6.32.15/arch/x86/include/asm/pgtable_64.h 2010-06-19 10:03:50.008525890 -0400 | 7918 | +++ linux-2.6.32.16/arch/x86/include/asm/pgtable_64.h 2010-07-09 14:50:35.000000000 -0400 |
7789 | @@ -16,10 +16,13 @@ | 7919 | @@ -16,10 +16,13 @@ |
7790 | 7920 | ||
7791 | extern pud_t level3_kernel_pgt[512]; | 7921 | extern pud_t level3_kernel_pgt[512]; |
@@ -7822,9 +7952,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable_64.h linux-2.6.32.15/arc | |||
7822 | } | 7952 | } |
7823 | 7953 | ||
7824 | static inline void native_pgd_clear(pgd_t *pgd) | 7954 | static inline void native_pgd_clear(pgd_t *pgd) |
7825 | 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 | 7955 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.16/arch/x86/include/asm/pgtable_64_types.h |
7826 | --- linux-2.6.32.15/arch/x86/include/asm/pgtable_64_types.h 2010-03-15 11:52:04.000000000 -0400 | 7956 | --- linux-2.6.32.16/arch/x86/include/asm/pgtable_64_types.h 2010-07-05 14:14:00.000000000 -0400 |
7827 | +++ linux-2.6.32.15/arch/x86/include/asm/pgtable_64_types.h 2010-05-28 21:27:14.915041226 -0400 | 7957 | +++ linux-2.6.32.16/arch/x86/include/asm/pgtable_64_types.h 2010-07-09 14:50:35.000000000 -0400 |
7828 | @@ -59,5 +59,7 @@ typedef struct { pteval_t pte; } pte_t; | 7958 | @@ -59,5 +59,7 @@ typedef struct { pteval_t pte; } pte_t; |
7829 | #define MODULES_VADDR _AC(0xffffffffa0000000, UL) | 7959 | #define MODULES_VADDR _AC(0xffffffffa0000000, UL) |
7830 | #define MODULES_END _AC(0xffffffffff000000, UL) | 7960 | #define MODULES_END _AC(0xffffffffff000000, UL) |
@@ -7833,9 +7963,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32. | |||
7833 | +#define MODULES_EXEC_END MODULES_END | 7963 | +#define MODULES_EXEC_END MODULES_END |
7834 | 7964 | ||
7835 | #endif /* _ASM_X86_PGTABLE_64_DEFS_H */ | 7965 | #endif /* _ASM_X86_PGTABLE_64_DEFS_H */ |
7836 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable.h linux-2.6.32.15/arch/x86/include/asm/pgtable.h | 7966 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable.h linux-2.6.32.16/arch/x86/include/asm/pgtable.h |
7837 | --- linux-2.6.32.15/arch/x86/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 | 7967 | --- linux-2.6.32.16/arch/x86/include/asm/pgtable.h 2010-07-05 14:14:00.000000000 -0400 |
7838 | +++ linux-2.6.32.15/arch/x86/include/asm/pgtable.h 2010-06-19 10:03:50.008525890 -0400 | 7968 | +++ linux-2.6.32.16/arch/x86/include/asm/pgtable.h 2010-07-09 14:50:35.000000000 -0400 |
7839 | @@ -74,12 +74,51 @@ extern struct list_head pgd_list; | 7969 | @@ -74,12 +74,51 @@ extern struct list_head pgd_list; |
7840 | 7970 | ||
7841 | #define arch_end_context_switch(prev) do {} while(0) | 7971 | #define arch_end_context_switch(prev) do {} while(0) |
@@ -8005,9 +8135,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable.h linux-2.6.32.15/arch/x | |||
8005 | 8135 | ||
8006 | #include <asm-generic/pgtable.h> | 8136 | #include <asm-generic/pgtable.h> |
8007 | #endif /* __ASSEMBLY__ */ | 8137 | #endif /* __ASSEMBLY__ */ |
8008 | 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 | 8138 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable_types.h linux-2.6.32.16/arch/x86/include/asm/pgtable_types.h |
8009 | --- linux-2.6.32.15/arch/x86/include/asm/pgtable_types.h 2010-03-15 11:52:04.000000000 -0400 | 8139 | --- linux-2.6.32.16/arch/x86/include/asm/pgtable_types.h 2010-07-05 14:14:00.000000000 -0400 |
8010 | +++ linux-2.6.32.15/arch/x86/include/asm/pgtable_types.h 2010-05-28 21:27:14.918896182 -0400 | 8140 | +++ linux-2.6.32.16/arch/x86/include/asm/pgtable_types.h 2010-07-09 14:50:35.000000000 -0400 |
8011 | @@ -16,12 +16,11 @@ | 8141 | @@ -16,12 +16,11 @@ |
8012 | #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ | 8142 | #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ |
8013 | #define _PAGE_BIT_PAT 7 /* on 4KB pages */ | 8143 | #define _PAGE_BIT_PAT 7 /* on 4KB pages */ |
@@ -8092,9 +8222,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable_types.h linux-2.6.32.15/ | |||
8092 | 8222 | ||
8093 | #define pgprot_writecombine pgprot_writecombine | 8223 | #define pgprot_writecombine pgprot_writecombine |
8094 | extern pgprot_t pgprot_writecombine(pgprot_t prot); | 8224 | extern pgprot_t pgprot_writecombine(pgprot_t prot); |
8095 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/processor.h linux-2.6.32.15/arch/x86/include/asm/processor.h | 8225 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/processor.h linux-2.6.32.16/arch/x86/include/asm/processor.h |
8096 | --- linux-2.6.32.15/arch/x86/include/asm/processor.h 2010-03-15 11:52:04.000000000 -0400 | 8226 | --- linux-2.6.32.16/arch/x86/include/asm/processor.h 2010-07-05 14:14:00.000000000 -0400 |
8097 | +++ linux-2.6.32.15/arch/x86/include/asm/processor.h 2010-05-28 21:27:14.918896182 -0400 | 8227 | +++ linux-2.6.32.16/arch/x86/include/asm/processor.h 2010-07-09 14:50:35.000000000 -0400 |
8098 | @@ -272,7 +272,7 @@ struct tss_struct { | 8228 | @@ -272,7 +272,7 @@ struct tss_struct { |
8099 | 8229 | ||
8100 | } ____cacheline_aligned; | 8230 | } ____cacheline_aligned; |
@@ -8179,9 +8309,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/processor.h linux-2.6.32.15/arch | |||
8179 | #define KSTK_EIP(task) (task_pt_regs(task)->ip) | 8309 | #define KSTK_EIP(task) (task_pt_regs(task)->ip) |
8180 | 8310 | ||
8181 | /* Get/set a process' ability to use the timestamp counter instruction */ | 8311 | /* Get/set a process' ability to use the timestamp counter instruction */ |
8182 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/ptrace.h linux-2.6.32.15/arch/x86/include/asm/ptrace.h | 8312 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/ptrace.h linux-2.6.32.16/arch/x86/include/asm/ptrace.h |
8183 | --- linux-2.6.32.15/arch/x86/include/asm/ptrace.h 2010-03-15 11:52:04.000000000 -0400 | 8313 | --- linux-2.6.32.16/arch/x86/include/asm/ptrace.h 2010-07-05 14:14:00.000000000 -0400 |
8184 | +++ linux-2.6.32.15/arch/x86/include/asm/ptrace.h 2010-05-28 21:27:14.918896182 -0400 | 8314 | +++ linux-2.6.32.16/arch/x86/include/asm/ptrace.h 2010-07-09 14:50:35.000000000 -0400 |
8185 | @@ -151,28 +151,29 @@ static inline unsigned long regs_return_ | 8315 | @@ -151,28 +151,29 @@ static inline unsigned long regs_return_ |
8186 | } | 8316 | } |
8187 | 8317 | ||
@@ -8218,9 +8348,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/ptrace.h linux-2.6.32.15/arch/x8 | |||
8218 | #endif | 8348 | #endif |
8219 | } | 8349 | } |
8220 | 8350 | ||
8221 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/reboot.h linux-2.6.32.15/arch/x86/include/asm/reboot.h | 8351 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/reboot.h linux-2.6.32.16/arch/x86/include/asm/reboot.h |
8222 | --- linux-2.6.32.15/arch/x86/include/asm/reboot.h 2010-03-15 11:52:04.000000000 -0400 | 8352 | --- linux-2.6.32.16/arch/x86/include/asm/reboot.h 2010-07-05 14:14:00.000000000 -0400 |
8223 | +++ linux-2.6.32.15/arch/x86/include/asm/reboot.h 2010-05-28 21:27:14.918896182 -0400 | 8353 | +++ linux-2.6.32.16/arch/x86/include/asm/reboot.h 2010-07-09 14:50:35.000000000 -0400 |
8224 | @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; | 8354 | @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; |
8225 | 8355 | ||
8226 | void native_machine_crash_shutdown(struct pt_regs *regs); | 8356 | void native_machine_crash_shutdown(struct pt_regs *regs); |
@@ -8230,9 +8360,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/reboot.h linux-2.6.32.15/arch/x8 | |||
8230 | 8360 | ||
8231 | typedef void (*nmi_shootdown_cb)(int, struct die_args*); | 8361 | typedef void (*nmi_shootdown_cb)(int, struct die_args*); |
8232 | void nmi_shootdown_cpus(nmi_shootdown_cb callback); | 8362 | void nmi_shootdown_cpus(nmi_shootdown_cb callback); |
8233 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/rwsem.h linux-2.6.32.15/arch/x86/include/asm/rwsem.h | 8363 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/rwsem.h linux-2.6.32.16/arch/x86/include/asm/rwsem.h |
8234 | --- linux-2.6.32.15/arch/x86/include/asm/rwsem.h 2010-04-29 17:49:37.501451369 -0400 | 8364 | --- linux-2.6.32.16/arch/x86/include/asm/rwsem.h 2010-07-05 14:14:00.000000000 -0400 |
8235 | +++ linux-2.6.32.15/arch/x86/include/asm/rwsem.h 2010-05-28 21:27:14.918896182 -0400 | 8365 | +++ linux-2.6.32.16/arch/x86/include/asm/rwsem.h 2010-07-09 14:50:35.000000000 -0400 |
8236 | @@ -118,10 +118,26 @@ static inline void __down_read(struct rw | 8366 | @@ -118,10 +118,26 @@ static inline void __down_read(struct rw |
8237 | { | 8367 | { |
8238 | asm volatile("# beginning down_read\n\t" | 8368 | asm volatile("# beginning down_read\n\t" |
@@ -8468,9 +8598,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/rwsem.h linux-2.6.32.15/arch/x86 | |||
8468 | : "+r" (tmp), "+m" (sem->count) | 8598 | : "+r" (tmp), "+m" (sem->count) |
8469 | : : "memory"); | 8599 | : : "memory"); |
8470 | 8600 | ||
8471 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/segment.h linux-2.6.32.15/arch/x86/include/asm/segment.h | 8601 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/segment.h linux-2.6.32.16/arch/x86/include/asm/segment.h |
8472 | --- linux-2.6.32.15/arch/x86/include/asm/segment.h 2010-03-15 11:52:04.000000000 -0400 | 8602 | --- linux-2.6.32.16/arch/x86/include/asm/segment.h 2010-07-05 14:14:00.000000000 -0400 |
8473 | +++ linux-2.6.32.15/arch/x86/include/asm/segment.h 2010-05-28 21:27:14.918896182 -0400 | 8603 | +++ linux-2.6.32.16/arch/x86/include/asm/segment.h 2010-07-09 14:50:35.000000000 -0400 |
8474 | @@ -62,8 +62,8 @@ | 8604 | @@ -62,8 +62,8 @@ |
8475 | * 26 - ESPFIX small SS | 8605 | * 26 - ESPFIX small SS |
8476 | * 27 - per-cpu [ offset to per-cpu data area ] | 8606 | * 27 - per-cpu [ offset to per-cpu data area ] |
@@ -8539,9 +8669,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/segment.h linux-2.6.32.15/arch/x | |||
8539 | #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8) | 8669 | #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8) |
8540 | #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3) | 8670 | #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3) |
8541 | #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3) | 8671 | #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3) |
8542 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/spinlock.h linux-2.6.32.15/arch/x86/include/asm/spinlock.h | 8672 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/spinlock.h linux-2.6.32.16/arch/x86/include/asm/spinlock.h |
8543 | --- linux-2.6.32.15/arch/x86/include/asm/spinlock.h 2010-03-15 11:52:04.000000000 -0400 | 8673 | --- linux-2.6.32.16/arch/x86/include/asm/spinlock.h 2010-07-05 14:14:00.000000000 -0400 |
8544 | +++ linux-2.6.32.15/arch/x86/include/asm/spinlock.h 2010-05-28 21:27:14.918896182 -0400 | 8674 | +++ linux-2.6.32.16/arch/x86/include/asm/spinlock.h 2010-07-09 14:50:35.000000000 -0400 |
8545 | @@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r | 8675 | @@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r |
8546 | static inline void __raw_read_lock(raw_rwlock_t *rw) | 8676 | static inline void __raw_read_lock(raw_rwlock_t *rw) |
8547 | { | 8677 | { |
@@ -8645,9 +8775,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/spinlock.h linux-2.6.32.15/arch/ | |||
8645 | : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); | 8775 | : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); |
8646 | } | 8776 | } |
8647 | 8777 | ||
8648 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/system.h linux-2.6.32.15/arch/x86/include/asm/system.h | 8778 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/system.h linux-2.6.32.16/arch/x86/include/asm/system.h |
8649 | --- linux-2.6.32.15/arch/x86/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400 | 8779 | --- linux-2.6.32.16/arch/x86/include/asm/system.h 2010-07-05 14:14:00.000000000 -0400 |
8650 | +++ linux-2.6.32.15/arch/x86/include/asm/system.h 2010-05-28 21:27:14.922894828 -0400 | 8780 | +++ linux-2.6.32.16/arch/x86/include/asm/system.h 2010-07-09 14:50:35.000000000 -0400 |
8651 | @@ -200,7 +200,7 @@ static inline unsigned long get_limit(un | 8781 | @@ -200,7 +200,7 @@ static inline unsigned long get_limit(un |
8652 | { | 8782 | { |
8653 | unsigned long __limit; | 8783 | unsigned long __limit; |
@@ -8666,9 +8796,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/system.h linux-2.6.32.15/arch/x8 | |||
8666 | extern void free_init_pages(char *what, unsigned long begin, unsigned long end); | 8796 | extern void free_init_pages(char *what, unsigned long begin, unsigned long end); |
8667 | 8797 | ||
8668 | void default_idle(void); | 8798 | void default_idle(void); |
8669 | 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 | 8799 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/uaccess_32.h linux-2.6.32.16/arch/x86/include/asm/uaccess_32.h |
8670 | --- linux-2.6.32.15/arch/x86/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400 | 8800 | --- linux-2.6.32.16/arch/x86/include/asm/uaccess_32.h 2010-07-05 14:14:00.000000000 -0400 |
8671 | +++ linux-2.6.32.15/arch/x86/include/asm/uaccess_32.h 2010-05-28 21:27:14.922894828 -0400 | 8801 | +++ linux-2.6.32.16/arch/x86/include/asm/uaccess_32.h 2010-07-09 14:50:35.000000000 -0400 |
8672 | @@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u | 8802 | @@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u |
8673 | static __always_inline unsigned long __must_check | 8803 | static __always_inline unsigned long __must_check |
8674 | __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) | 8804 | __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) |
@@ -8798,9 +8928,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess_32.h linux-2.6.32.15/arc | |||
8798 | long __must_check strncpy_from_user(char *dst, const char __user *src, | 8928 | long __must_check strncpy_from_user(char *dst, const char __user *src, |
8799 | long count); | 8929 | long count); |
8800 | long __must_check __strncpy_from_user(char *dst, | 8930 | long __must_check __strncpy_from_user(char *dst, |
8801 | 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 | 8931 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/uaccess_64.h linux-2.6.32.16/arch/x86/include/asm/uaccess_64.h |
8802 | --- linux-2.6.32.15/arch/x86/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400 | 8932 | --- linux-2.6.32.16/arch/x86/include/asm/uaccess_64.h 2010-07-05 14:14:00.000000000 -0400 |
8803 | +++ linux-2.6.32.15/arch/x86/include/asm/uaccess_64.h 2010-05-28 21:27:14.922894828 -0400 | 8933 | +++ linux-2.6.32.16/arch/x86/include/asm/uaccess_64.h 2010-07-09 14:50:35.000000000 -0400 |
8804 | @@ -9,6 +9,9 @@ | 8934 | @@ -9,6 +9,9 @@ |
8805 | #include <linux/prefetch.h> | 8935 | #include <linux/prefetch.h> |
8806 | #include <linux/lockdep.h> | 8936 | #include <linux/lockdep.h> |
@@ -8992,19 +9122,26 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess_64.h linux-2.6.32.15/arc | |||
8992 | copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); | 9122 | copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); |
8993 | 9123 | ||
8994 | #endif /* _ASM_X86_UACCESS_64_H */ | 9124 | #endif /* _ASM_X86_UACCESS_64_H */ |
8995 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess.h linux-2.6.32.15/arch/x86/include/asm/uaccess.h | 9125 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/uaccess.h linux-2.6.32.16/arch/x86/include/asm/uaccess.h |
8996 | --- linux-2.6.32.15/arch/x86/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 | 9126 | --- linux-2.6.32.16/arch/x86/include/asm/uaccess.h 2010-07-05 14:14:00.000000000 -0400 |
8997 | +++ linux-2.6.32.15/arch/x86/include/asm/uaccess.h 2010-05-28 21:27:14.922894828 -0400 | 9127 | +++ linux-2.6.32.16/arch/x86/include/asm/uaccess.h 2010-07-11 21:16:08.000000000 -0400 |
8998 | @@ -8,6 +8,8 @@ | 9128 | @@ -8,12 +8,15 @@ |
8999 | #include <linux/thread_info.h> | 9129 | #include <linux/thread_info.h> |
9000 | #include <linux/prefetch.h> | 9130 | #include <linux/prefetch.h> |
9001 | #include <linux/string.h> | 9131 | #include <linux/string.h> |
9002 | +#include <linux/sched.h> | 9132 | +#include <linux/sched.h> |
9003 | +#include <linux/slab.h> | ||
9004 | #include <asm/asm.h> | 9133 | #include <asm/asm.h> |
9005 | #include <asm/page.h> | 9134 | #include <asm/page.h> |
9006 | 9135 | ||
9007 | @@ -29,7 +31,12 @@ | 9136 | #define VERIFY_READ 0 |
9137 | #define VERIFY_WRITE 1 | ||
9138 | |||
9139 | +extern void check_object_size(const void *ptr, unsigned long n, bool to); | ||
9140 | + | ||
9141 | /* | ||
9142 | * The fs value determines whether argument validity checking should be | ||
9143 | * performed or not. If get_fs() == USER_DS, checking is performed, with | ||
9144 | @@ -29,7 +32,12 @@ | ||
9008 | 9145 | ||
9009 | #define get_ds() (KERNEL_DS) | 9146 | #define get_ds() (KERNEL_DS) |
9010 | #define get_fs() (current_thread_info()->addr_limit) | 9147 | #define get_fs() (current_thread_info()->addr_limit) |
@@ -9017,7 +9154,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess.h linux-2.6.32.15/arch/x | |||
9017 | 9154 | ||
9018 | #define segment_eq(a, b) ((a).seg == (b).seg) | 9155 | #define segment_eq(a, b) ((a).seg == (b).seg) |
9019 | 9156 | ||
9020 | @@ -77,7 +84,33 @@ | 9157 | @@ -77,7 +85,33 @@ |
9021 | * checks that the pointer is in the user space range - after calling | 9158 | * checks that the pointer is in the user space range - after calling |
9022 | * this function, memory access functions may still return -EFAULT. | 9159 | * this function, memory access functions may still return -EFAULT. |
9023 | */ | 9160 | */ |
@@ -9052,9 +9189,22 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess.h linux-2.6.32.15/arch/x | |||
9052 | 9189 | ||
9053 | /* | 9190 | /* |
9054 | * The exception table consists of pairs of addresses: the first is the | 9191 | * The exception table consists of pairs of addresses: the first is the |
9055 | @@ -183,13 +216,21 @@ extern int __get_user_bad(void); | 9192 | @@ -179,17 +213,34 @@ extern int __get_user_bad(void); |
9193 | __ret_gu; \ | ||
9194 | }) | ||
9195 | |||
9196 | +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) | ||
9197 | +#define __put_user_x(size, x, ptr, __ret_pu) \ | ||
9198 | + ({ \ | ||
9199 | + int __dummy; \ | ||
9200 | + asm volatile("call __put_user_" #size : "=a" (__ret_pu), "=c" (__dummy) \ | ||
9201 | + : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx"); \ | ||
9202 | + }) | ||
9203 | +#else | ||
9204 | #define __put_user_x(size, x, ptr, __ret_pu) \ | ||
9056 | asm volatile("call __put_user_" #size : "=a" (__ret_pu) \ | 9205 | asm volatile("call __put_user_" #size : "=a" (__ret_pu) \ |
9057 | : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") | 9206 | : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") |
9207 | +#endif | ||
9058 | 9208 | ||
9059 | - | 9209 | - |
9060 | +#ifdef CONFIG_X86_32 | 9210 | +#ifdef CONFIG_X86_32 |
@@ -9077,7 +9227,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess.h linux-2.6.32.15/arch/x | |||
9077 | ".section .fixup,\"ax\"\n" \ | 9227 | ".section .fixup,\"ax\"\n" \ |
9078 | "4: movl %3,%0\n" \ | 9228 | "4: movl %3,%0\n" \ |
9079 | " jmp 3b\n" \ | 9229 | " jmp 3b\n" \ |
9080 | @@ -197,15 +238,18 @@ extern int __get_user_bad(void); | 9230 | @@ -197,15 +248,18 @@ extern int __get_user_bad(void); |
9081 | _ASM_EXTABLE(1b, 4b) \ | 9231 | _ASM_EXTABLE(1b, 4b) \ |
9082 | _ASM_EXTABLE(2b, 4b) \ | 9232 | _ASM_EXTABLE(2b, 4b) \ |
9083 | : "=r" (err) \ | 9233 | : "=r" (err) \ |
@@ -9100,7 +9250,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess.h linux-2.6.32.15/arch/x | |||
9100 | 9250 | ||
9101 | #define __put_user_x8(x, ptr, __ret_pu) \ | 9251 | #define __put_user_x8(x, ptr, __ret_pu) \ |
9102 | asm volatile("call __put_user_8" : "=a" (__ret_pu) \ | 9252 | asm volatile("call __put_user_8" : "=a" (__ret_pu) \ |
9103 | @@ -374,16 +418,18 @@ do { \ | 9253 | @@ -374,16 +428,18 @@ do { \ |
9104 | } while (0) | 9254 | } while (0) |
9105 | 9255 | ||
9106 | #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \ | 9256 | #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \ |
@@ -9122,7 +9272,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess.h linux-2.6.32.15/arch/x | |||
9122 | 9272 | ||
9123 | #define __get_user_size_ex(x, ptr, size) \ | 9273 | #define __get_user_size_ex(x, ptr, size) \ |
9124 | do { \ | 9274 | do { \ |
9125 | @@ -407,10 +453,12 @@ do { \ | 9275 | @@ -407,10 +463,12 @@ do { \ |
9126 | } while (0) | 9276 | } while (0) |
9127 | 9277 | ||
9128 | #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \ | 9278 | #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \ |
@@ -9137,7 +9287,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess.h linux-2.6.32.15/arch/x | |||
9137 | 9287 | ||
9138 | #define __put_user_nocheck(x, ptr, size) \ | 9288 | #define __put_user_nocheck(x, ptr, size) \ |
9139 | ({ \ | 9289 | ({ \ |
9140 | @@ -424,13 +472,24 @@ do { \ | 9290 | @@ -424,13 +482,24 @@ do { \ |
9141 | int __gu_err; \ | 9291 | int __gu_err; \ |
9142 | unsigned long __gu_val; \ | 9292 | unsigned long __gu_val; \ |
9143 | __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \ | 9293 | __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \ |
@@ -9164,7 +9314,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess.h linux-2.6.32.15/arch/x | |||
9164 | 9314 | ||
9165 | /* | 9315 | /* |
9166 | * Tell gcc we read from memory instead of writing: this is because | 9316 | * Tell gcc we read from memory instead of writing: this is because |
9167 | @@ -438,21 +497,26 @@ struct __large_struct { unsigned long bu | 9317 | @@ -438,21 +507,26 @@ struct __large_struct { unsigned long bu |
9168 | * aliasing issues. | 9318 | * aliasing issues. |
9169 | */ | 9319 | */ |
9170 | #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \ | 9320 | #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \ |
@@ -9195,7 +9345,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess.h linux-2.6.32.15/arch/x | |||
9195 | 9345 | ||
9196 | /* | 9346 | /* |
9197 | * uaccess_try and catch | 9347 | * uaccess_try and catch |
9198 | @@ -530,7 +594,7 @@ struct __large_struct { unsigned long bu | 9348 | @@ -530,7 +604,7 @@ struct __large_struct { unsigned long bu |
9199 | #define get_user_ex(x, ptr) do { \ | 9349 | #define get_user_ex(x, ptr) do { \ |
9200 | unsigned long __gue_val; \ | 9350 | unsigned long __gue_val; \ |
9201 | __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \ | 9351 | __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \ |
@@ -9204,7 +9354,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess.h linux-2.6.32.15/arch/x | |||
9204 | } while (0) | 9354 | } while (0) |
9205 | 9355 | ||
9206 | #ifdef CONFIG_X86_WP_WORKS_OK | 9356 | #ifdef CONFIG_X86_WP_WORKS_OK |
9207 | @@ -567,6 +631,7 @@ extern struct movsl_mask { | 9357 | @@ -567,6 +641,7 @@ extern struct movsl_mask { |
9208 | 9358 | ||
9209 | #define ARCH_HAS_NOCACHE_UACCESS 1 | 9359 | #define ARCH_HAS_NOCACHE_UACCESS 1 |
9210 | 9360 | ||
@@ -9212,9 +9362,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess.h linux-2.6.32.15/arch/x | |||
9212 | #ifdef CONFIG_X86_32 | 9362 | #ifdef CONFIG_X86_32 |
9213 | # include "uaccess_32.h" | 9363 | # include "uaccess_32.h" |
9214 | #else | 9364 | #else |
9215 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/vgtod.h linux-2.6.32.15/arch/x86/include/asm/vgtod.h | 9365 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/vgtod.h linux-2.6.32.16/arch/x86/include/asm/vgtod.h |
9216 | --- linux-2.6.32.15/arch/x86/include/asm/vgtod.h 2010-03-15 11:52:04.000000000 -0400 | 9366 | --- linux-2.6.32.16/arch/x86/include/asm/vgtod.h 2010-07-05 14:14:00.000000000 -0400 |
9217 | +++ linux-2.6.32.15/arch/x86/include/asm/vgtod.h 2010-05-28 21:27:14.922894828 -0400 | 9367 | +++ linux-2.6.32.16/arch/x86/include/asm/vgtod.h 2010-07-09 14:50:35.000000000 -0400 |
9218 | @@ -14,6 +14,7 @@ struct vsyscall_gtod_data { | 9368 | @@ -14,6 +14,7 @@ struct vsyscall_gtod_data { |
9219 | int sysctl_enabled; | 9369 | int sysctl_enabled; |
9220 | struct timezone sys_tz; | 9370 | struct timezone sys_tz; |
@@ -9223,9 +9373,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/vgtod.h linux-2.6.32.15/arch/x86 | |||
9223 | cycle_t (*vread)(void); | 9373 | cycle_t (*vread)(void); |
9224 | cycle_t cycle_last; | 9374 | cycle_t cycle_last; |
9225 | cycle_t mask; | 9375 | cycle_t mask; |
9226 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/vmi.h linux-2.6.32.15/arch/x86/include/asm/vmi.h | 9376 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/vmi.h linux-2.6.32.16/arch/x86/include/asm/vmi.h |
9227 | --- linux-2.6.32.15/arch/x86/include/asm/vmi.h 2010-03-15 11:52:04.000000000 -0400 | 9377 | --- linux-2.6.32.16/arch/x86/include/asm/vmi.h 2010-07-05 14:14:00.000000000 -0400 |
9228 | +++ linux-2.6.32.15/arch/x86/include/asm/vmi.h 2010-05-28 21:27:14.922894828 -0400 | 9378 | +++ linux-2.6.32.16/arch/x86/include/asm/vmi.h 2010-07-09 14:50:35.000000000 -0400 |
9229 | @@ -191,6 +191,7 @@ struct vrom_header { | 9379 | @@ -191,6 +191,7 @@ struct vrom_header { |
9230 | u8 reserved[96]; /* Reserved for headers */ | 9380 | u8 reserved[96]; /* Reserved for headers */ |
9231 | char vmi_init[8]; /* VMI_Init jump point */ | 9381 | char vmi_init[8]; /* VMI_Init jump point */ |
@@ -9234,9 +9384,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/vmi.h linux-2.6.32.15/arch/x86/i | |||
9234 | } __attribute__((packed)); | 9384 | } __attribute__((packed)); |
9235 | 9385 | ||
9236 | struct pnp_header { | 9386 | struct pnp_header { |
9237 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/vsyscall.h linux-2.6.32.15/arch/x86/include/asm/vsyscall.h | 9387 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/vsyscall.h linux-2.6.32.16/arch/x86/include/asm/vsyscall.h |
9238 | --- linux-2.6.32.15/arch/x86/include/asm/vsyscall.h 2010-03-15 11:52:04.000000000 -0400 | 9388 | --- linux-2.6.32.16/arch/x86/include/asm/vsyscall.h 2010-07-05 14:14:00.000000000 -0400 |
9239 | +++ linux-2.6.32.15/arch/x86/include/asm/vsyscall.h 2010-05-28 21:27:14.922894828 -0400 | 9389 | +++ linux-2.6.32.16/arch/x86/include/asm/vsyscall.h 2010-07-09 14:50:35.000000000 -0400 |
9240 | @@ -15,9 +15,10 @@ enum vsyscall_num { | 9390 | @@ -15,9 +15,10 @@ enum vsyscall_num { |
9241 | 9391 | ||
9242 | #ifdef __KERNEL__ | 9392 | #ifdef __KERNEL__ |
@@ -9267,9 +9417,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/vsyscall.h linux-2.6.32.15/arch/ | |||
9267 | #endif /* __KERNEL__ */ | 9417 | #endif /* __KERNEL__ */ |
9268 | 9418 | ||
9269 | #endif /* _ASM_X86_VSYSCALL_H */ | 9419 | #endif /* _ASM_X86_VSYSCALL_H */ |
9270 | diff -urNp linux-2.6.32.15/arch/x86/include/asm/xsave.h linux-2.6.32.15/arch/x86/include/asm/xsave.h | 9420 | diff -urNp linux-2.6.32.16/arch/x86/include/asm/xsave.h linux-2.6.32.16/arch/x86/include/asm/xsave.h |
9271 | --- linux-2.6.32.15/arch/x86/include/asm/xsave.h 2010-03-15 11:52:04.000000000 -0400 | 9421 | --- linux-2.6.32.16/arch/x86/include/asm/xsave.h 2010-07-05 14:14:00.000000000 -0400 |
9272 | +++ linux-2.6.32.15/arch/x86/include/asm/xsave.h 2010-05-28 21:27:14.922894828 -0400 | 9422 | +++ linux-2.6.32.16/arch/x86/include/asm/xsave.h 2010-07-09 14:50:35.000000000 -0400 |
9273 | @@ -56,6 +56,12 @@ static inline int xrstor_checking(struct | 9423 | @@ -56,6 +56,12 @@ static inline int xrstor_checking(struct |
9274 | static inline int xsave_user(struct xsave_struct __user *buf) | 9424 | static inline int xsave_user(struct xsave_struct __user *buf) |
9275 | { | 9425 | { |
@@ -9295,9 +9445,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/xsave.h linux-2.6.32.15/arch/x86 | |||
9295 | __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n" | 9445 | __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n" |
9296 | "2:\n" | 9446 | "2:\n" |
9297 | ".section .fixup,\"ax\"\n" | 9447 | ".section .fixup,\"ax\"\n" |
9298 | diff -urNp linux-2.6.32.15/arch/x86/Kconfig linux-2.6.32.15/arch/x86/Kconfig | 9448 | diff -urNp linux-2.6.32.16/arch/x86/Kconfig linux-2.6.32.16/arch/x86/Kconfig |
9299 | --- linux-2.6.32.15/arch/x86/Kconfig 2010-05-15 13:20:18.407099662 -0400 | 9449 | --- linux-2.6.32.16/arch/x86/Kconfig 2010-07-05 14:14:00.000000000 -0400 |
9300 | +++ linux-2.6.32.15/arch/x86/Kconfig 2010-06-19 11:15:06.486972627 -0400 | 9450 | +++ linux-2.6.32.16/arch/x86/Kconfig 2010-07-09 14:50:35.000000000 -0400 |
9301 | @@ -1083,7 +1083,7 @@ config PAGE_OFFSET | 9451 | @@ -1083,7 +1083,7 @@ config PAGE_OFFSET |
9302 | hex | 9452 | hex |
9303 | default 0xB0000000 if VMSPLIT_3G_OPT | 9453 | default 0xB0000000 if VMSPLIT_3G_OPT |
@@ -9344,9 +9494,9 @@ diff -urNp linux-2.6.32.15/arch/x86/Kconfig linux-2.6.32.15/arch/x86/Kconfig | |||
9344 | ---help--- | 9494 | ---help--- |
9345 | Map the 32-bit VDSO to the predictable old-style address too. | 9495 | Map the 32-bit VDSO to the predictable old-style address too. |
9346 | ---help--- | 9496 | ---help--- |
9347 | diff -urNp linux-2.6.32.15/arch/x86/Kconfig.cpu linux-2.6.32.15/arch/x86/Kconfig.cpu | 9497 | diff -urNp linux-2.6.32.16/arch/x86/Kconfig.cpu linux-2.6.32.16/arch/x86/Kconfig.cpu |
9348 | --- linux-2.6.32.15/arch/x86/Kconfig.cpu 2010-04-29 17:49:37.481119841 -0400 | 9498 | --- linux-2.6.32.16/arch/x86/Kconfig.cpu 2010-07-05 14:14:00.000000000 -0400 |
9349 | +++ linux-2.6.32.15/arch/x86/Kconfig.cpu 2010-05-28 21:27:14.922894828 -0400 | 9499 | +++ linux-2.6.32.16/arch/x86/Kconfig.cpu 2010-07-09 14:50:35.000000000 -0400 |
9350 | @@ -340,7 +340,7 @@ config X86_PPRO_FENCE | 9500 | @@ -340,7 +340,7 @@ config X86_PPRO_FENCE |
9351 | 9501 | ||
9352 | config X86_F00F_BUG | 9502 | config X86_F00F_BUG |
@@ -9374,9 +9524,9 @@ diff -urNp linux-2.6.32.15/arch/x86/Kconfig.cpu linux-2.6.32.15/arch/x86/Kconfig | |||
9374 | 9524 | ||
9375 | config X86_MINIMUM_CPU_FAMILY | 9525 | config X86_MINIMUM_CPU_FAMILY |
9376 | int | 9526 | int |
9377 | diff -urNp linux-2.6.32.15/arch/x86/Kconfig.debug linux-2.6.32.15/arch/x86/Kconfig.debug | 9527 | diff -urNp linux-2.6.32.16/arch/x86/Kconfig.debug linux-2.6.32.16/arch/x86/Kconfig.debug |
9378 | --- linux-2.6.32.15/arch/x86/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400 | 9528 | --- linux-2.6.32.16/arch/x86/Kconfig.debug 2010-07-05 14:14:00.000000000 -0400 |
9379 | +++ linux-2.6.32.15/arch/x86/Kconfig.debug 2010-05-28 21:27:14.926914091 -0400 | 9529 | +++ linux-2.6.32.16/arch/x86/Kconfig.debug 2010-07-09 14:50:35.000000000 -0400 |
9380 | @@ -99,7 +99,7 @@ config X86_PTDUMP | 9530 | @@ -99,7 +99,7 @@ config X86_PTDUMP |
9381 | config DEBUG_RODATA | 9531 | config DEBUG_RODATA |
9382 | bool "Write protect kernel read-only data structures" | 9532 | bool "Write protect kernel read-only data structures" |
@@ -9386,9 +9536,9 @@ diff -urNp linux-2.6.32.15/arch/x86/Kconfig.debug linux-2.6.32.15/arch/x86/Kconf | |||
9386 | ---help--- | 9536 | ---help--- |
9387 | Mark the kernel read-only data as write-protected in the pagetables, | 9537 | Mark the kernel read-only data as write-protected in the pagetables, |
9388 | in order to catch accidental (and incorrect) writes to such const | 9538 | in order to catch accidental (and incorrect) writes to such const |
9389 | diff -urNp linux-2.6.32.15/arch/x86/kernel/acpi/boot.c linux-2.6.32.15/arch/x86/kernel/acpi/boot.c | 9539 | diff -urNp linux-2.6.32.16/arch/x86/kernel/acpi/boot.c linux-2.6.32.16/arch/x86/kernel/acpi/boot.c |
9390 | --- linux-2.6.32.15/arch/x86/kernel/acpi/boot.c 2010-04-04 20:41:49.916475305 -0400 | 9540 | --- linux-2.6.32.16/arch/x86/kernel/acpi/boot.c 2010-07-05 14:14:00.000000000 -0400 |
9391 | +++ linux-2.6.32.15/arch/x86/kernel/acpi/boot.c 2010-05-28 21:27:14.939148318 -0400 | 9541 | +++ linux-2.6.32.16/arch/x86/kernel/acpi/boot.c 2010-07-09 14:50:35.000000000 -0400 |
9392 | @@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a | 9542 | @@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a |
9393 | DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), | 9543 | DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), |
9394 | }, | 9544 | }, |
@@ -9398,9 +9548,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/acpi/boot.c linux-2.6.32.15/arch/x86/ | |||
9398 | }; | 9548 | }; |
9399 | 9549 | ||
9400 | /* | 9550 | /* |
9401 | 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 | 9551 | diff -urNp linux-2.6.32.16/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.16/arch/x86/kernel/acpi/realmode/wakeup.S |
9402 | --- linux-2.6.32.15/arch/x86/kernel/acpi/realmode/wakeup.S 2010-03-15 11:52:04.000000000 -0400 | 9552 | --- linux-2.6.32.16/arch/x86/kernel/acpi/realmode/wakeup.S 2010-07-05 14:14:00.000000000 -0400 |
9403 | +++ linux-2.6.32.15/arch/x86/kernel/acpi/realmode/wakeup.S 2010-05-28 21:27:14.939148318 -0400 | 9553 | +++ linux-2.6.32.16/arch/x86/kernel/acpi/realmode/wakeup.S 2010-07-09 14:50:35.000000000 -0400 |
9404 | @@ -104,7 +104,7 @@ _start: | 9554 | @@ -104,7 +104,7 @@ _start: |
9405 | movl %eax, %ecx | 9555 | movl %eax, %ecx |
9406 | orl %edx, %ecx | 9556 | orl %edx, %ecx |
@@ -9410,9 +9560,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.1 | |||
9410 | wrmsr | 9560 | wrmsr |
9411 | 1: | 9561 | 1: |
9412 | 9562 | ||
9413 | diff -urNp linux-2.6.32.15/arch/x86/kernel/acpi/sleep.c linux-2.6.32.15/arch/x86/kernel/acpi/sleep.c | 9563 | diff -urNp linux-2.6.32.16/arch/x86/kernel/acpi/sleep.c linux-2.6.32.16/arch/x86/kernel/acpi/sleep.c |
9414 | --- linux-2.6.32.15/arch/x86/kernel/acpi/sleep.c 2010-05-15 13:20:18.407099662 -0400 | 9564 | --- linux-2.6.32.16/arch/x86/kernel/acpi/sleep.c 2010-07-05 14:14:00.000000000 -0400 |
9415 | +++ linux-2.6.32.15/arch/x86/kernel/acpi/sleep.c 2010-05-28 21:27:14.943027635 -0400 | 9565 | +++ linux-2.6.32.16/arch/x86/kernel/acpi/sleep.c 2010-07-09 14:50:35.000000000 -0400 |
9416 | @@ -11,11 +11,12 @@ | 9566 | @@ -11,11 +11,12 @@ |
9417 | #include <linux/cpumask.h> | 9567 | #include <linux/cpumask.h> |
9418 | #include <asm/segment.h> | 9568 | #include <asm/segment.h> |
@@ -9457,9 +9607,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/acpi/sleep.c linux-2.6.32.15/arch/x86 | |||
9457 | } | 9607 | } |
9458 | 9608 | ||
9459 | 9609 | ||
9460 | 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 | 9610 | diff -urNp linux-2.6.32.16/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.16/arch/x86/kernel/acpi/wakeup_32.S |
9461 | --- linux-2.6.32.15/arch/x86/kernel/acpi/wakeup_32.S 2010-03-15 11:52:04.000000000 -0400 | 9611 | --- linux-2.6.32.16/arch/x86/kernel/acpi/wakeup_32.S 2010-07-05 14:14:00.000000000 -0400 |
9462 | +++ linux-2.6.32.15/arch/x86/kernel/acpi/wakeup_32.S 2010-05-28 21:27:14.943027635 -0400 | 9612 | +++ linux-2.6.32.16/arch/x86/kernel/acpi/wakeup_32.S 2010-07-09 14:50:35.000000000 -0400 |
9463 | @@ -30,13 +30,11 @@ wakeup_pmode_return: | 9613 | @@ -30,13 +30,11 @@ wakeup_pmode_return: |
9464 | # and restore the stack ... but you need gdt for this to work | 9614 | # and restore the stack ... but you need gdt for this to work |
9465 | movl saved_context_esp, %esp | 9615 | movl saved_context_esp, %esp |
@@ -9476,9 +9626,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.15/arch | |||
9476 | 9626 | ||
9477 | bogus_magic: | 9627 | bogus_magic: |
9478 | jmp bogus_magic | 9628 | jmp bogus_magic |
9479 | diff -urNp linux-2.6.32.15/arch/x86/kernel/alternative.c linux-2.6.32.15/arch/x86/kernel/alternative.c | 9629 | diff -urNp linux-2.6.32.16/arch/x86/kernel/alternative.c linux-2.6.32.16/arch/x86/kernel/alternative.c |
9480 | --- linux-2.6.32.15/arch/x86/kernel/alternative.c 2010-03-15 11:52:04.000000000 -0400 | 9630 | --- linux-2.6.32.16/arch/x86/kernel/alternative.c 2010-07-05 14:14:00.000000000 -0400 |
9481 | +++ linux-2.6.32.15/arch/x86/kernel/alternative.c 2010-05-28 21:27:14.943027635 -0400 | 9631 | +++ linux-2.6.32.16/arch/x86/kernel/alternative.c 2010-07-09 14:50:35.000000000 -0400 |
9482 | @@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str | 9632 | @@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str |
9483 | 9633 | ||
9484 | BUG_ON(p->len > MAX_PATCH_LEN); | 9634 | BUG_ON(p->len > MAX_PATCH_LEN); |
@@ -9488,6 +9638,15 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/alternative.c linux-2.6.32.15/arch/x8 | |||
9488 | used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf, | 9638 | used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf, |
9489 | (unsigned long)p->instr, p->len); | 9639 | (unsigned long)p->instr, p->len); |
9490 | 9640 | ||
9641 | @@ -475,7 +475,7 @@ void __init alternative_instructions(voi | ||
9642 | if (smp_alt_once) | ||
9643 | free_init_pages("SMP alternatives", | ||
9644 | (unsigned long)__smp_locks, | ||
9645 | - (unsigned long)__smp_locks_end); | ||
9646 | + PAGE_ALIGN((unsigned long)__smp_locks_end)); | ||
9647 | |||
9648 | restart_nmi(); | ||
9649 | } | ||
9491 | @@ -492,12 +492,16 @@ void __init alternative_instructions(voi | 9650 | @@ -492,12 +492,16 @@ void __init alternative_instructions(voi |
9492 | * instructions. And on the local CPU you need to be protected again NMI or MCE | 9651 | * instructions. And on the local CPU you need to be protected again NMI or MCE |
9493 | * handlers seeing an inconsistent instruction while you patch. | 9652 | * handlers seeing an inconsistent instruction while you patch. |
@@ -9551,9 +9710,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/alternative.c linux-2.6.32.15/arch/x8 | |||
9551 | + BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]); | 9710 | + BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]); |
9552 | return addr; | 9711 | return addr; |
9553 | } | 9712 | } |
9554 | diff -urNp linux-2.6.32.15/arch/x86/kernel/amd_iommu.c linux-2.6.32.15/arch/x86/kernel/amd_iommu.c | 9713 | diff -urNp linux-2.6.32.16/arch/x86/kernel/amd_iommu.c linux-2.6.32.16/arch/x86/kernel/amd_iommu.c |
9555 | --- linux-2.6.32.15/arch/x86/kernel/amd_iommu.c 2010-04-29 17:49:37.521943068 -0400 | 9714 | --- linux-2.6.32.16/arch/x86/kernel/amd_iommu.c 2010-07-05 14:14:00.000000000 -0400 |
9556 | +++ linux-2.6.32.15/arch/x86/kernel/amd_iommu.c 2010-05-28 21:27:14.959145751 -0400 | 9715 | +++ linux-2.6.32.16/arch/x86/kernel/amd_iommu.c 2010-07-09 14:50:35.000000000 -0400 |
9557 | @@ -2074,7 +2074,7 @@ static void prealloc_protection_domains( | 9716 | @@ -2074,7 +2074,7 @@ static void prealloc_protection_domains( |
9558 | } | 9717 | } |
9559 | } | 9718 | } |
@@ -9563,9 +9722,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/amd_iommu.c linux-2.6.32.15/arch/x86/ | |||
9563 | .alloc_coherent = alloc_coherent, | 9722 | .alloc_coherent = alloc_coherent, |
9564 | .free_coherent = free_coherent, | 9723 | .free_coherent = free_coherent, |
9565 | .map_page = map_page, | 9724 | .map_page = map_page, |
9566 | 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 | 9725 | diff -urNp linux-2.6.32.16/arch/x86/kernel/apic/io_apic.c linux-2.6.32.16/arch/x86/kernel/apic/io_apic.c |
9567 | --- linux-2.6.32.15/arch/x86/kernel/apic/io_apic.c 2010-03-15 11:52:04.000000000 -0400 | 9726 | --- linux-2.6.32.16/arch/x86/kernel/apic/io_apic.c 2010-07-05 14:14:00.000000000 -0400 |
9568 | +++ linux-2.6.32.15/arch/x86/kernel/apic/io_apic.c 2010-05-28 21:27:14.967145332 -0400 | 9727 | +++ linux-2.6.32.16/arch/x86/kernel/apic/io_apic.c 2010-07-09 14:50:35.000000000 -0400 |
9569 | @@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi | 9728 | @@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi |
9570 | ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, | 9729 | ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, |
9571 | GFP_ATOMIC); | 9730 | GFP_ATOMIC); |
@@ -9602,9 +9761,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/apic/io_apic.c linux-2.6.32.15/arch/x | |||
9602 | { | 9761 | { |
9603 | spin_unlock(&vector_lock); | 9762 | spin_unlock(&vector_lock); |
9604 | } | 9763 | } |
9605 | diff -urNp linux-2.6.32.15/arch/x86/kernel/apm_32.c linux-2.6.32.15/arch/x86/kernel/apm_32.c | 9764 | diff -urNp linux-2.6.32.16/arch/x86/kernel/apm_32.c linux-2.6.32.16/arch/x86/kernel/apm_32.c |
9606 | --- linux-2.6.32.15/arch/x86/kernel/apm_32.c 2010-03-15 11:52:04.000000000 -0400 | 9765 | --- linux-2.6.32.16/arch/x86/kernel/apm_32.c 2010-07-05 14:14:00.000000000 -0400 |
9607 | +++ linux-2.6.32.15/arch/x86/kernel/apm_32.c 2010-05-28 21:27:14.975148965 -0400 | 9766 | +++ linux-2.6.32.16/arch/x86/kernel/apm_32.c 2010-07-09 14:50:35.000000000 -0400 |
9608 | @@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock); | 9767 | @@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock); |
9609 | * This is for buggy BIOS's that refer to (real mode) segment 0x40 | 9768 | * This is for buggy BIOS's that refer to (real mode) segment 0x40 |
9610 | * even though they are called in protected mode. | 9769 | * even though they are called in protected mode. |
@@ -9706,9 +9865,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/apm_32.c linux-2.6.32.15/arch/x86/ker | |||
9706 | 9865 | ||
9707 | proc_create("apm", 0, NULL, &apm_file_ops); | 9866 | proc_create("apm", 0, NULL, &apm_file_ops); |
9708 | 9867 | ||
9709 | 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 | 9868 | diff -urNp linux-2.6.32.16/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.16/arch/x86/kernel/asm-offsets_32.c |
9710 | --- linux-2.6.32.15/arch/x86/kernel/asm-offsets_32.c 2010-03-15 11:52:04.000000000 -0400 | 9869 | --- linux-2.6.32.16/arch/x86/kernel/asm-offsets_32.c 2010-07-05 14:14:00.000000000 -0400 |
9711 | +++ linux-2.6.32.15/arch/x86/kernel/asm-offsets_32.c 2010-05-28 21:27:14.975148965 -0400 | 9870 | +++ linux-2.6.32.16/arch/x86/kernel/asm-offsets_32.c 2010-07-09 14:50:35.000000000 -0400 |
9712 | @@ -115,6 +115,11 @@ void foo(void) | 9871 | @@ -115,6 +115,11 @@ void foo(void) |
9713 | OFFSET(PV_CPU_iret, pv_cpu_ops, iret); | 9872 | OFFSET(PV_CPU_iret, pv_cpu_ops, iret); |
9714 | OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); | 9873 | OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); |
@@ -9721,9 +9880,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.15/arch | |||
9721 | #endif | 9880 | #endif |
9722 | 9881 | ||
9723 | #ifdef CONFIG_XEN | 9882 | #ifdef CONFIG_XEN |
9724 | 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 | 9883 | diff -urNp linux-2.6.32.16/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.16/arch/x86/kernel/asm-offsets_64.c |
9725 | --- linux-2.6.32.15/arch/x86/kernel/asm-offsets_64.c 2010-03-15 11:52:04.000000000 -0400 | 9884 | --- linux-2.6.32.16/arch/x86/kernel/asm-offsets_64.c 2010-07-05 14:14:00.000000000 -0400 |
9726 | +++ linux-2.6.32.15/arch/x86/kernel/asm-offsets_64.c 2010-05-28 21:27:14.975148965 -0400 | 9885 | +++ linux-2.6.32.16/arch/x86/kernel/asm-offsets_64.c 2010-07-09 14:50:35.000000000 -0400 |
9727 | @@ -63,6 +63,18 @@ int main(void) | 9886 | @@ -63,6 +63,18 @@ int main(void) |
9728 | OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); | 9887 | OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); |
9729 | OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs); | 9888 | OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs); |
@@ -9751,9 +9910,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.15/arch | |||
9751 | DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); | 9910 | DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); |
9752 | BLANK(); | 9911 | BLANK(); |
9753 | DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); | 9912 | DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); |
9754 | diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/common.c linux-2.6.32.15/arch/x86/kernel/cpu/common.c | 9913 | diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/common.c linux-2.6.32.16/arch/x86/kernel/cpu/common.c |
9755 | --- linux-2.6.32.15/arch/x86/kernel/cpu/common.c 2010-03-15 11:52:04.000000000 -0400 | 9914 | --- linux-2.6.32.16/arch/x86/kernel/cpu/common.c 2010-07-05 14:14:00.000000000 -0400 |
9756 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/common.c 2010-05-28 21:27:14.975148965 -0400 | 9915 | +++ linux-2.6.32.16/arch/x86/kernel/cpu/common.c 2010-07-09 14:50:35.000000000 -0400 |
9757 | @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon | 9916 | @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon |
9758 | 9917 | ||
9759 | static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; | 9918 | static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; |
@@ -9862,9 +10021,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/common.c linux-2.6.32.15/arch/x86 | |||
9862 | struct thread_struct *thread = &curr->thread; | 10021 | struct thread_struct *thread = &curr->thread; |
9863 | 10022 | ||
9864 | if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { | 10023 | if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { |
9865 | 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 | 10024 | diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c |
9866 | --- linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-03-15 11:52:04.000000000 -0400 | 10025 | --- linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-07-05 14:14:00.000000000 -0400 |
9867 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-05-28 21:27:14.975148965 -0400 | 10026 | +++ linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-07-09 14:50:35.000000000 -0400 |
9868 | @@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any | 10027 | @@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any |
9869 | DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), | 10028 | DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), |
9870 | }, | 10029 | }, |
@@ -9874,9 +10033,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6. | |||
9874 | }; | 10033 | }; |
9875 | 10034 | ||
9876 | static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) | 10035 | static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) |
9877 | 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 | 10036 | diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c |
9878 | --- linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-03-15 11:52:04.000000000 -0400 | 10037 | --- linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-07-05 14:14:00.000000000 -0400 |
9879 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-05-28 21:27:14.975148965 -0400 | 10038 | +++ linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-07-09 14:50:35.000000000 -0400 |
9880 | @@ -225,7 +225,7 @@ static struct cpu_model models[] = | 10039 | @@ -225,7 +225,7 @@ static struct cpu_model models[] = |
9881 | { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL }, | 10040 | { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL }, |
9882 | { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL }, | 10041 | { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL }, |
@@ -9886,9 +10045,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linu | |||
9886 | }; | 10045 | }; |
9887 | #undef _BANIAS | 10046 | #undef _BANIAS |
9888 | #undef BANIAS | 10047 | #undef BANIAS |
9889 | diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/intel.c linux-2.6.32.15/arch/x86/kernel/cpu/intel.c | 10048 | diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/intel.c linux-2.6.32.16/arch/x86/kernel/cpu/intel.c |
9890 | --- linux-2.6.32.15/arch/x86/kernel/cpu/intel.c 2010-05-15 13:20:18.427075180 -0400 | 10049 | --- linux-2.6.32.16/arch/x86/kernel/cpu/intel.c 2010-07-05 14:14:00.000000000 -0400 |
9891 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/intel.c 2010-05-28 21:27:14.975148965 -0400 | 10050 | +++ linux-2.6.32.16/arch/x86/kernel/cpu/intel.c 2010-07-09 14:50:35.000000000 -0400 |
9892 | @@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug | 10051 | @@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug |
9893 | * Update the IDT descriptor and reload the IDT so that | 10052 | * Update the IDT descriptor and reload the IDT so that |
9894 | * it uses the read-only mapped virtual address. | 10053 | * it uses the read-only mapped virtual address. |
@@ -9898,9 +10057,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/intel.c linux-2.6.32.15/arch/x86/ | |||
9898 | load_idt(&idt_descr); | 10057 | load_idt(&idt_descr); |
9899 | } | 10058 | } |
9900 | #endif | 10059 | #endif |
9901 | 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 | 10060 | diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.16/arch/x86/kernel/cpu/intel_cacheinfo.c |
9902 | --- linux-2.6.32.15/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-05-28 20:16:44.430924650 -0400 | 10061 | --- linux-2.6.32.16/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-07-05 14:14:00.000000000 -0400 |
9903 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-05-28 21:27:14.987166265 -0400 | 10062 | +++ linux-2.6.32.16/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-07-09 14:50:35.000000000 -0400 |
9904 | @@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob | 10063 | @@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob |
9905 | return ret; | 10064 | return ret; |
9906 | } | 10065 | } |
@@ -9910,9 +10069,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.15 | |||
9910 | .show = show, | 10069 | .show = show, |
9911 | .store = store, | 10070 | .store = store, |
9912 | }; | 10071 | }; |
9913 | diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/Makefile linux-2.6.32.15/arch/x86/kernel/cpu/Makefile | 10072 | diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/Makefile linux-2.6.32.16/arch/x86/kernel/cpu/Makefile |
9914 | --- linux-2.6.32.15/arch/x86/kernel/cpu/Makefile 2010-03-15 11:52:04.000000000 -0400 | 10073 | --- linux-2.6.32.16/arch/x86/kernel/cpu/Makefile 2010-07-05 14:14:00.000000000 -0400 |
9915 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/Makefile 2010-05-28 21:27:14.987166265 -0400 | 10074 | +++ linux-2.6.32.16/arch/x86/kernel/cpu/Makefile 2010-07-09 14:50:35.000000000 -0400 |
9916 | @@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER | 10075 | @@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER |
9917 | CFLAGS_REMOVE_common.o = -pg | 10076 | CFLAGS_REMOVE_common.o = -pg |
9918 | endif | 10077 | endif |
@@ -9924,9 +10083,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/Makefile linux-2.6.32.15/arch/x86 | |||
9924 | obj-y := intel_cacheinfo.o addon_cpuid_features.o | 10083 | obj-y := intel_cacheinfo.o addon_cpuid_features.o |
9925 | obj-y += proc.o capflags.o powerflags.o common.o | 10084 | obj-y += proc.o capflags.o powerflags.o common.o |
9926 | obj-y += vmware.o hypervisor.o sched.o | 10085 | obj-y += vmware.o hypervisor.o sched.o |
9927 | 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 | 10086 | diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce_amd.c |
9928 | --- linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-03-15 11:52:04.000000000 -0400 | 10087 | --- linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-07-05 14:14:00.000000000 -0400 |
9929 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-05-28 21:27:14.995163789 -0400 | 10088 | +++ linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-07-09 14:50:35.000000000 -0400 |
9930 | @@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob | 10089 | @@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob |
9931 | return ret; | 10090 | return ret; |
9932 | } | 10091 | } |
@@ -9936,9 +10095,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.15/ | |||
9936 | .show = show, | 10095 | .show = show, |
9937 | .store = store, | 10096 | .store = store, |
9938 | }; | 10097 | }; |
9939 | 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 | 10098 | diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce.c |
9940 | --- linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce.c 2010-03-15 11:52:04.000000000 -0400 | 10099 | --- linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce.c 2010-07-05 14:14:00.000000000 -0400 |
9941 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce.c 2010-05-28 21:27:15.011149672 -0400 | 10100 | +++ linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce.c 2010-07-09 14:50:35.000000000 -0400 |
9942 | @@ -187,7 +187,7 @@ static void print_mce(struct mce *m) | 10101 | @@ -187,7 +187,7 @@ static void print_mce(struct mce *m) |
9943 | !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "", | 10102 | !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "", |
9944 | m->cs, m->ip); | 10103 | m->cs, m->ip); |
@@ -9991,9 +10150,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.15/arch | |||
9991 | }; | 10150 | }; |
9992 | 10151 | ||
9993 | /* | 10152 | /* |
9994 | 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 | 10153 | diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/amd.c |
9995 | --- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/amd.c 2010-03-15 11:52:04.000000000 -0400 | 10154 | --- linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/amd.c 2010-07-05 14:14:00.000000000 -0400 |
9996 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/amd.c 2010-05-28 21:27:15.011149672 -0400 | 10155 | +++ linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/amd.c 2010-07-09 14:50:35.000000000 -0400 |
9997 | @@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base | 10156 | @@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base |
9998 | return 0; | 10157 | return 0; |
9999 | } | 10158 | } |
@@ -10003,9 +10162,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.15/arch/x | |||
10003 | .vendor = X86_VENDOR_AMD, | 10162 | .vendor = X86_VENDOR_AMD, |
10004 | .set = amd_set_mtrr, | 10163 | .set = amd_set_mtrr, |
10005 | .get = amd_get_mtrr, | 10164 | .get = amd_get_mtrr, |
10006 | 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 | 10165 | diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/centaur.c |
10007 | --- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/centaur.c 2010-03-15 11:52:04.000000000 -0400 | 10166 | --- linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/centaur.c 2010-07-05 14:14:00.000000000 -0400 |
10008 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/centaur.c 2010-05-28 21:27:15.011149672 -0400 | 10167 | +++ linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/centaur.c 2010-07-09 14:50:35.000000000 -0400 |
10009 | @@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long | 10168 | @@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long |
10010 | return 0; | 10169 | return 0; |
10011 | } | 10170 | } |
@@ -10015,9 +10174,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.15/ar | |||
10015 | .vendor = X86_VENDOR_CENTAUR, | 10174 | .vendor = X86_VENDOR_CENTAUR, |
10016 | .set = centaur_set_mcr, | 10175 | .set = centaur_set_mcr, |
10017 | .get = centaur_get_mcr, | 10176 | .get = centaur_get_mcr, |
10018 | 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 | 10177 | diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/cyrix.c |
10019 | --- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-03-15 11:52:04.000000000 -0400 | 10178 | --- linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-07-05 14:14:00.000000000 -0400 |
10020 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-05-28 21:27:15.011149672 -0400 | 10179 | +++ linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-07-09 14:50:35.000000000 -0400 |
10021 | @@ -265,7 +265,7 @@ static void cyrix_set_all(void) | 10180 | @@ -265,7 +265,7 @@ static void cyrix_set_all(void) |
10022 | post_set(); | 10181 | post_set(); |
10023 | } | 10182 | } |
@@ -10027,9 +10186,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.15/arch | |||
10027 | .vendor = X86_VENDOR_CYRIX, | 10186 | .vendor = X86_VENDOR_CYRIX, |
10028 | .set_all = cyrix_set_all, | 10187 | .set_all = cyrix_set_all, |
10029 | .set = cyrix_set_arr, | 10188 | .set = cyrix_set_arr, |
10030 | 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 | 10189 | diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/generic.c |
10031 | --- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/generic.c 2010-03-15 11:52:04.000000000 -0400 | 10190 | --- linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/generic.c 2010-07-05 14:14:00.000000000 -0400 |
10032 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/generic.c 2010-05-28 21:27:15.011149672 -0400 | 10191 | +++ linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/generic.c 2010-07-09 14:50:35.000000000 -0400 |
10033 | @@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra | 10192 | @@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra |
10034 | { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ | 10193 | { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ |
10035 | { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ | 10194 | { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ |
@@ -10048,9 +10207,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.15/ar | |||
10048 | .use_intel_if = 1, | 10207 | .use_intel_if = 1, |
10049 | .set_all = generic_set_all, | 10208 | .set_all = generic_set_all, |
10050 | .get = generic_get_mtrr, | 10209 | .get = generic_get_mtrr, |
10051 | 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 | 10210 | diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/main.c |
10052 | --- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/main.c 2010-03-15 11:52:04.000000000 -0400 | 10211 | --- linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/main.c 2010-07-05 14:14:00.000000000 -0400 |
10053 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/main.c 2010-05-28 21:27:15.011149672 -0400 | 10212 | +++ linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/main.c 2010-07-09 14:50:35.000000000 -0400 |
10054 | @@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); | 10213 | @@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); |
10055 | u64 size_or_mask, size_and_mask; | 10214 | u64 size_or_mask, size_and_mask; |
10056 | static bool mtrr_aps_delayed_init; | 10215 | static bool mtrr_aps_delayed_init; |
@@ -10069,9 +10228,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.15/arch/ | |||
10069 | { | 10228 | { |
10070 | if (ops->vendor && ops->vendor < X86_VENDOR_NUM) | 10229 | if (ops->vendor && ops->vendor < X86_VENDOR_NUM) |
10071 | mtrr_ops[ops->vendor] = ops; | 10230 | mtrr_ops[ops->vendor] = ops; |
10072 | 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 | 10231 | diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/mtrr.h |
10073 | --- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-03-15 11:52:04.000000000 -0400 | 10232 | --- linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-07-05 14:14:00.000000000 -0400 |
10074 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-05-28 21:27:15.011149672 -0400 | 10233 | +++ linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-07-09 14:50:35.000000000 -0400 |
10075 | @@ -12,19 +12,19 @@ | 10234 | @@ -12,19 +12,19 @@ |
10076 | extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; | 10235 | extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; |
10077 | 10236 | ||
@@ -10122,9 +10281,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.15/arch/ | |||
10122 | 10281 | ||
10123 | #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd) | 10282 | #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd) |
10124 | #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1) | 10283 | #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1) |
10125 | 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 | 10284 | diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.16/arch/x86/kernel/cpu/perfctr-watchdog.c |
10126 | --- linux-2.6.32.15/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-03-15 11:52:04.000000000 -0400 | 10285 | --- linux-2.6.32.16/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-07-05 14:14:00.000000000 -0400 |
10127 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-05-28 21:27:15.011149672 -0400 | 10286 | +++ linux-2.6.32.16/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-07-09 14:50:35.000000000 -0400 |
10128 | @@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk { | 10287 | @@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk { |
10129 | 10288 | ||
10130 | /* Interface defining a CPU specific perfctr watchdog */ | 10289 | /* Interface defining a CPU specific perfctr watchdog */ |
@@ -10158,10 +10317,10 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.1 | |||
10158 | static struct wd_ops intel_arch_wd_ops __read_mostly = { | 10317 | static struct wd_ops intel_arch_wd_ops __read_mostly = { |
10159 | .reserve = single_msr_reserve, | 10318 | .reserve = single_msr_reserve, |
10160 | .unreserve = single_msr_unreserve, | 10319 | .unreserve = single_msr_unreserve, |
10161 | 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 | 10320 | diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.16/arch/x86/kernel/cpu/perf_event.c |
10162 | --- linux-2.6.32.15/arch/x86/kernel/cpu/perf_event.c 2010-04-29 17:49:37.537108997 -0400 | 10321 | --- linux-2.6.32.16/arch/x86/kernel/cpu/perf_event.c 2010-07-05 14:14:00.000000000 -0400 |
10163 | +++ linux-2.6.32.15/arch/x86/kernel/cpu/perf_event.c 2010-05-28 21:27:15.015028232 -0400 | 10322 | +++ linux-2.6.32.16/arch/x86/kernel/cpu/perf_event.c 2010-07-09 14:50:35.000000000 -0400 |
10164 | @@ -2354,7 +2354,7 @@ perf_callchain_user(struct pt_regs *regs | 10323 | @@ -2357,7 +2357,7 @@ perf_callchain_user(struct pt_regs *regs |
10165 | break; | 10324 | break; |
10166 | 10325 | ||
10167 | callchain_store(entry, frame.return_address); | 10326 | callchain_store(entry, frame.return_address); |
@@ -10170,9 +10329,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.15/arch | |||
10170 | } | 10329 | } |
10171 | } | 10330 | } |
10172 | 10331 | ||
10173 | diff -urNp linux-2.6.32.15/arch/x86/kernel/crash.c linux-2.6.32.15/arch/x86/kernel/crash.c | 10332 | diff -urNp linux-2.6.32.16/arch/x86/kernel/crash.c linux-2.6.32.16/arch/x86/kernel/crash.c |
10174 | --- linux-2.6.32.15/arch/x86/kernel/crash.c 2010-04-29 17:49:37.537108997 -0400 | 10333 | --- linux-2.6.32.16/arch/x86/kernel/crash.c 2010-07-05 14:14:00.000000000 -0400 |
10175 | +++ linux-2.6.32.15/arch/x86/kernel/crash.c 2010-05-28 21:27:15.015028232 -0400 | 10334 | +++ linux-2.6.32.16/arch/x86/kernel/crash.c 2010-07-09 14:50:35.000000000 -0400 |
10176 | @@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu, | 10335 | @@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu, |
10177 | regs = args->regs; | 10336 | regs = args->regs; |
10178 | 10337 | ||
@@ -10182,9 +10341,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/crash.c linux-2.6.32.15/arch/x86/kern | |||
10182 | crash_fixup_ss_esp(&fixed_regs, regs); | 10341 | crash_fixup_ss_esp(&fixed_regs, regs); |
10183 | regs = &fixed_regs; | 10342 | regs = &fixed_regs; |
10184 | } | 10343 | } |
10185 | diff -urNp linux-2.6.32.15/arch/x86/kernel/doublefault_32.c linux-2.6.32.15/arch/x86/kernel/doublefault_32.c | 10344 | diff -urNp linux-2.6.32.16/arch/x86/kernel/doublefault_32.c linux-2.6.32.16/arch/x86/kernel/doublefault_32.c |
10186 | --- linux-2.6.32.15/arch/x86/kernel/doublefault_32.c 2010-03-15 11:52:04.000000000 -0400 | 10345 | --- linux-2.6.32.16/arch/x86/kernel/doublefault_32.c 2010-07-05 14:14:00.000000000 -0400 |
10187 | +++ linux-2.6.32.15/arch/x86/kernel/doublefault_32.c 2010-05-28 21:27:15.015028232 -0400 | 10346 | +++ linux-2.6.32.16/arch/x86/kernel/doublefault_32.c 2010-07-09 14:50:35.000000000 -0400 |
10188 | @@ -11,7 +11,7 @@ | 10347 | @@ -11,7 +11,7 @@ |
10189 | 10348 | ||
10190 | #define DOUBLEFAULT_STACKSIZE (1024) | 10349 | #define DOUBLEFAULT_STACKSIZE (1024) |
@@ -10216,9 +10375,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/doublefault_32.c linux-2.6.32.15/arch | |||
10216 | .fs = __KERNEL_PERCPU, | 10375 | .fs = __KERNEL_PERCPU, |
10217 | 10376 | ||
10218 | .__cr3 = __pa_nodebug(swapper_pg_dir), | 10377 | .__cr3 = __pa_nodebug(swapper_pg_dir), |
10219 | diff -urNp linux-2.6.32.15/arch/x86/kernel/dumpstack_32.c linux-2.6.32.15/arch/x86/kernel/dumpstack_32.c | 10378 | diff -urNp linux-2.6.32.16/arch/x86/kernel/dumpstack_32.c linux-2.6.32.16/arch/x86/kernel/dumpstack_32.c |
10220 | --- linux-2.6.32.15/arch/x86/kernel/dumpstack_32.c 2010-03-15 11:52:04.000000000 -0400 | 10379 | --- linux-2.6.32.16/arch/x86/kernel/dumpstack_32.c 2010-07-05 14:14:00.000000000 -0400 |
10221 | +++ linux-2.6.32.15/arch/x86/kernel/dumpstack_32.c 2010-05-28 21:27:15.015028232 -0400 | 10380 | +++ linux-2.6.32.16/arch/x86/kernel/dumpstack_32.c 2010-07-09 14:50:35.000000000 -0400 |
10222 | @@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs | 10381 | @@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs |
10223 | * When in-kernel, we also print out the stack and code at the | 10382 | * When in-kernel, we also print out the stack and code at the |
10224 | * time of the fault.. | 10383 | * time of the fault.. |
@@ -10263,9 +10422,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/dumpstack_32.c linux-2.6.32.15/arch/x | |||
10263 | if (ip < PAGE_OFFSET) | 10422 | if (ip < PAGE_OFFSET) |
10264 | return 0; | 10423 | return 0; |
10265 | if (probe_kernel_address((unsigned short *)ip, ud2)) | 10424 | if (probe_kernel_address((unsigned short *)ip, ud2)) |
10266 | diff -urNp linux-2.6.32.15/arch/x86/kernel/dumpstack.c linux-2.6.32.15/arch/x86/kernel/dumpstack.c | 10425 | diff -urNp linux-2.6.32.16/arch/x86/kernel/dumpstack.c linux-2.6.32.16/arch/x86/kernel/dumpstack.c |
10267 | --- linux-2.6.32.15/arch/x86/kernel/dumpstack.c 2010-03-15 11:52:04.000000000 -0400 | 10426 | --- linux-2.6.32.16/arch/x86/kernel/dumpstack.c 2010-07-05 14:14:00.000000000 -0400 |
10268 | +++ linux-2.6.32.15/arch/x86/kernel/dumpstack.c 2010-05-28 21:27:15.023156603 -0400 | 10427 | +++ linux-2.6.32.16/arch/x86/kernel/dumpstack.c 2010-07-09 14:50:35.000000000 -0400 |
10269 | @@ -180,7 +180,7 @@ void dump_stack(void) | 10428 | @@ -180,7 +180,7 @@ void dump_stack(void) |
10270 | #endif | 10429 | #endif |
10271 | 10430 | ||
@@ -10293,9 +10452,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/dumpstack.c linux-2.6.32.15/arch/x86/ | |||
10293 | report_bug(regs->ip, regs); | 10452 | report_bug(regs->ip, regs); |
10294 | 10453 | ||
10295 | if (__die(str, regs, err)) | 10454 | if (__die(str, regs, err)) |
10296 | diff -urNp linux-2.6.32.15/arch/x86/kernel/e820.c linux-2.6.32.15/arch/x86/kernel/e820.c | 10455 | diff -urNp linux-2.6.32.16/arch/x86/kernel/e820.c linux-2.6.32.16/arch/x86/kernel/e820.c |
10297 | --- linux-2.6.32.15/arch/x86/kernel/e820.c 2010-03-15 11:52:04.000000000 -0400 | 10456 | --- linux-2.6.32.16/arch/x86/kernel/e820.c 2010-07-05 14:14:00.000000000 -0400 |
10298 | +++ linux-2.6.32.15/arch/x86/kernel/e820.c 2010-05-28 21:27:15.023156603 -0400 | 10457 | +++ linux-2.6.32.16/arch/x86/kernel/e820.c 2010-07-09 14:50:35.000000000 -0400 |
10299 | @@ -733,7 +733,7 @@ struct early_res { | 10458 | @@ -733,7 +733,7 @@ struct early_res { |
10300 | }; | 10459 | }; |
10301 | static struct early_res early_res[MAX_EARLY_RES] __initdata = { | 10460 | static struct early_res early_res[MAX_EARLY_RES] __initdata = { |
@@ -10305,9 +10464,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/e820.c linux-2.6.32.15/arch/x86/kerne | |||
10305 | }; | 10464 | }; |
10306 | 10465 | ||
10307 | static int __init find_overlapped_early(u64 start, u64 end) | 10466 | static int __init find_overlapped_early(u64 start, u64 end) |
10308 | diff -urNp linux-2.6.32.15/arch/x86/kernel/efi_32.c linux-2.6.32.15/arch/x86/kernel/efi_32.c | 10467 | diff -urNp linux-2.6.32.16/arch/x86/kernel/efi_32.c linux-2.6.32.16/arch/x86/kernel/efi_32.c |
10309 | --- linux-2.6.32.15/arch/x86/kernel/efi_32.c 2010-03-15 11:52:04.000000000 -0400 | 10468 | --- linux-2.6.32.16/arch/x86/kernel/efi_32.c 2010-07-05 14:14:00.000000000 -0400 |
10310 | +++ linux-2.6.32.15/arch/x86/kernel/efi_32.c 2010-05-28 21:27:15.023156603 -0400 | 10469 | +++ linux-2.6.32.16/arch/x86/kernel/efi_32.c 2010-07-09 14:50:35.000000000 -0400 |
10311 | @@ -38,70 +38,38 @@ | 10470 | @@ -38,70 +38,38 @@ |
10312 | */ | 10471 | */ |
10313 | 10472 | ||
@@ -10388,9 +10547,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/efi_32.c linux-2.6.32.15/arch/x86/ker | |||
10388 | 10547 | ||
10389 | /* | 10548 | /* |
10390 | * After the lock is released, the original page table is restored. | 10549 | * After the lock is released, the original page table is restored. |
10391 | 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 | 10550 | diff -urNp linux-2.6.32.16/arch/x86/kernel/efi_stub_32.S linux-2.6.32.16/arch/x86/kernel/efi_stub_32.S |
10392 | --- linux-2.6.32.15/arch/x86/kernel/efi_stub_32.S 2010-03-15 11:52:04.000000000 -0400 | 10551 | --- linux-2.6.32.16/arch/x86/kernel/efi_stub_32.S 2010-07-05 14:14:00.000000000 -0400 |
10393 | +++ linux-2.6.32.15/arch/x86/kernel/efi_stub_32.S 2010-05-28 21:27:15.031137412 -0400 | 10552 | +++ linux-2.6.32.16/arch/x86/kernel/efi_stub_32.S 2010-07-09 14:50:35.000000000 -0400 |
10394 | @@ -6,6 +6,7 @@ | 10553 | @@ -6,6 +6,7 @@ |
10395 | */ | 10554 | */ |
10396 | 10555 | ||
@@ -10489,9 +10648,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/efi_stub_32.S linux-2.6.32.15/arch/x8 | |||
10489 | saved_return_addr: | 10648 | saved_return_addr: |
10490 | .long 0 | 10649 | .long 0 |
10491 | efi_rt_function_ptr: | 10650 | efi_rt_function_ptr: |
10492 | diff -urNp linux-2.6.32.15/arch/x86/kernel/entry_32.S linux-2.6.32.15/arch/x86/kernel/entry_32.S | 10651 | diff -urNp linux-2.6.32.16/arch/x86/kernel/entry_32.S linux-2.6.32.16/arch/x86/kernel/entry_32.S |
10493 | --- linux-2.6.32.15/arch/x86/kernel/entry_32.S 2010-03-15 11:52:04.000000000 -0400 | 10652 | --- linux-2.6.32.16/arch/x86/kernel/entry_32.S 2010-07-05 14:14:00.000000000 -0400 |
10494 | +++ linux-2.6.32.15/arch/x86/kernel/entry_32.S 2010-06-19 10:03:50.008525890 -0400 | 10653 | +++ linux-2.6.32.16/arch/x86/kernel/entry_32.S 2010-07-09 14:50:35.000000000 -0400 |
10495 | @@ -191,7 +191,67 @@ | 10654 | @@ -191,7 +191,67 @@ |
10496 | 10655 | ||
10497 | #endif /* CONFIG_X86_32_LAZY_GS */ | 10656 | #endif /* CONFIG_X86_32_LAZY_GS */ |
@@ -10802,9 +10961,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/entry_32.S linux-2.6.32.15/arch/x86/k | |||
10802 | RESTORE_REGS | 10961 | RESTORE_REGS |
10803 | lss 12+4(%esp), %esp # back to espfix stack | 10962 | lss 12+4(%esp), %esp # back to espfix stack |
10804 | CFI_ADJUST_CFA_OFFSET -24 | 10963 | CFI_ADJUST_CFA_OFFSET -24 |
10805 | diff -urNp linux-2.6.32.15/arch/x86/kernel/entry_64.S linux-2.6.32.15/arch/x86/kernel/entry_64.S | 10964 | diff -urNp linux-2.6.32.16/arch/x86/kernel/entry_64.S linux-2.6.32.16/arch/x86/kernel/entry_64.S |
10806 | --- linux-2.6.32.15/arch/x86/kernel/entry_64.S 2010-03-15 11:52:04.000000000 -0400 | 10965 | --- linux-2.6.32.16/arch/x86/kernel/entry_64.S 2010-07-05 14:14:00.000000000 -0400 |
10807 | +++ linux-2.6.32.15/arch/x86/kernel/entry_64.S 2010-05-28 21:27:15.031137412 -0400 | 10966 | +++ linux-2.6.32.16/arch/x86/kernel/entry_64.S 2010-07-09 14:50:35.000000000 -0400 |
10808 | @@ -53,6 +53,7 @@ | 10967 | @@ -53,6 +53,7 @@ |
10809 | #include <asm/paravirt.h> | 10968 | #include <asm/paravirt.h> |
10810 | #include <asm/ftrace.h> | 10969 | #include <asm/ftrace.h> |
@@ -11262,9 +11421,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/entry_64.S linux-2.6.32.15/arch/x86/k | |||
11262 | RESTORE_ALL 8 | 11421 | RESTORE_ALL 8 |
11263 | jmp irq_return | 11422 | jmp irq_return |
11264 | nmi_userspace: | 11423 | nmi_userspace: |
11265 | diff -urNp linux-2.6.32.15/arch/x86/kernel/ftrace.c linux-2.6.32.15/arch/x86/kernel/ftrace.c | 11424 | diff -urNp linux-2.6.32.16/arch/x86/kernel/ftrace.c linux-2.6.32.16/arch/x86/kernel/ftrace.c |
11266 | --- linux-2.6.32.15/arch/x86/kernel/ftrace.c 2010-03-15 11:52:04.000000000 -0400 | 11425 | --- linux-2.6.32.16/arch/x86/kernel/ftrace.c 2010-07-05 14:14:00.000000000 -0400 |
11267 | +++ linux-2.6.32.15/arch/x86/kernel/ftrace.c 2010-05-28 21:27:15.031137412 -0400 | 11426 | +++ linux-2.6.32.16/arch/x86/kernel/ftrace.c 2010-07-09 14:50:35.000000000 -0400 |
11268 | @@ -149,7 +149,9 @@ void ftrace_nmi_enter(void) | 11427 | @@ -149,7 +149,9 @@ void ftrace_nmi_enter(void) |
11269 | { | 11428 | { |
11270 | if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { | 11429 | if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { |
@@ -11330,9 +11489,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/ftrace.c linux-2.6.32.15/arch/x86/ker | |||
11330 | if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) | 11489 | if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) |
11331 | return -EFAULT; | 11490 | return -EFAULT; |
11332 | 11491 | ||
11333 | diff -urNp linux-2.6.32.15/arch/x86/kernel/head32.c linux-2.6.32.15/arch/x86/kernel/head32.c | 11492 | diff -urNp linux-2.6.32.16/arch/x86/kernel/head32.c linux-2.6.32.16/arch/x86/kernel/head32.c |
11334 | --- linux-2.6.32.15/arch/x86/kernel/head32.c 2010-03-15 11:52:04.000000000 -0400 | 11493 | --- linux-2.6.32.16/arch/x86/kernel/head32.c 2010-07-05 14:14:00.000000000 -0400 |
11335 | +++ linux-2.6.32.15/arch/x86/kernel/head32.c 2010-05-28 21:27:15.031137412 -0400 | 11494 | +++ linux-2.6.32.16/arch/x86/kernel/head32.c 2010-07-09 14:50:35.000000000 -0400 |
11336 | @@ -16,6 +16,7 @@ | 11495 | @@ -16,6 +16,7 @@ |
11337 | #include <asm/apic.h> | 11496 | #include <asm/apic.h> |
11338 | #include <asm/io_apic.h> | 11497 | #include <asm/io_apic.h> |
@@ -11350,9 +11509,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/head32.c linux-2.6.32.15/arch/x86/ker | |||
11350 | 11509 | ||
11351 | #ifdef CONFIG_BLK_DEV_INITRD | 11510 | #ifdef CONFIG_BLK_DEV_INITRD |
11352 | /* Reserve INITRD */ | 11511 | /* Reserve INITRD */ |
11353 | diff -urNp linux-2.6.32.15/arch/x86/kernel/head_32.S linux-2.6.32.15/arch/x86/kernel/head_32.S | 11512 | diff -urNp linux-2.6.32.16/arch/x86/kernel/head_32.S linux-2.6.32.16/arch/x86/kernel/head_32.S |
11354 | --- linux-2.6.32.15/arch/x86/kernel/head_32.S 2010-03-15 11:52:04.000000000 -0400 | 11513 | --- linux-2.6.32.16/arch/x86/kernel/head_32.S 2010-07-05 14:14:00.000000000 -0400 |
11355 | +++ linux-2.6.32.15/arch/x86/kernel/head_32.S 2010-06-19 10:03:50.008525890 -0400 | 11514 | +++ linux-2.6.32.16/arch/x86/kernel/head_32.S 2010-07-09 14:50:35.000000000 -0400 |
11356 | @@ -19,10 +19,17 @@ | 11515 | @@ -19,10 +19,17 @@ |
11357 | #include <asm/setup.h> | 11516 | #include <asm/setup.h> |
11358 | #include <asm/processor-flags.h> | 11517 | #include <asm/processor-flags.h> |
@@ -11799,9 +11958,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/head_32.S linux-2.6.32.15/arch/x86/ke | |||
11799 | + /* Be sure this is zeroed to avoid false validations in Xen */ | 11958 | + /* Be sure this is zeroed to avoid false validations in Xen */ |
11800 | + .fill PAGE_SIZE_asm - GDT_SIZE,1,0 | 11959 | + .fill PAGE_SIZE_asm - GDT_SIZE,1,0 |
11801 | + .endr | 11960 | + .endr |
11802 | diff -urNp linux-2.6.32.15/arch/x86/kernel/head_64.S linux-2.6.32.15/arch/x86/kernel/head_64.S | 11961 | diff -urNp linux-2.6.32.16/arch/x86/kernel/head_64.S linux-2.6.32.16/arch/x86/kernel/head_64.S |
11803 | --- linux-2.6.32.15/arch/x86/kernel/head_64.S 2010-03-15 11:52:04.000000000 -0400 | 11962 | --- linux-2.6.32.16/arch/x86/kernel/head_64.S 2010-07-05 14:14:00.000000000 -0400 |
11804 | +++ linux-2.6.32.15/arch/x86/kernel/head_64.S 2010-05-28 21:27:15.039159907 -0400 | 11963 | +++ linux-2.6.32.16/arch/x86/kernel/head_64.S 2010-07-09 14:50:35.000000000 -0400 |
11805 | @@ -19,6 +19,7 @@ | 11964 | @@ -19,6 +19,7 @@ |
11806 | #include <asm/cache.h> | 11965 | #include <asm/cache.h> |
11807 | #include <asm/processor-flags.h> | 11966 | #include <asm/processor-flags.h> |
@@ -12072,9 +12231,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/head_64.S linux-2.6.32.15/arch/x86/ke | |||
12072 | 12231 | ||
12073 | __PAGE_ALIGNED_BSS | 12232 | __PAGE_ALIGNED_BSS |
12074 | .align PAGE_SIZE | 12233 | .align PAGE_SIZE |
12075 | 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 | 12234 | diff -urNp linux-2.6.32.16/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.16/arch/x86/kernel/i386_ksyms_32.c |
12076 | --- linux-2.6.32.15/arch/x86/kernel/i386_ksyms_32.c 2010-03-15 11:52:04.000000000 -0400 | 12235 | --- linux-2.6.32.16/arch/x86/kernel/i386_ksyms_32.c 2010-07-05 14:14:00.000000000 -0400 |
12077 | +++ linux-2.6.32.15/arch/x86/kernel/i386_ksyms_32.c 2010-05-28 21:27:15.039159907 -0400 | 12236 | +++ linux-2.6.32.16/arch/x86/kernel/i386_ksyms_32.c 2010-07-09 14:50:35.000000000 -0400 |
12078 | @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); | 12237 | @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); |
12079 | EXPORT_SYMBOL(cmpxchg8b_emu); | 12238 | EXPORT_SYMBOL(cmpxchg8b_emu); |
12080 | #endif | 12239 | #endif |
@@ -12096,9 +12255,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.15/arch/ | |||
12096 | +#ifdef CONFIG_PAX_KERNEXEC | 12255 | +#ifdef CONFIG_PAX_KERNEXEC |
12097 | +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); | 12256 | +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); |
12098 | +#endif | 12257 | +#endif |
12099 | diff -urNp linux-2.6.32.15/arch/x86/kernel/init_task.c linux-2.6.32.15/arch/x86/kernel/init_task.c | 12258 | diff -urNp linux-2.6.32.16/arch/x86/kernel/init_task.c linux-2.6.32.16/arch/x86/kernel/init_task.c |
12100 | --- linux-2.6.32.15/arch/x86/kernel/init_task.c 2010-03-15 11:52:04.000000000 -0400 | 12259 | --- linux-2.6.32.16/arch/x86/kernel/init_task.c 2010-07-05 14:14:00.000000000 -0400 |
12101 | +++ linux-2.6.32.15/arch/x86/kernel/init_task.c 2010-05-28 21:27:15.039159907 -0400 | 12260 | +++ linux-2.6.32.16/arch/x86/kernel/init_task.c 2010-07-09 14:50:35.000000000 -0400 |
12102 | @@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task); | 12261 | @@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task); |
12103 | * section. Since TSS's are completely CPU-local, we want them | 12262 | * section. Since TSS's are completely CPU-local, we want them |
12104 | * on exact cacheline boundaries, to eliminate cacheline ping-pong. | 12263 | * on exact cacheline boundaries, to eliminate cacheline ping-pong. |
@@ -12107,9 +12266,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/init_task.c linux-2.6.32.15/arch/x86/ | |||
12107 | - | 12266 | - |
12108 | +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; | 12267 | +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; |
12109 | +EXPORT_SYMBOL(init_tss); | 12268 | +EXPORT_SYMBOL(init_tss); |
12110 | diff -urNp linux-2.6.32.15/arch/x86/kernel/ioport.c linux-2.6.32.15/arch/x86/kernel/ioport.c | 12269 | diff -urNp linux-2.6.32.16/arch/x86/kernel/ioport.c linux-2.6.32.16/arch/x86/kernel/ioport.c |
12111 | --- linux-2.6.32.15/arch/x86/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400 | 12270 | --- linux-2.6.32.16/arch/x86/kernel/ioport.c 2010-07-05 14:14:00.000000000 -0400 |
12112 | +++ linux-2.6.32.15/arch/x86/kernel/ioport.c 2010-06-19 21:48:03.327550760 -0400 | 12271 | +++ linux-2.6.32.16/arch/x86/kernel/ioport.c 2010-07-09 14:50:35.000000000 -0400 |
12113 | @@ -6,6 +6,7 @@ | 12272 | @@ -6,6 +6,7 @@ |
12114 | #include <linux/sched.h> | 12273 | #include <linux/sched.h> |
12115 | #include <linux/kernel.h> | 12274 | #include <linux/kernel.h> |
@@ -12153,9 +12312,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/ioport.c linux-2.6.32.15/arch/x86/ker | |||
12153 | if (!capable(CAP_SYS_RAWIO)) | 12312 | if (!capable(CAP_SYS_RAWIO)) |
12154 | return -EPERM; | 12313 | return -EPERM; |
12155 | } | 12314 | } |
12156 | diff -urNp linux-2.6.32.15/arch/x86/kernel/irq_32.c linux-2.6.32.15/arch/x86/kernel/irq_32.c | 12315 | diff -urNp linux-2.6.32.16/arch/x86/kernel/irq_32.c linux-2.6.32.16/arch/x86/kernel/irq_32.c |
12157 | --- linux-2.6.32.15/arch/x86/kernel/irq_32.c 2010-03-15 11:52:04.000000000 -0400 | 12316 | --- linux-2.6.32.16/arch/x86/kernel/irq_32.c 2010-07-05 14:14:00.000000000 -0400 |
12158 | +++ linux-2.6.32.15/arch/x86/kernel/irq_32.c 2010-05-28 21:27:15.039159907 -0400 | 12317 | +++ linux-2.6.32.16/arch/x86/kernel/irq_32.c 2010-07-09 14:50:35.000000000 -0400 |
12159 | @@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc | 12318 | @@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc |
12160 | return 0; | 12319 | return 0; |
12161 | 12320 | ||
@@ -12174,9 +12333,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/irq_32.c linux-2.6.32.15/arch/x86/ker | |||
12174 | 12333 | ||
12175 | call_on_stack(__do_softirq, isp); | 12334 | call_on_stack(__do_softirq, isp); |
12176 | /* | 12335 | /* |
12177 | diff -urNp linux-2.6.32.15/arch/x86/kernel/kgdb.c linux-2.6.32.15/arch/x86/kernel/kgdb.c | 12336 | diff -urNp linux-2.6.32.16/arch/x86/kernel/kgdb.c linux-2.6.32.16/arch/x86/kernel/kgdb.c |
12178 | --- linux-2.6.32.15/arch/x86/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 | 12337 | --- linux-2.6.32.16/arch/x86/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 |
12179 | +++ linux-2.6.32.15/arch/x86/kernel/kgdb.c 2010-05-28 21:27:15.039159907 -0400 | 12338 | +++ linux-2.6.32.16/arch/x86/kernel/kgdb.c 2010-07-09 14:50:35.000000000 -0400 |
12180 | @@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception | 12339 | @@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception |
12181 | return instruction_pointer(regs); | 12340 | return instruction_pointer(regs); |
12182 | } | 12341 | } |
@@ -12186,9 +12345,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/kgdb.c linux-2.6.32.15/arch/x86/kerne | |||
12186 | /* Breakpoint instruction: */ | 12345 | /* Breakpoint instruction: */ |
12187 | .gdb_bpt_instr = { 0xcc }, | 12346 | .gdb_bpt_instr = { 0xcc }, |
12188 | .flags = KGDB_HW_BREAKPOINT, | 12347 | .flags = KGDB_HW_BREAKPOINT, |
12189 | diff -urNp linux-2.6.32.15/arch/x86/kernel/kprobes.c linux-2.6.32.15/arch/x86/kernel/kprobes.c | 12348 | diff -urNp linux-2.6.32.16/arch/x86/kernel/kprobes.c linux-2.6.32.16/arch/x86/kernel/kprobes.c |
12190 | --- linux-2.6.32.15/arch/x86/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400 | 12349 | --- linux-2.6.32.16/arch/x86/kernel/kprobes.c 2010-07-05 14:14:00.000000000 -0400 |
12191 | +++ linux-2.6.32.15/arch/x86/kernel/kprobes.c 2010-05-28 21:27:15.039159907 -0400 | 12350 | +++ linux-2.6.32.16/arch/x86/kernel/kprobes.c 2010-07-09 14:50:35.000000000 -0400 |
12192 | @@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f | 12351 | @@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f |
12193 | char op; | 12352 | char op; |
12194 | s32 raddr; | 12353 | s32 raddr; |
@@ -12281,9 +12440,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/kprobes.c linux-2.6.32.15/arch/x86/ke | |||
12281 | return ret; | 12440 | return ret; |
12282 | 12441 | ||
12283 | switch (val) { | 12442 | switch (val) { |
12284 | diff -urNp linux-2.6.32.15/arch/x86/kernel/ldt.c linux-2.6.32.15/arch/x86/kernel/ldt.c | 12443 | diff -urNp linux-2.6.32.16/arch/x86/kernel/ldt.c linux-2.6.32.16/arch/x86/kernel/ldt.c |
12285 | --- linux-2.6.32.15/arch/x86/kernel/ldt.c 2010-03-15 11:52:04.000000000 -0400 | 12444 | --- linux-2.6.32.16/arch/x86/kernel/ldt.c 2010-07-05 14:14:00.000000000 -0400 |
12286 | +++ linux-2.6.32.15/arch/x86/kernel/ldt.c 2010-05-28 21:27:15.039159907 -0400 | 12445 | +++ linux-2.6.32.16/arch/x86/kernel/ldt.c 2010-07-09 14:50:35.000000000 -0400 |
12287 | @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i | 12446 | @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i |
12288 | if (reload) { | 12447 | if (reload) { |
12289 | #ifdef CONFIG_SMP | 12448 | #ifdef CONFIG_SMP |
@@ -12348,9 +12507,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/ldt.c linux-2.6.32.15/arch/x86/kernel | |||
12348 | fill_ldt(&ldt, &ldt_info); | 12507 | fill_ldt(&ldt, &ldt_info); |
12349 | if (oldmode) | 12508 | if (oldmode) |
12350 | ldt.avl = 0; | 12509 | ldt.avl = 0; |
12351 | 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 | 12510 | diff -urNp linux-2.6.32.16/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.16/arch/x86/kernel/machine_kexec_32.c |
12352 | --- linux-2.6.32.15/arch/x86/kernel/machine_kexec_32.c 2010-03-15 11:52:04.000000000 -0400 | 12511 | --- linux-2.6.32.16/arch/x86/kernel/machine_kexec_32.c 2010-07-05 14:14:00.000000000 -0400 |
12353 | +++ linux-2.6.32.15/arch/x86/kernel/machine_kexec_32.c 2010-05-28 21:27:15.043064911 -0400 | 12512 | +++ linux-2.6.32.16/arch/x86/kernel/machine_kexec_32.c 2010-07-09 14:50:35.000000000 -0400 |
12354 | @@ -26,7 +26,7 @@ | 12513 | @@ -26,7 +26,7 @@ |
12355 | #include <asm/system.h> | 12514 | #include <asm/system.h> |
12356 | #include <asm/cacheflush.h> | 12515 | #include <asm/cacheflush.h> |
@@ -12378,9 +12537,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.15/ar | |||
12378 | 12537 | ||
12379 | relocate_kernel_ptr = control_page; | 12538 | relocate_kernel_ptr = control_page; |
12380 | page_list[PA_CONTROL_PAGE] = __pa(control_page); | 12539 | page_list[PA_CONTROL_PAGE] = __pa(control_page); |
12381 | diff -urNp linux-2.6.32.15/arch/x86/kernel/microcode_amd.c linux-2.6.32.15/arch/x86/kernel/microcode_amd.c | 12540 | diff -urNp linux-2.6.32.16/arch/x86/kernel/microcode_amd.c linux-2.6.32.16/arch/x86/kernel/microcode_amd.c |
12382 | --- linux-2.6.32.15/arch/x86/kernel/microcode_amd.c 2010-03-15 11:52:04.000000000 -0400 | 12541 | --- linux-2.6.32.16/arch/x86/kernel/microcode_amd.c 2010-07-05 14:14:00.000000000 -0400 |
12383 | +++ linux-2.6.32.15/arch/x86/kernel/microcode_amd.c 2010-05-28 21:27:15.043064911 -0400 | 12542 | +++ linux-2.6.32.16/arch/x86/kernel/microcode_amd.c 2010-07-09 14:50:35.000000000 -0400 |
12384 | @@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c | 12543 | @@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c |
12385 | uci->mc = NULL; | 12544 | uci->mc = NULL; |
12386 | } | 12545 | } |
@@ -12399,9 +12558,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/microcode_amd.c linux-2.6.32.15/arch/ | |||
12399 | { | 12558 | { |
12400 | return µcode_amd_ops; | 12559 | return µcode_amd_ops; |
12401 | } | 12560 | } |
12402 | diff -urNp linux-2.6.32.15/arch/x86/kernel/microcode_core.c linux-2.6.32.15/arch/x86/kernel/microcode_core.c | 12561 | diff -urNp linux-2.6.32.16/arch/x86/kernel/microcode_core.c linux-2.6.32.16/arch/x86/kernel/microcode_core.c |
12403 | --- linux-2.6.32.15/arch/x86/kernel/microcode_core.c 2010-03-15 11:52:04.000000000 -0400 | 12562 | --- linux-2.6.32.16/arch/x86/kernel/microcode_core.c 2010-07-05 14:14:00.000000000 -0400 |
12404 | +++ linux-2.6.32.15/arch/x86/kernel/microcode_core.c 2010-05-28 21:27:15.043064911 -0400 | 12563 | +++ linux-2.6.32.16/arch/x86/kernel/microcode_core.c 2010-07-09 14:50:35.000000000 -0400 |
12405 | @@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); | 12564 | @@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); |
12406 | 12565 | ||
12407 | #define MICROCODE_VERSION "2.00" | 12566 | #define MICROCODE_VERSION "2.00" |
@@ -12411,9 +12570,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/microcode_core.c linux-2.6.32.15/arch | |||
12411 | 12570 | ||
12412 | /* | 12571 | /* |
12413 | * Synchronization. | 12572 | * Synchronization. |
12414 | diff -urNp linux-2.6.32.15/arch/x86/kernel/microcode_intel.c linux-2.6.32.15/arch/x86/kernel/microcode_intel.c | 12573 | diff -urNp linux-2.6.32.16/arch/x86/kernel/microcode_intel.c linux-2.6.32.16/arch/x86/kernel/microcode_intel.c |
12415 | --- linux-2.6.32.15/arch/x86/kernel/microcode_intel.c 2010-03-15 11:52:04.000000000 -0400 | 12574 | --- linux-2.6.32.16/arch/x86/kernel/microcode_intel.c 2010-07-05 14:14:00.000000000 -0400 |
12416 | +++ linux-2.6.32.15/arch/x86/kernel/microcode_intel.c 2010-05-28 21:27:15.043064911 -0400 | 12575 | +++ linux-2.6.32.16/arch/x86/kernel/microcode_intel.c 2010-07-09 14:50:35.000000000 -0400 |
12417 | @@ -443,13 +443,13 @@ static enum ucode_state request_microcod | 12576 | @@ -443,13 +443,13 @@ static enum ucode_state request_microcod |
12418 | 12577 | ||
12419 | static int get_ucode_user(void *to, const void *from, size_t n) | 12578 | static int get_ucode_user(void *to, const void *from, size_t n) |
@@ -12448,9 +12607,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/microcode_intel.c linux-2.6.32.15/arc | |||
12448 | { | 12607 | { |
12449 | return µcode_intel_ops; | 12608 | return µcode_intel_ops; |
12450 | } | 12609 | } |
12451 | diff -urNp linux-2.6.32.15/arch/x86/kernel/module.c linux-2.6.32.15/arch/x86/kernel/module.c | 12610 | diff -urNp linux-2.6.32.16/arch/x86/kernel/module.c linux-2.6.32.16/arch/x86/kernel/module.c |
12452 | --- linux-2.6.32.15/arch/x86/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 | 12611 | --- linux-2.6.32.16/arch/x86/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 |
12453 | +++ linux-2.6.32.15/arch/x86/kernel/module.c 2010-05-28 21:27:15.043064911 -0400 | 12612 | +++ linux-2.6.32.16/arch/x86/kernel/module.c 2010-07-09 14:50:35.000000000 -0400 |
12454 | @@ -34,7 +34,7 @@ | 12613 | @@ -34,7 +34,7 @@ |
12455 | #define DEBUGP(fmt...) | 12614 | #define DEBUGP(fmt...) |
12456 | #endif | 12615 | #endif |
@@ -12591,9 +12750,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/module.c linux-2.6.32.15/arch/x86/ker | |||
12591 | #if 0 | 12750 | #if 0 |
12592 | if ((s64)val != *(s32 *)loc) | 12751 | if ((s64)val != *(s32 *)loc) |
12593 | goto overflow; | 12752 | goto overflow; |
12594 | diff -urNp linux-2.6.32.15/arch/x86/kernel/paravirt.c linux-2.6.32.15/arch/x86/kernel/paravirt.c | 12753 | diff -urNp linux-2.6.32.16/arch/x86/kernel/paravirt.c linux-2.6.32.16/arch/x86/kernel/paravirt.c |
12595 | --- linux-2.6.32.15/arch/x86/kernel/paravirt.c 2010-03-15 11:52:04.000000000 -0400 | 12754 | --- linux-2.6.32.16/arch/x86/kernel/paravirt.c 2010-07-05 14:14:00.000000000 -0400 |
12596 | +++ linux-2.6.32.15/arch/x86/kernel/paravirt.c 2010-05-28 21:27:15.043064911 -0400 | 12755 | +++ linux-2.6.32.16/arch/x86/kernel/paravirt.c 2010-07-09 14:50:35.000000000 -0400 |
12597 | @@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu | 12756 | @@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu |
12598 | * corresponding structure. */ | 12757 | * corresponding structure. */ |
12599 | static void *get_call_destination(u8 type) | 12758 | static void *get_call_destination(u8 type) |
@@ -12697,9 +12856,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/paravirt.c linux-2.6.32.15/arch/x86/k | |||
12697 | }; | 12856 | }; |
12698 | 12857 | ||
12699 | EXPORT_SYMBOL_GPL(pv_time_ops); | 12858 | EXPORT_SYMBOL_GPL(pv_time_ops); |
12700 | diff -urNp linux-2.6.32.15/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.15/arch/x86/kernel/paravirt-spinlocks.c | 12859 | diff -urNp linux-2.6.32.16/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.16/arch/x86/kernel/paravirt-spinlocks.c |
12701 | --- linux-2.6.32.15/arch/x86/kernel/paravirt-spinlocks.c 2010-03-15 11:52:04.000000000 -0400 | 12860 | --- linux-2.6.32.16/arch/x86/kernel/paravirt-spinlocks.c 2010-07-05 14:14:00.000000000 -0400 |
12702 | +++ linux-2.6.32.15/arch/x86/kernel/paravirt-spinlocks.c 2010-05-28 21:27:15.043064911 -0400 | 12861 | +++ linux-2.6.32.16/arch/x86/kernel/paravirt-spinlocks.c 2010-07-09 14:50:35.000000000 -0400 |
12703 | @@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * | 12862 | @@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * |
12704 | __raw_spin_lock(lock); | 12863 | __raw_spin_lock(lock); |
12705 | } | 12864 | } |
@@ -12709,9 +12868,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.15/ | |||
12709 | #ifdef CONFIG_SMP | 12868 | #ifdef CONFIG_SMP |
12710 | .spin_is_locked = __ticket_spin_is_locked, | 12869 | .spin_is_locked = __ticket_spin_is_locked, |
12711 | .spin_is_contended = __ticket_spin_is_contended, | 12870 | .spin_is_contended = __ticket_spin_is_contended, |
12712 | 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 | 12871 | diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.16/arch/x86/kernel/pci-calgary_64.c |
12713 | --- linux-2.6.32.15/arch/x86/kernel/pci-calgary_64.c 2010-03-15 11:52:04.000000000 -0400 | 12872 | --- linux-2.6.32.16/arch/x86/kernel/pci-calgary_64.c 2010-07-05 14:14:00.000000000 -0400 |
12714 | +++ linux-2.6.32.15/arch/x86/kernel/pci-calgary_64.c 2010-05-28 21:27:15.043064911 -0400 | 12873 | +++ linux-2.6.32.16/arch/x86/kernel/pci-calgary_64.c 2010-07-09 14:50:35.000000000 -0400 |
12715 | @@ -472,7 +472,7 @@ static void calgary_free_coherent(struct | 12874 | @@ -472,7 +472,7 @@ static void calgary_free_coherent(struct |
12716 | free_pages((unsigned long)vaddr, get_order(size)); | 12875 | free_pages((unsigned long)vaddr, get_order(size)); |
12717 | } | 12876 | } |
@@ -12721,9 +12880,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.15/arch | |||
12721 | .alloc_coherent = calgary_alloc_coherent, | 12880 | .alloc_coherent = calgary_alloc_coherent, |
12722 | .free_coherent = calgary_free_coherent, | 12881 | .free_coherent = calgary_free_coherent, |
12723 | .map_sg = calgary_map_sg, | 12882 | .map_sg = calgary_map_sg, |
12724 | diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-dma.c linux-2.6.32.15/arch/x86/kernel/pci-dma.c | 12883 | diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-dma.c linux-2.6.32.16/arch/x86/kernel/pci-dma.c |
12725 | --- linux-2.6.32.15/arch/x86/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400 | 12884 | --- linux-2.6.32.16/arch/x86/kernel/pci-dma.c 2010-07-05 14:14:00.000000000 -0400 |
12726 | +++ linux-2.6.32.15/arch/x86/kernel/pci-dma.c 2010-05-28 21:27:15.043064911 -0400 | 12885 | +++ linux-2.6.32.16/arch/x86/kernel/pci-dma.c 2010-07-09 14:50:35.000000000 -0400 |
12727 | @@ -14,7 +14,7 @@ | 12886 | @@ -14,7 +14,7 @@ |
12728 | 12887 | ||
12729 | static int forbid_dac __read_mostly; | 12888 | static int forbid_dac __read_mostly; |
@@ -12742,9 +12901,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-dma.c linux-2.6.32.15/arch/x86/ke | |||
12742 | 12901 | ||
12743 | #ifdef CONFIG_PCI | 12902 | #ifdef CONFIG_PCI |
12744 | if (mask > 0xffffffff && forbid_dac > 0) { | 12903 | if (mask > 0xffffffff && forbid_dac > 0) { |
12745 | 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 | 12904 | diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-gart_64.c linux-2.6.32.16/arch/x86/kernel/pci-gart_64.c |
12746 | --- linux-2.6.32.15/arch/x86/kernel/pci-gart_64.c 2010-05-15 13:20:18.438563899 -0400 | 12905 | --- linux-2.6.32.16/arch/x86/kernel/pci-gart_64.c 2010-07-05 14:14:00.000000000 -0400 |
12747 | +++ linux-2.6.32.15/arch/x86/kernel/pci-gart_64.c 2010-05-28 21:27:15.047155410 -0400 | 12906 | +++ linux-2.6.32.16/arch/x86/kernel/pci-gart_64.c 2010-07-09 14:50:35.000000000 -0400 |
12748 | @@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag | 12907 | @@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag |
12749 | return -1; | 12908 | return -1; |
12750 | } | 12909 | } |
@@ -12754,9 +12913,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-gart_64.c linux-2.6.32.15/arch/x8 | |||
12754 | .map_sg = gart_map_sg, | 12913 | .map_sg = gart_map_sg, |
12755 | .unmap_sg = gart_unmap_sg, | 12914 | .unmap_sg = gart_unmap_sg, |
12756 | .map_page = gart_map_page, | 12915 | .map_page = gart_map_page, |
12757 | diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-nommu.c linux-2.6.32.15/arch/x86/kernel/pci-nommu.c | 12916 | diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-nommu.c linux-2.6.32.16/arch/x86/kernel/pci-nommu.c |
12758 | --- linux-2.6.32.15/arch/x86/kernel/pci-nommu.c 2010-03-15 11:52:04.000000000 -0400 | 12917 | --- linux-2.6.32.16/arch/x86/kernel/pci-nommu.c 2010-07-05 14:14:00.000000000 -0400 |
12759 | +++ linux-2.6.32.15/arch/x86/kernel/pci-nommu.c 2010-05-28 21:27:15.047155410 -0400 | 12918 | +++ linux-2.6.32.16/arch/x86/kernel/pci-nommu.c 2010-07-09 14:50:35.000000000 -0400 |
12760 | @@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str | 12919 | @@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str |
12761 | flush_write_buffers(); | 12920 | flush_write_buffers(); |
12762 | } | 12921 | } |
@@ -12766,9 +12925,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-nommu.c linux-2.6.32.15/arch/x86/ | |||
12766 | .alloc_coherent = dma_generic_alloc_coherent, | 12925 | .alloc_coherent = dma_generic_alloc_coherent, |
12767 | .free_coherent = nommu_free_coherent, | 12926 | .free_coherent = nommu_free_coherent, |
12768 | .map_sg = nommu_map_sg, | 12927 | .map_sg = nommu_map_sg, |
12769 | diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.15/arch/x86/kernel/pci-swiotlb.c | 12928 | diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.16/arch/x86/kernel/pci-swiotlb.c |
12770 | --- linux-2.6.32.15/arch/x86/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 | 12929 | --- linux-2.6.32.16/arch/x86/kernel/pci-swiotlb.c 2010-07-05 14:14:00.000000000 -0400 |
12771 | +++ linux-2.6.32.15/arch/x86/kernel/pci-swiotlb.c 2010-05-28 21:27:15.047155410 -0400 | 12930 | +++ linux-2.6.32.16/arch/x86/kernel/pci-swiotlb.c 2010-07-09 14:50:35.000000000 -0400 |
12772 | @@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent( | 12931 | @@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent( |
12773 | return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); | 12932 | return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); |
12774 | } | 12933 | } |
@@ -12778,9 +12937,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.15/arch/x8 | |||
12778 | .mapping_error = swiotlb_dma_mapping_error, | 12937 | .mapping_error = swiotlb_dma_mapping_error, |
12779 | .alloc_coherent = x86_swiotlb_alloc_coherent, | 12938 | .alloc_coherent = x86_swiotlb_alloc_coherent, |
12780 | .free_coherent = swiotlb_free_coherent, | 12939 | .free_coherent = swiotlb_free_coherent, |
12781 | diff -urNp linux-2.6.32.15/arch/x86/kernel/process_32.c linux-2.6.32.15/arch/x86/kernel/process_32.c | 12940 | diff -urNp linux-2.6.32.16/arch/x86/kernel/process_32.c linux-2.6.32.16/arch/x86/kernel/process_32.c |
12782 | --- linux-2.6.32.15/arch/x86/kernel/process_32.c 2010-03-15 11:52:04.000000000 -0400 | 12941 | --- linux-2.6.32.16/arch/x86/kernel/process_32.c 2010-07-05 14:14:00.000000000 -0400 |
12783 | +++ linux-2.6.32.15/arch/x86/kernel/process_32.c 2010-05-28 21:27:15.047155410 -0400 | 12942 | +++ linux-2.6.32.16/arch/x86/kernel/process_32.c 2010-07-09 14:50:35.000000000 -0400 |
12784 | @@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as | 12943 | @@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as |
12785 | unsigned long thread_saved_pc(struct task_struct *tsk) | 12944 | unsigned long thread_saved_pc(struct task_struct *tsk) |
12786 | { | 12945 | { |
@@ -12875,9 +13034,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/process_32.c linux-2.6.32.15/arch/x86 | |||
12875 | + load_sp0(init_tss + smp_processor_id(), thread); | 13034 | + load_sp0(init_tss + smp_processor_id(), thread); |
12876 | +} | 13035 | +} |
12877 | +#endif | 13036 | +#endif |
12878 | diff -urNp linux-2.6.32.15/arch/x86/kernel/process_64.c linux-2.6.32.15/arch/x86/kernel/process_64.c | 13037 | diff -urNp linux-2.6.32.16/arch/x86/kernel/process_64.c linux-2.6.32.16/arch/x86/kernel/process_64.c |
12879 | --- linux-2.6.32.15/arch/x86/kernel/process_64.c 2010-05-15 13:20:18.438563899 -0400 | 13038 | --- linux-2.6.32.16/arch/x86/kernel/process_64.c 2010-07-05 14:14:00.000000000 -0400 |
12880 | +++ linux-2.6.32.15/arch/x86/kernel/process_64.c 2010-05-28 21:27:15.047155410 -0400 | 13039 | +++ linux-2.6.32.16/arch/x86/kernel/process_64.c 2010-07-09 14:50:35.000000000 -0400 |
12881 | @@ -91,7 +91,7 @@ static void __exit_idle(void) | 13040 | @@ -91,7 +91,7 @@ static void __exit_idle(void) |
12882 | void exit_idle(void) | 13041 | void exit_idle(void) |
12883 | { | 13042 | { |
@@ -12920,9 +13079,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/process_64.c linux-2.6.32.15/arch/x86 | |||
12920 | return 0; | 13079 | return 0; |
12921 | ip = *(u64 *)(fp+8); | 13080 | ip = *(u64 *)(fp+8); |
12922 | if (!in_sched_functions(ip)) | 13081 | if (!in_sched_functions(ip)) |
12923 | diff -urNp linux-2.6.32.15/arch/x86/kernel/process.c linux-2.6.32.15/arch/x86/kernel/process.c | 13082 | diff -urNp linux-2.6.32.16/arch/x86/kernel/process.c linux-2.6.32.16/arch/x86/kernel/process.c |
12924 | --- linux-2.6.32.15/arch/x86/kernel/process.c 2010-05-28 20:16:44.430924650 -0400 | 13083 | --- linux-2.6.32.16/arch/x86/kernel/process.c 2010-07-05 14:14:00.000000000 -0400 |
12925 | +++ linux-2.6.32.15/arch/x86/kernel/process.c 2010-05-28 21:27:15.047155410 -0400 | 13084 | +++ linux-2.6.32.16/arch/x86/kernel/process.c 2010-07-09 14:50:35.000000000 -0400 |
12926 | @@ -73,7 +73,7 @@ void exit_thread(void) | 13085 | @@ -73,7 +73,7 @@ void exit_thread(void) |
12927 | unsigned long *bp = t->io_bitmap_ptr; | 13086 | unsigned long *bp = t->io_bitmap_ptr; |
12928 | 13087 | ||
@@ -12960,9 +13119,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/process.c linux-2.6.32.15/arch/x86/ke | |||
12960 | - return randomize_range(mm->brk, range_end, 0) ? : mm->brk; | 13119 | - return randomize_range(mm->brk, range_end, 0) ? : mm->brk; |
12961 | -} | 13120 | -} |
12962 | - | 13121 | - |
12963 | diff -urNp linux-2.6.32.15/arch/x86/kernel/ptrace.c linux-2.6.32.15/arch/x86/kernel/ptrace.c | 13122 | diff -urNp linux-2.6.32.16/arch/x86/kernel/ptrace.c linux-2.6.32.16/arch/x86/kernel/ptrace.c |
12964 | --- linux-2.6.32.15/arch/x86/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400 | 13123 | --- linux-2.6.32.16/arch/x86/kernel/ptrace.c 2010-07-05 14:14:00.000000000 -0400 |
12965 | +++ linux-2.6.32.15/arch/x86/kernel/ptrace.c 2010-05-28 21:27:15.047155410 -0400 | 13124 | +++ linux-2.6.32.16/arch/x86/kernel/ptrace.c 2010-07-09 14:50:35.000000000 -0400 |
12966 | @@ -925,7 +925,7 @@ static const struct user_regset_view use | 13125 | @@ -925,7 +925,7 @@ static const struct user_regset_view use |
12967 | long arch_ptrace(struct task_struct *child, long request, long addr, long data) | 13126 | long arch_ptrace(struct task_struct *child, long request, long addr, long data) |
12968 | { | 13127 | { |
@@ -13031,9 +13190,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/ptrace.c linux-2.6.32.15/arch/x86/ker | |||
13031 | 13190 | ||
13032 | /* Send us the fake SIGTRAP */ | 13191 | /* Send us the fake SIGTRAP */ |
13033 | force_sig_info(SIGTRAP, &info, tsk); | 13192 | force_sig_info(SIGTRAP, &info, tsk); |
13034 | diff -urNp linux-2.6.32.15/arch/x86/kernel/reboot.c linux-2.6.32.15/arch/x86/kernel/reboot.c | 13193 | diff -urNp linux-2.6.32.16/arch/x86/kernel/reboot.c linux-2.6.32.16/arch/x86/kernel/reboot.c |
13035 | --- linux-2.6.32.15/arch/x86/kernel/reboot.c 2010-03-15 11:52:04.000000000 -0400 | 13194 | --- linux-2.6.32.16/arch/x86/kernel/reboot.c 2010-07-05 14:14:00.000000000 -0400 |
13036 | +++ linux-2.6.32.15/arch/x86/kernel/reboot.c 2010-05-28 21:27:15.050883545 -0400 | 13195 | +++ linux-2.6.32.16/arch/x86/kernel/reboot.c 2010-07-09 14:50:35.000000000 -0400 |
13037 | @@ -33,7 +33,7 @@ void (*pm_power_off)(void); | 13196 | @@ -33,7 +33,7 @@ void (*pm_power_off)(void); |
13038 | EXPORT_SYMBOL(pm_power_off); | 13197 | EXPORT_SYMBOL(pm_power_off); |
13039 | 13198 | ||
@@ -13110,10 +13269,10 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/reboot.c linux-2.6.32.15/arch/x86/ker | |||
13110 | 13269 | ||
13111 | /* Set up the IDT for real mode. */ | 13270 | /* Set up the IDT for real mode. */ |
13112 | load_idt(&real_mode_idt); | 13271 | load_idt(&real_mode_idt); |
13113 | diff -urNp linux-2.6.32.15/arch/x86/kernel/setup.c linux-2.6.32.15/arch/x86/kernel/setup.c | 13272 | diff -urNp linux-2.6.32.16/arch/x86/kernel/setup.c linux-2.6.32.16/arch/x86/kernel/setup.c |
13114 | --- linux-2.6.32.15/arch/x86/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400 | 13273 | --- linux-2.6.32.16/arch/x86/kernel/setup.c 2010-07-05 14:14:00.000000000 -0400 |
13115 | +++ linux-2.6.32.15/arch/x86/kernel/setup.c 2010-05-28 21:27:15.062911922 -0400 | 13274 | +++ linux-2.6.32.16/arch/x86/kernel/setup.c 2010-07-09 14:50:35.000000000 -0400 |
13116 | @@ -771,14 +771,14 @@ void __init setup_arch(char **cmdline_p) | 13275 | @@ -782,14 +782,14 @@ void __init setup_arch(char **cmdline_p) |
13117 | 13276 | ||
13118 | if (!boot_params.hdr.root_flags) | 13277 | if (!boot_params.hdr.root_flags) |
13119 | root_mountflags &= ~MS_RDONLY; | 13278 | root_mountflags &= ~MS_RDONLY; |
@@ -13133,9 +13292,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/setup.c linux-2.6.32.15/arch/x86/kern | |||
13133 | data_resource.end = virt_to_phys(_edata)-1; | 13292 | data_resource.end = virt_to_phys(_edata)-1; |
13134 | bss_resource.start = virt_to_phys(&__bss_start); | 13293 | bss_resource.start = virt_to_phys(&__bss_start); |
13135 | bss_resource.end = virt_to_phys(&__bss_stop)-1; | 13294 | bss_resource.end = virt_to_phys(&__bss_stop)-1; |
13136 | diff -urNp linux-2.6.32.15/arch/x86/kernel/setup_percpu.c linux-2.6.32.15/arch/x86/kernel/setup_percpu.c | 13295 | diff -urNp linux-2.6.32.16/arch/x86/kernel/setup_percpu.c linux-2.6.32.16/arch/x86/kernel/setup_percpu.c |
13137 | --- linux-2.6.32.15/arch/x86/kernel/setup_percpu.c 2010-03-15 11:52:04.000000000 -0400 | 13296 | --- linux-2.6.32.16/arch/x86/kernel/setup_percpu.c 2010-07-05 14:14:00.000000000 -0400 |
13138 | +++ linux-2.6.32.15/arch/x86/kernel/setup_percpu.c 2010-05-28 21:27:15.062911922 -0400 | 13297 | +++ linux-2.6.32.16/arch/x86/kernel/setup_percpu.c 2010-07-09 14:50:35.000000000 -0400 |
13139 | @@ -25,19 +25,17 @@ | 13298 | @@ -25,19 +25,17 @@ |
13140 | # define DBG(x...) | 13299 | # define DBG(x...) |
13141 | #endif | 13300 | #endif |
@@ -13198,9 +13357,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/setup_percpu.c linux-2.6.32.15/arch/x | |||
13198 | /* | 13357 | /* |
13199 | * Up to this point, the boot CPU has been using .data.init | 13358 | * Up to this point, the boot CPU has been using .data.init |
13200 | * area. Reload any changed state for the boot CPU. | 13359 | * area. Reload any changed state for the boot CPU. |
13201 | diff -urNp linux-2.6.32.15/arch/x86/kernel/signal.c linux-2.6.32.15/arch/x86/kernel/signal.c | 13360 | diff -urNp linux-2.6.32.16/arch/x86/kernel/signal.c linux-2.6.32.16/arch/x86/kernel/signal.c |
13202 | --- linux-2.6.32.15/arch/x86/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400 | 13361 | --- linux-2.6.32.16/arch/x86/kernel/signal.c 2010-07-05 14:14:00.000000000 -0400 |
13203 | +++ linux-2.6.32.15/arch/x86/kernel/signal.c 2010-05-28 21:27:15.062911922 -0400 | 13362 | +++ linux-2.6.32.16/arch/x86/kernel/signal.c 2010-07-09 14:50:35.000000000 -0400 |
13204 | @@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi | 13363 | @@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi |
13205 | * Align the stack pointer according to the i386 ABI, | 13364 | * Align the stack pointer according to the i386 ABI, |
13206 | * i.e. so that on function entry ((sp + 4) & 15) == 0. | 13365 | * i.e. so that on function entry ((sp + 4) & 15) == 0. |
@@ -13272,9 +13431,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/signal.c linux-2.6.32.15/arch/x86/ker | |||
13272 | return; | 13431 | return; |
13273 | 13432 | ||
13274 | if (current_thread_info()->status & TS_RESTORE_SIGMASK) | 13433 | if (current_thread_info()->status & TS_RESTORE_SIGMASK) |
13275 | diff -urNp linux-2.6.32.15/arch/x86/kernel/smpboot.c linux-2.6.32.15/arch/x86/kernel/smpboot.c | 13434 | diff -urNp linux-2.6.32.16/arch/x86/kernel/smpboot.c linux-2.6.32.16/arch/x86/kernel/smpboot.c |
13276 | --- linux-2.6.32.15/arch/x86/kernel/smpboot.c 2010-04-04 20:41:49.920655481 -0400 | 13435 | --- linux-2.6.32.16/arch/x86/kernel/smpboot.c 2010-07-05 14:14:00.000000000 -0400 |
13277 | +++ linux-2.6.32.15/arch/x86/kernel/smpboot.c 2010-05-28 21:27:15.062911922 -0400 | 13436 | +++ linux-2.6.32.16/arch/x86/kernel/smpboot.c 2010-07-09 14:50:35.000000000 -0400 |
13278 | @@ -729,7 +729,11 @@ do_rest: | 13437 | @@ -729,7 +729,11 @@ do_rest: |
13279 | (unsigned long)task_stack_page(c_idle.idle) - | 13438 | (unsigned long)task_stack_page(c_idle.idle) - |
13280 | KERNEL_STACK_OFFSET + THREAD_SIZE; | 13439 | KERNEL_STACK_OFFSET + THREAD_SIZE; |
@@ -13300,9 +13459,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/smpboot.c linux-2.6.32.15/arch/x86/ke | |||
13300 | #ifdef CONFIG_X86_32 | 13459 | #ifdef CONFIG_X86_32 |
13301 | /* init low mem mapping */ | 13460 | /* init low mem mapping */ |
13302 | clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY, | 13461 | clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY, |
13303 | diff -urNp linux-2.6.32.15/arch/x86/kernel/step.c linux-2.6.32.15/arch/x86/kernel/step.c | 13462 | diff -urNp linux-2.6.32.16/arch/x86/kernel/step.c linux-2.6.32.16/arch/x86/kernel/step.c |
13304 | --- linux-2.6.32.15/arch/x86/kernel/step.c 2010-03-15 11:52:04.000000000 -0400 | 13463 | --- linux-2.6.32.16/arch/x86/kernel/step.c 2010-07-05 14:14:00.000000000 -0400 |
13305 | +++ linux-2.6.32.15/arch/x86/kernel/step.c 2010-05-28 21:27:15.062911922 -0400 | 13464 | +++ linux-2.6.32.16/arch/x86/kernel/step.c 2010-07-09 14:50:35.000000000 -0400 |
13306 | @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc | 13465 | @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc |
13307 | struct desc_struct *desc; | 13466 | struct desc_struct *desc; |
13308 | unsigned long base; | 13467 | unsigned long base; |
@@ -13335,17 +13494,17 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/step.c linux-2.6.32.15/arch/x86/kerne | |||
13335 | /* 32-bit mode: register increment */ | 13494 | /* 32-bit mode: register increment */ |
13336 | return 0; | 13495 | return 0; |
13337 | /* 64-bit mode: REX prefix */ | 13496 | /* 64-bit mode: REX prefix */ |
13338 | 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 | 13497 | diff -urNp linux-2.6.32.16/arch/x86/kernel/syscall_table_32.S linux-2.6.32.16/arch/x86/kernel/syscall_table_32.S |
13339 | --- linux-2.6.32.15/arch/x86/kernel/syscall_table_32.S 2010-03-15 11:52:04.000000000 -0400 | 13498 | --- linux-2.6.32.16/arch/x86/kernel/syscall_table_32.S 2010-07-05 14:14:00.000000000 -0400 |
13340 | +++ linux-2.6.32.15/arch/x86/kernel/syscall_table_32.S 2010-05-28 21:27:15.062911922 -0400 | 13499 | +++ linux-2.6.32.16/arch/x86/kernel/syscall_table_32.S 2010-07-09 14:50:35.000000000 -0400 |
13341 | @@ -1,3 +1,4 @@ | 13500 | @@ -1,3 +1,4 @@ |
13342 | +.section .rodata,"a",@progbits | 13501 | +.section .rodata,"a",@progbits |
13343 | ENTRY(sys_call_table) | 13502 | ENTRY(sys_call_table) |
13344 | .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ | 13503 | .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ |
13345 | .long sys_exit | 13504 | .long sys_exit |
13346 | 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 | 13505 | diff -urNp linux-2.6.32.16/arch/x86/kernel/sys_i386_32.c linux-2.6.32.16/arch/x86/kernel/sys_i386_32.c |
13347 | --- linux-2.6.32.15/arch/x86/kernel/sys_i386_32.c 2010-03-15 11:52:04.000000000 -0400 | 13506 | --- linux-2.6.32.16/arch/x86/kernel/sys_i386_32.c 2010-07-05 14:14:00.000000000 -0400 |
13348 | +++ linux-2.6.32.15/arch/x86/kernel/sys_i386_32.c 2010-05-28 21:27:15.062911922 -0400 | 13507 | +++ linux-2.6.32.16/arch/x86/kernel/sys_i386_32.c 2010-07-09 14:50:35.000000000 -0400 |
13349 | @@ -24,6 +24,21 @@ | 13508 | @@ -24,6 +24,21 @@ |
13350 | 13509 | ||
13351 | #include <asm/syscalls.h> | 13510 | #include <asm/syscalls.h> |
@@ -13592,9 +13751,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/sys_i386_32.c linux-2.6.32.15/arch/x8 | |||
13592 | } | 13751 | } |
13593 | case 1: /* iBCS2 emulator entry point */ | 13752 | case 1: /* iBCS2 emulator entry point */ |
13594 | if (!segment_eq(get_fs(), get_ds())) | 13753 | if (!segment_eq(get_fs(), get_ds())) |
13595 | 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 | 13754 | diff -urNp linux-2.6.32.16/arch/x86/kernel/sys_x86_64.c linux-2.6.32.16/arch/x86/kernel/sys_x86_64.c |
13596 | --- linux-2.6.32.15/arch/x86/kernel/sys_x86_64.c 2010-03-15 11:52:04.000000000 -0400 | 13755 | --- linux-2.6.32.16/arch/x86/kernel/sys_x86_64.c 2010-07-05 14:14:00.000000000 -0400 |
13597 | +++ linux-2.6.32.15/arch/x86/kernel/sys_x86_64.c 2010-05-28 21:27:15.062911922 -0400 | 13756 | +++ linux-2.6.32.16/arch/x86/kernel/sys_x86_64.c 2010-07-09 14:50:35.000000000 -0400 |
13598 | @@ -32,8 +32,8 @@ out: | 13757 | @@ -32,8 +32,8 @@ out: |
13599 | return error; | 13758 | return error; |
13600 | } | 13759 | } |
@@ -13676,9 +13835,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/sys_x86_64.c linux-2.6.32.15/arch/x86 | |||
13676 | mm->cached_hole_size = ~0UL; | 13835 | mm->cached_hole_size = ~0UL; |
13677 | 13836 | ||
13678 | return addr; | 13837 | return addr; |
13679 | diff -urNp linux-2.6.32.15/arch/x86/kernel/time.c linux-2.6.32.15/arch/x86/kernel/time.c | 13838 | diff -urNp linux-2.6.32.16/arch/x86/kernel/time.c linux-2.6.32.16/arch/x86/kernel/time.c |
13680 | --- linux-2.6.32.15/arch/x86/kernel/time.c 2010-03-15 11:52:04.000000000 -0400 | 13839 | --- linux-2.6.32.16/arch/x86/kernel/time.c 2010-07-05 14:14:00.000000000 -0400 |
13681 | +++ linux-2.6.32.15/arch/x86/kernel/time.c 2010-05-28 21:27:15.062911922 -0400 | 13840 | +++ linux-2.6.32.16/arch/x86/kernel/time.c 2010-07-09 14:50:35.000000000 -0400 |
13682 | @@ -26,17 +26,13 @@ | 13841 | @@ -26,17 +26,13 @@ |
13683 | int timer_ack; | 13842 | int timer_ack; |
13684 | #endif | 13843 | #endif |
@@ -13717,9 +13876,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/time.c linux-2.6.32.15/arch/x86/kerne | |||
13717 | } | 13876 | } |
13718 | return pc; | 13877 | return pc; |
13719 | } | 13878 | } |
13720 | diff -urNp linux-2.6.32.15/arch/x86/kernel/tls.c linux-2.6.32.15/arch/x86/kernel/tls.c | 13879 | diff -urNp linux-2.6.32.16/arch/x86/kernel/tls.c linux-2.6.32.16/arch/x86/kernel/tls.c |
13721 | --- linux-2.6.32.15/arch/x86/kernel/tls.c 2010-03-15 11:52:04.000000000 -0400 | 13880 | --- linux-2.6.32.16/arch/x86/kernel/tls.c 2010-07-05 14:14:00.000000000 -0400 |
13722 | +++ linux-2.6.32.15/arch/x86/kernel/tls.c 2010-05-28 21:27:15.062911922 -0400 | 13881 | +++ linux-2.6.32.16/arch/x86/kernel/tls.c 2010-07-09 14:50:35.000000000 -0400 |
13723 | @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc | 13882 | @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc |
13724 | if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) | 13883 | if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) |
13725 | return -EINVAL; | 13884 | return -EINVAL; |
@@ -13732,9 +13891,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/tls.c linux-2.6.32.15/arch/x86/kernel | |||
13732 | set_tls_desc(p, idx, &info, 1); | 13891 | set_tls_desc(p, idx, &info, 1); |
13733 | 13892 | ||
13734 | return 0; | 13893 | return 0; |
13735 | diff -urNp linux-2.6.32.15/arch/x86/kernel/trampoline_32.S linux-2.6.32.15/arch/x86/kernel/trampoline_32.S | 13894 | diff -urNp linux-2.6.32.16/arch/x86/kernel/trampoline_32.S linux-2.6.32.16/arch/x86/kernel/trampoline_32.S |
13736 | --- linux-2.6.32.15/arch/x86/kernel/trampoline_32.S 2010-03-15 11:52:04.000000000 -0400 | 13895 | --- linux-2.6.32.16/arch/x86/kernel/trampoline_32.S 2010-07-05 14:14:00.000000000 -0400 |
13737 | +++ linux-2.6.32.15/arch/x86/kernel/trampoline_32.S 2010-05-28 21:27:15.062911922 -0400 | 13896 | +++ linux-2.6.32.16/arch/x86/kernel/trampoline_32.S 2010-07-09 14:50:35.000000000 -0400 |
13738 | @@ -32,6 +32,12 @@ | 13897 | @@ -32,6 +32,12 @@ |
13739 | #include <asm/segment.h> | 13898 | #include <asm/segment.h> |
13740 | #include <asm/page_types.h> | 13899 | #include <asm/page_types.h> |
@@ -13757,9 +13916,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/trampoline_32.S linux-2.6.32.15/arch/ | |||
13757 | 13916 | ||
13758 | # These need to be in the same 64K segment as the above; | 13917 | # These need to be in the same 64K segment as the above; |
13759 | # hence we don't use the boot_gdt_descr defined in head.S | 13918 | # hence we don't use the boot_gdt_descr defined in head.S |
13760 | diff -urNp linux-2.6.32.15/arch/x86/kernel/traps.c linux-2.6.32.15/arch/x86/kernel/traps.c | 13919 | diff -urNp linux-2.6.32.16/arch/x86/kernel/traps.c linux-2.6.32.16/arch/x86/kernel/traps.c |
13761 | --- linux-2.6.32.15/arch/x86/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400 | 13920 | --- linux-2.6.32.16/arch/x86/kernel/traps.c 2010-07-05 14:14:00.000000000 -0400 |
13762 | +++ linux-2.6.32.15/arch/x86/kernel/traps.c 2010-05-28 21:27:15.067055592 -0400 | 13921 | +++ linux-2.6.32.16/arch/x86/kernel/traps.c 2010-07-09 14:50:35.000000000 -0400 |
13763 | @@ -69,12 +69,6 @@ asmlinkage int system_call(void); | 13922 | @@ -69,12 +69,6 @@ asmlinkage int system_call(void); |
13764 | 13923 | ||
13765 | /* Do we ignore FPU interrupts ? */ | 13924 | /* Do we ignore FPU interrupts ? */ |
@@ -13909,9 +14068,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/traps.c linux-2.6.32.15/arch/x86/kern | |||
13909 | handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code); | 14068 | handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code); |
13910 | return; | 14069 | return; |
13911 | } | 14070 | } |
13912 | diff -urNp linux-2.6.32.15/arch/x86/kernel/tsc.c linux-2.6.32.15/arch/x86/kernel/tsc.c | 14071 | diff -urNp linux-2.6.32.16/arch/x86/kernel/tsc.c linux-2.6.32.16/arch/x86/kernel/tsc.c |
13913 | --- linux-2.6.32.15/arch/x86/kernel/tsc.c 2010-03-15 11:52:04.000000000 -0400 | 14072 | --- linux-2.6.32.16/arch/x86/kernel/tsc.c 2010-07-05 14:14:00.000000000 -0400 |
13914 | +++ linux-2.6.32.15/arch/x86/kernel/tsc.c 2010-05-28 21:27:15.067055592 -0400 | 14073 | +++ linux-2.6.32.16/arch/x86/kernel/tsc.c 2010-07-09 14:50:35.000000000 -0400 |
13915 | @@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b | 14074 | @@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b |
13916 | DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), | 14075 | DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), |
13917 | }, | 14076 | }, |
@@ -13921,9 +14080,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/tsc.c linux-2.6.32.15/arch/x86/kernel | |||
13921 | }; | 14080 | }; |
13922 | 14081 | ||
13923 | static void __init check_system_tsc_reliable(void) | 14082 | static void __init check_system_tsc_reliable(void) |
13924 | diff -urNp linux-2.6.32.15/arch/x86/kernel/vm86_32.c linux-2.6.32.15/arch/x86/kernel/vm86_32.c | 14083 | diff -urNp linux-2.6.32.16/arch/x86/kernel/vm86_32.c linux-2.6.32.16/arch/x86/kernel/vm86_32.c |
13925 | --- linux-2.6.32.15/arch/x86/kernel/vm86_32.c 2010-03-15 11:52:04.000000000 -0400 | 14084 | --- linux-2.6.32.16/arch/x86/kernel/vm86_32.c 2010-07-05 14:14:00.000000000 -0400 |
13926 | +++ linux-2.6.32.15/arch/x86/kernel/vm86_32.c 2010-05-28 21:27:15.067055592 -0400 | 14085 | +++ linux-2.6.32.16/arch/x86/kernel/vm86_32.c 2010-07-09 14:50:35.000000000 -0400 |
13927 | @@ -41,6 +41,7 @@ | 14086 | @@ -41,6 +41,7 @@ |
13928 | #include <linux/ptrace.h> | 14087 | #include <linux/ptrace.h> |
13929 | #include <linux/audit.h> | 14088 | #include <linux/audit.h> |
@@ -13988,9 +14147,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/vm86_32.c linux-2.6.32.15/arch/x86/ke | |||
13988 | if (get_user(segoffs, intr_ptr)) | 14147 | if (get_user(segoffs, intr_ptr)) |
13989 | goto cannot_handle; | 14148 | goto cannot_handle; |
13990 | if ((segoffs >> 16) == BIOSSEG) | 14149 | if ((segoffs >> 16) == BIOSSEG) |
13991 | diff -urNp linux-2.6.32.15/arch/x86/kernel/vmi_32.c linux-2.6.32.15/arch/x86/kernel/vmi_32.c | 14150 | diff -urNp linux-2.6.32.16/arch/x86/kernel/vmi_32.c linux-2.6.32.16/arch/x86/kernel/vmi_32.c |
13992 | --- linux-2.6.32.15/arch/x86/kernel/vmi_32.c 2010-03-15 11:52:04.000000000 -0400 | 14151 | --- linux-2.6.32.16/arch/x86/kernel/vmi_32.c 2010-07-05 14:14:00.000000000 -0400 |
13993 | +++ linux-2.6.32.15/arch/x86/kernel/vmi_32.c 2010-05-28 21:27:15.067055592 -0400 | 14152 | +++ linux-2.6.32.16/arch/x86/kernel/vmi_32.c 2010-07-09 14:50:35.000000000 -0400 |
13994 | @@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) | 14153 | @@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) |
13995 | typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); | 14154 | typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); |
13996 | 14155 | ||
@@ -14150,9 +14309,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/vmi_32.c linux-2.6.32.15/arch/x86/ker | |||
14150 | return; | 14309 | return; |
14151 | 14310 | ||
14152 | local_irq_save(flags); | 14311 | local_irq_save(flags); |
14153 | diff -urNp linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S | 14312 | diff -urNp linux-2.6.32.16/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.16/arch/x86/kernel/vmlinux.lds.S |
14154 | --- linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400 | 14313 | --- linux-2.6.32.16/arch/x86/kernel/vmlinux.lds.S 2010-07-05 14:14:00.000000000 -0400 |
14155 | +++ linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S 2010-05-28 21:27:15.067055592 -0400 | 14314 | +++ linux-2.6.32.16/arch/x86/kernel/vmlinux.lds.S 2010-07-10 08:19:32.000000000 -0400 |
14156 | @@ -26,6 +26,22 @@ | 14315 | @@ -26,6 +26,22 @@ |
14157 | #include <asm/page_types.h> | 14316 | #include <asm/page_types.h> |
14158 | #include <asm/cache.h> | 14317 | #include <asm/cache.h> |
@@ -14192,14 +14351,14 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.15/arch/x8 | |||
14192 | PHDRS { | 14351 | PHDRS { |
14193 | text PT_LOAD FLAGS(5); /* R_E */ | 14352 | text PT_LOAD FLAGS(5); /* R_E */ |
14194 | - data PT_LOAD FLAGS(7); /* RWE */ | 14353 | - data PT_LOAD FLAGS(7); /* RWE */ |
14354 | +#ifdef CONFIG_X86_32 | ||
14355 | + module PT_LOAD FLAGS(5); /* R_E */ | ||
14356 | +#endif | ||
14195 | +#ifdef CONFIG_XEN | 14357 | +#ifdef CONFIG_XEN |
14196 | + rodata PT_LOAD FLAGS(5); /* R_E */ | 14358 | + rodata PT_LOAD FLAGS(5); /* R_E */ |
14197 | +#else | 14359 | +#else |
14198 | + rodata PT_LOAD FLAGS(4); /* R__ */ | 14360 | + rodata PT_LOAD FLAGS(4); /* R__ */ |
14199 | +#endif | 14361 | +#endif |
14200 | +#ifdef CONFIG_X86_32 | ||
14201 | + module PT_LOAD FLAGS(5); /* R_E */ | ||
14202 | +#endif | ||
14203 | + data PT_LOAD FLAGS(6); /* RW_ */ | 14362 | + data PT_LOAD FLAGS(6); /* RW_ */ |
14204 | #ifdef CONFIG_X86_64 | 14363 | #ifdef CONFIG_X86_64 |
14205 | user PT_LOAD FLAGS(5); /* R_E */ | 14364 | user PT_LOAD FLAGS(5); /* R_E */ |
@@ -14242,7 +14401,7 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.15/arch/x8 | |||
14242 | HEAD_TEXT | 14401 | HEAD_TEXT |
14243 | #ifdef CONFIG_X86_32 | 14402 | #ifdef CONFIG_X86_32 |
14244 | . = ALIGN(PAGE_SIZE); | 14403 | . = ALIGN(PAGE_SIZE); |
14245 | @@ -82,28 +113,64 @@ SECTIONS | 14404 | @@ -82,28 +113,69 @@ SECTIONS |
14246 | IRQENTRY_TEXT | 14405 | IRQENTRY_TEXT |
14247 | *(.fixup) | 14406 | *(.fixup) |
14248 | *(.gnu.warning) | 14407 | *(.gnu.warning) |
@@ -14252,26 +14411,10 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.15/arch/x8 | |||
14252 | 14411 | ||
14253 | - NOTES :text :note | 14412 | - NOTES :text :note |
14254 | + . += __KERNEL_TEXT_OFFSET; | 14413 | + . += __KERNEL_TEXT_OFFSET; |
14255 | + | ||
14256 | + . = ALIGN(PAGE_SIZE); | ||
14257 | + NOTES :rodata :note | ||
14258 | 14414 | ||
14259 | - EXCEPTION_TABLE(16) :text = 0x9090 | 14415 | - EXCEPTION_TABLE(16) :text = 0x9090 |
14260 | + EXCEPTION_TABLE(16) :rodata | ||
14261 | |||
14262 | RO_DATA(PAGE_SIZE) | ||
14263 | |||
14264 | +#ifdef CONFIG_X86_32 | 14416 | +#ifdef CONFIG_X86_32 |
14265 | + . = ALIGN(PAGE_SIZE); | 14417 | + . = ALIGN(PAGE_SIZE); |
14266 | + .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) { | ||
14267 | + *(.idt) | ||
14268 | + . = ALIGN(PAGE_SIZE); | ||
14269 | + *(.empty_zero_page) | ||
14270 | + *(.swapper_pg_pmd) | ||
14271 | + *(.swapper_pg_dir) | ||
14272 | + } | ||
14273 | + | ||
14274 | + . = ALIGN(PAGE_SIZE); | ||
14275 | + .vmi.rom : AT(ADDR(.vmi.rom) - LOAD_OFFSET) { | 14418 | + .vmi.rom : AT(ADDR(.vmi.rom) - LOAD_OFFSET) { |
14276 | + *(.vmi.rom) | 14419 | + *(.vmi.rom) |
14277 | + } :module | 14420 | + } :module |
@@ -14283,20 +14426,41 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.15/arch/x8 | |||
14283 | + MODULES_EXEC_VADDR = .; | 14426 | + MODULES_EXEC_VADDR = .; |
14284 | + BYTE(0) | 14427 | + BYTE(0) |
14285 | + . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024); | 14428 | + . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024); |
14286 | + . = ALIGN(PMD_SIZE); | 14429 | + . = ALIGN(HPAGE_SIZE); |
14287 | + MODULES_EXEC_END = . - 1; | 14430 | + MODULES_EXEC_END = . - 1; |
14288 | +#endif | 14431 | +#endif |
14289 | + | 14432 | + |
14290 | + } :module | 14433 | + } :module |
14291 | +#endif | 14434 | +#endif |
14292 | + | 14435 | + |
14293 | /* Data */ | 14436 | + .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) { |
14294 | .data : AT(ADDR(.data) - LOAD_OFFSET) { | ||
14295 | + /* End of text section */ | 14437 | + /* End of text section */ |
14296 | + _etext = . - __KERNEL_TEXT_OFFSET; | 14438 | + _etext = . - __KERNEL_TEXT_OFFSET; |
14439 | + } | ||
14440 | + | ||
14441 | +#ifdef CONFIG_X86_32 | ||
14442 | + . = ALIGN(PAGE_SIZE); | ||
14443 | + .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) { | ||
14444 | + *(.idt) | ||
14445 | + . = ALIGN(PAGE_SIZE); | ||
14446 | + *(.empty_zero_page) | ||
14447 | + *(.swapper_pg_pmd) | ||
14448 | + *(.swapper_pg_dir) | ||
14449 | + } :rodata | ||
14450 | +#endif | ||
14451 | + | ||
14452 | + . = ALIGN(PAGE_SIZE); | ||
14453 | + NOTES :rodata :note | ||
14454 | + | ||
14455 | + EXCEPTION_TABLE(16) :rodata | ||
14456 | |||
14457 | RO_DATA(PAGE_SIZE) | ||
14458 | |||
14459 | /* Data */ | ||
14460 | .data : AT(ADDR(.data) - LOAD_OFFSET) { | ||
14297 | + | 14461 | + |
14298 | +#ifdef CONFIG_PAX_KERNEXEC | 14462 | +#ifdef CONFIG_PAX_KERNEXEC |
14299 | + . = ALIGN(PMD_SIZE); | 14463 | + . = ALIGN(HPAGE_SIZE); |
14300 | +#else | 14464 | +#else |
14301 | + . = ALIGN(PAGE_SIZE); | 14465 | + . = ALIGN(PAGE_SIZE); |
14302 | +#endif | 14466 | +#endif |
@@ -14314,7 +14478,7 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.15/arch/x8 | |||
14314 | 14478 | ||
14315 | PAGE_ALIGNED_DATA(PAGE_SIZE) | 14479 | PAGE_ALIGNED_DATA(PAGE_SIZE) |
14316 | 14480 | ||
14317 | @@ -166,12 +233,6 @@ SECTIONS | 14481 | @@ -166,12 +238,6 @@ SECTIONS |
14318 | } | 14482 | } |
14319 | vgetcpu_mode = VVIRT(.vgetcpu_mode); | 14483 | vgetcpu_mode = VVIRT(.vgetcpu_mode); |
14320 | 14484 | ||
@@ -14327,7 +14491,7 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.15/arch/x8 | |||
14327 | .vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) { | 14491 | .vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) { |
14328 | *(.vsyscall_3) | 14492 | *(.vsyscall_3) |
14329 | } | 14493 | } |
14330 | @@ -187,12 +248,19 @@ SECTIONS | 14494 | @@ -187,12 +253,19 @@ SECTIONS |
14331 | #endif /* CONFIG_X86_64 */ | 14495 | #endif /* CONFIG_X86_64 */ |
14332 | 14496 | ||
14333 | /* Init code and data - will be freed after init */ | 14497 | /* Init code and data - will be freed after init */ |
@@ -14336,7 +14500,7 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.15/arch/x8 | |||
14336 | + BYTE(0) | 14500 | + BYTE(0) |
14337 | + | 14501 | + |
14338 | +#ifdef CONFIG_PAX_KERNEXEC | 14502 | +#ifdef CONFIG_PAX_KERNEXEC |
14339 | + . = ALIGN(PMD_SIZE); | 14503 | + . = ALIGN(HPAGE_SIZE); |
14340 | +#else | 14504 | +#else |
14341 | + . = ALIGN(PAGE_SIZE); | 14505 | + . = ALIGN(PAGE_SIZE); |
14342 | +#endif | 14506 | +#endif |
@@ -14350,7 +14514,7 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.15/arch/x8 | |||
14350 | /* | 14514 | /* |
14351 | * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the | 14515 | * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the |
14352 | * output PHDR, so the next output section - .init.text - should | 14516 | * output PHDR, so the next output section - .init.text - should |
14353 | @@ -201,12 +269,27 @@ SECTIONS | 14517 | @@ -201,12 +274,27 @@ SECTIONS |
14354 | PERCPU_VADDR(0, :percpu) | 14518 | PERCPU_VADDR(0, :percpu) |
14355 | #endif | 14519 | #endif |
14356 | 14520 | ||
@@ -14371,7 +14535,7 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.15/arch/x8 | |||
14371 | + * .exit.text is discard at runtime, not link time, to deal with | 14535 | + * .exit.text is discard at runtime, not link time, to deal with |
14372 | + * references from .altinstructions and .eh_frame | 14536 | + * references from .altinstructions and .eh_frame |
14373 | + */ | 14537 | + */ |
14374 | + .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) { | 14538 | + .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) { |
14375 | + EXIT_TEXT | 14539 | + EXIT_TEXT |
14376 | + . = ALIGN(16); | 14540 | + . = ALIGN(16); |
14377 | + } :text.exit | 14541 | + } :text.exit |
@@ -14383,7 +14547,7 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.15/arch/x8 | |||
14383 | 14547 | ||
14384 | .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) { | 14548 | .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) { |
14385 | __x86_cpu_dev_start = .; | 14549 | __x86_cpu_dev_start = .; |
14386 | @@ -232,19 +315,11 @@ SECTIONS | 14550 | @@ -232,19 +320,11 @@ SECTIONS |
14387 | *(.altinstr_replacement) | 14551 | *(.altinstr_replacement) |
14388 | } | 14552 | } |
14389 | 14553 | ||
@@ -14404,7 +14568,7 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.15/arch/x8 | |||
14404 | PERCPU(PAGE_SIZE) | 14568 | PERCPU(PAGE_SIZE) |
14405 | #endif | 14569 | #endif |
14406 | 14570 | ||
14407 | @@ -267,12 +342,6 @@ SECTIONS | 14571 | @@ -267,12 +347,6 @@ SECTIONS |
14408 | . = ALIGN(PAGE_SIZE); | 14572 | . = ALIGN(PAGE_SIZE); |
14409 | } | 14573 | } |
14410 | 14574 | ||
@@ -14417,15 +14581,15 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.15/arch/x8 | |||
14417 | /* BSS */ | 14581 | /* BSS */ |
14418 | . = ALIGN(PAGE_SIZE); | 14582 | . = ALIGN(PAGE_SIZE); |
14419 | .bss : AT(ADDR(.bss) - LOAD_OFFSET) { | 14583 | .bss : AT(ADDR(.bss) - LOAD_OFFSET) { |
14420 | @@ -288,6 +357,7 @@ SECTIONS | 14584 | @@ -288,6 +362,7 @@ SECTIONS |
14421 | __brk_base = .; | 14585 | __brk_base = .; |
14422 | . += 64 * 1024; /* 64k alignment slop space */ | 14586 | . += 64 * 1024; /* 64k alignment slop space */ |
14423 | *(.brk_reservation) /* areas brk users have reserved */ | 14587 | *(.brk_reservation) /* areas brk users have reserved */ |
14424 | + . = ALIGN(PMD_SIZE); | 14588 | + . = ALIGN(HPAGE_SIZE); |
14425 | __brk_limit = .; | 14589 | __brk_limit = .; |
14426 | } | 14590 | } |
14427 | 14591 | ||
14428 | @@ -316,13 +386,12 @@ SECTIONS | 14592 | @@ -316,13 +391,12 @@ SECTIONS |
14429 | * for the boot processor. | 14593 | * for the boot processor. |
14430 | */ | 14594 | */ |
14431 | #define INIT_PER_CPU(x) init_per_cpu__##x = per_cpu__##x + __per_cpu_load | 14595 | #define INIT_PER_CPU(x) init_per_cpu__##x = per_cpu__##x + __per_cpu_load |
@@ -14440,9 +14604,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.15/arch/x8 | |||
14440 | "kernel image bigger than KERNEL_IMAGE_SIZE"); | 14604 | "kernel image bigger than KERNEL_IMAGE_SIZE"); |
14441 | 14605 | ||
14442 | #ifdef CONFIG_SMP | 14606 | #ifdef CONFIG_SMP |
14443 | diff -urNp linux-2.6.32.15/arch/x86/kernel/vsyscall_64.c linux-2.6.32.15/arch/x86/kernel/vsyscall_64.c | 14607 | diff -urNp linux-2.6.32.16/arch/x86/kernel/vsyscall_64.c linux-2.6.32.16/arch/x86/kernel/vsyscall_64.c |
14444 | --- linux-2.6.32.15/arch/x86/kernel/vsyscall_64.c 2010-03-15 11:52:04.000000000 -0400 | 14608 | --- linux-2.6.32.16/arch/x86/kernel/vsyscall_64.c 2010-07-05 14:14:00.000000000 -0400 |
14445 | +++ linux-2.6.32.15/arch/x86/kernel/vsyscall_64.c 2010-05-28 21:27:15.067055592 -0400 | 14609 | +++ linux-2.6.32.16/arch/x86/kernel/vsyscall_64.c 2010-07-09 14:50:35.000000000 -0400 |
14446 | @@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa | 14610 | @@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa |
14447 | 14611 | ||
14448 | write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); | 14612 | write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); |
@@ -14476,9 +14640,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/vsyscall_64.c linux-2.6.32.15/arch/x8 | |||
14476 | }; | 14640 | }; |
14477 | #endif | 14641 | #endif |
14478 | 14642 | ||
14479 | 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 | 14643 | diff -urNp linux-2.6.32.16/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.16/arch/x86/kernel/x8664_ksyms_64.c |
14480 | --- linux-2.6.32.15/arch/x86/kernel/x8664_ksyms_64.c 2010-03-15 11:52:04.000000000 -0400 | 14644 | --- linux-2.6.32.16/arch/x86/kernel/x8664_ksyms_64.c 2010-07-05 14:14:00.000000000 -0400 |
14481 | +++ linux-2.6.32.15/arch/x86/kernel/x8664_ksyms_64.c 2010-05-28 21:27:15.067055592 -0400 | 14645 | +++ linux-2.6.32.16/arch/x86/kernel/x8664_ksyms_64.c 2010-07-09 14:50:35.000000000 -0400 |
14482 | @@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); | 14646 | @@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); |
14483 | 14647 | ||
14484 | EXPORT_SYMBOL(copy_user_generic); | 14648 | EXPORT_SYMBOL(copy_user_generic); |
@@ -14488,9 +14652,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.15/arch | |||
14488 | EXPORT_SYMBOL(__copy_from_user_inatomic); | 14652 | EXPORT_SYMBOL(__copy_from_user_inatomic); |
14489 | 14653 | ||
14490 | EXPORT_SYMBOL(copy_page); | 14654 | EXPORT_SYMBOL(copy_page); |
14491 | diff -urNp linux-2.6.32.15/arch/x86/kernel/xsave.c linux-2.6.32.15/arch/x86/kernel/xsave.c | 14655 | diff -urNp linux-2.6.32.16/arch/x86/kernel/xsave.c linux-2.6.32.16/arch/x86/kernel/xsave.c |
14492 | --- linux-2.6.32.15/arch/x86/kernel/xsave.c 2010-03-15 11:52:04.000000000 -0400 | 14656 | --- linux-2.6.32.16/arch/x86/kernel/xsave.c 2010-07-05 14:14:00.000000000 -0400 |
14493 | +++ linux-2.6.32.15/arch/x86/kernel/xsave.c 2010-05-28 21:27:15.067055592 -0400 | 14657 | +++ linux-2.6.32.16/arch/x86/kernel/xsave.c 2010-07-09 14:50:35.000000000 -0400 |
14494 | @@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_ | 14658 | @@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_ |
14495 | fx_sw_user->xstate_size > fx_sw_user->extended_size) | 14659 | fx_sw_user->xstate_size > fx_sw_user->extended_size) |
14496 | return -1; | 14660 | return -1; |
@@ -14518,9 +14682,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/xsave.c linux-2.6.32.15/arch/x86/kern | |||
14518 | buf); | 14682 | buf); |
14519 | if (unlikely(err)) { | 14683 | if (unlikely(err)) { |
14520 | /* | 14684 | /* |
14521 | diff -urNp linux-2.6.32.15/arch/x86/kvm/emulate.c linux-2.6.32.15/arch/x86/kvm/emulate.c | 14685 | diff -urNp linux-2.6.32.16/arch/x86/kvm/emulate.c linux-2.6.32.16/arch/x86/kvm/emulate.c |
14522 | --- linux-2.6.32.15/arch/x86/kvm/emulate.c 2010-04-29 17:49:37.541027029 -0400 | 14686 | --- linux-2.6.32.16/arch/x86/kvm/emulate.c 2010-07-05 14:14:00.000000000 -0400 |
14523 | +++ linux-2.6.32.15/arch/x86/kvm/emulate.c 2010-05-28 21:27:15.086896808 -0400 | 14687 | +++ linux-2.6.32.16/arch/x86/kvm/emulate.c 2010-07-09 14:50:35.000000000 -0400 |
14524 | @@ -81,8 +81,8 @@ | 14688 | @@ -81,8 +81,8 @@ |
14525 | #define Src2CL (1<<29) | 14689 | #define Src2CL (1<<29) |
14526 | #define Src2ImmByte (2<<29) | 14690 | #define Src2ImmByte (2<<29) |
@@ -14557,9 +14721,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kvm/emulate.c linux-2.6.32.15/arch/x86/kvm/e | |||
14557 | switch ((_dst).bytes) { \ | 14721 | switch ((_dst).bytes) { \ |
14558 | case 1: \ | 14722 | case 1: \ |
14559 | ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ | 14723 | ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ |
14560 | diff -urNp linux-2.6.32.15/arch/x86/kvm/lapic.c linux-2.6.32.15/arch/x86/kvm/lapic.c | 14724 | diff -urNp linux-2.6.32.16/arch/x86/kvm/lapic.c linux-2.6.32.16/arch/x86/kvm/lapic.c |
14561 | --- linux-2.6.32.15/arch/x86/kvm/lapic.c 2010-03-15 11:52:04.000000000 -0400 | 14725 | --- linux-2.6.32.16/arch/x86/kvm/lapic.c 2010-07-05 14:14:00.000000000 -0400 |
14562 | +++ linux-2.6.32.15/arch/x86/kvm/lapic.c 2010-05-28 21:27:15.086896808 -0400 | 14726 | +++ linux-2.6.32.16/arch/x86/kvm/lapic.c 2010-07-09 14:50:35.000000000 -0400 |
14563 | @@ -52,7 +52,7 @@ | 14727 | @@ -52,7 +52,7 @@ |
14564 | #define APIC_BUS_CYCLE_NS 1 | 14728 | #define APIC_BUS_CYCLE_NS 1 |
14565 | 14729 | ||
@@ -14569,9 +14733,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kvm/lapic.c linux-2.6.32.15/arch/x86/kvm/lap | |||
14569 | 14733 | ||
14570 | #define APIC_LVT_NUM 6 | 14734 | #define APIC_LVT_NUM 6 |
14571 | /* 14 is the version for Xeon and Pentium 8.4.8*/ | 14735 | /* 14 is the version for Xeon and Pentium 8.4.8*/ |
14572 | diff -urNp linux-2.6.32.15/arch/x86/kvm/svm.c linux-2.6.32.15/arch/x86/kvm/svm.c | 14736 | diff -urNp linux-2.6.32.16/arch/x86/kvm/svm.c linux-2.6.32.16/arch/x86/kvm/svm.c |
14573 | --- linux-2.6.32.15/arch/x86/kvm/svm.c 2010-04-29 17:49:37.601044544 -0400 | 14737 | --- linux-2.6.32.16/arch/x86/kvm/svm.c 2010-07-05 14:14:00.000000000 -0400 |
14574 | +++ linux-2.6.32.15/arch/x86/kvm/svm.c 2010-05-28 21:27:15.086896808 -0400 | 14738 | +++ linux-2.6.32.16/arch/x86/kvm/svm.c 2010-07-09 14:50:35.000000000 -0400 |
14575 | @@ -2395,9 +2395,12 @@ static int handle_exit(struct kvm_run *k | 14739 | @@ -2395,9 +2395,12 @@ static int handle_exit(struct kvm_run *k |
14576 | static void reload_tss(struct kvm_vcpu *vcpu) | 14740 | static void reload_tss(struct kvm_vcpu *vcpu) |
14577 | { | 14741 | { |
@@ -14595,10 +14759,10 @@ diff -urNp linux-2.6.32.15/arch/x86/kvm/svm.c linux-2.6.32.15/arch/x86/kvm/svm.c | |||
14595 | .cpu_has_kvm_support = has_svm, | 14759 | .cpu_has_kvm_support = has_svm, |
14596 | .disabled_by_bios = is_disabled, | 14760 | .disabled_by_bios = is_disabled, |
14597 | .hardware_setup = svm_hardware_setup, | 14761 | .hardware_setup = svm_hardware_setup, |
14598 | diff -urNp linux-2.6.32.15/arch/x86/kvm/vmx.c linux-2.6.32.15/arch/x86/kvm/vmx.c | 14762 | diff -urNp linux-2.6.32.16/arch/x86/kvm/vmx.c linux-2.6.32.16/arch/x86/kvm/vmx.c |
14599 | --- linux-2.6.32.15/arch/x86/kvm/vmx.c 2010-04-29 17:49:37.601044544 -0400 | 14763 | --- linux-2.6.32.16/arch/x86/kvm/vmx.c 2010-07-05 14:14:00.000000000 -0400 |
14600 | +++ linux-2.6.32.15/arch/x86/kvm/vmx.c 2010-05-28 21:27:15.091170095 -0400 | 14764 | +++ linux-2.6.32.16/arch/x86/kvm/vmx.c 2010-07-09 14:50:35.000000000 -0400 |
14601 | @@ -568,7 +568,11 @@ static void reload_tss(void) | 14765 | @@ -569,7 +569,11 @@ static void reload_tss(void) |
14602 | 14766 | ||
14603 | kvm_get_gdt(&gdt); | 14767 | kvm_get_gdt(&gdt); |
14604 | descs = (void *)gdt.base; | 14768 | descs = (void *)gdt.base; |
@@ -14610,7 +14774,7 @@ diff -urNp linux-2.6.32.15/arch/x86/kvm/vmx.c linux-2.6.32.15/arch/x86/kvm/vmx.c | |||
14610 | load_TR_desc(); | 14774 | load_TR_desc(); |
14611 | } | 14775 | } |
14612 | 14776 | ||
14613 | @@ -1395,8 +1399,11 @@ static __init int hardware_setup(void) | 14777 | @@ -1405,8 +1409,11 @@ static __init int hardware_setup(void) |
14614 | if (!cpu_has_vmx_flexpriority()) | 14778 | if (!cpu_has_vmx_flexpriority()) |
14615 | flexpriority_enabled = 0; | 14779 | flexpriority_enabled = 0; |
14616 | 14780 | ||
@@ -14624,7 +14788,7 @@ diff -urNp linux-2.6.32.15/arch/x86/kvm/vmx.c linux-2.6.32.15/arch/x86/kvm/vmx.c | |||
14624 | 14788 | ||
14625 | if (enable_ept && !cpu_has_vmx_ept_2m_page()) | 14789 | if (enable_ept && !cpu_has_vmx_ept_2m_page()) |
14626 | kvm_disable_largepages(); | 14790 | kvm_disable_largepages(); |
14627 | @@ -2347,7 +2354,7 @@ static int vmx_vcpu_setup(struct vcpu_vm | 14791 | @@ -2357,7 +2364,7 @@ static int vmx_vcpu_setup(struct vcpu_vm |
14628 | vmcs_writel(HOST_IDTR_BASE, dt.base); /* 22.2.4 */ | 14792 | vmcs_writel(HOST_IDTR_BASE, dt.base); /* 22.2.4 */ |
14629 | 14793 | ||
14630 | asm("mov $.Lkvm_vmx_return, %0" : "=r"(kvm_vmx_return)); | 14794 | asm("mov $.Lkvm_vmx_return, %0" : "=r"(kvm_vmx_return)); |
@@ -14633,7 +14797,7 @@ diff -urNp linux-2.6.32.15/arch/x86/kvm/vmx.c linux-2.6.32.15/arch/x86/kvm/vmx.c | |||
14633 | vmcs_write32(VM_EXIT_MSR_STORE_COUNT, 0); | 14797 | vmcs_write32(VM_EXIT_MSR_STORE_COUNT, 0); |
14634 | vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, 0); | 14798 | vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, 0); |
14635 | vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, 0); | 14799 | vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, 0); |
14636 | @@ -3703,6 +3710,12 @@ static void vmx_vcpu_run(struct kvm_vcpu | 14800 | @@ -3713,6 +3720,12 @@ static void vmx_vcpu_run(struct kvm_vcpu |
14637 | "jmp .Lkvm_vmx_return \n\t" | 14801 | "jmp .Lkvm_vmx_return \n\t" |
14638 | ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t" | 14802 | ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t" |
14639 | ".Lkvm_vmx_return: " | 14803 | ".Lkvm_vmx_return: " |
@@ -14646,7 +14810,7 @@ diff -urNp linux-2.6.32.15/arch/x86/kvm/vmx.c linux-2.6.32.15/arch/x86/kvm/vmx.c | |||
14646 | /* Save guest registers, load host registers, keep flags */ | 14810 | /* Save guest registers, load host registers, keep flags */ |
14647 | "xchg %0, (%%"R"sp) \n\t" | 14811 | "xchg %0, (%%"R"sp) \n\t" |
14648 | "mov %%"R"ax, %c[rax](%0) \n\t" | 14812 | "mov %%"R"ax, %c[rax](%0) \n\t" |
14649 | @@ -3749,8 +3762,13 @@ static void vmx_vcpu_run(struct kvm_vcpu | 14813 | @@ -3759,8 +3772,13 @@ static void vmx_vcpu_run(struct kvm_vcpu |
14650 | [r15]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_R15])), | 14814 | [r15]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_R15])), |
14651 | #endif | 14815 | #endif |
14652 | [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)) | 14816 | [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)) |
@@ -14661,7 +14825,7 @@ diff -urNp linux-2.6.32.15/arch/x86/kvm/vmx.c linux-2.6.32.15/arch/x86/kvm/vmx.c | |||
14661 | #ifdef CONFIG_X86_64 | 14825 | #ifdef CONFIG_X86_64 |
14662 | , "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15" | 14826 | , "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15" |
14663 | #endif | 14827 | #endif |
14664 | @@ -3767,7 +3785,7 @@ static void vmx_vcpu_run(struct kvm_vcpu | 14828 | @@ -3777,7 +3795,7 @@ static void vmx_vcpu_run(struct kvm_vcpu |
14665 | if (vmx->rmode.irq.pending) | 14829 | if (vmx->rmode.irq.pending) |
14666 | fixup_rmode_irq(vmx); | 14830 | fixup_rmode_irq(vmx); |
14667 | 14831 | ||
@@ -14670,7 +14834,7 @@ diff -urNp linux-2.6.32.15/arch/x86/kvm/vmx.c linux-2.6.32.15/arch/x86/kvm/vmx.c | |||
14670 | vmx->launched = 1; | 14834 | vmx->launched = 1; |
14671 | 14835 | ||
14672 | vmx_complete_interrupts(vmx); | 14836 | vmx_complete_interrupts(vmx); |
14673 | @@ -3942,7 +3960,7 @@ static bool vmx_gb_page_enable(void) | 14837 | @@ -3952,7 +3970,7 @@ static bool vmx_gb_page_enable(void) |
14674 | return false; | 14838 | return false; |
14675 | } | 14839 | } |
14676 | 14840 | ||
@@ -14679,9 +14843,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kvm/vmx.c linux-2.6.32.15/arch/x86/kvm/vmx.c | |||
14679 | .cpu_has_kvm_support = cpu_has_kvm_support, | 14843 | .cpu_has_kvm_support = cpu_has_kvm_support, |
14680 | .disabled_by_bios = vmx_disabled_by_bios, | 14844 | .disabled_by_bios = vmx_disabled_by_bios, |
14681 | .hardware_setup = hardware_setup, | 14845 | .hardware_setup = hardware_setup, |
14682 | diff -urNp linux-2.6.32.15/arch/x86/kvm/x86.c linux-2.6.32.15/arch/x86/kvm/x86.c | 14846 | diff -urNp linux-2.6.32.16/arch/x86/kvm/x86.c linux-2.6.32.16/arch/x86/kvm/x86.c |
14683 | --- linux-2.6.32.15/arch/x86/kvm/x86.c 2010-05-15 13:20:18.454567530 -0400 | 14847 | --- linux-2.6.32.16/arch/x86/kvm/x86.c 2010-07-05 14:14:00.000000000 -0400 |
14684 | +++ linux-2.6.32.15/arch/x86/kvm/x86.c 2010-05-28 21:27:15.095006556 -0400 | 14848 | +++ linux-2.6.32.16/arch/x86/kvm/x86.c 2010-07-09 14:50:35.000000000 -0400 |
14685 | @@ -81,45 +81,45 @@ static void update_cr8_intercept(struct | 14849 | @@ -81,45 +81,45 @@ static void update_cr8_intercept(struct |
14686 | static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, | 14850 | static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, |
14687 | struct kvm_cpuid_entry2 __user *entries); | 14851 | struct kvm_cpuid_entry2 __user *entries); |
@@ -14761,7 +14925,7 @@ diff -urNp linux-2.6.32.15/arch/x86/kvm/x86.c linux-2.6.32.15/arch/x86/kvm/x86.c | |||
14761 | { NULL } | 14925 | { NULL } |
14762 | }; | 14926 | }; |
14763 | 14927 | ||
14764 | @@ -1635,7 +1635,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru | 14928 | @@ -1638,7 +1638,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru |
14765 | static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, | 14929 | static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, |
14766 | struct kvm_interrupt *irq) | 14930 | struct kvm_interrupt *irq) |
14767 | { | 14931 | { |
@@ -14770,7 +14934,7 @@ diff -urNp linux-2.6.32.15/arch/x86/kvm/x86.c linux-2.6.32.15/arch/x86/kvm/x86.c | |||
14770 | return -EINVAL; | 14934 | return -EINVAL; |
14771 | if (irqchip_in_kernel(vcpu->kvm)) | 14935 | if (irqchip_in_kernel(vcpu->kvm)) |
14772 | return -ENXIO; | 14936 | return -ENXIO; |
14773 | @@ -3205,10 +3205,10 @@ static struct notifier_block kvmclock_cp | 14937 | @@ -3212,10 +3212,10 @@ static struct notifier_block kvmclock_cp |
14774 | .notifier_call = kvmclock_cpufreq_notifier | 14938 | .notifier_call = kvmclock_cpufreq_notifier |
14775 | }; | 14939 | }; |
14776 | 14940 | ||
@@ -14783,9 +14947,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kvm/x86.c linux-2.6.32.15/arch/x86/kvm/x86.c | |||
14783 | 14947 | ||
14784 | if (kvm_x86_ops) { | 14948 | if (kvm_x86_ops) { |
14785 | printk(KERN_ERR "kvm: already loaded the other module\n"); | 14949 | printk(KERN_ERR "kvm: already loaded the other module\n"); |
14786 | diff -urNp linux-2.6.32.15/arch/x86/lib/checksum_32.S linux-2.6.32.15/arch/x86/lib/checksum_32.S | 14950 | diff -urNp linux-2.6.32.16/arch/x86/lib/checksum_32.S linux-2.6.32.16/arch/x86/lib/checksum_32.S |
14787 | --- linux-2.6.32.15/arch/x86/lib/checksum_32.S 2010-03-15 11:52:04.000000000 -0400 | 14951 | --- linux-2.6.32.16/arch/x86/lib/checksum_32.S 2010-07-05 14:14:00.000000000 -0400 |
14788 | +++ linux-2.6.32.15/arch/x86/lib/checksum_32.S 2010-05-28 21:27:15.095006556 -0400 | 14952 | +++ linux-2.6.32.16/arch/x86/lib/checksum_32.S 2010-07-09 14:50:35.000000000 -0400 |
14789 | @@ -28,7 +28,8 @@ | 14953 | @@ -28,7 +28,8 @@ |
14790 | #include <linux/linkage.h> | 14954 | #include <linux/linkage.h> |
14791 | #include <asm/dwarf2.h> | 14955 | #include <asm/dwarf2.h> |
@@ -15031,9 +15195,9 @@ diff -urNp linux-2.6.32.15/arch/x86/lib/checksum_32.S linux-2.6.32.15/arch/x86/l | |||
15031 | 15195 | ||
15032 | #undef ROUND | 15196 | #undef ROUND |
15033 | #undef ROUND1 | 15197 | #undef ROUND1 |
15034 | 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 | 15198 | diff -urNp linux-2.6.32.16/arch/x86/lib/clear_page_64.S linux-2.6.32.16/arch/x86/lib/clear_page_64.S |
15035 | --- linux-2.6.32.15/arch/x86/lib/clear_page_64.S 2010-03-15 11:52:04.000000000 -0400 | 15199 | --- linux-2.6.32.16/arch/x86/lib/clear_page_64.S 2010-07-05 14:14:00.000000000 -0400 |
15036 | +++ linux-2.6.32.15/arch/x86/lib/clear_page_64.S 2010-05-28 21:27:15.095006556 -0400 | 15200 | +++ linux-2.6.32.16/arch/x86/lib/clear_page_64.S 2010-07-09 14:50:35.000000000 -0400 |
15037 | @@ -43,7 +43,7 @@ ENDPROC(clear_page) | 15201 | @@ -43,7 +43,7 @@ ENDPROC(clear_page) |
15038 | 15202 | ||
15039 | #include <asm/cpufeature.h> | 15203 | #include <asm/cpufeature.h> |
@@ -15043,9 +15207,9 @@ diff -urNp linux-2.6.32.15/arch/x86/lib/clear_page_64.S linux-2.6.32.15/arch/x86 | |||
15043 | 1: .byte 0xeb /* jmp <disp8> */ | 15207 | 1: .byte 0xeb /* jmp <disp8> */ |
15044 | .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ | 15208 | .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ |
15045 | 2: | 15209 | 2: |
15046 | 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 | 15210 | diff -urNp linux-2.6.32.16/arch/x86/lib/copy_page_64.S linux-2.6.32.16/arch/x86/lib/copy_page_64.S |
15047 | --- linux-2.6.32.15/arch/x86/lib/copy_page_64.S 2010-03-15 11:52:04.000000000 -0400 | 15211 | --- linux-2.6.32.16/arch/x86/lib/copy_page_64.S 2010-07-05 14:14:00.000000000 -0400 |
15048 | +++ linux-2.6.32.15/arch/x86/lib/copy_page_64.S 2010-05-28 21:27:15.095006556 -0400 | 15212 | +++ linux-2.6.32.16/arch/x86/lib/copy_page_64.S 2010-07-09 14:50:35.000000000 -0400 |
15049 | @@ -104,7 +104,7 @@ ENDPROC(copy_page) | 15213 | @@ -104,7 +104,7 @@ ENDPROC(copy_page) |
15050 | 15214 | ||
15051 | #include <asm/cpufeature.h> | 15215 | #include <asm/cpufeature.h> |
@@ -15055,9 +15219,9 @@ diff -urNp linux-2.6.32.15/arch/x86/lib/copy_page_64.S linux-2.6.32.15/arch/x86/ | |||
15055 | 1: .byte 0xeb /* jmp <disp8> */ | 15219 | 1: .byte 0xeb /* jmp <disp8> */ |
15056 | .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ | 15220 | .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ |
15057 | 2: | 15221 | 2: |
15058 | 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 | 15222 | diff -urNp linux-2.6.32.16/arch/x86/lib/copy_user_64.S linux-2.6.32.16/arch/x86/lib/copy_user_64.S |
15059 | --- linux-2.6.32.15/arch/x86/lib/copy_user_64.S 2010-03-15 11:52:04.000000000 -0400 | 15223 | --- linux-2.6.32.16/arch/x86/lib/copy_user_64.S 2010-07-05 14:14:00.000000000 -0400 |
15060 | +++ linux-2.6.32.15/arch/x86/lib/copy_user_64.S 2010-05-28 21:27:15.095006556 -0400 | 15224 | +++ linux-2.6.32.16/arch/x86/lib/copy_user_64.S 2010-07-09 14:50:35.000000000 -0400 |
15061 | @@ -15,13 +15,14 @@ | 15225 | @@ -15,13 +15,14 @@ |
15062 | #include <asm/asm-offsets.h> | 15226 | #include <asm/asm-offsets.h> |
15063 | #include <asm/thread_info.h> | 15227 | #include <asm/thread_info.h> |
@@ -15132,9 +15296,9 @@ diff -urNp linux-2.6.32.15/arch/x86/lib/copy_user_64.S linux-2.6.32.15/arch/x86/ | |||
15132 | movl %edx,%ecx | 15296 | movl %edx,%ecx |
15133 | xorl %eax,%eax | 15297 | xorl %eax,%eax |
15134 | rep | 15298 | rep |
15135 | 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 | 15299 | diff -urNp linux-2.6.32.16/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.16/arch/x86/lib/copy_user_nocache_64.S |
15136 | --- linux-2.6.32.15/arch/x86/lib/copy_user_nocache_64.S 2010-03-15 11:52:04.000000000 -0400 | 15300 | --- linux-2.6.32.16/arch/x86/lib/copy_user_nocache_64.S 2010-07-05 14:14:00.000000000 -0400 |
15137 | +++ linux-2.6.32.15/arch/x86/lib/copy_user_nocache_64.S 2010-05-28 21:27:15.095006556 -0400 | 15301 | +++ linux-2.6.32.16/arch/x86/lib/copy_user_nocache_64.S 2010-07-09 14:50:35.000000000 -0400 |
15138 | @@ -14,6 +14,7 @@ | 15302 | @@ -14,6 +14,7 @@ |
15139 | #include <asm/current.h> | 15303 | #include <asm/current.h> |
15140 | #include <asm/asm-offsets.h> | 15304 | #include <asm/asm-offsets.h> |
@@ -15159,9 +15323,9 @@ diff -urNp linux-2.6.32.15/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.15/a | |||
15159 | cmpl $8,%edx | 15323 | cmpl $8,%edx |
15160 | jb 20f /* less then 8 bytes, go to byte copy loop */ | 15324 | jb 20f /* less then 8 bytes, go to byte copy loop */ |
15161 | ALIGN_DESTINATION | 15325 | ALIGN_DESTINATION |
15162 | 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 | 15326 | diff -urNp linux-2.6.32.16/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.16/arch/x86/lib/csum-wrappers_64.c |
15163 | --- linux-2.6.32.15/arch/x86/lib/csum-wrappers_64.c 2010-03-15 11:52:04.000000000 -0400 | 15327 | --- linux-2.6.32.16/arch/x86/lib/csum-wrappers_64.c 2010-07-05 14:14:00.000000000 -0400 |
15164 | +++ linux-2.6.32.15/arch/x86/lib/csum-wrappers_64.c 2010-05-28 21:27:15.095006556 -0400 | 15328 | +++ linux-2.6.32.16/arch/x86/lib/csum-wrappers_64.c 2010-07-09 14:50:35.000000000 -0400 |
15165 | @@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _ | 15329 | @@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _ |
15166 | len -= 2; | 15330 | len -= 2; |
15167 | } | 15331 | } |
@@ -15180,9 +15344,9 @@ diff -urNp linux-2.6.32.15/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.15/arch/ | |||
15180 | return csum_partial_copy_generic(src, (void __force *)dst, | 15344 | return csum_partial_copy_generic(src, (void __force *)dst, |
15181 | len, isum, NULL, errp); | 15345 | len, isum, NULL, errp); |
15182 | } | 15346 | } |
15183 | diff -urNp linux-2.6.32.15/arch/x86/lib/getuser.S linux-2.6.32.15/arch/x86/lib/getuser.S | 15347 | diff -urNp linux-2.6.32.16/arch/x86/lib/getuser.S linux-2.6.32.16/arch/x86/lib/getuser.S |
15184 | --- linux-2.6.32.15/arch/x86/lib/getuser.S 2010-03-15 11:52:04.000000000 -0400 | 15348 | --- linux-2.6.32.16/arch/x86/lib/getuser.S 2010-07-05 14:14:00.000000000 -0400 |
15185 | +++ linux-2.6.32.15/arch/x86/lib/getuser.S 2010-05-28 21:27:15.095006556 -0400 | 15349 | +++ linux-2.6.32.16/arch/x86/lib/getuser.S 2010-07-09 14:50:35.000000000 -0400 |
15186 | @@ -33,14 +33,38 @@ | 15350 | @@ -33,14 +33,38 @@ |
15187 | #include <asm/asm-offsets.h> | 15351 | #include <asm/asm-offsets.h> |
15188 | #include <asm/thread_info.h> | 15352 | #include <asm/thread_info.h> |
@@ -15319,9 +15483,9 @@ diff -urNp linux-2.6.32.15/arch/x86/lib/getuser.S linux-2.6.32.15/arch/x86/lib/g | |||
15319 | xor %edx,%edx | 15483 | xor %edx,%edx |
15320 | mov $(-EFAULT),%_ASM_AX | 15484 | mov $(-EFAULT),%_ASM_AX |
15321 | ret | 15485 | ret |
15322 | diff -urNp linux-2.6.32.15/arch/x86/lib/memcpy_64.S linux-2.6.32.15/arch/x86/lib/memcpy_64.S | 15486 | diff -urNp linux-2.6.32.16/arch/x86/lib/memcpy_64.S linux-2.6.32.16/arch/x86/lib/memcpy_64.S |
15323 | --- linux-2.6.32.15/arch/x86/lib/memcpy_64.S 2010-03-15 11:52:04.000000000 -0400 | 15487 | --- linux-2.6.32.16/arch/x86/lib/memcpy_64.S 2010-07-05 14:14:00.000000000 -0400 |
15324 | +++ linux-2.6.32.15/arch/x86/lib/memcpy_64.S 2010-05-28 21:27:15.095006556 -0400 | 15488 | +++ linux-2.6.32.16/arch/x86/lib/memcpy_64.S 2010-07-09 14:50:35.000000000 -0400 |
15325 | @@ -128,7 +128,7 @@ ENDPROC(__memcpy) | 15489 | @@ -128,7 +128,7 @@ ENDPROC(__memcpy) |
15326 | * It is also a lot simpler. Use this when possible: | 15490 | * It is also a lot simpler. Use this when possible: |
15327 | */ | 15491 | */ |
@@ -15331,9 +15495,9 @@ diff -urNp linux-2.6.32.15/arch/x86/lib/memcpy_64.S linux-2.6.32.15/arch/x86/lib | |||
15331 | 1: .byte 0xeb /* jmp <disp8> */ | 15495 | 1: .byte 0xeb /* jmp <disp8> */ |
15332 | .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ | 15496 | .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ |
15333 | 2: | 15497 | 2: |
15334 | diff -urNp linux-2.6.32.15/arch/x86/lib/memset_64.S linux-2.6.32.15/arch/x86/lib/memset_64.S | 15498 | diff -urNp linux-2.6.32.16/arch/x86/lib/memset_64.S linux-2.6.32.16/arch/x86/lib/memset_64.S |
15335 | --- linux-2.6.32.15/arch/x86/lib/memset_64.S 2010-03-15 11:52:04.000000000 -0400 | 15499 | --- linux-2.6.32.16/arch/x86/lib/memset_64.S 2010-07-05 14:14:00.000000000 -0400 |
15336 | +++ linux-2.6.32.15/arch/x86/lib/memset_64.S 2010-05-28 21:27:15.095006556 -0400 | 15500 | +++ linux-2.6.32.16/arch/x86/lib/memset_64.S 2010-07-09 14:50:35.000000000 -0400 |
15337 | @@ -118,7 +118,7 @@ ENDPROC(__memset) | 15501 | @@ -118,7 +118,7 @@ ENDPROC(__memset) |
15338 | 15502 | ||
15339 | #include <asm/cpufeature.h> | 15503 | #include <asm/cpufeature.h> |
@@ -15343,9 +15507,9 @@ diff -urNp linux-2.6.32.15/arch/x86/lib/memset_64.S linux-2.6.32.15/arch/x86/lib | |||
15343 | 1: .byte 0xeb /* jmp <disp8> */ | 15507 | 1: .byte 0xeb /* jmp <disp8> */ |
15344 | .byte (memset_c - memset) - (2f - 1b) /* offset */ | 15508 | .byte (memset_c - memset) - (2f - 1b) /* offset */ |
15345 | 2: | 15509 | 2: |
15346 | diff -urNp linux-2.6.32.15/arch/x86/lib/mmx_32.c linux-2.6.32.15/arch/x86/lib/mmx_32.c | 15510 | diff -urNp linux-2.6.32.16/arch/x86/lib/mmx_32.c linux-2.6.32.16/arch/x86/lib/mmx_32.c |
15347 | --- linux-2.6.32.15/arch/x86/lib/mmx_32.c 2010-03-15 11:52:04.000000000 -0400 | 15511 | --- linux-2.6.32.16/arch/x86/lib/mmx_32.c 2010-07-05 14:14:00.000000000 -0400 |
15348 | +++ linux-2.6.32.15/arch/x86/lib/mmx_32.c 2010-05-28 21:27:15.095006556 -0400 | 15512 | +++ linux-2.6.32.16/arch/x86/lib/mmx_32.c 2010-07-09 14:50:35.000000000 -0400 |
15349 | @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * | 15513 | @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * |
15350 | { | 15514 | { |
15351 | void *p; | 15515 | void *p; |
@@ -15661,9 +15825,9 @@ diff -urNp linux-2.6.32.15/arch/x86/lib/mmx_32.c linux-2.6.32.15/arch/x86/lib/mm | |||
15661 | 15825 | ||
15662 | from += 64; | 15826 | from += 64; |
15663 | to += 64; | 15827 | to += 64; |
15664 | diff -urNp linux-2.6.32.15/arch/x86/lib/putuser.S linux-2.6.32.15/arch/x86/lib/putuser.S | 15828 | diff -urNp linux-2.6.32.16/arch/x86/lib/putuser.S linux-2.6.32.16/arch/x86/lib/putuser.S |
15665 | --- linux-2.6.32.15/arch/x86/lib/putuser.S 2010-03-15 11:52:04.000000000 -0400 | 15829 | --- linux-2.6.32.16/arch/x86/lib/putuser.S 2010-07-05 14:14:00.000000000 -0400 |
15666 | +++ linux-2.6.32.15/arch/x86/lib/putuser.S 2010-05-28 21:27:15.095006556 -0400 | 15830 | +++ linux-2.6.32.16/arch/x86/lib/putuser.S 2010-07-11 20:00:44.000000000 -0400 |
15667 | @@ -15,7 +15,8 @@ | 15831 | @@ -15,7 +15,8 @@ |
15668 | #include <asm/thread_info.h> | 15832 | #include <asm/thread_info.h> |
15669 | #include <asm/errno.h> | 15833 | #include <asm/errno.h> |
@@ -15833,9 +15997,9 @@ diff -urNp linux-2.6.32.15/arch/x86/lib/putuser.S linux-2.6.32.15/arch/x86/lib/p | |||
15833 | movl $-EFAULT,%eax | 15997 | movl $-EFAULT,%eax |
15834 | EXIT | 15998 | EXIT |
15835 | END(bad_put_user) | 15999 | END(bad_put_user) |
15836 | diff -urNp linux-2.6.32.15/arch/x86/lib/usercopy_32.c linux-2.6.32.15/arch/x86/lib/usercopy_32.c | 16000 | diff -urNp linux-2.6.32.16/arch/x86/lib/usercopy_32.c linux-2.6.32.16/arch/x86/lib/usercopy_32.c |
15837 | --- linux-2.6.32.15/arch/x86/lib/usercopy_32.c 2010-03-15 11:52:04.000000000 -0400 | 16001 | --- linux-2.6.32.16/arch/x86/lib/usercopy_32.c 2010-07-05 14:14:00.000000000 -0400 |
15838 | +++ linux-2.6.32.15/arch/x86/lib/usercopy_32.c 2010-05-28 21:27:15.107152206 -0400 | 16002 | +++ linux-2.6.32.16/arch/x86/lib/usercopy_32.c 2010-07-09 14:50:35.000000000 -0400 |
15839 | @@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned | 16003 | @@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned |
15840 | * Copy a null terminated string from userspace. | 16004 | * Copy a null terminated string from userspace. |
15841 | */ | 16005 | */ |
@@ -16804,9 +16968,9 @@ diff -urNp linux-2.6.32.15/arch/x86/lib/usercopy_32.c linux-2.6.32.15/arch/x86/l | |||
16804 | +#endif | 16968 | +#endif |
16805 | + | 16969 | + |
16806 | +EXPORT_SYMBOL(set_fs); | 16970 | +EXPORT_SYMBOL(set_fs); |
16807 | diff -urNp linux-2.6.32.15/arch/x86/lib/usercopy_64.c linux-2.6.32.15/arch/x86/lib/usercopy_64.c | 16971 | diff -urNp linux-2.6.32.16/arch/x86/lib/usercopy_64.c linux-2.6.32.16/arch/x86/lib/usercopy_64.c |
16808 | --- linux-2.6.32.15/arch/x86/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400 | 16972 | --- linux-2.6.32.16/arch/x86/lib/usercopy_64.c 2010-07-05 14:14:00.000000000 -0400 |
16809 | +++ linux-2.6.32.15/arch/x86/lib/usercopy_64.c 2010-05-28 21:27:15.107152206 -0400 | 16973 | +++ linux-2.6.32.16/arch/x86/lib/usercopy_64.c 2010-07-09 14:50:35.000000000 -0400 |
16810 | @@ -42,6 +42,8 @@ long | 16974 | @@ -42,6 +42,8 @@ long |
16811 | __strncpy_from_user(char *dst, const char __user *src, long count) | 16975 | __strncpy_from_user(char *dst, const char __user *src, long count) |
16812 | { | 16976 | { |
@@ -16843,9 +17007,9 @@ diff -urNp linux-2.6.32.15/arch/x86/lib/usercopy_64.c linux-2.6.32.15/arch/x86/l | |||
16843 | } | 17007 | } |
16844 | EXPORT_SYMBOL(copy_in_user); | 17008 | EXPORT_SYMBOL(copy_in_user); |
16845 | 17009 | ||
16846 | diff -urNp linux-2.6.32.15/arch/x86/Makefile linux-2.6.32.15/arch/x86/Makefile | 17010 | diff -urNp linux-2.6.32.16/arch/x86/Makefile linux-2.6.32.16/arch/x86/Makefile |
16847 | --- linux-2.6.32.15/arch/x86/Makefile 2010-03-15 11:52:04.000000000 -0400 | 17011 | --- linux-2.6.32.16/arch/x86/Makefile 2010-07-05 14:14:00.000000000 -0400 |
16848 | +++ linux-2.6.32.15/arch/x86/Makefile 2010-05-28 21:27:15.107152206 -0400 | 17012 | +++ linux-2.6.32.16/arch/x86/Makefile 2010-07-09 14:50:35.000000000 -0400 |
16849 | @@ -189,3 +189,12 @@ define archhelp | 17013 | @@ -189,3 +189,12 @@ define archhelp |
16850 | echo ' FDARGS="..." arguments for the booted kernel' | 17014 | echo ' FDARGS="..." arguments for the booted kernel' |
16851 | echo ' FDINITRD=file initrd for the booted kernel' | 17015 | echo ' FDINITRD=file initrd for the booted kernel' |
@@ -16859,9 +17023,9 @@ diff -urNp linux-2.6.32.15/arch/x86/Makefile linux-2.6.32.15/arch/x86/Makefile | |||
16859 | + | 17023 | + |
16860 | +archprepare: | 17024 | +archprepare: |
16861 | + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) | 17025 | + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) |
16862 | diff -urNp linux-2.6.32.15/arch/x86/mm/extable.c linux-2.6.32.15/arch/x86/mm/extable.c | 17026 | diff -urNp linux-2.6.32.16/arch/x86/mm/extable.c linux-2.6.32.16/arch/x86/mm/extable.c |
16863 | --- linux-2.6.32.15/arch/x86/mm/extable.c 2010-03-15 11:52:04.000000000 -0400 | 17027 | --- linux-2.6.32.16/arch/x86/mm/extable.c 2010-07-05 14:14:00.000000000 -0400 |
16864 | +++ linux-2.6.32.15/arch/x86/mm/extable.c 2010-05-28 21:27:15.107152206 -0400 | 17028 | +++ linux-2.6.32.16/arch/x86/mm/extable.c 2010-07-09 14:50:35.000000000 -0400 |
16865 | @@ -1,14 +1,71 @@ | 17029 | @@ -1,14 +1,71 @@ |
16866 | #include <linux/module.h> | 17030 | #include <linux/module.h> |
16867 | #include <linux/spinlock.h> | 17031 | #include <linux/spinlock.h> |
@@ -16935,9 +17099,9 @@ diff -urNp linux-2.6.32.15/arch/x86/mm/extable.c linux-2.6.32.15/arch/x86/mm/ext | |||
16935 | extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; | 17099 | extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; |
16936 | extern u32 pnp_bios_is_utter_crap; | 17100 | extern u32 pnp_bios_is_utter_crap; |
16937 | pnp_bios_is_utter_crap = 1; | 17101 | pnp_bios_is_utter_crap = 1; |
16938 | diff -urNp linux-2.6.32.15/arch/x86/mm/fault.c linux-2.6.32.15/arch/x86/mm/fault.c | 17102 | diff -urNp linux-2.6.32.16/arch/x86/mm/fault.c linux-2.6.32.16/arch/x86/mm/fault.c |
16939 | --- linux-2.6.32.15/arch/x86/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 | 17103 | --- linux-2.6.32.16/arch/x86/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 |
16940 | +++ linux-2.6.32.15/arch/x86/mm/fault.c 2010-06-19 10:03:50.012498759 -0400 | 17104 | +++ linux-2.6.32.16/arch/x86/mm/fault.c 2010-07-09 14:50:35.000000000 -0400 |
16941 | @@ -11,10 +11,19 @@ | 17105 | @@ -11,10 +11,19 @@ |
16942 | #include <linux/kprobes.h> /* __kprobes, ... */ | 17106 | #include <linux/kprobes.h> /* __kprobes, ... */ |
16943 | #include <linux/mmiotrace.h> /* kmmio_handler, ... */ | 17107 | #include <linux/mmiotrace.h> /* kmmio_handler, ... */ |
@@ -17605,9 +17769,9 @@ diff -urNp linux-2.6.32.15/arch/x86/mm/fault.c linux-2.6.32.15/arch/x86/mm/fault | |||
17605 | + | 17769 | + |
17606 | + return ret ? -EFAULT : 0; | 17770 | + return ret ? -EFAULT : 0; |
17607 | +} | 17771 | +} |
17608 | diff -urNp linux-2.6.32.15/arch/x86/mm/gup.c linux-2.6.32.15/arch/x86/mm/gup.c | 17772 | diff -urNp linux-2.6.32.16/arch/x86/mm/gup.c linux-2.6.32.16/arch/x86/mm/gup.c |
17609 | --- linux-2.6.32.15/arch/x86/mm/gup.c 2010-03-15 11:52:04.000000000 -0400 | 17773 | --- linux-2.6.32.16/arch/x86/mm/gup.c 2010-07-05 14:14:00.000000000 -0400 |
17610 | +++ linux-2.6.32.15/arch/x86/mm/gup.c 2010-05-28 21:27:15.107152206 -0400 | 17774 | +++ linux-2.6.32.16/arch/x86/mm/gup.c 2010-07-09 14:50:35.000000000 -0400 |
17611 | @@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long | 17775 | @@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long |
17612 | addr = start; | 17776 | addr = start; |
17613 | len = (unsigned long) nr_pages << PAGE_SHIFT; | 17777 | len = (unsigned long) nr_pages << PAGE_SHIFT; |
@@ -17617,9 +17781,9 @@ diff -urNp linux-2.6.32.15/arch/x86/mm/gup.c linux-2.6.32.15/arch/x86/mm/gup.c | |||
17617 | (void __user *)start, len))) | 17781 | (void __user *)start, len))) |
17618 | return 0; | 17782 | return 0; |
17619 | 17783 | ||
17620 | diff -urNp linux-2.6.32.15/arch/x86/mm/highmem_32.c linux-2.6.32.15/arch/x86/mm/highmem_32.c | 17784 | diff -urNp linux-2.6.32.16/arch/x86/mm/highmem_32.c linux-2.6.32.16/arch/x86/mm/highmem_32.c |
17621 | --- linux-2.6.32.15/arch/x86/mm/highmem_32.c 2010-03-15 11:52:04.000000000 -0400 | 17785 | --- linux-2.6.32.16/arch/x86/mm/highmem_32.c 2010-07-05 14:14:00.000000000 -0400 |
17622 | +++ linux-2.6.32.15/arch/x86/mm/highmem_32.c 2010-05-28 21:27:15.107152206 -0400 | 17786 | +++ linux-2.6.32.16/arch/x86/mm/highmem_32.c 2010-07-09 14:50:35.000000000 -0400 |
17623 | @@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page | 17787 | @@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page |
17624 | idx = type + KM_TYPE_NR*smp_processor_id(); | 17788 | idx = type + KM_TYPE_NR*smp_processor_id(); |
17625 | vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); | 17789 | vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); |
@@ -17631,9 +17795,9 @@ diff -urNp linux-2.6.32.15/arch/x86/mm/highmem_32.c linux-2.6.32.15/arch/x86/mm/ | |||
17631 | 17795 | ||
17632 | return (void *)vaddr; | 17796 | return (void *)vaddr; |
17633 | } | 17797 | } |
17634 | diff -urNp linux-2.6.32.15/arch/x86/mm/hugetlbpage.c linux-2.6.32.15/arch/x86/mm/hugetlbpage.c | 17798 | diff -urNp linux-2.6.32.16/arch/x86/mm/hugetlbpage.c linux-2.6.32.16/arch/x86/mm/hugetlbpage.c |
17635 | --- linux-2.6.32.15/arch/x86/mm/hugetlbpage.c 2010-03-15 11:52:04.000000000 -0400 | 17799 | --- linux-2.6.32.16/arch/x86/mm/hugetlbpage.c 2010-07-05 14:14:00.000000000 -0400 |
17636 | +++ linux-2.6.32.15/arch/x86/mm/hugetlbpage.c 2010-05-28 21:27:15.107152206 -0400 | 17800 | +++ linux-2.6.32.16/arch/x86/mm/hugetlbpage.c 2010-07-09 14:50:35.000000000 -0400 |
17637 | @@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe | 17801 | @@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe |
17638 | struct hstate *h = hstate_file(file); | 17802 | struct hstate *h = hstate_file(file); |
17639 | struct mm_struct *mm = current->mm; | 17803 | struct mm_struct *mm = current->mm; |
@@ -17768,9 +17932,9 @@ diff -urNp linux-2.6.32.15/arch/x86/mm/hugetlbpage.c linux-2.6.32.15/arch/x86/mm | |||
17768 | (!vma || addr + len <= vma->vm_start)) | 17932 | (!vma || addr + len <= vma->vm_start)) |
17769 | return addr; | 17933 | return addr; |
17770 | } | 17934 | } |
17771 | diff -urNp linux-2.6.32.15/arch/x86/mm/init_32.c linux-2.6.32.15/arch/x86/mm/init_32.c | 17935 | diff -urNp linux-2.6.32.16/arch/x86/mm/init_32.c linux-2.6.32.16/arch/x86/mm/init_32.c |
17772 | --- linux-2.6.32.15/arch/x86/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400 | 17936 | --- linux-2.6.32.16/arch/x86/mm/init_32.c 2010-07-05 14:14:00.000000000 -0400 |
17773 | +++ linux-2.6.32.15/arch/x86/mm/init_32.c 2010-05-28 21:27:15.114903294 -0400 | 17937 | +++ linux-2.6.32.16/arch/x86/mm/init_32.c 2010-07-09 14:50:35.000000000 -0400 |
17774 | @@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) | 17938 | @@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) |
17775 | } | 17939 | } |
17776 | 17940 | ||
@@ -18074,9 +18238,9 @@ diff -urNp linux-2.6.32.15/arch/x86/mm/init_32.c linux-2.6.32.15/arch/x86/mm/ini | |||
18074 | set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); | 18238 | set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); |
18075 | printk(KERN_INFO "Write protecting the kernel text: %luk\n", | 18239 | printk(KERN_INFO "Write protecting the kernel text: %luk\n", |
18076 | size >> 10); | 18240 | size >> 10); |
18077 | diff -urNp linux-2.6.32.15/arch/x86/mm/init_64.c linux-2.6.32.15/arch/x86/mm/init_64.c | 18241 | diff -urNp linux-2.6.32.16/arch/x86/mm/init_64.c linux-2.6.32.16/arch/x86/mm/init_64.c |
18078 | --- linux-2.6.32.15/arch/x86/mm/init_64.c 2010-03-15 11:52:04.000000000 -0400 | 18242 | --- linux-2.6.32.16/arch/x86/mm/init_64.c 2010-07-05 14:14:00.000000000 -0400 |
18079 | +++ linux-2.6.32.15/arch/x86/mm/init_64.c 2010-05-28 21:27:15.114903294 -0400 | 18243 | +++ linux-2.6.32.16/arch/x86/mm/init_64.c 2010-07-09 14:50:35.000000000 -0400 |
18080 | @@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, | 18244 | @@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, |
18081 | pmd = fill_pmd(pud, vaddr); | 18245 | pmd = fill_pmd(pud, vaddr); |
18082 | pte = fill_pte(pmd, vaddr); | 18246 | pte = fill_pte(pmd, vaddr); |
@@ -18137,9 +18301,9 @@ diff -urNp linux-2.6.32.15/arch/x86/mm/init_64.c linux-2.6.32.15/arch/x86/mm/ini | |||
18137 | return "[vdso]"; | 18301 | return "[vdso]"; |
18138 | if (vma == &gate_vma) | 18302 | if (vma == &gate_vma) |
18139 | return "[vsyscall]"; | 18303 | return "[vsyscall]"; |
18140 | diff -urNp linux-2.6.32.15/arch/x86/mm/init.c linux-2.6.32.15/arch/x86/mm/init.c | 18304 | diff -urNp linux-2.6.32.16/arch/x86/mm/init.c linux-2.6.32.16/arch/x86/mm/init.c |
18141 | --- linux-2.6.32.15/arch/x86/mm/init.c 2010-03-15 11:52:04.000000000 -0400 | 18305 | --- linux-2.6.32.16/arch/x86/mm/init.c 2010-07-05 14:14:00.000000000 -0400 |
18142 | +++ linux-2.6.32.15/arch/x86/mm/init.c 2010-06-19 10:03:50.012498759 -0400 | 18306 | +++ linux-2.6.32.16/arch/x86/mm/init.c 2010-07-09 14:50:35.000000000 -0400 |
18143 | @@ -69,11 +69,7 @@ static void __init find_early_table_spac | 18307 | @@ -69,11 +69,7 @@ static void __init find_early_table_spac |
18144 | * cause a hotspot and fill up ZONE_DMA. The page tables | 18308 | * cause a hotspot and fill up ZONE_DMA. The page tables |
18145 | * need roughly 0.5KB per GB. | 18309 | * need roughly 0.5KB per GB. |
@@ -18168,16 +18332,12 @@ diff -urNp linux-2.6.32.15/arch/x86/mm/init.c linux-2.6.32.15/arch/x86/mm/init.c | |||
18168 | return 1; | 18332 | return 1; |
18169 | if (iomem_is_exclusive(pagenr << PAGE_SHIFT)) | 18333 | if (iomem_is_exclusive(pagenr << PAGE_SHIFT)) |
18170 | return 0; | 18334 | return 0; |
18171 | @@ -379,6 +381,89 @@ void free_init_pages(char *what, unsigne | 18335 | @@ -379,6 +381,88 @@ void free_init_pages(char *what, unsigne |
18172 | 18336 | ||
18173 | void free_initmem(void) | 18337 | void free_initmem(void) |
18174 | { | 18338 | { |
18175 | + | 18339 | + |
18176 | +#ifdef CONFIG_PAX_KERNEXEC | 18340 | +#ifdef CONFIG_PAX_KERNEXEC |
18177 | + pgd_t *pgd; | ||
18178 | + pud_t *pud; | ||
18179 | + pmd_t *pmd; | ||
18180 | + | ||
18181 | +#ifdef CONFIG_X86_32 | 18341 | +#ifdef CONFIG_X86_32 |
18182 | + /* PaX: limit KERNEL_CS to actual size */ | 18342 | + /* PaX: limit KERNEL_CS to actual size */ |
18183 | + unsigned long addr, limit; | 18343 | + unsigned long addr, limit; |
@@ -18222,6 +18382,9 @@ diff -urNp linux-2.6.32.15/arch/x86/mm/init.c linux-2.6.32.15/arch/x86/mm/init.c | |||
18222 | +#endif | 18382 | +#endif |
18223 | + | 18383 | + |
18224 | +#else | 18384 | +#else |
18385 | + pgd_t *pgd; | ||
18386 | + pud_t *pud; | ||
18387 | + pmd_t *pmd; | ||
18225 | + unsigned long addr, end; | 18388 | + unsigned long addr, end; |
18226 | + | 18389 | + |
18227 | + /* PaX: make kernel code/rodata read-only, rest non-executable */ | 18390 | + /* PaX: make kernel code/rodata read-only, rest non-executable */ |
@@ -18258,9 +18421,9 @@ diff -urNp linux-2.6.32.15/arch/x86/mm/init.c linux-2.6.32.15/arch/x86/mm/init.c | |||
18258 | free_init_pages("unused kernel memory", | 18421 | free_init_pages("unused kernel memory", |
18259 | (unsigned long)(&__init_begin), | 18422 | (unsigned long)(&__init_begin), |
18260 | (unsigned long)(&__init_end)); | 18423 | (unsigned long)(&__init_end)); |
18261 | diff -urNp linux-2.6.32.15/arch/x86/mm/iomap_32.c linux-2.6.32.15/arch/x86/mm/iomap_32.c | 18424 | diff -urNp linux-2.6.32.16/arch/x86/mm/iomap_32.c linux-2.6.32.16/arch/x86/mm/iomap_32.c |
18262 | --- linux-2.6.32.15/arch/x86/mm/iomap_32.c 2010-03-15 11:52:04.000000000 -0400 | 18425 | --- linux-2.6.32.16/arch/x86/mm/iomap_32.c 2010-07-05 14:14:00.000000000 -0400 |
18263 | +++ linux-2.6.32.15/arch/x86/mm/iomap_32.c 2010-05-28 21:27:15.114903294 -0400 | 18426 | +++ linux-2.6.32.16/arch/x86/mm/iomap_32.c 2010-07-09 14:50:35.000000000 -0400 |
18264 | @@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long | 18427 | @@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long |
18265 | debug_kmap_atomic(type); | 18428 | debug_kmap_atomic(type); |
18266 | idx = type + KM_TYPE_NR * smp_processor_id(); | 18429 | idx = type + KM_TYPE_NR * smp_processor_id(); |
@@ -18273,9 +18436,9 @@ diff -urNp linux-2.6.32.15/arch/x86/mm/iomap_32.c linux-2.6.32.15/arch/x86/mm/io | |||
18273 | arch_flush_lazy_mmu_mode(); | 18436 | arch_flush_lazy_mmu_mode(); |
18274 | 18437 | ||
18275 | return (void *)vaddr; | 18438 | return (void *)vaddr; |
18276 | diff -urNp linux-2.6.32.15/arch/x86/mm/ioremap.c linux-2.6.32.15/arch/x86/mm/ioremap.c | 18439 | diff -urNp linux-2.6.32.16/arch/x86/mm/ioremap.c linux-2.6.32.16/arch/x86/mm/ioremap.c |
18277 | --- linux-2.6.32.15/arch/x86/mm/ioremap.c 2010-03-15 11:52:04.000000000 -0400 | 18440 | --- linux-2.6.32.16/arch/x86/mm/ioremap.c 2010-07-05 14:14:00.000000000 -0400 |
18278 | +++ linux-2.6.32.15/arch/x86/mm/ioremap.c 2010-05-28 21:27:15.114903294 -0400 | 18441 | +++ linux-2.6.32.16/arch/x86/mm/ioremap.c 2010-07-09 14:50:35.000000000 -0400 |
18279 | @@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr) | 18442 | @@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr) |
18280 | * Second special case: Some BIOSen report the PC BIOS | 18443 | * Second special case: Some BIOSen report the PC BIOS |
18281 | * area (640->1Mb) as ram even though it is not. | 18444 | * area (640->1Mb) as ram even though it is not. |
@@ -18322,9 +18485,9 @@ diff -urNp linux-2.6.32.15/arch/x86/mm/ioremap.c linux-2.6.32.15/arch/x86/mm/ior | |||
18322 | 18485 | ||
18323 | /* | 18486 | /* |
18324 | * The boot-ioremap range spans multiple pmds, for which | 18487 | * The boot-ioremap range spans multiple pmds, for which |
18325 | diff -urNp linux-2.6.32.15/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.15/arch/x86/mm/kmemcheck/kmemcheck.c | 18488 | diff -urNp linux-2.6.32.16/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.16/arch/x86/mm/kmemcheck/kmemcheck.c |
18326 | --- linux-2.6.32.15/arch/x86/mm/kmemcheck/kmemcheck.c 2010-03-15 11:52:04.000000000 -0400 | 18489 | --- linux-2.6.32.16/arch/x86/mm/kmemcheck/kmemcheck.c 2010-07-05 14:14:00.000000000 -0400 |
18327 | +++ linux-2.6.32.15/arch/x86/mm/kmemcheck/kmemcheck.c 2010-05-28 21:27:15.114903294 -0400 | 18490 | +++ linux-2.6.32.16/arch/x86/mm/kmemcheck/kmemcheck.c 2010-07-09 14:50:35.000000000 -0400 |
18328 | @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg | 18491 | @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg |
18329 | * memory (e.g. tracked pages)? For now, we need this to avoid | 18492 | * memory (e.g. tracked pages)? For now, we need this to avoid |
18330 | * invoking kmemcheck for PnP BIOS calls. | 18493 | * invoking kmemcheck for PnP BIOS calls. |
@@ -18337,9 +18500,9 @@ diff -urNp linux-2.6.32.15/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.15/arc | |||
18337 | return false; | 18500 | return false; |
18338 | 18501 | ||
18339 | pte = kmemcheck_pte_lookup(address); | 18502 | pte = kmemcheck_pte_lookup(address); |
18340 | diff -urNp linux-2.6.32.15/arch/x86/mm/mmap.c linux-2.6.32.15/arch/x86/mm/mmap.c | 18503 | diff -urNp linux-2.6.32.16/arch/x86/mm/mmap.c linux-2.6.32.16/arch/x86/mm/mmap.c |
18341 | --- linux-2.6.32.15/arch/x86/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 | 18504 | --- linux-2.6.32.16/arch/x86/mm/mmap.c 2010-07-05 14:14:00.000000000 -0400 |
18342 | +++ linux-2.6.32.15/arch/x86/mm/mmap.c 2010-05-28 21:27:15.114903294 -0400 | 18505 | +++ linux-2.6.32.16/arch/x86/mm/mmap.c 2010-07-09 14:50:35.000000000 -0400 |
18343 | @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size | 18506 | @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size |
18344 | * Leave an at least ~128 MB hole with possible stack randomization. | 18507 | * Leave an at least ~128 MB hole with possible stack randomization. |
18345 | */ | 18508 | */ |
@@ -18421,9 +18584,9 @@ diff -urNp linux-2.6.32.15/arch/x86/mm/mmap.c linux-2.6.32.15/arch/x86/mm/mmap.c | |||
18421 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; | 18584 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; |
18422 | mm->unmap_area = arch_unmap_area_topdown; | 18585 | mm->unmap_area = arch_unmap_area_topdown; |
18423 | } | 18586 | } |
18424 | diff -urNp linux-2.6.32.15/arch/x86/mm/numa_32.c linux-2.6.32.15/arch/x86/mm/numa_32.c | 18587 | diff -urNp linux-2.6.32.16/arch/x86/mm/numa_32.c linux-2.6.32.16/arch/x86/mm/numa_32.c |
18425 | --- linux-2.6.32.15/arch/x86/mm/numa_32.c 2010-03-15 11:52:04.000000000 -0400 | 18588 | --- linux-2.6.32.16/arch/x86/mm/numa_32.c 2010-07-05 14:14:00.000000000 -0400 |
18426 | +++ linux-2.6.32.15/arch/x86/mm/numa_32.c 2010-05-28 21:27:15.118897735 -0400 | 18589 | +++ linux-2.6.32.16/arch/x86/mm/numa_32.c 2010-07-09 14:50:35.000000000 -0400 |
18427 | @@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int | 18590 | @@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int |
18428 | } | 18591 | } |
18429 | #endif | 18592 | #endif |
@@ -18432,9 +18595,9 @@ diff -urNp linux-2.6.32.15/arch/x86/mm/numa_32.c linux-2.6.32.15/arch/x86/mm/num | |||
18432 | extern unsigned long highend_pfn, highstart_pfn; | 18595 | extern unsigned long highend_pfn, highstart_pfn; |
18433 | 18596 | ||
18434 | #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) | 18597 | #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) |
18435 | diff -urNp linux-2.6.32.15/arch/x86/mm/pageattr.c linux-2.6.32.15/arch/x86/mm/pageattr.c | 18598 | diff -urNp linux-2.6.32.16/arch/x86/mm/pageattr.c linux-2.6.32.16/arch/x86/mm/pageattr.c |
18436 | --- linux-2.6.32.15/arch/x86/mm/pageattr.c 2010-03-15 11:52:04.000000000 -0400 | 18599 | --- linux-2.6.32.16/arch/x86/mm/pageattr.c 2010-07-05 14:14:00.000000000 -0400 |
18437 | +++ linux-2.6.32.15/arch/x86/mm/pageattr.c 2010-06-19 10:03:50.012498759 -0400 | 18600 | +++ linux-2.6.32.16/arch/x86/mm/pageattr.c 2010-07-09 14:50:35.000000000 -0400 |
18438 | @@ -261,16 +261,17 @@ static inline pgprot_t static_protection | 18601 | @@ -261,16 +261,17 @@ static inline pgprot_t static_protection |
18439 | * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support. | 18602 | * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support. |
18440 | */ | 18603 | */ |
@@ -18493,7 +18656,7 @@ diff -urNp linux-2.6.32.15/arch/x86/mm/pageattr.c linux-2.6.32.15/arch/x86/mm/pa | |||
18493 | +#else | 18656 | +#else |
18494 | list_for_each_entry(page, &pgd_list, lru) { | 18657 | list_for_each_entry(page, &pgd_list, lru) { |
18495 | - pgd_t *pgd; | 18658 | - pgd_t *pgd; |
18496 | + pgd_t *pgd = (pgd_t *)page_address(page);; | 18659 | + pgd_t *pgd = (pgd_t *)page_address(page); |
18497 | +#endif | 18660 | +#endif |
18498 | + | 18661 | + |
18499 | pud_t *pud; | 18662 | pud_t *pud; |
@@ -18511,9 +18674,9 @@ diff -urNp linux-2.6.32.15/arch/x86/mm/pageattr.c linux-2.6.32.15/arch/x86/mm/pa | |||
18511 | } | 18674 | } |
18512 | 18675 | ||
18513 | static int | 18676 | static int |
18514 | diff -urNp linux-2.6.32.15/arch/x86/mm/pageattr-test.c linux-2.6.32.15/arch/x86/mm/pageattr-test.c | 18677 | diff -urNp linux-2.6.32.16/arch/x86/mm/pageattr-test.c linux-2.6.32.16/arch/x86/mm/pageattr-test.c |
18515 | --- linux-2.6.32.15/arch/x86/mm/pageattr-test.c 2010-03-15 11:52:04.000000000 -0400 | 18678 | --- linux-2.6.32.16/arch/x86/mm/pageattr-test.c 2010-07-05 14:14:00.000000000 -0400 |
18516 | +++ linux-2.6.32.15/arch/x86/mm/pageattr-test.c 2010-05-28 21:27:15.118897735 -0400 | 18679 | +++ linux-2.6.32.16/arch/x86/mm/pageattr-test.c 2010-07-09 14:50:35.000000000 -0400 |
18517 | @@ -36,7 +36,7 @@ enum { | 18680 | @@ -36,7 +36,7 @@ enum { |
18518 | 18681 | ||
18519 | static int pte_testbit(pte_t pte) | 18682 | static int pte_testbit(pte_t pte) |
@@ -18523,9 +18686,9 @@ diff -urNp linux-2.6.32.15/arch/x86/mm/pageattr-test.c linux-2.6.32.15/arch/x86/ | |||
18523 | } | 18686 | } |
18524 | 18687 | ||
18525 | struct split_state { | 18688 | struct split_state { |
18526 | diff -urNp linux-2.6.32.15/arch/x86/mm/pat.c linux-2.6.32.15/arch/x86/mm/pat.c | 18689 | diff -urNp linux-2.6.32.16/arch/x86/mm/pat.c linux-2.6.32.16/arch/x86/mm/pat.c |
18527 | --- linux-2.6.32.15/arch/x86/mm/pat.c 2010-03-15 11:52:04.000000000 -0400 | 18690 | --- linux-2.6.32.16/arch/x86/mm/pat.c 2010-07-05 14:14:00.000000000 -0400 |
18528 | +++ linux-2.6.32.15/arch/x86/mm/pat.c 2010-05-28 21:27:15.118897735 -0400 | 18691 | +++ linux-2.6.32.16/arch/x86/mm/pat.c 2010-07-09 14:50:35.000000000 -0400 |
18529 | @@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct | 18692 | @@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct |
18530 | 18693 | ||
18531 | conflict: | 18694 | conflict: |
@@ -18562,9 +18725,9 @@ diff -urNp linux-2.6.32.15/arch/x86/mm/pat.c linux-2.6.32.15/arch/x86/mm/pat.c | |||
18562 | cattr_name(want_flags), | 18725 | cattr_name(want_flags), |
18563 | (unsigned long long)paddr, | 18726 | (unsigned long long)paddr, |
18564 | (unsigned long long)(paddr + size), | 18727 | (unsigned long long)(paddr + size), |
18565 | diff -urNp linux-2.6.32.15/arch/x86/mm/pgtable_32.c linux-2.6.32.15/arch/x86/mm/pgtable_32.c | 18728 | diff -urNp linux-2.6.32.16/arch/x86/mm/pgtable_32.c linux-2.6.32.16/arch/x86/mm/pgtable_32.c |
18566 | --- linux-2.6.32.15/arch/x86/mm/pgtable_32.c 2010-03-15 11:52:04.000000000 -0400 | 18729 | --- linux-2.6.32.16/arch/x86/mm/pgtable_32.c 2010-07-05 14:14:00.000000000 -0400 |
18567 | +++ linux-2.6.32.15/arch/x86/mm/pgtable_32.c 2010-05-28 21:27:15.118897735 -0400 | 18730 | +++ linux-2.6.32.16/arch/x86/mm/pgtable_32.c 2010-07-09 14:50:35.000000000 -0400 |
18568 | @@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, | 18731 | @@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, |
18569 | return; | 18732 | return; |
18570 | } | 18733 | } |
@@ -18579,9 +18742,9 @@ diff -urNp linux-2.6.32.15/arch/x86/mm/pgtable_32.c linux-2.6.32.15/arch/x86/mm/ | |||
18579 | 18742 | ||
18580 | /* | 18743 | /* |
18581 | * It's enough to flush this one mapping. | 18744 | * It's enough to flush this one mapping. |
18582 | diff -urNp linux-2.6.32.15/arch/x86/mm/pgtable.c linux-2.6.32.15/arch/x86/mm/pgtable.c | 18745 | diff -urNp linux-2.6.32.16/arch/x86/mm/pgtable.c linux-2.6.32.16/arch/x86/mm/pgtable.c |
18583 | --- linux-2.6.32.15/arch/x86/mm/pgtable.c 2010-03-15 11:52:04.000000000 -0400 | 18746 | --- linux-2.6.32.16/arch/x86/mm/pgtable.c 2010-07-05 14:14:00.000000000 -0400 |
18584 | +++ linux-2.6.32.15/arch/x86/mm/pgtable.c 2010-06-19 10:03:50.012498759 -0400 | 18747 | +++ linux-2.6.32.16/arch/x86/mm/pgtable.c 2010-07-09 14:50:35.000000000 -0400 |
18585 | @@ -83,8 +83,59 @@ static inline void pgd_list_del(pgd_t *p | 18748 | @@ -83,8 +83,59 @@ static inline void pgd_list_del(pgd_t *p |
18586 | list_del(&page->lru); | 18749 | list_del(&page->lru); |
18587 | } | 18750 | } |
@@ -18835,9 +18998,9 @@ diff -urNp linux-2.6.32.15/arch/x86/mm/pgtable.c linux-2.6.32.15/arch/x86/mm/pgt | |||
18835 | pgd_dtor(pgd); | 18998 | pgd_dtor(pgd); |
18836 | paravirt_pgd_free(mm, pgd); | 18999 | paravirt_pgd_free(mm, pgd); |
18837 | free_page((unsigned long)pgd); | 19000 | free_page((unsigned long)pgd); |
18838 | diff -urNp linux-2.6.32.15/arch/x86/mm/setup_nx.c linux-2.6.32.15/arch/x86/mm/setup_nx.c | 19001 | diff -urNp linux-2.6.32.16/arch/x86/mm/setup_nx.c linux-2.6.32.16/arch/x86/mm/setup_nx.c |
18839 | --- linux-2.6.32.15/arch/x86/mm/setup_nx.c 2010-03-15 11:52:04.000000000 -0400 | 19002 | --- linux-2.6.32.16/arch/x86/mm/setup_nx.c 2010-07-05 14:14:00.000000000 -0400 |
18840 | +++ linux-2.6.32.15/arch/x86/mm/setup_nx.c 2010-05-28 21:27:15.118897735 -0400 | 19003 | +++ linux-2.6.32.16/arch/x86/mm/setup_nx.c 2010-07-09 14:50:35.000000000 -0400 |
18841 | @@ -4,11 +4,10 @@ | 19004 | @@ -4,11 +4,10 @@ |
18842 | 19005 | ||
18843 | #include <asm/pgtable.h> | 19006 | #include <asm/pgtable.h> |
@@ -18903,9 +19066,9 @@ diff -urNp linux-2.6.32.15/arch/x86/mm/setup_nx.c linux-2.6.32.15/arch/x86/mm/se | |||
18903 | __supported_pte_mask &= ~_PAGE_NX; | 19066 | __supported_pte_mask &= ~_PAGE_NX; |
18904 | } | 19067 | } |
18905 | #endif | 19068 | #endif |
18906 | diff -urNp linux-2.6.32.15/arch/x86/mm/tlb.c linux-2.6.32.15/arch/x86/mm/tlb.c | 19069 | diff -urNp linux-2.6.32.16/arch/x86/mm/tlb.c linux-2.6.32.16/arch/x86/mm/tlb.c |
18907 | --- linux-2.6.32.15/arch/x86/mm/tlb.c 2010-03-15 11:52:04.000000000 -0400 | 19070 | --- linux-2.6.32.16/arch/x86/mm/tlb.c 2010-07-05 14:14:00.000000000 -0400 |
18908 | +++ linux-2.6.32.15/arch/x86/mm/tlb.c 2010-05-28 21:27:15.118897735 -0400 | 19071 | +++ linux-2.6.32.16/arch/x86/mm/tlb.c 2010-07-09 14:50:35.000000000 -0400 |
18909 | @@ -12,7 +12,7 @@ | 19072 | @@ -12,7 +12,7 @@ |
18910 | #include <asm/uv/uv.h> | 19073 | #include <asm/uv/uv.h> |
18911 | 19074 | ||
@@ -18927,9 +19090,9 @@ diff -urNp linux-2.6.32.15/arch/x86/mm/tlb.c linux-2.6.32.15/arch/x86/mm/tlb.c | |||
18927 | } | 19090 | } |
18928 | EXPORT_SYMBOL_GPL(leave_mm); | 19091 | EXPORT_SYMBOL_GPL(leave_mm); |
18929 | 19092 | ||
18930 | diff -urNp linux-2.6.32.15/arch/x86/oprofile/backtrace.c linux-2.6.32.15/arch/x86/oprofile/backtrace.c | 19093 | diff -urNp linux-2.6.32.16/arch/x86/oprofile/backtrace.c linux-2.6.32.16/arch/x86/oprofile/backtrace.c |
18931 | --- linux-2.6.32.15/arch/x86/oprofile/backtrace.c 2010-03-15 11:52:04.000000000 -0400 | 19094 | --- linux-2.6.32.16/arch/x86/oprofile/backtrace.c 2010-07-05 14:14:00.000000000 -0400 |
18932 | +++ linux-2.6.32.15/arch/x86/oprofile/backtrace.c 2010-05-28 21:27:15.118897735 -0400 | 19095 | +++ linux-2.6.32.16/arch/x86/oprofile/backtrace.c 2010-07-09 14:50:35.000000000 -0400 |
18933 | @@ -57,7 +57,7 @@ static struct frame_head *dump_user_back | 19096 | @@ -57,7 +57,7 @@ static struct frame_head *dump_user_back |
18934 | struct frame_head bufhead[2]; | 19097 | struct frame_head bufhead[2]; |
18935 | 19098 | ||
@@ -18948,9 +19111,9 @@ diff -urNp linux-2.6.32.15/arch/x86/oprofile/backtrace.c linux-2.6.32.15/arch/x8 | |||
18948 | unsigned long stack = kernel_stack_pointer(regs); | 19111 | unsigned long stack = kernel_stack_pointer(regs); |
18949 | if (depth) | 19112 | if (depth) |
18950 | dump_trace(NULL, regs, (unsigned long *)stack, 0, | 19113 | dump_trace(NULL, regs, (unsigned long *)stack, 0, |
18951 | 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 | 19114 | diff -urNp linux-2.6.32.16/arch/x86/oprofile/op_model_p4.c linux-2.6.32.16/arch/x86/oprofile/op_model_p4.c |
18952 | --- linux-2.6.32.15/arch/x86/oprofile/op_model_p4.c 2010-03-15 11:52:04.000000000 -0400 | 19115 | --- linux-2.6.32.16/arch/x86/oprofile/op_model_p4.c 2010-07-05 14:14:00.000000000 -0400 |
18953 | +++ linux-2.6.32.15/arch/x86/oprofile/op_model_p4.c 2010-05-28 21:27:15.118897735 -0400 | 19116 | +++ linux-2.6.32.16/arch/x86/oprofile/op_model_p4.c 2010-07-09 14:50:35.000000000 -0400 |
18954 | @@ -50,7 +50,7 @@ static inline void setup_num_counters(vo | 19117 | @@ -50,7 +50,7 @@ static inline void setup_num_counters(vo |
18955 | #endif | 19118 | #endif |
18956 | } | 19119 | } |
@@ -18960,9 +19123,9 @@ diff -urNp linux-2.6.32.15/arch/x86/oprofile/op_model_p4.c linux-2.6.32.15/arch/ | |||
18960 | { | 19123 | { |
18961 | #ifdef CONFIG_SMP | 19124 | #ifdef CONFIG_SMP |
18962 | return smp_num_siblings == 2 ? 2 : 1; | 19125 | return smp_num_siblings == 2 ? 2 : 1; |
18963 | diff -urNp linux-2.6.32.15/arch/x86/pci/common.c linux-2.6.32.15/arch/x86/pci/common.c | 19126 | diff -urNp linux-2.6.32.16/arch/x86/pci/common.c linux-2.6.32.16/arch/x86/pci/common.c |
18964 | --- linux-2.6.32.15/arch/x86/pci/common.c 2010-03-15 11:52:04.000000000 -0400 | 19127 | --- linux-2.6.32.16/arch/x86/pci/common.c 2010-07-05 14:14:00.000000000 -0400 |
18965 | +++ linux-2.6.32.15/arch/x86/pci/common.c 2010-05-28 21:27:15.118897735 -0400 | 19128 | +++ linux-2.6.32.16/arch/x86/pci/common.c 2010-07-09 14:50:35.000000000 -0400 |
18966 | @@ -31,8 +31,8 @@ int noioapicreroute = 1; | 19129 | @@ -31,8 +31,8 @@ int noioapicreroute = 1; |
18967 | int pcibios_last_bus = -1; | 19130 | int pcibios_last_bus = -1; |
18968 | unsigned long pirq_table_addr; | 19131 | unsigned long pirq_table_addr; |
@@ -18983,9 +19146,9 @@ diff -urNp linux-2.6.32.15/arch/x86/pci/common.c linux-2.6.32.15/arch/x86/pci/co | |||
18983 | }; | 19146 | }; |
18984 | 19147 | ||
18985 | void __init dmi_check_pciprobe(void) | 19148 | void __init dmi_check_pciprobe(void) |
18986 | diff -urNp linux-2.6.32.15/arch/x86/pci/direct.c linux-2.6.32.15/arch/x86/pci/direct.c | 19149 | diff -urNp linux-2.6.32.16/arch/x86/pci/direct.c linux-2.6.32.16/arch/x86/pci/direct.c |
18987 | --- linux-2.6.32.15/arch/x86/pci/direct.c 2010-03-15 11:52:04.000000000 -0400 | 19150 | --- linux-2.6.32.16/arch/x86/pci/direct.c 2010-07-05 14:14:00.000000000 -0400 |
18988 | +++ linux-2.6.32.15/arch/x86/pci/direct.c 2010-05-28 21:27:15.118897735 -0400 | 19151 | +++ linux-2.6.32.16/arch/x86/pci/direct.c 2010-07-09 14:50:35.000000000 -0400 |
18989 | @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int | 19152 | @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int |
18990 | 19153 | ||
18991 | #undef PCI_CONF1_ADDRESS | 19154 | #undef PCI_CONF1_ADDRESS |
@@ -19013,9 +19176,9 @@ diff -urNp linux-2.6.32.15/arch/x86/pci/direct.c linux-2.6.32.15/arch/x86/pci/di | |||
19013 | { | 19176 | { |
19014 | u32 x = 0; | 19177 | u32 x = 0; |
19015 | int year, devfn; | 19178 | int year, devfn; |
19016 | diff -urNp linux-2.6.32.15/arch/x86/pci/fixup.c linux-2.6.32.15/arch/x86/pci/fixup.c | 19179 | diff -urNp linux-2.6.32.16/arch/x86/pci/fixup.c linux-2.6.32.16/arch/x86/pci/fixup.c |
19017 | --- linux-2.6.32.15/arch/x86/pci/fixup.c 2010-03-15 11:52:04.000000000 -0400 | 19180 | --- linux-2.6.32.16/arch/x86/pci/fixup.c 2010-07-05 14:14:00.000000000 -0400 |
19018 | +++ linux-2.6.32.15/arch/x86/pci/fixup.c 2010-05-28 21:27:15.118897735 -0400 | 19181 | +++ linux-2.6.32.16/arch/x86/pci/fixup.c 2010-07-09 14:50:35.000000000 -0400 |
19019 | @@ -364,7 +364,7 @@ static const struct dmi_system_id __devi | 19182 | @@ -364,7 +364,7 @@ static const struct dmi_system_id __devi |
19020 | DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), | 19183 | DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), |
19021 | }, | 19184 | }, |
@@ -19034,9 +19197,9 @@ diff -urNp linux-2.6.32.15/arch/x86/pci/fixup.c linux-2.6.32.15/arch/x86/pci/fix | |||
19034 | }; | 19197 | }; |
19035 | 19198 | ||
19036 | static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) | 19199 | static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) |
19037 | diff -urNp linux-2.6.32.15/arch/x86/pci/irq.c linux-2.6.32.15/arch/x86/pci/irq.c | 19200 | diff -urNp linux-2.6.32.16/arch/x86/pci/irq.c linux-2.6.32.16/arch/x86/pci/irq.c |
19038 | --- linux-2.6.32.15/arch/x86/pci/irq.c 2010-04-29 17:49:37.625451376 -0400 | 19201 | --- linux-2.6.32.16/arch/x86/pci/irq.c 2010-07-05 14:14:00.000000000 -0400 |
19039 | +++ linux-2.6.32.15/arch/x86/pci/irq.c 2010-05-28 21:27:15.118897735 -0400 | 19202 | +++ linux-2.6.32.16/arch/x86/pci/irq.c 2010-07-09 14:50:35.000000000 -0400 |
19040 | @@ -543,7 +543,7 @@ static __init int intel_router_probe(str | 19203 | @@ -543,7 +543,7 @@ static __init int intel_router_probe(str |
19041 | static struct pci_device_id __initdata pirq_440gx[] = { | 19204 | static struct pci_device_id __initdata pirq_440gx[] = { |
19042 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) }, | 19205 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) }, |
@@ -19055,9 +19218,9 @@ diff -urNp linux-2.6.32.15/arch/x86/pci/irq.c linux-2.6.32.15/arch/x86/pci/irq.c | |||
19055 | }; | 19218 | }; |
19056 | 19219 | ||
19057 | int __init pcibios_irq_init(void) | 19220 | int __init pcibios_irq_init(void) |
19058 | diff -urNp linux-2.6.32.15/arch/x86/pci/mmconfig_32.c linux-2.6.32.15/arch/x86/pci/mmconfig_32.c | 19221 | diff -urNp linux-2.6.32.16/arch/x86/pci/mmconfig_32.c linux-2.6.32.16/arch/x86/pci/mmconfig_32.c |
19059 | --- linux-2.6.32.15/arch/x86/pci/mmconfig_32.c 2010-03-15 11:52:04.000000000 -0400 | 19222 | --- linux-2.6.32.16/arch/x86/pci/mmconfig_32.c 2010-07-05 14:14:00.000000000 -0400 |
19060 | +++ linux-2.6.32.15/arch/x86/pci/mmconfig_32.c 2010-05-28 21:27:15.118897735 -0400 | 19223 | +++ linux-2.6.32.16/arch/x86/pci/mmconfig_32.c 2010-07-09 14:50:35.000000000 -0400 |
19061 | @@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int | 19224 | @@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int |
19062 | return 0; | 19225 | return 0; |
19063 | } | 19226 | } |
@@ -19067,9 +19230,9 @@ diff -urNp linux-2.6.32.15/arch/x86/pci/mmconfig_32.c linux-2.6.32.15/arch/x86/p | |||
19067 | .read = pci_mmcfg_read, | 19230 | .read = pci_mmcfg_read, |
19068 | .write = pci_mmcfg_write, | 19231 | .write = pci_mmcfg_write, |
19069 | }; | 19232 | }; |
19070 | diff -urNp linux-2.6.32.15/arch/x86/pci/mmconfig_64.c linux-2.6.32.15/arch/x86/pci/mmconfig_64.c | 19233 | diff -urNp linux-2.6.32.16/arch/x86/pci/mmconfig_64.c linux-2.6.32.16/arch/x86/pci/mmconfig_64.c |
19071 | --- linux-2.6.32.15/arch/x86/pci/mmconfig_64.c 2010-03-15 11:52:04.000000000 -0400 | 19234 | --- linux-2.6.32.16/arch/x86/pci/mmconfig_64.c 2010-07-05 14:14:00.000000000 -0400 |
19072 | +++ linux-2.6.32.15/arch/x86/pci/mmconfig_64.c 2010-05-28 21:27:15.118897735 -0400 | 19235 | +++ linux-2.6.32.16/arch/x86/pci/mmconfig_64.c 2010-07-09 14:50:35.000000000 -0400 |
19073 | @@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int | 19236 | @@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int |
19074 | return 0; | 19237 | return 0; |
19075 | } | 19238 | } |
@@ -19079,9 +19242,9 @@ diff -urNp linux-2.6.32.15/arch/x86/pci/mmconfig_64.c linux-2.6.32.15/arch/x86/p | |||
19079 | .read = pci_mmcfg_read, | 19242 | .read = pci_mmcfg_read, |
19080 | .write = pci_mmcfg_write, | 19243 | .write = pci_mmcfg_write, |
19081 | }; | 19244 | }; |
19082 | diff -urNp linux-2.6.32.15/arch/x86/pci/numaq_32.c linux-2.6.32.15/arch/x86/pci/numaq_32.c | 19245 | diff -urNp linux-2.6.32.16/arch/x86/pci/numaq_32.c linux-2.6.32.16/arch/x86/pci/numaq_32.c |
19083 | --- linux-2.6.32.15/arch/x86/pci/numaq_32.c 2010-03-15 11:52:04.000000000 -0400 | 19246 | --- linux-2.6.32.16/arch/x86/pci/numaq_32.c 2010-07-05 14:14:00.000000000 -0400 |
19084 | +++ linux-2.6.32.15/arch/x86/pci/numaq_32.c 2010-05-28 21:27:15.118897735 -0400 | 19247 | +++ linux-2.6.32.16/arch/x86/pci/numaq_32.c 2010-07-09 14:50:35.000000000 -0400 |
19085 | @@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i | 19248 | @@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i |
19086 | 19249 | ||
19087 | #undef PCI_CONF1_MQ_ADDRESS | 19250 | #undef PCI_CONF1_MQ_ADDRESS |
@@ -19091,9 +19254,9 @@ diff -urNp linux-2.6.32.15/arch/x86/pci/numaq_32.c linux-2.6.32.15/arch/x86/pci/ | |||
19091 | .read = pci_conf1_mq_read, | 19254 | .read = pci_conf1_mq_read, |
19092 | .write = pci_conf1_mq_write | 19255 | .write = pci_conf1_mq_write |
19093 | }; | 19256 | }; |
19094 | diff -urNp linux-2.6.32.15/arch/x86/pci/olpc.c linux-2.6.32.15/arch/x86/pci/olpc.c | 19257 | diff -urNp linux-2.6.32.16/arch/x86/pci/olpc.c linux-2.6.32.16/arch/x86/pci/olpc.c |
19095 | --- linux-2.6.32.15/arch/x86/pci/olpc.c 2010-03-15 11:52:04.000000000 -0400 | 19258 | --- linux-2.6.32.16/arch/x86/pci/olpc.c 2010-07-05 14:14:00.000000000 -0400 |
19096 | +++ linux-2.6.32.15/arch/x86/pci/olpc.c 2010-05-28 21:27:15.118897735 -0400 | 19259 | +++ linux-2.6.32.16/arch/x86/pci/olpc.c 2010-07-09 14:50:35.000000000 -0400 |
19097 | @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s | 19260 | @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s |
19098 | return 0; | 19261 | return 0; |
19099 | } | 19262 | } |
@@ -19103,9 +19266,9 @@ diff -urNp linux-2.6.32.15/arch/x86/pci/olpc.c linux-2.6.32.15/arch/x86/pci/olpc | |||
19103 | .read = pci_olpc_read, | 19266 | .read = pci_olpc_read, |
19104 | .write = pci_olpc_write, | 19267 | .write = pci_olpc_write, |
19105 | }; | 19268 | }; |
19106 | diff -urNp linux-2.6.32.15/arch/x86/pci/pcbios.c linux-2.6.32.15/arch/x86/pci/pcbios.c | 19269 | diff -urNp linux-2.6.32.16/arch/x86/pci/pcbios.c linux-2.6.32.16/arch/x86/pci/pcbios.c |
19107 | --- linux-2.6.32.15/arch/x86/pci/pcbios.c 2010-03-15 11:52:04.000000000 -0400 | 19270 | --- linux-2.6.32.16/arch/x86/pci/pcbios.c 2010-07-05 14:14:00.000000000 -0400 |
19108 | +++ linux-2.6.32.15/arch/x86/pci/pcbios.c 2010-05-28 21:27:15.135148926 -0400 | 19271 | +++ linux-2.6.32.16/arch/x86/pci/pcbios.c 2010-07-09 14:50:35.000000000 -0400 |
19109 | @@ -56,50 +56,93 @@ union bios32 { | 19272 | @@ -56,50 +56,93 @@ union bios32 { |
19110 | static struct { | 19273 | static struct { |
19111 | unsigned long address; | 19274 | unsigned long address; |
@@ -19428,9 +19591,9 @@ diff -urNp linux-2.6.32.15/arch/x86/pci/pcbios.c linux-2.6.32.15/arch/x86/pci/pc | |||
19428 | return !(ret & 0xff00); | 19591 | return !(ret & 0xff00); |
19429 | } | 19592 | } |
19430 | EXPORT_SYMBOL(pcibios_set_irq_routing); | 19593 | EXPORT_SYMBOL(pcibios_set_irq_routing); |
19431 | diff -urNp linux-2.6.32.15/arch/x86/power/cpu.c linux-2.6.32.15/arch/x86/power/cpu.c | 19594 | diff -urNp linux-2.6.32.16/arch/x86/power/cpu.c linux-2.6.32.16/arch/x86/power/cpu.c |
19432 | --- linux-2.6.32.15/arch/x86/power/cpu.c 2010-03-15 11:52:04.000000000 -0400 | 19595 | --- linux-2.6.32.16/arch/x86/power/cpu.c 2010-07-05 14:14:00.000000000 -0400 |
19433 | +++ linux-2.6.32.15/arch/x86/power/cpu.c 2010-05-28 21:27:15.135148926 -0400 | 19596 | +++ linux-2.6.32.16/arch/x86/power/cpu.c 2010-07-09 14:50:35.000000000 -0400 |
19434 | @@ -126,7 +126,7 @@ static void do_fpu_end(void) | 19597 | @@ -126,7 +126,7 @@ static void do_fpu_end(void) |
19435 | static void fix_processor_context(void) | 19598 | static void fix_processor_context(void) |
19436 | { | 19599 | { |
@@ -19450,9 +19613,9 @@ diff -urNp linux-2.6.32.15/arch/x86/power/cpu.c linux-2.6.32.15/arch/x86/power/c | |||
19450 | 19613 | ||
19451 | syscall_init(); /* This sets MSR_*STAR and related */ | 19614 | syscall_init(); /* This sets MSR_*STAR and related */ |
19452 | #endif | 19615 | #endif |
19453 | diff -urNp linux-2.6.32.15/arch/x86/vdso/Makefile linux-2.6.32.15/arch/x86/vdso/Makefile | 19616 | diff -urNp linux-2.6.32.16/arch/x86/vdso/Makefile linux-2.6.32.16/arch/x86/vdso/Makefile |
19454 | --- linux-2.6.32.15/arch/x86/vdso/Makefile 2010-03-15 11:52:04.000000000 -0400 | 19617 | --- linux-2.6.32.16/arch/x86/vdso/Makefile 2010-07-05 14:14:00.000000000 -0400 |
19455 | +++ linux-2.6.32.15/arch/x86/vdso/Makefile 2010-05-28 21:27:15.135148926 -0400 | 19618 | +++ linux-2.6.32.16/arch/x86/vdso/Makefile 2010-07-09 14:50:35.000000000 -0400 |
19456 | @@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ | 19619 | @@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ |
19457 | $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ | 19620 | $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ |
19458 | -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) | 19621 | -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) |
@@ -19462,9 +19625,9 @@ diff -urNp linux-2.6.32.15/arch/x86/vdso/Makefile linux-2.6.32.15/arch/x86/vdso/ | |||
19462 | GCOV_PROFILE := n | 19625 | GCOV_PROFILE := n |
19463 | 19626 | ||
19464 | # | 19627 | # |
19465 | diff -urNp linux-2.6.32.15/arch/x86/vdso/vclock_gettime.c linux-2.6.32.15/arch/x86/vdso/vclock_gettime.c | 19628 | diff -urNp linux-2.6.32.16/arch/x86/vdso/vclock_gettime.c linux-2.6.32.16/arch/x86/vdso/vclock_gettime.c |
19466 | --- linux-2.6.32.15/arch/x86/vdso/vclock_gettime.c 2010-03-15 11:52:04.000000000 -0400 | 19629 | --- linux-2.6.32.16/arch/x86/vdso/vclock_gettime.c 2010-07-05 14:14:00.000000000 -0400 |
19467 | +++ linux-2.6.32.15/arch/x86/vdso/vclock_gettime.c 2010-05-28 21:27:15.151704467 -0400 | 19630 | +++ linux-2.6.32.16/arch/x86/vdso/vclock_gettime.c 2010-07-09 14:50:35.000000000 -0400 |
19468 | @@ -22,24 +22,48 @@ | 19631 | @@ -22,24 +22,48 @@ |
19469 | #include <asm/hpet.h> | 19632 | #include <asm/hpet.h> |
19470 | #include <asm/unistd.h> | 19633 | #include <asm/unistd.h> |
@@ -19563,9 +19726,9 @@ diff -urNp linux-2.6.32.15/arch/x86/vdso/vclock_gettime.c linux-2.6.32.15/arch/x | |||
19563 | } | 19726 | } |
19564 | int gettimeofday(struct timeval *, struct timezone *) | 19727 | int gettimeofday(struct timeval *, struct timezone *) |
19565 | __attribute__((weak, alias("__vdso_gettimeofday"))); | 19728 | __attribute__((weak, alias("__vdso_gettimeofday"))); |
19566 | diff -urNp linux-2.6.32.15/arch/x86/vdso/vdso32-setup.c linux-2.6.32.15/arch/x86/vdso/vdso32-setup.c | 19729 | diff -urNp linux-2.6.32.16/arch/x86/vdso/vdso32-setup.c linux-2.6.32.16/arch/x86/vdso/vdso32-setup.c |
19567 | --- linux-2.6.32.15/arch/x86/vdso/vdso32-setup.c 2010-03-15 11:52:04.000000000 -0400 | 19730 | --- linux-2.6.32.16/arch/x86/vdso/vdso32-setup.c 2010-07-05 14:14:00.000000000 -0400 |
19568 | +++ linux-2.6.32.15/arch/x86/vdso/vdso32-setup.c 2010-05-28 21:27:15.151704467 -0400 | 19731 | +++ linux-2.6.32.16/arch/x86/vdso/vdso32-setup.c 2010-07-09 14:50:35.000000000 -0400 |
19569 | @@ -25,6 +25,7 @@ | 19732 | @@ -25,6 +25,7 @@ |
19570 | #include <asm/tlbflush.h> | 19733 | #include <asm/tlbflush.h> |
19571 | #include <asm/vdso.h> | 19734 | #include <asm/vdso.h> |
@@ -19666,9 +19829,9 @@ diff -urNp linux-2.6.32.15/arch/x86/vdso/vdso32-setup.c linux-2.6.32.15/arch/x86 | |||
19666 | return &gate_vma; | 19829 | return &gate_vma; |
19667 | return NULL; | 19830 | return NULL; |
19668 | } | 19831 | } |
19669 | diff -urNp linux-2.6.32.15/arch/x86/vdso/vdso.lds.S linux-2.6.32.15/arch/x86/vdso/vdso.lds.S | 19832 | diff -urNp linux-2.6.32.16/arch/x86/vdso/vdso.lds.S linux-2.6.32.16/arch/x86/vdso/vdso.lds.S |
19670 | --- linux-2.6.32.15/arch/x86/vdso/vdso.lds.S 2010-03-15 11:52:04.000000000 -0400 | 19833 | --- linux-2.6.32.16/arch/x86/vdso/vdso.lds.S 2010-07-05 14:14:00.000000000 -0400 |
19671 | +++ linux-2.6.32.15/arch/x86/vdso/vdso.lds.S 2010-05-28 21:27:15.151704467 -0400 | 19834 | +++ linux-2.6.32.16/arch/x86/vdso/vdso.lds.S 2010-07-09 14:50:35.000000000 -0400 |
19672 | @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; | 19835 | @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; |
19673 | #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; | 19836 | #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; |
19674 | #include "vextern.h" | 19837 | #include "vextern.h" |
@@ -19679,9 +19842,9 @@ diff -urNp linux-2.6.32.15/arch/x86/vdso/vdso.lds.S linux-2.6.32.15/arch/x86/vds | |||
19679 | +VEXTERN(fallback_time) | 19842 | +VEXTERN(fallback_time) |
19680 | +VEXTERN(getcpu) | 19843 | +VEXTERN(getcpu) |
19681 | +#undef VEXTERN | 19844 | +#undef VEXTERN |
19682 | diff -urNp linux-2.6.32.15/arch/x86/vdso/vextern.h linux-2.6.32.15/arch/x86/vdso/vextern.h | 19845 | diff -urNp linux-2.6.32.16/arch/x86/vdso/vextern.h linux-2.6.32.16/arch/x86/vdso/vextern.h |
19683 | --- linux-2.6.32.15/arch/x86/vdso/vextern.h 2010-03-15 11:52:04.000000000 -0400 | 19846 | --- linux-2.6.32.16/arch/x86/vdso/vextern.h 2010-07-05 14:14:00.000000000 -0400 |
19684 | +++ linux-2.6.32.15/arch/x86/vdso/vextern.h 2010-05-28 21:27:15.151704467 -0400 | 19847 | +++ linux-2.6.32.16/arch/x86/vdso/vextern.h 2010-07-09 14:50:35.000000000 -0400 |
19685 | @@ -11,6 +11,5 @@ | 19848 | @@ -11,6 +11,5 @@ |
19686 | put into vextern.h and be referenced as a pointer with vdso prefix. | 19849 | put into vextern.h and be referenced as a pointer with vdso prefix. |
19687 | The main kernel later fills in the values. */ | 19850 | The main kernel later fills in the values. */ |
@@ -19689,9 +19852,9 @@ diff -urNp linux-2.6.32.15/arch/x86/vdso/vextern.h linux-2.6.32.15/arch/x86/vdso | |||
19689 | -VEXTERN(jiffies) | 19852 | -VEXTERN(jiffies) |
19690 | VEXTERN(vgetcpu_mode) | 19853 | VEXTERN(vgetcpu_mode) |
19691 | VEXTERN(vsyscall_gtod_data) | 19854 | VEXTERN(vsyscall_gtod_data) |
19692 | diff -urNp linux-2.6.32.15/arch/x86/vdso/vma.c linux-2.6.32.15/arch/x86/vdso/vma.c | 19855 | diff -urNp linux-2.6.32.16/arch/x86/vdso/vma.c linux-2.6.32.16/arch/x86/vdso/vma.c |
19693 | --- linux-2.6.32.15/arch/x86/vdso/vma.c 2010-03-15 11:52:04.000000000 -0400 | 19856 | --- linux-2.6.32.16/arch/x86/vdso/vma.c 2010-07-05 14:14:00.000000000 -0400 |
19694 | +++ linux-2.6.32.15/arch/x86/vdso/vma.c 2010-05-28 21:27:15.151704467 -0400 | 19857 | +++ linux-2.6.32.16/arch/x86/vdso/vma.c 2010-07-09 14:50:35.000000000 -0400 |
19695 | @@ -57,7 +57,7 @@ static int __init init_vdso_vars(void) | 19858 | @@ -57,7 +57,7 @@ static int __init init_vdso_vars(void) |
19696 | if (!vbase) | 19859 | if (!vbase) |
19697 | goto oom; | 19860 | goto oom; |
@@ -19738,9 +19901,9 @@ diff -urNp linux-2.6.32.15/arch/x86/vdso/vma.c linux-2.6.32.15/arch/x86/vdso/vma | |||
19738 | - return 0; | 19901 | - return 0; |
19739 | -} | 19902 | -} |
19740 | -__setup("vdso=", vdso_setup); | 19903 | -__setup("vdso=", vdso_setup); |
19741 | diff -urNp linux-2.6.32.15/arch/x86/xen/enlighten.c linux-2.6.32.15/arch/x86/xen/enlighten.c | 19904 | diff -urNp linux-2.6.32.16/arch/x86/xen/enlighten.c linux-2.6.32.16/arch/x86/xen/enlighten.c |
19742 | --- linux-2.6.32.15/arch/x86/xen/enlighten.c 2010-03-15 11:52:04.000000000 -0400 | 19905 | --- linux-2.6.32.16/arch/x86/xen/enlighten.c 2010-07-05 14:14:00.000000000 -0400 |
19743 | +++ linux-2.6.32.15/arch/x86/xen/enlighten.c 2010-05-29 16:33:34.251291763 -0400 | 19906 | +++ linux-2.6.32.16/arch/x86/xen/enlighten.c 2010-07-09 14:50:35.000000000 -0400 |
19744 | @@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); | 19907 | @@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); |
19745 | 19908 | ||
19746 | struct shared_info xen_dummy_shared_info; | 19909 | struct shared_info xen_dummy_shared_info; |
@@ -19796,9 +19959,9 @@ diff -urNp linux-2.6.32.15/arch/x86/xen/enlighten.c linux-2.6.32.15/arch/x86/xen | |||
19796 | xen_smp_init(); | 19959 | xen_smp_init(); |
19797 | 19960 | ||
19798 | pgd = (pgd_t *)xen_start_info->pt_base; | 19961 | pgd = (pgd_t *)xen_start_info->pt_base; |
19799 | diff -urNp linux-2.6.32.15/arch/x86/xen/mmu.c linux-2.6.32.15/arch/x86/xen/mmu.c | 19962 | diff -urNp linux-2.6.32.16/arch/x86/xen/mmu.c linux-2.6.32.16/arch/x86/xen/mmu.c |
19800 | --- linux-2.6.32.15/arch/x86/xen/mmu.c 2010-03-15 11:52:04.000000000 -0400 | 19963 | --- linux-2.6.32.16/arch/x86/xen/mmu.c 2010-07-05 14:14:00.000000000 -0400 |
19801 | +++ linux-2.6.32.15/arch/x86/xen/mmu.c 2010-05-28 21:27:15.151704467 -0400 | 19964 | +++ linux-2.6.32.16/arch/x86/xen/mmu.c 2010-07-09 14:50:35.000000000 -0400 |
19802 | @@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable | 19965 | @@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable |
19803 | convert_pfn_mfn(init_level4_pgt); | 19966 | convert_pfn_mfn(init_level4_pgt); |
19804 | convert_pfn_mfn(level3_ident_pgt); | 19967 | convert_pfn_mfn(level3_ident_pgt); |
@@ -19819,9 +19982,9 @@ diff -urNp linux-2.6.32.15/arch/x86/xen/mmu.c linux-2.6.32.15/arch/x86/xen/mmu.c | |||
19819 | set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); | 19982 | set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); |
19820 | set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); | 19983 | set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); |
19821 | 19984 | ||
19822 | diff -urNp linux-2.6.32.15/arch/x86/xen/smp.c linux-2.6.32.15/arch/x86/xen/smp.c | 19985 | diff -urNp linux-2.6.32.16/arch/x86/xen/smp.c linux-2.6.32.16/arch/x86/xen/smp.c |
19823 | --- linux-2.6.32.15/arch/x86/xen/smp.c 2010-03-15 11:52:04.000000000 -0400 | 19986 | --- linux-2.6.32.16/arch/x86/xen/smp.c 2010-07-05 14:14:00.000000000 -0400 |
19824 | +++ linux-2.6.32.15/arch/x86/xen/smp.c 2010-05-28 21:27:15.155009648 -0400 | 19987 | +++ linux-2.6.32.16/arch/x86/xen/smp.c 2010-07-09 14:50:35.000000000 -0400 |
19825 | @@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ | 19988 | @@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ |
19826 | { | 19989 | { |
19827 | BUG_ON(smp_processor_id() != 0); | 19990 | BUG_ON(smp_processor_id() != 0); |
@@ -19845,9 +20008,9 @@ diff -urNp linux-2.6.32.15/arch/x86/xen/smp.c linux-2.6.32.15/arch/x86/xen/smp.c | |||
19845 | ctxt->user_regs.ss = __KERNEL_DS; | 20008 | ctxt->user_regs.ss = __KERNEL_DS; |
19846 | #ifdef CONFIG_X86_32 | 20009 | #ifdef CONFIG_X86_32 |
19847 | ctxt->user_regs.fs = __KERNEL_PERCPU; | 20010 | ctxt->user_regs.fs = __KERNEL_PERCPU; |
19848 | diff -urNp linux-2.6.32.15/arch/x86/xen/xen-head.S linux-2.6.32.15/arch/x86/xen/xen-head.S | 20011 | diff -urNp linux-2.6.32.16/arch/x86/xen/xen-head.S linux-2.6.32.16/arch/x86/xen/xen-head.S |
19849 | --- linux-2.6.32.15/arch/x86/xen/xen-head.S 2010-03-15 11:52:04.000000000 -0400 | 20012 | --- linux-2.6.32.16/arch/x86/xen/xen-head.S 2010-07-05 14:14:00.000000000 -0400 |
19850 | +++ linux-2.6.32.15/arch/x86/xen/xen-head.S 2010-05-28 21:27:15.155009648 -0400 | 20013 | +++ linux-2.6.32.16/arch/x86/xen/xen-head.S 2010-07-09 14:50:35.000000000 -0400 |
19851 | @@ -19,6 +19,17 @@ ENTRY(startup_xen) | 20014 | @@ -19,6 +19,17 @@ ENTRY(startup_xen) |
19852 | #ifdef CONFIG_X86_32 | 20015 | #ifdef CONFIG_X86_32 |
19853 | mov %esi,xen_start_info | 20016 | mov %esi,xen_start_info |
@@ -19866,9 +20029,9 @@ diff -urNp linux-2.6.32.15/arch/x86/xen/xen-head.S linux-2.6.32.15/arch/x86/xen/ | |||
19866 | #else | 20029 | #else |
19867 | mov %rsi,xen_start_info | 20030 | mov %rsi,xen_start_info |
19868 | mov $init_thread_union+THREAD_SIZE,%rsp | 20031 | mov $init_thread_union+THREAD_SIZE,%rsp |
19869 | diff -urNp linux-2.6.32.15/arch/x86/xen/xen-ops.h linux-2.6.32.15/arch/x86/xen/xen-ops.h | 20032 | diff -urNp linux-2.6.32.16/arch/x86/xen/xen-ops.h linux-2.6.32.16/arch/x86/xen/xen-ops.h |
19870 | --- linux-2.6.32.15/arch/x86/xen/xen-ops.h 2010-03-15 11:52:04.000000000 -0400 | 20033 | --- linux-2.6.32.16/arch/x86/xen/xen-ops.h 2010-07-05 14:14:00.000000000 -0400 |
19871 | +++ linux-2.6.32.15/arch/x86/xen/xen-ops.h 2010-05-28 21:27:15.155009648 -0400 | 20034 | +++ linux-2.6.32.16/arch/x86/xen/xen-ops.h 2010-07-09 14:50:35.000000000 -0400 |
19872 | @@ -10,8 +10,6 @@ | 20035 | @@ -10,8 +10,6 @@ |
19873 | extern const char xen_hypervisor_callback[]; | 20036 | extern const char xen_hypervisor_callback[]; |
19874 | extern const char xen_failsafe_callback[]; | 20037 | extern const char xen_failsafe_callback[]; |
@@ -19878,9 +20041,9 @@ diff -urNp linux-2.6.32.15/arch/x86/xen/xen-ops.h linux-2.6.32.15/arch/x86/xen/x | |||
19878 | struct trap_info; | 20041 | struct trap_info; |
19879 | void xen_copy_trap_info(struct trap_info *traps); | 20042 | void xen_copy_trap_info(struct trap_info *traps); |
19880 | 20043 | ||
19881 | diff -urNp linux-2.6.32.15/block/blk-integrity.c linux-2.6.32.15/block/blk-integrity.c | 20044 | diff -urNp linux-2.6.32.16/block/blk-integrity.c linux-2.6.32.16/block/blk-integrity.c |
19882 | --- linux-2.6.32.15/block/blk-integrity.c 2010-03-15 11:52:04.000000000 -0400 | 20045 | --- linux-2.6.32.16/block/blk-integrity.c 2010-07-05 14:14:00.000000000 -0400 |
19883 | +++ linux-2.6.32.15/block/blk-integrity.c 2010-05-28 21:27:15.167161810 -0400 | 20046 | +++ linux-2.6.32.16/block/blk-integrity.c 2010-07-09 14:50:35.000000000 -0400 |
19884 | @@ -278,7 +278,7 @@ static struct attribute *integrity_attrs | 20047 | @@ -278,7 +278,7 @@ static struct attribute *integrity_attrs |
19885 | NULL, | 20048 | NULL, |
19886 | }; | 20049 | }; |
@@ -19890,9 +20053,9 @@ diff -urNp linux-2.6.32.15/block/blk-integrity.c linux-2.6.32.15/block/blk-integ | |||
19890 | .show = &integrity_attr_show, | 20053 | .show = &integrity_attr_show, |
19891 | .store = &integrity_attr_store, | 20054 | .store = &integrity_attr_store, |
19892 | }; | 20055 | }; |
19893 | diff -urNp linux-2.6.32.15/block/blk-iopoll.c linux-2.6.32.15/block/blk-iopoll.c | 20056 | diff -urNp linux-2.6.32.16/block/blk-iopoll.c linux-2.6.32.16/block/blk-iopoll.c |
19894 | --- linux-2.6.32.15/block/blk-iopoll.c 2010-03-15 11:52:04.000000000 -0400 | 20057 | --- linux-2.6.32.16/block/blk-iopoll.c 2010-07-05 14:14:00.000000000 -0400 |
19895 | +++ linux-2.6.32.15/block/blk-iopoll.c 2010-05-28 21:27:15.167161810 -0400 | 20058 | +++ linux-2.6.32.16/block/blk-iopoll.c 2010-07-09 14:50:35.000000000 -0400 |
19896 | @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo | 20059 | @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo |
19897 | } | 20060 | } |
19898 | EXPORT_SYMBOL(blk_iopoll_complete); | 20061 | EXPORT_SYMBOL(blk_iopoll_complete); |
@@ -19902,9 +20065,9 @@ diff -urNp linux-2.6.32.15/block/blk-iopoll.c linux-2.6.32.15/block/blk-iopoll.c | |||
19902 | { | 20065 | { |
19903 | struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); | 20066 | struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); |
19904 | int rearm = 0, budget = blk_iopoll_budget; | 20067 | int rearm = 0, budget = blk_iopoll_budget; |
19905 | diff -urNp linux-2.6.32.15/block/blk-map.c linux-2.6.32.15/block/blk-map.c | 20068 | diff -urNp linux-2.6.32.16/block/blk-map.c linux-2.6.32.16/block/blk-map.c |
19906 | --- linux-2.6.32.15/block/blk-map.c 2010-03-15 11:52:04.000000000 -0400 | 20069 | --- linux-2.6.32.16/block/blk-map.c 2010-07-05 14:14:00.000000000 -0400 |
19907 | +++ linux-2.6.32.15/block/blk-map.c 2010-05-28 21:27:15.167161810 -0400 | 20070 | +++ linux-2.6.32.16/block/blk-map.c 2010-07-09 14:50:35.000000000 -0400 |
19908 | @@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ | 20071 | @@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ |
19909 | * direct dma. else, set up kernel bounce buffers | 20072 | * direct dma. else, set up kernel bounce buffers |
19910 | */ | 20073 | */ |
@@ -19923,9 +20086,9 @@ diff -urNp linux-2.6.32.15/block/blk-map.c linux-2.6.32.15/block/blk-map.c | |||
19923 | if (do_copy) | 20086 | if (do_copy) |
19924 | bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); | 20087 | bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); |
19925 | else | 20088 | else |
19926 | diff -urNp linux-2.6.32.15/block/blk-softirq.c linux-2.6.32.15/block/blk-softirq.c | 20089 | diff -urNp linux-2.6.32.16/block/blk-softirq.c linux-2.6.32.16/block/blk-softirq.c |
19927 | --- linux-2.6.32.15/block/blk-softirq.c 2010-03-15 11:52:04.000000000 -0400 | 20090 | --- linux-2.6.32.16/block/blk-softirq.c 2010-07-05 14:14:00.000000000 -0400 |
19928 | +++ linux-2.6.32.15/block/blk-softirq.c 2010-05-28 21:27:15.179152446 -0400 | 20091 | +++ linux-2.6.32.16/block/blk-softirq.c 2010-07-09 14:50:35.000000000 -0400 |
19929 | @@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, | 20092 | @@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, |
19930 | * Softirq action handler - move entries to local list and loop over them | 20093 | * Softirq action handler - move entries to local list and loop over them |
19931 | * while passing them to the queue registered handler. | 20094 | * while passing them to the queue registered handler. |
@@ -19935,9 +20098,9 @@ diff -urNp linux-2.6.32.15/block/blk-softirq.c linux-2.6.32.15/block/blk-softirq | |||
19935 | { | 20098 | { |
19936 | struct list_head *cpu_list, local_list; | 20099 | struct list_head *cpu_list, local_list; |
19937 | 20100 | ||
19938 | diff -urNp linux-2.6.32.15/block/blk-sysfs.c linux-2.6.32.15/block/blk-sysfs.c | 20101 | diff -urNp linux-2.6.32.16/block/blk-sysfs.c linux-2.6.32.16/block/blk-sysfs.c |
19939 | --- linux-2.6.32.15/block/blk-sysfs.c 2010-03-15 11:52:04.000000000 -0400 | 20102 | --- linux-2.6.32.16/block/blk-sysfs.c 2010-07-05 14:14:00.000000000 -0400 |
19940 | +++ linux-2.6.32.15/block/blk-sysfs.c 2010-05-28 21:27:15.179152446 -0400 | 20103 | +++ linux-2.6.32.16/block/blk-sysfs.c 2010-07-09 14:50:35.000000000 -0400 |
19941 | @@ -414,7 +414,7 @@ static void blk_release_queue(struct kob | 20104 | @@ -414,7 +414,7 @@ static void blk_release_queue(struct kob |
19942 | kmem_cache_free(blk_requestq_cachep, q); | 20105 | kmem_cache_free(blk_requestq_cachep, q); |
19943 | } | 20106 | } |
@@ -19947,9 +20110,9 @@ diff -urNp linux-2.6.32.15/block/blk-sysfs.c linux-2.6.32.15/block/blk-sysfs.c | |||
19947 | .show = queue_attr_show, | 20110 | .show = queue_attr_show, |
19948 | .store = queue_attr_store, | 20111 | .store = queue_attr_store, |
19949 | }; | 20112 | }; |
19950 | diff -urNp linux-2.6.32.15/block/elevator.c linux-2.6.32.15/block/elevator.c | 20113 | diff -urNp linux-2.6.32.16/block/elevator.c linux-2.6.32.16/block/elevator.c |
19951 | --- linux-2.6.32.15/block/elevator.c 2010-03-15 11:52:04.000000000 -0400 | 20114 | --- linux-2.6.32.16/block/elevator.c 2010-07-05 14:14:00.000000000 -0400 |
19952 | +++ linux-2.6.32.15/block/elevator.c 2010-05-28 21:27:15.179152446 -0400 | 20115 | +++ linux-2.6.32.16/block/elevator.c 2010-07-09 14:50:35.000000000 -0400 |
19953 | @@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str | 20116 | @@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str |
19954 | return error; | 20117 | return error; |
19955 | } | 20118 | } |
@@ -19959,9 +20122,9 @@ diff -urNp linux-2.6.32.15/block/elevator.c linux-2.6.32.15/block/elevator.c | |||
19959 | .show = elv_attr_show, | 20122 | .show = elv_attr_show, |
19960 | .store = elv_attr_store, | 20123 | .store = elv_attr_store, |
19961 | }; | 20124 | }; |
19962 | diff -urNp linux-2.6.32.15/crypto/lrw.c linux-2.6.32.15/crypto/lrw.c | 20125 | diff -urNp linux-2.6.32.16/crypto/lrw.c linux-2.6.32.16/crypto/lrw.c |
19963 | --- linux-2.6.32.15/crypto/lrw.c 2010-03-15 11:52:04.000000000 -0400 | 20126 | --- linux-2.6.32.16/crypto/lrw.c 2010-07-05 14:14:00.000000000 -0400 |
19964 | +++ linux-2.6.32.15/crypto/lrw.c 2010-05-28 21:27:15.179152446 -0400 | 20127 | +++ linux-2.6.32.16/crypto/lrw.c 2010-07-09 14:50:35.000000000 -0400 |
19965 | @@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par | 20128 | @@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par |
19966 | struct priv *ctx = crypto_tfm_ctx(parent); | 20129 | struct priv *ctx = crypto_tfm_ctx(parent); |
19967 | struct crypto_cipher *child = ctx->child; | 20130 | struct crypto_cipher *child = ctx->child; |
@@ -19971,9 +20134,9 @@ diff -urNp linux-2.6.32.15/crypto/lrw.c linux-2.6.32.15/crypto/lrw.c | |||
19971 | int bsize = crypto_cipher_blocksize(child); | 20134 | int bsize = crypto_cipher_blocksize(child); |
19972 | 20135 | ||
19973 | crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); | 20136 | crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); |
19974 | diff -urNp linux-2.6.32.15/Documentation/dontdiff linux-2.6.32.15/Documentation/dontdiff | 20137 | diff -urNp linux-2.6.32.16/Documentation/dontdiff linux-2.6.32.16/Documentation/dontdiff |
19975 | --- linux-2.6.32.15/Documentation/dontdiff 2010-03-15 11:52:04.000000000 -0400 | 20138 | --- linux-2.6.32.16/Documentation/dontdiff 2010-07-05 14:14:00.000000000 -0400 |
19976 | +++ linux-2.6.32.15/Documentation/dontdiff 2010-05-28 21:27:15.179152446 -0400 | 20139 | +++ linux-2.6.32.16/Documentation/dontdiff 2010-07-09 14:50:35.000000000 -0400 |
19977 | @@ -3,6 +3,7 @@ | 20140 | @@ -3,6 +3,7 @@ |
19978 | *.bin | 20141 | *.bin |
19979 | *.cpio | 20142 | *.cpio |
@@ -20081,9 +20244,9 @@ diff -urNp linux-2.6.32.15/Documentation/dontdiff linux-2.6.32.15/Documentation/ | |||
20081 | zImage* | 20244 | zImage* |
20082 | zconf.hash.c | 20245 | zconf.hash.c |
20083 | +zoffset.h | 20246 | +zoffset.h |
20084 | diff -urNp linux-2.6.32.15/Documentation/kernel-parameters.txt linux-2.6.32.15/Documentation/kernel-parameters.txt | 20247 | diff -urNp linux-2.6.32.16/Documentation/kernel-parameters.txt linux-2.6.32.16/Documentation/kernel-parameters.txt |
20085 | --- linux-2.6.32.15/Documentation/kernel-parameters.txt 2010-05-15 13:20:18.374565913 -0400 | 20248 | --- linux-2.6.32.16/Documentation/kernel-parameters.txt 2010-07-05 14:14:00.000000000 -0400 |
20086 | +++ linux-2.6.32.15/Documentation/kernel-parameters.txt 2010-05-28 21:27:15.179152446 -0400 | 20249 | +++ linux-2.6.32.16/Documentation/kernel-parameters.txt 2010-07-09 14:50:35.000000000 -0400 |
20087 | @@ -1836,6 +1836,12 @@ and is between 256 and 4096 characters. | 20250 | @@ -1836,6 +1836,12 @@ and is between 256 and 4096 characters. |
20088 | the specified number of seconds. This is to be used if | 20251 | the specified number of seconds. This is to be used if |
20089 | your oopses keep scrolling off the screen. | 20252 | your oopses keep scrolling off the screen. |
@@ -20097,9 +20260,9 @@ diff -urNp linux-2.6.32.15/Documentation/kernel-parameters.txt linux-2.6.32.15/D | |||
20097 | pcbit= [HW,ISDN] | 20260 | pcbit= [HW,ISDN] |
20098 | 20261 | ||
20099 | pcd. [PARIDE] | 20262 | pcd. [PARIDE] |
20100 | diff -urNp linux-2.6.32.15/drivers/acpi/acpi_pad.c linux-2.6.32.15/drivers/acpi/acpi_pad.c | 20263 | diff -urNp linux-2.6.32.16/drivers/acpi/acpi_pad.c linux-2.6.32.16/drivers/acpi/acpi_pad.c |
20101 | --- linux-2.6.32.15/drivers/acpi/acpi_pad.c 2010-03-15 11:52:04.000000000 -0400 | 20264 | --- linux-2.6.32.16/drivers/acpi/acpi_pad.c 2010-07-05 14:14:00.000000000 -0400 |
20102 | +++ linux-2.6.32.15/drivers/acpi/acpi_pad.c 2010-06-19 10:03:45.704801524 -0400 | 20265 | +++ linux-2.6.32.16/drivers/acpi/acpi_pad.c 2010-07-09 14:50:35.000000000 -0400 |
20103 | @@ -30,7 +30,7 @@ | 20266 | @@ -30,7 +30,7 @@ |
20104 | #include <acpi/acpi_bus.h> | 20267 | #include <acpi/acpi_bus.h> |
20105 | #include <acpi/acpi_drivers.h> | 20268 | #include <acpi/acpi_drivers.h> |
@@ -20109,9 +20272,9 @@ diff -urNp linux-2.6.32.15/drivers/acpi/acpi_pad.c linux-2.6.32.15/drivers/acpi/ | |||
20109 | #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" | 20272 | #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" |
20110 | #define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 | 20273 | #define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 |
20111 | static DEFINE_MUTEX(isolated_cpus_lock); | 20274 | static DEFINE_MUTEX(isolated_cpus_lock); |
20112 | diff -urNp linux-2.6.32.15/drivers/acpi/battery.c linux-2.6.32.15/drivers/acpi/battery.c | 20275 | diff -urNp linux-2.6.32.16/drivers/acpi/battery.c linux-2.6.32.16/drivers/acpi/battery.c |
20113 | --- linux-2.6.32.15/drivers/acpi/battery.c 2010-03-15 11:52:04.000000000 -0400 | 20276 | --- linux-2.6.32.16/drivers/acpi/battery.c 2010-07-05 14:14:00.000000000 -0400 |
20114 | +++ linux-2.6.32.15/drivers/acpi/battery.c 2010-05-28 21:27:15.179152446 -0400 | 20277 | +++ linux-2.6.32.16/drivers/acpi/battery.c 2010-07-09 14:50:35.000000000 -0400 |
20115 | @@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm); | 20278 | @@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm); |
20116 | } | 20279 | } |
20117 | 20280 | ||
@@ -20121,9 +20284,9 @@ diff -urNp linux-2.6.32.15/drivers/acpi/battery.c linux-2.6.32.15/drivers/acpi/b | |||
20121 | mode_t mode; | 20284 | mode_t mode; |
20122 | const char *name; | 20285 | const char *name; |
20123 | } acpi_battery_file[] = { | 20286 | } acpi_battery_file[] = { |
20124 | diff -urNp linux-2.6.32.15/drivers/acpi/blacklist.c linux-2.6.32.15/drivers/acpi/blacklist.c | 20287 | diff -urNp linux-2.6.32.16/drivers/acpi/blacklist.c linux-2.6.32.16/drivers/acpi/blacklist.c |
20125 | --- linux-2.6.32.15/drivers/acpi/blacklist.c 2010-03-15 11:52:04.000000000 -0400 | 20288 | --- linux-2.6.32.16/drivers/acpi/blacklist.c 2010-07-05 14:14:00.000000000 -0400 |
20126 | +++ linux-2.6.32.15/drivers/acpi/blacklist.c 2010-05-28 21:27:15.179152446 -0400 | 20289 | +++ linux-2.6.32.16/drivers/acpi/blacklist.c 2010-07-09 14:50:35.000000000 -0400 |
20127 | @@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b | 20290 | @@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b |
20128 | {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, | 20291 | {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, |
20129 | "Incorrect _ADR", 1}, | 20292 | "Incorrect _ADR", 1}, |
@@ -20133,9 +20296,9 @@ diff -urNp linux-2.6.32.15/drivers/acpi/blacklist.c linux-2.6.32.15/drivers/acpi | |||
20133 | }; | 20296 | }; |
20134 | 20297 | ||
20135 | #if CONFIG_ACPI_BLACKLIST_YEAR | 20298 | #if CONFIG_ACPI_BLACKLIST_YEAR |
20136 | diff -urNp linux-2.6.32.15/drivers/acpi/dock.c linux-2.6.32.15/drivers/acpi/dock.c | 20299 | diff -urNp linux-2.6.32.16/drivers/acpi/dock.c linux-2.6.32.16/drivers/acpi/dock.c |
20137 | --- linux-2.6.32.15/drivers/acpi/dock.c 2010-03-15 11:52:04.000000000 -0400 | 20300 | --- linux-2.6.32.16/drivers/acpi/dock.c 2010-07-05 14:14:00.000000000 -0400 |
20138 | +++ linux-2.6.32.15/drivers/acpi/dock.c 2010-05-28 21:27:15.179152446 -0400 | 20301 | +++ linux-2.6.32.16/drivers/acpi/dock.c 2010-07-09 14:50:35.000000000 -0400 |
20139 | @@ -77,7 +77,7 @@ struct dock_dependent_device { | 20302 | @@ -77,7 +77,7 @@ struct dock_dependent_device { |
20140 | struct list_head list; | 20303 | struct list_head list; |
20141 | struct list_head hotplug_list; | 20304 | struct list_head hotplug_list; |
@@ -20154,9 +20317,9 @@ diff -urNp linux-2.6.32.15/drivers/acpi/dock.c linux-2.6.32.15/drivers/acpi/dock | |||
20154 | void *context) | 20317 | void *context) |
20155 | { | 20318 | { |
20156 | struct dock_dependent_device *dd; | 20319 | struct dock_dependent_device *dd; |
20157 | diff -urNp linux-2.6.32.15/drivers/acpi/osl.c linux-2.6.32.15/drivers/acpi/osl.c | 20320 | diff -urNp linux-2.6.32.16/drivers/acpi/osl.c linux-2.6.32.16/drivers/acpi/osl.c |
20158 | --- linux-2.6.32.15/drivers/acpi/osl.c 2010-03-15 11:52:04.000000000 -0400 | 20321 | --- linux-2.6.32.16/drivers/acpi/osl.c 2010-07-05 14:14:00.000000000 -0400 |
20159 | +++ linux-2.6.32.15/drivers/acpi/osl.c 2010-05-28 21:27:15.183173771 -0400 | 20322 | +++ linux-2.6.32.16/drivers/acpi/osl.c 2010-07-09 14:50:35.000000000 -0400 |
20160 | @@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres | 20323 | @@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres |
20161 | void __iomem *virt_addr; | 20324 | void __iomem *virt_addr; |
20162 | 20325 | ||
@@ -20175,9 +20338,9 @@ diff -urNp linux-2.6.32.15/drivers/acpi/osl.c linux-2.6.32.15/drivers/acpi/osl.c | |||
20175 | 20338 | ||
20176 | switch (width) { | 20339 | switch (width) { |
20177 | case 8: | 20340 | case 8: |
20178 | diff -urNp linux-2.6.32.15/drivers/acpi/power_meter.c linux-2.6.32.15/drivers/acpi/power_meter.c | 20341 | diff -urNp linux-2.6.32.16/drivers/acpi/power_meter.c linux-2.6.32.16/drivers/acpi/power_meter.c |
20179 | --- linux-2.6.32.15/drivers/acpi/power_meter.c 2010-05-15 13:20:18.454567530 -0400 | 20342 | --- linux-2.6.32.16/drivers/acpi/power_meter.c 2010-07-05 14:14:00.000000000 -0400 |
20180 | +++ linux-2.6.32.15/drivers/acpi/power_meter.c 2010-05-28 21:27:15.191153765 -0400 | 20343 | +++ linux-2.6.32.16/drivers/acpi/power_meter.c 2010-07-09 14:50:35.000000000 -0400 |
20181 | @@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d | 20344 | @@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d |
20182 | return res; | 20345 | return res; |
20183 | 20346 | ||
@@ -20187,9 +20350,9 @@ diff -urNp linux-2.6.32.15/drivers/acpi/power_meter.c linux-2.6.32.15/drivers/ac | |||
20187 | 20350 | ||
20188 | mutex_lock(&resource->lock); | 20351 | mutex_lock(&resource->lock); |
20189 | resource->trip[attr->index - 7] = temp; | 20352 | resource->trip[attr->index - 7] = temp; |
20190 | diff -urNp linux-2.6.32.15/drivers/acpi/proc.c linux-2.6.32.15/drivers/acpi/proc.c | 20353 | diff -urNp linux-2.6.32.16/drivers/acpi/proc.c linux-2.6.32.16/drivers/acpi/proc.c |
20191 | --- linux-2.6.32.15/drivers/acpi/proc.c 2010-03-15 11:52:04.000000000 -0400 | 20354 | --- linux-2.6.32.16/drivers/acpi/proc.c 2010-07-05 14:14:00.000000000 -0400 |
20192 | +++ linux-2.6.32.15/drivers/acpi/proc.c 2010-05-28 21:27:15.191153765 -0400 | 20355 | +++ linux-2.6.32.16/drivers/acpi/proc.c 2010-07-09 14:50:35.000000000 -0400 |
20193 | @@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f | 20356 | @@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f |
20194 | size_t count, loff_t * ppos) | 20357 | size_t count, loff_t * ppos) |
20195 | { | 20358 | { |
@@ -20225,9 +20388,9 @@ diff -urNp linux-2.6.32.15/drivers/acpi/proc.c linux-2.6.32.15/drivers/acpi/proc | |||
20225 | dev->wakeup.state.enabled = | 20388 | dev->wakeup.state.enabled = |
20226 | dev->wakeup.state.enabled ? 0 : 1; | 20389 | dev->wakeup.state.enabled ? 0 : 1; |
20227 | found_dev = dev; | 20390 | found_dev = dev; |
20228 | diff -urNp linux-2.6.32.15/drivers/acpi/processor_core.c linux-2.6.32.15/drivers/acpi/processor_core.c | 20391 | diff -urNp linux-2.6.32.16/drivers/acpi/processor_core.c linux-2.6.32.16/drivers/acpi/processor_core.c |
20229 | --- linux-2.6.32.15/drivers/acpi/processor_core.c 2010-03-15 11:52:04.000000000 -0400 | 20392 | --- linux-2.6.32.16/drivers/acpi/processor_core.c 2010-07-05 14:14:00.000000000 -0400 |
20230 | +++ linux-2.6.32.15/drivers/acpi/processor_core.c 2010-05-28 21:27:15.191153765 -0400 | 20393 | +++ linux-2.6.32.16/drivers/acpi/processor_core.c 2010-07-09 14:50:35.000000000 -0400 |
20231 | @@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add( | 20394 | @@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add( |
20232 | return 0; | 20395 | return 0; |
20233 | } | 20396 | } |
@@ -20237,9 +20400,9 @@ diff -urNp linux-2.6.32.15/drivers/acpi/processor_core.c linux-2.6.32.15/drivers | |||
20237 | 20400 | ||
20238 | /* | 20401 | /* |
20239 | * Buggy BIOS check | 20402 | * Buggy BIOS check |
20240 | diff -urNp linux-2.6.32.15/drivers/acpi/processor_idle.c linux-2.6.32.15/drivers/acpi/processor_idle.c | 20403 | diff -urNp linux-2.6.32.16/drivers/acpi/processor_idle.c linux-2.6.32.16/drivers/acpi/processor_idle.c |
20241 | --- linux-2.6.32.15/drivers/acpi/processor_idle.c 2010-03-15 11:52:04.000000000 -0400 | 20404 | --- linux-2.6.32.16/drivers/acpi/processor_idle.c 2010-07-05 14:14:00.000000000 -0400 |
20242 | +++ linux-2.6.32.15/drivers/acpi/processor_idle.c 2010-05-28 21:27:15.191153765 -0400 | 20405 | +++ linux-2.6.32.16/drivers/acpi/processor_idle.c 2010-07-09 14:50:35.000000000 -0400 |
20243 | @@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat | 20406 | @@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat |
20244 | DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), | 20407 | DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), |
20245 | DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, | 20408 | DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, |
@@ -20249,9 +20412,9 @@ diff -urNp linux-2.6.32.15/drivers/acpi/processor_idle.c linux-2.6.32.15/drivers | |||
20249 | }; | 20412 | }; |
20250 | 20413 | ||
20251 | 20414 | ||
20252 | diff -urNp linux-2.6.32.15/drivers/acpi/sbshc.c linux-2.6.32.15/drivers/acpi/sbshc.c | 20415 | diff -urNp linux-2.6.32.16/drivers/acpi/sbshc.c linux-2.6.32.16/drivers/acpi/sbshc.c |
20253 | --- linux-2.6.32.15/drivers/acpi/sbshc.c 2010-03-15 11:52:04.000000000 -0400 | 20416 | --- linux-2.6.32.16/drivers/acpi/sbshc.c 2010-07-05 14:14:00.000000000 -0400 |
20254 | +++ linux-2.6.32.15/drivers/acpi/sbshc.c 2010-05-31 11:26:43.164958464 -0400 | 20417 | +++ linux-2.6.32.16/drivers/acpi/sbshc.c 2010-07-09 14:50:35.000000000 -0400 |
20255 | @@ -17,7 +17,7 @@ | 20418 | @@ -17,7 +17,7 @@ |
20256 | 20419 | ||
20257 | #define PREFIX "ACPI: " | 20420 | #define PREFIX "ACPI: " |
@@ -20261,9 +20424,9 @@ diff -urNp linux-2.6.32.15/drivers/acpi/sbshc.c linux-2.6.32.15/drivers/acpi/sbs | |||
20261 | #define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC" | 20424 | #define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC" |
20262 | 20425 | ||
20263 | struct acpi_smb_hc { | 20426 | 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 | 20427 | diff -urNp linux-2.6.32.16/drivers/acpi/sleep.c linux-2.6.32.16/drivers/acpi/sleep.c |
20265 | --- linux-2.6.32.15/drivers/acpi/sleep.c 2010-05-28 20:16:44.438931092 -0400 | 20428 | --- linux-2.6.32.16/drivers/acpi/sleep.c 2010-07-05 14:14:00.000000000 -0400 |
20266 | +++ linux-2.6.32.15/drivers/acpi/sleep.c 2010-05-28 21:27:15.191153765 -0400 | 20429 | +++ linux-2.6.32.16/drivers/acpi/sleep.c 2010-07-09 14:50:35.000000000 -0400 |
20267 | @@ -302,7 +302,7 @@ static int acpi_suspend_state_valid(susp | 20430 | @@ -302,7 +302,7 @@ static int acpi_suspend_state_valid(susp |
20268 | } | 20431 | } |
20269 | } | 20432 | } |
@@ -20300,9 +20463,9 @@ diff -urNp linux-2.6.32.15/drivers/acpi/sleep.c linux-2.6.32.15/drivers/acpi/sle | |||
20300 | .begin = acpi_hibernation_begin_old, | 20463 | .begin = acpi_hibernation_begin_old, |
20301 | .end = acpi_pm_end, | 20464 | .end = acpi_pm_end, |
20302 | .pre_snapshot = acpi_hibernation_pre_snapshot_old, | 20465 | .pre_snapshot = acpi_hibernation_pre_snapshot_old, |
20303 | diff -urNp linux-2.6.32.15/drivers/acpi/video.c linux-2.6.32.15/drivers/acpi/video.c | 20466 | diff -urNp linux-2.6.32.16/drivers/acpi/video.c linux-2.6.32.16/drivers/acpi/video.c |
20304 | --- linux-2.6.32.15/drivers/acpi/video.c 2010-03-15 11:52:04.000000000 -0400 | 20467 | --- linux-2.6.32.16/drivers/acpi/video.c 2010-07-05 14:14:00.000000000 -0400 |
20305 | +++ linux-2.6.32.15/drivers/acpi/video.c 2010-05-28 21:27:15.203165017 -0400 | 20468 | +++ linux-2.6.32.16/drivers/acpi/video.c 2010-07-09 14:50:35.000000000 -0400 |
20306 | @@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str | 20469 | @@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str |
20307 | vd->brightness->levels[request_level]); | 20470 | vd->brightness->levels[request_level]); |
20308 | } | 20471 | } |
@@ -20312,9 +20475,9 @@ diff -urNp linux-2.6.32.15/drivers/acpi/video.c linux-2.6.32.15/drivers/acpi/vid | |||
20312 | .get_brightness = acpi_video_get_brightness, | 20475 | .get_brightness = acpi_video_get_brightness, |
20313 | .update_status = acpi_video_set_brightness, | 20476 | .update_status = acpi_video_set_brightness, |
20314 | }; | 20477 | }; |
20315 | diff -urNp linux-2.6.32.15/drivers/ata/ahci.c linux-2.6.32.15/drivers/ata/ahci.c | 20478 | diff -urNp linux-2.6.32.16/drivers/ata/ahci.c linux-2.6.32.16/drivers/ata/ahci.c |
20316 | --- linux-2.6.32.15/drivers/ata/ahci.c 2010-04-29 17:49:37.661448235 -0400 | 20479 | --- linux-2.6.32.16/drivers/ata/ahci.c 2010-07-05 14:14:00.000000000 -0400 |
20317 | +++ linux-2.6.32.15/drivers/ata/ahci.c 2010-05-28 21:27:15.203165017 -0400 | 20480 | +++ linux-2.6.32.16/drivers/ata/ahci.c 2010-07-09 14:50:35.000000000 -0400 |
20318 | @@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh | 20481 | @@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh |
20319 | .sdev_attrs = ahci_sdev_attrs, | 20482 | .sdev_attrs = ahci_sdev_attrs, |
20320 | }; | 20483 | }; |
@@ -20354,9 +20517,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/ahci.c linux-2.6.32.15/drivers/ata/ahci.c | |||
20354 | }; | 20517 | }; |
20355 | 20518 | ||
20356 | 20519 | ||
20357 | diff -urNp linux-2.6.32.15/drivers/ata/ata_generic.c linux-2.6.32.15/drivers/ata/ata_generic.c | 20520 | diff -urNp linux-2.6.32.16/drivers/ata/ata_generic.c linux-2.6.32.16/drivers/ata/ata_generic.c |
20358 | --- linux-2.6.32.15/drivers/ata/ata_generic.c 2010-03-15 11:52:04.000000000 -0400 | 20521 | --- linux-2.6.32.16/drivers/ata/ata_generic.c 2010-07-05 14:14:00.000000000 -0400 |
20359 | +++ linux-2.6.32.15/drivers/ata/ata_generic.c 2010-05-28 21:27:15.203165017 -0400 | 20522 | +++ linux-2.6.32.16/drivers/ata/ata_generic.c 2010-07-09 14:50:35.000000000 -0400 |
20360 | @@ -95,7 +95,7 @@ static struct scsi_host_template generic | 20523 | @@ -95,7 +95,7 @@ static struct scsi_host_template generic |
20361 | ATA_BMDMA_SHT(DRV_NAME), | 20524 | ATA_BMDMA_SHT(DRV_NAME), |
20362 | }; | 20525 | }; |
@@ -20366,9 +20529,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/ata_generic.c linux-2.6.32.15/drivers/ata | |||
20366 | .inherits = &ata_bmdma_port_ops, | 20529 | .inherits = &ata_bmdma_port_ops, |
20367 | .cable_detect = ata_cable_unknown, | 20530 | .cable_detect = ata_cable_unknown, |
20368 | .set_mode = generic_set_mode, | 20531 | .set_mode = generic_set_mode, |
20369 | diff -urNp linux-2.6.32.15/drivers/ata/ata_piix.c linux-2.6.32.15/drivers/ata/ata_piix.c | 20532 | diff -urNp linux-2.6.32.16/drivers/ata/ata_piix.c linux-2.6.32.16/drivers/ata/ata_piix.c |
20370 | --- linux-2.6.32.15/drivers/ata/ata_piix.c 2010-04-29 17:49:37.669446700 -0400 | 20533 | --- linux-2.6.32.16/drivers/ata/ata_piix.c 2010-07-05 14:14:00.000000000 -0400 |
20371 | +++ linux-2.6.32.15/drivers/ata/ata_piix.c 2010-05-28 21:27:15.203165017 -0400 | 20534 | +++ linux-2.6.32.16/drivers/ata/ata_piix.c 2010-07-09 14:50:35.000000000 -0400 |
20372 | @@ -299,7 +299,7 @@ static const struct pci_device_id piix_p | 20535 | @@ -299,7 +299,7 @@ static const struct pci_device_id piix_p |
20373 | { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, | 20536 | { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, |
20374 | /* SATA Controller IDE (CPT) */ | 20537 | /* SATA Controller IDE (CPT) */ |
@@ -20432,9 +20595,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/ata_piix.c linux-2.6.32.15/drivers/ata/at | |||
20432 | }; | 20595 | }; |
20433 | static const char *oemstrs[] = { | 20596 | static const char *oemstrs[] = { |
20434 | "Tecra M3,", | 20597 | "Tecra M3,", |
20435 | diff -urNp linux-2.6.32.15/drivers/ata/libata-acpi.c linux-2.6.32.15/drivers/ata/libata-acpi.c | 20598 | diff -urNp linux-2.6.32.16/drivers/ata/libata-acpi.c linux-2.6.32.16/drivers/ata/libata-acpi.c |
20436 | --- linux-2.6.32.15/drivers/ata/libata-acpi.c 2010-03-15 11:52:04.000000000 -0400 | 20599 | --- linux-2.6.32.16/drivers/ata/libata-acpi.c 2010-07-05 14:14:00.000000000 -0400 |
20437 | +++ linux-2.6.32.15/drivers/ata/libata-acpi.c 2010-05-28 21:27:15.203165017 -0400 | 20600 | +++ linux-2.6.32.16/drivers/ata/libata-acpi.c 2010-07-09 14:50:35.000000000 -0400 |
20438 | @@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han | 20601 | @@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han |
20439 | ata_acpi_uevent(dev->link->ap, dev, event); | 20602 | ata_acpi_uevent(dev->link->ap, dev, event); |
20440 | } | 20603 | } |
@@ -20450,10 +20613,10 @@ diff -urNp linux-2.6.32.15/drivers/ata/libata-acpi.c linux-2.6.32.15/drivers/ata | |||
20450 | .handler = ata_acpi_ap_notify_dock, | 20613 | .handler = ata_acpi_ap_notify_dock, |
20451 | .uevent = ata_acpi_ap_uevent, | 20614 | .uevent = ata_acpi_ap_uevent, |
20452 | }; | 20615 | }; |
20453 | diff -urNp linux-2.6.32.15/drivers/ata/libata-core.c linux-2.6.32.15/drivers/ata/libata-core.c | 20616 | diff -urNp linux-2.6.32.16/drivers/ata/libata-core.c linux-2.6.32.16/drivers/ata/libata-core.c |
20454 | --- linux-2.6.32.15/drivers/ata/libata-core.c 2010-04-29 17:49:37.689144697 -0400 | 20617 | --- linux-2.6.32.16/drivers/ata/libata-core.c 2010-07-05 14:14:00.000000000 -0400 |
20455 | +++ linux-2.6.32.15/drivers/ata/libata-core.c 2010-05-28 21:27:15.207155482 -0400 | 20618 | +++ linux-2.6.32.16/drivers/ata/libata-core.c 2010-07-09 14:50:35.000000000 -0400 |
20456 | @@ -896,7 +896,7 @@ static const struct ata_xfer_ent { | 20619 | @@ -900,7 +900,7 @@ static const struct ata_xfer_ent { |
20457 | { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 }, | 20620 | { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 }, |
20458 | { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 }, | 20621 | { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 }, |
20459 | { ATA_SHIFT_UDMA, ATA_NR_UDMA_MODES, XFER_UDMA_0 }, | 20622 | { ATA_SHIFT_UDMA, ATA_NR_UDMA_MODES, XFER_UDMA_0 }, |
@@ -20462,7 +20625,7 @@ diff -urNp linux-2.6.32.15/drivers/ata/libata-core.c linux-2.6.32.15/drivers/ata | |||
20462 | }; | 20625 | }; |
20463 | 20626 | ||
20464 | /** | 20627 | /** |
20465 | @@ -3163,7 +3163,7 @@ static const struct ata_timing ata_timin | 20628 | @@ -3168,7 +3168,7 @@ static const struct ata_timing ata_timin |
20466 | { XFER_UDMA_5, 0, 0, 0, 0, 0, 0, 0, 0, 20 }, | 20629 | { XFER_UDMA_5, 0, 0, 0, 0, 0, 0, 0, 0, 20 }, |
20467 | { XFER_UDMA_6, 0, 0, 0, 0, 0, 0, 0, 0, 15 }, | 20630 | { XFER_UDMA_6, 0, 0, 0, 0, 0, 0, 0, 0, 15 }, |
20468 | 20631 | ||
@@ -20471,7 +20634,7 @@ diff -urNp linux-2.6.32.15/drivers/ata/libata-core.c linux-2.6.32.15/drivers/ata | |||
20471 | }; | 20634 | }; |
20472 | 20635 | ||
20473 | #define ENOUGH(v, unit) (((v)-1)/(unit)+1) | 20636 | #define ENOUGH(v, unit) (((v)-1)/(unit)+1) |
20474 | @@ -4388,7 +4388,7 @@ static const struct ata_blacklist_entry | 20637 | @@ -4393,7 +4393,7 @@ static const struct ata_blacklist_entry |
20475 | { "PIONEER DVD-RW DVRTD08", "1.00", ATA_HORKAGE_NOSETXFER }, | 20638 | { "PIONEER DVD-RW DVRTD08", "1.00", ATA_HORKAGE_NOSETXFER }, |
20476 | 20639 | ||
20477 | /* End Marker */ | 20640 | /* End Marker */ |
@@ -20480,7 +20643,7 @@ diff -urNp linux-2.6.32.15/drivers/ata/libata-core.c linux-2.6.32.15/drivers/ata | |||
20480 | }; | 20643 | }; |
20481 | 20644 | ||
20482 | static int strn_pattern_cmp(const char *patt, const char *name, int wildchar) | 20645 | static int strn_pattern_cmp(const char *patt, const char *name, int wildchar) |
20483 | @@ -5964,7 +5964,7 @@ static void ata_host_stop(struct device | 20646 | @@ -5969,7 +5969,7 @@ static void ata_host_stop(struct device |
20484 | * LOCKING: | 20647 | * LOCKING: |
20485 | * None. | 20648 | * None. |
20486 | */ | 20649 | */ |
@@ -20489,7 +20652,7 @@ diff -urNp linux-2.6.32.15/drivers/ata/libata-core.c linux-2.6.32.15/drivers/ata | |||
20489 | { | 20652 | { |
20490 | static DEFINE_SPINLOCK(lock); | 20653 | static DEFINE_SPINLOCK(lock); |
20491 | const struct ata_port_operations *cur; | 20654 | const struct ata_port_operations *cur; |
20492 | @@ -5976,6 +5976,7 @@ static void ata_finalize_port_ops(struct | 20655 | @@ -5981,6 +5981,7 @@ static void ata_finalize_port_ops(struct |
20493 | return; | 20656 | return; |
20494 | 20657 | ||
20495 | spin_lock(&lock); | 20658 | spin_lock(&lock); |
@@ -20497,7 +20660,7 @@ diff -urNp linux-2.6.32.15/drivers/ata/libata-core.c linux-2.6.32.15/drivers/ata | |||
20497 | 20660 | ||
20498 | for (cur = ops->inherits; cur; cur = cur->inherits) { | 20661 | for (cur = ops->inherits; cur; cur = cur->inherits) { |
20499 | void **inherit = (void **)cur; | 20662 | void **inherit = (void **)cur; |
20500 | @@ -5989,8 +5990,9 @@ static void ata_finalize_port_ops(struct | 20663 | @@ -5994,8 +5995,9 @@ static void ata_finalize_port_ops(struct |
20501 | if (IS_ERR(*pp)) | 20664 | if (IS_ERR(*pp)) |
20502 | *pp = NULL; | 20665 | *pp = NULL; |
20503 | 20666 | ||
@@ -20508,7 +20671,7 @@ diff -urNp linux-2.6.32.15/drivers/ata/libata-core.c linux-2.6.32.15/drivers/ata | |||
20508 | spin_unlock(&lock); | 20671 | spin_unlock(&lock); |
20509 | } | 20672 | } |
20510 | 20673 | ||
20511 | @@ -6087,7 +6089,7 @@ int ata_host_start(struct ata_host *host | 20674 | @@ -6092,7 +6094,7 @@ int ata_host_start(struct ata_host *host |
20512 | */ | 20675 | */ |
20513 | /* KILLME - the only user left is ipr */ | 20676 | /* KILLME - the only user left is ipr */ |
20514 | void ata_host_init(struct ata_host *host, struct device *dev, | 20677 | void ata_host_init(struct ata_host *host, struct device *dev, |
@@ -20517,7 +20680,7 @@ diff -urNp linux-2.6.32.15/drivers/ata/libata-core.c linux-2.6.32.15/drivers/ata | |||
20517 | { | 20680 | { |
20518 | spin_lock_init(&host->lock); | 20681 | spin_lock_init(&host->lock); |
20519 | host->dev = dev; | 20682 | host->dev = dev; |
20520 | @@ -6750,7 +6752,7 @@ static void ata_dummy_error_handler(stru | 20683 | @@ -6755,7 +6757,7 @@ static void ata_dummy_error_handler(stru |
20521 | /* truly dummy */ | 20684 | /* truly dummy */ |
20522 | } | 20685 | } |
20523 | 20686 | ||
@@ -20526,9 +20689,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/libata-core.c linux-2.6.32.15/drivers/ata | |||
20526 | .qc_prep = ata_noop_qc_prep, | 20689 | .qc_prep = ata_noop_qc_prep, |
20527 | .qc_issue = ata_dummy_qc_issue, | 20690 | .qc_issue = ata_dummy_qc_issue, |
20528 | .error_handler = ata_dummy_error_handler, | 20691 | .error_handler = ata_dummy_error_handler, |
20529 | diff -urNp linux-2.6.32.15/drivers/ata/libata-eh.c linux-2.6.32.15/drivers/ata/libata-eh.c | 20692 | diff -urNp linux-2.6.32.16/drivers/ata/libata-eh.c linux-2.6.32.16/drivers/ata/libata-eh.c |
20530 | --- linux-2.6.32.15/drivers/ata/libata-eh.c 2010-05-15 13:20:18.462978524 -0400 | 20693 | --- linux-2.6.32.16/drivers/ata/libata-eh.c 2010-07-05 14:14:00.000000000 -0400 |
20531 | +++ linux-2.6.32.15/drivers/ata/libata-eh.c 2010-05-28 21:27:15.215165530 -0400 | 20694 | +++ linux-2.6.32.16/drivers/ata/libata-eh.c 2010-07-09 14:50:35.000000000 -0400 |
20532 | @@ -3586,7 +3586,7 @@ void ata_do_eh(struct ata_port *ap, ata_ | 20695 | @@ -3586,7 +3586,7 @@ void ata_do_eh(struct ata_port *ap, ata_ |
20533 | */ | 20696 | */ |
20534 | void ata_std_error_handler(struct ata_port *ap) | 20697 | void ata_std_error_handler(struct ata_port *ap) |
@@ -20538,9 +20701,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/libata-eh.c linux-2.6.32.15/drivers/ata/l | |||
20538 | ata_reset_fn_t hardreset = ops->hardreset; | 20701 | ata_reset_fn_t hardreset = ops->hardreset; |
20539 | 20702 | ||
20540 | /* ignore built-in hardreset if SCR access is not available */ | 20703 | /* ignore built-in hardreset if SCR access is not available */ |
20541 | diff -urNp linux-2.6.32.15/drivers/ata/libata-pmp.c linux-2.6.32.15/drivers/ata/libata-pmp.c | 20704 | diff -urNp linux-2.6.32.16/drivers/ata/libata-pmp.c linux-2.6.32.16/drivers/ata/libata-pmp.c |
20542 | --- linux-2.6.32.15/drivers/ata/libata-pmp.c 2010-03-15 11:52:04.000000000 -0400 | 20705 | --- linux-2.6.32.16/drivers/ata/libata-pmp.c 2010-07-05 14:14:00.000000000 -0400 |
20543 | +++ linux-2.6.32.15/drivers/ata/libata-pmp.c 2010-05-28 21:27:15.215165530 -0400 | 20706 | +++ linux-2.6.32.16/drivers/ata/libata-pmp.c 2010-07-09 14:50:35.000000000 -0400 |
20544 | @@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str | 20707 | @@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str |
20545 | */ | 20708 | */ |
20546 | static int sata_pmp_eh_recover(struct ata_port *ap) | 20709 | static int sata_pmp_eh_recover(struct ata_port *ap) |
@@ -20550,9 +20713,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/libata-pmp.c linux-2.6.32.15/drivers/ata/ | |||
20550 | int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; | 20713 | int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; |
20551 | struct ata_link *pmp_link = &ap->link; | 20714 | struct ata_link *pmp_link = &ap->link; |
20552 | struct ata_device *pmp_dev = pmp_link->device; | 20715 | struct ata_device *pmp_dev = pmp_link->device; |
20553 | diff -urNp linux-2.6.32.15/drivers/ata/pata_acpi.c linux-2.6.32.15/drivers/ata/pata_acpi.c | 20716 | diff -urNp linux-2.6.32.16/drivers/ata/pata_acpi.c linux-2.6.32.16/drivers/ata/pata_acpi.c |
20554 | --- linux-2.6.32.15/drivers/ata/pata_acpi.c 2010-03-15 11:52:04.000000000 -0400 | 20717 | --- linux-2.6.32.16/drivers/ata/pata_acpi.c 2010-07-05 14:14:00.000000000 -0400 |
20555 | +++ linux-2.6.32.15/drivers/ata/pata_acpi.c 2010-05-28 21:27:15.215165530 -0400 | 20718 | +++ linux-2.6.32.16/drivers/ata/pata_acpi.c 2010-07-09 14:50:35.000000000 -0400 |
20556 | @@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s | 20719 | @@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s |
20557 | ATA_BMDMA_SHT(DRV_NAME), | 20720 | ATA_BMDMA_SHT(DRV_NAME), |
20558 | }; | 20721 | }; |
@@ -20562,9 +20725,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_acpi.c linux-2.6.32.15/drivers/ata/p | |||
20562 | .inherits = &ata_bmdma_port_ops, | 20725 | .inherits = &ata_bmdma_port_ops, |
20563 | .qc_issue = pacpi_qc_issue, | 20726 | .qc_issue = pacpi_qc_issue, |
20564 | .cable_detect = pacpi_cable_detect, | 20727 | .cable_detect = pacpi_cable_detect, |
20565 | diff -urNp linux-2.6.32.15/drivers/ata/pata_ali.c linux-2.6.32.15/drivers/ata/pata_ali.c | 20728 | diff -urNp linux-2.6.32.16/drivers/ata/pata_ali.c linux-2.6.32.16/drivers/ata/pata_ali.c |
20566 | --- linux-2.6.32.15/drivers/ata/pata_ali.c 2010-04-29 17:49:37.689144697 -0400 | 20729 | --- linux-2.6.32.16/drivers/ata/pata_ali.c 2010-07-05 14:14:00.000000000 -0400 |
20567 | +++ linux-2.6.32.15/drivers/ata/pata_ali.c 2010-05-28 21:27:15.215165530 -0400 | 20730 | +++ linux-2.6.32.16/drivers/ata/pata_ali.c 2010-07-09 14:50:35.000000000 -0400 |
20568 | @@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht | 20731 | @@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht |
20569 | * Port operations for PIO only ALi | 20732 | * Port operations for PIO only ALi |
20570 | */ | 20733 | */ |
@@ -20610,9 +20773,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_ali.c linux-2.6.32.15/drivers/ata/pa | |||
20610 | .inherits = &ali_dma_base_ops, | 20773 | .inherits = &ali_dma_base_ops, |
20611 | .check_atapi_dma = ali_check_atapi_dma, | 20774 | .check_atapi_dma = ali_check_atapi_dma, |
20612 | .dev_config = ali_warn_atapi_dma, | 20775 | .dev_config = ali_warn_atapi_dma, |
20613 | diff -urNp linux-2.6.32.15/drivers/ata/pata_amd.c linux-2.6.32.15/drivers/ata/pata_amd.c | 20776 | diff -urNp linux-2.6.32.16/drivers/ata/pata_amd.c linux-2.6.32.16/drivers/ata/pata_amd.c |
20614 | --- linux-2.6.32.15/drivers/ata/pata_amd.c 2010-03-15 11:52:04.000000000 -0400 | 20777 | --- linux-2.6.32.16/drivers/ata/pata_amd.c 2010-07-05 14:14:00.000000000 -0400 |
20615 | +++ linux-2.6.32.15/drivers/ata/pata_amd.c 2010-05-28 21:27:15.215165530 -0400 | 20778 | +++ linux-2.6.32.16/drivers/ata/pata_amd.c 2010-07-09 14:50:35.000000000 -0400 |
20616 | @@ -397,28 +397,28 @@ static const struct ata_port_operations | 20779 | @@ -397,28 +397,28 @@ static const struct ata_port_operations |
20617 | .prereset = amd_pre_reset, | 20780 | .prereset = amd_pre_reset, |
20618 | }; | 20781 | }; |
@@ -20662,9 +20825,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_amd.c linux-2.6.32.15/drivers/ata/pa | |||
20662 | .inherits = &nv_base_port_ops, | 20825 | .inherits = &nv_base_port_ops, |
20663 | .set_piomode = nv133_set_piomode, | 20826 | .set_piomode = nv133_set_piomode, |
20664 | .set_dmamode = nv133_set_dmamode, | 20827 | .set_dmamode = nv133_set_dmamode, |
20665 | diff -urNp linux-2.6.32.15/drivers/ata/pata_artop.c linux-2.6.32.15/drivers/ata/pata_artop.c | 20828 | diff -urNp linux-2.6.32.16/drivers/ata/pata_artop.c linux-2.6.32.16/drivers/ata/pata_artop.c |
20666 | --- linux-2.6.32.15/drivers/ata/pata_artop.c 2010-03-15 11:52:04.000000000 -0400 | 20829 | --- linux-2.6.32.16/drivers/ata/pata_artop.c 2010-07-05 14:14:00.000000000 -0400 |
20667 | +++ linux-2.6.32.15/drivers/ata/pata_artop.c 2010-05-28 21:27:15.215165530 -0400 | 20830 | +++ linux-2.6.32.16/drivers/ata/pata_artop.c 2010-07-09 14:50:35.000000000 -0400 |
20668 | @@ -311,7 +311,7 @@ static struct scsi_host_template artop_s | 20831 | @@ -311,7 +311,7 @@ static struct scsi_host_template artop_s |
20669 | ATA_BMDMA_SHT(DRV_NAME), | 20832 | ATA_BMDMA_SHT(DRV_NAME), |
20670 | }; | 20833 | }; |
@@ -20683,9 +20846,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_artop.c linux-2.6.32.15/drivers/ata/ | |||
20683 | .inherits = &ata_bmdma_port_ops, | 20846 | .inherits = &ata_bmdma_port_ops, |
20684 | .cable_detect = artop6260_cable_detect, | 20847 | .cable_detect = artop6260_cable_detect, |
20685 | .set_piomode = artop6260_set_piomode, | 20848 | .set_piomode = artop6260_set_piomode, |
20686 | diff -urNp linux-2.6.32.15/drivers/ata/pata_at32.c linux-2.6.32.15/drivers/ata/pata_at32.c | 20849 | diff -urNp linux-2.6.32.16/drivers/ata/pata_at32.c linux-2.6.32.16/drivers/ata/pata_at32.c |
20687 | --- linux-2.6.32.15/drivers/ata/pata_at32.c 2010-03-15 11:52:04.000000000 -0400 | 20850 | --- linux-2.6.32.16/drivers/ata/pata_at32.c 2010-07-05 14:14:00.000000000 -0400 |
20688 | +++ linux-2.6.32.15/drivers/ata/pata_at32.c 2010-05-28 21:27:15.215165530 -0400 | 20851 | +++ linux-2.6.32.16/drivers/ata/pata_at32.c 2010-07-09 14:50:35.000000000 -0400 |
20689 | @@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh | 20852 | @@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh |
20690 | ATA_PIO_SHT(DRV_NAME), | 20853 | ATA_PIO_SHT(DRV_NAME), |
20691 | }; | 20854 | }; |
@@ -20695,9 +20858,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_at32.c linux-2.6.32.15/drivers/ata/p | |||
20695 | .inherits = &ata_sff_port_ops, | 20858 | .inherits = &ata_sff_port_ops, |
20696 | .cable_detect = ata_cable_40wire, | 20859 | .cable_detect = ata_cable_40wire, |
20697 | .set_piomode = pata_at32_set_piomode, | 20860 | .set_piomode = pata_at32_set_piomode, |
20698 | diff -urNp linux-2.6.32.15/drivers/ata/pata_at91.c linux-2.6.32.15/drivers/ata/pata_at91.c | 20861 | diff -urNp linux-2.6.32.16/drivers/ata/pata_at91.c linux-2.6.32.16/drivers/ata/pata_at91.c |
20699 | --- linux-2.6.32.15/drivers/ata/pata_at91.c 2010-03-15 11:52:04.000000000 -0400 | 20862 | --- linux-2.6.32.16/drivers/ata/pata_at91.c 2010-07-05 14:14:00.000000000 -0400 |
20700 | +++ linux-2.6.32.15/drivers/ata/pata_at91.c 2010-05-28 21:27:15.227169983 -0400 | 20863 | +++ linux-2.6.32.16/drivers/ata/pata_at91.c 2010-07-09 14:50:35.000000000 -0400 |
20701 | @@ -195,7 +195,7 @@ static struct scsi_host_template pata_at | 20864 | @@ -195,7 +195,7 @@ static struct scsi_host_template pata_at |
20702 | ATA_PIO_SHT(DRV_NAME), | 20865 | ATA_PIO_SHT(DRV_NAME), |
20703 | }; | 20866 | }; |
@@ -20707,9 +20870,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_at91.c linux-2.6.32.15/drivers/ata/p | |||
20707 | .inherits = &ata_sff_port_ops, | 20870 | .inherits = &ata_sff_port_ops, |
20708 | 20871 | ||
20709 | .sff_data_xfer = pata_at91_data_xfer_noirq, | 20872 | .sff_data_xfer = pata_at91_data_xfer_noirq, |
20710 | diff -urNp linux-2.6.32.15/drivers/ata/pata_atiixp.c linux-2.6.32.15/drivers/ata/pata_atiixp.c | 20873 | diff -urNp linux-2.6.32.16/drivers/ata/pata_atiixp.c linux-2.6.32.16/drivers/ata/pata_atiixp.c |
20711 | --- linux-2.6.32.15/drivers/ata/pata_atiixp.c 2010-03-15 11:52:04.000000000 -0400 | 20874 | --- linux-2.6.32.16/drivers/ata/pata_atiixp.c 2010-07-05 14:14:00.000000000 -0400 |
20712 | +++ linux-2.6.32.15/drivers/ata/pata_atiixp.c 2010-05-28 21:27:15.227169983 -0400 | 20875 | +++ linux-2.6.32.16/drivers/ata/pata_atiixp.c 2010-07-09 14:50:35.000000000 -0400 |
20713 | @@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_ | 20876 | @@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_ |
20714 | .sg_tablesize = LIBATA_DUMB_MAX_PRD, | 20877 | .sg_tablesize = LIBATA_DUMB_MAX_PRD, |
20715 | }; | 20878 | }; |
@@ -20719,9 +20882,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_atiixp.c linux-2.6.32.15/drivers/ata | |||
20719 | .inherits = &ata_bmdma_port_ops, | 20882 | .inherits = &ata_bmdma_port_ops, |
20720 | 20883 | ||
20721 | .qc_prep = ata_sff_dumb_qc_prep, | 20884 | .qc_prep = ata_sff_dumb_qc_prep, |
20722 | diff -urNp linux-2.6.32.15/drivers/ata/pata_atp867x.c linux-2.6.32.15/drivers/ata/pata_atp867x.c | 20885 | diff -urNp linux-2.6.32.16/drivers/ata/pata_atp867x.c linux-2.6.32.16/drivers/ata/pata_atp867x.c |
20723 | --- linux-2.6.32.15/drivers/ata/pata_atp867x.c 2010-03-15 11:52:04.000000000 -0400 | 20886 | --- linux-2.6.32.16/drivers/ata/pata_atp867x.c 2010-07-05 14:14:00.000000000 -0400 |
20724 | +++ linux-2.6.32.15/drivers/ata/pata_atp867x.c 2010-05-28 21:27:15.227169983 -0400 | 20887 | +++ linux-2.6.32.16/drivers/ata/pata_atp867x.c 2010-07-09 14:50:35.000000000 -0400 |
20725 | @@ -274,7 +274,7 @@ static struct scsi_host_template atp867x | 20888 | @@ -274,7 +274,7 @@ static struct scsi_host_template atp867x |
20726 | ATA_BMDMA_SHT(DRV_NAME), | 20889 | ATA_BMDMA_SHT(DRV_NAME), |
20727 | }; | 20890 | }; |
@@ -20731,9 +20894,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_atp867x.c linux-2.6.32.15/drivers/at | |||
20731 | .inherits = &ata_bmdma_port_ops, | 20894 | .inherits = &ata_bmdma_port_ops, |
20732 | .cable_detect = atp867x_cable_detect, | 20895 | .cable_detect = atp867x_cable_detect, |
20733 | .set_piomode = atp867x_set_piomode, | 20896 | .set_piomode = atp867x_set_piomode, |
20734 | diff -urNp linux-2.6.32.15/drivers/ata/pata_bf54x.c linux-2.6.32.15/drivers/ata/pata_bf54x.c | 20897 | diff -urNp linux-2.6.32.16/drivers/ata/pata_bf54x.c linux-2.6.32.16/drivers/ata/pata_bf54x.c |
20735 | --- linux-2.6.32.15/drivers/ata/pata_bf54x.c 2010-03-15 11:52:04.000000000 -0400 | 20898 | --- linux-2.6.32.16/drivers/ata/pata_bf54x.c 2010-07-05 14:14:00.000000000 -0400 |
20736 | +++ linux-2.6.32.15/drivers/ata/pata_bf54x.c 2010-05-28 21:27:15.235166526 -0400 | 20899 | +++ linux-2.6.32.16/drivers/ata/pata_bf54x.c 2010-07-09 14:50:35.000000000 -0400 |
20737 | @@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh | 20900 | @@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh |
20738 | .dma_boundary = ATA_DMA_BOUNDARY, | 20901 | .dma_boundary = ATA_DMA_BOUNDARY, |
20739 | }; | 20902 | }; |
@@ -20743,9 +20906,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_bf54x.c linux-2.6.32.15/drivers/ata/ | |||
20743 | .inherits = &ata_sff_port_ops, | 20906 | .inherits = &ata_sff_port_ops, |
20744 | 20907 | ||
20745 | .set_piomode = bfin_set_piomode, | 20908 | .set_piomode = bfin_set_piomode, |
20746 | diff -urNp linux-2.6.32.15/drivers/ata/pata_cmd640.c linux-2.6.32.15/drivers/ata/pata_cmd640.c | 20909 | diff -urNp linux-2.6.32.16/drivers/ata/pata_cmd640.c linux-2.6.32.16/drivers/ata/pata_cmd640.c |
20747 | --- linux-2.6.32.15/drivers/ata/pata_cmd640.c 2010-03-15 11:52:04.000000000 -0400 | 20910 | --- linux-2.6.32.16/drivers/ata/pata_cmd640.c 2010-07-05 14:14:00.000000000 -0400 |
20748 | +++ linux-2.6.32.15/drivers/ata/pata_cmd640.c 2010-05-28 21:27:15.235166526 -0400 | 20911 | +++ linux-2.6.32.16/drivers/ata/pata_cmd640.c 2010-07-09 14:50:35.000000000 -0400 |
20749 | @@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_ | 20912 | @@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_ |
20750 | ATA_BMDMA_SHT(DRV_NAME), | 20913 | ATA_BMDMA_SHT(DRV_NAME), |
20751 | }; | 20914 | }; |
@@ -20755,9 +20918,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_cmd640.c linux-2.6.32.15/drivers/ata | |||
20755 | .inherits = &ata_bmdma_port_ops, | 20918 | .inherits = &ata_bmdma_port_ops, |
20756 | /* In theory xfer_noirq is not needed once we kill the prefetcher */ | 20919 | /* In theory xfer_noirq is not needed once we kill the prefetcher */ |
20757 | .sff_data_xfer = ata_sff_data_xfer_noirq, | 20920 | .sff_data_xfer = ata_sff_data_xfer_noirq, |
20758 | diff -urNp linux-2.6.32.15/drivers/ata/pata_cmd64x.c linux-2.6.32.15/drivers/ata/pata_cmd64x.c | 20921 | diff -urNp linux-2.6.32.16/drivers/ata/pata_cmd64x.c linux-2.6.32.16/drivers/ata/pata_cmd64x.c |
20759 | --- linux-2.6.32.15/drivers/ata/pata_cmd64x.c 2010-03-15 11:52:04.000000000 -0400 | 20922 | --- linux-2.6.32.16/drivers/ata/pata_cmd64x.c 2010-07-05 14:14:00.000000000 -0400 |
20760 | +++ linux-2.6.32.15/drivers/ata/pata_cmd64x.c 2010-05-28 21:27:15.235166526 -0400 | 20923 | +++ linux-2.6.32.16/drivers/ata/pata_cmd64x.c 2010-07-09 14:50:35.000000000 -0400 |
20761 | @@ -275,18 +275,18 @@ static const struct ata_port_operations | 20924 | @@ -275,18 +275,18 @@ static const struct ata_port_operations |
20762 | .set_dmamode = cmd64x_set_dmamode, | 20925 | .set_dmamode = cmd64x_set_dmamode, |
20763 | }; | 20926 | }; |
@@ -20780,9 +20943,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_cmd64x.c linux-2.6.32.15/drivers/ata | |||
20780 | .inherits = &cmd64x_base_ops, | 20943 | .inherits = &cmd64x_base_ops, |
20781 | .bmdma_stop = cmd648_bmdma_stop, | 20944 | .bmdma_stop = cmd648_bmdma_stop, |
20782 | .cable_detect = cmd648_cable_detect, | 20945 | .cable_detect = cmd648_cable_detect, |
20783 | diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5520.c linux-2.6.32.15/drivers/ata/pata_cs5520.c | 20946 | diff -urNp linux-2.6.32.16/drivers/ata/pata_cs5520.c linux-2.6.32.16/drivers/ata/pata_cs5520.c |
20784 | --- linux-2.6.32.15/drivers/ata/pata_cs5520.c 2010-03-15 11:52:04.000000000 -0400 | 20947 | --- linux-2.6.32.16/drivers/ata/pata_cs5520.c 2010-07-05 14:14:00.000000000 -0400 |
20785 | +++ linux-2.6.32.15/drivers/ata/pata_cs5520.c 2010-05-28 21:27:15.239154462 -0400 | 20948 | +++ linux-2.6.32.16/drivers/ata/pata_cs5520.c 2010-07-09 14:50:35.000000000 -0400 |
20786 | @@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_ | 20949 | @@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_ |
20787 | .sg_tablesize = LIBATA_DUMB_MAX_PRD, | 20950 | .sg_tablesize = LIBATA_DUMB_MAX_PRD, |
20788 | }; | 20951 | }; |
@@ -20792,9 +20955,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5520.c linux-2.6.32.15/drivers/ata | |||
20792 | .inherits = &ata_bmdma_port_ops, | 20955 | .inherits = &ata_bmdma_port_ops, |
20793 | .qc_prep = ata_sff_dumb_qc_prep, | 20956 | .qc_prep = ata_sff_dumb_qc_prep, |
20794 | .cable_detect = ata_cable_40wire, | 20957 | .cable_detect = ata_cable_40wire, |
20795 | diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5530.c linux-2.6.32.15/drivers/ata/pata_cs5530.c | 20958 | diff -urNp linux-2.6.32.16/drivers/ata/pata_cs5530.c linux-2.6.32.16/drivers/ata/pata_cs5530.c |
20796 | --- linux-2.6.32.15/drivers/ata/pata_cs5530.c 2010-03-15 11:52:04.000000000 -0400 | 20959 | --- linux-2.6.32.16/drivers/ata/pata_cs5530.c 2010-07-05 14:14:00.000000000 -0400 |
20797 | +++ linux-2.6.32.15/drivers/ata/pata_cs5530.c 2010-05-28 21:27:15.239154462 -0400 | 20960 | +++ linux-2.6.32.16/drivers/ata/pata_cs5530.c 2010-07-09 14:50:35.000000000 -0400 |
20798 | @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ | 20961 | @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ |
20799 | .sg_tablesize = LIBATA_DUMB_MAX_PRD, | 20962 | .sg_tablesize = LIBATA_DUMB_MAX_PRD, |
20800 | }; | 20963 | }; |
@@ -20804,9 +20967,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5530.c linux-2.6.32.15/drivers/ata | |||
20804 | .inherits = &ata_bmdma_port_ops, | 20967 | .inherits = &ata_bmdma_port_ops, |
20805 | 20968 | ||
20806 | .qc_prep = ata_sff_dumb_qc_prep, | 20969 | .qc_prep = ata_sff_dumb_qc_prep, |
20807 | diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5535.c linux-2.6.32.15/drivers/ata/pata_cs5535.c | 20970 | diff -urNp linux-2.6.32.16/drivers/ata/pata_cs5535.c linux-2.6.32.16/drivers/ata/pata_cs5535.c |
20808 | --- linux-2.6.32.15/drivers/ata/pata_cs5535.c 2010-03-15 11:52:04.000000000 -0400 | 20971 | --- linux-2.6.32.16/drivers/ata/pata_cs5535.c 2010-07-05 14:14:00.000000000 -0400 |
20809 | +++ linux-2.6.32.15/drivers/ata/pata_cs5535.c 2010-05-28 21:27:15.239154462 -0400 | 20972 | +++ linux-2.6.32.16/drivers/ata/pata_cs5535.c 2010-07-09 14:50:35.000000000 -0400 |
20810 | @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ | 20973 | @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ |
20811 | ATA_BMDMA_SHT(DRV_NAME), | 20974 | ATA_BMDMA_SHT(DRV_NAME), |
20812 | }; | 20975 | }; |
@@ -20816,9 +20979,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5535.c linux-2.6.32.15/drivers/ata | |||
20816 | .inherits = &ata_bmdma_port_ops, | 20979 | .inherits = &ata_bmdma_port_ops, |
20817 | .cable_detect = cs5535_cable_detect, | 20980 | .cable_detect = cs5535_cable_detect, |
20818 | .set_piomode = cs5535_set_piomode, | 20981 | .set_piomode = cs5535_set_piomode, |
20819 | diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5536.c linux-2.6.32.15/drivers/ata/pata_cs5536.c | 20982 | diff -urNp linux-2.6.32.16/drivers/ata/pata_cs5536.c linux-2.6.32.16/drivers/ata/pata_cs5536.c |
20820 | --- linux-2.6.32.15/drivers/ata/pata_cs5536.c 2010-03-15 11:52:04.000000000 -0400 | 20983 | --- linux-2.6.32.16/drivers/ata/pata_cs5536.c 2010-07-05 14:14:00.000000000 -0400 |
20821 | +++ linux-2.6.32.15/drivers/ata/pata_cs5536.c 2010-05-28 21:27:15.239154462 -0400 | 20984 | +++ linux-2.6.32.16/drivers/ata/pata_cs5536.c 2010-07-09 14:50:35.000000000 -0400 |
20822 | @@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_ | 20985 | @@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_ |
20823 | ATA_BMDMA_SHT(DRV_NAME), | 20986 | ATA_BMDMA_SHT(DRV_NAME), |
20824 | }; | 20987 | }; |
@@ -20828,9 +20991,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5536.c linux-2.6.32.15/drivers/ata | |||
20828 | .inherits = &ata_bmdma_port_ops, | 20991 | .inherits = &ata_bmdma_port_ops, |
20829 | .cable_detect = cs5536_cable_detect, | 20992 | .cable_detect = cs5536_cable_detect, |
20830 | .set_piomode = cs5536_set_piomode, | 20993 | .set_piomode = cs5536_set_piomode, |
20831 | diff -urNp linux-2.6.32.15/drivers/ata/pata_cypress.c linux-2.6.32.15/drivers/ata/pata_cypress.c | 20994 | diff -urNp linux-2.6.32.16/drivers/ata/pata_cypress.c linux-2.6.32.16/drivers/ata/pata_cypress.c |
20832 | --- linux-2.6.32.15/drivers/ata/pata_cypress.c 2010-03-15 11:52:04.000000000 -0400 | 20995 | --- linux-2.6.32.16/drivers/ata/pata_cypress.c 2010-07-05 14:14:00.000000000 -0400 |
20833 | +++ linux-2.6.32.15/drivers/ata/pata_cypress.c 2010-05-28 21:27:15.243179627 -0400 | 20996 | +++ linux-2.6.32.16/drivers/ata/pata_cypress.c 2010-07-09 14:50:35.000000000 -0400 |
20834 | @@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69 | 20997 | @@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69 |
20835 | ATA_BMDMA_SHT(DRV_NAME), | 20998 | ATA_BMDMA_SHT(DRV_NAME), |
20836 | }; | 20999 | }; |
@@ -20840,9 +21003,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_cypress.c linux-2.6.32.15/drivers/at | |||
20840 | .inherits = &ata_bmdma_port_ops, | 21003 | .inherits = &ata_bmdma_port_ops, |
20841 | .cable_detect = ata_cable_40wire, | 21004 | .cable_detect = ata_cable_40wire, |
20842 | .set_piomode = cy82c693_set_piomode, | 21005 | .set_piomode = cy82c693_set_piomode, |
20843 | diff -urNp linux-2.6.32.15/drivers/ata/pata_efar.c linux-2.6.32.15/drivers/ata/pata_efar.c | 21006 | diff -urNp linux-2.6.32.16/drivers/ata/pata_efar.c linux-2.6.32.16/drivers/ata/pata_efar.c |
20844 | --- linux-2.6.32.15/drivers/ata/pata_efar.c 2010-03-15 11:52:04.000000000 -0400 | 21007 | --- linux-2.6.32.16/drivers/ata/pata_efar.c 2010-07-05 14:14:00.000000000 -0400 |
20845 | +++ linux-2.6.32.15/drivers/ata/pata_efar.c 2010-05-28 21:27:15.243179627 -0400 | 21008 | +++ linux-2.6.32.16/drivers/ata/pata_efar.c 2010-07-09 14:50:35.000000000 -0400 |
20846 | @@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh | 21009 | @@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh |
20847 | ATA_BMDMA_SHT(DRV_NAME), | 21010 | ATA_BMDMA_SHT(DRV_NAME), |
20848 | }; | 21011 | }; |
@@ -20852,9 +21015,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_efar.c linux-2.6.32.15/drivers/ata/p | |||
20852 | .inherits = &ata_bmdma_port_ops, | 21015 | .inherits = &ata_bmdma_port_ops, |
20853 | .cable_detect = efar_cable_detect, | 21016 | .cable_detect = efar_cable_detect, |
20854 | .set_piomode = efar_set_piomode, | 21017 | .set_piomode = efar_set_piomode, |
20855 | diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt366.c linux-2.6.32.15/drivers/ata/pata_hpt366.c | 21018 | diff -urNp linux-2.6.32.16/drivers/ata/pata_hpt366.c linux-2.6.32.16/drivers/ata/pata_hpt366.c |
20856 | --- linux-2.6.32.15/drivers/ata/pata_hpt366.c 2010-03-15 11:52:04.000000000 -0400 | 21019 | --- linux-2.6.32.16/drivers/ata/pata_hpt366.c 2010-07-05 14:14:00.000000000 -0400 |
20857 | +++ linux-2.6.32.15/drivers/ata/pata_hpt366.c 2010-05-28 21:27:15.243179627 -0400 | 21020 | +++ linux-2.6.32.16/drivers/ata/pata_hpt366.c 2010-07-09 14:50:35.000000000 -0400 |
20858 | @@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_ | 21021 | @@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_ |
20859 | * Configuration for HPT366/68 | 21022 | * Configuration for HPT366/68 |
20860 | */ | 21023 | */ |
@@ -20864,9 +21027,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt366.c linux-2.6.32.15/drivers/ata | |||
20864 | .inherits = &ata_bmdma_port_ops, | 21027 | .inherits = &ata_bmdma_port_ops, |
20865 | .cable_detect = hpt36x_cable_detect, | 21028 | .cable_detect = hpt36x_cable_detect, |
20866 | .mode_filter = hpt366_filter, | 21029 | .mode_filter = hpt366_filter, |
20867 | diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt37x.c linux-2.6.32.15/drivers/ata/pata_hpt37x.c | 21030 | diff -urNp linux-2.6.32.16/drivers/ata/pata_hpt37x.c linux-2.6.32.16/drivers/ata/pata_hpt37x.c |
20868 | --- linux-2.6.32.15/drivers/ata/pata_hpt37x.c 2010-03-15 11:52:04.000000000 -0400 | 21031 | --- linux-2.6.32.16/drivers/ata/pata_hpt37x.c 2010-07-05 14:14:00.000000000 -0400 |
20869 | +++ linux-2.6.32.15/drivers/ata/pata_hpt37x.c 2010-05-28 21:27:15.247200461 -0400 | 21032 | +++ linux-2.6.32.16/drivers/ata/pata_hpt37x.c 2010-07-09 14:50:35.000000000 -0400 |
20870 | @@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_ | 21033 | @@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_ |
20871 | * Configuration for HPT370 | 21034 | * Configuration for HPT370 |
20872 | */ | 21035 | */ |
@@ -20903,9 +21066,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt37x.c linux-2.6.32.15/drivers/ata | |||
20903 | .inherits = &hpt372_port_ops, | 21066 | .inherits = &hpt372_port_ops, |
20904 | .prereset = hpt374_fn1_pre_reset, | 21067 | .prereset = hpt374_fn1_pre_reset, |
20905 | }; | 21068 | }; |
20906 | diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt3x2n.c linux-2.6.32.15/drivers/ata/pata_hpt3x2n.c | 21069 | diff -urNp linux-2.6.32.16/drivers/ata/pata_hpt3x2n.c linux-2.6.32.16/drivers/ata/pata_hpt3x2n.c |
20907 | --- linux-2.6.32.15/drivers/ata/pata_hpt3x2n.c 2010-03-15 11:52:04.000000000 -0400 | 21070 | --- linux-2.6.32.16/drivers/ata/pata_hpt3x2n.c 2010-07-05 14:14:00.000000000 -0400 |
20908 | +++ linux-2.6.32.15/drivers/ata/pata_hpt3x2n.c 2010-05-28 21:27:15.247200461 -0400 | 21071 | +++ linux-2.6.32.16/drivers/ata/pata_hpt3x2n.c 2010-07-09 14:50:35.000000000 -0400 |
20909 | @@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n | 21072 | @@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n |
20910 | * Configuration for HPT3x2n. | 21073 | * Configuration for HPT3x2n. |
20911 | */ | 21074 | */ |
@@ -20915,9 +21078,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt3x2n.c linux-2.6.32.15/drivers/at | |||
20915 | .inherits = &ata_bmdma_port_ops, | 21078 | .inherits = &ata_bmdma_port_ops, |
20916 | 21079 | ||
20917 | .bmdma_stop = hpt3x2n_bmdma_stop, | 21080 | .bmdma_stop = hpt3x2n_bmdma_stop, |
20918 | diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt3x3.c linux-2.6.32.15/drivers/ata/pata_hpt3x3.c | 21081 | diff -urNp linux-2.6.32.16/drivers/ata/pata_hpt3x3.c linux-2.6.32.16/drivers/ata/pata_hpt3x3.c |
20919 | --- linux-2.6.32.15/drivers/ata/pata_hpt3x3.c 2010-03-15 11:52:04.000000000 -0400 | 21082 | --- linux-2.6.32.16/drivers/ata/pata_hpt3x3.c 2010-07-05 14:14:00.000000000 -0400 |
20920 | +++ linux-2.6.32.15/drivers/ata/pata_hpt3x3.c 2010-05-28 21:27:15.247200461 -0400 | 21083 | +++ linux-2.6.32.16/drivers/ata/pata_hpt3x3.c 2010-07-09 14:50:35.000000000 -0400 |
20921 | @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ | 21084 | @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ |
20922 | ATA_BMDMA_SHT(DRV_NAME), | 21085 | ATA_BMDMA_SHT(DRV_NAME), |
20923 | }; | 21086 | }; |
@@ -20927,9 +21090,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt3x3.c linux-2.6.32.15/drivers/ata | |||
20927 | .inherits = &ata_bmdma_port_ops, | 21090 | .inherits = &ata_bmdma_port_ops, |
20928 | .cable_detect = ata_cable_40wire, | 21091 | .cable_detect = ata_cable_40wire, |
20929 | .set_piomode = hpt3x3_set_piomode, | 21092 | .set_piomode = hpt3x3_set_piomode, |
20930 | diff -urNp linux-2.6.32.15/drivers/ata/pata_icside.c linux-2.6.32.15/drivers/ata/pata_icside.c | 21093 | diff -urNp linux-2.6.32.16/drivers/ata/pata_icside.c linux-2.6.32.16/drivers/ata/pata_icside.c |
20931 | --- linux-2.6.32.15/drivers/ata/pata_icside.c 2010-03-15 11:52:04.000000000 -0400 | 21094 | --- linux-2.6.32.16/drivers/ata/pata_icside.c 2010-07-05 14:14:00.000000000 -0400 |
20932 | +++ linux-2.6.32.15/drivers/ata/pata_icside.c 2010-05-28 21:27:15.251151122 -0400 | 21095 | +++ linux-2.6.32.16/drivers/ata/pata_icside.c 2010-07-09 14:50:35.000000000 -0400 |
20933 | @@ -319,7 +319,7 @@ static void pata_icside_postreset(struct | 21096 | @@ -319,7 +319,7 @@ static void pata_icside_postreset(struct |
20934 | } | 21097 | } |
20935 | } | 21098 | } |
@@ -20939,9 +21102,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_icside.c linux-2.6.32.15/drivers/ata | |||
20939 | .inherits = &ata_sff_port_ops, | 21102 | .inherits = &ata_sff_port_ops, |
20940 | /* no need to build any PRD tables for DMA */ | 21103 | /* no need to build any PRD tables for DMA */ |
20941 | .qc_prep = ata_noop_qc_prep, | 21104 | .qc_prep = ata_noop_qc_prep, |
20942 | diff -urNp linux-2.6.32.15/drivers/ata/pata_isapnp.c linux-2.6.32.15/drivers/ata/pata_isapnp.c | 21105 | diff -urNp linux-2.6.32.16/drivers/ata/pata_isapnp.c linux-2.6.32.16/drivers/ata/pata_isapnp.c |
20943 | --- linux-2.6.32.15/drivers/ata/pata_isapnp.c 2010-03-15 11:52:04.000000000 -0400 | 21106 | --- linux-2.6.32.16/drivers/ata/pata_isapnp.c 2010-07-05 14:14:00.000000000 -0400 |
20944 | +++ linux-2.6.32.15/drivers/ata/pata_isapnp.c 2010-05-28 21:27:15.251151122 -0400 | 21107 | +++ linux-2.6.32.16/drivers/ata/pata_isapnp.c 2010-07-09 14:50:35.000000000 -0400 |
20945 | @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ | 21108 | @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ |
20946 | ATA_PIO_SHT(DRV_NAME), | 21109 | ATA_PIO_SHT(DRV_NAME), |
20947 | }; | 21110 | }; |
@@ -20957,9 +21120,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_isapnp.c linux-2.6.32.15/drivers/ata | |||
20957 | .inherits = &ata_sff_port_ops, | 21120 | .inherits = &ata_sff_port_ops, |
20958 | .cable_detect = ata_cable_40wire, | 21121 | .cable_detect = ata_cable_40wire, |
20959 | /* No altstatus so we don't want to use the lost interrupt poll */ | 21122 | /* No altstatus so we don't want to use the lost interrupt poll */ |
20960 | diff -urNp linux-2.6.32.15/drivers/ata/pata_it8213.c linux-2.6.32.15/drivers/ata/pata_it8213.c | 21123 | diff -urNp linux-2.6.32.16/drivers/ata/pata_it8213.c linux-2.6.32.16/drivers/ata/pata_it8213.c |
20961 | --- linux-2.6.32.15/drivers/ata/pata_it8213.c 2010-03-15 11:52:04.000000000 -0400 | 21124 | --- linux-2.6.32.16/drivers/ata/pata_it8213.c 2010-07-05 14:14:00.000000000 -0400 |
20962 | +++ linux-2.6.32.15/drivers/ata/pata_it8213.c 2010-05-28 21:27:15.251151122 -0400 | 21125 | +++ linux-2.6.32.16/drivers/ata/pata_it8213.c 2010-07-09 14:50:35.000000000 -0400 |
20963 | @@ -234,7 +234,7 @@ static struct scsi_host_template it8213_ | 21126 | @@ -234,7 +234,7 @@ static struct scsi_host_template it8213_ |
20964 | }; | 21127 | }; |
20965 | 21128 | ||
@@ -20969,9 +21132,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_it8213.c linux-2.6.32.15/drivers/ata | |||
20969 | .inherits = &ata_bmdma_port_ops, | 21132 | .inherits = &ata_bmdma_port_ops, |
20970 | .cable_detect = it8213_cable_detect, | 21133 | .cable_detect = it8213_cable_detect, |
20971 | .set_piomode = it8213_set_piomode, | 21134 | .set_piomode = it8213_set_piomode, |
20972 | diff -urNp linux-2.6.32.15/drivers/ata/pata_it821x.c linux-2.6.32.15/drivers/ata/pata_it821x.c | 21135 | diff -urNp linux-2.6.32.16/drivers/ata/pata_it821x.c linux-2.6.32.16/drivers/ata/pata_it821x.c |
20973 | --- linux-2.6.32.15/drivers/ata/pata_it821x.c 2010-03-15 11:52:04.000000000 -0400 | 21136 | --- linux-2.6.32.16/drivers/ata/pata_it821x.c 2010-07-05 14:14:00.000000000 -0400 |
20974 | +++ linux-2.6.32.15/drivers/ata/pata_it821x.c 2010-05-28 21:27:15.251151122 -0400 | 21137 | +++ linux-2.6.32.16/drivers/ata/pata_it821x.c 2010-07-09 14:50:35.000000000 -0400 |
20975 | @@ -800,7 +800,7 @@ static struct scsi_host_template it821x_ | 21138 | @@ -800,7 +800,7 @@ static struct scsi_host_template it821x_ |
20976 | ATA_BMDMA_SHT(DRV_NAME), | 21139 | ATA_BMDMA_SHT(DRV_NAME), |
20977 | }; | 21140 | }; |
@@ -20999,9 +21162,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_it821x.c linux-2.6.32.15/drivers/ata | |||
20999 | .inherits = &ata_bmdma_port_ops, | 21162 | .inherits = &ata_bmdma_port_ops, |
21000 | 21163 | ||
21001 | .check_atapi_dma= it821x_check_atapi_dma, | 21164 | .check_atapi_dma= it821x_check_atapi_dma, |
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 | 21165 | diff -urNp linux-2.6.32.16/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.16/drivers/ata/pata_ixp4xx_cf.c |
21003 | --- linux-2.6.32.15/drivers/ata/pata_ixp4xx_cf.c 2010-03-15 11:52:04.000000000 -0400 | 21166 | --- linux-2.6.32.16/drivers/ata/pata_ixp4xx_cf.c 2010-07-05 14:14:00.000000000 -0400 |
21004 | +++ linux-2.6.32.15/drivers/ata/pata_ixp4xx_cf.c 2010-05-28 21:27:15.251151122 -0400 | 21167 | +++ linux-2.6.32.16/drivers/ata/pata_ixp4xx_cf.c 2010-07-09 14:50:35.000000000 -0400 |
21005 | @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ | 21168 | @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ |
21006 | ATA_PIO_SHT(DRV_NAME), | 21169 | ATA_PIO_SHT(DRV_NAME), |
21007 | }; | 21170 | }; |
@@ -21011,9 +21174,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.15/drivers/ | |||
21011 | .inherits = &ata_sff_port_ops, | 21174 | .inherits = &ata_sff_port_ops, |
21012 | .sff_data_xfer = ixp4xx_mmio_data_xfer, | 21175 | .sff_data_xfer = ixp4xx_mmio_data_xfer, |
21013 | .cable_detect = ata_cable_40wire, | 21176 | .cable_detect = ata_cable_40wire, |
21014 | diff -urNp linux-2.6.32.15/drivers/ata/pata_jmicron.c linux-2.6.32.15/drivers/ata/pata_jmicron.c | 21177 | diff -urNp linux-2.6.32.16/drivers/ata/pata_jmicron.c linux-2.6.32.16/drivers/ata/pata_jmicron.c |
21015 | --- linux-2.6.32.15/drivers/ata/pata_jmicron.c 2010-03-15 11:52:04.000000000 -0400 | 21178 | --- linux-2.6.32.16/drivers/ata/pata_jmicron.c 2010-07-05 14:14:00.000000000 -0400 |
21016 | +++ linux-2.6.32.15/drivers/ata/pata_jmicron.c 2010-05-28 21:27:15.251151122 -0400 | 21179 | +++ linux-2.6.32.16/drivers/ata/pata_jmicron.c 2010-07-09 14:50:35.000000000 -0400 |
21017 | @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron | 21180 | @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron |
21018 | ATA_BMDMA_SHT(DRV_NAME), | 21181 | ATA_BMDMA_SHT(DRV_NAME), |
21019 | }; | 21182 | }; |
@@ -21023,9 +21186,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_jmicron.c linux-2.6.32.15/drivers/at | |||
21023 | .inherits = &ata_bmdma_port_ops, | 21186 | .inherits = &ata_bmdma_port_ops, |
21024 | .prereset = jmicron_pre_reset, | 21187 | .prereset = jmicron_pre_reset, |
21025 | }; | 21188 | }; |
21026 | diff -urNp linux-2.6.32.15/drivers/ata/pata_legacy.c linux-2.6.32.15/drivers/ata/pata_legacy.c | 21189 | diff -urNp linux-2.6.32.16/drivers/ata/pata_legacy.c linux-2.6.32.16/drivers/ata/pata_legacy.c |
21027 | --- linux-2.6.32.15/drivers/ata/pata_legacy.c 2010-03-15 11:52:04.000000000 -0400 | 21190 | --- linux-2.6.32.16/drivers/ata/pata_legacy.c 2010-07-05 14:14:00.000000000 -0400 |
21028 | +++ linux-2.6.32.15/drivers/ata/pata_legacy.c 2010-05-28 21:27:15.251151122 -0400 | 21191 | +++ linux-2.6.32.16/drivers/ata/pata_legacy.c 2010-07-09 14:50:35.000000000 -0400 |
21029 | @@ -106,7 +106,7 @@ struct legacy_probe { | 21192 | @@ -106,7 +106,7 @@ struct legacy_probe { |
21030 | 21193 | ||
21031 | struct legacy_controller { | 21194 | struct legacy_controller { |
@@ -21137,9 +21300,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_legacy.c linux-2.6.32.15/drivers/ata | |||
21137 | struct legacy_data *ld = &legacy_data[probe->slot]; | 21300 | struct legacy_data *ld = &legacy_data[probe->slot]; |
21138 | struct ata_host *host = NULL; | 21301 | struct ata_host *host = NULL; |
21139 | struct ata_port *ap; | 21302 | struct ata_port *ap; |
21140 | diff -urNp linux-2.6.32.15/drivers/ata/pata_marvell.c linux-2.6.32.15/drivers/ata/pata_marvell.c | 21303 | diff -urNp linux-2.6.32.16/drivers/ata/pata_marvell.c linux-2.6.32.16/drivers/ata/pata_marvell.c |
21141 | --- linux-2.6.32.15/drivers/ata/pata_marvell.c 2010-03-15 11:52:04.000000000 -0400 | 21304 | --- linux-2.6.32.16/drivers/ata/pata_marvell.c 2010-07-05 14:14:00.000000000 -0400 |
21142 | +++ linux-2.6.32.15/drivers/ata/pata_marvell.c 2010-05-28 21:27:15.251151122 -0400 | 21305 | +++ linux-2.6.32.16/drivers/ata/pata_marvell.c 2010-07-09 14:50:35.000000000 -0400 |
21143 | @@ -100,7 +100,7 @@ static struct scsi_host_template marvell | 21306 | @@ -100,7 +100,7 @@ static struct scsi_host_template marvell |
21144 | ATA_BMDMA_SHT(DRV_NAME), | 21307 | ATA_BMDMA_SHT(DRV_NAME), |
21145 | }; | 21308 | }; |
@@ -21149,9 +21312,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_marvell.c linux-2.6.32.15/drivers/at | |||
21149 | .inherits = &ata_bmdma_port_ops, | 21312 | .inherits = &ata_bmdma_port_ops, |
21150 | .cable_detect = marvell_cable_detect, | 21313 | .cable_detect = marvell_cable_detect, |
21151 | .prereset = marvell_pre_reset, | 21314 | .prereset = marvell_pre_reset, |
21152 | diff -urNp linux-2.6.32.15/drivers/ata/pata_mpc52xx.c linux-2.6.32.15/drivers/ata/pata_mpc52xx.c | 21315 | diff -urNp linux-2.6.32.16/drivers/ata/pata_mpc52xx.c linux-2.6.32.16/drivers/ata/pata_mpc52xx.c |
21153 | --- linux-2.6.32.15/drivers/ata/pata_mpc52xx.c 2010-03-15 11:52:04.000000000 -0400 | 21316 | --- linux-2.6.32.16/drivers/ata/pata_mpc52xx.c 2010-07-05 14:14:00.000000000 -0400 |
21154 | +++ linux-2.6.32.15/drivers/ata/pata_mpc52xx.c 2010-05-28 21:27:15.251151122 -0400 | 21317 | +++ linux-2.6.32.16/drivers/ata/pata_mpc52xx.c 2010-07-09 14:50:35.000000000 -0400 |
21155 | @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx | 21318 | @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx |
21156 | ATA_PIO_SHT(DRV_NAME), | 21319 | ATA_PIO_SHT(DRV_NAME), |
21157 | }; | 21320 | }; |
@@ -21161,9 +21324,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_mpc52xx.c linux-2.6.32.15/drivers/at | |||
21161 | .inherits = &ata_sff_port_ops, | 21324 | .inherits = &ata_sff_port_ops, |
21162 | .sff_dev_select = mpc52xx_ata_dev_select, | 21325 | .sff_dev_select = mpc52xx_ata_dev_select, |
21163 | .set_piomode = mpc52xx_ata_set_piomode, | 21326 | .set_piomode = mpc52xx_ata_set_piomode, |
21164 | diff -urNp linux-2.6.32.15/drivers/ata/pata_mpiix.c linux-2.6.32.15/drivers/ata/pata_mpiix.c | 21327 | diff -urNp linux-2.6.32.16/drivers/ata/pata_mpiix.c linux-2.6.32.16/drivers/ata/pata_mpiix.c |
21165 | --- linux-2.6.32.15/drivers/ata/pata_mpiix.c 2010-03-15 11:52:04.000000000 -0400 | 21328 | --- linux-2.6.32.16/drivers/ata/pata_mpiix.c 2010-07-05 14:14:00.000000000 -0400 |
21166 | +++ linux-2.6.32.15/drivers/ata/pata_mpiix.c 2010-05-28 21:27:15.251151122 -0400 | 21329 | +++ linux-2.6.32.16/drivers/ata/pata_mpiix.c 2010-07-09 14:50:35.000000000 -0400 |
21167 | @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s | 21330 | @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s |
21168 | ATA_PIO_SHT(DRV_NAME), | 21331 | ATA_PIO_SHT(DRV_NAME), |
21169 | }; | 21332 | }; |
@@ -21173,9 +21336,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_mpiix.c linux-2.6.32.15/drivers/ata/ | |||
21173 | .inherits = &ata_sff_port_ops, | 21336 | .inherits = &ata_sff_port_ops, |
21174 | .qc_issue = mpiix_qc_issue, | 21337 | .qc_issue = mpiix_qc_issue, |
21175 | .cable_detect = ata_cable_40wire, | 21338 | .cable_detect = ata_cable_40wire, |
21176 | diff -urNp linux-2.6.32.15/drivers/ata/pata_netcell.c linux-2.6.32.15/drivers/ata/pata_netcell.c | 21339 | diff -urNp linux-2.6.32.16/drivers/ata/pata_netcell.c linux-2.6.32.16/drivers/ata/pata_netcell.c |
21177 | --- linux-2.6.32.15/drivers/ata/pata_netcell.c 2010-03-15 11:52:04.000000000 -0400 | 21340 | --- linux-2.6.32.16/drivers/ata/pata_netcell.c 2010-07-05 14:14:00.000000000 -0400 |
21178 | +++ linux-2.6.32.15/drivers/ata/pata_netcell.c 2010-05-28 21:27:15.251151122 -0400 | 21341 | +++ linux-2.6.32.16/drivers/ata/pata_netcell.c 2010-07-09 14:50:35.000000000 -0400 |
21179 | @@ -34,7 +34,7 @@ static struct scsi_host_template netcell | 21342 | @@ -34,7 +34,7 @@ static struct scsi_host_template netcell |
21180 | ATA_BMDMA_SHT(DRV_NAME), | 21343 | ATA_BMDMA_SHT(DRV_NAME), |
21181 | }; | 21344 | }; |
@@ -21185,9 +21348,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_netcell.c linux-2.6.32.15/drivers/at | |||
21185 | .inherits = &ata_bmdma_port_ops, | 21348 | .inherits = &ata_bmdma_port_ops, |
21186 | .cable_detect = ata_cable_80wire, | 21349 | .cable_detect = ata_cable_80wire, |
21187 | .read_id = netcell_read_id, | 21350 | .read_id = netcell_read_id, |
21188 | diff -urNp linux-2.6.32.15/drivers/ata/pata_ninja32.c linux-2.6.32.15/drivers/ata/pata_ninja32.c | 21351 | diff -urNp linux-2.6.32.16/drivers/ata/pata_ninja32.c linux-2.6.32.16/drivers/ata/pata_ninja32.c |
21189 | --- linux-2.6.32.15/drivers/ata/pata_ninja32.c 2010-03-15 11:52:04.000000000 -0400 | 21352 | --- linux-2.6.32.16/drivers/ata/pata_ninja32.c 2010-07-05 14:14:00.000000000 -0400 |
21190 | +++ linux-2.6.32.15/drivers/ata/pata_ninja32.c 2010-05-28 21:27:15.251151122 -0400 | 21353 | +++ linux-2.6.32.16/drivers/ata/pata_ninja32.c 2010-07-09 14:50:35.000000000 -0400 |
21191 | @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 | 21354 | @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 |
21192 | ATA_BMDMA_SHT(DRV_NAME), | 21355 | ATA_BMDMA_SHT(DRV_NAME), |
21193 | }; | 21356 | }; |
@@ -21197,9 +21360,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_ninja32.c linux-2.6.32.15/drivers/at | |||
21197 | .inherits = &ata_bmdma_port_ops, | 21360 | .inherits = &ata_bmdma_port_ops, |
21198 | .sff_dev_select = ninja32_dev_select, | 21361 | .sff_dev_select = ninja32_dev_select, |
21199 | .cable_detect = ata_cable_40wire, | 21362 | .cable_detect = ata_cable_40wire, |
21200 | diff -urNp linux-2.6.32.15/drivers/ata/pata_ns87410.c linux-2.6.32.15/drivers/ata/pata_ns87410.c | 21363 | diff -urNp linux-2.6.32.16/drivers/ata/pata_ns87410.c linux-2.6.32.16/drivers/ata/pata_ns87410.c |
21201 | --- linux-2.6.32.15/drivers/ata/pata_ns87410.c 2010-03-15 11:52:04.000000000 -0400 | 21364 | --- linux-2.6.32.16/drivers/ata/pata_ns87410.c 2010-07-05 14:14:00.000000000 -0400 |
21202 | +++ linux-2.6.32.15/drivers/ata/pata_ns87410.c 2010-05-28 21:27:15.251151122 -0400 | 21365 | +++ linux-2.6.32.16/drivers/ata/pata_ns87410.c 2010-07-09 14:50:35.000000000 -0400 |
21203 | @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 | 21366 | @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 |
21204 | ATA_PIO_SHT(DRV_NAME), | 21367 | ATA_PIO_SHT(DRV_NAME), |
21205 | }; | 21368 | }; |
@@ -21209,9 +21372,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_ns87410.c linux-2.6.32.15/drivers/at | |||
21209 | .inherits = &ata_sff_port_ops, | 21372 | .inherits = &ata_sff_port_ops, |
21210 | .qc_issue = ns87410_qc_issue, | 21373 | .qc_issue = ns87410_qc_issue, |
21211 | .cable_detect = ata_cable_40wire, | 21374 | .cable_detect = ata_cable_40wire, |
21212 | diff -urNp linux-2.6.32.15/drivers/ata/pata_ns87415.c linux-2.6.32.15/drivers/ata/pata_ns87415.c | 21375 | diff -urNp linux-2.6.32.16/drivers/ata/pata_ns87415.c linux-2.6.32.16/drivers/ata/pata_ns87415.c |
21213 | --- linux-2.6.32.15/drivers/ata/pata_ns87415.c 2010-03-15 11:52:04.000000000 -0400 | 21376 | --- linux-2.6.32.16/drivers/ata/pata_ns87415.c 2010-07-05 14:14:00.000000000 -0400 |
21214 | +++ linux-2.6.32.15/drivers/ata/pata_ns87415.c 2010-05-28 21:27:15.251151122 -0400 | 21377 | +++ linux-2.6.32.16/drivers/ata/pata_ns87415.c 2010-07-09 14:50:35.000000000 -0400 |
21215 | @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at | 21378 | @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at |
21216 | } | 21379 | } |
21217 | #endif /* 87560 SuperIO Support */ | 21380 | #endif /* 87560 SuperIO Support */ |
@@ -21230,9 +21393,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_ns87415.c linux-2.6.32.15/drivers/at | |||
21230 | .inherits = &ns87415_pata_ops, | 21393 | .inherits = &ns87415_pata_ops, |
21231 | .sff_tf_read = ns87560_tf_read, | 21394 | .sff_tf_read = ns87560_tf_read, |
21232 | .sff_check_status = ns87560_check_status, | 21395 | .sff_check_status = ns87560_check_status, |
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 | 21396 | diff -urNp linux-2.6.32.16/drivers/ata/pata_octeon_cf.c linux-2.6.32.16/drivers/ata/pata_octeon_cf.c |
21234 | --- linux-2.6.32.15/drivers/ata/pata_octeon_cf.c 2010-03-15 11:52:04.000000000 -0400 | 21397 | --- linux-2.6.32.16/drivers/ata/pata_octeon_cf.c 2010-07-05 14:14:00.000000000 -0400 |
21235 | +++ linux-2.6.32.15/drivers/ata/pata_octeon_cf.c 2010-05-28 21:27:15.251151122 -0400 | 21398 | +++ linux-2.6.32.16/drivers/ata/pata_octeon_cf.c 2010-07-09 14:50:35.000000000 -0400 |
21236 | @@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s | 21399 | @@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s |
21237 | return 0; | 21400 | return 0; |
21238 | } | 21401 | } |
@@ -21241,9 +21404,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_octeon_cf.c linux-2.6.32.15/drivers/ | |||
21241 | static struct ata_port_operations octeon_cf_ops = { | 21404 | static struct ata_port_operations octeon_cf_ops = { |
21242 | .inherits = &ata_sff_port_ops, | 21405 | .inherits = &ata_sff_port_ops, |
21243 | .check_atapi_dma = octeon_cf_check_atapi_dma, | 21406 | .check_atapi_dma = octeon_cf_check_atapi_dma, |
21244 | diff -urNp linux-2.6.32.15/drivers/ata/pata_oldpiix.c linux-2.6.32.15/drivers/ata/pata_oldpiix.c | 21407 | diff -urNp linux-2.6.32.16/drivers/ata/pata_oldpiix.c linux-2.6.32.16/drivers/ata/pata_oldpiix.c |
21245 | --- linux-2.6.32.15/drivers/ata/pata_oldpiix.c 2010-03-15 11:52:04.000000000 -0400 | 21408 | --- linux-2.6.32.16/drivers/ata/pata_oldpiix.c 2010-07-05 14:14:00.000000000 -0400 |
21246 | +++ linux-2.6.32.15/drivers/ata/pata_oldpiix.c 2010-05-28 21:27:15.251151122 -0400 | 21409 | +++ linux-2.6.32.16/drivers/ata/pata_oldpiix.c 2010-07-09 14:50:35.000000000 -0400 |
21247 | @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix | 21410 | @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix |
21248 | ATA_BMDMA_SHT(DRV_NAME), | 21411 | ATA_BMDMA_SHT(DRV_NAME), |
21249 | }; | 21412 | }; |
@@ -21253,9 +21416,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_oldpiix.c linux-2.6.32.15/drivers/at | |||
21253 | .inherits = &ata_bmdma_port_ops, | 21416 | .inherits = &ata_bmdma_port_ops, |
21254 | .qc_issue = oldpiix_qc_issue, | 21417 | .qc_issue = oldpiix_qc_issue, |
21255 | .cable_detect = ata_cable_40wire, | 21418 | .cable_detect = ata_cable_40wire, |
21256 | diff -urNp linux-2.6.32.15/drivers/ata/pata_opti.c linux-2.6.32.15/drivers/ata/pata_opti.c | 21419 | diff -urNp linux-2.6.32.16/drivers/ata/pata_opti.c linux-2.6.32.16/drivers/ata/pata_opti.c |
21257 | --- linux-2.6.32.15/drivers/ata/pata_opti.c 2010-03-15 11:52:04.000000000 -0400 | 21420 | --- linux-2.6.32.16/drivers/ata/pata_opti.c 2010-07-05 14:14:00.000000000 -0400 |
21258 | +++ linux-2.6.32.15/drivers/ata/pata_opti.c 2010-05-28 21:27:15.263188611 -0400 | 21421 | +++ linux-2.6.32.16/drivers/ata/pata_opti.c 2010-07-09 14:50:35.000000000 -0400 |
21259 | @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh | 21422 | @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh |
21260 | ATA_PIO_SHT(DRV_NAME), | 21423 | ATA_PIO_SHT(DRV_NAME), |
21261 | }; | 21424 | }; |
@@ -21265,9 +21428,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_opti.c linux-2.6.32.15/drivers/ata/p | |||
21265 | .inherits = &ata_sff_port_ops, | 21428 | .inherits = &ata_sff_port_ops, |
21266 | .cable_detect = ata_cable_40wire, | 21429 | .cable_detect = ata_cable_40wire, |
21267 | .set_piomode = opti_set_piomode, | 21430 | .set_piomode = opti_set_piomode, |
21268 | diff -urNp linux-2.6.32.15/drivers/ata/pata_optidma.c linux-2.6.32.15/drivers/ata/pata_optidma.c | 21431 | diff -urNp linux-2.6.32.16/drivers/ata/pata_optidma.c linux-2.6.32.16/drivers/ata/pata_optidma.c |
21269 | --- linux-2.6.32.15/drivers/ata/pata_optidma.c 2010-03-15 11:52:04.000000000 -0400 | 21432 | --- linux-2.6.32.16/drivers/ata/pata_optidma.c 2010-07-05 14:14:00.000000000 -0400 |
21270 | +++ linux-2.6.32.15/drivers/ata/pata_optidma.c 2010-05-28 21:27:15.263188611 -0400 | 21433 | +++ linux-2.6.32.16/drivers/ata/pata_optidma.c 2010-07-09 14:50:35.000000000 -0400 |
21271 | @@ -337,7 +337,7 @@ static struct scsi_host_template optidma | 21434 | @@ -337,7 +337,7 @@ static struct scsi_host_template optidma |
21272 | ATA_BMDMA_SHT(DRV_NAME), | 21435 | ATA_BMDMA_SHT(DRV_NAME), |
21273 | }; | 21436 | }; |
@@ -21286,9 +21449,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_optidma.c linux-2.6.32.15/drivers/at | |||
21286 | .inherits = &optidma_port_ops, | 21449 | .inherits = &optidma_port_ops, |
21287 | .set_piomode = optiplus_set_pio_mode, | 21450 | .set_piomode = optiplus_set_pio_mode, |
21288 | .set_dmamode = optiplus_set_dma_mode, | 21451 | .set_dmamode = optiplus_set_dma_mode, |
21289 | diff -urNp linux-2.6.32.15/drivers/ata/pata_palmld.c linux-2.6.32.15/drivers/ata/pata_palmld.c | 21452 | diff -urNp linux-2.6.32.16/drivers/ata/pata_palmld.c linux-2.6.32.16/drivers/ata/pata_palmld.c |
21290 | --- linux-2.6.32.15/drivers/ata/pata_palmld.c 2010-03-15 11:52:04.000000000 -0400 | 21453 | --- linux-2.6.32.16/drivers/ata/pata_palmld.c 2010-07-05 14:14:00.000000000 -0400 |
21291 | +++ linux-2.6.32.15/drivers/ata/pata_palmld.c 2010-05-28 21:27:15.263188611 -0400 | 21454 | +++ linux-2.6.32.16/drivers/ata/pata_palmld.c 2010-07-09 14:50:35.000000000 -0400 |
21292 | @@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ | 21455 | @@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ |
21293 | ATA_PIO_SHT(DRV_NAME), | 21456 | ATA_PIO_SHT(DRV_NAME), |
21294 | }; | 21457 | }; |
@@ -21298,9 +21461,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_palmld.c linux-2.6.32.15/drivers/ata | |||
21298 | .inherits = &ata_sff_port_ops, | 21461 | .inherits = &ata_sff_port_ops, |
21299 | .sff_data_xfer = ata_sff_data_xfer_noirq, | 21462 | .sff_data_xfer = ata_sff_data_xfer_noirq, |
21300 | .cable_detect = ata_cable_40wire, | 21463 | .cable_detect = ata_cable_40wire, |
21301 | diff -urNp linux-2.6.32.15/drivers/ata/pata_pcmcia.c linux-2.6.32.15/drivers/ata/pata_pcmcia.c | 21464 | diff -urNp linux-2.6.32.16/drivers/ata/pata_pcmcia.c linux-2.6.32.16/drivers/ata/pata_pcmcia.c |
21302 | --- linux-2.6.32.15/drivers/ata/pata_pcmcia.c 2010-03-15 11:52:04.000000000 -0400 | 21465 | --- linux-2.6.32.16/drivers/ata/pata_pcmcia.c 2010-07-05 14:14:00.000000000 -0400 |
21303 | +++ linux-2.6.32.15/drivers/ata/pata_pcmcia.c 2010-05-28 21:27:15.263188611 -0400 | 21466 | +++ linux-2.6.32.16/drivers/ata/pata_pcmcia.c 2010-07-09 14:50:35.000000000 -0400 |
21304 | @@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_ | 21467 | @@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_ |
21305 | ATA_PIO_SHT(DRV_NAME), | 21468 | ATA_PIO_SHT(DRV_NAME), |
21306 | }; | 21469 | }; |
@@ -21327,9 +21490,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_pcmcia.c linux-2.6.32.15/drivers/ata | |||
21327 | 21490 | ||
21328 | info = kzalloc(sizeof(*info), GFP_KERNEL); | 21491 | info = kzalloc(sizeof(*info), GFP_KERNEL); |
21329 | if (info == NULL) | 21492 | if (info == NULL) |
21330 | diff -urNp linux-2.6.32.15/drivers/ata/pata_pdc2027x.c linux-2.6.32.15/drivers/ata/pata_pdc2027x.c | 21493 | diff -urNp linux-2.6.32.16/drivers/ata/pata_pdc2027x.c linux-2.6.32.16/drivers/ata/pata_pdc2027x.c |
21331 | --- linux-2.6.32.15/drivers/ata/pata_pdc2027x.c 2010-03-15 11:52:04.000000000 -0400 | 21494 | --- linux-2.6.32.16/drivers/ata/pata_pdc2027x.c 2010-07-05 14:14:00.000000000 -0400 |
21332 | +++ linux-2.6.32.15/drivers/ata/pata_pdc2027x.c 2010-05-28 21:27:15.263188611 -0400 | 21495 | +++ linux-2.6.32.16/drivers/ata/pata_pdc2027x.c 2010-07-09 14:50:35.000000000 -0400 |
21333 | @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 | 21496 | @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 |
21334 | ATA_BMDMA_SHT(DRV_NAME), | 21497 | ATA_BMDMA_SHT(DRV_NAME), |
21335 | }; | 21498 | }; |
@@ -21347,9 +21510,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_pdc2027x.c linux-2.6.32.15/drivers/a | |||
21347 | .inherits = &pdc2027x_pata100_ops, | 21510 | .inherits = &pdc2027x_pata100_ops, |
21348 | .mode_filter = pdc2027x_mode_filter, | 21511 | .mode_filter = pdc2027x_mode_filter, |
21349 | .set_piomode = pdc2027x_set_piomode, | 21512 | .set_piomode = pdc2027x_set_piomode, |
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 | 21513 | diff -urNp linux-2.6.32.16/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.16/drivers/ata/pata_pdc202xx_old.c |
21351 | --- linux-2.6.32.15/drivers/ata/pata_pdc202xx_old.c 2010-03-15 11:52:04.000000000 -0400 | 21514 | --- linux-2.6.32.16/drivers/ata/pata_pdc202xx_old.c 2010-07-05 14:14:00.000000000 -0400 |
21352 | +++ linux-2.6.32.15/drivers/ata/pata_pdc202xx_old.c 2010-05-28 21:27:15.263188611 -0400 | 21515 | +++ linux-2.6.32.16/drivers/ata/pata_pdc202xx_old.c 2010-07-09 14:50:35.000000000 -0400 |
21353 | @@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x | 21516 | @@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x |
21354 | ATA_BMDMA_SHT(DRV_NAME), | 21517 | ATA_BMDMA_SHT(DRV_NAME), |
21355 | }; | 21518 | }; |
@@ -21368,9 +21531,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.15/drive | |||
21368 | .inherits = &pdc2024x_port_ops, | 21531 | .inherits = &pdc2024x_port_ops, |
21369 | 21532 | ||
21370 | .check_atapi_dma = pdc2026x_check_atapi_dma, | 21533 | .check_atapi_dma = pdc2026x_check_atapi_dma, |
21371 | diff -urNp linux-2.6.32.15/drivers/ata/pata_platform.c linux-2.6.32.15/drivers/ata/pata_platform.c | 21534 | diff -urNp linux-2.6.32.16/drivers/ata/pata_platform.c linux-2.6.32.16/drivers/ata/pata_platform.c |
21372 | --- linux-2.6.32.15/drivers/ata/pata_platform.c 2010-03-15 11:52:04.000000000 -0400 | 21535 | --- linux-2.6.32.16/drivers/ata/pata_platform.c 2010-07-05 14:14:00.000000000 -0400 |
21373 | +++ linux-2.6.32.15/drivers/ata/pata_platform.c 2010-05-28 21:27:15.263188611 -0400 | 21536 | +++ linux-2.6.32.16/drivers/ata/pata_platform.c 2010-07-09 14:50:35.000000000 -0400 |
21374 | @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl | 21537 | @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl |
21375 | ATA_PIO_SHT(DRV_NAME), | 21538 | ATA_PIO_SHT(DRV_NAME), |
21376 | }; | 21539 | }; |
@@ -21380,9 +21543,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_platform.c linux-2.6.32.15/drivers/a | |||
21380 | .inherits = &ata_sff_port_ops, | 21543 | .inherits = &ata_sff_port_ops, |
21381 | .sff_data_xfer = ata_sff_data_xfer_noirq, | 21544 | .sff_data_xfer = ata_sff_data_xfer_noirq, |
21382 | .cable_detect = ata_cable_unknown, | 21545 | .cable_detect = ata_cable_unknown, |
21383 | diff -urNp linux-2.6.32.15/drivers/ata/pata_qdi.c linux-2.6.32.15/drivers/ata/pata_qdi.c | 21546 | diff -urNp linux-2.6.32.16/drivers/ata/pata_qdi.c linux-2.6.32.16/drivers/ata/pata_qdi.c |
21384 | --- linux-2.6.32.15/drivers/ata/pata_qdi.c 2010-03-15 11:52:04.000000000 -0400 | 21547 | --- linux-2.6.32.16/drivers/ata/pata_qdi.c 2010-07-05 14:14:00.000000000 -0400 |
21385 | +++ linux-2.6.32.15/drivers/ata/pata_qdi.c 2010-05-28 21:27:15.263188611 -0400 | 21548 | +++ linux-2.6.32.16/drivers/ata/pata_qdi.c 2010-07-09 14:50:35.000000000 -0400 |
21386 | @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht | 21549 | @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht |
21387 | ATA_PIO_SHT(DRV_NAME), | 21550 | ATA_PIO_SHT(DRV_NAME), |
21388 | }; | 21551 | }; |
@@ -21401,9 +21564,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_qdi.c linux-2.6.32.15/drivers/ata/pa | |||
21401 | .inherits = &qdi6500_port_ops, | 21564 | .inherits = &qdi6500_port_ops, |
21402 | .set_piomode = qdi6580_set_piomode, | 21565 | .set_piomode = qdi6580_set_piomode, |
21403 | }; | 21566 | }; |
21404 | diff -urNp linux-2.6.32.15/drivers/ata/pata_radisys.c linux-2.6.32.15/drivers/ata/pata_radisys.c | 21567 | diff -urNp linux-2.6.32.16/drivers/ata/pata_radisys.c linux-2.6.32.16/drivers/ata/pata_radisys.c |
21405 | --- linux-2.6.32.15/drivers/ata/pata_radisys.c 2010-03-15 11:52:04.000000000 -0400 | 21568 | --- linux-2.6.32.16/drivers/ata/pata_radisys.c 2010-07-05 14:14:00.000000000 -0400 |
21406 | +++ linux-2.6.32.15/drivers/ata/pata_radisys.c 2010-05-28 21:27:15.267180677 -0400 | 21569 | +++ linux-2.6.32.16/drivers/ata/pata_radisys.c 2010-07-09 14:50:35.000000000 -0400 |
21407 | @@ -187,7 +187,7 @@ static struct scsi_host_template radisys | 21570 | @@ -187,7 +187,7 @@ static struct scsi_host_template radisys |
21408 | ATA_BMDMA_SHT(DRV_NAME), | 21571 | ATA_BMDMA_SHT(DRV_NAME), |
21409 | }; | 21572 | }; |
@@ -21413,9 +21576,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_radisys.c linux-2.6.32.15/drivers/at | |||
21413 | .inherits = &ata_bmdma_port_ops, | 21576 | .inherits = &ata_bmdma_port_ops, |
21414 | .qc_issue = radisys_qc_issue, | 21577 | .qc_issue = radisys_qc_issue, |
21415 | .cable_detect = ata_cable_unknown, | 21578 | .cable_detect = ata_cable_unknown, |
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 | 21579 | diff -urNp linux-2.6.32.16/drivers/ata/pata_rb532_cf.c linux-2.6.32.16/drivers/ata/pata_rb532_cf.c |
21417 | --- linux-2.6.32.15/drivers/ata/pata_rb532_cf.c 2010-03-15 11:52:04.000000000 -0400 | 21580 | --- linux-2.6.32.16/drivers/ata/pata_rb532_cf.c 2010-07-05 14:14:00.000000000 -0400 |
21418 | +++ linux-2.6.32.15/drivers/ata/pata_rb532_cf.c 2010-05-28 21:27:15.267180677 -0400 | 21581 | +++ linux-2.6.32.16/drivers/ata/pata_rb532_cf.c 2010-07-09 14:50:35.000000000 -0400 |
21419 | @@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle | 21582 | @@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle |
21420 | return IRQ_HANDLED; | 21583 | return IRQ_HANDLED; |
21421 | } | 21584 | } |
@@ -21425,9 +21588,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_rb532_cf.c linux-2.6.32.15/drivers/a | |||
21425 | .inherits = &ata_sff_port_ops, | 21588 | .inherits = &ata_sff_port_ops, |
21426 | .sff_data_xfer = ata_sff_data_xfer32, | 21589 | .sff_data_xfer = ata_sff_data_xfer32, |
21427 | }; | 21590 | }; |
21428 | diff -urNp linux-2.6.32.15/drivers/ata/pata_rdc.c linux-2.6.32.15/drivers/ata/pata_rdc.c | 21591 | diff -urNp linux-2.6.32.16/drivers/ata/pata_rdc.c linux-2.6.32.16/drivers/ata/pata_rdc.c |
21429 | --- linux-2.6.32.15/drivers/ata/pata_rdc.c 2010-03-15 11:52:04.000000000 -0400 | 21592 | --- linux-2.6.32.16/drivers/ata/pata_rdc.c 2010-07-05 14:14:00.000000000 -0400 |
21430 | +++ linux-2.6.32.15/drivers/ata/pata_rdc.c 2010-05-28 21:27:15.267180677 -0400 | 21593 | +++ linux-2.6.32.16/drivers/ata/pata_rdc.c 2010-07-09 14:50:35.000000000 -0400 |
21431 | @@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p | 21594 | @@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p |
21432 | pci_write_config_byte(dev, 0x48, udma_enable); | 21595 | pci_write_config_byte(dev, 0x48, udma_enable); |
21433 | } | 21596 | } |
@@ -21437,9 +21600,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_rdc.c linux-2.6.32.15/drivers/ata/pa | |||
21437 | .inherits = &ata_bmdma32_port_ops, | 21600 | .inherits = &ata_bmdma32_port_ops, |
21438 | .cable_detect = rdc_pata_cable_detect, | 21601 | .cable_detect = rdc_pata_cable_detect, |
21439 | .set_piomode = rdc_set_piomode, | 21602 | .set_piomode = rdc_set_piomode, |
21440 | diff -urNp linux-2.6.32.15/drivers/ata/pata_rz1000.c linux-2.6.32.15/drivers/ata/pata_rz1000.c | 21603 | diff -urNp linux-2.6.32.16/drivers/ata/pata_rz1000.c linux-2.6.32.16/drivers/ata/pata_rz1000.c |
21441 | --- linux-2.6.32.15/drivers/ata/pata_rz1000.c 2010-03-15 11:52:04.000000000 -0400 | 21604 | --- linux-2.6.32.16/drivers/ata/pata_rz1000.c 2010-07-05 14:14:00.000000000 -0400 |
21442 | +++ linux-2.6.32.15/drivers/ata/pata_rz1000.c 2010-05-28 21:27:15.267180677 -0400 | 21605 | +++ linux-2.6.32.16/drivers/ata/pata_rz1000.c 2010-07-09 14:50:35.000000000 -0400 |
21443 | @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ | 21606 | @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ |
21444 | ATA_PIO_SHT(DRV_NAME), | 21607 | ATA_PIO_SHT(DRV_NAME), |
21445 | }; | 21608 | }; |
@@ -21449,9 +21612,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_rz1000.c linux-2.6.32.15/drivers/ata | |||
21449 | .inherits = &ata_sff_port_ops, | 21612 | .inherits = &ata_sff_port_ops, |
21450 | .cable_detect = ata_cable_40wire, | 21613 | .cable_detect = ata_cable_40wire, |
21451 | .set_mode = rz1000_set_mode, | 21614 | .set_mode = rz1000_set_mode, |
21452 | diff -urNp linux-2.6.32.15/drivers/ata/pata_sc1200.c linux-2.6.32.15/drivers/ata/pata_sc1200.c | 21615 | diff -urNp linux-2.6.32.16/drivers/ata/pata_sc1200.c linux-2.6.32.16/drivers/ata/pata_sc1200.c |
21453 | --- linux-2.6.32.15/drivers/ata/pata_sc1200.c 2010-03-15 11:52:04.000000000 -0400 | 21616 | --- linux-2.6.32.16/drivers/ata/pata_sc1200.c 2010-07-05 14:14:00.000000000 -0400 |
21454 | +++ linux-2.6.32.15/drivers/ata/pata_sc1200.c 2010-05-28 21:27:15.267180677 -0400 | 21617 | +++ linux-2.6.32.16/drivers/ata/pata_sc1200.c 2010-07-09 14:50:35.000000000 -0400 |
21455 | @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ | 21618 | @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ |
21456 | .sg_tablesize = LIBATA_DUMB_MAX_PRD, | 21619 | .sg_tablesize = LIBATA_DUMB_MAX_PRD, |
21457 | }; | 21620 | }; |
@@ -21461,9 +21624,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_sc1200.c linux-2.6.32.15/drivers/ata | |||
21461 | .inherits = &ata_bmdma_port_ops, | 21624 | .inherits = &ata_bmdma_port_ops, |
21462 | .qc_prep = ata_sff_dumb_qc_prep, | 21625 | .qc_prep = ata_sff_dumb_qc_prep, |
21463 | .qc_issue = sc1200_qc_issue, | 21626 | .qc_issue = sc1200_qc_issue, |
21464 | diff -urNp linux-2.6.32.15/drivers/ata/pata_scc.c linux-2.6.32.15/drivers/ata/pata_scc.c | 21627 | diff -urNp linux-2.6.32.16/drivers/ata/pata_scc.c linux-2.6.32.16/drivers/ata/pata_scc.c |
21465 | --- linux-2.6.32.15/drivers/ata/pata_scc.c 2010-03-15 11:52:04.000000000 -0400 | 21628 | --- linux-2.6.32.16/drivers/ata/pata_scc.c 2010-07-05 14:14:00.000000000 -0400 |
21466 | +++ linux-2.6.32.15/drivers/ata/pata_scc.c 2010-05-28 21:27:15.267180677 -0400 | 21629 | +++ linux-2.6.32.16/drivers/ata/pata_scc.c 2010-07-09 14:50:35.000000000 -0400 |
21467 | @@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht | 21630 | @@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht |
21468 | ATA_BMDMA_SHT(DRV_NAME), | 21631 | ATA_BMDMA_SHT(DRV_NAME), |
21469 | }; | 21632 | }; |
@@ -21473,9 +21636,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_scc.c linux-2.6.32.15/drivers/ata/pa | |||
21473 | .inherits = &ata_bmdma_port_ops, | 21636 | .inherits = &ata_bmdma_port_ops, |
21474 | 21637 | ||
21475 | .set_piomode = scc_set_piomode, | 21638 | .set_piomode = scc_set_piomode, |
21476 | diff -urNp linux-2.6.32.15/drivers/ata/pata_sch.c linux-2.6.32.15/drivers/ata/pata_sch.c | 21639 | diff -urNp linux-2.6.32.16/drivers/ata/pata_sch.c linux-2.6.32.16/drivers/ata/pata_sch.c |
21477 | --- linux-2.6.32.15/drivers/ata/pata_sch.c 2010-03-15 11:52:04.000000000 -0400 | 21640 | --- linux-2.6.32.16/drivers/ata/pata_sch.c 2010-07-05 14:14:00.000000000 -0400 |
21478 | +++ linux-2.6.32.15/drivers/ata/pata_sch.c 2010-05-28 21:27:15.267180677 -0400 | 21641 | +++ linux-2.6.32.16/drivers/ata/pata_sch.c 2010-07-09 14:50:35.000000000 -0400 |
21479 | @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht | 21642 | @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht |
21480 | ATA_BMDMA_SHT(DRV_NAME), | 21643 | ATA_BMDMA_SHT(DRV_NAME), |
21481 | }; | 21644 | }; |
@@ -21485,9 +21648,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_sch.c linux-2.6.32.15/drivers/ata/pa | |||
21485 | .inherits = &ata_bmdma_port_ops, | 21648 | .inherits = &ata_bmdma_port_ops, |
21486 | .cable_detect = ata_cable_unknown, | 21649 | .cable_detect = ata_cable_unknown, |
21487 | .set_piomode = sch_set_piomode, | 21650 | .set_piomode = sch_set_piomode, |
21488 | diff -urNp linux-2.6.32.15/drivers/ata/pata_serverworks.c linux-2.6.32.15/drivers/ata/pata_serverworks.c | 21651 | diff -urNp linux-2.6.32.16/drivers/ata/pata_serverworks.c linux-2.6.32.16/drivers/ata/pata_serverworks.c |
21489 | --- linux-2.6.32.15/drivers/ata/pata_serverworks.c 2010-03-15 11:52:04.000000000 -0400 | 21652 | --- linux-2.6.32.16/drivers/ata/pata_serverworks.c 2010-07-05 14:14:00.000000000 -0400 |
21490 | +++ linux-2.6.32.15/drivers/ata/pata_serverworks.c 2010-05-28 21:27:15.267180677 -0400 | 21653 | +++ linux-2.6.32.16/drivers/ata/pata_serverworks.c 2010-07-09 14:50:35.000000000 -0400 |
21491 | @@ -299,7 +299,7 @@ static struct scsi_host_template serverw | 21654 | @@ -299,7 +299,7 @@ static struct scsi_host_template serverw |
21492 | ATA_BMDMA_SHT(DRV_NAME), | 21655 | ATA_BMDMA_SHT(DRV_NAME), |
21493 | }; | 21656 | }; |
@@ -21506,9 +21669,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_serverworks.c linux-2.6.32.15/driver | |||
21506 | .inherits = &serverworks_osb4_port_ops, | 21669 | .inherits = &serverworks_osb4_port_ops, |
21507 | .mode_filter = serverworks_csb_filter, | 21670 | .mode_filter = serverworks_csb_filter, |
21508 | }; | 21671 | }; |
21509 | diff -urNp linux-2.6.32.15/drivers/ata/pata_sil680.c linux-2.6.32.15/drivers/ata/pata_sil680.c | 21672 | diff -urNp linux-2.6.32.16/drivers/ata/pata_sil680.c linux-2.6.32.16/drivers/ata/pata_sil680.c |
21510 | --- linux-2.6.32.15/drivers/ata/pata_sil680.c 2010-03-15 11:52:04.000000000 -0400 | 21673 | --- linux-2.6.32.16/drivers/ata/pata_sil680.c 2010-07-05 14:14:00.000000000 -0400 |
21511 | +++ linux-2.6.32.15/drivers/ata/pata_sil680.c 2010-05-28 21:27:15.267180677 -0400 | 21674 | +++ linux-2.6.32.16/drivers/ata/pata_sil680.c 2010-07-09 14:50:35.000000000 -0400 |
21512 | @@ -194,7 +194,7 @@ static struct scsi_host_template sil680_ | 21675 | @@ -194,7 +194,7 @@ static struct scsi_host_template sil680_ |
21513 | ATA_BMDMA_SHT(DRV_NAME), | 21676 | ATA_BMDMA_SHT(DRV_NAME), |
21514 | }; | 21677 | }; |
@@ -21518,9 +21681,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_sil680.c linux-2.6.32.15/drivers/ata | |||
21518 | .inherits = &ata_bmdma32_port_ops, | 21681 | .inherits = &ata_bmdma32_port_ops, |
21519 | .cable_detect = sil680_cable_detect, | 21682 | .cable_detect = sil680_cable_detect, |
21520 | .set_piomode = sil680_set_piomode, | 21683 | .set_piomode = sil680_set_piomode, |
21521 | diff -urNp linux-2.6.32.15/drivers/ata/pata_sis.c linux-2.6.32.15/drivers/ata/pata_sis.c | 21684 | diff -urNp linux-2.6.32.16/drivers/ata/pata_sis.c linux-2.6.32.16/drivers/ata/pata_sis.c |
21522 | --- linux-2.6.32.15/drivers/ata/pata_sis.c 2010-03-15 11:52:04.000000000 -0400 | 21685 | --- linux-2.6.32.16/drivers/ata/pata_sis.c 2010-07-05 14:14:00.000000000 -0400 |
21523 | +++ linux-2.6.32.15/drivers/ata/pata_sis.c 2010-05-28 21:27:15.267180677 -0400 | 21686 | +++ linux-2.6.32.16/drivers/ata/pata_sis.c 2010-07-09 14:50:35.000000000 -0400 |
21524 | @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht | 21687 | @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht |
21525 | ATA_BMDMA_SHT(DRV_NAME), | 21688 | ATA_BMDMA_SHT(DRV_NAME), |
21526 | }; | 21689 | }; |
@@ -21576,9 +21739,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_sis.c linux-2.6.32.15/drivers/ata/pa | |||
21576 | .inherits = &sis_base_ops, | 21739 | .inherits = &sis_base_ops, |
21577 | .set_piomode = sis_old_set_piomode, | 21740 | .set_piomode = sis_old_set_piomode, |
21578 | .set_dmamode = sis_old_set_dmamode, | 21741 | .set_dmamode = sis_old_set_dmamode, |
21579 | diff -urNp linux-2.6.32.15/drivers/ata/pata_sl82c105.c linux-2.6.32.15/drivers/ata/pata_sl82c105.c | 21742 | diff -urNp linux-2.6.32.16/drivers/ata/pata_sl82c105.c linux-2.6.32.16/drivers/ata/pata_sl82c105.c |
21580 | --- linux-2.6.32.15/drivers/ata/pata_sl82c105.c 2010-03-15 11:52:04.000000000 -0400 | 21743 | --- linux-2.6.32.16/drivers/ata/pata_sl82c105.c 2010-07-05 14:14:00.000000000 -0400 |
21581 | +++ linux-2.6.32.15/drivers/ata/pata_sl82c105.c 2010-05-28 21:27:15.267180677 -0400 | 21744 | +++ linux-2.6.32.16/drivers/ata/pata_sl82c105.c 2010-07-09 14:50:35.000000000 -0400 |
21582 | @@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10 | 21745 | @@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10 |
21583 | ATA_BMDMA_SHT(DRV_NAME), | 21746 | ATA_BMDMA_SHT(DRV_NAME), |
21584 | }; | 21747 | }; |
@@ -21588,9 +21751,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_sl82c105.c linux-2.6.32.15/drivers/a | |||
21588 | .inherits = &ata_bmdma_port_ops, | 21751 | .inherits = &ata_bmdma_port_ops, |
21589 | .qc_defer = sl82c105_qc_defer, | 21752 | .qc_defer = sl82c105_qc_defer, |
21590 | .bmdma_start = sl82c105_bmdma_start, | 21753 | .bmdma_start = sl82c105_bmdma_start, |
21591 | diff -urNp linux-2.6.32.15/drivers/ata/pata_triflex.c linux-2.6.32.15/drivers/ata/pata_triflex.c | 21754 | diff -urNp linux-2.6.32.16/drivers/ata/pata_triflex.c linux-2.6.32.16/drivers/ata/pata_triflex.c |
21592 | --- linux-2.6.32.15/drivers/ata/pata_triflex.c 2010-03-15 11:52:04.000000000 -0400 | 21755 | --- linux-2.6.32.16/drivers/ata/pata_triflex.c 2010-07-05 14:14:00.000000000 -0400 |
21593 | +++ linux-2.6.32.15/drivers/ata/pata_triflex.c 2010-05-28 21:27:15.267180677 -0400 | 21756 | +++ linux-2.6.32.16/drivers/ata/pata_triflex.c 2010-07-09 14:50:35.000000000 -0400 |
21594 | @@ -178,7 +178,7 @@ static struct scsi_host_template triflex | 21757 | @@ -178,7 +178,7 @@ static struct scsi_host_template triflex |
21595 | ATA_BMDMA_SHT(DRV_NAME), | 21758 | ATA_BMDMA_SHT(DRV_NAME), |
21596 | }; | 21759 | }; |
@@ -21600,9 +21763,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_triflex.c linux-2.6.32.15/drivers/at | |||
21600 | .inherits = &ata_bmdma_port_ops, | 21763 | .inherits = &ata_bmdma_port_ops, |
21601 | .bmdma_start = triflex_bmdma_start, | 21764 | .bmdma_start = triflex_bmdma_start, |
21602 | .bmdma_stop = triflex_bmdma_stop, | 21765 | .bmdma_stop = triflex_bmdma_stop, |
21603 | diff -urNp linux-2.6.32.15/drivers/ata/pata_via.c linux-2.6.32.15/drivers/ata/pata_via.c | 21766 | diff -urNp linux-2.6.32.16/drivers/ata/pata_via.c linux-2.6.32.16/drivers/ata/pata_via.c |
21604 | --- linux-2.6.32.15/drivers/ata/pata_via.c 2010-04-29 17:49:37.709698369 -0400 | 21767 | --- linux-2.6.32.16/drivers/ata/pata_via.c 2010-07-05 14:14:00.000000000 -0400 |
21605 | +++ linux-2.6.32.15/drivers/ata/pata_via.c 2010-05-28 21:27:15.267180677 -0400 | 21768 | +++ linux-2.6.32.16/drivers/ata/pata_via.c 2010-07-09 14:50:35.000000000 -0400 |
21606 | @@ -419,7 +419,7 @@ static struct scsi_host_template via_sht | 21769 | @@ -419,7 +419,7 @@ static struct scsi_host_template via_sht |
21607 | ATA_BMDMA_SHT(DRV_NAME), | 21770 | ATA_BMDMA_SHT(DRV_NAME), |
21608 | }; | 21771 | }; |
@@ -21621,9 +21784,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_via.c linux-2.6.32.15/drivers/ata/pa | |||
21621 | .inherits = &via_port_ops, | 21784 | .inherits = &via_port_ops, |
21622 | .sff_data_xfer = ata_sff_data_xfer_noirq, | 21785 | .sff_data_xfer = ata_sff_data_xfer_noirq, |
21623 | }; | 21786 | }; |
21624 | diff -urNp linux-2.6.32.15/drivers/ata/pata_winbond.c linux-2.6.32.15/drivers/ata/pata_winbond.c | 21787 | diff -urNp linux-2.6.32.16/drivers/ata/pata_winbond.c linux-2.6.32.16/drivers/ata/pata_winbond.c |
21625 | --- linux-2.6.32.15/drivers/ata/pata_winbond.c 2010-03-15 11:52:04.000000000 -0400 | 21788 | --- linux-2.6.32.16/drivers/ata/pata_winbond.c 2010-07-05 14:14:00.000000000 -0400 |
21626 | +++ linux-2.6.32.15/drivers/ata/pata_winbond.c 2010-05-28 21:27:15.267180677 -0400 | 21789 | +++ linux-2.6.32.16/drivers/ata/pata_winbond.c 2010-07-09 14:50:35.000000000 -0400 |
21627 | @@ -125,7 +125,7 @@ static struct scsi_host_template winbond | 21790 | @@ -125,7 +125,7 @@ static struct scsi_host_template winbond |
21628 | ATA_PIO_SHT(DRV_NAME), | 21791 | ATA_PIO_SHT(DRV_NAME), |
21629 | }; | 21792 | }; |
@@ -21633,9 +21796,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_winbond.c linux-2.6.32.15/drivers/at | |||
21633 | .inherits = &ata_sff_port_ops, | 21796 | .inherits = &ata_sff_port_ops, |
21634 | .sff_data_xfer = winbond_data_xfer, | 21797 | .sff_data_xfer = winbond_data_xfer, |
21635 | .cable_detect = ata_cable_40wire, | 21798 | .cable_detect = ata_cable_40wire, |
21636 | diff -urNp linux-2.6.32.15/drivers/ata/pdc_adma.c linux-2.6.32.15/drivers/ata/pdc_adma.c | 21799 | diff -urNp linux-2.6.32.16/drivers/ata/pdc_adma.c linux-2.6.32.16/drivers/ata/pdc_adma.c |
21637 | --- linux-2.6.32.15/drivers/ata/pdc_adma.c 2010-03-15 11:52:04.000000000 -0400 | 21800 | --- linux-2.6.32.16/drivers/ata/pdc_adma.c 2010-07-05 14:14:00.000000000 -0400 |
21638 | +++ linux-2.6.32.15/drivers/ata/pdc_adma.c 2010-05-28 21:27:15.267180677 -0400 | 21801 | +++ linux-2.6.32.16/drivers/ata/pdc_adma.c 2010-07-09 14:50:35.000000000 -0400 |
21639 | @@ -145,7 +145,7 @@ static struct scsi_host_template adma_at | 21802 | @@ -145,7 +145,7 @@ static struct scsi_host_template adma_at |
21640 | .dma_boundary = ADMA_DMA_BOUNDARY, | 21803 | .dma_boundary = ADMA_DMA_BOUNDARY, |
21641 | }; | 21804 | }; |
@@ -21645,9 +21808,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pdc_adma.c linux-2.6.32.15/drivers/ata/pd | |||
21645 | .inherits = &ata_sff_port_ops, | 21808 | .inherits = &ata_sff_port_ops, |
21646 | 21809 | ||
21647 | .lost_interrupt = ATA_OP_NULL, | 21810 | .lost_interrupt = ATA_OP_NULL, |
21648 | diff -urNp linux-2.6.32.15/drivers/ata/sata_fsl.c linux-2.6.32.15/drivers/ata/sata_fsl.c | 21811 | diff -urNp linux-2.6.32.16/drivers/ata/sata_fsl.c linux-2.6.32.16/drivers/ata/sata_fsl.c |
21649 | --- linux-2.6.32.15/drivers/ata/sata_fsl.c 2010-03-15 11:52:04.000000000 -0400 | 21812 | --- linux-2.6.32.16/drivers/ata/sata_fsl.c 2010-07-05 14:14:00.000000000 -0400 |
21650 | +++ linux-2.6.32.15/drivers/ata/sata_fsl.c 2010-05-28 21:27:15.270965204 -0400 | 21813 | +++ linux-2.6.32.16/drivers/ata/sata_fsl.c 2010-07-09 14:50:35.000000000 -0400 |
21651 | @@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs | 21814 | @@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs |
21652 | .dma_boundary = ATA_DMA_BOUNDARY, | 21815 | .dma_boundary = ATA_DMA_BOUNDARY, |
21653 | }; | 21816 | }; |
@@ -21657,9 +21820,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_fsl.c linux-2.6.32.15/drivers/ata/sa | |||
21657 | .inherits = &sata_pmp_port_ops, | 21820 | .inherits = &sata_pmp_port_ops, |
21658 | 21821 | ||
21659 | .qc_defer = ata_std_qc_defer, | 21822 | .qc_defer = ata_std_qc_defer, |
21660 | diff -urNp linux-2.6.32.15/drivers/ata/sata_inic162x.c linux-2.6.32.15/drivers/ata/sata_inic162x.c | 21823 | diff -urNp linux-2.6.32.16/drivers/ata/sata_inic162x.c linux-2.6.32.16/drivers/ata/sata_inic162x.c |
21661 | --- linux-2.6.32.15/drivers/ata/sata_inic162x.c 2010-03-15 11:52:04.000000000 -0400 | 21824 | --- linux-2.6.32.16/drivers/ata/sata_inic162x.c 2010-07-05 14:14:00.000000000 -0400 |
21662 | +++ linux-2.6.32.15/drivers/ata/sata_inic162x.c 2010-05-28 21:27:15.270965204 -0400 | 21825 | +++ linux-2.6.32.16/drivers/ata/sata_inic162x.c 2010-07-09 14:50:35.000000000 -0400 |
21663 | @@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po | 21826 | @@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po |
21664 | return 0; | 21827 | return 0; |
21665 | } | 21828 | } |
@@ -21669,9 +21832,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_inic162x.c linux-2.6.32.15/drivers/a | |||
21669 | .inherits = &sata_port_ops, | 21832 | .inherits = &sata_port_ops, |
21670 | 21833 | ||
21671 | .check_atapi_dma = inic_check_atapi_dma, | 21834 | .check_atapi_dma = inic_check_atapi_dma, |
21672 | diff -urNp linux-2.6.32.15/drivers/ata/sata_mv.c linux-2.6.32.15/drivers/ata/sata_mv.c | 21835 | diff -urNp linux-2.6.32.16/drivers/ata/sata_mv.c linux-2.6.32.16/drivers/ata/sata_mv.c |
21673 | --- linux-2.6.32.15/drivers/ata/sata_mv.c 2010-03-15 11:52:04.000000000 -0400 | 21836 | --- linux-2.6.32.16/drivers/ata/sata_mv.c 2010-07-05 14:14:00.000000000 -0400 |
21674 | +++ linux-2.6.32.15/drivers/ata/sata_mv.c 2010-05-28 21:27:15.270965204 -0400 | 21837 | +++ linux-2.6.32.16/drivers/ata/sata_mv.c 2010-07-09 14:50:35.000000000 -0400 |
21675 | @@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht | 21838 | @@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht |
21676 | .dma_boundary = MV_DMA_BOUNDARY, | 21839 | .dma_boundary = MV_DMA_BOUNDARY, |
21677 | }; | 21840 | }; |
@@ -21699,9 +21862,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_mv.c linux-2.6.32.15/drivers/ata/sat | |||
21699 | .inherits = &mv6_ops, | 21862 | .inherits = &mv6_ops, |
21700 | .dev_config = ATA_OP_NULL, | 21863 | .dev_config = ATA_OP_NULL, |
21701 | .qc_prep = mv_qc_prep_iie, | 21864 | .qc_prep = mv_qc_prep_iie, |
21702 | diff -urNp linux-2.6.32.15/drivers/ata/sata_nv.c linux-2.6.32.15/drivers/ata/sata_nv.c | 21865 | diff -urNp linux-2.6.32.16/drivers/ata/sata_nv.c linux-2.6.32.16/drivers/ata/sata_nv.c |
21703 | --- linux-2.6.32.15/drivers/ata/sata_nv.c 2010-03-15 11:52:04.000000000 -0400 | 21866 | --- linux-2.6.32.16/drivers/ata/sata_nv.c 2010-07-05 14:14:00.000000000 -0400 |
21704 | +++ linux-2.6.32.15/drivers/ata/sata_nv.c 2010-05-28 21:27:15.275100842 -0400 | 21867 | +++ linux-2.6.32.16/drivers/ata/sata_nv.c 2010-07-09 14:50:35.000000000 -0400 |
21705 | @@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc | 21868 | @@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc |
21706 | * cases. Define nv_hardreset() which only kicks in for post-boot | 21869 | * cases. Define nv_hardreset() which only kicks in for post-boot |
21707 | * probing and use it for all variants. | 21870 | * probing and use it for all variants. |
@@ -21744,9 +21907,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_nv.c linux-2.6.32.15/drivers/ata/sat | |||
21744 | .inherits = &nv_generic_ops, | 21907 | .inherits = &nv_generic_ops, |
21745 | 21908 | ||
21746 | .qc_defer = ata_std_qc_defer, | 21909 | .qc_defer = ata_std_qc_defer, |
21747 | diff -urNp linux-2.6.32.15/drivers/ata/sata_promise.c linux-2.6.32.15/drivers/ata/sata_promise.c | 21910 | diff -urNp linux-2.6.32.16/drivers/ata/sata_promise.c linux-2.6.32.16/drivers/ata/sata_promise.c |
21748 | --- linux-2.6.32.15/drivers/ata/sata_promise.c 2010-03-15 11:52:04.000000000 -0400 | 21911 | --- linux-2.6.32.16/drivers/ata/sata_promise.c 2010-07-05 14:14:00.000000000 -0400 |
21749 | +++ linux-2.6.32.15/drivers/ata/sata_promise.c 2010-05-28 21:27:15.275100842 -0400 | 21912 | +++ linux-2.6.32.16/drivers/ata/sata_promise.c 2010-07-09 14:50:35.000000000 -0400 |
21750 | @@ -195,7 +195,7 @@ static const struct ata_port_operations | 21913 | @@ -195,7 +195,7 @@ static const struct ata_port_operations |
21751 | .error_handler = pdc_error_handler, | 21914 | .error_handler = pdc_error_handler, |
21752 | }; | 21915 | }; |
@@ -21773,9 +21936,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_promise.c linux-2.6.32.15/drivers/at | |||
21773 | .inherits = &pdc_common_ops, | 21936 | .inherits = &pdc_common_ops, |
21774 | .cable_detect = pdc_pata_cable_detect, | 21937 | .cable_detect = pdc_pata_cable_detect, |
21775 | .freeze = pdc_freeze, | 21938 | .freeze = pdc_freeze, |
21776 | diff -urNp linux-2.6.32.15/drivers/ata/sata_qstor.c linux-2.6.32.15/drivers/ata/sata_qstor.c | 21939 | diff -urNp linux-2.6.32.16/drivers/ata/sata_qstor.c linux-2.6.32.16/drivers/ata/sata_qstor.c |
21777 | --- linux-2.6.32.15/drivers/ata/sata_qstor.c 2010-03-15 11:52:04.000000000 -0400 | 21940 | --- linux-2.6.32.16/drivers/ata/sata_qstor.c 2010-07-05 14:14:00.000000000 -0400 |
21778 | +++ linux-2.6.32.15/drivers/ata/sata_qstor.c 2010-05-28 21:27:15.275100842 -0400 | 21941 | +++ linux-2.6.32.16/drivers/ata/sata_qstor.c 2010-07-09 14:50:35.000000000 -0400 |
21779 | @@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_ | 21942 | @@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_ |
21780 | .dma_boundary = QS_DMA_BOUNDARY, | 21943 | .dma_boundary = QS_DMA_BOUNDARY, |
21781 | }; | 21944 | }; |
@@ -21785,9 +21948,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_qstor.c linux-2.6.32.15/drivers/ata/ | |||
21785 | .inherits = &ata_sff_port_ops, | 21948 | .inherits = &ata_sff_port_ops, |
21786 | 21949 | ||
21787 | .check_atapi_dma = qs_check_atapi_dma, | 21950 | .check_atapi_dma = qs_check_atapi_dma, |
21788 | diff -urNp linux-2.6.32.15/drivers/ata/sata_sil24.c linux-2.6.32.15/drivers/ata/sata_sil24.c | 21951 | diff -urNp linux-2.6.32.16/drivers/ata/sata_sil24.c linux-2.6.32.16/drivers/ata/sata_sil24.c |
21789 | --- linux-2.6.32.15/drivers/ata/sata_sil24.c 2010-03-15 11:52:04.000000000 -0400 | 21952 | --- linux-2.6.32.16/drivers/ata/sata_sil24.c 2010-07-05 14:14:00.000000000 -0400 |
21790 | +++ linux-2.6.32.15/drivers/ata/sata_sil24.c 2010-05-28 21:27:15.275100842 -0400 | 21953 | +++ linux-2.6.32.16/drivers/ata/sata_sil24.c 2010-07-09 14:50:35.000000000 -0400 |
21791 | @@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s | 21954 | @@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s |
21792 | .dma_boundary = ATA_DMA_BOUNDARY, | 21955 | .dma_boundary = ATA_DMA_BOUNDARY, |
21793 | }; | 21956 | }; |
@@ -21797,9 +21960,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_sil24.c linux-2.6.32.15/drivers/ata/ | |||
21797 | .inherits = &sata_pmp_port_ops, | 21960 | .inherits = &sata_pmp_port_ops, |
21798 | 21961 | ||
21799 | .qc_defer = sil24_qc_defer, | 21962 | .qc_defer = sil24_qc_defer, |
21800 | diff -urNp linux-2.6.32.15/drivers/ata/sata_sil.c linux-2.6.32.15/drivers/ata/sata_sil.c | 21963 | diff -urNp linux-2.6.32.16/drivers/ata/sata_sil.c linux-2.6.32.16/drivers/ata/sata_sil.c |
21801 | --- linux-2.6.32.15/drivers/ata/sata_sil.c 2010-03-15 11:52:04.000000000 -0400 | 21964 | --- linux-2.6.32.16/drivers/ata/sata_sil.c 2010-07-05 14:14:00.000000000 -0400 |
21802 | +++ linux-2.6.32.15/drivers/ata/sata_sil.c 2010-05-28 21:27:15.275100842 -0400 | 21965 | +++ linux-2.6.32.16/drivers/ata/sata_sil.c 2010-07-09 14:50:35.000000000 -0400 |
21803 | @@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht | 21966 | @@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht |
21804 | .sg_tablesize = ATA_MAX_PRD | 21967 | .sg_tablesize = ATA_MAX_PRD |
21805 | }; | 21968 | }; |
@@ -21809,9 +21972,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_sil.c linux-2.6.32.15/drivers/ata/sa | |||
21809 | .inherits = &ata_bmdma32_port_ops, | 21972 | .inherits = &ata_bmdma32_port_ops, |
21810 | .dev_config = sil_dev_config, | 21973 | .dev_config = sil_dev_config, |
21811 | .set_mode = sil_set_mode, | 21974 | .set_mode = sil_set_mode, |
21812 | diff -urNp linux-2.6.32.15/drivers/ata/sata_sis.c linux-2.6.32.15/drivers/ata/sata_sis.c | 21975 | diff -urNp linux-2.6.32.16/drivers/ata/sata_sis.c linux-2.6.32.16/drivers/ata/sata_sis.c |
21813 | --- linux-2.6.32.15/drivers/ata/sata_sis.c 2010-03-15 11:52:04.000000000 -0400 | 21976 | --- linux-2.6.32.16/drivers/ata/sata_sis.c 2010-07-05 14:14:00.000000000 -0400 |
21814 | +++ linux-2.6.32.15/drivers/ata/sata_sis.c 2010-05-28 21:27:15.275100842 -0400 | 21977 | +++ linux-2.6.32.16/drivers/ata/sata_sis.c 2010-07-09 14:50:35.000000000 -0400 |
21815 | @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht | 21978 | @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht |
21816 | ATA_BMDMA_SHT(DRV_NAME), | 21979 | ATA_BMDMA_SHT(DRV_NAME), |
21817 | }; | 21980 | }; |
@@ -21821,9 +21984,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_sis.c linux-2.6.32.15/drivers/ata/sa | |||
21821 | .inherits = &ata_bmdma_port_ops, | 21984 | .inherits = &ata_bmdma_port_ops, |
21822 | .scr_read = sis_scr_read, | 21985 | .scr_read = sis_scr_read, |
21823 | .scr_write = sis_scr_write, | 21986 | .scr_write = sis_scr_write, |
21824 | diff -urNp linux-2.6.32.15/drivers/ata/sata_svw.c linux-2.6.32.15/drivers/ata/sata_svw.c | 21987 | diff -urNp linux-2.6.32.16/drivers/ata/sata_svw.c linux-2.6.32.16/drivers/ata/sata_svw.c |
21825 | --- linux-2.6.32.15/drivers/ata/sata_svw.c 2010-03-15 11:52:04.000000000 -0400 | 21988 | --- linux-2.6.32.16/drivers/ata/sata_svw.c 2010-07-05 14:14:00.000000000 -0400 |
21826 | +++ linux-2.6.32.15/drivers/ata/sata_svw.c 2010-05-28 21:27:15.275100842 -0400 | 21989 | +++ linux-2.6.32.16/drivers/ata/sata_svw.c 2010-07-09 14:50:35.000000000 -0400 |
21827 | @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata | 21990 | @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata |
21828 | }; | 21991 | }; |
21829 | 21992 | ||
@@ -21833,9 +21996,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_svw.c linux-2.6.32.15/drivers/ata/sa | |||
21833 | .inherits = &ata_bmdma_port_ops, | 21996 | .inherits = &ata_bmdma_port_ops, |
21834 | .sff_tf_load = k2_sata_tf_load, | 21997 | .sff_tf_load = k2_sata_tf_load, |
21835 | .sff_tf_read = k2_sata_tf_read, | 21998 | .sff_tf_read = k2_sata_tf_read, |
21836 | diff -urNp linux-2.6.32.15/drivers/ata/sata_sx4.c linux-2.6.32.15/drivers/ata/sata_sx4.c | 21999 | diff -urNp linux-2.6.32.16/drivers/ata/sata_sx4.c linux-2.6.32.16/drivers/ata/sata_sx4.c |
21837 | --- linux-2.6.32.15/drivers/ata/sata_sx4.c 2010-03-15 11:52:04.000000000 -0400 | 22000 | --- linux-2.6.32.16/drivers/ata/sata_sx4.c 2010-07-05 14:14:00.000000000 -0400 |
21838 | +++ linux-2.6.32.15/drivers/ata/sata_sx4.c 2010-05-28 21:27:15.275100842 -0400 | 22001 | +++ linux-2.6.32.16/drivers/ata/sata_sx4.c 2010-07-09 14:50:35.000000000 -0400 |
21839 | @@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat | 22002 | @@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat |
21840 | }; | 22003 | }; |
21841 | 22004 | ||
@@ -21845,9 +22008,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_sx4.c linux-2.6.32.15/drivers/ata/sa | |||
21845 | .inherits = &ata_sff_port_ops, | 22008 | .inherits = &ata_sff_port_ops, |
21846 | 22009 | ||
21847 | .check_atapi_dma = pdc_check_atapi_dma, | 22010 | .check_atapi_dma = pdc_check_atapi_dma, |
21848 | diff -urNp linux-2.6.32.15/drivers/ata/sata_uli.c linux-2.6.32.15/drivers/ata/sata_uli.c | 22011 | diff -urNp linux-2.6.32.16/drivers/ata/sata_uli.c linux-2.6.32.16/drivers/ata/sata_uli.c |
21849 | --- linux-2.6.32.15/drivers/ata/sata_uli.c 2010-03-15 11:52:04.000000000 -0400 | 22012 | --- linux-2.6.32.16/drivers/ata/sata_uli.c 2010-07-05 14:14:00.000000000 -0400 |
21850 | +++ linux-2.6.32.15/drivers/ata/sata_uli.c 2010-05-28 21:27:15.275100842 -0400 | 22013 | +++ linux-2.6.32.16/drivers/ata/sata_uli.c 2010-07-09 14:50:35.000000000 -0400 |
21851 | @@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht | 22014 | @@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht |
21852 | ATA_BMDMA_SHT(DRV_NAME), | 22015 | ATA_BMDMA_SHT(DRV_NAME), |
21853 | }; | 22016 | }; |
@@ -21857,9 +22020,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_uli.c linux-2.6.32.15/drivers/ata/sa | |||
21857 | .inherits = &ata_bmdma_port_ops, | 22020 | .inherits = &ata_bmdma_port_ops, |
21858 | .scr_read = uli_scr_read, | 22021 | .scr_read = uli_scr_read, |
21859 | .scr_write = uli_scr_write, | 22022 | .scr_write = uli_scr_write, |
21860 | diff -urNp linux-2.6.32.15/drivers/ata/sata_via.c linux-2.6.32.15/drivers/ata/sata_via.c | 22023 | diff -urNp linux-2.6.32.16/drivers/ata/sata_via.c linux-2.6.32.16/drivers/ata/sata_via.c |
21861 | --- linux-2.6.32.15/drivers/ata/sata_via.c 2010-03-15 11:52:04.000000000 -0400 | 22024 | --- linux-2.6.32.16/drivers/ata/sata_via.c 2010-07-05 14:14:00.000000000 -0400 |
21862 | +++ linux-2.6.32.15/drivers/ata/sata_via.c 2010-05-28 21:27:15.275100842 -0400 | 22025 | +++ linux-2.6.32.16/drivers/ata/sata_via.c 2010-07-09 14:50:35.000000000 -0400 |
21863 | @@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh | 22026 | @@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh |
21864 | ATA_BMDMA_SHT(DRV_NAME), | 22027 | ATA_BMDMA_SHT(DRV_NAME), |
21865 | }; | 22028 | }; |
@@ -21897,9 +22060,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_via.c linux-2.6.32.15/drivers/ata/sa | |||
21897 | .inherits = &svia_base_ops, | 22060 | .inherits = &svia_base_ops, |
21898 | .hardreset = sata_std_hardreset, | 22061 | .hardreset = sata_std_hardreset, |
21899 | .scr_read = vt8251_scr_read, | 22062 | .scr_read = vt8251_scr_read, |
21900 | diff -urNp linux-2.6.32.15/drivers/ata/sata_vsc.c linux-2.6.32.15/drivers/ata/sata_vsc.c | 22063 | diff -urNp linux-2.6.32.16/drivers/ata/sata_vsc.c linux-2.6.32.16/drivers/ata/sata_vsc.c |
21901 | --- linux-2.6.32.15/drivers/ata/sata_vsc.c 2010-03-15 11:52:04.000000000 -0400 | 22064 | --- linux-2.6.32.16/drivers/ata/sata_vsc.c 2010-07-05 14:14:00.000000000 -0400 |
21902 | +++ linux-2.6.32.15/drivers/ata/sata_vsc.c 2010-05-28 21:27:15.275100842 -0400 | 22065 | +++ linux-2.6.32.16/drivers/ata/sata_vsc.c 2010-07-09 14:50:35.000000000 -0400 |
21903 | @@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat | 22066 | @@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat |
21904 | }; | 22067 | }; |
21905 | 22068 | ||
@@ -21909,9 +22072,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_vsc.c linux-2.6.32.15/drivers/ata/sa | |||
21909 | .inherits = &ata_bmdma_port_ops, | 22072 | .inherits = &ata_bmdma_port_ops, |
21910 | /* The IRQ handling is not quite standard SFF behaviour so we | 22073 | /* The IRQ handling is not quite standard SFF behaviour so we |
21911 | cannot use the default lost interrupt handler */ | 22074 | cannot use the default lost interrupt handler */ |
21912 | diff -urNp linux-2.6.32.15/drivers/atm/adummy.c linux-2.6.32.15/drivers/atm/adummy.c | 22075 | diff -urNp linux-2.6.32.16/drivers/atm/adummy.c linux-2.6.32.16/drivers/atm/adummy.c |
21913 | --- linux-2.6.32.15/drivers/atm/adummy.c 2010-03-15 11:52:04.000000000 -0400 | 22076 | --- linux-2.6.32.16/drivers/atm/adummy.c 2010-07-05 14:14:00.000000000 -0400 |
21914 | +++ linux-2.6.32.15/drivers/atm/adummy.c 2010-05-28 21:27:15.275100842 -0400 | 22077 | +++ linux-2.6.32.16/drivers/atm/adummy.c 2010-07-09 14:50:35.000000000 -0400 |
21915 | @@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct | 22078 | @@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct |
21916 | vcc->pop(vcc, skb); | 22079 | vcc->pop(vcc, skb); |
21917 | else | 22080 | else |
@@ -21921,9 +22084,9 @@ diff -urNp linux-2.6.32.15/drivers/atm/adummy.c linux-2.6.32.15/drivers/atm/adum | |||
21921 | 22084 | ||
21922 | return 0; | 22085 | return 0; |
21923 | } | 22086 | } |
21924 | diff -urNp linux-2.6.32.15/drivers/atm/ambassador.c linux-2.6.32.15/drivers/atm/ambassador.c | 22087 | diff -urNp linux-2.6.32.16/drivers/atm/ambassador.c linux-2.6.32.16/drivers/atm/ambassador.c |
21925 | --- linux-2.6.32.15/drivers/atm/ambassador.c 2010-03-15 11:52:04.000000000 -0400 | 22088 | --- linux-2.6.32.16/drivers/atm/ambassador.c 2010-07-05 14:14:00.000000000 -0400 |
21926 | +++ linux-2.6.32.15/drivers/atm/ambassador.c 2010-05-28 21:27:15.283225651 -0400 | 22089 | +++ linux-2.6.32.16/drivers/atm/ambassador.c 2010-07-09 14:50:35.000000000 -0400 |
21927 | @@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, | 22090 | @@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, |
21928 | PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); | 22091 | PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); |
21929 | 22092 | ||
@@ -21960,9 +22123,9 @@ diff -urNp linux-2.6.32.15/drivers/atm/ambassador.c linux-2.6.32.15/drivers/atm/ | |||
21960 | return -ENOMEM; // ? | 22123 | return -ENOMEM; // ? |
21961 | } | 22124 | } |
21962 | 22125 | ||
21963 | diff -urNp linux-2.6.32.15/drivers/atm/atmtcp.c linux-2.6.32.15/drivers/atm/atmtcp.c | 22126 | diff -urNp linux-2.6.32.16/drivers/atm/atmtcp.c linux-2.6.32.16/drivers/atm/atmtcp.c |
21964 | --- linux-2.6.32.15/drivers/atm/atmtcp.c 2010-03-15 11:52:04.000000000 -0400 | 22127 | --- linux-2.6.32.16/drivers/atm/atmtcp.c 2010-07-05 14:14:00.000000000 -0400 |
21965 | +++ linux-2.6.32.15/drivers/atm/atmtcp.c 2010-05-28 21:27:15.287736634 -0400 | 22128 | +++ linux-2.6.32.16/drivers/atm/atmtcp.c 2010-07-09 14:50:35.000000000 -0400 |
21966 | @@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc | 22129 | @@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc |
21967 | if (vcc->pop) vcc->pop(vcc,skb); | 22130 | if (vcc->pop) vcc->pop(vcc,skb); |
21968 | else dev_kfree_skb(skb); | 22131 | else dev_kfree_skb(skb); |
@@ -22012,9 +22175,9 @@ diff -urNp linux-2.6.32.15/drivers/atm/atmtcp.c linux-2.6.32.15/drivers/atm/atmt | |||
22012 | done: | 22175 | done: |
22013 | if (vcc->pop) vcc->pop(vcc,skb); | 22176 | if (vcc->pop) vcc->pop(vcc,skb); |
22014 | else dev_kfree_skb(skb); | 22177 | else dev_kfree_skb(skb); |
22015 | diff -urNp linux-2.6.32.15/drivers/atm/eni.c linux-2.6.32.15/drivers/atm/eni.c | 22178 | diff -urNp linux-2.6.32.16/drivers/atm/eni.c linux-2.6.32.16/drivers/atm/eni.c |
22016 | --- linux-2.6.32.15/drivers/atm/eni.c 2010-03-15 11:52:04.000000000 -0400 | 22179 | --- linux-2.6.32.16/drivers/atm/eni.c 2010-07-05 14:14:00.000000000 -0400 |
22017 | +++ linux-2.6.32.15/drivers/atm/eni.c 2010-05-28 21:27:15.299117902 -0400 | 22180 | +++ linux-2.6.32.16/drivers/atm/eni.c 2010-07-09 14:50:35.000000000 -0400 |
22018 | @@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc) | 22181 | @@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc) |
22019 | DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", | 22182 | DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", |
22020 | vcc->dev->number); | 22183 | vcc->dev->number); |
@@ -22060,9 +22223,9 @@ diff -urNp linux-2.6.32.15/drivers/atm/eni.c linux-2.6.32.15/drivers/atm/eni.c | |||
22060 | wake_up(&eni_dev->tx_wait); | 22223 | wake_up(&eni_dev->tx_wait); |
22061 | dma_complete++; | 22224 | dma_complete++; |
22062 | } | 22225 | } |
22063 | diff -urNp linux-2.6.32.15/drivers/atm/firestream.c linux-2.6.32.15/drivers/atm/firestream.c | 22226 | diff -urNp linux-2.6.32.16/drivers/atm/firestream.c linux-2.6.32.16/drivers/atm/firestream.c |
22064 | --- linux-2.6.32.15/drivers/atm/firestream.c 2010-03-15 11:52:04.000000000 -0400 | 22227 | --- linux-2.6.32.16/drivers/atm/firestream.c 2010-07-05 14:14:00.000000000 -0400 |
22065 | +++ linux-2.6.32.15/drivers/atm/firestream.c 2010-05-28 21:27:15.303175631 -0400 | 22228 | +++ linux-2.6.32.16/drivers/atm/firestream.c 2010-07-09 14:50:35.000000000 -0400 |
22066 | @@ -748,7 +748,7 @@ static void process_txdone_queue (struct | 22229 | @@ -748,7 +748,7 @@ static void process_txdone_queue (struct |
22067 | } | 22230 | } |
22068 | } | 22231 | } |
@@ -22096,9 +22259,9 @@ diff -urNp linux-2.6.32.15/drivers/atm/firestream.c linux-2.6.32.15/drivers/atm/ | |||
22096 | break; | 22259 | break; |
22097 | default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ | 22260 | default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ |
22098 | printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", | 22261 | printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", |
22099 | diff -urNp linux-2.6.32.15/drivers/atm/fore200e.c linux-2.6.32.15/drivers/atm/fore200e.c | 22262 | diff -urNp linux-2.6.32.16/drivers/atm/fore200e.c linux-2.6.32.16/drivers/atm/fore200e.c |
22100 | --- linux-2.6.32.15/drivers/atm/fore200e.c 2010-03-15 11:52:04.000000000 -0400 | 22263 | --- linux-2.6.32.16/drivers/atm/fore200e.c 2010-07-05 14:14:00.000000000 -0400 |
22101 | +++ linux-2.6.32.15/drivers/atm/fore200e.c 2010-05-28 21:27:15.311169155 -0400 | 22264 | +++ linux-2.6.32.16/drivers/atm/fore200e.c 2010-07-09 14:50:35.000000000 -0400 |
22102 | @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 | 22265 | @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 |
22103 | #endif | 22266 | #endif |
22104 | /* check error condition */ | 22267 | /* check error condition */ |
@@ -22155,9 +22318,9 @@ diff -urNp linux-2.6.32.15/drivers/atm/fore200e.c linux-2.6.32.15/drivers/atm/fo | |||
22155 | 22318 | ||
22156 | fore200e->tx_sat++; | 22319 | fore200e->tx_sat++; |
22157 | DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", | 22320 | DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", |
22158 | diff -urNp linux-2.6.32.15/drivers/atm/he.c linux-2.6.32.15/drivers/atm/he.c | 22321 | diff -urNp linux-2.6.32.16/drivers/atm/he.c linux-2.6.32.16/drivers/atm/he.c |
22159 | --- linux-2.6.32.15/drivers/atm/he.c 2010-03-15 11:52:04.000000000 -0400 | 22322 | --- linux-2.6.32.16/drivers/atm/he.c 2010-07-05 14:14:00.000000000 -0400 |
22160 | +++ linux-2.6.32.15/drivers/atm/he.c 2010-05-28 21:27:15.311169155 -0400 | 22323 | +++ linux-2.6.32.16/drivers/atm/he.c 2010-07-09 14:50:35.000000000 -0400 |
22161 | @@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i | 22324 | @@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i |
22162 | 22325 | ||
22163 | if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { | 22326 | if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { |
@@ -22239,9 +22402,9 @@ diff -urNp linux-2.6.32.15/drivers/atm/he.c linux-2.6.32.15/drivers/atm/he.c | |||
22239 | 22402 | ||
22240 | return 0; | 22403 | return 0; |
22241 | } | 22404 | } |
22242 | diff -urNp linux-2.6.32.15/drivers/atm/horizon.c linux-2.6.32.15/drivers/atm/horizon.c | 22405 | diff -urNp linux-2.6.32.16/drivers/atm/horizon.c linux-2.6.32.16/drivers/atm/horizon.c |
22243 | --- linux-2.6.32.15/drivers/atm/horizon.c 2010-03-15 11:52:04.000000000 -0400 | 22406 | --- linux-2.6.32.16/drivers/atm/horizon.c 2010-07-05 14:14:00.000000000 -0400 |
22244 | +++ linux-2.6.32.15/drivers/atm/horizon.c 2010-05-28 21:27:15.311169155 -0400 | 22407 | +++ linux-2.6.32.16/drivers/atm/horizon.c 2010-07-09 14:50:35.000000000 -0400 |
22245 | @@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, | 22408 | @@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, |
22246 | { | 22409 | { |
22247 | struct atm_vcc * vcc = ATM_SKB(skb)->vcc; | 22410 | struct atm_vcc * vcc = ATM_SKB(skb)->vcc; |
@@ -22260,9 +22423,9 @@ diff -urNp linux-2.6.32.15/drivers/atm/horizon.c linux-2.6.32.15/drivers/atm/hor | |||
22260 | 22423 | ||
22261 | // free the skb | 22424 | // free the skb |
22262 | hrz_kfree_skb (skb); | 22425 | hrz_kfree_skb (skb); |
22263 | diff -urNp linux-2.6.32.15/drivers/atm/idt77252.c linux-2.6.32.15/drivers/atm/idt77252.c | 22426 | diff -urNp linux-2.6.32.16/drivers/atm/idt77252.c linux-2.6.32.16/drivers/atm/idt77252.c |
22264 | --- linux-2.6.32.15/drivers/atm/idt77252.c 2010-03-15 11:52:04.000000000 -0400 | 22427 | --- linux-2.6.32.16/drivers/atm/idt77252.c 2010-07-05 14:14:00.000000000 -0400 |
22265 | +++ linux-2.6.32.15/drivers/atm/idt77252.c 2010-05-28 21:27:15.326952874 -0400 | 22428 | +++ linux-2.6.32.16/drivers/atm/idt77252.c 2010-07-09 14:50:35.000000000 -0400 |
22266 | @@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str | 22429 | @@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str |
22267 | else | 22430 | else |
22268 | dev_kfree_skb(skb); | 22431 | dev_kfree_skb(skb); |
@@ -22417,9 +22580,9 @@ diff -urNp linux-2.6.32.15/drivers/atm/idt77252.c linux-2.6.32.15/drivers/atm/id | |||
22417 | return -ENOMEM; | 22580 | return -ENOMEM; |
22418 | } | 22581 | } |
22419 | atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); | 22582 | atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); |
22420 | diff -urNp linux-2.6.32.15/drivers/atm/iphase.c linux-2.6.32.15/drivers/atm/iphase.c | 22583 | diff -urNp linux-2.6.32.16/drivers/atm/iphase.c linux-2.6.32.16/drivers/atm/iphase.c |
22421 | --- linux-2.6.32.15/drivers/atm/iphase.c 2010-03-15 11:52:04.000000000 -0400 | 22584 | --- linux-2.6.32.16/drivers/atm/iphase.c 2010-07-05 14:14:00.000000000 -0400 |
22422 | +++ linux-2.6.32.15/drivers/atm/iphase.c 2010-05-28 21:27:15.326952874 -0400 | 22585 | +++ linux-2.6.32.16/drivers/atm/iphase.c 2010-07-09 14:50:35.000000000 -0400 |
22423 | @@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev) | 22586 | @@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev) |
22424 | status = (u_short) (buf_desc_ptr->desc_mode); | 22587 | status = (u_short) (buf_desc_ptr->desc_mode); |
22425 | if (status & (RX_CER | RX_PTE | RX_OFL)) | 22588 | if (status & (RX_CER | RX_PTE | RX_OFL)) |
@@ -22516,9 +22679,9 @@ diff -urNp linux-2.6.32.15/drivers/atm/iphase.c linux-2.6.32.15/drivers/atm/ipha | |||
22516 | if (iavcc->vc_desc_cnt > 10) { | 22679 | if (iavcc->vc_desc_cnt > 10) { |
22517 | vcc->tx_quota = vcc->tx_quota * 3 / 4; | 22680 | vcc->tx_quota = vcc->tx_quota * 3 / 4; |
22518 | printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); | 22681 | printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); |
22519 | diff -urNp linux-2.6.32.15/drivers/atm/lanai.c linux-2.6.32.15/drivers/atm/lanai.c | 22682 | diff -urNp linux-2.6.32.16/drivers/atm/lanai.c linux-2.6.32.16/drivers/atm/lanai.c |
22520 | --- linux-2.6.32.15/drivers/atm/lanai.c 2010-03-15 11:52:04.000000000 -0400 | 22683 | --- linux-2.6.32.16/drivers/atm/lanai.c 2010-07-05 14:14:00.000000000 -0400 |
22521 | +++ linux-2.6.32.15/drivers/atm/lanai.c 2010-05-28 21:27:15.331218290 -0400 | 22684 | +++ linux-2.6.32.16/drivers/atm/lanai.c 2010-07-09 14:50:35.000000000 -0400 |
22522 | @@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l | 22685 | @@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l |
22523 | vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); | 22686 | vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); |
22524 | lanai_endtx(lanai, lvcc); | 22687 | lanai_endtx(lanai, lvcc); |
@@ -22573,9 +22736,9 @@ diff -urNp linux-2.6.32.15/drivers/atm/lanai.c linux-2.6.32.15/drivers/atm/lanai | |||
22573 | lvcc->stats.x.aal5.service_rxcrc++; | 22736 | lvcc->stats.x.aal5.service_rxcrc++; |
22574 | lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; | 22737 | lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; |
22575 | cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); | 22738 | cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); |
22576 | diff -urNp linux-2.6.32.15/drivers/atm/nicstar.c linux-2.6.32.15/drivers/atm/nicstar.c | 22739 | diff -urNp linux-2.6.32.16/drivers/atm/nicstar.c linux-2.6.32.16/drivers/atm/nicstar.c |
22577 | --- linux-2.6.32.15/drivers/atm/nicstar.c 2010-03-15 11:52:04.000000000 -0400 | 22740 | --- linux-2.6.32.16/drivers/atm/nicstar.c 2010-07-05 14:14:00.000000000 -0400 |
22578 | +++ linux-2.6.32.15/drivers/atm/nicstar.c 2010-05-28 21:27:15.368039837 -0400 | 22741 | +++ linux-2.6.32.16/drivers/atm/nicstar.c 2010-07-09 14:50:35.000000000 -0400 |
22579 | @@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, | 22742 | @@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, |
22580 | if ((vc = (vc_map *) vcc->dev_data) == NULL) | 22743 | if ((vc = (vc_map *) vcc->dev_data) == NULL) |
22581 | { | 22744 | { |
@@ -22778,9 +22941,9 @@ diff -urNp linux-2.6.32.15/drivers/atm/nicstar.c linux-2.6.32.15/drivers/atm/nic | |||
22778 | } | 22941 | } |
22779 | } | 22942 | } |
22780 | 22943 | ||
22781 | diff -urNp linux-2.6.32.15/drivers/atm/solos-pci.c linux-2.6.32.15/drivers/atm/solos-pci.c | 22944 | diff -urNp linux-2.6.32.16/drivers/atm/solos-pci.c linux-2.6.32.16/drivers/atm/solos-pci.c |
22782 | --- linux-2.6.32.15/drivers/atm/solos-pci.c 2010-03-15 11:52:04.000000000 -0400 | 22945 | --- linux-2.6.32.16/drivers/atm/solos-pci.c 2010-07-05 14:14:00.000000000 -0400 |
22783 | +++ linux-2.6.32.15/drivers/atm/solos-pci.c 2010-05-28 21:27:15.368039837 -0400 | 22946 | +++ linux-2.6.32.16/drivers/atm/solos-pci.c 2010-07-09 14:50:35.000000000 -0400 |
22784 | @@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg) | 22947 | @@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg) |
22785 | } | 22948 | } |
22786 | atm_charge(vcc, skb->truesize); | 22949 | atm_charge(vcc, skb->truesize); |
@@ -22799,9 +22962,9 @@ diff -urNp linux-2.6.32.15/drivers/atm/solos-pci.c linux-2.6.32.15/drivers/atm/s | |||
22799 | solos_pop(vcc, oldskb); | 22962 | solos_pop(vcc, oldskb); |
22800 | } else | 22963 | } else |
22801 | dev_kfree_skb_irq(oldskb); | 22964 | dev_kfree_skb_irq(oldskb); |
22802 | diff -urNp linux-2.6.32.15/drivers/atm/suni.c linux-2.6.32.15/drivers/atm/suni.c | 22965 | diff -urNp linux-2.6.32.16/drivers/atm/suni.c linux-2.6.32.16/drivers/atm/suni.c |
22803 | --- linux-2.6.32.15/drivers/atm/suni.c 2010-03-15 11:52:04.000000000 -0400 | 22966 | --- linux-2.6.32.16/drivers/atm/suni.c 2010-07-05 14:14:00.000000000 -0400 |
22804 | +++ linux-2.6.32.15/drivers/atm/suni.c 2010-05-28 21:27:15.368039837 -0400 | 22967 | +++ linux-2.6.32.16/drivers/atm/suni.c 2010-07-09 14:50:35.000000000 -0400 |
22805 | @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); | 22968 | @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); |
22806 | 22969 | ||
22807 | 22970 | ||
@@ -22813,9 +22976,9 @@ diff -urNp linux-2.6.32.15/drivers/atm/suni.c linux-2.6.32.15/drivers/atm/suni.c | |||
22813 | 22976 | ||
22814 | 22977 | ||
22815 | static void suni_hz(unsigned long from_timer) | 22978 | static void suni_hz(unsigned long from_timer) |
22816 | diff -urNp linux-2.6.32.15/drivers/atm/uPD98402.c linux-2.6.32.15/drivers/atm/uPD98402.c | 22979 | diff -urNp linux-2.6.32.16/drivers/atm/uPD98402.c linux-2.6.32.16/drivers/atm/uPD98402.c |
22817 | --- linux-2.6.32.15/drivers/atm/uPD98402.c 2010-03-15 11:52:04.000000000 -0400 | 22980 | --- linux-2.6.32.16/drivers/atm/uPD98402.c 2010-07-05 14:14:00.000000000 -0400 |
22818 | +++ linux-2.6.32.15/drivers/atm/uPD98402.c 2010-05-28 21:27:15.368039837 -0400 | 22981 | +++ linux-2.6.32.16/drivers/atm/uPD98402.c 2010-07-09 14:50:35.000000000 -0400 |
22819 | @@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d | 22982 | @@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d |
22820 | struct sonet_stats tmp; | 22983 | struct sonet_stats tmp; |
22821 | int error = 0; | 22984 | int error = 0; |
@@ -22860,9 +23023,9 @@ diff -urNp linux-2.6.32.15/drivers/atm/uPD98402.c linux-2.6.32.15/drivers/atm/uP | |||
22860 | return 0; | 23023 | return 0; |
22861 | } | 23024 | } |
22862 | 23025 | ||
22863 | diff -urNp linux-2.6.32.15/drivers/atm/zatm.c linux-2.6.32.15/drivers/atm/zatm.c | 23026 | diff -urNp linux-2.6.32.16/drivers/atm/zatm.c linux-2.6.32.16/drivers/atm/zatm.c |
22864 | --- linux-2.6.32.15/drivers/atm/zatm.c 2010-03-15 11:52:04.000000000 -0400 | 23027 | --- linux-2.6.32.16/drivers/atm/zatm.c 2010-07-05 14:14:00.000000000 -0400 |
22865 | +++ linux-2.6.32.15/drivers/atm/zatm.c 2010-05-28 21:27:15.375178174 -0400 | 23028 | +++ linux-2.6.32.16/drivers/atm/zatm.c 2010-07-09 14:50:35.000000000 -0400 |
22866 | @@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy | 23029 | @@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy |
22867 | } | 23030 | } |
22868 | if (!size) { | 23031 | if (!size) { |
@@ -22890,9 +23053,9 @@ diff -urNp linux-2.6.32.15/drivers/atm/zatm.c linux-2.6.32.15/drivers/atm/zatm.c | |||
22890 | wake_up(&zatm_vcc->tx_wait); | 23053 | wake_up(&zatm_vcc->tx_wait); |
22891 | } | 23054 | } |
22892 | 23055 | ||
22893 | diff -urNp linux-2.6.32.15/drivers/base/bus.c linux-2.6.32.15/drivers/base/bus.c | 23056 | diff -urNp linux-2.6.32.16/drivers/base/bus.c linux-2.6.32.16/drivers/base/bus.c |
22894 | --- linux-2.6.32.15/drivers/base/bus.c 2010-03-15 11:52:04.000000000 -0400 | 23057 | --- linux-2.6.32.16/drivers/base/bus.c 2010-07-05 14:14:00.000000000 -0400 |
22895 | +++ linux-2.6.32.15/drivers/base/bus.c 2010-05-28 21:27:15.383215309 -0400 | 23058 | +++ linux-2.6.32.16/drivers/base/bus.c 2010-07-09 14:50:36.000000000 -0400 |
22896 | @@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob | 23059 | @@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob |
22897 | return ret; | 23060 | return ret; |
22898 | } | 23061 | } |
@@ -22920,9 +23083,9 @@ diff -urNp linux-2.6.32.15/drivers/base/bus.c linux-2.6.32.15/drivers/base/bus.c | |||
22920 | .filter = bus_uevent_filter, | 23083 | .filter = bus_uevent_filter, |
22921 | }; | 23084 | }; |
22922 | 23085 | ||
22923 | diff -urNp linux-2.6.32.15/drivers/base/class.c linux-2.6.32.15/drivers/base/class.c | 23086 | diff -urNp linux-2.6.32.16/drivers/base/class.c linux-2.6.32.16/drivers/base/class.c |
22924 | --- linux-2.6.32.15/drivers/base/class.c 2010-03-15 11:52:04.000000000 -0400 | 23087 | --- linux-2.6.32.16/drivers/base/class.c 2010-07-05 14:14:00.000000000 -0400 |
22925 | +++ linux-2.6.32.15/drivers/base/class.c 2010-05-28 21:27:15.383215309 -0400 | 23088 | +++ linux-2.6.32.16/drivers/base/class.c 2010-07-09 14:50:36.000000000 -0400 |
22926 | @@ -63,7 +63,7 @@ static void class_release(struct kobject | 23089 | @@ -63,7 +63,7 @@ static void class_release(struct kobject |
22927 | kfree(cp); | 23090 | kfree(cp); |
22928 | } | 23091 | } |
@@ -22932,9 +23095,9 @@ diff -urNp linux-2.6.32.15/drivers/base/class.c linux-2.6.32.15/drivers/base/cla | |||
22932 | .show = class_attr_show, | 23095 | .show = class_attr_show, |
22933 | .store = class_attr_store, | 23096 | .store = class_attr_store, |
22934 | }; | 23097 | }; |
22935 | diff -urNp linux-2.6.32.15/drivers/base/core.c linux-2.6.32.15/drivers/base/core.c | 23098 | diff -urNp linux-2.6.32.16/drivers/base/core.c linux-2.6.32.16/drivers/base/core.c |
22936 | --- linux-2.6.32.15/drivers/base/core.c 2010-03-15 11:52:04.000000000 -0400 | 23099 | --- linux-2.6.32.16/drivers/base/core.c 2010-07-05 14:14:00.000000000 -0400 |
22937 | +++ linux-2.6.32.15/drivers/base/core.c 2010-05-28 21:27:15.386909095 -0400 | 23100 | +++ linux-2.6.32.16/drivers/base/core.c 2010-07-09 14:50:36.000000000 -0400 |
22938 | @@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob | 23101 | @@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob |
22939 | return ret; | 23102 | return ret; |
22940 | } | 23103 | } |
@@ -22953,9 +23116,9 @@ diff -urNp linux-2.6.32.15/drivers/base/core.c linux-2.6.32.15/drivers/base/core | |||
22953 | .filter = dev_uevent_filter, | 23116 | .filter = dev_uevent_filter, |
22954 | .name = dev_uevent_name, | 23117 | .name = dev_uevent_name, |
22955 | .uevent = dev_uevent, | 23118 | .uevent = dev_uevent, |
22956 | diff -urNp linux-2.6.32.15/drivers/base/memory.c linux-2.6.32.15/drivers/base/memory.c | 23119 | diff -urNp linux-2.6.32.16/drivers/base/memory.c linux-2.6.32.16/drivers/base/memory.c |
22957 | --- linux-2.6.32.15/drivers/base/memory.c 2010-03-15 11:52:04.000000000 -0400 | 23120 | --- linux-2.6.32.16/drivers/base/memory.c 2010-07-05 14:14:00.000000000 -0400 |
22958 | +++ linux-2.6.32.15/drivers/base/memory.c 2010-05-28 21:27:15.386909095 -0400 | 23121 | +++ linux-2.6.32.16/drivers/base/memory.c 2010-07-09 14:50:36.000000000 -0400 |
22959 | @@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks | 23122 | @@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks |
22960 | return retval; | 23123 | return retval; |
22961 | } | 23124 | } |
@@ -22965,9 +23128,9 @@ diff -urNp linux-2.6.32.15/drivers/base/memory.c linux-2.6.32.15/drivers/base/me | |||
22965 | .name = memory_uevent_name, | 23128 | .name = memory_uevent_name, |
22966 | .uevent = memory_uevent, | 23129 | .uevent = memory_uevent, |
22967 | }; | 23130 | }; |
22968 | diff -urNp linux-2.6.32.15/drivers/base/sys.c linux-2.6.32.15/drivers/base/sys.c | 23131 | diff -urNp linux-2.6.32.16/drivers/base/sys.c linux-2.6.32.16/drivers/base/sys.c |
22969 | --- linux-2.6.32.15/drivers/base/sys.c 2010-03-15 11:52:04.000000000 -0400 | 23132 | --- linux-2.6.32.16/drivers/base/sys.c 2010-07-05 14:14:00.000000000 -0400 |
22970 | +++ linux-2.6.32.15/drivers/base/sys.c 2010-05-28 21:27:15.395045412 -0400 | 23133 | +++ linux-2.6.32.16/drivers/base/sys.c 2010-07-09 14:50:36.000000000 -0400 |
22971 | @@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc | 23134 | @@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc |
22972 | return -EIO; | 23135 | return -EIO; |
22973 | } | 23136 | } |
@@ -22986,9 +23149,9 @@ diff -urNp linux-2.6.32.15/drivers/base/sys.c linux-2.6.32.15/drivers/base/sys.c | |||
22986 | .show = sysdev_class_show, | 23149 | .show = sysdev_class_show, |
22987 | .store = sysdev_class_store, | 23150 | .store = sysdev_class_store, |
22988 | }; | 23151 | }; |
22989 | diff -urNp linux-2.6.32.15/drivers/block/pktcdvd.c linux-2.6.32.15/drivers/block/pktcdvd.c | 23152 | diff -urNp linux-2.6.32.16/drivers/block/pktcdvd.c linux-2.6.32.16/drivers/block/pktcdvd.c |
22990 | --- linux-2.6.32.15/drivers/block/pktcdvd.c 2010-03-15 11:52:04.000000000 -0400 | 23153 | --- linux-2.6.32.16/drivers/block/pktcdvd.c 2010-07-05 14:14:00.000000000 -0400 |
22991 | +++ linux-2.6.32.15/drivers/block/pktcdvd.c 2010-05-28 21:27:15.403194679 -0400 | 23154 | +++ linux-2.6.32.16/drivers/block/pktcdvd.c 2010-07-09 14:50:36.000000000 -0400 |
22992 | @@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob | 23155 | @@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob |
22993 | return len; | 23156 | return len; |
22994 | } | 23157 | } |
@@ -22998,9 +23161,9 @@ diff -urNp linux-2.6.32.15/drivers/block/pktcdvd.c linux-2.6.32.15/drivers/block | |||
22998 | .show = kobj_pkt_show, | 23161 | .show = kobj_pkt_show, |
22999 | .store = kobj_pkt_store | 23162 | .store = kobj_pkt_store |
23000 | }; | 23163 | }; |
23001 | diff -urNp linux-2.6.32.15/drivers/char/agp/frontend.c linux-2.6.32.15/drivers/char/agp/frontend.c | 23164 | diff -urNp linux-2.6.32.16/drivers/char/agp/frontend.c linux-2.6.32.16/drivers/char/agp/frontend.c |
23002 | --- linux-2.6.32.15/drivers/char/agp/frontend.c 2010-03-15 11:52:04.000000000 -0400 | 23165 | --- linux-2.6.32.16/drivers/char/agp/frontend.c 2010-07-05 14:14:00.000000000 -0400 |
23003 | +++ linux-2.6.32.15/drivers/char/agp/frontend.c 2010-05-28 21:27:15.403194679 -0400 | 23166 | +++ linux-2.6.32.16/drivers/char/agp/frontend.c 2010-07-09 14:50:36.000000000 -0400 |
23004 | @@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag | 23167 | @@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag |
23005 | if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) | 23168 | if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) |
23006 | return -EFAULT; | 23169 | return -EFAULT; |
@@ -23010,9 +23173,9 @@ diff -urNp linux-2.6.32.15/drivers/char/agp/frontend.c linux-2.6.32.15/drivers/c | |||
23010 | return -EFAULT; | 23173 | return -EFAULT; |
23011 | 23174 | ||
23012 | client = agp_find_client_by_pid(reserve.pid); | 23175 | client = agp_find_client_by_pid(reserve.pid); |
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 | 23176 | diff -urNp linux-2.6.32.16/drivers/char/agp/intel-agp.c linux-2.6.32.16/drivers/char/agp/intel-agp.c |
23014 | --- linux-2.6.32.15/drivers/char/agp/intel-agp.c 2010-04-29 17:49:37.777981896 -0400 | 23177 | --- linux-2.6.32.16/drivers/char/agp/intel-agp.c 2010-07-05 14:14:00.000000000 -0400 |
23015 | +++ linux-2.6.32.15/drivers/char/agp/intel-agp.c 2010-05-28 21:27:15.403194679 -0400 | 23178 | +++ linux-2.6.32.16/drivers/char/agp/intel-agp.c 2010-07-09 14:50:36.000000000 -0400 |
23016 | @@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc | 23179 | @@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc |
23017 | ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB), | 23180 | ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB), |
23018 | ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB), | 23181 | ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB), |
@@ -23022,9 +23185,9 @@ diff -urNp linux-2.6.32.15/drivers/char/agp/intel-agp.c linux-2.6.32.15/drivers/ | |||
23022 | }; | 23185 | }; |
23023 | 23186 | ||
23024 | MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); | 23187 | MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); |
23025 | diff -urNp linux-2.6.32.15/drivers/char/hpet.c linux-2.6.32.15/drivers/char/hpet.c | 23188 | diff -urNp linux-2.6.32.16/drivers/char/hpet.c linux-2.6.32.16/drivers/char/hpet.c |
23026 | --- linux-2.6.32.15/drivers/char/hpet.c 2010-03-15 11:52:04.000000000 -0400 | 23189 | --- linux-2.6.32.16/drivers/char/hpet.c 2010-07-05 14:14:00.000000000 -0400 |
23027 | +++ linux-2.6.32.15/drivers/char/hpet.c 2010-05-28 21:27:15.403194679 -0400 | 23190 | +++ linux-2.6.32.16/drivers/char/hpet.c 2010-07-09 14:50:36.000000000 -0400 |
23028 | @@ -430,7 +430,7 @@ static int hpet_release(struct inode *in | 23191 | @@ -430,7 +430,7 @@ static int hpet_release(struct inode *in |
23029 | return 0; | 23192 | return 0; |
23030 | } | 23193 | } |
@@ -23052,9 +23215,9 @@ diff -urNp linux-2.6.32.15/drivers/char/hpet.c linux-2.6.32.15/drivers/char/hpet | |||
23052 | 23215 | ||
23053 | static int __init hpet_init(void) | 23216 | static int __init hpet_init(void) |
23054 | { | 23217 | { |
23055 | diff -urNp linux-2.6.32.15/drivers/char/hvc_beat.c linux-2.6.32.15/drivers/char/hvc_beat.c | 23218 | diff -urNp linux-2.6.32.16/drivers/char/hvc_beat.c linux-2.6.32.16/drivers/char/hvc_beat.c |
23056 | --- linux-2.6.32.15/drivers/char/hvc_beat.c 2010-03-15 11:52:04.000000000 -0400 | 23219 | --- linux-2.6.32.16/drivers/char/hvc_beat.c 2010-07-05 14:14:00.000000000 -0400 |
23057 | +++ linux-2.6.32.15/drivers/char/hvc_beat.c 2010-05-28 21:27:15.403194679 -0400 | 23220 | +++ linux-2.6.32.16/drivers/char/hvc_beat.c 2010-07-09 14:50:36.000000000 -0400 |
23058 | @@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v | 23221 | @@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v |
23059 | return cnt; | 23222 | return cnt; |
23060 | } | 23223 | } |
@@ -23064,9 +23227,9 @@ diff -urNp linux-2.6.32.15/drivers/char/hvc_beat.c linux-2.6.32.15/drivers/char/ | |||
23064 | .get_chars = hvc_beat_get_chars, | 23227 | .get_chars = hvc_beat_get_chars, |
23065 | .put_chars = hvc_beat_put_chars, | 23228 | .put_chars = hvc_beat_put_chars, |
23066 | }; | 23229 | }; |
23067 | diff -urNp linux-2.6.32.15/drivers/char/hvc_console.c linux-2.6.32.15/drivers/char/hvc_console.c | 23230 | diff -urNp linux-2.6.32.16/drivers/char/hvc_console.c linux-2.6.32.16/drivers/char/hvc_console.c |
23068 | --- linux-2.6.32.15/drivers/char/hvc_console.c 2010-03-15 11:52:04.000000000 -0400 | 23231 | --- linux-2.6.32.16/drivers/char/hvc_console.c 2010-07-05 14:14:00.000000000 -0400 |
23069 | +++ linux-2.6.32.15/drivers/char/hvc_console.c 2010-05-28 21:27:15.403194679 -0400 | 23232 | +++ linux-2.6.32.16/drivers/char/hvc_console.c 2010-07-09 14:50:36.000000000 -0400 |
23070 | @@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind | 23233 | @@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind |
23071 | * console interfaces but can still be used as a tty device. This has to be | 23234 | * console interfaces but can still be used as a tty device. This has to be |
23072 | * static because kmalloc will not work during early console init. | 23235 | * static because kmalloc will not work during early console init. |
@@ -23094,9 +23257,9 @@ diff -urNp linux-2.6.32.15/drivers/char/hvc_console.c linux-2.6.32.15/drivers/ch | |||
23094 | { | 23257 | { |
23095 | struct hvc_struct *hp; | 23258 | struct hvc_struct *hp; |
23096 | int i; | 23259 | int i; |
23097 | diff -urNp linux-2.6.32.15/drivers/char/hvc_console.h linux-2.6.32.15/drivers/char/hvc_console.h | 23260 | diff -urNp linux-2.6.32.16/drivers/char/hvc_console.h linux-2.6.32.16/drivers/char/hvc_console.h |
23098 | --- linux-2.6.32.15/drivers/char/hvc_console.h 2010-03-15 11:52:04.000000000 -0400 | 23261 | --- linux-2.6.32.16/drivers/char/hvc_console.h 2010-07-05 14:14:00.000000000 -0400 |
23099 | +++ linux-2.6.32.15/drivers/char/hvc_console.h 2010-05-28 21:27:15.403194679 -0400 | 23262 | +++ linux-2.6.32.16/drivers/char/hvc_console.h 2010-07-09 14:50:36.000000000 -0400 |
23100 | @@ -55,7 +55,7 @@ struct hvc_struct { | 23263 | @@ -55,7 +55,7 @@ struct hvc_struct { |
23101 | int outbuf_size; | 23264 | int outbuf_size; |
23102 | int n_outbuf; | 23265 | int n_outbuf; |
@@ -23120,9 +23283,9 @@ diff -urNp linux-2.6.32.15/drivers/char/hvc_console.h linux-2.6.32.15/drivers/ch | |||
23120 | /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ | 23283 | /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ |
23121 | extern int hvc_remove(struct hvc_struct *hp); | 23284 | extern int hvc_remove(struct hvc_struct *hp); |
23122 | 23285 | ||
23123 | diff -urNp linux-2.6.32.15/drivers/char/hvc_iseries.c linux-2.6.32.15/drivers/char/hvc_iseries.c | 23286 | diff -urNp linux-2.6.32.16/drivers/char/hvc_iseries.c linux-2.6.32.16/drivers/char/hvc_iseries.c |
23124 | --- linux-2.6.32.15/drivers/char/hvc_iseries.c 2010-03-15 11:52:04.000000000 -0400 | 23287 | --- linux-2.6.32.16/drivers/char/hvc_iseries.c 2010-07-05 14:14:00.000000000 -0400 |
23125 | +++ linux-2.6.32.15/drivers/char/hvc_iseries.c 2010-05-28 21:27:15.403194679 -0400 | 23288 | +++ linux-2.6.32.16/drivers/char/hvc_iseries.c 2010-07-09 14:50:36.000000000 -0400 |
23126 | @@ -197,7 +197,7 @@ done: | 23289 | @@ -197,7 +197,7 @@ done: |
23127 | return sent; | 23290 | return sent; |
23128 | } | 23291 | } |
@@ -23132,9 +23295,9 @@ diff -urNp linux-2.6.32.15/drivers/char/hvc_iseries.c linux-2.6.32.15/drivers/ch | |||
23132 | .get_chars = get_chars, | 23295 | .get_chars = get_chars, |
23133 | .put_chars = put_chars, | 23296 | .put_chars = put_chars, |
23134 | .notifier_add = notifier_add_irq, | 23297 | .notifier_add = notifier_add_irq, |
23135 | diff -urNp linux-2.6.32.15/drivers/char/hvc_iucv.c linux-2.6.32.15/drivers/char/hvc_iucv.c | 23298 | diff -urNp linux-2.6.32.16/drivers/char/hvc_iucv.c linux-2.6.32.16/drivers/char/hvc_iucv.c |
23136 | --- linux-2.6.32.15/drivers/char/hvc_iucv.c 2010-03-15 11:52:04.000000000 -0400 | 23299 | --- linux-2.6.32.16/drivers/char/hvc_iucv.c 2010-07-05 14:14:00.000000000 -0400 |
23137 | +++ linux-2.6.32.15/drivers/char/hvc_iucv.c 2010-05-28 21:27:15.403194679 -0400 | 23300 | +++ linux-2.6.32.16/drivers/char/hvc_iucv.c 2010-07-09 14:50:36.000000000 -0400 |
23138 | @@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru | 23301 | @@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru |
23139 | 23302 | ||
23140 | 23303 | ||
@@ -23144,9 +23307,9 @@ diff -urNp linux-2.6.32.15/drivers/char/hvc_iucv.c linux-2.6.32.15/drivers/char/ | |||
23144 | .get_chars = hvc_iucv_get_chars, | 23307 | .get_chars = hvc_iucv_get_chars, |
23145 | .put_chars = hvc_iucv_put_chars, | 23308 | .put_chars = hvc_iucv_put_chars, |
23146 | .notifier_add = hvc_iucv_notifier_add, | 23309 | .notifier_add = hvc_iucv_notifier_add, |
23147 | diff -urNp linux-2.6.32.15/drivers/char/hvc_rtas.c linux-2.6.32.15/drivers/char/hvc_rtas.c | 23310 | diff -urNp linux-2.6.32.16/drivers/char/hvc_rtas.c linux-2.6.32.16/drivers/char/hvc_rtas.c |
23148 | --- linux-2.6.32.15/drivers/char/hvc_rtas.c 2010-03-15 11:52:04.000000000 -0400 | 23311 | --- linux-2.6.32.16/drivers/char/hvc_rtas.c 2010-07-05 14:14:00.000000000 -0400 |
23149 | +++ linux-2.6.32.15/drivers/char/hvc_rtas.c 2010-05-28 21:27:15.407096871 -0400 | 23312 | +++ linux-2.6.32.16/drivers/char/hvc_rtas.c 2010-07-09 14:50:36.000000000 -0400 |
23150 | @@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ | 23313 | @@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ |
23151 | return i; | 23314 | return i; |
23152 | } | 23315 | } |
@@ -23156,9 +23319,9 @@ diff -urNp linux-2.6.32.15/drivers/char/hvc_rtas.c linux-2.6.32.15/drivers/char/ | |||
23156 | .get_chars = hvc_rtas_read_console, | 23319 | .get_chars = hvc_rtas_read_console, |
23157 | .put_chars = hvc_rtas_write_console, | 23320 | .put_chars = hvc_rtas_write_console, |
23158 | }; | 23321 | }; |
23159 | diff -urNp linux-2.6.32.15/drivers/char/hvcs.c linux-2.6.32.15/drivers/char/hvcs.c | 23322 | diff -urNp linux-2.6.32.16/drivers/char/hvcs.c linux-2.6.32.16/drivers/char/hvcs.c |
23160 | --- linux-2.6.32.15/drivers/char/hvcs.c 2010-03-15 11:52:04.000000000 -0400 | 23323 | --- linux-2.6.32.16/drivers/char/hvcs.c 2010-07-05 14:14:00.000000000 -0400 |
23161 | +++ linux-2.6.32.15/drivers/char/hvcs.c 2010-05-28 21:27:15.407096871 -0400 | 23324 | +++ linux-2.6.32.16/drivers/char/hvcs.c 2010-07-09 14:50:36.000000000 -0400 |
23162 | @@ -269,7 +269,7 @@ struct hvcs_struct { | 23325 | @@ -269,7 +269,7 @@ struct hvcs_struct { |
23163 | unsigned int index; | 23326 | unsigned int index; |
23164 | 23327 | ||
@@ -23253,9 +23416,9 @@ diff -urNp linux-2.6.32.15/drivers/char/hvcs.c linux-2.6.32.15/drivers/char/hvcs | |||
23253 | return 0; | 23416 | return 0; |
23254 | 23417 | ||
23255 | return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; | 23418 | return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; |
23256 | diff -urNp linux-2.6.32.15/drivers/char/hvc_udbg.c linux-2.6.32.15/drivers/char/hvc_udbg.c | 23419 | diff -urNp linux-2.6.32.16/drivers/char/hvc_udbg.c linux-2.6.32.16/drivers/char/hvc_udbg.c |
23257 | --- linux-2.6.32.15/drivers/char/hvc_udbg.c 2010-03-15 11:52:04.000000000 -0400 | 23420 | --- linux-2.6.32.16/drivers/char/hvc_udbg.c 2010-07-05 14:14:00.000000000 -0400 |
23258 | +++ linux-2.6.32.15/drivers/char/hvc_udbg.c 2010-05-28 21:27:15.407096871 -0400 | 23421 | +++ linux-2.6.32.16/drivers/char/hvc_udbg.c 2010-07-09 14:50:36.000000000 -0400 |
23259 | @@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno | 23422 | @@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno |
23260 | return i; | 23423 | return i; |
23261 | } | 23424 | } |
@@ -23265,9 +23428,9 @@ diff -urNp linux-2.6.32.15/drivers/char/hvc_udbg.c linux-2.6.32.15/drivers/char/ | |||
23265 | .get_chars = hvc_udbg_get, | 23428 | .get_chars = hvc_udbg_get, |
23266 | .put_chars = hvc_udbg_put, | 23429 | .put_chars = hvc_udbg_put, |
23267 | }; | 23430 | }; |
23268 | diff -urNp linux-2.6.32.15/drivers/char/hvc_vio.c linux-2.6.32.15/drivers/char/hvc_vio.c | 23431 | diff -urNp linux-2.6.32.16/drivers/char/hvc_vio.c linux-2.6.32.16/drivers/char/hvc_vio.c |
23269 | --- linux-2.6.32.15/drivers/char/hvc_vio.c 2010-03-15 11:52:04.000000000 -0400 | 23432 | --- linux-2.6.32.16/drivers/char/hvc_vio.c 2010-07-05 14:14:00.000000000 -0400 |
23270 | +++ linux-2.6.32.15/drivers/char/hvc_vio.c 2010-05-28 21:27:15.407096871 -0400 | 23433 | +++ linux-2.6.32.16/drivers/char/hvc_vio.c 2010-07-09 14:50:36.000000000 -0400 |
23271 | @@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v | 23434 | @@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v |
23272 | return got; | 23435 | return got; |
23273 | } | 23436 | } |
@@ -23277,9 +23440,9 @@ diff -urNp linux-2.6.32.15/drivers/char/hvc_vio.c linux-2.6.32.15/drivers/char/h | |||
23277 | .get_chars = filtered_get_chars, | 23440 | .get_chars = filtered_get_chars, |
23278 | .put_chars = hvc_put_chars, | 23441 | .put_chars = hvc_put_chars, |
23279 | .notifier_add = notifier_add_irq, | 23442 | .notifier_add = notifier_add_irq, |
23280 | diff -urNp linux-2.6.32.15/drivers/char/hvc_xen.c linux-2.6.32.15/drivers/char/hvc_xen.c | 23443 | diff -urNp linux-2.6.32.16/drivers/char/hvc_xen.c linux-2.6.32.16/drivers/char/hvc_xen.c |
23281 | --- linux-2.6.32.15/drivers/char/hvc_xen.c 2010-03-15 11:52:04.000000000 -0400 | 23444 | --- linux-2.6.32.16/drivers/char/hvc_xen.c 2010-07-05 14:14:00.000000000 -0400 |
23282 | +++ linux-2.6.32.15/drivers/char/hvc_xen.c 2010-05-28 21:27:15.407096871 -0400 | 23445 | +++ linux-2.6.32.16/drivers/char/hvc_xen.c 2010-07-09 14:50:36.000000000 -0400 |
23283 | @@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno | 23446 | @@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno |
23284 | return recv; | 23447 | return recv; |
23285 | } | 23448 | } |
@@ -23289,9 +23452,9 @@ diff -urNp linux-2.6.32.15/drivers/char/hvc_xen.c linux-2.6.32.15/drivers/char/h | |||
23289 | .get_chars = read_console, | 23452 | .get_chars = read_console, |
23290 | .put_chars = write_console, | 23453 | .put_chars = write_console, |
23291 | .notifier_add = notifier_add_irq, | 23454 | .notifier_add = notifier_add_irq, |
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 | 23455 | diff -urNp linux-2.6.32.16/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.16/drivers/char/ipmi/ipmi_msghandler.c |
23293 | --- linux-2.6.32.15/drivers/char/ipmi/ipmi_msghandler.c 2010-03-15 11:52:04.000000000 -0400 | 23456 | --- linux-2.6.32.16/drivers/char/ipmi/ipmi_msghandler.c 2010-07-05 14:14:00.000000000 -0400 |
23294 | +++ linux-2.6.32.15/drivers/char/ipmi/ipmi_msghandler.c 2010-05-28 21:27:15.407096871 -0400 | 23457 | +++ linux-2.6.32.16/drivers/char/ipmi/ipmi_msghandler.c 2010-07-09 14:50:36.000000000 -0400 |
23295 | @@ -414,7 +414,7 @@ struct ipmi_smi { | 23458 | @@ -414,7 +414,7 @@ struct ipmi_smi { |
23296 | struct proc_dir_entry *proc_dir; | 23459 | struct proc_dir_entry *proc_dir; |
23297 | char proc_dir_name[10]; | 23460 | char proc_dir_name[10]; |
@@ -23322,9 +23485,9 @@ diff -urNp linux-2.6.32.15/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.15/d | |||
23322 | 23485 | ||
23323 | intf->proc_dir = NULL; | 23486 | intf->proc_dir = NULL; |
23324 | 23487 | ||
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 | 23488 | diff -urNp linux-2.6.32.16/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.16/drivers/char/ipmi/ipmi_si_intf.c |
23326 | --- linux-2.6.32.15/drivers/char/ipmi/ipmi_si_intf.c 2010-03-15 11:52:04.000000000 -0400 | 23489 | --- linux-2.6.32.16/drivers/char/ipmi/ipmi_si_intf.c 2010-07-05 14:14:00.000000000 -0400 |
23327 | +++ linux-2.6.32.15/drivers/char/ipmi/ipmi_si_intf.c 2010-05-28 21:27:15.407096871 -0400 | 23490 | +++ linux-2.6.32.16/drivers/char/ipmi/ipmi_si_intf.c 2010-07-09 14:50:36.000000000 -0400 |
23328 | @@ -277,7 +277,7 @@ struct smi_info { | 23491 | @@ -277,7 +277,7 @@ struct smi_info { |
23329 | unsigned char slave_addr; | 23492 | unsigned char slave_addr; |
23330 | 23493 | ||
@@ -23346,7 +23509,7 @@ diff -urNp linux-2.6.32.15/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.15/driv | |||
23346 | 23509 | ||
23347 | #define SI_MAX_PARMS 4 | 23510 | #define SI_MAX_PARMS 4 |
23348 | 23511 | ||
23349 | @@ -2926,7 +2926,7 @@ static int try_smi_init(struct smi_info | 23512 | @@ -2931,7 +2931,7 @@ static int try_smi_init(struct smi_info |
23350 | atomic_set(&new_smi->req_events, 0); | 23513 | atomic_set(&new_smi->req_events, 0); |
23351 | new_smi->run_to_completion = 0; | 23514 | new_smi->run_to_completion = 0; |
23352 | for (i = 0; i < SI_NUM_STATS; i++) | 23515 | for (i = 0; i < SI_NUM_STATS; i++) |
@@ -23355,9 +23518,9 @@ diff -urNp linux-2.6.32.15/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.15/driv | |||
23355 | 23518 | ||
23356 | new_smi->interrupt_disabled = 0; | 23519 | new_smi->interrupt_disabled = 0; |
23357 | atomic_set(&new_smi->stop_operation, 0); | 23520 | atomic_set(&new_smi->stop_operation, 0); |
23358 | diff -urNp linux-2.6.32.15/drivers/char/keyboard.c linux-2.6.32.15/drivers/char/keyboard.c | 23521 | diff -urNp linux-2.6.32.16/drivers/char/keyboard.c linux-2.6.32.16/drivers/char/keyboard.c |
23359 | --- linux-2.6.32.15/drivers/char/keyboard.c 2010-03-15 11:52:04.000000000 -0400 | 23522 | --- linux-2.6.32.16/drivers/char/keyboard.c 2010-07-05 14:14:00.000000000 -0400 |
23360 | +++ linux-2.6.32.15/drivers/char/keyboard.c 2010-05-28 21:27:15.407096871 -0400 | 23523 | +++ linux-2.6.32.16/drivers/char/keyboard.c 2010-07-09 14:50:36.000000000 -0400 |
23361 | @@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u | 23524 | @@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u |
23362 | kbd->kbdmode == VC_MEDIUMRAW) && | 23525 | kbd->kbdmode == VC_MEDIUMRAW) && |
23363 | value != KVAL(K_SAK)) | 23526 | value != KVAL(K_SAK)) |
@@ -23384,9 +23547,9 @@ diff -urNp linux-2.6.32.15/drivers/char/keyboard.c linux-2.6.32.15/drivers/char/ | |||
23384 | }; | 23547 | }; |
23385 | 23548 | ||
23386 | MODULE_DEVICE_TABLE(input, kbd_ids); | 23549 | MODULE_DEVICE_TABLE(input, kbd_ids); |
23387 | diff -urNp linux-2.6.32.15/drivers/char/mem.c linux-2.6.32.15/drivers/char/mem.c | 23550 | diff -urNp linux-2.6.32.16/drivers/char/mem.c linux-2.6.32.16/drivers/char/mem.c |
23388 | --- linux-2.6.32.15/drivers/char/mem.c 2010-03-15 11:52:04.000000000 -0400 | 23551 | --- linux-2.6.32.16/drivers/char/mem.c 2010-07-05 14:14:00.000000000 -0400 |
23389 | +++ linux-2.6.32.15/drivers/char/mem.c 2010-05-28 21:27:15.407096871 -0400 | 23552 | +++ linux-2.6.32.16/drivers/char/mem.c 2010-07-09 14:50:36.000000000 -0400 |
23390 | @@ -18,6 +18,7 @@ | 23553 | @@ -18,6 +18,7 @@ |
23391 | #include <linux/raw.h> | 23554 | #include <linux/raw.h> |
23392 | #include <linux/tty.h> | 23555 | #include <linux/tty.h> |
@@ -23477,9 +23640,9 @@ diff -urNp linux-2.6.32.15/drivers/char/mem.c linux-2.6.32.15/drivers/char/mem.c | |||
23477 | }; | 23640 | }; |
23478 | 23641 | ||
23479 | static int memory_open(struct inode *inode, struct file *filp) | 23642 | static int memory_open(struct inode *inode, struct file *filp) |
23480 | diff -urNp linux-2.6.32.15/drivers/char/nvram.c linux-2.6.32.15/drivers/char/nvram.c | 23643 | diff -urNp linux-2.6.32.16/drivers/char/nvram.c linux-2.6.32.16/drivers/char/nvram.c |
23481 | --- linux-2.6.32.15/drivers/char/nvram.c 2010-03-15 11:52:04.000000000 -0400 | 23644 | --- linux-2.6.32.16/drivers/char/nvram.c 2010-07-05 14:14:00.000000000 -0400 |
23482 | +++ linux-2.6.32.15/drivers/char/nvram.c 2010-05-28 21:27:15.407096871 -0400 | 23645 | +++ linux-2.6.32.16/drivers/char/nvram.c 2010-07-09 14:50:36.000000000 -0400 |
23483 | @@ -429,7 +429,10 @@ static const struct file_operations nvra | 23646 | @@ -429,7 +429,10 @@ static const struct file_operations nvra |
23484 | static struct miscdevice nvram_dev = { | 23647 | static struct miscdevice nvram_dev = { |
23485 | NVRAM_MINOR, | 23648 | NVRAM_MINOR, |
@@ -23492,9 +23655,9 @@ diff -urNp linux-2.6.32.15/drivers/char/nvram.c linux-2.6.32.15/drivers/char/nvr | |||
23492 | }; | 23655 | }; |
23493 | 23656 | ||
23494 | static int __init nvram_init(void) | 23657 | static int __init nvram_init(void) |
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 | 23658 | diff -urNp linux-2.6.32.16/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.16/drivers/char/pcmcia/ipwireless/tty.c |
23496 | --- linux-2.6.32.15/drivers/char/pcmcia/ipwireless/tty.c 2010-03-15 11:52:04.000000000 -0400 | 23659 | --- linux-2.6.32.16/drivers/char/pcmcia/ipwireless/tty.c 2010-07-05 14:14:00.000000000 -0400 |
23497 | +++ linux-2.6.32.15/drivers/char/pcmcia/ipwireless/tty.c 2010-05-28 21:27:15.407096871 -0400 | 23660 | +++ linux-2.6.32.16/drivers/char/pcmcia/ipwireless/tty.c 2010-07-09 14:50:36.000000000 -0400 |
23498 | @@ -51,7 +51,7 @@ struct ipw_tty { | 23661 | @@ -51,7 +51,7 @@ struct ipw_tty { |
23499 | int tty_type; | 23662 | int tty_type; |
23500 | struct ipw_network *network; | 23663 | struct ipw_network *network; |
@@ -23609,9 +23772,9 @@ diff -urNp linux-2.6.32.15/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.15/ | |||
23609 | do_ipw_close(ttyj); | 23772 | do_ipw_close(ttyj); |
23610 | ipwireless_disassociate_network_ttys(network, | 23773 | ipwireless_disassociate_network_ttys(network, |
23611 | ttyj->channel_idx); | 23774 | ttyj->channel_idx); |
23612 | diff -urNp linux-2.6.32.15/drivers/char/pty.c linux-2.6.32.15/drivers/char/pty.c | 23775 | diff -urNp linux-2.6.32.16/drivers/char/pty.c linux-2.6.32.16/drivers/char/pty.c |
23613 | --- linux-2.6.32.15/drivers/char/pty.c 2010-03-15 11:52:04.000000000 -0400 | 23776 | --- linux-2.6.32.16/drivers/char/pty.c 2010-07-05 14:14:00.000000000 -0400 |
23614 | +++ linux-2.6.32.15/drivers/char/pty.c 2010-05-28 21:27:15.411167470 -0400 | 23777 | +++ linux-2.6.32.16/drivers/char/pty.c 2010-07-09 14:50:36.000000000 -0400 |
23615 | @@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode | 23778 | @@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode |
23616 | return ret; | 23779 | return ret; |
23617 | } | 23780 | } |
@@ -23642,9 +23805,9 @@ diff -urNp linux-2.6.32.15/drivers/char/pty.c linux-2.6.32.15/drivers/char/pty.c | |||
23642 | cdev_init(&ptmx_cdev, &ptmx_fops); | 23805 | cdev_init(&ptmx_cdev, &ptmx_fops); |
23643 | if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || | 23806 | if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || |
23644 | register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) | 23807 | register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) |
23645 | diff -urNp linux-2.6.32.15/drivers/char/random.c linux-2.6.32.15/drivers/char/random.c | 23808 | diff -urNp linux-2.6.32.16/drivers/char/random.c linux-2.6.32.16/drivers/char/random.c |
23646 | --- linux-2.6.32.15/drivers/char/random.c 2010-03-15 11:52:04.000000000 -0400 | 23809 | --- linux-2.6.32.16/drivers/char/random.c 2010-07-05 14:14:00.000000000 -0400 |
23647 | +++ linux-2.6.32.15/drivers/char/random.c 2010-05-28 21:27:15.411167470 -0400 | 23810 | +++ linux-2.6.32.16/drivers/char/random.c 2010-07-09 14:50:36.000000000 -0400 |
23648 | @@ -254,8 +254,13 @@ | 23811 | @@ -254,8 +254,13 @@ |
23649 | /* | 23812 | /* |
23650 | * Configuration information | 23813 | * Configuration information |
@@ -23686,9 +23849,9 @@ diff -urNp linux-2.6.32.15/drivers/char/random.c linux-2.6.32.15/drivers/char/ra | |||
23686 | static int max_write_thresh = INPUT_POOL_WORDS * 32; | 23849 | static int max_write_thresh = INPUT_POOL_WORDS * 32; |
23687 | static char sysctl_bootid[16]; | 23850 | static char sysctl_bootid[16]; |
23688 | 23851 | ||
23689 | diff -urNp linux-2.6.32.15/drivers/char/sonypi.c linux-2.6.32.15/drivers/char/sonypi.c | 23852 | diff -urNp linux-2.6.32.16/drivers/char/sonypi.c linux-2.6.32.16/drivers/char/sonypi.c |
23690 | --- linux-2.6.32.15/drivers/char/sonypi.c 2010-03-15 11:52:04.000000000 -0400 | 23853 | --- linux-2.6.32.16/drivers/char/sonypi.c 2010-07-05 14:14:00.000000000 -0400 |
23691 | +++ linux-2.6.32.15/drivers/char/sonypi.c 2010-05-28 21:27:15.411167470 -0400 | 23854 | +++ linux-2.6.32.16/drivers/char/sonypi.c 2010-07-09 14:50:36.000000000 -0400 |
23692 | @@ -491,7 +491,7 @@ static struct sonypi_device { | 23855 | @@ -491,7 +491,7 @@ static struct sonypi_device { |
23693 | spinlock_t fifo_lock; | 23856 | spinlock_t fifo_lock; |
23694 | wait_queue_head_t fifo_proc_list; | 23857 | wait_queue_head_t fifo_proc_list; |
@@ -23719,9 +23882,9 @@ diff -urNp linux-2.6.32.15/drivers/char/sonypi.c linux-2.6.32.15/drivers/char/so | |||
23719 | mutex_unlock(&sonypi_device.lock); | 23882 | mutex_unlock(&sonypi_device.lock); |
23720 | unlock_kernel(); | 23883 | unlock_kernel(); |
23721 | return 0; | 23884 | return 0; |
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 | 23885 | diff -urNp linux-2.6.32.16/drivers/char/tpm/tpm_bios.c linux-2.6.32.16/drivers/char/tpm/tpm_bios.c |
23723 | --- linux-2.6.32.15/drivers/char/tpm/tpm_bios.c 2010-03-15 11:52:04.000000000 -0400 | 23886 | --- linux-2.6.32.16/drivers/char/tpm/tpm_bios.c 2010-07-05 14:14:00.000000000 -0400 |
23724 | +++ linux-2.6.32.15/drivers/char/tpm/tpm_bios.c 2010-05-28 21:27:15.411167470 -0400 | 23887 | +++ linux-2.6.32.16/drivers/char/tpm/tpm_bios.c 2010-07-09 14:50:36.000000000 -0400 |
23725 | @@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start | 23888 | @@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start |
23726 | event = addr; | 23889 | event = addr; |
23727 | 23890 | ||
@@ -23762,9 +23925,9 @@ diff -urNp linux-2.6.32.15/drivers/char/tpm/tpm_bios.c linux-2.6.32.15/drivers/c | |||
23762 | 23925 | ||
23763 | memcpy(log->bios_event_log, virt, len); | 23926 | memcpy(log->bios_event_log, virt, len); |
23764 | 23927 | ||
23765 | diff -urNp linux-2.6.32.15/drivers/char/tty_io.c linux-2.6.32.15/drivers/char/tty_io.c | 23928 | diff -urNp linux-2.6.32.16/drivers/char/tty_io.c linux-2.6.32.16/drivers/char/tty_io.c |
23766 | --- linux-2.6.32.15/drivers/char/tty_io.c 2010-04-29 17:49:37.826084348 -0400 | 23929 | --- linux-2.6.32.16/drivers/char/tty_io.c 2010-07-05 14:14:00.000000000 -0400 |
23767 | +++ linux-2.6.32.15/drivers/char/tty_io.c 2010-05-28 21:27:15.411167470 -0400 | 23930 | +++ linux-2.6.32.16/drivers/char/tty_io.c 2010-07-09 14:50:36.000000000 -0400 |
23768 | @@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list | 23931 | @@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list |
23769 | DEFINE_MUTEX(tty_mutex); | 23932 | DEFINE_MUTEX(tty_mutex); |
23770 | EXPORT_SYMBOL(tty_mutex); | 23933 | EXPORT_SYMBOL(tty_mutex); |
@@ -23903,9 +24066,9 @@ diff -urNp linux-2.6.32.15/drivers/char/tty_io.c linux-2.6.32.15/drivers/char/tt | |||
23903 | /* | 24066 | /* |
23904 | * Initialize the console device. This is called *early*, so | 24067 | * Initialize the console device. This is called *early*, so |
23905 | * we can't necessarily depend on lots of kernel help here. | 24068 | * we can't necessarily depend on lots of kernel help here. |
23906 | diff -urNp linux-2.6.32.15/drivers/char/tty_ldisc.c linux-2.6.32.15/drivers/char/tty_ldisc.c | 24069 | diff -urNp linux-2.6.32.16/drivers/char/tty_ldisc.c linux-2.6.32.16/drivers/char/tty_ldisc.c |
23907 | --- linux-2.6.32.15/drivers/char/tty_ldisc.c 2010-03-15 11:52:04.000000000 -0400 | 24070 | --- linux-2.6.32.16/drivers/char/tty_ldisc.c 2010-07-05 14:14:00.000000000 -0400 |
23908 | +++ linux-2.6.32.15/drivers/char/tty_ldisc.c 2010-05-28 21:27:15.411167470 -0400 | 24071 | +++ linux-2.6.32.16/drivers/char/tty_ldisc.c 2010-07-09 14:50:36.000000000 -0400 |
23909 | @@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc * | 24072 | @@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc * |
23910 | if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { | 24073 | if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { |
23911 | struct tty_ldisc_ops *ldo = ld->ops; | 24074 | struct tty_ldisc_ops *ldo = ld->ops; |
@@ -23951,9 +24114,9 @@ diff -urNp linux-2.6.32.15/drivers/char/tty_ldisc.c linux-2.6.32.15/drivers/char | |||
23951 | module_put(ldops->owner); | 24114 | module_put(ldops->owner); |
23952 | spin_unlock_irqrestore(&tty_ldisc_lock, flags); | 24115 | spin_unlock_irqrestore(&tty_ldisc_lock, flags); |
23953 | } | 24116 | } |
23954 | diff -urNp linux-2.6.32.15/drivers/char/virtio_console.c linux-2.6.32.15/drivers/char/virtio_console.c | 24117 | diff -urNp linux-2.6.32.16/drivers/char/virtio_console.c linux-2.6.32.16/drivers/char/virtio_console.c |
23955 | --- linux-2.6.32.15/drivers/char/virtio_console.c 2010-03-15 11:52:04.000000000 -0400 | 24118 | --- linux-2.6.32.16/drivers/char/virtio_console.c 2010-07-05 14:14:00.000000000 -0400 |
23956 | +++ linux-2.6.32.15/drivers/char/virtio_console.c 2010-05-28 21:27:15.411167470 -0400 | 24119 | +++ linux-2.6.32.16/drivers/char/virtio_console.c 2010-07-09 14:50:36.000000000 -0400 |
23957 | @@ -44,6 +44,7 @@ static unsigned int in_len; | 24120 | @@ -44,6 +44,7 @@ static unsigned int in_len; |
23958 | static char *in, *inbuf; | 24121 | static char *in, *inbuf; |
23959 | 24122 | ||
@@ -23962,39 +24125,55 @@ diff -urNp linux-2.6.32.15/drivers/char/virtio_console.c linux-2.6.32.15/drivers | |||
23962 | static struct hv_ops virtio_cons; | 24125 | static struct hv_ops virtio_cons; |
23963 | 24126 | ||
23964 | /* The hvc device */ | 24127 | /* The hvc device */ |
23965 | diff -urNp linux-2.6.32.15/drivers/char/vt_ioctl.c linux-2.6.32.15/drivers/char/vt_ioctl.c | 24128 | diff -urNp linux-2.6.32.16/drivers/char/vt_ioctl.c linux-2.6.32.16/drivers/char/vt_ioctl.c |
23966 | --- linux-2.6.32.15/drivers/char/vt_ioctl.c 2010-03-15 11:52:04.000000000 -0400 | 24129 | --- linux-2.6.32.16/drivers/char/vt_ioctl.c 2010-07-05 14:14:00.000000000 -0400 |
23967 | +++ linux-2.6.32.15/drivers/char/vt_ioctl.c 2010-05-28 21:27:15.414917676 -0400 | 24130 | +++ linux-2.6.32.16/drivers/char/vt_ioctl.c 2010-07-11 12:11:58.000000000 -0400 |
23968 | @@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __ | 24131 | @@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __ |
24132 | if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry))) | ||
24133 | return -EFAULT; | ||
24134 | |||
24135 | - if (!capable(CAP_SYS_TTY_CONFIG)) | ||
24136 | - perm = 0; | ||
24137 | - | ||
24138 | switch (cmd) { | ||
24139 | case KDGKBENT: | ||
24140 | key_map = key_maps[s]; | ||
24141 | @@ -224,8 +221,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __ | ||
24142 | val = (i ? K_HOLE : K_NOSUCHMAP); | ||
24143 | return put_user(val, &user_kbe->kb_value); | ||
23969 | case KDSKBENT: | 24144 | case KDSKBENT: |
24145 | + if (!capable(CAP_SYS_TTY_CONFIG)) | ||
24146 | + perm = 0; | ||
24147 | + | ||
23970 | if (!perm) | 24148 | if (!perm) |
23971 | return -EPERM; | 24149 | return -EPERM; |
23972 | + | 24150 | + |
23973 | +#ifdef CONFIG_GRKERNSEC | ||
23974 | + if (!capable(CAP_SYS_TTY_CONFIG)) | ||
23975 | + return -EPERM; | ||
23976 | +#endif | ||
23977 | + | ||
23978 | if (!i && v == K_NOSUCHMAP) { | 24151 | if (!i && v == K_NOSUCHMAP) { |
23979 | /* deallocate map */ | 24152 | /* deallocate map */ |
23980 | key_map = key_maps[s]; | 24153 | key_map = key_maps[s]; |
23981 | @@ -366,6 +372,13 @@ do_kdgkb_ioctl(int cmd, struct kbsentry | 24154 | @@ -325,9 +326,6 @@ do_kdgkb_ioctl(int cmd, struct kbsentry |
23982 | goto reterr; | 24155 | int i, j, k; |
23983 | } | 24156 | int ret; |
23984 | 24157 | ||
23985 | +#ifdef CONFIG_GRKERNSEC | 24158 | - if (!capable(CAP_SYS_TTY_CONFIG)) |
23986 | + if (!capable(CAP_SYS_TTY_CONFIG)) { | 24159 | - perm = 0; |
23987 | + ret = -EPERM; | 24160 | - |
23988 | + goto reterr; | 24161 | kbs = kmalloc(sizeof(*kbs), GFP_KERNEL); |
23989 | + } | 24162 | if (!kbs) { |
23990 | +#endif | 24163 | ret = -ENOMEM; |
24164 | @@ -361,6 +359,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry | ||
24165 | kfree(kbs); | ||
24166 | return ((p && *p) ? -EOVERFLOW : 0); | ||
24167 | case KDSKBSENT: | ||
24168 | + if (!capable(CAP_SYS_TTY_CONFIG)) | ||
24169 | + perm = 0; | ||
23991 | + | 24170 | + |
23992 | q = func_table[i]; | 24171 | if (!perm) { |
23993 | first_free = funcbufptr + (funcbufsize - funcbufleft); | 24172 | ret = -EPERM; |
23994 | for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) | 24173 | goto reterr; |
23995 | diff -urNp linux-2.6.32.15/drivers/cpufreq/cpufreq.c linux-2.6.32.15/drivers/cpufreq/cpufreq.c | 24174 | diff -urNp linux-2.6.32.16/drivers/cpufreq/cpufreq.c linux-2.6.32.16/drivers/cpufreq/cpufreq.c |
23996 | --- linux-2.6.32.15/drivers/cpufreq/cpufreq.c 2010-03-15 11:52:04.000000000 -0400 | 24175 | --- linux-2.6.32.16/drivers/cpufreq/cpufreq.c 2010-07-05 14:14:00.000000000 -0400 |
23997 | +++ linux-2.6.32.15/drivers/cpufreq/cpufreq.c 2010-05-28 21:27:15.418968453 -0400 | 24176 | +++ linux-2.6.32.16/drivers/cpufreq/cpufreq.c 2010-07-09 14:50:36.000000000 -0400 |
23998 | @@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct | 24177 | @@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct |
23999 | complete(&policy->kobj_unregister); | 24178 | complete(&policy->kobj_unregister); |
24000 | } | 24179 | } |
@@ -24004,9 +24183,9 @@ diff -urNp linux-2.6.32.15/drivers/cpufreq/cpufreq.c linux-2.6.32.15/drivers/cpu | |||
24004 | .show = show, | 24183 | .show = show, |
24005 | .store = store, | 24184 | .store = store, |
24006 | }; | 24185 | }; |
24007 | diff -urNp linux-2.6.32.15/drivers/cpuidle/sysfs.c linux-2.6.32.15/drivers/cpuidle/sysfs.c | 24186 | diff -urNp linux-2.6.32.16/drivers/cpuidle/sysfs.c linux-2.6.32.16/drivers/cpuidle/sysfs.c |
24008 | --- linux-2.6.32.15/drivers/cpuidle/sysfs.c 2010-03-15 11:52:04.000000000 -0400 | 24187 | --- linux-2.6.32.16/drivers/cpuidle/sysfs.c 2010-07-05 14:14:00.000000000 -0400 |
24009 | +++ linux-2.6.32.15/drivers/cpuidle/sysfs.c 2010-05-28 21:27:15.418968453 -0400 | 24188 | +++ linux-2.6.32.16/drivers/cpuidle/sysfs.c 2010-07-09 14:50:36.000000000 -0400 |
24010 | @@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj | 24189 | @@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj |
24011 | return ret; | 24190 | return ret; |
24012 | } | 24191 | } |
@@ -24034,9 +24213,9 @@ diff -urNp linux-2.6.32.15/drivers/cpuidle/sysfs.c linux-2.6.32.15/drivers/cpuid | |||
24034 | { | 24213 | { |
24035 | kobject_put(&device->kobjs[i]->kobj); | 24214 | kobject_put(&device->kobjs[i]->kobj); |
24036 | wait_for_completion(&device->kobjs[i]->kobj_unregister); | 24215 | wait_for_completion(&device->kobjs[i]->kobj_unregister); |
24037 | diff -urNp linux-2.6.32.15/drivers/dma/ioat/dma.c linux-2.6.32.15/drivers/dma/ioat/dma.c | 24216 | diff -urNp linux-2.6.32.16/drivers/dma/ioat/dma.c linux-2.6.32.16/drivers/dma/ioat/dma.c |
24038 | --- linux-2.6.32.15/drivers/dma/ioat/dma.c 2010-03-15 11:52:04.000000000 -0400 | 24217 | --- linux-2.6.32.16/drivers/dma/ioat/dma.c 2010-07-05 14:14:00.000000000 -0400 |
24039 | +++ linux-2.6.32.15/drivers/dma/ioat/dma.c 2010-05-28 21:27:15.418968453 -0400 | 24218 | +++ linux-2.6.32.16/drivers/dma/ioat/dma.c 2010-07-09 14:50:36.000000000 -0400 |
24040 | @@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str | 24219 | @@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str |
24041 | return entry->show(&chan->common, page); | 24220 | return entry->show(&chan->common, page); |
24042 | } | 24221 | } |
@@ -24046,9 +24225,9 @@ diff -urNp linux-2.6.32.15/drivers/dma/ioat/dma.c linux-2.6.32.15/drivers/dma/io | |||
24046 | .show = ioat_attr_show, | 24225 | .show = ioat_attr_show, |
24047 | }; | 24226 | }; |
24048 | 24227 | ||
24049 | diff -urNp linux-2.6.32.15/drivers/dma/ioat/dma.h linux-2.6.32.15/drivers/dma/ioat/dma.h | 24228 | diff -urNp linux-2.6.32.16/drivers/dma/ioat/dma.h linux-2.6.32.16/drivers/dma/ioat/dma.h |
24050 | --- linux-2.6.32.15/drivers/dma/ioat/dma.h 2010-03-15 11:52:04.000000000 -0400 | 24229 | --- linux-2.6.32.16/drivers/dma/ioat/dma.h 2010-07-05 14:14:00.000000000 -0400 |
24051 | +++ linux-2.6.32.15/drivers/dma/ioat/dma.h 2010-05-28 21:27:15.418968453 -0400 | 24230 | +++ linux-2.6.32.16/drivers/dma/ioat/dma.h 2010-07-09 14:50:36.000000000 -0400 |
24052 | @@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c | 24231 | @@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c |
24053 | unsigned long *phys_complete); | 24232 | unsigned long *phys_complete); |
24054 | void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type); | 24233 | void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type); |
@@ -24058,9 +24237,9 @@ diff -urNp linux-2.6.32.15/drivers/dma/ioat/dma.h linux-2.6.32.15/drivers/dma/io | |||
24058 | extern struct ioat_sysfs_entry ioat_version_attr; | 24237 | extern struct ioat_sysfs_entry ioat_version_attr; |
24059 | extern struct ioat_sysfs_entry ioat_cap_attr; | 24238 | extern struct ioat_sysfs_entry ioat_cap_attr; |
24060 | #endif /* IOATDMA_H */ | 24239 | #endif /* IOATDMA_H */ |
24061 | diff -urNp linux-2.6.32.15/drivers/edac/edac_core.h linux-2.6.32.15/drivers/edac/edac_core.h | 24240 | diff -urNp linux-2.6.32.16/drivers/edac/edac_core.h linux-2.6.32.16/drivers/edac/edac_core.h |
24062 | --- linux-2.6.32.15/drivers/edac/edac_core.h 2010-03-15 11:52:04.000000000 -0400 | 24241 | --- linux-2.6.32.16/drivers/edac/edac_core.h 2010-07-05 14:14:00.000000000 -0400 |
24063 | +++ linux-2.6.32.15/drivers/edac/edac_core.h 2010-05-28 21:27:15.418968453 -0400 | 24242 | +++ linux-2.6.32.16/drivers/edac/edac_core.h 2010-07-09 14:50:36.000000000 -0400 |
24064 | @@ -99,11 +99,11 @@ extern int edac_debug_level; | 24243 | @@ -99,11 +99,11 @@ extern int edac_debug_level; |
24065 | 24244 | ||
24066 | #else /* !CONFIG_EDAC_DEBUG */ | 24245 | #else /* !CONFIG_EDAC_DEBUG */ |
@@ -24078,9 +24257,9 @@ diff -urNp linux-2.6.32.15/drivers/edac/edac_core.h linux-2.6.32.15/drivers/edac | |||
24078 | 24257 | ||
24079 | #endif /* !CONFIG_EDAC_DEBUG */ | 24258 | #endif /* !CONFIG_EDAC_DEBUG */ |
24080 | 24259 | ||
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 | 24260 | diff -urNp linux-2.6.32.16/drivers/edac/edac_device_sysfs.c linux-2.6.32.16/drivers/edac/edac_device_sysfs.c |
24082 | --- linux-2.6.32.15/drivers/edac/edac_device_sysfs.c 2010-03-15 11:52:04.000000000 -0400 | 24261 | --- linux-2.6.32.16/drivers/edac/edac_device_sysfs.c 2010-07-05 14:14:00.000000000 -0400 |
24083 | +++ linux-2.6.32.15/drivers/edac/edac_device_sysfs.c 2010-05-28 21:27:15.418968453 -0400 | 24262 | +++ linux-2.6.32.16/drivers/edac/edac_device_sysfs.c 2010-07-09 14:50:36.000000000 -0400 |
24084 | @@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s | 24263 | @@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s |
24085 | } | 24264 | } |
24086 | 24265 | ||
@@ -24108,9 +24287,9 @@ diff -urNp linux-2.6.32.15/drivers/edac/edac_device_sysfs.c linux-2.6.32.15/driv | |||
24108 | .show = edac_dev_block_show, | 24287 | .show = edac_dev_block_show, |
24109 | .store = edac_dev_block_store | 24288 | .store = edac_dev_block_store |
24110 | }; | 24289 | }; |
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 | 24290 | diff -urNp linux-2.6.32.16/drivers/edac/edac_mc_sysfs.c linux-2.6.32.16/drivers/edac/edac_mc_sysfs.c |
24112 | --- linux-2.6.32.15/drivers/edac/edac_mc_sysfs.c 2010-03-15 11:52:04.000000000 -0400 | 24291 | --- linux-2.6.32.16/drivers/edac/edac_mc_sysfs.c 2010-07-05 14:14:00.000000000 -0400 |
24113 | +++ linux-2.6.32.15/drivers/edac/edac_mc_sysfs.c 2010-05-28 21:27:15.418968453 -0400 | 24292 | +++ linux-2.6.32.16/drivers/edac/edac_mc_sysfs.c 2010-07-09 14:50:36.000000000 -0400 |
24114 | @@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob | 24293 | @@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob |
24115 | return -EIO; | 24294 | return -EIO; |
24116 | } | 24295 | } |
@@ -24129,9 +24308,9 @@ diff -urNp linux-2.6.32.15/drivers/edac/edac_mc_sysfs.c linux-2.6.32.15/drivers/ | |||
24129 | .show = mcidev_show, | 24308 | .show = mcidev_show, |
24130 | .store = mcidev_store | 24309 | .store = mcidev_store |
24131 | }; | 24310 | }; |
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 | 24311 | diff -urNp linux-2.6.32.16/drivers/edac/edac_pci_sysfs.c linux-2.6.32.16/drivers/edac/edac_pci_sysfs.c |
24133 | --- linux-2.6.32.15/drivers/edac/edac_pci_sysfs.c 2010-03-15 11:52:04.000000000 -0400 | 24312 | --- linux-2.6.32.16/drivers/edac/edac_pci_sysfs.c 2010-07-05 14:14:00.000000000 -0400 |
24134 | +++ linux-2.6.32.15/drivers/edac/edac_pci_sysfs.c 2010-05-28 21:27:15.418968453 -0400 | 24313 | +++ linux-2.6.32.16/drivers/edac/edac_pci_sysfs.c 2010-07-09 14:50:36.000000000 -0400 |
24135 | @@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s | 24314 | @@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s |
24136 | } | 24315 | } |
24137 | 24316 | ||
@@ -24150,9 +24329,9 @@ diff -urNp linux-2.6.32.15/drivers/edac/edac_pci_sysfs.c linux-2.6.32.15/drivers | |||
24150 | .show = edac_pci_dev_show, | 24329 | .show = edac_pci_dev_show, |
24151 | .store = edac_pci_dev_store | 24330 | .store = edac_pci_dev_store |
24152 | }; | 24331 | }; |
24153 | diff -urNp linux-2.6.32.15/drivers/firewire/core-cdev.c linux-2.6.32.15/drivers/firewire/core-cdev.c | 24332 | diff -urNp linux-2.6.32.16/drivers/firewire/core-cdev.c linux-2.6.32.16/drivers/firewire/core-cdev.c |
24154 | --- linux-2.6.32.15/drivers/firewire/core-cdev.c 2010-03-15 11:52:04.000000000 -0400 | 24333 | --- linux-2.6.32.16/drivers/firewire/core-cdev.c 2010-07-05 14:14:00.000000000 -0400 |
24155 | +++ linux-2.6.32.15/drivers/firewire/core-cdev.c 2010-05-28 21:27:15.422980793 -0400 | 24334 | +++ linux-2.6.32.16/drivers/firewire/core-cdev.c 2010-07-09 14:50:36.000000000 -0400 |
24156 | @@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie | 24335 | @@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie |
24157 | int ret; | 24336 | int ret; |
24158 | 24337 | ||
@@ -24163,9 +24342,9 @@ diff -urNp linux-2.6.32.15/drivers/firewire/core-cdev.c linux-2.6.32.15/drivers/ | |||
24163 | return -EINVAL; | 24342 | return -EINVAL; |
24164 | 24343 | ||
24165 | r = kmalloc(sizeof(*r), GFP_KERNEL); | 24344 | r = kmalloc(sizeof(*r), GFP_KERNEL); |
24166 | diff -urNp linux-2.6.32.15/drivers/firmware/dmi_scan.c linux-2.6.32.15/drivers/firmware/dmi_scan.c | 24345 | diff -urNp linux-2.6.32.16/drivers/firmware/dmi_scan.c linux-2.6.32.16/drivers/firmware/dmi_scan.c |
24167 | --- linux-2.6.32.15/drivers/firmware/dmi_scan.c 2010-03-15 11:52:04.000000000 -0400 | 24346 | --- linux-2.6.32.16/drivers/firmware/dmi_scan.c 2010-07-05 14:14:00.000000000 -0400 |
24168 | +++ linux-2.6.32.15/drivers/firmware/dmi_scan.c 2010-05-28 21:27:15.422980793 -0400 | 24347 | +++ linux-2.6.32.16/drivers/firmware/dmi_scan.c 2010-07-09 14:50:36.000000000 -0400 |
24169 | @@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) | 24348 | @@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) |
24170 | } | 24349 | } |
24171 | } | 24350 | } |
@@ -24178,9 +24357,9 @@ diff -urNp linux-2.6.32.15/drivers/firmware/dmi_scan.c linux-2.6.32.15/drivers/f | |||
24178 | p = dmi_ioremap(0xF0000, 0x10000); | 24357 | p = dmi_ioremap(0xF0000, 0x10000); |
24179 | if (p == NULL) | 24358 | if (p == NULL) |
24180 | goto error; | 24359 | goto error; |
24181 | diff -urNp linux-2.6.32.15/drivers/firmware/edd.c linux-2.6.32.15/drivers/firmware/edd.c | 24360 | diff -urNp linux-2.6.32.16/drivers/firmware/edd.c linux-2.6.32.16/drivers/firmware/edd.c |
24182 | --- linux-2.6.32.15/drivers/firmware/edd.c 2010-03-15 11:52:04.000000000 -0400 | 24361 | --- linux-2.6.32.16/drivers/firmware/edd.c 2010-07-05 14:14:00.000000000 -0400 |
24183 | +++ linux-2.6.32.15/drivers/firmware/edd.c 2010-05-28 21:27:15.422980793 -0400 | 24362 | +++ linux-2.6.32.16/drivers/firmware/edd.c 2010-07-09 14:50:36.000000000 -0400 |
24184 | @@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str | 24363 | @@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str |
24185 | return ret; | 24364 | return ret; |
24186 | } | 24365 | } |
@@ -24190,9 +24369,9 @@ diff -urNp linux-2.6.32.15/drivers/firmware/edd.c linux-2.6.32.15/drivers/firmwa | |||
24190 | .show = edd_attr_show, | 24369 | .show = edd_attr_show, |
24191 | }; | 24370 | }; |
24192 | 24371 | ||
24193 | diff -urNp linux-2.6.32.15/drivers/firmware/efivars.c linux-2.6.32.15/drivers/firmware/efivars.c | 24372 | diff -urNp linux-2.6.32.16/drivers/firmware/efivars.c linux-2.6.32.16/drivers/firmware/efivars.c |
24194 | --- linux-2.6.32.15/drivers/firmware/efivars.c 2010-03-15 11:52:04.000000000 -0400 | 24373 | --- linux-2.6.32.16/drivers/firmware/efivars.c 2010-07-05 14:14:00.000000000 -0400 |
24195 | +++ linux-2.6.32.15/drivers/firmware/efivars.c 2010-05-28 21:27:15.422980793 -0400 | 24374 | +++ linux-2.6.32.16/drivers/firmware/efivars.c 2010-07-09 14:50:36.000000000 -0400 |
24196 | @@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct | 24375 | @@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct |
24197 | return ret; | 24376 | return ret; |
24198 | } | 24377 | } |
@@ -24202,9 +24381,9 @@ diff -urNp linux-2.6.32.15/drivers/firmware/efivars.c linux-2.6.32.15/drivers/fi | |||
24202 | .show = efivar_attr_show, | 24381 | .show = efivar_attr_show, |
24203 | .store = efivar_attr_store, | 24382 | .store = efivar_attr_store, |
24204 | }; | 24383 | }; |
24205 | diff -urNp linux-2.6.32.15/drivers/firmware/iscsi_ibft.c linux-2.6.32.15/drivers/firmware/iscsi_ibft.c | 24384 | diff -urNp linux-2.6.32.16/drivers/firmware/iscsi_ibft.c linux-2.6.32.16/drivers/firmware/iscsi_ibft.c |
24206 | --- linux-2.6.32.15/drivers/firmware/iscsi_ibft.c 2010-03-15 11:52:04.000000000 -0400 | 24385 | --- linux-2.6.32.16/drivers/firmware/iscsi_ibft.c 2010-07-05 14:14:00.000000000 -0400 |
24207 | +++ linux-2.6.32.15/drivers/firmware/iscsi_ibft.c 2010-05-28 21:27:15.431186849 -0400 | 24386 | +++ linux-2.6.32.16/drivers/firmware/iscsi_ibft.c 2010-07-09 14:50:36.000000000 -0400 |
24208 | @@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc | 24387 | @@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc |
24209 | return ret; | 24388 | return ret; |
24210 | } | 24389 | } |
@@ -24214,9 +24393,9 @@ diff -urNp linux-2.6.32.15/drivers/firmware/iscsi_ibft.c linux-2.6.32.15/drivers | |||
24214 | .show = ibft_show_attribute, | 24393 | .show = ibft_show_attribute, |
24215 | }; | 24394 | }; |
24216 | 24395 | ||
24217 | diff -urNp linux-2.6.32.15/drivers/firmware/memmap.c linux-2.6.32.15/drivers/firmware/memmap.c | 24396 | diff -urNp linux-2.6.32.16/drivers/firmware/memmap.c linux-2.6.32.16/drivers/firmware/memmap.c |
24218 | --- linux-2.6.32.15/drivers/firmware/memmap.c 2010-03-15 11:52:04.000000000 -0400 | 24397 | --- linux-2.6.32.16/drivers/firmware/memmap.c 2010-07-05 14:14:00.000000000 -0400 |
24219 | +++ linux-2.6.32.15/drivers/firmware/memmap.c 2010-05-28 21:27:15.446919696 -0400 | 24398 | +++ linux-2.6.32.16/drivers/firmware/memmap.c 2010-07-09 14:50:36.000000000 -0400 |
24220 | @@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = { | 24399 | @@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = { |
24221 | NULL | 24400 | NULL |
24222 | }; | 24401 | }; |
@@ -24226,9 +24405,9 @@ diff -urNp linux-2.6.32.15/drivers/firmware/memmap.c linux-2.6.32.15/drivers/fir | |||
24226 | .show = memmap_attr_show, | 24405 | .show = memmap_attr_show, |
24227 | }; | 24406 | }; |
24228 | 24407 | ||
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 | 24408 | diff -urNp linux-2.6.32.16/drivers/gpu/drm/drm_drv.c linux-2.6.32.16/drivers/gpu/drm/drm_drv.c |
24230 | --- linux-2.6.32.15/drivers/gpu/drm/drm_drv.c 2010-03-15 11:52:04.000000000 -0400 | 24409 | --- linux-2.6.32.16/drivers/gpu/drm/drm_drv.c 2010-07-05 14:14:00.000000000 -0400 |
24231 | +++ linux-2.6.32.15/drivers/gpu/drm/drm_drv.c 2010-05-28 21:27:15.446919696 -0400 | 24410 | +++ linux-2.6.32.16/drivers/gpu/drm/drm_drv.c 2010-07-09 14:50:36.000000000 -0400 |
24232 | @@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc | 24411 | @@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc |
24233 | char *kdata = NULL; | 24412 | char *kdata = NULL; |
24234 | 24413 | ||
@@ -24238,9 +24417,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/drm_drv.c linux-2.6.32.15/drivers/gpu | |||
24238 | ++file_priv->ioctl_count; | 24417 | ++file_priv->ioctl_count; |
24239 | 24418 | ||
24240 | DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", | 24419 | DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", |
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 | 24420 | diff -urNp linux-2.6.32.16/drivers/gpu/drm/drm_fops.c linux-2.6.32.16/drivers/gpu/drm/drm_fops.c |
24242 | --- linux-2.6.32.15/drivers/gpu/drm/drm_fops.c 2010-04-29 17:49:37.845185844 -0400 | 24421 | --- linux-2.6.32.16/drivers/gpu/drm/drm_fops.c 2010-07-05 14:14:00.000000000 -0400 |
24243 | +++ linux-2.6.32.15/drivers/gpu/drm/drm_fops.c 2010-05-28 21:27:15.451193295 -0400 | 24422 | +++ linux-2.6.32.16/drivers/gpu/drm/drm_fops.c 2010-07-09 14:50:36.000000000 -0400 |
24244 | @@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * | 24423 | @@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * |
24245 | } | 24424 | } |
24246 | 24425 | ||
@@ -24292,9 +24471,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/drm_fops.c linux-2.6.32.15/drivers/gp | |||
24292 | if (atomic_read(&dev->ioctl_count)) { | 24471 | if (atomic_read(&dev->ioctl_count)) { |
24293 | DRM_ERROR("Device busy: %d\n", | 24472 | DRM_ERROR("Device busy: %d\n", |
24294 | atomic_read(&dev->ioctl_count)); | 24473 | atomic_read(&dev->ioctl_count)); |
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 | 24474 | diff -urNp linux-2.6.32.16/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.16/drivers/gpu/drm/drm_ioctl.c |
24296 | --- linux-2.6.32.15/drivers/gpu/drm/drm_ioctl.c 2010-03-15 11:52:04.000000000 -0400 | 24475 | --- linux-2.6.32.16/drivers/gpu/drm/drm_ioctl.c 2010-07-05 14:14:00.000000000 -0400 |
24297 | +++ linux-2.6.32.15/drivers/gpu/drm/drm_ioctl.c 2010-05-28 21:27:15.451193295 -0400 | 24476 | +++ linux-2.6.32.16/drivers/gpu/drm/drm_ioctl.c 2010-07-09 14:50:36.000000000 -0400 |
24298 | @@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev, | 24477 | @@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev, |
24299 | stats->data[i].value = | 24478 | stats->data[i].value = |
24300 | (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0); | 24479 | (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0); |
@@ -24304,9 +24483,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.15/drivers/g | |||
24304 | stats->data[i].type = dev->types[i]; | 24483 | stats->data[i].type = dev->types[i]; |
24305 | } | 24484 | } |
24306 | 24485 | ||
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 | 24486 | diff -urNp linux-2.6.32.16/drivers/gpu/drm/drm_lock.c linux-2.6.32.16/drivers/gpu/drm/drm_lock.c |
24308 | --- linux-2.6.32.15/drivers/gpu/drm/drm_lock.c 2010-03-15 11:52:04.000000000 -0400 | 24487 | --- linux-2.6.32.16/drivers/gpu/drm/drm_lock.c 2010-07-05 14:14:00.000000000 -0400 |
24309 | +++ linux-2.6.32.15/drivers/gpu/drm/drm_lock.c 2010-05-28 21:27:15.451193295 -0400 | 24488 | +++ linux-2.6.32.16/drivers/gpu/drm/drm_lock.c 2010-07-09 14:50:36.000000000 -0400 |
24310 | @@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi | 24489 | @@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi |
24311 | if (drm_lock_take(&master->lock, lock->context)) { | 24490 | if (drm_lock_take(&master->lock, lock->context)) { |
24312 | master->lock.file_priv = file_priv; | 24491 | master->lock.file_priv = file_priv; |
@@ -24325,9 +24504,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/drm_lock.c linux-2.6.32.15/drivers/gp | |||
24325 | 24504 | ||
24326 | /* kernel_context_switch isn't used by any of the x86 drm | 24505 | /* kernel_context_switch isn't used by any of the x86 drm |
24327 | * modules but is required by the Sparc driver. | 24506 | * modules but is required by the Sparc driver. |
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 | 24507 | diff -urNp linux-2.6.32.16/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.16/drivers/gpu/drm/i810/i810_dma.c |
24329 | --- linux-2.6.32.15/drivers/gpu/drm/i810/i810_dma.c 2010-03-15 11:52:04.000000000 -0400 | 24508 | --- linux-2.6.32.16/drivers/gpu/drm/i810/i810_dma.c 2010-07-05 14:14:00.000000000 -0400 |
24330 | +++ linux-2.6.32.15/drivers/gpu/drm/i810/i810_dma.c 2010-05-28 21:27:15.455180050 -0400 | 24509 | +++ linux-2.6.32.16/drivers/gpu/drm/i810/i810_dma.c 2010-07-09 14:50:36.000000000 -0400 |
24331 | @@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de | 24510 | @@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de |
24332 | dma->buflist[vertex->idx], | 24511 | dma->buflist[vertex->idx], |
24333 | vertex->discard, vertex->used); | 24512 | vertex->discard, vertex->used); |
@@ -24350,9 +24529,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.15/drive | |||
24350 | sarea_priv->last_enqueue = dev_priv->counter - 1; | 24529 | sarea_priv->last_enqueue = dev_priv->counter - 1; |
24351 | sarea_priv->last_dispatch = (int)hw_status[5]; | 24530 | sarea_priv->last_dispatch = (int)hw_status[5]; |
24352 | 24531 | ||
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 | 24532 | diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7017.c |
24354 | --- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7017.c 2010-03-15 11:52:04.000000000 -0400 | 24533 | --- linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7017.c 2010-07-05 14:14:00.000000000 -0400 |
24355 | +++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7017.c 2010-05-28 21:27:15.455180050 -0400 | 24534 | +++ linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7017.c 2010-07-09 14:50:36.000000000 -0400 |
24356 | @@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_ | 24535 | @@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_ |
24357 | } | 24536 | } |
24358 | } | 24537 | } |
@@ -24362,9 +24541,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.15/dri | |||
24362 | .init = ch7017_init, | 24541 | .init = ch7017_init, |
24363 | .detect = ch7017_detect, | 24542 | .detect = ch7017_detect, |
24364 | .mode_valid = ch7017_mode_valid, | 24543 | .mode_valid = ch7017_mode_valid, |
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 | 24544 | diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7xxx.c |
24366 | --- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-03-15 11:52:04.000000000 -0400 | 24545 | --- linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-07-05 14:14:00.000000000 -0400 |
24367 | +++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-05-28 21:27:15.459183485 -0400 | 24546 | +++ linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-07-09 14:50:36.000000000 -0400 |
24368 | @@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_ | 24547 | @@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_ |
24369 | } | 24548 | } |
24370 | } | 24549 | } |
@@ -24374,9 +24553,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.15/dri | |||
24374 | .init = ch7xxx_init, | 24553 | .init = ch7xxx_init, |
24375 | .detect = ch7xxx_detect, | 24554 | .detect = ch7xxx_detect, |
24376 | .mode_valid = ch7xxx_mode_valid, | 24555 | .mode_valid = ch7xxx_mode_valid, |
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 | 24556 | diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo.h linux-2.6.32.16/drivers/gpu/drm/i915/dvo.h |
24378 | --- linux-2.6.32.15/drivers/gpu/drm/i915/dvo.h 2010-03-15 11:52:04.000000000 -0400 | 24557 | --- linux-2.6.32.16/drivers/gpu/drm/i915/dvo.h 2010-07-05 14:14:00.000000000 -0400 |
24379 | +++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo.h 2010-05-28 21:27:15.463172433 -0400 | 24558 | +++ linux-2.6.32.16/drivers/gpu/drm/i915/dvo.h 2010-07-09 14:50:36.000000000 -0400 |
24380 | @@ -135,23 +135,23 @@ struct intel_dvo_dev_ops { | 24559 | @@ -135,23 +135,23 @@ struct intel_dvo_dev_ops { |
24381 | * | 24560 | * |
24382 | * \return singly-linked list of modes or NULL if no modes found. | 24561 | * \return singly-linked list of modes or NULL if no modes found. |
@@ -24409,9 +24588,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo.h linux-2.6.32.15/drivers/gp | |||
24409 | +extern const struct intel_dvo_dev_ops ch7017_ops; | 24588 | +extern const struct intel_dvo_dev_ops ch7017_ops; |
24410 | 24589 | ||
24411 | #endif /* _INTEL_DVO_H */ | 24590 | #endif /* _INTEL_DVO_H */ |
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 | 24591 | diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ivch.c |
24413 | --- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ivch.c 2010-03-15 11:52:04.000000000 -0400 | 24592 | --- linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ivch.c 2010-07-05 14:14:00.000000000 -0400 |
24414 | +++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ivch.c 2010-05-28 21:27:15.463172433 -0400 | 24593 | +++ linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ivch.c 2010-07-09 14:50:36.000000000 -0400 |
24415 | @@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv | 24594 | @@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv |
24416 | } | 24595 | } |
24417 | } | 24596 | } |
@@ -24421,9 +24600,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.15/drive | |||
24421 | .init = ivch_init, | 24600 | .init = ivch_init, |
24422 | .dpms = ivch_dpms, | 24601 | .dpms = ivch_dpms, |
24423 | .save = ivch_save, | 24602 | .save = ivch_save, |
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 | 24603 | diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.16/drivers/gpu/drm/i915/dvo_sil164.c |
24425 | --- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_sil164.c 2010-03-15 11:52:04.000000000 -0400 | 24604 | --- linux-2.6.32.16/drivers/gpu/drm/i915/dvo_sil164.c 2010-07-05 14:14:00.000000000 -0400 |
24426 | +++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_sil164.c 2010-05-28 21:27:15.463172433 -0400 | 24605 | +++ linux-2.6.32.16/drivers/gpu/drm/i915/dvo_sil164.c 2010-07-09 14:50:36.000000000 -0400 |
24427 | @@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_ | 24606 | @@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_ |
24428 | } | 24607 | } |
24429 | } | 24608 | } |
@@ -24433,9 +24612,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.15/dri | |||
24433 | .init = sil164_init, | 24612 | .init = sil164_init, |
24434 | .detect = sil164_detect, | 24613 | .detect = sil164_detect, |
24435 | .mode_valid = sil164_mode_valid, | 24614 | .mode_valid = sil164_mode_valid, |
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 | 24615 | diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.16/drivers/gpu/drm/i915/dvo_tfp410.c |
24437 | --- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_tfp410.c 2010-03-15 11:52:04.000000000 -0400 | 24616 | --- linux-2.6.32.16/drivers/gpu/drm/i915/dvo_tfp410.c 2010-07-05 14:14:00.000000000 -0400 |
24438 | +++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_tfp410.c 2010-05-28 21:27:15.463172433 -0400 | 24617 | +++ linux-2.6.32.16/drivers/gpu/drm/i915/dvo_tfp410.c 2010-07-09 14:50:36.000000000 -0400 |
24439 | @@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_ | 24618 | @@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_ |
24440 | } | 24619 | } |
24441 | } | 24620 | } |
@@ -24445,9 +24624,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.15/dri | |||
24445 | .init = tfp410_init, | 24624 | .init = tfp410_init, |
24446 | .detect = tfp410_detect, | 24625 | .detect = tfp410_detect, |
24447 | .mode_valid = tfp410_mode_valid, | 24626 | .mode_valid = tfp410_mode_valid, |
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 | 24627 | diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.16/drivers/gpu/drm/i915/i915_drv.c |
24449 | --- linux-2.6.32.15/drivers/gpu/drm/i915/i915_drv.c 2010-03-15 11:52:04.000000000 -0400 | 24628 | --- linux-2.6.32.16/drivers/gpu/drm/i915/i915_drv.c 2010-07-05 14:14:00.000000000 -0400 |
24450 | +++ linux-2.6.32.15/drivers/gpu/drm/i915/i915_drv.c 2010-05-28 21:27:15.463172433 -0400 | 24629 | +++ linux-2.6.32.16/drivers/gpu/drm/i915/i915_drv.c 2010-07-09 14:50:36.000000000 -0400 |
24451 | @@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev) | 24630 | @@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev) |
24452 | return i915_resume(dev); | 24631 | return i915_resume(dev); |
24453 | } | 24632 | } |
@@ -24457,9 +24636,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.15/drive | |||
24457 | .fault = i915_gem_fault, | 24636 | .fault = i915_gem_fault, |
24458 | .open = drm_gem_vm_open, | 24637 | .open = drm_gem_vm_open, |
24459 | .close = drm_gem_vm_close, | 24638 | .close = drm_gem_vm_close, |
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 | 24639 | diff -urNp linux-2.6.32.16/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.16/drivers/gpu/drm/radeon/mkregtable.c |
24461 | --- linux-2.6.32.15/drivers/gpu/drm/radeon/mkregtable.c 2010-03-15 11:52:04.000000000 -0400 | 24640 | --- linux-2.6.32.16/drivers/gpu/drm/radeon/mkregtable.c 2010-07-05 14:14:00.000000000 -0400 |
24462 | +++ linux-2.6.32.15/drivers/gpu/drm/radeon/mkregtable.c 2010-05-28 21:27:15.467181648 -0400 | 24641 | +++ linux-2.6.32.16/drivers/gpu/drm/radeon/mkregtable.c 2010-07-09 14:50:36.000000000 -0400 |
24463 | @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, | 24642 | @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, |
24464 | regex_t mask_rex; | 24643 | regex_t mask_rex; |
24465 | regmatch_t match[4]; | 24644 | regmatch_t match[4]; |
@@ -24477,9 +24656,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.15/d | |||
24477 | 24656 | ||
24478 | if (regcomp | 24657 | if (regcomp |
24479 | (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { | 24658 | (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { |
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 | 24659 | diff -urNp linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_atombios.c |
24481 | --- linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_atombios.c 2010-03-15 11:52:04.000000000 -0400 | 24660 | --- linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_atombios.c 2010-07-05 14:14:00.000000000 -0400 |
24482 | +++ linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_atombios.c 2010-05-28 21:27:15.467181648 -0400 | 24661 | +++ linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_atombios.c 2010-07-09 14:50:36.000000000 -0400 |
24483 | @@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o | 24662 | @@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o |
24484 | } | 24663 | } |
24485 | } | 24664 | } |
@@ -24504,9 +24683,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32 | |||
24504 | 24683 | ||
24505 | atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); | 24684 | atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); |
24506 | 24685 | ||
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 | 24686 | diff -urNp linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_display.c |
24508 | --- linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_display.c 2010-03-15 11:52:04.000000000 -0400 | 24687 | --- linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_display.c 2010-07-05 14:14:00.000000000 -0400 |
24509 | +++ linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_display.c 2010-05-28 21:27:15.467181648 -0400 | 24688 | +++ linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_display.c 2010-07-09 14:50:36.000000000 -0400 |
24510 | @@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl | 24689 | @@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl |
24511 | 24690 | ||
24512 | if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) { | 24691 | if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) { |
@@ -24516,10 +24695,10 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32. | |||
24516 | } else | 24695 | } else |
24517 | error = abs(current_freq - freq); | 24696 | error = abs(current_freq - freq); |
24518 | vco_diff = abs(vco - best_vco); | 24697 | vco_diff = abs(vco - best_vco); |
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 | 24698 | diff -urNp linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_state.c |
24520 | --- linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_state.c 2010-03-15 11:52:04.000000000 -0400 | 24699 | --- linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_state.c 2010-07-05 14:14:00.000000000 -0400 |
24521 | +++ linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_state.c 2010-05-28 21:27:15.475020618 -0400 | 24700 | +++ linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_state.c 2010-07-09 14:50:36.000000000 -0400 |
24522 | @@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm | 24701 | @@ -3021,7 +3021,7 @@ static int radeon_cp_getparam(struct drm |
24523 | { | 24702 | { |
24524 | drm_radeon_private_t *dev_priv = dev->dev_private; | 24703 | drm_radeon_private_t *dev_priv = dev->dev_private; |
24525 | drm_radeon_getparam_t *param = data; | 24704 | drm_radeon_getparam_t *param = data; |
@@ -24528,9 +24707,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.15 | |||
24528 | 24707 | ||
24529 | DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); | 24708 | DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); |
24530 | 24709 | ||
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 | 24710 | diff -urNp linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_ttm.c |
24532 | --- linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_ttm.c 2010-03-15 11:52:04.000000000 -0400 | 24711 | --- linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_ttm.c 2010-07-05 14:14:00.000000000 -0400 |
24533 | +++ linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_ttm.c 2010-05-28 21:27:15.475020618 -0400 | 24712 | +++ linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_ttm.c 2010-07-09 14:50:36.000000000 -0400 |
24534 | @@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic | 24713 | @@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic |
24535 | DRM_INFO("radeon: ttm finalized\n"); | 24714 | DRM_INFO("radeon: ttm finalized\n"); |
24536 | } | 24715 | } |
@@ -24582,9 +24761,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.15/d | |||
24582 | } | 24761 | } |
24583 | 24762 | ||
24584 | 24763 | ||
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 | 24764 | diff -urNp linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo.c |
24586 | --- linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo.c 2010-03-15 11:52:04.000000000 -0400 | 24765 | --- linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo.c 2010-07-05 14:14:00.000000000 -0400 |
24587 | +++ linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo.c 2010-05-28 21:27:15.483213986 -0400 | 24766 | +++ linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo.c 2010-07-09 14:50:36.000000000 -0400 |
24588 | @@ -39,7 +39,7 @@ | 24767 | @@ -39,7 +39,7 @@ |
24589 | #include <linux/module.h> | 24768 | #include <linux/module.h> |
24590 | 24769 | ||
@@ -24603,9 +24782,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.15/drivers/ | |||
24603 | .show = &ttm_bo_global_show | 24782 | .show = &ttm_bo_global_show |
24604 | }; | 24783 | }; |
24605 | 24784 | ||
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 | 24785 | diff -urNp linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo_vm.c |
24607 | --- linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-03-15 11:52:04.000000000 -0400 | 24786 | --- linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-07-05 14:14:00.000000000 -0400 |
24608 | +++ linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-05-28 21:27:15.483213986 -0400 | 24787 | +++ linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-07-09 14:50:36.000000000 -0400 |
24609 | @@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are | 24788 | @@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are |
24610 | { | 24789 | { |
24611 | struct ttm_buffer_object *bo = (struct ttm_buffer_object *) | 24790 | struct ttm_buffer_object *bo = (struct ttm_buffer_object *) |
@@ -24626,9 +24805,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.15/drive | |||
24626 | /* | 24805 | /* |
24627 | * Work around locking order reversal in fault / nopfn | 24806 | * Work around locking order reversal in fault / nopfn |
24628 | * between mmap_sem and bo_reserve: Perform a trylock operation | 24807 | * between mmap_sem and bo_reserve: Perform a trylock operation |
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 | 24808 | diff -urNp linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_global.c |
24630 | --- linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_global.c 2010-03-15 11:52:04.000000000 -0400 | 24809 | --- linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_global.c 2010-07-05 14:14:00.000000000 -0400 |
24631 | +++ linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_global.c 2010-05-28 21:27:15.487089783 -0400 | 24810 | +++ linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_global.c 2010-07-09 14:50:36.000000000 -0400 |
24632 | @@ -36,7 +36,7 @@ | 24811 | @@ -36,7 +36,7 @@ |
24633 | struct ttm_global_item { | 24812 | struct ttm_global_item { |
24634 | struct mutex mutex; | 24813 | struct mutex mutex; |
@@ -24686,9 +24865,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.15/driv | |||
24686 | ref->release(ref); | 24865 | ref->release(ref); |
24687 | item->object = NULL; | 24866 | item->object = NULL; |
24688 | } | 24867 | } |
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 | 24868 | diff -urNp linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_memory.c |
24690 | --- linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_memory.c 2010-03-15 11:52:04.000000000 -0400 | 24869 | --- linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_memory.c 2010-07-05 14:14:00.000000000 -0400 |
24691 | +++ linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_memory.c 2010-05-28 21:27:15.487089783 -0400 | 24870 | +++ linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_memory.c 2010-07-09 14:50:36.000000000 -0400 |
24692 | @@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at | 24871 | @@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at |
24693 | NULL | 24872 | NULL |
24694 | }; | 24873 | }; |
@@ -24698,9 +24877,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.15/driv | |||
24698 | .show = &ttm_mem_zone_show, | 24877 | .show = &ttm_mem_zone_show, |
24699 | .store = &ttm_mem_zone_store | 24878 | .store = &ttm_mem_zone_store |
24700 | }; | 24879 | }; |
24701 | diff -urNp linux-2.6.32.15/drivers/hid/usbhid/hiddev.c linux-2.6.32.15/drivers/hid/usbhid/hiddev.c | 24880 | diff -urNp linux-2.6.32.16/drivers/hid/usbhid/hiddev.c linux-2.6.32.16/drivers/hid/usbhid/hiddev.c |
24702 | --- linux-2.6.32.15/drivers/hid/usbhid/hiddev.c 2010-03-15 11:52:04.000000000 -0400 | 24881 | --- linux-2.6.32.16/drivers/hid/usbhid/hiddev.c 2010-07-05 14:14:00.000000000 -0400 |
24703 | +++ linux-2.6.32.15/drivers/hid/usbhid/hiddev.c 2010-05-28 21:27:15.487089783 -0400 | 24882 | +++ linux-2.6.32.16/drivers/hid/usbhid/hiddev.c 2010-07-09 14:50:36.000000000 -0400 |
24704 | @@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi | 24883 | @@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi |
24705 | return put_user(HID_VERSION, (int __user *)arg); | 24884 | return put_user(HID_VERSION, (int __user *)arg); |
24706 | 24885 | ||
@@ -24710,9 +24889,9 @@ diff -urNp linux-2.6.32.15/drivers/hid/usbhid/hiddev.c linux-2.6.32.15/drivers/h | |||
24710 | return -EINVAL; | 24889 | return -EINVAL; |
24711 | 24890 | ||
24712 | for (i = 0; i < hid->maxcollection; i++) | 24891 | for (i = 0; i < hid->maxcollection; i++) |
24713 | diff -urNp linux-2.6.32.15/drivers/hwmon/k8temp.c linux-2.6.32.15/drivers/hwmon/k8temp.c | 24892 | diff -urNp linux-2.6.32.16/drivers/hwmon/k8temp.c linux-2.6.32.16/drivers/hwmon/k8temp.c |
24714 | --- linux-2.6.32.15/drivers/hwmon/k8temp.c 2010-03-15 11:52:04.000000000 -0400 | 24893 | --- linux-2.6.32.16/drivers/hwmon/k8temp.c 2010-07-05 14:14:00.000000000 -0400 |
24715 | +++ linux-2.6.32.15/drivers/hwmon/k8temp.c 2010-05-28 21:27:15.487089783 -0400 | 24894 | +++ linux-2.6.32.16/drivers/hwmon/k8temp.c 2010-07-09 14:50:36.000000000 -0400 |
24716 | @@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n | 24895 | @@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n |
24717 | 24896 | ||
24718 | static struct pci_device_id k8temp_ids[] = { | 24897 | static struct pci_device_id k8temp_ids[] = { |
@@ -24722,9 +24901,9 @@ diff -urNp linux-2.6.32.15/drivers/hwmon/k8temp.c linux-2.6.32.15/drivers/hwmon/ | |||
24722 | }; | 24901 | }; |
24723 | 24902 | ||
24724 | MODULE_DEVICE_TABLE(pci, k8temp_ids); | 24903 | MODULE_DEVICE_TABLE(pci, k8temp_ids); |
24725 | diff -urNp linux-2.6.32.15/drivers/hwmon/sis5595.c linux-2.6.32.15/drivers/hwmon/sis5595.c | 24904 | diff -urNp linux-2.6.32.16/drivers/hwmon/sis5595.c linux-2.6.32.16/drivers/hwmon/sis5595.c |
24726 | --- linux-2.6.32.15/drivers/hwmon/sis5595.c 2010-03-15 11:52:04.000000000 -0400 | 24905 | --- linux-2.6.32.16/drivers/hwmon/sis5595.c 2010-07-05 14:14:00.000000000 -0400 |
24727 | +++ linux-2.6.32.15/drivers/hwmon/sis5595.c 2010-05-28 21:27:15.495189257 -0400 | 24906 | +++ linux-2.6.32.16/drivers/hwmon/sis5595.c 2010-07-09 14:50:36.000000000 -0400 |
24728 | @@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda | 24907 | @@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda |
24729 | 24908 | ||
24730 | static struct pci_device_id sis5595_pci_ids[] = { | 24909 | static struct pci_device_id sis5595_pci_ids[] = { |
@@ -24734,9 +24913,9 @@ diff -urNp linux-2.6.32.15/drivers/hwmon/sis5595.c linux-2.6.32.15/drivers/hwmon | |||
24734 | }; | 24913 | }; |
24735 | 24914 | ||
24736 | MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); | 24915 | MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); |
24737 | diff -urNp linux-2.6.32.15/drivers/hwmon/via686a.c linux-2.6.32.15/drivers/hwmon/via686a.c | 24916 | diff -urNp linux-2.6.32.16/drivers/hwmon/via686a.c linux-2.6.32.16/drivers/hwmon/via686a.c |
24738 | --- linux-2.6.32.15/drivers/hwmon/via686a.c 2010-03-15 11:52:04.000000000 -0400 | 24917 | --- linux-2.6.32.16/drivers/hwmon/via686a.c 2010-07-05 14:14:00.000000000 -0400 |
24739 | +++ linux-2.6.32.15/drivers/hwmon/via686a.c 2010-05-28 21:27:15.495189257 -0400 | 24918 | +++ linux-2.6.32.16/drivers/hwmon/via686a.c 2010-07-09 14:50:36.000000000 -0400 |
24740 | @@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda | 24919 | @@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda |
24741 | 24920 | ||
24742 | static struct pci_device_id via686a_pci_ids[] = { | 24921 | static struct pci_device_id via686a_pci_ids[] = { |
@@ -24746,9 +24925,9 @@ diff -urNp linux-2.6.32.15/drivers/hwmon/via686a.c linux-2.6.32.15/drivers/hwmon | |||
24746 | }; | 24925 | }; |
24747 | 24926 | ||
24748 | MODULE_DEVICE_TABLE(pci, via686a_pci_ids); | 24927 | MODULE_DEVICE_TABLE(pci, via686a_pci_ids); |
24749 | diff -urNp linux-2.6.32.15/drivers/hwmon/vt8231.c linux-2.6.32.15/drivers/hwmon/vt8231.c | 24928 | diff -urNp linux-2.6.32.16/drivers/hwmon/vt8231.c linux-2.6.32.16/drivers/hwmon/vt8231.c |
24750 | --- linux-2.6.32.15/drivers/hwmon/vt8231.c 2010-03-15 11:52:04.000000000 -0400 | 24929 | --- linux-2.6.32.16/drivers/hwmon/vt8231.c 2010-07-05 14:14:00.000000000 -0400 |
24751 | +++ linux-2.6.32.15/drivers/hwmon/vt8231.c 2010-05-28 21:27:15.507004721 -0400 | 24930 | +++ linux-2.6.32.16/drivers/hwmon/vt8231.c 2010-07-09 14:50:36.000000000 -0400 |
24752 | @@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri | 24931 | @@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri |
24753 | 24932 | ||
24754 | static struct pci_device_id vt8231_pci_ids[] = { | 24933 | static struct pci_device_id vt8231_pci_ids[] = { |
@@ -24758,9 +24937,9 @@ diff -urNp linux-2.6.32.15/drivers/hwmon/vt8231.c linux-2.6.32.15/drivers/hwmon/ | |||
24758 | }; | 24937 | }; |
24759 | 24938 | ||
24760 | MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); | 24939 | MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); |
24761 | diff -urNp linux-2.6.32.15/drivers/hwmon/w83791d.c linux-2.6.32.15/drivers/hwmon/w83791d.c | 24940 | diff -urNp linux-2.6.32.16/drivers/hwmon/w83791d.c linux-2.6.32.16/drivers/hwmon/w83791d.c |
24762 | --- linux-2.6.32.15/drivers/hwmon/w83791d.c 2010-03-15 11:52:04.000000000 -0400 | 24941 | --- linux-2.6.32.16/drivers/hwmon/w83791d.c 2010-07-05 14:14:00.000000000 -0400 |
24763 | +++ linux-2.6.32.15/drivers/hwmon/w83791d.c 2010-05-28 21:27:15.507004721 -0400 | 24942 | +++ linux-2.6.32.16/drivers/hwmon/w83791d.c 2010-07-09 14:50:36.000000000 -0400 |
24764 | @@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli | 24943 | @@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli |
24765 | struct i2c_board_info *info); | 24944 | struct i2c_board_info *info); |
24766 | static int w83791d_remove(struct i2c_client *client); | 24945 | static int w83791d_remove(struct i2c_client *client); |
@@ -24772,9 +24951,9 @@ diff -urNp linux-2.6.32.15/drivers/hwmon/w83791d.c linux-2.6.32.15/drivers/hwmon | |||
24772 | static struct w83791d_data *w83791d_update_device(struct device *dev); | 24951 | static struct w83791d_data *w83791d_update_device(struct device *dev); |
24773 | 24952 | ||
24774 | #ifdef DEBUG | 24953 | #ifdef DEBUG |
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 | 24954 | diff -urNp linux-2.6.32.16/drivers/i2c/busses/i2c-i801.c linux-2.6.32.16/drivers/i2c/busses/i2c-i801.c |
24776 | --- linux-2.6.32.15/drivers/i2c/busses/i2c-i801.c 2010-04-29 17:49:37.945518391 -0400 | 24955 | --- linux-2.6.32.16/drivers/i2c/busses/i2c-i801.c 2010-07-05 14:14:00.000000000 -0400 |
24777 | +++ linux-2.6.32.15/drivers/i2c/busses/i2c-i801.c 2010-05-28 21:27:15.507004721 -0400 | 24956 | +++ linux-2.6.32.16/drivers/i2c/busses/i2c-i801.c 2010-07-09 14:50:36.000000000 -0400 |
24778 | @@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] = | 24957 | @@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] = |
24779 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, | 24958 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, |
24780 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) }, | 24959 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) }, |
@@ -24784,9 +24963,9 @@ diff -urNp linux-2.6.32.15/drivers/i2c/busses/i2c-i801.c linux-2.6.32.15/drivers | |||
24784 | }; | 24963 | }; |
24785 | 24964 | ||
24786 | MODULE_DEVICE_TABLE (pci, i801_ids); | 24965 | MODULE_DEVICE_TABLE (pci, i801_ids); |
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 | 24966 | diff -urNp linux-2.6.32.16/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.16/drivers/i2c/busses/i2c-piix4.c |
24788 | --- linux-2.6.32.15/drivers/i2c/busses/i2c-piix4.c 2010-03-15 11:52:04.000000000 -0400 | 24967 | --- linux-2.6.32.16/drivers/i2c/busses/i2c-piix4.c 2010-07-05 14:14:00.000000000 -0400 |
24789 | +++ linux-2.6.32.15/drivers/i2c/busses/i2c-piix4.c 2010-05-28 21:27:15.507004721 -0400 | 24968 | +++ linux-2.6.32.16/drivers/i2c/busses/i2c-piix4.c 2010-07-09 14:50:36.000000000 -0400 |
24790 | @@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat | 24969 | @@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat |
24791 | .ident = "IBM", | 24970 | .ident = "IBM", |
24792 | .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, | 24971 | .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, |
@@ -24805,9 +24984,9 @@ diff -urNp linux-2.6.32.15/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.15/driver | |||
24805 | }; | 24984 | }; |
24806 | 24985 | ||
24807 | MODULE_DEVICE_TABLE (pci, piix4_ids); | 24986 | MODULE_DEVICE_TABLE (pci, piix4_ids); |
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 | 24987 | diff -urNp linux-2.6.32.16/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.16/drivers/i2c/busses/i2c-sis630.c |
24809 | --- linux-2.6.32.15/drivers/i2c/busses/i2c-sis630.c 2010-03-15 11:52:04.000000000 -0400 | 24988 | --- linux-2.6.32.16/drivers/i2c/busses/i2c-sis630.c 2010-07-05 14:14:00.000000000 -0400 |
24810 | +++ linux-2.6.32.15/drivers/i2c/busses/i2c-sis630.c 2010-05-28 21:27:15.507004721 -0400 | 24989 | +++ linux-2.6.32.16/drivers/i2c/busses/i2c-sis630.c 2010-07-09 14:50:36.000000000 -0400 |
24811 | @@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter | 24990 | @@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter |
24812 | static struct pci_device_id sis630_ids[] __devinitdata = { | 24991 | static struct pci_device_id sis630_ids[] __devinitdata = { |
24813 | { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, | 24992 | { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, |
@@ -24817,9 +24996,9 @@ diff -urNp linux-2.6.32.15/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.15/drive | |||
24817 | }; | 24996 | }; |
24818 | 24997 | ||
24819 | MODULE_DEVICE_TABLE (pci, sis630_ids); | 24998 | MODULE_DEVICE_TABLE (pci, sis630_ids); |
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 | 24999 | diff -urNp linux-2.6.32.16/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.16/drivers/i2c/busses/i2c-sis96x.c |
24821 | --- linux-2.6.32.15/drivers/i2c/busses/i2c-sis96x.c 2010-03-15 11:52:04.000000000 -0400 | 25000 | --- linux-2.6.32.16/drivers/i2c/busses/i2c-sis96x.c 2010-07-05 14:14:00.000000000 -0400 |
24822 | +++ linux-2.6.32.15/drivers/i2c/busses/i2c-sis96x.c 2010-05-28 21:27:15.507004721 -0400 | 25001 | +++ linux-2.6.32.16/drivers/i2c/busses/i2c-sis96x.c 2010-07-09 14:50:36.000000000 -0400 |
24823 | @@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter | 25002 | @@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter |
24824 | 25003 | ||
24825 | static struct pci_device_id sis96x_ids[] = { | 25004 | static struct pci_device_id sis96x_ids[] = { |
@@ -24829,9 +25008,9 @@ diff -urNp linux-2.6.32.15/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.15/drive | |||
24829 | }; | 25008 | }; |
24830 | 25009 | ||
24831 | MODULE_DEVICE_TABLE (pci, sis96x_ids); | 25010 | MODULE_DEVICE_TABLE (pci, sis96x_ids); |
24832 | diff -urNp linux-2.6.32.15/drivers/ide/ide-cd.c linux-2.6.32.15/drivers/ide/ide-cd.c | 25011 | diff -urNp linux-2.6.32.16/drivers/ide/ide-cd.c linux-2.6.32.16/drivers/ide/ide-cd.c |
24833 | --- linux-2.6.32.15/drivers/ide/ide-cd.c 2010-03-15 11:52:04.000000000 -0400 | 25012 | --- linux-2.6.32.16/drivers/ide/ide-cd.c 2010-07-05 14:14:00.000000000 -0400 |
24834 | +++ linux-2.6.32.15/drivers/ide/ide-cd.c 2010-05-28 21:27:15.510961438 -0400 | 25013 | +++ linux-2.6.32.16/drivers/ide/ide-cd.c 2010-07-09 14:50:36.000000000 -0400 |
24835 | @@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_ | 25014 | @@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_ |
24836 | alignment = queue_dma_alignment(q) | q->dma_pad_mask; | 25015 | alignment = queue_dma_alignment(q) | q->dma_pad_mask; |
24837 | if ((unsigned long)buf & alignment | 25016 | if ((unsigned long)buf & alignment |
@@ -24841,9 +25020,9 @@ diff -urNp linux-2.6.32.15/drivers/ide/ide-cd.c linux-2.6.32.15/drivers/ide/ide- | |||
24841 | drive->dma = 0; | 25020 | drive->dma = 0; |
24842 | } | 25021 | } |
24843 | } | 25022 | } |
24844 | diff -urNp linux-2.6.32.15/drivers/ieee1394/dv1394.c linux-2.6.32.15/drivers/ieee1394/dv1394.c | 25023 | diff -urNp linux-2.6.32.16/drivers/ieee1394/dv1394.c linux-2.6.32.16/drivers/ieee1394/dv1394.c |
24845 | --- linux-2.6.32.15/drivers/ieee1394/dv1394.c 2010-03-15 11:52:04.000000000 -0400 | 25024 | --- linux-2.6.32.16/drivers/ieee1394/dv1394.c 2010-07-05 14:14:00.000000000 -0400 |
24846 | +++ linux-2.6.32.15/drivers/ieee1394/dv1394.c 2010-05-28 21:27:15.527187024 -0400 | 25025 | +++ linux-2.6.32.16/drivers/ieee1394/dv1394.c 2010-07-09 14:50:36.000000000 -0400 |
24847 | @@ -739,7 +739,7 @@ static void frame_prepare(struct video_c | 25026 | @@ -739,7 +739,7 @@ static void frame_prepare(struct video_c |
24848 | based upon DIF section and sequence | 25027 | based upon DIF section and sequence |
24849 | */ | 25028 | */ |
@@ -24862,9 +25041,9 @@ diff -urNp linux-2.6.32.15/drivers/ieee1394/dv1394.c linux-2.6.32.15/drivers/iee | |||
24862 | }; | 25041 | }; |
24863 | 25042 | ||
24864 | MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); | 25043 | MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); |
24865 | diff -urNp linux-2.6.32.15/drivers/ieee1394/eth1394.c linux-2.6.32.15/drivers/ieee1394/eth1394.c | 25044 | diff -urNp linux-2.6.32.16/drivers/ieee1394/eth1394.c linux-2.6.32.16/drivers/ieee1394/eth1394.c |
24866 | --- linux-2.6.32.15/drivers/ieee1394/eth1394.c 2010-03-15 11:52:04.000000000 -0400 | 25045 | --- linux-2.6.32.16/drivers/ieee1394/eth1394.c 2010-07-05 14:14:00.000000000 -0400 |
24867 | +++ linux-2.6.32.15/drivers/ieee1394/eth1394.c 2010-05-28 21:27:15.544607394 -0400 | 25046 | +++ linux-2.6.32.16/drivers/ieee1394/eth1394.c 2010-07-09 14:50:36.000000000 -0400 |
24868 | @@ -446,7 +446,7 @@ static const struct ieee1394_device_id e | 25047 | @@ -446,7 +446,7 @@ static const struct ieee1394_device_id e |
24869 | .specifier_id = ETHER1394_GASP_SPECIFIER_ID, | 25048 | .specifier_id = ETHER1394_GASP_SPECIFIER_ID, |
24870 | .version = ETHER1394_GASP_VERSION, | 25049 | .version = ETHER1394_GASP_VERSION, |
@@ -24874,9 +25053,9 @@ diff -urNp linux-2.6.32.15/drivers/ieee1394/eth1394.c linux-2.6.32.15/drivers/ie | |||
24874 | }; | 25053 | }; |
24875 | 25054 | ||
24876 | MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); | 25055 | MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); |
24877 | diff -urNp linux-2.6.32.15/drivers/ieee1394/hosts.c linux-2.6.32.15/drivers/ieee1394/hosts.c | 25056 | diff -urNp linux-2.6.32.16/drivers/ieee1394/hosts.c linux-2.6.32.16/drivers/ieee1394/hosts.c |
24878 | --- linux-2.6.32.15/drivers/ieee1394/hosts.c 2010-03-15 11:52:04.000000000 -0400 | 25057 | --- linux-2.6.32.16/drivers/ieee1394/hosts.c 2010-07-05 14:14:00.000000000 -0400 |
24879 | +++ linux-2.6.32.15/drivers/ieee1394/hosts.c 2010-05-28 21:27:15.544607394 -0400 | 25058 | +++ linux-2.6.32.16/drivers/ieee1394/hosts.c 2010-07-09 14:50:36.000000000 -0400 |
24880 | @@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso | 25059 | @@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso |
24881 | } | 25060 | } |
24882 | 25061 | ||
@@ -24885,9 +25064,9 @@ diff -urNp linux-2.6.32.15/drivers/ieee1394/hosts.c linux-2.6.32.15/drivers/ieee | |||
24885 | .transmit_packet = dummy_transmit_packet, | 25064 | .transmit_packet = dummy_transmit_packet, |
24886 | .devctl = dummy_devctl, | 25065 | .devctl = dummy_devctl, |
24887 | .isoctl = dummy_isoctl | 25066 | .isoctl = dummy_isoctl |
24888 | diff -urNp linux-2.6.32.15/drivers/ieee1394/ohci1394.c linux-2.6.32.15/drivers/ieee1394/ohci1394.c | 25067 | diff -urNp linux-2.6.32.16/drivers/ieee1394/ohci1394.c linux-2.6.32.16/drivers/ieee1394/ohci1394.c |
24889 | --- linux-2.6.32.15/drivers/ieee1394/ohci1394.c 2010-03-15 11:52:04.000000000 -0400 | 25068 | --- linux-2.6.32.16/drivers/ieee1394/ohci1394.c 2010-07-05 14:14:00.000000000 -0400 |
24890 | +++ linux-2.6.32.15/drivers/ieee1394/ohci1394.c 2010-05-28 21:27:15.555018453 -0400 | 25069 | +++ linux-2.6.32.16/drivers/ieee1394/ohci1394.c 2010-07-09 14:50:36.000000000 -0400 |
24891 | @@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_ | 25070 | @@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_ |
24892 | printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args) | 25071 | printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args) |
24893 | 25072 | ||
@@ -24909,9 +25088,9 @@ diff -urNp linux-2.6.32.15/drivers/ieee1394/ohci1394.c linux-2.6.32.15/drivers/i | |||
24909 | }; | 25088 | }; |
24910 | 25089 | ||
24911 | MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); | 25090 | MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); |
24912 | diff -urNp linux-2.6.32.15/drivers/ieee1394/raw1394.c linux-2.6.32.15/drivers/ieee1394/raw1394.c | 25091 | diff -urNp linux-2.6.32.16/drivers/ieee1394/raw1394.c linux-2.6.32.16/drivers/ieee1394/raw1394.c |
24913 | --- linux-2.6.32.15/drivers/ieee1394/raw1394.c 2010-03-15 11:52:04.000000000 -0400 | 25092 | --- linux-2.6.32.16/drivers/ieee1394/raw1394.c 2010-07-05 14:14:00.000000000 -0400 |
24914 | +++ linux-2.6.32.15/drivers/ieee1394/raw1394.c 2010-05-28 21:27:15.555018453 -0400 | 25093 | +++ linux-2.6.32.16/drivers/ieee1394/raw1394.c 2010-07-09 14:50:36.000000000 -0400 |
24915 | @@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r | 25094 | @@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r |
24916 | .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, | 25095 | .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, |
24917 | .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, | 25096 | .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, |
@@ -24921,9 +25100,9 @@ diff -urNp linux-2.6.32.15/drivers/ieee1394/raw1394.c linux-2.6.32.15/drivers/ie | |||
24921 | }; | 25100 | }; |
24922 | 25101 | ||
24923 | MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); | 25102 | MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); |
24924 | diff -urNp linux-2.6.32.15/drivers/ieee1394/sbp2.c linux-2.6.32.15/drivers/ieee1394/sbp2.c | 25103 | diff -urNp linux-2.6.32.16/drivers/ieee1394/sbp2.c linux-2.6.32.16/drivers/ieee1394/sbp2.c |
24925 | --- linux-2.6.32.15/drivers/ieee1394/sbp2.c 2010-03-15 11:52:04.000000000 -0400 | 25104 | --- linux-2.6.32.16/drivers/ieee1394/sbp2.c 2010-07-05 14:14:00.000000000 -0400 |
24926 | +++ linux-2.6.32.15/drivers/ieee1394/sbp2.c 2010-05-28 21:27:15.555018453 -0400 | 25105 | +++ linux-2.6.32.16/drivers/ieee1394/sbp2.c 2010-07-09 14:50:36.000000000 -0400 |
24927 | @@ -290,7 +290,7 @@ static const struct ieee1394_device_id s | 25106 | @@ -290,7 +290,7 @@ static const struct ieee1394_device_id s |
24928 | .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, | 25107 | .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, |
24929 | .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, | 25108 | .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, |
@@ -24942,9 +25121,9 @@ diff -urNp linux-2.6.32.15/drivers/ieee1394/sbp2.c linux-2.6.32.15/drivers/ieee1 | |||
24942 | { | 25121 | { |
24943 | int ret; | 25122 | int ret; |
24944 | 25123 | ||
24945 | diff -urNp linux-2.6.32.15/drivers/ieee1394/video1394.c linux-2.6.32.15/drivers/ieee1394/video1394.c | 25124 | diff -urNp linux-2.6.32.16/drivers/ieee1394/video1394.c linux-2.6.32.16/drivers/ieee1394/video1394.c |
24946 | --- linux-2.6.32.15/drivers/ieee1394/video1394.c 2010-03-15 11:52:04.000000000 -0400 | 25125 | --- linux-2.6.32.16/drivers/ieee1394/video1394.c 2010-07-05 14:14:00.000000000 -0400 |
24947 | +++ linux-2.6.32.15/drivers/ieee1394/video1394.c 2010-05-28 21:27:15.559201489 -0400 | 25126 | +++ linux-2.6.32.16/drivers/ieee1394/video1394.c 2010-07-09 14:50:36.000000000 -0400 |
24948 | @@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v | 25127 | @@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v |
24949 | .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, | 25128 | .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, |
24950 | .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff | 25129 | .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff |
@@ -24954,9 +25133,9 @@ diff -urNp linux-2.6.32.15/drivers/ieee1394/video1394.c linux-2.6.32.15/drivers/ | |||
24954 | }; | 25133 | }; |
24955 | 25134 | ||
24956 | MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); | 25135 | MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); |
24957 | diff -urNp linux-2.6.32.15/drivers/infiniband/core/cm.c linux-2.6.32.15/drivers/infiniband/core/cm.c | 25136 | diff -urNp linux-2.6.32.16/drivers/infiniband/core/cm.c linux-2.6.32.16/drivers/infiniband/core/cm.c |
24958 | --- linux-2.6.32.15/drivers/infiniband/core/cm.c 2010-03-15 11:52:04.000000000 -0400 | 25137 | --- linux-2.6.32.16/drivers/infiniband/core/cm.c 2010-07-05 14:14:00.000000000 -0400 |
24959 | +++ linux-2.6.32.15/drivers/infiniband/core/cm.c 2010-05-28 21:27:15.559201489 -0400 | 25138 | +++ linux-2.6.32.16/drivers/infiniband/core/cm.c 2010-07-09 14:50:36.000000000 -0400 |
24960 | @@ -112,7 +112,7 @@ static char const counter_group_names[CM | 25139 | @@ -112,7 +112,7 @@ static char const counter_group_names[CM |
24961 | 25140 | ||
24962 | struct cm_counter_group { | 25141 | struct cm_counter_group { |
@@ -25100,9 +25279,9 @@ diff -urNp linux-2.6.32.15/drivers/infiniband/core/cm.c linux-2.6.32.15/drivers/ | |||
25100 | .show = cm_show_counter | 25279 | .show = cm_show_counter |
25101 | }; | 25280 | }; |
25102 | 25281 | ||
25103 | diff -urNp linux-2.6.32.15/drivers/infiniband/core/sysfs.c linux-2.6.32.15/drivers/infiniband/core/sysfs.c | 25282 | diff -urNp linux-2.6.32.16/drivers/infiniband/core/sysfs.c linux-2.6.32.16/drivers/infiniband/core/sysfs.c |
25104 | --- linux-2.6.32.15/drivers/infiniband/core/sysfs.c 2010-03-15 11:52:04.000000000 -0400 | 25283 | --- linux-2.6.32.16/drivers/infiniband/core/sysfs.c 2010-07-05 14:14:00.000000000 -0400 |
25105 | +++ linux-2.6.32.15/drivers/infiniband/core/sysfs.c 2010-05-28 21:27:15.563689341 -0400 | 25284 | +++ linux-2.6.32.16/drivers/infiniband/core/sysfs.c 2010-07-09 14:50:36.000000000 -0400 |
25106 | @@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob | 25285 | @@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob |
25107 | return port_attr->show(p, port_attr, buf); | 25286 | return port_attr->show(p, port_attr, buf); |
25108 | } | 25287 | } |
@@ -25112,9 +25291,9 @@ diff -urNp linux-2.6.32.15/drivers/infiniband/core/sysfs.c linux-2.6.32.15/drive | |||
25112 | .show = port_attr_show | 25291 | .show = port_attr_show |
25113 | }; | 25292 | }; |
25114 | 25293 | ||
25115 | diff -urNp linux-2.6.32.15/drivers/input/keyboard/atkbd.c linux-2.6.32.15/drivers/input/keyboard/atkbd.c | 25294 | diff -urNp linux-2.6.32.16/drivers/input/keyboard/atkbd.c linux-2.6.32.16/drivers/input/keyboard/atkbd.c |
25116 | --- linux-2.6.32.15/drivers/input/keyboard/atkbd.c 2010-03-15 11:52:04.000000000 -0400 | 25295 | --- linux-2.6.32.16/drivers/input/keyboard/atkbd.c 2010-07-05 14:14:00.000000000 -0400 |
25117 | +++ linux-2.6.32.15/drivers/input/keyboard/atkbd.c 2010-05-28 21:27:15.568704406 -0400 | 25296 | +++ linux-2.6.32.16/drivers/input/keyboard/atkbd.c 2010-07-09 14:50:36.000000000 -0400 |
25118 | @@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri | 25297 | @@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri |
25119 | .id = SERIO_ANY, | 25298 | .id = SERIO_ANY, |
25120 | .extra = SERIO_ANY, | 25299 | .extra = SERIO_ANY, |
@@ -25124,9 +25303,9 @@ diff -urNp linux-2.6.32.15/drivers/input/keyboard/atkbd.c linux-2.6.32.15/driver | |||
25124 | }; | 25303 | }; |
25125 | 25304 | ||
25126 | MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); | 25305 | MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); |
25127 | diff -urNp linux-2.6.32.15/drivers/input/mouse/lifebook.c linux-2.6.32.15/drivers/input/mouse/lifebook.c | 25306 | diff -urNp linux-2.6.32.16/drivers/input/mouse/lifebook.c linux-2.6.32.16/drivers/input/mouse/lifebook.c |
25128 | --- linux-2.6.32.15/drivers/input/mouse/lifebook.c 2010-03-15 11:52:04.000000000 -0400 | 25307 | --- linux-2.6.32.16/drivers/input/mouse/lifebook.c 2010-07-05 14:14:00.000000000 -0400 |
25129 | +++ linux-2.6.32.15/drivers/input/mouse/lifebook.c 2010-05-28 21:27:15.572693057 -0400 | 25308 | +++ linux-2.6.32.16/drivers/input/mouse/lifebook.c 2010-07-09 14:50:36.000000000 -0400 |
25130 | @@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo | 25309 | @@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo |
25131 | DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), | 25310 | DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), |
25132 | }, | 25311 | }, |
@@ -25136,10 +25315,10 @@ diff -urNp linux-2.6.32.15/drivers/input/mouse/lifebook.c linux-2.6.32.15/driver | |||
25136 | }; | 25315 | }; |
25137 | 25316 | ||
25138 | static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) | 25317 | static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) |
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 | 25318 | diff -urNp linux-2.6.32.16/drivers/input/mouse/psmouse-base.c linux-2.6.32.16/drivers/input/mouse/psmouse-base.c |
25140 | --- linux-2.6.32.15/drivers/input/mouse/psmouse-base.c 2010-03-15 11:52:04.000000000 -0400 | 25319 | --- linux-2.6.32.16/drivers/input/mouse/psmouse-base.c 2010-07-05 14:14:00.000000000 -0400 |
25141 | +++ linux-2.6.32.15/drivers/input/mouse/psmouse-base.c 2010-05-28 21:27:15.580689971 -0400 | 25320 | +++ linux-2.6.32.16/drivers/input/mouse/psmouse-base.c 2010-07-09 14:50:36.000000000 -0400 |
25142 | @@ -1409,7 +1409,7 @@ static struct serio_device_id psmouse_se | 25321 | @@ -1415,7 +1415,7 @@ static struct serio_device_id psmouse_se |
25143 | .id = SERIO_ANY, | 25322 | .id = SERIO_ANY, |
25144 | .extra = SERIO_ANY, | 25323 | .extra = SERIO_ANY, |
25145 | }, | 25324 | }, |
@@ -25148,9 +25327,9 @@ diff -urNp linux-2.6.32.15/drivers/input/mouse/psmouse-base.c linux-2.6.32.15/dr | |||
25148 | }; | 25327 | }; |
25149 | 25328 | ||
25150 | MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); | 25329 | MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); |
25151 | diff -urNp linux-2.6.32.15/drivers/input/mouse/synaptics.c linux-2.6.32.15/drivers/input/mouse/synaptics.c | 25330 | diff -urNp linux-2.6.32.16/drivers/input/mouse/synaptics.c linux-2.6.32.16/drivers/input/mouse/synaptics.c |
25152 | --- linux-2.6.32.15/drivers/input/mouse/synaptics.c 2010-03-15 11:52:04.000000000 -0400 | 25331 | --- linux-2.6.32.16/drivers/input/mouse/synaptics.c 2010-07-05 14:14:00.000000000 -0400 |
25153 | +++ linux-2.6.32.15/drivers/input/mouse/synaptics.c 2010-05-28 21:27:15.587725031 -0400 | 25332 | +++ linux-2.6.32.16/drivers/input/mouse/synaptics.c 2010-07-09 14:50:36.000000000 -0400 |
25154 | @@ -437,7 +437,7 @@ static void synaptics_process_packet(str | 25333 | @@ -437,7 +437,7 @@ static void synaptics_process_packet(str |
25155 | break; | 25334 | break; |
25156 | case 2: | 25335 | case 2: |
@@ -25179,9 +25358,9 @@ diff -urNp linux-2.6.32.15/drivers/input/mouse/synaptics.c linux-2.6.32.15/drive | |||
25179 | }; | 25358 | }; |
25180 | #endif | 25359 | #endif |
25181 | 25360 | ||
25182 | diff -urNp linux-2.6.32.15/drivers/input/mousedev.c linux-2.6.32.15/drivers/input/mousedev.c | 25361 | diff -urNp linux-2.6.32.16/drivers/input/mousedev.c linux-2.6.32.16/drivers/input/mousedev.c |
25183 | --- linux-2.6.32.15/drivers/input/mousedev.c 2010-03-15 11:52:04.000000000 -0400 | 25362 | --- linux-2.6.32.16/drivers/input/mousedev.c 2010-07-05 14:14:00.000000000 -0400 |
25184 | +++ linux-2.6.32.15/drivers/input/mousedev.c 2010-05-28 21:27:15.592694173 -0400 | 25363 | +++ linux-2.6.32.16/drivers/input/mousedev.c 2010-07-09 14:50:36.000000000 -0400 |
25185 | @@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han | 25364 | @@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han |
25186 | 25365 | ||
25187 | #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX | 25366 | #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX |
@@ -25191,9 +25370,9 @@ diff -urNp linux-2.6.32.15/drivers/input/mousedev.c linux-2.6.32.15/drivers/inpu | |||
25191 | }; | 25370 | }; |
25192 | static int psaux_registered; | 25371 | static int psaux_registered; |
25193 | #endif | 25372 | #endif |
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 | 25373 | diff -urNp linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h |
25195 | --- linux-2.6.32.15/drivers/input/serio/i8042-x86ia64io.h 2010-04-04 20:41:49.956500002 -0400 | 25374 | --- linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h 2010-07-05 14:14:00.000000000 -0400 |
25196 | +++ linux-2.6.32.15/drivers/input/serio/i8042-x86ia64io.h 2010-05-28 21:27:15.592694173 -0400 | 25375 | +++ linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h 2010-07-09 14:50:36.000000000 -0400 |
25197 | @@ -172,7 +172,7 @@ static const struct dmi_system_id __init | 25376 | @@ -172,7 +172,7 @@ static const struct dmi_system_id __init |
25198 | DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), | 25377 | DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), |
25199 | }, | 25378 | }, |
@@ -25248,9 +25427,9 @@ diff -urNp linux-2.6.32.15/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.15 | |||
25248 | }; | 25427 | }; |
25249 | 25428 | ||
25250 | #endif /* CONFIG_X86 */ | 25429 | #endif /* CONFIG_X86 */ |
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 | 25430 | diff -urNp linux-2.6.32.16/drivers/input/serio/serio_raw.c linux-2.6.32.16/drivers/input/serio/serio_raw.c |
25252 | --- linux-2.6.32.15/drivers/input/serio/serio_raw.c 2010-03-15 11:52:04.000000000 -0400 | 25431 | --- linux-2.6.32.16/drivers/input/serio/serio_raw.c 2010-07-05 14:14:00.000000000 -0400 |
25253 | +++ linux-2.6.32.15/drivers/input/serio/serio_raw.c 2010-05-28 21:27:15.596690001 -0400 | 25432 | +++ linux-2.6.32.16/drivers/input/serio/serio_raw.c 2010-07-09 14:50:36.000000000 -0400 |
25254 | @@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_ | 25433 | @@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_ |
25255 | .id = SERIO_ANY, | 25434 | .id = SERIO_ANY, |
25256 | .extra = SERIO_ANY, | 25435 | .extra = SERIO_ANY, |
@@ -25260,9 +25439,9 @@ diff -urNp linux-2.6.32.15/drivers/input/serio/serio_raw.c linux-2.6.32.15/drive | |||
25260 | }; | 25439 | }; |
25261 | 25440 | ||
25262 | MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); | 25441 | MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); |
25263 | diff -urNp linux-2.6.32.15/drivers/isdn/gigaset/common.c linux-2.6.32.15/drivers/isdn/gigaset/common.c | 25442 | diff -urNp linux-2.6.32.16/drivers/isdn/gigaset/common.c linux-2.6.32.16/drivers/isdn/gigaset/common.c |
25264 | --- linux-2.6.32.15/drivers/isdn/gigaset/common.c 2010-03-15 11:52:04.000000000 -0400 | 25443 | --- linux-2.6.32.16/drivers/isdn/gigaset/common.c 2010-07-05 14:14:00.000000000 -0400 |
25265 | +++ linux-2.6.32.15/drivers/isdn/gigaset/common.c 2010-05-28 21:27:15.600680043 -0400 | 25444 | +++ linux-2.6.32.16/drivers/isdn/gigaset/common.c 2010-07-09 14:50:36.000000000 -0400 |
25266 | @@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct | 25445 | @@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct |
25267 | cs->commands_pending = 0; | 25446 | cs->commands_pending = 0; |
25268 | cs->cur_at_seq = 0; | 25447 | cs->cur_at_seq = 0; |
@@ -25272,9 +25451,9 @@ diff -urNp linux-2.6.32.15/drivers/isdn/gigaset/common.c linux-2.6.32.15/drivers | |||
25272 | cs->dev = NULL; | 25451 | cs->dev = NULL; |
25273 | cs->tty = NULL; | 25452 | cs->tty = NULL; |
25274 | cs->tty_dev = NULL; | 25453 | cs->tty_dev = NULL; |
25275 | diff -urNp linux-2.6.32.15/drivers/isdn/gigaset/gigaset.h linux-2.6.32.15/drivers/isdn/gigaset/gigaset.h | 25454 | diff -urNp linux-2.6.32.16/drivers/isdn/gigaset/gigaset.h linux-2.6.32.16/drivers/isdn/gigaset/gigaset.h |
25276 | --- linux-2.6.32.15/drivers/isdn/gigaset/gigaset.h 2010-03-15 11:52:04.000000000 -0400 | 25455 | --- linux-2.6.32.16/drivers/isdn/gigaset/gigaset.h 2010-07-05 14:14:00.000000000 -0400 |
25277 | +++ linux-2.6.32.15/drivers/isdn/gigaset/gigaset.h 2010-05-28 21:27:15.600680043 -0400 | 25456 | +++ linux-2.6.32.16/drivers/isdn/gigaset/gigaset.h 2010-07-09 14:50:36.000000000 -0400 |
25278 | @@ -446,7 +446,7 @@ struct cardstate { | 25457 | @@ -446,7 +446,7 @@ struct cardstate { |
25279 | spinlock_t cmdlock; | 25458 | spinlock_t cmdlock; |
25280 | unsigned curlen, cmdbytes; | 25459 | unsigned curlen, cmdbytes; |
@@ -25284,9 +25463,9 @@ diff -urNp linux-2.6.32.15/drivers/isdn/gigaset/gigaset.h linux-2.6.32.15/driver | |||
25284 | struct tty_struct *tty; | 25463 | struct tty_struct *tty; |
25285 | struct tasklet_struct if_wake_tasklet; | 25464 | struct tasklet_struct if_wake_tasklet; |
25286 | unsigned control_state; | 25465 | unsigned control_state; |
25287 | diff -urNp linux-2.6.32.15/drivers/isdn/gigaset/interface.c linux-2.6.32.15/drivers/isdn/gigaset/interface.c | 25466 | diff -urNp linux-2.6.32.16/drivers/isdn/gigaset/interface.c linux-2.6.32.16/drivers/isdn/gigaset/interface.c |
25288 | --- linux-2.6.32.15/drivers/isdn/gigaset/interface.c 2010-04-04 20:41:49.956500002 -0400 | 25467 | --- linux-2.6.32.16/drivers/isdn/gigaset/interface.c 2010-07-05 14:14:00.000000000 -0400 |
25289 | +++ linux-2.6.32.15/drivers/isdn/gigaset/interface.c 2010-05-28 21:27:15.600680043 -0400 | 25468 | +++ linux-2.6.32.16/drivers/isdn/gigaset/interface.c 2010-07-09 14:50:36.000000000 -0400 |
25290 | @@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt | 25469 | @@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt |
25291 | return -ERESTARTSYS; // FIXME -EINTR? | 25470 | return -ERESTARTSYS; // FIXME -EINTR? |
25292 | tty->driver_data = cs; | 25471 | tty->driver_data = cs; |
@@ -25374,9 +25553,9 @@ diff -urNp linux-2.6.32.15/drivers/isdn/gigaset/interface.c linux-2.6.32.15/driv | |||
25374 | dev_warn(cs->dev, "%s: device not opened\n", __func__); | 25553 | dev_warn(cs->dev, "%s: device not opened\n", __func__); |
25375 | goto out; | 25554 | goto out; |
25376 | } | 25555 | } |
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 | 25556 | diff -urNp linux-2.6.32.16/drivers/isdn/hardware/avm/b1.c linux-2.6.32.16/drivers/isdn/hardware/avm/b1.c |
25378 | --- linux-2.6.32.15/drivers/isdn/hardware/avm/b1.c 2010-03-15 11:52:04.000000000 -0400 | 25557 | --- linux-2.6.32.16/drivers/isdn/hardware/avm/b1.c 2010-07-05 14:14:00.000000000 -0400 |
25379 | +++ linux-2.6.32.15/drivers/isdn/hardware/avm/b1.c 2010-05-28 21:27:15.600680043 -0400 | 25558 | +++ linux-2.6.32.16/drivers/isdn/hardware/avm/b1.c 2010-07-09 14:50:36.000000000 -0400 |
25380 | @@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo | 25559 | @@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo |
25381 | } | 25560 | } |
25382 | if (left) { | 25561 | if (left) { |
@@ -25395,9 +25574,9 @@ diff -urNp linux-2.6.32.15/drivers/isdn/hardware/avm/b1.c linux-2.6.32.15/driver | |||
25395 | return -EFAULT; | 25574 | return -EFAULT; |
25396 | } else { | 25575 | } else { |
25397 | memcpy(buf, dp, left); | 25576 | memcpy(buf, dp, left); |
25398 | diff -urNp linux-2.6.32.15/drivers/isdn/icn/icn.c linux-2.6.32.15/drivers/isdn/icn/icn.c | 25577 | diff -urNp linux-2.6.32.16/drivers/isdn/icn/icn.c linux-2.6.32.16/drivers/isdn/icn/icn.c |
25399 | --- linux-2.6.32.15/drivers/isdn/icn/icn.c 2010-03-15 11:52:04.000000000 -0400 | 25578 | --- linux-2.6.32.16/drivers/isdn/icn/icn.c 2010-07-05 14:14:00.000000000 -0400 |
25400 | +++ linux-2.6.32.15/drivers/isdn/icn/icn.c 2010-05-28 21:27:15.600680043 -0400 | 25579 | +++ linux-2.6.32.16/drivers/isdn/icn/icn.c 2010-07-09 14:50:36.000000000 -0400 |
25401 | @@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len | 25580 | @@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len |
25402 | if (count > len) | 25581 | if (count > len) |
25403 | count = len; | 25582 | count = len; |
@@ -25407,9 +25586,9 @@ diff -urNp linux-2.6.32.15/drivers/isdn/icn/icn.c linux-2.6.32.15/drivers/isdn/i | |||
25407 | return -EFAULT; | 25586 | return -EFAULT; |
25408 | } else | 25587 | } else |
25409 | memcpy(msg, buf, count); | 25588 | memcpy(msg, buf, count); |
25410 | diff -urNp linux-2.6.32.15/drivers/lguest/core.c linux-2.6.32.15/drivers/lguest/core.c | 25589 | diff -urNp linux-2.6.32.16/drivers/lguest/core.c linux-2.6.32.16/drivers/lguest/core.c |
25411 | --- linux-2.6.32.15/drivers/lguest/core.c 2010-03-15 11:52:04.000000000 -0400 | 25590 | --- linux-2.6.32.16/drivers/lguest/core.c 2010-07-05 14:14:00.000000000 -0400 |
25412 | +++ linux-2.6.32.15/drivers/lguest/core.c 2010-05-28 21:27:15.600680043 -0400 | 25591 | +++ linux-2.6.32.16/drivers/lguest/core.c 2010-07-09 14:50:36.000000000 -0400 |
25413 | @@ -91,9 +91,17 @@ static __init int map_switcher(void) | 25592 | @@ -91,9 +91,17 @@ static __init int map_switcher(void) |
25414 | * it's worked so far. The end address needs +1 because __get_vm_area | 25593 | * it's worked so far. The end address needs +1 because __get_vm_area |
25415 | * allocates an extra guard page, so we need space for that. | 25594 | * allocates an extra guard page, so we need space for that. |
@@ -25428,9 +25607,9 @@ diff -urNp linux-2.6.32.15/drivers/lguest/core.c linux-2.6.32.15/drivers/lguest/ | |||
25428 | if (!switcher_vma) { | 25607 | if (!switcher_vma) { |
25429 | err = -ENOMEM; | 25608 | err = -ENOMEM; |
25430 | printk("lguest: could not map switcher pages high\n"); | 25609 | printk("lguest: could not map switcher pages high\n"); |
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 | 25610 | diff -urNp linux-2.6.32.16/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.16/drivers/macintosh/via-pmu-backlight.c |
25432 | --- linux-2.6.32.15/drivers/macintosh/via-pmu-backlight.c 2010-03-15 11:52:04.000000000 -0400 | 25611 | --- linux-2.6.32.16/drivers/macintosh/via-pmu-backlight.c 2010-07-05 14:14:00.000000000 -0400 |
25433 | +++ linux-2.6.32.15/drivers/macintosh/via-pmu-backlight.c 2010-05-28 21:27:15.600680043 -0400 | 25612 | +++ linux-2.6.32.16/drivers/macintosh/via-pmu-backlight.c 2010-07-09 14:50:36.000000000 -0400 |
25434 | @@ -15,7 +15,7 @@ | 25613 | @@ -15,7 +15,7 @@ |
25435 | 25614 | ||
25436 | #define MAX_PMU_LEVEL 0xFF | 25615 | #define MAX_PMU_LEVEL 0xFF |
@@ -25449,9 +25628,9 @@ diff -urNp linux-2.6.32.15/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.15 | |||
25449 | .get_brightness = pmu_backlight_get_brightness, | 25628 | .get_brightness = pmu_backlight_get_brightness, |
25450 | .update_status = pmu_backlight_update_status, | 25629 | .update_status = pmu_backlight_update_status, |
25451 | 25630 | ||
25452 | diff -urNp linux-2.6.32.15/drivers/macintosh/via-pmu.c linux-2.6.32.15/drivers/macintosh/via-pmu.c | 25631 | diff -urNp linux-2.6.32.16/drivers/macintosh/via-pmu.c linux-2.6.32.16/drivers/macintosh/via-pmu.c |
25453 | --- linux-2.6.32.15/drivers/macintosh/via-pmu.c 2010-03-15 11:52:04.000000000 -0400 | 25632 | --- linux-2.6.32.16/drivers/macintosh/via-pmu.c 2010-07-05 14:14:00.000000000 -0400 |
25454 | +++ linux-2.6.32.15/drivers/macintosh/via-pmu.c 2010-05-28 21:27:15.608683910 -0400 | 25633 | +++ linux-2.6.32.16/drivers/macintosh/via-pmu.c 2010-07-09 14:50:36.000000000 -0400 |
25455 | @@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state | 25634 | @@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state |
25456 | && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); | 25635 | && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); |
25457 | } | 25636 | } |
@@ -25461,9 +25640,9 @@ diff -urNp linux-2.6.32.15/drivers/macintosh/via-pmu.c linux-2.6.32.15/drivers/m | |||
25461 | .enter = powerbook_sleep, | 25640 | .enter = powerbook_sleep, |
25462 | .valid = pmu_sleep_valid, | 25641 | .valid = pmu_sleep_valid, |
25463 | }; | 25642 | }; |
25464 | diff -urNp linux-2.6.32.15/drivers/md/bitmap.c linux-2.6.32.15/drivers/md/bitmap.c | 25643 | diff -urNp linux-2.6.32.16/drivers/md/bitmap.c linux-2.6.32.16/drivers/md/bitmap.c |
25465 | --- linux-2.6.32.15/drivers/md/bitmap.c 2010-03-15 11:52:04.000000000 -0400 | 25644 | --- linux-2.6.32.16/drivers/md/bitmap.c 2010-07-05 14:14:00.000000000 -0400 |
25466 | +++ linux-2.6.32.15/drivers/md/bitmap.c 2010-05-28 21:27:15.608683910 -0400 | 25645 | +++ linux-2.6.32.16/drivers/md/bitmap.c 2010-07-09 14:50:36.000000000 -0400 |
25467 | @@ -58,7 +58,7 @@ | 25646 | @@ -58,7 +58,7 @@ |
25468 | # if DEBUG > 0 | 25647 | # if DEBUG > 0 |
25469 | # define PRINTK(x...) printk(KERN_DEBUG x) | 25648 | # define PRINTK(x...) printk(KERN_DEBUG x) |
@@ -25473,9 +25652,9 @@ diff -urNp linux-2.6.32.15/drivers/md/bitmap.c linux-2.6.32.15/drivers/md/bitmap | |||
25473 | # endif | 25652 | # endif |
25474 | #endif | 25653 | #endif |
25475 | 25654 | ||
25476 | diff -urNp linux-2.6.32.15/drivers/md/dm-sysfs.c linux-2.6.32.15/drivers/md/dm-sysfs.c | 25655 | diff -urNp linux-2.6.32.16/drivers/md/dm-sysfs.c linux-2.6.32.16/drivers/md/dm-sysfs.c |
25477 | --- linux-2.6.32.15/drivers/md/dm-sysfs.c 2010-03-15 11:52:04.000000000 -0400 | 25656 | --- linux-2.6.32.16/drivers/md/dm-sysfs.c 2010-07-05 14:14:00.000000000 -0400 |
25478 | +++ linux-2.6.32.15/drivers/md/dm-sysfs.c 2010-05-28 21:27:15.608683910 -0400 | 25657 | +++ linux-2.6.32.16/drivers/md/dm-sysfs.c 2010-07-09 14:50:36.000000000 -0400 |
25479 | @@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = { | 25658 | @@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = { |
25480 | NULL, | 25659 | NULL, |
25481 | }; | 25660 | }; |
@@ -25485,9 +25664,9 @@ diff -urNp linux-2.6.32.15/drivers/md/dm-sysfs.c linux-2.6.32.15/drivers/md/dm-s | |||
25485 | .show = dm_attr_show, | 25664 | .show = dm_attr_show, |
25486 | }; | 25665 | }; |
25487 | 25666 | ||
25488 | diff -urNp linux-2.6.32.15/drivers/md/dm-table.c linux-2.6.32.15/drivers/md/dm-table.c | 25667 | diff -urNp linux-2.6.32.16/drivers/md/dm-table.c linux-2.6.32.16/drivers/md/dm-table.c |
25489 | --- linux-2.6.32.15/drivers/md/dm-table.c 2010-03-15 11:52:04.000000000 -0400 | 25668 | --- linux-2.6.32.16/drivers/md/dm-table.c 2010-07-05 14:14:00.000000000 -0400 |
25490 | +++ linux-2.6.32.15/drivers/md/dm-table.c 2010-05-28 21:27:15.608683910 -0400 | 25669 | +++ linux-2.6.32.16/drivers/md/dm-table.c 2010-07-09 14:50:36.000000000 -0400 |
25491 | @@ -359,7 +359,7 @@ static int device_area_is_invalid(struct | 25670 | @@ -359,7 +359,7 @@ static int device_area_is_invalid(struct |
25492 | if (!dev_size) | 25671 | if (!dev_size) |
25493 | return 0; | 25672 | return 0; |
@@ -25497,9 +25676,9 @@ diff -urNp linux-2.6.32.15/drivers/md/dm-table.c linux-2.6.32.15/drivers/md/dm-t | |||
25497 | DMWARN("%s: %s too small for target: " | 25676 | DMWARN("%s: %s too small for target: " |
25498 | "start=%llu, len=%llu, dev_size=%llu", | 25677 | "start=%llu, len=%llu, dev_size=%llu", |
25499 | dm_device_name(ti->table->md), bdevname(bdev, b), | 25678 | dm_device_name(ti->table->md), bdevname(bdev, b), |
25500 | diff -urNp linux-2.6.32.15/drivers/md/md.c linux-2.6.32.15/drivers/md/md.c | 25679 | diff -urNp linux-2.6.32.16/drivers/md/md.c linux-2.6.32.16/drivers/md/md.c |
25501 | --- linux-2.6.32.15/drivers/md/md.c 2010-05-15 13:20:18.542567696 -0400 | 25680 | --- linux-2.6.32.16/drivers/md/md.c 2010-07-05 14:14:00.000000000 -0400 |
25502 | +++ linux-2.6.32.15/drivers/md/md.c 2010-05-28 21:27:15.608683910 -0400 | 25681 | +++ linux-2.6.32.16/drivers/md/md.c 2010-07-09 14:50:36.000000000 -0400 |
25503 | @@ -2514,7 +2514,7 @@ static void rdev_free(struct kobject *ko | 25682 | @@ -2514,7 +2514,7 @@ static void rdev_free(struct kobject *ko |
25504 | mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj); | 25683 | mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj); |
25505 | kfree(rdev); | 25684 | kfree(rdev); |
@@ -25518,7 +25697,7 @@ diff -urNp linux-2.6.32.15/drivers/md/md.c linux-2.6.32.15/drivers/md/md.c | |||
25518 | .show = md_attr_show, | 25697 | .show = md_attr_show, |
25519 | .store = md_attr_store, | 25698 | .store = md_attr_store, |
25520 | }; | 25699 | }; |
25521 | @@ -6010,7 +6010,7 @@ static int md_seq_show(struct seq_file * | 25700 | @@ -6039,7 +6039,7 @@ static int md_seq_show(struct seq_file * |
25522 | chunk_kb ? "KB" : "B"); | 25701 | chunk_kb ? "KB" : "B"); |
25523 | if (bitmap->file) { | 25702 | if (bitmap->file) { |
25524 | seq_printf(seq, ", file: "); | 25703 | seq_printf(seq, ", file: "); |
@@ -25527,7 +25706,7 @@ diff -urNp linux-2.6.32.15/drivers/md/md.c linux-2.6.32.15/drivers/md/md.c | |||
25527 | } | 25706 | } |
25528 | 25707 | ||
25529 | seq_printf(seq, "\n"); | 25708 | seq_printf(seq, "\n"); |
25530 | @@ -6104,7 +6104,7 @@ static int is_mddev_idle(mddev_t *mddev, | 25709 | @@ -6133,7 +6133,7 @@ static int is_mddev_idle(mddev_t *mddev, |
25531 | struct gendisk *disk = rdev->bdev->bd_contains->bd_disk; | 25710 | struct gendisk *disk = rdev->bdev->bd_contains->bd_disk; |
25532 | curr_events = (int)part_stat_read(&disk->part0, sectors[0]) + | 25711 | curr_events = (int)part_stat_read(&disk->part0, sectors[0]) + |
25533 | (int)part_stat_read(&disk->part0, sectors[1]) - | 25712 | (int)part_stat_read(&disk->part0, sectors[1]) - |
@@ -25536,9 +25715,9 @@ diff -urNp linux-2.6.32.15/drivers/md/md.c linux-2.6.32.15/drivers/md/md.c | |||
25536 | /* sync IO will cause sync_io to increase before the disk_stats | 25715 | /* sync IO will cause sync_io to increase before the disk_stats |
25537 | * as sync_io is counted when a request starts, and | 25716 | * as sync_io is counted when a request starts, and |
25538 | * disk_stats is counted when it completes. | 25717 | * disk_stats is counted when it completes. |
25539 | diff -urNp linux-2.6.32.15/drivers/md/md.h linux-2.6.32.15/drivers/md/md.h | 25718 | diff -urNp linux-2.6.32.16/drivers/md/md.h linux-2.6.32.16/drivers/md/md.h |
25540 | --- linux-2.6.32.15/drivers/md/md.h 2010-03-15 11:52:04.000000000 -0400 | 25719 | --- linux-2.6.32.16/drivers/md/md.h 2010-07-05 14:14:00.000000000 -0400 |
25541 | +++ linux-2.6.32.15/drivers/md/md.h 2010-05-28 21:27:15.608683910 -0400 | 25720 | +++ linux-2.6.32.16/drivers/md/md.h 2010-07-09 14:50:36.000000000 -0400 |
25542 | @@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_ | 25721 | @@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_ |
25543 | 25722 | ||
25544 | static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) | 25723 | static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) |
@@ -25548,9 +25727,9 @@ diff -urNp linux-2.6.32.15/drivers/md/md.h linux-2.6.32.15/drivers/md/md.h | |||
25548 | } | 25727 | } |
25549 | 25728 | ||
25550 | struct mdk_personality | 25729 | struct mdk_personality |
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 | 25730 | diff -urNp linux-2.6.32.16/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.16/drivers/media/dvb/dvb-core/dvbdev.c |
25552 | --- linux-2.6.32.15/drivers/media/dvb/dvb-core/dvbdev.c 2010-03-15 11:52:04.000000000 -0400 | 25731 | --- linux-2.6.32.16/drivers/media/dvb/dvb-core/dvbdev.c 2010-07-05 14:14:00.000000000 -0400 |
25553 | +++ linux-2.6.32.15/drivers/media/dvb/dvb-core/dvbdev.c 2010-05-28 21:27:15.616695200 -0400 | 25732 | +++ linux-2.6.32.16/drivers/media/dvb/dvb-core/dvbdev.c 2010-07-09 14:50:36.000000000 -0400 |
25554 | @@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt | 25733 | @@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt |
25555 | const struct dvb_device *template, void *priv, int type) | 25734 | const struct dvb_device *template, void *priv, int type) |
25556 | { | 25735 | { |
@@ -25559,9 +25738,9 @@ diff -urNp linux-2.6.32.15/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.15/d | |||
25559 | struct file_operations *dvbdevfops; | 25738 | struct file_operations *dvbdevfops; |
25560 | struct device *clsdev; | 25739 | struct device *clsdev; |
25561 | int minor; | 25740 | int minor; |
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 | 25741 | diff -urNp linux-2.6.32.16/drivers/media/radio/radio-cadet.c linux-2.6.32.16/drivers/media/radio/radio-cadet.c |
25563 | --- linux-2.6.32.15/drivers/media/radio/radio-cadet.c 2010-03-15 11:52:04.000000000 -0400 | 25742 | --- linux-2.6.32.16/drivers/media/radio/radio-cadet.c 2010-07-05 14:14:00.000000000 -0400 |
25564 | +++ linux-2.6.32.15/drivers/media/radio/radio-cadet.c 2010-05-28 21:27:15.616695200 -0400 | 25743 | +++ linux-2.6.32.16/drivers/media/radio/radio-cadet.c 2010-07-09 14:50:36.000000000 -0400 |
25565 | @@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f | 25744 | @@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f |
25566 | while (i < count && dev->rdsin != dev->rdsout) | 25745 | while (i < count && dev->rdsin != dev->rdsout) |
25567 | readbuf[i++] = dev->rdsbuf[dev->rdsout++]; | 25746 | readbuf[i++] = dev->rdsbuf[dev->rdsout++]; |
@@ -25571,9 +25750,9 @@ diff -urNp linux-2.6.32.15/drivers/media/radio/radio-cadet.c linux-2.6.32.15/dri | |||
25571 | return -EFAULT; | 25750 | return -EFAULT; |
25572 | return i; | 25751 | return i; |
25573 | } | 25752 | } |
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 | 25753 | diff -urNp linux-2.6.32.16/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.16/drivers/media/video/usbvideo/konicawc.c |
25575 | --- linux-2.6.32.15/drivers/media/video/usbvideo/konicawc.c 2010-03-15 11:52:04.000000000 -0400 | 25754 | --- linux-2.6.32.16/drivers/media/video/usbvideo/konicawc.c 2010-07-05 14:14:00.000000000 -0400 |
25576 | +++ linux-2.6.32.15/drivers/media/video/usbvideo/konicawc.c 2010-05-28 21:27:15.628727154 -0400 | 25755 | +++ linux-2.6.32.16/drivers/media/video/usbvideo/konicawc.c 2010-07-09 14:50:36.000000000 -0400 |
25577 | @@ -225,7 +225,7 @@ static void konicawc_register_input(stru | 25756 | @@ -225,7 +225,7 @@ static void konicawc_register_input(stru |
25578 | int error; | 25757 | int error; |
25579 | 25758 | ||
@@ -25583,9 +25762,9 @@ diff -urNp linux-2.6.32.15/drivers/media/video/usbvideo/konicawc.c linux-2.6.32. | |||
25583 | 25762 | ||
25584 | cam->input = input_dev = input_allocate_device(); | 25763 | cam->input = input_dev = input_allocate_device(); |
25585 | if (!input_dev) { | 25764 | if (!input_dev) { |
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 | 25765 | diff -urNp linux-2.6.32.16/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.16/drivers/media/video/usbvideo/quickcam_messenger.c |
25587 | --- linux-2.6.32.15/drivers/media/video/usbvideo/quickcam_messenger.c 2010-03-15 11:52:04.000000000 -0400 | 25766 | --- linux-2.6.32.16/drivers/media/video/usbvideo/quickcam_messenger.c 2010-07-05 14:14:00.000000000 -0400 |
25588 | +++ linux-2.6.32.15/drivers/media/video/usbvideo/quickcam_messenger.c 2010-05-28 21:27:15.630929247 -0400 | 25767 | +++ linux-2.6.32.16/drivers/media/video/usbvideo/quickcam_messenger.c 2010-07-09 14:50:36.000000000 -0400 |
25589 | @@ -89,7 +89,7 @@ static void qcm_register_input(struct qc | 25768 | @@ -89,7 +89,7 @@ static void qcm_register_input(struct qc |
25590 | int error; | 25769 | int error; |
25591 | 25770 | ||
@@ -25595,9 +25774,9 @@ diff -urNp linux-2.6.32.15/drivers/media/video/usbvideo/quickcam_messenger.c lin | |||
25595 | 25774 | ||
25596 | cam->input = input_dev = input_allocate_device(); | 25775 | cam->input = input_dev = input_allocate_device(); |
25597 | if (!input_dev) { | 25776 | if (!input_dev) { |
25598 | diff -urNp linux-2.6.32.15/drivers/message/fusion/mptdebug.h linux-2.6.32.15/drivers/message/fusion/mptdebug.h | 25777 | diff -urNp linux-2.6.32.16/drivers/message/fusion/mptdebug.h linux-2.6.32.16/drivers/message/fusion/mptdebug.h |
25599 | --- linux-2.6.32.15/drivers/message/fusion/mptdebug.h 2010-03-15 11:52:04.000000000 -0400 | 25778 | --- linux-2.6.32.16/drivers/message/fusion/mptdebug.h 2010-07-05 14:14:00.000000000 -0400 |
25600 | +++ linux-2.6.32.15/drivers/message/fusion/mptdebug.h 2010-05-28 21:27:15.630929247 -0400 | 25779 | +++ linux-2.6.32.16/drivers/message/fusion/mptdebug.h 2010-07-09 14:50:36.000000000 -0400 |
25601 | @@ -71,7 +71,7 @@ | 25780 | @@ -71,7 +71,7 @@ |
25602 | CMD; \ | 25781 | CMD; \ |
25603 | } | 25782 | } |
@@ -25607,9 +25786,9 @@ diff -urNp linux-2.6.32.15/drivers/message/fusion/mptdebug.h linux-2.6.32.15/dri | |||
25607 | #endif | 25786 | #endif |
25608 | 25787 | ||
25609 | 25788 | ||
25610 | diff -urNp linux-2.6.32.15/drivers/message/fusion/mptsas.c linux-2.6.32.15/drivers/message/fusion/mptsas.c | 25789 | diff -urNp linux-2.6.32.16/drivers/message/fusion/mptsas.c linux-2.6.32.16/drivers/message/fusion/mptsas.c |
25611 | --- linux-2.6.32.15/drivers/message/fusion/mptsas.c 2010-03-15 11:52:04.000000000 -0400 | 25790 | --- linux-2.6.32.16/drivers/message/fusion/mptsas.c 2010-07-05 14:14:00.000000000 -0400 |
25612 | +++ linux-2.6.32.15/drivers/message/fusion/mptsas.c 2010-05-28 21:27:15.639064560 -0400 | 25791 | +++ linux-2.6.32.16/drivers/message/fusion/mptsas.c 2010-07-09 14:50:36.000000000 -0400 |
25613 | @@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin | 25792 | @@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin |
25614 | return 0; | 25793 | return 0; |
25615 | } | 25794 | } |
@@ -25658,9 +25837,9 @@ diff -urNp linux-2.6.32.15/drivers/message/fusion/mptsas.c linux-2.6.32.15/drive | |||
25658 | static inline struct sas_port * | 25837 | static inline struct sas_port * |
25659 | mptsas_get_port(struct mptsas_phyinfo *phy_info) | 25838 | mptsas_get_port(struct mptsas_phyinfo *phy_info) |
25660 | { | 25839 | { |
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 | 25840 | diff -urNp linux-2.6.32.16/drivers/message/i2o/i2o_proc.c linux-2.6.32.16/drivers/message/i2o/i2o_proc.c |
25662 | --- linux-2.6.32.15/drivers/message/i2o/i2o_proc.c 2010-03-15 11:52:04.000000000 -0400 | 25841 | --- linux-2.6.32.16/drivers/message/i2o/i2o_proc.c 2010-07-05 14:14:00.000000000 -0400 |
25663 | +++ linux-2.6.32.15/drivers/message/i2o/i2o_proc.c 2010-05-28 21:27:15.639064560 -0400 | 25842 | +++ linux-2.6.32.16/drivers/message/i2o/i2o_proc.c 2010-07-09 14:50:36.000000000 -0400 |
25664 | @@ -259,13 +259,6 @@ static char *scsi_devices[] = { | 25843 | @@ -259,13 +259,6 @@ static char *scsi_devices[] = { |
25665 | "Array Controller Device" | 25844 | "Array Controller Device" |
25666 | }; | 25845 | }; |
@@ -25747,9 +25926,9 @@ diff -urNp linux-2.6.32.15/drivers/message/i2o/i2o_proc.c linux-2.6.32.15/driver | |||
25747 | 25926 | ||
25748 | return 0; | 25927 | return 0; |
25749 | } | 25928 | } |
25750 | diff -urNp linux-2.6.32.15/drivers/misc/kgdbts.c linux-2.6.32.15/drivers/misc/kgdbts.c | 25929 | diff -urNp linux-2.6.32.16/drivers/misc/kgdbts.c linux-2.6.32.16/drivers/misc/kgdbts.c |
25751 | --- linux-2.6.32.15/drivers/misc/kgdbts.c 2010-03-15 11:52:04.000000000 -0400 | 25930 | --- linux-2.6.32.16/drivers/misc/kgdbts.c 2010-07-05 14:14:00.000000000 -0400 |
25752 | +++ linux-2.6.32.15/drivers/misc/kgdbts.c 2010-05-28 21:27:15.650946222 -0400 | 25931 | +++ linux-2.6.32.16/drivers/misc/kgdbts.c 2010-07-09 14:50:36.000000000 -0400 |
25753 | @@ -118,7 +118,7 @@ | 25932 | @@ -118,7 +118,7 @@ |
25754 | } while (0) | 25933 | } while (0) |
25755 | #define MAX_CONFIG_LEN 40 | 25934 | #define MAX_CONFIG_LEN 40 |
@@ -25768,9 +25947,9 @@ diff -urNp linux-2.6.32.15/drivers/misc/kgdbts.c linux-2.6.32.15/drivers/misc/kg | |||
25768 | .name = "kgdbts", | 25947 | .name = "kgdbts", |
25769 | .read_char = kgdbts_get_char, | 25948 | .read_char = kgdbts_get_char, |
25770 | .write_char = kgdbts_put_char, | 25949 | .write_char = kgdbts_put_char, |
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 | 25950 | diff -urNp linux-2.6.32.16/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.16/drivers/misc/sgi-gru/gruhandles.c |
25772 | --- linux-2.6.32.15/drivers/misc/sgi-gru/gruhandles.c 2010-03-15 11:52:04.000000000 -0400 | 25951 | --- linux-2.6.32.16/drivers/misc/sgi-gru/gruhandles.c 2010-07-05 14:14:00.000000000 -0400 |
25773 | +++ linux-2.6.32.15/drivers/misc/sgi-gru/gruhandles.c 2010-05-28 21:27:15.650946222 -0400 | 25952 | +++ linux-2.6.32.16/drivers/misc/sgi-gru/gruhandles.c 2010-07-09 14:50:36.000000000 -0400 |
25774 | @@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic | 25953 | @@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic |
25775 | 25954 | ||
25776 | static void update_mcs_stats(enum mcs_op op, unsigned long clks) | 25955 | static void update_mcs_stats(enum mcs_op op, unsigned long clks) |
@@ -25782,9 +25961,9 @@ diff -urNp linux-2.6.32.15/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.15/dri | |||
25782 | if (mcs_op_statistics[op].max < clks) | 25961 | if (mcs_op_statistics[op].max < clks) |
25783 | mcs_op_statistics[op].max = clks; | 25962 | mcs_op_statistics[op].max = clks; |
25784 | } | 25963 | } |
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 | 25964 | diff -urNp linux-2.6.32.16/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.16/drivers/misc/sgi-gru/gruprocfs.c |
25786 | --- linux-2.6.32.15/drivers/misc/sgi-gru/gruprocfs.c 2010-03-15 11:52:04.000000000 -0400 | 25965 | --- linux-2.6.32.16/drivers/misc/sgi-gru/gruprocfs.c 2010-07-05 14:14:00.000000000 -0400 |
25787 | +++ linux-2.6.32.15/drivers/misc/sgi-gru/gruprocfs.c 2010-05-28 21:27:15.650946222 -0400 | 25966 | +++ linux-2.6.32.16/drivers/misc/sgi-gru/gruprocfs.c 2010-07-09 14:50:36.000000000 -0400 |
25788 | @@ -32,9 +32,9 @@ | 25967 | @@ -32,9 +32,9 @@ |
25789 | 25968 | ||
25790 | #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) | 25969 | #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) |
@@ -25808,9 +25987,9 @@ diff -urNp linux-2.6.32.15/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.15/driv | |||
25808 | max = mcs_op_statistics[op].max; | 25987 | max = mcs_op_statistics[op].max; |
25809 | seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, | 25988 | seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, |
25810 | count ? total / count : 0, max); | 25989 | count ? total / count : 0, max); |
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 | 25990 | diff -urNp linux-2.6.32.16/drivers/misc/sgi-gru/grutables.h linux-2.6.32.16/drivers/misc/sgi-gru/grutables.h |
25812 | --- linux-2.6.32.15/drivers/misc/sgi-gru/grutables.h 2010-03-15 11:52:04.000000000 -0400 | 25991 | --- linux-2.6.32.16/drivers/misc/sgi-gru/grutables.h 2010-07-05 14:14:00.000000000 -0400 |
25813 | +++ linux-2.6.32.15/drivers/misc/sgi-gru/grutables.h 2010-05-28 21:27:15.650946222 -0400 | 25992 | +++ linux-2.6.32.16/drivers/misc/sgi-gru/grutables.h 2010-07-09 14:50:36.000000000 -0400 |
25814 | @@ -167,84 +167,84 @@ extern unsigned int gru_max_gids; | 25993 | @@ -167,84 +167,84 @@ extern unsigned int gru_max_gids; |
25815 | * GRU statistics. | 25994 | * GRU statistics. |
25816 | */ | 25995 | */ |
@@ -25994,9 +26173,9 @@ diff -urNp linux-2.6.32.15/drivers/misc/sgi-gru/grutables.h linux-2.6.32.15/driv | |||
25994 | } while (0) | 26173 | } while (0) |
25995 | 26174 | ||
25996 | #ifdef CONFIG_SGI_GRU_DEBUG | 26175 | #ifdef CONFIG_SGI_GRU_DEBUG |
25997 | diff -urNp linux-2.6.32.15/drivers/mtd/devices/doc2000.c linux-2.6.32.15/drivers/mtd/devices/doc2000.c | 26176 | diff -urNp linux-2.6.32.16/drivers/mtd/devices/doc2000.c linux-2.6.32.16/drivers/mtd/devices/doc2000.c |
25998 | --- linux-2.6.32.15/drivers/mtd/devices/doc2000.c 2010-03-15 11:52:04.000000000 -0400 | 26177 | --- linux-2.6.32.16/drivers/mtd/devices/doc2000.c 2010-07-05 14:14:00.000000000 -0400 |
25999 | +++ linux-2.6.32.15/drivers/mtd/devices/doc2000.c 2010-05-28 21:27:15.650946222 -0400 | 26178 | +++ linux-2.6.32.16/drivers/mtd/devices/doc2000.c 2010-07-09 14:50:36.000000000 -0400 |
26000 | @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt | 26179 | @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt |
26001 | 26180 | ||
26002 | /* The ECC will not be calculated correctly if less than 512 is written */ | 26181 | /* The ECC will not be calculated correctly if less than 512 is written */ |
@@ -26006,9 +26185,9 @@ diff -urNp linux-2.6.32.15/drivers/mtd/devices/doc2000.c linux-2.6.32.15/drivers | |||
26006 | printk(KERN_WARNING | 26185 | printk(KERN_WARNING |
26007 | "ECC needs a full sector write (adr: %lx size %lx)\n", | 26186 | "ECC needs a full sector write (adr: %lx size %lx)\n", |
26008 | (long) to, (long) len); | 26187 | (long) to, (long) len); |
26009 | diff -urNp linux-2.6.32.15/drivers/mtd/devices/doc2001.c linux-2.6.32.15/drivers/mtd/devices/doc2001.c | 26188 | diff -urNp linux-2.6.32.16/drivers/mtd/devices/doc2001.c linux-2.6.32.16/drivers/mtd/devices/doc2001.c |
26010 | --- linux-2.6.32.15/drivers/mtd/devices/doc2001.c 2010-03-15 11:52:04.000000000 -0400 | 26189 | --- linux-2.6.32.16/drivers/mtd/devices/doc2001.c 2010-07-05 14:14:00.000000000 -0400 |
26011 | +++ linux-2.6.32.15/drivers/mtd/devices/doc2001.c 2010-05-28 21:27:15.650946222 -0400 | 26190 | +++ linux-2.6.32.16/drivers/mtd/devices/doc2001.c 2010-07-09 14:50:36.000000000 -0400 |
26012 | @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt | 26191 | @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt |
26013 | struct Nand *mychip = &this->chips[from >> (this->chipshift)]; | 26192 | struct Nand *mychip = &this->chips[from >> (this->chipshift)]; |
26014 | 26193 | ||
@@ -26018,9 +26197,9 @@ diff -urNp linux-2.6.32.15/drivers/mtd/devices/doc2001.c linux-2.6.32.15/drivers | |||
26018 | return -EINVAL; | 26197 | return -EINVAL; |
26019 | 26198 | ||
26020 | /* Don't allow a single read to cross a 512-byte block boundary */ | 26199 | /* Don't allow a single read to cross a 512-byte block boundary */ |
26021 | diff -urNp linux-2.6.32.15/drivers/mtd/ubi/build.c linux-2.6.32.15/drivers/mtd/ubi/build.c | 26200 | diff -urNp linux-2.6.32.16/drivers/mtd/ubi/build.c linux-2.6.32.16/drivers/mtd/ubi/build.c |
26022 | --- linux-2.6.32.15/drivers/mtd/ubi/build.c 2010-03-15 11:52:04.000000000 -0400 | 26201 | --- linux-2.6.32.16/drivers/mtd/ubi/build.c 2010-07-05 14:14:00.000000000 -0400 |
26023 | +++ linux-2.6.32.15/drivers/mtd/ubi/build.c 2010-05-28 21:27:15.650946222 -0400 | 26202 | +++ linux-2.6.32.16/drivers/mtd/ubi/build.c 2010-07-09 14:50:36.000000000 -0400 |
26024 | @@ -1255,7 +1255,7 @@ module_exit(ubi_exit); | 26203 | @@ -1255,7 +1255,7 @@ module_exit(ubi_exit); |
26025 | static int __init bytes_str_to_int(const char *str) | 26204 | static int __init bytes_str_to_int(const char *str) |
26026 | { | 26205 | { |
@@ -26060,9 +26239,9 @@ diff -urNp linux-2.6.32.15/drivers/mtd/ubi/build.c linux-2.6.32.15/drivers/mtd/u | |||
26060 | } | 26239 | } |
26061 | 26240 | ||
26062 | /** | 26241 | /** |
26063 | diff -urNp linux-2.6.32.15/drivers/net/e1000e/82571.c linux-2.6.32.15/drivers/net/e1000e/82571.c | 26242 | diff -urNp linux-2.6.32.16/drivers/net/e1000e/82571.c linux-2.6.32.16/drivers/net/e1000e/82571.c |
26064 | --- linux-2.6.32.15/drivers/net/e1000e/82571.c 2010-03-15 11:52:04.000000000 -0400 | 26243 | --- linux-2.6.32.16/drivers/net/e1000e/82571.c 2010-07-05 14:14:00.000000000 -0400 |
26065 | +++ linux-2.6.32.15/drivers/net/e1000e/82571.c 2010-05-28 21:27:15.655178202 -0400 | 26244 | +++ linux-2.6.32.16/drivers/net/e1000e/82571.c 2010-07-09 14:50:36.000000000 -0400 |
26066 | @@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s | 26245 | @@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s |
26067 | { | 26246 | { |
26068 | struct e1000_hw *hw = &adapter->hw; | 26247 | struct e1000_hw *hw = &adapter->hw; |
@@ -26116,9 +26295,9 @@ diff -urNp linux-2.6.32.15/drivers/net/e1000e/82571.c linux-2.6.32.15/drivers/ne | |||
26116 | .acquire_nvm = e1000_acquire_nvm_82571, | 26295 | .acquire_nvm = e1000_acquire_nvm_82571, |
26117 | .read_nvm = e1000e_read_nvm_eerd, | 26296 | .read_nvm = e1000e_read_nvm_eerd, |
26118 | .release_nvm = e1000_release_nvm_82571, | 26297 | .release_nvm = e1000_release_nvm_82571, |
26119 | diff -urNp linux-2.6.32.15/drivers/net/e1000e/e1000.h linux-2.6.32.15/drivers/net/e1000e/e1000.h | 26298 | diff -urNp linux-2.6.32.16/drivers/net/e1000e/e1000.h linux-2.6.32.16/drivers/net/e1000e/e1000.h |
26120 | --- linux-2.6.32.15/drivers/net/e1000e/e1000.h 2010-03-15 11:52:04.000000000 -0400 | 26299 | --- linux-2.6.32.16/drivers/net/e1000e/e1000.h 2010-07-05 14:14:00.000000000 -0400 |
26121 | +++ linux-2.6.32.15/drivers/net/e1000e/e1000.h 2010-05-28 21:27:15.655178202 -0400 | 26300 | +++ linux-2.6.32.16/drivers/net/e1000e/e1000.h 2010-07-09 14:50:36.000000000 -0400 |
26122 | @@ -375,9 +375,9 @@ struct e1000_info { | 26301 | @@ -375,9 +375,9 @@ struct e1000_info { |
26123 | u32 pba; | 26302 | u32 pba; |
26124 | u32 max_hw_frame_size; | 26303 | u32 max_hw_frame_size; |
@@ -26132,9 +26311,9 @@ diff -urNp linux-2.6.32.15/drivers/net/e1000e/e1000.h linux-2.6.32.15/drivers/ne | |||
26132 | }; | 26311 | }; |
26133 | 26312 | ||
26134 | /* hardware capability, feature, and workaround flags */ | 26313 | /* hardware capability, feature, and workaround flags */ |
26135 | diff -urNp linux-2.6.32.15/drivers/net/e1000e/es2lan.c linux-2.6.32.15/drivers/net/e1000e/es2lan.c | 26314 | diff -urNp linux-2.6.32.16/drivers/net/e1000e/es2lan.c linux-2.6.32.16/drivers/net/e1000e/es2lan.c |
26136 | --- linux-2.6.32.15/drivers/net/e1000e/es2lan.c 2010-03-15 11:52:04.000000000 -0400 | 26315 | --- linux-2.6.32.16/drivers/net/e1000e/es2lan.c 2010-07-05 14:14:00.000000000 -0400 |
26137 | +++ linux-2.6.32.15/drivers/net/e1000e/es2lan.c 2010-05-28 21:27:15.655178202 -0400 | 26316 | +++ linux-2.6.32.16/drivers/net/e1000e/es2lan.c 2010-07-09 14:50:36.000000000 -0400 |
26138 | @@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es | 26317 | @@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es |
26139 | { | 26318 | { |
26140 | struct e1000_hw *hw = &adapter->hw; | 26319 | struct e1000_hw *hw = &adapter->hw; |
@@ -26170,9 +26349,9 @@ diff -urNp linux-2.6.32.15/drivers/net/e1000e/es2lan.c linux-2.6.32.15/drivers/n | |||
26170 | .acquire_nvm = e1000_acquire_nvm_80003es2lan, | 26349 | .acquire_nvm = e1000_acquire_nvm_80003es2lan, |
26171 | .read_nvm = e1000e_read_nvm_eerd, | 26350 | .read_nvm = e1000e_read_nvm_eerd, |
26172 | .release_nvm = e1000_release_nvm_80003es2lan, | 26351 | .release_nvm = e1000_release_nvm_80003es2lan, |
26173 | diff -urNp linux-2.6.32.15/drivers/net/e1000e/hw.h linux-2.6.32.15/drivers/net/e1000e/hw.h | 26352 | diff -urNp linux-2.6.32.16/drivers/net/e1000e/hw.h linux-2.6.32.16/drivers/net/e1000e/hw.h |
26174 | --- linux-2.6.32.15/drivers/net/e1000e/hw.h 2010-04-04 20:41:49.956500002 -0400 | 26353 | --- linux-2.6.32.16/drivers/net/e1000e/hw.h 2010-07-05 14:14:00.000000000 -0400 |
26175 | +++ linux-2.6.32.15/drivers/net/e1000e/hw.h 2010-05-28 21:27:15.659202304 -0400 | 26354 | +++ linux-2.6.32.16/drivers/net/e1000e/hw.h 2010-07-09 14:50:36.000000000 -0400 |
26176 | @@ -756,34 +756,34 @@ struct e1000_mac_operations { | 26355 | @@ -756,34 +756,34 @@ struct e1000_mac_operations { |
26177 | 26356 | ||
26178 | /* Function pointers for the PHY. */ | 26357 | /* Function pointers for the PHY. */ |
@@ -26232,9 +26411,9 @@ diff -urNp linux-2.6.32.15/drivers/net/e1000e/hw.h linux-2.6.32.15/drivers/net/e | |||
26232 | }; | 26411 | }; |
26233 | 26412 | ||
26234 | struct e1000_mac_info { | 26413 | struct e1000_mac_info { |
26235 | diff -urNp linux-2.6.32.15/drivers/net/e1000e/ich8lan.c linux-2.6.32.15/drivers/net/e1000e/ich8lan.c | 26414 | diff -urNp linux-2.6.32.16/drivers/net/e1000e/ich8lan.c linux-2.6.32.16/drivers/net/e1000e/ich8lan.c |
26236 | --- linux-2.6.32.15/drivers/net/e1000e/ich8lan.c 2010-04-04 20:41:49.960543003 -0400 | 26415 | --- linux-2.6.32.16/drivers/net/e1000e/ich8lan.c 2010-07-05 14:14:00.000000000 -0400 |
26237 | +++ linux-2.6.32.15/drivers/net/e1000e/ich8lan.c 2010-05-28 21:27:15.659202304 -0400 | 26416 | +++ linux-2.6.32.16/drivers/net/e1000e/ich8lan.c 2010-07-09 14:50:36.000000000 -0400 |
26238 | @@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan | 26417 | @@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan |
26239 | } | 26418 | } |
26240 | } | 26419 | } |
@@ -26262,9 +26441,9 @@ diff -urNp linux-2.6.32.15/drivers/net/e1000e/ich8lan.c linux-2.6.32.15/drivers/ | |||
26262 | .acquire_nvm = e1000_acquire_nvm_ich8lan, | 26441 | .acquire_nvm = e1000_acquire_nvm_ich8lan, |
26263 | .read_nvm = e1000_read_nvm_ich8lan, | 26442 | .read_nvm = e1000_read_nvm_ich8lan, |
26264 | .release_nvm = e1000_release_nvm_ich8lan, | 26443 | .release_nvm = e1000_release_nvm_ich8lan, |
26265 | diff -urNp linux-2.6.32.15/drivers/net/ibmveth.c linux-2.6.32.15/drivers/net/ibmveth.c | 26444 | diff -urNp linux-2.6.32.16/drivers/net/ibmveth.c linux-2.6.32.16/drivers/net/ibmveth.c |
26266 | --- linux-2.6.32.15/drivers/net/ibmveth.c 2010-03-15 11:52:04.000000000 -0400 | 26445 | --- linux-2.6.32.16/drivers/net/ibmveth.c 2010-07-05 14:14:00.000000000 -0400 |
26267 | +++ linux-2.6.32.15/drivers/net/ibmveth.c 2010-05-28 21:27:15.659202304 -0400 | 26446 | +++ linux-2.6.32.16/drivers/net/ibmveth.c 2010-07-09 14:50:36.000000000 -0400 |
26268 | @@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr | 26447 | @@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr |
26269 | NULL, | 26448 | NULL, |
26270 | }; | 26449 | }; |
@@ -26274,9 +26453,9 @@ diff -urNp linux-2.6.32.15/drivers/net/ibmveth.c linux-2.6.32.15/drivers/net/ibm | |||
26274 | .show = veth_pool_show, | 26453 | .show = veth_pool_show, |
26275 | .store = veth_pool_store, | 26454 | .store = veth_pool_store, |
26276 | }; | 26455 | }; |
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 | 26456 | diff -urNp linux-2.6.32.16/drivers/net/igb/e1000_82575.c linux-2.6.32.16/drivers/net/igb/e1000_82575.c |
26278 | --- linux-2.6.32.15/drivers/net/igb/e1000_82575.c 2010-04-29 17:49:38.085476187 -0400 | 26457 | --- linux-2.6.32.16/drivers/net/igb/e1000_82575.c 2010-07-05 14:14:00.000000000 -0400 |
26279 | +++ linux-2.6.32.15/drivers/net/igb/e1000_82575.c 2010-05-28 21:27:15.659202304 -0400 | 26458 | +++ linux-2.6.32.16/drivers/net/igb/e1000_82575.c 2010-07-09 14:50:36.000000000 -0400 |
26280 | @@ -1401,7 +1401,7 @@ void igb_vmdq_set_replication_pf(struct | 26459 | @@ -1401,7 +1401,7 @@ void igb_vmdq_set_replication_pf(struct |
26281 | wr32(E1000_VT_CTL, vt_ctl); | 26460 | wr32(E1000_VT_CTL, vt_ctl); |
26282 | } | 26461 | } |
@@ -26302,9 +26481,9 @@ diff -urNp linux-2.6.32.15/drivers/net/igb/e1000_82575.c linux-2.6.32.15/drivers | |||
26302 | .acquire = igb_acquire_nvm_82575, | 26481 | .acquire = igb_acquire_nvm_82575, |
26303 | .read = igb_read_nvm_eerd, | 26482 | .read = igb_read_nvm_eerd, |
26304 | .release = igb_release_nvm_82575, | 26483 | .release = igb_release_nvm_82575, |
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 | 26484 | diff -urNp linux-2.6.32.16/drivers/net/igb/e1000_hw.h linux-2.6.32.16/drivers/net/igb/e1000_hw.h |
26306 | --- linux-2.6.32.15/drivers/net/igb/e1000_hw.h 2010-04-29 17:49:38.085476187 -0400 | 26485 | --- linux-2.6.32.16/drivers/net/igb/e1000_hw.h 2010-07-05 14:14:00.000000000 -0400 |
26307 | +++ linux-2.6.32.15/drivers/net/igb/e1000_hw.h 2010-05-28 21:27:15.659202304 -0400 | 26486 | +++ linux-2.6.32.16/drivers/net/igb/e1000_hw.h 2010-07-09 14:50:36.000000000 -0400 |
26308 | @@ -303,17 +303,17 @@ struct e1000_phy_operations { | 26487 | @@ -303,17 +303,17 @@ struct e1000_phy_operations { |
26309 | }; | 26488 | }; |
26310 | 26489 | ||
@@ -26330,9 +26509,9 @@ diff -urNp linux-2.6.32.15/drivers/net/igb/e1000_hw.h linux-2.6.32.15/drivers/ne | |||
26330 | }; | 26509 | }; |
26331 | 26510 | ||
26332 | extern const struct e1000_info e1000_82575_info; | 26511 | extern const struct e1000_info e1000_82575_info; |
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 | 26512 | diff -urNp linux-2.6.32.16/drivers/net/irda/vlsi_ir.c linux-2.6.32.16/drivers/net/irda/vlsi_ir.c |
26334 | --- linux-2.6.32.15/drivers/net/irda/vlsi_ir.c 2010-03-15 11:52:04.000000000 -0400 | 26513 | --- linux-2.6.32.16/drivers/net/irda/vlsi_ir.c 2010-07-05 14:14:00.000000000 -0400 |
26335 | +++ linux-2.6.32.15/drivers/net/irda/vlsi_ir.c 2010-05-28 21:27:15.662946876 -0400 | 26514 | +++ linux-2.6.32.16/drivers/net/irda/vlsi_ir.c 2010-07-09 14:50:36.000000000 -0400 |
26336 | @@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit( | 26515 | @@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit( |
26337 | /* no race - tx-ring already empty */ | 26516 | /* no race - tx-ring already empty */ |
26338 | vlsi_set_baud(idev, iobase); | 26517 | vlsi_set_baud(idev, iobase); |
@@ -26349,9 +26528,9 @@ diff -urNp linux-2.6.32.15/drivers/net/irda/vlsi_ir.c linux-2.6.32.15/drivers/ne | |||
26349 | spin_unlock_irqrestore(&idev->lock, flags); | 26528 | spin_unlock_irqrestore(&idev->lock, flags); |
26350 | dev_kfree_skb_any(skb); | 26529 | dev_kfree_skb_any(skb); |
26351 | return NETDEV_TX_OK; | 26530 | return NETDEV_TX_OK; |
26352 | diff -urNp linux-2.6.32.15/drivers/net/iseries_veth.c linux-2.6.32.15/drivers/net/iseries_veth.c | 26531 | diff -urNp linux-2.6.32.16/drivers/net/iseries_veth.c linux-2.6.32.16/drivers/net/iseries_veth.c |
26353 | --- linux-2.6.32.15/drivers/net/iseries_veth.c 2010-03-15 11:52:04.000000000 -0400 | 26532 | --- linux-2.6.32.16/drivers/net/iseries_veth.c 2010-07-05 14:14:00.000000000 -0400 |
26354 | +++ linux-2.6.32.15/drivers/net/iseries_veth.c 2010-05-28 21:27:15.662946876 -0400 | 26533 | +++ linux-2.6.32.16/drivers/net/iseries_veth.c 2010-07-09 14:50:36.000000000 -0400 |
26355 | @@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul | 26534 | @@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul |
26356 | NULL | 26535 | NULL |
26357 | }; | 26536 | }; |
@@ -26370,9 +26549,9 @@ diff -urNp linux-2.6.32.15/drivers/net/iseries_veth.c linux-2.6.32.15/drivers/ne | |||
26370 | .show = veth_port_attribute_show | 26549 | .show = veth_port_attribute_show |
26371 | }; | 26550 | }; |
26372 | 26551 | ||
26373 | diff -urNp linux-2.6.32.15/drivers/net/pcnet32.c linux-2.6.32.15/drivers/net/pcnet32.c | 26552 | diff -urNp linux-2.6.32.16/drivers/net/pcnet32.c linux-2.6.32.16/drivers/net/pcnet32.c |
26374 | --- linux-2.6.32.15/drivers/net/pcnet32.c 2010-03-15 11:52:04.000000000 -0400 | 26553 | --- linux-2.6.32.16/drivers/net/pcnet32.c 2010-07-05 14:14:00.000000000 -0400 |
26375 | +++ linux-2.6.32.15/drivers/net/pcnet32.c 2010-05-28 21:27:15.662946876 -0400 | 26554 | +++ linux-2.6.32.16/drivers/net/pcnet32.c 2010-07-09 14:50:36.000000000 -0400 |
26376 | @@ -79,7 +79,7 @@ static int cards_found; | 26555 | @@ -79,7 +79,7 @@ static int cards_found; |
26377 | /* | 26556 | /* |
26378 | * VLB I/O addresses | 26557 | * VLB I/O addresses |
@@ -26382,9 +26561,9 @@ diff -urNp linux-2.6.32.15/drivers/net/pcnet32.c linux-2.6.32.15/drivers/net/pcn | |||
26382 | { 0x300, 0x320, 0x340, 0x360, 0 }; | 26561 | { 0x300, 0x320, 0x340, 0x360, 0 }; |
26383 | 26562 | ||
26384 | static int pcnet32_debug = 0; | 26563 | static int pcnet32_debug = 0; |
26385 | diff -urNp linux-2.6.32.15/drivers/net/tg3.h linux-2.6.32.15/drivers/net/tg3.h | 26564 | diff -urNp linux-2.6.32.16/drivers/net/tg3.h linux-2.6.32.16/drivers/net/tg3.h |
26386 | --- linux-2.6.32.15/drivers/net/tg3.h 2010-04-04 20:41:49.968494922 -0400 | 26565 | --- linux-2.6.32.16/drivers/net/tg3.h 2010-07-05 14:14:00.000000000 -0400 |
26387 | +++ linux-2.6.32.15/drivers/net/tg3.h 2010-05-28 21:27:15.662946876 -0400 | 26566 | +++ linux-2.6.32.16/drivers/net/tg3.h 2010-07-09 14:50:36.000000000 -0400 |
26388 | @@ -95,6 +95,7 @@ | 26567 | @@ -95,6 +95,7 @@ |
26389 | #define CHIPREV_ID_5750_A0 0x4000 | 26568 | #define CHIPREV_ID_5750_A0 0x4000 |
26390 | #define CHIPREV_ID_5750_A1 0x4001 | 26569 | #define CHIPREV_ID_5750_A1 0x4001 |
@@ -26393,9 +26572,9 @@ diff -urNp linux-2.6.32.15/drivers/net/tg3.h linux-2.6.32.15/drivers/net/tg3.h | |||
26393 | #define CHIPREV_ID_5750_C2 0x4202 | 26572 | #define CHIPREV_ID_5750_C2 0x4202 |
26394 | #define CHIPREV_ID_5752_A0_HW 0x5000 | 26573 | #define CHIPREV_ID_5752_A0_HW 0x5000 |
26395 | #define CHIPREV_ID_5752_A0 0x6000 | 26574 | #define CHIPREV_ID_5752_A0 0x6000 |
26396 | diff -urNp linux-2.6.32.15/drivers/net/tulip/de4x5.c linux-2.6.32.15/drivers/net/tulip/de4x5.c | 26575 | diff -urNp linux-2.6.32.16/drivers/net/tulip/de4x5.c linux-2.6.32.16/drivers/net/tulip/de4x5.c |
26397 | --- linux-2.6.32.15/drivers/net/tulip/de4x5.c 2010-03-15 11:52:04.000000000 -0400 | 26576 | --- linux-2.6.32.16/drivers/net/tulip/de4x5.c 2010-07-05 14:14:00.000000000 -0400 |
26398 | +++ linux-2.6.32.15/drivers/net/tulip/de4x5.c 2010-05-28 21:27:15.696210343 -0400 | 26577 | +++ linux-2.6.32.16/drivers/net/tulip/de4x5.c 2010-07-09 14:50:36.000000000 -0400 |
26399 | @@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru | 26578 | @@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru |
26400 | for (i=0; i<ETH_ALEN; i++) { | 26579 | for (i=0; i<ETH_ALEN; i++) { |
26401 | tmp.addr[i] = dev->dev_addr[i]; | 26580 | tmp.addr[i] = dev->dev_addr[i]; |
@@ -26414,9 +26593,9 @@ diff -urNp linux-2.6.32.15/drivers/net/tulip/de4x5.c linux-2.6.32.15/drivers/net | |||
26414 | return -EFAULT; | 26593 | return -EFAULT; |
26415 | break; | 26594 | break; |
26416 | } | 26595 | } |
26417 | diff -urNp linux-2.6.32.15/drivers/net/usb/hso.c linux-2.6.32.15/drivers/net/usb/hso.c | 26596 | diff -urNp linux-2.6.32.16/drivers/net/usb/hso.c linux-2.6.32.16/drivers/net/usb/hso.c |
26418 | --- linux-2.6.32.15/drivers/net/usb/hso.c 2010-03-15 11:52:04.000000000 -0400 | 26597 | --- linux-2.6.32.16/drivers/net/usb/hso.c 2010-07-05 14:14:00.000000000 -0400 |
26419 | +++ linux-2.6.32.15/drivers/net/usb/hso.c 2010-05-28 21:27:15.699197955 -0400 | 26598 | +++ linux-2.6.32.16/drivers/net/usb/hso.c 2010-07-09 14:50:36.000000000 -0400 |
26420 | @@ -258,7 +258,7 @@ struct hso_serial { | 26599 | @@ -258,7 +258,7 @@ struct hso_serial { |
26421 | 26600 | ||
26422 | /* from usb_serial_port */ | 26601 | /* from usb_serial_port */ |
@@ -26495,9 +26674,9 @@ diff -urNp linux-2.6.32.15/drivers/net/usb/hso.c linux-2.6.32.15/drivers/net/usb | |||
26495 | result = | 26674 | result = |
26496 | hso_start_serial_device(serial_table[i], GFP_NOIO); | 26675 | hso_start_serial_device(serial_table[i], GFP_NOIO); |
26497 | hso_kick_transmit(dev2ser(serial_table[i])); | 26676 | hso_kick_transmit(dev2ser(serial_table[i])); |
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 | 26677 | diff -urNp linux-2.6.32.16/drivers/net/wireless/b43/debugfs.c linux-2.6.32.16/drivers/net/wireless/b43/debugfs.c |
26499 | --- linux-2.6.32.15/drivers/net/wireless/b43/debugfs.c 2010-03-15 11:52:04.000000000 -0400 | 26678 | --- linux-2.6.32.16/drivers/net/wireless/b43/debugfs.c 2010-07-05 14:14:00.000000000 -0400 |
26500 | +++ linux-2.6.32.15/drivers/net/wireless/b43/debugfs.c 2010-05-28 21:27:15.699197955 -0400 | 26679 | +++ linux-2.6.32.16/drivers/net/wireless/b43/debugfs.c 2010-07-09 14:50:36.000000000 -0400 |
26501 | @@ -43,7 +43,7 @@ static struct dentry *rootdir; | 26680 | @@ -43,7 +43,7 @@ static struct dentry *rootdir; |
26502 | struct b43_debugfs_fops { | 26681 | struct b43_debugfs_fops { |
26503 | ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); | 26682 | ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); |
@@ -26507,9 +26686,9 @@ diff -urNp linux-2.6.32.15/drivers/net/wireless/b43/debugfs.c linux-2.6.32.15/dr | |||
26507 | /* Offset of struct b43_dfs_file in struct b43_dfsentry */ | 26686 | /* Offset of struct b43_dfs_file in struct b43_dfsentry */ |
26508 | size_t file_struct_offset; | 26687 | size_t file_struct_offset; |
26509 | }; | 26688 | }; |
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 | 26689 | diff -urNp linux-2.6.32.16/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.16/drivers/net/wireless/b43legacy/debugfs.c |
26511 | --- linux-2.6.32.15/drivers/net/wireless/b43legacy/debugfs.c 2010-03-15 11:52:04.000000000 -0400 | 26690 | --- linux-2.6.32.16/drivers/net/wireless/b43legacy/debugfs.c 2010-07-05 14:14:00.000000000 -0400 |
26512 | +++ linux-2.6.32.15/drivers/net/wireless/b43legacy/debugfs.c 2010-05-28 21:27:15.699197955 -0400 | 26691 | +++ linux-2.6.32.16/drivers/net/wireless/b43legacy/debugfs.c 2010-07-09 14:50:36.000000000 -0400 |
26513 | @@ -44,7 +44,7 @@ static struct dentry *rootdir; | 26692 | @@ -44,7 +44,7 @@ static struct dentry *rootdir; |
26514 | struct b43legacy_debugfs_fops { | 26693 | struct b43legacy_debugfs_fops { |
26515 | ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize); | 26694 | ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize); |
@@ -26519,9 +26698,9 @@ diff -urNp linux-2.6.32.15/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32 | |||
26519 | /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ | 26698 | /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ |
26520 | size_t file_struct_offset; | 26699 | size_t file_struct_offset; |
26521 | /* Take wl->irq_lock before calling read/write? */ | 26700 | /* Take wl->irq_lock before calling read/write? */ |
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 | 26701 | diff -urNp linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-1000.c |
26523 | --- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-03-15 11:52:04.000000000 -0400 | 26702 | --- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-07-05 14:14:00.000000000 -0400 |
26524 | +++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-05-28 21:27:15.699197955 -0400 | 26703 | +++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-07-09 14:50:36.000000000 -0400 |
26525 | @@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = | 26704 | @@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = |
26526 | }, | 26705 | }, |
26527 | }; | 26706 | }; |
@@ -26531,9 +26710,9 @@ diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32. | |||
26531 | .ucode = &iwl5000_ucode, | 26710 | .ucode = &iwl5000_ucode, |
26532 | .lib = &iwl1000_lib, | 26711 | .lib = &iwl1000_lib, |
26533 | .hcmd = &iwl5000_hcmd, | 26712 | .hcmd = &iwl5000_hcmd, |
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 | 26713 | diff -urNp linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-3945.c |
26535 | --- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-04-04 20:41:49.972919715 -0400 | 26714 | --- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-07-05 14:14:00.000000000 -0400 |
26536 | +++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-05-28 21:27:15.707206768 -0400 | 26715 | +++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-07-09 14:50:36.000000000 -0400 |
26537 | @@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945 | 26716 | @@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945 |
26538 | .build_addsta_hcmd = iwl3945_build_addsta_hcmd, | 26717 | .build_addsta_hcmd = iwl3945_build_addsta_hcmd, |
26539 | }; | 26718 | }; |
@@ -26543,9 +26722,9 @@ diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32. | |||
26543 | .ucode = &iwl3945_ucode, | 26722 | .ucode = &iwl3945_ucode, |
26544 | .lib = &iwl3945_lib, | 26723 | .lib = &iwl3945_lib, |
26545 | .hcmd = &iwl3945_hcmd, | 26724 | .hcmd = &iwl3945_hcmd, |
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 | 26725 | diff -urNp linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-4965.c |
26547 | --- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-05-28 20:16:44.442935997 -0400 | 26726 | --- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-07-05 14:14:00.000000000 -0400 |
26548 | +++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-05-28 21:27:15.707206768 -0400 | 26727 | +++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-07-09 14:50:36.000000000 -0400 |
26549 | @@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib = | 26728 | @@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib = |
26550 | }, | 26729 | }, |
26551 | }; | 26730 | }; |
@@ -26555,9 +26734,9 @@ diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32. | |||
26555 | .ucode = &iwl4965_ucode, | 26734 | .ucode = &iwl4965_ucode, |
26556 | .lib = &iwl4965_lib, | 26735 | .lib = &iwl4965_lib, |
26557 | .hcmd = &iwl4965_hcmd, | 26736 | .hcmd = &iwl4965_hcmd, |
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 | 26737 | diff -urNp linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-5000.c |
26559 | --- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-05-28 20:16:44.446927415 -0400 | 26738 | --- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-07-05 14:14:00.000000000 -0400 |
26560 | +++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-05-28 21:27:15.707206768 -0400 | 26739 | +++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-07-09 14:50:36.000000000 -0400 |
26561 | @@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib = | 26740 | @@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib = |
26562 | }, | 26741 | }, |
26563 | }; | 26742 | }; |
@@ -26575,9 +26754,9 @@ diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32. | |||
26575 | .ucode = &iwl5000_ucode, | 26754 | .ucode = &iwl5000_ucode, |
26576 | .lib = &iwl5150_lib, | 26755 | .lib = &iwl5150_lib, |
26577 | .hcmd = &iwl5000_hcmd, | 26756 | .hcmd = &iwl5000_hcmd, |
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 | 26757 | diff -urNp linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-6000.c |
26579 | --- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-03-15 11:52:04.000000000 -0400 | 26758 | --- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-07-05 14:14:00.000000000 -0400 |
26580 | +++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-05-28 21:27:15.707206768 -0400 | 26759 | +++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-07-09 14:50:36.000000000 -0400 |
26581 | @@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000 | 26760 | @@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000 |
26582 | .calc_rssi = iwl5000_calc_rssi, | 26761 | .calc_rssi = iwl5000_calc_rssi, |
26583 | }; | 26762 | }; |
@@ -26587,9 +26766,9 @@ diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32. | |||
26587 | .ucode = &iwl5000_ucode, | 26766 | .ucode = &iwl5000_ucode, |
26588 | .lib = &iwl6000_lib, | 26767 | .lib = &iwl6000_lib, |
26589 | .hcmd = &iwl5000_hcmd, | 26768 | .hcmd = &iwl5000_hcmd, |
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 | 26769 | diff -urNp linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-debug.h |
26591 | --- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-03-15 11:52:04.000000000 -0400 | 26770 | --- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-07-05 14:14:00.000000000 -0400 |
26592 | +++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-05-28 21:27:15.707206768 -0400 | 26771 | +++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-07-09 14:50:36.000000000 -0400 |
26593 | @@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri | 26772 | @@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri |
26594 | #endif | 26773 | #endif |
26595 | 26774 | ||
@@ -26601,10 +26780,10 @@ diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32 | |||
26601 | static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level, | 26780 | static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level, |
26602 | void *p, u32 len) | 26781 | void *p, u32 len) |
26603 | {} | 26782 | {} |
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 | 26783 | diff -urNp linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-dev.h |
26605 | --- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-03-15 11:52:04.000000000 -0400 | 26784 | --- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-07-05 14:14:00.000000000 -0400 |
26606 | +++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-05-28 21:27:15.707206768 -0400 | 26785 | +++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-07-09 14:50:36.000000000 -0400 |
26607 | @@ -67,7 +67,7 @@ struct iwl_tx_queue; | 26786 | @@ -68,7 +68,7 @@ struct iwl_tx_queue; |
26608 | 26787 | ||
26609 | /* shared structures from iwl-5000.c */ | 26788 | /* shared structures from iwl-5000.c */ |
26610 | extern struct iwl_mod_params iwl50_mod_params; | 26789 | extern struct iwl_mod_params iwl50_mod_params; |
@@ -26613,9 +26792,9 @@ diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.1 | |||
26613 | extern struct iwl_ucode_ops iwl5000_ucode; | 26792 | extern struct iwl_ucode_ops iwl5000_ucode; |
26614 | extern struct iwl_lib_ops iwl5000_lib; | 26793 | extern struct iwl_lib_ops iwl5000_lib; |
26615 | extern struct iwl_hcmd_ops iwl5000_hcmd; | 26794 | extern struct iwl_hcmd_ops iwl5000_hcmd; |
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 | 26795 | diff -urNp linux-2.6.32.16/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.16/drivers/net/wireless/libertas/debugfs.c |
26617 | --- linux-2.6.32.15/drivers/net/wireless/libertas/debugfs.c 2010-03-15 11:52:04.000000000 -0400 | 26796 | --- linux-2.6.32.16/drivers/net/wireless/libertas/debugfs.c 2010-07-05 14:14:00.000000000 -0400 |
26618 | +++ linux-2.6.32.15/drivers/net/wireless/libertas/debugfs.c 2010-05-28 21:27:15.715208538 -0400 | 26797 | +++ linux-2.6.32.16/drivers/net/wireless/libertas/debugfs.c 2010-07-09 14:50:36.000000000 -0400 |
26619 | @@ -708,7 +708,7 @@ out_unlock: | 26798 | @@ -708,7 +708,7 @@ out_unlock: |
26620 | struct lbs_debugfs_files { | 26799 | struct lbs_debugfs_files { |
26621 | const char *name; | 26800 | const char *name; |
@@ -26625,9 +26804,9 @@ diff -urNp linux-2.6.32.15/drivers/net/wireless/libertas/debugfs.c linux-2.6.32. | |||
26625 | }; | 26804 | }; |
26626 | 26805 | ||
26627 | static const struct lbs_debugfs_files debugfs_files[] = { | 26806 | static const struct lbs_debugfs_files debugfs_files[] = { |
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 | 26807 | diff -urNp linux-2.6.32.16/drivers/net/wireless/rndis_wlan.c linux-2.6.32.16/drivers/net/wireless/rndis_wlan.c |
26629 | --- linux-2.6.32.15/drivers/net/wireless/rndis_wlan.c 2010-03-15 11:52:04.000000000 -0400 | 26808 | --- linux-2.6.32.16/drivers/net/wireless/rndis_wlan.c 2010-07-05 14:14:00.000000000 -0400 |
26630 | +++ linux-2.6.32.15/drivers/net/wireless/rndis_wlan.c 2010-05-28 21:27:15.715208538 -0400 | 26809 | +++ linux-2.6.32.16/drivers/net/wireless/rndis_wlan.c 2010-07-09 14:50:36.000000000 -0400 |
26631 | @@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn | 26810 | @@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn |
26632 | 26811 | ||
26633 | devdbg(usbdev, "set_rts_threshold %i", rts_threshold); | 26812 | devdbg(usbdev, "set_rts_threshold %i", rts_threshold); |
@@ -26637,9 +26816,9 @@ diff -urNp linux-2.6.32.15/drivers/net/wireless/rndis_wlan.c linux-2.6.32.15/dri | |||
26637 | rts_threshold = 2347; | 26816 | rts_threshold = 2347; |
26638 | 26817 | ||
26639 | tmp = cpu_to_le32(rts_threshold); | 26818 | tmp = cpu_to_le32(rts_threshold); |
26640 | diff -urNp linux-2.6.32.15/drivers/oprofile/buffer_sync.c linux-2.6.32.15/drivers/oprofile/buffer_sync.c | 26819 | diff -urNp linux-2.6.32.16/drivers/oprofile/buffer_sync.c linux-2.6.32.16/drivers/oprofile/buffer_sync.c |
26641 | --- linux-2.6.32.15/drivers/oprofile/buffer_sync.c 2010-03-15 11:52:04.000000000 -0400 | 26820 | --- linux-2.6.32.16/drivers/oprofile/buffer_sync.c 2010-07-05 14:14:00.000000000 -0400 |
26642 | +++ linux-2.6.32.15/drivers/oprofile/buffer_sync.c 2010-05-28 21:27:15.718942362 -0400 | 26821 | +++ linux-2.6.32.16/drivers/oprofile/buffer_sync.c 2010-07-09 14:50:36.000000000 -0400 |
26643 | @@ -340,7 +340,7 @@ static void add_data(struct op_entry *en | 26822 | @@ -340,7 +340,7 @@ static void add_data(struct op_entry *en |
26644 | if (cookie == NO_COOKIE) | 26823 | if (cookie == NO_COOKIE) |
26645 | offset = pc; | 26824 | offset = pc; |
@@ -26675,9 +26854,9 @@ diff -urNp linux-2.6.32.15/drivers/oprofile/buffer_sync.c linux-2.6.32.15/driver | |||
26675 | } | 26854 | } |
26676 | } | 26855 | } |
26677 | release_mm(mm); | 26856 | release_mm(mm); |
26678 | diff -urNp linux-2.6.32.15/drivers/oprofile/event_buffer.c linux-2.6.32.15/drivers/oprofile/event_buffer.c | 26857 | diff -urNp linux-2.6.32.16/drivers/oprofile/event_buffer.c linux-2.6.32.16/drivers/oprofile/event_buffer.c |
26679 | --- linux-2.6.32.15/drivers/oprofile/event_buffer.c 2010-03-15 11:52:04.000000000 -0400 | 26858 | --- linux-2.6.32.16/drivers/oprofile/event_buffer.c 2010-07-05 14:14:00.000000000 -0400 |
26680 | +++ linux-2.6.32.15/drivers/oprofile/event_buffer.c 2010-05-28 21:27:15.718942362 -0400 | 26859 | +++ linux-2.6.32.16/drivers/oprofile/event_buffer.c 2010-07-09 14:50:36.000000000 -0400 |
26681 | @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value | 26860 | @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value |
26682 | } | 26861 | } |
26683 | 26862 | ||
@@ -26687,9 +26866,9 @@ diff -urNp linux-2.6.32.15/drivers/oprofile/event_buffer.c linux-2.6.32.15/drive | |||
26687 | return; | 26866 | return; |
26688 | } | 26867 | } |
26689 | 26868 | ||
26690 | diff -urNp linux-2.6.32.15/drivers/oprofile/oprof.c linux-2.6.32.15/drivers/oprofile/oprof.c | 26869 | diff -urNp linux-2.6.32.16/drivers/oprofile/oprof.c linux-2.6.32.16/drivers/oprofile/oprof.c |
26691 | --- linux-2.6.32.15/drivers/oprofile/oprof.c 2010-03-15 11:52:04.000000000 -0400 | 26870 | --- linux-2.6.32.16/drivers/oprofile/oprof.c 2010-07-05 14:14:00.000000000 -0400 |
26692 | +++ linux-2.6.32.15/drivers/oprofile/oprof.c 2010-05-28 21:27:15.718942362 -0400 | 26871 | +++ linux-2.6.32.16/drivers/oprofile/oprof.c 2010-07-09 14:50:36.000000000 -0400 |
26693 | @@ -110,7 +110,7 @@ static void switch_worker(struct work_st | 26872 | @@ -110,7 +110,7 @@ static void switch_worker(struct work_st |
26694 | if (oprofile_ops.switch_events()) | 26873 | if (oprofile_ops.switch_events()) |
26695 | return; | 26874 | return; |
@@ -26699,9 +26878,9 @@ diff -urNp linux-2.6.32.15/drivers/oprofile/oprof.c linux-2.6.32.15/drivers/opro | |||
26699 | start_switch_worker(); | 26878 | start_switch_worker(); |
26700 | } | 26879 | } |
26701 | 26880 | ||
26702 | diff -urNp linux-2.6.32.15/drivers/oprofile/oprofilefs.c linux-2.6.32.15/drivers/oprofile/oprofilefs.c | 26881 | diff -urNp linux-2.6.32.16/drivers/oprofile/oprofilefs.c linux-2.6.32.16/drivers/oprofile/oprofilefs.c |
26703 | --- linux-2.6.32.15/drivers/oprofile/oprofilefs.c 2010-03-15 11:52:04.000000000 -0400 | 26882 | --- linux-2.6.32.16/drivers/oprofile/oprofilefs.c 2010-07-05 14:14:00.000000000 -0400 |
26704 | +++ linux-2.6.32.15/drivers/oprofile/oprofilefs.c 2010-05-28 21:27:15.718942362 -0400 | 26883 | +++ linux-2.6.32.16/drivers/oprofile/oprofilefs.c 2010-07-09 14:50:37.000000000 -0400 |
26705 | @@ -187,7 +187,7 @@ static const struct file_operations atom | 26884 | @@ -187,7 +187,7 @@ static const struct file_operations atom |
26706 | 26885 | ||
26707 | 26886 | ||
@@ -26711,9 +26890,9 @@ diff -urNp linux-2.6.32.15/drivers/oprofile/oprofilefs.c linux-2.6.32.15/drivers | |||
26711 | { | 26890 | { |
26712 | struct dentry *d = __oprofilefs_create_file(sb, root, name, | 26891 | struct dentry *d = __oprofilefs_create_file(sb, root, name, |
26713 | &atomic_ro_fops, 0444); | 26892 | &atomic_ro_fops, 0444); |
26714 | diff -urNp linux-2.6.32.15/drivers/oprofile/oprofile_stats.c linux-2.6.32.15/drivers/oprofile/oprofile_stats.c | 26893 | diff -urNp linux-2.6.32.16/drivers/oprofile/oprofile_stats.c linux-2.6.32.16/drivers/oprofile/oprofile_stats.c |
26715 | --- linux-2.6.32.15/drivers/oprofile/oprofile_stats.c 2010-03-15 11:52:04.000000000 -0400 | 26894 | --- linux-2.6.32.16/drivers/oprofile/oprofile_stats.c 2010-07-05 14:14:00.000000000 -0400 |
26716 | +++ linux-2.6.32.15/drivers/oprofile/oprofile_stats.c 2010-05-28 21:27:15.718942362 -0400 | 26895 | +++ linux-2.6.32.16/drivers/oprofile/oprofile_stats.c 2010-07-09 14:50:37.000000000 -0400 |
26717 | @@ -30,11 +30,11 @@ void oprofile_reset_stats(void) | 26896 | @@ -30,11 +30,11 @@ void oprofile_reset_stats(void) |
26718 | cpu_buf->sample_invalid_eip = 0; | 26897 | cpu_buf->sample_invalid_eip = 0; |
26719 | } | 26898 | } |
@@ -26731,9 +26910,9 @@ diff -urNp linux-2.6.32.15/drivers/oprofile/oprofile_stats.c linux-2.6.32.15/dri | |||
26731 | } | 26910 | } |
26732 | 26911 | ||
26733 | 26912 | ||
26734 | diff -urNp linux-2.6.32.15/drivers/oprofile/oprofile_stats.h linux-2.6.32.15/drivers/oprofile/oprofile_stats.h | 26913 | diff -urNp linux-2.6.32.16/drivers/oprofile/oprofile_stats.h linux-2.6.32.16/drivers/oprofile/oprofile_stats.h |
26735 | --- linux-2.6.32.15/drivers/oprofile/oprofile_stats.h 2010-03-15 11:52:04.000000000 -0400 | 26914 | --- linux-2.6.32.16/drivers/oprofile/oprofile_stats.h 2010-07-05 14:14:00.000000000 -0400 |
26736 | +++ linux-2.6.32.15/drivers/oprofile/oprofile_stats.h 2010-05-28 21:27:15.718942362 -0400 | 26915 | +++ linux-2.6.32.16/drivers/oprofile/oprofile_stats.h 2010-07-09 14:50:37.000000000 -0400 |
26737 | @@ -13,11 +13,11 @@ | 26916 | @@ -13,11 +13,11 @@ |
26738 | #include <asm/atomic.h> | 26917 | #include <asm/atomic.h> |
26739 | 26918 | ||
@@ -26751,9 +26930,9 @@ diff -urNp linux-2.6.32.15/drivers/oprofile/oprofile_stats.h linux-2.6.32.15/dri | |||
26751 | }; | 26930 | }; |
26752 | 26931 | ||
26753 | extern struct oprofile_stat_struct oprofile_stats; | 26932 | extern struct oprofile_stat_struct oprofile_stats; |
26754 | diff -urNp linux-2.6.32.15/drivers/parisc/pdc_stable.c linux-2.6.32.15/drivers/parisc/pdc_stable.c | 26933 | diff -urNp linux-2.6.32.16/drivers/parisc/pdc_stable.c linux-2.6.32.16/drivers/parisc/pdc_stable.c |
26755 | --- linux-2.6.32.15/drivers/parisc/pdc_stable.c 2010-03-15 11:52:04.000000000 -0400 | 26934 | --- linux-2.6.32.16/drivers/parisc/pdc_stable.c 2010-07-05 14:14:00.000000000 -0400 |
26756 | +++ linux-2.6.32.15/drivers/parisc/pdc_stable.c 2010-05-28 21:27:15.727198333 -0400 | 26935 | +++ linux-2.6.32.16/drivers/parisc/pdc_stable.c 2010-07-09 14:50:37.000000000 -0400 |
26757 | @@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj | 26936 | @@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj |
26758 | return ret; | 26937 | return ret; |
26759 | } | 26938 | } |
@@ -26763,9 +26942,9 @@ diff -urNp linux-2.6.32.15/drivers/parisc/pdc_stable.c linux-2.6.32.15/drivers/p | |||
26763 | .show = pdcspath_attr_show, | 26942 | .show = pdcspath_attr_show, |
26764 | .store = pdcspath_attr_store, | 26943 | .store = pdcspath_attr_store, |
26765 | }; | 26944 | }; |
26766 | diff -urNp linux-2.6.32.15/drivers/parport/procfs.c linux-2.6.32.15/drivers/parport/procfs.c | 26945 | diff -urNp linux-2.6.32.16/drivers/parport/procfs.c linux-2.6.32.16/drivers/parport/procfs.c |
26767 | --- linux-2.6.32.15/drivers/parport/procfs.c 2010-03-15 11:52:04.000000000 -0400 | 26946 | --- linux-2.6.32.16/drivers/parport/procfs.c 2010-07-05 14:14:00.000000000 -0400 |
26768 | +++ linux-2.6.32.15/drivers/parport/procfs.c 2010-05-28 21:27:15.727198333 -0400 | 26947 | +++ linux-2.6.32.16/drivers/parport/procfs.c 2010-07-09 14:50:37.000000000 -0400 |
26769 | @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t | 26948 | @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t |
26770 | 26949 | ||
26771 | *ppos += len; | 26950 | *ppos += len; |
@@ -26784,9 +26963,9 @@ diff -urNp linux-2.6.32.15/drivers/parport/procfs.c linux-2.6.32.15/drivers/parp | |||
26784 | } | 26963 | } |
26785 | #endif /* IEEE1284.3 support. */ | 26964 | #endif /* IEEE1284.3 support. */ |
26786 | 26965 | ||
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 | 26966 | diff -urNp linux-2.6.32.16/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.16/drivers/pci/hotplug/acpiphp_glue.c |
26788 | --- linux-2.6.32.15/drivers/pci/hotplug/acpiphp_glue.c 2010-03-15 11:52:04.000000000 -0400 | 26967 | --- linux-2.6.32.16/drivers/pci/hotplug/acpiphp_glue.c 2010-07-05 14:14:00.000000000 -0400 |
26789 | +++ linux-2.6.32.15/drivers/pci/hotplug/acpiphp_glue.c 2010-05-28 21:27:15.727198333 -0400 | 26968 | +++ linux-2.6.32.16/drivers/pci/hotplug/acpiphp_glue.c 2010-07-09 14:50:37.000000000 -0400 |
26790 | @@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif | 26969 | @@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif |
26791 | } | 26970 | } |
26792 | 26971 | ||
@@ -26796,9 +26975,9 @@ diff -urNp linux-2.6.32.15/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.15/dr | |||
26796 | .handler = handle_hotplug_event_func, | 26975 | .handler = handle_hotplug_event_func, |
26797 | }; | 26976 | }; |
26798 | 26977 | ||
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 | 26978 | diff -urNp linux-2.6.32.16/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.16/drivers/pci/hotplug/cpqphp_nvram.c |
26800 | --- linux-2.6.32.15/drivers/pci/hotplug/cpqphp_nvram.c 2010-03-15 11:52:04.000000000 -0400 | 26979 | --- linux-2.6.32.16/drivers/pci/hotplug/cpqphp_nvram.c 2010-07-05 14:14:00.000000000 -0400 |
26801 | +++ linux-2.6.32.15/drivers/pci/hotplug/cpqphp_nvram.c 2010-05-28 21:27:15.727198333 -0400 | 26980 | +++ linux-2.6.32.16/drivers/pci/hotplug/cpqphp_nvram.c 2010-07-09 14:50:37.000000000 -0400 |
26802 | @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ | 26981 | @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ |
26803 | 26982 | ||
26804 | void compaq_nvram_init (void __iomem *rom_start) | 26983 | void compaq_nvram_init (void __iomem *rom_start) |
@@ -26813,9 +26992,9 @@ diff -urNp linux-2.6.32.15/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.15/dr | |||
26813 | dbg("int15 entry = %p\n", compaq_int15_entry_point); | 26992 | dbg("int15 entry = %p\n", compaq_int15_entry_point); |
26814 | 26993 | ||
26815 | /* initialize our int15 lock */ | 26994 | /* initialize our int15 lock */ |
26816 | diff -urNp linux-2.6.32.15/drivers/pci/hotplug/fakephp.c linux-2.6.32.15/drivers/pci/hotplug/fakephp.c | 26995 | diff -urNp linux-2.6.32.16/drivers/pci/hotplug/fakephp.c linux-2.6.32.16/drivers/pci/hotplug/fakephp.c |
26817 | --- linux-2.6.32.15/drivers/pci/hotplug/fakephp.c 2010-03-15 11:52:04.000000000 -0400 | 26996 | --- linux-2.6.32.16/drivers/pci/hotplug/fakephp.c 2010-07-05 14:14:00.000000000 -0400 |
26818 | +++ linux-2.6.32.15/drivers/pci/hotplug/fakephp.c 2010-05-28 21:27:15.727198333 -0400 | 26997 | +++ linux-2.6.32.16/drivers/pci/hotplug/fakephp.c 2010-07-09 14:50:37.000000000 -0400 |
26819 | @@ -73,7 +73,7 @@ static void legacy_release(struct kobjec | 26998 | @@ -73,7 +73,7 @@ static void legacy_release(struct kobjec |
26820 | } | 26999 | } |
26821 | 27000 | ||
@@ -26825,10 +27004,70 @@ diff -urNp linux-2.6.32.15/drivers/pci/hotplug/fakephp.c linux-2.6.32.15/drivers | |||
26825 | .store = legacy_store, .show = legacy_show | 27004 | .store = legacy_store, .show = legacy_show |
26826 | }, | 27005 | }, |
26827 | .release = &legacy_release, | 27006 | .release = &legacy_release, |
26828 | diff -urNp linux-2.6.32.15/drivers/pci/intel-iommu.c linux-2.6.32.15/drivers/pci/intel-iommu.c | 27007 | diff -urNp linux-2.6.32.16/drivers/pci/intel-iommu.c linux-2.6.32.16/drivers/pci/intel-iommu.c |
26829 | --- linux-2.6.32.15/drivers/pci/intel-iommu.c 2010-03-15 11:52:04.000000000 -0400 | 27008 | --- linux-2.6.32.16/drivers/pci/intel-iommu.c 2010-07-05 14:14:00.000000000 -0400 |
26830 | +++ linux-2.6.32.15/drivers/pci/intel-iommu.c 2010-05-28 21:27:15.730990089 -0400 | 27009 | +++ linux-2.6.32.16/drivers/pci/intel-iommu.c 2010-07-09 14:50:44.000000000 -0400 |
26831 | @@ -2950,7 +2950,7 @@ static int intel_mapping_error(struct de | 27010 | @@ -2647,7 +2647,7 @@ error: |
27011 | return 0; | ||
27012 | } | ||
27013 | |||
27014 | -static dma_addr_t intel_map_page(struct device *dev, struct page *page, | ||
27015 | +dma_addr_t intel_map_page(struct device *dev, struct page *page, | ||
27016 | unsigned long offset, size_t size, | ||
27017 | enum dma_data_direction dir, | ||
27018 | struct dma_attrs *attrs) | ||
27019 | @@ -2723,7 +2723,7 @@ static void add_unmap(struct dmar_domain | ||
27020 | spin_unlock_irqrestore(&async_umap_flush_lock, flags); | ||
27021 | } | ||
27022 | |||
27023 | -static void intel_unmap_page(struct device *dev, dma_addr_t dev_addr, | ||
27024 | +void intel_unmap_page(struct device *dev, dma_addr_t dev_addr, | ||
27025 | size_t size, enum dma_data_direction dir, | ||
27026 | struct dma_attrs *attrs) | ||
27027 | { | ||
27028 | @@ -2772,7 +2772,7 @@ static void intel_unmap_page(struct devi | ||
27029 | } | ||
27030 | } | ||
27031 | |||
27032 | -static void *intel_alloc_coherent(struct device *hwdev, size_t size, | ||
27033 | +void *intel_alloc_coherent(struct device *hwdev, size_t size, | ||
27034 | dma_addr_t *dma_handle, gfp_t flags) | ||
27035 | { | ||
27036 | void *vaddr; | ||
27037 | @@ -2804,7 +2804,7 @@ static void *intel_alloc_coherent(struct | ||
27038 | return NULL; | ||
27039 | } | ||
27040 | |||
27041 | -static void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr, | ||
27042 | +void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr, | ||
27043 | dma_addr_t dma_handle) | ||
27044 | { | ||
27045 | int order; | ||
27046 | @@ -2816,7 +2816,7 @@ static void intel_free_coherent(struct d | ||
27047 | free_pages((unsigned long)vaddr, order); | ||
27048 | } | ||
27049 | |||
27050 | -static void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist, | ||
27051 | +void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist, | ||
27052 | int nelems, enum dma_data_direction dir, | ||
27053 | struct dma_attrs *attrs) | ||
27054 | { | ||
27055 | @@ -2876,7 +2876,7 @@ static int intel_nontranslate_map_sg(str | ||
27056 | return nelems; | ||
27057 | } | ||
27058 | |||
27059 | -static int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int nelems, | ||
27060 | +int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int nelems, | ||
27061 | enum dma_data_direction dir, struct dma_attrs *attrs) | ||
27062 | { | ||
27063 | int i; | ||
27064 | @@ -2945,12 +2945,12 @@ static int intel_map_sg(struct device *h | ||
27065 | return nelems; | ||
27066 | } | ||
27067 | |||
27068 | -static int intel_mapping_error(struct device *dev, dma_addr_t dma_addr) | ||
27069 | +int intel_mapping_error(struct device *dev, dma_addr_t dma_addr) | ||
27070 | { | ||
26832 | return !dma_addr; | 27071 | return !dma_addr; |
26833 | } | 27072 | } |
26834 | 27073 | ||
@@ -26837,9 +27076,9 @@ diff -urNp linux-2.6.32.15/drivers/pci/intel-iommu.c linux-2.6.32.15/drivers/pci | |||
26837 | .alloc_coherent = intel_alloc_coherent, | 27076 | .alloc_coherent = intel_alloc_coherent, |
26838 | .free_coherent = intel_free_coherent, | 27077 | .free_coherent = intel_free_coherent, |
26839 | .map_sg = intel_map_sg, | 27078 | .map_sg = intel_map_sg, |
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 | 27079 | diff -urNp linux-2.6.32.16/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.16/drivers/pci/pcie/portdrv_pci.c |
26841 | --- linux-2.6.32.15/drivers/pci/pcie/portdrv_pci.c 2010-03-15 11:52:04.000000000 -0400 | 27080 | --- linux-2.6.32.16/drivers/pci/pcie/portdrv_pci.c 2010-07-05 14:14:00.000000000 -0400 |
26842 | +++ linux-2.6.32.15/drivers/pci/pcie/portdrv_pci.c 2010-05-28 21:27:15.730990089 -0400 | 27081 | +++ linux-2.6.32.16/drivers/pci/pcie/portdrv_pci.c 2010-07-09 14:50:37.000000000 -0400 |
26843 | @@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru | 27082 | @@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru |
26844 | static const struct pci_device_id port_pci_ids[] = { { | 27083 | static const struct pci_device_id port_pci_ids[] = { { |
26845 | /* handle any PCI-Express port */ | 27084 | /* handle any PCI-Express port */ |
@@ -26849,9 +27088,9 @@ diff -urNp linux-2.6.32.15/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.15/driver | |||
26849 | }; | 27088 | }; |
26850 | MODULE_DEVICE_TABLE(pci, port_pci_ids); | 27089 | MODULE_DEVICE_TABLE(pci, port_pci_ids); |
26851 | 27090 | ||
26852 | diff -urNp linux-2.6.32.15/drivers/pci/probe.c linux-2.6.32.15/drivers/pci/probe.c | 27091 | diff -urNp linux-2.6.32.16/drivers/pci/probe.c linux-2.6.32.16/drivers/pci/probe.c |
26853 | --- linux-2.6.32.15/drivers/pci/probe.c 2010-03-15 11:52:04.000000000 -0400 | 27092 | --- linux-2.6.32.16/drivers/pci/probe.c 2010-07-05 14:14:00.000000000 -0400 |
26854 | +++ linux-2.6.32.15/drivers/pci/probe.c 2010-05-28 21:27:15.739209869 -0400 | 27093 | +++ linux-2.6.32.16/drivers/pci/probe.c 2010-07-09 14:50:37.000000000 -0400 |
26855 | @@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity( | 27094 | @@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity( |
26856 | return ret; | 27095 | return ret; |
26857 | } | 27096 | } |
@@ -26869,9 +27108,9 @@ diff -urNp linux-2.6.32.15/drivers/pci/probe.c linux-2.6.32.15/drivers/pci/probe | |||
26869 | struct device_attribute *attr, | 27108 | struct device_attribute *attr, |
26870 | char *buf) | 27109 | char *buf) |
26871 | { | 27110 | { |
26872 | diff -urNp linux-2.6.32.15/drivers/pci/proc.c linux-2.6.32.15/drivers/pci/proc.c | 27111 | diff -urNp linux-2.6.32.16/drivers/pci/proc.c linux-2.6.32.16/drivers/pci/proc.c |
26873 | --- linux-2.6.32.15/drivers/pci/proc.c 2010-03-15 11:52:04.000000000 -0400 | 27112 | --- linux-2.6.32.16/drivers/pci/proc.c 2010-07-05 14:14:00.000000000 -0400 |
26874 | +++ linux-2.6.32.15/drivers/pci/proc.c 2010-05-28 21:27:15.739209869 -0400 | 27113 | +++ linux-2.6.32.16/drivers/pci/proc.c 2010-07-09 14:50:37.000000000 -0400 |
26875 | @@ -480,7 +480,16 @@ static const struct file_operations proc | 27114 | @@ -480,7 +480,16 @@ static const struct file_operations proc |
26876 | static int __init pci_proc_init(void) | 27115 | static int __init pci_proc_init(void) |
26877 | { | 27116 | { |
@@ -26889,9 +27128,9 @@ diff -urNp linux-2.6.32.15/drivers/pci/proc.c linux-2.6.32.15/drivers/pci/proc.c | |||
26889 | proc_create("devices", 0, proc_bus_pci_dir, | 27128 | proc_create("devices", 0, proc_bus_pci_dir, |
26890 | &proc_bus_pci_dev_operations); | 27129 | &proc_bus_pci_dev_operations); |
26891 | proc_initialized = 1; | 27130 | proc_initialized = 1; |
26892 | diff -urNp linux-2.6.32.15/drivers/pci/slot.c linux-2.6.32.15/drivers/pci/slot.c | 27131 | diff -urNp linux-2.6.32.16/drivers/pci/slot.c linux-2.6.32.16/drivers/pci/slot.c |
26893 | --- linux-2.6.32.15/drivers/pci/slot.c 2010-03-15 11:52:04.000000000 -0400 | 27132 | --- linux-2.6.32.16/drivers/pci/slot.c 2010-07-05 14:14:00.000000000 -0400 |
26894 | +++ linux-2.6.32.15/drivers/pci/slot.c 2010-05-28 21:27:15.739209869 -0400 | 27133 | +++ linux-2.6.32.16/drivers/pci/slot.c 2010-07-09 14:50:37.000000000 -0400 |
26895 | @@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc | 27134 | @@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc |
26896 | return attribute->store ? attribute->store(slot, buf, len) : -EIO; | 27135 | return attribute->store ? attribute->store(slot, buf, len) : -EIO; |
26897 | } | 27136 | } |
@@ -26901,9 +27140,9 @@ diff -urNp linux-2.6.32.15/drivers/pci/slot.c linux-2.6.32.15/drivers/pci/slot.c | |||
26901 | .show = pci_slot_attr_show, | 27140 | .show = pci_slot_attr_show, |
26902 | .store = pci_slot_attr_store, | 27141 | .store = pci_slot_attr_store, |
26903 | }; | 27142 | }; |
26904 | diff -urNp linux-2.6.32.15/drivers/pcmcia/ti113x.h linux-2.6.32.15/drivers/pcmcia/ti113x.h | 27143 | diff -urNp linux-2.6.32.16/drivers/pcmcia/ti113x.h linux-2.6.32.16/drivers/pcmcia/ti113x.h |
26905 | --- linux-2.6.32.15/drivers/pcmcia/ti113x.h 2010-03-15 11:52:04.000000000 -0400 | 27144 | --- linux-2.6.32.16/drivers/pcmcia/ti113x.h 2010-07-05 14:14:00.000000000 -0400 |
26906 | +++ linux-2.6.32.15/drivers/pcmcia/ti113x.h 2010-05-28 21:27:15.743188935 -0400 | 27145 | +++ linux-2.6.32.16/drivers/pcmcia/ti113x.h 2010-07-09 14:50:37.000000000 -0400 |
26907 | @@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl | 27146 | @@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl |
26908 | DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID, | 27147 | DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID, |
26909 | ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE), | 27148 | ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE), |
@@ -26913,9 +27152,9 @@ diff -urNp linux-2.6.32.15/drivers/pcmcia/ti113x.h linux-2.6.32.15/drivers/pcmci | |||
26913 | }; | 27152 | }; |
26914 | 27153 | ||
26915 | static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) | 27154 | static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) |
26916 | diff -urNp linux-2.6.32.15/drivers/pcmcia/yenta_socket.c linux-2.6.32.15/drivers/pcmcia/yenta_socket.c | 27155 | diff -urNp linux-2.6.32.16/drivers/pcmcia/yenta_socket.c linux-2.6.32.16/drivers/pcmcia/yenta_socket.c |
26917 | --- linux-2.6.32.15/drivers/pcmcia/yenta_socket.c 2010-03-15 11:52:04.000000000 -0400 | 27156 | --- linux-2.6.32.16/drivers/pcmcia/yenta_socket.c 2010-07-05 14:14:00.000000000 -0400 |
26918 | +++ linux-2.6.32.15/drivers/pcmcia/yenta_socket.c 2010-05-28 21:27:15.751196243 -0400 | 27157 | +++ linux-2.6.32.16/drivers/pcmcia/yenta_socket.c 2010-07-09 14:50:37.000000000 -0400 |
26919 | @@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table | 27158 | @@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table |
26920 | 27159 | ||
26921 | /* match any cardbus bridge */ | 27160 | /* match any cardbus bridge */ |
@@ -26925,9 +27164,9 @@ diff -urNp linux-2.6.32.15/drivers/pcmcia/yenta_socket.c linux-2.6.32.15/drivers | |||
26925 | }; | 27164 | }; |
26926 | MODULE_DEVICE_TABLE(pci, yenta_table); | 27165 | MODULE_DEVICE_TABLE(pci, yenta_table); |
26927 | 27166 | ||
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 | 27167 | diff -urNp linux-2.6.32.16/drivers/platform/x86/acer-wmi.c linux-2.6.32.16/drivers/platform/x86/acer-wmi.c |
26929 | --- linux-2.6.32.15/drivers/platform/x86/acer-wmi.c 2010-03-15 11:52:04.000000000 -0400 | 27168 | --- linux-2.6.32.16/drivers/platform/x86/acer-wmi.c 2010-07-05 14:14:00.000000000 -0400 |
26930 | +++ linux-2.6.32.15/drivers/platform/x86/acer-wmi.c 2010-05-28 21:27:15.759196972 -0400 | 27169 | +++ linux-2.6.32.16/drivers/platform/x86/acer-wmi.c 2010-07-09 14:50:37.000000000 -0400 |
26931 | @@ -918,7 +918,7 @@ static int update_bl_status(struct backl | 27170 | @@ -918,7 +918,7 @@ static int update_bl_status(struct backl |
26932 | return 0; | 27171 | return 0; |
26933 | } | 27172 | } |
@@ -26937,9 +27176,9 @@ diff -urNp linux-2.6.32.15/drivers/platform/x86/acer-wmi.c linux-2.6.32.15/drive | |||
26937 | .get_brightness = read_brightness, | 27176 | .get_brightness = read_brightness, |
26938 | .update_status = update_bl_status, | 27177 | .update_status = update_bl_status, |
26939 | }; | 27178 | }; |
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 | 27179 | diff -urNp linux-2.6.32.16/drivers/platform/x86/asus_acpi.c linux-2.6.32.16/drivers/platform/x86/asus_acpi.c |
26941 | --- linux-2.6.32.15/drivers/platform/x86/asus_acpi.c 2010-03-15 11:52:04.000000000 -0400 | 27180 | --- linux-2.6.32.16/drivers/platform/x86/asus_acpi.c 2010-07-05 14:14:00.000000000 -0400 |
26942 | +++ linux-2.6.32.15/drivers/platform/x86/asus_acpi.c 2010-05-28 21:27:15.759196972 -0400 | 27181 | +++ linux-2.6.32.16/drivers/platform/x86/asus_acpi.c 2010-07-09 14:50:37.000000000 -0400 |
26943 | @@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_ | 27182 | @@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_ |
26944 | return 0; | 27183 | return 0; |
26945 | } | 27184 | } |
@@ -26949,9 +27188,9 @@ diff -urNp linux-2.6.32.15/drivers/platform/x86/asus_acpi.c linux-2.6.32.15/driv | |||
26949 | .get_brightness = read_brightness, | 27188 | .get_brightness = read_brightness, |
26950 | .update_status = set_brightness_status, | 27189 | .update_status = set_brightness_status, |
26951 | }; | 27190 | }; |
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 | 27191 | diff -urNp linux-2.6.32.16/drivers/platform/x86/asus-laptop.c linux-2.6.32.16/drivers/platform/x86/asus-laptop.c |
26953 | --- linux-2.6.32.15/drivers/platform/x86/asus-laptop.c 2010-03-15 11:52:04.000000000 -0400 | 27192 | --- linux-2.6.32.16/drivers/platform/x86/asus-laptop.c 2010-07-05 14:14:00.000000000 -0400 |
26954 | +++ linux-2.6.32.15/drivers/platform/x86/asus-laptop.c 2010-05-28 21:27:15.759196972 -0400 | 27193 | +++ linux-2.6.32.16/drivers/platform/x86/asus-laptop.c 2010-07-09 14:50:37.000000000 -0400 |
26955 | @@ -250,7 +250,7 @@ static struct backlight_device *asus_bac | 27194 | @@ -250,7 +250,7 @@ static struct backlight_device *asus_bac |
26956 | */ | 27195 | */ |
26957 | static int read_brightness(struct backlight_device *bd); | 27196 | static int read_brightness(struct backlight_device *bd); |
@@ -26961,9 +27200,9 @@ diff -urNp linux-2.6.32.15/drivers/platform/x86/asus-laptop.c linux-2.6.32.15/dr | |||
26961 | .get_brightness = read_brightness, | 27200 | .get_brightness = read_brightness, |
26962 | .update_status = update_bl_status, | 27201 | .update_status = update_bl_status, |
26963 | }; | 27202 | }; |
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 | 27203 | diff -urNp linux-2.6.32.16/drivers/platform/x86/compal-laptop.c linux-2.6.32.16/drivers/platform/x86/compal-laptop.c |
26965 | --- linux-2.6.32.15/drivers/platform/x86/compal-laptop.c 2010-03-15 11:52:04.000000000 -0400 | 27204 | --- linux-2.6.32.16/drivers/platform/x86/compal-laptop.c 2010-07-05 14:14:00.000000000 -0400 |
26966 | +++ linux-2.6.32.15/drivers/platform/x86/compal-laptop.c 2010-05-28 21:27:15.759196972 -0400 | 27205 | +++ linux-2.6.32.16/drivers/platform/x86/compal-laptop.c 2010-07-09 14:50:37.000000000 -0400 |
26967 | @@ -163,7 +163,7 @@ static int bl_update_status(struct backl | 27206 | @@ -163,7 +163,7 @@ static int bl_update_status(struct backl |
26968 | return set_lcd_level(b->props.brightness); | 27207 | return set_lcd_level(b->props.brightness); |
26969 | } | 27208 | } |
@@ -26973,9 +27212,9 @@ diff -urNp linux-2.6.32.15/drivers/platform/x86/compal-laptop.c linux-2.6.32.15/ | |||
26973 | .get_brightness = bl_get_brightness, | 27212 | .get_brightness = bl_get_brightness, |
26974 | .update_status = bl_update_status, | 27213 | .update_status = bl_update_status, |
26975 | }; | 27214 | }; |
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 | 27215 | diff -urNp linux-2.6.32.16/drivers/platform/x86/dell-laptop.c linux-2.6.32.16/drivers/platform/x86/dell-laptop.c |
26977 | --- linux-2.6.32.15/drivers/platform/x86/dell-laptop.c 2010-03-15 11:52:04.000000000 -0400 | 27216 | --- linux-2.6.32.16/drivers/platform/x86/dell-laptop.c 2010-07-05 14:14:00.000000000 -0400 |
26978 | +++ linux-2.6.32.15/drivers/platform/x86/dell-laptop.c 2010-05-28 21:27:15.759196972 -0400 | 27217 | +++ linux-2.6.32.16/drivers/platform/x86/dell-laptop.c 2010-07-09 14:50:37.000000000 -0400 |
26979 | @@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac | 27218 | @@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac |
26980 | return buffer.output[1]; | 27219 | return buffer.output[1]; |
26981 | } | 27220 | } |
@@ -26985,9 +27224,9 @@ diff -urNp linux-2.6.32.15/drivers/platform/x86/dell-laptop.c linux-2.6.32.15/dr | |||
26985 | .get_brightness = dell_get_intensity, | 27224 | .get_brightness = dell_get_intensity, |
26986 | .update_status = dell_send_intensity, | 27225 | .update_status = dell_send_intensity, |
26987 | }; | 27226 | }; |
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 | 27227 | diff -urNp linux-2.6.32.16/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.16/drivers/platform/x86/eeepc-laptop.c |
26989 | --- linux-2.6.32.15/drivers/platform/x86/eeepc-laptop.c 2010-04-29 17:49:38.317493070 -0400 | 27228 | --- linux-2.6.32.16/drivers/platform/x86/eeepc-laptop.c 2010-07-05 14:14:00.000000000 -0400 |
26990 | +++ linux-2.6.32.15/drivers/platform/x86/eeepc-laptop.c 2010-05-28 21:27:15.759196972 -0400 | 27229 | +++ linux-2.6.32.16/drivers/platform/x86/eeepc-laptop.c 2010-07-09 14:50:37.000000000 -0400 |
26991 | @@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device | 27230 | @@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device |
26992 | */ | 27231 | */ |
26993 | static int read_brightness(struct backlight_device *bd); | 27232 | static int read_brightness(struct backlight_device *bd); |
@@ -26997,9 +27236,9 @@ diff -urNp linux-2.6.32.15/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.15/d | |||
26997 | .get_brightness = read_brightness, | 27236 | .get_brightness = read_brightness, |
26998 | .update_status = update_bl_status, | 27237 | .update_status = update_bl_status, |
26999 | }; | 27238 | }; |
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 | 27239 | diff -urNp linux-2.6.32.16/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.16/drivers/platform/x86/fujitsu-laptop.c |
27001 | --- linux-2.6.32.15/drivers/platform/x86/fujitsu-laptop.c 2010-03-15 11:52:04.000000000 -0400 | 27240 | --- linux-2.6.32.16/drivers/platform/x86/fujitsu-laptop.c 2010-07-05 14:14:00.000000000 -0400 |
27002 | +++ linux-2.6.32.15/drivers/platform/x86/fujitsu-laptop.c 2010-05-28 21:27:15.759196972 -0400 | 27241 | +++ linux-2.6.32.16/drivers/platform/x86/fujitsu-laptop.c 2010-07-09 14:50:37.000000000 -0400 |
27003 | @@ -436,7 +436,7 @@ static int bl_update_status(struct backl | 27242 | @@ -436,7 +436,7 @@ static int bl_update_status(struct backl |
27004 | return ret; | 27243 | return ret; |
27005 | } | 27244 | } |
@@ -27009,9 +27248,9 @@ diff -urNp linux-2.6.32.15/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.15 | |||
27009 | .get_brightness = bl_get_brightness, | 27248 | .get_brightness = bl_get_brightness, |
27010 | .update_status = bl_update_status, | 27249 | .update_status = bl_update_status, |
27011 | }; | 27250 | }; |
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 | 27251 | diff -urNp linux-2.6.32.16/drivers/platform/x86/msi-laptop.c linux-2.6.32.16/drivers/platform/x86/msi-laptop.c |
27013 | --- linux-2.6.32.15/drivers/platform/x86/msi-laptop.c 2010-03-15 11:52:04.000000000 -0400 | 27252 | --- linux-2.6.32.16/drivers/platform/x86/msi-laptop.c 2010-07-05 14:14:00.000000000 -0400 |
27014 | +++ linux-2.6.32.15/drivers/platform/x86/msi-laptop.c 2010-05-28 21:27:15.759196972 -0400 | 27253 | +++ linux-2.6.32.16/drivers/platform/x86/msi-laptop.c 2010-07-09 14:50:37.000000000 -0400 |
27015 | @@ -161,7 +161,7 @@ static int bl_update_status(struct backl | 27254 | @@ -161,7 +161,7 @@ static int bl_update_status(struct backl |
27016 | return set_lcd_level(b->props.brightness); | 27255 | return set_lcd_level(b->props.brightness); |
27017 | } | 27256 | } |
@@ -27021,9 +27260,9 @@ diff -urNp linux-2.6.32.15/drivers/platform/x86/msi-laptop.c linux-2.6.32.15/dri | |||
27021 | .get_brightness = bl_get_brightness, | 27260 | .get_brightness = bl_get_brightness, |
27022 | .update_status = bl_update_status, | 27261 | .update_status = bl_update_status, |
27023 | }; | 27262 | }; |
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 | 27263 | diff -urNp linux-2.6.32.16/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.16/drivers/platform/x86/panasonic-laptop.c |
27025 | --- linux-2.6.32.15/drivers/platform/x86/panasonic-laptop.c 2010-03-15 11:52:04.000000000 -0400 | 27264 | --- linux-2.6.32.16/drivers/platform/x86/panasonic-laptop.c 2010-07-05 14:14:00.000000000 -0400 |
27026 | +++ linux-2.6.32.15/drivers/platform/x86/panasonic-laptop.c 2010-05-28 21:27:15.759196972 -0400 | 27265 | +++ linux-2.6.32.16/drivers/platform/x86/panasonic-laptop.c 2010-07-09 14:50:37.000000000 -0400 |
27027 | @@ -352,7 +352,7 @@ static int bl_set_status(struct backligh | 27266 | @@ -352,7 +352,7 @@ static int bl_set_status(struct backligh |
27028 | return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright); | 27267 | return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright); |
27029 | } | 27268 | } |
@@ -27033,9 +27272,9 @@ diff -urNp linux-2.6.32.15/drivers/platform/x86/panasonic-laptop.c linux-2.6.32. | |||
27033 | .get_brightness = bl_get, | 27272 | .get_brightness = bl_get, |
27034 | .update_status = bl_set_status, | 27273 | .update_status = bl_set_status, |
27035 | }; | 27274 | }; |
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 | 27275 | diff -urNp linux-2.6.32.16/drivers/platform/x86/sony-laptop.c linux-2.6.32.16/drivers/platform/x86/sony-laptop.c |
27037 | --- linux-2.6.32.15/drivers/platform/x86/sony-laptop.c 2010-03-15 11:52:04.000000000 -0400 | 27276 | --- linux-2.6.32.16/drivers/platform/x86/sony-laptop.c 2010-07-05 14:14:00.000000000 -0400 |
27038 | +++ linux-2.6.32.15/drivers/platform/x86/sony-laptop.c 2010-05-28 21:27:15.759196972 -0400 | 27277 | +++ linux-2.6.32.16/drivers/platform/x86/sony-laptop.c 2010-07-09 14:50:37.000000000 -0400 |
27039 | @@ -850,7 +850,7 @@ static int sony_backlight_get_brightness | 27278 | @@ -850,7 +850,7 @@ static int sony_backlight_get_brightness |
27040 | } | 27279 | } |
27041 | 27280 | ||
@@ -27045,9 +27284,9 @@ diff -urNp linux-2.6.32.15/drivers/platform/x86/sony-laptop.c linux-2.6.32.15/dr | |||
27045 | .update_status = sony_backlight_update_status, | 27284 | .update_status = sony_backlight_update_status, |
27046 | .get_brightness = sony_backlight_get_brightness, | 27285 | .get_brightness = sony_backlight_get_brightness, |
27047 | }; | 27286 | }; |
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 | 27287 | diff -urNp linux-2.6.32.16/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.16/drivers/platform/x86/thinkpad_acpi.c |
27049 | --- linux-2.6.32.15/drivers/platform/x86/thinkpad_acpi.c 2010-04-29 17:49:38.333363657 -0400 | 27288 | --- linux-2.6.32.16/drivers/platform/x86/thinkpad_acpi.c 2010-07-05 14:14:00.000000000 -0400 |
27050 | +++ linux-2.6.32.15/drivers/platform/x86/thinkpad_acpi.c 2010-05-28 21:27:15.763212426 -0400 | 27289 | +++ linux-2.6.32.16/drivers/platform/x86/thinkpad_acpi.c 2010-07-09 14:50:37.000000000 -0400 |
27051 | @@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha | 27290 | @@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha |
27052 | BACKLIGHT_UPDATE_HOTKEY); | 27291 | BACKLIGHT_UPDATE_HOTKEY); |
27053 | } | 27292 | } |
@@ -27057,9 +27296,9 @@ diff -urNp linux-2.6.32.15/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.15/ | |||
27057 | .get_brightness = brightness_get, | 27296 | .get_brightness = brightness_get, |
27058 | .update_status = brightness_update_status, | 27297 | .update_status = brightness_update_status, |
27059 | }; | 27298 | }; |
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 | 27299 | diff -urNp linux-2.6.32.16/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.16/drivers/platform/x86/toshiba_acpi.c |
27061 | --- linux-2.6.32.15/drivers/platform/x86/toshiba_acpi.c 2010-03-15 11:52:04.000000000 -0400 | 27300 | --- linux-2.6.32.16/drivers/platform/x86/toshiba_acpi.c 2010-07-05 14:14:00.000000000 -0400 |
27062 | +++ linux-2.6.32.15/drivers/platform/x86/toshiba_acpi.c 2010-05-28 21:27:15.763212426 -0400 | 27301 | +++ linux-2.6.32.16/drivers/platform/x86/toshiba_acpi.c 2010-07-09 14:50:37.000000000 -0400 |
27063 | @@ -671,7 +671,7 @@ static acpi_status remove_device(void) | 27302 | @@ -671,7 +671,7 @@ static acpi_status remove_device(void) |
27064 | return AE_OK; | 27303 | return AE_OK; |
27065 | } | 27304 | } |
@@ -27069,9 +27308,9 @@ diff -urNp linux-2.6.32.15/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.15/d | |||
27069 | .get_brightness = get_lcd, | 27308 | .get_brightness = get_lcd, |
27070 | .update_status = set_lcd_status, | 27309 | .update_status = set_lcd_status, |
27071 | }; | 27310 | }; |
27072 | diff -urNp linux-2.6.32.15/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.15/drivers/pnp/pnpbios/bioscalls.c | 27311 | diff -urNp linux-2.6.32.16/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.16/drivers/pnp/pnpbios/bioscalls.c |
27073 | --- linux-2.6.32.15/drivers/pnp/pnpbios/bioscalls.c 2010-03-15 11:52:04.000000000 -0400 | 27312 | --- linux-2.6.32.16/drivers/pnp/pnpbios/bioscalls.c 2010-07-05 14:14:00.000000000 -0400 |
27074 | +++ linux-2.6.32.15/drivers/pnp/pnpbios/bioscalls.c 2010-05-28 21:27:15.763212426 -0400 | 27313 | +++ linux-2.6.32.16/drivers/pnp/pnpbios/bioscalls.c 2010-07-09 14:50:37.000000000 -0400 |
27075 | @@ -60,7 +60,7 @@ do { \ | 27314 | @@ -60,7 +60,7 @@ do { \ |
27076 | set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ | 27315 | set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ |
27077 | } while(0) | 27316 | } while(0) |
@@ -27128,9 +27367,9 @@ diff -urNp linux-2.6.32.15/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.15/drive | |||
27128 | + | 27367 | + |
27129 | + pax_close_kernel(); | 27368 | + pax_close_kernel(); |
27130 | } | 27369 | } |
27131 | diff -urNp linux-2.6.32.15/drivers/pnp/quirks.c linux-2.6.32.15/drivers/pnp/quirks.c | 27370 | diff -urNp linux-2.6.32.16/drivers/pnp/quirks.c linux-2.6.32.16/drivers/pnp/quirks.c |
27132 | --- linux-2.6.32.15/drivers/pnp/quirks.c 2010-03-15 11:52:04.000000000 -0400 | 27371 | --- linux-2.6.32.16/drivers/pnp/quirks.c 2010-07-05 14:14:00.000000000 -0400 |
27133 | +++ linux-2.6.32.15/drivers/pnp/quirks.c 2010-05-28 21:27:15.763212426 -0400 | 27372 | +++ linux-2.6.32.16/drivers/pnp/quirks.c 2010-07-09 14:50:37.000000000 -0400 |
27134 | @@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = { | 27373 | @@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = { |
27135 | /* PnP resources that might overlap PCI BARs */ | 27374 | /* PnP resources that might overlap PCI BARs */ |
27136 | {"PNP0c01", quirk_system_pci_resources}, | 27375 | {"PNP0c01", quirk_system_pci_resources}, |
@@ -27140,9 +27379,9 @@ diff -urNp linux-2.6.32.15/drivers/pnp/quirks.c linux-2.6.32.15/drivers/pnp/quir | |||
27140 | }; | 27379 | }; |
27141 | 27380 | ||
27142 | void pnp_fixup_device(struct pnp_dev *dev) | 27381 | void pnp_fixup_device(struct pnp_dev *dev) |
27143 | diff -urNp linux-2.6.32.15/drivers/pnp/resource.c linux-2.6.32.15/drivers/pnp/resource.c | 27382 | diff -urNp linux-2.6.32.16/drivers/pnp/resource.c linux-2.6.32.16/drivers/pnp/resource.c |
27144 | --- linux-2.6.32.15/drivers/pnp/resource.c 2010-03-15 11:52:04.000000000 -0400 | 27383 | --- linux-2.6.32.16/drivers/pnp/resource.c 2010-07-05 14:14:00.000000000 -0400 |
27145 | +++ linux-2.6.32.15/drivers/pnp/resource.c 2010-05-28 21:27:15.763212426 -0400 | 27384 | +++ linux-2.6.32.16/drivers/pnp/resource.c 2010-07-09 14:50:37.000000000 -0400 |
27146 | @@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s | 27385 | @@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s |
27147 | return 1; | 27386 | return 1; |
27148 | 27387 | ||
@@ -27161,9 +27400,9 @@ diff -urNp linux-2.6.32.15/drivers/pnp/resource.c linux-2.6.32.15/drivers/pnp/re | |||
27161 | return 0; | 27400 | return 0; |
27162 | 27401 | ||
27163 | /* check if the resource is reserved */ | 27402 | /* check if the resource is reserved */ |
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 | 27403 | diff -urNp linux-2.6.32.16/drivers/s390/cio/qdio_perf.c linux-2.6.32.16/drivers/s390/cio/qdio_perf.c |
27165 | --- linux-2.6.32.15/drivers/s390/cio/qdio_perf.c 2010-03-15 11:52:04.000000000 -0400 | 27404 | --- linux-2.6.32.16/drivers/s390/cio/qdio_perf.c 2010-07-05 14:14:00.000000000 -0400 |
27166 | +++ linux-2.6.32.15/drivers/s390/cio/qdio_perf.c 2010-05-28 21:27:15.763212426 -0400 | 27405 | +++ linux-2.6.32.16/drivers/s390/cio/qdio_perf.c 2010-07-09 14:50:37.000000000 -0400 |
27167 | @@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_ | 27406 | @@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_ |
27168 | static int qdio_perf_proc_show(struct seq_file *m, void *v) | 27407 | static int qdio_perf_proc_show(struct seq_file *m, void *v) |
27169 | { | 27408 | { |
@@ -27239,9 +27478,9 @@ diff -urNp linux-2.6.32.15/drivers/s390/cio/qdio_perf.c linux-2.6.32.15/drivers/ | |||
27239 | seq_printf(m, "\n"); | 27478 | seq_printf(m, "\n"); |
27240 | return 0; | 27479 | return 0; |
27241 | } | 27480 | } |
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 | 27481 | diff -urNp linux-2.6.32.16/drivers/s390/cio/qdio_perf.h linux-2.6.32.16/drivers/s390/cio/qdio_perf.h |
27243 | --- linux-2.6.32.15/drivers/s390/cio/qdio_perf.h 2010-03-15 11:52:04.000000000 -0400 | 27482 | --- linux-2.6.32.16/drivers/s390/cio/qdio_perf.h 2010-07-05 14:14:00.000000000 -0400 |
27244 | +++ linux-2.6.32.15/drivers/s390/cio/qdio_perf.h 2010-05-28 21:27:15.763212426 -0400 | 27483 | +++ linux-2.6.32.16/drivers/s390/cio/qdio_perf.h 2010-07-09 14:50:37.000000000 -0400 |
27245 | @@ -13,46 +13,46 @@ | 27484 | @@ -13,46 +13,46 @@ |
27246 | 27485 | ||
27247 | struct qdio_perf_stats { | 27486 | struct qdio_perf_stats { |
@@ -27314,9 +27553,9 @@ diff -urNp linux-2.6.32.15/drivers/s390/cio/qdio_perf.h linux-2.6.32.15/drivers/ | |||
27314 | } | 27553 | } |
27315 | 27554 | ||
27316 | int qdio_setup_perf_stats(void); | 27555 | int qdio_setup_perf_stats(void); |
27317 | diff -urNp linux-2.6.32.15/drivers/scsi/ipr.c linux-2.6.32.15/drivers/scsi/ipr.c | 27556 | diff -urNp linux-2.6.32.16/drivers/scsi/ipr.c linux-2.6.32.16/drivers/scsi/ipr.c |
27318 | --- linux-2.6.32.15/drivers/scsi/ipr.c 2010-03-15 11:52:04.000000000 -0400 | 27557 | --- linux-2.6.32.16/drivers/scsi/ipr.c 2010-07-05 14:14:00.000000000 -0400 |
27319 | +++ linux-2.6.32.15/drivers/scsi/ipr.c 2010-05-28 21:27:15.787650200 -0400 | 27558 | +++ linux-2.6.32.16/drivers/scsi/ipr.c 2010-07-09 14:50:37.000000000 -0400 |
27320 | @@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q | 27559 | @@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q |
27321 | return true; | 27560 | return true; |
27322 | } | 27561 | } |
@@ -27326,9 +27565,9 @@ diff -urNp linux-2.6.32.15/drivers/scsi/ipr.c linux-2.6.32.15/drivers/scsi/ipr.c | |||
27326 | .phy_reset = ipr_ata_phy_reset, | 27565 | .phy_reset = ipr_ata_phy_reset, |
27327 | .hardreset = ipr_sata_reset, | 27566 | .hardreset = ipr_sata_reset, |
27328 | .post_internal_cmd = ipr_ata_post_internal, | 27567 | .post_internal_cmd = ipr_ata_post_internal, |
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 | 27568 | diff -urNp linux-2.6.32.16/drivers/scsi/libfc/fc_exch.c linux-2.6.32.16/drivers/scsi/libfc/fc_exch.c |
27330 | --- linux-2.6.32.15/drivers/scsi/libfc/fc_exch.c 2010-03-15 11:52:04.000000000 -0400 | 27569 | --- linux-2.6.32.16/drivers/scsi/libfc/fc_exch.c 2010-07-05 14:14:00.000000000 -0400 |
27331 | +++ linux-2.6.32.15/drivers/scsi/libfc/fc_exch.c 2010-05-28 21:27:15.795200668 -0400 | 27570 | +++ linux-2.6.32.16/drivers/scsi/libfc/fc_exch.c 2010-07-09 14:50:37.000000000 -0400 |
27332 | @@ -86,12 +86,12 @@ struct fc_exch_mgr { | 27571 | @@ -86,12 +86,12 @@ struct fc_exch_mgr { |
27333 | * all together if not used XXX | 27572 | * all together if not used XXX |
27334 | */ | 27573 | */ |
@@ -27450,9 +27689,9 @@ diff -urNp linux-2.6.32.15/drivers/scsi/libfc/fc_exch.c linux-2.6.32.15/drivers/ | |||
27450 | 27689 | ||
27451 | fc_frame_free(fp); | 27690 | fc_frame_free(fp); |
27452 | } | 27691 | } |
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 | 27692 | diff -urNp linux-2.6.32.16/drivers/scsi/libsas/sas_ata.c linux-2.6.32.16/drivers/scsi/libsas/sas_ata.c |
27454 | --- linux-2.6.32.15/drivers/scsi/libsas/sas_ata.c 2010-05-15 13:20:18.878584179 -0400 | 27693 | --- linux-2.6.32.16/drivers/scsi/libsas/sas_ata.c 2010-07-05 14:14:00.000000000 -0400 |
27455 | +++ linux-2.6.32.15/drivers/scsi/libsas/sas_ata.c 2010-05-28 21:27:15.803426462 -0400 | 27694 | +++ linux-2.6.32.16/drivers/scsi/libsas/sas_ata.c 2010-07-09 14:50:37.000000000 -0400 |
27456 | @@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l | 27695 | @@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l |
27457 | } | 27696 | } |
27458 | } | 27697 | } |
@@ -27462,9 +27701,9 @@ diff -urNp linux-2.6.32.15/drivers/scsi/libsas/sas_ata.c linux-2.6.32.15/drivers | |||
27462 | .phy_reset = sas_ata_phy_reset, | 27701 | .phy_reset = sas_ata_phy_reset, |
27463 | .post_internal_cmd = sas_ata_post_internal, | 27702 | .post_internal_cmd = sas_ata_post_internal, |
27464 | .qc_prep = ata_noop_qc_prep, | 27703 | .qc_prep = ata_noop_qc_prep, |
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 | 27704 | diff -urNp linux-2.6.32.16/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.16/drivers/scsi/mpt2sas/mpt2sas_debug.h |
27466 | --- linux-2.6.32.15/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-03-15 11:52:04.000000000 -0400 | 27705 | --- linux-2.6.32.16/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-07-05 14:14:00.000000000 -0400 |
27467 | +++ linux-2.6.32.15/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-05-28 21:27:15.803426462 -0400 | 27706 | +++ linux-2.6.32.16/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-07-09 14:50:37.000000000 -0400 |
27468 | @@ -79,7 +79,7 @@ | 27707 | @@ -79,7 +79,7 @@ |
27469 | CMD; \ | 27708 | CMD; \ |
27470 | } | 27709 | } |
@@ -27474,9 +27713,9 @@ diff -urNp linux-2.6.32.15/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.15/ | |||
27474 | #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */ | 27713 | #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */ |
27475 | 27714 | ||
27476 | 27715 | ||
27477 | diff -urNp linux-2.6.32.15/drivers/scsi/scsi_logging.h linux-2.6.32.15/drivers/scsi/scsi_logging.h | 27716 | diff -urNp linux-2.6.32.16/drivers/scsi/scsi_logging.h linux-2.6.32.16/drivers/scsi/scsi_logging.h |
27478 | --- linux-2.6.32.15/drivers/scsi/scsi_logging.h 2010-03-15 11:52:04.000000000 -0400 | 27717 | --- linux-2.6.32.16/drivers/scsi/scsi_logging.h 2010-07-05 14:14:00.000000000 -0400 |
27479 | +++ linux-2.6.32.15/drivers/scsi/scsi_logging.h 2010-05-28 21:27:15.803426462 -0400 | 27718 | +++ linux-2.6.32.16/drivers/scsi/scsi_logging.h 2010-07-09 14:50:37.000000000 -0400 |
27480 | @@ -51,7 +51,7 @@ do { \ | 27719 | @@ -51,7 +51,7 @@ do { \ |
27481 | } while (0); \ | 27720 | } while (0); \ |
27482 | } while (0) | 27721 | } while (0) |
@@ -27486,9 +27725,9 @@ diff -urNp linux-2.6.32.15/drivers/scsi/scsi_logging.h linux-2.6.32.15/drivers/s | |||
27486 | #endif /* CONFIG_SCSI_LOGGING */ | 27725 | #endif /* CONFIG_SCSI_LOGGING */ |
27487 | 27726 | ||
27488 | /* | 27727 | /* |
27489 | diff -urNp linux-2.6.32.15/drivers/scsi/sg.c linux-2.6.32.15/drivers/scsi/sg.c | 27728 | diff -urNp linux-2.6.32.16/drivers/scsi/sg.c linux-2.6.32.16/drivers/scsi/sg.c |
27490 | --- linux-2.6.32.15/drivers/scsi/sg.c 2010-03-15 11:52:04.000000000 -0400 | 27729 | --- linux-2.6.32.16/drivers/scsi/sg.c 2010-07-05 14:14:00.000000000 -0400 |
27491 | +++ linux-2.6.32.15/drivers/scsi/sg.c 2010-05-28 21:27:15.803426462 -0400 | 27730 | +++ linux-2.6.32.16/drivers/scsi/sg.c 2010-07-09 14:50:37.000000000 -0400 |
27492 | @@ -2292,7 +2292,7 @@ struct sg_proc_leaf { | 27731 | @@ -2292,7 +2292,7 @@ struct sg_proc_leaf { |
27493 | const struct file_operations * fops; | 27732 | const struct file_operations * fops; |
27494 | }; | 27733 | }; |
@@ -27507,9 +27746,9 @@ diff -urNp linux-2.6.32.15/drivers/scsi/sg.c linux-2.6.32.15/drivers/scsi/sg.c | |||
27507 | 27746 | ||
27508 | sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); | 27747 | sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); |
27509 | if (!sg_proc_sgp) | 27748 | if (!sg_proc_sgp) |
27510 | diff -urNp linux-2.6.32.15/drivers/serial/8250_pci.c linux-2.6.32.15/drivers/serial/8250_pci.c | 27749 | diff -urNp linux-2.6.32.16/drivers/serial/8250_pci.c linux-2.6.32.16/drivers/serial/8250_pci.c |
27511 | --- linux-2.6.32.15/drivers/serial/8250_pci.c 2010-03-15 11:52:04.000000000 -0400 | 27750 | --- linux-2.6.32.16/drivers/serial/8250_pci.c 2010-07-05 14:14:00.000000000 -0400 |
27512 | +++ linux-2.6.32.15/drivers/serial/8250_pci.c 2010-05-28 21:27:15.803426462 -0400 | 27751 | +++ linux-2.6.32.16/drivers/serial/8250_pci.c 2010-07-09 14:50:37.000000000 -0400 |
27513 | @@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t | 27752 | @@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t |
27514 | PCI_ANY_ID, PCI_ANY_ID, | 27753 | PCI_ANY_ID, PCI_ANY_ID, |
27515 | PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, | 27754 | PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, |
@@ -27519,9 +27758,9 @@ diff -urNp linux-2.6.32.15/drivers/serial/8250_pci.c linux-2.6.32.15/drivers/ser | |||
27519 | }; | 27758 | }; |
27520 | 27759 | ||
27521 | static struct pci_driver serial_pci_driver = { | 27760 | static struct pci_driver serial_pci_driver = { |
27522 | diff -urNp linux-2.6.32.15/drivers/serial/kgdboc.c linux-2.6.32.15/drivers/serial/kgdboc.c | 27761 | diff -urNp linux-2.6.32.16/drivers/serial/kgdboc.c linux-2.6.32.16/drivers/serial/kgdboc.c |
27523 | --- linux-2.6.32.15/drivers/serial/kgdboc.c 2010-03-15 11:52:04.000000000 -0400 | 27762 | --- linux-2.6.32.16/drivers/serial/kgdboc.c 2010-07-05 14:14:00.000000000 -0400 |
27524 | +++ linux-2.6.32.15/drivers/serial/kgdboc.c 2010-05-28 21:27:15.803426462 -0400 | 27763 | +++ linux-2.6.32.16/drivers/serial/kgdboc.c 2010-07-09 14:50:37.000000000 -0400 |
27525 | @@ -18,7 +18,7 @@ | 27764 | @@ -18,7 +18,7 @@ |
27526 | 27765 | ||
27527 | #define MAX_CONFIG_LEN 40 | 27766 | #define MAX_CONFIG_LEN 40 |
@@ -27540,9 +27779,9 @@ diff -urNp linux-2.6.32.15/drivers/serial/kgdboc.c linux-2.6.32.15/drivers/seria | |||
27540 | .name = "kgdboc", | 27779 | .name = "kgdboc", |
27541 | .read_char = kgdboc_get_char, | 27780 | .read_char = kgdboc_get_char, |
27542 | .write_char = kgdboc_put_char, | 27781 | .write_char = kgdboc_put_char, |
27543 | diff -urNp linux-2.6.32.15/drivers/staging/android/binder.c linux-2.6.32.15/drivers/staging/android/binder.c | 27782 | diff -urNp linux-2.6.32.16/drivers/staging/android/binder.c linux-2.6.32.16/drivers/staging/android/binder.c |
27544 | --- linux-2.6.32.15/drivers/staging/android/binder.c 2010-03-15 11:52:04.000000000 -0400 | 27783 | --- linux-2.6.32.16/drivers/staging/android/binder.c 2010-07-05 14:14:00.000000000 -0400 |
27545 | +++ linux-2.6.32.15/drivers/staging/android/binder.c 2010-05-28 21:27:15.815152627 -0400 | 27784 | +++ linux-2.6.32.16/drivers/staging/android/binder.c 2010-07-09 14:50:37.000000000 -0400 |
27546 | @@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a | 27785 | @@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a |
27547 | binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); | 27786 | binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); |
27548 | } | 27787 | } |
@@ -27552,9 +27791,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/android/binder.c linux-2.6.32.15/driv | |||
27552 | .open = binder_vma_open, | 27791 | .open = binder_vma_open, |
27553 | .close = binder_vma_close, | 27792 | .close = binder_vma_close, |
27554 | }; | 27793 | }; |
27555 | diff -urNp linux-2.6.32.15/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.15/drivers/staging/b3dfg/b3dfg.c | 27794 | diff -urNp linux-2.6.32.16/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.16/drivers/staging/b3dfg/b3dfg.c |
27556 | --- linux-2.6.32.15/drivers/staging/b3dfg/b3dfg.c 2010-03-15 11:52:04.000000000 -0400 | 27795 | --- linux-2.6.32.16/drivers/staging/b3dfg/b3dfg.c 2010-07-05 14:14:00.000000000 -0400 |
27557 | +++ linux-2.6.32.15/drivers/staging/b3dfg/b3dfg.c 2010-05-28 21:27:15.815152627 -0400 | 27796 | +++ linux-2.6.32.16/drivers/staging/b3dfg/b3dfg.c 2010-07-09 14:50:37.000000000 -0400 |
27558 | @@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are | 27797 | @@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are |
27559 | return VM_FAULT_NOPAGE; | 27798 | return VM_FAULT_NOPAGE; |
27560 | } | 27799 | } |
@@ -27573,9 +27812,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.15/drivers | |||
27573 | .owner = THIS_MODULE, | 27812 | .owner = THIS_MODULE, |
27574 | .open = b3dfg_open, | 27813 | .open = b3dfg_open, |
27575 | .release = b3dfg_release, | 27814 | .release = b3dfg_release, |
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 | 27815 | diff -urNp linux-2.6.32.16/drivers/staging/comedi/comedi_fops.c linux-2.6.32.16/drivers/staging/comedi/comedi_fops.c |
27577 | --- linux-2.6.32.15/drivers/staging/comedi/comedi_fops.c 2010-03-15 11:52:04.000000000 -0400 | 27816 | --- linux-2.6.32.16/drivers/staging/comedi/comedi_fops.c 2010-07-05 14:14:00.000000000 -0400 |
27578 | +++ linux-2.6.32.15/drivers/staging/comedi/comedi_fops.c 2010-05-28 21:27:15.815152627 -0400 | 27817 | +++ linux-2.6.32.16/drivers/staging/comedi/comedi_fops.c 2010-07-09 14:50:37.000000000 -0400 |
27579 | @@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct | 27818 | @@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct |
27580 | mutex_unlock(&dev->mutex); | 27819 | mutex_unlock(&dev->mutex); |
27581 | } | 27820 | } |
@@ -27585,9 +27824,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/comedi/comedi_fops.c linux-2.6.32.15/ | |||
27585 | .close = comedi_unmap, | 27824 | .close = comedi_unmap, |
27586 | }; | 27825 | }; |
27587 | 27826 | ||
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 | 27827 | diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.16/drivers/staging/dream/qdsp5/adsp_driver.c |
27589 | --- linux-2.6.32.15/drivers/staging/dream/qdsp5/adsp_driver.c 2010-03-15 11:52:04.000000000 -0400 | 27828 | --- linux-2.6.32.16/drivers/staging/dream/qdsp5/adsp_driver.c 2010-07-05 14:14:00.000000000 -0400 |
27590 | +++ linux-2.6.32.15/drivers/staging/dream/qdsp5/adsp_driver.c 2010-05-28 21:27:15.815152627 -0400 | 27829 | +++ linux-2.6.32.16/drivers/staging/dream/qdsp5/adsp_driver.c 2010-07-09 14:50:37.000000000 -0400 |
27591 | @@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi | 27830 | @@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi |
27592 | static dev_t adsp_devno; | 27831 | static dev_t adsp_devno; |
27593 | static struct class *adsp_class; | 27832 | static struct class *adsp_class; |
@@ -27597,9 +27836,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.3 | |||
27597 | .owner = THIS_MODULE, | 27836 | .owner = THIS_MODULE, |
27598 | .open = adsp_open, | 27837 | .open = adsp_open, |
27599 | .unlocked_ioctl = adsp_ioctl, | 27838 | .unlocked_ioctl = adsp_ioctl, |
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 | 27839 | diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_aac.c |
27601 | --- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_aac.c 2010-03-15 11:52:04.000000000 -0400 | 27840 | --- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_aac.c 2010-07-05 14:14:00.000000000 -0400 |
27602 | +++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_aac.c 2010-05-28 21:27:15.819209681 -0400 | 27841 | +++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_aac.c 2010-07-09 14:50:37.000000000 -0400 |
27603 | @@ -1022,7 +1022,7 @@ done: | 27842 | @@ -1022,7 +1022,7 @@ done: |
27604 | return rc; | 27843 | return rc; |
27605 | } | 27844 | } |
@@ -27609,9 +27848,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32. | |||
27609 | .owner = THIS_MODULE, | 27848 | .owner = THIS_MODULE, |
27610 | .open = audio_open, | 27849 | .open = audio_open, |
27611 | .release = audio_release, | 27850 | .release = audio_release, |
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 | 27851 | diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_amrnb.c |
27613 | --- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-03-15 11:52:04.000000000 -0400 | 27852 | --- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-07-05 14:14:00.000000000 -0400 |
27614 | +++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-05-28 21:27:15.823076824 -0400 | 27853 | +++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-07-09 14:50:37.000000000 -0400 |
27615 | @@ -833,7 +833,7 @@ done: | 27854 | @@ -833,7 +833,7 @@ done: |
27616 | return rc; | 27855 | return rc; |
27617 | } | 27856 | } |
@@ -27621,9 +27860,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.3 | |||
27621 | .owner = THIS_MODULE, | 27860 | .owner = THIS_MODULE, |
27622 | .open = audamrnb_open, | 27861 | .open = audamrnb_open, |
27623 | .release = audamrnb_release, | 27862 | .release = audamrnb_release, |
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 | 27863 | diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_evrc.c |
27625 | --- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_evrc.c 2010-03-15 11:52:04.000000000 -0400 | 27864 | --- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_evrc.c 2010-07-05 14:14:00.000000000 -0400 |
27626 | +++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_evrc.c 2010-05-28 21:27:15.823076824 -0400 | 27865 | +++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_evrc.c 2010-07-09 14:50:37.000000000 -0400 |
27627 | @@ -805,7 +805,7 @@ dma_fail: | 27866 | @@ -805,7 +805,7 @@ dma_fail: |
27628 | return rc; | 27867 | return rc; |
27629 | } | 27868 | } |
@@ -27633,9 +27872,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32 | |||
27633 | .owner = THIS_MODULE, | 27872 | .owner = THIS_MODULE, |
27634 | .open = audevrc_open, | 27873 | .open = audevrc_open, |
27635 | .release = audevrc_release, | 27874 | .release = audevrc_release, |
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 | 27875 | diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_in.c |
27637 | --- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_in.c 2010-03-15 11:52:04.000000000 -0400 | 27876 | --- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_in.c 2010-07-05 14:14:00.000000000 -0400 |
27638 | +++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_in.c 2010-05-28 21:27:15.823076824 -0400 | 27877 | +++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_in.c 2010-07-09 14:50:37.000000000 -0400 |
27639 | @@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino | 27878 | @@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino |
27640 | return 0; | 27879 | return 0; |
27641 | } | 27880 | } |
@@ -27654,9 +27893,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.1 | |||
27654 | .owner = THIS_MODULE, | 27893 | .owner = THIS_MODULE, |
27655 | .open = audpre_open, | 27894 | .open = audpre_open, |
27656 | .unlocked_ioctl = audpre_ioctl, | 27895 | .unlocked_ioctl = audpre_ioctl, |
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 | 27896 | diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_mp3.c |
27658 | --- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_mp3.c 2010-03-15 11:52:04.000000000 -0400 | 27897 | --- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_mp3.c 2010-07-05 14:14:00.000000000 -0400 |
27659 | +++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_mp3.c 2010-05-28 21:27:15.823076824 -0400 | 27898 | +++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_mp3.c 2010-07-09 14:50:37.000000000 -0400 |
27660 | @@ -941,7 +941,7 @@ done: | 27899 | @@ -941,7 +941,7 @@ done: |
27661 | return rc; | 27900 | return rc; |
27662 | } | 27901 | } |
@@ -27666,9 +27905,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32. | |||
27666 | .owner = THIS_MODULE, | 27905 | .owner = THIS_MODULE, |
27667 | .open = audio_open, | 27906 | .open = audio_open, |
27668 | .release = audio_release, | 27907 | .release = audio_release, |
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 | 27908 | diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_out.c |
27670 | --- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_out.c 2010-03-15 11:52:04.000000000 -0400 | 27909 | --- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_out.c 2010-07-05 14:14:00.000000000 -0400 |
27671 | +++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_out.c 2010-05-28 21:27:15.823076824 -0400 | 27910 | +++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_out.c 2010-07-09 14:50:37.000000000 -0400 |
27672 | @@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod | 27911 | @@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod |
27673 | return 0; | 27912 | return 0; |
27674 | } | 27913 | } |
@@ -27687,9 +27926,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32. | |||
27687 | .owner = THIS_MODULE, | 27926 | .owner = THIS_MODULE, |
27688 | .open = audpp_open, | 27927 | .open = audpp_open, |
27689 | .unlocked_ioctl = audpp_ioctl, | 27928 | .unlocked_ioctl = audpp_ioctl, |
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 | 27929 | diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_qcelp.c |
27691 | --- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-03-15 11:52:04.000000000 -0400 | 27930 | --- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-07-05 14:14:00.000000000 -0400 |
27692 | +++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-05-28 21:27:15.841738212 -0400 | 27931 | +++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-07-09 14:50:37.000000000 -0400 |
27693 | @@ -816,7 +816,7 @@ err: | 27932 | @@ -816,7 +816,7 @@ err: |
27694 | return rc; | 27933 | return rc; |
27695 | } | 27934 | } |
@@ -27699,9 +27938,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.3 | |||
27699 | .owner = THIS_MODULE, | 27938 | .owner = THIS_MODULE, |
27700 | .open = audqcelp_open, | 27939 | .open = audqcelp_open, |
27701 | .release = audqcelp_release, | 27940 | .release = audqcelp_release, |
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 | 27941 | diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.16/drivers/staging/dream/qdsp5/snd.c |
27703 | --- linux-2.6.32.15/drivers/staging/dream/qdsp5/snd.c 2010-03-15 11:52:04.000000000 -0400 | 27942 | --- linux-2.6.32.16/drivers/staging/dream/qdsp5/snd.c 2010-07-05 14:14:00.000000000 -0400 |
27704 | +++ linux-2.6.32.15/drivers/staging/dream/qdsp5/snd.c 2010-05-28 21:27:15.841738212 -0400 | 27943 | +++ linux-2.6.32.16/drivers/staging/dream/qdsp5/snd.c 2010-07-09 14:50:37.000000000 -0400 |
27705 | @@ -242,7 +242,7 @@ err: | 27944 | @@ -242,7 +242,7 @@ err: |
27706 | return rc; | 27945 | return rc; |
27707 | } | 27946 | } |
@@ -27711,9 +27950,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.15/dri | |||
27711 | .owner = THIS_MODULE, | 27950 | .owner = THIS_MODULE, |
27712 | .open = snd_open, | 27951 | .open = snd_open, |
27713 | .release = snd_release, | 27952 | .release = snd_release, |
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 | 27953 | diff -urNp linux-2.6.32.16/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.16/drivers/staging/dream/smd/smd_qmi.c |
27715 | --- linux-2.6.32.15/drivers/staging/dream/smd/smd_qmi.c 2010-03-15 11:52:04.000000000 -0400 | 27954 | --- linux-2.6.32.16/drivers/staging/dream/smd/smd_qmi.c 2010-07-05 14:14:00.000000000 -0400 |
27716 | +++ linux-2.6.32.15/drivers/staging/dream/smd/smd_qmi.c 2010-05-28 21:27:15.841738212 -0400 | 27955 | +++ linux-2.6.32.16/drivers/staging/dream/smd/smd_qmi.c 2010-07-09 14:50:37.000000000 -0400 |
27717 | @@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, | 27956 | @@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, |
27718 | return 0; | 27957 | return 0; |
27719 | } | 27958 | } |
@@ -27723,9 +27962,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.15/d | |||
27723 | .owner = THIS_MODULE, | 27962 | .owner = THIS_MODULE, |
27724 | .read = qmi_read, | 27963 | .read = qmi_read, |
27725 | .write = qmi_write, | 27964 | .write = qmi_write, |
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 | 27965 | diff -urNp linux-2.6.32.16/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.16/drivers/staging/dream/smd/smd_rpcrouter_device.c |
27727 | --- linux-2.6.32.15/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-03-15 11:52:04.000000000 -0400 | 27966 | --- linux-2.6.32.16/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-07-05 14:14:00.000000000 -0400 |
27728 | +++ linux-2.6.32.15/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-05-28 21:27:15.841738212 -0400 | 27967 | +++ linux-2.6.32.16/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-07-09 14:50:37.000000000 -0400 |
27729 | @@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file | 27968 | @@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file |
27730 | return rc; | 27969 | return rc; |
27731 | } | 27970 | } |
@@ -27744,9 +27983,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/dream/smd/smd_rpcrouter_device.c linu | |||
27744 | .owner = THIS_MODULE, | 27983 | .owner = THIS_MODULE, |
27745 | .open = rpcrouter_open, | 27984 | .open = rpcrouter_open, |
27746 | .release = rpcrouter_release, | 27985 | .release = rpcrouter_release, |
27747 | diff -urNp linux-2.6.32.15/drivers/staging/dst/dcore.c linux-2.6.32.15/drivers/staging/dst/dcore.c | 27986 | diff -urNp linux-2.6.32.16/drivers/staging/dst/dcore.c linux-2.6.32.16/drivers/staging/dst/dcore.c |
27748 | --- linux-2.6.32.15/drivers/staging/dst/dcore.c 2010-03-15 11:52:04.000000000 -0400 | 27987 | --- linux-2.6.32.16/drivers/staging/dst/dcore.c 2010-07-05 14:14:00.000000000 -0400 |
27749 | +++ linux-2.6.32.15/drivers/staging/dst/dcore.c 2010-05-28 21:27:15.841738212 -0400 | 27988 | +++ linux-2.6.32.16/drivers/staging/dst/dcore.c 2010-07-09 14:50:37.000000000 -0400 |
27750 | @@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi | 27989 | @@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi |
27751 | return 0; | 27990 | return 0; |
27752 | } | 27991 | } |
@@ -27765,9 +28004,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/dst/dcore.c linux-2.6.32.15/drivers/s | |||
27765 | snprintf(n->name, sizeof(n->name), "%s", ctl->name); | 28004 | snprintf(n->name, sizeof(n->name), "%s", ctl->name); |
27766 | 28005 | ||
27767 | err = dst_node_sysfs_init(n); | 28006 | err = dst_node_sysfs_init(n); |
27768 | diff -urNp linux-2.6.32.15/drivers/staging/dst/trans.c linux-2.6.32.15/drivers/staging/dst/trans.c | 28007 | diff -urNp linux-2.6.32.16/drivers/staging/dst/trans.c linux-2.6.32.16/drivers/staging/dst/trans.c |
27769 | --- linux-2.6.32.15/drivers/staging/dst/trans.c 2010-03-15 11:52:04.000000000 -0400 | 28008 | --- linux-2.6.32.16/drivers/staging/dst/trans.c 2010-07-05 14:14:00.000000000 -0400 |
27770 | +++ linux-2.6.32.15/drivers/staging/dst/trans.c 2010-05-28 21:27:15.842942312 -0400 | 28009 | +++ linux-2.6.32.16/drivers/staging/dst/trans.c 2010-07-09 14:50:37.000000000 -0400 |
27771 | @@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, | 28010 | @@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, |
27772 | t->error = 0; | 28011 | t->error = 0; |
27773 | t->retries = 0; | 28012 | t->retries = 0; |
@@ -27777,9 +28016,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/dst/trans.c linux-2.6.32.15/drivers/s | |||
27777 | 28016 | ||
27778 | t->enc = bio_data_dir(bio); | 28017 | t->enc = bio_data_dir(bio); |
27779 | dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen); | 28018 | dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen); |
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 | 28019 | diff -urNp linux-2.6.32.16/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.16/drivers/staging/go7007/go7007-v4l2.c |
27781 | --- linux-2.6.32.15/drivers/staging/go7007/go7007-v4l2.c 2010-03-15 11:52:04.000000000 -0400 | 28020 | --- linux-2.6.32.16/drivers/staging/go7007/go7007-v4l2.c 2010-07-05 14:14:00.000000000 -0400 |
27782 | +++ linux-2.6.32.15/drivers/staging/go7007/go7007-v4l2.c 2010-05-28 21:27:15.842942312 -0400 | 28021 | +++ linux-2.6.32.16/drivers/staging/go7007/go7007-v4l2.c 2010-07-09 14:50:37.000000000 -0400 |
27783 | @@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are | 28022 | @@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are |
27784 | return 0; | 28023 | return 0; |
27785 | } | 28024 | } |
@@ -27789,9 +28028,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.15/ | |||
27789 | .open = go7007_vm_open, | 28028 | .open = go7007_vm_open, |
27790 | .close = go7007_vm_close, | 28029 | .close = go7007_vm_close, |
27791 | .fault = go7007_vm_fault, | 28030 | .fault = go7007_vm_fault, |
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 | 28031 | diff -urNp linux-2.6.32.16/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.16/drivers/staging/hv/blkvsc_drv.c |
27793 | --- linux-2.6.32.15/drivers/staging/hv/blkvsc_drv.c 2010-03-15 11:52:04.000000000 -0400 | 28032 | --- linux-2.6.32.16/drivers/staging/hv/blkvsc_drv.c 2010-07-05 14:14:00.000000000 -0400 |
27794 | +++ linux-2.6.32.15/drivers/staging/hv/blkvsc_drv.c 2010-05-28 21:27:15.842942312 -0400 | 28033 | +++ linux-2.6.32.16/drivers/staging/hv/blkvsc_drv.c 2010-07-09 14:50:37.000000000 -0400 |
27795 | @@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV | 28034 | @@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV |
27796 | /* The one and only one */ | 28035 | /* The one and only one */ |
27797 | static struct blkvsc_driver_context g_blkvsc_drv; | 28036 | static struct blkvsc_driver_context g_blkvsc_drv; |
@@ -27801,9 +28040,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.15/drive | |||
27801 | .owner = THIS_MODULE, | 28040 | .owner = THIS_MODULE, |
27802 | .open = blkvsc_open, | 28041 | .open = blkvsc_open, |
27803 | .release = blkvsc_release, | 28042 | .release = blkvsc_release, |
27804 | diff -urNp linux-2.6.32.15/drivers/staging/hv/Hv.c linux-2.6.32.15/drivers/staging/hv/Hv.c | 28043 | diff -urNp linux-2.6.32.16/drivers/staging/hv/Hv.c linux-2.6.32.16/drivers/staging/hv/Hv.c |
27805 | --- linux-2.6.32.15/drivers/staging/hv/Hv.c 2010-05-15 13:20:18.963900073 -0400 | 28044 | --- linux-2.6.32.16/drivers/staging/hv/Hv.c 2010-07-05 14:14:00.000000000 -0400 |
27806 | +++ linux-2.6.32.15/drivers/staging/hv/Hv.c 2010-06-19 10:03:50.012498759 -0400 | 28045 | +++ linux-2.6.32.16/drivers/staging/hv/Hv.c 2010-07-09 14:50:37.000000000 -0400 |
27807 | @@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, vo | 28046 | @@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, vo |
27808 | u64 outputAddress = (Output) ? virt_to_phys(Output) : 0; | 28047 | u64 outputAddress = (Output) ? virt_to_phys(Output) : 0; |
27809 | u32 outputAddressHi = outputAddress >> 32; | 28048 | u32 outputAddressHi = outputAddress >> 32; |
@@ -27813,9 +28052,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/hv/Hv.c linux-2.6.32.15/drivers/stagi | |||
27813 | 28052 | ||
27814 | DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>", | 28053 | DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>", |
27815 | Control, Input, Output); | 28054 | Control, Input, Output); |
27816 | diff -urNp linux-2.6.32.15/drivers/staging/panel/panel.c linux-2.6.32.15/drivers/staging/panel/panel.c | 28055 | diff -urNp linux-2.6.32.16/drivers/staging/panel/panel.c linux-2.6.32.16/drivers/staging/panel/panel.c |
27817 | --- linux-2.6.32.15/drivers/staging/panel/panel.c 2010-03-15 11:52:04.000000000 -0400 | 28056 | --- linux-2.6.32.16/drivers/staging/panel/panel.c 2010-07-05 14:14:00.000000000 -0400 |
27818 | +++ linux-2.6.32.15/drivers/staging/panel/panel.c 2010-05-28 21:27:15.842942312 -0400 | 28057 | +++ linux-2.6.32.16/drivers/staging/panel/panel.c 2010-07-09 14:50:37.000000000 -0400 |
27819 | @@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino | 28058 | @@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino |
27820 | return 0; | 28059 | return 0; |
27821 | } | 28060 | } |
@@ -27834,9 +28073,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/panel/panel.c linux-2.6.32.15/drivers | |||
27834 | .read = keypad_read, /* read */ | 28073 | .read = keypad_read, /* read */ |
27835 | .open = keypad_open, /* open */ | 28074 | .open = keypad_open, /* open */ |
27836 | .release = keypad_release, /* close */ | 28075 | .release = keypad_release, /* close */ |
27837 | diff -urNp linux-2.6.32.15/drivers/staging/phison/phison.c linux-2.6.32.15/drivers/staging/phison/phison.c | 28076 | diff -urNp linux-2.6.32.16/drivers/staging/phison/phison.c linux-2.6.32.16/drivers/staging/phison/phison.c |
27838 | --- linux-2.6.32.15/drivers/staging/phison/phison.c 2010-03-15 11:52:04.000000000 -0400 | 28077 | --- linux-2.6.32.16/drivers/staging/phison/phison.c 2010-07-05 14:14:00.000000000 -0400 |
27839 | +++ linux-2.6.32.15/drivers/staging/phison/phison.c 2010-05-28 21:27:15.842942312 -0400 | 28078 | +++ linux-2.6.32.16/drivers/staging/phison/phison.c 2010-07-09 14:50:37.000000000 -0400 |
27840 | @@ -43,7 +43,7 @@ static struct scsi_host_template phison_ | 28079 | @@ -43,7 +43,7 @@ static struct scsi_host_template phison_ |
27841 | ATA_BMDMA_SHT(DRV_NAME), | 28080 | ATA_BMDMA_SHT(DRV_NAME), |
27842 | }; | 28081 | }; |
@@ -27846,9 +28085,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/phison/phison.c linux-2.6.32.15/drive | |||
27846 | .inherits = &ata_bmdma_port_ops, | 28085 | .inherits = &ata_bmdma_port_ops, |
27847 | .prereset = phison_pre_reset, | 28086 | .prereset = phison_pre_reset, |
27848 | }; | 28087 | }; |
27849 | diff -urNp linux-2.6.32.15/drivers/staging/poch/poch.c linux-2.6.32.15/drivers/staging/poch/poch.c | 28088 | diff -urNp linux-2.6.32.16/drivers/staging/poch/poch.c linux-2.6.32.16/drivers/staging/poch/poch.c |
27850 | --- linux-2.6.32.15/drivers/staging/poch/poch.c 2010-03-15 11:52:04.000000000 -0400 | 28089 | --- linux-2.6.32.16/drivers/staging/poch/poch.c 2010-07-05 14:14:00.000000000 -0400 |
27851 | +++ linux-2.6.32.15/drivers/staging/poch/poch.c 2010-05-28 21:27:15.842942312 -0400 | 28090 | +++ linux-2.6.32.16/drivers/staging/poch/poch.c 2010-07-09 14:50:37.000000000 -0400 |
27852 | @@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod | 28091 | @@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod |
27853 | return 0; | 28092 | return 0; |
27854 | } | 28093 | } |
@@ -27858,9 +28097,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/poch/poch.c linux-2.6.32.15/drivers/s | |||
27858 | .owner = THIS_MODULE, | 28097 | .owner = THIS_MODULE, |
27859 | .open = poch_open, | 28098 | .open = poch_open, |
27860 | .release = poch_release, | 28099 | .release = poch_release, |
27861 | diff -urNp linux-2.6.32.15/drivers/staging/pohmelfs/inode.c linux-2.6.32.15/drivers/staging/pohmelfs/inode.c | 28100 | diff -urNp linux-2.6.32.16/drivers/staging/pohmelfs/inode.c linux-2.6.32.16/drivers/staging/pohmelfs/inode.c |
27862 | --- linux-2.6.32.15/drivers/staging/pohmelfs/inode.c 2010-03-15 11:52:04.000000000 -0400 | 28101 | --- linux-2.6.32.16/drivers/staging/pohmelfs/inode.c 2010-07-05 14:14:00.000000000 -0400 |
27863 | +++ linux-2.6.32.15/drivers/staging/pohmelfs/inode.c 2010-05-28 21:27:15.842942312 -0400 | 28102 | +++ linux-2.6.32.16/drivers/staging/pohmelfs/inode.c 2010-07-09 14:50:37.000000000 -0400 |
27864 | @@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su | 28103 | @@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su |
27865 | mutex_init(&psb->mcache_lock); | 28104 | mutex_init(&psb->mcache_lock); |
27866 | psb->mcache_root = RB_ROOT; | 28105 | psb->mcache_root = RB_ROOT; |
@@ -27870,9 +28109,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/pohmelfs/inode.c linux-2.6.32.15/driv | |||
27870 | 28109 | ||
27871 | psb->trans_max_pages = 100; | 28110 | psb->trans_max_pages = 100; |
27872 | 28111 | ||
27873 | diff -urNp linux-2.6.32.15/drivers/staging/pohmelfs/mcache.c linux-2.6.32.15/drivers/staging/pohmelfs/mcache.c | 28112 | diff -urNp linux-2.6.32.16/drivers/staging/pohmelfs/mcache.c linux-2.6.32.16/drivers/staging/pohmelfs/mcache.c |
27874 | --- linux-2.6.32.15/drivers/staging/pohmelfs/mcache.c 2010-03-15 11:52:04.000000000 -0400 | 28113 | --- linux-2.6.32.16/drivers/staging/pohmelfs/mcache.c 2010-07-05 14:14:00.000000000 -0400 |
27875 | +++ linux-2.6.32.15/drivers/staging/pohmelfs/mcache.c 2010-05-28 21:27:15.842942312 -0400 | 28114 | +++ linux-2.6.32.16/drivers/staging/pohmelfs/mcache.c 2010-07-09 14:50:37.000000000 -0400 |
27876 | @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ | 28115 | @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ |
27877 | m->data = data; | 28116 | m->data = data; |
27878 | m->start = start; | 28117 | m->start = start; |
@@ -27882,9 +28121,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/pohmelfs/mcache.c linux-2.6.32.15/dri | |||
27882 | 28121 | ||
27883 | mutex_lock(&psb->mcache_lock); | 28122 | mutex_lock(&psb->mcache_lock); |
27884 | err = pohmelfs_mcache_insert(psb, m); | 28123 | err = pohmelfs_mcache_insert(psb, m); |
27885 | diff -urNp linux-2.6.32.15/drivers/staging/pohmelfs/netfs.h linux-2.6.32.15/drivers/staging/pohmelfs/netfs.h | 28124 | diff -urNp linux-2.6.32.16/drivers/staging/pohmelfs/netfs.h linux-2.6.32.16/drivers/staging/pohmelfs/netfs.h |
27886 | --- linux-2.6.32.15/drivers/staging/pohmelfs/netfs.h 2010-03-15 11:52:04.000000000 -0400 | 28125 | --- linux-2.6.32.16/drivers/staging/pohmelfs/netfs.h 2010-07-05 14:14:00.000000000 -0400 |
27887 | +++ linux-2.6.32.15/drivers/staging/pohmelfs/netfs.h 2010-05-28 21:27:15.846971345 -0400 | 28126 | +++ linux-2.6.32.16/drivers/staging/pohmelfs/netfs.h 2010-07-09 14:50:37.000000000 -0400 |
27888 | @@ -570,7 +570,7 @@ struct pohmelfs_config; | 28127 | @@ -570,7 +570,7 @@ struct pohmelfs_config; |
27889 | struct pohmelfs_sb { | 28128 | struct pohmelfs_sb { |
27890 | struct rb_root mcache_root; | 28129 | struct rb_root mcache_root; |
@@ -27894,9 +28133,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/pohmelfs/netfs.h linux-2.6.32.15/driv | |||
27894 | unsigned long mcache_timeout; | 28133 | unsigned long mcache_timeout; |
27895 | 28134 | ||
27896 | unsigned int idx; | 28135 | unsigned int idx; |
27897 | diff -urNp linux-2.6.32.15/drivers/staging/sep/sep_driver.c linux-2.6.32.15/drivers/staging/sep/sep_driver.c | 28136 | diff -urNp linux-2.6.32.16/drivers/staging/sep/sep_driver.c linux-2.6.32.16/drivers/staging/sep/sep_driver.c |
27898 | --- linux-2.6.32.15/drivers/staging/sep/sep_driver.c 2010-03-15 11:52:04.000000000 -0400 | 28137 | --- linux-2.6.32.16/drivers/staging/sep/sep_driver.c 2010-07-05 14:14:00.000000000 -0400 |
27899 | +++ linux-2.6.32.15/drivers/staging/sep/sep_driver.c 2010-05-28 21:27:15.859198868 -0400 | 28138 | +++ linux-2.6.32.16/drivers/staging/sep/sep_driver.c 2010-07-09 14:50:37.000000000 -0400 |
27900 | @@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver | 28139 | @@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver |
27901 | static dev_t sep_devno; | 28140 | static dev_t sep_devno; |
27902 | 28141 | ||
@@ -27906,9 +28145,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/sep/sep_driver.c linux-2.6.32.15/driv | |||
27906 | .owner = THIS_MODULE, | 28145 | .owner = THIS_MODULE, |
27907 | .ioctl = sep_ioctl, | 28146 | .ioctl = sep_ioctl, |
27908 | .poll = sep_poll, | 28147 | .poll = sep_poll, |
27909 | 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 | 28148 | diff -urNp linux-2.6.32.16/drivers/staging/vme/devices/vme_user.c linux-2.6.32.16/drivers/staging/vme/devices/vme_user.c |
27910 | --- linux-2.6.32.15/drivers/staging/vme/devices/vme_user.c 2010-03-15 11:52:04.000000000 -0400 | 28149 | --- linux-2.6.32.16/drivers/staging/vme/devices/vme_user.c 2010-07-05 14:14:00.000000000 -0400 |
27911 | +++ linux-2.6.32.15/drivers/staging/vme/devices/vme_user.c 2010-05-28 21:27:15.859198868 -0400 | 28150 | +++ linux-2.6.32.16/drivers/staging/vme/devices/vme_user.c 2010-07-09 14:50:37.000000000 -0400 |
27912 | @@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode * | 28151 | @@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode * |
27913 | static int __init vme_user_probe(struct device *, int, int); | 28152 | static int __init vme_user_probe(struct device *, int, int); |
27914 | static int __exit vme_user_remove(struct device *, int, int); | 28153 | static int __exit vme_user_remove(struct device *, int, int); |
@@ -27918,9 +28157,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/vme/devices/vme_user.c linux-2.6.32.1 | |||
27918 | .open = vme_user_open, | 28157 | .open = vme_user_open, |
27919 | .release = vme_user_release, | 28158 | .release = vme_user_release, |
27920 | .read = vme_user_read, | 28159 | .read = vme_user_read, |
27921 | diff -urNp linux-2.6.32.15/drivers/uio/uio.c linux-2.6.32.15/drivers/uio/uio.c | 28160 | diff -urNp linux-2.6.32.16/drivers/uio/uio.c linux-2.6.32.16/drivers/uio/uio.c |
27922 | --- linux-2.6.32.15/drivers/uio/uio.c 2010-03-15 11:52:04.000000000 -0400 | 28161 | --- linux-2.6.32.16/drivers/uio/uio.c 2010-07-05 14:14:00.000000000 -0400 |
27923 | +++ linux-2.6.32.15/drivers/uio/uio.c 2010-05-28 21:27:15.859198868 -0400 | 28162 | +++ linux-2.6.32.16/drivers/uio/uio.c 2010-07-09 14:50:37.000000000 -0400 |
27924 | @@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj | 28163 | @@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj |
27925 | return entry->show(mem, buf); | 28164 | return entry->show(mem, buf); |
27926 | } | 28165 | } |
@@ -27939,9 +28178,9 @@ diff -urNp linux-2.6.32.15/drivers/uio/uio.c linux-2.6.32.15/drivers/uio/uio.c | |||
27939 | .show = portio_type_show, | 28178 | .show = portio_type_show, |
27940 | }; | 28179 | }; |
27941 | 28180 | ||
27942 | diff -urNp linux-2.6.32.15/drivers/usb/atm/usbatm.c linux-2.6.32.15/drivers/usb/atm/usbatm.c | 28181 | diff -urNp linux-2.6.32.16/drivers/usb/atm/usbatm.c linux-2.6.32.16/drivers/usb/atm/usbatm.c |
27943 | --- linux-2.6.32.15/drivers/usb/atm/usbatm.c 2010-03-15 11:52:04.000000000 -0400 | 28182 | --- linux-2.6.32.16/drivers/usb/atm/usbatm.c 2010-07-05 14:14:00.000000000 -0400 |
27944 | +++ linux-2.6.32.15/drivers/usb/atm/usbatm.c 2010-05-28 21:27:15.859198868 -0400 | 28183 | +++ linux-2.6.32.16/drivers/usb/atm/usbatm.c 2010-07-09 14:50:37.000000000 -0400 |
27945 | @@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru | 28184 | @@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru |
27946 | if (printk_ratelimit()) | 28185 | if (printk_ratelimit()) |
27947 | atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", | 28186 | atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", |
@@ -28021,10 +28260,10 @@ diff -urNp linux-2.6.32.15/drivers/usb/atm/usbatm.c linux-2.6.32.15/drivers/usb/ | |||
28021 | 28260 | ||
28022 | if (!left--) { | 28261 | if (!left--) { |
28023 | if (instance->disconnected) | 28262 | if (instance->disconnected) |
28024 | diff -urNp linux-2.6.32.15/drivers/usb/class/cdc-acm.c linux-2.6.32.15/drivers/usb/class/cdc-acm.c | 28263 | diff -urNp linux-2.6.32.16/drivers/usb/class/cdc-acm.c linux-2.6.32.16/drivers/usb/class/cdc-acm.c |
28025 | --- linux-2.6.32.15/drivers/usb/class/cdc-acm.c 2010-04-29 17:49:38.389083173 -0400 | 28264 | --- linux-2.6.32.16/drivers/usb/class/cdc-acm.c 2010-07-05 14:14:00.000000000 -0400 |
28026 | +++ linux-2.6.32.15/drivers/usb/class/cdc-acm.c 2010-05-28 21:27:15.867210979 -0400 | 28265 | +++ linux-2.6.32.16/drivers/usb/class/cdc-acm.c 2010-07-09 14:50:37.000000000 -0400 |
28027 | @@ -1535,7 +1535,7 @@ static struct usb_device_id acm_ids[] = | 28266 | @@ -1537,7 +1537,7 @@ static struct usb_device_id acm_ids[] = |
28028 | USB_CDC_ACM_PROTO_AT_CDMA) }, | 28267 | USB_CDC_ACM_PROTO_AT_CDMA) }, |
28029 | 28268 | ||
28030 | /* NOTE: COMM/ACM/0xff is likely MSFT RNDIS ... NOT a modem!! */ | 28269 | /* NOTE: COMM/ACM/0xff is likely MSFT RNDIS ... NOT a modem!! */ |
@@ -28033,9 +28272,9 @@ diff -urNp linux-2.6.32.15/drivers/usb/class/cdc-acm.c linux-2.6.32.15/drivers/u | |||
28033 | }; | 28272 | }; |
28034 | 28273 | ||
28035 | MODULE_DEVICE_TABLE(usb, acm_ids); | 28274 | MODULE_DEVICE_TABLE(usb, acm_ids); |
28036 | diff -urNp linux-2.6.32.15/drivers/usb/class/usblp.c linux-2.6.32.15/drivers/usb/class/usblp.c | 28275 | diff -urNp linux-2.6.32.16/drivers/usb/class/usblp.c linux-2.6.32.16/drivers/usb/class/usblp.c |
28037 | --- linux-2.6.32.15/drivers/usb/class/usblp.c 2010-03-15 11:52:04.000000000 -0400 | 28276 | --- linux-2.6.32.16/drivers/usb/class/usblp.c 2010-07-05 14:14:00.000000000 -0400 |
28038 | +++ linux-2.6.32.15/drivers/usb/class/usblp.c 2010-05-28 21:27:15.875212570 -0400 | 28277 | +++ linux-2.6.32.16/drivers/usb/class/usblp.c 2010-07-09 14:50:37.000000000 -0400 |
28039 | @@ -228,7 +228,7 @@ static const struct quirk_printer_struct | 28278 | @@ -228,7 +228,7 @@ static const struct quirk_printer_struct |
28040 | { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */ | 28279 | { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */ |
28041 | { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */ | 28280 | { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */ |
@@ -28054,9 +28293,9 @@ diff -urNp linux-2.6.32.15/drivers/usb/class/usblp.c linux-2.6.32.15/drivers/usb | |||
28054 | }; | 28293 | }; |
28055 | 28294 | ||
28056 | MODULE_DEVICE_TABLE (usb, usblp_ids); | 28295 | MODULE_DEVICE_TABLE (usb, usblp_ids); |
28057 | diff -urNp linux-2.6.32.15/drivers/usb/core/hcd.c linux-2.6.32.15/drivers/usb/core/hcd.c | 28296 | diff -urNp linux-2.6.32.16/drivers/usb/core/hcd.c linux-2.6.32.16/drivers/usb/core/hcd.c |
28058 | --- linux-2.6.32.15/drivers/usb/core/hcd.c 2010-03-15 11:52:04.000000000 -0400 | 28297 | --- linux-2.6.32.16/drivers/usb/core/hcd.c 2010-07-05 14:14:00.000000000 -0400 |
28059 | +++ linux-2.6.32.15/drivers/usb/core/hcd.c 2010-05-28 21:27:15.887216714 -0400 | 28298 | +++ linux-2.6.32.16/drivers/usb/core/hcd.c 2010-07-09 14:50:37.000000000 -0400 |
28060 | @@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd | 28299 | @@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd |
28061 | 28300 | ||
28062 | #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) | 28301 | #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) |
@@ -28075,9 +28314,9 @@ diff -urNp linux-2.6.32.15/drivers/usb/core/hcd.c linux-2.6.32.15/drivers/usb/co | |||
28075 | { | 28314 | { |
28076 | 28315 | ||
28077 | if (mon_ops) | 28316 | if (mon_ops) |
28078 | diff -urNp linux-2.6.32.15/drivers/usb/core/hcd.h linux-2.6.32.15/drivers/usb/core/hcd.h | 28317 | diff -urNp linux-2.6.32.16/drivers/usb/core/hcd.h linux-2.6.32.16/drivers/usb/core/hcd.h |
28079 | --- linux-2.6.32.15/drivers/usb/core/hcd.h 2010-03-15 11:52:04.000000000 -0400 | 28318 | --- linux-2.6.32.16/drivers/usb/core/hcd.h 2010-07-05 14:14:00.000000000 -0400 |
28080 | +++ linux-2.6.32.15/drivers/usb/core/hcd.h 2010-05-28 21:27:15.887216714 -0400 | 28319 | +++ linux-2.6.32.16/drivers/usb/core/hcd.h 2010-07-09 14:50:37.000000000 -0400 |
28081 | @@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { | 28320 | @@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { |
28082 | #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) | 28321 | #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) |
28083 | 28322 | ||
@@ -28105,9 +28344,9 @@ diff -urNp linux-2.6.32.15/drivers/usb/core/hcd.h linux-2.6.32.15/drivers/usb/co | |||
28105 | void usb_mon_deregister(void); | 28344 | void usb_mon_deregister(void); |
28106 | 28345 | ||
28107 | #else | 28346 | #else |
28108 | diff -urNp linux-2.6.32.15/drivers/usb/core/hub.c linux-2.6.32.15/drivers/usb/core/hub.c | 28347 | diff -urNp linux-2.6.32.16/drivers/usb/core/hub.c linux-2.6.32.16/drivers/usb/core/hub.c |
28109 | --- linux-2.6.32.15/drivers/usb/core/hub.c 2010-03-15 11:52:04.000000000 -0400 | 28348 | --- linux-2.6.32.16/drivers/usb/core/hub.c 2010-07-05 14:14:00.000000000 -0400 |
28110 | +++ linux-2.6.32.15/drivers/usb/core/hub.c 2010-05-28 21:27:15.887216714 -0400 | 28349 | +++ linux-2.6.32.16/drivers/usb/core/hub.c 2010-07-09 14:50:37.000000000 -0400 |
28111 | @@ -3397,7 +3397,7 @@ static struct usb_device_id hub_id_table | 28350 | @@ -3397,7 +3397,7 @@ static struct usb_device_id hub_id_table |
28112 | .bDeviceClass = USB_CLASS_HUB}, | 28351 | .bDeviceClass = USB_CLASS_HUB}, |
28113 | { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, | 28352 | { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, |
@@ -28117,9 +28356,9 @@ diff -urNp linux-2.6.32.15/drivers/usb/core/hub.c linux-2.6.32.15/drivers/usb/co | |||
28117 | }; | 28356 | }; |
28118 | 28357 | ||
28119 | MODULE_DEVICE_TABLE (usb, hub_id_table); | 28358 | MODULE_DEVICE_TABLE (usb, hub_id_table); |
28120 | diff -urNp linux-2.6.32.15/drivers/usb/core/message.c linux-2.6.32.15/drivers/usb/core/message.c | 28359 | diff -urNp linux-2.6.32.16/drivers/usb/core/message.c linux-2.6.32.16/drivers/usb/core/message.c |
28121 | --- linux-2.6.32.15/drivers/usb/core/message.c 2010-03-15 11:52:04.000000000 -0400 | 28360 | --- linux-2.6.32.16/drivers/usb/core/message.c 2010-07-05 14:14:00.000000000 -0400 |
28122 | +++ linux-2.6.32.15/drivers/usb/core/message.c 2010-05-28 21:27:15.898958902 -0400 | 28361 | +++ linux-2.6.32.16/drivers/usb/core/message.c 2010-07-09 14:50:37.000000000 -0400 |
28123 | @@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device | 28362 | @@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device |
28124 | buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); | 28363 | buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); |
28125 | if (buf) { | 28364 | if (buf) { |
@@ -28131,9 +28370,9 @@ diff -urNp linux-2.6.32.15/drivers/usb/core/message.c linux-2.6.32.15/drivers/us | |||
28131 | if (!smallbuf) | 28370 | if (!smallbuf) |
28132 | return buf; | 28371 | return buf; |
28133 | memcpy(smallbuf, buf, len); | 28372 | memcpy(smallbuf, buf, len); |
28134 | diff -urNp linux-2.6.32.15/drivers/usb/host/ehci-pci.c linux-2.6.32.15/drivers/usb/host/ehci-pci.c | 28373 | diff -urNp linux-2.6.32.16/drivers/usb/host/ehci-pci.c linux-2.6.32.16/drivers/usb/host/ehci-pci.c |
28135 | --- linux-2.6.32.15/drivers/usb/host/ehci-pci.c 2010-03-15 11:52:04.000000000 -0400 | 28374 | --- linux-2.6.32.16/drivers/usb/host/ehci-pci.c 2010-07-05 14:14:00.000000000 -0400 |
28136 | +++ linux-2.6.32.15/drivers/usb/host/ehci-pci.c 2010-05-28 21:27:15.898958902 -0400 | 28375 | +++ linux-2.6.32.16/drivers/usb/host/ehci-pci.c 2010-07-09 14:50:37.000000000 -0400 |
28137 | @@ -422,7 +422,7 @@ static const struct pci_device_id pci_id | 28376 | @@ -422,7 +422,7 @@ static const struct pci_device_id pci_id |
28138 | PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), | 28377 | PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), |
28139 | .driver_data = (unsigned long) &ehci_pci_hc_driver, | 28378 | .driver_data = (unsigned long) &ehci_pci_hc_driver, |
@@ -28143,9 +28382,9 @@ diff -urNp linux-2.6.32.15/drivers/usb/host/ehci-pci.c linux-2.6.32.15/drivers/u | |||
28143 | }; | 28382 | }; |
28144 | MODULE_DEVICE_TABLE(pci, pci_ids); | 28383 | MODULE_DEVICE_TABLE(pci, pci_ids); |
28145 | 28384 | ||
28146 | diff -urNp linux-2.6.32.15/drivers/usb/host/uhci-hcd.c linux-2.6.32.15/drivers/usb/host/uhci-hcd.c | 28385 | diff -urNp linux-2.6.32.16/drivers/usb/host/uhci-hcd.c linux-2.6.32.16/drivers/usb/host/uhci-hcd.c |
28147 | --- linux-2.6.32.15/drivers/usb/host/uhci-hcd.c 2010-03-15 11:52:04.000000000 -0400 | 28386 | --- linux-2.6.32.16/drivers/usb/host/uhci-hcd.c 2010-07-05 14:14:00.000000000 -0400 |
28148 | +++ linux-2.6.32.15/drivers/usb/host/uhci-hcd.c 2010-05-28 21:27:15.903225521 -0400 | 28387 | +++ linux-2.6.32.16/drivers/usb/host/uhci-hcd.c 2010-07-09 14:50:37.000000000 -0400 |
28149 | @@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p | 28388 | @@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p |
28150 | /* handle any USB UHCI controller */ | 28389 | /* handle any USB UHCI controller */ |
28151 | PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), | 28390 | PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), |
@@ -28155,9 +28394,9 @@ diff -urNp linux-2.6.32.15/drivers/usb/host/uhci-hcd.c linux-2.6.32.15/drivers/u | |||
28155 | }; | 28394 | }; |
28156 | 28395 | ||
28157 | MODULE_DEVICE_TABLE(pci, uhci_pci_ids); | 28396 | MODULE_DEVICE_TABLE(pci, uhci_pci_ids); |
28158 | diff -urNp linux-2.6.32.15/drivers/usb/misc/appledisplay.c linux-2.6.32.15/drivers/usb/misc/appledisplay.c | 28397 | diff -urNp linux-2.6.32.16/drivers/usb/misc/appledisplay.c linux-2.6.32.16/drivers/usb/misc/appledisplay.c |
28159 | --- linux-2.6.32.15/drivers/usb/misc/appledisplay.c 2010-03-15 11:52:04.000000000 -0400 | 28398 | --- linux-2.6.32.16/drivers/usb/misc/appledisplay.c 2010-07-05 14:14:00.000000000 -0400 |
28160 | +++ linux-2.6.32.15/drivers/usb/misc/appledisplay.c 2010-05-28 21:27:15.903225521 -0400 | 28399 | +++ linux-2.6.32.16/drivers/usb/misc/appledisplay.c 2010-07-09 14:50:37.000000000 -0400 |
28161 | @@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes | 28400 | @@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes |
28162 | return pdata->msgdata[1]; | 28401 | return pdata->msgdata[1]; |
28163 | } | 28402 | } |
@@ -28167,9 +28406,9 @@ diff -urNp linux-2.6.32.15/drivers/usb/misc/appledisplay.c linux-2.6.32.15/drive | |||
28167 | .get_brightness = appledisplay_bl_get_brightness, | 28406 | .get_brightness = appledisplay_bl_get_brightness, |
28168 | .update_status = appledisplay_bl_update_status, | 28407 | .update_status = appledisplay_bl_update_status, |
28169 | }; | 28408 | }; |
28170 | diff -urNp linux-2.6.32.15/drivers/usb/mon/mon_main.c linux-2.6.32.15/drivers/usb/mon/mon_main.c | 28409 | diff -urNp linux-2.6.32.16/drivers/usb/mon/mon_main.c linux-2.6.32.16/drivers/usb/mon/mon_main.c |
28171 | --- linux-2.6.32.15/drivers/usb/mon/mon_main.c 2010-03-15 11:52:04.000000000 -0400 | 28410 | --- linux-2.6.32.16/drivers/usb/mon/mon_main.c 2010-07-05 14:14:00.000000000 -0400 |
28172 | +++ linux-2.6.32.15/drivers/usb/mon/mon_main.c 2010-05-28 21:27:15.903225521 -0400 | 28411 | +++ linux-2.6.32.16/drivers/usb/mon/mon_main.c 2010-07-09 14:50:37.000000000 -0400 |
28173 | @@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { | 28412 | @@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { |
28174 | /* | 28413 | /* |
28175 | * Ops | 28414 | * Ops |
@@ -28179,9 +28418,9 @@ diff -urNp linux-2.6.32.15/drivers/usb/mon/mon_main.c linux-2.6.32.15/drivers/us | |||
28179 | .urb_submit = mon_submit, | 28418 | .urb_submit = mon_submit, |
28180 | .urb_submit_error = mon_submit_error, | 28419 | .urb_submit_error = mon_submit_error, |
28181 | .urb_complete = mon_complete, | 28420 | .urb_complete = mon_complete, |
28182 | diff -urNp linux-2.6.32.15/drivers/usb/storage/debug.h linux-2.6.32.15/drivers/usb/storage/debug.h | 28421 | diff -urNp linux-2.6.32.16/drivers/usb/storage/debug.h linux-2.6.32.16/drivers/usb/storage/debug.h |
28183 | --- linux-2.6.32.15/drivers/usb/storage/debug.h 2010-03-15 11:52:04.000000000 -0400 | 28422 | --- linux-2.6.32.16/drivers/usb/storage/debug.h 2010-07-05 14:14:00.000000000 -0400 |
28184 | +++ linux-2.6.32.15/drivers/usb/storage/debug.h 2010-05-28 21:27:15.903225521 -0400 | 28423 | +++ linux-2.6.32.16/drivers/usb/storage/debug.h 2010-07-09 14:50:37.000000000 -0400 |
28185 | @@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char | 28424 | @@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char |
28186 | #define US_DEBUGPX(x...) printk( x ) | 28425 | #define US_DEBUGPX(x...) printk( x ) |
28187 | #define US_DEBUG(x) x | 28426 | #define US_DEBUG(x) x |
@@ -28195,9 +28434,9 @@ diff -urNp linux-2.6.32.15/drivers/usb/storage/debug.h linux-2.6.32.15/drivers/u | |||
28195 | #endif | 28434 | #endif |
28196 | 28435 | ||
28197 | #endif | 28436 | #endif |
28198 | diff -urNp linux-2.6.32.15/drivers/usb/storage/usb.c linux-2.6.32.15/drivers/usb/storage/usb.c | 28437 | diff -urNp linux-2.6.32.16/drivers/usb/storage/usb.c linux-2.6.32.16/drivers/usb/storage/usb.c |
28199 | --- linux-2.6.32.15/drivers/usb/storage/usb.c 2010-03-15 11:52:04.000000000 -0400 | 28438 | --- linux-2.6.32.16/drivers/usb/storage/usb.c 2010-07-05 14:14:00.000000000 -0400 |
28200 | +++ linux-2.6.32.15/drivers/usb/storage/usb.c 2010-05-28 21:27:15.915209208 -0400 | 28439 | +++ linux-2.6.32.16/drivers/usb/storage/usb.c 2010-07-09 14:50:37.000000000 -0400 |
28201 | @@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l | 28440 | @@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l |
28202 | 28441 | ||
28203 | static struct us_unusual_dev us_unusual_dev_list[] = { | 28442 | static struct us_unusual_dev us_unusual_dev_list[] = { |
@@ -28207,9 +28446,9 @@ diff -urNp linux-2.6.32.15/drivers/usb/storage/usb.c linux-2.6.32.15/drivers/usb | |||
28207 | }; | 28446 | }; |
28208 | 28447 | ||
28209 | #undef UNUSUAL_DEV | 28448 | #undef UNUSUAL_DEV |
28210 | diff -urNp linux-2.6.32.15/drivers/usb/storage/usual-tables.c linux-2.6.32.15/drivers/usb/storage/usual-tables.c | 28449 | diff -urNp linux-2.6.32.16/drivers/usb/storage/usual-tables.c linux-2.6.32.16/drivers/usb/storage/usual-tables.c |
28211 | --- linux-2.6.32.15/drivers/usb/storage/usual-tables.c 2010-03-15 11:52:04.000000000 -0400 | 28450 | --- linux-2.6.32.16/drivers/usb/storage/usual-tables.c 2010-07-05 14:14:00.000000000 -0400 |
28212 | +++ linux-2.6.32.15/drivers/usb/storage/usual-tables.c 2010-05-28 21:27:15.915209208 -0400 | 28451 | +++ linux-2.6.32.16/drivers/usb/storage/usual-tables.c 2010-07-09 14:50:37.000000000 -0400 |
28213 | @@ -48,7 +48,7 @@ | 28452 | @@ -48,7 +48,7 @@ |
28214 | 28453 | ||
28215 | struct usb_device_id usb_storage_usb_ids[] = { | 28454 | struct usb_device_id usb_storage_usb_ids[] = { |
@@ -28219,9 +28458,9 @@ diff -urNp linux-2.6.32.15/drivers/usb/storage/usual-tables.c linux-2.6.32.15/dr | |||
28219 | }; | 28458 | }; |
28220 | EXPORT_SYMBOL_GPL(usb_storage_usb_ids); | 28459 | EXPORT_SYMBOL_GPL(usb_storage_usb_ids); |
28221 | 28460 | ||
28222 | diff -urNp linux-2.6.32.15/drivers/uwb/wlp/messages.c linux-2.6.32.15/drivers/uwb/wlp/messages.c | 28461 | diff -urNp linux-2.6.32.16/drivers/uwb/wlp/messages.c linux-2.6.32.16/drivers/uwb/wlp/messages.c |
28223 | --- linux-2.6.32.15/drivers/uwb/wlp/messages.c 2010-03-15 11:52:04.000000000 -0400 | 28462 | --- linux-2.6.32.16/drivers/uwb/wlp/messages.c 2010-07-05 14:14:00.000000000 -0400 |
28224 | +++ linux-2.6.32.15/drivers/uwb/wlp/messages.c 2010-05-28 21:27:15.915209208 -0400 | 28463 | +++ linux-2.6.32.16/drivers/uwb/wlp/messages.c 2010-07-09 14:50:37.000000000 -0400 |
28225 | @@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct | 28464 | @@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct |
28226 | size_t len = skb->len; | 28465 | size_t len = skb->len; |
28227 | size_t used; | 28466 | size_t used; |
@@ -28231,9 +28470,9 @@ diff -urNp linux-2.6.32.15/drivers/uwb/wlp/messages.c linux-2.6.32.15/drivers/uw | |||
28231 | enum wlp_assc_error assc_err; | 28470 | enum wlp_assc_error assc_err; |
28232 | char enonce_buf[WLP_WSS_NONCE_STRSIZE]; | 28471 | char enonce_buf[WLP_WSS_NONCE_STRSIZE]; |
28233 | char rnonce_buf[WLP_WSS_NONCE_STRSIZE]; | 28472 | char rnonce_buf[WLP_WSS_NONCE_STRSIZE]; |
28234 | diff -urNp linux-2.6.32.15/drivers/uwb/wlp/sysfs.c linux-2.6.32.15/drivers/uwb/wlp/sysfs.c | 28473 | diff -urNp linux-2.6.32.16/drivers/uwb/wlp/sysfs.c linux-2.6.32.16/drivers/uwb/wlp/sysfs.c |
28235 | --- linux-2.6.32.15/drivers/uwb/wlp/sysfs.c 2010-03-15 11:52:04.000000000 -0400 | 28474 | --- linux-2.6.32.16/drivers/uwb/wlp/sysfs.c 2010-07-05 14:14:00.000000000 -0400 |
28236 | +++ linux-2.6.32.15/drivers/uwb/wlp/sysfs.c 2010-05-28 21:27:15.915209208 -0400 | 28475 | +++ linux-2.6.32.16/drivers/uwb/wlp/sysfs.c 2010-07-09 14:50:37.000000000 -0400 |
28237 | @@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec | 28476 | @@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec |
28238 | return ret; | 28477 | return ret; |
28239 | } | 28478 | } |
@@ -28244,9 +28483,9 @@ diff -urNp linux-2.6.32.15/drivers/uwb/wlp/sysfs.c linux-2.6.32.15/drivers/uwb/w | |||
28244 | .show = wlp_wss_attr_show, | 28483 | .show = wlp_wss_attr_show, |
28245 | .store = wlp_wss_attr_store, | 28484 | .store = wlp_wss_attr_store, |
28246 | }; | 28485 | }; |
28247 | diff -urNp linux-2.6.32.15/drivers/video/atmel_lcdfb.c linux-2.6.32.15/drivers/video/atmel_lcdfb.c | 28486 | diff -urNp linux-2.6.32.16/drivers/video/atmel_lcdfb.c linux-2.6.32.16/drivers/video/atmel_lcdfb.c |
28248 | --- linux-2.6.32.15/drivers/video/atmel_lcdfb.c 2010-03-15 11:52:04.000000000 -0400 | 28487 | --- linux-2.6.32.16/drivers/video/atmel_lcdfb.c 2010-07-05 14:14:00.000000000 -0400 |
28249 | +++ linux-2.6.32.15/drivers/video/atmel_lcdfb.c 2010-05-28 21:27:15.915209208 -0400 | 28488 | +++ linux-2.6.32.16/drivers/video/atmel_lcdfb.c 2010-07-09 14:50:37.000000000 -0400 |
28250 | @@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc | 28489 | @@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc |
28251 | return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); | 28490 | return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); |
28252 | } | 28491 | } |
@@ -28256,9 +28495,9 @@ diff -urNp linux-2.6.32.15/drivers/video/atmel_lcdfb.c linux-2.6.32.15/drivers/v | |||
28256 | .update_status = atmel_bl_update_status, | 28495 | .update_status = atmel_bl_update_status, |
28257 | .get_brightness = atmel_bl_get_brightness, | 28496 | .get_brightness = atmel_bl_get_brightness, |
28258 | }; | 28497 | }; |
28259 | diff -urNp linux-2.6.32.15/drivers/video/aty/aty128fb.c linux-2.6.32.15/drivers/video/aty/aty128fb.c | 28498 | diff -urNp linux-2.6.32.16/drivers/video/aty/aty128fb.c linux-2.6.32.16/drivers/video/aty/aty128fb.c |
28260 | --- linux-2.6.32.15/drivers/video/aty/aty128fb.c 2010-03-15 11:52:04.000000000 -0400 | 28499 | --- linux-2.6.32.16/drivers/video/aty/aty128fb.c 2010-07-05 14:14:00.000000000 -0400 |
28261 | +++ linux-2.6.32.15/drivers/video/aty/aty128fb.c 2010-05-28 21:27:15.931199110 -0400 | 28500 | +++ linux-2.6.32.16/drivers/video/aty/aty128fb.c 2010-07-09 14:50:37.000000000 -0400 |
28262 | @@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru | 28501 | @@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru |
28263 | return bd->props.brightness; | 28502 | return bd->props.brightness; |
28264 | } | 28503 | } |
@@ -28268,9 +28507,9 @@ diff -urNp linux-2.6.32.15/drivers/video/aty/aty128fb.c linux-2.6.32.15/drivers/ | |||
28268 | .get_brightness = aty128_bl_get_brightness, | 28507 | .get_brightness = aty128_bl_get_brightness, |
28269 | .update_status = aty128_bl_update_status, | 28508 | .update_status = aty128_bl_update_status, |
28270 | }; | 28509 | }; |
28271 | diff -urNp linux-2.6.32.15/drivers/video/aty/atyfb_base.c linux-2.6.32.15/drivers/video/aty/atyfb_base.c | 28510 | diff -urNp linux-2.6.32.16/drivers/video/aty/atyfb_base.c linux-2.6.32.16/drivers/video/aty/atyfb_base.c |
28272 | --- linux-2.6.32.15/drivers/video/aty/atyfb_base.c 2010-03-15 11:52:04.000000000 -0400 | 28511 | --- linux-2.6.32.16/drivers/video/aty/atyfb_base.c 2010-07-05 14:14:00.000000000 -0400 |
28273 | +++ linux-2.6.32.15/drivers/video/aty/atyfb_base.c 2010-05-28 21:27:15.939052461 -0400 | 28512 | +++ linux-2.6.32.16/drivers/video/aty/atyfb_base.c 2010-07-09 14:50:37.000000000 -0400 |
28274 | @@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct | 28513 | @@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct |
28275 | return bd->props.brightness; | 28514 | return bd->props.brightness; |
28276 | } | 28515 | } |
@@ -28280,9 +28519,9 @@ diff -urNp linux-2.6.32.15/drivers/video/aty/atyfb_base.c linux-2.6.32.15/driver | |||
28280 | .get_brightness = aty_bl_get_brightness, | 28519 | .get_brightness = aty_bl_get_brightness, |
28281 | .update_status = aty_bl_update_status, | 28520 | .update_status = aty_bl_update_status, |
28282 | }; | 28521 | }; |
28283 | diff -urNp linux-2.6.32.15/drivers/video/aty/radeon_backlight.c linux-2.6.32.15/drivers/video/aty/radeon_backlight.c | 28522 | diff -urNp linux-2.6.32.16/drivers/video/aty/radeon_backlight.c linux-2.6.32.16/drivers/video/aty/radeon_backlight.c |
28284 | --- linux-2.6.32.15/drivers/video/aty/radeon_backlight.c 2010-03-15 11:52:04.000000000 -0400 | 28523 | --- linux-2.6.32.16/drivers/video/aty/radeon_backlight.c 2010-07-05 14:14:00.000000000 -0400 |
28285 | +++ linux-2.6.32.15/drivers/video/aty/radeon_backlight.c 2010-05-28 21:27:15.939052461 -0400 | 28524 | +++ linux-2.6.32.16/drivers/video/aty/radeon_backlight.c 2010-07-09 14:50:37.000000000 -0400 |
28286 | @@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru | 28525 | @@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru |
28287 | return bd->props.brightness; | 28526 | return bd->props.brightness; |
28288 | } | 28527 | } |
@@ -28292,9 +28531,9 @@ diff -urNp linux-2.6.32.15/drivers/video/aty/radeon_backlight.c linux-2.6.32.15/ | |||
28292 | .get_brightness = radeon_bl_get_brightness, | 28531 | .get_brightness = radeon_bl_get_brightness, |
28293 | .update_status = radeon_bl_update_status, | 28532 | .update_status = radeon_bl_update_status, |
28294 | }; | 28533 | }; |
28295 | diff -urNp linux-2.6.32.15/drivers/video/backlight/adp5520_bl.c linux-2.6.32.15/drivers/video/backlight/adp5520_bl.c | 28534 | diff -urNp linux-2.6.32.16/drivers/video/backlight/adp5520_bl.c linux-2.6.32.16/drivers/video/backlight/adp5520_bl.c |
28296 | --- linux-2.6.32.15/drivers/video/backlight/adp5520_bl.c 2010-03-15 11:52:04.000000000 -0400 | 28535 | --- linux-2.6.32.16/drivers/video/backlight/adp5520_bl.c 2010-07-05 14:14:00.000000000 -0400 |
28297 | +++ linux-2.6.32.15/drivers/video/backlight/adp5520_bl.c 2010-05-28 21:27:15.939052461 -0400 | 28536 | +++ linux-2.6.32.16/drivers/video/backlight/adp5520_bl.c 2010-07-09 14:50:37.000000000 -0400 |
28298 | @@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str | 28537 | @@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str |
28299 | return error ? data->current_brightness : reg_val; | 28538 | return error ? data->current_brightness : reg_val; |
28300 | } | 28539 | } |
@@ -28304,9 +28543,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/adp5520_bl.c linux-2.6.32.15/ | |||
28304 | .update_status = adp5520_bl_update_status, | 28543 | .update_status = adp5520_bl_update_status, |
28305 | .get_brightness = adp5520_bl_get_brightness, | 28544 | .get_brightness = adp5520_bl_get_brightness, |
28306 | }; | 28545 | }; |
28307 | diff -urNp linux-2.6.32.15/drivers/video/backlight/adx_bl.c linux-2.6.32.15/drivers/video/backlight/adx_bl.c | 28546 | diff -urNp linux-2.6.32.16/drivers/video/backlight/adx_bl.c linux-2.6.32.16/drivers/video/backlight/adx_bl.c |
28308 | --- linux-2.6.32.15/drivers/video/backlight/adx_bl.c 2010-03-15 11:52:04.000000000 -0400 | 28547 | --- linux-2.6.32.16/drivers/video/backlight/adx_bl.c 2010-07-05 14:14:00.000000000 -0400 |
28309 | +++ linux-2.6.32.15/drivers/video/backlight/adx_bl.c 2010-05-28 21:27:15.939052461 -0400 | 28548 | +++ linux-2.6.32.16/drivers/video/backlight/adx_bl.c 2010-07-09 14:50:37.000000000 -0400 |
28310 | @@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct | 28549 | @@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct |
28311 | return 1; | 28550 | return 1; |
28312 | } | 28551 | } |
@@ -28316,9 +28555,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/adx_bl.c linux-2.6.32.15/driv | |||
28316 | .options = 0, | 28555 | .options = 0, |
28317 | .update_status = adx_backlight_update_status, | 28556 | .update_status = adx_backlight_update_status, |
28318 | .get_brightness = adx_backlight_get_brightness, | 28557 | .get_brightness = adx_backlight_get_brightness, |
28319 | 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 | 28558 | diff -urNp linux-2.6.32.16/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.16/drivers/video/backlight/atmel-pwm-bl.c |
28320 | --- linux-2.6.32.15/drivers/video/backlight/atmel-pwm-bl.c 2010-03-15 11:52:04.000000000 -0400 | 28559 | --- linux-2.6.32.16/drivers/video/backlight/atmel-pwm-bl.c 2010-07-05 14:14:00.000000000 -0400 |
28321 | +++ linux-2.6.32.15/drivers/video/backlight/atmel-pwm-bl.c 2010-05-28 21:27:15.939052461 -0400 | 28560 | +++ linux-2.6.32.16/drivers/video/backlight/atmel-pwm-bl.c 2010-07-09 14:50:37.000000000 -0400 |
28322 | @@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct | 28561 | @@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct |
28323 | return pwm_channel_enable(&pwmbl->pwmc); | 28562 | return pwm_channel_enable(&pwmbl->pwmc); |
28324 | } | 28563 | } |
@@ -28328,9 +28567,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.1 | |||
28328 | .get_brightness = atmel_pwm_bl_get_intensity, | 28567 | .get_brightness = atmel_pwm_bl_get_intensity, |
28329 | .update_status = atmel_pwm_bl_set_intensity, | 28568 | .update_status = atmel_pwm_bl_set_intensity, |
28330 | }; | 28569 | }; |
28331 | diff -urNp linux-2.6.32.15/drivers/video/backlight/backlight.c linux-2.6.32.15/drivers/video/backlight/backlight.c | 28570 | diff -urNp linux-2.6.32.16/drivers/video/backlight/backlight.c linux-2.6.32.16/drivers/video/backlight/backlight.c |
28332 | --- linux-2.6.32.15/drivers/video/backlight/backlight.c 2010-03-15 11:52:04.000000000 -0400 | 28571 | --- linux-2.6.32.16/drivers/video/backlight/backlight.c 2010-07-05 14:14:00.000000000 -0400 |
28333 | +++ linux-2.6.32.15/drivers/video/backlight/backlight.c 2010-05-28 21:27:15.939052461 -0400 | 28572 | +++ linux-2.6.32.16/drivers/video/backlight/backlight.c 2010-07-09 14:50:37.000000000 -0400 |
28334 | @@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update); | 28573 | @@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update); |
28335 | * ERR_PTR() or a pointer to the newly allocated device. | 28574 | * ERR_PTR() or a pointer to the newly allocated device. |
28336 | */ | 28575 | */ |
@@ -28340,9 +28579,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/backlight.c linux-2.6.32.15/d | |||
28340 | { | 28579 | { |
28341 | struct backlight_device *new_bd; | 28580 | struct backlight_device *new_bd; |
28342 | int rc; | 28581 | int rc; |
28343 | diff -urNp linux-2.6.32.15/drivers/video/backlight/corgi_lcd.c linux-2.6.32.15/drivers/video/backlight/corgi_lcd.c | 28582 | diff -urNp linux-2.6.32.16/drivers/video/backlight/corgi_lcd.c linux-2.6.32.16/drivers/video/backlight/corgi_lcd.c |
28344 | --- linux-2.6.32.15/drivers/video/backlight/corgi_lcd.c 2010-03-15 11:52:04.000000000 -0400 | 28583 | --- linux-2.6.32.16/drivers/video/backlight/corgi_lcd.c 2010-07-05 14:14:00.000000000 -0400 |
28345 | +++ linux-2.6.32.15/drivers/video/backlight/corgi_lcd.c 2010-05-28 21:27:15.939052461 -0400 | 28584 | +++ linux-2.6.32.16/drivers/video/backlight/corgi_lcd.c 2010-07-09 14:50:37.000000000 -0400 |
28346 | @@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit | 28585 | @@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit |
28347 | } | 28586 | } |
28348 | EXPORT_SYMBOL(corgi_lcd_limit_intensity); | 28587 | EXPORT_SYMBOL(corgi_lcd_limit_intensity); |
@@ -28352,9 +28591,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/corgi_lcd.c linux-2.6.32.15/d | |||
28352 | .get_brightness = corgi_bl_get_intensity, | 28591 | .get_brightness = corgi_bl_get_intensity, |
28353 | .update_status = corgi_bl_update_status, | 28592 | .update_status = corgi_bl_update_status, |
28354 | }; | 28593 | }; |
28355 | diff -urNp linux-2.6.32.15/drivers/video/backlight/cr_bllcd.c linux-2.6.32.15/drivers/video/backlight/cr_bllcd.c | 28594 | diff -urNp linux-2.6.32.16/drivers/video/backlight/cr_bllcd.c linux-2.6.32.16/drivers/video/backlight/cr_bllcd.c |
28356 | --- linux-2.6.32.15/drivers/video/backlight/cr_bllcd.c 2010-03-15 11:52:04.000000000 -0400 | 28595 | --- linux-2.6.32.16/drivers/video/backlight/cr_bllcd.c 2010-07-05 14:14:00.000000000 -0400 |
28357 | +++ linux-2.6.32.15/drivers/video/backlight/cr_bllcd.c 2010-05-28 21:27:15.939052461 -0400 | 28596 | +++ linux-2.6.32.16/drivers/video/backlight/cr_bllcd.c 2010-07-09 14:50:37.000000000 -0400 |
28358 | @@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st | 28597 | @@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st |
28359 | return intensity; | 28598 | return intensity; |
28360 | } | 28599 | } |
@@ -28364,9 +28603,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/cr_bllcd.c linux-2.6.32.15/dr | |||
28364 | .get_brightness = cr_backlight_get_intensity, | 28603 | .get_brightness = cr_backlight_get_intensity, |
28365 | .update_status = cr_backlight_set_intensity, | 28604 | .update_status = cr_backlight_set_intensity, |
28366 | }; | 28605 | }; |
28367 | diff -urNp linux-2.6.32.15/drivers/video/backlight/da903x_bl.c linux-2.6.32.15/drivers/video/backlight/da903x_bl.c | 28606 | diff -urNp linux-2.6.32.16/drivers/video/backlight/da903x_bl.c linux-2.6.32.16/drivers/video/backlight/da903x_bl.c |
28368 | --- linux-2.6.32.15/drivers/video/backlight/da903x_bl.c 2010-03-15 11:52:04.000000000 -0400 | 28607 | --- linux-2.6.32.16/drivers/video/backlight/da903x_bl.c 2010-07-05 14:14:00.000000000 -0400 |
28369 | +++ linux-2.6.32.15/drivers/video/backlight/da903x_bl.c 2010-05-28 21:27:15.939052461 -0400 | 28608 | +++ linux-2.6.32.16/drivers/video/backlight/da903x_bl.c 2010-07-09 14:50:37.000000000 -0400 |
28370 | @@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne | 28609 | @@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne |
28371 | return data->current_brightness; | 28610 | return data->current_brightness; |
28372 | } | 28611 | } |
@@ -28376,9 +28615,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/da903x_bl.c linux-2.6.32.15/d | |||
28376 | .update_status = da903x_backlight_update_status, | 28615 | .update_status = da903x_backlight_update_status, |
28377 | .get_brightness = da903x_backlight_get_brightness, | 28616 | .get_brightness = da903x_backlight_get_brightness, |
28378 | }; | 28617 | }; |
28379 | diff -urNp linux-2.6.32.15/drivers/video/backlight/generic_bl.c linux-2.6.32.15/drivers/video/backlight/generic_bl.c | 28618 | diff -urNp linux-2.6.32.16/drivers/video/backlight/generic_bl.c linux-2.6.32.16/drivers/video/backlight/generic_bl.c |
28380 | --- linux-2.6.32.15/drivers/video/backlight/generic_bl.c 2010-03-15 11:52:04.000000000 -0400 | 28619 | --- linux-2.6.32.16/drivers/video/backlight/generic_bl.c 2010-07-05 14:14:00.000000000 -0400 |
28381 | +++ linux-2.6.32.15/drivers/video/backlight/generic_bl.c 2010-05-28 21:27:15.939052461 -0400 | 28620 | +++ linux-2.6.32.16/drivers/video/backlight/generic_bl.c 2010-07-09 14:50:37.000000000 -0400 |
28382 | @@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit) | 28621 | @@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit) |
28383 | } | 28622 | } |
28384 | EXPORT_SYMBOL(corgibl_limit_intensity); | 28623 | EXPORT_SYMBOL(corgibl_limit_intensity); |
@@ -28388,9 +28627,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/generic_bl.c linux-2.6.32.15/ | |||
28388 | .options = BL_CORE_SUSPENDRESUME, | 28627 | .options = BL_CORE_SUSPENDRESUME, |
28389 | .get_brightness = genericbl_get_intensity, | 28628 | .get_brightness = genericbl_get_intensity, |
28390 | .update_status = genericbl_send_intensity, | 28629 | .update_status = genericbl_send_intensity, |
28391 | diff -urNp linux-2.6.32.15/drivers/video/backlight/hp680_bl.c linux-2.6.32.15/drivers/video/backlight/hp680_bl.c | 28630 | diff -urNp linux-2.6.32.16/drivers/video/backlight/hp680_bl.c linux-2.6.32.16/drivers/video/backlight/hp680_bl.c |
28392 | --- linux-2.6.32.15/drivers/video/backlight/hp680_bl.c 2010-03-15 11:52:04.000000000 -0400 | 28631 | --- linux-2.6.32.16/drivers/video/backlight/hp680_bl.c 2010-07-05 14:14:00.000000000 -0400 |
28393 | +++ linux-2.6.32.15/drivers/video/backlight/hp680_bl.c 2010-05-28 21:27:15.939052461 -0400 | 28632 | +++ linux-2.6.32.16/drivers/video/backlight/hp680_bl.c 2010-07-09 14:50:37.000000000 -0400 |
28394 | @@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct | 28633 | @@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct |
28395 | return current_intensity; | 28634 | return current_intensity; |
28396 | } | 28635 | } |
@@ -28400,9 +28639,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/hp680_bl.c linux-2.6.32.15/dr | |||
28400 | .get_brightness = hp680bl_get_intensity, | 28639 | .get_brightness = hp680bl_get_intensity, |
28401 | .update_status = hp680bl_set_intensity, | 28640 | .update_status = hp680bl_set_intensity, |
28402 | }; | 28641 | }; |
28403 | diff -urNp linux-2.6.32.15/drivers/video/backlight/jornada720_bl.c linux-2.6.32.15/drivers/video/backlight/jornada720_bl.c | 28642 | diff -urNp linux-2.6.32.16/drivers/video/backlight/jornada720_bl.c linux-2.6.32.16/drivers/video/backlight/jornada720_bl.c |
28404 | --- linux-2.6.32.15/drivers/video/backlight/jornada720_bl.c 2010-03-15 11:52:04.000000000 -0400 | 28643 | --- linux-2.6.32.16/drivers/video/backlight/jornada720_bl.c 2010-07-05 14:14:00.000000000 -0400 |
28405 | +++ linux-2.6.32.15/drivers/video/backlight/jornada720_bl.c 2010-05-28 21:27:15.943207359 -0400 | 28644 | +++ linux-2.6.32.16/drivers/video/backlight/jornada720_bl.c 2010-07-09 14:50:37.000000000 -0400 |
28406 | @@ -93,7 +93,7 @@ out: | 28645 | @@ -93,7 +93,7 @@ out: |
28407 | return ret; | 28646 | return ret; |
28408 | } | 28647 | } |
@@ -28412,9 +28651,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/jornada720_bl.c linux-2.6.32. | |||
28412 | .get_brightness = jornada_bl_get_brightness, | 28651 | .get_brightness = jornada_bl_get_brightness, |
28413 | .update_status = jornada_bl_update_status, | 28652 | .update_status = jornada_bl_update_status, |
28414 | .options = BL_CORE_SUSPENDRESUME, | 28653 | .options = BL_CORE_SUSPENDRESUME, |
28415 | diff -urNp linux-2.6.32.15/drivers/video/backlight/kb3886_bl.c linux-2.6.32.15/drivers/video/backlight/kb3886_bl.c | 28654 | diff -urNp linux-2.6.32.16/drivers/video/backlight/kb3886_bl.c linux-2.6.32.16/drivers/video/backlight/kb3886_bl.c |
28416 | --- linux-2.6.32.15/drivers/video/backlight/kb3886_bl.c 2010-03-15 11:52:04.000000000 -0400 | 28655 | --- linux-2.6.32.16/drivers/video/backlight/kb3886_bl.c 2010-07-05 14:14:00.000000000 -0400 |
28417 | +++ linux-2.6.32.15/drivers/video/backlight/kb3886_bl.c 2010-05-28 21:27:15.943207359 -0400 | 28656 | +++ linux-2.6.32.16/drivers/video/backlight/kb3886_bl.c 2010-07-09 14:50:37.000000000 -0400 |
28418 | @@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct | 28657 | @@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct |
28419 | return kb3886bl_intensity; | 28658 | return kb3886bl_intensity; |
28420 | } | 28659 | } |
@@ -28424,9 +28663,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/kb3886_bl.c linux-2.6.32.15/d | |||
28424 | .get_brightness = kb3886bl_get_intensity, | 28663 | .get_brightness = kb3886bl_get_intensity, |
28425 | .update_status = kb3886bl_send_intensity, | 28664 | .update_status = kb3886bl_send_intensity, |
28426 | }; | 28665 | }; |
28427 | diff -urNp linux-2.6.32.15/drivers/video/backlight/locomolcd.c linux-2.6.32.15/drivers/video/backlight/locomolcd.c | 28666 | diff -urNp linux-2.6.32.16/drivers/video/backlight/locomolcd.c linux-2.6.32.16/drivers/video/backlight/locomolcd.c |
28428 | --- linux-2.6.32.15/drivers/video/backlight/locomolcd.c 2010-03-15 11:52:04.000000000 -0400 | 28667 | --- linux-2.6.32.16/drivers/video/backlight/locomolcd.c 2010-07-05 14:14:00.000000000 -0400 |
28429 | +++ linux-2.6.32.15/drivers/video/backlight/locomolcd.c 2010-05-28 21:27:15.943207359 -0400 | 28668 | +++ linux-2.6.32.16/drivers/video/backlight/locomolcd.c 2010-07-09 14:50:37.000000000 -0400 |
28430 | @@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc | 28669 | @@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc |
28431 | return current_intensity; | 28670 | return current_intensity; |
28432 | } | 28671 | } |
@@ -28436,9 +28675,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/locomolcd.c linux-2.6.32.15/d | |||
28436 | .get_brightness = locomolcd_get_intensity, | 28675 | .get_brightness = locomolcd_get_intensity, |
28437 | .update_status = locomolcd_set_intensity, | 28676 | .update_status = locomolcd_set_intensity, |
28438 | }; | 28677 | }; |
28439 | 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 | 28678 | diff -urNp linux-2.6.32.16/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.16/drivers/video/backlight/mbp_nvidia_bl.c |
28440 | --- linux-2.6.32.15/drivers/video/backlight/mbp_nvidia_bl.c 2010-04-29 17:49:38.397382140 -0400 | 28679 | --- linux-2.6.32.16/drivers/video/backlight/mbp_nvidia_bl.c 2010-07-05 14:14:00.000000000 -0400 |
28441 | +++ linux-2.6.32.15/drivers/video/backlight/mbp_nvidia_bl.c 2010-05-28 21:27:15.943207359 -0400 | 28680 | +++ linux-2.6.32.16/drivers/video/backlight/mbp_nvidia_bl.c 2010-07-09 14:50:37.000000000 -0400 |
28442 | @@ -33,7 +33,7 @@ struct dmi_match_data { | 28681 | @@ -33,7 +33,7 @@ struct dmi_match_data { |
28443 | unsigned long iostart; | 28682 | unsigned long iostart; |
28444 | unsigned long iolen; | 28683 | unsigned long iolen; |
@@ -28448,9 +28687,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32. | |||
28448 | }; | 28687 | }; |
28449 | 28688 | ||
28450 | /* Module parameters. */ | 28689 | /* Module parameters. */ |
28451 | diff -urNp linux-2.6.32.15/drivers/video/backlight/omap1_bl.c linux-2.6.32.15/drivers/video/backlight/omap1_bl.c | 28690 | diff -urNp linux-2.6.32.16/drivers/video/backlight/omap1_bl.c linux-2.6.32.16/drivers/video/backlight/omap1_bl.c |
28452 | --- linux-2.6.32.15/drivers/video/backlight/omap1_bl.c 2010-03-15 11:52:04.000000000 -0400 | 28691 | --- linux-2.6.32.16/drivers/video/backlight/omap1_bl.c 2010-07-05 14:14:00.000000000 -0400 |
28453 | +++ linux-2.6.32.15/drivers/video/backlight/omap1_bl.c 2010-05-28 21:27:15.943207359 -0400 | 28692 | +++ linux-2.6.32.16/drivers/video/backlight/omap1_bl.c 2010-07-09 14:50:37.000000000 -0400 |
28454 | @@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b | 28693 | @@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b |
28455 | return bl->current_intensity; | 28694 | return bl->current_intensity; |
28456 | } | 28695 | } |
@@ -28460,9 +28699,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/omap1_bl.c linux-2.6.32.15/dr | |||
28460 | .get_brightness = omapbl_get_intensity, | 28699 | .get_brightness = omapbl_get_intensity, |
28461 | .update_status = omapbl_update_status, | 28700 | .update_status = omapbl_update_status, |
28462 | }; | 28701 | }; |
28463 | diff -urNp linux-2.6.32.15/drivers/video/backlight/progear_bl.c linux-2.6.32.15/drivers/video/backlight/progear_bl.c | 28702 | diff -urNp linux-2.6.32.16/drivers/video/backlight/progear_bl.c linux-2.6.32.16/drivers/video/backlight/progear_bl.c |
28464 | --- linux-2.6.32.15/drivers/video/backlight/progear_bl.c 2010-03-15 11:52:04.000000000 -0400 | 28703 | --- linux-2.6.32.16/drivers/video/backlight/progear_bl.c 2010-07-05 14:14:00.000000000 -0400 |
28465 | +++ linux-2.6.32.15/drivers/video/backlight/progear_bl.c 2010-05-28 21:27:15.943207359 -0400 | 28704 | +++ linux-2.6.32.16/drivers/video/backlight/progear_bl.c 2010-07-09 14:50:37.000000000 -0400 |
28466 | @@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc | 28705 | @@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc |
28467 | return intensity - HW_LEVEL_MIN; | 28706 | return intensity - HW_LEVEL_MIN; |
28468 | } | 28707 | } |
@@ -28472,9 +28711,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/progear_bl.c linux-2.6.32.15/ | |||
28472 | .get_brightness = progearbl_get_intensity, | 28711 | .get_brightness = progearbl_get_intensity, |
28473 | .update_status = progearbl_set_intensity, | 28712 | .update_status = progearbl_set_intensity, |
28474 | }; | 28713 | }; |
28475 | diff -urNp linux-2.6.32.15/drivers/video/backlight/pwm_bl.c linux-2.6.32.15/drivers/video/backlight/pwm_bl.c | 28714 | diff -urNp linux-2.6.32.16/drivers/video/backlight/pwm_bl.c linux-2.6.32.16/drivers/video/backlight/pwm_bl.c |
28476 | --- linux-2.6.32.15/drivers/video/backlight/pwm_bl.c 2010-03-15 11:52:04.000000000 -0400 | 28715 | --- linux-2.6.32.16/drivers/video/backlight/pwm_bl.c 2010-07-05 14:14:00.000000000 -0400 |
28477 | +++ linux-2.6.32.15/drivers/video/backlight/pwm_bl.c 2010-05-28 21:27:15.943207359 -0400 | 28716 | +++ linux-2.6.32.16/drivers/video/backlight/pwm_bl.c 2010-07-09 14:50:37.000000000 -0400 |
28478 | @@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness( | 28717 | @@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness( |
28479 | return bl->props.brightness; | 28718 | return bl->props.brightness; |
28480 | } | 28719 | } |
@@ -28484,9 +28723,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/pwm_bl.c linux-2.6.32.15/driv | |||
28484 | .update_status = pwm_backlight_update_status, | 28723 | .update_status = pwm_backlight_update_status, |
28485 | .get_brightness = pwm_backlight_get_brightness, | 28724 | .get_brightness = pwm_backlight_get_brightness, |
28486 | }; | 28725 | }; |
28487 | diff -urNp linux-2.6.32.15/drivers/video/backlight/tosa_bl.c linux-2.6.32.15/drivers/video/backlight/tosa_bl.c | 28726 | diff -urNp linux-2.6.32.16/drivers/video/backlight/tosa_bl.c linux-2.6.32.16/drivers/video/backlight/tosa_bl.c |
28488 | --- linux-2.6.32.15/drivers/video/backlight/tosa_bl.c 2010-03-15 11:52:04.000000000 -0400 | 28727 | --- linux-2.6.32.16/drivers/video/backlight/tosa_bl.c 2010-07-05 14:14:00.000000000 -0400 |
28489 | +++ linux-2.6.32.15/drivers/video/backlight/tosa_bl.c 2010-05-28 21:27:15.943207359 -0400 | 28728 | +++ linux-2.6.32.16/drivers/video/backlight/tosa_bl.c 2010-07-09 14:50:37.000000000 -0400 |
28490 | @@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct | 28729 | @@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct |
28491 | return props->brightness; | 28730 | return props->brightness; |
28492 | } | 28731 | } |
@@ -28496,9 +28735,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/tosa_bl.c linux-2.6.32.15/dri | |||
28496 | .get_brightness = tosa_bl_get_brightness, | 28735 | .get_brightness = tosa_bl_get_brightness, |
28497 | .update_status = tosa_bl_update_status, | 28736 | .update_status = tosa_bl_update_status, |
28498 | }; | 28737 | }; |
28499 | diff -urNp linux-2.6.32.15/drivers/video/backlight/wm831x_bl.c linux-2.6.32.15/drivers/video/backlight/wm831x_bl.c | 28738 | diff -urNp linux-2.6.32.16/drivers/video/backlight/wm831x_bl.c linux-2.6.32.16/drivers/video/backlight/wm831x_bl.c |
28500 | --- linux-2.6.32.15/drivers/video/backlight/wm831x_bl.c 2010-03-15 11:52:04.000000000 -0400 | 28739 | --- linux-2.6.32.16/drivers/video/backlight/wm831x_bl.c 2010-07-05 14:14:00.000000000 -0400 |
28501 | +++ linux-2.6.32.15/drivers/video/backlight/wm831x_bl.c 2010-05-28 21:27:15.943207359 -0400 | 28740 | +++ linux-2.6.32.16/drivers/video/backlight/wm831x_bl.c 2010-07-09 14:50:37.000000000 -0400 |
28502 | @@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne | 28741 | @@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne |
28503 | return data->current_brightness; | 28742 | return data->current_brightness; |
28504 | } | 28743 | } |
@@ -28508,9 +28747,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/wm831x_bl.c linux-2.6.32.15/d | |||
28508 | .options = BL_CORE_SUSPENDRESUME, | 28747 | .options = BL_CORE_SUSPENDRESUME, |
28509 | .update_status = wm831x_backlight_update_status, | 28748 | .update_status = wm831x_backlight_update_status, |
28510 | .get_brightness = wm831x_backlight_get_brightness, | 28749 | .get_brightness = wm831x_backlight_get_brightness, |
28511 | diff -urNp linux-2.6.32.15/drivers/video/bf54x-lq043fb.c linux-2.6.32.15/drivers/video/bf54x-lq043fb.c | 28750 | diff -urNp linux-2.6.32.16/drivers/video/bf54x-lq043fb.c linux-2.6.32.16/drivers/video/bf54x-lq043fb.c |
28512 | --- linux-2.6.32.15/drivers/video/bf54x-lq043fb.c 2010-03-15 11:52:04.000000000 -0400 | 28751 | --- linux-2.6.32.16/drivers/video/bf54x-lq043fb.c 2010-07-05 14:14:00.000000000 -0400 |
28513 | +++ linux-2.6.32.15/drivers/video/bf54x-lq043fb.c 2010-05-28 21:27:15.943207359 -0400 | 28752 | +++ linux-2.6.32.16/drivers/video/bf54x-lq043fb.c 2010-07-09 14:50:37.000000000 -0400 |
28514 | @@ -463,7 +463,7 @@ static int bl_get_brightness(struct back | 28753 | @@ -463,7 +463,7 @@ static int bl_get_brightness(struct back |
28515 | return 0; | 28754 | return 0; |
28516 | } | 28755 | } |
@@ -28520,9 +28759,9 @@ diff -urNp linux-2.6.32.15/drivers/video/bf54x-lq043fb.c linux-2.6.32.15/drivers | |||
28520 | .get_brightness = bl_get_brightness, | 28759 | .get_brightness = bl_get_brightness, |
28521 | }; | 28760 | }; |
28522 | 28761 | ||
28523 | diff -urNp linux-2.6.32.15/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.15/drivers/video/bfin-t350mcqb-fb.c | 28762 | diff -urNp linux-2.6.32.16/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.16/drivers/video/bfin-t350mcqb-fb.c |
28524 | --- linux-2.6.32.15/drivers/video/bfin-t350mcqb-fb.c 2010-05-28 20:16:44.454934408 -0400 | 28763 | --- linux-2.6.32.16/drivers/video/bfin-t350mcqb-fb.c 2010-07-05 14:14:00.000000000 -0400 |
28525 | +++ linux-2.6.32.15/drivers/video/bfin-t350mcqb-fb.c 2010-05-28 21:27:15.943207359 -0400 | 28764 | +++ linux-2.6.32.16/drivers/video/bfin-t350mcqb-fb.c 2010-07-09 14:50:37.000000000 -0400 |
28526 | @@ -381,7 +381,7 @@ static int bl_get_brightness(struct back | 28765 | @@ -381,7 +381,7 @@ static int bl_get_brightness(struct back |
28527 | return 0; | 28766 | return 0; |
28528 | } | 28767 | } |
@@ -28532,9 +28771,9 @@ diff -urNp linux-2.6.32.15/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.15/driv | |||
28532 | .get_brightness = bl_get_brightness, | 28771 | .get_brightness = bl_get_brightness, |
28533 | }; | 28772 | }; |
28534 | 28773 | ||
28535 | diff -urNp linux-2.6.32.15/drivers/video/fbcmap.c linux-2.6.32.15/drivers/video/fbcmap.c | 28774 | diff -urNp linux-2.6.32.16/drivers/video/fbcmap.c linux-2.6.32.16/drivers/video/fbcmap.c |
28536 | --- linux-2.6.32.15/drivers/video/fbcmap.c 2010-03-15 11:52:04.000000000 -0400 | 28775 | --- linux-2.6.32.16/drivers/video/fbcmap.c 2010-07-05 14:14:00.000000000 -0400 |
28537 | +++ linux-2.6.32.15/drivers/video/fbcmap.c 2010-05-28 21:27:15.943207359 -0400 | 28776 | +++ linux-2.6.32.16/drivers/video/fbcmap.c 2010-07-09 14:50:37.000000000 -0400 |
28538 | @@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user | 28777 | @@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user |
28539 | rc = -ENODEV; | 28778 | rc = -ENODEV; |
28540 | goto out; | 28779 | goto out; |
@@ -28545,9 +28784,9 @@ diff -urNp linux-2.6.32.15/drivers/video/fbcmap.c linux-2.6.32.15/drivers/video/ | |||
28545 | rc = -EINVAL; | 28784 | rc = -EINVAL; |
28546 | goto out1; | 28785 | goto out1; |
28547 | } | 28786 | } |
28548 | diff -urNp linux-2.6.32.15/drivers/video/fbmem.c linux-2.6.32.15/drivers/video/fbmem.c | 28787 | diff -urNp linux-2.6.32.16/drivers/video/fbmem.c linux-2.6.32.16/drivers/video/fbmem.c |
28549 | --- linux-2.6.32.15/drivers/video/fbmem.c 2010-03-15 11:52:04.000000000 -0400 | 28788 | --- linux-2.6.32.16/drivers/video/fbmem.c 2010-07-05 14:14:00.000000000 -0400 |
28550 | +++ linux-2.6.32.15/drivers/video/fbmem.c 2010-05-28 21:27:15.947209363 -0400 | 28789 | +++ linux-2.6.32.16/drivers/video/fbmem.c 2010-07-09 14:50:37.000000000 -0400 |
28551 | @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in | 28790 | @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in |
28552 | image->dx += image->width + 8; | 28791 | image->dx += image->width + 8; |
28553 | } | 28792 | } |
@@ -28575,9 +28814,9 @@ diff -urNp linux-2.6.32.15/drivers/video/fbmem.c linux-2.6.32.15/drivers/video/f | |||
28575 | return -EINVAL; | 28814 | return -EINVAL; |
28576 | if (!registered_fb[con2fb.framebuffer]) | 28815 | if (!registered_fb[con2fb.framebuffer]) |
28577 | request_module("fb%d", con2fb.framebuffer); | 28816 | request_module("fb%d", con2fb.framebuffer); |
28578 | diff -urNp linux-2.6.32.15/drivers/video/fbmon.c linux-2.6.32.15/drivers/video/fbmon.c | 28817 | diff -urNp linux-2.6.32.16/drivers/video/fbmon.c linux-2.6.32.16/drivers/video/fbmon.c |
28579 | --- linux-2.6.32.15/drivers/video/fbmon.c 2010-03-15 11:52:04.000000000 -0400 | 28818 | --- linux-2.6.32.16/drivers/video/fbmon.c 2010-07-05 14:14:00.000000000 -0400 |
28580 | +++ linux-2.6.32.15/drivers/video/fbmon.c 2010-05-28 21:27:15.947209363 -0400 | 28819 | +++ linux-2.6.32.16/drivers/video/fbmon.c 2010-07-09 14:50:37.000000000 -0400 |
28581 | @@ -45,7 +45,7 @@ | 28820 | @@ -45,7 +45,7 @@ |
28582 | #ifdef DEBUG | 28821 | #ifdef DEBUG |
28583 | #define DPRINTK(fmt, args...) printk(fmt,## args) | 28822 | #define DPRINTK(fmt, args...) printk(fmt,## args) |
@@ -28587,9 +28826,9 @@ diff -urNp linux-2.6.32.15/drivers/video/fbmon.c linux-2.6.32.15/drivers/video/f | |||
28587 | #endif | 28826 | #endif |
28588 | 28827 | ||
28589 | #define FBMON_FIX_HEADER 1 | 28828 | #define FBMON_FIX_HEADER 1 |
28590 | diff -urNp linux-2.6.32.15/drivers/video/i810/i810_accel.c linux-2.6.32.15/drivers/video/i810/i810_accel.c | 28829 | diff -urNp linux-2.6.32.16/drivers/video/i810/i810_accel.c linux-2.6.32.16/drivers/video/i810/i810_accel.c |
28591 | --- linux-2.6.32.15/drivers/video/i810/i810_accel.c 2010-03-15 11:52:04.000000000 -0400 | 28830 | --- linux-2.6.32.16/drivers/video/i810/i810_accel.c 2010-07-05 14:14:00.000000000 -0400 |
28592 | +++ linux-2.6.32.15/drivers/video/i810/i810_accel.c 2010-05-28 21:27:15.947209363 -0400 | 28831 | +++ linux-2.6.32.16/drivers/video/i810/i810_accel.c 2010-07-09 14:50:37.000000000 -0400 |
28593 | @@ -73,6 +73,7 @@ static inline int wait_for_space(struct | 28832 | @@ -73,6 +73,7 @@ static inline int wait_for_space(struct |
28594 | } | 28833 | } |
28595 | } | 28834 | } |
@@ -28598,9 +28837,9 @@ diff -urNp linux-2.6.32.15/drivers/video/i810/i810_accel.c linux-2.6.32.15/drive | |||
28598 | i810_report_error(mmio); | 28837 | i810_report_error(mmio); |
28599 | par->dev_flags |= LOCKUP; | 28838 | par->dev_flags |= LOCKUP; |
28600 | info->pixmap.scan_align = 1; | 28839 | info->pixmap.scan_align = 1; |
28601 | diff -urNp linux-2.6.32.15/drivers/video/i810/i810_main.c linux-2.6.32.15/drivers/video/i810/i810_main.c | 28840 | diff -urNp linux-2.6.32.16/drivers/video/i810/i810_main.c linux-2.6.32.16/drivers/video/i810/i810_main.c |
28602 | --- linux-2.6.32.15/drivers/video/i810/i810_main.c 2010-03-15 11:52:04.000000000 -0400 | 28841 | --- linux-2.6.32.16/drivers/video/i810/i810_main.c 2010-07-05 14:14:00.000000000 -0400 |
28603 | +++ linux-2.6.32.15/drivers/video/i810/i810_main.c 2010-05-28 21:27:15.987994154 -0400 | 28842 | +++ linux-2.6.32.16/drivers/video/i810/i810_main.c 2010-07-09 14:50:37.000000000 -0400 |
28604 | @@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t | 28843 | @@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t |
28605 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, | 28844 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, |
28606 | { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC, | 28845 | { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC, |
@@ -28610,9 +28849,9 @@ diff -urNp linux-2.6.32.15/drivers/video/i810/i810_main.c linux-2.6.32.15/driver | |||
28610 | }; | 28849 | }; |
28611 | 28850 | ||
28612 | static struct pci_driver i810fb_driver = { | 28851 | static struct pci_driver i810fb_driver = { |
28613 | diff -urNp linux-2.6.32.15/drivers/video/modedb.c linux-2.6.32.15/drivers/video/modedb.c | 28852 | diff -urNp linux-2.6.32.16/drivers/video/modedb.c linux-2.6.32.16/drivers/video/modedb.c |
28614 | --- linux-2.6.32.15/drivers/video/modedb.c 2010-03-15 11:52:04.000000000 -0400 | 28853 | --- linux-2.6.32.16/drivers/video/modedb.c 2010-07-05 14:14:00.000000000 -0400 |
28615 | +++ linux-2.6.32.15/drivers/video/modedb.c 2010-05-28 21:27:15.987994154 -0400 | 28854 | +++ linux-2.6.32.16/drivers/video/modedb.c 2010-07-09 14:50:37.000000000 -0400 |
28616 | @@ -38,240 +38,240 @@ static const struct fb_videomode modedb[ | 28855 | @@ -38,240 +38,240 @@ static const struct fb_videomode modedb[ |
28617 | { | 28856 | { |
28618 | /* 640x400 @ 70 Hz, 31.5 kHz hsync */ | 28857 | /* 640x400 @ 70 Hz, 31.5 kHz hsync */ |
@@ -28913,9 +29152,9 @@ diff -urNp linux-2.6.32.15/drivers/video/modedb.c linux-2.6.32.15/drivers/video/ | |||
28913 | }, | 29152 | }, |
28914 | }; | 29153 | }; |
28915 | 29154 | ||
28916 | diff -urNp linux-2.6.32.15/drivers/video/nvidia/nv_backlight.c linux-2.6.32.15/drivers/video/nvidia/nv_backlight.c | 29155 | diff -urNp linux-2.6.32.16/drivers/video/nvidia/nv_backlight.c linux-2.6.32.16/drivers/video/nvidia/nv_backlight.c |
28917 | --- linux-2.6.32.15/drivers/video/nvidia/nv_backlight.c 2010-03-15 11:52:04.000000000 -0400 | 29156 | --- linux-2.6.32.16/drivers/video/nvidia/nv_backlight.c 2010-07-05 14:14:00.000000000 -0400 |
28918 | +++ linux-2.6.32.15/drivers/video/nvidia/nv_backlight.c 2010-05-28 21:27:15.987994154 -0400 | 29157 | +++ linux-2.6.32.16/drivers/video/nvidia/nv_backlight.c 2010-07-09 14:50:37.000000000 -0400 |
28919 | @@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru | 29158 | @@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru |
28920 | return bd->props.brightness; | 29159 | return bd->props.brightness; |
28921 | } | 29160 | } |
@@ -28925,9 +29164,9 @@ diff -urNp linux-2.6.32.15/drivers/video/nvidia/nv_backlight.c linux-2.6.32.15/d | |||
28925 | .get_brightness = nvidia_bl_get_brightness, | 29164 | .get_brightness = nvidia_bl_get_brightness, |
28926 | .update_status = nvidia_bl_update_status, | 29165 | .update_status = nvidia_bl_update_status, |
28927 | }; | 29166 | }; |
28928 | diff -urNp linux-2.6.32.15/drivers/video/riva/fbdev.c linux-2.6.32.15/drivers/video/riva/fbdev.c | 29167 | diff -urNp linux-2.6.32.16/drivers/video/riva/fbdev.c linux-2.6.32.16/drivers/video/riva/fbdev.c |
28929 | --- linux-2.6.32.15/drivers/video/riva/fbdev.c 2010-03-15 11:52:04.000000000 -0400 | 29168 | --- linux-2.6.32.16/drivers/video/riva/fbdev.c 2010-07-05 14:14:00.000000000 -0400 |
28930 | +++ linux-2.6.32.15/drivers/video/riva/fbdev.c 2010-05-28 21:27:15.987994154 -0400 | 29169 | +++ linux-2.6.32.16/drivers/video/riva/fbdev.c 2010-07-09 14:50:37.000000000 -0400 |
28931 | @@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct | 29170 | @@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct |
28932 | return bd->props.brightness; | 29171 | return bd->props.brightness; |
28933 | } | 29172 | } |
@@ -28937,9 +29176,9 @@ diff -urNp linux-2.6.32.15/drivers/video/riva/fbdev.c linux-2.6.32.15/drivers/vi | |||
28937 | .get_brightness = riva_bl_get_brightness, | 29176 | .get_brightness = riva_bl_get_brightness, |
28938 | .update_status = riva_bl_update_status, | 29177 | .update_status = riva_bl_update_status, |
28939 | }; | 29178 | }; |
28940 | diff -urNp linux-2.6.32.15/drivers/video/uvesafb.c linux-2.6.32.15/drivers/video/uvesafb.c | 29179 | diff -urNp linux-2.6.32.16/drivers/video/uvesafb.c linux-2.6.32.16/drivers/video/uvesafb.c |
28941 | --- linux-2.6.32.15/drivers/video/uvesafb.c 2010-03-15 11:52:04.000000000 -0400 | 29180 | --- linux-2.6.32.16/drivers/video/uvesafb.c 2010-07-05 14:14:00.000000000 -0400 |
28942 | +++ linux-2.6.32.15/drivers/video/uvesafb.c 2010-05-28 21:27:15.987994154 -0400 | 29181 | +++ linux-2.6.32.16/drivers/video/uvesafb.c 2010-07-09 14:50:37.000000000 -0400 |
28943 | @@ -18,6 +18,7 @@ | 29182 | @@ -18,6 +18,7 @@ |
28944 | #include <linux/fb.h> | 29183 | #include <linux/fb.h> |
28945 | #include <linux/io.h> | 29184 | #include <linux/io.h> |
@@ -29015,9 +29254,9 @@ diff -urNp linux-2.6.32.15/drivers/video/uvesafb.c linux-2.6.32.15/drivers/video | |||
29015 | } | 29254 | } |
29016 | 29255 | ||
29017 | framebuffer_release(info); | 29256 | framebuffer_release(info); |
29018 | diff -urNp linux-2.6.32.15/drivers/video/vesafb.c linux-2.6.32.15/drivers/video/vesafb.c | 29257 | diff -urNp linux-2.6.32.16/drivers/video/vesafb.c linux-2.6.32.16/drivers/video/vesafb.c |
29019 | --- linux-2.6.32.15/drivers/video/vesafb.c 2010-03-15 11:52:04.000000000 -0400 | 29258 | --- linux-2.6.32.16/drivers/video/vesafb.c 2010-07-05 14:14:00.000000000 -0400 |
29020 | +++ linux-2.6.32.15/drivers/video/vesafb.c 2010-05-28 21:27:15.987994154 -0400 | 29259 | +++ linux-2.6.32.16/drivers/video/vesafb.c 2010-07-09 14:50:37.000000000 -0400 |
29021 | @@ -9,6 +9,7 @@ | 29260 | @@ -9,6 +9,7 @@ |
29022 | */ | 29261 | */ |
29023 | 29262 | ||
@@ -29121,9 +29360,9 @@ diff -urNp linux-2.6.32.15/drivers/video/vesafb.c linux-2.6.32.15/drivers/video/ | |||
29121 | if (info->screen_base) | 29360 | if (info->screen_base) |
29122 | iounmap(info->screen_base); | 29361 | iounmap(info->screen_base); |
29123 | framebuffer_release(info); | 29362 | framebuffer_release(info); |
29124 | diff -urNp linux-2.6.32.15/drivers/xen/sys-hypervisor.c linux-2.6.32.15/drivers/xen/sys-hypervisor.c | 29363 | diff -urNp linux-2.6.32.16/drivers/xen/sys-hypervisor.c linux-2.6.32.16/drivers/xen/sys-hypervisor.c |
29125 | --- linux-2.6.32.15/drivers/xen/sys-hypervisor.c 2010-03-15 11:52:04.000000000 -0400 | 29364 | --- linux-2.6.32.16/drivers/xen/sys-hypervisor.c 2010-07-05 14:14:00.000000000 -0400 |
29126 | +++ linux-2.6.32.15/drivers/xen/sys-hypervisor.c 2010-05-28 21:27:15.987994154 -0400 | 29365 | +++ linux-2.6.32.16/drivers/xen/sys-hypervisor.c 2010-07-09 14:50:37.000000000 -0400 |
29127 | @@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko | 29366 | @@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko |
29128 | return 0; | 29367 | return 0; |
29129 | } | 29368 | } |
@@ -29133,9 +29372,9 @@ diff -urNp linux-2.6.32.15/drivers/xen/sys-hypervisor.c linux-2.6.32.15/drivers/ | |||
29133 | .show = hyp_sysfs_show, | 29372 | .show = hyp_sysfs_show, |
29134 | .store = hyp_sysfs_store, | 29373 | .store = hyp_sysfs_store, |
29135 | }; | 29374 | }; |
29136 | diff -urNp linux-2.6.32.15/fs/9p/vfs_inode.c linux-2.6.32.15/fs/9p/vfs_inode.c | 29375 | diff -urNp linux-2.6.32.16/fs/9p/vfs_inode.c linux-2.6.32.16/fs/9p/vfs_inode.c |
29137 | --- linux-2.6.32.15/fs/9p/vfs_inode.c 2010-03-15 11:52:04.000000000 -0400 | 29376 | --- linux-2.6.32.16/fs/9p/vfs_inode.c 2010-07-05 14:14:00.000000000 -0400 |
29138 | +++ linux-2.6.32.15/fs/9p/vfs_inode.c 2010-05-28 21:27:15.987994154 -0400 | 29377 | +++ linux-2.6.32.16/fs/9p/vfs_inode.c 2010-07-09 14:50:37.000000000 -0400 |
29139 | @@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct | 29378 | @@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct |
29140 | static void | 29379 | static void |
29141 | v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) | 29380 | v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) |
@@ -29145,9 +29384,9 @@ diff -urNp linux-2.6.32.15/fs/9p/vfs_inode.c linux-2.6.32.15/fs/9p/vfs_inode.c | |||
29145 | 29384 | ||
29146 | P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, | 29385 | P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, |
29147 | IS_ERR(s) ? "<error>" : s); | 29386 | IS_ERR(s) ? "<error>" : s); |
29148 | diff -urNp linux-2.6.32.15/fs/aio.c linux-2.6.32.15/fs/aio.c | 29387 | diff -urNp linux-2.6.32.16/fs/aio.c linux-2.6.32.16/fs/aio.c |
29149 | --- linux-2.6.32.15/fs/aio.c 2010-03-15 11:52:04.000000000 -0400 | 29388 | --- linux-2.6.32.16/fs/aio.c 2010-07-05 14:14:00.000000000 -0400 |
29150 | +++ linux-2.6.32.15/fs/aio.c 2010-05-28 21:27:15.995209124 -0400 | 29389 | +++ linux-2.6.32.16/fs/aio.c 2010-07-09 14:50:37.000000000 -0400 |
29151 | @@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx | 29390 | @@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx |
29152 | size += sizeof(struct io_event) * nr_events; | 29391 | size += sizeof(struct io_event) * nr_events; |
29153 | nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; | 29392 | nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; |
@@ -29157,9 +29396,9 @@ diff -urNp linux-2.6.32.15/fs/aio.c linux-2.6.32.15/fs/aio.c | |||
29157 | return -EINVAL; | 29396 | return -EINVAL; |
29158 | 29397 | ||
29159 | nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); | 29398 | nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); |
29160 | diff -urNp linux-2.6.32.15/fs/attr.c linux-2.6.32.15/fs/attr.c | 29399 | diff -urNp linux-2.6.32.16/fs/attr.c linux-2.6.32.16/fs/attr.c |
29161 | --- linux-2.6.32.15/fs/attr.c 2010-03-15 11:52:04.000000000 -0400 | 29400 | --- linux-2.6.32.16/fs/attr.c 2010-07-05 14:14:00.000000000 -0400 |
29162 | +++ linux-2.6.32.15/fs/attr.c 2010-05-28 21:27:15.995209124 -0400 | 29401 | +++ linux-2.6.32.16/fs/attr.c 2010-07-09 14:50:37.000000000 -0400 |
29163 | @@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode | 29402 | @@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode |
29164 | unsigned long limit; | 29403 | unsigned long limit; |
29165 | 29404 | ||
@@ -29168,9 +29407,9 @@ diff -urNp linux-2.6.32.15/fs/attr.c linux-2.6.32.15/fs/attr.c | |||
29168 | if (limit != RLIM_INFINITY && offset > limit) | 29407 | if (limit != RLIM_INFINITY && offset > limit) |
29169 | goto out_sig; | 29408 | goto out_sig; |
29170 | if (offset > inode->i_sb->s_maxbytes) | 29409 | if (offset > inode->i_sb->s_maxbytes) |
29171 | diff -urNp linux-2.6.32.15/fs/autofs/root.c linux-2.6.32.15/fs/autofs/root.c | 29410 | diff -urNp linux-2.6.32.16/fs/autofs/root.c linux-2.6.32.16/fs/autofs/root.c |
29172 | --- linux-2.6.32.15/fs/autofs/root.c 2010-03-15 11:52:04.000000000 -0400 | 29411 | --- linux-2.6.32.16/fs/autofs/root.c 2010-07-05 14:14:00.000000000 -0400 |
29173 | +++ linux-2.6.32.15/fs/autofs/root.c 2010-05-28 21:27:15.995209124 -0400 | 29412 | +++ linux-2.6.32.16/fs/autofs/root.c 2010-07-09 14:50:37.000000000 -0400 |
29174 | @@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in | 29413 | @@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in |
29175 | set_bit(n,sbi->symlink_bitmap); | 29414 | set_bit(n,sbi->symlink_bitmap); |
29176 | sl = &sbi->symlink[n]; | 29415 | sl = &sbi->symlink[n]; |
@@ -29181,9 +29420,9 @@ diff -urNp linux-2.6.32.15/fs/autofs/root.c linux-2.6.32.15/fs/autofs/root.c | |||
29181 | if (!sl->data) { | 29420 | if (!sl->data) { |
29182 | clear_bit(n,sbi->symlink_bitmap); | 29421 | clear_bit(n,sbi->symlink_bitmap); |
29183 | unlock_kernel(); | 29422 | unlock_kernel(); |
29184 | diff -urNp linux-2.6.32.15/fs/autofs4/symlink.c linux-2.6.32.15/fs/autofs4/symlink.c | 29423 | diff -urNp linux-2.6.32.16/fs/autofs4/symlink.c linux-2.6.32.16/fs/autofs4/symlink.c |
29185 | --- linux-2.6.32.15/fs/autofs4/symlink.c 2010-03-15 11:52:04.000000000 -0400 | 29424 | --- linux-2.6.32.16/fs/autofs4/symlink.c 2010-07-05 14:14:00.000000000 -0400 |
29186 | +++ linux-2.6.32.15/fs/autofs4/symlink.c 2010-05-28 21:27:15.995209124 -0400 | 29425 | +++ linux-2.6.32.16/fs/autofs4/symlink.c 2010-07-09 14:50:37.000000000 -0400 |
29187 | @@ -15,7 +15,7 @@ | 29426 | @@ -15,7 +15,7 @@ |
29188 | static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) | 29427 | static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) |
29189 | { | 29428 | { |
@@ -29193,9 +29432,9 @@ diff -urNp linux-2.6.32.15/fs/autofs4/symlink.c linux-2.6.32.15/fs/autofs4/symli | |||
29193 | return NULL; | 29432 | return NULL; |
29194 | } | 29433 | } |
29195 | 29434 | ||
29196 | diff -urNp linux-2.6.32.15/fs/befs/linuxvfs.c linux-2.6.32.15/fs/befs/linuxvfs.c | 29435 | diff -urNp linux-2.6.32.16/fs/befs/linuxvfs.c linux-2.6.32.16/fs/befs/linuxvfs.c |
29197 | --- linux-2.6.32.15/fs/befs/linuxvfs.c 2010-03-15 11:52:04.000000000 -0400 | 29436 | --- linux-2.6.32.16/fs/befs/linuxvfs.c 2010-07-05 14:14:00.000000000 -0400 |
29198 | +++ linux-2.6.32.15/fs/befs/linuxvfs.c 2010-05-28 21:27:16.011217374 -0400 | 29437 | +++ linux-2.6.32.16/fs/befs/linuxvfs.c 2010-07-09 14:50:37.000000000 -0400 |
29199 | @@ -493,7 +493,7 @@ static void befs_put_link(struct dentry | 29438 | @@ -493,7 +493,7 @@ static void befs_put_link(struct dentry |
29200 | { | 29439 | { |
29201 | befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); | 29440 | befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); |
@@ -29205,9 +29444,9 @@ diff -urNp linux-2.6.32.15/fs/befs/linuxvfs.c linux-2.6.32.15/fs/befs/linuxvfs.c | |||
29205 | if (!IS_ERR(link)) | 29444 | if (!IS_ERR(link)) |
29206 | kfree(link); | 29445 | kfree(link); |
29207 | } | 29446 | } |
29208 | diff -urNp linux-2.6.32.15/fs/binfmt_aout.c linux-2.6.32.15/fs/binfmt_aout.c | 29447 | diff -urNp linux-2.6.32.16/fs/binfmt_aout.c linux-2.6.32.16/fs/binfmt_aout.c |
29209 | --- linux-2.6.32.15/fs/binfmt_aout.c 2010-03-15 11:52:04.000000000 -0400 | 29448 | --- linux-2.6.32.16/fs/binfmt_aout.c 2010-07-05 14:14:00.000000000 -0400 |
29210 | +++ linux-2.6.32.15/fs/binfmt_aout.c 2010-05-28 21:27:16.011217374 -0400 | 29449 | +++ linux-2.6.32.16/fs/binfmt_aout.c 2010-07-09 14:50:37.000000000 -0400 |
29211 | @@ -16,6 +16,7 @@ | 29450 | @@ -16,6 +16,7 @@ |
29212 | #include <linux/string.h> | 29451 | #include <linux/string.h> |
29213 | #include <linux/fs.h> | 29452 | #include <linux/fs.h> |
@@ -29275,9 +29514,9 @@ diff -urNp linux-2.6.32.15/fs/binfmt_aout.c linux-2.6.32.15/fs/binfmt_aout.c | |||
29275 | MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, | 29514 | MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, |
29276 | fd_offset + ex.a_text); | 29515 | fd_offset + ex.a_text); |
29277 | up_write(¤t->mm->mmap_sem); | 29516 | up_write(¤t->mm->mmap_sem); |
29278 | diff -urNp linux-2.6.32.15/fs/binfmt_elf.c linux-2.6.32.15/fs/binfmt_elf.c | 29517 | diff -urNp linux-2.6.32.16/fs/binfmt_elf.c linux-2.6.32.16/fs/binfmt_elf.c |
29279 | --- linux-2.6.32.15/fs/binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400 | 29518 | --- linux-2.6.32.16/fs/binfmt_elf.c 2010-07-05 14:14:00.000000000 -0400 |
29280 | +++ linux-2.6.32.15/fs/binfmt_elf.c 2010-05-28 21:27:16.011217374 -0400 | 29519 | +++ linux-2.6.32.16/fs/binfmt_elf.c 2010-07-09 14:50:37.000000000 -0400 |
29281 | @@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str | 29520 | @@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str |
29282 | #define elf_core_dump NULL | 29521 | #define elf_core_dump NULL |
29283 | #endif | 29522 | #endif |
@@ -29913,9 +30152,9 @@ diff -urNp linux-2.6.32.15/fs/binfmt_elf.c linux-2.6.32.15/fs/binfmt_elf.c | |||
29913 | static int __init init_elf_binfmt(void) | 30152 | static int __init init_elf_binfmt(void) |
29914 | { | 30153 | { |
29915 | return register_binfmt(&elf_format); | 30154 | return register_binfmt(&elf_format); |
29916 | diff -urNp linux-2.6.32.15/fs/binfmt_flat.c linux-2.6.32.15/fs/binfmt_flat.c | 30155 | diff -urNp linux-2.6.32.16/fs/binfmt_flat.c linux-2.6.32.16/fs/binfmt_flat.c |
29917 | --- linux-2.6.32.15/fs/binfmt_flat.c 2010-03-15 11:52:04.000000000 -0400 | 30156 | --- linux-2.6.32.16/fs/binfmt_flat.c 2010-07-05 14:14:00.000000000 -0400 |
29918 | +++ linux-2.6.32.15/fs/binfmt_flat.c 2010-05-28 21:27:16.018905555 -0400 | 30157 | +++ linux-2.6.32.16/fs/binfmt_flat.c 2010-07-09 14:50:37.000000000 -0400 |
29919 | @@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b | 30158 | @@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b |
29920 | realdatastart = (unsigned long) -ENOMEM; | 30159 | realdatastart = (unsigned long) -ENOMEM; |
29921 | printk("Unable to allocate RAM for process data, errno %d\n", | 30160 | printk("Unable to allocate RAM for process data, errno %d\n", |
@@ -29948,9 +30187,9 @@ diff -urNp linux-2.6.32.15/fs/binfmt_flat.c linux-2.6.32.15/fs/binfmt_flat.c | |||
29948 | ret = result; | 30187 | ret = result; |
29949 | goto err; | 30188 | goto err; |
29950 | } | 30189 | } |
29951 | diff -urNp linux-2.6.32.15/fs/binfmt_misc.c linux-2.6.32.15/fs/binfmt_misc.c | 30190 | diff -urNp linux-2.6.32.16/fs/binfmt_misc.c linux-2.6.32.16/fs/binfmt_misc.c |
29952 | --- linux-2.6.32.15/fs/binfmt_misc.c 2010-03-15 11:52:04.000000000 -0400 | 30191 | --- linux-2.6.32.16/fs/binfmt_misc.c 2010-07-05 14:14:00.000000000 -0400 |
29953 | +++ linux-2.6.32.15/fs/binfmt_misc.c 2010-05-28 21:27:16.018905555 -0400 | 30192 | +++ linux-2.6.32.16/fs/binfmt_misc.c 2010-07-09 14:50:37.000000000 -0400 |
29954 | @@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl | 30193 | @@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl |
29955 | static struct tree_descr bm_files[] = { | 30194 | static struct tree_descr bm_files[] = { |
29956 | [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO}, | 30195 | [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO}, |
@@ -29960,9 +30199,9 @@ diff -urNp linux-2.6.32.15/fs/binfmt_misc.c linux-2.6.32.15/fs/binfmt_misc.c | |||
29960 | }; | 30199 | }; |
29961 | int err = simple_fill_super(sb, 0x42494e4d, bm_files); | 30200 | int err = simple_fill_super(sb, 0x42494e4d, bm_files); |
29962 | if (!err) | 30201 | if (!err) |
29963 | diff -urNp linux-2.6.32.15/fs/bio.c linux-2.6.32.15/fs/bio.c | 30202 | diff -urNp linux-2.6.32.16/fs/bio.c linux-2.6.32.16/fs/bio.c |
29964 | --- linux-2.6.32.15/fs/bio.c 2010-03-15 11:52:04.000000000 -0400 | 30203 | --- linux-2.6.32.16/fs/bio.c 2010-07-05 14:14:00.000000000 -0400 |
29965 | +++ linux-2.6.32.15/fs/bio.c 2010-05-28 21:27:16.018905555 -0400 | 30204 | +++ linux-2.6.32.16/fs/bio.c 2010-07-09 14:50:37.000000000 -0400 |
29966 | @@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr | 30205 | @@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr |
29967 | 30206 | ||
29968 | i = 0; | 30207 | i = 0; |
@@ -29981,9 +30220,9 @@ diff -urNp linux-2.6.32.15/fs/bio.c linux-2.6.32.15/fs/bio.c | |||
29981 | 30220 | ||
29982 | __bio_for_each_segment(bvec, bio, i, 0) { | 30221 | __bio_for_each_segment(bvec, bio, i, 0) { |
29983 | char *addr = page_address(bvec->bv_page); | 30222 | char *addr = page_address(bvec->bv_page); |
29984 | diff -urNp linux-2.6.32.15/fs/block_dev.c linux-2.6.32.15/fs/block_dev.c | 30223 | diff -urNp linux-2.6.32.16/fs/block_dev.c linux-2.6.32.16/fs/block_dev.c |
29985 | --- linux-2.6.32.15/fs/block_dev.c 2010-04-29 17:49:38.421500081 -0400 | 30224 | --- linux-2.6.32.16/fs/block_dev.c 2010-07-05 14:14:00.000000000 -0400 |
29986 | +++ linux-2.6.32.15/fs/block_dev.c 2010-05-28 21:27:16.030907926 -0400 | 30225 | +++ linux-2.6.32.16/fs/block_dev.c 2010-07-09 14:50:37.000000000 -0400 |
29987 | @@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev, | 30226 | @@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev, |
29988 | else if (bdev->bd_contains == bdev) | 30227 | else if (bdev->bd_contains == bdev) |
29989 | res = 0; /* is a whole device which isn't held */ | 30228 | res = 0; /* is a whole device which isn't held */ |
@@ -29993,9 +30232,9 @@ diff -urNp linux-2.6.32.15/fs/block_dev.c linux-2.6.32.15/fs/block_dev.c | |||
29993 | res = 0; /* is a partition of a device that is being partitioned */ | 30232 | res = 0; /* is a partition of a device that is being partitioned */ |
29994 | else if (bdev->bd_contains->bd_holder != NULL) | 30233 | else if (bdev->bd_contains->bd_holder != NULL) |
29995 | res = -EBUSY; /* is a partition of a held device */ | 30234 | res = -EBUSY; /* is a partition of a held device */ |
29996 | diff -urNp linux-2.6.32.15/fs/btrfs/ctree.c linux-2.6.32.15/fs/btrfs/ctree.c | 30235 | diff -urNp linux-2.6.32.16/fs/btrfs/ctree.c linux-2.6.32.16/fs/btrfs/ctree.c |
29997 | --- linux-2.6.32.15/fs/btrfs/ctree.c 2010-03-15 11:52:04.000000000 -0400 | 30236 | --- linux-2.6.32.16/fs/btrfs/ctree.c 2010-07-05 14:14:00.000000000 -0400 |
29998 | +++ linux-2.6.32.15/fs/btrfs/ctree.c 2010-05-28 21:27:16.047217370 -0400 | 30237 | +++ linux-2.6.32.16/fs/btrfs/ctree.c 2010-07-09 14:50:37.000000000 -0400 |
29999 | @@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran | 30238 | @@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran |
30000 | 30239 | ||
30001 | ret = 0; | 30240 | ret = 0; |
@@ -30004,9 +30243,9 @@ diff -urNp linux-2.6.32.15/fs/btrfs/ctree.c linux-2.6.32.15/fs/btrfs/ctree.c | |||
30004 | btrfs_cpu_key_to_disk(&disk_key, cpu_key); | 30243 | btrfs_cpu_key_to_disk(&disk_key, cpu_key); |
30005 | ret = fixup_low_keys(trans, root, path, &disk_key, 1); | 30244 | ret = fixup_low_keys(trans, root, path, &disk_key, 1); |
30006 | } | 30245 | } |
30007 | diff -urNp linux-2.6.32.15/fs/btrfs/disk-io.c linux-2.6.32.15/fs/btrfs/disk-io.c | 30246 | diff -urNp linux-2.6.32.16/fs/btrfs/disk-io.c linux-2.6.32.16/fs/btrfs/disk-io.c |
30008 | --- linux-2.6.32.15/fs/btrfs/disk-io.c 2010-03-15 11:52:04.000000000 -0400 | 30247 | --- linux-2.6.32.16/fs/btrfs/disk-io.c 2010-07-05 14:14:00.000000000 -0400 |
30009 | +++ linux-2.6.32.15/fs/btrfs/disk-io.c 2010-05-28 21:27:16.055226050 -0400 | 30248 | +++ linux-2.6.32.16/fs/btrfs/disk-io.c 2010-07-09 14:50:37.000000000 -0400 |
30010 | @@ -39,7 +39,7 @@ | 30249 | @@ -39,7 +39,7 @@ |
30011 | #include "tree-log.h" | 30250 | #include "tree-log.h" |
30012 | #include "free-space-cache.h" | 30251 | #include "free-space-cache.h" |
@@ -30025,9 +30264,9 @@ diff -urNp linux-2.6.32.15/fs/btrfs/disk-io.c linux-2.6.32.15/fs/btrfs/disk-io.c | |||
30025 | .write_cache_pages_lock_hook = btree_lock_page_hook, | 30264 | .write_cache_pages_lock_hook = btree_lock_page_hook, |
30026 | .readpage_end_io_hook = btree_readpage_end_io_hook, | 30265 | .readpage_end_io_hook = btree_readpage_end_io_hook, |
30027 | .submit_bio_hook = btree_submit_bio_hook, | 30266 | .submit_bio_hook = btree_submit_bio_hook, |
30028 | diff -urNp linux-2.6.32.15/fs/btrfs/extent_io.h linux-2.6.32.15/fs/btrfs/extent_io.h | 30267 | diff -urNp linux-2.6.32.16/fs/btrfs/extent_io.h linux-2.6.32.16/fs/btrfs/extent_io.h |
30029 | --- linux-2.6.32.15/fs/btrfs/extent_io.h 2010-03-15 11:52:04.000000000 -0400 | 30268 | --- linux-2.6.32.16/fs/btrfs/extent_io.h 2010-07-05 14:14:00.000000000 -0400 |
30030 | +++ linux-2.6.32.15/fs/btrfs/extent_io.h 2010-05-28 21:27:16.055226050 -0400 | 30269 | +++ linux-2.6.32.16/fs/btrfs/extent_io.h 2010-07-09 14:50:37.000000000 -0400 |
30031 | @@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s | 30270 | @@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s |
30032 | struct bio *bio, int mirror_num, | 30271 | struct bio *bio, int mirror_num, |
30033 | unsigned long bio_flags); | 30272 | unsigned long bio_flags); |
@@ -30088,9 +30327,9 @@ diff -urNp linux-2.6.32.15/fs/btrfs/extent_io.h linux-2.6.32.15/fs/btrfs/extent_ | |||
30088 | }; | 30327 | }; |
30089 | 30328 | ||
30090 | struct extent_state { | 30329 | struct extent_state { |
30091 | diff -urNp linux-2.6.32.15/fs/btrfs/free-space-cache.c linux-2.6.32.15/fs/btrfs/free-space-cache.c | 30330 | diff -urNp linux-2.6.32.16/fs/btrfs/free-space-cache.c linux-2.6.32.16/fs/btrfs/free-space-cache.c |
30092 | --- linux-2.6.32.15/fs/btrfs/free-space-cache.c 2010-03-15 11:52:04.000000000 -0400 | 30331 | --- linux-2.6.32.16/fs/btrfs/free-space-cache.c 2010-07-05 14:14:00.000000000 -0400 |
30093 | +++ linux-2.6.32.15/fs/btrfs/free-space-cache.c 2010-05-28 21:27:16.067008196 -0400 | 30332 | +++ linux-2.6.32.16/fs/btrfs/free-space-cache.c 2010-07-09 14:50:37.000000000 -0400 |
30094 | @@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf | 30333 | @@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf |
30095 | 30334 | ||
30096 | while(1) { | 30335 | while(1) { |
@@ -30109,9 +30348,9 @@ diff -urNp linux-2.6.32.15/fs/btrfs/free-space-cache.c linux-2.6.32.15/fs/btrfs/ | |||
30109 | 30348 | ||
30110 | if (entry->bitmap && entry->bytes > bytes + empty_size) { | 30349 | if (entry->bitmap && entry->bytes > bytes + empty_size) { |
30111 | ret = btrfs_bitmap_cluster(block_group, entry, cluster, | 30350 | ret = btrfs_bitmap_cluster(block_group, entry, cluster, |
30112 | diff -urNp linux-2.6.32.15/fs/btrfs/inode.c linux-2.6.32.15/fs/btrfs/inode.c | 30351 | diff -urNp linux-2.6.32.16/fs/btrfs/inode.c linux-2.6.32.16/fs/btrfs/inode.c |
30113 | --- linux-2.6.32.15/fs/btrfs/inode.c 2010-03-15 11:52:04.000000000 -0400 | 30352 | --- linux-2.6.32.16/fs/btrfs/inode.c 2010-07-05 14:14:00.000000000 -0400 |
30114 | +++ linux-2.6.32.15/fs/btrfs/inode.c 2010-05-28 21:27:16.071504594 -0400 | 30353 | +++ linux-2.6.32.16/fs/btrfs/inode.c 2010-07-09 14:50:37.000000000 -0400 |
30115 | @@ -63,7 +63,7 @@ static const struct inode_operations btr | 30354 | @@ -63,7 +63,7 @@ static const struct inode_operations btr |
30116 | static const struct address_space_operations btrfs_aops; | 30355 | static const struct address_space_operations btrfs_aops; |
30117 | static const struct address_space_operations btrfs_symlink_aops; | 30356 | static const struct address_space_operations btrfs_symlink_aops; |
@@ -30130,9 +30369,9 @@ diff -urNp linux-2.6.32.15/fs/btrfs/inode.c linux-2.6.32.15/fs/btrfs/inode.c | |||
30130 | .fill_delalloc = run_delalloc_range, | 30369 | .fill_delalloc = run_delalloc_range, |
30131 | .submit_bio_hook = btrfs_submit_bio_hook, | 30370 | .submit_bio_hook = btrfs_submit_bio_hook, |
30132 | .merge_bio_hook = btrfs_merge_bio_hook, | 30371 | .merge_bio_hook = btrfs_merge_bio_hook, |
30133 | diff -urNp linux-2.6.32.15/fs/btrfs/sysfs.c linux-2.6.32.15/fs/btrfs/sysfs.c | 30372 | diff -urNp linux-2.6.32.16/fs/btrfs/sysfs.c linux-2.6.32.16/fs/btrfs/sysfs.c |
30134 | --- linux-2.6.32.15/fs/btrfs/sysfs.c 2010-03-15 11:52:04.000000000 -0400 | 30373 | --- linux-2.6.32.16/fs/btrfs/sysfs.c 2010-07-05 14:14:00.000000000 -0400 |
30135 | +++ linux-2.6.32.15/fs/btrfs/sysfs.c 2010-05-28 21:27:16.071504594 -0400 | 30374 | +++ linux-2.6.32.16/fs/btrfs/sysfs.c 2010-07-09 14:50:37.000000000 -0400 |
30136 | @@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko | 30375 | @@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko |
30137 | complete(&root->kobj_unregister); | 30376 | complete(&root->kobj_unregister); |
30138 | } | 30377 | } |
@@ -30148,9 +30387,9 @@ diff -urNp linux-2.6.32.15/fs/btrfs/sysfs.c linux-2.6.32.15/fs/btrfs/sysfs.c | |||
30148 | .show = btrfs_root_attr_show, | 30387 | .show = btrfs_root_attr_show, |
30149 | .store = btrfs_root_attr_store, | 30388 | .store = btrfs_root_attr_store, |
30150 | }; | 30389 | }; |
30151 | diff -urNp linux-2.6.32.15/fs/buffer.c linux-2.6.32.15/fs/buffer.c | 30390 | diff -urNp linux-2.6.32.16/fs/buffer.c linux-2.6.32.16/fs/buffer.c |
30152 | --- linux-2.6.32.15/fs/buffer.c 2010-03-15 11:52:04.000000000 -0400 | 30391 | --- linux-2.6.32.16/fs/buffer.c 2010-07-05 14:14:00.000000000 -0400 |
30153 | +++ linux-2.6.32.15/fs/buffer.c 2010-05-28 21:27:16.083222448 -0400 | 30392 | +++ linux-2.6.32.16/fs/buffer.c 2010-07-09 14:50:37.000000000 -0400 |
30154 | @@ -25,6 +25,7 @@ | 30393 | @@ -25,6 +25,7 @@ |
30155 | #include <linux/percpu.h> | 30394 | #include <linux/percpu.h> |
30156 | #include <linux/slab.h> | 30395 | #include <linux/slab.h> |
@@ -30159,9 +30398,9 @@ diff -urNp linux-2.6.32.15/fs/buffer.c linux-2.6.32.15/fs/buffer.c | |||
30159 | #include <linux/blkdev.h> | 30398 | #include <linux/blkdev.h> |
30160 | #include <linux/file.h> | 30399 | #include <linux/file.h> |
30161 | #include <linux/quotaops.h> | 30400 | #include <linux/quotaops.h> |
30162 | diff -urNp linux-2.6.32.15/fs/cachefiles/bind.c linux-2.6.32.15/fs/cachefiles/bind.c | 30401 | diff -urNp linux-2.6.32.16/fs/cachefiles/bind.c linux-2.6.32.16/fs/cachefiles/bind.c |
30163 | --- linux-2.6.32.15/fs/cachefiles/bind.c 2010-03-15 11:52:04.000000000 -0400 | 30402 | --- linux-2.6.32.16/fs/cachefiles/bind.c 2010-07-05 14:14:00.000000000 -0400 |
30164 | +++ linux-2.6.32.15/fs/cachefiles/bind.c 2010-05-28 21:27:16.083222448 -0400 | 30403 | +++ linux-2.6.32.16/fs/cachefiles/bind.c 2010-07-09 14:50:37.000000000 -0400 |
30165 | @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef | 30404 | @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef |
30166 | args); | 30405 | args); |
30167 | 30406 | ||
@@ -30178,9 +30417,9 @@ diff -urNp linux-2.6.32.15/fs/cachefiles/bind.c linux-2.6.32.15/fs/cachefiles/bi | |||
30178 | cache->bcull_percent < cache->brun_percent && | 30417 | cache->bcull_percent < cache->brun_percent && |
30179 | cache->brun_percent < 100); | 30418 | cache->brun_percent < 100); |
30180 | 30419 | ||
30181 | diff -urNp linux-2.6.32.15/fs/cachefiles/daemon.c linux-2.6.32.15/fs/cachefiles/daemon.c | 30420 | diff -urNp linux-2.6.32.16/fs/cachefiles/daemon.c linux-2.6.32.16/fs/cachefiles/daemon.c |
30182 | --- linux-2.6.32.15/fs/cachefiles/daemon.c 2010-03-15 11:52:04.000000000 -0400 | 30421 | --- linux-2.6.32.16/fs/cachefiles/daemon.c 2010-07-05 14:14:00.000000000 -0400 |
30183 | +++ linux-2.6.32.15/fs/cachefiles/daemon.c 2010-05-28 21:27:16.091216728 -0400 | 30422 | +++ linux-2.6.32.16/fs/cachefiles/daemon.c 2010-07-09 14:50:37.000000000 -0400 |
30184 | @@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s | 30423 | @@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s |
30185 | if (test_bit(CACHEFILES_DEAD, &cache->flags)) | 30424 | if (test_bit(CACHEFILES_DEAD, &cache->flags)) |
30186 | return -EIO; | 30425 | return -EIO; |
@@ -30208,9 +30447,9 @@ diff -urNp linux-2.6.32.15/fs/cachefiles/daemon.c linux-2.6.32.15/fs/cachefiles/ | |||
30208 | return cachefiles_daemon_range_error(cache, args); | 30447 | return cachefiles_daemon_range_error(cache, args); |
30209 | 30448 | ||
30210 | cache->bstop_percent = bstop; | 30449 | cache->bstop_percent = bstop; |
30211 | diff -urNp linux-2.6.32.15/fs/cachefiles/rdwr.c linux-2.6.32.15/fs/cachefiles/rdwr.c | 30450 | diff -urNp linux-2.6.32.16/fs/cachefiles/rdwr.c linux-2.6.32.16/fs/cachefiles/rdwr.c |
30212 | --- linux-2.6.32.15/fs/cachefiles/rdwr.c 2010-03-15 11:52:04.000000000 -0400 | 30451 | --- linux-2.6.32.16/fs/cachefiles/rdwr.c 2010-07-05 14:14:00.000000000 -0400 |
30213 | +++ linux-2.6.32.15/fs/cachefiles/rdwr.c 2010-05-28 21:27:16.091216728 -0400 | 30452 | +++ linux-2.6.32.16/fs/cachefiles/rdwr.c 2010-07-09 14:50:37.000000000 -0400 |
30214 | @@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache | 30453 | @@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache |
30215 | old_fs = get_fs(); | 30454 | old_fs = get_fs(); |
30216 | set_fs(KERNEL_DS); | 30455 | set_fs(KERNEL_DS); |
@@ -30220,9 +30459,9 @@ diff -urNp linux-2.6.32.15/fs/cachefiles/rdwr.c linux-2.6.32.15/fs/cachefiles/rd | |||
30220 | set_fs(old_fs); | 30459 | set_fs(old_fs); |
30221 | kunmap(page); | 30460 | kunmap(page); |
30222 | if (ret != len) | 30461 | if (ret != len) |
30223 | diff -urNp linux-2.6.32.15/fs/cifs/cifs_uniupr.h linux-2.6.32.15/fs/cifs/cifs_uniupr.h | 30462 | diff -urNp linux-2.6.32.16/fs/cifs/cifs_uniupr.h linux-2.6.32.16/fs/cifs/cifs_uniupr.h |
30224 | --- linux-2.6.32.15/fs/cifs/cifs_uniupr.h 2010-03-15 11:52:04.000000000 -0400 | 30463 | --- linux-2.6.32.16/fs/cifs/cifs_uniupr.h 2010-07-05 14:14:00.000000000 -0400 |
30225 | +++ linux-2.6.32.15/fs/cifs/cifs_uniupr.h 2010-05-28 21:27:16.091216728 -0400 | 30464 | +++ linux-2.6.32.16/fs/cifs/cifs_uniupr.h 2010-07-09 14:50:37.000000000 -0400 |
30226 | @@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa | 30465 | @@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa |
30227 | {0x0490, 0x04cc, UniCaseRangeU0490}, | 30466 | {0x0490, 0x04cc, UniCaseRangeU0490}, |
30228 | {0x1e00, 0x1ffc, UniCaseRangeU1e00}, | 30467 | {0x1e00, 0x1ffc, UniCaseRangeU1e00}, |
@@ -30232,9 +30471,9 @@ diff -urNp linux-2.6.32.15/fs/cifs/cifs_uniupr.h linux-2.6.32.15/fs/cifs/cifs_un | |||
30232 | }; | 30471 | }; |
30233 | #endif | 30472 | #endif |
30234 | 30473 | ||
30235 | diff -urNp linux-2.6.32.15/fs/cifs/link.c linux-2.6.32.15/fs/cifs/link.c | 30474 | diff -urNp linux-2.6.32.16/fs/cifs/link.c linux-2.6.32.16/fs/cifs/link.c |
30236 | --- linux-2.6.32.15/fs/cifs/link.c 2010-03-15 11:52:04.000000000 -0400 | 30475 | --- linux-2.6.32.16/fs/cifs/link.c 2010-07-05 14:14:00.000000000 -0400 |
30237 | +++ linux-2.6.32.15/fs/cifs/link.c 2010-05-28 21:27:16.091216728 -0400 | 30476 | +++ linux-2.6.32.16/fs/cifs/link.c 2010-07-09 14:50:37.000000000 -0400 |
30238 | @@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct | 30477 | @@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct |
30239 | 30478 | ||
30240 | void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) | 30479 | void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) |
@@ -30244,9 +30483,9 @@ diff -urNp linux-2.6.32.15/fs/cifs/link.c linux-2.6.32.15/fs/cifs/link.c | |||
30244 | if (!IS_ERR(p)) | 30483 | if (!IS_ERR(p)) |
30245 | kfree(p); | 30484 | kfree(p); |
30246 | } | 30485 | } |
30247 | diff -urNp linux-2.6.32.15/fs/compat_binfmt_elf.c linux-2.6.32.15/fs/compat_binfmt_elf.c | 30486 | diff -urNp linux-2.6.32.16/fs/compat_binfmt_elf.c linux-2.6.32.16/fs/compat_binfmt_elf.c |
30248 | --- linux-2.6.32.15/fs/compat_binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400 | 30487 | --- linux-2.6.32.16/fs/compat_binfmt_elf.c 2010-07-05 14:14:00.000000000 -0400 |
30249 | +++ linux-2.6.32.15/fs/compat_binfmt_elf.c 2010-05-28 21:27:16.091216728 -0400 | 30488 | +++ linux-2.6.32.16/fs/compat_binfmt_elf.c 2010-07-09 14:50:37.000000000 -0400 |
30250 | @@ -29,10 +29,12 @@ | 30489 | @@ -29,10 +29,12 @@ |
30251 | #undef elfhdr | 30490 | #undef elfhdr |
30252 | #undef elf_phdr | 30491 | #undef elf_phdr |
@@ -30260,9 +30499,9 @@ diff -urNp linux-2.6.32.15/fs/compat_binfmt_elf.c linux-2.6.32.15/fs/compat_binf | |||
30260 | #define elf_addr_t Elf32_Addr | 30499 | #define elf_addr_t Elf32_Addr |
30261 | 30500 | ||
30262 | /* | 30501 | /* |
30263 | diff -urNp linux-2.6.32.15/fs/compat.c linux-2.6.32.15/fs/compat.c | 30502 | diff -urNp linux-2.6.32.16/fs/compat.c linux-2.6.32.16/fs/compat.c |
30264 | --- linux-2.6.32.15/fs/compat.c 2010-05-28 20:16:44.454934408 -0400 | 30503 | --- linux-2.6.32.16/fs/compat.c 2010-07-05 14:14:00.000000000 -0400 |
30265 | +++ linux-2.6.32.15/fs/compat.c 2010-05-28 21:27:16.095276039 -0400 | 30504 | +++ linux-2.6.32.16/fs/compat.c 2010-07-09 14:50:37.000000000 -0400 |
30266 | @@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc, | 30505 | @@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc, |
30267 | if (!kmapped_page || kpos != (pos & PAGE_MASK)) { | 30506 | if (!kmapped_page || kpos != (pos & PAGE_MASK)) { |
30268 | struct page *page; | 30507 | struct page *page; |
@@ -30362,9 +30601,9 @@ diff -urNp linux-2.6.32.15/fs/compat.c linux-2.6.32.15/fs/compat.c | |||
30362 | out: | 30601 | out: |
30363 | if (bprm->mm) | 30602 | if (bprm->mm) |
30364 | mmput(bprm->mm); | 30603 | mmput(bprm->mm); |
30365 | diff -urNp linux-2.6.32.15/fs/compat_ioctl.c linux-2.6.32.15/fs/compat_ioctl.c | 30604 | diff -urNp linux-2.6.32.16/fs/compat_ioctl.c linux-2.6.32.16/fs/compat_ioctl.c |
30366 | --- linux-2.6.32.15/fs/compat_ioctl.c 2010-03-15 11:52:04.000000000 -0400 | 30605 | --- linux-2.6.32.16/fs/compat_ioctl.c 2010-07-05 14:14:00.000000000 -0400 |
30367 | +++ linux-2.6.32.15/fs/compat_ioctl.c 2010-05-28 21:27:16.111229439 -0400 | 30606 | +++ linux-2.6.32.16/fs/compat_ioctl.c 2010-07-09 14:50:37.000000000 -0400 |
30368 | @@ -1827,15 +1827,15 @@ struct ioctl_trans { | 30607 | @@ -1827,15 +1827,15 @@ struct ioctl_trans { |
30369 | }; | 30608 | }; |
30370 | 30609 | ||
@@ -30384,9 +30623,9 @@ diff -urNp linux-2.6.32.15/fs/compat_ioctl.c linux-2.6.32.15/fs/compat_ioctl.c | |||
30384 | 30623 | ||
30385 | /* ioctl should not be warned about even if it's not implemented. | 30624 | /* ioctl should not be warned about even if it's not implemented. |
30386 | Valid reasons to use this: | 30625 | Valid reasons to use this: |
30387 | diff -urNp linux-2.6.32.15/fs/debugfs/inode.c linux-2.6.32.15/fs/debugfs/inode.c | 30626 | diff -urNp linux-2.6.32.16/fs/debugfs/inode.c linux-2.6.32.16/fs/debugfs/inode.c |
30388 | --- linux-2.6.32.15/fs/debugfs/inode.c 2010-03-15 11:52:04.000000000 -0400 | 30627 | --- linux-2.6.32.16/fs/debugfs/inode.c 2010-07-05 14:14:00.000000000 -0400 |
30389 | +++ linux-2.6.32.15/fs/debugfs/inode.c 2010-05-28 21:27:16.111229439 -0400 | 30628 | +++ linux-2.6.32.16/fs/debugfs/inode.c 2010-07-09 14:50:37.000000000 -0400 |
30390 | @@ -128,7 +128,7 @@ static inline int debugfs_positive(struc | 30629 | @@ -128,7 +128,7 @@ static inline int debugfs_positive(struc |
30391 | 30630 | ||
30392 | static int debug_fill_super(struct super_block *sb, void *data, int silent) | 30631 | static int debug_fill_super(struct super_block *sb, void *data, int silent) |
@@ -30396,9 +30635,9 @@ diff -urNp linux-2.6.32.15/fs/debugfs/inode.c linux-2.6.32.15/fs/debugfs/inode.c | |||
30396 | 30635 | ||
30397 | return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); | 30636 | return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); |
30398 | } | 30637 | } |
30399 | diff -urNp linux-2.6.32.15/fs/dlm/lockspace.c linux-2.6.32.15/fs/dlm/lockspace.c | 30638 | diff -urNp linux-2.6.32.16/fs/dlm/lockspace.c linux-2.6.32.16/fs/dlm/lockspace.c |
30400 | --- linux-2.6.32.15/fs/dlm/lockspace.c 2010-03-15 11:52:04.000000000 -0400 | 30639 | --- linux-2.6.32.16/fs/dlm/lockspace.c 2010-07-05 14:14:00.000000000 -0400 |
30401 | +++ linux-2.6.32.15/fs/dlm/lockspace.c 2010-05-28 21:27:16.111229439 -0400 | 30640 | +++ linux-2.6.32.16/fs/dlm/lockspace.c 2010-07-09 14:50:37.000000000 -0400 |
30402 | @@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc | 30641 | @@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc |
30403 | kfree(ls); | 30642 | kfree(ls); |
30404 | } | 30643 | } |
@@ -30408,9 +30647,9 @@ diff -urNp linux-2.6.32.15/fs/dlm/lockspace.c linux-2.6.32.15/fs/dlm/lockspace.c | |||
30408 | .show = dlm_attr_show, | 30647 | .show = dlm_attr_show, |
30409 | .store = dlm_attr_store, | 30648 | .store = dlm_attr_store, |
30410 | }; | 30649 | }; |
30411 | diff -urNp linux-2.6.32.15/fs/ecryptfs/inode.c linux-2.6.32.15/fs/ecryptfs/inode.c | 30650 | diff -urNp linux-2.6.32.16/fs/ecryptfs/inode.c linux-2.6.32.16/fs/ecryptfs/inode.c |
30412 | --- linux-2.6.32.15/fs/ecryptfs/inode.c 2010-04-29 17:49:38.429034237 -0400 | 30651 | --- linux-2.6.32.16/fs/ecryptfs/inode.c 2010-07-05 14:14:00.000000000 -0400 |
30413 | +++ linux-2.6.32.15/fs/ecryptfs/inode.c 2010-05-28 21:27:16.111229439 -0400 | 30652 | +++ linux-2.6.32.16/fs/ecryptfs/inode.c 2010-07-09 14:50:37.000000000 -0400 |
30414 | @@ -655,7 +655,7 @@ static int ecryptfs_readlink_lower(struc | 30653 | @@ -655,7 +655,7 @@ static int ecryptfs_readlink_lower(struc |
30415 | old_fs = get_fs(); | 30654 | old_fs = get_fs(); |
30416 | set_fs(get_ds()); | 30655 | set_fs(get_ds()); |
@@ -30429,9 +30668,9 @@ diff -urNp linux-2.6.32.15/fs/ecryptfs/inode.c linux-2.6.32.15/fs/ecryptfs/inode | |||
30429 | set_fs(old_fs); | 30668 | set_fs(old_fs); |
30430 | if (rc < 0) | 30669 | if (rc < 0) |
30431 | goto out_free; | 30670 | goto out_free; |
30432 | diff -urNp linux-2.6.32.15/fs/exec.c linux-2.6.32.15/fs/exec.c | 30671 | diff -urNp linux-2.6.32.16/fs/exec.c linux-2.6.32.16/fs/exec.c |
30433 | --- linux-2.6.32.15/fs/exec.c 2010-05-28 20:16:44.454934408 -0400 | 30672 | --- linux-2.6.32.16/fs/exec.c 2010-07-05 14:14:00.000000000 -0400 |
30434 | +++ linux-2.6.32.15/fs/exec.c 2010-05-28 21:27:16.119217721 -0400 | 30673 | +++ linux-2.6.32.16/fs/exec.c 2010-07-09 14:50:37.000000000 -0400 |
30435 | @@ -56,12 +56,24 @@ | 30674 | @@ -56,12 +56,24 @@ |
30436 | #include <linux/fsnotify.h> | 30675 | #include <linux/fsnotify.h> |
30437 | #include <linux/fs_struct.h> | 30676 | #include <linux/fs_struct.h> |
@@ -30910,9 +31149,9 @@ diff -urNp linux-2.6.32.15/fs/exec.c linux-2.6.32.15/fs/exec.c | |||
30910 | /* | 31149 | /* |
30911 | * lock_kernel() because format_corename() is controlled by sysctl, which | 31150 | * lock_kernel() because format_corename() is controlled by sysctl, which |
30912 | * uses lock_kernel() | 31151 | * uses lock_kernel() |
30913 | diff -urNp linux-2.6.32.15/fs/ext2/balloc.c linux-2.6.32.15/fs/ext2/balloc.c | 31152 | diff -urNp linux-2.6.32.16/fs/ext2/balloc.c linux-2.6.32.16/fs/ext2/balloc.c |
30914 | --- linux-2.6.32.15/fs/ext2/balloc.c 2010-03-15 11:52:04.000000000 -0400 | 31153 | --- linux-2.6.32.16/fs/ext2/balloc.c 2010-07-05 14:14:00.000000000 -0400 |
30915 | +++ linux-2.6.32.15/fs/ext2/balloc.c 2010-05-28 21:27:16.139352882 -0400 | 31154 | +++ linux-2.6.32.16/fs/ext2/balloc.c 2010-07-09 14:50:37.000000000 -0400 |
30916 | @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e | 31155 | @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e |
30917 | 31156 | ||
30918 | free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); | 31157 | free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); |
@@ -30922,9 +31161,9 @@ diff -urNp linux-2.6.32.15/fs/ext2/balloc.c linux-2.6.32.15/fs/ext2/balloc.c | |||
30922 | sbi->s_resuid != current_fsuid() && | 31161 | sbi->s_resuid != current_fsuid() && |
30923 | (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { | 31162 | (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { |
30924 | return 0; | 31163 | return 0; |
30925 | diff -urNp linux-2.6.32.15/fs/ext2/xattr.c linux-2.6.32.15/fs/ext2/xattr.c | 31164 | diff -urNp linux-2.6.32.16/fs/ext2/xattr.c linux-2.6.32.16/fs/ext2/xattr.c |
30926 | --- linux-2.6.32.15/fs/ext2/xattr.c 2010-03-15 11:52:04.000000000 -0400 | 31165 | --- linux-2.6.32.16/fs/ext2/xattr.c 2010-07-05 14:14:00.000000000 -0400 |
30927 | +++ linux-2.6.32.15/fs/ext2/xattr.c 2010-05-28 21:27:16.139352882 -0400 | 31166 | +++ linux-2.6.32.16/fs/ext2/xattr.c 2010-07-09 14:50:37.000000000 -0400 |
30928 | @@ -85,8 +85,8 @@ | 31167 | @@ -85,8 +85,8 @@ |
30929 | printk("\n"); \ | 31168 | printk("\n"); \ |
30930 | } while (0) | 31169 | } while (0) |
@@ -30936,9 +31175,9 @@ diff -urNp linux-2.6.32.15/fs/ext2/xattr.c linux-2.6.32.15/fs/ext2/xattr.c | |||
30936 | #endif | 31175 | #endif |
30937 | 31176 | ||
30938 | static int ext2_xattr_set2(struct inode *, struct buffer_head *, | 31177 | static int ext2_xattr_set2(struct inode *, struct buffer_head *, |
30939 | diff -urNp linux-2.6.32.15/fs/ext3/balloc.c linux-2.6.32.15/fs/ext3/balloc.c | 31178 | diff -urNp linux-2.6.32.16/fs/ext3/balloc.c linux-2.6.32.16/fs/ext3/balloc.c |
30940 | --- linux-2.6.32.15/fs/ext3/balloc.c 2010-03-15 11:52:04.000000000 -0400 | 31179 | --- linux-2.6.32.16/fs/ext3/balloc.c 2010-07-05 14:14:00.000000000 -0400 |
30941 | +++ linux-2.6.32.15/fs/ext3/balloc.c 2010-05-28 21:27:16.139352882 -0400 | 31180 | +++ linux-2.6.32.16/fs/ext3/balloc.c 2010-07-09 14:50:37.000000000 -0400 |
30942 | @@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e | 31181 | @@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e |
30943 | 31182 | ||
30944 | free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); | 31183 | free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); |
@@ -30948,9 +31187,9 @@ diff -urNp linux-2.6.32.15/fs/ext3/balloc.c linux-2.6.32.15/fs/ext3/balloc.c | |||
30948 | sbi->s_resuid != current_fsuid() && | 31187 | sbi->s_resuid != current_fsuid() && |
30949 | (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { | 31188 | (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { |
30950 | return 0; | 31189 | return 0; |
30951 | diff -urNp linux-2.6.32.15/fs/ext3/namei.c linux-2.6.32.15/fs/ext3/namei.c | 31190 | diff -urNp linux-2.6.32.16/fs/ext3/namei.c linux-2.6.32.16/fs/ext3/namei.c |
30952 | --- linux-2.6.32.15/fs/ext3/namei.c 2010-03-15 11:52:04.000000000 -0400 | 31191 | --- linux-2.6.32.16/fs/ext3/namei.c 2010-07-05 14:14:00.000000000 -0400 |
30953 | +++ linux-2.6.32.15/fs/ext3/namei.c 2010-05-28 21:27:16.139352882 -0400 | 31192 | +++ linux-2.6.32.16/fs/ext3/namei.c 2010-07-09 14:50:37.000000000 -0400 |
30954 | @@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split | 31193 | @@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split |
30955 | char *data1 = (*bh)->b_data, *data2; | 31194 | char *data1 = (*bh)->b_data, *data2; |
30956 | unsigned split, move, size; | 31195 | unsigned split, move, size; |
@@ -30960,9 +31199,9 @@ diff -urNp linux-2.6.32.15/fs/ext3/namei.c linux-2.6.32.15/fs/ext3/namei.c | |||
30960 | 31199 | ||
30961 | bh2 = ext3_append (handle, dir, &newblock, &err); | 31200 | bh2 = ext3_append (handle, dir, &newblock, &err); |
30962 | if (!(bh2)) { | 31201 | if (!(bh2)) { |
30963 | diff -urNp linux-2.6.32.15/fs/ext3/xattr.c linux-2.6.32.15/fs/ext3/xattr.c | 31202 | diff -urNp linux-2.6.32.16/fs/ext3/xattr.c linux-2.6.32.16/fs/ext3/xattr.c |
30964 | --- linux-2.6.32.15/fs/ext3/xattr.c 2010-04-29 17:49:38.429034237 -0400 | 31203 | --- linux-2.6.32.16/fs/ext3/xattr.c 2010-07-05 14:14:00.000000000 -0400 |
30965 | +++ linux-2.6.32.15/fs/ext3/xattr.c 2010-05-28 21:27:16.139352882 -0400 | 31204 | +++ linux-2.6.32.16/fs/ext3/xattr.c 2010-07-09 14:50:37.000000000 -0400 |
30966 | @@ -89,8 +89,8 @@ | 31205 | @@ -89,8 +89,8 @@ |
30967 | printk("\n"); \ | 31206 | printk("\n"); \ |
30968 | } while (0) | 31207 | } while (0) |
@@ -30974,9 +31213,9 @@ diff -urNp linux-2.6.32.15/fs/ext3/xattr.c linux-2.6.32.15/fs/ext3/xattr.c | |||
30974 | #endif | 31213 | #endif |
30975 | 31214 | ||
30976 | static void ext3_xattr_cache_insert(struct buffer_head *); | 31215 | static void ext3_xattr_cache_insert(struct buffer_head *); |
30977 | diff -urNp linux-2.6.32.15/fs/ext4/balloc.c linux-2.6.32.15/fs/ext4/balloc.c | 31216 | diff -urNp linux-2.6.32.16/fs/ext4/balloc.c linux-2.6.32.16/fs/ext4/balloc.c |
30978 | --- linux-2.6.32.15/fs/ext4/balloc.c 2010-03-15 11:52:04.000000000 -0400 | 31217 | --- linux-2.6.32.16/fs/ext4/balloc.c 2010-07-05 14:14:00.000000000 -0400 |
30979 | +++ linux-2.6.32.15/fs/ext4/balloc.c 2010-05-28 21:27:16.143235197 -0400 | 31218 | +++ linux-2.6.32.16/fs/ext4/balloc.c 2010-07-09 14:50:37.000000000 -0400 |
30980 | @@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_ | 31219 | @@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_ |
30981 | /* Hm, nope. Are (enough) root reserved blocks available? */ | 31220 | /* Hm, nope. Are (enough) root reserved blocks available? */ |
30982 | if (sbi->s_resuid == current_fsuid() || | 31221 | if (sbi->s_resuid == current_fsuid() || |
@@ -30986,9 +31225,9 @@ diff -urNp linux-2.6.32.15/fs/ext4/balloc.c linux-2.6.32.15/fs/ext4/balloc.c | |||
30986 | if (free_blocks >= (nblocks + dirty_blocks)) | 31225 | if (free_blocks >= (nblocks + dirty_blocks)) |
30987 | return 1; | 31226 | return 1; |
30988 | } | 31227 | } |
30989 | diff -urNp linux-2.6.32.15/fs/ext4/ioctl.c linux-2.6.32.15/fs/ext4/ioctl.c | 31228 | diff -urNp linux-2.6.32.16/fs/ext4/ioctl.c linux-2.6.32.16/fs/ext4/ioctl.c |
30990 | --- linux-2.6.32.15/fs/ext4/ioctl.c 2010-03-15 11:52:04.000000000 -0400 | 31229 | --- linux-2.6.32.16/fs/ext4/ioctl.c 2010-07-05 14:14:00.000000000 -0400 |
30991 | +++ linux-2.6.32.15/fs/ext4/ioctl.c 2010-05-28 21:27:16.143235197 -0400 | 31230 | +++ linux-2.6.32.16/fs/ext4/ioctl.c 2010-07-09 14:50:37.000000000 -0400 |
30992 | @@ -221,6 +221,9 @@ setversion_out: | 31231 | @@ -221,6 +221,9 @@ setversion_out: |
30993 | struct file *donor_filp; | 31232 | struct file *donor_filp; |
30994 | int err; | 31233 | int err; |
@@ -30999,9 +31238,9 @@ diff -urNp linux-2.6.32.15/fs/ext4/ioctl.c linux-2.6.32.15/fs/ext4/ioctl.c | |||
30999 | if (!(filp->f_mode & FMODE_READ) || | 31238 | if (!(filp->f_mode & FMODE_READ) || |
31000 | !(filp->f_mode & FMODE_WRITE)) | 31239 | !(filp->f_mode & FMODE_WRITE)) |
31001 | return -EBADF; | 31240 | return -EBADF; |
31002 | diff -urNp linux-2.6.32.15/fs/ext4/namei.c linux-2.6.32.15/fs/ext4/namei.c | 31241 | diff -urNp linux-2.6.32.16/fs/ext4/namei.c linux-2.6.32.16/fs/ext4/namei.c |
31003 | --- linux-2.6.32.15/fs/ext4/namei.c 2010-03-15 11:52:04.000000000 -0400 | 31242 | --- linux-2.6.32.16/fs/ext4/namei.c 2010-07-05 14:14:00.000000000 -0400 |
31004 | +++ linux-2.6.32.15/fs/ext4/namei.c 2010-05-28 21:27:16.151243127 -0400 | 31243 | +++ linux-2.6.32.16/fs/ext4/namei.c 2010-07-09 14:50:37.000000000 -0400 |
31005 | @@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split | 31244 | @@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split |
31006 | char *data1 = (*bh)->b_data, *data2; | 31245 | char *data1 = (*bh)->b_data, *data2; |
31007 | unsigned split, move, size; | 31246 | unsigned split, move, size; |
@@ -31011,9 +31250,9 @@ diff -urNp linux-2.6.32.15/fs/ext4/namei.c linux-2.6.32.15/fs/ext4/namei.c | |||
31011 | 31250 | ||
31012 | bh2 = ext4_append (handle, dir, &newblock, &err); | 31251 | bh2 = ext4_append (handle, dir, &newblock, &err); |
31013 | if (!(bh2)) { | 31252 | if (!(bh2)) { |
31014 | diff -urNp linux-2.6.32.15/fs/ext4/super.c linux-2.6.32.15/fs/ext4/super.c | 31253 | diff -urNp linux-2.6.32.16/fs/ext4/super.c linux-2.6.32.16/fs/ext4/super.c |
31015 | --- linux-2.6.32.15/fs/ext4/super.c 2010-03-15 11:52:04.000000000 -0400 | 31254 | --- linux-2.6.32.16/fs/ext4/super.c 2010-07-05 14:14:00.000000000 -0400 |
31016 | +++ linux-2.6.32.15/fs/ext4/super.c 2010-05-28 21:27:16.155228523 -0400 | 31255 | +++ linux-2.6.32.16/fs/ext4/super.c 2010-07-09 14:50:38.000000000 -0400 |
31017 | @@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje | 31256 | @@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje |
31018 | } | 31257 | } |
31019 | 31258 | ||
@@ -31023,9 +31262,9 @@ diff -urNp linux-2.6.32.15/fs/ext4/super.c linux-2.6.32.15/fs/ext4/super.c | |||
31023 | .show = ext4_attr_show, | 31262 | .show = ext4_attr_show, |
31024 | .store = ext4_attr_store, | 31263 | .store = ext4_attr_store, |
31025 | }; | 31264 | }; |
31026 | diff -urNp linux-2.6.32.15/fs/ext4/xattr.c linux-2.6.32.15/fs/ext4/xattr.c | 31265 | diff -urNp linux-2.6.32.16/fs/ext4/xattr.c linux-2.6.32.16/fs/ext4/xattr.c |
31027 | --- linux-2.6.32.15/fs/ext4/xattr.c 2010-03-15 11:52:04.000000000 -0400 | 31266 | --- linux-2.6.32.16/fs/ext4/xattr.c 2010-07-05 14:14:00.000000000 -0400 |
31028 | +++ linux-2.6.32.15/fs/ext4/xattr.c 2010-05-28 21:27:16.155228523 -0400 | 31267 | +++ linux-2.6.32.16/fs/ext4/xattr.c 2010-07-09 14:50:38.000000000 -0400 |
31029 | @@ -82,8 +82,8 @@ | 31268 | @@ -82,8 +82,8 @@ |
31030 | printk("\n"); \ | 31269 | printk("\n"); \ |
31031 | } while (0) | 31270 | } while (0) |
@@ -31037,10 +31276,22 @@ diff -urNp linux-2.6.32.15/fs/ext4/xattr.c linux-2.6.32.15/fs/ext4/xattr.c | |||
31037 | #endif | 31276 | #endif |
31038 | 31277 | ||
31039 | static void ext4_xattr_cache_insert(struct buffer_head *); | 31278 | static void ext4_xattr_cache_insert(struct buffer_head *); |
31040 | diff -urNp linux-2.6.32.15/fs/fcntl.c linux-2.6.32.15/fs/fcntl.c | 31279 | diff -urNp linux-2.6.32.16/fs/fcntl.c linux-2.6.32.16/fs/fcntl.c |
31041 | --- linux-2.6.32.15/fs/fcntl.c 2010-03-15 11:52:04.000000000 -0400 | 31280 | --- linux-2.6.32.16/fs/fcntl.c 2010-07-05 14:14:00.000000000 -0400 |
31042 | +++ linux-2.6.32.15/fs/fcntl.c 2010-05-28 21:27:16.158915754 -0400 | 31281 | +++ linux-2.6.32.16/fs/fcntl.c 2010-07-10 08:04:59.000000000 -0400 |
31043 | @@ -344,6 +344,7 @@ static long do_fcntl(int fd, unsigned in | 31282 | @@ -223,6 +223,11 @@ int __f_setown(struct file *filp, struct |
31283 | if (err) | ||
31284 | return err; | ||
31285 | |||
31286 | + if (gr_handle_chroot_fowner(pid, type)) | ||
31287 | + return -ENOENT; | ||
31288 | + if (gr_check_protected_task_fowner(pid, type)) | ||
31289 | + return -EACCES; | ||
31290 | + | ||
31291 | f_modown(filp, pid, type, force); | ||
31292 | return 0; | ||
31293 | } | ||
31294 | @@ -344,6 +349,7 @@ static long do_fcntl(int fd, unsigned in | ||
31044 | switch (cmd) { | 31295 | switch (cmd) { |
31045 | case F_DUPFD: | 31296 | case F_DUPFD: |
31046 | case F_DUPFD_CLOEXEC: | 31297 | case F_DUPFD_CLOEXEC: |
@@ -31048,19 +31299,9 @@ diff -urNp linux-2.6.32.15/fs/fcntl.c linux-2.6.32.15/fs/fcntl.c | |||
31048 | if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) | 31299 | if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) |
31049 | break; | 31300 | break; |
31050 | err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0); | 31301 | err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0); |
31051 | @@ -500,7 +501,8 @@ static inline int sigio_perm(struct task | 31302 | diff -urNp linux-2.6.32.16/fs/fifo.c linux-2.6.32.16/fs/fifo.c |
31052 | ret = ((fown->euid == 0 || | 31303 | --- linux-2.6.32.16/fs/fifo.c 2010-07-05 14:14:00.000000000 -0400 |
31053 | fown->euid == cred->suid || fown->euid == cred->uid || | 31304 | +++ linux-2.6.32.16/fs/fifo.c 2010-07-09 14:50:38.000000000 -0400 |
31054 | fown->uid == cred->suid || fown->uid == cred->uid) && | ||
31055 | - !security_file_send_sigiotask(p, fown, sig)); | ||
31056 | + !security_file_send_sigiotask(p, fown, sig) && | ||
31057 | + !gr_check_protected_task(p) && !gr_pid_is_chrooted(p)); | ||
31058 | rcu_read_unlock(); | ||
31059 | return ret; | ||
31060 | } | ||
31061 | diff -urNp linux-2.6.32.15/fs/fifo.c linux-2.6.32.15/fs/fifo.c | ||
31062 | --- linux-2.6.32.15/fs/fifo.c 2010-03-15 11:52:04.000000000 -0400 | ||
31063 | +++ linux-2.6.32.15/fs/fifo.c 2010-05-28 21:27:16.158915754 -0400 | ||
31064 | @@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode | 31305 | @@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode |
31065 | */ | 31306 | */ |
31066 | filp->f_op = &read_pipefifo_fops; | 31307 | filp->f_op = &read_pipefifo_fops; |
@@ -31131,9 +31372,9 @@ diff -urNp linux-2.6.32.15/fs/fifo.c linux-2.6.32.15/fs/fifo.c | |||
31131 | free_pipe_info(inode); | 31372 | free_pipe_info(inode); |
31132 | 31373 | ||
31133 | err_nocleanup: | 31374 | err_nocleanup: |
31134 | diff -urNp linux-2.6.32.15/fs/file.c linux-2.6.32.15/fs/file.c | 31375 | diff -urNp linux-2.6.32.16/fs/file.c linux-2.6.32.16/fs/file.c |
31135 | --- linux-2.6.32.15/fs/file.c 2010-03-15 11:52:04.000000000 -0400 | 31376 | --- linux-2.6.32.16/fs/file.c 2010-07-05 14:14:00.000000000 -0400 |
31136 | +++ linux-2.6.32.15/fs/file.c 2010-05-28 21:27:16.158915754 -0400 | 31377 | +++ linux-2.6.32.16/fs/file.c 2010-07-09 14:50:38.000000000 -0400 |
31137 | @@ -14,6 +14,7 @@ | 31378 | @@ -14,6 +14,7 @@ |
31138 | #include <linux/slab.h> | 31379 | #include <linux/slab.h> |
31139 | #include <linux/vmalloc.h> | 31380 | #include <linux/vmalloc.h> |
@@ -31151,50 +31392,44 @@ diff -urNp linux-2.6.32.15/fs/file.c linux-2.6.32.15/fs/file.c | |||
31151 | if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) | 31392 | if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) |
31152 | return -EMFILE; | 31393 | return -EMFILE; |
31153 | 31394 | ||
31154 | diff -urNp linux-2.6.32.15/fs/fs_struct.c linux-2.6.32.15/fs/fs_struct.c | 31395 | diff -urNp linux-2.6.32.16/fs/fs_struct.c linux-2.6.32.16/fs/fs_struct.c |
31155 | --- linux-2.6.32.15/fs/fs_struct.c 2010-03-15 11:52:04.000000000 -0400 | 31396 | --- linux-2.6.32.16/fs/fs_struct.c 2010-07-05 14:14:00.000000000 -0400 |
31156 | +++ linux-2.6.32.15/fs/fs_struct.c 2010-05-28 21:27:16.158915754 -0400 | 31397 | +++ linux-2.6.32.16/fs/fs_struct.c 2010-07-09 14:50:38.000000000 -0400 |
31157 | @@ -45,10 +45,12 @@ void chroot_fs_refs(struct path *old_roo | 31398 | @@ -4,6 +4,7 @@ |
31158 | struct task_struct *g, *p; | 31399 | #include <linux/path.h> |
31159 | struct fs_struct *fs; | 31400 | #include <linux/slab.h> |
31160 | int count = 0; | 31401 | #include <linux/fs_struct.h> |
31161 | + unsigned long flags; | 31402 | +#include <linux/grsecurity.h> |
31162 | 31403 | ||
31163 | read_lock(&tasklist_lock); | 31404 | /* |
31164 | do_each_thread(g, p) { | 31405 | * Replace the fs->{rootmnt,root} with {mnt,dentry}. Put the old values. |
31165 | task_lock(p); | 31406 | @@ -17,6 +18,7 @@ void set_fs_root(struct fs_struct *fs, s |
31166 | + gr_fs_write_lock_irqsave(p, flags); | 31407 | old_root = fs->root; |
31167 | fs = p->fs; | 31408 | fs->root = *path; |
31168 | if (fs) { | 31409 | path_get(path); |
31169 | write_lock(&fs->lock); | 31410 | + gr_set_chroot_entries(current, path); |
31170 | @@ -66,6 +68,7 @@ void chroot_fs_refs(struct path *old_roo | 31411 | write_unlock(&fs->lock); |
31412 | if (old_root.dentry) | ||
31413 | path_put(&old_root); | ||
31414 | @@ -56,6 +58,7 @@ void chroot_fs_refs(struct path *old_roo | ||
31415 | && fs->root.mnt == old_root->mnt) { | ||
31416 | path_get(new_root); | ||
31417 | fs->root = *new_root; | ||
31418 | + gr_set_chroot_entries(p, new_root); | ||
31419 | count++; | ||
31171 | } | 31420 | } |
31172 | write_unlock(&fs->lock); | 31421 | if (fs->pwd.dentry == old_root->dentry |
31173 | } | 31422 | @@ -89,7 +92,8 @@ void exit_fs(struct task_struct *tsk) |
31174 | + gr_fs_write_unlock_irqrestore(p, flags); | ||
31175 | task_unlock(p); | ||
31176 | } while_each_thread(g, p); | ||
31177 | read_unlock(&tasklist_lock); | ||
31178 | @@ -83,14 +86,17 @@ void free_fs_struct(struct fs_struct *fs | ||
31179 | void exit_fs(struct task_struct *tsk) | ||
31180 | { | ||
31181 | struct fs_struct *fs = tsk->fs; | ||
31182 | + unsigned long flags; | ||
31183 | |||
31184 | if (fs) { | ||
31185 | int kill; | ||
31186 | task_lock(tsk); | 31423 | task_lock(tsk); |
31187 | + gr_fs_write_lock_irqsave(tsk, flags); | ||
31188 | write_lock(&fs->lock); | 31424 | write_lock(&fs->lock); |
31189 | tsk->fs = NULL; | 31425 | tsk->fs = NULL; |
31190 | - kill = !--fs->users; | 31426 | - kill = !--fs->users; |
31427 | + gr_clear_chroot_entries(tsk); | ||
31191 | + kill = !atomic_dec_return(&fs->users); | 31428 | + kill = !atomic_dec_return(&fs->users); |
31192 | write_unlock(&fs->lock); | 31429 | write_unlock(&fs->lock); |
31193 | + gr_fs_write_unlock_irqrestore(tsk, flags); | ||
31194 | task_unlock(tsk); | 31430 | task_unlock(tsk); |
31195 | if (kill) | 31431 | if (kill) |
31196 | free_fs_struct(fs); | 31432 | @@ -102,7 +106,7 @@ struct fs_struct *copy_fs_struct(struct |
31197 | @@ -102,7 +108,7 @@ struct fs_struct *copy_fs_struct(struct | ||
31198 | struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL); | 31433 | struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL); |
31199 | /* We don't need to lock fs - think why ;-) */ | 31434 | /* We don't need to lock fs - think why ;-) */ |
31200 | if (fs) { | 31435 | if (fs) { |
@@ -31203,27 +31438,18 @@ diff -urNp linux-2.6.32.15/fs/fs_struct.c linux-2.6.32.15/fs/fs_struct.c | |||
31203 | fs->in_exec = 0; | 31438 | fs->in_exec = 0; |
31204 | rwlock_init(&fs->lock); | 31439 | rwlock_init(&fs->lock); |
31205 | fs->umask = old->umask; | 31440 | fs->umask = old->umask; |
31206 | @@ -121,15 +127,18 @@ int unshare_fs_struct(void) | 31441 | @@ -127,8 +131,9 @@ int unshare_fs_struct(void) |
31207 | struct fs_struct *fs = current->fs; | ||
31208 | struct fs_struct *new_fs = copy_fs_struct(fs); | ||
31209 | int kill; | ||
31210 | + unsigned long flags; | ||
31211 | |||
31212 | if (!new_fs) | ||
31213 | return -ENOMEM; | ||
31214 | 31442 | ||
31215 | task_lock(current); | 31443 | task_lock(current); |
31216 | + gr_fs_write_lock_irqsave(current, flags); | ||
31217 | write_lock(&fs->lock); | 31444 | write_lock(&fs->lock); |
31218 | - kill = !--fs->users; | 31445 | - kill = !--fs->users; |
31219 | + kill = !atomic_dec_return(&fs->users); | 31446 | + kill = !atomic_dec_return(&fs->users); |
31220 | current->fs = new_fs; | 31447 | current->fs = new_fs; |
31448 | + gr_set_chroot_entries(current, &new_fs->root); | ||
31221 | write_unlock(&fs->lock); | 31449 | write_unlock(&fs->lock); |
31222 | + gr_fs_write_unlock_irqrestore(current, flags); | ||
31223 | task_unlock(current); | 31450 | task_unlock(current); |
31224 | 31451 | ||
31225 | if (kill) | 31452 | @@ -147,7 +152,7 @@ EXPORT_SYMBOL(current_umask); |
31226 | @@ -147,7 +156,7 @@ EXPORT_SYMBOL(current_umask); | ||
31227 | 31453 | ||
31228 | /* to be mentioned only in INIT_TASK */ | 31454 | /* to be mentioned only in INIT_TASK */ |
31229 | struct fs_struct init_fs = { | 31455 | struct fs_struct init_fs = { |
@@ -31232,15 +31458,7 @@ diff -urNp linux-2.6.32.15/fs/fs_struct.c linux-2.6.32.15/fs/fs_struct.c | |||
31232 | .lock = __RW_LOCK_UNLOCKED(init_fs.lock), | 31458 | .lock = __RW_LOCK_UNLOCKED(init_fs.lock), |
31233 | .umask = 0022, | 31459 | .umask = 0022, |
31234 | }; | 31460 | }; |
31235 | @@ -155,6 +164,7 @@ struct fs_struct init_fs = { | 31461 | @@ -162,12 +167,13 @@ void daemonize_fs_struct(void) |
31236 | void daemonize_fs_struct(void) | ||
31237 | { | ||
31238 | struct fs_struct *fs = current->fs; | ||
31239 | + unsigned long flags; | ||
31240 | |||
31241 | if (fs) { | ||
31242 | int kill; | ||
31243 | @@ -162,13 +172,15 @@ void daemonize_fs_struct(void) | ||
31244 | task_lock(current); | 31462 | task_lock(current); |
31245 | 31463 | ||
31246 | write_lock(&init_fs.lock); | 31464 | write_lock(&init_fs.lock); |
@@ -31248,19 +31466,17 @@ diff -urNp linux-2.6.32.15/fs/fs_struct.c linux-2.6.32.15/fs/fs_struct.c | |||
31248 | + atomic_inc(&init_fs.users); | 31466 | + atomic_inc(&init_fs.users); |
31249 | write_unlock(&init_fs.lock); | 31467 | write_unlock(&init_fs.lock); |
31250 | 31468 | ||
31251 | + gr_fs_write_lock_irqsave(current, flags); | ||
31252 | write_lock(&fs->lock); | 31469 | write_lock(&fs->lock); |
31253 | current->fs = &init_fs; | 31470 | current->fs = &init_fs; |
31254 | - kill = !--fs->users; | 31471 | - kill = !--fs->users; |
31472 | + gr_set_chroot_entries(current, ¤t->fs->root); | ||
31255 | + kill = !atomic_dec_return(&fs->users); | 31473 | + kill = !atomic_dec_return(&fs->users); |
31256 | write_unlock(&fs->lock); | 31474 | write_unlock(&fs->lock); |
31257 | + gr_fs_write_unlock_irqrestore(current, flags); | ||
31258 | 31475 | ||
31259 | task_unlock(current); | 31476 | task_unlock(current); |
31260 | if (kill) | 31477 | diff -urNp linux-2.6.32.16/fs/fuse/control.c linux-2.6.32.16/fs/fuse/control.c |
31261 | diff -urNp linux-2.6.32.15/fs/fuse/control.c linux-2.6.32.15/fs/fuse/control.c | 31478 | --- linux-2.6.32.16/fs/fuse/control.c 2010-07-05 14:14:00.000000000 -0400 |
31262 | --- linux-2.6.32.15/fs/fuse/control.c 2010-03-15 11:52:04.000000000 -0400 | 31479 | +++ linux-2.6.32.16/fs/fuse/control.c 2010-07-09 14:50:38.000000000 -0400 |
31263 | +++ linux-2.6.32.15/fs/fuse/control.c 2010-05-28 21:27:16.158915754 -0400 | ||
31264 | @@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co | 31480 | @@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co |
31265 | 31481 | ||
31266 | static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent) | 31482 | static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent) |
@@ -31270,9 +31486,9 @@ diff -urNp linux-2.6.32.15/fs/fuse/control.c linux-2.6.32.15/fs/fuse/control.c | |||
31270 | struct fuse_conn *fc; | 31486 | struct fuse_conn *fc; |
31271 | int err; | 31487 | int err; |
31272 | 31488 | ||
31273 | diff -urNp linux-2.6.32.15/fs/fuse/cuse.c linux-2.6.32.15/fs/fuse/cuse.c | 31489 | diff -urNp linux-2.6.32.16/fs/fuse/cuse.c linux-2.6.32.16/fs/fuse/cuse.c |
31274 | --- linux-2.6.32.15/fs/fuse/cuse.c 2010-03-15 11:52:04.000000000 -0400 | 31490 | --- linux-2.6.32.16/fs/fuse/cuse.c 2010-07-05 14:14:00.000000000 -0400 |
31275 | +++ linux-2.6.32.15/fs/fuse/cuse.c 2010-05-28 21:27:16.158915754 -0400 | 31491 | +++ linux-2.6.32.16/fs/fuse/cuse.c 2010-07-09 14:50:38.000000000 -0400 |
31276 | @@ -528,8 +528,18 @@ static int cuse_channel_release(struct i | 31492 | @@ -528,8 +528,18 @@ static int cuse_channel_release(struct i |
31277 | return rc; | 31493 | return rc; |
31278 | } | 31494 | } |
@@ -31307,9 +31523,9 @@ diff -urNp linux-2.6.32.15/fs/fuse/cuse.c linux-2.6.32.15/fs/fuse/cuse.c | |||
31307 | cuse_class = class_create(THIS_MODULE, "cuse"); | 31523 | cuse_class = class_create(THIS_MODULE, "cuse"); |
31308 | if (IS_ERR(cuse_class)) | 31524 | if (IS_ERR(cuse_class)) |
31309 | return PTR_ERR(cuse_class); | 31525 | return PTR_ERR(cuse_class); |
31310 | diff -urNp linux-2.6.32.15/fs/fuse/dev.c linux-2.6.32.15/fs/fuse/dev.c | 31526 | diff -urNp linux-2.6.32.16/fs/fuse/dev.c linux-2.6.32.16/fs/fuse/dev.c |
31311 | --- linux-2.6.32.15/fs/fuse/dev.c 2010-03-15 11:52:04.000000000 -0400 | 31527 | --- linux-2.6.32.16/fs/fuse/dev.c 2010-07-05 14:14:00.000000000 -0400 |
31312 | +++ linux-2.6.32.15/fs/fuse/dev.c 2010-05-28 21:27:16.158915754 -0400 | 31528 | +++ linux-2.6.32.16/fs/fuse/dev.c 2010-07-09 14:50:38.000000000 -0400 |
31313 | @@ -745,7 +745,7 @@ __releases(&fc->lock) | 31529 | @@ -745,7 +745,7 @@ __releases(&fc->lock) |
31314 | * request_end(). Otherwise add it to the processing list, and set | 31530 | * request_end(). Otherwise add it to the processing list, and set |
31315 | * the 'sent' flag. | 31531 | * the 'sent' flag. |
@@ -31415,9 +31631,9 @@ diff -urNp linux-2.6.32.15/fs/fuse/dev.c linux-2.6.32.15/fs/fuse/dev.c | |||
31415 | 31631 | ||
31416 | const struct file_operations fuse_dev_operations = { | 31632 | const struct file_operations fuse_dev_operations = { |
31417 | .owner = THIS_MODULE, | 31633 | .owner = THIS_MODULE, |
31418 | diff -urNp linux-2.6.32.15/fs/fuse/dir.c linux-2.6.32.15/fs/fuse/dir.c | 31634 | diff -urNp linux-2.6.32.16/fs/fuse/dir.c linux-2.6.32.16/fs/fuse/dir.c |
31419 | --- linux-2.6.32.15/fs/fuse/dir.c 2010-03-15 11:52:04.000000000 -0400 | 31635 | --- linux-2.6.32.16/fs/fuse/dir.c 2010-07-05 14:14:00.000000000 -0400 |
31420 | +++ linux-2.6.32.15/fs/fuse/dir.c 2010-05-28 21:27:16.167243337 -0400 | 31636 | +++ linux-2.6.32.16/fs/fuse/dir.c 2010-07-09 14:50:38.000000000 -0400 |
31421 | @@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de | 31637 | @@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de |
31422 | return link; | 31638 | return link; |
31423 | } | 31639 | } |
@@ -31427,9 +31643,9 @@ diff -urNp linux-2.6.32.15/fs/fuse/dir.c linux-2.6.32.15/fs/fuse/dir.c | |||
31427 | { | 31643 | { |
31428 | if (!IS_ERR(link)) | 31644 | if (!IS_ERR(link)) |
31429 | free_page((unsigned long) link); | 31645 | free_page((unsigned long) link); |
31430 | diff -urNp linux-2.6.32.15/fs/fuse/fuse_i.h linux-2.6.32.15/fs/fuse/fuse_i.h | 31646 | diff -urNp linux-2.6.32.16/fs/fuse/fuse_i.h linux-2.6.32.16/fs/fuse/fuse_i.h |
31431 | --- linux-2.6.32.15/fs/fuse/fuse_i.h 2010-03-15 11:52:04.000000000 -0400 | 31647 | --- linux-2.6.32.16/fs/fuse/fuse_i.h 2010-07-05 14:14:00.000000000 -0400 |
31432 | +++ linux-2.6.32.15/fs/fuse/fuse_i.h 2010-05-28 21:27:16.167243337 -0400 | 31648 | +++ linux-2.6.32.16/fs/fuse/fuse_i.h 2010-07-09 14:50:38.000000000 -0400 |
31433 | @@ -521,6 +521,16 @@ extern const struct file_operations fuse | 31649 | @@ -521,6 +521,16 @@ extern const struct file_operations fuse |
31434 | 31650 | ||
31435 | extern const struct dentry_operations fuse_dentry_operations; | 31651 | extern const struct dentry_operations fuse_dentry_operations; |
@@ -31447,9 +31663,9 @@ diff -urNp linux-2.6.32.15/fs/fuse/fuse_i.h linux-2.6.32.15/fs/fuse/fuse_i.h | |||
31447 | /** | 31663 | /** |
31448 | * Inode to nodeid comparison. | 31664 | * Inode to nodeid comparison. |
31449 | */ | 31665 | */ |
31450 | diff -urNp linux-2.6.32.15/fs/gfs2/sys.c linux-2.6.32.15/fs/gfs2/sys.c | 31666 | diff -urNp linux-2.6.32.16/fs/gfs2/sys.c linux-2.6.32.16/fs/gfs2/sys.c |
31451 | --- linux-2.6.32.15/fs/gfs2/sys.c 2010-03-15 11:52:04.000000000 -0400 | 31667 | --- linux-2.6.32.16/fs/gfs2/sys.c 2010-07-05 14:14:00.000000000 -0400 |
31452 | +++ linux-2.6.32.15/fs/gfs2/sys.c 2010-05-28 21:27:16.167243337 -0400 | 31668 | +++ linux-2.6.32.16/fs/gfs2/sys.c 2010-07-09 14:50:38.000000000 -0400 |
31453 | @@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko | 31669 | @@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko |
31454 | return a->store ? a->store(sdp, buf, len) : len; | 31670 | return a->store ? a->store(sdp, buf, len) : len; |
31455 | } | 31671 | } |
@@ -31468,9 +31684,9 @@ diff -urNp linux-2.6.32.15/fs/gfs2/sys.c linux-2.6.32.15/fs/gfs2/sys.c | |||
31468 | .uevent = gfs2_uevent, | 31684 | .uevent = gfs2_uevent, |
31469 | }; | 31685 | }; |
31470 | 31686 | ||
31471 | diff -urNp linux-2.6.32.15/fs/hfs/inode.c linux-2.6.32.15/fs/hfs/inode.c | 31687 | diff -urNp linux-2.6.32.16/fs/hfs/inode.c linux-2.6.32.16/fs/hfs/inode.c |
31472 | --- linux-2.6.32.15/fs/hfs/inode.c 2010-03-15 11:52:04.000000000 -0400 | 31688 | --- linux-2.6.32.16/fs/hfs/inode.c 2010-07-05 14:14:00.000000000 -0400 |
31473 | +++ linux-2.6.32.15/fs/hfs/inode.c 2010-05-28 21:27:16.171892577 -0400 | 31689 | +++ linux-2.6.32.16/fs/hfs/inode.c 2010-07-09 14:50:38.000000000 -0400 |
31474 | @@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode, | 31690 | @@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode, |
31475 | 31691 | ||
31476 | if (S_ISDIR(main_inode->i_mode)) { | 31692 | if (S_ISDIR(main_inode->i_mode)) { |
@@ -31489,9 +31705,9 @@ diff -urNp linux-2.6.32.15/fs/hfs/inode.c linux-2.6.32.15/fs/hfs/inode.c | |||
31489 | hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, | 31705 | hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, |
31490 | sizeof(struct hfs_cat_file)); | 31706 | sizeof(struct hfs_cat_file)); |
31491 | if (rec.type != HFS_CDR_FIL || | 31707 | if (rec.type != HFS_CDR_FIL || |
31492 | diff -urNp linux-2.6.32.15/fs/hfsplus/inode.c linux-2.6.32.15/fs/hfsplus/inode.c | 31708 | diff -urNp linux-2.6.32.16/fs/hfsplus/inode.c linux-2.6.32.16/fs/hfsplus/inode.c |
31493 | --- linux-2.6.32.15/fs/hfsplus/inode.c 2010-03-15 11:52:04.000000000 -0400 | 31709 | --- linux-2.6.32.16/fs/hfsplus/inode.c 2010-07-05 14:14:00.000000000 -0400 |
31494 | +++ linux-2.6.32.15/fs/hfsplus/inode.c 2010-05-28 21:27:16.171892577 -0400 | 31710 | +++ linux-2.6.32.16/fs/hfsplus/inode.c 2010-07-09 14:50:38.000000000 -0400 |
31495 | @@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode | 31711 | @@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode |
31496 | struct hfsplus_cat_folder *folder = &entry.folder; | 31712 | struct hfsplus_cat_folder *folder = &entry.folder; |
31497 | 31713 | ||
@@ -31528,9 +31744,9 @@ diff -urNp linux-2.6.32.15/fs/hfsplus/inode.c linux-2.6.32.15/fs/hfsplus/inode.c | |||
31528 | hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, | 31744 | hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, |
31529 | sizeof(struct hfsplus_cat_file)); | 31745 | sizeof(struct hfsplus_cat_file)); |
31530 | hfsplus_inode_write_fork(inode, &file->data_fork); | 31746 | hfsplus_inode_write_fork(inode, &file->data_fork); |
31531 | diff -urNp linux-2.6.32.15/fs/hugetlbfs/inode.c linux-2.6.32.15/fs/hugetlbfs/inode.c | 31747 | diff -urNp linux-2.6.32.16/fs/hugetlbfs/inode.c linux-2.6.32.16/fs/hugetlbfs/inode.c |
31532 | --- linux-2.6.32.15/fs/hugetlbfs/inode.c 2010-03-15 11:52:04.000000000 -0400 | 31748 | --- linux-2.6.32.16/fs/hugetlbfs/inode.c 2010-07-05 14:14:00.000000000 -0400 |
31533 | +++ linux-2.6.32.15/fs/hugetlbfs/inode.c 2010-05-28 21:27:16.171892577 -0400 | 31749 | +++ linux-2.6.32.16/fs/hugetlbfs/inode.c 2010-07-09 14:50:38.000000000 -0400 |
31534 | @@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs | 31750 | @@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs |
31535 | .kill_sb = kill_litter_super, | 31751 | .kill_sb = kill_litter_super, |
31536 | }; | 31752 | }; |
@@ -31540,9 +31756,9 @@ diff -urNp linux-2.6.32.15/fs/hugetlbfs/inode.c linux-2.6.32.15/fs/hugetlbfs/ino | |||
31540 | 31756 | ||
31541 | static int can_do_hugetlb_shm(void) | 31757 | static int can_do_hugetlb_shm(void) |
31542 | { | 31758 | { |
31543 | diff -urNp linux-2.6.32.15/fs/ioctl.c linux-2.6.32.15/fs/ioctl.c | 31759 | diff -urNp linux-2.6.32.16/fs/ioctl.c linux-2.6.32.16/fs/ioctl.c |
31544 | --- linux-2.6.32.15/fs/ioctl.c 2010-03-15 11:52:04.000000000 -0400 | 31760 | --- linux-2.6.32.16/fs/ioctl.c 2010-07-05 14:14:00.000000000 -0400 |
31545 | +++ linux-2.6.32.15/fs/ioctl.c 2010-05-28 21:27:16.175116356 -0400 | 31761 | +++ linux-2.6.32.16/fs/ioctl.c 2010-07-09 14:50:38.000000000 -0400 |
31546 | @@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema | 31762 | @@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema |
31547 | u64 phys, u64 len, u32 flags) | 31763 | u64 phys, u64 len, u32 flags) |
31548 | { | 31764 | { |
@@ -31570,9 +31786,9 @@ diff -urNp linux-2.6.32.15/fs/ioctl.c linux-2.6.32.15/fs/ioctl.c | |||
31570 | error = -EFAULT; | 31786 | error = -EFAULT; |
31571 | 31787 | ||
31572 | return error; | 31788 | return error; |
31573 | diff -urNp linux-2.6.32.15/fs/jffs2/debug.h linux-2.6.32.15/fs/jffs2/debug.h | 31789 | diff -urNp linux-2.6.32.16/fs/jffs2/debug.h linux-2.6.32.16/fs/jffs2/debug.h |
31574 | --- linux-2.6.32.15/fs/jffs2/debug.h 2010-03-15 11:52:04.000000000 -0400 | 31790 | --- linux-2.6.32.16/fs/jffs2/debug.h 2010-07-05 14:14:00.000000000 -0400 |
31575 | +++ linux-2.6.32.15/fs/jffs2/debug.h 2010-05-28 21:27:16.175116356 -0400 | 31791 | +++ linux-2.6.32.16/fs/jffs2/debug.h 2010-07-09 14:50:38.000000000 -0400 |
31576 | @@ -52,13 +52,13 @@ | 31792 | @@ -52,13 +52,13 @@ |
31577 | #if CONFIG_JFFS2_FS_DEBUG > 0 | 31793 | #if CONFIG_JFFS2_FS_DEBUG > 0 |
31578 | #define D1(x) x | 31794 | #define D1(x) x |
@@ -31674,9 +31890,9 @@ diff -urNp linux-2.6.32.15/fs/jffs2/debug.h linux-2.6.32.15/fs/jffs2/debug.h | |||
31674 | #endif | 31890 | #endif |
31675 | 31891 | ||
31676 | /* "Sanity" checks */ | 31892 | /* "Sanity" checks */ |
31677 | diff -urNp linux-2.6.32.15/fs/jffs2/erase.c linux-2.6.32.15/fs/jffs2/erase.c | 31893 | diff -urNp linux-2.6.32.16/fs/jffs2/erase.c linux-2.6.32.16/fs/jffs2/erase.c |
31678 | --- linux-2.6.32.15/fs/jffs2/erase.c 2010-03-15 11:52:04.000000000 -0400 | 31894 | --- linux-2.6.32.16/fs/jffs2/erase.c 2010-07-05 14:14:00.000000000 -0400 |
31679 | +++ linux-2.6.32.15/fs/jffs2/erase.c 2010-05-28 21:27:16.175116356 -0400 | 31895 | +++ linux-2.6.32.16/fs/jffs2/erase.c 2010-07-09 14:50:38.000000000 -0400 |
31680 | @@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru | 31896 | @@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru |
31681 | struct jffs2_unknown_node marker = { | 31897 | struct jffs2_unknown_node marker = { |
31682 | .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), | 31898 | .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), |
@@ -31687,9 +31903,9 @@ diff -urNp linux-2.6.32.15/fs/jffs2/erase.c linux-2.6.32.15/fs/jffs2/erase.c | |||
31687 | }; | 31903 | }; |
31688 | 31904 | ||
31689 | jffs2_prealloc_raw_node_refs(c, jeb, 1); | 31905 | jffs2_prealloc_raw_node_refs(c, jeb, 1); |
31690 | diff -urNp linux-2.6.32.15/fs/jffs2/summary.h linux-2.6.32.15/fs/jffs2/summary.h | 31906 | diff -urNp linux-2.6.32.16/fs/jffs2/summary.h linux-2.6.32.16/fs/jffs2/summary.h |
31691 | --- linux-2.6.32.15/fs/jffs2/summary.h 2010-03-15 11:52:04.000000000 -0400 | 31907 | --- linux-2.6.32.16/fs/jffs2/summary.h 2010-07-05 14:14:00.000000000 -0400 |
31692 | +++ linux-2.6.32.15/fs/jffs2/summary.h 2010-05-28 21:27:16.175116356 -0400 | 31908 | +++ linux-2.6.32.16/fs/jffs2/summary.h 2010-07-09 14:50:38.000000000 -0400 |
31693 | @@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ | 31909 | @@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ |
31694 | 31910 | ||
31695 | #define jffs2_sum_active() (0) | 31911 | #define jffs2_sum_active() (0) |
@@ -31718,9 +31934,9 @@ diff -urNp linux-2.6.32.15/fs/jffs2/summary.h linux-2.6.32.15/fs/jffs2/summary.h | |||
31718 | #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) | 31934 | #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) |
31719 | 31935 | ||
31720 | #endif /* CONFIG_JFFS2_SUMMARY */ | 31936 | #endif /* CONFIG_JFFS2_SUMMARY */ |
31721 | diff -urNp linux-2.6.32.15/fs/jffs2/wbuf.c linux-2.6.32.15/fs/jffs2/wbuf.c | 31937 | diff -urNp linux-2.6.32.16/fs/jffs2/wbuf.c linux-2.6.32.16/fs/jffs2/wbuf.c |
31722 | --- linux-2.6.32.15/fs/jffs2/wbuf.c 2010-03-15 11:52:04.000000000 -0400 | 31938 | --- linux-2.6.32.16/fs/jffs2/wbuf.c 2010-07-05 14:14:00.000000000 -0400 |
31723 | +++ linux-2.6.32.15/fs/jffs2/wbuf.c 2010-05-28 21:27:16.175116356 -0400 | 31939 | +++ linux-2.6.32.16/fs/jffs2/wbuf.c 2010-07-09 14:50:38.000000000 -0400 |
31724 | @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o | 31940 | @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o |
31725 | { | 31941 | { |
31726 | .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), | 31942 | .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), |
@@ -31731,9 +31947,9 @@ diff -urNp linux-2.6.32.15/fs/jffs2/wbuf.c linux-2.6.32.15/fs/jffs2/wbuf.c | |||
31731 | }; | 31947 | }; |
31732 | 31948 | ||
31733 | /* | 31949 | /* |
31734 | diff -urNp linux-2.6.32.15/fs/lockd/svc.c linux-2.6.32.15/fs/lockd/svc.c | 31950 | diff -urNp linux-2.6.32.16/fs/lockd/svc.c linux-2.6.32.16/fs/lockd/svc.c |
31735 | --- linux-2.6.32.15/fs/lockd/svc.c 2010-03-15 11:52:04.000000000 -0400 | 31951 | --- linux-2.6.32.16/fs/lockd/svc.c 2010-07-05 14:14:00.000000000 -0400 |
31736 | +++ linux-2.6.32.15/fs/lockd/svc.c 2010-05-28 21:27:16.175116356 -0400 | 31952 | +++ linux-2.6.32.16/fs/lockd/svc.c 2010-07-09 14:50:38.000000000 -0400 |
31737 | @@ -43,7 +43,7 @@ | 31953 | @@ -43,7 +43,7 @@ |
31738 | 31954 | ||
31739 | static struct svc_program nlmsvc_program; | 31955 | static struct svc_program nlmsvc_program; |
@@ -31743,9 +31959,9 @@ diff -urNp linux-2.6.32.15/fs/lockd/svc.c linux-2.6.32.15/fs/lockd/svc.c | |||
31743 | EXPORT_SYMBOL_GPL(nlmsvc_ops); | 31959 | EXPORT_SYMBOL_GPL(nlmsvc_ops); |
31744 | 31960 | ||
31745 | static DEFINE_MUTEX(nlmsvc_mutex); | 31961 | static DEFINE_MUTEX(nlmsvc_mutex); |
31746 | diff -urNp linux-2.6.32.15/fs/locks.c linux-2.6.32.15/fs/locks.c | 31962 | diff -urNp linux-2.6.32.16/fs/locks.c linux-2.6.32.16/fs/locks.c |
31747 | --- linux-2.6.32.15/fs/locks.c 2010-03-15 11:52:04.000000000 -0400 | 31963 | --- linux-2.6.32.16/fs/locks.c 2010-07-05 14:14:00.000000000 -0400 |
31748 | +++ linux-2.6.32.15/fs/locks.c 2010-05-28 21:27:16.191151426 -0400 | 31964 | +++ linux-2.6.32.16/fs/locks.c 2010-07-09 14:50:38.000000000 -0400 |
31749 | @@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil | 31965 | @@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil |
31750 | return; | 31966 | return; |
31751 | 31967 | ||
@@ -31767,9 +31983,9 @@ diff -urNp linux-2.6.32.15/fs/locks.c linux-2.6.32.15/fs/locks.c | |||
31767 | } | 31983 | } |
31768 | 31984 | ||
31769 | lock_kernel(); | 31985 | lock_kernel(); |
31770 | diff -urNp linux-2.6.32.15/fs/namei.c linux-2.6.32.15/fs/namei.c | 31986 | diff -urNp linux-2.6.32.16/fs/namei.c linux-2.6.32.16/fs/namei.c |
31771 | --- linux-2.6.32.15/fs/namei.c 2010-03-15 11:52:04.000000000 -0400 | 31987 | --- linux-2.6.32.16/fs/namei.c 2010-07-05 14:14:00.000000000 -0400 |
31772 | +++ linux-2.6.32.15/fs/namei.c 2010-05-28 21:27:16.199231859 -0400 | 31988 | +++ linux-2.6.32.16/fs/namei.c 2010-07-09 14:50:38.000000000 -0400 |
31773 | @@ -638,7 +638,7 @@ static __always_inline int __do_follow_l | 31989 | @@ -638,7 +638,7 @@ static __always_inline int __do_follow_l |
31774 | cookie = dentry->d_inode->i_op->follow_link(dentry, nd); | 31990 | cookie = dentry->d_inode->i_op->follow_link(dentry, nd); |
31775 | error = PTR_ERR(cookie); | 31991 | error = PTR_ERR(cookie); |
@@ -32096,9 +32312,9 @@ diff -urNp linux-2.6.32.15/fs/namei.c linux-2.6.32.15/fs/namei.c | |||
32096 | exit6: | 32312 | exit6: |
32097 | mnt_drop_write(oldnd.path.mnt); | 32313 | mnt_drop_write(oldnd.path.mnt); |
32098 | exit5: | 32314 | exit5: |
32099 | diff -urNp linux-2.6.32.15/fs/namespace.c linux-2.6.32.15/fs/namespace.c | 32315 | diff -urNp linux-2.6.32.16/fs/namespace.c linux-2.6.32.16/fs/namespace.c |
32100 | --- linux-2.6.32.15/fs/namespace.c 2010-03-15 11:52:04.000000000 -0400 | 32316 | --- linux-2.6.32.16/fs/namespace.c 2010-07-05 14:14:00.000000000 -0400 |
32101 | +++ linux-2.6.32.15/fs/namespace.c 2010-05-28 21:27:16.199231859 -0400 | 32317 | +++ linux-2.6.32.16/fs/namespace.c 2010-07-09 14:50:38.000000000 -0400 |
32102 | @@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn | 32318 | @@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn |
32103 | if (!(sb->s_flags & MS_RDONLY)) | 32319 | if (!(sb->s_flags & MS_RDONLY)) |
32104 | retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); | 32320 | retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); |
@@ -32119,7 +32335,7 @@ diff -urNp linux-2.6.32.15/fs/namespace.c linux-2.6.32.15/fs/namespace.c | |||
32119 | return retval; | 32335 | return retval; |
32120 | } | 32336 | } |
32121 | 32337 | ||
32122 | @@ -1955,6 +1961,16 @@ long do_mount(char *dev_name, char *dir_ | 32338 | @@ -1962,6 +1968,16 @@ long do_mount(char *dev_name, char *dir_ |
32123 | if (retval) | 32339 | if (retval) |
32124 | goto dput_out; | 32340 | goto dput_out; |
32125 | 32341 | ||
@@ -32136,7 +32352,7 @@ diff -urNp linux-2.6.32.15/fs/namespace.c linux-2.6.32.15/fs/namespace.c | |||
32136 | if (flags & MS_REMOUNT) | 32352 | if (flags & MS_REMOUNT) |
32137 | retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags, | 32353 | retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags, |
32138 | data_page); | 32354 | data_page); |
32139 | @@ -1969,6 +1985,9 @@ long do_mount(char *dev_name, char *dir_ | 32355 | @@ -1976,6 +1992,9 @@ long do_mount(char *dev_name, char *dir_ |
32140 | dev_name, data_page); | 32356 | dev_name, data_page); |
32141 | dput_out: | 32357 | dput_out: |
32142 | path_put(&path); | 32358 | path_put(&path); |
@@ -32146,7 +32362,7 @@ diff -urNp linux-2.6.32.15/fs/namespace.c linux-2.6.32.15/fs/namespace.c | |||
32146 | return retval; | 32362 | return retval; |
32147 | } | 32363 | } |
32148 | 32364 | ||
32149 | @@ -2175,6 +2194,12 @@ SYSCALL_DEFINE2(pivot_root, const char _ | 32365 | @@ -2182,6 +2201,12 @@ SYSCALL_DEFINE2(pivot_root, const char _ |
32150 | goto out1; | 32366 | goto out1; |
32151 | } | 32367 | } |
32152 | 32368 | ||
@@ -32159,9 +32375,9 @@ diff -urNp linux-2.6.32.15/fs/namespace.c linux-2.6.32.15/fs/namespace.c | |||
32159 | read_lock(¤t->fs->lock); | 32375 | read_lock(¤t->fs->lock); |
32160 | root = current->fs->root; | 32376 | root = current->fs->root; |
32161 | path_get(¤t->fs->root); | 32377 | path_get(¤t->fs->root); |
32162 | diff -urNp linux-2.6.32.15/fs/nfs/inode.c linux-2.6.32.15/fs/nfs/inode.c | 32378 | diff -urNp linux-2.6.32.16/fs/nfs/inode.c linux-2.6.32.16/fs/nfs/inode.c |
32163 | --- linux-2.6.32.15/fs/nfs/inode.c 2010-04-04 20:41:50.045778117 -0400 | 32379 | --- linux-2.6.32.16/fs/nfs/inode.c 2010-07-05 14:14:00.000000000 -0400 |
32164 | +++ linux-2.6.32.15/fs/nfs/inode.c 2010-05-28 21:27:16.199231859 -0400 | 32380 | +++ linux-2.6.32.16/fs/nfs/inode.c 2010-07-09 14:50:38.000000000 -0400 |
32165 | @@ -965,16 +965,16 @@ static int nfs_size_need_update(const st | 32381 | @@ -965,16 +965,16 @@ static int nfs_size_need_update(const st |
32166 | return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); | 32382 | return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); |
32167 | } | 32383 | } |
@@ -32182,9 +32398,9 @@ diff -urNp linux-2.6.32.15/fs/nfs/inode.c linux-2.6.32.15/fs/nfs/inode.c | |||
32182 | } | 32398 | } |
32183 | 32399 | ||
32184 | void nfs_fattr_init(struct nfs_fattr *fattr) | 32400 | void nfs_fattr_init(struct nfs_fattr *fattr) |
32185 | diff -urNp linux-2.6.32.15/fs/nfs/nfs4proc.c linux-2.6.32.15/fs/nfs/nfs4proc.c | 32401 | diff -urNp linux-2.6.32.16/fs/nfs/nfs4proc.c linux-2.6.32.16/fs/nfs/nfs4proc.c |
32186 | --- linux-2.6.32.15/fs/nfs/nfs4proc.c 2010-04-29 17:49:38.445067399 -0400 | 32402 | --- linux-2.6.32.16/fs/nfs/nfs4proc.c 2010-07-05 14:14:00.000000000 -0400 |
32187 | +++ linux-2.6.32.15/fs/nfs/nfs4proc.c 2010-05-28 21:27:16.210892100 -0400 | 32403 | +++ linux-2.6.32.16/fs/nfs/nfs4proc.c 2010-07-09 14:50:38.000000000 -0400 |
32188 | @@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct | 32404 | @@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct |
32189 | static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state) | 32405 | static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state) |
32190 | { | 32406 | { |
@@ -32455,9 +32671,9 @@ diff -urNp linux-2.6.32.15/fs/nfs/nfs4proc.c linux-2.6.32.15/fs/nfs/nfs4proc.c | |||
32455 | int err; | 32671 | int err; |
32456 | 32672 | ||
32457 | err = nfs4_set_lock_state(state, fl); | 32673 | err = nfs4_set_lock_state(state, fl); |
32458 | diff -urNp linux-2.6.32.15/fs/nfsd/lockd.c linux-2.6.32.15/fs/nfsd/lockd.c | 32674 | diff -urNp linux-2.6.32.16/fs/nfsd/lockd.c linux-2.6.32.16/fs/nfsd/lockd.c |
32459 | --- linux-2.6.32.15/fs/nfsd/lockd.c 2010-03-15 11:52:04.000000000 -0400 | 32675 | --- linux-2.6.32.16/fs/nfsd/lockd.c 2010-07-05 14:14:00.000000000 -0400 |
32460 | +++ linux-2.6.32.15/fs/nfsd/lockd.c 2010-05-28 21:27:16.210892100 -0400 | 32676 | +++ linux-2.6.32.16/fs/nfsd/lockd.c 2010-07-09 14:50:38.000000000 -0400 |
32461 | @@ -67,7 +67,7 @@ nlm_fclose(struct file *filp) | 32677 | @@ -67,7 +67,7 @@ nlm_fclose(struct file *filp) |
32462 | fput(filp); | 32678 | fput(filp); |
32463 | } | 32679 | } |
@@ -32467,9 +32683,9 @@ diff -urNp linux-2.6.32.15/fs/nfsd/lockd.c linux-2.6.32.15/fs/nfsd/lockd.c | |||
32467 | .fopen = nlm_fopen, /* open file for locking */ | 32683 | .fopen = nlm_fopen, /* open file for locking */ |
32468 | .fclose = nlm_fclose, /* close file */ | 32684 | .fclose = nlm_fclose, /* close file */ |
32469 | }; | 32685 | }; |
32470 | diff -urNp linux-2.6.32.15/fs/nfsd/vfs.c linux-2.6.32.15/fs/nfsd/vfs.c | 32686 | diff -urNp linux-2.6.32.16/fs/nfsd/vfs.c linux-2.6.32.16/fs/nfsd/vfs.c |
32471 | --- linux-2.6.32.15/fs/nfsd/vfs.c 2010-03-15 11:52:04.000000000 -0400 | 32687 | --- linux-2.6.32.16/fs/nfsd/vfs.c 2010-07-05 14:14:00.000000000 -0400 |
32472 | +++ linux-2.6.32.15/fs/nfsd/vfs.c 2010-05-28 21:27:16.218925750 -0400 | 32688 | +++ linux-2.6.32.16/fs/nfsd/vfs.c 2010-07-09 14:50:38.000000000 -0400 |
32473 | @@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st | 32689 | @@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st |
32474 | } else { | 32690 | } else { |
32475 | oldfs = get_fs(); | 32691 | oldfs = get_fs(); |
@@ -32497,9 +32713,9 @@ diff -urNp linux-2.6.32.15/fs/nfsd/vfs.c linux-2.6.32.15/fs/nfsd/vfs.c | |||
32497 | set_fs(oldfs); | 32713 | set_fs(oldfs); |
32498 | 32714 | ||
32499 | if (host_err < 0) | 32715 | if (host_err < 0) |
32500 | diff -urNp linux-2.6.32.15/fs/nls/nls_base.c linux-2.6.32.15/fs/nls/nls_base.c | 32716 | diff -urNp linux-2.6.32.16/fs/nls/nls_base.c linux-2.6.32.16/fs/nls/nls_base.c |
32501 | --- linux-2.6.32.15/fs/nls/nls_base.c 2010-03-15 11:52:04.000000000 -0400 | 32717 | --- linux-2.6.32.16/fs/nls/nls_base.c 2010-07-05 14:14:00.000000000 -0400 |
32502 | +++ linux-2.6.32.15/fs/nls/nls_base.c 2010-05-28 21:27:16.218925750 -0400 | 32718 | +++ linux-2.6.32.16/fs/nls/nls_base.c 2010-07-09 14:50:38.000000000 -0400 |
32503 | @@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl | 32719 | @@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl |
32504 | {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */}, | 32720 | {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */}, |
32505 | {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */}, | 32721 | {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */}, |
@@ -32509,9 +32725,9 @@ diff -urNp linux-2.6.32.15/fs/nls/nls_base.c linux-2.6.32.15/fs/nls/nls_base.c | |||
32509 | }; | 32725 | }; |
32510 | 32726 | ||
32511 | #define UNICODE_MAX 0x0010ffff | 32727 | #define UNICODE_MAX 0x0010ffff |
32512 | diff -urNp linux-2.6.32.15/fs/ntfs/file.c linux-2.6.32.15/fs/ntfs/file.c | 32728 | diff -urNp linux-2.6.32.16/fs/ntfs/file.c linux-2.6.32.16/fs/ntfs/file.c |
32513 | --- linux-2.6.32.15/fs/ntfs/file.c 2010-03-15 11:52:04.000000000 -0400 | 32729 | --- linux-2.6.32.16/fs/ntfs/file.c 2010-07-05 14:14:00.000000000 -0400 |
32514 | +++ linux-2.6.32.15/fs/ntfs/file.c 2010-05-28 21:27:16.227248042 -0400 | 32730 | +++ linux-2.6.32.16/fs/ntfs/file.c 2010-07-09 14:50:38.000000000 -0400 |
32515 | @@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_ | 32731 | @@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_ |
32516 | #endif /* NTFS_RW */ | 32732 | #endif /* NTFS_RW */ |
32517 | }; | 32733 | }; |
@@ -32521,9 +32737,9 @@ diff -urNp linux-2.6.32.15/fs/ntfs/file.c linux-2.6.32.15/fs/ntfs/file.c | |||
32521 | 32737 | ||
32522 | -const struct inode_operations ntfs_empty_inode_ops = {}; | 32738 | -const struct inode_operations ntfs_empty_inode_ops = {}; |
32523 | +const struct inode_operations ntfs_empty_inode_ops __read_only; | 32739 | +const struct inode_operations ntfs_empty_inode_ops __read_only; |
32524 | diff -urNp linux-2.6.32.15/fs/ocfs2/cluster/masklog.c linux-2.6.32.15/fs/ocfs2/cluster/masklog.c | 32740 | diff -urNp linux-2.6.32.16/fs/ocfs2/cluster/masklog.c linux-2.6.32.16/fs/ocfs2/cluster/masklog.c |
32525 | --- linux-2.6.32.15/fs/ocfs2/cluster/masklog.c 2010-03-15 11:52:04.000000000 -0400 | 32741 | --- linux-2.6.32.16/fs/ocfs2/cluster/masklog.c 2010-07-05 14:14:00.000000000 -0400 |
32526 | +++ linux-2.6.32.15/fs/ocfs2/cluster/masklog.c 2010-05-28 21:27:16.227248042 -0400 | 32742 | +++ linux-2.6.32.16/fs/ocfs2/cluster/masklog.c 2010-07-09 14:50:38.000000000 -0400 |
32527 | @@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject | 32743 | @@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject |
32528 | return mlog_mask_store(mlog_attr->mask, buf, count); | 32744 | return mlog_mask_store(mlog_attr->mask, buf, count); |
32529 | } | 32745 | } |
@@ -32533,9 +32749,9 @@ diff -urNp linux-2.6.32.15/fs/ocfs2/cluster/masklog.c linux-2.6.32.15/fs/ocfs2/c | |||
32533 | .show = mlog_show, | 32749 | .show = mlog_show, |
32534 | .store = mlog_store, | 32750 | .store = mlog_store, |
32535 | }; | 32751 | }; |
32536 | diff -urNp linux-2.6.32.15/fs/ocfs2/localalloc.c linux-2.6.32.15/fs/ocfs2/localalloc.c | 32752 | diff -urNp linux-2.6.32.16/fs/ocfs2/localalloc.c linux-2.6.32.16/fs/ocfs2/localalloc.c |
32537 | --- linux-2.6.32.15/fs/ocfs2/localalloc.c 2010-03-15 11:52:04.000000000 -0400 | 32753 | --- linux-2.6.32.16/fs/ocfs2/localalloc.c 2010-07-05 14:14:00.000000000 -0400 |
32538 | +++ linux-2.6.32.15/fs/ocfs2/localalloc.c 2010-05-28 21:27:16.227248042 -0400 | 32754 | +++ linux-2.6.32.16/fs/ocfs2/localalloc.c 2010-07-09 14:50:38.000000000 -0400 |
32539 | @@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo | 32755 | @@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo |
32540 | goto bail; | 32756 | goto bail; |
32541 | } | 32757 | } |
@@ -32545,9 +32761,9 @@ diff -urNp linux-2.6.32.15/fs/ocfs2/localalloc.c linux-2.6.32.15/fs/ocfs2/locala | |||
32545 | 32761 | ||
32546 | status = 0; | 32762 | status = 0; |
32547 | bail: | 32763 | bail: |
32548 | diff -urNp linux-2.6.32.15/fs/ocfs2/ocfs2.h linux-2.6.32.15/fs/ocfs2/ocfs2.h | 32764 | diff -urNp linux-2.6.32.16/fs/ocfs2/ocfs2.h linux-2.6.32.16/fs/ocfs2/ocfs2.h |
32549 | --- linux-2.6.32.15/fs/ocfs2/ocfs2.h 2010-03-15 11:52:04.000000000 -0400 | 32765 | --- linux-2.6.32.16/fs/ocfs2/ocfs2.h 2010-07-05 14:14:00.000000000 -0400 |
32550 | +++ linux-2.6.32.15/fs/ocfs2/ocfs2.h 2010-05-28 21:27:16.227248042 -0400 | 32766 | +++ linux-2.6.32.16/fs/ocfs2/ocfs2.h 2010-07-09 14:50:38.000000000 -0400 |
32551 | @@ -217,11 +217,11 @@ enum ocfs2_vol_state | 32767 | @@ -217,11 +217,11 @@ enum ocfs2_vol_state |
32552 | 32768 | ||
32553 | struct ocfs2_alloc_stats | 32769 | struct ocfs2_alloc_stats |
@@ -32565,9 +32781,9 @@ diff -urNp linux-2.6.32.15/fs/ocfs2/ocfs2.h linux-2.6.32.15/fs/ocfs2/ocfs2.h | |||
32565 | }; | 32781 | }; |
32566 | 32782 | ||
32567 | enum ocfs2_local_alloc_state | 32783 | enum ocfs2_local_alloc_state |
32568 | diff -urNp linux-2.6.32.15/fs/ocfs2/suballoc.c linux-2.6.32.15/fs/ocfs2/suballoc.c | 32784 | diff -urNp linux-2.6.32.16/fs/ocfs2/suballoc.c linux-2.6.32.16/fs/ocfs2/suballoc.c |
32569 | --- linux-2.6.32.15/fs/ocfs2/suballoc.c 2010-04-29 17:49:38.449086403 -0400 | 32785 | --- linux-2.6.32.16/fs/ocfs2/suballoc.c 2010-07-05 14:14:00.000000000 -0400 |
32570 | +++ linux-2.6.32.15/fs/ocfs2/suballoc.c 2010-05-28 21:27:16.227248042 -0400 | 32786 | +++ linux-2.6.32.16/fs/ocfs2/suballoc.c 2010-07-09 14:50:38.000000000 -0400 |
32571 | @@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s | 32787 | @@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s |
32572 | mlog_errno(status); | 32788 | mlog_errno(status); |
32573 | goto bail; | 32789 | goto bail; |
@@ -32613,9 +32829,9 @@ diff -urNp linux-2.6.32.15/fs/ocfs2/suballoc.c linux-2.6.32.15/fs/ocfs2/suballoc | |||
32613 | } | 32829 | } |
32614 | } | 32830 | } |
32615 | if (status < 0) { | 32831 | if (status < 0) { |
32616 | diff -urNp linux-2.6.32.15/fs/ocfs2/super.c linux-2.6.32.15/fs/ocfs2/super.c | 32832 | diff -urNp linux-2.6.32.16/fs/ocfs2/super.c linux-2.6.32.16/fs/ocfs2/super.c |
32617 | --- linux-2.6.32.15/fs/ocfs2/super.c 2010-03-15 11:52:04.000000000 -0400 | 32833 | --- linux-2.6.32.16/fs/ocfs2/super.c 2010-07-05 14:14:00.000000000 -0400 |
32618 | +++ linux-2.6.32.15/fs/ocfs2/super.c 2010-05-28 21:27:16.247317121 -0400 | 32834 | +++ linux-2.6.32.16/fs/ocfs2/super.c 2010-07-09 14:50:38.000000000 -0400 |
32619 | @@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s | 32835 | @@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s |
32620 | "%10s => GlobalAllocs: %d LocalAllocs: %d " | 32836 | "%10s => GlobalAllocs: %d LocalAllocs: %d " |
32621 | "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", | 32837 | "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", |
@@ -32650,9 +32866,9 @@ diff -urNp linux-2.6.32.15/fs/ocfs2/super.c linux-2.6.32.15/fs/ocfs2/super.c | |||
32650 | 32866 | ||
32651 | /* Copy the blockcheck stats from the superblock probe */ | 32867 | /* Copy the blockcheck stats from the superblock probe */ |
32652 | osb->osb_ecc_stats = *stats; | 32868 | osb->osb_ecc_stats = *stats; |
32653 | diff -urNp linux-2.6.32.15/fs/open.c linux-2.6.32.15/fs/open.c | 32869 | diff -urNp linux-2.6.32.16/fs/open.c linux-2.6.32.16/fs/open.c |
32654 | --- linux-2.6.32.15/fs/open.c 2010-03-15 11:52:04.000000000 -0400 | 32870 | --- linux-2.6.32.16/fs/open.c 2010-07-05 14:14:00.000000000 -0400 |
32655 | +++ linux-2.6.32.15/fs/open.c 2010-05-28 21:27:16.247317121 -0400 | 32871 | +++ linux-2.6.32.16/fs/open.c 2010-07-09 14:50:38.000000000 -0400 |
32656 | @@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l | 32872 | @@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l |
32657 | if (length < 0) | 32873 | if (length < 0) |
32658 | return -EINVAL; | 32874 | return -EINVAL; |
@@ -32826,9 +33042,9 @@ diff -urNp linux-2.6.32.15/fs/open.c linux-2.6.32.15/fs/open.c | |||
32826 | mnt_drop_write(file->f_path.mnt); | 33042 | mnt_drop_write(file->f_path.mnt); |
32827 | out_fput: | 33043 | out_fput: |
32828 | fput(file); | 33044 | fput(file); |
32829 | diff -urNp linux-2.6.32.15/fs/pipe.c linux-2.6.32.15/fs/pipe.c | 33045 | diff -urNp linux-2.6.32.16/fs/pipe.c linux-2.6.32.16/fs/pipe.c |
32830 | --- linux-2.6.32.15/fs/pipe.c 2010-03-15 11:52:04.000000000 -0400 | 33046 | --- linux-2.6.32.16/fs/pipe.c 2010-07-05 14:14:00.000000000 -0400 |
32831 | +++ linux-2.6.32.15/fs/pipe.c 2010-05-28 21:27:16.247317121 -0400 | 33047 | +++ linux-2.6.32.16/fs/pipe.c 2010-07-09 14:50:38.000000000 -0400 |
32832 | @@ -401,9 +401,9 @@ redo: | 33048 | @@ -401,9 +401,9 @@ redo: |
32833 | } | 33049 | } |
32834 | if (bufs) /* More to do? */ | 33050 | if (bufs) /* More to do? */ |
@@ -32952,9 +33168,9 @@ diff -urNp linux-2.6.32.15/fs/pipe.c linux-2.6.32.15/fs/pipe.c | |||
32952 | inode->i_fop = &rdwr_pipefifo_fops; | 33168 | inode->i_fop = &rdwr_pipefifo_fops; |
32953 | 33169 | ||
32954 | /* | 33170 | /* |
32955 | diff -urNp linux-2.6.32.15/fs/proc/array.c linux-2.6.32.15/fs/proc/array.c | 33171 | diff -urNp linux-2.6.32.16/fs/proc/array.c linux-2.6.32.16/fs/proc/array.c |
32956 | --- linux-2.6.32.15/fs/proc/array.c 2010-05-28 20:16:44.454934408 -0400 | 33172 | --- linux-2.6.32.16/fs/proc/array.c 2010-07-05 14:14:00.000000000 -0400 |
32957 | +++ linux-2.6.32.15/fs/proc/array.c 2010-05-28 22:32:01.011402212 -0400 | 33173 | +++ linux-2.6.32.16/fs/proc/array.c 2010-07-09 14:50:38.000000000 -0400 |
32958 | @@ -321,6 +321,21 @@ static inline void task_context_switch_c | 33174 | @@ -321,6 +321,21 @@ static inline void task_context_switch_c |
32959 | p->nivcsw); | 33175 | p->nivcsw); |
32960 | } | 33176 | } |
@@ -33045,9 +33261,9 @@ diff -urNp linux-2.6.32.15/fs/proc/array.c linux-2.6.32.15/fs/proc/array.c | |||
33045 | + return sprintf(buffer, "%pI4\n", &task->signal->curr_ip); | 33261 | + return sprintf(buffer, "%pI4\n", &task->signal->curr_ip); |
33046 | +} | 33262 | +} |
33047 | +#endif | 33263 | +#endif |
33048 | diff -urNp linux-2.6.32.15/fs/proc/base.c linux-2.6.32.15/fs/proc/base.c | 33264 | diff -urNp linux-2.6.32.16/fs/proc/base.c linux-2.6.32.16/fs/proc/base.c |
33049 | --- linux-2.6.32.15/fs/proc/base.c 2010-05-15 13:20:19.242597763 -0400 | 33265 | --- linux-2.6.32.16/fs/proc/base.c 2010-07-05 14:14:00.000000000 -0400 |
33050 | +++ linux-2.6.32.15/fs/proc/base.c 2010-05-28 21:27:16.250934990 -0400 | 33266 | +++ linux-2.6.32.16/fs/proc/base.c 2010-07-10 14:56:09.000000000 -0400 |
33051 | @@ -102,6 +102,22 @@ struct pid_entry { | 33267 | @@ -102,6 +102,22 @@ struct pid_entry { |
33052 | union proc_op op; | 33268 | union proc_op op; |
33053 | }; | 33269 | }; |
@@ -33289,17 +33505,7 @@ diff -urNp linux-2.6.32.15/fs/proc/base.c linux-2.6.32.15/fs/proc/base.c | |||
33289 | if (!IS_ERR(s)) | 33505 | if (!IS_ERR(s)) |
33290 | __putname(s); | 33506 | __putname(s); |
33291 | } | 33507 | } |
33292 | @@ -2433,6 +2527,9 @@ static struct dentry *proc_base_lookup(s | 33508 | @@ -2519,7 +2613,7 @@ static const struct pid_entry tgid_base_ |
33293 | if (p > last) | ||
33294 | goto out; | ||
33295 | |||
33296 | + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task)) | ||
33297 | + goto out; | ||
33298 | + | ||
33299 | error = proc_base_instantiate(dir, dentry, task, p); | ||
33300 | |||
33301 | out: | ||
33302 | @@ -2519,7 +2616,7 @@ static const struct pid_entry tgid_base_ | ||
33303 | #ifdef CONFIG_SCHED_DEBUG | 33509 | #ifdef CONFIG_SCHED_DEBUG |
33304 | REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), | 33510 | REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), |
33305 | #endif | 33511 | #endif |
@@ -33308,7 +33514,7 @@ diff -urNp linux-2.6.32.15/fs/proc/base.c linux-2.6.32.15/fs/proc/base.c | |||
33308 | INF("syscall", S_IRUSR, proc_pid_syscall), | 33514 | INF("syscall", S_IRUSR, proc_pid_syscall), |
33309 | #endif | 33515 | #endif |
33310 | INF("cmdline", S_IRUGO, proc_pid_cmdline), | 33516 | INF("cmdline", S_IRUGO, proc_pid_cmdline), |
33311 | @@ -2547,7 +2644,7 @@ static const struct pid_entry tgid_base_ | 33517 | @@ -2547,7 +2641,7 @@ static const struct pid_entry tgid_base_ |
33312 | #ifdef CONFIG_KALLSYMS | 33518 | #ifdef CONFIG_KALLSYMS |
33313 | INF("wchan", S_IRUGO, proc_pid_wchan), | 33519 | INF("wchan", S_IRUGO, proc_pid_wchan), |
33314 | #endif | 33520 | #endif |
@@ -33317,7 +33523,7 @@ diff -urNp linux-2.6.32.15/fs/proc/base.c linux-2.6.32.15/fs/proc/base.c | |||
33317 | ONE("stack", S_IRUSR, proc_pid_stack), | 33523 | ONE("stack", S_IRUSR, proc_pid_stack), |
33318 | #endif | 33524 | #endif |
33319 | #ifdef CONFIG_SCHEDSTATS | 33525 | #ifdef CONFIG_SCHEDSTATS |
33320 | @@ -2577,6 +2674,9 @@ static const struct pid_entry tgid_base_ | 33526 | @@ -2577,6 +2671,9 @@ static const struct pid_entry tgid_base_ |
33321 | #ifdef CONFIG_TASK_IO_ACCOUNTING | 33527 | #ifdef CONFIG_TASK_IO_ACCOUNTING |
33322 | INF("io", S_IRUGO, proc_tgid_io_accounting), | 33528 | INF("io", S_IRUGO, proc_tgid_io_accounting), |
33323 | #endif | 33529 | #endif |
@@ -33327,7 +33533,7 @@ diff -urNp linux-2.6.32.15/fs/proc/base.c linux-2.6.32.15/fs/proc/base.c | |||
33327 | }; | 33533 | }; |
33328 | 33534 | ||
33329 | static int proc_tgid_base_readdir(struct file * filp, | 33535 | static int proc_tgid_base_readdir(struct file * filp, |
33330 | @@ -2701,7 +2801,14 @@ static struct dentry *proc_pid_instantia | 33536 | @@ -2701,7 +2798,14 @@ static struct dentry *proc_pid_instantia |
33331 | if (!inode) | 33537 | if (!inode) |
33332 | goto out; | 33538 | goto out; |
33333 | 33539 | ||
@@ -33342,11 +33548,11 @@ diff -urNp linux-2.6.32.15/fs/proc/base.c linux-2.6.32.15/fs/proc/base.c | |||
33342 | inode->i_op = &proc_tgid_base_inode_operations; | 33548 | inode->i_op = &proc_tgid_base_inode_operations; |
33343 | inode->i_fop = &proc_tgid_base_operations; | 33549 | inode->i_fop = &proc_tgid_base_operations; |
33344 | inode->i_flags|=S_IMMUTABLE; | 33550 | inode->i_flags|=S_IMMUTABLE; |
33345 | @@ -2743,7 +2850,11 @@ struct dentry *proc_pid_lookup(struct in | 33551 | @@ -2743,7 +2847,11 @@ struct dentry *proc_pid_lookup(struct in |
33346 | if (!task) | 33552 | if (!task) |
33347 | goto out; | 33553 | goto out; |
33348 | 33554 | ||
33349 | + if (gr_check_hidden_task(task)) | 33555 | + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task)) |
33350 | + goto out_put_task; | 33556 | + goto out_put_task; |
33351 | + | 33557 | + |
33352 | result = proc_pid_instantiate(dir, dentry, task, NULL); | 33558 | result = proc_pid_instantiate(dir, dentry, task, NULL); |
@@ -33354,7 +33560,7 @@ diff -urNp linux-2.6.32.15/fs/proc/base.c linux-2.6.32.15/fs/proc/base.c | |||
33354 | put_task_struct(task); | 33560 | put_task_struct(task); |
33355 | out: | 33561 | out: |
33356 | return result; | 33562 | return result; |
33357 | @@ -2808,6 +2919,11 @@ int proc_pid_readdir(struct file * filp, | 33563 | @@ -2808,6 +2916,11 @@ int proc_pid_readdir(struct file * filp, |
33358 | { | 33564 | { |
33359 | unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY; | 33565 | unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY; |
33360 | struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode); | 33566 | struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode); |
@@ -33366,7 +33572,7 @@ diff -urNp linux-2.6.32.15/fs/proc/base.c linux-2.6.32.15/fs/proc/base.c | |||
33366 | struct tgid_iter iter; | 33572 | struct tgid_iter iter; |
33367 | struct pid_namespace *ns; | 33573 | struct pid_namespace *ns; |
33368 | 33574 | ||
33369 | @@ -2826,8 +2942,27 @@ int proc_pid_readdir(struct file * filp, | 33575 | @@ -2826,8 +2939,27 @@ int proc_pid_readdir(struct file * filp, |
33370 | for (iter = next_tgid(ns, iter); | 33576 | for (iter = next_tgid(ns, iter); |
33371 | iter.task; | 33577 | iter.task; |
33372 | iter.tgid += 1, iter = next_tgid(ns, iter)) { | 33578 | iter.tgid += 1, iter = next_tgid(ns, iter)) { |
@@ -33395,7 +33601,7 @@ diff -urNp linux-2.6.32.15/fs/proc/base.c linux-2.6.32.15/fs/proc/base.c | |||
33395 | put_task_struct(iter.task); | 33601 | put_task_struct(iter.task); |
33396 | goto out; | 33602 | goto out; |
33397 | } | 33603 | } |
33398 | @@ -2853,7 +2988,7 @@ static const struct pid_entry tid_base_s | 33604 | @@ -2853,7 +2985,7 @@ static const struct pid_entry tid_base_s |
33399 | #ifdef CONFIG_SCHED_DEBUG | 33605 | #ifdef CONFIG_SCHED_DEBUG |
33400 | REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), | 33606 | REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), |
33401 | #endif | 33607 | #endif |
@@ -33404,7 +33610,7 @@ diff -urNp linux-2.6.32.15/fs/proc/base.c linux-2.6.32.15/fs/proc/base.c | |||
33404 | INF("syscall", S_IRUSR, proc_pid_syscall), | 33610 | INF("syscall", S_IRUSR, proc_pid_syscall), |
33405 | #endif | 33611 | #endif |
33406 | INF("cmdline", S_IRUGO, proc_pid_cmdline), | 33612 | INF("cmdline", S_IRUGO, proc_pid_cmdline), |
33407 | @@ -2880,7 +3015,7 @@ static const struct pid_entry tid_base_s | 33613 | @@ -2880,7 +3012,7 @@ static const struct pid_entry tid_base_s |
33408 | #ifdef CONFIG_KALLSYMS | 33614 | #ifdef CONFIG_KALLSYMS |
33409 | INF("wchan", S_IRUGO, proc_pid_wchan), | 33615 | INF("wchan", S_IRUGO, proc_pid_wchan), |
33410 | #endif | 33616 | #endif |
@@ -33413,9 +33619,9 @@ diff -urNp linux-2.6.32.15/fs/proc/base.c linux-2.6.32.15/fs/proc/base.c | |||
33413 | ONE("stack", S_IRUSR, proc_pid_stack), | 33619 | ONE("stack", S_IRUSR, proc_pid_stack), |
33414 | #endif | 33620 | #endif |
33415 | #ifdef CONFIG_SCHEDSTATS | 33621 | #ifdef CONFIG_SCHEDSTATS |
33416 | diff -urNp linux-2.6.32.15/fs/proc/cmdline.c linux-2.6.32.15/fs/proc/cmdline.c | 33622 | diff -urNp linux-2.6.32.16/fs/proc/cmdline.c linux-2.6.32.16/fs/proc/cmdline.c |
33417 | --- linux-2.6.32.15/fs/proc/cmdline.c 2010-03-15 11:52:04.000000000 -0400 | 33623 | --- linux-2.6.32.16/fs/proc/cmdline.c 2010-07-05 14:14:00.000000000 -0400 |
33418 | +++ linux-2.6.32.15/fs/proc/cmdline.c 2010-05-28 21:27:16.250934990 -0400 | 33624 | +++ linux-2.6.32.16/fs/proc/cmdline.c 2010-07-09 14:50:38.000000000 -0400 |
33419 | @@ -23,7 +23,11 @@ static const struct file_operations cmdl | 33625 | @@ -23,7 +23,11 @@ static const struct file_operations cmdl |
33420 | 33626 | ||
33421 | static int __init proc_cmdline_init(void) | 33627 | static int __init proc_cmdline_init(void) |
@@ -33428,9 +33634,9 @@ diff -urNp linux-2.6.32.15/fs/proc/cmdline.c linux-2.6.32.15/fs/proc/cmdline.c | |||
33428 | return 0; | 33634 | return 0; |
33429 | } | 33635 | } |
33430 | module_init(proc_cmdline_init); | 33636 | module_init(proc_cmdline_init); |
33431 | diff -urNp linux-2.6.32.15/fs/proc/devices.c linux-2.6.32.15/fs/proc/devices.c | 33637 | diff -urNp linux-2.6.32.16/fs/proc/devices.c linux-2.6.32.16/fs/proc/devices.c |
33432 | --- linux-2.6.32.15/fs/proc/devices.c 2010-03-15 11:52:04.000000000 -0400 | 33638 | --- linux-2.6.32.16/fs/proc/devices.c 2010-07-05 14:14:00.000000000 -0400 |
33433 | +++ linux-2.6.32.15/fs/proc/devices.c 2010-05-28 21:27:16.250934990 -0400 | 33639 | +++ linux-2.6.32.16/fs/proc/devices.c 2010-07-09 14:50:38.000000000 -0400 |
33434 | @@ -64,7 +64,11 @@ static const struct file_operations proc | 33640 | @@ -64,7 +64,11 @@ static const struct file_operations proc |
33435 | 33641 | ||
33436 | static int __init proc_devices_init(void) | 33642 | static int __init proc_devices_init(void) |
@@ -33443,9 +33649,9 @@ diff -urNp linux-2.6.32.15/fs/proc/devices.c linux-2.6.32.15/fs/proc/devices.c | |||
33443 | return 0; | 33649 | return 0; |
33444 | } | 33650 | } |
33445 | module_init(proc_devices_init); | 33651 | module_init(proc_devices_init); |
33446 | diff -urNp linux-2.6.32.15/fs/proc/inode.c linux-2.6.32.15/fs/proc/inode.c | 33652 | diff -urNp linux-2.6.32.16/fs/proc/inode.c linux-2.6.32.16/fs/proc/inode.c |
33447 | --- linux-2.6.32.15/fs/proc/inode.c 2010-03-15 11:52:04.000000000 -0400 | 33653 | --- linux-2.6.32.16/fs/proc/inode.c 2010-07-05 14:14:00.000000000 -0400 |
33448 | +++ linux-2.6.32.15/fs/proc/inode.c 2010-05-28 21:27:16.250934990 -0400 | 33654 | +++ linux-2.6.32.16/fs/proc/inode.c 2010-07-09 14:50:38.000000000 -0400 |
33449 | @@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe | 33655 | @@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe |
33450 | if (de->mode) { | 33656 | if (de->mode) { |
33451 | inode->i_mode = de->mode; | 33657 | inode->i_mode = de->mode; |
@@ -33458,9 +33664,9 @@ diff -urNp linux-2.6.32.15/fs/proc/inode.c linux-2.6.32.15/fs/proc/inode.c | |||
33458 | } | 33664 | } |
33459 | if (de->size) | 33665 | if (de->size) |
33460 | inode->i_size = de->size; | 33666 | inode->i_size = de->size; |
33461 | diff -urNp linux-2.6.32.15/fs/proc/internal.h linux-2.6.32.15/fs/proc/internal.h | 33667 | diff -urNp linux-2.6.32.16/fs/proc/internal.h linux-2.6.32.16/fs/proc/internal.h |
33462 | --- linux-2.6.32.15/fs/proc/internal.h 2010-03-15 11:52:04.000000000 -0400 | 33668 | --- linux-2.6.32.16/fs/proc/internal.h 2010-07-05 14:14:00.000000000 -0400 |
33463 | +++ linux-2.6.32.15/fs/proc/internal.h 2010-05-28 21:27:16.250934990 -0400 | 33669 | +++ linux-2.6.32.16/fs/proc/internal.h 2010-07-09 14:50:38.000000000 -0400 |
33464 | @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi | 33670 | @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi |
33465 | struct pid *pid, struct task_struct *task); | 33671 | struct pid *pid, struct task_struct *task); |
33466 | extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, | 33672 | extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, |
@@ -33471,9 +33677,9 @@ diff -urNp linux-2.6.32.15/fs/proc/internal.h linux-2.6.32.15/fs/proc/internal.h | |||
33471 | extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); | 33677 | extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); |
33472 | 33678 | ||
33473 | extern const struct file_operations proc_maps_operations; | 33679 | extern const struct file_operations proc_maps_operations; |
33474 | diff -urNp linux-2.6.32.15/fs/proc/Kconfig linux-2.6.32.15/fs/proc/Kconfig | 33680 | diff -urNp linux-2.6.32.16/fs/proc/Kconfig linux-2.6.32.16/fs/proc/Kconfig |
33475 | --- linux-2.6.32.15/fs/proc/Kconfig 2010-03-15 11:52:04.000000000 -0400 | 33681 | --- linux-2.6.32.16/fs/proc/Kconfig 2010-07-05 14:14:00.000000000 -0400 |
33476 | +++ linux-2.6.32.15/fs/proc/Kconfig 2010-05-28 21:27:16.250934990 -0400 | 33682 | +++ linux-2.6.32.16/fs/proc/Kconfig 2010-07-09 14:50:38.000000000 -0400 |
33477 | @@ -30,12 +30,12 @@ config PROC_FS | 33683 | @@ -30,12 +30,12 @@ config PROC_FS |
33478 | 33684 | ||
33479 | config PROC_KCORE | 33685 | config PROC_KCORE |
@@ -33501,9 +33707,9 @@ diff -urNp linux-2.6.32.15/fs/proc/Kconfig linux-2.6.32.15/fs/proc/Kconfig | |||
33501 | bool "Enable /proc page monitoring" if EMBEDDED | 33707 | bool "Enable /proc page monitoring" if EMBEDDED |
33502 | help | 33708 | help |
33503 | Various /proc files exist to monitor process memory utilization: | 33709 | Various /proc files exist to monitor process memory utilization: |
33504 | diff -urNp linux-2.6.32.15/fs/proc/kcore.c linux-2.6.32.15/fs/proc/kcore.c | 33710 | diff -urNp linux-2.6.32.16/fs/proc/kcore.c linux-2.6.32.16/fs/proc/kcore.c |
33505 | --- linux-2.6.32.15/fs/proc/kcore.c 2010-03-15 11:52:04.000000000 -0400 | 33711 | --- linux-2.6.32.16/fs/proc/kcore.c 2010-07-05 14:14:00.000000000 -0400 |
33506 | +++ linux-2.6.32.15/fs/proc/kcore.c 2010-05-28 21:27:16.250934990 -0400 | 33712 | +++ linux-2.6.32.16/fs/proc/kcore.c 2010-07-09 14:50:38.000000000 -0400 |
33507 | @@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use | 33713 | @@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use |
33508 | 33714 | ||
33509 | static int open_kcore(struct inode *inode, struct file *filp) | 33715 | static int open_kcore(struct inode *inode, struct file *filp) |
@@ -33514,9 +33720,9 @@ diff -urNp linux-2.6.32.15/fs/proc/kcore.c linux-2.6.32.15/fs/proc/kcore.c | |||
33514 | if (!capable(CAP_SYS_RAWIO)) | 33720 | if (!capable(CAP_SYS_RAWIO)) |
33515 | return -EPERM; | 33721 | return -EPERM; |
33516 | if (kcore_need_update) | 33722 | if (kcore_need_update) |
33517 | diff -urNp linux-2.6.32.15/fs/proc/meminfo.c linux-2.6.32.15/fs/proc/meminfo.c | 33723 | diff -urNp linux-2.6.32.16/fs/proc/meminfo.c linux-2.6.32.16/fs/proc/meminfo.c |
33518 | --- linux-2.6.32.15/fs/proc/meminfo.c 2010-03-15 11:52:04.000000000 -0400 | 33724 | --- linux-2.6.32.16/fs/proc/meminfo.c 2010-07-05 14:14:00.000000000 -0400 |
33519 | +++ linux-2.6.32.15/fs/proc/meminfo.c 2010-05-28 21:27:16.250934990 -0400 | 33725 | +++ linux-2.6.32.16/fs/proc/meminfo.c 2010-07-09 14:50:38.000000000 -0400 |
33520 | @@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_ | 33726 | @@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_ |
33521 | vmi.used >> 10, | 33727 | vmi.used >> 10, |
33522 | vmi.largest_chunk >> 10 | 33728 | vmi.largest_chunk >> 10 |
@@ -33526,9 +33732,9 @@ diff -urNp linux-2.6.32.15/fs/proc/meminfo.c linux-2.6.32.15/fs/proc/meminfo.c | |||
33526 | #endif | 33732 | #endif |
33527 | ); | 33733 | ); |
33528 | 33734 | ||
33529 | diff -urNp linux-2.6.32.15/fs/proc/nommu.c linux-2.6.32.15/fs/proc/nommu.c | 33735 | diff -urNp linux-2.6.32.16/fs/proc/nommu.c linux-2.6.32.16/fs/proc/nommu.c |
33530 | --- linux-2.6.32.15/fs/proc/nommu.c 2010-03-15 11:52:04.000000000 -0400 | 33736 | --- linux-2.6.32.16/fs/proc/nommu.c 2010-07-05 14:14:00.000000000 -0400 |
33531 | +++ linux-2.6.32.15/fs/proc/nommu.c 2010-05-28 21:27:16.250934990 -0400 | 33737 | +++ linux-2.6.32.16/fs/proc/nommu.c 2010-07-09 14:50:38.000000000 -0400 |
33532 | @@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ | 33738 | @@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ |
33533 | if (len < 1) | 33739 | if (len < 1) |
33534 | len = 1; | 33740 | len = 1; |
@@ -33538,9 +33744,9 @@ diff -urNp linux-2.6.32.15/fs/proc/nommu.c linux-2.6.32.15/fs/proc/nommu.c | |||
33538 | } | 33744 | } |
33539 | 33745 | ||
33540 | seq_putc(m, '\n'); | 33746 | seq_putc(m, '\n'); |
33541 | diff -urNp linux-2.6.32.15/fs/proc/proc_net.c linux-2.6.32.15/fs/proc/proc_net.c | 33747 | diff -urNp linux-2.6.32.16/fs/proc/proc_net.c linux-2.6.32.16/fs/proc/proc_net.c |
33542 | --- linux-2.6.32.15/fs/proc/proc_net.c 2010-03-15 11:52:04.000000000 -0400 | 33748 | --- linux-2.6.32.16/fs/proc/proc_net.c 2010-07-05 14:14:00.000000000 -0400 |
33543 | +++ linux-2.6.32.15/fs/proc/proc_net.c 2010-05-28 21:27:16.250934990 -0400 | 33749 | +++ linux-2.6.32.16/fs/proc/proc_net.c 2010-07-09 14:50:38.000000000 -0400 |
33544 | @@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str | 33750 | @@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str |
33545 | struct task_struct *task; | 33751 | struct task_struct *task; |
33546 | struct nsproxy *ns; | 33752 | struct nsproxy *ns; |
@@ -33559,9 +33765,9 @@ diff -urNp linux-2.6.32.15/fs/proc/proc_net.c linux-2.6.32.15/fs/proc/proc_net.c | |||
33559 | 33765 | ||
33560 | rcu_read_lock(); | 33766 | rcu_read_lock(); |
33561 | task = pid_task(proc_pid(dir), PIDTYPE_PID); | 33767 | task = pid_task(proc_pid(dir), PIDTYPE_PID); |
33562 | diff -urNp linux-2.6.32.15/fs/proc/proc_sysctl.c linux-2.6.32.15/fs/proc/proc_sysctl.c | 33768 | diff -urNp linux-2.6.32.16/fs/proc/proc_sysctl.c linux-2.6.32.16/fs/proc/proc_sysctl.c |
33563 | --- linux-2.6.32.15/fs/proc/proc_sysctl.c 2010-03-15 11:52:04.000000000 -0400 | 33769 | --- linux-2.6.32.16/fs/proc/proc_sysctl.c 2010-07-05 14:14:00.000000000 -0400 |
33564 | +++ linux-2.6.32.15/fs/proc/proc_sysctl.c 2010-05-28 21:27:16.250934990 -0400 | 33770 | +++ linux-2.6.32.16/fs/proc/proc_sysctl.c 2010-07-09 14:50:38.000000000 -0400 |
33565 | @@ -7,6 +7,8 @@ | 33771 | @@ -7,6 +7,8 @@ |
33566 | #include <linux/security.h> | 33772 | #include <linux/security.h> |
33567 | #include "internal.h" | 33773 | #include "internal.h" |
@@ -33601,9 +33807,9 @@ diff -urNp linux-2.6.32.15/fs/proc/proc_sysctl.c linux-2.6.32.15/fs/proc/proc_sy | |||
33601 | generic_fillattr(inode, stat); | 33807 | generic_fillattr(inode, stat); |
33602 | if (table) | 33808 | if (table) |
33603 | stat->mode = (stat->mode & S_IFMT) | table->mode; | 33809 | stat->mode = (stat->mode & S_IFMT) | table->mode; |
33604 | diff -urNp linux-2.6.32.15/fs/proc/root.c linux-2.6.32.15/fs/proc/root.c | 33810 | diff -urNp linux-2.6.32.16/fs/proc/root.c linux-2.6.32.16/fs/proc/root.c |
33605 | --- linux-2.6.32.15/fs/proc/root.c 2010-03-15 11:52:04.000000000 -0400 | 33811 | --- linux-2.6.32.16/fs/proc/root.c 2010-07-05 14:14:00.000000000 -0400 |
33606 | +++ linux-2.6.32.15/fs/proc/root.c 2010-05-28 21:27:16.250934990 -0400 | 33812 | +++ linux-2.6.32.16/fs/proc/root.c 2010-07-09 14:50:38.000000000 -0400 |
33607 | @@ -134,7 +134,15 @@ void __init proc_root_init(void) | 33813 | @@ -134,7 +134,15 @@ void __init proc_root_init(void) |
33608 | #ifdef CONFIG_PROC_DEVICETREE | 33814 | #ifdef CONFIG_PROC_DEVICETREE |
33609 | proc_device_tree_init(); | 33815 | proc_device_tree_init(); |
@@ -33620,9 +33826,9 @@ diff -urNp linux-2.6.32.15/fs/proc/root.c linux-2.6.32.15/fs/proc/root.c | |||
33620 | proc_sys_init(); | 33826 | proc_sys_init(); |
33621 | } | 33827 | } |
33622 | 33828 | ||
33623 | diff -urNp linux-2.6.32.15/fs/proc/task_mmu.c linux-2.6.32.15/fs/proc/task_mmu.c | 33829 | diff -urNp linux-2.6.32.16/fs/proc/task_mmu.c linux-2.6.32.16/fs/proc/task_mmu.c |
33624 | --- linux-2.6.32.15/fs/proc/task_mmu.c 2010-05-28 20:16:44.454934408 -0400 | 33830 | --- linux-2.6.32.16/fs/proc/task_mmu.c 2010-07-05 14:14:00.000000000 -0400 |
33625 | +++ linux-2.6.32.15/fs/proc/task_mmu.c 2010-05-28 21:27:16.250934990 -0400 | 33831 | +++ linux-2.6.32.16/fs/proc/task_mmu.c 2010-07-09 14:50:38.000000000 -0400 |
33626 | @@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct | 33832 | @@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct |
33627 | "VmStk:\t%8lu kB\n" | 33833 | "VmStk:\t%8lu kB\n" |
33628 | "VmExe:\t%8lu kB\n" | 33834 | "VmExe:\t%8lu kB\n" |
@@ -33743,9 +33949,9 @@ diff -urNp linux-2.6.32.15/fs/proc/task_mmu.c linux-2.6.32.15/fs/proc/task_mmu.c | |||
33743 | mss.resident >> 10, | 33949 | mss.resident >> 10, |
33744 | (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), | 33950 | (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), |
33745 | mss.shared_clean >> 10, | 33951 | mss.shared_clean >> 10, |
33746 | diff -urNp linux-2.6.32.15/fs/proc/task_nommu.c linux-2.6.32.15/fs/proc/task_nommu.c | 33952 | diff -urNp linux-2.6.32.16/fs/proc/task_nommu.c linux-2.6.32.16/fs/proc/task_nommu.c |
33747 | --- linux-2.6.32.15/fs/proc/task_nommu.c 2010-03-15 11:52:04.000000000 -0400 | 33953 | --- linux-2.6.32.16/fs/proc/task_nommu.c 2010-07-05 14:14:00.000000000 -0400 |
33748 | +++ linux-2.6.32.15/fs/proc/task_nommu.c 2010-05-28 21:27:16.250934990 -0400 | 33954 | +++ linux-2.6.32.16/fs/proc/task_nommu.c 2010-07-09 14:50:38.000000000 -0400 |
33749 | @@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct | 33955 | @@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct |
33750 | else | 33956 | else |
33751 | bytes += kobjsize(mm); | 33957 | bytes += kobjsize(mm); |
@@ -33764,9 +33970,9 @@ diff -urNp linux-2.6.32.15/fs/proc/task_nommu.c linux-2.6.32.15/fs/proc/task_nom | |||
33764 | } | 33970 | } |
33765 | 33971 | ||
33766 | seq_putc(m, '\n'); | 33972 | seq_putc(m, '\n'); |
33767 | diff -urNp linux-2.6.32.15/fs/readdir.c linux-2.6.32.15/fs/readdir.c | 33973 | diff -urNp linux-2.6.32.16/fs/readdir.c linux-2.6.32.16/fs/readdir.c |
33768 | --- linux-2.6.32.15/fs/readdir.c 2010-03-15 11:52:04.000000000 -0400 | 33974 | --- linux-2.6.32.16/fs/readdir.c 2010-07-05 14:14:00.000000000 -0400 |
33769 | +++ linux-2.6.32.15/fs/readdir.c 2010-05-28 21:27:16.250934990 -0400 | 33975 | +++ linux-2.6.32.16/fs/readdir.c 2010-07-09 14:50:38.000000000 -0400 |
33770 | @@ -16,6 +16,7 @@ | 33976 | @@ -16,6 +16,7 @@ |
33771 | #include <linux/security.h> | 33977 | #include <linux/security.h> |
33772 | #include <linux/syscalls.h> | 33978 | #include <linux/syscalls.h> |
@@ -33856,9 +34062,9 @@ diff -urNp linux-2.6.32.15/fs/readdir.c linux-2.6.32.15/fs/readdir.c | |||
33856 | buf.count = count; | 34062 | buf.count = count; |
33857 | buf.error = 0; | 34063 | buf.error = 0; |
33858 | 34064 | ||
33859 | diff -urNp linux-2.6.32.15/fs/reiserfs/do_balan.c linux-2.6.32.15/fs/reiserfs/do_balan.c | 34065 | diff -urNp linux-2.6.32.16/fs/reiserfs/do_balan.c linux-2.6.32.16/fs/reiserfs/do_balan.c |
33860 | --- linux-2.6.32.15/fs/reiserfs/do_balan.c 2010-03-15 11:52:04.000000000 -0400 | 34066 | --- linux-2.6.32.16/fs/reiserfs/do_balan.c 2010-07-05 14:14:00.000000000 -0400 |
33861 | +++ linux-2.6.32.15/fs/reiserfs/do_balan.c 2010-05-28 21:27:16.255227340 -0400 | 34067 | +++ linux-2.6.32.16/fs/reiserfs/do_balan.c 2010-07-09 14:50:38.000000000 -0400 |
33862 | @@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, | 34068 | @@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, |
33863 | return; | 34069 | return; |
33864 | } | 34070 | } |
@@ -33868,9 +34074,9 @@ diff -urNp linux-2.6.32.15/fs/reiserfs/do_balan.c linux-2.6.32.15/fs/reiserfs/do | |||
33868 | do_balance_starts(tb); | 34074 | do_balance_starts(tb); |
33869 | 34075 | ||
33870 | /* balance leaf returns 0 except if combining L R and S into | 34076 | /* balance leaf returns 0 except if combining L R and S into |
33871 | diff -urNp linux-2.6.32.15/fs/reiserfs/item_ops.c linux-2.6.32.15/fs/reiserfs/item_ops.c | 34077 | diff -urNp linux-2.6.32.16/fs/reiserfs/item_ops.c linux-2.6.32.16/fs/reiserfs/item_ops.c |
33872 | --- linux-2.6.32.15/fs/reiserfs/item_ops.c 2010-03-15 11:52:04.000000000 -0400 | 34078 | --- linux-2.6.32.16/fs/reiserfs/item_ops.c 2010-07-05 14:14:00.000000000 -0400 |
33873 | +++ linux-2.6.32.15/fs/reiserfs/item_ops.c 2010-05-28 21:27:16.255227340 -0400 | 34079 | +++ linux-2.6.32.16/fs/reiserfs/item_ops.c 2010-07-09 14:50:38.000000000 -0400 |
33874 | @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i | 34080 | @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i |
33875 | vi->vi_index, vi->vi_type, vi->vi_ih); | 34081 | vi->vi_index, vi->vi_type, vi->vi_ih); |
33876 | } | 34082 | } |
@@ -33925,9 +34131,9 @@ diff -urNp linux-2.6.32.15/fs/reiserfs/item_ops.c linux-2.6.32.15/fs/reiserfs/it | |||
33925 | &stat_data_ops, | 34131 | &stat_data_ops, |
33926 | &indirect_ops, | 34132 | &indirect_ops, |
33927 | &direct_ops, | 34133 | &direct_ops, |
33928 | diff -urNp linux-2.6.32.15/fs/reiserfs/procfs.c linux-2.6.32.15/fs/reiserfs/procfs.c | 34134 | diff -urNp linux-2.6.32.16/fs/reiserfs/procfs.c linux-2.6.32.16/fs/reiserfs/procfs.c |
33929 | --- linux-2.6.32.15/fs/reiserfs/procfs.c 2010-03-15 11:52:04.000000000 -0400 | 34135 | --- linux-2.6.32.16/fs/reiserfs/procfs.c 2010-07-05 14:14:00.000000000 -0400 |
33930 | +++ linux-2.6.32.15/fs/reiserfs/procfs.c 2010-05-28 21:27:16.255227340 -0400 | 34136 | +++ linux-2.6.32.16/fs/reiserfs/procfs.c 2010-07-09 14:50:38.000000000 -0400 |
33931 | @@ -123,7 +123,7 @@ static int show_super(struct seq_file *m | 34137 | @@ -123,7 +123,7 @@ static int show_super(struct seq_file *m |
33932 | "SMALL_TAILS " : "NO_TAILS ", | 34138 | "SMALL_TAILS " : "NO_TAILS ", |
33933 | replay_only(sb) ? "REPLAY_ONLY " : "", | 34139 | replay_only(sb) ? "REPLAY_ONLY " : "", |
@@ -33937,9 +34143,9 @@ diff -urNp linux-2.6.32.15/fs/reiserfs/procfs.c linux-2.6.32.15/fs/reiserfs/proc | |||
33937 | SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes), | 34143 | SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes), |
33938 | SF(s_do_balance), SF(s_unneeded_left_neighbor), | 34144 | SF(s_do_balance), SF(s_unneeded_left_neighbor), |
33939 | SF(s_good_search_by_key_reada), SF(s_bmaps), | 34145 | SF(s_good_search_by_key_reada), SF(s_bmaps), |
33940 | diff -urNp linux-2.6.32.15/fs/select.c linux-2.6.32.15/fs/select.c | 34146 | diff -urNp linux-2.6.32.16/fs/select.c linux-2.6.32.16/fs/select.c |
33941 | --- linux-2.6.32.15/fs/select.c 2010-03-15 11:52:04.000000000 -0400 | 34147 | --- linux-2.6.32.16/fs/select.c 2010-07-05 14:14:00.000000000 -0400 |
33942 | +++ linux-2.6.32.15/fs/select.c 2010-05-28 21:27:16.263231213 -0400 | 34148 | +++ linux-2.6.32.16/fs/select.c 2010-07-09 14:50:38.000000000 -0400 |
33943 | @@ -20,6 +20,7 @@ | 34149 | @@ -20,6 +20,7 @@ |
33944 | #include <linux/module.h> | 34150 | #include <linux/module.h> |
33945 | #include <linux/slab.h> | 34151 | #include <linux/slab.h> |
@@ -33956,9 +34162,9 @@ diff -urNp linux-2.6.32.15/fs/select.c linux-2.6.32.15/fs/select.c | |||
33956 | if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) | 34162 | if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) |
33957 | return -EINVAL; | 34163 | return -EINVAL; |
33958 | 34164 | ||
33959 | diff -urNp linux-2.6.32.15/fs/seq_file.c linux-2.6.32.15/fs/seq_file.c | 34165 | diff -urNp linux-2.6.32.16/fs/seq_file.c linux-2.6.32.16/fs/seq_file.c |
33960 | --- linux-2.6.32.15/fs/seq_file.c 2010-03-15 11:52:04.000000000 -0400 | 34166 | --- linux-2.6.32.16/fs/seq_file.c 2010-07-05 14:14:00.000000000 -0400 |
33961 | +++ linux-2.6.32.15/fs/seq_file.c 2010-05-28 21:27:16.267126788 -0400 | 34167 | +++ linux-2.6.32.16/fs/seq_file.c 2010-07-09 14:50:38.000000000 -0400 |
33962 | @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, | 34168 | @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, |
33963 | return 0; | 34169 | return 0; |
33964 | } | 34170 | } |
@@ -33999,9 +34205,9 @@ diff -urNp linux-2.6.32.15/fs/seq_file.c linux-2.6.32.15/fs/seq_file.c | |||
33999 | if (!m->buf) | 34205 | if (!m->buf) |
34000 | goto Enomem; | 34206 | goto Enomem; |
34001 | m->count = 0; | 34207 | m->count = 0; |
34002 | diff -urNp linux-2.6.32.15/fs/smbfs/symlink.c linux-2.6.32.15/fs/smbfs/symlink.c | 34208 | diff -urNp linux-2.6.32.16/fs/smbfs/symlink.c linux-2.6.32.16/fs/smbfs/symlink.c |
34003 | --- linux-2.6.32.15/fs/smbfs/symlink.c 2010-03-15 11:52:04.000000000 -0400 | 34209 | --- linux-2.6.32.16/fs/smbfs/symlink.c 2010-07-05 14:14:00.000000000 -0400 |
34004 | +++ linux-2.6.32.15/fs/smbfs/symlink.c 2010-05-28 21:27:16.267126788 -0400 | 34210 | +++ linux-2.6.32.16/fs/smbfs/symlink.c 2010-07-09 14:50:38.000000000 -0400 |
34005 | @@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent | 34211 | @@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent |
34006 | 34212 | ||
34007 | static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p) | 34213 | static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p) |
@@ -34011,9 +34217,9 @@ diff -urNp linux-2.6.32.15/fs/smbfs/symlink.c linux-2.6.32.15/fs/smbfs/symlink.c | |||
34011 | if (!IS_ERR(s)) | 34217 | if (!IS_ERR(s)) |
34012 | __putname(s); | 34218 | __putname(s); |
34013 | } | 34219 | } |
34014 | diff -urNp linux-2.6.32.15/fs/splice.c linux-2.6.32.15/fs/splice.c | 34220 | diff -urNp linux-2.6.32.16/fs/splice.c linux-2.6.32.16/fs/splice.c |
34015 | --- linux-2.6.32.15/fs/splice.c 2010-03-15 11:52:04.000000000 -0400 | 34221 | --- linux-2.6.32.16/fs/splice.c 2010-07-05 14:14:00.000000000 -0400 |
34016 | +++ linux-2.6.32.15/fs/splice.c 2010-05-28 21:27:16.267126788 -0400 | 34222 | +++ linux-2.6.32.16/fs/splice.c 2010-07-09 14:50:38.000000000 -0400 |
34017 | @@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode | 34223 | @@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode |
34018 | pipe_lock(pipe); | 34224 | pipe_lock(pipe); |
34019 | 34225 | ||
@@ -34152,9 +34358,9 @@ diff -urNp linux-2.6.32.15/fs/splice.c linux-2.6.32.15/fs/splice.c | |||
34152 | ret = -EAGAIN; | 34358 | ret = -EAGAIN; |
34153 | 34359 | ||
34154 | pipe_unlock(ipipe); | 34360 | pipe_unlock(ipipe); |
34155 | diff -urNp linux-2.6.32.15/fs/sysfs/file.c linux-2.6.32.15/fs/sysfs/file.c | 34361 | diff -urNp linux-2.6.32.16/fs/sysfs/file.c linux-2.6.32.16/fs/sysfs/file.c |
34156 | --- linux-2.6.32.15/fs/sysfs/file.c 2010-03-15 11:52:04.000000000 -0400 | 34362 | --- linux-2.6.32.16/fs/sysfs/file.c 2010-07-05 14:14:00.000000000 -0400 |
34157 | +++ linux-2.6.32.15/fs/sysfs/file.c 2010-05-28 21:27:16.267126788 -0400 | 34363 | +++ linux-2.6.32.16/fs/sysfs/file.c 2010-07-09 14:50:38.000000000 -0400 |
34158 | @@ -53,7 +53,7 @@ struct sysfs_buffer { | 34364 | @@ -53,7 +53,7 @@ struct sysfs_buffer { |
34159 | size_t count; | 34365 | size_t count; |
34160 | loff_t pos; | 34366 | loff_t pos; |
@@ -34191,9 +34397,9 @@ diff -urNp linux-2.6.32.15/fs/sysfs/file.c linux-2.6.32.15/fs/sysfs/file.c | |||
34191 | int error = -EACCES; | 34397 | int error = -EACCES; |
34192 | char *p; | 34398 | char *p; |
34193 | 34399 | ||
34194 | diff -urNp linux-2.6.32.15/fs/sysfs/symlink.c linux-2.6.32.15/fs/sysfs/symlink.c | 34400 | diff -urNp linux-2.6.32.16/fs/sysfs/symlink.c linux-2.6.32.16/fs/sysfs/symlink.c |
34195 | --- linux-2.6.32.15/fs/sysfs/symlink.c 2010-03-15 11:52:04.000000000 -0400 | 34401 | --- linux-2.6.32.16/fs/sysfs/symlink.c 2010-07-05 14:14:00.000000000 -0400 |
34196 | +++ linux-2.6.32.15/fs/sysfs/symlink.c 2010-05-28 21:27:16.267126788 -0400 | 34402 | +++ linux-2.6.32.16/fs/sysfs/symlink.c 2010-07-09 14:50:38.000000000 -0400 |
34197 | @@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de | 34403 | @@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de |
34198 | 34404 | ||
34199 | static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) | 34405 | static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) |
@@ -34203,9 +34409,9 @@ diff -urNp linux-2.6.32.15/fs/sysfs/symlink.c linux-2.6.32.15/fs/sysfs/symlink.c | |||
34203 | if (!IS_ERR(page)) | 34409 | if (!IS_ERR(page)) |
34204 | free_page((unsigned long)page); | 34410 | free_page((unsigned long)page); |
34205 | } | 34411 | } |
34206 | diff -urNp linux-2.6.32.15/fs/udf/balloc.c linux-2.6.32.15/fs/udf/balloc.c | 34412 | diff -urNp linux-2.6.32.16/fs/udf/balloc.c linux-2.6.32.16/fs/udf/balloc.c |
34207 | --- linux-2.6.32.15/fs/udf/balloc.c 2010-03-15 11:52:04.000000000 -0400 | 34413 | --- linux-2.6.32.16/fs/udf/balloc.c 2010-07-05 14:14:00.000000000 -0400 |
34208 | +++ linux-2.6.32.15/fs/udf/balloc.c 2010-05-28 21:27:16.267126788 -0400 | 34414 | +++ linux-2.6.32.16/fs/udf/balloc.c 2010-07-09 14:50:38.000000000 -0400 |
34209 | @@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc | 34415 | @@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc |
34210 | 34416 | ||
34211 | mutex_lock(&sbi->s_alloc_mutex); | 34417 | mutex_lock(&sbi->s_alloc_mutex); |
@@ -34228,9 +34434,9 @@ diff -urNp linux-2.6.32.15/fs/udf/balloc.c linux-2.6.32.15/fs/udf/balloc.c | |||
34228 | udf_debug("%d < %d || %d + %d > %d\n", | 34434 | udf_debug("%d < %d || %d + %d > %d\n", |
34229 | bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count, | 34435 | bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count, |
34230 | partmap->s_partition_len); | 34436 | partmap->s_partition_len); |
34231 | diff -urNp linux-2.6.32.15/fs/udf/misc.c linux-2.6.32.15/fs/udf/misc.c | 34437 | diff -urNp linux-2.6.32.16/fs/udf/misc.c linux-2.6.32.16/fs/udf/misc.c |
34232 | --- linux-2.6.32.15/fs/udf/misc.c 2010-03-15 11:52:04.000000000 -0400 | 34438 | --- linux-2.6.32.16/fs/udf/misc.c 2010-07-05 14:14:00.000000000 -0400 |
34233 | +++ linux-2.6.32.15/fs/udf/misc.c 2010-05-28 21:27:16.271177364 -0400 | 34439 | +++ linux-2.6.32.16/fs/udf/misc.c 2010-07-09 14:50:38.000000000 -0400 |
34234 | @@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat | 34440 | @@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat |
34235 | iinfo->i_lenEAttr += size; | 34441 | iinfo->i_lenEAttr += size; |
34236 | return (struct genericFormat *)&ea[offset]; | 34442 | return (struct genericFormat *)&ea[offset]; |
@@ -34242,9 +34448,9 @@ diff -urNp linux-2.6.32.15/fs/udf/misc.c linux-2.6.32.15/fs/udf/misc.c | |||
34242 | 34448 | ||
34243 | return NULL; | 34449 | return NULL; |
34244 | } | 34450 | } |
34245 | diff -urNp linux-2.6.32.15/fs/udf/udfdecl.h linux-2.6.32.15/fs/udf/udfdecl.h | 34451 | diff -urNp linux-2.6.32.16/fs/udf/udfdecl.h linux-2.6.32.16/fs/udf/udfdecl.h |
34246 | --- linux-2.6.32.15/fs/udf/udfdecl.h 2010-03-15 11:52:04.000000000 -0400 | 34452 | --- linux-2.6.32.16/fs/udf/udfdecl.h 2010-07-05 14:14:00.000000000 -0400 |
34247 | +++ linux-2.6.32.15/fs/udf/udfdecl.h 2010-05-28 21:27:16.271177364 -0400 | 34453 | +++ linux-2.6.32.16/fs/udf/udfdecl.h 2010-07-09 14:50:38.000000000 -0400 |
34248 | @@ -26,7 +26,7 @@ do { \ | 34454 | @@ -26,7 +26,7 @@ do { \ |
34249 | printk(f, ##a); \ | 34455 | printk(f, ##a); \ |
34250 | } while (0) | 34456 | } while (0) |
@@ -34254,9 +34460,9 @@ diff -urNp linux-2.6.32.15/fs/udf/udfdecl.h linux-2.6.32.15/fs/udf/udfdecl.h | |||
34254 | #endif | 34460 | #endif |
34255 | 34461 | ||
34256 | #define udf_info(f, a...) \ | 34462 | #define udf_info(f, a...) \ |
34257 | diff -urNp linux-2.6.32.15/fs/utimes.c linux-2.6.32.15/fs/utimes.c | 34463 | diff -urNp linux-2.6.32.16/fs/utimes.c linux-2.6.32.16/fs/utimes.c |
34258 | --- linux-2.6.32.15/fs/utimes.c 2010-03-15 11:52:04.000000000 -0400 | 34464 | --- linux-2.6.32.16/fs/utimes.c 2010-07-05 14:14:00.000000000 -0400 |
34259 | +++ linux-2.6.32.15/fs/utimes.c 2010-05-28 21:27:16.271177364 -0400 | 34465 | +++ linux-2.6.32.16/fs/utimes.c 2010-07-09 14:50:38.000000000 -0400 |
34260 | @@ -1,6 +1,7 @@ | 34466 | @@ -1,6 +1,7 @@ |
34261 | #include <linux/compiler.h> | 34467 | #include <linux/compiler.h> |
34262 | #include <linux/file.h> | 34468 | #include <linux/file.h> |
@@ -34278,9 +34484,9 @@ diff -urNp linux-2.6.32.15/fs/utimes.c linux-2.6.32.15/fs/utimes.c | |||
34278 | mutex_lock(&inode->i_mutex); | 34484 | mutex_lock(&inode->i_mutex); |
34279 | error = notify_change(path->dentry, &newattrs); | 34485 | error = notify_change(path->dentry, &newattrs); |
34280 | mutex_unlock(&inode->i_mutex); | 34486 | mutex_unlock(&inode->i_mutex); |
34281 | 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 | 34487 | diff -urNp linux-2.6.32.16/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.16/fs/xfs/linux-2.6/xfs_ioctl.c |
34282 | --- linux-2.6.32.15/fs/xfs/linux-2.6/xfs_ioctl.c 2010-03-15 11:52:04.000000000 -0400 | 34488 | --- linux-2.6.32.16/fs/xfs/linux-2.6/xfs_ioctl.c 2010-07-05 14:14:00.000000000 -0400 |
34283 | +++ linux-2.6.32.15/fs/xfs/linux-2.6/xfs_ioctl.c 2010-05-28 21:27:16.275231809 -0400 | 34489 | +++ linux-2.6.32.16/fs/xfs/linux-2.6/xfs_ioctl.c 2010-07-09 14:50:38.000000000 -0400 |
34284 | @@ -134,7 +134,7 @@ xfs_find_handle( | 34490 | @@ -134,7 +134,7 @@ xfs_find_handle( |
34285 | } | 34491 | } |
34286 | 34492 | ||
@@ -34290,9 +34496,9 @@ diff -urNp linux-2.6.32.15/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.15/fs/xfs/l | |||
34290 | copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32))) | 34496 | copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32))) |
34291 | goto out_put; | 34497 | goto out_put; |
34292 | 34498 | ||
34293 | 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 | 34499 | diff -urNp linux-2.6.32.16/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.16/fs/xfs/linux-2.6/xfs_iops.c |
34294 | --- linux-2.6.32.15/fs/xfs/linux-2.6/xfs_iops.c 2010-04-29 17:49:38.453075413 -0400 | 34500 | --- linux-2.6.32.16/fs/xfs/linux-2.6/xfs_iops.c 2010-07-05 14:14:00.000000000 -0400 |
34295 | +++ linux-2.6.32.15/fs/xfs/linux-2.6/xfs_iops.c 2010-05-28 21:27:16.279036027 -0400 | 34501 | +++ linux-2.6.32.16/fs/xfs/linux-2.6/xfs_iops.c 2010-07-09 14:50:38.000000000 -0400 |
34296 | @@ -468,7 +468,7 @@ xfs_vn_put_link( | 34502 | @@ -468,7 +468,7 @@ xfs_vn_put_link( |
34297 | struct nameidata *nd, | 34503 | struct nameidata *nd, |
34298 | void *p) | 34504 | void *p) |
@@ -34302,9 +34508,9 @@ diff -urNp linux-2.6.32.15/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.15/fs/xfs/li | |||
34302 | 34508 | ||
34303 | if (!IS_ERR(s)) | 34509 | if (!IS_ERR(s)) |
34304 | kfree(s); | 34510 | kfree(s); |
34305 | diff -urNp linux-2.6.32.15/fs/xfs/xfs_bmap.c linux-2.6.32.15/fs/xfs/xfs_bmap.c | 34511 | diff -urNp linux-2.6.32.16/fs/xfs/xfs_bmap.c linux-2.6.32.16/fs/xfs/xfs_bmap.c |
34306 | --- linux-2.6.32.15/fs/xfs/xfs_bmap.c 2010-03-15 11:52:04.000000000 -0400 | 34512 | --- linux-2.6.32.16/fs/xfs/xfs_bmap.c 2010-07-05 14:14:00.000000000 -0400 |
34307 | +++ linux-2.6.32.15/fs/xfs/xfs_bmap.c 2010-05-28 21:27:16.327077893 -0400 | 34513 | +++ linux-2.6.32.16/fs/xfs/xfs_bmap.c 2010-07-09 14:50:38.000000000 -0400 |
34308 | @@ -360,7 +360,7 @@ xfs_bmap_validate_ret( | 34514 | @@ -360,7 +360,7 @@ xfs_bmap_validate_ret( |
34309 | int nmap, | 34515 | int nmap, |
34310 | int ret_nmap); | 34516 | int ret_nmap); |
@@ -34314,9 +34520,9 @@ diff -urNp linux-2.6.32.15/fs/xfs/xfs_bmap.c linux-2.6.32.15/fs/xfs/xfs_bmap.c | |||
34314 | #endif /* DEBUG */ | 34520 | #endif /* DEBUG */ |
34315 | 34521 | ||
34316 | #if defined(XFS_RW_TRACE) | 34522 | #if defined(XFS_RW_TRACE) |
34317 | diff -urNp linux-2.6.32.15/grsecurity/gracl_alloc.c linux-2.6.32.15/grsecurity/gracl_alloc.c | 34523 | diff -urNp linux-2.6.32.16/grsecurity/gracl_alloc.c linux-2.6.32.16/grsecurity/gracl_alloc.c |
34318 | --- linux-2.6.32.15/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 | 34524 | --- linux-2.6.32.16/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 |
34319 | +++ linux-2.6.32.15/grsecurity/gracl_alloc.c 2010-05-28 21:27:16.327077893 -0400 | 34525 | +++ linux-2.6.32.16/grsecurity/gracl_alloc.c 2010-07-09 14:50:38.000000000 -0400 |
34320 | @@ -0,0 +1,105 @@ | 34526 | @@ -0,0 +1,105 @@ |
34321 | +#include <linux/kernel.h> | 34527 | +#include <linux/kernel.h> |
34322 | +#include <linux/mm.h> | 34528 | +#include <linux/mm.h> |
@@ -34423,10 +34629,10 @@ diff -urNp linux-2.6.32.15/grsecurity/gracl_alloc.c linux-2.6.32.15/grsecurity/g | |||
34423 | + else | 34629 | + else |
34424 | + return 1; | 34630 | + return 1; |
34425 | +} | 34631 | +} |
34426 | diff -urNp linux-2.6.32.15/grsecurity/gracl.c linux-2.6.32.15/grsecurity/gracl.c | 34632 | diff -urNp linux-2.6.32.16/grsecurity/gracl.c linux-2.6.32.16/grsecurity/gracl.c |
34427 | --- linux-2.6.32.15/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 | 34633 | --- linux-2.6.32.16/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 |
34428 | +++ linux-2.6.32.15/grsecurity/gracl.c 2010-06-26 14:00:02.982610280 -0400 | 34634 | +++ linux-2.6.32.16/grsecurity/gracl.c 2010-07-10 08:10:31.000000000 -0400 |
34429 | @@ -0,0 +1,3899 @@ | 34635 | @@ -0,0 +1,3919 @@ |
34430 | +#include <linux/kernel.h> | 34636 | +#include <linux/kernel.h> |
34431 | +#include <linux/module.h> | 34637 | +#include <linux/module.h> |
34432 | +#include <linux/sched.h> | 34638 | +#include <linux/sched.h> |
@@ -36543,6 +36749,29 @@ diff -urNp linux-2.6.32.15/grsecurity/gracl.c linux-2.6.32.15/grsecurity/gracl.c | |||
36543 | + return 0; | 36749 | + return 0; |
36544 | +} | 36750 | +} |
36545 | + | 36751 | + |
36752 | +int | ||
36753 | +gr_check_protected_task_fowner(struct pid *pid, enum pid_type type) | ||
36754 | +{ | ||
36755 | + struct task_struct *p; | ||
36756 | + int ret = 0; | ||
36757 | + | ||
36758 | + if (unlikely(!(gr_status & GR_READY) || !pid)) | ||
36759 | + return ret; | ||
36760 | + | ||
36761 | + read_lock(&tasklist_lock); | ||
36762 | + do_each_pid_task(pid, type, p) { | ||
36763 | + if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) && | ||
36764 | + p->acl != current->acl) { | ||
36765 | + ret = 1; | ||
36766 | + goto out; | ||
36767 | + } | ||
36768 | + } while_each_pid_task(pid, type, p); | ||
36769 | +out: | ||
36770 | + read_unlock(&tasklist_lock); | ||
36771 | + | ||
36772 | + return ret; | ||
36773 | +} | ||
36774 | + | ||
36546 | +void | 36775 | +void |
36547 | +gr_copy_label(struct task_struct *tsk) | 36776 | +gr_copy_label(struct task_struct *tsk) |
36548 | +{ | 36777 | +{ |
@@ -38218,7 +38447,6 @@ diff -urNp linux-2.6.32.15/grsecurity/gracl.c linux-2.6.32.15/grsecurity/gracl.c | |||
38218 | + read_lock(&tasklist_lock); | 38447 | + read_lock(&tasklist_lock); |
38219 | + task = find_task_by_vpid(pid); | 38448 | + task = find_task_by_vpid(pid); |
38220 | + if (task) { | 38449 | + if (task) { |
38221 | + gr_fs_read_lock(task); | ||
38222 | +#ifdef CONFIG_GRKERNSEC_CHROOT | 38450 | +#ifdef CONFIG_GRKERNSEC_CHROOT |
38223 | + if (proc_is_chrooted(task)) | 38451 | + if (proc_is_chrooted(task)) |
38224 | + ret = -EACCES; | 38452 | + ret = -EACCES; |
@@ -38237,8 +38465,6 @@ diff -urNp linux-2.6.32.15/grsecurity/gracl.c linux-2.6.32.15/grsecurity/gracl.c | |||
38237 | + if (!(task->acl->mode & GR_VIEW)) | 38465 | + if (!(task->acl->mode & GR_VIEW)) |
38238 | + ret = -EACCES; | 38466 | + ret = -EACCES; |
38239 | + } | 38467 | + } |
38240 | + | ||
38241 | + gr_fs_read_unlock(task); | ||
38242 | + } else | 38468 | + } else |
38243 | + ret = -ENOENT; | 38469 | + ret = -ENOENT; |
38244 | + | 38470 | + |
@@ -38326,9 +38552,9 @@ diff -urNp linux-2.6.32.15/grsecurity/gracl.c linux-2.6.32.15/grsecurity/gracl.c | |||
38326 | +EXPORT_SYMBOL(gr_check_group_change); | 38552 | +EXPORT_SYMBOL(gr_check_group_change); |
38327 | +#endif | 38553 | +#endif |
38328 | + | 38554 | + |
38329 | diff -urNp linux-2.6.32.15/grsecurity/gracl_cap.c linux-2.6.32.15/grsecurity/gracl_cap.c | 38555 | diff -urNp linux-2.6.32.16/grsecurity/gracl_cap.c linux-2.6.32.16/grsecurity/gracl_cap.c |
38330 | --- linux-2.6.32.15/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 | 38556 | --- linux-2.6.32.16/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 |
38331 | +++ linux-2.6.32.15/grsecurity/gracl_cap.c 2010-06-19 21:06:17.097881201 -0400 | 38557 | +++ linux-2.6.32.16/grsecurity/gracl_cap.c 2010-07-09 14:50:38.000000000 -0400 |
38332 | @@ -0,0 +1,138 @@ | 38558 | @@ -0,0 +1,138 @@ |
38333 | +#include <linux/kernel.h> | 38559 | +#include <linux/kernel.h> |
38334 | +#include <linux/module.h> | 38560 | +#include <linux/module.h> |
@@ -38468,9 +38694,9 @@ diff -urNp linux-2.6.32.15/grsecurity/gracl_cap.c linux-2.6.32.15/grsecurity/gra | |||
38468 | + return 0; | 38694 | + return 0; |
38469 | +} | 38695 | +} |
38470 | + | 38696 | + |
38471 | diff -urNp linux-2.6.32.15/grsecurity/gracl_fs.c linux-2.6.32.15/grsecurity/gracl_fs.c | 38697 | diff -urNp linux-2.6.32.16/grsecurity/gracl_fs.c linux-2.6.32.16/grsecurity/gracl_fs.c |
38472 | --- linux-2.6.32.15/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 | 38698 | --- linux-2.6.32.16/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 |
38473 | +++ linux-2.6.32.15/grsecurity/gracl_fs.c 2010-05-28 21:27:16.327077893 -0400 | 38699 | +++ linux-2.6.32.16/grsecurity/gracl_fs.c 2010-07-09 14:50:38.000000000 -0400 |
38474 | @@ -0,0 +1,424 @@ | 38700 | @@ -0,0 +1,424 @@ |
38475 | +#include <linux/kernel.h> | 38701 | +#include <linux/kernel.h> |
38476 | +#include <linux/sched.h> | 38702 | +#include <linux/sched.h> |
@@ -38896,9 +39122,9 @@ diff -urNp linux-2.6.32.15/grsecurity/gracl_fs.c linux-2.6.32.15/grsecurity/grac | |||
38896 | + | 39122 | + |
38897 | + return 0; | 39123 | + return 0; |
38898 | +} | 39124 | +} |
38899 | diff -urNp linux-2.6.32.15/grsecurity/gracl_ip.c linux-2.6.32.15/grsecurity/gracl_ip.c | 39125 | diff -urNp linux-2.6.32.16/grsecurity/gracl_ip.c linux-2.6.32.16/grsecurity/gracl_ip.c |
38900 | --- linux-2.6.32.15/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 | 39126 | --- linux-2.6.32.16/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 |
38901 | +++ linux-2.6.32.15/grsecurity/gracl_ip.c 2010-05-28 21:27:16.327077893 -0400 | 39127 | +++ linux-2.6.32.16/grsecurity/gracl_ip.c 2010-07-09 14:50:38.000000000 -0400 |
38902 | @@ -0,0 +1,339 @@ | 39128 | @@ -0,0 +1,339 @@ |
38903 | +#include <linux/kernel.h> | 39129 | +#include <linux/kernel.h> |
38904 | +#include <asm/uaccess.h> | 39130 | +#include <asm/uaccess.h> |
@@ -39239,9 +39465,9 @@ diff -urNp linux-2.6.32.15/grsecurity/gracl_ip.c linux-2.6.32.15/grsecurity/grac | |||
39239 | + | 39465 | + |
39240 | + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); | 39466 | + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); |
39241 | +} | 39467 | +} |
39242 | diff -urNp linux-2.6.32.15/grsecurity/gracl_learn.c linux-2.6.32.15/grsecurity/gracl_learn.c | 39468 | diff -urNp linux-2.6.32.16/grsecurity/gracl_learn.c linux-2.6.32.16/grsecurity/gracl_learn.c |
39243 | --- linux-2.6.32.15/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 | 39469 | --- linux-2.6.32.16/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 |
39244 | +++ linux-2.6.32.15/grsecurity/gracl_learn.c 2010-05-28 21:27:16.327077893 -0400 | 39470 | +++ linux-2.6.32.16/grsecurity/gracl_learn.c 2010-07-09 14:50:38.000000000 -0400 |
39245 | @@ -0,0 +1,211 @@ | 39471 | @@ -0,0 +1,211 @@ |
39246 | +#include <linux/kernel.h> | 39472 | +#include <linux/kernel.h> |
39247 | +#include <linux/mm.h> | 39473 | +#include <linux/mm.h> |
@@ -39454,10 +39680,10 @@ diff -urNp linux-2.6.32.15/grsecurity/gracl_learn.c linux-2.6.32.15/grsecurity/g | |||
39454 | + .release = close_learn, | 39680 | + .release = close_learn, |
39455 | + .poll = poll_learn, | 39681 | + .poll = poll_learn, |
39456 | +}; | 39682 | +}; |
39457 | diff -urNp linux-2.6.32.15/grsecurity/gracl_res.c linux-2.6.32.15/grsecurity/gracl_res.c | 39683 | diff -urNp linux-2.6.32.16/grsecurity/gracl_res.c linux-2.6.32.16/grsecurity/gracl_res.c |
39458 | --- linux-2.6.32.15/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 | 39684 | --- linux-2.6.32.16/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 |
39459 | +++ linux-2.6.32.15/grsecurity/gracl_res.c 2010-05-28 21:27:16.331240103 -0400 | 39685 | +++ linux-2.6.32.16/grsecurity/gracl_res.c 2010-07-09 14:50:38.000000000 -0400 |
39460 | @@ -0,0 +1,65 @@ | 39686 | @@ -0,0 +1,67 @@ |
39461 | +#include <linux/kernel.h> | 39687 | +#include <linux/kernel.h> |
39462 | +#include <linux/sched.h> | 39688 | +#include <linux/sched.h> |
39463 | +#include <linux/gracl.h> | 39689 | +#include <linux/gracl.h> |
@@ -39488,12 +39714,20 @@ diff -urNp linux-2.6.32.15/grsecurity/gracl_res.c linux-2.6.32.15/grsecurity/gra | |||
39488 | + const int res, const unsigned long wanted, const int gt) | 39714 | + const int res, const unsigned long wanted, const int gt) |
39489 | +{ | 39715 | +{ |
39490 | + const struct cred *cred; | 39716 | + const struct cred *cred; |
39717 | + unsigned long rlim; | ||
39491 | + | 39718 | + |
39492 | + if (!gr_acl_is_enabled() && !grsec_resource_logging) | 39719 | + if (!gr_acl_is_enabled() && !grsec_resource_logging) |
39493 | + return; | 39720 | + return; |
39494 | + | 39721 | + |
39495 | + // not yet supported resource | 39722 | + // not yet supported resource |
39496 | + if (!restab_log[res]) | 39723 | + if (unlikely(!restab_log[res])) |
39724 | + return; | ||
39725 | + | ||
39726 | + if (res == RLIMIT_CPU || res == RLIMIT_RTTIME) | ||
39727 | + rlim = task->signal->rlim[res].rlim_max; | ||
39728 | + else | ||
39729 | + rlim = task->signal->rlim[res].rlim_cur; | ||
39730 | + if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim))) | ||
39497 | + return; | 39731 | + return; |
39498 | + | 39732 | + |
39499 | + rcu_read_lock(); | 39733 | + rcu_read_lock(); |
@@ -39510,22 +39744,16 @@ diff -urNp linux-2.6.32.15/grsecurity/gracl_res.c linux-2.6.32.15/grsecurity/gra | |||
39510 | + goto out_rcu_unlock; | 39744 | + goto out_rcu_unlock; |
39511 | + rcu_read_unlock(); | 39745 | + rcu_read_unlock(); |
39512 | + | 39746 | + |
39513 | + preempt_disable(); | 39747 | + gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim); |
39514 | + | ||
39515 | + if (unlikely(((gt && wanted > task->signal->rlim[res].rlim_cur) || | ||
39516 | + (!gt && wanted >= task->signal->rlim[res].rlim_cur)) && | ||
39517 | + task->signal->rlim[res].rlim_cur != RLIM_INFINITY)) | ||
39518 | + gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], task->signal->rlim[res].rlim_cur); | ||
39519 | + preempt_enable_no_resched(); | ||
39520 | + | 39748 | + |
39521 | + return; | 39749 | + return; |
39522 | +out_rcu_unlock: | 39750 | +out_rcu_unlock: |
39523 | + rcu_read_unlock(); | 39751 | + rcu_read_unlock(); |
39524 | + return; | 39752 | + return; |
39525 | +} | 39753 | +} |
39526 | diff -urNp linux-2.6.32.15/grsecurity/gracl_segv.c linux-2.6.32.15/grsecurity/gracl_segv.c | 39754 | diff -urNp linux-2.6.32.16/grsecurity/gracl_segv.c linux-2.6.32.16/grsecurity/gracl_segv.c |
39527 | --- linux-2.6.32.15/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 | 39755 | --- linux-2.6.32.16/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 |
39528 | +++ linux-2.6.32.15/grsecurity/gracl_segv.c 2010-05-28 21:27:16.331240103 -0400 | 39756 | +++ linux-2.6.32.16/grsecurity/gracl_segv.c 2010-07-09 14:50:38.000000000 -0400 |
39529 | @@ -0,0 +1,310 @@ | 39757 | @@ -0,0 +1,310 @@ |
39530 | +#include <linux/kernel.h> | 39758 | +#include <linux/kernel.h> |
39531 | +#include <linux/mm.h> | 39759 | +#include <linux/mm.h> |
@@ -39837,9 +40065,9 @@ diff -urNp linux-2.6.32.15/grsecurity/gracl_segv.c linux-2.6.32.15/grsecurity/gr | |||
39837 | + | 40065 | + |
39838 | + return; | 40066 | + return; |
39839 | +} | 40067 | +} |
39840 | diff -urNp linux-2.6.32.15/grsecurity/gracl_shm.c linux-2.6.32.15/grsecurity/gracl_shm.c | 40068 | diff -urNp linux-2.6.32.16/grsecurity/gracl_shm.c linux-2.6.32.16/grsecurity/gracl_shm.c |
39841 | --- linux-2.6.32.15/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 | 40069 | --- linux-2.6.32.16/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 |
39842 | +++ linux-2.6.32.15/grsecurity/gracl_shm.c 2010-06-26 14:01:55.746591444 -0400 | 40070 | +++ linux-2.6.32.16/grsecurity/gracl_shm.c 2010-07-09 14:50:38.000000000 -0400 |
39843 | @@ -0,0 +1,40 @@ | 40071 | @@ -0,0 +1,40 @@ |
39844 | +#include <linux/kernel.h> | 40072 | +#include <linux/kernel.h> |
39845 | +#include <linux/mm.h> | 40073 | +#include <linux/mm.h> |
@@ -39881,9 +40109,9 @@ diff -urNp linux-2.6.32.15/grsecurity/gracl_shm.c linux-2.6.32.15/grsecurity/gra | |||
39881 | + | 40109 | + |
39882 | + return 1; | 40110 | + return 1; |
39883 | +} | 40111 | +} |
39884 | diff -urNp linux-2.6.32.15/grsecurity/grsec_chdir.c linux-2.6.32.15/grsecurity/grsec_chdir.c | 40112 | diff -urNp linux-2.6.32.16/grsecurity/grsec_chdir.c linux-2.6.32.16/grsecurity/grsec_chdir.c |
39885 | --- linux-2.6.32.15/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 | 40113 | --- linux-2.6.32.16/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 |
39886 | +++ linux-2.6.32.15/grsecurity/grsec_chdir.c 2010-05-28 21:27:16.331240103 -0400 | 40114 | +++ linux-2.6.32.16/grsecurity/grsec_chdir.c 2010-07-09 14:50:38.000000000 -0400 |
39887 | @@ -0,0 +1,19 @@ | 40115 | @@ -0,0 +1,19 @@ |
39888 | +#include <linux/kernel.h> | 40116 | +#include <linux/kernel.h> |
39889 | +#include <linux/sched.h> | 40117 | +#include <linux/sched.h> |
@@ -39904,10 +40132,10 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_chdir.c linux-2.6.32.15/grsecurity/g | |||
39904 | +#endif | 40132 | +#endif |
39905 | + return; | 40133 | + return; |
39906 | +} | 40134 | +} |
39907 | diff -urNp linux-2.6.32.15/grsecurity/grsec_chroot.c linux-2.6.32.15/grsecurity/grsec_chroot.c | 40135 | diff -urNp linux-2.6.32.16/grsecurity/grsec_chroot.c linux-2.6.32.16/grsecurity/grsec_chroot.c |
39908 | --- linux-2.6.32.15/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 | 40136 | --- linux-2.6.32.16/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 |
39909 | +++ linux-2.6.32.15/grsecurity/grsec_chroot.c 2010-06-26 14:05:26.054819575 -0400 | 40137 | +++ linux-2.6.32.16/grsecurity/grsec_chroot.c 2010-07-10 08:10:14.000000000 -0400 |
39910 | @@ -0,0 +1,355 @@ | 40138 | @@ -0,0 +1,389 @@ |
39911 | +#include <linux/kernel.h> | 40139 | +#include <linux/kernel.h> |
39912 | +#include <linux/module.h> | 40140 | +#include <linux/module.h> |
39913 | +#include <linux/sched.h> | 40141 | +#include <linux/sched.h> |
@@ -39919,6 +40147,29 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_chroot.c linux-2.6.32.15/grsecurity/ | |||
39919 | +#include <linux/grsecurity.h> | 40147 | +#include <linux/grsecurity.h> |
39920 | +#include <linux/grinternal.h> | 40148 | +#include <linux/grinternal.h> |
39921 | + | 40149 | + |
40150 | +void gr_set_chroot_entries(struct task_struct *task, struct path *path) | ||
40151 | +{ | ||
40152 | +#ifdef CONFIG_GRKERNSEC | ||
40153 | + if (task->pid > 1 && path->dentry != init_task.fs->root.dentry && | ||
40154 | + path->dentry != task->nsproxy->mnt_ns->root->mnt_root) | ||
40155 | + task->gr_is_chrooted = 1; | ||
40156 | + else | ||
40157 | + task->gr_is_chrooted = 0; | ||
40158 | + | ||
40159 | + task->gr_chroot_dentry = path->dentry; | ||
40160 | +#endif | ||
40161 | + return; | ||
40162 | +} | ||
40163 | + | ||
40164 | +void gr_clear_chroot_entries(struct task_struct *task) | ||
40165 | +{ | ||
40166 | +#ifdef CONFIG_GRKERNSEC | ||
40167 | + task->gr_is_chrooted = 0; | ||
40168 | + task->gr_chroot_dentry = NULL; | ||
40169 | +#endif | ||
40170 | + return; | ||
40171 | +} | ||
40172 | + | ||
39922 | +int | 40173 | +int |
39923 | +gr_handle_chroot_unix(const pid_t pid) | 40174 | +gr_handle_chroot_unix(const pid_t pid) |
39924 | +{ | 40175 | +{ |
@@ -39938,15 +40189,12 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_chroot.c linux-2.6.32.15/grsecurity/ | |||
39938 | + if (spid) { | 40189 | + if (spid) { |
39939 | + struct task_struct *p; | 40190 | + struct task_struct *p; |
39940 | + p = pid_task(spid, PIDTYPE_PID); | 40191 | + p = pid_task(spid, PIDTYPE_PID); |
39941 | + gr_fs_read_lock(p); | ||
39942 | + if (unlikely(!have_same_root(current, p))) { | 40192 | + if (unlikely(!have_same_root(current, p))) { |
39943 | + gr_fs_read_unlock(p); | ||
39944 | + read_unlock(&tasklist_lock); | 40193 | + read_unlock(&tasklist_lock); |
39945 | + rcu_read_unlock(); | 40194 | + rcu_read_unlock(); |
39946 | + gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG); | 40195 | + gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG); |
39947 | + return 0; | 40196 | + return 0; |
39948 | + } | 40197 | + } |
39949 | + gr_fs_read_unlock(p); | ||
39950 | + } | 40198 | + } |
39951 | + read_unlock(&tasklist_lock); | 40199 | + read_unlock(&tasklist_lock); |
39952 | + rcu_read_unlock(); | 40200 | + rcu_read_unlock(); |
@@ -39991,19 +40239,39 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_chroot.c linux-2.6.32.15/grsecurity/ | |||
39991 | +} | 40239 | +} |
39992 | + | 40240 | + |
39993 | +int | 40241 | +int |
40242 | +gr_handle_chroot_fowner(struct pid *pid, enum pid_type type) | ||
40243 | +{ | ||
40244 | +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK | ||
40245 | + struct task_struct *p; | ||
40246 | + int ret = 0; | ||
40247 | + if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid) | ||
40248 | + return ret; | ||
40249 | + | ||
40250 | + read_lock(&tasklist_lock); | ||
40251 | + do_each_pid_task(pid, type, p) { | ||
40252 | + if (!have_same_root(current, p)) { | ||
40253 | + ret = 1; | ||
40254 | + goto out; | ||
40255 | + } | ||
40256 | + } while_each_pid_task(pid, type, p); | ||
40257 | +out: | ||
40258 | + read_unlock(&tasklist_lock); | ||
40259 | + return ret; | ||
40260 | +#endif | ||
40261 | + return 0; | ||
40262 | +} | ||
40263 | + | ||
40264 | +int | ||
39994 | +gr_pid_is_chrooted(struct task_struct *p) | 40265 | +gr_pid_is_chrooted(struct task_struct *p) |
39995 | +{ | 40266 | +{ |
39996 | +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK | 40267 | +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK |
39997 | + if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL) | 40268 | + if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL) |
39998 | + return 0; | 40269 | + return 0; |
39999 | + | 40270 | + |
40000 | + gr_fs_read_lock(p); | ||
40001 | + if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) || | 40271 | + if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) || |
40002 | + !have_same_root(current, p)) { | 40272 | + !have_same_root(current, p)) { |
40003 | + gr_fs_read_unlock(p); | ||
40004 | + return 1; | 40273 | + return 1; |
40005 | + } | 40274 | + } |
40006 | + gr_fs_read_unlock(p); | ||
40007 | +#endif | 40275 | +#endif |
40008 | + return 0; | 40276 | + return 0; |
40009 | +} | 40277 | +} |
@@ -40099,31 +40367,25 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_chroot.c linux-2.6.32.15/grsecurity/ | |||
40099 | + if (pid) { | 40367 | + if (pid) { |
40100 | + struct task_struct *p; | 40368 | + struct task_struct *p; |
40101 | + p = pid_task(pid, PIDTYPE_PID); | 40369 | + p = pid_task(pid, PIDTYPE_PID); |
40102 | + gr_fs_read_lock(p); | ||
40103 | + starttime = p->start_time.tv_sec; | 40370 | + starttime = p->start_time.tv_sec; |
40104 | + if (unlikely(!have_same_root(current, p) && | 40371 | + if (unlikely(!have_same_root(current, p) && |
40105 | + time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime))) { | 40372 | + time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime))) { |
40106 | + gr_fs_read_unlock(p); | ||
40107 | + read_unlock(&tasklist_lock); | 40373 | + read_unlock(&tasklist_lock); |
40108 | + rcu_read_unlock(); | 40374 | + rcu_read_unlock(); |
40109 | + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG); | 40375 | + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG); |
40110 | + return 0; | 40376 | + return 0; |
40111 | + } | 40377 | + } |
40112 | + gr_fs_read_unlock(p); | ||
40113 | + } else { | 40378 | + } else { |
40114 | + pid = find_vpid(shm_lapid); | 40379 | + pid = find_vpid(shm_lapid); |
40115 | + if (pid) { | 40380 | + if (pid) { |
40116 | + struct task_struct *p; | 40381 | + struct task_struct *p; |
40117 | + p = pid_task(pid, PIDTYPE_PID); | 40382 | + p = pid_task(pid, PIDTYPE_PID); |
40118 | + gr_fs_read_lock(p); | ||
40119 | + if (unlikely(!have_same_root(current, p))) { | 40383 | + if (unlikely(!have_same_root(current, p))) { |
40120 | + gr_fs_read_unlock(p); | ||
40121 | + read_unlock(&tasklist_lock); | 40384 | + read_unlock(&tasklist_lock); |
40122 | + rcu_read_unlock(); | 40385 | + rcu_read_unlock(); |
40123 | + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG); | 40386 | + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG); |
40124 | + return 0; | 40387 | + return 0; |
40125 | + } | 40388 | + } |
40126 | + gr_fs_read_unlock(p); | ||
40127 | + } | 40389 | + } |
40128 | + } | 40390 | + } |
40129 | + | 40391 | + |
@@ -40263,10 +40525,10 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_chroot.c linux-2.6.32.15/grsecurity/ | |||
40263 | +#ifdef CONFIG_SECURITY | 40525 | +#ifdef CONFIG_SECURITY |
40264 | +EXPORT_SYMBOL(gr_handle_chroot_caps); | 40526 | +EXPORT_SYMBOL(gr_handle_chroot_caps); |
40265 | +#endif | 40527 | +#endif |
40266 | diff -urNp linux-2.6.32.15/grsecurity/grsec_disabled.c linux-2.6.32.15/grsecurity/grsec_disabled.c | 40528 | diff -urNp linux-2.6.32.16/grsecurity/grsec_disabled.c linux-2.6.32.16/grsecurity/grsec_disabled.c |
40267 | --- linux-2.6.32.15/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 | 40529 | --- linux-2.6.32.16/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 |
40268 | +++ linux-2.6.32.15/grsecurity/grsec_disabled.c 2010-05-28 21:27:16.331240103 -0400 | 40530 | +++ linux-2.6.32.16/grsecurity/grsec_disabled.c 2010-07-10 07:45:05.000000000 -0400 |
40269 | @@ -0,0 +1,426 @@ | 40531 | @@ -0,0 +1,431 @@ |
40270 | +#include <linux/kernel.h> | 40532 | +#include <linux/kernel.h> |
40271 | +#include <linux/module.h> | 40533 | +#include <linux/module.h> |
40272 | +#include <linux/sched.h> | 40534 | +#include <linux/sched.h> |
@@ -40357,6 +40619,12 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_disabled.c linux-2.6.32.15/grsecurit | |||
40357 | + return 0; | 40619 | + return 0; |
40358 | +} | 40620 | +} |
40359 | + | 40621 | + |
40622 | +int | ||
40623 | +gr_check_protected_task_fowner(struct pid *pid, enum pid_type type) | ||
40624 | +{ | ||
40625 | + return 0; | ||
40626 | +} | ||
40627 | + | ||
40360 | +void | 40628 | +void |
40361 | +gr_copy_label(struct task_struct *tsk) | 40629 | +gr_copy_label(struct task_struct *tsk) |
40362 | +{ | 40630 | +{ |
@@ -40684,7 +40952,6 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_disabled.c linux-2.6.32.15/grsecurit | |||
40684 | + return 0; | 40952 | + return 0; |
40685 | +} | 40953 | +} |
40686 | + | 40954 | + |
40687 | + | ||
40688 | +EXPORT_SYMBOL(gr_is_capable); | 40955 | +EXPORT_SYMBOL(gr_is_capable); |
40689 | +EXPORT_SYMBOL(gr_is_capable_nolog); | 40956 | +EXPORT_SYMBOL(gr_is_capable_nolog); |
40690 | +EXPORT_SYMBOL(gr_learn_resource); | 40957 | +EXPORT_SYMBOL(gr_learn_resource); |
@@ -40693,9 +40960,9 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_disabled.c linux-2.6.32.15/grsecurit | |||
40693 | +EXPORT_SYMBOL(gr_check_user_change); | 40960 | +EXPORT_SYMBOL(gr_check_user_change); |
40694 | +EXPORT_SYMBOL(gr_check_group_change); | 40961 | +EXPORT_SYMBOL(gr_check_group_change); |
40695 | +#endif | 40962 | +#endif |
40696 | diff -urNp linux-2.6.32.15/grsecurity/grsec_exec.c linux-2.6.32.15/grsecurity/grsec_exec.c | 40963 | diff -urNp linux-2.6.32.16/grsecurity/grsec_exec.c linux-2.6.32.16/grsecurity/grsec_exec.c |
40697 | --- linux-2.6.32.15/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 | 40964 | --- linux-2.6.32.16/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 |
40698 | +++ linux-2.6.32.15/grsecurity/grsec_exec.c 2010-05-28 21:27:16.331240103 -0400 | 40965 | +++ linux-2.6.32.16/grsecurity/grsec_exec.c 2010-07-09 14:50:38.000000000 -0400 |
40699 | @@ -0,0 +1,89 @@ | 40966 | @@ -0,0 +1,89 @@ |
40700 | +#include <linux/kernel.h> | 40967 | +#include <linux/kernel.h> |
40701 | +#include <linux/sched.h> | 40968 | +#include <linux/sched.h> |
@@ -40786,9 +41053,9 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_exec.c linux-2.6.32.15/grsecurity/gr | |||
40786 | +#endif | 41053 | +#endif |
40787 | + return; | 41054 | + return; |
40788 | +} | 41055 | +} |
40789 | diff -urNp linux-2.6.32.15/grsecurity/grsec_fifo.c linux-2.6.32.15/grsecurity/grsec_fifo.c | 41056 | diff -urNp linux-2.6.32.16/grsecurity/grsec_fifo.c linux-2.6.32.16/grsecurity/grsec_fifo.c |
40790 | --- linux-2.6.32.15/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 | 41057 | --- linux-2.6.32.16/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 |
40791 | +++ linux-2.6.32.15/grsecurity/grsec_fifo.c 2010-05-28 21:27:16.331240103 -0400 | 41058 | +++ linux-2.6.32.16/grsecurity/grsec_fifo.c 2010-07-09 14:50:38.000000000 -0400 |
40792 | @@ -0,0 +1,24 @@ | 41059 | @@ -0,0 +1,24 @@ |
40793 | +#include <linux/kernel.h> | 41060 | +#include <linux/kernel.h> |
40794 | +#include <linux/sched.h> | 41061 | +#include <linux/sched.h> |
@@ -40814,9 +41081,9 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_fifo.c linux-2.6.32.15/grsecurity/gr | |||
40814 | +#endif | 41081 | +#endif |
40815 | + return 0; | 41082 | + return 0; |
40816 | +} | 41083 | +} |
40817 | diff -urNp linux-2.6.32.15/grsecurity/grsec_fork.c linux-2.6.32.15/grsecurity/grsec_fork.c | 41084 | diff -urNp linux-2.6.32.16/grsecurity/grsec_fork.c linux-2.6.32.16/grsecurity/grsec_fork.c |
40818 | --- linux-2.6.32.15/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 | 41085 | --- linux-2.6.32.16/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 |
40819 | +++ linux-2.6.32.15/grsecurity/grsec_fork.c 2010-05-28 21:27:16.331240103 -0400 | 41086 | +++ linux-2.6.32.16/grsecurity/grsec_fork.c 2010-07-09 14:50:38.000000000 -0400 |
40820 | @@ -0,0 +1,15 @@ | 41087 | @@ -0,0 +1,15 @@ |
40821 | +#include <linux/kernel.h> | 41088 | +#include <linux/kernel.h> |
40822 | +#include <linux/sched.h> | 41089 | +#include <linux/sched.h> |
@@ -40833,9 +41100,9 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_fork.c linux-2.6.32.15/grsecurity/gr | |||
40833 | +#endif | 41100 | +#endif |
40834 | + return; | 41101 | + return; |
40835 | +} | 41102 | +} |
40836 | diff -urNp linux-2.6.32.15/grsecurity/grsec_init.c linux-2.6.32.15/grsecurity/grsec_init.c | 41103 | diff -urNp linux-2.6.32.16/grsecurity/grsec_init.c linux-2.6.32.16/grsecurity/grsec_init.c |
40837 | --- linux-2.6.32.15/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 | 41104 | --- linux-2.6.32.16/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 |
40838 | +++ linux-2.6.32.15/grsecurity/grsec_init.c 2010-06-27 12:52:54.615758098 -0400 | 41105 | +++ linux-2.6.32.16/grsecurity/grsec_init.c 2010-07-09 14:50:38.000000000 -0400 |
40839 | @@ -0,0 +1,258 @@ | 41106 | @@ -0,0 +1,258 @@ |
40840 | +#include <linux/kernel.h> | 41107 | +#include <linux/kernel.h> |
40841 | +#include <linux/sched.h> | 41108 | +#include <linux/sched.h> |
@@ -41095,9 +41362,9 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_init.c linux-2.6.32.15/grsecurity/gr | |||
41095 | + | 41362 | + |
41096 | + return; | 41363 | + return; |
41097 | +} | 41364 | +} |
41098 | diff -urNp linux-2.6.32.15/grsecurity/grsec_link.c linux-2.6.32.15/grsecurity/grsec_link.c | 41365 | diff -urNp linux-2.6.32.16/grsecurity/grsec_link.c linux-2.6.32.16/grsecurity/grsec_link.c |
41099 | --- linux-2.6.32.15/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 | 41366 | --- linux-2.6.32.16/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 |
41100 | +++ linux-2.6.32.15/grsecurity/grsec_link.c 2010-05-28 21:27:16.331240103 -0400 | 41367 | +++ linux-2.6.32.16/grsecurity/grsec_link.c 2010-07-09 14:50:38.000000000 -0400 |
41101 | @@ -0,0 +1,43 @@ | 41368 | @@ -0,0 +1,43 @@ |
41102 | +#include <linux/kernel.h> | 41369 | +#include <linux/kernel.h> |
41103 | +#include <linux/sched.h> | 41370 | +#include <linux/sched.h> |
@@ -41142,10 +41409,10 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_link.c linux-2.6.32.15/grsecurity/gr | |||
41142 | +#endif | 41409 | +#endif |
41143 | + return 0; | 41410 | + return 0; |
41144 | +} | 41411 | +} |
41145 | diff -urNp linux-2.6.32.15/grsecurity/grsec_log.c linux-2.6.32.15/grsecurity/grsec_log.c | 41412 | diff -urNp linux-2.6.32.16/grsecurity/grsec_log.c linux-2.6.32.16/grsecurity/grsec_log.c |
41146 | --- linux-2.6.32.15/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 | 41413 | --- linux-2.6.32.16/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 |
41147 | +++ linux-2.6.32.15/grsecurity/grsec_log.c 2010-05-28 21:27:16.331240103 -0400 | 41414 | +++ linux-2.6.32.16/grsecurity/grsec_log.c 2010-07-09 14:50:38.000000000 -0400 |
41148 | @@ -0,0 +1,296 @@ | 41415 | @@ -0,0 +1,306 @@ |
41149 | +#include <linux/kernel.h> | 41416 | +#include <linux/kernel.h> |
41150 | +#include <linux/sched.h> | 41417 | +#include <linux/sched.h> |
41151 | +#include <linux/file.h> | 41418 | +#include <linux/file.h> |
@@ -41153,7 +41420,16 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_log.c linux-2.6.32.15/grsecurity/grs | |||
41153 | +#include <linux/fs.h> | 41420 | +#include <linux/fs.h> |
41154 | +#include <linux/grinternal.h> | 41421 | +#include <linux/grinternal.h> |
41155 | + | 41422 | + |
41423 | +#ifdef CONFIG_TREE_PREEMPT_RCU | ||
41424 | +#define DISABLE_PREEMPT() preempt_disable() | ||
41425 | +#define ENABLE_PREEMPT() preempt_enable() | ||
41426 | +#else | ||
41427 | +#define DISABLE_PREEMPT() | ||
41428 | +#define ENABLE_PREEMPT() | ||
41429 | +#endif | ||
41430 | + | ||
41156 | +#define BEGIN_LOCKS(x) \ | 41431 | +#define BEGIN_LOCKS(x) \ |
41432 | + DISABLE_PREEMPT(); \ | ||
41157 | + rcu_read_lock(); \ | 41433 | + rcu_read_lock(); \ |
41158 | + read_lock(&tasklist_lock); \ | 41434 | + read_lock(&tasklist_lock); \ |
41159 | + read_lock(&grsec_exec_file_lock); \ | 41435 | + read_lock(&grsec_exec_file_lock); \ |
@@ -41170,6 +41446,7 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_log.c linux-2.6.32.15/grsecurity/grs | |||
41170 | + read_unlock(&grsec_exec_file_lock); \ | 41446 | + read_unlock(&grsec_exec_file_lock); \ |
41171 | + read_unlock(&tasklist_lock); \ | 41447 | + read_unlock(&tasklist_lock); \ |
41172 | + rcu_read_unlock(); \ | 41448 | + rcu_read_unlock(); \ |
41449 | + ENABLE_PREEMPT(); \ | ||
41173 | + if (x == GR_DONT_AUDIT) \ | 41450 | + if (x == GR_DONT_AUDIT) \ |
41174 | + gr_handle_alertkill(current) | 41451 | + gr_handle_alertkill(current) |
41175 | + | 41452 | + |
@@ -41442,9 +41719,9 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_log.c linux-2.6.32.15/grsecurity/grs | |||
41442 | + gr_log_end(audit); | 41719 | + gr_log_end(audit); |
41443 | + END_LOCKS(audit); | 41720 | + END_LOCKS(audit); |
41444 | +} | 41721 | +} |
41445 | diff -urNp linux-2.6.32.15/grsecurity/grsec_mem.c linux-2.6.32.15/grsecurity/grsec_mem.c | 41722 | diff -urNp linux-2.6.32.16/grsecurity/grsec_mem.c linux-2.6.32.16/grsecurity/grsec_mem.c |
41446 | --- linux-2.6.32.15/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 | 41723 | --- linux-2.6.32.16/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 |
41447 | +++ linux-2.6.32.15/grsecurity/grsec_mem.c 2010-05-28 21:27:16.331240103 -0400 | 41724 | +++ linux-2.6.32.16/grsecurity/grsec_mem.c 2010-07-09 14:50:38.000000000 -0400 |
41448 | @@ -0,0 +1,85 @@ | 41725 | @@ -0,0 +1,85 @@ |
41449 | +#include <linux/kernel.h> | 41726 | +#include <linux/kernel.h> |
41450 | +#include <linux/sched.h> | 41727 | +#include <linux/sched.h> |
@@ -41531,9 +41808,9 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_mem.c linux-2.6.32.15/grsecurity/grs | |||
41531 | + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); | 41808 | + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); |
41532 | + return; | 41809 | + return; |
41533 | +} | 41810 | +} |
41534 | diff -urNp linux-2.6.32.15/grsecurity/grsec_mount.c linux-2.6.32.15/grsecurity/grsec_mount.c | 41811 | diff -urNp linux-2.6.32.16/grsecurity/grsec_mount.c linux-2.6.32.16/grsecurity/grsec_mount.c |
41535 | --- linux-2.6.32.15/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 | 41812 | --- linux-2.6.32.16/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 |
41536 | +++ linux-2.6.32.15/grsecurity/grsec_mount.c 2010-05-28 21:27:16.331240103 -0400 | 41813 | +++ linux-2.6.32.16/grsecurity/grsec_mount.c 2010-07-09 14:50:38.000000000 -0400 |
41537 | @@ -0,0 +1,62 @@ | 41814 | @@ -0,0 +1,62 @@ |
41538 | +#include <linux/kernel.h> | 41815 | +#include <linux/kernel.h> |
41539 | +#include <linux/sched.h> | 41816 | +#include <linux/sched.h> |
@@ -41597,9 +41874,9 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_mount.c linux-2.6.32.15/grsecurity/g | |||
41597 | +#endif | 41874 | +#endif |
41598 | + return 0; | 41875 | + return 0; |
41599 | +} | 41876 | +} |
41600 | diff -urNp linux-2.6.32.15/grsecurity/grsec_ptrace.c linux-2.6.32.15/grsecurity/grsec_ptrace.c | 41877 | diff -urNp linux-2.6.32.16/grsecurity/grsec_ptrace.c linux-2.6.32.16/grsecurity/grsec_ptrace.c |
41601 | --- linux-2.6.32.15/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 | 41878 | --- linux-2.6.32.16/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 |
41602 | +++ linux-2.6.32.15/grsecurity/grsec_ptrace.c 2010-05-28 21:27:16.331240103 -0400 | 41879 | +++ linux-2.6.32.16/grsecurity/grsec_ptrace.c 2010-07-09 14:50:38.000000000 -0400 |
41603 | @@ -0,0 +1,14 @@ | 41880 | @@ -0,0 +1,14 @@ |
41604 | +#include <linux/kernel.h> | 41881 | +#include <linux/kernel.h> |
41605 | +#include <linux/sched.h> | 41882 | +#include <linux/sched.h> |
@@ -41615,9 +41892,9 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_ptrace.c linux-2.6.32.15/grsecurity/ | |||
41615 | +#endif | 41892 | +#endif |
41616 | + return; | 41893 | + return; |
41617 | +} | 41894 | +} |
41618 | diff -urNp linux-2.6.32.15/grsecurity/grsec_sig.c linux-2.6.32.15/grsecurity/grsec_sig.c | 41895 | diff -urNp linux-2.6.32.16/grsecurity/grsec_sig.c linux-2.6.32.16/grsecurity/grsec_sig.c |
41619 | --- linux-2.6.32.15/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 | 41896 | --- linux-2.6.32.16/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 |
41620 | +++ linux-2.6.32.15/grsecurity/grsec_sig.c 2010-05-28 21:27:16.331240103 -0400 | 41897 | +++ linux-2.6.32.16/grsecurity/grsec_sig.c 2010-07-09 14:50:38.000000000 -0400 |
41621 | @@ -0,0 +1,65 @@ | 41898 | @@ -0,0 +1,65 @@ |
41622 | +#include <linux/kernel.h> | 41899 | +#include <linux/kernel.h> |
41623 | +#include <linux/sched.h> | 41900 | +#include <linux/sched.h> |
@@ -41684,9 +41961,9 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_sig.c linux-2.6.32.15/grsecurity/grs | |||
41684 | + return; | 41961 | + return; |
41685 | +} | 41962 | +} |
41686 | + | 41963 | + |
41687 | diff -urNp linux-2.6.32.15/grsecurity/grsec_sock.c linux-2.6.32.15/grsecurity/grsec_sock.c | 41964 | diff -urNp linux-2.6.32.16/grsecurity/grsec_sock.c linux-2.6.32.16/grsecurity/grsec_sock.c |
41688 | --- linux-2.6.32.15/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 | 41965 | --- linux-2.6.32.16/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 |
41689 | +++ linux-2.6.32.15/grsecurity/grsec_sock.c 2010-05-28 21:27:16.331240103 -0400 | 41966 | +++ linux-2.6.32.16/grsecurity/grsec_sock.c 2010-07-09 14:50:38.000000000 -0400 |
41690 | @@ -0,0 +1,271 @@ | 41967 | @@ -0,0 +1,271 @@ |
41691 | +#include <linux/kernel.h> | 41968 | +#include <linux/kernel.h> |
41692 | +#include <linux/module.h> | 41969 | +#include <linux/module.h> |
@@ -41959,9 +42236,9 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_sock.c linux-2.6.32.15/grsecurity/gr | |||
41959 | + return current_cap(); | 42236 | + return current_cap(); |
41960 | +#endif | 42237 | +#endif |
41961 | +} | 42238 | +} |
41962 | diff -urNp linux-2.6.32.15/grsecurity/grsec_sysctl.c linux-2.6.32.15/grsecurity/grsec_sysctl.c | 42239 | diff -urNp linux-2.6.32.16/grsecurity/grsec_sysctl.c linux-2.6.32.16/grsecurity/grsec_sysctl.c |
41963 | --- linux-2.6.32.15/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 | 42240 | --- linux-2.6.32.16/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 |
41964 | +++ linux-2.6.32.15/grsecurity/grsec_sysctl.c 2010-06-19 21:32:37.093947224 -0400 | 42241 | +++ linux-2.6.32.16/grsecurity/grsec_sysctl.c 2010-07-09 14:50:38.000000000 -0400 |
41965 | @@ -0,0 +1,459 @@ | 42242 | @@ -0,0 +1,459 @@ |
41966 | +#include <linux/kernel.h> | 42243 | +#include <linux/kernel.h> |
41967 | +#include <linux/sched.h> | 42244 | +#include <linux/sched.h> |
@@ -42422,9 +42699,9 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_sysctl.c linux-2.6.32.15/grsecurity/ | |||
42422 | + { .ctl_name = 0 } | 42699 | + { .ctl_name = 0 } |
42423 | +}; | 42700 | +}; |
42424 | +#endif | 42701 | +#endif |
42425 | diff -urNp linux-2.6.32.15/grsecurity/grsec_textrel.c linux-2.6.32.15/grsecurity/grsec_textrel.c | 42702 | diff -urNp linux-2.6.32.16/grsecurity/grsec_textrel.c linux-2.6.32.16/grsecurity/grsec_textrel.c |
42426 | --- linux-2.6.32.15/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 | 42703 | --- linux-2.6.32.16/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 |
42427 | +++ linux-2.6.32.15/grsecurity/grsec_textrel.c 2010-05-28 21:27:16.331240103 -0400 | 42704 | +++ linux-2.6.32.16/grsecurity/grsec_textrel.c 2010-07-09 14:50:38.000000000 -0400 |
42428 | @@ -0,0 +1,16 @@ | 42705 | @@ -0,0 +1,16 @@ |
42429 | +#include <linux/kernel.h> | 42706 | +#include <linux/kernel.h> |
42430 | +#include <linux/sched.h> | 42707 | +#include <linux/sched.h> |
@@ -42442,9 +42719,9 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_textrel.c linux-2.6.32.15/grsecurity | |||
42442 | +#endif | 42719 | +#endif |
42443 | + return; | 42720 | + return; |
42444 | +} | 42721 | +} |
42445 | diff -urNp linux-2.6.32.15/grsecurity/grsec_time.c linux-2.6.32.15/grsecurity/grsec_time.c | 42722 | diff -urNp linux-2.6.32.16/grsecurity/grsec_time.c linux-2.6.32.16/grsecurity/grsec_time.c |
42446 | --- linux-2.6.32.15/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 | 42723 | --- linux-2.6.32.16/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 |
42447 | +++ linux-2.6.32.15/grsecurity/grsec_time.c 2010-05-28 21:27:16.331240103 -0400 | 42724 | +++ linux-2.6.32.16/grsecurity/grsec_time.c 2010-07-09 14:50:38.000000000 -0400 |
42448 | @@ -0,0 +1,13 @@ | 42725 | @@ -0,0 +1,13 @@ |
42449 | +#include <linux/kernel.h> | 42726 | +#include <linux/kernel.h> |
42450 | +#include <linux/sched.h> | 42727 | +#include <linux/sched.h> |
@@ -42459,9 +42736,9 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_time.c linux-2.6.32.15/grsecurity/gr | |||
42459 | +#endif | 42736 | +#endif |
42460 | + return; | 42737 | + return; |
42461 | +} | 42738 | +} |
42462 | diff -urNp linux-2.6.32.15/grsecurity/grsec_tpe.c linux-2.6.32.15/grsecurity/grsec_tpe.c | 42739 | diff -urNp linux-2.6.32.16/grsecurity/grsec_tpe.c linux-2.6.32.16/grsecurity/grsec_tpe.c |
42463 | --- linux-2.6.32.15/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 | 42740 | --- linux-2.6.32.16/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 |
42464 | +++ linux-2.6.32.15/grsecurity/grsec_tpe.c 2010-05-28 21:27:16.331240103 -0400 | 42741 | +++ linux-2.6.32.16/grsecurity/grsec_tpe.c 2010-07-09 14:50:38.000000000 -0400 |
42465 | @@ -0,0 +1,38 @@ | 42742 | @@ -0,0 +1,38 @@ |
42466 | +#include <linux/kernel.h> | 42743 | +#include <linux/kernel.h> |
42467 | +#include <linux/sched.h> | 42744 | +#include <linux/sched.h> |
@@ -42501,9 +42778,9 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_tpe.c linux-2.6.32.15/grsecurity/grs | |||
42501 | +#endif | 42778 | +#endif |
42502 | + return 1; | 42779 | + return 1; |
42503 | +} | 42780 | +} |
42504 | diff -urNp linux-2.6.32.15/grsecurity/grsum.c linux-2.6.32.15/grsecurity/grsum.c | 42781 | diff -urNp linux-2.6.32.16/grsecurity/grsum.c linux-2.6.32.16/grsecurity/grsum.c |
42505 | --- linux-2.6.32.15/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 | 42782 | --- linux-2.6.32.16/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 |
42506 | +++ linux-2.6.32.15/grsecurity/grsum.c 2010-06-26 13:55:39.510774424 -0400 | 42783 | +++ linux-2.6.32.16/grsecurity/grsum.c 2010-07-09 14:50:38.000000000 -0400 |
42507 | @@ -0,0 +1,61 @@ | 42784 | @@ -0,0 +1,61 @@ |
42508 | +#include <linux/err.h> | 42785 | +#include <linux/err.h> |
42509 | +#include <linux/kernel.h> | 42786 | +#include <linux/kernel.h> |
@@ -42566,9 +42843,9 @@ diff -urNp linux-2.6.32.15/grsecurity/grsum.c linux-2.6.32.15/grsecurity/grsum.c | |||
42566 | + | 42843 | + |
42567 | + return retval; | 42844 | + return retval; |
42568 | +} | 42845 | +} |
42569 | diff -urNp linux-2.6.32.15/grsecurity/Kconfig linux-2.6.32.15/grsecurity/Kconfig | 42846 | diff -urNp linux-2.6.32.16/grsecurity/Kconfig linux-2.6.32.16/grsecurity/Kconfig |
42570 | --- linux-2.6.32.15/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 | 42847 | --- linux-2.6.32.16/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 |
42571 | +++ linux-2.6.32.15/grsecurity/Kconfig 2010-06-26 14:17:55.584309817 -0400 | 42848 | +++ linux-2.6.32.16/grsecurity/Kconfig 2010-07-09 14:50:38.000000000 -0400 |
42572 | @@ -0,0 +1,981 @@ | 42849 | @@ -0,0 +1,981 @@ |
42573 | +# | 42850 | +# |
42574 | +# grecurity configuration | 42851 | +# grecurity configuration |
@@ -43385,14 +43662,14 @@ diff -urNp linux-2.6.32.15/grsecurity/Kconfig linux-2.6.32.15/grsecurity/Kconfig | |||
43385 | + help | 43662 | + help |
43386 | + If you say Y here, neither TCP resets nor ICMP | 43663 | + If you say Y here, neither TCP resets nor ICMP |
43387 | + destination-unreachable packets will be sent in response to packets | 43664 | + destination-unreachable packets will be sent in response to packets |
43388 | + send to ports for which no associated listening process exists. | 43665 | + sent to ports for which no associated listening process exists. |
43389 | + This feature supports both IPV4 and IPV6 and exempts the | 43666 | + This feature supports both IPV4 and IPV6 and exempts the |
43390 | + loopback interface from blackholing. Enabling this feature | 43667 | + loopback interface from blackholing. Enabling this feature |
43391 | + makes a host more resilient to DoS attacks and reduces network | 43668 | + makes a host more resilient to DoS attacks and reduces network |
43392 | + visibility against scanners. | 43669 | + visibility against scanners. |
43393 | + | 43670 | + |
43394 | + The blackhole feature as-implemented is equivalent to the FreeBSD | 43671 | + The blackhole feature as-implemented is equivalent to the FreeBSD |
43395 | + blackhole feature, as prevents RST responses to all packets, not | 43672 | + blackhole feature, as it prevents RST responses to all packets, not |
43396 | + just SYNs. Under most application behavior this causes no | 43673 | + just SYNs. Under most application behavior this causes no |
43397 | + problems, but applications (like haproxy) may not close certain | 43674 | + problems, but applications (like haproxy) may not close certain |
43398 | + connections in a way that cleanly terminates them on the remote | 43675 | + connections in a way that cleanly terminates them on the remote |
@@ -43551,9 +43828,9 @@ diff -urNp linux-2.6.32.15/grsecurity/Kconfig linux-2.6.32.15/grsecurity/Kconfig | |||
43551 | +endmenu | 43828 | +endmenu |
43552 | + | 43829 | + |
43553 | +endmenu | 43830 | +endmenu |
43554 | diff -urNp linux-2.6.32.15/grsecurity/Makefile linux-2.6.32.15/grsecurity/Makefile | 43831 | diff -urNp linux-2.6.32.16/grsecurity/Makefile linux-2.6.32.16/grsecurity/Makefile |
43555 | --- linux-2.6.32.15/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 | 43832 | --- linux-2.6.32.16/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 |
43556 | +++ linux-2.6.32.15/grsecurity/Makefile 2010-05-28 21:27:16.331240103 -0400 | 43833 | +++ linux-2.6.32.16/grsecurity/Makefile 2010-07-09 14:50:38.000000000 -0400 |
43557 | @@ -0,0 +1,29 @@ | 43834 | @@ -0,0 +1,29 @@ |
43558 | +# grsecurity's ACL system was originally written in 2001 by Michael Dalton | 43835 | +# grsecurity's ACL system was originally written in 2001 by Michael Dalton |
43559 | +# during 2001-2009 it has been completely redesigned by Brad Spengler | 43836 | +# during 2001-2009 it has been completely redesigned by Brad Spengler |
@@ -43584,9 +43861,9 @@ diff -urNp linux-2.6.32.15/grsecurity/Makefile linux-2.6.32.15/grsecurity/Makefi | |||
43584 | + @-chmod -f 700 . | 43861 | + @-chmod -f 700 . |
43585 | + @echo ' grsec: protected kernel image paths' | 43862 | + @echo ' grsec: protected kernel image paths' |
43586 | +endif | 43863 | +endif |
43587 | diff -urNp linux-2.6.32.15/include/acpi/acoutput.h linux-2.6.32.15/include/acpi/acoutput.h | 43864 | diff -urNp linux-2.6.32.16/include/acpi/acoutput.h linux-2.6.32.16/include/acpi/acoutput.h |
43588 | --- linux-2.6.32.15/include/acpi/acoutput.h 2010-03-15 11:52:04.000000000 -0400 | 43865 | --- linux-2.6.32.16/include/acpi/acoutput.h 2010-07-05 14:14:00.000000000 -0400 |
43589 | +++ linux-2.6.32.15/include/acpi/acoutput.h 2010-05-28 21:27:16.336579957 -0400 | 43866 | +++ linux-2.6.32.16/include/acpi/acoutput.h 2010-07-09 14:50:38.000000000 -0400 |
43590 | @@ -264,8 +264,8 @@ | 43867 | @@ -264,8 +264,8 @@ |
43591 | * leaving no executable debug code! | 43868 | * leaving no executable debug code! |
43592 | */ | 43869 | */ |
@@ -43598,9 +43875,9 @@ diff -urNp linux-2.6.32.15/include/acpi/acoutput.h linux-2.6.32.15/include/acpi/ | |||
43598 | 43875 | ||
43599 | #endif /* ACPI_DEBUG_OUTPUT */ | 43876 | #endif /* ACPI_DEBUG_OUTPUT */ |
43600 | 43877 | ||
43601 | diff -urNp linux-2.6.32.15/include/acpi/acpi_drivers.h linux-2.6.32.15/include/acpi/acpi_drivers.h | 43878 | diff -urNp linux-2.6.32.16/include/acpi/acpi_drivers.h linux-2.6.32.16/include/acpi/acpi_drivers.h |
43602 | --- linux-2.6.32.15/include/acpi/acpi_drivers.h 2010-03-15 11:52:04.000000000 -0400 | 43879 | --- linux-2.6.32.16/include/acpi/acpi_drivers.h 2010-07-05 14:14:00.000000000 -0400 |
43603 | +++ linux-2.6.32.15/include/acpi/acpi_drivers.h 2010-05-28 21:27:16.336579957 -0400 | 43880 | +++ linux-2.6.32.16/include/acpi/acpi_drivers.h 2010-07-09 14:50:38.000000000 -0400 |
43604 | @@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp | 43881 | @@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp |
43605 | Dock Station | 43882 | Dock Station |
43606 | -------------------------------------------------------------------------- */ | 43883 | -------------------------------------------------------------------------- */ |
@@ -43630,9 +43907,9 @@ diff -urNp linux-2.6.32.15/include/acpi/acpi_drivers.h linux-2.6.32.15/include/a | |||
43630 | void *context) | 43907 | void *context) |
43631 | { | 43908 | { |
43632 | return -ENODEV; | 43909 | return -ENODEV; |
43633 | diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/include/asm-generic/atomic-long.h | 43910 | diff -urNp linux-2.6.32.16/include/asm-generic/atomic-long.h linux-2.6.32.16/include/asm-generic/atomic-long.h |
43634 | --- linux-2.6.32.15/include/asm-generic/atomic-long.h 2010-03-15 11:52:04.000000000 -0400 | 43911 | --- linux-2.6.32.16/include/asm-generic/atomic-long.h 2010-07-05 14:14:00.000000000 -0400 |
43635 | +++ linux-2.6.32.15/include/asm-generic/atomic-long.h 2010-05-28 21:27:16.339120729 -0400 | 43912 | +++ linux-2.6.32.16/include/asm-generic/atomic-long.h 2010-07-09 14:50:38.000000000 -0400 |
43636 | @@ -22,6 +22,12 @@ | 43913 | @@ -22,6 +22,12 @@ |
43637 | 43914 | ||
43638 | typedef atomic64_t atomic_long_t; | 43915 | typedef atomic64_t atomic_long_t; |
@@ -43694,7 +43971,23 @@ diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/inc | |||
43694 | static inline void atomic_long_dec(atomic_long_t *l) | 43971 | static inline void atomic_long_dec(atomic_long_t *l) |
43695 | { | 43972 | { |
43696 | atomic64_t *v = (atomic64_t *)l; | 43973 | atomic64_t *v = (atomic64_t *)l; |
43697 | @@ -59,6 +92,15 @@ static inline void atomic_long_add(long | 43974 | @@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomi |
43975 | atomic64_dec(v); | ||
43976 | } | ||
43977 | |||
43978 | +#ifdef CONFIG_PAX_REFCOUNT | ||
43979 | +static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l) | ||
43980 | +{ | ||
43981 | + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l; | ||
43982 | + | ||
43983 | + atomic64_dec_unchecked(v); | ||
43984 | +} | ||
43985 | +#endif | ||
43986 | + | ||
43987 | static inline void atomic_long_add(long i, atomic_long_t *l) | ||
43988 | { | ||
43989 | atomic64_t *v = (atomic64_t *)l; | ||
43990 | @@ -59,6 +101,15 @@ static inline void atomic_long_add(long | ||
43698 | atomic64_add(i, v); | 43991 | atomic64_add(i, v); |
43699 | } | 43992 | } |
43700 | 43993 | ||
@@ -43710,7 +44003,7 @@ diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/inc | |||
43710 | static inline void atomic_long_sub(long i, atomic_long_t *l) | 44003 | static inline void atomic_long_sub(long i, atomic_long_t *l) |
43711 | { | 44004 | { |
43712 | atomic64_t *v = (atomic64_t *)l; | 44005 | atomic64_t *v = (atomic64_t *)l; |
43713 | @@ -115,6 +157,15 @@ static inline long atomic_long_inc_retur | 44006 | @@ -115,6 +166,15 @@ static inline long atomic_long_inc_retur |
43714 | return (long)atomic64_inc_return(v); | 44007 | return (long)atomic64_inc_return(v); |
43715 | } | 44008 | } |
43716 | 44009 | ||
@@ -43726,7 +44019,7 @@ diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/inc | |||
43726 | static inline long atomic_long_dec_return(atomic_long_t *l) | 44019 | static inline long atomic_long_dec_return(atomic_long_t *l) |
43727 | { | 44020 | { |
43728 | atomic64_t *v = (atomic64_t *)l; | 44021 | atomic64_t *v = (atomic64_t *)l; |
43729 | @@ -140,6 +191,12 @@ static inline long atomic_long_add_unles | 44022 | @@ -140,6 +200,12 @@ static inline long atomic_long_add_unles |
43730 | 44023 | ||
43731 | typedef atomic_t atomic_long_t; | 44024 | typedef atomic_t atomic_long_t; |
43732 | 44025 | ||
@@ -43739,7 +44032,7 @@ diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/inc | |||
43739 | #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i) | 44032 | #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i) |
43740 | static inline long atomic_long_read(atomic_long_t *l) | 44033 | static inline long atomic_long_read(atomic_long_t *l) |
43741 | { | 44034 | { |
43742 | @@ -148,6 +205,15 @@ static inline long atomic_long_read(atom | 44035 | @@ -148,6 +214,15 @@ static inline long atomic_long_read(atom |
43743 | return (long)atomic_read(v); | 44036 | return (long)atomic_read(v); |
43744 | } | 44037 | } |
43745 | 44038 | ||
@@ -43755,7 +44048,7 @@ diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/inc | |||
43755 | static inline void atomic_long_set(atomic_long_t *l, long i) | 44048 | static inline void atomic_long_set(atomic_long_t *l, long i) |
43756 | { | 44049 | { |
43757 | atomic_t *v = (atomic_t *)l; | 44050 | atomic_t *v = (atomic_t *)l; |
43758 | @@ -155,6 +221,15 @@ static inline void atomic_long_set(atomi | 44051 | @@ -155,6 +230,15 @@ static inline void atomic_long_set(atomi |
43759 | atomic_set(v, i); | 44052 | atomic_set(v, i); |
43760 | } | 44053 | } |
43761 | 44054 | ||
@@ -43771,7 +44064,7 @@ diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/inc | |||
43771 | static inline void atomic_long_inc(atomic_long_t *l) | 44064 | static inline void atomic_long_inc(atomic_long_t *l) |
43772 | { | 44065 | { |
43773 | atomic_t *v = (atomic_t *)l; | 44066 | atomic_t *v = (atomic_t *)l; |
43774 | @@ -162,6 +237,15 @@ static inline void atomic_long_inc(atomi | 44067 | @@ -162,6 +246,15 @@ static inline void atomic_long_inc(atomi |
43775 | atomic_inc(v); | 44068 | atomic_inc(v); |
43776 | } | 44069 | } |
43777 | 44070 | ||
@@ -43787,7 +44080,23 @@ diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/inc | |||
43787 | static inline void atomic_long_dec(atomic_long_t *l) | 44080 | static inline void atomic_long_dec(atomic_long_t *l) |
43788 | { | 44081 | { |
43789 | atomic_t *v = (atomic_t *)l; | 44082 | atomic_t *v = (atomic_t *)l; |
43790 | @@ -176,6 +260,15 @@ static inline void atomic_long_add(long | 44083 | @@ -169,6 +262,15 @@ static inline void atomic_long_dec(atomi |
44084 | atomic_dec(v); | ||
44085 | } | ||
44086 | |||
44087 | +#ifdef CONFIG_PAX_REFCOUNT | ||
44088 | +static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l) | ||
44089 | +{ | ||
44090 | + atomic_unchecked_t *v = (atomic_unchecked_t *)l; | ||
44091 | + | ||
44092 | + atomic_dec_unchecked(v); | ||
44093 | +} | ||
44094 | +#endif | ||
44095 | + | ||
44096 | static inline void atomic_long_add(long i, atomic_long_t *l) | ||
44097 | { | ||
44098 | atomic_t *v = (atomic_t *)l; | ||
44099 | @@ -176,6 +278,15 @@ static inline void atomic_long_add(long | ||
43791 | atomic_add(i, v); | 44100 | atomic_add(i, v); |
43792 | } | 44101 | } |
43793 | 44102 | ||
@@ -43803,7 +44112,7 @@ diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/inc | |||
43803 | static inline void atomic_long_sub(long i, atomic_long_t *l) | 44112 | static inline void atomic_long_sub(long i, atomic_long_t *l) |
43804 | { | 44113 | { |
43805 | atomic_t *v = (atomic_t *)l; | 44114 | atomic_t *v = (atomic_t *)l; |
43806 | @@ -232,6 +325,15 @@ static inline long atomic_long_inc_retur | 44115 | @@ -232,6 +343,15 @@ static inline long atomic_long_inc_retur |
43807 | return (long)atomic_inc_return(v); | 44116 | return (long)atomic_inc_return(v); |
43808 | } | 44117 | } |
43809 | 44118 | ||
@@ -43819,7 +44128,7 @@ diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/inc | |||
43819 | static inline long atomic_long_dec_return(atomic_long_t *l) | 44128 | static inline long atomic_long_dec_return(atomic_long_t *l) |
43820 | { | 44129 | { |
43821 | atomic_t *v = (atomic_t *)l; | 44130 | atomic_t *v = (atomic_t *)l; |
43822 | @@ -255,4 +357,33 @@ static inline long atomic_long_add_unles | 44131 | @@ -255,4 +375,35 @@ static inline long atomic_long_add_unles |
43823 | 44132 | ||
43824 | #endif /* BITS_PER_LONG == 64 */ | 44133 | #endif /* BITS_PER_LONG == 64 */ |
43825 | 44134 | ||
@@ -43837,6 +44146,7 @@ diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/inc | |||
43837 | + atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL); | 44146 | + atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL); |
43838 | + atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL); | 44147 | + atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL); |
43839 | + atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL); | 44148 | + atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL); |
44149 | + atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL); | ||
43840 | +} | 44150 | +} |
43841 | +#else | 44151 | +#else |
43842 | +#define atomic_read_unchecked(v) atomic_read(v) | 44152 | +#define atomic_read_unchecked(v) atomic_read(v) |
@@ -43850,12 +44160,13 @@ diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/inc | |||
43850 | +#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v)) | 44160 | +#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v)) |
43851 | +#define atomic_long_inc_unchecked(v) atomic_long_inc(v) | 44161 | +#define atomic_long_inc_unchecked(v) atomic_long_inc(v) |
43852 | +#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v) | 44162 | +#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v) |
44163 | +#define atomic_long_dec_unchecked(v) atomic_long_dec(v) | ||
43853 | +#endif | 44164 | +#endif |
43854 | + | 44165 | + |
43855 | #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ | 44166 | #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ |
43856 | 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 | 44167 | diff -urNp linux-2.6.32.16/include/asm-generic/dma-mapping-common.h linux-2.6.32.16/include/asm-generic/dma-mapping-common.h |
43857 | --- linux-2.6.32.15/include/asm-generic/dma-mapping-common.h 2010-05-28 20:16:44.458924952 -0400 | 44168 | --- linux-2.6.32.16/include/asm-generic/dma-mapping-common.h 2010-07-05 14:14:00.000000000 -0400 |
43858 | +++ linux-2.6.32.15/include/asm-generic/dma-mapping-common.h 2010-05-28 21:27:16.339120729 -0400 | 44169 | +++ linux-2.6.32.16/include/asm-generic/dma-mapping-common.h 2010-07-09 14:50:38.000000000 -0400 |
43859 | @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ | 44170 | @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ |
43860 | enum dma_data_direction dir, | 44171 | enum dma_data_direction dir, |
43861 | struct dma_attrs *attrs) | 44172 | struct dma_attrs *attrs) |
@@ -43964,9 +44275,9 @@ diff -urNp linux-2.6.32.15/include/asm-generic/dma-mapping-common.h linux-2.6.32 | |||
43964 | 44275 | ||
43965 | BUG_ON(!valid_dma_direction(dir)); | 44276 | BUG_ON(!valid_dma_direction(dir)); |
43966 | if (ops->sync_sg_for_device) | 44277 | if (ops->sync_sg_for_device) |
43967 | diff -urNp linux-2.6.32.15/include/asm-generic/futex.h linux-2.6.32.15/include/asm-generic/futex.h | 44278 | diff -urNp linux-2.6.32.16/include/asm-generic/futex.h linux-2.6.32.16/include/asm-generic/futex.h |
43968 | --- linux-2.6.32.15/include/asm-generic/futex.h 2010-03-15 11:52:04.000000000 -0400 | 44279 | --- linux-2.6.32.16/include/asm-generic/futex.h 2010-07-05 14:14:00.000000000 -0400 |
43969 | +++ linux-2.6.32.15/include/asm-generic/futex.h 2010-05-28 21:27:16.343246556 -0400 | 44280 | +++ linux-2.6.32.16/include/asm-generic/futex.h 2010-07-09 14:50:38.000000000 -0400 |
43970 | @@ -6,7 +6,7 @@ | 44281 | @@ -6,7 +6,7 @@ |
43971 | #include <asm/errno.h> | 44282 | #include <asm/errno.h> |
43972 | 44283 | ||
@@ -43985,9 +44296,9 @@ diff -urNp linux-2.6.32.15/include/asm-generic/futex.h linux-2.6.32.15/include/a | |||
43985 | { | 44296 | { |
43986 | return -ENOSYS; | 44297 | return -ENOSYS; |
43987 | } | 44298 | } |
43988 | diff -urNp linux-2.6.32.15/include/asm-generic/int-l64.h linux-2.6.32.15/include/asm-generic/int-l64.h | 44299 | diff -urNp linux-2.6.32.16/include/asm-generic/int-l64.h linux-2.6.32.16/include/asm-generic/int-l64.h |
43989 | --- linux-2.6.32.15/include/asm-generic/int-l64.h 2010-03-15 11:52:04.000000000 -0400 | 44300 | --- linux-2.6.32.16/include/asm-generic/int-l64.h 2010-07-05 14:14:00.000000000 -0400 |
43990 | +++ linux-2.6.32.15/include/asm-generic/int-l64.h 2010-05-28 21:27:16.343246556 -0400 | 44301 | +++ linux-2.6.32.16/include/asm-generic/int-l64.h 2010-07-09 14:50:38.000000000 -0400 |
43991 | @@ -46,6 +46,8 @@ typedef unsigned int u32; | 44302 | @@ -46,6 +46,8 @@ typedef unsigned int u32; |
43992 | typedef signed long s64; | 44303 | typedef signed long s64; |
43993 | typedef unsigned long u64; | 44304 | typedef unsigned long u64; |
@@ -43997,9 +44308,9 @@ diff -urNp linux-2.6.32.15/include/asm-generic/int-l64.h linux-2.6.32.15/include | |||
43997 | #define S8_C(x) x | 44308 | #define S8_C(x) x |
43998 | #define U8_C(x) x ## U | 44309 | #define U8_C(x) x ## U |
43999 | #define S16_C(x) x | 44310 | #define S16_C(x) x |
44000 | diff -urNp linux-2.6.32.15/include/asm-generic/int-ll64.h linux-2.6.32.15/include/asm-generic/int-ll64.h | 44311 | diff -urNp linux-2.6.32.16/include/asm-generic/int-ll64.h linux-2.6.32.16/include/asm-generic/int-ll64.h |
44001 | --- linux-2.6.32.15/include/asm-generic/int-ll64.h 2010-03-15 11:52:04.000000000 -0400 | 44312 | --- linux-2.6.32.16/include/asm-generic/int-ll64.h 2010-07-05 14:14:00.000000000 -0400 |
44002 | +++ linux-2.6.32.15/include/asm-generic/int-ll64.h 2010-05-28 21:27:16.343246556 -0400 | 44313 | +++ linux-2.6.32.16/include/asm-generic/int-ll64.h 2010-07-09 14:50:38.000000000 -0400 |
44003 | @@ -51,6 +51,8 @@ typedef unsigned int u32; | 44314 | @@ -51,6 +51,8 @@ typedef unsigned int u32; |
44004 | typedef signed long long s64; | 44315 | typedef signed long long s64; |
44005 | typedef unsigned long long u64; | 44316 | typedef unsigned long long u64; |
@@ -44009,9 +44320,9 @@ diff -urNp linux-2.6.32.15/include/asm-generic/int-ll64.h linux-2.6.32.15/includ | |||
44009 | #define S8_C(x) x | 44320 | #define S8_C(x) x |
44010 | #define U8_C(x) x ## U | 44321 | #define U8_C(x) x ## U |
44011 | #define S16_C(x) x | 44322 | #define S16_C(x) x |
44012 | diff -urNp linux-2.6.32.15/include/asm-generic/kmap_types.h linux-2.6.32.15/include/asm-generic/kmap_types.h | 44323 | diff -urNp linux-2.6.32.16/include/asm-generic/kmap_types.h linux-2.6.32.16/include/asm-generic/kmap_types.h |
44013 | --- linux-2.6.32.15/include/asm-generic/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 | 44324 | --- linux-2.6.32.16/include/asm-generic/kmap_types.h 2010-07-05 14:14:00.000000000 -0400 |
44014 | +++ linux-2.6.32.15/include/asm-generic/kmap_types.h 2010-05-28 21:27:16.343246556 -0400 | 44325 | +++ linux-2.6.32.16/include/asm-generic/kmap_types.h 2010-07-09 14:50:38.000000000 -0400 |
44015 | @@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY, | 44326 | @@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY, |
44016 | KMAP_D(16) KM_IRQ_PTE, | 44327 | KMAP_D(16) KM_IRQ_PTE, |
44017 | KMAP_D(17) KM_NMI, | 44328 | KMAP_D(17) KM_NMI, |
@@ -44022,9 +44333,9 @@ diff -urNp linux-2.6.32.15/include/asm-generic/kmap_types.h linux-2.6.32.15/incl | |||
44022 | }; | 44333 | }; |
44023 | 44334 | ||
44024 | #undef KMAP_D | 44335 | #undef KMAP_D |
44025 | diff -urNp linux-2.6.32.15/include/asm-generic/pgtable.h linux-2.6.32.15/include/asm-generic/pgtable.h | 44336 | diff -urNp linux-2.6.32.16/include/asm-generic/pgtable.h linux-2.6.32.16/include/asm-generic/pgtable.h |
44026 | --- linux-2.6.32.15/include/asm-generic/pgtable.h 2010-03-15 11:52:04.000000000 -0400 | 44337 | --- linux-2.6.32.16/include/asm-generic/pgtable.h 2010-07-05 14:14:00.000000000 -0400 |
44027 | +++ linux-2.6.32.15/include/asm-generic/pgtable.h 2010-05-28 21:27:16.343246556 -0400 | 44338 | +++ linux-2.6.32.16/include/asm-generic/pgtable.h 2010-07-09 14:50:38.000000000 -0400 |
44028 | @@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar | 44339 | @@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar |
44029 | unsigned long size); | 44340 | unsigned long size); |
44030 | #endif | 44341 | #endif |
@@ -44040,9 +44351,9 @@ diff -urNp linux-2.6.32.15/include/asm-generic/pgtable.h linux-2.6.32.15/include | |||
44040 | #endif /* !__ASSEMBLY__ */ | 44351 | #endif /* !__ASSEMBLY__ */ |
44041 | 44352 | ||
44042 | #endif /* _ASM_GENERIC_PGTABLE_H */ | 44353 | #endif /* _ASM_GENERIC_PGTABLE_H */ |
44043 | diff -urNp linux-2.6.32.15/include/asm-generic/vmlinux.lds.h linux-2.6.32.15/include/asm-generic/vmlinux.lds.h | 44354 | diff -urNp linux-2.6.32.16/include/asm-generic/vmlinux.lds.h linux-2.6.32.16/include/asm-generic/vmlinux.lds.h |
44044 | --- linux-2.6.32.15/include/asm-generic/vmlinux.lds.h 2010-03-15 11:52:04.000000000 -0400 | 44355 | --- linux-2.6.32.16/include/asm-generic/vmlinux.lds.h 2010-07-05 14:14:00.000000000 -0400 |
44045 | +++ linux-2.6.32.15/include/asm-generic/vmlinux.lds.h 2010-05-28 21:27:16.343246556 -0400 | 44356 | +++ linux-2.6.32.16/include/asm-generic/vmlinux.lds.h 2010-07-09 14:50:38.000000000 -0400 |
44046 | @@ -199,6 +199,7 @@ | 44357 | @@ -199,6 +199,7 @@ |
44047 | .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ | 44358 | .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ |
44048 | VMLINUX_SYMBOL(__start_rodata) = .; \ | 44359 | VMLINUX_SYMBOL(__start_rodata) = .; \ |
@@ -44081,9 +44392,9 @@ diff -urNp linux-2.6.32.15/include/asm-generic/vmlinux.lds.h linux-2.6.32.15/inc | |||
44081 | 44392 | ||
44082 | /** | 44393 | /** |
44083 | * PERCPU - define output section for percpu area, simple version | 44394 | * PERCPU - define output section for percpu area, simple version |
44084 | diff -urNp linux-2.6.32.15/include/drm/drm_pciids.h linux-2.6.32.15/include/drm/drm_pciids.h | 44395 | diff -urNp linux-2.6.32.16/include/drm/drm_pciids.h linux-2.6.32.16/include/drm/drm_pciids.h |
44085 | --- linux-2.6.32.15/include/drm/drm_pciids.h 2010-04-29 17:49:38.529851956 -0400 | 44396 | --- linux-2.6.32.16/include/drm/drm_pciids.h 2010-07-05 14:14:00.000000000 -0400 |
44086 | +++ linux-2.6.32.15/include/drm/drm_pciids.h 2010-05-28 21:27:16.343246556 -0400 | 44397 | +++ linux-2.6.32.16/include/drm/drm_pciids.h 2010-07-09 14:50:38.000000000 -0400 |
44087 | @@ -377,7 +377,7 @@ | 44398 | @@ -377,7 +377,7 @@ |
44088 | {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | 44399 | {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
44089 | {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | 44400 | {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
@@ -44187,9 +44498,9 @@ diff -urNp linux-2.6.32.15/include/drm/drm_pciids.h linux-2.6.32.15/include/drm/ | |||
44187 | {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ | 44498 | {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ |
44188 | - {0, 0, 0} | 44499 | - {0, 0, 0} |
44189 | + {0, 0, 0, 0, 0, 0} | 44500 | + {0, 0, 0, 0, 0, 0} |
44190 | diff -urNp linux-2.6.32.15/include/drm/drmP.h linux-2.6.32.15/include/drm/drmP.h | 44501 | diff -urNp linux-2.6.32.16/include/drm/drmP.h linux-2.6.32.16/include/drm/drmP.h |
44191 | --- linux-2.6.32.15/include/drm/drmP.h 2010-03-15 11:52:04.000000000 -0400 | 44502 | --- linux-2.6.32.16/include/drm/drmP.h 2010-07-05 14:14:00.000000000 -0400 |
44192 | +++ linux-2.6.32.15/include/drm/drmP.h 2010-05-28 21:27:16.343246556 -0400 | 44503 | +++ linux-2.6.32.16/include/drm/drmP.h 2010-07-09 14:50:38.000000000 -0400 |
44193 | @@ -814,7 +814,7 @@ struct drm_driver { | 44504 | @@ -814,7 +814,7 @@ struct drm_driver { |
44194 | void (*vgaarb_irq)(struct drm_device *dev, bool state); | 44505 | void (*vgaarb_irq)(struct drm_device *dev, bool state); |
44195 | 44506 | ||
@@ -44217,9 +44528,9 @@ diff -urNp linux-2.6.32.15/include/drm/drmP.h linux-2.6.32.15/include/drm/drmP.h | |||
44217 | /*@} */ | 44528 | /*@} */ |
44218 | 44529 | ||
44219 | struct list_head filelist; | 44530 | struct list_head filelist; |
44220 | diff -urNp linux-2.6.32.15/include/linux/a.out.h linux-2.6.32.15/include/linux/a.out.h | 44531 | diff -urNp linux-2.6.32.16/include/linux/a.out.h linux-2.6.32.16/include/linux/a.out.h |
44221 | --- linux-2.6.32.15/include/linux/a.out.h 2010-03-15 11:52:04.000000000 -0400 | 44532 | --- linux-2.6.32.16/include/linux/a.out.h 2010-07-05 14:14:00.000000000 -0400 |
44222 | +++ linux-2.6.32.15/include/linux/a.out.h 2010-05-28 21:27:16.343246556 -0400 | 44533 | +++ linux-2.6.32.16/include/linux/a.out.h 2010-07-09 14:50:38.000000000 -0400 |
44223 | @@ -39,6 +39,14 @@ enum machine_type { | 44534 | @@ -39,6 +39,14 @@ enum machine_type { |
44224 | M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ | 44535 | M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ |
44225 | }; | 44536 | }; |
@@ -44235,9 +44546,9 @@ diff -urNp linux-2.6.32.15/include/linux/a.out.h linux-2.6.32.15/include/linux/a | |||
44235 | #if !defined (N_MAGIC) | 44546 | #if !defined (N_MAGIC) |
44236 | #define N_MAGIC(exec) ((exec).a_info & 0xffff) | 44547 | #define N_MAGIC(exec) ((exec).a_info & 0xffff) |
44237 | #endif | 44548 | #endif |
44238 | diff -urNp linux-2.6.32.15/include/linux/atmdev.h linux-2.6.32.15/include/linux/atmdev.h | 44549 | diff -urNp linux-2.6.32.16/include/linux/atmdev.h linux-2.6.32.16/include/linux/atmdev.h |
44239 | --- linux-2.6.32.15/include/linux/atmdev.h 2010-03-15 11:52:04.000000000 -0400 | 44550 | --- linux-2.6.32.16/include/linux/atmdev.h 2010-07-05 14:14:00.000000000 -0400 |
44240 | +++ linux-2.6.32.15/include/linux/atmdev.h 2010-05-28 21:27:16.343246556 -0400 | 44551 | +++ linux-2.6.32.16/include/linux/atmdev.h 2010-07-09 14:50:38.000000000 -0400 |
44241 | @@ -237,7 +237,7 @@ struct compat_atm_iobuf { | 44552 | @@ -237,7 +237,7 @@ struct compat_atm_iobuf { |
44242 | #endif | 44553 | #endif |
44243 | 44554 | ||
@@ -44247,9 +44558,9 @@ diff -urNp linux-2.6.32.15/include/linux/atmdev.h linux-2.6.32.15/include/linux/ | |||
44247 | __AAL_STAT_ITEMS | 44558 | __AAL_STAT_ITEMS |
44248 | #undef __HANDLE_ITEM | 44559 | #undef __HANDLE_ITEM |
44249 | }; | 44560 | }; |
44250 | diff -urNp linux-2.6.32.15/include/linux/backlight.h linux-2.6.32.15/include/linux/backlight.h | 44561 | diff -urNp linux-2.6.32.16/include/linux/backlight.h linux-2.6.32.16/include/linux/backlight.h |
44251 | --- linux-2.6.32.15/include/linux/backlight.h 2010-03-15 11:52:04.000000000 -0400 | 44562 | --- linux-2.6.32.16/include/linux/backlight.h 2010-07-05 14:14:00.000000000 -0400 |
44252 | +++ linux-2.6.32.15/include/linux/backlight.h 2010-05-28 21:27:16.343246556 -0400 | 44563 | +++ linux-2.6.32.16/include/linux/backlight.h 2010-07-09 14:50:38.000000000 -0400 |
44253 | @@ -36,18 +36,18 @@ struct backlight_device; | 44564 | @@ -36,18 +36,18 @@ struct backlight_device; |
44254 | struct fb_info; | 44565 | struct fb_info; |
44255 | 44566 | ||
@@ -44291,9 +44602,9 @@ diff -urNp linux-2.6.32.15/include/linux/backlight.h linux-2.6.32.15/include/lin | |||
44291 | extern void backlight_device_unregister(struct backlight_device *bd); | 44602 | extern void backlight_device_unregister(struct backlight_device *bd); |
44292 | extern void backlight_force_update(struct backlight_device *bd, | 44603 | extern void backlight_force_update(struct backlight_device *bd, |
44293 | enum backlight_update_reason reason); | 44604 | enum backlight_update_reason reason); |
44294 | diff -urNp linux-2.6.32.15/include/linux/binfmts.h linux-2.6.32.15/include/linux/binfmts.h | 44605 | diff -urNp linux-2.6.32.16/include/linux/binfmts.h linux-2.6.32.16/include/linux/binfmts.h |
44295 | --- linux-2.6.32.15/include/linux/binfmts.h 2010-03-15 11:52:04.000000000 -0400 | 44606 | --- linux-2.6.32.16/include/linux/binfmts.h 2010-07-05 14:14:00.000000000 -0400 |
44296 | +++ linux-2.6.32.15/include/linux/binfmts.h 2010-05-28 21:27:16.343246556 -0400 | 44607 | +++ linux-2.6.32.16/include/linux/binfmts.h 2010-07-09 14:50:38.000000000 -0400 |
44297 | @@ -78,6 +78,7 @@ struct linux_binfmt { | 44608 | @@ -78,6 +78,7 @@ struct linux_binfmt { |
44298 | int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); | 44609 | int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); |
44299 | int (*load_shlib)(struct file *); | 44610 | int (*load_shlib)(struct file *); |
@@ -44302,9 +44613,9 @@ diff -urNp linux-2.6.32.15/include/linux/binfmts.h linux-2.6.32.15/include/linux | |||
44302 | unsigned long min_coredump; /* minimal dump size */ | 44613 | unsigned long min_coredump; /* minimal dump size */ |
44303 | int hasvdso; | 44614 | int hasvdso; |
44304 | }; | 44615 | }; |
44305 | diff -urNp linux-2.6.32.15/include/linux/blkdev.h linux-2.6.32.15/include/linux/blkdev.h | 44616 | diff -urNp linux-2.6.32.16/include/linux/blkdev.h linux-2.6.32.16/include/linux/blkdev.h |
44306 | --- linux-2.6.32.15/include/linux/blkdev.h 2010-03-15 11:52:04.000000000 -0400 | 44617 | --- linux-2.6.32.16/include/linux/blkdev.h 2010-07-05 14:14:00.000000000 -0400 |
44307 | +++ linux-2.6.32.15/include/linux/blkdev.h 2010-05-28 21:27:16.347237122 -0400 | 44618 | +++ linux-2.6.32.16/include/linux/blkdev.h 2010-07-09 14:50:38.000000000 -0400 |
44308 | @@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc | 44619 | @@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc |
44309 | #endif /* CONFIG_BLK_DEV_INTEGRITY */ | 44620 | #endif /* CONFIG_BLK_DEV_INTEGRITY */ |
44310 | 44621 | ||
@@ -44336,9 +44647,9 @@ diff -urNp linux-2.6.32.15/include/linux/blkdev.h linux-2.6.32.15/include/linux/ | |||
44336 | }; | 44647 | }; |
44337 | 44648 | ||
44338 | extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, | 44649 | extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, |
44339 | diff -urNp linux-2.6.32.15/include/linux/cache.h linux-2.6.32.15/include/linux/cache.h | 44650 | diff -urNp linux-2.6.32.16/include/linux/cache.h linux-2.6.32.16/include/linux/cache.h |
44340 | --- linux-2.6.32.15/include/linux/cache.h 2010-03-15 11:52:04.000000000 -0400 | 44651 | --- linux-2.6.32.16/include/linux/cache.h 2010-07-05 14:14:00.000000000 -0400 |
44341 | +++ linux-2.6.32.15/include/linux/cache.h 2010-05-28 21:27:16.347237122 -0400 | 44652 | +++ linux-2.6.32.16/include/linux/cache.h 2010-07-09 14:50:38.000000000 -0400 |
44342 | @@ -16,6 +16,10 @@ | 44653 | @@ -16,6 +16,10 @@ |
44343 | #define __read_mostly | 44654 | #define __read_mostly |
44344 | #endif | 44655 | #endif |
@@ -44350,9 +44661,9 @@ diff -urNp linux-2.6.32.15/include/linux/cache.h linux-2.6.32.15/include/linux/c | |||
44350 | #ifndef ____cacheline_aligned | 44661 | #ifndef ____cacheline_aligned |
44351 | #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) | 44662 | #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) |
44352 | #endif | 44663 | #endif |
44353 | diff -urNp linux-2.6.32.15/include/linux/capability.h linux-2.6.32.15/include/linux/capability.h | 44664 | diff -urNp linux-2.6.32.16/include/linux/capability.h linux-2.6.32.16/include/linux/capability.h |
44354 | --- linux-2.6.32.15/include/linux/capability.h 2010-03-15 11:52:04.000000000 -0400 | 44665 | --- linux-2.6.32.16/include/linux/capability.h 2010-07-05 14:14:00.000000000 -0400 |
44355 | +++ linux-2.6.32.15/include/linux/capability.h 2010-05-28 21:27:16.347237122 -0400 | 44666 | +++ linux-2.6.32.16/include/linux/capability.h 2010-07-09 14:50:38.000000000 -0400 |
44356 | @@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff | 44667 | @@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff |
44357 | (security_real_capable_noaudit((t), (cap)) == 0) | 44668 | (security_real_capable_noaudit((t), (cap)) == 0) |
44358 | 44669 | ||
@@ -44361,9 +44672,9 @@ diff -urNp linux-2.6.32.15/include/linux/capability.h linux-2.6.32.15/include/li | |||
44361 | 44672 | ||
44362 | /* audit system wants to get cap info from files as well */ | 44673 | /* audit system wants to get cap info from files as well */ |
44363 | struct dentry; | 44674 | struct dentry; |
44364 | diff -urNp linux-2.6.32.15/include/linux/compiler-gcc4.h linux-2.6.32.15/include/linux/compiler-gcc4.h | 44675 | diff -urNp linux-2.6.32.16/include/linux/compiler-gcc4.h linux-2.6.32.16/include/linux/compiler-gcc4.h |
44365 | --- linux-2.6.32.15/include/linux/compiler-gcc4.h 2010-03-15 11:52:04.000000000 -0400 | 44676 | --- linux-2.6.32.16/include/linux/compiler-gcc4.h 2010-07-05 14:14:00.000000000 -0400 |
44366 | +++ linux-2.6.32.15/include/linux/compiler-gcc4.h 2010-05-28 21:27:16.347237122 -0400 | 44677 | +++ linux-2.6.32.16/include/linux/compiler-gcc4.h 2010-07-09 14:50:38.000000000 -0400 |
44367 | @@ -36,4 +36,8 @@ | 44678 | @@ -36,4 +36,8 @@ |
44368 | the kernel context */ | 44679 | the kernel context */ |
44369 | #define __cold __attribute__((__cold__)) | 44680 | #define __cold __attribute__((__cold__)) |
@@ -44373,9 +44684,9 @@ diff -urNp linux-2.6.32.15/include/linux/compiler-gcc4.h linux-2.6.32.15/include | |||
44373 | +#define __bos0(ptr) __bos((ptr), 0) | 44684 | +#define __bos0(ptr) __bos((ptr), 0) |
44374 | +#define __bos1(ptr) __bos((ptr), 1) | 44685 | +#define __bos1(ptr) __bos((ptr), 1) |
44375 | #endif | 44686 | #endif |
44376 | diff -urNp linux-2.6.32.15/include/linux/compiler.h linux-2.6.32.15/include/linux/compiler.h | 44687 | diff -urNp linux-2.6.32.16/include/linux/compiler.h linux-2.6.32.16/include/linux/compiler.h |
44377 | --- linux-2.6.32.15/include/linux/compiler.h 2010-03-15 11:52:04.000000000 -0400 | 44688 | --- linux-2.6.32.16/include/linux/compiler.h 2010-07-05 14:14:00.000000000 -0400 |
44378 | +++ linux-2.6.32.15/include/linux/compiler.h 2010-05-28 21:27:16.347237122 -0400 | 44689 | +++ linux-2.6.32.16/include/linux/compiler.h 2010-07-09 14:50:38.000000000 -0400 |
44379 | @@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_ | 44690 | @@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_ |
44380 | #define __cold | 44691 | #define __cold |
44381 | #endif | 44692 | #endif |
@@ -44399,9 +44710,9 @@ diff -urNp linux-2.6.32.15/include/linux/compiler.h linux-2.6.32.15/include/linu | |||
44399 | /* Simple shorthand for a section definition */ | 44710 | /* Simple shorthand for a section definition */ |
44400 | #ifndef __section | 44711 | #ifndef __section |
44401 | # define __section(S) __attribute__ ((__section__(#S))) | 44712 | # define __section(S) __attribute__ ((__section__(#S))) |
44402 | diff -urNp linux-2.6.32.15/include/linux/decompress/mm.h linux-2.6.32.15/include/linux/decompress/mm.h | 44713 | diff -urNp linux-2.6.32.16/include/linux/decompress/mm.h linux-2.6.32.16/include/linux/decompress/mm.h |
44403 | --- linux-2.6.32.15/include/linux/decompress/mm.h 2010-04-04 20:41:50.048452804 -0400 | 44714 | --- linux-2.6.32.16/include/linux/decompress/mm.h 2010-07-05 14:14:00.000000000 -0400 |
44404 | +++ linux-2.6.32.15/include/linux/decompress/mm.h 2010-05-28 21:27:16.347237122 -0400 | 44715 | +++ linux-2.6.32.16/include/linux/decompress/mm.h 2010-07-09 14:50:38.000000000 -0400 |
44405 | @@ -78,7 +78,7 @@ static void free(void *where) | 44716 | @@ -78,7 +78,7 @@ static void free(void *where) |
44406 | * warnings when not needed (indeed large_malloc / large_free are not | 44717 | * warnings when not needed (indeed large_malloc / large_free are not |
44407 | * needed by inflate */ | 44718 | * needed by inflate */ |
@@ -44411,9 +44722,9 @@ diff -urNp linux-2.6.32.15/include/linux/decompress/mm.h linux-2.6.32.15/include | |||
44411 | #define free(a) kfree(a) | 44722 | #define free(a) kfree(a) |
44412 | 44723 | ||
44413 | #define large_malloc(a) vmalloc(a) | 44724 | #define large_malloc(a) vmalloc(a) |
44414 | diff -urNp linux-2.6.32.15/include/linux/dma-mapping.h linux-2.6.32.15/include/linux/dma-mapping.h | 44725 | diff -urNp linux-2.6.32.16/include/linux/dma-mapping.h linux-2.6.32.16/include/linux/dma-mapping.h |
44415 | --- linux-2.6.32.15/include/linux/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 | 44726 | --- linux-2.6.32.16/include/linux/dma-mapping.h 2010-07-05 14:14:00.000000000 -0400 |
44416 | +++ linux-2.6.32.15/include/linux/dma-mapping.h 2010-05-28 21:27:16.347237122 -0400 | 44727 | +++ linux-2.6.32.16/include/linux/dma-mapping.h 2010-07-09 14:50:38.000000000 -0400 |
44417 | @@ -16,50 +16,50 @@ enum dma_data_direction { | 44728 | @@ -16,50 +16,50 @@ enum dma_data_direction { |
44418 | }; | 44729 | }; |
44419 | 44730 | ||
@@ -44480,9 +44791,9 @@ diff -urNp linux-2.6.32.15/include/linux/dma-mapping.h linux-2.6.32.15/include/l | |||
44480 | }; | 44791 | }; |
44481 | 44792 | ||
44482 | #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) | 44793 | #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) |
44483 | diff -urNp linux-2.6.32.15/include/linux/dst.h linux-2.6.32.15/include/linux/dst.h | 44794 | diff -urNp linux-2.6.32.16/include/linux/dst.h linux-2.6.32.16/include/linux/dst.h |
44484 | --- linux-2.6.32.15/include/linux/dst.h 2010-03-15 11:52:04.000000000 -0400 | 44795 | --- linux-2.6.32.16/include/linux/dst.h 2010-07-05 14:14:00.000000000 -0400 |
44485 | +++ linux-2.6.32.15/include/linux/dst.h 2010-05-28 21:27:16.347237122 -0400 | 44796 | +++ linux-2.6.32.16/include/linux/dst.h 2010-07-09 14:50:38.000000000 -0400 |
44486 | @@ -380,7 +380,7 @@ struct dst_node | 44797 | @@ -380,7 +380,7 @@ struct dst_node |
44487 | struct thread_pool *pool; | 44798 | struct thread_pool *pool; |
44488 | 44799 | ||
@@ -44492,9 +44803,9 @@ diff -urNp linux-2.6.32.15/include/linux/dst.h linux-2.6.32.15/include/linux/dst | |||
44492 | 44803 | ||
44493 | /* | 44804 | /* |
44494 | * How frequently and how many times transaction | 44805 | * How frequently and how many times transaction |
44495 | diff -urNp linux-2.6.32.15/include/linux/elf.h linux-2.6.32.15/include/linux/elf.h | 44806 | diff -urNp linux-2.6.32.16/include/linux/elf.h linux-2.6.32.16/include/linux/elf.h |
44496 | --- linux-2.6.32.15/include/linux/elf.h 2010-03-15 11:52:04.000000000 -0400 | 44807 | --- linux-2.6.32.16/include/linux/elf.h 2010-07-05 14:14:00.000000000 -0400 |
44497 | +++ linux-2.6.32.15/include/linux/elf.h 2010-05-28 21:27:16.347237122 -0400 | 44808 | +++ linux-2.6.32.16/include/linux/elf.h 2010-07-09 14:50:38.000000000 -0400 |
44498 | @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; | 44809 | @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; |
44499 | #define PT_GNU_EH_FRAME 0x6474e550 | 44810 | #define PT_GNU_EH_FRAME 0x6474e550 |
44500 | 44811 | ||
@@ -44567,9 +44878,9 @@ diff -urNp linux-2.6.32.15/include/linux/elf.h linux-2.6.32.15/include/linux/elf | |||
44567 | 44878 | ||
44568 | #endif | 44879 | #endif |
44569 | 44880 | ||
44570 | diff -urNp linux-2.6.32.15/include/linux/fs.h linux-2.6.32.15/include/linux/fs.h | 44881 | diff -urNp linux-2.6.32.16/include/linux/fs.h linux-2.6.32.16/include/linux/fs.h |
44571 | --- linux-2.6.32.15/include/linux/fs.h 2010-04-29 17:49:38.529851956 -0400 | 44882 | --- linux-2.6.32.16/include/linux/fs.h 2010-07-05 14:14:00.000000000 -0400 |
44572 | +++ linux-2.6.32.15/include/linux/fs.h 2010-05-28 21:27:16.347237122 -0400 | 44883 | +++ linux-2.6.32.16/include/linux/fs.h 2010-07-10 08:00:09.000000000 -0400 |
44573 | @@ -90,6 +90,11 @@ struct inodes_stat_t { | 44884 | @@ -90,6 +90,11 @@ struct inodes_stat_t { |
44574 | /* Expect random access pattern */ | 44885 | /* Expect random access pattern */ |
44575 | #define FMODE_RANDOM ((__force fmode_t)4096) | 44886 | #define FMODE_RANDOM ((__force fmode_t)4096) |
@@ -44671,7 +44982,7 @@ diff -urNp linux-2.6.32.15/include/linux/fs.h linux-2.6.32.15/include/linux/fs.h | |||
44671 | }; | 44982 | }; |
44672 | 44983 | ||
44673 | struct lock_manager { | 44984 | struct lock_manager { |
44674 | @@ -1439,7 +1444,7 @@ struct fiemap_extent_info { | 44985 | @@ -1441,7 +1446,7 @@ struct fiemap_extent_info { |
44675 | unsigned int fi_flags; /* Flags as passed from user */ | 44986 | unsigned int fi_flags; /* Flags as passed from user */ |
44676 | unsigned int fi_extents_mapped; /* Number of mapped extents */ | 44987 | unsigned int fi_extents_mapped; /* Number of mapped extents */ |
44677 | unsigned int fi_extents_max; /* Size of fiemap_extent array */ | 44988 | unsigned int fi_extents_max; /* Size of fiemap_extent array */ |
@@ -44680,7 +44991,7 @@ diff -urNp linux-2.6.32.15/include/linux/fs.h linux-2.6.32.15/include/linux/fs.h | |||
44680 | * array */ | 44991 | * array */ |
44681 | }; | 44992 | }; |
44682 | int fiemap_fill_next_extent(struct fiemap_extent_info *info, u64 logical, | 44993 | int fiemap_fill_next_extent(struct fiemap_extent_info *info, u64 logical, |
44683 | @@ -1556,30 +1561,30 @@ extern ssize_t vfs_writev(struct file *, | 44994 | @@ -1558,30 +1563,30 @@ extern ssize_t vfs_writev(struct file *, |
44684 | unsigned long, loff_t *); | 44995 | unsigned long, loff_t *); |
44685 | 44996 | ||
44686 | struct super_operations { | 44997 | struct super_operations { |
@@ -44731,9 +45042,9 @@ diff -urNp linux-2.6.32.15/include/linux/fs.h linux-2.6.32.15/include/linux/fs.h | |||
44731 | }; | 45042 | }; |
44732 | 45043 | ||
44733 | /* | 45044 | /* |
44734 | diff -urNp linux-2.6.32.15/include/linux/fs_struct.h linux-2.6.32.15/include/linux/fs_struct.h | 45045 | diff -urNp linux-2.6.32.16/include/linux/fs_struct.h linux-2.6.32.16/include/linux/fs_struct.h |
44735 | --- linux-2.6.32.15/include/linux/fs_struct.h 2010-03-15 11:52:04.000000000 -0400 | 45046 | --- linux-2.6.32.16/include/linux/fs_struct.h 2010-07-05 14:14:00.000000000 -0400 |
44736 | +++ linux-2.6.32.15/include/linux/fs_struct.h 2010-05-28 21:27:16.347237122 -0400 | 45047 | +++ linux-2.6.32.16/include/linux/fs_struct.h 2010-07-09 14:50:38.000000000 -0400 |
44737 | @@ -4,7 +4,7 @@ | 45048 | @@ -4,7 +4,7 @@ |
44738 | #include <linux/path.h> | 45049 | #include <linux/path.h> |
44739 | 45050 | ||
@@ -44743,9 +45054,9 @@ diff -urNp linux-2.6.32.15/include/linux/fs_struct.h linux-2.6.32.15/include/lin | |||
44743 | rwlock_t lock; | 45054 | rwlock_t lock; |
44744 | int umask; | 45055 | int umask; |
44745 | int in_exec; | 45056 | int in_exec; |
44746 | diff -urNp linux-2.6.32.15/include/linux/genhd.h linux-2.6.32.15/include/linux/genhd.h | 45057 | diff -urNp linux-2.6.32.16/include/linux/genhd.h linux-2.6.32.16/include/linux/genhd.h |
44747 | --- linux-2.6.32.15/include/linux/genhd.h 2010-03-15 11:52:04.000000000 -0400 | 45058 | --- linux-2.6.32.16/include/linux/genhd.h 2010-07-05 14:14:00.000000000 -0400 |
44748 | +++ linux-2.6.32.15/include/linux/genhd.h 2010-05-28 21:27:16.355225759 -0400 | 45059 | +++ linux-2.6.32.16/include/linux/genhd.h 2010-07-09 14:50:38.000000000 -0400 |
44749 | @@ -161,7 +161,7 @@ struct gendisk { | 45060 | @@ -161,7 +161,7 @@ struct gendisk { |
44750 | 45061 | ||
44751 | struct timer_rand_state *random; | 45062 | struct timer_rand_state *random; |
@@ -44755,9 +45066,9 @@ diff -urNp linux-2.6.32.15/include/linux/genhd.h linux-2.6.32.15/include/linux/g | |||
44755 | struct work_struct async_notify; | 45066 | struct work_struct async_notify; |
44756 | #ifdef CONFIG_BLK_DEV_INTEGRITY | 45067 | #ifdef CONFIG_BLK_DEV_INTEGRITY |
44757 | struct blk_integrity *integrity; | 45068 | struct blk_integrity *integrity; |
44758 | diff -urNp linux-2.6.32.15/include/linux/gracl.h linux-2.6.32.15/include/linux/gracl.h | 45069 | diff -urNp linux-2.6.32.16/include/linux/gracl.h linux-2.6.32.16/include/linux/gracl.h |
44759 | --- linux-2.6.32.15/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 | 45070 | --- linux-2.6.32.16/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 |
44760 | +++ linux-2.6.32.15/include/linux/gracl.h 2010-06-19 21:06:17.097881201 -0400 | 45071 | +++ linux-2.6.32.16/include/linux/gracl.h 2010-07-09 14:50:38.000000000 -0400 |
44761 | @@ -0,0 +1,310 @@ | 45072 | @@ -0,0 +1,310 @@ |
44762 | +#ifndef GR_ACL_H | 45073 | +#ifndef GR_ACL_H |
44763 | +#define GR_ACL_H | 45074 | +#define GR_ACL_H |
@@ -45069,9 +45380,9 @@ diff -urNp linux-2.6.32.15/include/linux/gracl.h linux-2.6.32.15/include/linux/g | |||
45069 | + | 45380 | + |
45070 | +#endif | 45381 | +#endif |
45071 | + | 45382 | + |
45072 | diff -urNp linux-2.6.32.15/include/linux/gralloc.h linux-2.6.32.15/include/linux/gralloc.h | 45383 | diff -urNp linux-2.6.32.16/include/linux/gralloc.h linux-2.6.32.16/include/linux/gralloc.h |
45073 | --- linux-2.6.32.15/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 | 45384 | --- linux-2.6.32.16/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 |
45074 | +++ linux-2.6.32.15/include/linux/gralloc.h 2010-05-28 21:27:16.355225759 -0400 | 45385 | +++ linux-2.6.32.16/include/linux/gralloc.h 2010-07-09 14:50:38.000000000 -0400 |
45075 | @@ -0,0 +1,9 @@ | 45386 | @@ -0,0 +1,9 @@ |
45076 | +#ifndef __GRALLOC_H | 45387 | +#ifndef __GRALLOC_H |
45077 | +#define __GRALLOC_H | 45388 | +#define __GRALLOC_H |
@@ -45082,9 +45393,9 @@ diff -urNp linux-2.6.32.15/include/linux/gralloc.h linux-2.6.32.15/include/linux | |||
45082 | +void *acl_alloc_num(unsigned long num, unsigned long len); | 45393 | +void *acl_alloc_num(unsigned long num, unsigned long len); |
45083 | + | 45394 | + |
45084 | +#endif | 45395 | +#endif |
45085 | diff -urNp linux-2.6.32.15/include/linux/grdefs.h linux-2.6.32.15/include/linux/grdefs.h | 45396 | diff -urNp linux-2.6.32.16/include/linux/grdefs.h linux-2.6.32.16/include/linux/grdefs.h |
45086 | --- linux-2.6.32.15/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 | 45397 | --- linux-2.6.32.16/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 |
45087 | +++ linux-2.6.32.15/include/linux/grdefs.h 2010-05-28 21:27:16.355225759 -0400 | 45398 | +++ linux-2.6.32.16/include/linux/grdefs.h 2010-07-09 14:50:38.000000000 -0400 |
45088 | @@ -0,0 +1,136 @@ | 45399 | @@ -0,0 +1,136 @@ |
45089 | +#ifndef GRDEFS_H | 45400 | +#ifndef GRDEFS_H |
45090 | +#define GRDEFS_H | 45401 | +#define GRDEFS_H |
@@ -45222,10 +45533,10 @@ diff -urNp linux-2.6.32.15/include/linux/grdefs.h linux-2.6.32.15/include/linux/ | |||
45222 | +}; | 45533 | +}; |
45223 | + | 45534 | + |
45224 | +#endif | 45535 | +#endif |
45225 | diff -urNp linux-2.6.32.15/include/linux/grinternal.h linux-2.6.32.15/include/linux/grinternal.h | 45536 | diff -urNp linux-2.6.32.16/include/linux/grinternal.h linux-2.6.32.16/include/linux/grinternal.h |
45226 | --- linux-2.6.32.15/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 | 45537 | --- linux-2.6.32.16/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 |
45227 | +++ linux-2.6.32.15/include/linux/grinternal.h 2010-06-19 21:46:05.111766483 -0400 | 45538 | +++ linux-2.6.32.16/include/linux/grinternal.h 2010-07-09 14:50:38.000000000 -0400 |
45228 | @@ -0,0 +1,215 @@ | 45539 | @@ -0,0 +1,211 @@ |
45229 | +#ifndef __GRINTERNAL_H | 45540 | +#ifndef __GRINTERNAL_H |
45230 | +#define __GRINTERNAL_H | 45541 | +#define __GRINTERNAL_H |
45231 | + | 45542 | + |
@@ -45331,13 +45642,9 @@ diff -urNp linux-2.6.32.15/include/linux/grinternal.h linux-2.6.32.15/include/li | |||
45331 | + gr_to_filename1(tsk->parent->exec_file->f_path.dentry, \ | 45642 | + gr_to_filename1(tsk->parent->exec_file->f_path.dentry, \ |
45332 | + tsk->parent->exec_file->f_vfsmnt) : "/") | 45643 | + tsk->parent->exec_file->f_vfsmnt) : "/") |
45333 | + | 45644 | + |
45334 | +#define proc_is_chrooted(tsk_a) ((tsk_a->pid > 1) && (tsk_a->fs != NULL) && \ | 45645 | +#define proc_is_chrooted(tsk_a) (tsk_a->gr_is_chrooted) |
45335 | + ((init_task.fs->root.dentry != tsk_a->fs->root.dentry) && \ | ||
45336 | + (tsk_a->nsproxy->mnt_ns->root->mnt_root != \ | ||
45337 | + tsk_a->fs->root.dentry))) | ||
45338 | + | 45646 | + |
45339 | +#define have_same_root(tsk_a,tsk_b) ((tsk_a->fs != NULL) && (tsk_b->fs != NULL) && \ | 45647 | +#define have_same_root(tsk_a,tsk_b) (tsk_a->gr_chroot_dentry == tsk_b->gr_chroot_dentry) |
45340 | + (tsk_a->fs->root.dentry == tsk_b->fs->root.dentry)) | ||
45341 | + | 45648 | + |
45342 | +#define DEFAULTSECARGS(task, cred, pcred) gr_task_fullpath(task), task->comm, \ | 45649 | +#define DEFAULTSECARGS(task, cred, pcred) gr_task_fullpath(task), task->comm, \ |
45343 | + task->pid, cred->uid, \ | 45650 | + task->pid, cred->uid, \ |
@@ -45441,9 +45748,9 @@ diff -urNp linux-2.6.32.15/include/linux/grinternal.h linux-2.6.32.15/include/li | |||
45441 | +#endif | 45748 | +#endif |
45442 | + | 45749 | + |
45443 | +#endif | 45750 | +#endif |
45444 | diff -urNp linux-2.6.32.15/include/linux/grmsg.h linux-2.6.32.15/include/linux/grmsg.h | 45751 | diff -urNp linux-2.6.32.16/include/linux/grmsg.h linux-2.6.32.16/include/linux/grmsg.h |
45445 | --- linux-2.6.32.15/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 | 45752 | --- linux-2.6.32.16/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 |
45446 | +++ linux-2.6.32.15/include/linux/grmsg.h 2010-06-19 21:06:17.097881201 -0400 | 45753 | +++ linux-2.6.32.16/include/linux/grmsg.h 2010-07-09 14:50:38.000000000 -0400 |
45447 | @@ -0,0 +1,108 @@ | 45754 | @@ -0,0 +1,108 @@ |
45448 | +#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" | 45755 | +#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" |
45449 | +#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" | 45756 | +#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" |
@@ -45553,10 +45860,10 @@ diff -urNp linux-2.6.32.15/include/linux/grmsg.h linux-2.6.32.15/include/linux/g | |||
45553 | +#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by " | 45860 | +#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by " |
45554 | +#define GR_VM86_MSG "denied use of vm86 by " | 45861 | +#define GR_VM86_MSG "denied use of vm86 by " |
45555 | +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by " | 45862 | +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by " |
45556 | diff -urNp linux-2.6.32.15/include/linux/grsecurity.h linux-2.6.32.15/include/linux/grsecurity.h | 45863 | diff -urNp linux-2.6.32.16/include/linux/grsecurity.h linux-2.6.32.16/include/linux/grsecurity.h |
45557 | --- linux-2.6.32.15/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 | 45864 | --- linux-2.6.32.16/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 |
45558 | +++ linux-2.6.32.15/include/linux/grsecurity.h 2010-06-19 21:45:41.506145931 -0400 | 45865 | +++ linux-2.6.32.16/include/linux/grsecurity.h 2010-07-10 07:56:56.000000000 -0400 |
45559 | @@ -0,0 +1,200 @@ | 45866 | @@ -0,0 +1,203 @@ |
45560 | +#ifndef GR_SECURITY_H | 45867 | +#ifndef GR_SECURITY_H |
45561 | +#define GR_SECURITY_H | 45868 | +#define GR_SECURITY_H |
45562 | +#include <linux/fs.h> | 45869 | +#include <linux/fs.h> |
@@ -45592,6 +45899,7 @@ diff -urNp linux-2.6.32.15/include/linux/grsecurity.h linux-2.6.32.15/include/li | |||
45592 | +void gr_del_task_from_ip_table(struct task_struct *p); | 45899 | +void gr_del_task_from_ip_table(struct task_struct *p); |
45593 | + | 45900 | + |
45594 | +int gr_pid_is_chrooted(struct task_struct *p); | 45901 | +int gr_pid_is_chrooted(struct task_struct *p); |
45902 | +int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type); | ||
45595 | +int gr_handle_chroot_nice(void); | 45903 | +int gr_handle_chroot_nice(void); |
45596 | +int gr_handle_chroot_sysctl(const int op); | 45904 | +int gr_handle_chroot_sysctl(const int op); |
45597 | +int gr_handle_chroot_setpriority(struct task_struct *p, | 45905 | +int gr_handle_chroot_setpriority(struct task_struct *p, |
@@ -45619,7 +45927,8 @@ diff -urNp linux-2.6.32.15/include/linux/grsecurity.h linux-2.6.32.15/include/li | |||
45619 | + | 45927 | + |
45620 | +int gr_tpe_allow(const struct file *file); | 45928 | +int gr_tpe_allow(const struct file *file); |
45621 | + | 45929 | + |
45622 | +int gr_random_pid(void); | 45930 | +void gr_set_chroot_entries(struct task_struct *task, struct path *path); |
45931 | +void gr_clear_chroot_entries(struct task_struct *task); | ||
45623 | + | 45932 | + |
45624 | +void gr_log_forkfail(const int retval); | 45933 | +void gr_log_forkfail(const int retval); |
45625 | +void gr_log_timechange(void); | 45934 | +void gr_log_timechange(void); |
@@ -45656,6 +45965,7 @@ diff -urNp linux-2.6.32.15/include/linux/grsecurity.h linux-2.6.32.15/include/li | |||
45656 | +int gr_handle_signal(const struct task_struct *p, const int sig); | 45965 | +int gr_handle_signal(const struct task_struct *p, const int sig); |
45657 | +int gr_check_crash_uid(const uid_t uid); | 45966 | +int gr_check_crash_uid(const uid_t uid); |
45658 | +int gr_check_protected_task(const struct task_struct *task); | 45967 | +int gr_check_protected_task(const struct task_struct *task); |
45968 | +int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type); | ||
45659 | +int gr_acl_handle_mmap(const struct file *file, | 45969 | +int gr_acl_handle_mmap(const struct file *file, |
45660 | + const unsigned long prot); | 45970 | + const unsigned long prot); |
45661 | +int gr_acl_handle_mprotect(const struct file *file, | 45971 | +int gr_acl_handle_mprotect(const struct file *file, |
@@ -45757,9 +46067,9 @@ diff -urNp linux-2.6.32.15/include/linux/grsecurity.h linux-2.6.32.15/include/li | |||
45757 | +#endif | 46067 | +#endif |
45758 | + | 46068 | + |
45759 | +#endif | 46069 | +#endif |
45760 | diff -urNp linux-2.6.32.15/include/linux/hdpu_features.h linux-2.6.32.15/include/linux/hdpu_features.h | 46070 | diff -urNp linux-2.6.32.16/include/linux/hdpu_features.h linux-2.6.32.16/include/linux/hdpu_features.h |
45761 | --- linux-2.6.32.15/include/linux/hdpu_features.h 2010-03-15 11:52:04.000000000 -0400 | 46071 | --- linux-2.6.32.16/include/linux/hdpu_features.h 2010-07-05 14:14:00.000000000 -0400 |
45762 | +++ linux-2.6.32.15/include/linux/hdpu_features.h 2010-05-28 21:27:16.355225759 -0400 | 46072 | +++ linux-2.6.32.16/include/linux/hdpu_features.h 2010-07-09 14:50:38.000000000 -0400 |
45763 | @@ -3,7 +3,7 @@ | 46073 | @@ -3,7 +3,7 @@ |
45764 | struct cpustate_t { | 46074 | struct cpustate_t { |
45765 | spinlock_t lock; | 46075 | spinlock_t lock; |
@@ -45769,9 +46079,9 @@ diff -urNp linux-2.6.32.15/include/linux/hdpu_features.h linux-2.6.32.15/include | |||
45769 | unsigned char cached_val; | 46079 | unsigned char cached_val; |
45770 | int inited; | 46080 | int inited; |
45771 | unsigned long *set_addr; | 46081 | unsigned long *set_addr; |
45772 | diff -urNp linux-2.6.32.15/include/linux/highmem.h linux-2.6.32.15/include/linux/highmem.h | 46082 | diff -urNp linux-2.6.32.16/include/linux/highmem.h linux-2.6.32.16/include/linux/highmem.h |
45773 | --- linux-2.6.32.15/include/linux/highmem.h 2010-03-15 11:52:04.000000000 -0400 | 46083 | --- linux-2.6.32.16/include/linux/highmem.h 2010-07-05 14:14:00.000000000 -0400 |
45774 | +++ linux-2.6.32.15/include/linux/highmem.h 2010-05-28 21:27:16.372277939 -0400 | 46084 | +++ linux-2.6.32.16/include/linux/highmem.h 2010-07-09 14:50:38.000000000 -0400 |
45775 | @@ -137,6 +137,18 @@ static inline void clear_highpage(struct | 46085 | @@ -137,6 +137,18 @@ static inline void clear_highpage(struct |
45776 | kunmap_atomic(kaddr, KM_USER0); | 46086 | kunmap_atomic(kaddr, KM_USER0); |
45777 | } | 46087 | } |
@@ -45791,34 +46101,9 @@ diff -urNp linux-2.6.32.15/include/linux/highmem.h linux-2.6.32.15/include/linux | |||
45791 | static inline void zero_user_segments(struct page *page, | 46101 | static inline void zero_user_segments(struct page *page, |
45792 | unsigned start1, unsigned end1, | 46102 | unsigned start1, unsigned end1, |
45793 | unsigned start2, unsigned end2) | 46103 | unsigned start2, unsigned end2) |
45794 | diff -urNp linux-2.6.32.15/include/linux/init_task.h linux-2.6.32.15/include/linux/init_task.h | 46104 | diff -urNp linux-2.6.32.16/include/linux/interrupt.h linux-2.6.32.16/include/linux/interrupt.h |
45795 | --- linux-2.6.32.15/include/linux/init_task.h 2010-03-15 11:52:04.000000000 -0400 | 46105 | --- linux-2.6.32.16/include/linux/interrupt.h 2010-07-05 14:14:00.000000000 -0400 |
45796 | +++ linux-2.6.32.15/include/linux/init_task.h 2010-05-28 21:27:16.377048812 -0400 | 46106 | +++ linux-2.6.32.16/include/linux/interrupt.h 2010-07-09 14:50:38.000000000 -0400 |
45797 | @@ -115,6 +115,13 @@ extern struct cred init_cred; | ||
45798 | # define INIT_PERF_EVENTS(tsk) | ||
45799 | #endif | ||
45800 | |||
45801 | +#ifdef CONFIG_GRKERNSEC | ||
45802 | +# define INIT_GR_FS_LOCK \ | ||
45803 | + .gr_fs_lock = __RW_LOCK_UNLOCKED(gr_fs_lock), | ||
45804 | +#else | ||
45805 | +# define INIT_GR_FS_LOCK | ||
45806 | +#endif | ||
45807 | + | ||
45808 | /* | ||
45809 | * INIT_TASK is used to set up the first task table, touch at | ||
45810 | * your own risk!. Base=0, limit=0x1fffff (=2MB) | ||
45811 | @@ -184,6 +191,7 @@ extern struct cred init_cred; | ||
45812 | INIT_FTRACE_GRAPH \ | ||
45813 | INIT_TRACE_RECURSION \ | ||
45814 | INIT_TASK_RCU_PREEMPT(tsk) \ | ||
45815 | + INIT_GR_FS_LOCK \ | ||
45816 | } | ||
45817 | |||
45818 | |||
45819 | diff -urNp linux-2.6.32.15/include/linux/interrupt.h linux-2.6.32.15/include/linux/interrupt.h | ||
45820 | --- linux-2.6.32.15/include/linux/interrupt.h 2010-03-15 11:52:04.000000000 -0400 | ||
45821 | +++ linux-2.6.32.15/include/linux/interrupt.h 2010-05-28 21:27:16.377048812 -0400 | ||
45822 | @@ -357,7 +357,7 @@ enum | 46107 | @@ -357,7 +357,7 @@ enum |
45823 | /* map softirq index to softirq name. update 'softirq_to_name' in | 46108 | /* map softirq index to softirq name. update 'softirq_to_name' in |
45824 | * kernel/softirq.c when adding a new softirq. | 46109 | * kernel/softirq.c when adding a new softirq. |
@@ -45843,9 +46128,9 @@ diff -urNp linux-2.6.32.15/include/linux/interrupt.h linux-2.6.32.15/include/lin | |||
45843 | extern void softirq_init(void); | 46128 | extern void softirq_init(void); |
45844 | #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0) | 46129 | #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0) |
45845 | extern void raise_softirq_irqoff(unsigned int nr); | 46130 | extern void raise_softirq_irqoff(unsigned int nr); |
45846 | diff -urNp linux-2.6.32.15/include/linux/jbd2.h linux-2.6.32.15/include/linux/jbd2.h | 46131 | diff -urNp linux-2.6.32.16/include/linux/jbd2.h linux-2.6.32.16/include/linux/jbd2.h |
45847 | --- linux-2.6.32.15/include/linux/jbd2.h 2010-03-15 11:52:04.000000000 -0400 | 46132 | --- linux-2.6.32.16/include/linux/jbd2.h 2010-07-05 14:14:00.000000000 -0400 |
45848 | +++ linux-2.6.32.15/include/linux/jbd2.h 2010-05-28 21:27:16.377048812 -0400 | 46133 | +++ linux-2.6.32.16/include/linux/jbd2.h 2010-07-09 14:50:38.000000000 -0400 |
45849 | @@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; | 46134 | @@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; |
45850 | } \ | 46135 | } \ |
45851 | } while (0) | 46136 | } while (0) |
@@ -45855,9 +46140,9 @@ diff -urNp linux-2.6.32.15/include/linux/jbd2.h linux-2.6.32.15/include/linux/jb | |||
45855 | #endif | 46140 | #endif |
45856 | 46141 | ||
45857 | static inline void *jbd2_alloc(size_t size, gfp_t flags) | 46142 | static inline void *jbd2_alloc(size_t size, gfp_t flags) |
45858 | diff -urNp linux-2.6.32.15/include/linux/jbd.h linux-2.6.32.15/include/linux/jbd.h | 46143 | diff -urNp linux-2.6.32.16/include/linux/jbd.h linux-2.6.32.16/include/linux/jbd.h |
45859 | --- linux-2.6.32.15/include/linux/jbd.h 2010-03-15 11:52:04.000000000 -0400 | 46144 | --- linux-2.6.32.16/include/linux/jbd.h 2010-07-05 14:14:00.000000000 -0400 |
45860 | +++ linux-2.6.32.15/include/linux/jbd.h 2010-05-28 21:27:16.377048812 -0400 | 46145 | +++ linux-2.6.32.16/include/linux/jbd.h 2010-07-09 14:50:38.000000000 -0400 |
45861 | @@ -66,7 +66,7 @@ extern u8 journal_enable_debug; | 46146 | @@ -66,7 +66,7 @@ extern u8 journal_enable_debug; |
45862 | } \ | 46147 | } \ |
45863 | } while (0) | 46148 | } while (0) |
@@ -45867,9 +46152,9 @@ diff -urNp linux-2.6.32.15/include/linux/jbd.h linux-2.6.32.15/include/linux/jbd | |||
45867 | #endif | 46152 | #endif |
45868 | 46153 | ||
45869 | static inline void *jbd_alloc(size_t size, gfp_t flags) | 46154 | static inline void *jbd_alloc(size_t size, gfp_t flags) |
45870 | diff -urNp linux-2.6.32.15/include/linux/kallsyms.h linux-2.6.32.15/include/linux/kallsyms.h | 46155 | diff -urNp linux-2.6.32.16/include/linux/kallsyms.h linux-2.6.32.16/include/linux/kallsyms.h |
45871 | --- linux-2.6.32.15/include/linux/kallsyms.h 2010-03-15 11:52:04.000000000 -0400 | 46156 | --- linux-2.6.32.16/include/linux/kallsyms.h 2010-07-05 14:14:00.000000000 -0400 |
45872 | +++ linux-2.6.32.15/include/linux/kallsyms.h 2010-05-28 21:27:16.377048812 -0400 | 46157 | +++ linux-2.6.32.16/include/linux/kallsyms.h 2010-07-09 14:50:38.000000000 -0400 |
45873 | @@ -15,7 +15,8 @@ | 46158 | @@ -15,7 +15,8 @@ |
45874 | 46159 | ||
45875 | struct module; | 46160 | struct module; |
@@ -45890,9 +46175,9 @@ diff -urNp linux-2.6.32.15/include/linux/kallsyms.h linux-2.6.32.15/include/linu | |||
45890 | 46175 | ||
45891 | /* This macro allows us to keep printk typechecking */ | 46176 | /* This macro allows us to keep printk typechecking */ |
45892 | static void __check_printsym_format(const char *fmt, ...) | 46177 | static void __check_printsym_format(const char *fmt, ...) |
45893 | diff -urNp linux-2.6.32.15/include/linux/kgdb.h linux-2.6.32.15/include/linux/kgdb.h | 46178 | diff -urNp linux-2.6.32.16/include/linux/kgdb.h linux-2.6.32.16/include/linux/kgdb.h |
45894 | --- linux-2.6.32.15/include/linux/kgdb.h 2010-03-15 11:52:04.000000000 -0400 | 46179 | --- linux-2.6.32.16/include/linux/kgdb.h 2010-07-05 14:14:00.000000000 -0400 |
45895 | +++ linux-2.6.32.15/include/linux/kgdb.h 2010-05-28 21:27:16.379237094 -0400 | 46180 | +++ linux-2.6.32.16/include/linux/kgdb.h 2010-07-09 14:50:38.000000000 -0400 |
45896 | @@ -251,20 +251,20 @@ struct kgdb_arch { | 46181 | @@ -251,20 +251,20 @@ struct kgdb_arch { |
45897 | */ | 46182 | */ |
45898 | struct kgdb_io { | 46183 | struct kgdb_io { |
@@ -45923,9 +46208,9 @@ diff -urNp linux-2.6.32.15/include/linux/kgdb.h linux-2.6.32.15/include/linux/kg | |||
45923 | 46208 | ||
45924 | extern int kgdb_hex2long(char **ptr, unsigned long *long_val); | 46209 | extern int kgdb_hex2long(char **ptr, unsigned long *long_val); |
45925 | extern int kgdb_mem2hex(char *mem, char *buf, int count); | 46210 | extern int kgdb_mem2hex(char *mem, char *buf, int count); |
45926 | diff -urNp linux-2.6.32.15/include/linux/kobject.h linux-2.6.32.15/include/linux/kobject.h | 46211 | diff -urNp linux-2.6.32.16/include/linux/kobject.h linux-2.6.32.16/include/linux/kobject.h |
45927 | --- linux-2.6.32.15/include/linux/kobject.h 2010-03-15 11:52:04.000000000 -0400 | 46212 | --- linux-2.6.32.16/include/linux/kobject.h 2010-07-05 14:14:00.000000000 -0400 |
45928 | +++ linux-2.6.32.15/include/linux/kobject.h 2010-05-28 21:27:16.379237094 -0400 | 46213 | +++ linux-2.6.32.16/include/linux/kobject.h 2010-07-09 14:50:38.000000000 -0400 |
45929 | @@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob | 46214 | @@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob |
45930 | 46215 | ||
45931 | struct kobj_type { | 46216 | struct kobj_type { |
@@ -45974,9 +46259,9 @@ diff -urNp linux-2.6.32.15/include/linux/kobject.h linux-2.6.32.15/include/linux | |||
45974 | struct kobject *parent_kobj); | 46259 | struct kobject *parent_kobj); |
45975 | 46260 | ||
45976 | static inline struct kset *to_kset(struct kobject *kobj) | 46261 | static inline struct kset *to_kset(struct kobject *kobj) |
45977 | diff -urNp linux-2.6.32.15/include/linux/kvm_host.h linux-2.6.32.15/include/linux/kvm_host.h | 46262 | diff -urNp linux-2.6.32.16/include/linux/kvm_host.h linux-2.6.32.16/include/linux/kvm_host.h |
45978 | --- linux-2.6.32.15/include/linux/kvm_host.h 2010-04-29 17:49:38.529851956 -0400 | 46263 | --- linux-2.6.32.16/include/linux/kvm_host.h 2010-07-05 14:14:00.000000000 -0400 |
45979 | +++ linux-2.6.32.15/include/linux/kvm_host.h 2010-05-28 21:27:16.379237094 -0400 | 46264 | +++ linux-2.6.32.16/include/linux/kvm_host.h 2010-07-09 14:50:38.000000000 -0400 |
45980 | @@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc | 46265 | @@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc |
45981 | void vcpu_load(struct kvm_vcpu *vcpu); | 46266 | void vcpu_load(struct kvm_vcpu *vcpu); |
45982 | void vcpu_put(struct kvm_vcpu *vcpu); | 46267 | void vcpu_put(struct kvm_vcpu *vcpu); |
@@ -45995,9 +46280,9 @@ diff -urNp linux-2.6.32.15/include/linux/kvm_host.h linux-2.6.32.15/include/linu | |||
45995 | void kvm_arch_exit(void); | 46280 | void kvm_arch_exit(void); |
45996 | 46281 | ||
45997 | int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); | 46282 | int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); |
45998 | diff -urNp linux-2.6.32.15/include/linux/libata.h linux-2.6.32.15/include/linux/libata.h | 46283 | diff -urNp linux-2.6.32.16/include/linux/libata.h linux-2.6.32.16/include/linux/libata.h |
45999 | --- linux-2.6.32.15/include/linux/libata.h 2010-03-15 11:52:04.000000000 -0400 | 46284 | --- linux-2.6.32.16/include/linux/libata.h 2010-07-05 14:14:00.000000000 -0400 |
46000 | +++ linux-2.6.32.15/include/linux/libata.h 2010-05-28 21:27:16.391248013 -0400 | 46285 | +++ linux-2.6.32.16/include/linux/libata.h 2010-07-09 14:50:38.000000000 -0400 |
46001 | @@ -64,11 +64,11 @@ | 46286 | @@ -64,11 +64,11 @@ |
46002 | #ifdef ATA_VERBOSE_DEBUG | 46287 | #ifdef ATA_VERBOSE_DEBUG |
46003 | #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) | 46288 | #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) |
@@ -46063,9 +46348,9 @@ diff -urNp linux-2.6.32.15/include/linux/libata.h linux-2.6.32.15/include/linux/ | |||
46063 | extern int ata_scsi_detect(struct scsi_host_template *sht); | 46348 | extern int ata_scsi_detect(struct scsi_host_template *sht); |
46064 | extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); | 46349 | extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); |
46065 | extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); | 46350 | extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); |
46066 | diff -urNp linux-2.6.32.15/include/linux/lockd/bind.h linux-2.6.32.15/include/linux/lockd/bind.h | 46351 | diff -urNp linux-2.6.32.16/include/linux/lockd/bind.h linux-2.6.32.16/include/linux/lockd/bind.h |
46067 | --- linux-2.6.32.15/include/linux/lockd/bind.h 2010-03-15 11:52:04.000000000 -0400 | 46352 | --- linux-2.6.32.16/include/linux/lockd/bind.h 2010-07-05 14:14:00.000000000 -0400 |
46068 | +++ linux-2.6.32.15/include/linux/lockd/bind.h 2010-05-28 21:27:16.391248013 -0400 | 46353 | +++ linux-2.6.32.16/include/linux/lockd/bind.h 2010-07-09 14:50:38.000000000 -0400 |
46069 | @@ -23,13 +23,13 @@ struct svc_rqst; | 46354 | @@ -23,13 +23,13 @@ struct svc_rqst; |
46070 | * This is the set of functions for lockd->nfsd communication | 46355 | * This is the set of functions for lockd->nfsd communication |
46071 | */ | 46356 | */ |
@@ -46083,9 +46368,9 @@ diff -urNp linux-2.6.32.15/include/linux/lockd/bind.h linux-2.6.32.15/include/li | |||
46083 | 46368 | ||
46084 | /* | 46369 | /* |
46085 | * Similar to nfs_client_initdata, but without the NFS-specific | 46370 | * Similar to nfs_client_initdata, but without the NFS-specific |
46086 | diff -urNp linux-2.6.32.15/include/linux/mm.h linux-2.6.32.15/include/linux/mm.h | 46371 | diff -urNp linux-2.6.32.16/include/linux/mm.h linux-2.6.32.16/include/linux/mm.h |
46087 | --- linux-2.6.32.15/include/linux/mm.h 2010-03-15 11:52:04.000000000 -0400 | 46372 | --- linux-2.6.32.16/include/linux/mm.h 2010-07-05 14:14:00.000000000 -0400 |
46088 | +++ linux-2.6.32.15/include/linux/mm.h 2010-05-31 11:15:44.592892079 -0400 | 46373 | +++ linux-2.6.32.16/include/linux/mm.h 2010-07-09 14:50:38.000000000 -0400 |
46089 | @@ -102,7 +102,14 @@ extern unsigned int kobjsize(const void | 46374 | @@ -102,7 +102,14 @@ extern unsigned int kobjsize(const void |
46090 | 46375 | ||
46091 | #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */ | 46376 | #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */ |
@@ -46152,9 +46437,9 @@ diff -urNp linux-2.6.32.15/include/linux/mm.h linux-2.6.32.15/include/linux/mm.h | |||
46152 | 46437 | ||
46153 | #endif /* __KERNEL__ */ | 46438 | #endif /* __KERNEL__ */ |
46154 | #endif /* _LINUX_MM_H */ | 46439 | #endif /* _LINUX_MM_H */ |
46155 | diff -urNp linux-2.6.32.15/include/linux/mm_types.h linux-2.6.32.15/include/linux/mm_types.h | 46440 | diff -urNp linux-2.6.32.16/include/linux/mm_types.h linux-2.6.32.16/include/linux/mm_types.h |
46156 | --- linux-2.6.32.15/include/linux/mm_types.h 2010-03-15 11:52:04.000000000 -0400 | 46441 | --- linux-2.6.32.16/include/linux/mm_types.h 2010-07-05 14:14:00.000000000 -0400 |
46157 | +++ linux-2.6.32.15/include/linux/mm_types.h 2010-05-28 21:27:16.391248013 -0400 | 46442 | +++ linux-2.6.32.16/include/linux/mm_types.h 2010-07-09 14:50:38.000000000 -0400 |
46158 | @@ -186,6 +186,8 @@ struct vm_area_struct { | 46443 | @@ -186,6 +186,8 @@ struct vm_area_struct { |
46159 | #ifdef CONFIG_NUMA | 46444 | #ifdef CONFIG_NUMA |
46160 | struct mempolicy *vm_policy; /* NUMA policy for the VMA */ | 46445 | struct mempolicy *vm_policy; /* NUMA policy for the VMA */ |
@@ -46189,9 +46474,9 @@ diff -urNp linux-2.6.32.15/include/linux/mm_types.h linux-2.6.32.15/include/linu | |||
46189 | }; | 46474 | }; |
46190 | 46475 | ||
46191 | /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ | 46476 | /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ |
46192 | diff -urNp linux-2.6.32.15/include/linux/mmu_notifier.h linux-2.6.32.15/include/linux/mmu_notifier.h | 46477 | diff -urNp linux-2.6.32.16/include/linux/mmu_notifier.h linux-2.6.32.16/include/linux/mmu_notifier.h |
46193 | --- linux-2.6.32.15/include/linux/mmu_notifier.h 2010-03-15 11:52:04.000000000 -0400 | 46478 | --- linux-2.6.32.16/include/linux/mmu_notifier.h 2010-07-05 14:14:00.000000000 -0400 |
46194 | +++ linux-2.6.32.15/include/linux/mmu_notifier.h 2010-05-28 21:27:16.391248013 -0400 | 46479 | +++ linux-2.6.32.16/include/linux/mmu_notifier.h 2010-07-09 14:50:38.000000000 -0400 |
46195 | @@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr | 46480 | @@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr |
46196 | */ | 46481 | */ |
46197 | #define ptep_clear_flush_notify(__vma, __address, __ptep) \ | 46482 | #define ptep_clear_flush_notify(__vma, __address, __ptep) \ |
@@ -46208,9 +46493,9 @@ diff -urNp linux-2.6.32.15/include/linux/mmu_notifier.h linux-2.6.32.15/include/ | |||
46208 | }) | 46493 | }) |
46209 | 46494 | ||
46210 | #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \ | 46495 | #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \ |
46211 | diff -urNp linux-2.6.32.15/include/linux/mod_devicetable.h linux-2.6.32.15/include/linux/mod_devicetable.h | 46496 | diff -urNp linux-2.6.32.16/include/linux/mod_devicetable.h linux-2.6.32.16/include/linux/mod_devicetable.h |
46212 | --- linux-2.6.32.15/include/linux/mod_devicetable.h 2010-03-15 11:52:04.000000000 -0400 | 46497 | --- linux-2.6.32.16/include/linux/mod_devicetable.h 2010-07-05 14:14:00.000000000 -0400 |
46213 | +++ linux-2.6.32.15/include/linux/mod_devicetable.h 2010-05-28 21:27:16.391248013 -0400 | 46498 | +++ linux-2.6.32.16/include/linux/mod_devicetable.h 2010-07-09 14:50:38.000000000 -0400 |
46214 | @@ -12,7 +12,7 @@ | 46499 | @@ -12,7 +12,7 @@ |
46215 | typedef unsigned long kernel_ulong_t; | 46500 | typedef unsigned long kernel_ulong_t; |
46216 | #endif | 46501 | #endif |
@@ -46229,9 +46514,9 @@ diff -urNp linux-2.6.32.15/include/linux/mod_devicetable.h linux-2.6.32.15/inclu | |||
46229 | 46514 | ||
46230 | struct hid_device_id { | 46515 | struct hid_device_id { |
46231 | __u16 bus; | 46516 | __u16 bus; |
46232 | diff -urNp linux-2.6.32.15/include/linux/module.h linux-2.6.32.15/include/linux/module.h | 46517 | diff -urNp linux-2.6.32.16/include/linux/module.h linux-2.6.32.16/include/linux/module.h |
46233 | --- linux-2.6.32.15/include/linux/module.h 2010-05-28 20:16:44.458924952 -0400 | 46518 | --- linux-2.6.32.16/include/linux/module.h 2010-07-05 14:14:00.000000000 -0400 |
46234 | +++ linux-2.6.32.15/include/linux/module.h 2010-05-28 21:27:16.391248013 -0400 | 46519 | +++ linux-2.6.32.16/include/linux/module.h 2010-07-09 14:50:38.000000000 -0400 |
46235 | @@ -287,16 +287,16 @@ struct module | 46520 | @@ -287,16 +287,16 @@ struct module |
46236 | int (*init)(void); | 46521 | int (*init)(void); |
46237 | 46522 | ||
@@ -46304,9 +46589,9 @@ diff -urNp linux-2.6.32.15/include/linux/module.h linux-2.6.32.15/include/linux/ | |||
46304 | } | 46589 | } |
46305 | 46590 | ||
46306 | /* Search for module by name: must hold module_mutex. */ | 46591 | /* Search for module by name: must hold module_mutex. */ |
46307 | diff -urNp linux-2.6.32.15/include/linux/moduleloader.h linux-2.6.32.15/include/linux/moduleloader.h | 46592 | diff -urNp linux-2.6.32.16/include/linux/moduleloader.h linux-2.6.32.16/include/linux/moduleloader.h |
46308 | --- linux-2.6.32.15/include/linux/moduleloader.h 2010-03-15 11:52:04.000000000 -0400 | 46593 | --- linux-2.6.32.16/include/linux/moduleloader.h 2010-07-05 14:14:00.000000000 -0400 |
46309 | +++ linux-2.6.32.15/include/linux/moduleloader.h 2010-05-28 21:27:16.391248013 -0400 | 46594 | +++ linux-2.6.32.16/include/linux/moduleloader.h 2010-07-09 14:50:38.000000000 -0400 |
46310 | @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st | 46595 | @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st |
46311 | sections. Returns NULL on failure. */ | 46596 | sections. Returns NULL on failure. */ |
46312 | void *module_alloc(unsigned long size); | 46597 | void *module_alloc(unsigned long size); |
@@ -46329,9 +46614,9 @@ diff -urNp linux-2.6.32.15/include/linux/moduleloader.h linux-2.6.32.15/include/ | |||
46329 | /* Apply the given relocation to the (simplified) ELF. Return -error | 46614 | /* Apply the given relocation to the (simplified) ELF. Return -error |
46330 | or 0. */ | 46615 | or 0. */ |
46331 | int apply_relocate(Elf_Shdr *sechdrs, | 46616 | int apply_relocate(Elf_Shdr *sechdrs, |
46332 | diff -urNp linux-2.6.32.15/include/linux/namei.h linux-2.6.32.15/include/linux/namei.h | 46617 | diff -urNp linux-2.6.32.16/include/linux/namei.h linux-2.6.32.16/include/linux/namei.h |
46333 | --- linux-2.6.32.15/include/linux/namei.h 2010-03-15 11:52:04.000000000 -0400 | 46618 | --- linux-2.6.32.16/include/linux/namei.h 2010-07-05 14:14:00.000000000 -0400 |
46334 | +++ linux-2.6.32.15/include/linux/namei.h 2010-05-28 21:27:16.394947878 -0400 | 46619 | +++ linux-2.6.32.16/include/linux/namei.h 2010-07-09 14:50:38.000000000 -0400 |
46335 | @@ -22,7 +22,7 @@ struct nameidata { | 46620 | @@ -22,7 +22,7 @@ struct nameidata { |
46336 | unsigned int flags; | 46621 | unsigned int flags; |
46337 | int last_type; | 46622 | int last_type; |
@@ -46356,9 +46641,9 @@ diff -urNp linux-2.6.32.15/include/linux/namei.h linux-2.6.32.15/include/linux/n | |||
46356 | { | 46641 | { |
46357 | return nd->saved_names[nd->depth]; | 46642 | return nd->saved_names[nd->depth]; |
46358 | } | 46643 | } |
46359 | diff -urNp linux-2.6.32.15/include/linux/nodemask.h linux-2.6.32.15/include/linux/nodemask.h | 46644 | diff -urNp linux-2.6.32.16/include/linux/nodemask.h linux-2.6.32.16/include/linux/nodemask.h |
46360 | --- linux-2.6.32.15/include/linux/nodemask.h 2010-03-15 11:52:04.000000000 -0400 | 46645 | --- linux-2.6.32.16/include/linux/nodemask.h 2010-07-05 14:14:00.000000000 -0400 |
46361 | +++ linux-2.6.32.15/include/linux/nodemask.h 2010-05-28 21:27:16.394947878 -0400 | 46646 | +++ linux-2.6.32.16/include/linux/nodemask.h 2010-07-09 14:50:38.000000000 -0400 |
46362 | @@ -464,11 +464,11 @@ static inline int num_node_state(enum no | 46647 | @@ -464,11 +464,11 @@ static inline int num_node_state(enum no |
46363 | 46648 | ||
46364 | #define any_online_node(mask) \ | 46649 | #define any_online_node(mask) \ |
@@ -46375,9 +46660,9 @@ diff -urNp linux-2.6.32.15/include/linux/nodemask.h linux-2.6.32.15/include/linu | |||
46375 | }) | 46660 | }) |
46376 | 46661 | ||
46377 | #define num_online_nodes() num_node_state(N_ONLINE) | 46662 | #define num_online_nodes() num_node_state(N_ONLINE) |
46378 | diff -urNp linux-2.6.32.15/include/linux/oprofile.h linux-2.6.32.15/include/linux/oprofile.h | 46663 | diff -urNp linux-2.6.32.16/include/linux/oprofile.h linux-2.6.32.16/include/linux/oprofile.h |
46379 | --- linux-2.6.32.15/include/linux/oprofile.h 2010-03-15 11:52:04.000000000 -0400 | 46664 | --- linux-2.6.32.16/include/linux/oprofile.h 2010-07-05 14:14:00.000000000 -0400 |
46380 | +++ linux-2.6.32.15/include/linux/oprofile.h 2010-05-28 21:27:16.394947878 -0400 | 46665 | +++ linux-2.6.32.16/include/linux/oprofile.h 2010-07-09 14:50:38.000000000 -0400 |
46381 | @@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super | 46666 | @@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super |
46382 | int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, | 46667 | int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, |
46383 | char const * name, ulong * val); | 46668 | char const * name, ulong * val); |
@@ -46390,9 +46675,9 @@ diff -urNp linux-2.6.32.15/include/linux/oprofile.h linux-2.6.32.15/include/linu | |||
46390 | 46675 | ||
46391 | /** create a directory */ | 46676 | /** create a directory */ |
46392 | struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, | 46677 | struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, |
46393 | diff -urNp linux-2.6.32.15/include/linux/pipe_fs_i.h linux-2.6.32.15/include/linux/pipe_fs_i.h | 46678 | diff -urNp linux-2.6.32.16/include/linux/pipe_fs_i.h linux-2.6.32.16/include/linux/pipe_fs_i.h |
46394 | --- linux-2.6.32.15/include/linux/pipe_fs_i.h 2010-03-15 11:52:04.000000000 -0400 | 46679 | --- linux-2.6.32.16/include/linux/pipe_fs_i.h 2010-07-05 14:14:00.000000000 -0400 |
46395 | +++ linux-2.6.32.15/include/linux/pipe_fs_i.h 2010-05-28 21:27:16.394947878 -0400 | 46680 | +++ linux-2.6.32.16/include/linux/pipe_fs_i.h 2010-07-09 14:50:38.000000000 -0400 |
46396 | @@ -46,9 +46,9 @@ struct pipe_inode_info { | 46681 | @@ -46,9 +46,9 @@ struct pipe_inode_info { |
46397 | wait_queue_head_t wait; | 46682 | wait_queue_head_t wait; |
46398 | unsigned int nrbufs, curbuf; | 46683 | unsigned int nrbufs, curbuf; |
@@ -46406,9 +46691,9 @@ diff -urNp linux-2.6.32.15/include/linux/pipe_fs_i.h linux-2.6.32.15/include/lin | |||
46406 | unsigned int r_counter; | 46691 | unsigned int r_counter; |
46407 | unsigned int w_counter; | 46692 | unsigned int w_counter; |
46408 | struct fasync_struct *fasync_readers; | 46693 | struct fasync_struct *fasync_readers; |
46409 | diff -urNp linux-2.6.32.15/include/linux/poison.h linux-2.6.32.15/include/linux/poison.h | 46694 | diff -urNp linux-2.6.32.16/include/linux/poison.h linux-2.6.32.16/include/linux/poison.h |
46410 | --- linux-2.6.32.15/include/linux/poison.h 2010-05-15 13:20:19.331913169 -0400 | 46695 | --- linux-2.6.32.16/include/linux/poison.h 2010-07-05 14:14:00.000000000 -0400 |
46411 | +++ linux-2.6.32.15/include/linux/poison.h 2010-05-28 21:27:16.394947878 -0400 | 46696 | +++ linux-2.6.32.16/include/linux/poison.h 2010-07-09 14:50:38.000000000 -0400 |
46412 | @@ -19,8 +19,8 @@ | 46697 | @@ -19,8 +19,8 @@ |
46413 | * under normal circumstances, used to verify that nobody uses | 46698 | * under normal circumstances, used to verify that nobody uses |
46414 | * non-initialized list entries. | 46699 | * non-initialized list entries. |
@@ -46420,9 +46705,9 @@ diff -urNp linux-2.6.32.15/include/linux/poison.h linux-2.6.32.15/include/linux/ | |||
46420 | 46705 | ||
46421 | /********** include/linux/timer.h **********/ | 46706 | /********** include/linux/timer.h **********/ |
46422 | /* | 46707 | /* |
46423 | diff -urNp linux-2.6.32.15/include/linux/proc_fs.h linux-2.6.32.15/include/linux/proc_fs.h | 46708 | diff -urNp linux-2.6.32.16/include/linux/proc_fs.h linux-2.6.32.16/include/linux/proc_fs.h |
46424 | --- linux-2.6.32.15/include/linux/proc_fs.h 2010-03-15 11:52:04.000000000 -0400 | 46709 | --- linux-2.6.32.16/include/linux/proc_fs.h 2010-07-05 14:14:00.000000000 -0400 |
46425 | +++ linux-2.6.32.15/include/linux/proc_fs.h 2010-05-28 21:27:16.394947878 -0400 | 46710 | +++ linux-2.6.32.16/include/linux/proc_fs.h 2010-07-09 14:50:38.000000000 -0400 |
46426 | @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro | 46711 | @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro |
46427 | return proc_create_data(name, mode, parent, proc_fops, NULL); | 46712 | return proc_create_data(name, mode, parent, proc_fops, NULL); |
46428 | } | 46713 | } |
@@ -46443,9 +46728,9 @@ diff -urNp linux-2.6.32.15/include/linux/proc_fs.h linux-2.6.32.15/include/linux | |||
46443 | static inline struct proc_dir_entry *create_proc_read_entry(const char *name, | 46728 | static inline struct proc_dir_entry *create_proc_read_entry(const char *name, |
46444 | mode_t mode, struct proc_dir_entry *base, | 46729 | mode_t mode, struct proc_dir_entry *base, |
46445 | read_proc_t *read_proc, void * data) | 46730 | read_proc_t *read_proc, void * data) |
46446 | diff -urNp linux-2.6.32.15/include/linux/random.h linux-2.6.32.15/include/linux/random.h | 46731 | diff -urNp linux-2.6.32.16/include/linux/random.h linux-2.6.32.16/include/linux/random.h |
46447 | --- linux-2.6.32.15/include/linux/random.h 2010-03-15 11:52:04.000000000 -0400 | 46732 | --- linux-2.6.32.16/include/linux/random.h 2010-07-05 14:14:00.000000000 -0400 |
46448 | +++ linux-2.6.32.15/include/linux/random.h 2010-05-28 21:27:16.394947878 -0400 | 46733 | +++ linux-2.6.32.16/include/linux/random.h 2010-07-09 14:50:38.000000000 -0400 |
46449 | @@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l | 46734 | @@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l |
46450 | u32 random32(void); | 46735 | u32 random32(void); |
46451 | void srandom32(u32 seed); | 46736 | void srandom32(u32 seed); |
@@ -46458,9 +46743,9 @@ diff -urNp linux-2.6.32.15/include/linux/random.h linux-2.6.32.15/include/linux/ | |||
46458 | #endif /* __KERNEL___ */ | 46743 | #endif /* __KERNEL___ */ |
46459 | 46744 | ||
46460 | #endif /* _LINUX_RANDOM_H */ | 46745 | #endif /* _LINUX_RANDOM_H */ |
46461 | diff -urNp linux-2.6.32.15/include/linux/reiserfs_fs.h linux-2.6.32.15/include/linux/reiserfs_fs.h | 46746 | diff -urNp linux-2.6.32.16/include/linux/reiserfs_fs.h linux-2.6.32.16/include/linux/reiserfs_fs.h |
46462 | --- linux-2.6.32.15/include/linux/reiserfs_fs.h 2010-03-15 11:52:04.000000000 -0400 | 46747 | --- linux-2.6.32.16/include/linux/reiserfs_fs.h 2010-07-05 14:14:00.000000000 -0400 |
46463 | +++ linux-2.6.32.15/include/linux/reiserfs_fs.h 2010-05-28 21:27:16.394947878 -0400 | 46748 | +++ linux-2.6.32.16/include/linux/reiserfs_fs.h 2010-07-09 14:50:38.000000000 -0400 |
46464 | @@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset | 46749 | @@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset |
46465 | #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ | 46750 | #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ |
46466 | 46751 | ||
@@ -46507,9 +46792,9 @@ diff -urNp linux-2.6.32.15/include/linux/reiserfs_fs.h linux-2.6.32.15/include/l | |||
46507 | 46792 | ||
46508 | #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize) | 46793 | #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize) |
46509 | #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize) | 46794 | #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize) |
46510 | diff -urNp linux-2.6.32.15/include/linux/reiserfs_fs_sb.h linux-2.6.32.15/include/linux/reiserfs_fs_sb.h | 46795 | diff -urNp linux-2.6.32.16/include/linux/reiserfs_fs_sb.h linux-2.6.32.16/include/linux/reiserfs_fs_sb.h |
46511 | --- linux-2.6.32.15/include/linux/reiserfs_fs_sb.h 2010-03-15 11:52:04.000000000 -0400 | 46796 | --- linux-2.6.32.16/include/linux/reiserfs_fs_sb.h 2010-07-05 14:14:00.000000000 -0400 |
46512 | +++ linux-2.6.32.15/include/linux/reiserfs_fs_sb.h 2010-05-28 21:27:16.394947878 -0400 | 46797 | +++ linux-2.6.32.16/include/linux/reiserfs_fs_sb.h 2010-07-09 14:50:38.000000000 -0400 |
46513 | @@ -377,7 +377,7 @@ struct reiserfs_sb_info { | 46798 | @@ -377,7 +377,7 @@ struct reiserfs_sb_info { |
46514 | /* Comment? -Hans */ | 46799 | /* Comment? -Hans */ |
46515 | wait_queue_head_t s_wait; | 46800 | wait_queue_head_t s_wait; |
@@ -46519,9 +46804,9 @@ diff -urNp linux-2.6.32.15/include/linux/reiserfs_fs_sb.h linux-2.6.32.15/includ | |||
46519 | // tree gets re-balanced | 46804 | // tree gets re-balanced |
46520 | unsigned long s_properties; /* File system properties. Currently holds | 46805 | unsigned long s_properties; /* File system properties. Currently holds |
46521 | on-disk FS format */ | 46806 | on-disk FS format */ |
46522 | diff -urNp linux-2.6.32.15/include/linux/sched.h linux-2.6.32.15/include/linux/sched.h | 46807 | diff -urNp linux-2.6.32.16/include/linux/sched.h linux-2.6.32.16/include/linux/sched.h |
46523 | --- linux-2.6.32.15/include/linux/sched.h 2010-05-28 20:16:44.458924952 -0400 | 46808 | --- linux-2.6.32.16/include/linux/sched.h 2010-07-05 14:14:00.000000000 -0400 |
46524 | +++ linux-2.6.32.15/include/linux/sched.h 2010-05-28 21:27:16.403248422 -0400 | 46809 | +++ linux-2.6.32.16/include/linux/sched.h 2010-07-09 14:50:38.000000000 -0400 |
46525 | @@ -101,6 +101,7 @@ struct bio; | 46810 | @@ -101,6 +101,7 @@ struct bio; |
46526 | struct fs_struct; | 46811 | struct fs_struct; |
46527 | struct bts_context; | 46812 | struct bts_context; |
@@ -46609,14 +46894,14 @@ diff -urNp linux-2.6.32.15/include/linux/sched.h linux-2.6.32.15/include/linux/s | |||
46609 | struct io_context *io_context; | 46894 | struct io_context *io_context; |
46610 | 46895 | ||
46611 | unsigned long ptrace_message; | 46896 | unsigned long ptrace_message; |
46612 | @@ -1520,6 +1532,19 @@ struct task_struct { | 46897 | @@ -1520,6 +1532,20 @@ struct task_struct { |
46613 | unsigned long default_timer_slack_ns; | 46898 | unsigned long default_timer_slack_ns; |
46614 | 46899 | ||
46615 | struct list_head *scm_work_list; | 46900 | struct list_head *scm_work_list; |
46616 | + | 46901 | + |
46617 | +#ifdef CONFIG_GRKERNSEC | 46902 | +#ifdef CONFIG_GRKERNSEC |
46618 | + /* grsecurity */ | 46903 | + /* grsecurity */ |
46619 | + rwlock_t gr_fs_lock; | 46904 | + struct dentry *gr_chroot_dentry; |
46620 | + struct acl_subject_label *acl; | 46905 | + struct acl_subject_label *acl; |
46621 | + struct acl_role_label *role; | 46906 | + struct acl_role_label *role; |
46622 | + struct file *exec_file; | 46907 | + struct file *exec_file; |
@@ -46624,12 +46909,13 @@ diff -urNp linux-2.6.32.15/include/linux/sched.h linux-2.6.32.15/include/linux/s | |||
46624 | + u8 acl_sp_role; | 46909 | + u8 acl_sp_role; |
46625 | + u8 is_writable; | 46910 | + u8 is_writable; |
46626 | + u8 brute; | 46911 | + u8 brute; |
46912 | + u8 gr_is_chrooted; | ||
46627 | +#endif | 46913 | +#endif |
46628 | + | 46914 | + |
46629 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | 46915 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER |
46630 | /* Index of current stored adress in ret_stack */ | 46916 | /* Index of current stored adress in ret_stack */ |
46631 | int curr_ret_stack; | 46917 | int curr_ret_stack; |
46632 | @@ -1543,6 +1568,52 @@ struct task_struct { | 46918 | @@ -1543,6 +1569,52 @@ struct task_struct { |
46633 | #endif /* CONFIG_TRACING */ | 46919 | #endif /* CONFIG_TRACING */ |
46634 | }; | 46920 | }; |
46635 | 46921 | ||
@@ -46682,7 +46968,7 @@ diff -urNp linux-2.6.32.15/include/linux/sched.h linux-2.6.32.15/include/linux/s | |||
46682 | /* Future-safe accessor for struct task_struct's cpus_allowed. */ | 46968 | /* Future-safe accessor for struct task_struct's cpus_allowed. */ |
46683 | #define tsk_cpumask(tsk) (&(tsk)->cpus_allowed) | 46969 | #define tsk_cpumask(tsk) (&(tsk)->cpus_allowed) |
46684 | 46970 | ||
46685 | @@ -2142,7 +2213,7 @@ extern void __cleanup_sighand(struct sig | 46971 | @@ -2142,7 +2214,7 @@ extern void __cleanup_sighand(struct sig |
46686 | extern void exit_itimers(struct signal_struct *); | 46972 | extern void exit_itimers(struct signal_struct *); |
46687 | extern void flush_itimer_signals(void); | 46973 | extern void flush_itimer_signals(void); |
46688 | 46974 | ||
@@ -46691,41 +46977,7 @@ diff -urNp linux-2.6.32.15/include/linux/sched.h linux-2.6.32.15/include/linux/s | |||
46691 | 46977 | ||
46692 | extern void daemonize(const char *, ...); | 46978 | extern void daemonize(const char *, ...); |
46693 | extern int allow_signal(int); | 46979 | extern int allow_signal(int); |
46694 | @@ -2244,6 +2315,33 @@ static inline void task_unlock(struct ta | 46980 | @@ -2255,8 +2327,8 @@ static inline void unlock_task_sighand(s |
46695 | spin_unlock(&p->alloc_lock); | ||
46696 | } | ||
46697 | |||
46698 | +/* grsec: protects only ->fs as task_lock is overkill and we can't | ||
46699 | + be using a spin_lock in interrupt context | ||
46700 | +*/ | ||
46701 | +#ifdef CONFIG_GRKERNSEC | ||
46702 | +#define gr_fs_write_lock_irqsave(x, y) \ | ||
46703 | + write_lock_irqsave(&x->gr_fs_lock, y) | ||
46704 | +#define gr_fs_write_unlock_irqrestore(x, y) \ | ||
46705 | + write_unlock_irqrestore(&x->gr_fs_lock, y) | ||
46706 | +#else | ||
46707 | +#define gr_fs_write_lock_irqsave(x, y) | ||
46708 | +#define gr_fs_write_unlock_irqrestore(x, y) | ||
46709 | +#endif | ||
46710 | + | ||
46711 | +static inline void gr_fs_read_lock(struct task_struct *p) | ||
46712 | +{ | ||
46713 | +#ifdef CONFIG_GRKERNSEC | ||
46714 | + read_lock(&p->gr_fs_lock); | ||
46715 | +#endif | ||
46716 | +} | ||
46717 | + | ||
46718 | +static inline void gr_fs_read_unlock(struct task_struct *p) | ||
46719 | +{ | ||
46720 | +#ifdef CONFIG_GRKERNSEC | ||
46721 | + read_unlock(&p->gr_fs_lock); | ||
46722 | +#endif | ||
46723 | +} | ||
46724 | + | ||
46725 | extern struct sighand_struct *lock_task_sighand(struct task_struct *tsk, | ||
46726 | unsigned long *flags); | ||
46727 | |||
46728 | @@ -2255,8 +2353,8 @@ static inline void unlock_task_sighand(s | ||
46729 | 46981 | ||
46730 | #ifndef __HAVE_THREAD_FUNCTIONS | 46982 | #ifndef __HAVE_THREAD_FUNCTIONS |
46731 | 46983 | ||
@@ -46736,7 +46988,7 @@ diff -urNp linux-2.6.32.15/include/linux/sched.h linux-2.6.32.15/include/linux/s | |||
46736 | 46988 | ||
46737 | static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org) | 46989 | static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org) |
46738 | { | 46990 | { |
46739 | @@ -2271,13 +2369,31 @@ static inline unsigned long *end_of_stac | 46991 | @@ -2271,13 +2343,31 @@ static inline unsigned long *end_of_stac |
46740 | 46992 | ||
46741 | #endif | 46993 | #endif |
46742 | 46994 | ||
@@ -46770,9 +47022,9 @@ diff -urNp linux-2.6.32.15/include/linux/sched.h linux-2.6.32.15/include/linux/s | |||
46770 | extern void thread_info_cache_init(void); | 47022 | extern void thread_info_cache_init(void); |
46771 | 47023 | ||
46772 | #ifdef CONFIG_DEBUG_STACK_USAGE | 47024 | #ifdef CONFIG_DEBUG_STACK_USAGE |
46773 | diff -urNp linux-2.6.32.15/include/linux/screen_info.h linux-2.6.32.15/include/linux/screen_info.h | 47025 | diff -urNp linux-2.6.32.16/include/linux/screen_info.h linux-2.6.32.16/include/linux/screen_info.h |
46774 | --- linux-2.6.32.15/include/linux/screen_info.h 2010-03-15 11:52:04.000000000 -0400 | 47026 | --- linux-2.6.32.16/include/linux/screen_info.h 2010-07-05 14:14:00.000000000 -0400 |
46775 | +++ linux-2.6.32.15/include/linux/screen_info.h 2010-05-28 21:27:16.403248422 -0400 | 47027 | +++ linux-2.6.32.16/include/linux/screen_info.h 2010-07-09 14:50:38.000000000 -0400 |
46776 | @@ -42,7 +42,8 @@ struct screen_info { | 47028 | @@ -42,7 +42,8 @@ struct screen_info { |
46777 | __u16 pages; /* 0x32 */ | 47029 | __u16 pages; /* 0x32 */ |
46778 | __u16 vesa_attributes; /* 0x34 */ | 47030 | __u16 vesa_attributes; /* 0x34 */ |
@@ -46783,9 +47035,9 @@ diff -urNp linux-2.6.32.15/include/linux/screen_info.h linux-2.6.32.15/include/l | |||
46783 | } __attribute__((packed)); | 47035 | } __attribute__((packed)); |
46784 | 47036 | ||
46785 | #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ | 47037 | #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ |
46786 | diff -urNp linux-2.6.32.15/include/linux/security.h linux-2.6.32.15/include/linux/security.h | 47038 | diff -urNp linux-2.6.32.16/include/linux/security.h linux-2.6.32.16/include/linux/security.h |
46787 | --- linux-2.6.32.15/include/linux/security.h 2010-03-15 11:52:04.000000000 -0400 | 47039 | --- linux-2.6.32.16/include/linux/security.h 2010-07-05 14:14:00.000000000 -0400 |
46788 | +++ linux-2.6.32.15/include/linux/security.h 2010-05-28 21:27:16.403248422 -0400 | 47040 | +++ linux-2.6.32.16/include/linux/security.h 2010-07-09 14:50:38.000000000 -0400 |
46789 | @@ -34,6 +34,7 @@ | 47041 | @@ -34,6 +34,7 @@ |
46790 | #include <linux/key.h> | 47042 | #include <linux/key.h> |
46791 | #include <linux/xfrm.h> | 47043 | #include <linux/xfrm.h> |
@@ -46794,9 +47046,9 @@ diff -urNp linux-2.6.32.15/include/linux/security.h linux-2.6.32.15/include/linu | |||
46794 | #include <net/flow.h> | 47046 | #include <net/flow.h> |
46795 | 47047 | ||
46796 | /* Maximum number of letters for an LSM name string */ | 47048 | /* Maximum number of letters for an LSM name string */ |
46797 | diff -urNp linux-2.6.32.15/include/linux/shm.h linux-2.6.32.15/include/linux/shm.h | 47049 | diff -urNp linux-2.6.32.16/include/linux/shm.h linux-2.6.32.16/include/linux/shm.h |
46798 | --- linux-2.6.32.15/include/linux/shm.h 2010-03-15 11:52:04.000000000 -0400 | 47050 | --- linux-2.6.32.16/include/linux/shm.h 2010-07-05 14:14:00.000000000 -0400 |
46799 | +++ linux-2.6.32.15/include/linux/shm.h 2010-05-28 21:27:16.403248422 -0400 | 47051 | +++ linux-2.6.32.16/include/linux/shm.h 2010-07-09 14:50:38.000000000 -0400 |
46800 | @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke | 47052 | @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke |
46801 | pid_t shm_cprid; | 47053 | pid_t shm_cprid; |
46802 | pid_t shm_lprid; | 47054 | pid_t shm_lprid; |
@@ -46808,9 +47060,9 @@ diff -urNp linux-2.6.32.15/include/linux/shm.h linux-2.6.32.15/include/linux/shm | |||
46808 | }; | 47060 | }; |
46809 | 47061 | ||
46810 | /* shm_mode upper byte flags */ | 47062 | /* shm_mode upper byte flags */ |
46811 | diff -urNp linux-2.6.32.15/include/linux/slab.h linux-2.6.32.15/include/linux/slab.h | 47063 | diff -urNp linux-2.6.32.16/include/linux/slab.h linux-2.6.32.16/include/linux/slab.h |
46812 | --- linux-2.6.32.15/include/linux/slab.h 2010-03-15 11:52:04.000000000 -0400 | 47064 | --- linux-2.6.32.16/include/linux/slab.h 2010-07-05 14:14:00.000000000 -0400 |
46813 | +++ linux-2.6.32.15/include/linux/slab.h 2010-05-28 21:27:16.407250185 -0400 | 47065 | +++ linux-2.6.32.16/include/linux/slab.h 2010-07-09 14:50:38.000000000 -0400 |
46814 | @@ -11,6 +11,7 @@ | 47066 | @@ -11,6 +11,7 @@ |
46815 | 47067 | ||
46816 | #include <linux/gfp.h> | 47068 | #include <linux/gfp.h> |
@@ -46882,9 +47134,9 @@ diff -urNp linux-2.6.32.15/include/linux/slab.h linux-2.6.32.15/include/linux/sl | |||
46882 | +}) | 47134 | +}) |
46883 | + | 47135 | + |
46884 | #endif /* _LINUX_SLAB_H */ | 47136 | #endif /* _LINUX_SLAB_H */ |
46885 | diff -urNp linux-2.6.32.15/include/linux/slub_def.h linux-2.6.32.15/include/linux/slub_def.h | 47137 | diff -urNp linux-2.6.32.16/include/linux/slub_def.h linux-2.6.32.16/include/linux/slub_def.h |
46886 | --- linux-2.6.32.15/include/linux/slub_def.h 2010-03-15 11:52:04.000000000 -0400 | 47138 | --- linux-2.6.32.16/include/linux/slub_def.h 2010-07-05 14:14:00.000000000 -0400 |
46887 | +++ linux-2.6.32.15/include/linux/slub_def.h 2010-05-28 21:27:16.407250185 -0400 | 47139 | +++ linux-2.6.32.16/include/linux/slub_def.h 2010-07-09 14:50:38.000000000 -0400 |
46888 | @@ -86,7 +86,7 @@ struct kmem_cache { | 47140 | @@ -86,7 +86,7 @@ struct kmem_cache { |
46889 | struct kmem_cache_order_objects max; | 47141 | struct kmem_cache_order_objects max; |
46890 | struct kmem_cache_order_objects min; | 47142 | struct kmem_cache_order_objects min; |
@@ -46894,9 +47146,9 @@ diff -urNp linux-2.6.32.15/include/linux/slub_def.h linux-2.6.32.15/include/linu | |||
46894 | void (*ctor)(void *); | 47146 | void (*ctor)(void *); |
46895 | int inuse; /* Offset to metadata */ | 47147 | int inuse; /* Offset to metadata */ |
46896 | int align; /* Alignment */ | 47148 | int align; /* Alignment */ |
46897 | diff -urNp linux-2.6.32.15/include/linux/sonet.h linux-2.6.32.15/include/linux/sonet.h | 47149 | diff -urNp linux-2.6.32.16/include/linux/sonet.h linux-2.6.32.16/include/linux/sonet.h |
46898 | --- linux-2.6.32.15/include/linux/sonet.h 2010-03-15 11:52:04.000000000 -0400 | 47150 | --- linux-2.6.32.16/include/linux/sonet.h 2010-07-05 14:14:00.000000000 -0400 |
46899 | +++ linux-2.6.32.15/include/linux/sonet.h 2010-05-28 21:27:16.407250185 -0400 | 47151 | +++ linux-2.6.32.16/include/linux/sonet.h 2010-07-09 14:50:38.000000000 -0400 |
46900 | @@ -61,7 +61,7 @@ struct sonet_stats { | 47152 | @@ -61,7 +61,7 @@ struct sonet_stats { |
46901 | #include <asm/atomic.h> | 47153 | #include <asm/atomic.h> |
46902 | 47154 | ||
@@ -46906,9 +47158,9 @@ diff -urNp linux-2.6.32.15/include/linux/sonet.h linux-2.6.32.15/include/linux/s | |||
46906 | __SONET_ITEMS | 47158 | __SONET_ITEMS |
46907 | #undef __HANDLE_ITEM | 47159 | #undef __HANDLE_ITEM |
46908 | }; | 47160 | }; |
46909 | diff -urNp linux-2.6.32.15/include/linux/suspend.h linux-2.6.32.15/include/linux/suspend.h | 47161 | diff -urNp linux-2.6.32.16/include/linux/suspend.h linux-2.6.32.16/include/linux/suspend.h |
46910 | --- linux-2.6.32.15/include/linux/suspend.h 2010-03-15 11:52:04.000000000 -0400 | 47162 | --- linux-2.6.32.16/include/linux/suspend.h 2010-07-05 14:14:00.000000000 -0400 |
46911 | +++ linux-2.6.32.15/include/linux/suspend.h 2010-05-28 21:27:16.407250185 -0400 | 47163 | +++ linux-2.6.32.16/include/linux/suspend.h 2010-07-09 14:50:38.000000000 -0400 |
46912 | @@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t; | 47164 | @@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t; |
46913 | * which require special recovery actions in that situation. | 47165 | * which require special recovery actions in that situation. |
46914 | */ | 47166 | */ |
@@ -46997,9 +47249,9 @@ diff -urNp linux-2.6.32.15/include/linux/suspend.h linux-2.6.32.15/include/linux | |||
46997 | static inline int hibernate(void) { return -ENOSYS; } | 47249 | static inline int hibernate(void) { return -ENOSYS; } |
46998 | static inline bool system_entering_hibernation(void) { return false; } | 47250 | static inline bool system_entering_hibernation(void) { return false; } |
46999 | #endif /* CONFIG_HIBERNATION */ | 47251 | #endif /* CONFIG_HIBERNATION */ |
47000 | diff -urNp linux-2.6.32.15/include/linux/sysctl.h linux-2.6.32.15/include/linux/sysctl.h | 47252 | diff -urNp linux-2.6.32.16/include/linux/sysctl.h linux-2.6.32.16/include/linux/sysctl.h |
47001 | --- linux-2.6.32.15/include/linux/sysctl.h 2010-03-15 11:52:04.000000000 -0400 | 47253 | --- linux-2.6.32.16/include/linux/sysctl.h 2010-07-05 14:14:00.000000000 -0400 |
47002 | +++ linux-2.6.32.15/include/linux/sysctl.h 2010-05-28 21:27:16.423734148 -0400 | 47254 | +++ linux-2.6.32.16/include/linux/sysctl.h 2010-07-09 14:50:38.000000000 -0400 |
47003 | @@ -164,7 +164,11 @@ enum | 47255 | @@ -164,7 +164,11 @@ enum |
47004 | KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ | 47256 | KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ |
47005 | }; | 47257 | }; |
@@ -47013,9 +47265,9 @@ diff -urNp linux-2.6.32.15/include/linux/sysctl.h linux-2.6.32.15/include/linux/ | |||
47013 | 47265 | ||
47014 | /* CTL_VM names: */ | 47266 | /* CTL_VM names: */ |
47015 | enum | 47267 | enum |
47016 | diff -urNp linux-2.6.32.15/include/linux/sysfs.h linux-2.6.32.15/include/linux/sysfs.h | 47268 | diff -urNp linux-2.6.32.16/include/linux/sysfs.h linux-2.6.32.16/include/linux/sysfs.h |
47017 | --- linux-2.6.32.15/include/linux/sysfs.h 2010-03-15 11:52:04.000000000 -0400 | 47269 | --- linux-2.6.32.16/include/linux/sysfs.h 2010-07-05 14:14:00.000000000 -0400 |
47018 | +++ linux-2.6.32.15/include/linux/sysfs.h 2010-05-28 21:27:16.423734148 -0400 | 47270 | +++ linux-2.6.32.16/include/linux/sysfs.h 2010-07-09 14:50:38.000000000 -0400 |
47019 | @@ -75,8 +75,8 @@ struct bin_attribute { | 47271 | @@ -75,8 +75,8 @@ struct bin_attribute { |
47020 | }; | 47272 | }; |
47021 | 47273 | ||
@@ -47027,9 +47279,9 @@ diff -urNp linux-2.6.32.15/include/linux/sysfs.h linux-2.6.32.15/include/linux/s | |||
47027 | }; | 47279 | }; |
47028 | 47280 | ||
47029 | struct sysfs_dirent; | 47281 | struct sysfs_dirent; |
47030 | diff -urNp linux-2.6.32.15/include/linux/thread_info.h linux-2.6.32.15/include/linux/thread_info.h | 47282 | diff -urNp linux-2.6.32.16/include/linux/thread_info.h linux-2.6.32.16/include/linux/thread_info.h |
47031 | --- linux-2.6.32.15/include/linux/thread_info.h 2010-03-15 11:52:04.000000000 -0400 | 47283 | --- linux-2.6.32.16/include/linux/thread_info.h 2010-07-05 14:14:00.000000000 -0400 |
47032 | +++ linux-2.6.32.15/include/linux/thread_info.h 2010-05-28 21:27:16.423734148 -0400 | 47284 | +++ linux-2.6.32.16/include/linux/thread_info.h 2010-07-09 14:50:38.000000000 -0400 |
47033 | @@ -23,7 +23,7 @@ struct restart_block { | 47285 | @@ -23,7 +23,7 @@ struct restart_block { |
47034 | }; | 47286 | }; |
47035 | /* For futex_wait and futex_wait_requeue_pi */ | 47287 | /* For futex_wait and futex_wait_requeue_pi */ |
@@ -47039,9 +47291,9 @@ diff -urNp linux-2.6.32.15/include/linux/thread_info.h linux-2.6.32.15/include/l | |||
47039 | u32 val; | 47291 | u32 val; |
47040 | u32 flags; | 47292 | u32 flags; |
47041 | u32 bitset; | 47293 | u32 bitset; |
47042 | diff -urNp linux-2.6.32.15/include/linux/tty.h linux-2.6.32.15/include/linux/tty.h | 47294 | diff -urNp linux-2.6.32.16/include/linux/tty.h linux-2.6.32.16/include/linux/tty.h |
47043 | --- linux-2.6.32.15/include/linux/tty.h 2010-04-04 20:41:50.060586306 -0400 | 47295 | --- linux-2.6.32.16/include/linux/tty.h 2010-07-05 14:14:00.000000000 -0400 |
47044 | +++ linux-2.6.32.15/include/linux/tty.h 2010-05-28 21:27:16.423734148 -0400 | 47296 | +++ linux-2.6.32.16/include/linux/tty.h 2010-07-09 14:50:38.000000000 -0400 |
47045 | @@ -13,6 +13,7 @@ | 47297 | @@ -13,6 +13,7 @@ |
47046 | #include <linux/tty_driver.h> | 47298 | #include <linux/tty_driver.h> |
47047 | #include <linux/tty_ldisc.h> | 47299 | #include <linux/tty_ldisc.h> |
@@ -47077,9 +47329,9 @@ diff -urNp linux-2.6.32.15/include/linux/tty.h linux-2.6.32.15/include/linux/tty | |||
47077 | 47329 | ||
47078 | /* n_tty.c */ | 47330 | /* n_tty.c */ |
47079 | extern struct tty_ldisc_ops tty_ldisc_N_TTY; | 47331 | extern struct tty_ldisc_ops tty_ldisc_N_TTY; |
47080 | diff -urNp linux-2.6.32.15/include/linux/tty_ldisc.h linux-2.6.32.15/include/linux/tty_ldisc.h | 47332 | diff -urNp linux-2.6.32.16/include/linux/tty_ldisc.h linux-2.6.32.16/include/linux/tty_ldisc.h |
47081 | --- linux-2.6.32.15/include/linux/tty_ldisc.h 2010-03-15 11:52:04.000000000 -0400 | 47333 | --- linux-2.6.32.16/include/linux/tty_ldisc.h 2010-07-05 14:14:00.000000000 -0400 |
47082 | +++ linux-2.6.32.15/include/linux/tty_ldisc.h 2010-05-28 21:27:16.423734148 -0400 | 47334 | +++ linux-2.6.32.16/include/linux/tty_ldisc.h 2010-07-09 14:50:38.000000000 -0400 |
47083 | @@ -139,7 +139,7 @@ struct tty_ldisc_ops { | 47335 | @@ -139,7 +139,7 @@ struct tty_ldisc_ops { |
47084 | 47336 | ||
47085 | struct module *owner; | 47337 | struct module *owner; |
@@ -47089,9 +47341,9 @@ diff -urNp linux-2.6.32.15/include/linux/tty_ldisc.h linux-2.6.32.15/include/lin | |||
47089 | }; | 47341 | }; |
47090 | 47342 | ||
47091 | struct tty_ldisc { | 47343 | struct tty_ldisc { |
47092 | diff -urNp linux-2.6.32.15/include/linux/types.h linux-2.6.32.15/include/linux/types.h | 47344 | diff -urNp linux-2.6.32.16/include/linux/types.h linux-2.6.32.16/include/linux/types.h |
47093 | --- linux-2.6.32.15/include/linux/types.h 2010-03-15 11:52:04.000000000 -0400 | 47345 | --- linux-2.6.32.16/include/linux/types.h 2010-07-05 14:14:00.000000000 -0400 |
47094 | +++ linux-2.6.32.15/include/linux/types.h 2010-05-28 21:27:16.427051097 -0400 | 47346 | +++ linux-2.6.32.16/include/linux/types.h 2010-07-09 14:50:38.000000000 -0400 |
47095 | @@ -191,10 +191,26 @@ typedef struct { | 47347 | @@ -191,10 +191,26 @@ typedef struct { |
47096 | volatile int counter; | 47348 | volatile int counter; |
47097 | } atomic_t; | 47349 | } atomic_t; |
@@ -47119,9 +47371,9 @@ diff -urNp linux-2.6.32.15/include/linux/types.h linux-2.6.32.15/include/linux/t | |||
47119 | #endif | 47371 | #endif |
47120 | 47372 | ||
47121 | struct ustat { | 47373 | struct ustat { |
47122 | diff -urNp linux-2.6.32.15/include/linux/uaccess.h linux-2.6.32.15/include/linux/uaccess.h | 47374 | diff -urNp linux-2.6.32.16/include/linux/uaccess.h linux-2.6.32.16/include/linux/uaccess.h |
47123 | --- linux-2.6.32.15/include/linux/uaccess.h 2010-03-15 11:52:04.000000000 -0400 | 47375 | --- linux-2.6.32.16/include/linux/uaccess.h 2010-07-05 14:14:00.000000000 -0400 |
47124 | +++ linux-2.6.32.15/include/linux/uaccess.h 2010-05-28 21:27:16.427051097 -0400 | 47376 | +++ linux-2.6.32.16/include/linux/uaccess.h 2010-07-09 14:50:38.000000000 -0400 |
47125 | @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ | 47377 | @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ |
47126 | long ret; \ | 47378 | long ret; \ |
47127 | mm_segment_t old_fs = get_fs(); \ | 47379 | mm_segment_t old_fs = get_fs(); \ |
@@ -47153,9 +47405,9 @@ diff -urNp linux-2.6.32.15/include/linux/uaccess.h linux-2.6.32.15/include/linux | |||
47153 | +extern long probe_kernel_write(void *dst, const void *src, size_t size); | 47405 | +extern long probe_kernel_write(void *dst, const void *src, size_t size); |
47154 | 47406 | ||
47155 | #endif /* __LINUX_UACCESS_H__ */ | 47407 | #endif /* __LINUX_UACCESS_H__ */ |
47156 | diff -urNp linux-2.6.32.15/include/linux/vmalloc.h linux-2.6.32.15/include/linux/vmalloc.h | 47408 | diff -urNp linux-2.6.32.16/include/linux/vmalloc.h linux-2.6.32.16/include/linux/vmalloc.h |
47157 | --- linux-2.6.32.15/include/linux/vmalloc.h 2010-03-15 11:52:04.000000000 -0400 | 47409 | --- linux-2.6.32.16/include/linux/vmalloc.h 2010-07-05 14:14:00.000000000 -0400 |
47158 | +++ linux-2.6.32.15/include/linux/vmalloc.h 2010-05-28 21:27:16.427051097 -0400 | 47410 | +++ linux-2.6.32.16/include/linux/vmalloc.h 2010-07-09 14:50:38.000000000 -0400 |
47159 | @@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining | 47411 | @@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining |
47160 | #define VM_MAP 0x00000004 /* vmap()ed pages */ | 47412 | #define VM_MAP 0x00000004 /* vmap()ed pages */ |
47161 | #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ | 47413 | #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ |
@@ -47250,9 +47502,9 @@ diff -urNp linux-2.6.32.15/include/linux/vmalloc.h linux-2.6.32.15/include/linux | |||
47250 | +}) | 47502 | +}) |
47251 | + | 47503 | + |
47252 | #endif /* _LINUX_VMALLOC_H */ | 47504 | #endif /* _LINUX_VMALLOC_H */ |
47253 | diff -urNp linux-2.6.32.15/include/net/irda/ircomm_tty.h linux-2.6.32.15/include/net/irda/ircomm_tty.h | 47505 | diff -urNp linux-2.6.32.16/include/net/irda/ircomm_tty.h linux-2.6.32.16/include/net/irda/ircomm_tty.h |
47254 | --- linux-2.6.32.15/include/net/irda/ircomm_tty.h 2010-03-15 11:52:04.000000000 -0400 | 47506 | --- linux-2.6.32.16/include/net/irda/ircomm_tty.h 2010-07-05 14:14:00.000000000 -0400 |
47255 | +++ linux-2.6.32.15/include/net/irda/ircomm_tty.h 2010-05-28 21:27:16.427051097 -0400 | 47507 | +++ linux-2.6.32.16/include/net/irda/ircomm_tty.h 2010-07-09 14:50:38.000000000 -0400 |
47256 | @@ -105,8 +105,8 @@ struct ircomm_tty_cb { | 47508 | @@ -105,8 +105,8 @@ struct ircomm_tty_cb { |
47257 | unsigned short close_delay; | 47509 | unsigned short close_delay; |
47258 | unsigned short closing_wait; /* time to wait before closing */ | 47510 | unsigned short closing_wait; /* time to wait before closing */ |
@@ -47264,9 +47516,9 @@ diff -urNp linux-2.6.32.15/include/net/irda/ircomm_tty.h linux-2.6.32.15/include | |||
47264 | 47516 | ||
47265 | /* Protect concurent access to : | 47517 | /* Protect concurent access to : |
47266 | * o self->open_count | 47518 | * o self->open_count |
47267 | diff -urNp linux-2.6.32.15/include/net/neighbour.h linux-2.6.32.15/include/net/neighbour.h | 47519 | diff -urNp linux-2.6.32.16/include/net/neighbour.h linux-2.6.32.16/include/net/neighbour.h |
47268 | --- linux-2.6.32.15/include/net/neighbour.h 2010-03-15 11:52:04.000000000 -0400 | 47520 | --- linux-2.6.32.16/include/net/neighbour.h 2010-07-05 14:14:00.000000000 -0400 |
47269 | +++ linux-2.6.32.15/include/net/neighbour.h 2010-05-28 21:27:16.427051097 -0400 | 47521 | +++ linux-2.6.32.16/include/net/neighbour.h 2010-07-09 14:50:38.000000000 -0400 |
47270 | @@ -125,12 +125,12 @@ struct neighbour | 47522 | @@ -125,12 +125,12 @@ struct neighbour |
47271 | struct neigh_ops | 47523 | struct neigh_ops |
47272 | { | 47524 | { |
@@ -47286,9 +47538,9 @@ diff -urNp linux-2.6.32.15/include/net/neighbour.h linux-2.6.32.15/include/net/n | |||
47286 | }; | 47538 | }; |
47287 | 47539 | ||
47288 | struct pneigh_entry | 47540 | struct pneigh_entry |
47289 | diff -urNp linux-2.6.32.15/include/net/sctp/sctp.h linux-2.6.32.15/include/net/sctp/sctp.h | 47541 | diff -urNp linux-2.6.32.16/include/net/sctp/sctp.h linux-2.6.32.16/include/net/sctp/sctp.h |
47290 | --- linux-2.6.32.15/include/net/sctp/sctp.h 2010-03-15 11:52:04.000000000 -0400 | 47542 | --- linux-2.6.32.16/include/net/sctp/sctp.h 2010-07-05 14:14:00.000000000 -0400 |
47291 | +++ linux-2.6.32.15/include/net/sctp/sctp.h 2010-05-28 21:27:16.427051097 -0400 | 47543 | +++ linux-2.6.32.16/include/net/sctp/sctp.h 2010-07-09 14:50:38.000000000 -0400 |
47292 | @@ -305,8 +305,8 @@ extern int sctp_debug_flag; | 47544 | @@ -305,8 +305,8 @@ extern int sctp_debug_flag; |
47293 | 47545 | ||
47294 | #else /* SCTP_DEBUG */ | 47546 | #else /* SCTP_DEBUG */ |
@@ -47300,9 +47552,9 @@ diff -urNp linux-2.6.32.15/include/net/sctp/sctp.h linux-2.6.32.15/include/net/s | |||
47300 | #define SCTP_ENABLE_DEBUG | 47552 | #define SCTP_ENABLE_DEBUG |
47301 | #define SCTP_DISABLE_DEBUG | 47553 | #define SCTP_DISABLE_DEBUG |
47302 | #define SCTP_ASSERT(expr, str, func) | 47554 | #define SCTP_ASSERT(expr, str, func) |
47303 | diff -urNp linux-2.6.32.15/include/net/tcp.h linux-2.6.32.15/include/net/tcp.h | 47555 | diff -urNp linux-2.6.32.16/include/net/tcp.h linux-2.6.32.16/include/net/tcp.h |
47304 | --- linux-2.6.32.15/include/net/tcp.h 2010-03-15 11:52:04.000000000 -0400 | 47556 | --- linux-2.6.32.16/include/net/tcp.h 2010-07-05 14:14:00.000000000 -0400 |
47305 | +++ linux-2.6.32.15/include/net/tcp.h 2010-05-28 21:27:16.427051097 -0400 | 47557 | +++ linux-2.6.32.16/include/net/tcp.h 2010-07-09 14:50:38.000000000 -0400 |
47306 | @@ -1420,6 +1420,7 @@ enum tcp_seq_states { | 47558 | @@ -1420,6 +1420,7 @@ enum tcp_seq_states { |
47307 | struct tcp_seq_afinfo { | 47559 | struct tcp_seq_afinfo { |
47308 | char *name; | 47560 | char *name; |
@@ -47311,9 +47563,9 @@ diff -urNp linux-2.6.32.15/include/net/tcp.h linux-2.6.32.15/include/net/tcp.h | |||
47311 | struct file_operations seq_fops; | 47563 | struct file_operations seq_fops; |
47312 | struct seq_operations seq_ops; | 47564 | struct seq_operations seq_ops; |
47313 | }; | 47565 | }; |
47314 | diff -urNp linux-2.6.32.15/include/net/udp.h linux-2.6.32.15/include/net/udp.h | 47566 | diff -urNp linux-2.6.32.16/include/net/udp.h linux-2.6.32.16/include/net/udp.h |
47315 | --- linux-2.6.32.15/include/net/udp.h 2010-03-15 11:52:04.000000000 -0400 | 47567 | --- linux-2.6.32.16/include/net/udp.h 2010-07-05 14:14:00.000000000 -0400 |
47316 | +++ linux-2.6.32.15/include/net/udp.h 2010-05-28 21:27:16.427051097 -0400 | 47568 | +++ linux-2.6.32.16/include/net/udp.h 2010-07-09 14:50:38.000000000 -0400 |
47317 | @@ -187,6 +187,7 @@ struct udp_seq_afinfo { | 47569 | @@ -187,6 +187,7 @@ struct udp_seq_afinfo { |
47318 | char *name; | 47570 | char *name; |
47319 | sa_family_t family; | 47571 | sa_family_t family; |
@@ -47322,9 +47574,9 @@ diff -urNp linux-2.6.32.15/include/net/udp.h linux-2.6.32.15/include/net/udp.h | |||
47322 | struct file_operations seq_fops; | 47574 | struct file_operations seq_fops; |
47323 | struct seq_operations seq_ops; | 47575 | struct seq_operations seq_ops; |
47324 | }; | 47576 | }; |
47325 | diff -urNp linux-2.6.32.15/include/sound/ac97_codec.h linux-2.6.32.15/include/sound/ac97_codec.h | 47577 | diff -urNp linux-2.6.32.16/include/sound/ac97_codec.h linux-2.6.32.16/include/sound/ac97_codec.h |
47326 | --- linux-2.6.32.15/include/sound/ac97_codec.h 2010-03-15 11:52:04.000000000 -0400 | 47578 | --- linux-2.6.32.16/include/sound/ac97_codec.h 2010-07-05 14:14:00.000000000 -0400 |
47327 | +++ linux-2.6.32.15/include/sound/ac97_codec.h 2010-05-28 21:27:16.427051097 -0400 | 47579 | +++ linux-2.6.32.16/include/sound/ac97_codec.h 2010-07-09 14:50:38.000000000 -0400 |
47328 | @@ -419,15 +419,15 @@ | 47580 | @@ -419,15 +419,15 @@ |
47329 | struct snd_ac97; | 47581 | struct snd_ac97; |
47330 | 47582 | ||
@@ -47357,9 +47609,9 @@ diff -urNp linux-2.6.32.15/include/sound/ac97_codec.h linux-2.6.32.15/include/so | |||
47357 | void *private_data; | 47609 | void *private_data; |
47358 | void (*private_free) (struct snd_ac97 *ac97); | 47610 | void (*private_free) (struct snd_ac97 *ac97); |
47359 | /* --- */ | 47611 | /* --- */ |
47360 | diff -urNp linux-2.6.32.15/include/trace/events/irq.h linux-2.6.32.15/include/trace/events/irq.h | 47612 | diff -urNp linux-2.6.32.16/include/trace/events/irq.h linux-2.6.32.16/include/trace/events/irq.h |
47361 | --- linux-2.6.32.15/include/trace/events/irq.h 2010-03-15 11:52:04.000000000 -0400 | 47613 | --- linux-2.6.32.16/include/trace/events/irq.h 2010-07-05 14:14:00.000000000 -0400 |
47362 | +++ linux-2.6.32.15/include/trace/events/irq.h 2010-05-28 21:27:16.427051097 -0400 | 47614 | +++ linux-2.6.32.16/include/trace/events/irq.h 2010-07-09 14:50:38.000000000 -0400 |
47363 | @@ -34,7 +34,7 @@ | 47615 | @@ -34,7 +34,7 @@ |
47364 | */ | 47616 | */ |
47365 | TRACE_EVENT(irq_handler_entry, | 47617 | TRACE_EVENT(irq_handler_entry, |
@@ -47396,9 +47648,9 @@ diff -urNp linux-2.6.32.15/include/trace/events/irq.h linux-2.6.32.15/include/tr | |||
47396 | 47648 | ||
47397 | TP_ARGS(h, vec), | 47649 | TP_ARGS(h, vec), |
47398 | 47650 | ||
47399 | diff -urNp linux-2.6.32.15/include/video/uvesafb.h linux-2.6.32.15/include/video/uvesafb.h | 47651 | diff -urNp linux-2.6.32.16/include/video/uvesafb.h linux-2.6.32.16/include/video/uvesafb.h |
47400 | --- linux-2.6.32.15/include/video/uvesafb.h 2010-03-15 11:52:04.000000000 -0400 | 47652 | --- linux-2.6.32.16/include/video/uvesafb.h 2010-07-05 14:14:00.000000000 -0400 |
47401 | +++ linux-2.6.32.15/include/video/uvesafb.h 2010-05-28 21:27:16.427051097 -0400 | 47653 | +++ linux-2.6.32.16/include/video/uvesafb.h 2010-07-09 14:50:38.000000000 -0400 |
47402 | @@ -177,6 +177,7 @@ struct uvesafb_par { | 47654 | @@ -177,6 +177,7 @@ struct uvesafb_par { |
47403 | u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ | 47655 | u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ |
47404 | u8 pmi_setpal; /* PMI for palette changes */ | 47656 | u8 pmi_setpal; /* PMI for palette changes */ |
@@ -47407,9 +47659,9 @@ diff -urNp linux-2.6.32.15/include/video/uvesafb.h linux-2.6.32.15/include/video | |||
47407 | void *pmi_start; | 47659 | void *pmi_start; |
47408 | void *pmi_pal; | 47660 | void *pmi_pal; |
47409 | u8 *vbe_state_orig; /* | 47661 | u8 *vbe_state_orig; /* |
47410 | diff -urNp linux-2.6.32.15/init/do_mounts.c linux-2.6.32.15/init/do_mounts.c | 47662 | diff -urNp linux-2.6.32.16/init/do_mounts.c linux-2.6.32.16/init/do_mounts.c |
47411 | --- linux-2.6.32.15/init/do_mounts.c 2010-03-15 11:52:04.000000000 -0400 | 47663 | --- linux-2.6.32.16/init/do_mounts.c 2010-07-05 14:14:00.000000000 -0400 |
47412 | +++ linux-2.6.32.15/init/do_mounts.c 2010-05-28 21:27:16.427051097 -0400 | 47664 | +++ linux-2.6.32.16/init/do_mounts.c 2010-07-09 14:50:38.000000000 -0400 |
47413 | @@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa | 47665 | @@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa |
47414 | 47666 | ||
47415 | static int __init do_mount_root(char *name, char *fs, int flags, void *data) | 47667 | static int __init do_mount_root(char *name, char *fs, int flags, void *data) |
@@ -47455,9 +47707,9 @@ diff -urNp linux-2.6.32.15/init/do_mounts.c linux-2.6.32.15/init/do_mounts.c | |||
47455 | + sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL); | 47707 | + sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL); |
47456 | + sys_chroot((__force char __user *)"."); | 47708 | + sys_chroot((__force char __user *)"."); |
47457 | } | 47709 | } |
47458 | diff -urNp linux-2.6.32.15/init/do_mounts.h linux-2.6.32.15/init/do_mounts.h | 47710 | diff -urNp linux-2.6.32.16/init/do_mounts.h linux-2.6.32.16/init/do_mounts.h |
47459 | --- linux-2.6.32.15/init/do_mounts.h 2010-03-15 11:52:04.000000000 -0400 | 47711 | --- linux-2.6.32.16/init/do_mounts.h 2010-07-05 14:14:00.000000000 -0400 |
47460 | +++ linux-2.6.32.15/init/do_mounts.h 2010-05-28 21:27:16.427051097 -0400 | 47712 | +++ linux-2.6.32.16/init/do_mounts.h 2010-07-09 14:50:38.000000000 -0400 |
47461 | @@ -15,15 +15,15 @@ extern int root_mountflags; | 47713 | @@ -15,15 +15,15 @@ extern int root_mountflags; |
47462 | 47714 | ||
47463 | static inline int create_dev(char *name, dev_t dev) | 47715 | static inline int create_dev(char *name, dev_t dev) |
@@ -47477,9 +47729,9 @@ diff -urNp linux-2.6.32.15/init/do_mounts.h linux-2.6.32.15/init/do_mounts.h | |||
47477 | return 0; | 47729 | return 0; |
47478 | if (!S_ISBLK(stat.st_mode)) | 47730 | if (!S_ISBLK(stat.st_mode)) |
47479 | return 0; | 47731 | return 0; |
47480 | diff -urNp linux-2.6.32.15/init/do_mounts_initrd.c linux-2.6.32.15/init/do_mounts_initrd.c | 47732 | diff -urNp linux-2.6.32.16/init/do_mounts_initrd.c linux-2.6.32.16/init/do_mounts_initrd.c |
47481 | --- linux-2.6.32.15/init/do_mounts_initrd.c 2010-03-15 11:52:04.000000000 -0400 | 47733 | --- linux-2.6.32.16/init/do_mounts_initrd.c 2010-07-05 14:14:00.000000000 -0400 |
47482 | +++ linux-2.6.32.15/init/do_mounts_initrd.c 2010-05-28 21:27:16.427051097 -0400 | 47734 | +++ linux-2.6.32.16/init/do_mounts_initrd.c 2010-07-09 14:50:38.000000000 -0400 |
47483 | @@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel | 47735 | @@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel |
47484 | sys_close(old_fd);sys_close(root_fd); | 47736 | sys_close(old_fd);sys_close(root_fd); |
47485 | sys_close(0);sys_close(1);sys_close(2); | 47737 | sys_close(0);sys_close(1);sys_close(2); |
@@ -47563,9 +47815,9 @@ diff -urNp linux-2.6.32.15/init/do_mounts_initrd.c linux-2.6.32.15/init/do_mount | |||
47563 | + sys_unlink((__force const char __user *)"/initrd.image"); | 47815 | + sys_unlink((__force const char __user *)"/initrd.image"); |
47564 | return 0; | 47816 | return 0; |
47565 | } | 47817 | } |
47566 | diff -urNp linux-2.6.32.15/init/do_mounts_md.c linux-2.6.32.15/init/do_mounts_md.c | 47818 | diff -urNp linux-2.6.32.16/init/do_mounts_md.c linux-2.6.32.16/init/do_mounts_md.c |
47567 | --- linux-2.6.32.15/init/do_mounts_md.c 2010-03-15 11:52:04.000000000 -0400 | 47819 | --- linux-2.6.32.16/init/do_mounts_md.c 2010-07-05 14:14:00.000000000 -0400 |
47568 | +++ linux-2.6.32.15/init/do_mounts_md.c 2010-05-28 21:27:16.427051097 -0400 | 47820 | +++ linux-2.6.32.16/init/do_mounts_md.c 2010-07-09 14:50:38.000000000 -0400 |
47569 | @@ -170,7 +170,7 @@ static void __init md_setup_drive(void) | 47821 | @@ -170,7 +170,7 @@ static void __init md_setup_drive(void) |
47570 | partitioned ? "_d" : "", minor, | 47822 | partitioned ? "_d" : "", minor, |
47571 | md_setup_args[ent].device_names); | 47823 | md_setup_args[ent].device_names); |
@@ -47593,9 +47845,9 @@ diff -urNp linux-2.6.32.15/init/do_mounts_md.c linux-2.6.32.15/init/do_mounts_md | |||
47593 | if (fd >= 0) { | 47845 | if (fd >= 0) { |
47594 | sys_ioctl(fd, RAID_AUTORUN, raid_autopart); | 47846 | sys_ioctl(fd, RAID_AUTORUN, raid_autopart); |
47595 | sys_close(fd); | 47847 | sys_close(fd); |
47596 | diff -urNp linux-2.6.32.15/init/initramfs.c linux-2.6.32.15/init/initramfs.c | 47848 | diff -urNp linux-2.6.32.16/init/initramfs.c linux-2.6.32.16/init/initramfs.c |
47597 | --- linux-2.6.32.15/init/initramfs.c 2010-05-15 13:20:19.362999772 -0400 | 47849 | --- linux-2.6.32.16/init/initramfs.c 2010-07-05 14:14:00.000000000 -0400 |
47598 | +++ linux-2.6.32.15/init/initramfs.c 2010-05-28 21:27:16.427051097 -0400 | 47850 | +++ linux-2.6.32.16/init/initramfs.c 2010-07-09 14:50:38.000000000 -0400 |
47599 | @@ -74,7 +74,7 @@ static void __init free_hash(void) | 47851 | @@ -74,7 +74,7 @@ static void __init free_hash(void) |
47600 | } | 47852 | } |
47601 | } | 47853 | } |
@@ -47704,9 +47956,9 @@ diff -urNp linux-2.6.32.15/init/initramfs.c linux-2.6.32.15/init/initramfs.c | |||
47704 | state = SkipIt; | 47956 | state = SkipIt; |
47705 | next_state = Reset; | 47957 | next_state = Reset; |
47706 | return 0; | 47958 | return 0; |
47707 | diff -urNp linux-2.6.32.15/init/Kconfig linux-2.6.32.15/init/Kconfig | 47959 | diff -urNp linux-2.6.32.16/init/Kconfig linux-2.6.32.16/init/Kconfig |
47708 | --- linux-2.6.32.15/init/Kconfig 2010-03-15 11:52:04.000000000 -0400 | 47960 | --- linux-2.6.32.16/init/Kconfig 2010-07-05 14:14:00.000000000 -0400 |
47709 | +++ linux-2.6.32.15/init/Kconfig 2010-05-29 16:35:52.581909467 -0400 | 47961 | +++ linux-2.6.32.16/init/Kconfig 2010-07-09 14:50:38.000000000 -0400 |
47710 | @@ -1026,7 +1026,7 @@ config SLUB_DEBUG | 47962 | @@ -1026,7 +1026,7 @@ config SLUB_DEBUG |
47711 | 47963 | ||
47712 | config COMPAT_BRK | 47964 | config COMPAT_BRK |
@@ -47716,9 +47968,9 @@ diff -urNp linux-2.6.32.15/init/Kconfig linux-2.6.32.15/init/Kconfig | |||
47716 | help | 47968 | help |
47717 | Randomizing heap placement makes heap exploits harder, but it | 47969 | Randomizing heap placement makes heap exploits harder, but it |
47718 | also breaks ancient binaries (including anything libc5 based). | 47970 | also breaks ancient binaries (including anything libc5 based). |
47719 | diff -urNp linux-2.6.32.15/init/main.c linux-2.6.32.15/init/main.c | 47971 | diff -urNp linux-2.6.32.16/init/main.c linux-2.6.32.16/init/main.c |
47720 | --- linux-2.6.32.15/init/main.c 2010-04-04 20:41:50.060586306 -0400 | 47972 | --- linux-2.6.32.16/init/main.c 2010-07-05 14:14:00.000000000 -0400 |
47721 | +++ linux-2.6.32.15/init/main.c 2010-06-19 10:03:39.368801195 -0400 | 47973 | +++ linux-2.6.32.16/init/main.c 2010-07-09 14:50:38.000000000 -0400 |
47722 | @@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) | 47974 | @@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) |
47723 | #ifdef CONFIG_TC | 47975 | #ifdef CONFIG_TC |
47724 | extern void tc_init(void); | 47976 | extern void tc_init(void); |
@@ -47863,9 +48115,9 @@ diff -urNp linux-2.6.32.15/init/main.c linux-2.6.32.15/init/main.c | |||
47863 | /* | 48115 | /* |
47864 | * Ok, we have completed the initial bootup, and | 48116 | * Ok, we have completed the initial bootup, and |
47865 | * we're essentially up and running. Get rid of the | 48117 | * we're essentially up and running. Get rid of the |
47866 | diff -urNp linux-2.6.32.15/init/noinitramfs.c linux-2.6.32.15/init/noinitramfs.c | 48118 | diff -urNp linux-2.6.32.16/init/noinitramfs.c linux-2.6.32.16/init/noinitramfs.c |
47867 | --- linux-2.6.32.15/init/noinitramfs.c 2010-03-15 11:52:04.000000000 -0400 | 48119 | --- linux-2.6.32.16/init/noinitramfs.c 2010-07-05 14:14:00.000000000 -0400 |
47868 | +++ linux-2.6.32.15/init/noinitramfs.c 2010-05-28 21:27:16.427051097 -0400 | 48120 | +++ linux-2.6.32.16/init/noinitramfs.c 2010-07-09 14:50:38.000000000 -0400 |
47869 | @@ -29,7 +29,7 @@ static int __init default_rootfs(void) | 48121 | @@ -29,7 +29,7 @@ static int __init default_rootfs(void) |
47870 | { | 48122 | { |
47871 | int err; | 48123 | int err; |
@@ -47884,9 +48136,9 @@ diff -urNp linux-2.6.32.15/init/noinitramfs.c linux-2.6.32.15/init/noinitramfs.c | |||
47884 | if (err < 0) | 48136 | if (err < 0) |
47885 | goto out; | 48137 | goto out; |
47886 | 48138 | ||
47887 | diff -urNp linux-2.6.32.15/ipc/ipc_sysctl.c linux-2.6.32.15/ipc/ipc_sysctl.c | 48139 | diff -urNp linux-2.6.32.16/ipc/ipc_sysctl.c linux-2.6.32.16/ipc/ipc_sysctl.c |
47888 | --- linux-2.6.32.15/ipc/ipc_sysctl.c 2010-03-15 11:52:04.000000000 -0400 | 48140 | --- linux-2.6.32.16/ipc/ipc_sysctl.c 2010-07-05 14:14:00.000000000 -0400 |
47889 | +++ linux-2.6.32.15/ipc/ipc_sysctl.c 2010-05-28 21:27:16.427051097 -0400 | 48141 | +++ linux-2.6.32.16/ipc/ipc_sysctl.c 2010-07-09 14:50:38.000000000 -0400 |
47890 | @@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[] | 48142 | @@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[] |
47891 | .extra1 = &zero, | 48143 | .extra1 = &zero, |
47892 | .extra2 = &one, | 48144 | .extra2 = &one, |
@@ -47905,9 +48157,9 @@ diff -urNp linux-2.6.32.15/ipc/ipc_sysctl.c linux-2.6.32.15/ipc/ipc_sysctl.c | |||
47905 | }; | 48157 | }; |
47906 | 48158 | ||
47907 | static int __init ipc_sysctl_init(void) | 48159 | static int __init ipc_sysctl_init(void) |
47908 | diff -urNp linux-2.6.32.15/ipc/mqueue.c linux-2.6.32.15/ipc/mqueue.c | 48160 | diff -urNp linux-2.6.32.16/ipc/mqueue.c linux-2.6.32.16/ipc/mqueue.c |
47909 | --- linux-2.6.32.15/ipc/mqueue.c 2010-04-04 20:41:50.060586306 -0400 | 48161 | --- linux-2.6.32.16/ipc/mqueue.c 2010-07-05 14:14:00.000000000 -0400 |
47910 | +++ linux-2.6.32.15/ipc/mqueue.c 2010-05-28 21:27:16.431938706 -0400 | 48162 | +++ linux-2.6.32.16/ipc/mqueue.c 2010-07-09 14:50:38.000000000 -0400 |
47911 | @@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st | 48163 | @@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st |
47912 | mq_bytes = (mq_msg_tblsz + | 48164 | mq_bytes = (mq_msg_tblsz + |
47913 | (info->attr.mq_maxmsg * info->attr.mq_msgsize)); | 48165 | (info->attr.mq_maxmsg * info->attr.mq_msgsize)); |
@@ -47916,9 +48168,9 @@ diff -urNp linux-2.6.32.15/ipc/mqueue.c linux-2.6.32.15/ipc/mqueue.c | |||
47916 | spin_lock(&mq_lock); | 48168 | spin_lock(&mq_lock); |
47917 | if (u->mq_bytes + mq_bytes < u->mq_bytes || | 48169 | if (u->mq_bytes + mq_bytes < u->mq_bytes || |
47918 | u->mq_bytes + mq_bytes > | 48170 | u->mq_bytes + mq_bytes > |
47919 | diff -urNp linux-2.6.32.15/ipc/shm.c linux-2.6.32.15/ipc/shm.c | 48171 | diff -urNp linux-2.6.32.16/ipc/shm.c linux-2.6.32.16/ipc/shm.c |
47920 | --- linux-2.6.32.15/ipc/shm.c 2010-03-15 11:52:04.000000000 -0400 | 48172 | --- linux-2.6.32.16/ipc/shm.c 2010-07-05 14:14:00.000000000 -0400 |
47921 | +++ linux-2.6.32.15/ipc/shm.c 2010-05-28 21:27:16.431938706 -0400 | 48173 | +++ linux-2.6.32.16/ipc/shm.c 2010-07-09 14:50:38.000000000 -0400 |
47922 | @@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name | 48174 | @@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name |
47923 | static int sysvipc_shm_proc_show(struct seq_file *s, void *it); | 48175 | static int sysvipc_shm_proc_show(struct seq_file *s, void *it); |
47924 | #endif | 48176 | #endif |
@@ -47971,9 +48223,9 @@ diff -urNp linux-2.6.32.15/ipc/shm.c linux-2.6.32.15/ipc/shm.c | |||
47971 | size = i_size_read(path.dentry->d_inode); | 48223 | size = i_size_read(path.dentry->d_inode); |
47972 | shm_unlock(shp); | 48224 | shm_unlock(shp); |
47973 | 48225 | ||
47974 | diff -urNp linux-2.6.32.15/kernel/acct.c linux-2.6.32.15/kernel/acct.c | 48226 | diff -urNp linux-2.6.32.16/kernel/acct.c linux-2.6.32.16/kernel/acct.c |
47975 | --- linux-2.6.32.15/kernel/acct.c 2010-03-15 11:52:04.000000000 -0400 | 48227 | --- linux-2.6.32.16/kernel/acct.c 2010-07-05 14:14:00.000000000 -0400 |
47976 | +++ linux-2.6.32.15/kernel/acct.c 2010-05-28 21:27:16.431938706 -0400 | 48228 | +++ linux-2.6.32.16/kernel/acct.c 2010-07-09 14:50:38.000000000 -0400 |
47977 | @@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a | 48229 | @@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a |
47978 | */ | 48230 | */ |
47979 | flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; | 48231 | flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; |
@@ -47983,9 +48235,9 @@ diff -urNp linux-2.6.32.15/kernel/acct.c linux-2.6.32.15/kernel/acct.c | |||
47983 | sizeof(acct_t), &file->f_pos); | 48235 | sizeof(acct_t), &file->f_pos); |
47984 | current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; | 48236 | current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; |
47985 | set_fs(fs); | 48237 | set_fs(fs); |
47986 | diff -urNp linux-2.6.32.15/kernel/capability.c linux-2.6.32.15/kernel/capability.c | 48238 | diff -urNp linux-2.6.32.16/kernel/capability.c linux-2.6.32.16/kernel/capability.c |
47987 | --- linux-2.6.32.15/kernel/capability.c 2010-03-15 11:52:04.000000000 -0400 | 48239 | --- linux-2.6.32.16/kernel/capability.c 2010-07-05 14:14:00.000000000 -0400 |
47988 | +++ linux-2.6.32.15/kernel/capability.c 2010-05-28 21:27:16.431938706 -0400 | 48240 | +++ linux-2.6.32.16/kernel/capability.c 2010-07-09 14:50:38.000000000 -0400 |
47989 | @@ -306,10 +306,21 @@ int capable(int cap) | 48241 | @@ -306,10 +306,21 @@ int capable(int cap) |
47990 | BUG(); | 48242 | BUG(); |
47991 | } | 48243 | } |
@@ -48009,9 +48261,9 @@ diff -urNp linux-2.6.32.15/kernel/capability.c linux-2.6.32.15/kernel/capability | |||
48009 | + | 48261 | + |
48010 | EXPORT_SYMBOL(capable); | 48262 | EXPORT_SYMBOL(capable); |
48011 | +EXPORT_SYMBOL(capable_nolog); | 48263 | +EXPORT_SYMBOL(capable_nolog); |
48012 | diff -urNp linux-2.6.32.15/kernel/configs.c linux-2.6.32.15/kernel/configs.c | 48264 | diff -urNp linux-2.6.32.16/kernel/configs.c linux-2.6.32.16/kernel/configs.c |
48013 | --- linux-2.6.32.15/kernel/configs.c 2010-03-15 11:52:04.000000000 -0400 | 48265 | --- linux-2.6.32.16/kernel/configs.c 2010-07-05 14:14:00.000000000 -0400 |
48014 | +++ linux-2.6.32.15/kernel/configs.c 2010-05-28 21:27:16.431938706 -0400 | 48266 | +++ linux-2.6.32.16/kernel/configs.c 2010-07-09 14:50:38.000000000 -0400 |
48015 | @@ -73,8 +73,19 @@ static int __init ikconfig_init(void) | 48267 | @@ -73,8 +73,19 @@ static int __init ikconfig_init(void) |
48016 | struct proc_dir_entry *entry; | 48268 | struct proc_dir_entry *entry; |
48017 | 48269 | ||
@@ -48032,9 +48284,9 @@ diff -urNp linux-2.6.32.15/kernel/configs.c linux-2.6.32.15/kernel/configs.c | |||
48032 | if (!entry) | 48284 | if (!entry) |
48033 | return -ENOMEM; | 48285 | return -ENOMEM; |
48034 | 48286 | ||
48035 | diff -urNp linux-2.6.32.15/kernel/cpu.c linux-2.6.32.15/kernel/cpu.c | 48287 | diff -urNp linux-2.6.32.16/kernel/cpu.c linux-2.6.32.16/kernel/cpu.c |
48036 | --- linux-2.6.32.15/kernel/cpu.c 2010-03-15 11:52:04.000000000 -0400 | 48288 | --- linux-2.6.32.16/kernel/cpu.c 2010-07-05 14:14:00.000000000 -0400 |
48037 | +++ linux-2.6.32.15/kernel/cpu.c 2010-05-28 21:27:16.431938706 -0400 | 48289 | +++ linux-2.6.32.16/kernel/cpu.c 2010-07-09 14:50:38.000000000 -0400 |
48038 | @@ -19,7 +19,7 @@ | 48290 | @@ -19,7 +19,7 @@ |
48039 | /* Serializes the updates to cpu_online_mask, cpu_present_mask */ | 48291 | /* Serializes the updates to cpu_online_mask, cpu_present_mask */ |
48040 | static DEFINE_MUTEX(cpu_add_remove_lock); | 48292 | static DEFINE_MUTEX(cpu_add_remove_lock); |
@@ -48044,9 +48296,9 @@ diff -urNp linux-2.6.32.15/kernel/cpu.c linux-2.6.32.15/kernel/cpu.c | |||
48044 | 48296 | ||
48045 | /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. | 48297 | /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. |
48046 | * Should always be manipulated under cpu_add_remove_lock | 48298 | * Should always be manipulated under cpu_add_remove_lock |
48047 | diff -urNp linux-2.6.32.15/kernel/cred.c linux-2.6.32.15/kernel/cred.c | 48299 | diff -urNp linux-2.6.32.16/kernel/cred.c linux-2.6.32.16/kernel/cred.c |
48048 | --- linux-2.6.32.15/kernel/cred.c 2010-05-15 13:20:19.362999772 -0400 | 48300 | --- linux-2.6.32.16/kernel/cred.c 2010-07-05 14:14:00.000000000 -0400 |
48049 | +++ linux-2.6.32.15/kernel/cred.c 2010-05-28 21:27:16.431938706 -0400 | 48301 | +++ linux-2.6.32.16/kernel/cred.c 2010-07-09 14:50:38.000000000 -0400 |
48050 | @@ -520,6 +520,8 @@ int commit_creds(struct cred *new) | 48302 | @@ -520,6 +520,8 @@ int commit_creds(struct cred *new) |
48051 | 48303 | ||
48052 | get_cred(new); /* we will require a ref for the subj creds too */ | 48304 | get_cred(new); /* we will require a ref for the subj creds too */ |
@@ -48056,9 +48308,9 @@ diff -urNp linux-2.6.32.15/kernel/cred.c linux-2.6.32.15/kernel/cred.c | |||
48056 | /* dumpability changes */ | 48308 | /* dumpability changes */ |
48057 | if (old->euid != new->euid || | 48309 | if (old->euid != new->euid || |
48058 | old->egid != new->egid || | 48310 | old->egid != new->egid || |
48059 | diff -urNp linux-2.6.32.15/kernel/exit.c linux-2.6.32.15/kernel/exit.c | 48311 | diff -urNp linux-2.6.32.16/kernel/exit.c linux-2.6.32.16/kernel/exit.c |
48060 | --- linux-2.6.32.15/kernel/exit.c 2010-03-15 11:52:04.000000000 -0400 | 48312 | --- linux-2.6.32.16/kernel/exit.c 2010-07-05 14:14:00.000000000 -0400 |
48061 | +++ linux-2.6.32.15/kernel/exit.c 2010-05-28 21:27:16.431938706 -0400 | 48313 | +++ linux-2.6.32.16/kernel/exit.c 2010-07-09 14:50:38.000000000 -0400 |
48062 | @@ -56,6 +56,10 @@ | 48314 | @@ -56,6 +56,10 @@ |
48063 | #include <asm/mmu_context.h> | 48315 | #include <asm/mmu_context.h> |
48064 | #include "cred-internals.h" | 48316 | #include "cred-internals.h" |
@@ -48148,9 +48400,9 @@ diff -urNp linux-2.6.32.15/kernel/exit.c linux-2.6.32.15/kernel/exit.c | |||
48148 | 48400 | ||
48149 | get_task_struct(p); | 48401 | get_task_struct(p); |
48150 | read_unlock(&tasklist_lock); | 48402 | read_unlock(&tasklist_lock); |
48151 | diff -urNp linux-2.6.32.15/kernel/fork.c linux-2.6.32.15/kernel/fork.c | 48403 | diff -urNp linux-2.6.32.16/kernel/fork.c linux-2.6.32.16/kernel/fork.c |
48152 | --- linux-2.6.32.15/kernel/fork.c 2010-05-28 20:16:44.458924952 -0400 | 48404 | --- linux-2.6.32.16/kernel/fork.c 2010-07-05 14:14:00.000000000 -0400 |
48153 | +++ linux-2.6.32.15/kernel/fork.c 2010-05-28 21:27:16.436716677 -0400 | 48405 | +++ linux-2.6.32.16/kernel/fork.c 2010-07-09 14:50:38.000000000 -0400 |
48154 | @@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru | 48406 | @@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru |
48155 | *stackend = STACK_END_MAGIC; /* for overflow detection */ | 48407 | *stackend = STACK_END_MAGIC; /* for overflow detection */ |
48156 | 48408 | ||
@@ -48211,7 +48463,7 @@ diff -urNp linux-2.6.32.15/kernel/fork.c linux-2.6.32.15/kernel/fork.c | |||
48211 | /* a new mm has just been created */ | 48463 | /* a new mm has just been created */ |
48212 | arch_dup_mmap(oldmm, mm); | 48464 | arch_dup_mmap(oldmm, mm); |
48213 | retval = 0; | 48465 | retval = 0; |
48214 | @@ -731,7 +757,7 @@ static int copy_fs(unsigned long clone_f | 48466 | @@ -731,13 +757,14 @@ static int copy_fs(unsigned long clone_f |
48215 | write_unlock(&fs->lock); | 48467 | write_unlock(&fs->lock); |
48216 | return -EAGAIN; | 48468 | return -EAGAIN; |
48217 | } | 48469 | } |
@@ -48220,7 +48472,14 @@ diff -urNp linux-2.6.32.15/kernel/fork.c linux-2.6.32.15/kernel/fork.c | |||
48220 | write_unlock(&fs->lock); | 48472 | write_unlock(&fs->lock); |
48221 | return 0; | 48473 | return 0; |
48222 | } | 48474 | } |
48223 | @@ -1027,10 +1053,13 @@ static struct task_struct *copy_process( | 48475 | tsk->fs = copy_fs_struct(fs); |
48476 | if (!tsk->fs) | ||
48477 | return -ENOMEM; | ||
48478 | + gr_set_chroot_entries(tsk, &tsk->fs->root); | ||
48479 | return 0; | ||
48480 | } | ||
48481 | |||
48482 | @@ -1027,10 +1054,13 @@ static struct task_struct *copy_process( | ||
48224 | DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled); | 48483 | DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled); |
48225 | #endif | 48484 | #endif |
48226 | retval = -EAGAIN; | 48485 | retval = -EAGAIN; |
@@ -48236,18 +48495,7 @@ diff -urNp linux-2.6.32.15/kernel/fork.c linux-2.6.32.15/kernel/fork.c | |||
48236 | goto bad_fork_free; | 48495 | goto bad_fork_free; |
48237 | } | 48496 | } |
48238 | 48497 | ||
48239 | @@ -1059,6 +1088,10 @@ static struct task_struct *copy_process( | 48498 | @@ -1177,6 +1207,8 @@ static struct task_struct *copy_process( |
48240 | p->vfork_done = NULL; | ||
48241 | spin_lock_init(&p->alloc_lock); | ||
48242 | |||
48243 | +#ifdef CONFIG_GRKERNSEC | ||
48244 | + rwlock_init(&p->gr_fs_lock); | ||
48245 | +#endif | ||
48246 | + | ||
48247 | init_sigpending(&p->pending); | ||
48248 | |||
48249 | p->utime = cputime_zero; | ||
48250 | @@ -1177,6 +1210,8 @@ static struct task_struct *copy_process( | ||
48251 | goto bad_fork_free_pid; | 48499 | goto bad_fork_free_pid; |
48252 | } | 48500 | } |
48253 | 48501 | ||
@@ -48256,7 +48504,7 @@ diff -urNp linux-2.6.32.15/kernel/fork.c linux-2.6.32.15/kernel/fork.c | |||
48256 | p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL; | 48504 | p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL; |
48257 | /* | 48505 | /* |
48258 | * Clear TID on mm_release()? | 48506 | * Clear TID on mm_release()? |
48259 | @@ -1342,6 +1377,8 @@ bad_fork_cleanup_count: | 48507 | @@ -1342,6 +1374,8 @@ bad_fork_cleanup_count: |
48260 | bad_fork_free: | 48508 | bad_fork_free: |
48261 | free_task(p); | 48509 | free_task(p); |
48262 | fork_out: | 48510 | fork_out: |
@@ -48265,7 +48513,7 @@ diff -urNp linux-2.6.32.15/kernel/fork.c linux-2.6.32.15/kernel/fork.c | |||
48265 | return ERR_PTR(retval); | 48513 | return ERR_PTR(retval); |
48266 | } | 48514 | } |
48267 | 48515 | ||
48268 | @@ -1435,6 +1472,8 @@ long do_fork(unsigned long clone_flags, | 48516 | @@ -1435,6 +1469,8 @@ long do_fork(unsigned long clone_flags, |
48269 | if (clone_flags & CLONE_PARENT_SETTID) | 48517 | if (clone_flags & CLONE_PARENT_SETTID) |
48270 | put_user(nr, parent_tidptr); | 48518 | put_user(nr, parent_tidptr); |
48271 | 48519 | ||
@@ -48274,7 +48522,7 @@ diff -urNp linux-2.6.32.15/kernel/fork.c linux-2.6.32.15/kernel/fork.c | |||
48274 | if (clone_flags & CLONE_VFORK) { | 48522 | if (clone_flags & CLONE_VFORK) { |
48275 | p->vfork_done = &vfork; | 48523 | p->vfork_done = &vfork; |
48276 | init_completion(&vfork); | 48524 | init_completion(&vfork); |
48277 | @@ -1567,7 +1606,7 @@ static int unshare_fs(unsigned long unsh | 48525 | @@ -1567,7 +1603,7 @@ static int unshare_fs(unsigned long unsh |
48278 | return 0; | 48526 | return 0; |
48279 | 48527 | ||
48280 | /* don't need lock here; in the worst case we'll do useless copy */ | 48528 | /* don't need lock here; in the worst case we'll do useless copy */ |
@@ -48283,29 +48531,19 @@ diff -urNp linux-2.6.32.15/kernel/fork.c linux-2.6.32.15/kernel/fork.c | |||
48283 | return 0; | 48531 | return 0; |
48284 | 48532 | ||
48285 | *new_fsp = copy_fs_struct(fs); | 48533 | *new_fsp = copy_fs_struct(fs); |
48286 | @@ -1687,14 +1726,18 @@ SYSCALL_DEFINE1(unshare, unsigned long, | 48534 | @@ -1690,7 +1726,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, |
48287 | task_lock(current); | ||
48288 | |||
48289 | if (new_fs) { | ||
48290 | + unsigned long flags; | ||
48291 | + | ||
48292 | + gr_fs_write_lock_irqsave(current, flags); | ||
48293 | fs = current->fs; | 48535 | fs = current->fs; |
48294 | write_lock(&fs->lock); | 48536 | write_lock(&fs->lock); |
48295 | current->fs = new_fs; | 48537 | current->fs = new_fs; |
48296 | - if (--fs->users) | 48538 | - if (--fs->users) |
48539 | + gr_set_chroot_entries(current, ¤t->fs->root); | ||
48297 | + if (atomic_dec_return(&fs->users)) | 48540 | + if (atomic_dec_return(&fs->users)) |
48298 | new_fs = NULL; | 48541 | new_fs = NULL; |
48299 | else | 48542 | else |
48300 | new_fs = fs; | 48543 | new_fs = fs; |
48301 | write_unlock(&fs->lock); | 48544 | diff -urNp linux-2.6.32.16/kernel/futex.c linux-2.6.32.16/kernel/futex.c |
48302 | + gr_fs_write_unlock_irqrestore(current, flags); | 48545 | --- linux-2.6.32.16/kernel/futex.c 2010-07-05 14:14:00.000000000 -0400 |
48303 | } | 48546 | +++ linux-2.6.32.16/kernel/futex.c 2010-07-09 14:50:38.000000000 -0400 |
48304 | |||
48305 | if (new_mm) { | ||
48306 | diff -urNp linux-2.6.32.15/kernel/futex.c linux-2.6.32.15/kernel/futex.c | ||
48307 | --- linux-2.6.32.15/kernel/futex.c 2010-03-15 11:52:04.000000000 -0400 | ||
48308 | +++ linux-2.6.32.15/kernel/futex.c 2010-05-28 21:27:16.439128347 -0400 | ||
48309 | @@ -54,6 +54,7 @@ | 48547 | @@ -54,6 +54,7 @@ |
48310 | #include <linux/mount.h> | 48548 | #include <linux/mount.h> |
48311 | #include <linux/pagemap.h> | 48549 | #include <linux/pagemap.h> |
@@ -48373,9 +48611,9 @@ diff -urNp linux-2.6.32.15/kernel/futex.c linux-2.6.32.15/kernel/futex.c | |||
48373 | { | 48611 | { |
48374 | unsigned long uentry; | 48612 | unsigned long uentry; |
48375 | 48613 | ||
48376 | diff -urNp linux-2.6.32.15/kernel/futex_compat.c linux-2.6.32.15/kernel/futex_compat.c | 48614 | diff -urNp linux-2.6.32.16/kernel/futex_compat.c linux-2.6.32.16/kernel/futex_compat.c |
48377 | --- linux-2.6.32.15/kernel/futex_compat.c 2010-03-15 11:52:04.000000000 -0400 | 48615 | --- linux-2.6.32.16/kernel/futex_compat.c 2010-07-05 14:14:00.000000000 -0400 |
48378 | +++ linux-2.6.32.15/kernel/futex_compat.c 2010-05-28 21:27:16.439128347 -0400 | 48616 | +++ linux-2.6.32.16/kernel/futex_compat.c 2010-07-09 15:16:46.000000000 -0400 |
48379 | @@ -10,6 +10,7 @@ | 48617 | @@ -10,6 +10,7 @@ |
48380 | #include <linux/compat.h> | 48618 | #include <linux/compat.h> |
48381 | #include <linux/nsproxy.h> | 48619 | #include <linux/nsproxy.h> |
@@ -48389,8 +48627,8 @@ diff -urNp linux-2.6.32.15/kernel/futex_compat.c linux-2.6.32.15/kernel/futex_co | |||
48389 | struct compat_robust_list_head __user *head; | 48627 | struct compat_robust_list_head __user *head; |
48390 | unsigned long ret; | 48628 | unsigned long ret; |
48391 | - const struct cred *cred = current_cred(), *pcred; | 48629 | - const struct cred *cred = current_cred(), *pcred; |
48392 | + const struct cred *cred = current_cred(); | ||
48393 | +#ifndef CONFIG_GRKERNSEC_PROC_MEMMAP | 48630 | +#ifndef CONFIG_GRKERNSEC_PROC_MEMMAP |
48631 | + const struct cred *cred = current_cred(); | ||
48394 | + const struct cred *pcred; | 48632 | + const struct cred *pcred; |
48395 | +#endif | 48633 | +#endif |
48396 | 48634 | ||
@@ -48413,9 +48651,9 @@ diff -urNp linux-2.6.32.15/kernel/futex_compat.c linux-2.6.32.15/kernel/futex_co | |||
48413 | head = p->compat_robust_list; | 48651 | head = p->compat_robust_list; |
48414 | read_unlock(&tasklist_lock); | 48652 | read_unlock(&tasklist_lock); |
48415 | } | 48653 | } |
48416 | diff -urNp linux-2.6.32.15/kernel/gcov/base.c linux-2.6.32.15/kernel/gcov/base.c | 48654 | diff -urNp linux-2.6.32.16/kernel/gcov/base.c linux-2.6.32.16/kernel/gcov/base.c |
48417 | --- linux-2.6.32.15/kernel/gcov/base.c 2010-03-15 11:52:04.000000000 -0400 | 48655 | --- linux-2.6.32.16/kernel/gcov/base.c 2010-07-05 14:14:00.000000000 -0400 |
48418 | +++ linux-2.6.32.15/kernel/gcov/base.c 2010-05-28 21:27:16.439128347 -0400 | 48656 | +++ linux-2.6.32.16/kernel/gcov/base.c 2010-07-09 14:50:38.000000000 -0400 |
48419 | @@ -102,11 +102,6 @@ void gcov_enable_events(void) | 48657 | @@ -102,11 +102,6 @@ void gcov_enable_events(void) |
48420 | } | 48658 | } |
48421 | 48659 | ||
@@ -48437,9 +48675,9 @@ diff -urNp linux-2.6.32.15/kernel/gcov/base.c linux-2.6.32.15/kernel/gcov/base.c | |||
48437 | if (prev) | 48675 | if (prev) |
48438 | prev->next = info->next; | 48676 | prev->next = info->next; |
48439 | else | 48677 | else |
48440 | diff -urNp linux-2.6.32.15/kernel/hrtimer.c linux-2.6.32.15/kernel/hrtimer.c | 48678 | diff -urNp linux-2.6.32.16/kernel/hrtimer.c linux-2.6.32.16/kernel/hrtimer.c |
48441 | --- linux-2.6.32.15/kernel/hrtimer.c 2010-04-04 20:41:50.064534828 -0400 | 48679 | --- linux-2.6.32.16/kernel/hrtimer.c 2010-07-05 14:14:00.000000000 -0400 |
48442 | +++ linux-2.6.32.15/kernel/hrtimer.c 2010-05-28 21:27:16.439128347 -0400 | 48680 | +++ linux-2.6.32.16/kernel/hrtimer.c 2010-07-09 14:50:38.000000000 -0400 |
48443 | @@ -1382,7 +1382,7 @@ void hrtimer_peek_ahead_timers(void) | 48681 | @@ -1382,7 +1382,7 @@ void hrtimer_peek_ahead_timers(void) |
48444 | local_irq_restore(flags); | 48682 | local_irq_restore(flags); |
48445 | } | 48683 | } |
@@ -48449,9 +48687,9 @@ diff -urNp linux-2.6.32.15/kernel/hrtimer.c linux-2.6.32.15/kernel/hrtimer.c | |||
48449 | { | 48687 | { |
48450 | hrtimer_peek_ahead_timers(); | 48688 | hrtimer_peek_ahead_timers(); |
48451 | } | 48689 | } |
48452 | diff -urNp linux-2.6.32.15/kernel/kallsyms.c linux-2.6.32.15/kernel/kallsyms.c | 48690 | diff -urNp linux-2.6.32.16/kernel/kallsyms.c linux-2.6.32.16/kernel/kallsyms.c |
48453 | --- linux-2.6.32.15/kernel/kallsyms.c 2010-03-15 11:52:04.000000000 -0400 | 48691 | --- linux-2.6.32.16/kernel/kallsyms.c 2010-07-05 14:14:00.000000000 -0400 |
48454 | +++ linux-2.6.32.15/kernel/kallsyms.c 2010-05-28 21:27:16.439128347 -0400 | 48692 | +++ linux-2.6.32.16/kernel/kallsyms.c 2010-07-09 14:50:44.000000000 -0400 |
48455 | @@ -11,6 +11,9 @@ | 48693 | @@ -11,6 +11,9 @@ |
48456 | * Changed the compression method from stem compression to "table lookup" | 48694 | * Changed the compression method from stem compression to "table lookup" |
48457 | * compression (see scripts/kallsyms.c for a more complete description) | 48695 | * compression (see scripts/kallsyms.c for a more complete description) |
@@ -48462,44 +48700,56 @@ diff -urNp linux-2.6.32.15/kernel/kallsyms.c linux-2.6.32.15/kernel/kallsyms.c | |||
48462 | #include <linux/kallsyms.h> | 48700 | #include <linux/kallsyms.h> |
48463 | #include <linux/module.h> | 48701 | #include <linux/module.h> |
48464 | #include <linux/init.h> | 48702 | #include <linux/init.h> |
48465 | @@ -51,6 +54,9 @@ extern const unsigned long kallsyms_mark | 48703 | @@ -51,23 +54,48 @@ extern const unsigned long kallsyms_mark |
48466 | 48704 | ||
48467 | static inline int is_kernel_inittext(unsigned long addr) | 48705 | static inline int is_kernel_inittext(unsigned long addr) |
48468 | { | 48706 | { |
48469 | + if (system_state != SYSTEM_BOOTING) | 48707 | + if (system_state != SYSTEM_BOOTING) |
48470 | + return 0; | 48708 | + return 0; |
48471 | + | 48709 | + |
48710 | +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) | ||
48711 | + if (addr >= ktla_ktva((unsigned long)_sinittext) | ||
48712 | + && addr <= ktla_ktva((unsigned long)_einittext)) | ||
48713 | +#else | ||
48472 | if (addr >= (unsigned long)_sinittext | 48714 | if (addr >= (unsigned long)_sinittext |
48473 | && addr <= (unsigned long)_einittext) | 48715 | && addr <= (unsigned long)_einittext) |
48716 | +#endif | ||
48474 | return 1; | 48717 | return 1; |
48475 | @@ -67,6 +73,26 @@ static inline int is_kernel_text(unsigne | 48718 | + |
48719 | return 0; | ||
48720 | } | ||
48476 | 48721 | ||
48477 | static inline int is_kernel(unsigned long addr) | 48722 | static inline int is_kernel_text(unsigned long addr) |
48478 | { | 48723 | { |
48479 | + if (is_kernel_inittext(addr)) | ||
48480 | + return 1; | ||
48481 | + | 48724 | + |
48482 | +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) | 48725 | +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) |
48483 | +#ifdef CONFIG_MODULES | 48726 | + if (addr >= ktla_ktva((unsigned long)_stext) |
48484 | + if ((unsigned long)MODULES_EXEC_VADDR <= ktla_ktva(addr) && ktla_ktva(addr) <= (unsigned long)MODULES_EXEC_END) | 48727 | + && addr <= ktla_ktva((unsigned long)_etext)) |
48485 | + return 0; | 48728 | +#else |
48729 | if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) || | ||
48730 | arch_is_kernel_text(addr)) | ||
48486 | +#endif | 48731 | +#endif |
48732 | return 1; | ||
48487 | + | 48733 | + |
48488 | + if (is_kernel_text(addr)) | 48734 | return in_gate_area_no_task(addr); |
48489 | + return 1; | 48735 | } |
48736 | |||
48737 | static inline int is_kernel(unsigned long addr) | ||
48738 | { | ||
48490 | + | 48739 | + |
48491 | + if (ktla_ktva((unsigned long)_stext) <= addr && addr < ktla_ktva((unsigned long)_etext)) | 48740 | +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) |
48741 | + if (is_kernel_text(addr) || is_kernel_inittext(addr)) | ||
48492 | + return 1; | 48742 | + return 1; |
48493 | + | 48743 | + |
48494 | + if ((addr >= (unsigned long)_sdata && addr <= (unsigned long)_end)) | 48744 | + if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end) |
48495 | + return 1; | 48745 | +#else |
48496 | + return in_gate_area_no_task(addr); | 48746 | if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end) |
48497 | +#endif | 48747 | +#endif |
48498 | + | 48748 | + |
48499 | if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end) | ||
48500 | return 1; | 48749 | return 1; |
48501 | return in_gate_area_no_task(addr); | 48750 | return in_gate_area_no_task(addr); |
48502 | @@ -413,7 +439,6 @@ static unsigned long get_ksymbol_core(st | 48751 | } |
48752 | @@ -413,7 +441,6 @@ static unsigned long get_ksymbol_core(st | ||
48503 | 48753 | ||
48504 | static void reset_iter(struct kallsym_iter *iter, loff_t new_pos) | 48754 | static void reset_iter(struct kallsym_iter *iter, loff_t new_pos) |
48505 | { | 48755 | { |
@@ -48507,7 +48757,7 @@ diff -urNp linux-2.6.32.15/kernel/kallsyms.c linux-2.6.32.15/kernel/kallsyms.c | |||
48507 | iter->nameoff = get_symbol_offset(new_pos); | 48757 | iter->nameoff = get_symbol_offset(new_pos); |
48508 | iter->pos = new_pos; | 48758 | iter->pos = new_pos; |
48509 | } | 48759 | } |
48510 | @@ -461,6 +486,11 @@ static int s_show(struct seq_file *m, vo | 48760 | @@ -461,6 +488,11 @@ static int s_show(struct seq_file *m, vo |
48511 | { | 48761 | { |
48512 | struct kallsym_iter *iter = m->private; | 48762 | struct kallsym_iter *iter = m->private; |
48513 | 48763 | ||
@@ -48519,7 +48769,7 @@ diff -urNp linux-2.6.32.15/kernel/kallsyms.c linux-2.6.32.15/kernel/kallsyms.c | |||
48519 | /* Some debugging symbols have no name. Ignore them. */ | 48769 | /* Some debugging symbols have no name. Ignore them. */ |
48520 | if (!iter->name[0]) | 48770 | if (!iter->name[0]) |
48521 | return 0; | 48771 | return 0; |
48522 | @@ -501,7 +531,7 @@ static int kallsyms_open(struct inode *i | 48772 | @@ -501,7 +533,7 @@ static int kallsyms_open(struct inode *i |
48523 | struct kallsym_iter *iter; | 48773 | struct kallsym_iter *iter; |
48524 | int ret; | 48774 | int ret; |
48525 | 48775 | ||
@@ -48528,9 +48778,9 @@ diff -urNp linux-2.6.32.15/kernel/kallsyms.c linux-2.6.32.15/kernel/kallsyms.c | |||
48528 | if (!iter) | 48778 | if (!iter) |
48529 | return -ENOMEM; | 48779 | return -ENOMEM; |
48530 | reset_iter(iter, 0); | 48780 | reset_iter(iter, 0); |
48531 | diff -urNp linux-2.6.32.15/kernel/kgdb.c linux-2.6.32.15/kernel/kgdb.c | 48781 | diff -urNp linux-2.6.32.16/kernel/kgdb.c linux-2.6.32.16/kernel/kgdb.c |
48532 | --- linux-2.6.32.15/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 | 48782 | --- linux-2.6.32.16/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 |
48533 | +++ linux-2.6.32.15/kernel/kgdb.c 2010-05-28 21:27:16.439128347 -0400 | 48783 | +++ linux-2.6.32.16/kernel/kgdb.c 2010-07-09 14:50:38.000000000 -0400 |
48534 | @@ -86,7 +86,7 @@ static int kgdb_io_module_registered; | 48784 | @@ -86,7 +86,7 @@ static int kgdb_io_module_registered; |
48535 | /* Guard for recursive entry */ | 48785 | /* Guard for recursive entry */ |
48536 | static int exception_level; | 48786 | static int exception_level; |
@@ -48558,9 +48808,9 @@ diff -urNp linux-2.6.32.15/kernel/kgdb.c linux-2.6.32.15/kernel/kgdb.c | |||
48558 | { | 48808 | { |
48559 | BUG_ON(kgdb_connected); | 48809 | BUG_ON(kgdb_connected); |
48560 | 48810 | ||
48561 | diff -urNp linux-2.6.32.15/kernel/kmod.c linux-2.6.32.15/kernel/kmod.c | 48811 | diff -urNp linux-2.6.32.16/kernel/kmod.c linux-2.6.32.16/kernel/kmod.c |
48562 | --- linux-2.6.32.15/kernel/kmod.c 2010-03-15 11:52:04.000000000 -0400 | 48812 | --- linux-2.6.32.16/kernel/kmod.c 2010-07-05 14:14:00.000000000 -0400 |
48563 | +++ linux-2.6.32.15/kernel/kmod.c 2010-05-28 21:27:16.439128347 -0400 | 48813 | +++ linux-2.6.32.16/kernel/kmod.c 2010-07-09 14:50:38.000000000 -0400 |
48564 | @@ -90,6 +90,18 @@ int __request_module(bool wait, const ch | 48814 | @@ -90,6 +90,18 @@ int __request_module(bool wait, const ch |
48565 | if (ret >= MODULE_NAME_LEN) | 48815 | if (ret >= MODULE_NAME_LEN) |
48566 | return -ENAMETOOLONG; | 48816 | return -ENAMETOOLONG; |
@@ -48580,9 +48830,9 @@ diff -urNp linux-2.6.32.15/kernel/kmod.c linux-2.6.32.15/kernel/kmod.c | |||
48580 | /* If modprobe needs a service that is in a module, we get a recursive | 48830 | /* If modprobe needs a service that is in a module, we get a recursive |
48581 | * loop. Limit the number of running kmod threads to max_threads/2 or | 48831 | * loop. Limit the number of running kmod threads to max_threads/2 or |
48582 | * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method | 48832 | * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method |
48583 | diff -urNp linux-2.6.32.15/kernel/kprobes.c linux-2.6.32.15/kernel/kprobes.c | 48833 | diff -urNp linux-2.6.32.16/kernel/kprobes.c linux-2.6.32.16/kernel/kprobes.c |
48584 | --- linux-2.6.32.15/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400 | 48834 | --- linux-2.6.32.16/kernel/kprobes.c 2010-07-05 14:14:00.000000000 -0400 |
48585 | +++ linux-2.6.32.15/kernel/kprobes.c 2010-05-28 21:27:16.439128347 -0400 | 48835 | +++ linux-2.6.32.16/kernel/kprobes.c 2010-07-09 14:50:38.000000000 -0400 |
48586 | @@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_ | 48836 | @@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_ |
48587 | * kernel image and loaded module images reside. This is required | 48837 | * kernel image and loaded module images reside. This is required |
48588 | * so x86_64 can correctly handle the %rip-relative fixups. | 48838 | * so x86_64 can correctly handle the %rip-relative fixups. |
@@ -48619,9 +48869,9 @@ diff -urNp linux-2.6.32.15/kernel/kprobes.c linux-2.6.32.15/kernel/kprobes.c | |||
48619 | 48869 | ||
48620 | head = &kprobe_table[i]; | 48870 | head = &kprobe_table[i]; |
48621 | preempt_disable(); | 48871 | preempt_disable(); |
48622 | diff -urNp linux-2.6.32.15/kernel/lockdep.c linux-2.6.32.15/kernel/lockdep.c | 48872 | diff -urNp linux-2.6.32.16/kernel/lockdep.c linux-2.6.32.16/kernel/lockdep.c |
48623 | --- linux-2.6.32.15/kernel/lockdep.c 2010-06-01 15:02:53.017540947 -0400 | 48873 | --- linux-2.6.32.16/kernel/lockdep.c 2010-07-05 14:14:00.000000000 -0400 |
48624 | +++ linux-2.6.32.15/kernel/lockdep.c 2010-06-01 15:06:14.633871339 -0400 | 48874 | +++ linux-2.6.32.16/kernel/lockdep.c 2010-07-09 14:50:38.000000000 -0400 |
48625 | @@ -577,6 +577,10 @@ static int static_obj(void *obj) | 48875 | @@ -577,6 +577,10 @@ static int static_obj(void *obj) |
48626 | int i; | 48876 | int i; |
48627 | #endif | 48877 | #endif |
@@ -48651,9 +48901,9 @@ diff -urNp linux-2.6.32.15/kernel/lockdep.c linux-2.6.32.15/kernel/lockdep.c | |||
48651 | printk("the code is fine but needs lockdep annotation.\n"); | 48901 | printk("the code is fine but needs lockdep annotation.\n"); |
48652 | printk("turning off the locking correctness validator.\n"); | 48902 | printk("turning off the locking correctness validator.\n"); |
48653 | dump_stack(); | 48903 | dump_stack(); |
48654 | diff -urNp linux-2.6.32.15/kernel/lockdep_proc.c linux-2.6.32.15/kernel/lockdep_proc.c | 48904 | diff -urNp linux-2.6.32.16/kernel/lockdep_proc.c linux-2.6.32.16/kernel/lockdep_proc.c |
48655 | --- linux-2.6.32.15/kernel/lockdep_proc.c 2010-03-15 11:52:04.000000000 -0400 | 48905 | --- linux-2.6.32.16/kernel/lockdep_proc.c 2010-07-05 14:14:00.000000000 -0400 |
48656 | +++ linux-2.6.32.15/kernel/lockdep_proc.c 2010-05-28 21:27:16.439128347 -0400 | 48906 | +++ linux-2.6.32.16/kernel/lockdep_proc.c 2010-07-09 14:50:38.000000000 -0400 |
48657 | @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v | 48907 | @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v |
48658 | 48908 | ||
48659 | static void print_name(struct seq_file *m, struct lock_class *class) | 48909 | static void print_name(struct seq_file *m, struct lock_class *class) |
@@ -48663,9 +48913,9 @@ diff -urNp linux-2.6.32.15/kernel/lockdep_proc.c linux-2.6.32.15/kernel/lockdep_ | |||
48663 | const char *name = class->name; | 48913 | const char *name = class->name; |
48664 | 48914 | ||
48665 | if (!name) { | 48915 | if (!name) { |
48666 | diff -urNp linux-2.6.32.15/kernel/module.c linux-2.6.32.15/kernel/module.c | 48916 | diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c |
48667 | --- linux-2.6.32.15/kernel/module.c 2010-06-01 15:02:53.053672396 -0400 | 48917 | --- linux-2.6.32.16/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 |
48668 | +++ linux-2.6.32.15/kernel/module.c 2010-06-01 15:03:15.410128488 -0400 | 48918 | +++ linux-2.6.32.16/kernel/module.c 2010-07-09 14:50:38.000000000 -0400 |
48669 | @@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq | 48919 | @@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq |
48670 | static BLOCKING_NOTIFIER_HEAD(module_notify_list); | 48920 | static BLOCKING_NOTIFIER_HEAD(module_notify_list); |
48671 | 48921 | ||
@@ -49205,9 +49455,9 @@ diff -urNp linux-2.6.32.15/kernel/module.c linux-2.6.32.15/kernel/module.c | |||
49205 | mod = NULL; | 49455 | mod = NULL; |
49206 | } | 49456 | } |
49207 | return mod; | 49457 | return mod; |
49208 | diff -urNp linux-2.6.32.15/kernel/panic.c linux-2.6.32.15/kernel/panic.c | 49458 | diff -urNp linux-2.6.32.16/kernel/panic.c linux-2.6.32.16/kernel/panic.c |
49209 | --- linux-2.6.32.15/kernel/panic.c 2010-03-15 11:52:04.000000000 -0400 | 49459 | --- linux-2.6.32.16/kernel/panic.c 2010-07-05 14:14:00.000000000 -0400 |
49210 | +++ linux-2.6.32.15/kernel/panic.c 2010-05-28 21:27:16.442904432 -0400 | 49460 | +++ linux-2.6.32.16/kernel/panic.c 2010-07-09 14:50:38.000000000 -0400 |
49211 | @@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null); | 49461 | @@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null); |
49212 | */ | 49462 | */ |
49213 | void __stack_chk_fail(void) | 49463 | void __stack_chk_fail(void) |
@@ -49218,9 +49468,9 @@ diff -urNp linux-2.6.32.15/kernel/panic.c linux-2.6.32.15/kernel/panic.c | |||
49218 | __builtin_return_address(0)); | 49468 | __builtin_return_address(0)); |
49219 | } | 49469 | } |
49220 | EXPORT_SYMBOL(__stack_chk_fail); | 49470 | EXPORT_SYMBOL(__stack_chk_fail); |
49221 | diff -urNp linux-2.6.32.15/kernel/params.c linux-2.6.32.15/kernel/params.c | 49471 | diff -urNp linux-2.6.32.16/kernel/params.c linux-2.6.32.16/kernel/params.c |
49222 | --- linux-2.6.32.15/kernel/params.c 2010-03-15 11:52:04.000000000 -0400 | 49472 | --- linux-2.6.32.16/kernel/params.c 2010-07-05 14:14:00.000000000 -0400 |
49223 | +++ linux-2.6.32.15/kernel/params.c 2010-05-28 21:27:16.442904432 -0400 | 49473 | +++ linux-2.6.32.16/kernel/params.c 2010-07-09 14:50:38.000000000 -0400 |
49224 | @@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct | 49474 | @@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct |
49225 | return ret; | 49475 | return ret; |
49226 | } | 49476 | } |
@@ -49239,9 +49489,9 @@ diff -urNp linux-2.6.32.15/kernel/params.c linux-2.6.32.15/kernel/params.c | |||
49239 | .filter = uevent_filter, | 49489 | .filter = uevent_filter, |
49240 | }; | 49490 | }; |
49241 | 49491 | ||
49242 | diff -urNp linux-2.6.32.15/kernel/pid.c linux-2.6.32.15/kernel/pid.c | 49492 | diff -urNp linux-2.6.32.16/kernel/pid.c linux-2.6.32.16/kernel/pid.c |
49243 | --- linux-2.6.32.15/kernel/pid.c 2010-03-15 11:52:04.000000000 -0400 | 49493 | --- linux-2.6.32.16/kernel/pid.c 2010-07-05 14:14:00.000000000 -0400 |
49244 | +++ linux-2.6.32.15/kernel/pid.c 2010-05-28 21:27:16.442904432 -0400 | 49494 | +++ linux-2.6.32.16/kernel/pid.c 2010-07-09 14:50:38.000000000 -0400 |
49245 | @@ -33,6 +33,7 @@ | 49495 | @@ -33,6 +33,7 @@ |
49246 | #include <linux/rculist.h> | 49496 | #include <linux/rculist.h> |
49247 | #include <linux/bootmem.h> | 49497 | #include <linux/bootmem.h> |
@@ -49275,9 +49525,9 @@ diff -urNp linux-2.6.32.15/kernel/pid.c linux-2.6.32.15/kernel/pid.c | |||
49275 | } | 49525 | } |
49276 | 49526 | ||
49277 | struct task_struct *find_task_by_vpid(pid_t vnr) | 49527 | struct task_struct *find_task_by_vpid(pid_t vnr) |
49278 | diff -urNp linux-2.6.32.15/kernel/posix-cpu-timers.c linux-2.6.32.15/kernel/posix-cpu-timers.c | 49528 | diff -urNp linux-2.6.32.16/kernel/posix-cpu-timers.c linux-2.6.32.16/kernel/posix-cpu-timers.c |
49279 | --- linux-2.6.32.15/kernel/posix-cpu-timers.c 2010-03-15 11:52:04.000000000 -0400 | 49529 | --- linux-2.6.32.16/kernel/posix-cpu-timers.c 2010-07-05 14:14:00.000000000 -0400 |
49280 | +++ linux-2.6.32.15/kernel/posix-cpu-timers.c 2010-05-28 21:27:16.442904432 -0400 | 49530 | +++ linux-2.6.32.16/kernel/posix-cpu-timers.c 2010-07-09 14:50:38.000000000 -0400 |
49281 | @@ -6,6 +6,7 @@ | 49531 | @@ -6,6 +6,7 @@ |
49282 | #include <linux/posix-timers.h> | 49532 | #include <linux/posix-timers.h> |
49283 | #include <linux/errno.h> | 49533 | #include <linux/errno.h> |
@@ -49286,25 +49536,25 @@ diff -urNp linux-2.6.32.15/kernel/posix-cpu-timers.c linux-2.6.32.15/kernel/posi | |||
49286 | #include <asm/uaccess.h> | 49536 | #include <asm/uaccess.h> |
49287 | #include <linux/kernel_stat.h> | 49537 | #include <linux/kernel_stat.h> |
49288 | #include <trace/events/timer.h> | 49538 | #include <trace/events/timer.h> |
49289 | @@ -1044,6 +1045,7 @@ static void check_thread_timers(struct t | 49539 | @@ -1035,6 +1036,7 @@ static void check_thread_timers(struct t |
49290 | __group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk); | 49540 | unsigned long hard = sig->rlim[RLIMIT_RTTIME].rlim_max; |
49291 | return; | 49541 | unsigned long *soft = &sig->rlim[RLIMIT_RTTIME].rlim_cur; |
49292 | } | 49542 | |
49293 | + gr_learn_resource(tsk, RLIMIT_RTTIME, tsk->rt.timeout, 1); | 49543 | + gr_learn_resource(tsk, RLIMIT_RTTIME, tsk->rt.timeout * (USEC_PER_SEC/HZ), 1); |
49294 | if (tsk->rt.timeout > DIV_ROUND_UP(*soft, USEC_PER_SEC/HZ)) { | 49544 | if (hard != RLIM_INFINITY && |
49545 | tsk->rt.timeout > DIV_ROUND_UP(hard, USEC_PER_SEC/HZ)) { | ||
49295 | /* | 49546 | /* |
49296 | * At the soft limit, send a SIGXCPU every second. | 49547 | @@ -1198,6 +1200,7 @@ static void check_process_timers(struct |
49297 | @@ -1206,6 +1208,7 @@ static void check_process_timers(struct | 49548 | if (sig->rlim[RLIMIT_CPU].rlim_cur != RLIM_INFINITY) { |
49298 | __group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk); | 49549 | unsigned long psecs = cputime_to_secs(ptime); |
49299 | return; | 49550 | cputime_t x; |
49300 | } | ||
49301 | + gr_learn_resource(tsk, RLIMIT_CPU, psecs, 0); | 49551 | + gr_learn_resource(tsk, RLIMIT_CPU, psecs, 0); |
49302 | if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) { | 49552 | if (psecs >= sig->rlim[RLIMIT_CPU].rlim_max) { |
49303 | /* | 49553 | /* |
49304 | * At the soft limit, send a SIGXCPU every second. | 49554 | * At the hard limit, we just die. |
49305 | diff -urNp linux-2.6.32.15/kernel/power/hibernate.c linux-2.6.32.15/kernel/power/hibernate.c | 49555 | diff -urNp linux-2.6.32.16/kernel/power/hibernate.c linux-2.6.32.16/kernel/power/hibernate.c |
49306 | --- linux-2.6.32.15/kernel/power/hibernate.c 2010-03-15 11:52:04.000000000 -0400 | 49556 | --- linux-2.6.32.16/kernel/power/hibernate.c 2010-07-05 14:14:00.000000000 -0400 |
49307 | +++ linux-2.6.32.15/kernel/power/hibernate.c 2010-05-28 21:27:16.442904432 -0400 | 49557 | +++ linux-2.6.32.16/kernel/power/hibernate.c 2010-07-09 14:50:38.000000000 -0400 |
49308 | @@ -48,14 +48,14 @@ enum { | 49558 | @@ -48,14 +48,14 @@ enum { |
49309 | 49559 | ||
49310 | static int hibernation_mode = HIBERNATION_SHUTDOWN; | 49560 | static int hibernation_mode = HIBERNATION_SHUTDOWN; |
@@ -49322,9 +49572,9 @@ diff -urNp linux-2.6.32.15/kernel/power/hibernate.c linux-2.6.32.15/kernel/power | |||
49322 | { | 49572 | { |
49323 | if (ops && !(ops->begin && ops->end && ops->pre_snapshot | 49573 | if (ops && !(ops->begin && ops->end && ops->pre_snapshot |
49324 | && ops->prepare && ops->finish && ops->enter && ops->pre_restore | 49574 | && ops->prepare && ops->finish && ops->enter && ops->pre_restore |
49325 | diff -urNp linux-2.6.32.15/kernel/power/poweroff.c linux-2.6.32.15/kernel/power/poweroff.c | 49575 | diff -urNp linux-2.6.32.16/kernel/power/poweroff.c linux-2.6.32.16/kernel/power/poweroff.c |
49326 | --- linux-2.6.32.15/kernel/power/poweroff.c 2010-03-15 11:52:04.000000000 -0400 | 49576 | --- linux-2.6.32.16/kernel/power/poweroff.c 2010-07-05 14:14:00.000000000 -0400 |
49327 | +++ linux-2.6.32.15/kernel/power/poweroff.c 2010-05-28 21:27:16.442904432 -0400 | 49577 | +++ linux-2.6.32.16/kernel/power/poweroff.c 2010-07-09 14:50:38.000000000 -0400 |
49328 | @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof | 49578 | @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof |
49329 | .enable_mask = SYSRQ_ENABLE_BOOT, | 49579 | .enable_mask = SYSRQ_ENABLE_BOOT, |
49330 | }; | 49580 | }; |
@@ -49334,9 +49584,9 @@ diff -urNp linux-2.6.32.15/kernel/power/poweroff.c linux-2.6.32.15/kernel/power/ | |||
49334 | { | 49584 | { |
49335 | register_sysrq_key('o', &sysrq_poweroff_op); | 49585 | register_sysrq_key('o', &sysrq_poweroff_op); |
49336 | return 0; | 49586 | return 0; |
49337 | diff -urNp linux-2.6.32.15/kernel/power/process.c linux-2.6.32.15/kernel/power/process.c | 49587 | diff -urNp linux-2.6.32.16/kernel/power/process.c linux-2.6.32.16/kernel/power/process.c |
49338 | --- linux-2.6.32.15/kernel/power/process.c 2010-04-29 17:49:38.590000225 -0400 | 49588 | --- linux-2.6.32.16/kernel/power/process.c 2010-07-05 14:14:00.000000000 -0400 |
49339 | +++ linux-2.6.32.15/kernel/power/process.c 2010-05-28 21:27:16.442904432 -0400 | 49589 | +++ linux-2.6.32.16/kernel/power/process.c 2010-07-09 14:50:38.000000000 -0400 |
49340 | @@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_ | 49590 | @@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_ |
49341 | struct timeval start, end; | 49591 | struct timeval start, end; |
49342 | u64 elapsed_csecs64; | 49592 | u64 elapsed_csecs64; |
@@ -49376,9 +49626,9 @@ diff -urNp linux-2.6.32.15/kernel/power/process.c linux-2.6.32.15/kernel/power/p | |||
49376 | 49626 | ||
49377 | do_gettimeofday(&end); | 49627 | do_gettimeofday(&end); |
49378 | elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start); | 49628 | elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start); |
49379 | diff -urNp linux-2.6.32.15/kernel/power/suspend.c linux-2.6.32.15/kernel/power/suspend.c | 49629 | diff -urNp linux-2.6.32.16/kernel/power/suspend.c linux-2.6.32.16/kernel/power/suspend.c |
49380 | --- linux-2.6.32.15/kernel/power/suspend.c 2010-03-15 11:52:04.000000000 -0400 | 49630 | --- linux-2.6.32.16/kernel/power/suspend.c 2010-07-05 14:14:00.000000000 -0400 |
49381 | +++ linux-2.6.32.15/kernel/power/suspend.c 2010-05-28 21:27:16.442904432 -0400 | 49631 | +++ linux-2.6.32.16/kernel/power/suspend.c 2010-07-09 14:50:38.000000000 -0400 |
49382 | @@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M | 49632 | @@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M |
49383 | [PM_SUSPEND_MEM] = "mem", | 49633 | [PM_SUSPEND_MEM] = "mem", |
49384 | }; | 49634 | }; |
@@ -49395,9 +49645,9 @@ diff -urNp linux-2.6.32.15/kernel/power/suspend.c linux-2.6.32.15/kernel/power/s | |||
49395 | { | 49645 | { |
49396 | mutex_lock(&pm_mutex); | 49646 | mutex_lock(&pm_mutex); |
49397 | suspend_ops = ops; | 49647 | suspend_ops = ops; |
49398 | diff -urNp linux-2.6.32.15/kernel/printk.c linux-2.6.32.15/kernel/printk.c | 49648 | diff -urNp linux-2.6.32.16/kernel/printk.c linux-2.6.32.16/kernel/printk.c |
49399 | --- linux-2.6.32.15/kernel/printk.c 2010-03-15 11:52:04.000000000 -0400 | 49649 | --- linux-2.6.32.16/kernel/printk.c 2010-07-05 14:14:00.000000000 -0400 |
49400 | +++ linux-2.6.32.15/kernel/printk.c 2010-05-28 21:27:16.442904432 -0400 | 49650 | +++ linux-2.6.32.16/kernel/printk.c 2010-07-09 14:50:38.000000000 -0400 |
49401 | @@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf | 49651 | @@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf |
49402 | char c; | 49652 | char c; |
49403 | int error = 0; | 49653 | int error = 0; |
@@ -49410,9 +49660,9 @@ diff -urNp linux-2.6.32.15/kernel/printk.c linux-2.6.32.15/kernel/printk.c | |||
49410 | error = security_syslog(type); | 49660 | error = security_syslog(type); |
49411 | if (error) | 49661 | if (error) |
49412 | return error; | 49662 | return error; |
49413 | diff -urNp linux-2.6.32.15/kernel/ptrace.c linux-2.6.32.15/kernel/ptrace.c | 49663 | diff -urNp linux-2.6.32.16/kernel/ptrace.c linux-2.6.32.16/kernel/ptrace.c |
49414 | --- linux-2.6.32.15/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400 | 49664 | --- linux-2.6.32.16/kernel/ptrace.c 2010-07-05 14:14:00.000000000 -0400 |
49415 | +++ linux-2.6.32.15/kernel/ptrace.c 2010-05-28 21:27:16.442904432 -0400 | 49665 | +++ linux-2.6.32.16/kernel/ptrace.c 2010-07-09 14:50:38.000000000 -0400 |
49416 | @@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru | 49666 | @@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru |
49417 | cred->gid != tcred->egid || | 49667 | cred->gid != tcred->egid || |
49418 | cred->gid != tcred->sgid || | 49668 | cred->gid != tcred->sgid || |
@@ -49494,9 +49744,9 @@ diff -urNp linux-2.6.32.15/kernel/ptrace.c linux-2.6.32.15/kernel/ptrace.c | |||
49494 | } | 49744 | } |
49495 | 49745 | ||
49496 | int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data) | 49746 | int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data) |
49497 | diff -urNp linux-2.6.32.15/kernel/rcutree.c linux-2.6.32.15/kernel/rcutree.c | 49747 | diff -urNp linux-2.6.32.16/kernel/rcutree.c linux-2.6.32.16/kernel/rcutree.c |
49498 | --- linux-2.6.32.15/kernel/rcutree.c 2010-03-15 11:52:04.000000000 -0400 | 49748 | --- linux-2.6.32.16/kernel/rcutree.c 2010-07-05 14:14:00.000000000 -0400 |
49499 | +++ linux-2.6.32.15/kernel/rcutree.c 2010-05-28 21:27:16.442904432 -0400 | 49749 | +++ linux-2.6.32.16/kernel/rcutree.c 2010-07-09 14:50:38.000000000 -0400 |
49500 | @@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state | 49750 | @@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state |
49501 | /* | 49751 | /* |
49502 | * Do softirq processing for the current CPU. | 49752 | * Do softirq processing for the current CPU. |
@@ -49506,9 +49756,9 @@ diff -urNp linux-2.6.32.15/kernel/rcutree.c linux-2.6.32.15/kernel/rcutree.c | |||
49506 | { | 49756 | { |
49507 | /* | 49757 | /* |
49508 | * Memory references from any prior RCU read-side critical sections | 49758 | * Memory references from any prior RCU read-side critical sections |
49509 | diff -urNp linux-2.6.32.15/kernel/relay.c linux-2.6.32.15/kernel/relay.c | 49759 | diff -urNp linux-2.6.32.16/kernel/relay.c linux-2.6.32.16/kernel/relay.c |
49510 | --- linux-2.6.32.15/kernel/relay.c 2010-03-15 11:52:04.000000000 -0400 | 49760 | --- linux-2.6.32.16/kernel/relay.c 2010-07-05 14:14:00.000000000 -0400 |
49511 | +++ linux-2.6.32.15/kernel/relay.c 2010-05-28 21:27:16.442904432 -0400 | 49761 | +++ linux-2.6.32.16/kernel/relay.c 2010-07-09 14:50:38.000000000 -0400 |
49512 | @@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi | 49762 | @@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi |
49513 | return 0; | 49763 | return 0; |
49514 | 49764 | ||
@@ -49518,9 +49768,9 @@ diff -urNp linux-2.6.32.15/kernel/relay.c linux-2.6.32.15/kernel/relay.c | |||
49518 | return ret; | 49768 | return ret; |
49519 | 49769 | ||
49520 | if (read_start + ret == nonpad_end) | 49770 | if (read_start + ret == nonpad_end) |
49521 | diff -urNp linux-2.6.32.15/kernel/resource.c linux-2.6.32.15/kernel/resource.c | 49771 | diff -urNp linux-2.6.32.16/kernel/resource.c linux-2.6.32.16/kernel/resource.c |
49522 | --- linux-2.6.32.15/kernel/resource.c 2010-03-15 11:52:04.000000000 -0400 | 49772 | --- linux-2.6.32.16/kernel/resource.c 2010-07-05 14:14:00.000000000 -0400 |
49523 | +++ linux-2.6.32.15/kernel/resource.c 2010-05-28 21:27:16.442904432 -0400 | 49773 | +++ linux-2.6.32.16/kernel/resource.c 2010-07-09 14:50:38.000000000 -0400 |
49524 | @@ -132,8 +132,18 @@ static const struct file_operations proc | 49774 | @@ -132,8 +132,18 @@ static const struct file_operations proc |
49525 | 49775 | ||
49526 | static int __init ioresources_init(void) | 49776 | static int __init ioresources_init(void) |
@@ -49540,9 +49790,9 @@ diff -urNp linux-2.6.32.15/kernel/resource.c linux-2.6.32.15/kernel/resource.c | |||
49540 | return 0; | 49790 | return 0; |
49541 | } | 49791 | } |
49542 | __initcall(ioresources_init); | 49792 | __initcall(ioresources_init); |
49543 | diff -urNp linux-2.6.32.15/kernel/sched.c linux-2.6.32.15/kernel/sched.c | 49793 | diff -urNp linux-2.6.32.16/kernel/sched.c linux-2.6.32.16/kernel/sched.c |
49544 | --- linux-2.6.32.15/kernel/sched.c 2010-04-29 17:49:38.609495328 -0400 | 49794 | --- linux-2.6.32.16/kernel/sched.c 2010-07-05 14:14:00.000000000 -0400 |
49545 | +++ linux-2.6.32.15/kernel/sched.c 2010-05-28 21:27:16.447114196 -0400 | 49795 | +++ linux-2.6.32.16/kernel/sched.c 2010-07-09 14:50:38.000000000 -0400 |
49546 | @@ -4841,7 +4841,7 @@ out: | 49796 | @@ -4841,7 +4841,7 @@ out: |
49547 | * In CONFIG_NO_HZ case, the idle load balance owner will do the | 49797 | * In CONFIG_NO_HZ case, the idle load balance owner will do the |
49548 | * rebalancing for all the cpus for whom scheduler ticks are stopped. | 49798 | * rebalancing for all the cpus for whom scheduler ticks are stopped. |
@@ -49571,16 +49821,7 @@ diff -urNp linux-2.6.32.15/kernel/sched.c linux-2.6.32.15/kernel/sched.c | |||
49571 | return -EPERM; | 49821 | return -EPERM; |
49572 | 49822 | ||
49573 | retval = security_task_setnice(current, nice); | 49823 | retval = security_task_setnice(current, nice); |
49574 | @@ -6293,6 +6296,8 @@ recheck: | 49824 | @@ -7452,7 +7455,7 @@ static struct ctl_table sd_ctl_dir[] = { |
49575 | if (rt_policy(policy)) { | ||
49576 | unsigned long rlim_rtprio; | ||
49577 | |||
49578 | + gr_learn_resource(p, RLIMIT_RTPRIO, param->sched_priority, 1); | ||
49579 | + | ||
49580 | if (!lock_task_sighand(p, &flags)) | ||
49581 | return -ESRCH; | ||
49582 | rlim_rtprio = p->signal->rlim[RLIMIT_RTPRIO].rlim_cur; | ||
49583 | @@ -7452,7 +7457,7 @@ static struct ctl_table sd_ctl_dir[] = { | ||
49584 | .procname = "sched_domain", | 49825 | .procname = "sched_domain", |
49585 | .mode = 0555, | 49826 | .mode = 0555, |
49586 | }, | 49827 | }, |
@@ -49589,7 +49830,7 @@ diff -urNp linux-2.6.32.15/kernel/sched.c linux-2.6.32.15/kernel/sched.c | |||
49589 | }; | 49830 | }; |
49590 | 49831 | ||
49591 | static struct ctl_table sd_ctl_root[] = { | 49832 | static struct ctl_table sd_ctl_root[] = { |
49592 | @@ -7462,7 +7467,7 @@ static struct ctl_table sd_ctl_root[] = | 49833 | @@ -7462,7 +7465,7 @@ static struct ctl_table sd_ctl_root[] = |
49593 | .mode = 0555, | 49834 | .mode = 0555, |
49594 | .child = sd_ctl_dir, | 49835 | .child = sd_ctl_dir, |
49595 | }, | 49836 | }, |
@@ -49598,9 +49839,9 @@ diff -urNp linux-2.6.32.15/kernel/sched.c linux-2.6.32.15/kernel/sched.c | |||
49598 | }; | 49839 | }; |
49599 | 49840 | ||
49600 | static struct ctl_table *sd_alloc_ctl_entry(int n) | 49841 | static struct ctl_table *sd_alloc_ctl_entry(int n) |
49601 | diff -urNp linux-2.6.32.15/kernel/signal.c linux-2.6.32.15/kernel/signal.c | 49842 | diff -urNp linux-2.6.32.16/kernel/signal.c linux-2.6.32.16/kernel/signal.c |
49602 | --- linux-2.6.32.15/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400 | 49843 | --- linux-2.6.32.16/kernel/signal.c 2010-07-05 14:14:00.000000000 -0400 |
49603 | +++ linux-2.6.32.15/kernel/signal.c 2010-05-28 21:27:16.447114196 -0400 | 49844 | +++ linux-2.6.32.16/kernel/signal.c 2010-07-09 14:50:38.000000000 -0400 |
49604 | @@ -41,12 +41,12 @@ | 49845 | @@ -41,12 +41,12 @@ |
49605 | 49846 | ||
49606 | static struct kmem_cache *sigqueue_cachep; | 49847 | static struct kmem_cache *sigqueue_cachep; |
@@ -49644,7 +49885,7 @@ diff -urNp linux-2.6.32.15/kernel/signal.c linux-2.6.32.15/kernel/signal.c | |||
49644 | if (is_global_init(tsk)) | 49885 | if (is_global_init(tsk)) |
49645 | return 1; | 49886 | return 1; |
49646 | if (handler != SIG_IGN && handler != SIG_DFL) | 49887 | if (handler != SIG_IGN && handler != SIG_DFL) |
49647 | @@ -625,6 +628,9 @@ static int check_kill_permission(int sig | 49888 | @@ -627,6 +630,9 @@ static int check_kill_permission(int sig |
49648 | } | 49889 | } |
49649 | } | 49890 | } |
49650 | 49891 | ||
@@ -49654,7 +49895,7 @@ diff -urNp linux-2.6.32.15/kernel/signal.c linux-2.6.32.15/kernel/signal.c | |||
49654 | return security_task_kill(t, info, sig, 0); | 49895 | return security_task_kill(t, info, sig, 0); |
49655 | } | 49896 | } |
49656 | 49897 | ||
49657 | @@ -966,7 +972,7 @@ __group_send_sig_info(int sig, struct si | 49898 | @@ -968,7 +974,7 @@ __group_send_sig_info(int sig, struct si |
49658 | return send_signal(sig, info, p, 1); | 49899 | return send_signal(sig, info, p, 1); |
49659 | } | 49900 | } |
49660 | 49901 | ||
@@ -49663,7 +49904,7 @@ diff -urNp linux-2.6.32.15/kernel/signal.c linux-2.6.32.15/kernel/signal.c | |||
49663 | specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t) | 49904 | specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t) |
49664 | { | 49905 | { |
49665 | return send_signal(sig, info, t, 0); | 49906 | return send_signal(sig, info, t, 0); |
49666 | @@ -1020,6 +1026,9 @@ force_sig_info(int sig, struct siginfo * | 49907 | @@ -1022,6 +1028,9 @@ force_sig_info(int sig, struct siginfo * |
49667 | ret = specific_send_sig_info(sig, info, t); | 49908 | ret = specific_send_sig_info(sig, info, t); |
49668 | spin_unlock_irqrestore(&t->sighand->siglock, flags); | 49909 | spin_unlock_irqrestore(&t->sighand->siglock, flags); |
49669 | 49910 | ||
@@ -49673,7 +49914,7 @@ diff -urNp linux-2.6.32.15/kernel/signal.c linux-2.6.32.15/kernel/signal.c | |||
49673 | return ret; | 49914 | return ret; |
49674 | } | 49915 | } |
49675 | 49916 | ||
49676 | @@ -1079,8 +1088,11 @@ int group_send_sig_info(int sig, struct | 49917 | @@ -1081,8 +1090,11 @@ int group_send_sig_info(int sig, struct |
49677 | { | 49918 | { |
49678 | int ret = check_kill_permission(sig, info, p); | 49919 | int ret = check_kill_permission(sig, info, p); |
49679 | 49920 | ||
@@ -49686,9 +49927,9 @@ diff -urNp linux-2.6.32.15/kernel/signal.c linux-2.6.32.15/kernel/signal.c | |||
49686 | 49927 | ||
49687 | return ret; | 49928 | return ret; |
49688 | } | 49929 | } |
49689 | diff -urNp linux-2.6.32.15/kernel/smp.c linux-2.6.32.15/kernel/smp.c | 49930 | diff -urNp linux-2.6.32.16/kernel/smp.c linux-2.6.32.16/kernel/smp.c |
49690 | --- linux-2.6.32.15/kernel/smp.c 2010-03-15 11:52:04.000000000 -0400 | 49931 | --- linux-2.6.32.16/kernel/smp.c 2010-07-05 14:14:00.000000000 -0400 |
49691 | +++ linux-2.6.32.15/kernel/smp.c 2010-05-28 21:27:16.447114196 -0400 | 49932 | +++ linux-2.6.32.16/kernel/smp.c 2010-07-09 14:50:38.000000000 -0400 |
49692 | @@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void | 49933 | @@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void |
49693 | } | 49934 | } |
49694 | EXPORT_SYMBOL(smp_call_function); | 49935 | EXPORT_SYMBOL(smp_call_function); |
@@ -49716,9 +49957,9 @@ diff -urNp linux-2.6.32.15/kernel/smp.c linux-2.6.32.15/kernel/smp.c | |||
49716 | { | 49957 | { |
49717 | spin_unlock_irq(&call_function.lock); | 49958 | spin_unlock_irq(&call_function.lock); |
49718 | } | 49959 | } |
49719 | diff -urNp linux-2.6.32.15/kernel/softirq.c linux-2.6.32.15/kernel/softirq.c | 49960 | diff -urNp linux-2.6.32.16/kernel/softirq.c linux-2.6.32.16/kernel/softirq.c |
49720 | --- linux-2.6.32.15/kernel/softirq.c 2010-03-15 11:52:04.000000000 -0400 | 49961 | --- linux-2.6.32.16/kernel/softirq.c 2010-07-05 14:14:00.000000000 -0400 |
49721 | +++ linux-2.6.32.15/kernel/softirq.c 2010-05-28 21:27:16.447114196 -0400 | 49962 | +++ linux-2.6.32.16/kernel/softirq.c 2010-07-09 14:50:38.000000000 -0400 |
49722 | @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec | 49963 | @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec |
49723 | 49964 | ||
49724 | static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); | 49965 | static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); |
@@ -49773,9 +50014,9 @@ diff -urNp linux-2.6.32.15/kernel/softirq.c linux-2.6.32.15/kernel/softirq.c | |||
49773 | { | 50014 | { |
49774 | struct tasklet_struct *list; | 50015 | struct tasklet_struct *list; |
49775 | 50016 | ||
49776 | diff -urNp linux-2.6.32.15/kernel/sys.c linux-2.6.32.15/kernel/sys.c | 50017 | diff -urNp linux-2.6.32.16/kernel/sys.c linux-2.6.32.16/kernel/sys.c |
49777 | --- linux-2.6.32.15/kernel/sys.c 2010-03-15 11:52:04.000000000 -0400 | 50018 | --- linux-2.6.32.16/kernel/sys.c 2010-07-05 14:14:00.000000000 -0400 |
49778 | +++ linux-2.6.32.15/kernel/sys.c 2010-05-28 21:27:16.447114196 -0400 | 50019 | +++ linux-2.6.32.16/kernel/sys.c 2010-07-09 14:50:38.000000000 -0400 |
49779 | @@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru | 50020 | @@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru |
49780 | error = -EACCES; | 50021 | error = -EACCES; |
49781 | goto out; | 50022 | goto out; |
@@ -49911,9 +50152,9 @@ diff -urNp linux-2.6.32.15/kernel/sys.c linux-2.6.32.15/kernel/sys.c | |||
49911 | error = -EINVAL; | 50152 | error = -EINVAL; |
49912 | break; | 50153 | break; |
49913 | } | 50154 | } |
49914 | diff -urNp linux-2.6.32.15/kernel/sysctl.c linux-2.6.32.15/kernel/sysctl.c | 50155 | diff -urNp linux-2.6.32.16/kernel/sysctl.c linux-2.6.32.16/kernel/sysctl.c |
49915 | --- linux-2.6.32.15/kernel/sysctl.c 2010-03-15 11:52:04.000000000 -0400 | 50156 | --- linux-2.6.32.16/kernel/sysctl.c 2010-07-05 14:14:00.000000000 -0400 |
49916 | +++ linux-2.6.32.15/kernel/sysctl.c 2010-05-28 21:27:16.447114196 -0400 | 50157 | +++ linux-2.6.32.16/kernel/sysctl.c 2010-07-09 14:50:38.000000000 -0400 |
49917 | @@ -63,6 +63,13 @@ | 50158 | @@ -63,6 +63,13 @@ |
49918 | static int deprecated_sysctl_warning(struct __sysctl_args *args); | 50159 | static int deprecated_sysctl_warning(struct __sysctl_args *args); |
49919 | 50160 | ||
@@ -50035,9 +50276,9 @@ diff -urNp linux-2.6.32.15/kernel/sysctl.c linux-2.6.32.15/kernel/sysctl.c | |||
50035 | error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC)); | 50276 | error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC)); |
50036 | if (error) | 50277 | if (error) |
50037 | return error; | 50278 | return error; |
50038 | diff -urNp linux-2.6.32.15/kernel/taskstats.c linux-2.6.32.15/kernel/taskstats.c | 50279 | diff -urNp linux-2.6.32.16/kernel/taskstats.c linux-2.6.32.16/kernel/taskstats.c |
50039 | --- linux-2.6.32.15/kernel/taskstats.c 2010-03-15 11:52:04.000000000 -0400 | 50280 | --- linux-2.6.32.16/kernel/taskstats.c 2010-07-05 14:14:00.000000000 -0400 |
50040 | +++ linux-2.6.32.15/kernel/taskstats.c 2010-05-28 21:27:16.447114196 -0400 | 50281 | +++ linux-2.6.32.16/kernel/taskstats.c 2010-07-09 14:50:38.000000000 -0400 |
50041 | @@ -26,9 +26,12 @@ | 50282 | @@ -26,9 +26,12 @@ |
50042 | #include <linux/cgroup.h> | 50283 | #include <linux/cgroup.h> |
50043 | #include <linux/fs.h> | 50284 | #include <linux/fs.h> |
@@ -50061,9 +50302,9 @@ diff -urNp linux-2.6.32.15/kernel/taskstats.c linux-2.6.32.15/kernel/taskstats.c | |||
50061 | if (!alloc_cpumask_var(&mask, GFP_KERNEL)) | 50302 | if (!alloc_cpumask_var(&mask, GFP_KERNEL)) |
50062 | return -ENOMEM; | 50303 | return -ENOMEM; |
50063 | 50304 | ||
50064 | diff -urNp linux-2.6.32.15/kernel/time/tick-broadcast.c linux-2.6.32.15/kernel/time/tick-broadcast.c | 50305 | diff -urNp linux-2.6.32.16/kernel/time/tick-broadcast.c linux-2.6.32.16/kernel/time/tick-broadcast.c |
50065 | --- linux-2.6.32.15/kernel/time/tick-broadcast.c 2010-03-15 11:52:04.000000000 -0400 | 50306 | --- linux-2.6.32.16/kernel/time/tick-broadcast.c 2010-07-05 14:14:00.000000000 -0400 |
50066 | +++ linux-2.6.32.15/kernel/time/tick-broadcast.c 2010-05-28 21:27:16.447114196 -0400 | 50307 | +++ linux-2.6.32.16/kernel/time/tick-broadcast.c 2010-07-09 14:50:38.000000000 -0400 |
50067 | @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl | 50308 | @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl |
50068 | * then clear the broadcast bit. | 50309 | * then clear the broadcast bit. |
50069 | */ | 50310 | */ |
@@ -50073,9 +50314,9 @@ diff -urNp linux-2.6.32.15/kernel/time/tick-broadcast.c linux-2.6.32.15/kernel/t | |||
50073 | 50314 | ||
50074 | cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); | 50315 | cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); |
50075 | tick_broadcast_clear_oneshot(cpu); | 50316 | tick_broadcast_clear_oneshot(cpu); |
50076 | diff -urNp linux-2.6.32.15/kernel/time.c linux-2.6.32.15/kernel/time.c | 50317 | diff -urNp linux-2.6.32.16/kernel/time.c linux-2.6.32.16/kernel/time.c |
50077 | --- linux-2.6.32.15/kernel/time.c 2010-03-15 11:52:04.000000000 -0400 | 50318 | --- linux-2.6.32.16/kernel/time.c 2010-07-05 14:14:00.000000000 -0400 |
50078 | +++ linux-2.6.32.15/kernel/time.c 2010-05-28 21:27:16.451020026 -0400 | 50319 | +++ linux-2.6.32.16/kernel/time.c 2010-07-09 14:50:38.000000000 -0400 |
50079 | @@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, | 50320 | @@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, |
50080 | return err; | 50321 | return err; |
50081 | 50322 | ||
@@ -50113,9 +50354,9 @@ diff -urNp linux-2.6.32.15/kernel/time.c linux-2.6.32.15/kernel/time.c | |||
50113 | { | 50354 | { |
50114 | #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) | 50355 | #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) |
50115 | return (USEC_PER_SEC / HZ) * j; | 50356 | return (USEC_PER_SEC / HZ) * j; |
50116 | diff -urNp linux-2.6.32.15/kernel/timer.c linux-2.6.32.15/kernel/timer.c | 50357 | diff -urNp linux-2.6.32.16/kernel/timer.c linux-2.6.32.16/kernel/timer.c |
50117 | --- linux-2.6.32.15/kernel/timer.c 2010-03-15 11:52:04.000000000 -0400 | 50358 | --- linux-2.6.32.16/kernel/timer.c 2010-07-05 14:14:00.000000000 -0400 |
50118 | +++ linux-2.6.32.15/kernel/timer.c 2010-05-28 21:27:16.451020026 -0400 | 50359 | +++ linux-2.6.32.16/kernel/timer.c 2010-07-09 14:50:38.000000000 -0400 |
50119 | @@ -1207,7 +1207,7 @@ void update_process_times(int user_tick) | 50360 | @@ -1207,7 +1207,7 @@ void update_process_times(int user_tick) |
50120 | /* | 50361 | /* |
50121 | * This function runs timers and the timer-tq in bottom half context. | 50362 | * This function runs timers and the timer-tq in bottom half context. |
@@ -50125,9 +50366,9 @@ diff -urNp linux-2.6.32.15/kernel/timer.c linux-2.6.32.15/kernel/timer.c | |||
50125 | { | 50366 | { |
50126 | struct tvec_base *base = __get_cpu_var(tvec_bases); | 50367 | struct tvec_base *base = __get_cpu_var(tvec_bases); |
50127 | 50368 | ||
50128 | diff -urNp linux-2.6.32.15/kernel/trace/ftrace.c linux-2.6.32.15/kernel/trace/ftrace.c | 50369 | diff -urNp linux-2.6.32.16/kernel/trace/ftrace.c linux-2.6.32.16/kernel/trace/ftrace.c |
50129 | --- linux-2.6.32.15/kernel/trace/ftrace.c 2010-04-04 20:41:50.068477203 -0400 | 50370 | --- linux-2.6.32.16/kernel/trace/ftrace.c 2010-07-05 14:14:00.000000000 -0400 |
50130 | +++ linux-2.6.32.15/kernel/trace/ftrace.c 2010-05-28 21:27:16.451020026 -0400 | 50371 | +++ linux-2.6.32.16/kernel/trace/ftrace.c 2010-07-09 14:50:38.000000000 -0400 |
50131 | @@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod, | 50372 | @@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod, |
50132 | 50373 | ||
50133 | ip = rec->ip; | 50374 | ip = rec->ip; |
@@ -50149,9 +50390,9 @@ diff -urNp linux-2.6.32.15/kernel/trace/ftrace.c linux-2.6.32.15/kernel/trace/ft | |||
50149 | } | 50390 | } |
50150 | 50391 | ||
50151 | /* | 50392 | /* |
50152 | diff -urNp linux-2.6.32.15/kernel/trace/Kconfig linux-2.6.32.15/kernel/trace/Kconfig | 50393 | diff -urNp linux-2.6.32.16/kernel/trace/Kconfig linux-2.6.32.16/kernel/trace/Kconfig |
50153 | --- linux-2.6.32.15/kernel/trace/Kconfig 2010-03-15 11:52:04.000000000 -0400 | 50394 | --- linux-2.6.32.16/kernel/trace/Kconfig 2010-07-05 14:14:00.000000000 -0400 |
50154 | +++ linux-2.6.32.15/kernel/trace/Kconfig 2010-05-28 21:27:16.451020026 -0400 | 50395 | +++ linux-2.6.32.16/kernel/trace/Kconfig 2010-07-09 14:50:38.000000000 -0400 |
50155 | @@ -126,6 +126,7 @@ if FTRACE | 50396 | @@ -126,6 +126,7 @@ if FTRACE |
50156 | config FUNCTION_TRACER | 50397 | config FUNCTION_TRACER |
50157 | bool "Kernel Function Tracer" | 50398 | bool "Kernel Function Tracer" |
@@ -50168,9 +50409,9 @@ diff -urNp linux-2.6.32.15/kernel/trace/Kconfig linux-2.6.32.15/kernel/trace/Kco | |||
50168 | select FUNCTION_TRACER | 50409 | select FUNCTION_TRACER |
50169 | select STACKTRACE | 50410 | select STACKTRACE |
50170 | select KALLSYMS | 50411 | select KALLSYMS |
50171 | diff -urNp linux-2.6.32.15/kernel/trace/ring_buffer.c linux-2.6.32.15/kernel/trace/ring_buffer.c | 50412 | diff -urNp linux-2.6.32.16/kernel/trace/ring_buffer.c linux-2.6.32.16/kernel/trace/ring_buffer.c |
50172 | --- linux-2.6.32.15/kernel/trace/ring_buffer.c 2010-04-04 20:41:50.072525146 -0400 | 50413 | --- linux-2.6.32.16/kernel/trace/ring_buffer.c 2010-07-05 14:14:00.000000000 -0400 |
50173 | +++ linux-2.6.32.15/kernel/trace/ring_buffer.c 2010-05-28 21:27:16.451020026 -0400 | 50414 | +++ linux-2.6.32.16/kernel/trace/ring_buffer.c 2010-07-09 14:50:38.000000000 -0400 |
50174 | @@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st | 50415 | @@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st |
50175 | * the reader page). But if the next page is a header page, | 50416 | * the reader page). But if the next page is a header page, |
50176 | * its flags will be non zero. | 50417 | * its flags will be non zero. |
@@ -50180,9 +50421,9 @@ diff -urNp linux-2.6.32.15/kernel/trace/ring_buffer.c linux-2.6.32.15/kernel/tra | |||
50180 | rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer, | 50421 | rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer, |
50181 | struct buffer_page *page, struct list_head *list) | 50422 | struct buffer_page *page, struct list_head *list) |
50182 | { | 50423 | { |
50183 | diff -urNp linux-2.6.32.15/kernel/trace/trace.c linux-2.6.32.15/kernel/trace/trace.c | 50424 | diff -urNp linux-2.6.32.16/kernel/trace/trace.c linux-2.6.32.16/kernel/trace/trace.c |
50184 | --- linux-2.6.32.15/kernel/trace/trace.c 2010-04-04 20:41:50.072525146 -0400 | 50425 | --- linux-2.6.32.16/kernel/trace/trace.c 2010-07-05 14:14:00.000000000 -0400 |
50185 | +++ linux-2.6.32.15/kernel/trace/trace.c 2010-05-28 21:27:16.451020026 -0400 | 50426 | +++ linux-2.6.32.16/kernel/trace/trace.c 2010-07-09 14:50:38.000000000 -0400 |
50186 | @@ -3808,10 +3808,9 @@ static const struct file_operations trac | 50427 | @@ -3808,10 +3808,9 @@ static const struct file_operations trac |
50187 | }; | 50428 | }; |
50188 | #endif | 50429 | #endif |
@@ -50207,9 +50448,9 @@ diff -urNp linux-2.6.32.15/kernel/trace/trace.c linux-2.6.32.15/kernel/trace/tra | |||
50207 | static int once; | 50448 | static int once; |
50208 | struct dentry *d_tracer; | 50449 | struct dentry *d_tracer; |
50209 | 50450 | ||
50210 | diff -urNp linux-2.6.32.15/kernel/trace/trace_events.c linux-2.6.32.15/kernel/trace/trace_events.c | 50451 | diff -urNp linux-2.6.32.16/kernel/trace/trace_events.c linux-2.6.32.16/kernel/trace/trace_events.c |
50211 | --- linux-2.6.32.15/kernel/trace/trace_events.c 2010-03-15 11:52:04.000000000 -0400 | 50452 | --- linux-2.6.32.16/kernel/trace/trace_events.c 2010-07-05 14:14:00.000000000 -0400 |
50212 | +++ linux-2.6.32.15/kernel/trace/trace_events.c 2010-05-28 21:27:16.451020026 -0400 | 50453 | +++ linux-2.6.32.16/kernel/trace/trace_events.c 2010-07-09 14:50:38.000000000 -0400 |
50213 | @@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list | 50454 | @@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list |
50214 | * Modules must own their file_operations to keep up with | 50455 | * Modules must own their file_operations to keep up with |
50215 | * reference counting. | 50456 | * reference counting. |
@@ -50219,9 +50460,9 @@ diff -urNp linux-2.6.32.15/kernel/trace/trace_events.c linux-2.6.32.15/kernel/tr | |||
50219 | struct ftrace_module_file_ops { | 50460 | struct ftrace_module_file_ops { |
50220 | struct list_head list; | 50461 | struct list_head list; |
50221 | struct module *mod; | 50462 | struct module *mod; |
50222 | diff -urNp linux-2.6.32.15/kernel/trace/trace_output.c linux-2.6.32.15/kernel/trace/trace_output.c | 50463 | diff -urNp linux-2.6.32.16/kernel/trace/trace_output.c linux-2.6.32.16/kernel/trace/trace_output.c |
50223 | --- linux-2.6.32.15/kernel/trace/trace_output.c 2010-03-15 11:52:04.000000000 -0400 | 50464 | --- linux-2.6.32.16/kernel/trace/trace_output.c 2010-07-05 14:14:00.000000000 -0400 |
50224 | +++ linux-2.6.32.15/kernel/trace/trace_output.c 2010-05-28 21:27:16.451020026 -0400 | 50465 | +++ linux-2.6.32.16/kernel/trace/trace_output.c 2010-07-09 14:50:38.000000000 -0400 |
50225 | @@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s, | 50466 | @@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s, |
50226 | return 0; | 50467 | return 0; |
50227 | p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); | 50468 | p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); |
@@ -50231,9 +50472,9 @@ diff -urNp linux-2.6.32.15/kernel/trace/trace_output.c linux-2.6.32.15/kernel/tr | |||
50231 | if (p) { | 50472 | if (p) { |
50232 | s->len = p - s->buffer; | 50473 | s->len = p - s->buffer; |
50233 | return 1; | 50474 | return 1; |
50234 | diff -urNp linux-2.6.32.15/kernel/trace/trace_stack.c linux-2.6.32.15/kernel/trace/trace_stack.c | 50475 | diff -urNp linux-2.6.32.16/kernel/trace/trace_stack.c linux-2.6.32.16/kernel/trace/trace_stack.c |
50235 | --- linux-2.6.32.15/kernel/trace/trace_stack.c 2010-03-15 11:52:04.000000000 -0400 | 50476 | --- linux-2.6.32.16/kernel/trace/trace_stack.c 2010-07-05 14:14:00.000000000 -0400 |
50236 | +++ linux-2.6.32.15/kernel/trace/trace_stack.c 2010-05-28 21:27:16.451020026 -0400 | 50477 | +++ linux-2.6.32.16/kernel/trace/trace_stack.c 2010-07-09 14:50:38.000000000 -0400 |
50237 | @@ -50,7 +50,7 @@ static inline void check_stack(void) | 50478 | @@ -50,7 +50,7 @@ static inline void check_stack(void) |
50238 | return; | 50479 | return; |
50239 | 50480 | ||
@@ -50243,9 +50484,9 @@ diff -urNp linux-2.6.32.15/kernel/trace/trace_stack.c linux-2.6.32.15/kernel/tra | |||
50243 | return; | 50484 | return; |
50244 | 50485 | ||
50245 | local_irq_save(flags); | 50486 | local_irq_save(flags); |
50246 | diff -urNp linux-2.6.32.15/kernel/utsname_sysctl.c linux-2.6.32.15/kernel/utsname_sysctl.c | 50487 | diff -urNp linux-2.6.32.16/kernel/utsname_sysctl.c linux-2.6.32.16/kernel/utsname_sysctl.c |
50247 | --- linux-2.6.32.15/kernel/utsname_sysctl.c 2010-03-15 11:52:04.000000000 -0400 | 50488 | --- linux-2.6.32.16/kernel/utsname_sysctl.c 2010-07-05 14:14:00.000000000 -0400 |
50248 | +++ linux-2.6.32.15/kernel/utsname_sysctl.c 2010-05-28 21:27:16.451020026 -0400 | 50489 | +++ linux-2.6.32.16/kernel/utsname_sysctl.c 2010-07-09 14:50:38.000000000 -0400 |
50249 | @@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[] | 50490 | @@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[] |
50250 | .proc_handler = proc_do_uts_string, | 50491 | .proc_handler = proc_do_uts_string, |
50251 | .strategy = sysctl_uts_string, | 50492 | .strategy = sysctl_uts_string, |
@@ -50264,9 +50505,9 @@ diff -urNp linux-2.6.32.15/kernel/utsname_sysctl.c linux-2.6.32.15/kernel/utsnam | |||
50264 | }; | 50505 | }; |
50265 | 50506 | ||
50266 | static int __init utsname_sysctl_init(void) | 50507 | static int __init utsname_sysctl_init(void) |
50267 | diff -urNp linux-2.6.32.15/lib/bug.c linux-2.6.32.15/lib/bug.c | 50508 | diff -urNp linux-2.6.32.16/lib/bug.c linux-2.6.32.16/lib/bug.c |
50268 | --- linux-2.6.32.15/lib/bug.c 2010-03-15 11:52:04.000000000 -0400 | 50509 | --- linux-2.6.32.16/lib/bug.c 2010-07-05 14:14:00.000000000 -0400 |
50269 | +++ linux-2.6.32.15/lib/bug.c 2010-05-28 21:27:16.451020026 -0400 | 50510 | +++ linux-2.6.32.16/lib/bug.c 2010-07-09 14:50:38.000000000 -0400 |
50270 | @@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l | 50511 | @@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l |
50271 | return BUG_TRAP_TYPE_NONE; | 50512 | return BUG_TRAP_TYPE_NONE; |
50272 | 50513 | ||
@@ -50276,9 +50517,9 @@ diff -urNp linux-2.6.32.15/lib/bug.c linux-2.6.32.15/lib/bug.c | |||
50276 | 50517 | ||
50277 | printk(KERN_EMERG "------------[ cut here ]------------\n"); | 50518 | printk(KERN_EMERG "------------[ cut here ]------------\n"); |
50278 | 50519 | ||
50279 | diff -urNp linux-2.6.32.15/lib/debugobjects.c linux-2.6.32.15/lib/debugobjects.c | 50520 | diff -urNp linux-2.6.32.16/lib/debugobjects.c linux-2.6.32.16/lib/debugobjects.c |
50280 | --- linux-2.6.32.15/lib/debugobjects.c 2010-03-15 11:52:04.000000000 -0400 | 50521 | --- linux-2.6.32.16/lib/debugobjects.c 2010-07-05 14:14:00.000000000 -0400 |
50281 | +++ linux-2.6.32.15/lib/debugobjects.c 2010-05-28 21:27:16.455065280 -0400 | 50522 | +++ linux-2.6.32.16/lib/debugobjects.c 2010-07-09 14:50:38.000000000 -0400 |
50282 | @@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi | 50523 | @@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi |
50283 | if (limit > 4) | 50524 | if (limit > 4) |
50284 | return; | 50525 | return; |
@@ -50288,9 +50529,9 @@ diff -urNp linux-2.6.32.15/lib/debugobjects.c linux-2.6.32.15/lib/debugobjects.c | |||
50288 | if (is_on_stack == onstack) | 50529 | if (is_on_stack == onstack) |
50289 | return; | 50530 | return; |
50290 | 50531 | ||
50291 | diff -urNp linux-2.6.32.15/lib/dma-debug.c linux-2.6.32.15/lib/dma-debug.c | 50532 | diff -urNp linux-2.6.32.16/lib/dma-debug.c linux-2.6.32.16/lib/dma-debug.c |
50292 | --- linux-2.6.32.15/lib/dma-debug.c 2010-03-15 11:52:04.000000000 -0400 | 50533 | --- linux-2.6.32.16/lib/dma-debug.c 2010-07-05 14:14:00.000000000 -0400 |
50293 | +++ linux-2.6.32.15/lib/dma-debug.c 2010-05-28 21:27:16.463242745 -0400 | 50534 | +++ linux-2.6.32.16/lib/dma-debug.c 2010-07-09 14:50:38.000000000 -0400 |
50294 | @@ -861,7 +861,7 @@ out: | 50535 | @@ -861,7 +861,7 @@ out: |
50295 | 50536 | ||
50296 | static void check_for_stack(struct device *dev, void *addr) | 50537 | static void check_for_stack(struct device *dev, void *addr) |
@@ -50300,9 +50541,9 @@ diff -urNp linux-2.6.32.15/lib/dma-debug.c linux-2.6.32.15/lib/dma-debug.c | |||
50300 | err_printk(dev, NULL, "DMA-API: device driver maps memory from" | 50541 | err_printk(dev, NULL, "DMA-API: device driver maps memory from" |
50301 | "stack [addr=%p]\n", addr); | 50542 | "stack [addr=%p]\n", addr); |
50302 | } | 50543 | } |
50303 | diff -urNp linux-2.6.32.15/lib/idr.c linux-2.6.32.15/lib/idr.c | 50544 | diff -urNp linux-2.6.32.16/lib/idr.c linux-2.6.32.16/lib/idr.c |
50304 | --- linux-2.6.32.15/lib/idr.c 2010-03-15 11:52:04.000000000 -0400 | 50545 | --- linux-2.6.32.16/lib/idr.c 2010-07-05 14:14:00.000000000 -0400 |
50305 | +++ linux-2.6.32.15/lib/idr.c 2010-05-28 21:27:16.463242745 -0400 | 50546 | +++ linux-2.6.32.16/lib/idr.c 2010-07-09 14:50:38.000000000 -0400 |
50306 | @@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in | 50547 | @@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in |
50307 | id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1; | 50548 | id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1; |
50308 | 50549 | ||
@@ -50312,9 +50553,9 @@ diff -urNp linux-2.6.32.15/lib/idr.c linux-2.6.32.15/lib/idr.c | |||
50312 | *starting_id = id; | 50553 | *starting_id = id; |
50313 | return IDR_NEED_TO_GROW; | 50554 | return IDR_NEED_TO_GROW; |
50314 | } | 50555 | } |
50315 | diff -urNp linux-2.6.32.15/lib/inflate.c linux-2.6.32.15/lib/inflate.c | 50556 | diff -urNp linux-2.6.32.16/lib/inflate.c linux-2.6.32.16/lib/inflate.c |
50316 | --- linux-2.6.32.15/lib/inflate.c 2010-03-15 11:52:04.000000000 -0400 | 50557 | --- linux-2.6.32.16/lib/inflate.c 2010-07-05 14:14:00.000000000 -0400 |
50317 | +++ linux-2.6.32.15/lib/inflate.c 2010-05-28 21:27:16.463242745 -0400 | 50558 | +++ linux-2.6.32.16/lib/inflate.c 2010-07-09 14:50:38.000000000 -0400 |
50318 | @@ -266,7 +266,7 @@ static void free(void *where) | 50559 | @@ -266,7 +266,7 @@ static void free(void *where) |
50319 | malloc_ptr = free_mem_ptr; | 50560 | malloc_ptr = free_mem_ptr; |
50320 | } | 50561 | } |
@@ -50324,9 +50565,9 @@ diff -urNp linux-2.6.32.15/lib/inflate.c linux-2.6.32.15/lib/inflate.c | |||
50324 | #define free(a) kfree(a) | 50565 | #define free(a) kfree(a) |
50325 | #endif | 50566 | #endif |
50326 | 50567 | ||
50327 | diff -urNp linux-2.6.32.15/lib/Kconfig.debug linux-2.6.32.15/lib/Kconfig.debug | 50568 | diff -urNp linux-2.6.32.16/lib/Kconfig.debug linux-2.6.32.16/lib/Kconfig.debug |
50328 | --- linux-2.6.32.15/lib/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400 | 50569 | --- linux-2.6.32.16/lib/Kconfig.debug 2010-07-05 14:14:00.000000000 -0400 |
50329 | +++ linux-2.6.32.15/lib/Kconfig.debug 2010-05-28 21:27:16.463242745 -0400 | 50570 | +++ linux-2.6.32.16/lib/Kconfig.debug 2010-07-09 14:50:38.000000000 -0400 |
50330 | @@ -905,7 +905,7 @@ config LATENCYTOP | 50571 | @@ -905,7 +905,7 @@ config LATENCYTOP |
50331 | select STACKTRACE | 50572 | select STACKTRACE |
50332 | select SCHEDSTATS | 50573 | select SCHEDSTATS |
@@ -50336,9 +50577,9 @@ diff -urNp linux-2.6.32.15/lib/Kconfig.debug linux-2.6.32.15/lib/Kconfig.debug | |||
50336 | help | 50577 | help |
50337 | Enable this option if you want to use the LatencyTOP tool | 50578 | Enable this option if you want to use the LatencyTOP tool |
50338 | to find out which userspace is blocking on what kernel operations. | 50579 | to find out which userspace is blocking on what kernel operations. |
50339 | diff -urNp linux-2.6.32.15/lib/kobject.c linux-2.6.32.15/lib/kobject.c | 50580 | diff -urNp linux-2.6.32.16/lib/kobject.c linux-2.6.32.16/lib/kobject.c |
50340 | --- linux-2.6.32.15/lib/kobject.c 2010-03-15 11:52:04.000000000 -0400 | 50581 | --- linux-2.6.32.16/lib/kobject.c 2010-07-05 14:14:00.000000000 -0400 |
50341 | +++ linux-2.6.32.15/lib/kobject.c 2010-05-28 21:27:16.463242745 -0400 | 50582 | +++ linux-2.6.32.16/lib/kobject.c 2010-07-09 14:50:38.000000000 -0400 |
50342 | @@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko | 50583 | @@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko |
50343 | return ret; | 50584 | return ret; |
50344 | } | 50585 | } |
@@ -50366,9 +50607,9 @@ diff -urNp linux-2.6.32.15/lib/kobject.c linux-2.6.32.15/lib/kobject.c | |||
50366 | struct kobject *parent_kobj) | 50607 | struct kobject *parent_kobj) |
50367 | { | 50608 | { |
50368 | struct kset *kset; | 50609 | struct kset *kset; |
50369 | diff -urNp linux-2.6.32.15/lib/kobject_uevent.c linux-2.6.32.15/lib/kobject_uevent.c | 50610 | diff -urNp linux-2.6.32.16/lib/kobject_uevent.c linux-2.6.32.16/lib/kobject_uevent.c |
50370 | --- linux-2.6.32.15/lib/kobject_uevent.c 2010-03-15 11:52:04.000000000 -0400 | 50611 | --- linux-2.6.32.16/lib/kobject_uevent.c 2010-07-05 14:14:00.000000000 -0400 |
50371 | +++ linux-2.6.32.15/lib/kobject_uevent.c 2010-05-28 21:27:16.463242745 -0400 | 50612 | +++ linux-2.6.32.16/lib/kobject_uevent.c 2010-07-09 14:50:38.000000000 -0400 |
50372 | @@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k | 50613 | @@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k |
50373 | const char *subsystem; | 50614 | const char *subsystem; |
50374 | struct kobject *top_kobj; | 50615 | struct kobject *top_kobj; |
@@ -50378,9 +50619,9 @@ diff -urNp linux-2.6.32.15/lib/kobject_uevent.c linux-2.6.32.15/lib/kobject_ueve | |||
50378 | u64 seq; | 50619 | u64 seq; |
50379 | int i = 0; | 50620 | int i = 0; |
50380 | int retval = 0; | 50621 | int retval = 0; |
50381 | diff -urNp linux-2.6.32.15/lib/parser.c linux-2.6.32.15/lib/parser.c | 50622 | diff -urNp linux-2.6.32.16/lib/parser.c linux-2.6.32.16/lib/parser.c |
50382 | --- linux-2.6.32.15/lib/parser.c 2010-03-15 11:52:04.000000000 -0400 | 50623 | --- linux-2.6.32.16/lib/parser.c 2010-07-05 14:14:00.000000000 -0400 |
50383 | +++ linux-2.6.32.15/lib/parser.c 2010-05-28 21:27:16.463242745 -0400 | 50624 | +++ linux-2.6.32.16/lib/parser.c 2010-07-09 14:50:38.000000000 -0400 |
50384 | @@ -126,7 +126,7 @@ static int match_number(substring_t *s, | 50625 | @@ -126,7 +126,7 @@ static int match_number(substring_t *s, |
50385 | char *buf; | 50626 | char *buf; |
50386 | int ret; | 50627 | int ret; |
@@ -50390,9 +50631,9 @@ diff -urNp linux-2.6.32.15/lib/parser.c linux-2.6.32.15/lib/parser.c | |||
50390 | if (!buf) | 50631 | if (!buf) |
50391 | return -ENOMEM; | 50632 | return -ENOMEM; |
50392 | memcpy(buf, s->from, s->to - s->from); | 50633 | memcpy(buf, s->from, s->to - s->from); |
50393 | diff -urNp linux-2.6.32.15/lib/radix-tree.c linux-2.6.32.15/lib/radix-tree.c | 50634 | diff -urNp linux-2.6.32.16/lib/radix-tree.c linux-2.6.32.16/lib/radix-tree.c |
50394 | --- linux-2.6.32.15/lib/radix-tree.c 2010-03-15 11:52:04.000000000 -0400 | 50635 | --- linux-2.6.32.16/lib/radix-tree.c 2010-07-05 14:14:00.000000000 -0400 |
50395 | +++ linux-2.6.32.15/lib/radix-tree.c 2010-05-28 21:27:16.471246042 -0400 | 50636 | +++ linux-2.6.32.16/lib/radix-tree.c 2010-07-09 14:50:38.000000000 -0400 |
50396 | @@ -81,7 +81,7 @@ struct radix_tree_preload { | 50637 | @@ -81,7 +81,7 @@ struct radix_tree_preload { |
50397 | int nr; | 50638 | int nr; |
50398 | struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; | 50639 | struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; |
@@ -50402,9 +50643,9 @@ diff -urNp linux-2.6.32.15/lib/radix-tree.c linux-2.6.32.15/lib/radix-tree.c | |||
50402 | 50643 | ||
50403 | static inline gfp_t root_gfp_mask(struct radix_tree_root *root) | 50644 | static inline gfp_t root_gfp_mask(struct radix_tree_root *root) |
50404 | { | 50645 | { |
50405 | diff -urNp linux-2.6.32.15/lib/random32.c linux-2.6.32.15/lib/random32.c | 50646 | diff -urNp linux-2.6.32.16/lib/random32.c linux-2.6.32.16/lib/random32.c |
50406 | --- linux-2.6.32.15/lib/random32.c 2010-03-15 11:52:04.000000000 -0400 | 50647 | --- linux-2.6.32.16/lib/random32.c 2010-07-05 14:14:00.000000000 -0400 |
50407 | +++ linux-2.6.32.15/lib/random32.c 2010-05-28 21:27:16.471246042 -0400 | 50648 | +++ linux-2.6.32.16/lib/random32.c 2010-07-09 14:50:38.000000000 -0400 |
50408 | @@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * | 50649 | @@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * |
50409 | */ | 50650 | */ |
50410 | static inline u32 __seed(u32 x, u32 m) | 50651 | static inline u32 __seed(u32 x, u32 m) |
@@ -50414,14 +50655,14 @@ diff -urNp linux-2.6.32.15/lib/random32.c linux-2.6.32.15/lib/random32.c | |||
50414 | } | 50655 | } |
50415 | 50656 | ||
50416 | /** | 50657 | /** |
50417 | diff -urNp linux-2.6.32.15/localversion-grsec linux-2.6.32.15/localversion-grsec | 50658 | diff -urNp linux-2.6.32.16/localversion-grsec linux-2.6.32.16/localversion-grsec |
50418 | --- linux-2.6.32.15/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 | 50659 | --- linux-2.6.32.16/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 |
50419 | +++ linux-2.6.32.15/localversion-grsec 2010-05-28 21:27:16.471246042 -0400 | 50660 | +++ linux-2.6.32.16/localversion-grsec 2010-07-09 14:50:38.000000000 -0400 |
50420 | @@ -0,0 +1 @@ | 50661 | @@ -0,0 +1 @@ |
50421 | +-grsec | 50662 | +-grsec |
50422 | diff -urNp linux-2.6.32.15/Makefile linux-2.6.32.15/Makefile | 50663 | diff -urNp linux-2.6.32.16/Makefile linux-2.6.32.16/Makefile |
50423 | --- linux-2.6.32.15/Makefile 2010-06-01 15:02:53.005442437 -0400 | 50664 | --- linux-2.6.32.16/Makefile 2010-07-05 14:14:00.000000000 -0400 |
50424 | +++ linux-2.6.32.15/Makefile 2010-06-01 15:03:15.405630699 -0400 | 50665 | +++ linux-2.6.32.16/Makefile 2010-07-09 14:50:38.000000000 -0400 |
50425 | @@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" | 50666 | @@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" |
50426 | 50667 | ||
50427 | HOSTCC = gcc | 50668 | HOSTCC = gcc |
@@ -50442,10 +50683,10 @@ diff -urNp linux-2.6.32.15/Makefile linux-2.6.32.15/Makefile | |||
50442 | 50683 | ||
50443 | vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ | 50684 | vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ |
50444 | $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ | 50685 | $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ |
50445 | diff -urNp linux-2.6.32.15/mm/filemap.c linux-2.6.32.15/mm/filemap.c | 50686 | diff -urNp linux-2.6.32.16/mm/filemap.c linux-2.6.32.16/mm/filemap.c |
50446 | --- linux-2.6.32.15/mm/filemap.c 2010-03-15 11:52:04.000000000 -0400 | 50687 | --- linux-2.6.32.16/mm/filemap.c 2010-07-05 14:14:00.000000000 -0400 |
50447 | +++ linux-2.6.32.15/mm/filemap.c 2010-05-28 21:27:16.479250347 -0400 | 50688 | +++ linux-2.6.32.16/mm/filemap.c 2010-07-09 14:50:38.000000000 -0400 |
50448 | @@ -1622,7 +1622,7 @@ int generic_file_mmap(struct file * file | 50689 | @@ -1628,7 +1628,7 @@ int generic_file_mmap(struct file * file |
50449 | struct address_space *mapping = file->f_mapping; | 50690 | struct address_space *mapping = file->f_mapping; |
50450 | 50691 | ||
50451 | if (!mapping->a_ops->readpage) | 50692 | if (!mapping->a_ops->readpage) |
@@ -50454,7 +50695,7 @@ diff -urNp linux-2.6.32.15/mm/filemap.c linux-2.6.32.15/mm/filemap.c | |||
50454 | file_accessed(file); | 50695 | file_accessed(file); |
50455 | vma->vm_ops = &generic_file_vm_ops; | 50696 | vma->vm_ops = &generic_file_vm_ops; |
50456 | vma->vm_flags |= VM_CAN_NONLINEAR; | 50697 | vma->vm_flags |= VM_CAN_NONLINEAR; |
50457 | @@ -2018,6 +2018,7 @@ inline int generic_write_checks(struct f | 50698 | @@ -2024,6 +2024,7 @@ inline int generic_write_checks(struct f |
50458 | *pos = i_size_read(inode); | 50699 | *pos = i_size_read(inode); |
50459 | 50700 | ||
50460 | if (limit != RLIM_INFINITY) { | 50701 | if (limit != RLIM_INFINITY) { |
@@ -50462,9 +50703,9 @@ diff -urNp linux-2.6.32.15/mm/filemap.c linux-2.6.32.15/mm/filemap.c | |||
50462 | if (*pos >= limit) { | 50703 | if (*pos >= limit) { |
50463 | send_sig(SIGXFSZ, current, 0); | 50704 | send_sig(SIGXFSZ, current, 0); |
50464 | return -EFBIG; | 50705 | return -EFBIG; |
50465 | diff -urNp linux-2.6.32.15/mm/fremap.c linux-2.6.32.15/mm/fremap.c | 50706 | diff -urNp linux-2.6.32.16/mm/fremap.c linux-2.6.32.16/mm/fremap.c |
50466 | --- linux-2.6.32.15/mm/fremap.c 2010-03-15 11:52:04.000000000 -0400 | 50707 | --- linux-2.6.32.16/mm/fremap.c 2010-07-05 14:14:00.000000000 -0400 |
50467 | +++ linux-2.6.32.15/mm/fremap.c 2010-05-28 21:27:16.487251224 -0400 | 50708 | +++ linux-2.6.32.16/mm/fremap.c 2010-07-09 14:50:38.000000000 -0400 |
50468 | @@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign | 50709 | @@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign |
50469 | retry: | 50710 | retry: |
50470 | vma = find_vma(mm, start); | 50711 | vma = find_vma(mm, start); |
@@ -50477,9 +50718,9 @@ diff -urNp linux-2.6.32.15/mm/fremap.c linux-2.6.32.15/mm/fremap.c | |||
50477 | /* | 50718 | /* |
50478 | * Make sure the vma is shared, that it supports prefaulting, | 50719 | * Make sure the vma is shared, that it supports prefaulting, |
50479 | * and that the remapped range is valid and fully within | 50720 | * and that the remapped range is valid and fully within |
50480 | diff -urNp linux-2.6.32.15/mm/highmem.c linux-2.6.32.15/mm/highmem.c | 50721 | diff -urNp linux-2.6.32.16/mm/highmem.c linux-2.6.32.16/mm/highmem.c |
50481 | --- linux-2.6.32.15/mm/highmem.c 2010-03-15 11:52:04.000000000 -0400 | 50722 | --- linux-2.6.32.16/mm/highmem.c 2010-07-05 14:14:00.000000000 -0400 |
50482 | +++ linux-2.6.32.15/mm/highmem.c 2010-05-28 21:27:16.487251224 -0400 | 50723 | +++ linux-2.6.32.16/mm/highmem.c 2010-07-09 14:50:38.000000000 -0400 |
50483 | @@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void) | 50724 | @@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void) |
50484 | * So no dangers, even with speculative execution. | 50725 | * So no dangers, even with speculative execution. |
50485 | */ | 50726 | */ |
@@ -50505,9 +50746,9 @@ diff -urNp linux-2.6.32.15/mm/highmem.c linux-2.6.32.15/mm/highmem.c | |||
50505 | pkmap_count[last_pkmap_nr] = 1; | 50746 | pkmap_count[last_pkmap_nr] = 1; |
50506 | set_page_address(page, (void *)vaddr); | 50747 | set_page_address(page, (void *)vaddr); |
50507 | 50748 | ||
50508 | diff -urNp linux-2.6.32.15/mm/hugetlb.c linux-2.6.32.15/mm/hugetlb.c | 50749 | diff -urNp linux-2.6.32.16/mm/hugetlb.c linux-2.6.32.16/mm/hugetlb.c |
50509 | --- linux-2.6.32.15/mm/hugetlb.c 2010-05-28 20:16:44.458924952 -0400 | 50750 | --- linux-2.6.32.16/mm/hugetlb.c 2010-07-05 14:14:00.000000000 -0400 |
50510 | +++ linux-2.6.32.15/mm/hugetlb.c 2010-05-28 21:27:16.487251224 -0400 | 50751 | +++ linux-2.6.32.16/mm/hugetlb.c 2010-07-09 14:50:38.000000000 -0400 |
50511 | @@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s | 50752 | @@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s |
50512 | return 1; | 50753 | return 1; |
50513 | } | 50754 | } |
@@ -50587,9 +50828,9 @@ diff -urNp linux-2.6.32.15/mm/hugetlb.c linux-2.6.32.15/mm/hugetlb.c | |||
50587 | ptep = huge_pte_alloc(mm, address, huge_page_size(h)); | 50828 | ptep = huge_pte_alloc(mm, address, huge_page_size(h)); |
50588 | if (!ptep) | 50829 | if (!ptep) |
50589 | return VM_FAULT_OOM; | 50830 | return VM_FAULT_OOM; |
50590 | diff -urNp linux-2.6.32.15/mm/Kconfig linux-2.6.32.15/mm/Kconfig | 50831 | diff -urNp linux-2.6.32.16/mm/Kconfig linux-2.6.32.16/mm/Kconfig |
50591 | --- linux-2.6.32.15/mm/Kconfig 2010-03-15 11:52:04.000000000 -0400 | 50832 | --- linux-2.6.32.16/mm/Kconfig 2010-07-05 14:14:00.000000000 -0400 |
50592 | +++ linux-2.6.32.15/mm/Kconfig 2010-05-28 21:27:16.487251224 -0400 | 50833 | +++ linux-2.6.32.16/mm/Kconfig 2010-07-09 14:50:38.000000000 -0400 |
50593 | @@ -228,7 +228,7 @@ config KSM | 50834 | @@ -228,7 +228,7 @@ config KSM |
50594 | config DEFAULT_MMAP_MIN_ADDR | 50835 | config DEFAULT_MMAP_MIN_ADDR |
50595 | int "Low address space to protect from user allocation" | 50836 | int "Low address space to protect from user allocation" |
@@ -50599,9 +50840,9 @@ diff -urNp linux-2.6.32.15/mm/Kconfig linux-2.6.32.15/mm/Kconfig | |||
50599 | help | 50840 | help |
50600 | This is the portion of low virtual memory which should be protected | 50841 | This is the portion of low virtual memory which should be protected |
50601 | from userspace allocation. Keeping a user from writing to low pages | 50842 | from userspace allocation. Keeping a user from writing to low pages |
50602 | diff -urNp linux-2.6.32.15/mm/maccess.c linux-2.6.32.15/mm/maccess.c | 50843 | diff -urNp linux-2.6.32.16/mm/maccess.c linux-2.6.32.16/mm/maccess.c |
50603 | --- linux-2.6.32.15/mm/maccess.c 2010-03-15 11:52:04.000000000 -0400 | 50844 | --- linux-2.6.32.16/mm/maccess.c 2010-07-05 14:14:00.000000000 -0400 |
50604 | +++ linux-2.6.32.15/mm/maccess.c 2010-05-28 21:27:16.487251224 -0400 | 50845 | +++ linux-2.6.32.16/mm/maccess.c 2010-07-09 14:50:38.000000000 -0400 |
50605 | @@ -14,7 +14,7 @@ | 50846 | @@ -14,7 +14,7 @@ |
50606 | * Safely read from address @src to the buffer at @dst. If a kernel fault | 50847 | * Safely read from address @src to the buffer at @dst. If a kernel fault |
50607 | * happens, handle that and return -EFAULT. | 50848 | * happens, handle that and return -EFAULT. |
@@ -50620,9 +50861,9 @@ diff -urNp linux-2.6.32.15/mm/maccess.c linux-2.6.32.15/mm/maccess.c | |||
50620 | { | 50861 | { |
50621 | long ret; | 50862 | long ret; |
50622 | mm_segment_t old_fs = get_fs(); | 50863 | mm_segment_t old_fs = get_fs(); |
50623 | diff -urNp linux-2.6.32.15/mm/madvise.c linux-2.6.32.15/mm/madvise.c | 50864 | diff -urNp linux-2.6.32.16/mm/madvise.c linux-2.6.32.16/mm/madvise.c |
50624 | --- linux-2.6.32.15/mm/madvise.c 2010-03-15 11:52:04.000000000 -0400 | 50865 | --- linux-2.6.32.16/mm/madvise.c 2010-07-05 14:14:00.000000000 -0400 |
50625 | +++ linux-2.6.32.15/mm/madvise.c 2010-05-28 21:27:16.487251224 -0400 | 50866 | +++ linux-2.6.32.16/mm/madvise.c 2010-07-09 14:50:38.000000000 -0400 |
50626 | @@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a | 50867 | @@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a |
50627 | pgoff_t pgoff; | 50868 | pgoff_t pgoff; |
50628 | unsigned long new_flags = vma->vm_flags; | 50869 | unsigned long new_flags = vma->vm_flags; |
@@ -50699,9 +50940,9 @@ diff -urNp linux-2.6.32.15/mm/madvise.c linux-2.6.32.15/mm/madvise.c | |||
50699 | error = 0; | 50940 | error = 0; |
50700 | if (end == start) | 50941 | if (end == start) |
50701 | goto out; | 50942 | goto out; |
50702 | diff -urNp linux-2.6.32.15/mm/memory.c linux-2.6.32.15/mm/memory.c | 50943 | diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c |
50703 | --- linux-2.6.32.15/mm/memory.c 2010-03-15 11:52:04.000000000 -0400 | 50944 | --- linux-2.6.32.16/mm/memory.c 2010-07-05 14:14:00.000000000 -0400 |
50704 | +++ linux-2.6.32.15/mm/memory.c 2010-06-19 10:03:50.012498759 -0400 | 50945 | +++ linux-2.6.32.16/mm/memory.c 2010-07-09 14:50:38.000000000 -0400 |
50705 | @@ -48,6 +48,7 @@ | 50946 | @@ -48,6 +48,7 @@ |
50706 | #include <linux/ksm.h> | 50947 | #include <linux/ksm.h> |
50707 | #include <linux/rmap.h> | 50948 | #include <linux/rmap.h> |
@@ -51132,9 +51373,9 @@ diff -urNp linux-2.6.32.15/mm/memory.c linux-2.6.32.15/mm/memory.c | |||
51132 | /* | 51373 | /* |
51133 | * Make sure the vDSO gets into every core dump. | 51374 | * Make sure the vDSO gets into every core dump. |
51134 | * Dumping its contents makes post-mortem fully interpretable later | 51375 | * Dumping its contents makes post-mortem fully interpretable later |
51135 | diff -urNp linux-2.6.32.15/mm/memory-failure.c linux-2.6.32.15/mm/memory-failure.c | 51376 | diff -urNp linux-2.6.32.16/mm/memory-failure.c linux-2.6.32.16/mm/memory-failure.c |
51136 | --- linux-2.6.32.15/mm/memory-failure.c 2010-03-15 11:52:04.000000000 -0400 | 51377 | --- linux-2.6.32.16/mm/memory-failure.c 2010-07-05 14:14:00.000000000 -0400 |
51137 | +++ linux-2.6.32.15/mm/memory-failure.c 2010-05-28 21:27:16.487251224 -0400 | 51378 | +++ linux-2.6.32.16/mm/memory-failure.c 2010-07-09 14:50:38.000000000 -0400 |
51138 | @@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r | 51379 | @@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r |
51139 | 51380 | ||
51140 | int sysctl_memory_failure_recovery __read_mostly = 1; | 51381 | int sysctl_memory_failure_recovery __read_mostly = 1; |
@@ -51153,9 +51394,9 @@ diff -urNp linux-2.6.32.15/mm/memory-failure.c linux-2.6.32.15/mm/memory-failure | |||
51153 | 51394 | ||
51154 | /* | 51395 | /* |
51155 | * We need/can do nothing about count=0 pages. | 51396 | * We need/can do nothing about count=0 pages. |
51156 | diff -urNp linux-2.6.32.15/mm/mempolicy.c linux-2.6.32.15/mm/mempolicy.c | 51397 | diff -urNp linux-2.6.32.16/mm/mempolicy.c linux-2.6.32.16/mm/mempolicy.c |
51157 | --- linux-2.6.32.15/mm/mempolicy.c 2010-04-04 20:41:50.072525146 -0400 | 51398 | --- linux-2.6.32.16/mm/mempolicy.c 2010-07-05 14:14:00.000000000 -0400 |
51158 | +++ linux-2.6.32.15/mm/mempolicy.c 2010-05-28 21:27:16.487251224 -0400 | 51399 | +++ linux-2.6.32.16/mm/mempolicy.c 2010-07-09 14:50:38.000000000 -0400 |
51159 | @@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st | 51400 | @@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st |
51160 | struct vm_area_struct *next; | 51401 | struct vm_area_struct *next; |
51161 | int err; | 51402 | int err; |
@@ -51236,9 +51477,9 @@ diff -urNp linux-2.6.32.15/mm/mempolicy.c linux-2.6.32.15/mm/mempolicy.c | |||
51236 | } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { | 51477 | } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { |
51237 | seq_printf(m, " heap"); | 51478 | seq_printf(m, " heap"); |
51238 | } else if (vma->vm_start <= mm->start_stack && | 51479 | } else if (vma->vm_start <= mm->start_stack && |
51239 | diff -urNp linux-2.6.32.15/mm/migrate.c linux-2.6.32.15/mm/migrate.c | 51480 | diff -urNp linux-2.6.32.16/mm/migrate.c linux-2.6.32.16/mm/migrate.c |
51240 | --- linux-2.6.32.15/mm/migrate.c 2010-03-15 11:52:04.000000000 -0400 | 51481 | --- linux-2.6.32.16/mm/migrate.c 2010-07-05 14:14:00.000000000 -0400 |
51241 | +++ linux-2.6.32.15/mm/migrate.c 2010-05-28 21:27:16.491098771 -0400 | 51482 | +++ linux-2.6.32.16/mm/migrate.c 2010-07-09 14:50:38.000000000 -0400 |
51242 | @@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, | 51483 | @@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, |
51243 | if (!mm) | 51484 | if (!mm) |
51244 | return -EINVAL; | 51485 | return -EINVAL; |
@@ -51264,9 +51505,9 @@ diff -urNp linux-2.6.32.15/mm/migrate.c linux-2.6.32.15/mm/migrate.c | |||
51264 | rcu_read_unlock(); | 51505 | rcu_read_unlock(); |
51265 | err = -EPERM; | 51506 | err = -EPERM; |
51266 | goto out; | 51507 | goto out; |
51267 | diff -urNp linux-2.6.32.15/mm/mlock.c linux-2.6.32.15/mm/mlock.c | 51508 | diff -urNp linux-2.6.32.16/mm/mlock.c linux-2.6.32.16/mm/mlock.c |
51268 | --- linux-2.6.32.15/mm/mlock.c 2010-03-15 11:52:04.000000000 -0400 | 51509 | --- linux-2.6.32.16/mm/mlock.c 2010-07-05 14:14:00.000000000 -0400 |
51269 | +++ linux-2.6.32.15/mm/mlock.c 2010-05-28 21:27:16.499256346 -0400 | 51510 | +++ linux-2.6.32.16/mm/mlock.c 2010-07-09 14:50:38.000000000 -0400 |
51270 | @@ -13,6 +13,7 @@ | 51511 | @@ -13,6 +13,7 @@ |
51271 | #include <linux/pagemap.h> | 51512 | #include <linux/pagemap.h> |
51272 | #include <linux/mempolicy.h> | 51513 | #include <linux/mempolicy.h> |
@@ -51335,9 +51576,9 @@ diff -urNp linux-2.6.32.15/mm/mlock.c linux-2.6.32.15/mm/mlock.c | |||
51335 | if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || | 51576 | if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || |
51336 | capable(CAP_IPC_LOCK)) | 51577 | capable(CAP_IPC_LOCK)) |
51337 | ret = do_mlockall(flags); | 51578 | ret = do_mlockall(flags); |
51338 | diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c | 51579 | diff -urNp linux-2.6.32.16/mm/mmap.c linux-2.6.32.16/mm/mmap.c |
51339 | --- linux-2.6.32.15/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 | 51580 | --- linux-2.6.32.16/mm/mmap.c 2010-07-05 14:14:00.000000000 -0400 |
51340 | +++ linux-2.6.32.15/mm/mmap.c 2010-05-28 21:27:16.502950026 -0400 | 51581 | +++ linux-2.6.32.16/mm/mmap.c 2010-07-09 14:50:38.000000000 -0400 |
51341 | @@ -45,6 +45,16 @@ | 51582 | @@ -45,6 +45,16 @@ |
51342 | #define arch_rebalance_pgtables(addr, len) (addr) | 51583 | #define arch_rebalance_pgtables(addr, len) (addr) |
51343 | #endif | 51584 | #endif |
@@ -52201,19 +52442,15 @@ diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c | |||
52201 | /* | 52442 | /* |
52202 | * this is really a simplified "do_mmap". it only handles | 52443 | * this is really a simplified "do_mmap". it only handles |
52203 | * anonymous maps. eventually we may be able to do some | 52444 | * anonymous maps. eventually we may be able to do some |
52204 | @@ -1984,6 +2317,11 @@ unsigned long do_brk(unsigned long addr, | 52445 | @@ -1984,6 +2317,7 @@ unsigned long do_brk(unsigned long addr, |
52205 | struct rb_node ** rb_link, * rb_parent; | 52446 | struct rb_node ** rb_link, * rb_parent; |
52206 | pgoff_t pgoff = addr >> PAGE_SHIFT; | 52447 | pgoff_t pgoff = addr >> PAGE_SHIFT; |
52207 | int error; | 52448 | int error; |
52208 | + unsigned long charged; | 52449 | + unsigned long charged; |
52209 | + | ||
52210 | +#ifdef CONFIG_PAX_SEGMEXEC | ||
52211 | + struct vm_area_struct *vma_m = NULL; | ||
52212 | +#endif | ||
52213 | 52450 | ||
52214 | len = PAGE_ALIGN(len); | 52451 | len = PAGE_ALIGN(len); |
52215 | if (!len) | 52452 | if (!len) |
52216 | @@ -1995,16 +2333,30 @@ unsigned long do_brk(unsigned long addr, | 52453 | @@ -1995,16 +2329,30 @@ unsigned long do_brk(unsigned long addr, |
52217 | 52454 | ||
52218 | flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags; | 52455 | flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags; |
52219 | 52456 | ||
@@ -52245,7 +52482,7 @@ diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c | |||
52245 | locked += mm->locked_vm; | 52482 | locked += mm->locked_vm; |
52246 | lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur; | 52483 | lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur; |
52247 | lock_limit >>= PAGE_SHIFT; | 52484 | lock_limit >>= PAGE_SHIFT; |
52248 | @@ -2021,22 +2373,22 @@ unsigned long do_brk(unsigned long addr, | 52485 | @@ -2021,22 +2369,22 @@ unsigned long do_brk(unsigned long addr, |
52249 | /* | 52486 | /* |
52250 | * Clear old maps. this also does some error checking for us | 52487 | * Clear old maps. this also does some error checking for us |
52251 | */ | 52488 | */ |
@@ -52272,7 +52509,7 @@ diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c | |||
52272 | return -ENOMEM; | 52509 | return -ENOMEM; |
52273 | 52510 | ||
52274 | /* Can we just expand an old private anonymous mapping? */ | 52511 | /* Can we just expand an old private anonymous mapping? */ |
52275 | @@ -2050,10 +2402,21 @@ unsigned long do_brk(unsigned long addr, | 52512 | @@ -2050,7 +2398,7 @@ unsigned long do_brk(unsigned long addr, |
52276 | */ | 52513 | */ |
52277 | vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL); | 52514 | vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL); |
52278 | if (!vma) { | 52515 | if (!vma) { |
@@ -52281,21 +52518,7 @@ diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c | |||
52281 | return -ENOMEM; | 52518 | return -ENOMEM; |
52282 | } | 52519 | } |
52283 | 52520 | ||
52284 | +#ifdef CONFIG_PAX_SEGMEXEC | 52521 | @@ -2062,11 +2410,12 @@ unsigned long do_brk(unsigned long addr, |
52285 | + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (flags & VM_EXEC)) { | ||
52286 | + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL); | ||
52287 | + if (!vma_m) { | ||
52288 | + kmem_cache_free(vm_area_cachep, vma); | ||
52289 | + vm_unacct_memory(charged); | ||
52290 | + return -ENOMEM; | ||
52291 | + } | ||
52292 | + } | ||
52293 | +#endif | ||
52294 | + | ||
52295 | vma->vm_mm = mm; | ||
52296 | vma->vm_start = addr; | ||
52297 | vma->vm_end = addr + len; | ||
52298 | @@ -2062,11 +2425,12 @@ unsigned long do_brk(unsigned long addr, | ||
52299 | vma->vm_page_prot = vm_get_page_prot(flags); | 52522 | vma->vm_page_prot = vm_get_page_prot(flags); |
52300 | vma_link(mm, vma, prev, rb_link, rb_parent); | 52523 | vma_link(mm, vma, prev, rb_link, rb_parent); |
52301 | out: | 52524 | out: |
@@ -52310,7 +52533,7 @@ diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c | |||
52310 | return addr; | 52533 | return addr; |
52311 | } | 52534 | } |
52312 | 52535 | ||
52313 | @@ -2113,8 +2477,10 @@ void exit_mmap(struct mm_struct *mm) | 52536 | @@ -2113,8 +2462,10 @@ void exit_mmap(struct mm_struct *mm) |
52314 | * Walk the list again, actually closing and freeing it, | 52537 | * Walk the list again, actually closing and freeing it, |
52315 | * with preemption enabled, without holding any MM locks. | 52538 | * with preemption enabled, without holding any MM locks. |
52316 | */ | 52539 | */ |
@@ -52322,7 +52545,7 @@ diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c | |||
52322 | 52545 | ||
52323 | BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT); | 52546 | BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT); |
52324 | } | 52547 | } |
52325 | @@ -2128,6 +2494,10 @@ int insert_vm_struct(struct mm_struct * | 52548 | @@ -2128,6 +2479,10 @@ int insert_vm_struct(struct mm_struct * |
52326 | struct vm_area_struct * __vma, * prev; | 52549 | struct vm_area_struct * __vma, * prev; |
52327 | struct rb_node ** rb_link, * rb_parent; | 52550 | struct rb_node ** rb_link, * rb_parent; |
52328 | 52551 | ||
@@ -52333,7 +52556,7 @@ diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c | |||
52333 | /* | 52556 | /* |
52334 | * The vm_pgoff of a purely anonymous vma should be irrelevant | 52557 | * The vm_pgoff of a purely anonymous vma should be irrelevant |
52335 | * until its first write fault, when page's anon_vma and index | 52558 | * until its first write fault, when page's anon_vma and index |
52336 | @@ -2150,7 +2520,22 @@ int insert_vm_struct(struct mm_struct * | 52559 | @@ -2150,7 +2505,22 @@ int insert_vm_struct(struct mm_struct * |
52337 | if ((vma->vm_flags & VM_ACCOUNT) && | 52560 | if ((vma->vm_flags & VM_ACCOUNT) && |
52338 | security_vm_enough_memory_mm(mm, vma_pages(vma))) | 52561 | security_vm_enough_memory_mm(mm, vma_pages(vma))) |
52339 | return -ENOMEM; | 52562 | return -ENOMEM; |
@@ -52356,7 +52579,7 @@ diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c | |||
52356 | return 0; | 52579 | return 0; |
52357 | } | 52580 | } |
52358 | 52581 | ||
52359 | @@ -2168,6 +2553,8 @@ struct vm_area_struct *copy_vma(struct v | 52582 | @@ -2168,6 +2538,8 @@ struct vm_area_struct *copy_vma(struct v |
52360 | struct rb_node **rb_link, *rb_parent; | 52583 | struct rb_node **rb_link, *rb_parent; |
52361 | struct mempolicy *pol; | 52584 | struct mempolicy *pol; |
52362 | 52585 | ||
@@ -52365,7 +52588,7 @@ diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c | |||
52365 | /* | 52588 | /* |
52366 | * If anonymous vma has not yet been faulted, update new pgoff | 52589 | * If anonymous vma has not yet been faulted, update new pgoff |
52367 | * to match new location, to increase its chance of merging. | 52590 | * to match new location, to increase its chance of merging. |
52368 | @@ -2211,6 +2598,35 @@ struct vm_area_struct *copy_vma(struct v | 52591 | @@ -2211,6 +2583,35 @@ struct vm_area_struct *copy_vma(struct v |
52369 | return new_vma; | 52592 | return new_vma; |
52370 | } | 52593 | } |
52371 | 52594 | ||
@@ -52401,7 +52624,7 @@ diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c | |||
52401 | /* | 52624 | /* |
52402 | * Return true if the calling process may expand its vm space by the passed | 52625 | * Return true if the calling process may expand its vm space by the passed |
52403 | * number of pages | 52626 | * number of pages |
52404 | @@ -2221,7 +2637,7 @@ int may_expand_vm(struct mm_struct *mm, | 52627 | @@ -2221,7 +2622,7 @@ int may_expand_vm(struct mm_struct *mm, |
52405 | unsigned long lim; | 52628 | unsigned long lim; |
52406 | 52629 | ||
52407 | lim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT; | 52630 | lim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT; |
@@ -52410,7 +52633,7 @@ diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c | |||
52410 | if (cur + npages > lim) | 52633 | if (cur + npages > lim) |
52411 | return 0; | 52634 | return 0; |
52412 | return 1; | 52635 | return 1; |
52413 | @@ -2290,6 +2706,15 @@ int install_special_mapping(struct mm_st | 52636 | @@ -2290,6 +2691,15 @@ int install_special_mapping(struct mm_st |
52414 | vma->vm_start = addr; | 52637 | vma->vm_start = addr; |
52415 | vma->vm_end = addr + len; | 52638 | vma->vm_end = addr + len; |
52416 | 52639 | ||
@@ -52426,9 +52649,9 @@ diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c | |||
52426 | vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; | 52649 | vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; |
52427 | vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); | 52650 | vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); |
52428 | 52651 | ||
52429 | diff -urNp linux-2.6.32.15/mm/mprotect.c linux-2.6.32.15/mm/mprotect.c | 52652 | diff -urNp linux-2.6.32.16/mm/mprotect.c linux-2.6.32.16/mm/mprotect.c |
52430 | --- linux-2.6.32.15/mm/mprotect.c 2010-03-15 11:52:04.000000000 -0400 | 52653 | --- linux-2.6.32.16/mm/mprotect.c 2010-07-05 14:14:00.000000000 -0400 |
52431 | +++ linux-2.6.32.15/mm/mprotect.c 2010-05-28 21:27:16.502950026 -0400 | 52654 | +++ linux-2.6.32.16/mm/mprotect.c 2010-07-09 14:50:38.000000000 -0400 |
52432 | @@ -24,10 +24,16 @@ | 52655 | @@ -24,10 +24,16 @@ |
52433 | #include <linux/mmu_notifier.h> | 52656 | #include <linux/mmu_notifier.h> |
52434 | #include <linux/migrate.h> | 52657 | #include <linux/migrate.h> |
@@ -52626,9 +52849,9 @@ diff -urNp linux-2.6.32.15/mm/mprotect.c linux-2.6.32.15/mm/mprotect.c | |||
52626 | nstart = tmp; | 52849 | nstart = tmp; |
52627 | 52850 | ||
52628 | if (nstart < prev->vm_end) | 52851 | if (nstart < prev->vm_end) |
52629 | diff -urNp linux-2.6.32.15/mm/mremap.c linux-2.6.32.15/mm/mremap.c | 52852 | diff -urNp linux-2.6.32.16/mm/mremap.c linux-2.6.32.16/mm/mremap.c |
52630 | --- linux-2.6.32.15/mm/mremap.c 2010-03-15 11:52:04.000000000 -0400 | 52853 | --- linux-2.6.32.16/mm/mremap.c 2010-07-05 14:14:00.000000000 -0400 |
52631 | +++ linux-2.6.32.15/mm/mremap.c 2010-05-28 21:27:16.502950026 -0400 | 52854 | +++ linux-2.6.32.16/mm/mremap.c 2010-07-09 14:50:38.000000000 -0400 |
52632 | @@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str | 52855 | @@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str |
52633 | continue; | 52856 | continue; |
52634 | pte = ptep_clear_flush(vma, old_addr, old_pte); | 52857 | pte = ptep_clear_flush(vma, old_addr, old_pte); |
@@ -52729,9 +52952,9 @@ diff -urNp linux-2.6.32.15/mm/mremap.c linux-2.6.32.15/mm/mremap.c | |||
52729 | } | 52952 | } |
52730 | out: | 52953 | out: |
52731 | if (ret & ~PAGE_MASK) | 52954 | if (ret & ~PAGE_MASK) |
52732 | diff -urNp linux-2.6.32.15/mm/nommu.c linux-2.6.32.15/mm/nommu.c | 52955 | diff -urNp linux-2.6.32.16/mm/nommu.c linux-2.6.32.16/mm/nommu.c |
52733 | --- linux-2.6.32.15/mm/nommu.c 2010-03-15 11:52:04.000000000 -0400 | 52956 | --- linux-2.6.32.16/mm/nommu.c 2010-07-05 14:14:00.000000000 -0400 |
52734 | +++ linux-2.6.32.15/mm/nommu.c 2010-05-28 21:27:16.502950026 -0400 | 52957 | +++ linux-2.6.32.16/mm/nommu.c 2010-07-09 14:50:38.000000000 -0400 |
52735 | @@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m | 52958 | @@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m |
52736 | EXPORT_SYMBOL(find_vma); | 52959 | EXPORT_SYMBOL(find_vma); |
52737 | 52960 | ||
@@ -52748,9 +52971,9 @@ diff -urNp linux-2.6.32.15/mm/nommu.c linux-2.6.32.15/mm/nommu.c | |||
52748 | * expand a stack to a given address | 52971 | * expand a stack to a given address |
52749 | * - not supported under NOMMU conditions | 52972 | * - not supported under NOMMU conditions |
52750 | */ | 52973 | */ |
52751 | diff -urNp linux-2.6.32.15/mm/page_alloc.c linux-2.6.32.15/mm/page_alloc.c | 52974 | diff -urNp linux-2.6.32.16/mm/page_alloc.c linux-2.6.32.16/mm/page_alloc.c |
52752 | --- linux-2.6.32.15/mm/page_alloc.c 2010-03-15 11:52:04.000000000 -0400 | 52975 | --- linux-2.6.32.16/mm/page_alloc.c 2010-07-05 14:14:00.000000000 -0400 |
52753 | +++ linux-2.6.32.15/mm/page_alloc.c 2010-05-28 21:27:16.530961628 -0400 | 52976 | +++ linux-2.6.32.16/mm/page_alloc.c 2010-07-09 14:50:38.000000000 -0400 |
52754 | @@ -586,6 +586,10 @@ static void __free_pages_ok(struct page | 52977 | @@ -586,6 +586,10 @@ static void __free_pages_ok(struct page |
52755 | int bad = 0; | 52978 | int bad = 0; |
52756 | int wasMlocked = __TestClearPageMlocked(page); | 52979 | int wasMlocked = __TestClearPageMlocked(page); |
@@ -52807,9 +53030,9 @@ diff -urNp linux-2.6.32.15/mm/page_alloc.c linux-2.6.32.15/mm/page_alloc.c | |||
52807 | struct zone *zone, unsigned long zonesize) {} | 53030 | struct zone *zone, unsigned long zonesize) {} |
52808 | #endif /* CONFIG_SPARSEMEM */ | 53031 | #endif /* CONFIG_SPARSEMEM */ |
52809 | 53032 | ||
52810 | diff -urNp linux-2.6.32.15/mm/percpu.c linux-2.6.32.15/mm/percpu.c | 53033 | diff -urNp linux-2.6.32.16/mm/percpu.c linux-2.6.32.16/mm/percpu.c |
52811 | --- linux-2.6.32.15/mm/percpu.c 2010-03-15 11:52:04.000000000 -0400 | 53034 | --- linux-2.6.32.16/mm/percpu.c 2010-07-05 14:14:00.000000000 -0400 |
52812 | +++ linux-2.6.32.15/mm/percpu.c 2010-05-28 21:27:16.530961628 -0400 | 53035 | +++ linux-2.6.32.16/mm/percpu.c 2010-07-09 14:50:38.000000000 -0400 |
52813 | @@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu | 53036 | @@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu |
52814 | static unsigned int pcpu_last_unit_cpu __read_mostly; | 53037 | static unsigned int pcpu_last_unit_cpu __read_mostly; |
52815 | 53038 | ||
@@ -52819,9 +53042,9 @@ diff -urNp linux-2.6.32.15/mm/percpu.c linux-2.6.32.15/mm/percpu.c | |||
52819 | EXPORT_SYMBOL_GPL(pcpu_base_addr); | 53042 | EXPORT_SYMBOL_GPL(pcpu_base_addr); |
52820 | 53043 | ||
52821 | static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ | 53044 | static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ |
52822 | diff -urNp linux-2.6.32.15/mm/rmap.c linux-2.6.32.15/mm/rmap.c | 53045 | diff -urNp linux-2.6.32.16/mm/rmap.c linux-2.6.32.16/mm/rmap.c |
52823 | --- linux-2.6.32.15/mm/rmap.c 2010-03-15 11:52:04.000000000 -0400 | 53046 | --- linux-2.6.32.16/mm/rmap.c 2010-07-05 14:14:00.000000000 -0400 |
52824 | +++ linux-2.6.32.15/mm/rmap.c 2010-05-28 21:27:16.539259032 -0400 | 53047 | +++ linux-2.6.32.16/mm/rmap.c 2010-07-09 14:50:38.000000000 -0400 |
52825 | @@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru | 53048 | @@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru |
52826 | struct mm_struct *mm = vma->vm_mm; | 53049 | struct mm_struct *mm = vma->vm_mm; |
52827 | struct anon_vma *allocated; | 53050 | struct anon_vma *allocated; |
@@ -52850,9 +53073,9 @@ diff -urNp linux-2.6.32.15/mm/rmap.c linux-2.6.32.15/mm/rmap.c | |||
52850 | vma->anon_vma = anon_vma; | 53073 | vma->anon_vma = anon_vma; |
52851 | list_add_tail(&vma->anon_vma_node, &anon_vma->head); | 53074 | list_add_tail(&vma->anon_vma_node, &anon_vma->head); |
52852 | allocated = NULL; | 53075 | allocated = NULL; |
52853 | diff -urNp linux-2.6.32.15/mm/shmem.c linux-2.6.32.15/mm/shmem.c | 53076 | diff -urNp linux-2.6.32.16/mm/shmem.c linux-2.6.32.16/mm/shmem.c |
52854 | --- linux-2.6.32.15/mm/shmem.c 2010-03-15 11:52:04.000000000 -0400 | 53077 | --- linux-2.6.32.16/mm/shmem.c 2010-07-05 14:14:00.000000000 -0400 |
52855 | +++ linux-2.6.32.15/mm/shmem.c 2010-05-28 21:27:16.543245570 -0400 | 53078 | +++ linux-2.6.32.16/mm/shmem.c 2010-07-09 14:50:38.000000000 -0400 |
52856 | @@ -31,7 +31,7 @@ | 53079 | @@ -31,7 +31,7 @@ |
52857 | #include <linux/swap.h> | 53080 | #include <linux/swap.h> |
52858 | #include <linux/ima.h> | 53081 | #include <linux/ima.h> |
@@ -52862,9 +53085,9 @@ diff -urNp linux-2.6.32.15/mm/shmem.c linux-2.6.32.15/mm/shmem.c | |||
52862 | 53085 | ||
52863 | #ifdef CONFIG_SHMEM | 53086 | #ifdef CONFIG_SHMEM |
52864 | /* | 53087 | /* |
52865 | diff -urNp linux-2.6.32.15/mm/slab.c linux-2.6.32.15/mm/slab.c | 53088 | diff -urNp linux-2.6.32.16/mm/slab.c linux-2.6.32.16/mm/slab.c |
52866 | --- linux-2.6.32.15/mm/slab.c 2010-03-15 11:52:04.000000000 -0400 | 53089 | --- linux-2.6.32.16/mm/slab.c 2010-07-05 14:14:00.000000000 -0400 |
52867 | +++ linux-2.6.32.15/mm/slab.c 2010-05-31 11:16:00.657200601 -0400 | 53090 | +++ linux-2.6.32.16/mm/slab.c 2010-07-09 14:50:38.000000000 -0400 |
52868 | @@ -308,7 +308,7 @@ struct kmem_list3 { | 53091 | @@ -308,7 +308,7 @@ struct kmem_list3 { |
52869 | * Need this for bootstrapping a per node allocator. | 53092 | * Need this for bootstrapping a per node allocator. |
52870 | */ | 53093 | */ |
@@ -52970,9 +53193,9 @@ diff -urNp linux-2.6.32.15/mm/slab.c linux-2.6.32.15/mm/slab.c | |||
52970 | /** | 53193 | /** |
52971 | * ksize - get the actual amount of memory allocated for a given object | 53194 | * ksize - get the actual amount of memory allocated for a given object |
52972 | * @objp: Pointer to the object | 53195 | * @objp: Pointer to the object |
52973 | diff -urNp linux-2.6.32.15/mm/slob.c linux-2.6.32.15/mm/slob.c | 53196 | diff -urNp linux-2.6.32.16/mm/slob.c linux-2.6.32.16/mm/slob.c |
52974 | --- linux-2.6.32.15/mm/slob.c 2010-03-15 11:52:04.000000000 -0400 | 53197 | --- linux-2.6.32.16/mm/slob.c 2010-07-05 14:14:00.000000000 -0400 |
52975 | +++ linux-2.6.32.15/mm/slob.c 2010-05-31 11:16:35.308884479 -0400 | 53198 | +++ linux-2.6.32.16/mm/slob.c 2010-07-09 14:50:38.000000000 -0400 |
52976 | @@ -29,7 +29,7 @@ | 53199 | @@ -29,7 +29,7 @@ |
52977 | * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls | 53200 | * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls |
52978 | * alloc_pages() directly, allocating compound pages so the page order | 53201 | * alloc_pages() directly, allocating compound pages so the page order |
@@ -53293,9 +53516,9 @@ diff -urNp linux-2.6.32.15/mm/slob.c linux-2.6.32.15/mm/slob.c | |||
53293 | } | 53516 | } |
53294 | 53517 | ||
53295 | trace_kmem_cache_free(_RET_IP_, b); | 53518 | trace_kmem_cache_free(_RET_IP_, b); |
53296 | diff -urNp linux-2.6.32.15/mm/slub.c linux-2.6.32.15/mm/slub.c | 53519 | diff -urNp linux-2.6.32.16/mm/slub.c linux-2.6.32.16/mm/slub.c |
53297 | --- linux-2.6.32.15/mm/slub.c 2010-03-15 11:52:04.000000000 -0400 | 53520 | --- linux-2.6.32.16/mm/slub.c 2010-07-05 14:14:00.000000000 -0400 |
53298 | +++ linux-2.6.32.15/mm/slub.c 2010-05-31 11:16:21.137686742 -0400 | 53521 | +++ linux-2.6.32.16/mm/slub.c 2010-07-09 14:50:38.000000000 -0400 |
53299 | @@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache * | 53522 | @@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache * |
53300 | 53523 | ||
53301 | page = virt_to_head_page(x); | 53524 | page = virt_to_head_page(x); |
@@ -53458,9 +53681,9 @@ diff -urNp linux-2.6.32.15/mm/slub.c linux-2.6.32.15/mm/slub.c | |||
53458 | return 0; | 53681 | return 0; |
53459 | } | 53682 | } |
53460 | module_init(slab_proc_init); | 53683 | module_init(slab_proc_init); |
53461 | diff -urNp linux-2.6.32.15/mm/util.c linux-2.6.32.15/mm/util.c | 53684 | diff -urNp linux-2.6.32.16/mm/util.c linux-2.6.32.16/mm/util.c |
53462 | --- linux-2.6.32.15/mm/util.c 2010-03-15 11:52:04.000000000 -0400 | 53685 | --- linux-2.6.32.16/mm/util.c 2010-07-05 14:14:00.000000000 -0400 |
53463 | +++ linux-2.6.32.15/mm/util.c 2010-05-28 21:27:16.563017088 -0400 | 53686 | +++ linux-2.6.32.16/mm/util.c 2010-07-09 14:50:38.000000000 -0400 |
53464 | @@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user); | 53687 | @@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user); |
53465 | void arch_pick_mmap_layout(struct mm_struct *mm) | 53688 | void arch_pick_mmap_layout(struct mm_struct *mm) |
53466 | { | 53689 | { |
@@ -53474,9 +53697,9 @@ diff -urNp linux-2.6.32.15/mm/util.c linux-2.6.32.15/mm/util.c | |||
53474 | mm->get_unmapped_area = arch_get_unmapped_area; | 53697 | mm->get_unmapped_area = arch_get_unmapped_area; |
53475 | mm->unmap_area = arch_unmap_area; | 53698 | mm->unmap_area = arch_unmap_area; |
53476 | } | 53699 | } |
53477 | diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c | 53700 | diff -urNp linux-2.6.32.16/mm/vmalloc.c linux-2.6.32.16/mm/vmalloc.c |
53478 | --- linux-2.6.32.15/mm/vmalloc.c 2010-03-15 11:52:04.000000000 -0400 | 53701 | --- linux-2.6.32.16/mm/vmalloc.c 2010-07-05 14:14:00.000000000 -0400 |
53479 | +++ linux-2.6.32.15/mm/vmalloc.c 2010-05-28 21:27:16.567244417 -0400 | 53702 | +++ linux-2.6.32.16/mm/vmalloc.c 2010-07-09 14:50:44.000000000 -0400 |
53480 | @@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, | 53703 | @@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, |
53481 | 53704 | ||
53482 | pte = pte_offset_kernel(pmd, addr); | 53705 | pte = pte_offset_kernel(pmd, addr); |
@@ -53507,7 +53730,7 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c | |||
53507 | 53730 | ||
53508 | /* | 53731 | /* |
53509 | * nr is a running index into the array which helps higher level | 53732 | * nr is a running index into the array which helps higher level |
53510 | @@ -101,17 +113,30 @@ static int vmap_pte_range(pmd_t *pmd, un | 53733 | @@ -101,17 +113,32 @@ static int vmap_pte_range(pmd_t *pmd, un |
53511 | pte = pte_alloc_kernel(pmd, addr); | 53734 | pte = pte_alloc_kernel(pmd, addr); |
53512 | if (!pte) | 53735 | if (!pte) |
53513 | return -ENOMEM; | 53736 | return -ENOMEM; |
@@ -53521,7 +53744,9 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c | |||
53521 | - if (WARN_ON(!page)) | 53744 | - if (WARN_ON(!page)) |
53522 | - return -ENOMEM; | 53745 | - return -ENOMEM; |
53523 | +#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) | 53746 | +#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) |
53524 | + if (pgprot_val(prot) & _PAGE_NX) | 53747 | + if (!(pgprot_val(prot) & _PAGE_NX)) |
53748 | + BUG_ON(!pte_exec(*pte) || pte_pfn(*pte) != __pa(addr) >> PAGE_SHIFT); | ||
53749 | + else | ||
53525 | +#endif | 53750 | +#endif |
53526 | + | 53751 | + |
53527 | + if (WARN_ON(!pte_none(*pte))) { | 53752 | + if (WARN_ON(!pte_none(*pte))) { |
@@ -53543,7 +53768,7 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c | |||
53543 | } | 53768 | } |
53544 | 53769 | ||
53545 | static int vmap_pmd_range(pud_t *pud, unsigned long addr, | 53770 | static int vmap_pmd_range(pud_t *pud, unsigned long addr, |
53546 | @@ -192,11 +217,20 @@ int is_vmalloc_or_module_addr(const void | 53771 | @@ -192,11 +219,20 @@ int is_vmalloc_or_module_addr(const void |
53547 | * and fall back on vmalloc() if that fails. Others | 53772 | * and fall back on vmalloc() if that fails. Others |
53548 | * just put it in the vmalloc space. | 53773 | * just put it in the vmalloc space. |
53549 | */ | 53774 | */ |
@@ -53565,7 +53790,22 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c | |||
53565 | return is_vmalloc_addr(x); | 53790 | return is_vmalloc_addr(x); |
53566 | } | 53791 | } |
53567 | 53792 | ||
53568 | @@ -292,13 +326,13 @@ static void __insert_vmap_area(struct vm | 53793 | @@ -217,8 +253,14 @@ struct page *vmalloc_to_page(const void |
53794 | |||
53795 | if (!pgd_none(*pgd)) { | ||
53796 | pud_t *pud = pud_offset(pgd, addr); | ||
53797 | +#ifdef CONFIG_X86 | ||
53798 | + if (!pud_large(*pud)) | ||
53799 | +#endif | ||
53800 | if (!pud_none(*pud)) { | ||
53801 | pmd_t *pmd = pmd_offset(pud, addr); | ||
53802 | +#ifdef CONFIG_X86 | ||
53803 | + if (!pmd_large(*pmd)) | ||
53804 | +#endif | ||
53805 | if (!pmd_none(*pmd)) { | ||
53806 | pte_t *ptep, pte; | ||
53807 | |||
53808 | @@ -292,13 +334,13 @@ static void __insert_vmap_area(struct vm | ||
53569 | struct rb_node *tmp; | 53809 | struct rb_node *tmp; |
53570 | 53810 | ||
53571 | while (*p) { | 53811 | while (*p) { |
@@ -53583,7 +53823,7 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c | |||
53583 | p = &(*p)->rb_right; | 53823 | p = &(*p)->rb_right; |
53584 | else | 53824 | else |
53585 | BUG(); | 53825 | BUG(); |
53586 | @@ -1223,6 +1257,16 @@ static struct vm_struct *__get_vm_area_n | 53826 | @@ -1223,6 +1265,16 @@ static struct vm_struct *__get_vm_area_n |
53587 | struct vm_struct *area; | 53827 | struct vm_struct *area; |
53588 | 53828 | ||
53589 | BUG_ON(in_interrupt()); | 53829 | BUG_ON(in_interrupt()); |
@@ -53600,7 +53840,7 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c | |||
53600 | if (flags & VM_IOREMAP) { | 53840 | if (flags & VM_IOREMAP) { |
53601 | int bit = fls(size); | 53841 | int bit = fls(size); |
53602 | 53842 | ||
53603 | @@ -1448,6 +1492,11 @@ void *vmap(struct page **pages, unsigned | 53843 | @@ -1448,6 +1500,11 @@ void *vmap(struct page **pages, unsigned |
53604 | if (count > totalram_pages) | 53844 | if (count > totalram_pages) |
53605 | return NULL; | 53845 | return NULL; |
53606 | 53846 | ||
@@ -53612,7 +53852,7 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c | |||
53612 | area = get_vm_area_caller((count << PAGE_SHIFT), flags, | 53852 | area = get_vm_area_caller((count << PAGE_SHIFT), flags, |
53613 | __builtin_return_address(0)); | 53853 | __builtin_return_address(0)); |
53614 | if (!area) | 53854 | if (!area) |
53615 | @@ -1558,6 +1607,13 @@ static void *__vmalloc_node(unsigned lon | 53855 | @@ -1558,6 +1615,13 @@ static void *__vmalloc_node(unsigned lon |
53616 | if (!size || (size >> PAGE_SHIFT) > totalram_pages) | 53856 | if (!size || (size >> PAGE_SHIFT) > totalram_pages) |
53617 | return NULL; | 53857 | return NULL; |
53618 | 53858 | ||
@@ -53626,7 +53866,7 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c | |||
53626 | area = __get_vm_area_node(size, align, VM_ALLOC, VMALLOC_START, | 53866 | area = __get_vm_area_node(size, align, VM_ALLOC, VMALLOC_START, |
53627 | VMALLOC_END, node, gfp_mask, caller); | 53867 | VMALLOC_END, node, gfp_mask, caller); |
53628 | 53868 | ||
53629 | @@ -1576,6 +1632,7 @@ static void *__vmalloc_node(unsigned lon | 53869 | @@ -1576,6 +1640,7 @@ static void *__vmalloc_node(unsigned lon |
53630 | return addr; | 53870 | return addr; |
53631 | } | 53871 | } |
53632 | 53872 | ||
@@ -53634,7 +53874,7 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c | |||
53634 | void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot) | 53874 | void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot) |
53635 | { | 53875 | { |
53636 | return __vmalloc_node(size, 1, gfp_mask, prot, -1, | 53876 | return __vmalloc_node(size, 1, gfp_mask, prot, -1, |
53637 | @@ -1592,6 +1649,7 @@ EXPORT_SYMBOL(__vmalloc); | 53877 | @@ -1592,6 +1657,7 @@ EXPORT_SYMBOL(__vmalloc); |
53638 | * For tight control over page level allocator and protection flags | 53878 | * For tight control over page level allocator and protection flags |
53639 | * use __vmalloc() instead. | 53879 | * use __vmalloc() instead. |
53640 | */ | 53880 | */ |
@@ -53642,7 +53882,7 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c | |||
53642 | void *vmalloc(unsigned long size) | 53882 | void *vmalloc(unsigned long size) |
53643 | { | 53883 | { |
53644 | return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, | 53884 | return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, |
53645 | @@ -1606,6 +1664,7 @@ EXPORT_SYMBOL(vmalloc); | 53885 | @@ -1606,6 +1672,7 @@ EXPORT_SYMBOL(vmalloc); |
53646 | * The resulting memory area is zeroed so it can be mapped to userspace | 53886 | * The resulting memory area is zeroed so it can be mapped to userspace |
53647 | * without leaking data. | 53887 | * without leaking data. |
53648 | */ | 53888 | */ |
@@ -53650,7 +53890,7 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c | |||
53650 | void *vmalloc_user(unsigned long size) | 53890 | void *vmalloc_user(unsigned long size) |
53651 | { | 53891 | { |
53652 | struct vm_struct *area; | 53892 | struct vm_struct *area; |
53653 | @@ -1633,6 +1692,7 @@ EXPORT_SYMBOL(vmalloc_user); | 53893 | @@ -1633,6 +1700,7 @@ EXPORT_SYMBOL(vmalloc_user); |
53654 | * For tight control over page level allocator and protection flags | 53894 | * For tight control over page level allocator and protection flags |
53655 | * use __vmalloc() instead. | 53895 | * use __vmalloc() instead. |
53656 | */ | 53896 | */ |
@@ -53658,7 +53898,7 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c | |||
53658 | void *vmalloc_node(unsigned long size, int node) | 53898 | void *vmalloc_node(unsigned long size, int node) |
53659 | { | 53899 | { |
53660 | return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, | 53900 | return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, |
53661 | @@ -1655,10 +1715,10 @@ EXPORT_SYMBOL(vmalloc_node); | 53901 | @@ -1655,10 +1723,10 @@ EXPORT_SYMBOL(vmalloc_node); |
53662 | * For tight control over page level allocator and protection flags | 53902 | * For tight control over page level allocator and protection flags |
53663 | * use __vmalloc() instead. | 53903 | * use __vmalloc() instead. |
53664 | */ | 53904 | */ |
@@ -53671,7 +53911,7 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c | |||
53671 | -1, __builtin_return_address(0)); | 53911 | -1, __builtin_return_address(0)); |
53672 | } | 53912 | } |
53673 | 53913 | ||
53674 | @@ -1677,6 +1737,7 @@ void *vmalloc_exec(unsigned long size) | 53914 | @@ -1677,6 +1745,7 @@ void *vmalloc_exec(unsigned long size) |
53675 | * Allocate enough 32bit PA addressable pages to cover @size from the | 53915 | * Allocate enough 32bit PA addressable pages to cover @size from the |
53676 | * page level allocator and map them into contiguous kernel virtual space. | 53916 | * page level allocator and map them into contiguous kernel virtual space. |
53677 | */ | 53917 | */ |
@@ -53679,7 +53919,7 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c | |||
53679 | void *vmalloc_32(unsigned long size) | 53919 | void *vmalloc_32(unsigned long size) |
53680 | { | 53920 | { |
53681 | return __vmalloc_node(size, 1, GFP_VMALLOC32, PAGE_KERNEL, | 53921 | return __vmalloc_node(size, 1, GFP_VMALLOC32, PAGE_KERNEL, |
53682 | @@ -1691,6 +1752,7 @@ EXPORT_SYMBOL(vmalloc_32); | 53922 | @@ -1691,6 +1760,7 @@ EXPORT_SYMBOL(vmalloc_32); |
53683 | * The resulting memory area is 32bit addressable and zeroed so it can be | 53923 | * The resulting memory area is 32bit addressable and zeroed so it can be |
53684 | * mapped to userspace without leaking data. | 53924 | * mapped to userspace without leaking data. |
53685 | */ | 53925 | */ |
@@ -53687,9 +53927,9 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c | |||
53687 | void *vmalloc_32_user(unsigned long size) | 53927 | void *vmalloc_32_user(unsigned long size) |
53688 | { | 53928 | { |
53689 | struct vm_struct *area; | 53929 | struct vm_struct *area; |
53690 | diff -urNp linux-2.6.32.15/net/8021q/vlan.c linux-2.6.32.15/net/8021q/vlan.c | 53930 | diff -urNp linux-2.6.32.16/net/8021q/vlan.c linux-2.6.32.16/net/8021q/vlan.c |
53691 | --- linux-2.6.32.15/net/8021q/vlan.c 2010-03-15 11:52:04.000000000 -0400 | 53931 | --- linux-2.6.32.16/net/8021q/vlan.c 2010-07-05 14:14:00.000000000 -0400 |
53692 | +++ linux-2.6.32.15/net/8021q/vlan.c 2010-05-28 21:27:16.567244417 -0400 | 53932 | +++ linux-2.6.32.16/net/8021q/vlan.c 2010-07-09 14:50:38.000000000 -0400 |
53693 | @@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net | 53933 | @@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net |
53694 | err = -EPERM; | 53934 | err = -EPERM; |
53695 | if (!capable(CAP_NET_ADMIN)) | 53935 | if (!capable(CAP_NET_ADMIN)) |
@@ -53700,9 +53940,9 @@ diff -urNp linux-2.6.32.15/net/8021q/vlan.c linux-2.6.32.15/net/8021q/vlan.c | |||
53700 | struct vlan_net *vn; | 53940 | struct vlan_net *vn; |
53701 | 53941 | ||
53702 | vn = net_generic(net, vlan_net_id); | 53942 | vn = net_generic(net, vlan_net_id); |
53703 | diff -urNp linux-2.6.32.15/net/atm/atm_misc.c linux-2.6.32.15/net/atm/atm_misc.c | 53943 | diff -urNp linux-2.6.32.16/net/atm/atm_misc.c linux-2.6.32.16/net/atm/atm_misc.c |
53704 | --- linux-2.6.32.15/net/atm/atm_misc.c 2010-03-15 11:52:04.000000000 -0400 | 53944 | --- linux-2.6.32.16/net/atm/atm_misc.c 2010-07-05 14:14:00.000000000 -0400 |
53705 | +++ linux-2.6.32.15/net/atm/atm_misc.c 2010-05-28 21:27:16.567244417 -0400 | 53945 | +++ linux-2.6.32.16/net/atm/atm_misc.c 2010-07-09 14:50:38.000000000 -0400 |
53706 | @@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t | 53946 | @@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t |
53707 | if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) | 53947 | if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) |
53708 | return 1; | 53948 | return 1; |
@@ -53739,9 +53979,9 @@ diff -urNp linux-2.6.32.15/net/atm/atm_misc.c linux-2.6.32.15/net/atm/atm_misc.c | |||
53739 | __SONET_ITEMS | 53979 | __SONET_ITEMS |
53740 | #undef __HANDLE_ITEM | 53980 | #undef __HANDLE_ITEM |
53741 | } | 53981 | } |
53742 | diff -urNp linux-2.6.32.15/net/atm/proc.c linux-2.6.32.15/net/atm/proc.c | 53982 | diff -urNp linux-2.6.32.16/net/atm/proc.c linux-2.6.32.16/net/atm/proc.c |
53743 | --- linux-2.6.32.15/net/atm/proc.c 2010-03-15 11:52:04.000000000 -0400 | 53983 | --- linux-2.6.32.16/net/atm/proc.c 2010-07-05 14:14:00.000000000 -0400 |
53744 | +++ linux-2.6.32.15/net/atm/proc.c 2010-05-28 21:27:16.567244417 -0400 | 53984 | +++ linux-2.6.32.16/net/atm/proc.c 2010-07-09 14:50:38.000000000 -0400 |
53745 | @@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s | 53985 | @@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s |
53746 | const struct k_atm_aal_stats *stats) | 53986 | const struct k_atm_aal_stats *stats) |
53747 | { | 53987 | { |
@@ -53755,9 +53995,9 @@ diff -urNp linux-2.6.32.15/net/atm/proc.c linux-2.6.32.15/net/atm/proc.c | |||
53755 | } | 53995 | } |
53756 | 53996 | ||
53757 | static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev) | 53997 | static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev) |
53758 | diff -urNp linux-2.6.32.15/net/atm/resources.c linux-2.6.32.15/net/atm/resources.c | 53998 | diff -urNp linux-2.6.32.16/net/atm/resources.c linux-2.6.32.16/net/atm/resources.c |
53759 | --- linux-2.6.32.15/net/atm/resources.c 2010-03-15 11:52:04.000000000 -0400 | 53999 | --- linux-2.6.32.16/net/atm/resources.c 2010-07-05 14:14:00.000000000 -0400 |
53760 | +++ linux-2.6.32.15/net/atm/resources.c 2010-05-28 21:27:16.579274907 -0400 | 54000 | +++ linux-2.6.32.16/net/atm/resources.c 2010-07-09 14:50:38.000000000 -0400 |
53761 | @@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev * | 54001 | @@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev * |
53762 | static void copy_aal_stats(struct k_atm_aal_stats *from, | 54002 | static void copy_aal_stats(struct k_atm_aal_stats *from, |
53763 | struct atm_aal_stats *to) | 54003 | struct atm_aal_stats *to) |
@@ -53776,9 +54016,9 @@ diff -urNp linux-2.6.32.15/net/atm/resources.c linux-2.6.32.15/net/atm/resources | |||
53776 | __AAL_STAT_ITEMS | 54016 | __AAL_STAT_ITEMS |
53777 | #undef __HANDLE_ITEM | 54017 | #undef __HANDLE_ITEM |
53778 | } | 54018 | } |
53779 | diff -urNp linux-2.6.32.15/net/bridge/br_private.h linux-2.6.32.15/net/bridge/br_private.h | 54019 | diff -urNp linux-2.6.32.16/net/bridge/br_private.h linux-2.6.32.16/net/bridge/br_private.h |
53780 | --- linux-2.6.32.15/net/bridge/br_private.h 2010-03-15 11:52:04.000000000 -0400 | 54020 | --- linux-2.6.32.16/net/bridge/br_private.h 2010-07-05 14:14:00.000000000 -0400 |
53781 | +++ linux-2.6.32.15/net/bridge/br_private.h 2010-05-28 21:27:16.579274907 -0400 | 54021 | +++ linux-2.6.32.16/net/bridge/br_private.h 2010-07-09 14:50:38.000000000 -0400 |
53782 | @@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event, | 54022 | @@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event, |
53783 | 54023 | ||
53784 | #ifdef CONFIG_SYSFS | 54024 | #ifdef CONFIG_SYSFS |
@@ -53788,9 +54028,9 @@ diff -urNp linux-2.6.32.15/net/bridge/br_private.h linux-2.6.32.15/net/bridge/br | |||
53788 | extern int br_sysfs_addif(struct net_bridge_port *p); | 54028 | extern int br_sysfs_addif(struct net_bridge_port *p); |
53789 | 54029 | ||
53790 | /* br_sysfs_br.c */ | 54030 | /* br_sysfs_br.c */ |
53791 | diff -urNp linux-2.6.32.15/net/bridge/br_stp_if.c linux-2.6.32.15/net/bridge/br_stp_if.c | 54031 | diff -urNp linux-2.6.32.16/net/bridge/br_stp_if.c linux-2.6.32.16/net/bridge/br_stp_if.c |
53792 | --- linux-2.6.32.15/net/bridge/br_stp_if.c 2010-03-15 11:52:04.000000000 -0400 | 54032 | --- linux-2.6.32.16/net/bridge/br_stp_if.c 2010-07-05 14:14:00.000000000 -0400 |
53793 | +++ linux-2.6.32.15/net/bridge/br_stp_if.c 2010-05-28 21:27:16.579274907 -0400 | 54033 | +++ linux-2.6.32.16/net/bridge/br_stp_if.c 2010-07-09 14:50:38.000000000 -0400 |
53794 | @@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg | 54034 | @@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg |
53795 | char *envp[] = { NULL }; | 54035 | char *envp[] = { NULL }; |
53796 | 54036 | ||
@@ -53800,9 +54040,9 @@ diff -urNp linux-2.6.32.15/net/bridge/br_stp_if.c linux-2.6.32.15/net/bridge/br_ | |||
53800 | printk(KERN_INFO "%s: userspace STP stopped, return code %d\n", | 54040 | printk(KERN_INFO "%s: userspace STP stopped, return code %d\n", |
53801 | br->dev->name, r); | 54041 | br->dev->name, r); |
53802 | 54042 | ||
53803 | diff -urNp linux-2.6.32.15/net/bridge/br_sysfs_if.c linux-2.6.32.15/net/bridge/br_sysfs_if.c | 54043 | diff -urNp linux-2.6.32.16/net/bridge/br_sysfs_if.c linux-2.6.32.16/net/bridge/br_sysfs_if.c |
53804 | --- linux-2.6.32.15/net/bridge/br_sysfs_if.c 2010-03-15 11:52:04.000000000 -0400 | 54044 | --- linux-2.6.32.16/net/bridge/br_sysfs_if.c 2010-07-05 14:14:00.000000000 -0400 |
53805 | +++ linux-2.6.32.15/net/bridge/br_sysfs_if.c 2010-05-28 21:27:16.579274907 -0400 | 54045 | +++ linux-2.6.32.16/net/bridge/br_sysfs_if.c 2010-07-09 14:50:38.000000000 -0400 |
53806 | @@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje | 54046 | @@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje |
53807 | return ret; | 54047 | return ret; |
53808 | } | 54048 | } |
@@ -53812,9 +54052,9 @@ diff -urNp linux-2.6.32.15/net/bridge/br_sysfs_if.c linux-2.6.32.15/net/bridge/b | |||
53812 | .show = brport_show, | 54052 | .show = brport_show, |
53813 | .store = brport_store, | 54053 | .store = brport_store, |
53814 | }; | 54054 | }; |
53815 | diff -urNp linux-2.6.32.15/net/core/dev.c linux-2.6.32.15/net/core/dev.c | 54055 | diff -urNp linux-2.6.32.16/net/core/dev.c linux-2.6.32.16/net/core/dev.c |
53816 | --- linux-2.6.32.15/net/core/dev.c 2010-03-15 11:52:04.000000000 -0400 | 54056 | --- linux-2.6.32.16/net/core/dev.c 2010-07-05 14:14:00.000000000 -0400 |
53817 | +++ linux-2.6.32.15/net/core/dev.c 2010-05-28 21:27:16.595266161 -0400 | 54057 | +++ linux-2.6.32.16/net/core/dev.c 2010-07-09 14:50:39.000000000 -0400 |
53818 | @@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb) | 54058 | @@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb) |
53819 | } | 54059 | } |
53820 | EXPORT_SYMBOL(netif_rx_ni); | 54060 | EXPORT_SYMBOL(netif_rx_ni); |
@@ -53833,9 +54073,9 @@ diff -urNp linux-2.6.32.15/net/core/dev.c linux-2.6.32.15/net/core/dev.c | |||
53833 | { | 54073 | { |
53834 | struct list_head *list = &__get_cpu_var(softnet_data).poll_list; | 54074 | struct list_head *list = &__get_cpu_var(softnet_data).poll_list; |
53835 | unsigned long time_limit = jiffies + 2; | 54075 | unsigned long time_limit = jiffies + 2; |
53836 | diff -urNp linux-2.6.32.15/net/core/flow.c linux-2.6.32.15/net/core/flow.c | 54076 | diff -urNp linux-2.6.32.16/net/core/flow.c linux-2.6.32.16/net/core/flow.c |
53837 | --- linux-2.6.32.15/net/core/flow.c 2010-03-15 11:52:04.000000000 -0400 | 54077 | --- linux-2.6.32.16/net/core/flow.c 2010-07-05 14:14:00.000000000 -0400 |
53838 | +++ linux-2.6.32.15/net/core/flow.c 2010-05-28 21:27:16.595266161 -0400 | 54078 | +++ linux-2.6.32.16/net/core/flow.c 2010-07-09 14:50:39.000000000 -0400 |
53839 | @@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT( | 54079 | @@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT( |
53840 | 54080 | ||
53841 | static u32 flow_hash_shift; | 54081 | static u32 flow_hash_shift; |
@@ -53863,9 +54103,9 @@ diff -urNp linux-2.6.32.15/net/core/flow.c linux-2.6.32.15/net/core/flow.c | |||
53863 | 54103 | ||
53864 | #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) | 54104 | #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) |
53865 | 54105 | ||
53866 | diff -urNp linux-2.6.32.15/net/dccp/ccids/ccid3.c linux-2.6.32.15/net/dccp/ccids/ccid3.c | 54106 | diff -urNp linux-2.6.32.16/net/dccp/ccids/ccid3.c linux-2.6.32.16/net/dccp/ccids/ccid3.c |
53867 | --- linux-2.6.32.15/net/dccp/ccids/ccid3.c 2010-03-15 11:52:04.000000000 -0400 | 54107 | --- linux-2.6.32.16/net/dccp/ccids/ccid3.c 2010-07-05 14:14:00.000000000 -0400 |
53868 | +++ linux-2.6.32.15/net/dccp/ccids/ccid3.c 2010-05-28 21:27:16.595266161 -0400 | 54108 | +++ linux-2.6.32.16/net/dccp/ccids/ccid3.c 2010-07-09 14:50:39.000000000 -0400 |
53869 | @@ -41,7 +41,7 @@ | 54109 | @@ -41,7 +41,7 @@ |
53870 | static int ccid3_debug; | 54110 | static int ccid3_debug; |
53871 | #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a) | 54111 | #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a) |
@@ -53875,9 +54115,9 @@ diff -urNp linux-2.6.32.15/net/dccp/ccids/ccid3.c linux-2.6.32.15/net/dccp/ccids | |||
53875 | #endif | 54115 | #endif |
53876 | 54116 | ||
53877 | /* | 54117 | /* |
53878 | diff -urNp linux-2.6.32.15/net/dccp/dccp.h linux-2.6.32.15/net/dccp/dccp.h | 54118 | diff -urNp linux-2.6.32.16/net/dccp/dccp.h linux-2.6.32.16/net/dccp/dccp.h |
53879 | --- linux-2.6.32.15/net/dccp/dccp.h 2010-03-15 11:52:04.000000000 -0400 | 54119 | --- linux-2.6.32.16/net/dccp/dccp.h 2010-07-05 14:14:00.000000000 -0400 |
53880 | +++ linux-2.6.32.15/net/dccp/dccp.h 2010-05-28 21:27:16.595266161 -0400 | 54120 | +++ linux-2.6.32.16/net/dccp/dccp.h 2010-07-09 14:50:39.000000000 -0400 |
53881 | @@ -44,9 +44,9 @@ extern int dccp_debug; | 54121 | @@ -44,9 +44,9 @@ extern int dccp_debug; |
53882 | #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a) | 54122 | #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a) |
53883 | #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a) | 54123 | #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a) |
@@ -53891,9 +54131,9 @@ diff -urNp linux-2.6.32.15/net/dccp/dccp.h linux-2.6.32.15/net/dccp/dccp.h | |||
53891 | #endif | 54131 | #endif |
53892 | 54132 | ||
53893 | extern struct inet_hashinfo dccp_hashinfo; | 54133 | extern struct inet_hashinfo dccp_hashinfo; |
53894 | diff -urNp linux-2.6.32.15/net/decnet/sysctl_net_decnet.c linux-2.6.32.15/net/decnet/sysctl_net_decnet.c | 54134 | diff -urNp linux-2.6.32.16/net/decnet/sysctl_net_decnet.c linux-2.6.32.16/net/decnet/sysctl_net_decnet.c |
53895 | --- linux-2.6.32.15/net/decnet/sysctl_net_decnet.c 2010-03-15 11:52:04.000000000 -0400 | 54135 | --- linux-2.6.32.16/net/decnet/sysctl_net_decnet.c 2010-07-05 14:14:00.000000000 -0400 |
53896 | +++ linux-2.6.32.15/net/decnet/sysctl_net_decnet.c 2010-05-28 21:27:16.595266161 -0400 | 54136 | +++ linux-2.6.32.16/net/decnet/sysctl_net_decnet.c 2010-07-09 14:50:39.000000000 -0400 |
53897 | @@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t | 54137 | @@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t |
53898 | 54138 | ||
53899 | if (len > *lenp) len = *lenp; | 54139 | if (len > *lenp) len = *lenp; |
@@ -53912,9 +54152,9 @@ diff -urNp linux-2.6.32.15/net/decnet/sysctl_net_decnet.c linux-2.6.32.15/net/de | |||
53912 | return -EFAULT; | 54152 | return -EFAULT; |
53913 | 54153 | ||
53914 | *lenp = len; | 54154 | *lenp = len; |
53915 | diff -urNp linux-2.6.32.15/net/ipv4/inet_hashtables.c linux-2.6.32.15/net/ipv4/inet_hashtables.c | 54155 | diff -urNp linux-2.6.32.16/net/ipv4/inet_hashtables.c linux-2.6.32.16/net/ipv4/inet_hashtables.c |
53916 | --- linux-2.6.32.15/net/ipv4/inet_hashtables.c 2010-03-15 11:52:04.000000000 -0400 | 54156 | --- linux-2.6.32.16/net/ipv4/inet_hashtables.c 2010-07-05 14:14:00.000000000 -0400 |
53917 | +++ linux-2.6.32.15/net/ipv4/inet_hashtables.c 2010-05-28 21:27:16.600259316 -0400 | 54157 | +++ linux-2.6.32.16/net/ipv4/inet_hashtables.c 2010-07-09 14:50:39.000000000 -0400 |
53918 | @@ -18,11 +18,14 @@ | 54158 | @@ -18,11 +18,14 @@ |
53919 | #include <linux/sched.h> | 54159 | #include <linux/sched.h> |
53920 | #include <linux/slab.h> | 54160 | #include <linux/slab.h> |
@@ -53939,9 +54179,9 @@ diff -urNp linux-2.6.32.15/net/ipv4/inet_hashtables.c linux-2.6.32.15/net/ipv4/i | |||
53939 | if (tw) { | 54179 | if (tw) { |
53940 | inet_twsk_deschedule(tw, death_row); | 54180 | inet_twsk_deschedule(tw, death_row); |
53941 | inet_twsk_put(tw); | 54181 | inet_twsk_put(tw); |
53942 | 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 | 54182 | diff -urNp linux-2.6.32.16/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.16/net/ipv4/netfilter/nf_nat_snmp_basic.c |
53943 | --- linux-2.6.32.15/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-03-15 11:52:04.000000000 -0400 | 54183 | --- linux-2.6.32.16/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-07-05 14:14:00.000000000 -0400 |
53944 | +++ linux-2.6.32.15/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-05-28 21:27:16.600259316 -0400 | 54184 | +++ linux-2.6.32.16/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-07-09 14:50:39.000000000 -0400 |
53945 | @@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( | 54185 | @@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( |
53946 | 54186 | ||
53947 | *len = 0; | 54187 | *len = 0; |
@@ -53951,9 +54191,9 @@ diff -urNp linux-2.6.32.15/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.1 | |||
53951 | if (*octets == NULL) { | 54191 | if (*octets == NULL) { |
53952 | if (net_ratelimit()) | 54192 | if (net_ratelimit()) |
53953 | printk("OOM in bsalg (%d)\n", __LINE__); | 54193 | printk("OOM in bsalg (%d)\n", __LINE__); |
53954 | diff -urNp linux-2.6.32.15/net/ipv4/tcp_ipv4.c linux-2.6.32.15/net/ipv4/tcp_ipv4.c | 54194 | diff -urNp linux-2.6.32.16/net/ipv4/tcp_ipv4.c linux-2.6.32.16/net/ipv4/tcp_ipv4.c |
53955 | --- linux-2.6.32.15/net/ipv4/tcp_ipv4.c 2010-03-15 11:52:04.000000000 -0400 | 54195 | --- linux-2.6.32.16/net/ipv4/tcp_ipv4.c 2010-07-05 14:14:00.000000000 -0400 |
53956 | +++ linux-2.6.32.15/net/ipv4/tcp_ipv4.c 2010-05-28 21:27:16.600259316 -0400 | 54196 | +++ linux-2.6.32.16/net/ipv4/tcp_ipv4.c 2010-07-09 14:50:39.000000000 -0400 |
53957 | @@ -84,6 +84,9 @@ | 54197 | @@ -84,6 +84,9 @@ |
53958 | int sysctl_tcp_tw_reuse __read_mostly; | 54198 | int sysctl_tcp_tw_reuse __read_mostly; |
53959 | int sysctl_tcp_low_latency __read_mostly; | 54199 | int sysctl_tcp_low_latency __read_mostly; |
@@ -53998,9 +54238,9 @@ diff -urNp linux-2.6.32.15/net/ipv4/tcp_ipv4.c linux-2.6.32.15/net/ipv4/tcp_ipv4 | |||
53998 | tcp_v4_send_reset(NULL, skb); | 54238 | tcp_v4_send_reset(NULL, skb); |
53999 | } | 54239 | } |
54000 | 54240 | ||
54001 | diff -urNp linux-2.6.32.15/net/ipv4/tcp_minisocks.c linux-2.6.32.15/net/ipv4/tcp_minisocks.c | 54241 | diff -urNp linux-2.6.32.16/net/ipv4/tcp_minisocks.c linux-2.6.32.16/net/ipv4/tcp_minisocks.c |
54002 | --- linux-2.6.32.15/net/ipv4/tcp_minisocks.c 2010-03-15 11:52:04.000000000 -0400 | 54242 | --- linux-2.6.32.16/net/ipv4/tcp_minisocks.c 2010-07-05 14:14:00.000000000 -0400 |
54003 | +++ linux-2.6.32.15/net/ipv4/tcp_minisocks.c 2010-05-28 21:27:16.600259316 -0400 | 54243 | +++ linux-2.6.32.16/net/ipv4/tcp_minisocks.c 2010-07-09 14:50:39.000000000 -0400 |
54004 | @@ -26,6 +26,10 @@ | 54244 | @@ -26,6 +26,10 @@ |
54005 | #include <net/inet_common.h> | 54245 | #include <net/inet_common.h> |
54006 | #include <net/xfrm.h> | 54246 | #include <net/xfrm.h> |
@@ -54023,9 +54263,9 @@ diff -urNp linux-2.6.32.15/net/ipv4/tcp_minisocks.c linux-2.6.32.15/net/ipv4/tcp | |||
54023 | if (!(flg & TCP_FLAG_RST)) | 54263 | if (!(flg & TCP_FLAG_RST)) |
54024 | req->rsk_ops->send_reset(sk, skb); | 54264 | req->rsk_ops->send_reset(sk, skb); |
54025 | 54265 | ||
54026 | diff -urNp linux-2.6.32.15/net/ipv4/tcp_probe.c linux-2.6.32.15/net/ipv4/tcp_probe.c | 54266 | diff -urNp linux-2.6.32.16/net/ipv4/tcp_probe.c linux-2.6.32.16/net/ipv4/tcp_probe.c |
54027 | --- linux-2.6.32.15/net/ipv4/tcp_probe.c 2010-03-15 11:52:04.000000000 -0400 | 54267 | --- linux-2.6.32.16/net/ipv4/tcp_probe.c 2010-07-05 14:14:00.000000000 -0400 |
54028 | +++ linux-2.6.32.15/net/ipv4/tcp_probe.c 2010-05-28 21:27:16.600259316 -0400 | 54268 | +++ linux-2.6.32.16/net/ipv4/tcp_probe.c 2010-07-09 14:50:39.000000000 -0400 |
54029 | @@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file | 54269 | @@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file |
54030 | if (cnt + width >= len) | 54270 | if (cnt + width >= len) |
54031 | break; | 54271 | break; |
@@ -54035,9 +54275,9 @@ diff -urNp linux-2.6.32.15/net/ipv4/tcp_probe.c linux-2.6.32.15/net/ipv4/tcp_pro | |||
54035 | return -EFAULT; | 54275 | return -EFAULT; |
54036 | cnt += width; | 54276 | cnt += width; |
54037 | } | 54277 | } |
54038 | diff -urNp linux-2.6.32.15/net/ipv4/tcp_timer.c linux-2.6.32.15/net/ipv4/tcp_timer.c | 54278 | diff -urNp linux-2.6.32.16/net/ipv4/tcp_timer.c linux-2.6.32.16/net/ipv4/tcp_timer.c |
54039 | --- linux-2.6.32.15/net/ipv4/tcp_timer.c 2010-03-15 11:52:04.000000000 -0400 | 54279 | --- linux-2.6.32.16/net/ipv4/tcp_timer.c 2010-07-05 14:14:00.000000000 -0400 |
54040 | +++ linux-2.6.32.15/net/ipv4/tcp_timer.c 2010-05-28 21:27:16.600259316 -0400 | 54280 | +++ linux-2.6.32.16/net/ipv4/tcp_timer.c 2010-07-09 14:50:39.000000000 -0400 |
54041 | @@ -21,6 +21,10 @@ | 54281 | @@ -21,6 +21,10 @@ |
54042 | #include <linux/module.h> | 54282 | #include <linux/module.h> |
54043 | #include <net/tcp.h> | 54283 | #include <net/tcp.h> |
@@ -54063,9 +54303,9 @@ diff -urNp linux-2.6.32.15/net/ipv4/tcp_timer.c linux-2.6.32.15/net/ipv4/tcp_tim | |||
54063 | if (retransmits_timed_out(sk, retry_until)) { | 54303 | if (retransmits_timed_out(sk, retry_until)) { |
54064 | /* Has it gone just too far? */ | 54304 | /* Has it gone just too far? */ |
54065 | tcp_write_err(sk); | 54305 | tcp_write_err(sk); |
54066 | diff -urNp linux-2.6.32.15/net/ipv4/udp.c linux-2.6.32.15/net/ipv4/udp.c | 54306 | diff -urNp linux-2.6.32.16/net/ipv4/udp.c linux-2.6.32.16/net/ipv4/udp.c |
54067 | --- linux-2.6.32.15/net/ipv4/udp.c 2010-05-28 20:16:44.458924952 -0400 | 54307 | --- linux-2.6.32.16/net/ipv4/udp.c 2010-07-05 14:14:00.000000000 -0400 |
54068 | +++ linux-2.6.32.15/net/ipv4/udp.c 2010-05-28 21:27:16.624385427 -0400 | 54308 | +++ linux-2.6.32.16/net/ipv4/udp.c 2010-07-09 14:50:39.000000000 -0400 |
54069 | @@ -86,6 +86,7 @@ | 54309 | @@ -86,6 +86,7 @@ |
54070 | #include <linux/types.h> | 54310 | #include <linux/types.h> |
54071 | #include <linux/fcntl.h> | 54311 | #include <linux/fcntl.h> |
@@ -54135,9 +54375,9 @@ diff -urNp linux-2.6.32.15/net/ipv4/udp.c linux-2.6.32.15/net/ipv4/udp.c | |||
54135 | icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); | 54375 | icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); |
54136 | 54376 | ||
54137 | /* | 54377 | /* |
54138 | diff -urNp linux-2.6.32.15/net/ipv6/exthdrs.c linux-2.6.32.15/net/ipv6/exthdrs.c | 54378 | diff -urNp linux-2.6.32.16/net/ipv6/exthdrs.c linux-2.6.32.16/net/ipv6/exthdrs.c |
54139 | --- linux-2.6.32.15/net/ipv6/exthdrs.c 2010-03-15 11:52:04.000000000 -0400 | 54379 | --- linux-2.6.32.16/net/ipv6/exthdrs.c 2010-07-05 14:14:00.000000000 -0400 |
54140 | +++ linux-2.6.32.15/net/ipv6/exthdrs.c 2010-05-28 21:27:16.624385427 -0400 | 54380 | +++ linux-2.6.32.16/net/ipv6/exthdrs.c 2010-07-09 14:50:39.000000000 -0400 |
54141 | @@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt | 54381 | @@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt |
54142 | .type = IPV6_TLV_JUMBO, | 54382 | .type = IPV6_TLV_JUMBO, |
54143 | .func = ipv6_hop_jumbo, | 54383 | .func = ipv6_hop_jumbo, |
@@ -54147,9 +54387,9 @@ diff -urNp linux-2.6.32.15/net/ipv6/exthdrs.c linux-2.6.32.15/net/ipv6/exthdrs.c | |||
54147 | }; | 54387 | }; |
54148 | 54388 | ||
54149 | int ipv6_parse_hopopts(struct sk_buff *skb) | 54389 | int ipv6_parse_hopopts(struct sk_buff *skb) |
54150 | diff -urNp linux-2.6.32.15/net/ipv6/raw.c linux-2.6.32.15/net/ipv6/raw.c | 54390 | diff -urNp linux-2.6.32.16/net/ipv6/raw.c linux-2.6.32.16/net/ipv6/raw.c |
54151 | --- linux-2.6.32.15/net/ipv6/raw.c 2010-03-15 11:52:04.000000000 -0400 | 54391 | --- linux-2.6.32.16/net/ipv6/raw.c 2010-07-05 14:14:00.000000000 -0400 |
54152 | +++ linux-2.6.32.15/net/ipv6/raw.c 2010-05-28 21:27:16.624385427 -0400 | 54392 | +++ linux-2.6.32.16/net/ipv6/raw.c 2010-07-09 14:50:39.000000000 -0400 |
54153 | @@ -600,7 +600,7 @@ out: | 54393 | @@ -600,7 +600,7 @@ out: |
54154 | return err; | 54394 | return err; |
54155 | } | 54395 | } |
@@ -54159,9 +54399,9 @@ diff -urNp linux-2.6.32.15/net/ipv6/raw.c linux-2.6.32.15/net/ipv6/raw.c | |||
54159 | struct flowi *fl, struct rt6_info *rt, | 54399 | struct flowi *fl, struct rt6_info *rt, |
54160 | unsigned int flags) | 54400 | unsigned int flags) |
54161 | { | 54401 | { |
54162 | diff -urNp linux-2.6.32.15/net/ipv6/tcp_ipv6.c linux-2.6.32.15/net/ipv6/tcp_ipv6.c | 54402 | diff -urNp linux-2.6.32.16/net/ipv6/tcp_ipv6.c linux-2.6.32.16/net/ipv6/tcp_ipv6.c |
54163 | --- linux-2.6.32.15/net/ipv6/tcp_ipv6.c 2010-03-15 11:52:04.000000000 -0400 | 54403 | --- linux-2.6.32.16/net/ipv6/tcp_ipv6.c 2010-07-05 14:14:00.000000000 -0400 |
54164 | +++ linux-2.6.32.15/net/ipv6/tcp_ipv6.c 2010-06-26 14:14:12.642949877 -0400 | 54404 | +++ linux-2.6.32.16/net/ipv6/tcp_ipv6.c 2010-07-09 14:50:39.000000000 -0400 |
54165 | @@ -88,6 +88,10 @@ static struct tcp_md5sig_key *tcp_v6_md5 | 54405 | @@ -88,6 +88,10 @@ static struct tcp_md5sig_key *tcp_v6_md5 |
54166 | } | 54406 | } |
54167 | #endif | 54407 | #endif |
@@ -54207,9 +54447,9 @@ diff -urNp linux-2.6.32.15/net/ipv6/tcp_ipv6.c linux-2.6.32.15/net/ipv6/tcp_ipv6 | |||
54207 | tcp_v6_send_reset(NULL, skb); | 54447 | tcp_v6_send_reset(NULL, skb); |
54208 | } | 54448 | } |
54209 | 54449 | ||
54210 | diff -urNp linux-2.6.32.15/net/ipv6/udp.c linux-2.6.32.15/net/ipv6/udp.c | 54450 | diff -urNp linux-2.6.32.16/net/ipv6/udp.c linux-2.6.32.16/net/ipv6/udp.c |
54211 | --- linux-2.6.32.15/net/ipv6/udp.c 2010-03-15 11:52:04.000000000 -0400 | 54451 | --- linux-2.6.32.16/net/ipv6/udp.c 2010-07-05 14:14:00.000000000 -0400 |
54212 | +++ linux-2.6.32.15/net/ipv6/udp.c 2010-06-26 14:15:10.978789054 -0400 | 54452 | +++ linux-2.6.32.16/net/ipv6/udp.c 2010-07-09 14:50:39.000000000 -0400 |
54213 | @@ -49,6 +49,10 @@ | 54453 | @@ -49,6 +49,10 @@ |
54214 | #include <linux/seq_file.h> | 54454 | #include <linux/seq_file.h> |
54215 | #include "udp_impl.h" | 54455 | #include "udp_impl.h" |
@@ -54231,9 +54471,9 @@ diff -urNp linux-2.6.32.15/net/ipv6/udp.c linux-2.6.32.15/net/ipv6/udp.c | |||
54231 | icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev); | 54471 | icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev); |
54232 | 54472 | ||
54233 | kfree_skb(skb); | 54473 | kfree_skb(skb); |
54234 | diff -urNp linux-2.6.32.15/net/irda/ircomm/ircomm_tty.c linux-2.6.32.15/net/irda/ircomm/ircomm_tty.c | 54474 | diff -urNp linux-2.6.32.16/net/irda/ircomm/ircomm_tty.c linux-2.6.32.16/net/irda/ircomm/ircomm_tty.c |
54235 | --- linux-2.6.32.15/net/irda/ircomm/ircomm_tty.c 2010-03-15 11:52:04.000000000 -0400 | 54475 | --- linux-2.6.32.16/net/irda/ircomm/ircomm_tty.c 2010-07-05 14:14:00.000000000 -0400 |
54236 | +++ linux-2.6.32.15/net/irda/ircomm/ircomm_tty.c 2010-05-28 21:27:16.634961077 -0400 | 54476 | +++ linux-2.6.32.16/net/irda/ircomm/ircomm_tty.c 2010-07-09 14:50:39.000000000 -0400 |
54237 | @@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st | 54477 | @@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st |
54238 | add_wait_queue(&self->open_wait, &wait); | 54478 | add_wait_queue(&self->open_wait, &wait); |
54239 | 54479 | ||
@@ -54356,9 +54596,9 @@ diff -urNp linux-2.6.32.15/net/irda/ircomm/ircomm_tty.c linux-2.6.32.15/net/irda | |||
54356 | seq_printf(m, "Max data size: %d\n", self->max_data_size); | 54596 | seq_printf(m, "Max data size: %d\n", self->max_data_size); |
54357 | seq_printf(m, "Max header size: %d\n", self->max_header_size); | 54597 | seq_printf(m, "Max header size: %d\n", self->max_header_size); |
54358 | 54598 | ||
54359 | diff -urNp linux-2.6.32.15/net/mac80211/ieee80211_i.h linux-2.6.32.15/net/mac80211/ieee80211_i.h | 54599 | diff -urNp linux-2.6.32.16/net/mac80211/ieee80211_i.h linux-2.6.32.16/net/mac80211/ieee80211_i.h |
54360 | --- linux-2.6.32.15/net/mac80211/ieee80211_i.h 2010-04-04 20:41:50.080541354 -0400 | 54600 | --- linux-2.6.32.16/net/mac80211/ieee80211_i.h 2010-07-05 14:14:00.000000000 -0400 |
54361 | +++ linux-2.6.32.15/net/mac80211/ieee80211_i.h 2010-05-28 21:27:16.639255900 -0400 | 54601 | +++ linux-2.6.32.16/net/mac80211/ieee80211_i.h 2010-07-09 14:50:39.000000000 -0400 |
54362 | @@ -635,7 +635,7 @@ struct ieee80211_local { | 54602 | @@ -635,7 +635,7 @@ struct ieee80211_local { |
54363 | /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ | 54603 | /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ |
54364 | spinlock_t queue_stop_reason_lock; | 54604 | spinlock_t queue_stop_reason_lock; |
@@ -54368,9 +54608,9 @@ diff -urNp linux-2.6.32.15/net/mac80211/ieee80211_i.h linux-2.6.32.15/net/mac802 | |||
54368 | int monitors, cooked_mntrs; | 54608 | int monitors, cooked_mntrs; |
54369 | /* number of interfaces with corresponding FIF_ flags */ | 54609 | /* number of interfaces with corresponding FIF_ flags */ |
54370 | int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll; | 54610 | int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll; |
54371 | diff -urNp linux-2.6.32.15/net/mac80211/iface.c linux-2.6.32.15/net/mac80211/iface.c | 54611 | diff -urNp linux-2.6.32.16/net/mac80211/iface.c linux-2.6.32.16/net/mac80211/iface.c |
54372 | --- linux-2.6.32.15/net/mac80211/iface.c 2010-03-15 11:52:04.000000000 -0400 | 54612 | --- linux-2.6.32.16/net/mac80211/iface.c 2010-07-05 14:14:00.000000000 -0400 |
54373 | +++ linux-2.6.32.15/net/mac80211/iface.c 2010-05-28 21:27:16.650898496 -0400 | 54613 | +++ linux-2.6.32.16/net/mac80211/iface.c 2010-07-09 14:50:39.000000000 -0400 |
54374 | @@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev | 54614 | @@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev |
54375 | break; | 54615 | break; |
54376 | } | 54616 | } |
@@ -54425,9 +54665,9 @@ diff -urNp linux-2.6.32.15/net/mac80211/iface.c linux-2.6.32.15/net/mac80211/ifa | |||
54425 | ieee80211_clear_tx_pending(local); | 54665 | ieee80211_clear_tx_pending(local); |
54426 | ieee80211_stop_device(local); | 54666 | ieee80211_stop_device(local); |
54427 | 54667 | ||
54428 | diff -urNp linux-2.6.32.15/net/mac80211/main.c linux-2.6.32.15/net/mac80211/main.c | 54668 | diff -urNp linux-2.6.32.16/net/mac80211/main.c linux-2.6.32.16/net/mac80211/main.c |
54429 | --- linux-2.6.32.15/net/mac80211/main.c 2010-04-04 20:41:50.080541354 -0400 | 54669 | --- linux-2.6.32.16/net/mac80211/main.c 2010-07-05 14:14:00.000000000 -0400 |
54430 | +++ linux-2.6.32.15/net/mac80211/main.c 2010-05-28 21:27:16.650898496 -0400 | 54670 | +++ linux-2.6.32.16/net/mac80211/main.c 2010-07-09 14:50:39.000000000 -0400 |
54431 | @@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211 | 54671 | @@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211 |
54432 | local->hw.conf.power_level = power; | 54672 | local->hw.conf.power_level = power; |
54433 | } | 54673 | } |
@@ -54437,9 +54677,9 @@ diff -urNp linux-2.6.32.15/net/mac80211/main.c linux-2.6.32.15/net/mac80211/main | |||
54437 | ret = drv_config(local, changed); | 54677 | ret = drv_config(local, changed); |
54438 | /* | 54678 | /* |
54439 | * Goal: | 54679 | * Goal: |
54440 | diff -urNp linux-2.6.32.15/net/mac80211/pm.c linux-2.6.32.15/net/mac80211/pm.c | 54680 | diff -urNp linux-2.6.32.16/net/mac80211/pm.c linux-2.6.32.16/net/mac80211/pm.c |
54441 | --- linux-2.6.32.15/net/mac80211/pm.c 2010-03-15 11:52:04.000000000 -0400 | 54681 | --- linux-2.6.32.16/net/mac80211/pm.c 2010-07-05 14:14:00.000000000 -0400 |
54442 | +++ linux-2.6.32.15/net/mac80211/pm.c 2010-05-28 21:27:16.650898496 -0400 | 54682 | +++ linux-2.6.32.16/net/mac80211/pm.c 2010-07-09 14:50:39.000000000 -0400 |
54443 | @@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211 | 54683 | @@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211 |
54444 | } | 54684 | } |
54445 | 54685 | ||
@@ -54449,9 +54689,9 @@ diff -urNp linux-2.6.32.15/net/mac80211/pm.c linux-2.6.32.15/net/mac80211/pm.c | |||
54449 | ieee80211_stop_device(local); | 54689 | ieee80211_stop_device(local); |
54450 | 54690 | ||
54451 | local->suspended = true; | 54691 | local->suspended = true; |
54452 | diff -urNp linux-2.6.32.15/net/mac80211/rate.c linux-2.6.32.15/net/mac80211/rate.c | 54692 | diff -urNp linux-2.6.32.16/net/mac80211/rate.c linux-2.6.32.16/net/mac80211/rate.c |
54453 | --- linux-2.6.32.15/net/mac80211/rate.c 2010-03-15 11:52:04.000000000 -0400 | 54693 | --- linux-2.6.32.16/net/mac80211/rate.c 2010-07-05 14:14:00.000000000 -0400 |
54454 | +++ linux-2.6.32.15/net/mac80211/rate.c 2010-05-28 21:27:16.650898496 -0400 | 54694 | +++ linux-2.6.32.16/net/mac80211/rate.c 2010-07-09 14:50:39.000000000 -0400 |
54455 | @@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct | 54695 | @@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct |
54456 | struct rate_control_ref *ref, *old; | 54696 | struct rate_control_ref *ref, *old; |
54457 | 54697 | ||
@@ -54461,9 +54701,9 @@ diff -urNp linux-2.6.32.15/net/mac80211/rate.c linux-2.6.32.15/net/mac80211/rate | |||
54461 | return -EBUSY; | 54701 | return -EBUSY; |
54462 | 54702 | ||
54463 | ref = rate_control_alloc(name, local); | 54703 | ref = rate_control_alloc(name, local); |
54464 | diff -urNp linux-2.6.32.15/net/mac80211/tx.c linux-2.6.32.15/net/mac80211/tx.c | 54704 | diff -urNp linux-2.6.32.16/net/mac80211/tx.c linux-2.6.32.16/net/mac80211/tx.c |
54465 | --- linux-2.6.32.15/net/mac80211/tx.c 2010-04-29 17:49:38.690617032 -0400 | 54705 | --- linux-2.6.32.16/net/mac80211/tx.c 2010-07-05 14:14:00.000000000 -0400 |
54466 | +++ linux-2.6.32.15/net/mac80211/tx.c 2010-05-28 21:27:16.655282610 -0400 | 54706 | +++ linux-2.6.32.16/net/mac80211/tx.c 2010-07-09 14:50:39.000000000 -0400 |
54467 | @@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct | 54707 | @@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct |
54468 | return cpu_to_le16(dur); | 54708 | return cpu_to_le16(dur); |
54469 | } | 54709 | } |
@@ -54473,9 +54713,9 @@ diff -urNp linux-2.6.32.15/net/mac80211/tx.c linux-2.6.32.15/net/mac80211/tx.c | |||
54473 | struct net_device *dev) | 54713 | struct net_device *dev) |
54474 | { | 54714 | { |
54475 | return local == wdev_priv(dev->ieee80211_ptr); | 54715 | return local == wdev_priv(dev->ieee80211_ptr); |
54476 | diff -urNp linux-2.6.32.15/net/mac80211/util.c linux-2.6.32.15/net/mac80211/util.c | 54716 | diff -urNp linux-2.6.32.16/net/mac80211/util.c linux-2.6.32.16/net/mac80211/util.c |
54477 | --- linux-2.6.32.15/net/mac80211/util.c 2010-04-29 17:49:38.690617032 -0400 | 54717 | --- linux-2.6.32.16/net/mac80211/util.c 2010-07-05 14:14:00.000000000 -0400 |
54478 | +++ linux-2.6.32.15/net/mac80211/util.c 2010-05-28 21:27:16.655282610 -0400 | 54718 | +++ linux-2.6.32.16/net/mac80211/util.c 2010-07-09 14:50:39.000000000 -0400 |
54479 | @@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_ | 54719 | @@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_ |
54480 | local->resuming = true; | 54720 | local->resuming = true; |
54481 | 54721 | ||
@@ -54493,9 +54733,9 @@ diff -urNp linux-2.6.32.15/net/mac80211/util.c linux-2.6.32.15/net/mac80211/util | |||
54493 | if (res) { | 54733 | if (res) { |
54494 | WARN(local->suspended, "Harware became unavailable " | 54734 | WARN(local->suspended, "Harware became unavailable " |
54495 | "upon resume. This is could be a software issue" | 54735 | "upon resume. This is could be a software issue" |
54496 | diff -urNp linux-2.6.32.15/net/sctp/socket.c linux-2.6.32.15/net/sctp/socket.c | 54736 | diff -urNp linux-2.6.32.16/net/sctp/socket.c linux-2.6.32.16/net/sctp/socket.c |
54497 | --- linux-2.6.32.15/net/sctp/socket.c 2010-03-15 11:52:04.000000000 -0400 | 54737 | --- linux-2.6.32.16/net/sctp/socket.c 2010-07-05 14:14:00.000000000 -0400 |
54498 | +++ linux-2.6.32.15/net/sctp/socket.c 2010-05-28 21:27:16.667233121 -0400 | 54738 | +++ linux-2.6.32.16/net/sctp/socket.c 2010-07-09 14:50:39.000000000 -0400 |
54499 | @@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc | 54739 | @@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc |
54500 | struct sctp_sndrcvinfo *sinfo; | 54740 | struct sctp_sndrcvinfo *sinfo; |
54501 | struct sctp_initmsg *sinit; | 54741 | struct sctp_initmsg *sinit; |
@@ -54513,9 +54753,9 @@ diff -urNp linux-2.6.32.15/net/sctp/socket.c linux-2.6.32.15/net/sctp/socket.c | |||
54513 | 54753 | ||
54514 | SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n"); | 54754 | SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n"); |
54515 | if (pp->fastreuse && sk->sk_reuse && | 54755 | if (pp->fastreuse && sk->sk_reuse && |
54516 | diff -urNp linux-2.6.32.15/net/socket.c linux-2.6.32.15/net/socket.c | 54756 | diff -urNp linux-2.6.32.16/net/socket.c linux-2.6.32.16/net/socket.c |
54517 | --- linux-2.6.32.15/net/socket.c 2010-03-15 11:52:04.000000000 -0400 | 54757 | --- linux-2.6.32.16/net/socket.c 2010-07-05 14:14:00.000000000 -0400 |
54518 | +++ linux-2.6.32.15/net/socket.c 2010-05-28 21:27:16.671255671 -0400 | 54758 | +++ linux-2.6.32.16/net/socket.c 2010-07-09 14:50:39.000000000 -0400 |
54519 | @@ -87,6 +87,7 @@ | 54759 | @@ -87,6 +87,7 @@ |
54520 | #include <linux/wireless.h> | 54760 | #include <linux/wireless.h> |
54521 | #include <linux/nsproxy.h> | 54761 | #include <linux/nsproxy.h> |
@@ -54532,7 +54772,7 @@ diff -urNp linux-2.6.32.15/net/socket.c linux-2.6.32.15/net/socket.c | |||
54532 | +extern int gr_handle_sock_all(const int family, const int type, | 54772 | +extern int gr_handle_sock_all(const int family, const int type, |
54533 | + const int protocol); | 54773 | + const int protocol); |
54534 | +extern int gr_handle_sock_server(const struct sockaddr *sck); | 54774 | +extern int gr_handle_sock_server(const struct sockaddr *sck); |
54535 | +extern int gr_handle_sock_server_other(const struct socket *sck); | 54775 | +extern int gr_handle_sock_server_other(const struct sock *sck); |
54536 | +extern int gr_handle_sock_client(const struct sockaddr *sck); | 54776 | +extern int gr_handle_sock_client(const struct sockaddr *sck); |
54537 | +extern int gr_search_connect(struct socket * sock, | 54777 | +extern int gr_search_connect(struct socket * sock, |
54538 | + struct sockaddr_in * addr); | 54778 | + struct sockaddr_in * addr); |
@@ -54599,7 +54839,7 @@ diff -urNp linux-2.6.32.15/net/socket.c linux-2.6.32.15/net/socket.c | |||
54599 | if ((unsigned)backlog > somaxconn) | 54839 | if ((unsigned)backlog > somaxconn) |
54600 | backlog = somaxconn; | 54840 | backlog = somaxconn; |
54601 | 54841 | ||
54602 | + if (gr_handle_sock_server_other(sock)) { | 54842 | + if (gr_handle_sock_server_other(sock->sk)) { |
54603 | + err = -EPERM; | 54843 | + err = -EPERM; |
54604 | + goto error; | 54844 | + goto error; |
54605 | + } | 54845 | + } |
@@ -54620,7 +54860,7 @@ diff -urNp linux-2.6.32.15/net/socket.c linux-2.6.32.15/net/socket.c | |||
54620 | newsock->type = sock->type; | 54860 | newsock->type = sock->type; |
54621 | newsock->ops = sock->ops; | 54861 | newsock->ops = sock->ops; |
54622 | 54862 | ||
54623 | + if (gr_handle_sock_server_other(sock)) { | 54863 | + if (gr_handle_sock_server_other(sock->sk)) { |
54624 | + err = -EPERM; | 54864 | + err = -EPERM; |
54625 | + sock_release(newsock); | 54865 | + sock_release(newsock); |
54626 | + goto out_put; | 54866 | + goto out_put; |
@@ -54670,9 +54910,9 @@ diff -urNp linux-2.6.32.15/net/socket.c linux-2.6.32.15/net/socket.c | |||
54670 | err = | 54910 | err = |
54671 | security_socket_connect(sock, (struct sockaddr *)&address, addrlen); | 54911 | security_socket_connect(sock, (struct sockaddr *)&address, addrlen); |
54672 | if (err) | 54912 | if (err) |
54673 | diff -urNp linux-2.6.32.15/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.15/net/sunrpc/xprtrdma/svc_rdma.c | 54913 | diff -urNp linux-2.6.32.16/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.16/net/sunrpc/xprtrdma/svc_rdma.c |
54674 | --- linux-2.6.32.15/net/sunrpc/xprtrdma/svc_rdma.c 2010-03-15 11:52:04.000000000 -0400 | 54914 | --- linux-2.6.32.16/net/sunrpc/xprtrdma/svc_rdma.c 2010-07-05 14:14:00.000000000 -0400 |
54675 | +++ linux-2.6.32.15/net/sunrpc/xprtrdma/svc_rdma.c 2010-05-28 21:27:16.671255671 -0400 | 54915 | +++ linux-2.6.32.16/net/sunrpc/xprtrdma/svc_rdma.c 2010-07-09 14:50:39.000000000 -0400 |
54676 | @@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta | 54916 | @@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta |
54677 | len -= *ppos; | 54917 | len -= *ppos; |
54678 | if (len > *lenp) | 54918 | if (len > *lenp) |
@@ -54682,9 +54922,9 @@ diff -urNp linux-2.6.32.15/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.15/net/su | |||
54682 | return -EFAULT; | 54922 | return -EFAULT; |
54683 | *lenp = len; | 54923 | *lenp = len; |
54684 | *ppos += len; | 54924 | *ppos += len; |
54685 | diff -urNp linux-2.6.32.15/net/sysctl_net.c linux-2.6.32.15/net/sysctl_net.c | 54925 | diff -urNp linux-2.6.32.16/net/sysctl_net.c linux-2.6.32.16/net/sysctl_net.c |
54686 | --- linux-2.6.32.15/net/sysctl_net.c 2010-03-15 11:52:04.000000000 -0400 | 54926 | --- linux-2.6.32.16/net/sysctl_net.c 2010-07-05 14:14:00.000000000 -0400 |
54687 | +++ linux-2.6.32.15/net/sysctl_net.c 2010-05-28 21:27:16.674940896 -0400 | 54927 | +++ linux-2.6.32.16/net/sysctl_net.c 2010-07-09 14:50:39.000000000 -0400 |
54688 | @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct | 54928 | @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct |
54689 | struct ctl_table *table) | 54929 | struct ctl_table *table) |
54690 | { | 54930 | { |
@@ -54694,9 +54934,9 @@ diff -urNp linux-2.6.32.15/net/sysctl_net.c linux-2.6.32.15/net/sysctl_net.c | |||
54694 | int mode = (table->mode >> 6) & 7; | 54934 | int mode = (table->mode >> 6) & 7; |
54695 | return (mode << 6) | (mode << 3) | mode; | 54935 | return (mode << 6) | (mode << 3) | mode; |
54696 | } | 54936 | } |
54697 | diff -urNp linux-2.6.32.15/net/tipc/socket.c linux-2.6.32.15/net/tipc/socket.c | 54937 | diff -urNp linux-2.6.32.16/net/tipc/socket.c linux-2.6.32.16/net/tipc/socket.c |
54698 | --- linux-2.6.32.15/net/tipc/socket.c 2010-03-15 11:52:04.000000000 -0400 | 54938 | --- linux-2.6.32.16/net/tipc/socket.c 2010-07-05 14:14:00.000000000 -0400 |
54699 | +++ linux-2.6.32.15/net/tipc/socket.c 2010-05-28 21:27:16.683249187 -0400 | 54939 | +++ linux-2.6.32.16/net/tipc/socket.c 2010-07-09 14:50:39.000000000 -0400 |
54700 | @@ -1449,8 +1449,9 @@ static int connect(struct socket *sock, | 54940 | @@ -1449,8 +1449,9 @@ static int connect(struct socket *sock, |
54701 | } else { | 54941 | } else { |
54702 | if (res == 0) | 54942 | if (res == 0) |
@@ -54709,9 +54949,9 @@ diff -urNp linux-2.6.32.15/net/tipc/socket.c linux-2.6.32.15/net/tipc/socket.c | |||
54709 | sock->state = SS_DISCONNECTING; | 54949 | sock->state = SS_DISCONNECTING; |
54710 | } | 54950 | } |
54711 | 54951 | ||
54712 | diff -urNp linux-2.6.32.15/net/unix/af_unix.c linux-2.6.32.15/net/unix/af_unix.c | 54952 | diff -urNp linux-2.6.32.16/net/unix/af_unix.c linux-2.6.32.16/net/unix/af_unix.c |
54713 | --- linux-2.6.32.15/net/unix/af_unix.c 2010-03-15 11:52:04.000000000 -0400 | 54953 | --- linux-2.6.32.16/net/unix/af_unix.c 2010-07-05 14:14:00.000000000 -0400 |
54714 | +++ linux-2.6.32.15/net/unix/af_unix.c 2010-05-28 21:27:16.686916709 -0400 | 54954 | +++ linux-2.6.32.16/net/unix/af_unix.c 2010-07-09 14:50:39.000000000 -0400 |
54715 | @@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru | 54955 | @@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru |
54716 | err = -ECONNREFUSED; | 54956 | err = -ECONNREFUSED; |
54717 | if (!S_ISSOCK(inode->i_mode)) | 54957 | if (!S_ISSOCK(inode->i_mode)) |
@@ -54769,9 +55009,9 @@ diff -urNp linux-2.6.32.15/net/unix/af_unix.c linux-2.6.32.15/net/unix/af_unix.c | |||
54769 | list = &unix_socket_table[addr->hash]; | 55009 | list = &unix_socket_table[addr->hash]; |
54770 | } else { | 55010 | } else { |
54771 | list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)]; | 55011 | list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)]; |
54772 | diff -urNp linux-2.6.32.15/net/wireless/wext.c linux-2.6.32.15/net/wireless/wext.c | 55012 | diff -urNp linux-2.6.32.16/net/wireless/wext.c linux-2.6.32.16/net/wireless/wext.c |
54773 | --- linux-2.6.32.15/net/wireless/wext.c 2010-03-15 11:52:04.000000000 -0400 | 55013 | --- linux-2.6.32.16/net/wireless/wext.c 2010-07-05 14:14:00.000000000 -0400 |
54774 | +++ linux-2.6.32.15/net/wireless/wext.c 2010-05-28 21:27:16.686916709 -0400 | 55014 | +++ linux-2.6.32.16/net/wireless/wext.c 2010-07-09 14:50:39.000000000 -0400 |
54775 | @@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc | 55015 | @@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc |
54776 | */ | 55016 | */ |
54777 | 55017 | ||
@@ -54782,9 +55022,9 @@ diff -urNp linux-2.6.32.15/net/wireless/wext.c linux-2.6.32.15/net/wireless/wext | |||
54782 | /* Allow userspace to GET more than max so | 55022 | /* Allow userspace to GET more than max so |
54783 | * we can support any size GET requests. | 55023 | * we can support any size GET requests. |
54784 | * There is still a limit : -ENOMEM. | 55024 | * There is still a limit : -ENOMEM. |
54785 | diff -urNp linux-2.6.32.15/net/xfrm/xfrm_policy.c linux-2.6.32.15/net/xfrm/xfrm_policy.c | 55025 | diff -urNp linux-2.6.32.16/net/xfrm/xfrm_policy.c linux-2.6.32.16/net/xfrm/xfrm_policy.c |
54786 | --- linux-2.6.32.15/net/xfrm/xfrm_policy.c 2010-03-15 11:52:04.000000000 -0400 | 55026 | --- linux-2.6.32.16/net/xfrm/xfrm_policy.c 2010-07-05 14:14:00.000000000 -0400 |
54787 | +++ linux-2.6.32.15/net/xfrm/xfrm_policy.c 2010-05-28 21:27:16.686916709 -0400 | 55027 | +++ linux-2.6.32.16/net/xfrm/xfrm_policy.c 2010-07-09 14:50:39.000000000 -0400 |
54788 | @@ -1477,7 +1477,7 @@ free_dst: | 55028 | @@ -1477,7 +1477,7 @@ free_dst: |
54789 | goto out; | 55029 | goto out; |
54790 | } | 55030 | } |
@@ -54812,9 +55052,9 @@ diff -urNp linux-2.6.32.15/net/xfrm/xfrm_policy.c linux-2.6.32.15/net/xfrm/xfrm_ | |||
54812 | xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl) | 55052 | xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl) |
54813 | { | 55053 | { |
54814 | #ifdef CONFIG_XFRM_SUB_POLICY | 55054 | #ifdef CONFIG_XFRM_SUB_POLICY |
54815 | diff -urNp linux-2.6.32.15/samples/kobject/kset-example.c linux-2.6.32.15/samples/kobject/kset-example.c | 55055 | diff -urNp linux-2.6.32.16/samples/kobject/kset-example.c linux-2.6.32.16/samples/kobject/kset-example.c |
54816 | --- linux-2.6.32.15/samples/kobject/kset-example.c 2010-03-15 11:52:04.000000000 -0400 | 55056 | --- linux-2.6.32.16/samples/kobject/kset-example.c 2010-07-05 14:14:00.000000000 -0400 |
54817 | +++ linux-2.6.32.15/samples/kobject/kset-example.c 2010-05-28 21:27:16.686916709 -0400 | 55057 | +++ linux-2.6.32.16/samples/kobject/kset-example.c 2010-07-09 14:50:39.000000000 -0400 |
54818 | @@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob | 55058 | @@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob |
54819 | } | 55059 | } |
54820 | 55060 | ||
@@ -54824,9 +55064,9 @@ diff -urNp linux-2.6.32.15/samples/kobject/kset-example.c linux-2.6.32.15/sample | |||
54824 | .show = foo_attr_show, | 55064 | .show = foo_attr_show, |
54825 | .store = foo_attr_store, | 55065 | .store = foo_attr_store, |
54826 | }; | 55066 | }; |
54827 | diff -urNp linux-2.6.32.15/scripts/basic/fixdep.c linux-2.6.32.15/scripts/basic/fixdep.c | 55067 | diff -urNp linux-2.6.32.16/scripts/basic/fixdep.c linux-2.6.32.16/scripts/basic/fixdep.c |
54828 | --- linux-2.6.32.15/scripts/basic/fixdep.c 2010-03-15 11:52:04.000000000 -0400 | 55068 | --- linux-2.6.32.16/scripts/basic/fixdep.c 2010-07-05 14:14:00.000000000 -0400 |
54829 | +++ linux-2.6.32.15/scripts/basic/fixdep.c 2010-05-28 21:27:16.686916709 -0400 | 55069 | +++ linux-2.6.32.16/scripts/basic/fixdep.c 2010-07-09 14:50:39.000000000 -0400 |
54830 | @@ -222,9 +222,9 @@ static void use_config(char *m, int slen | 55070 | @@ -222,9 +222,9 @@ static void use_config(char *m, int slen |
54831 | 55071 | ||
54832 | static void parse_config_file(char *map, size_t len) | 55072 | static void parse_config_file(char *map, size_t len) |
@@ -54848,9 +55088,9 @@ diff -urNp linux-2.6.32.15/scripts/basic/fixdep.c linux-2.6.32.15/scripts/basic/ | |||
54848 | 55088 | ||
54849 | if (*p != INT_CONF) { | 55089 | if (*p != INT_CONF) { |
54850 | fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", | 55090 | fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", |
54851 | diff -urNp linux-2.6.32.15/scripts/kallsyms.c linux-2.6.32.15/scripts/kallsyms.c | 55091 | diff -urNp linux-2.6.32.16/scripts/kallsyms.c linux-2.6.32.16/scripts/kallsyms.c |
54852 | --- linux-2.6.32.15/scripts/kallsyms.c 2010-03-15 11:52:04.000000000 -0400 | 55092 | --- linux-2.6.32.16/scripts/kallsyms.c 2010-07-05 14:14:00.000000000 -0400 |
54853 | +++ linux-2.6.32.15/scripts/kallsyms.c 2010-05-28 21:27:16.686916709 -0400 | 55093 | +++ linux-2.6.32.16/scripts/kallsyms.c 2010-07-09 14:50:39.000000000 -0400 |
54854 | @@ -43,10 +43,10 @@ struct text_range { | 55094 | @@ -43,10 +43,10 @@ struct text_range { |
54855 | 55095 | ||
54856 | static unsigned long long _text; | 55096 | static unsigned long long _text; |
@@ -54866,9 +55106,9 @@ diff -urNp linux-2.6.32.15/scripts/kallsyms.c linux-2.6.32.15/scripts/kallsyms.c | |||
54866 | }; | 55106 | }; |
54867 | #define text_range_text (&text_ranges[0]) | 55107 | #define text_range_text (&text_ranges[0]) |
54868 | #define text_range_inittext (&text_ranges[1]) | 55108 | #define text_range_inittext (&text_ranges[1]) |
54869 | diff -urNp linux-2.6.32.15/scripts/mod/file2alias.c linux-2.6.32.15/scripts/mod/file2alias.c | 55109 | diff -urNp linux-2.6.32.16/scripts/mod/file2alias.c linux-2.6.32.16/scripts/mod/file2alias.c |
54870 | --- linux-2.6.32.15/scripts/mod/file2alias.c 2010-03-15 11:52:04.000000000 -0400 | 55110 | --- linux-2.6.32.16/scripts/mod/file2alias.c 2010-07-05 14:14:00.000000000 -0400 |
54871 | +++ linux-2.6.32.15/scripts/mod/file2alias.c 2010-05-28 21:27:16.686916709 -0400 | 55111 | +++ linux-2.6.32.16/scripts/mod/file2alias.c 2010-07-09 14:50:39.000000000 -0400 |
54872 | @@ -72,7 +72,7 @@ static void device_id_check(const char * | 55112 | @@ -72,7 +72,7 @@ static void device_id_check(const char * |
54873 | unsigned long size, unsigned long id_size, | 55113 | unsigned long size, unsigned long id_size, |
54874 | void *symval) | 55114 | void *symval) |
@@ -54923,9 +55163,9 @@ diff -urNp linux-2.6.32.15/scripts/mod/file2alias.c linux-2.6.32.15/scripts/mod/ | |||
54923 | 55163 | ||
54924 | sprintf(alias, "dmi*"); | 55164 | sprintf(alias, "dmi*"); |
54925 | 55165 | ||
54926 | diff -urNp linux-2.6.32.15/scripts/mod/modpost.c linux-2.6.32.15/scripts/mod/modpost.c | 55166 | diff -urNp linux-2.6.32.16/scripts/mod/modpost.c linux-2.6.32.16/scripts/mod/modpost.c |
54927 | --- linux-2.6.32.15/scripts/mod/modpost.c 2010-03-15 11:52:04.000000000 -0400 | 55167 | --- linux-2.6.32.16/scripts/mod/modpost.c 2010-07-05 14:14:00.000000000 -0400 |
54928 | +++ linux-2.6.32.15/scripts/mod/modpost.c 2010-05-28 21:27:16.694974041 -0400 | 55168 | +++ linux-2.6.32.16/scripts/mod/modpost.c 2010-07-09 14:50:39.000000000 -0400 |
54929 | @@ -835,6 +835,7 @@ enum mismatch { | 55169 | @@ -835,6 +835,7 @@ enum mismatch { |
54930 | INIT_TO_EXIT, | 55170 | INIT_TO_EXIT, |
54931 | EXIT_TO_INIT, | 55171 | EXIT_TO_INIT, |
@@ -54993,9 +55233,9 @@ diff -urNp linux-2.6.32.15/scripts/mod/modpost.c linux-2.6.32.15/scripts/mod/mod | |||
54993 | goto close_write; | 55233 | goto close_write; |
54994 | 55234 | ||
54995 | tmp = NOFAIL(malloc(b->pos)); | 55235 | tmp = NOFAIL(malloc(b->pos)); |
54996 | diff -urNp linux-2.6.32.15/scripts/mod/modpost.h linux-2.6.32.15/scripts/mod/modpost.h | 55236 | diff -urNp linux-2.6.32.16/scripts/mod/modpost.h linux-2.6.32.16/scripts/mod/modpost.h |
54997 | --- linux-2.6.32.15/scripts/mod/modpost.h 2010-03-15 11:52:04.000000000 -0400 | 55237 | --- linux-2.6.32.16/scripts/mod/modpost.h 2010-07-05 14:14:00.000000000 -0400 |
54998 | +++ linux-2.6.32.15/scripts/mod/modpost.h 2010-05-28 21:27:16.694974041 -0400 | 55238 | +++ linux-2.6.32.16/scripts/mod/modpost.h 2010-07-09 14:50:39.000000000 -0400 |
54999 | @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e | 55239 | @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e |
55000 | 55240 | ||
55001 | struct buffer { | 55241 | struct buffer { |
@@ -55015,9 +55255,9 @@ diff -urNp linux-2.6.32.15/scripts/mod/modpost.h linux-2.6.32.15/scripts/mod/mod | |||
55015 | 55255 | ||
55016 | struct module { | 55256 | struct module { |
55017 | struct module *next; | 55257 | struct module *next; |
55018 | diff -urNp linux-2.6.32.15/scripts/mod/sumversion.c linux-2.6.32.15/scripts/mod/sumversion.c | 55258 | diff -urNp linux-2.6.32.16/scripts/mod/sumversion.c linux-2.6.32.16/scripts/mod/sumversion.c |
55019 | --- linux-2.6.32.15/scripts/mod/sumversion.c 2010-03-15 11:52:04.000000000 -0400 | 55259 | --- linux-2.6.32.16/scripts/mod/sumversion.c 2010-07-05 14:14:00.000000000 -0400 |
55020 | +++ linux-2.6.32.15/scripts/mod/sumversion.c 2010-05-28 21:27:16.694974041 -0400 | 55260 | +++ linux-2.6.32.16/scripts/mod/sumversion.c 2010-07-09 14:50:39.000000000 -0400 |
55021 | @@ -455,7 +455,7 @@ static void write_version(const char *fi | 55261 | @@ -455,7 +455,7 @@ static void write_version(const char *fi |
55022 | goto out; | 55262 | goto out; |
55023 | } | 55263 | } |
@@ -55027,9 +55267,9 @@ diff -urNp linux-2.6.32.15/scripts/mod/sumversion.c linux-2.6.32.15/scripts/mod/ | |||
55027 | warn("writing sum in %s failed: %s\n", | 55267 | warn("writing sum in %s failed: %s\n", |
55028 | filename, strerror(errno)); | 55268 | filename, strerror(errno)); |
55029 | goto out; | 55269 | goto out; |
55030 | diff -urNp linux-2.6.32.15/scripts/pnmtologo.c linux-2.6.32.15/scripts/pnmtologo.c | 55270 | diff -urNp linux-2.6.32.16/scripts/pnmtologo.c linux-2.6.32.16/scripts/pnmtologo.c |
55031 | --- linux-2.6.32.15/scripts/pnmtologo.c 2010-03-15 11:52:04.000000000 -0400 | 55271 | --- linux-2.6.32.16/scripts/pnmtologo.c 2010-07-05 14:14:00.000000000 -0400 |
55032 | +++ linux-2.6.32.15/scripts/pnmtologo.c 2010-05-28 21:27:16.694974041 -0400 | 55272 | +++ linux-2.6.32.16/scripts/pnmtologo.c 2010-07-09 14:50:39.000000000 -0400 |
55033 | @@ -237,14 +237,14 @@ static void write_header(void) | 55273 | @@ -237,14 +237,14 @@ static void write_header(void) |
55034 | fprintf(out, " * Linux logo %s\n", logoname); | 55274 | fprintf(out, " * Linux logo %s\n", logoname); |
55035 | fputs(" */\n\n", out); | 55275 | fputs(" */\n\n", out); |
@@ -55056,9 +55296,9 @@ diff -urNp linux-2.6.32.15/scripts/pnmtologo.c linux-2.6.32.15/scripts/pnmtologo | |||
55056 | logoname); | 55296 | logoname); |
55057 | write_hex_cnt = 0; | 55297 | write_hex_cnt = 0; |
55058 | for (i = 0; i < logo_clutsize; i++) { | 55298 | for (i = 0; i < logo_clutsize; i++) { |
55059 | diff -urNp linux-2.6.32.15/security/commoncap.c linux-2.6.32.15/security/commoncap.c | 55299 | diff -urNp linux-2.6.32.16/security/commoncap.c linux-2.6.32.16/security/commoncap.c |
55060 | --- linux-2.6.32.15/security/commoncap.c 2010-03-15 11:52:04.000000000 -0400 | 55300 | --- linux-2.6.32.16/security/commoncap.c 2010-07-05 14:14:00.000000000 -0400 |
55061 | +++ linux-2.6.32.15/security/commoncap.c 2010-05-28 21:27:16.694974041 -0400 | 55301 | +++ linux-2.6.32.16/security/commoncap.c 2010-07-09 14:50:39.000000000 -0400 |
55062 | @@ -27,7 +27,7 @@ | 55302 | @@ -27,7 +27,7 @@ |
55063 | #include <linux/sched.h> | 55303 | #include <linux/sched.h> |
55064 | #include <linux/prctl.h> | 55304 | #include <linux/prctl.h> |
@@ -55081,9 +55321,9 @@ diff -urNp linux-2.6.32.15/security/commoncap.c linux-2.6.32.15/security/commonc | |||
55081 | return 0; | 55321 | return 0; |
55082 | } | 55322 | } |
55083 | 55323 | ||
55084 | diff -urNp linux-2.6.32.15/security/integrity/ima/ima_api.c linux-2.6.32.15/security/integrity/ima/ima_api.c | 55324 | diff -urNp linux-2.6.32.16/security/integrity/ima/ima_api.c linux-2.6.32.16/security/integrity/ima/ima_api.c |
55085 | --- linux-2.6.32.15/security/integrity/ima/ima_api.c 2010-03-15 11:52:04.000000000 -0400 | 55325 | --- linux-2.6.32.16/security/integrity/ima/ima_api.c 2010-07-05 14:14:00.000000000 -0400 |
55086 | +++ linux-2.6.32.15/security/integrity/ima/ima_api.c 2010-05-28 21:27:16.694974041 -0400 | 55326 | +++ linux-2.6.32.16/security/integrity/ima/ima_api.c 2010-07-09 14:50:39.000000000 -0400 |
55087 | @@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino | 55327 | @@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino |
55088 | int result; | 55328 | int result; |
55089 | 55329 | ||
@@ -55093,9 +55333,9 @@ diff -urNp linux-2.6.32.15/security/integrity/ima/ima_api.c linux-2.6.32.15/secu | |||
55093 | 55333 | ||
55094 | entry = kmalloc(sizeof(*entry), GFP_KERNEL); | 55334 | entry = kmalloc(sizeof(*entry), GFP_KERNEL); |
55095 | if (!entry) { | 55335 | if (!entry) { |
55096 | diff -urNp linux-2.6.32.15/security/integrity/ima/ima_fs.c linux-2.6.32.15/security/integrity/ima/ima_fs.c | 55336 | diff -urNp linux-2.6.32.16/security/integrity/ima/ima_fs.c linux-2.6.32.16/security/integrity/ima/ima_fs.c |
55097 | --- linux-2.6.32.15/security/integrity/ima/ima_fs.c 2010-03-15 11:52:04.000000000 -0400 | 55337 | --- linux-2.6.32.16/security/integrity/ima/ima_fs.c 2010-07-05 14:14:00.000000000 -0400 |
55098 | +++ linux-2.6.32.15/security/integrity/ima/ima_fs.c 2010-05-28 21:27:16.694974041 -0400 | 55338 | +++ linux-2.6.32.16/security/integrity/ima/ima_fs.c 2010-07-09 14:50:39.000000000 -0400 |
55099 | @@ -27,12 +27,12 @@ | 55339 | @@ -27,12 +27,12 @@ |
55100 | static int valid_policy = 1; | 55340 | static int valid_policy = 1; |
55101 | #define TMPBUFLEN 12 | 55341 | #define TMPBUFLEN 12 |
@@ -55111,9 +55351,9 @@ diff -urNp linux-2.6.32.15/security/integrity/ima/ima_fs.c linux-2.6.32.15/secur | |||
55111 | return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); | 55351 | return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); |
55112 | } | 55352 | } |
55113 | 55353 | ||
55114 | diff -urNp linux-2.6.32.15/security/integrity/ima/ima.h linux-2.6.32.15/security/integrity/ima/ima.h | 55354 | diff -urNp linux-2.6.32.16/security/integrity/ima/ima.h linux-2.6.32.16/security/integrity/ima/ima.h |
55115 | --- linux-2.6.32.15/security/integrity/ima/ima.h 2010-03-15 11:52:04.000000000 -0400 | 55355 | --- linux-2.6.32.16/security/integrity/ima/ima.h 2010-07-05 14:14:00.000000000 -0400 |
55116 | +++ linux-2.6.32.15/security/integrity/ima/ima.h 2010-05-28 21:27:16.694974041 -0400 | 55356 | +++ linux-2.6.32.16/security/integrity/ima/ima.h 2010-07-09 14:50:39.000000000 -0400 |
55117 | @@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino | 55357 | @@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino |
55118 | extern spinlock_t ima_queue_lock; | 55358 | extern spinlock_t ima_queue_lock; |
55119 | 55359 | ||
@@ -55125,9 +55365,9 @@ diff -urNp linux-2.6.32.15/security/integrity/ima/ima.h linux-2.6.32.15/security | |||
55125 | struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; | 55365 | struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; |
55126 | }; | 55366 | }; |
55127 | extern struct ima_h_table ima_htable; | 55367 | extern struct ima_h_table ima_htable; |
55128 | diff -urNp linux-2.6.32.15/security/integrity/ima/ima_queue.c linux-2.6.32.15/security/integrity/ima/ima_queue.c | 55368 | diff -urNp linux-2.6.32.16/security/integrity/ima/ima_queue.c linux-2.6.32.16/security/integrity/ima/ima_queue.c |
55129 | --- linux-2.6.32.15/security/integrity/ima/ima_queue.c 2010-03-15 11:52:04.000000000 -0400 | 55369 | --- linux-2.6.32.16/security/integrity/ima/ima_queue.c 2010-07-05 14:14:00.000000000 -0400 |
55130 | +++ linux-2.6.32.15/security/integrity/ima/ima_queue.c 2010-05-28 21:27:16.694974041 -0400 | 55370 | +++ linux-2.6.32.16/security/integrity/ima/ima_queue.c 2010-07-09 14:50:39.000000000 -0400 |
55131 | @@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i | 55371 | @@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i |
55132 | INIT_LIST_HEAD(&qe->later); | 55372 | INIT_LIST_HEAD(&qe->later); |
55133 | list_add_tail_rcu(&qe->later, &ima_measurements); | 55373 | list_add_tail_rcu(&qe->later, &ima_measurements); |
@@ -55137,9 +55377,9 @@ diff -urNp linux-2.6.32.15/security/integrity/ima/ima_queue.c linux-2.6.32.15/se | |||
55137 | key = ima_hash_key(entry->digest); | 55377 | key = ima_hash_key(entry->digest); |
55138 | hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); | 55378 | hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); |
55139 | return 0; | 55379 | return 0; |
55140 | diff -urNp linux-2.6.32.15/security/Kconfig linux-2.6.32.15/security/Kconfig | 55380 | diff -urNp linux-2.6.32.16/security/Kconfig linux-2.6.32.16/security/Kconfig |
55141 | --- linux-2.6.32.15/security/Kconfig 2010-03-15 11:52:04.000000000 -0400 | 55381 | --- linux-2.6.32.16/security/Kconfig 2010-07-05 14:14:00.000000000 -0400 |
55142 | +++ linux-2.6.32.15/security/Kconfig 2010-05-28 21:27:16.694974041 -0400 | 55382 | +++ linux-2.6.32.16/security/Kconfig 2010-07-09 14:50:39.000000000 -0400 |
55143 | @@ -4,6 +4,499 @@ | 55383 | @@ -4,6 +4,499 @@ |
55144 | 55384 | ||
55145 | menu "Security options" | 55385 | menu "Security options" |
@@ -55649,9 +55889,9 @@ diff -urNp linux-2.6.32.15/security/Kconfig linux-2.6.32.15/security/Kconfig | |||
55649 | help | 55889 | help |
55650 | This is the portion of low virtual memory which should be protected | 55890 | This is the portion of low virtual memory which should be protected |
55651 | from userspace allocation. Keeping a user from writing to low pages | 55891 | from userspace allocation. Keeping a user from writing to low pages |
55652 | diff -urNp linux-2.6.32.15/security/min_addr.c linux-2.6.32.15/security/min_addr.c | 55892 | diff -urNp linux-2.6.32.16/security/min_addr.c linux-2.6.32.16/security/min_addr.c |
55653 | --- linux-2.6.32.15/security/min_addr.c 2010-05-28 20:16:44.458924952 -0400 | 55893 | --- linux-2.6.32.16/security/min_addr.c 2010-07-05 14:14:00.000000000 -0400 |
55654 | +++ linux-2.6.32.15/security/min_addr.c 2010-05-28 21:27:16.694974041 -0400 | 55894 | +++ linux-2.6.32.16/security/min_addr.c 2010-07-09 14:50:39.000000000 -0400 |
55655 | @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG | 55895 | @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG |
55656 | */ | 55896 | */ |
55657 | static void update_mmap_min_addr(void) | 55897 | static void update_mmap_min_addr(void) |
@@ -55668,9 +55908,9 @@ diff -urNp linux-2.6.32.15/security/min_addr.c linux-2.6.32.15/security/min_addr | |||
55668 | } | 55908 | } |
55669 | 55909 | ||
55670 | /* | 55910 | /* |
55671 | diff -urNp linux-2.6.32.15/sound/aoa/codecs/onyx.c linux-2.6.32.15/sound/aoa/codecs/onyx.c | 55911 | diff -urNp linux-2.6.32.16/sound/aoa/codecs/onyx.c linux-2.6.32.16/sound/aoa/codecs/onyx.c |
55672 | --- linux-2.6.32.15/sound/aoa/codecs/onyx.c 2010-03-15 11:52:04.000000000 -0400 | 55912 | --- linux-2.6.32.16/sound/aoa/codecs/onyx.c 2010-07-05 14:14:00.000000000 -0400 |
55673 | +++ linux-2.6.32.15/sound/aoa/codecs/onyx.c 2010-05-28 21:27:16.694974041 -0400 | 55913 | +++ linux-2.6.32.16/sound/aoa/codecs/onyx.c 2010-07-09 14:50:39.000000000 -0400 |
55674 | @@ -53,7 +53,7 @@ struct onyx { | 55914 | @@ -53,7 +53,7 @@ struct onyx { |
55675 | spdif_locked:1, | 55915 | spdif_locked:1, |
55676 | analog_locked:1, | 55916 | analog_locked:1, |
@@ -55699,9 +55939,9 @@ diff -urNp linux-2.6.32.15/sound/aoa/codecs/onyx.c linux-2.6.32.15/sound/aoa/cod | |||
55699 | onyx->spdif_locked = onyx->analog_locked = 0; | 55939 | onyx->spdif_locked = onyx->analog_locked = 0; |
55700 | mutex_unlock(&onyx->mutex); | 55940 | mutex_unlock(&onyx->mutex); |
55701 | 55941 | ||
55702 | diff -urNp linux-2.6.32.15/sound/core/oss/pcm_oss.c linux-2.6.32.15/sound/core/oss/pcm_oss.c | 55942 | diff -urNp linux-2.6.32.16/sound/core/oss/pcm_oss.c linux-2.6.32.16/sound/core/oss/pcm_oss.c |
55703 | --- linux-2.6.32.15/sound/core/oss/pcm_oss.c 2010-03-15 11:52:04.000000000 -0400 | 55943 | --- linux-2.6.32.16/sound/core/oss/pcm_oss.c 2010-07-05 14:14:00.000000000 -0400 |
55704 | +++ linux-2.6.32.15/sound/core/oss/pcm_oss.c 2010-05-28 21:27:16.698950213 -0400 | 55944 | +++ linux-2.6.32.16/sound/core/oss/pcm_oss.c 2010-07-09 14:50:39.000000000 -0400 |
55705 | @@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct | 55945 | @@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct |
55706 | } | 55946 | } |
55707 | } | 55947 | } |
@@ -55713,9 +55953,9 @@ diff -urNp linux-2.6.32.15/sound/core/oss/pcm_oss.c linux-2.6.32.15/sound/core/o | |||
55713 | #endif /* CONFIG_SND_VERBOSE_PROCFS */ | 55953 | #endif /* CONFIG_SND_VERBOSE_PROCFS */ |
55714 | 55954 | ||
55715 | /* | 55955 | /* |
55716 | diff -urNp linux-2.6.32.15/sound/core/seq/seq_lock.h linux-2.6.32.15/sound/core/seq/seq_lock.h | 55956 | diff -urNp linux-2.6.32.16/sound/core/seq/seq_lock.h linux-2.6.32.16/sound/core/seq/seq_lock.h |
55717 | --- linux-2.6.32.15/sound/core/seq/seq_lock.h 2010-03-15 11:52:04.000000000 -0400 | 55957 | --- linux-2.6.32.16/sound/core/seq/seq_lock.h 2010-07-05 14:14:00.000000000 -0400 |
55718 | +++ linux-2.6.32.15/sound/core/seq/seq_lock.h 2010-05-28 21:27:16.698950213 -0400 | 55958 | +++ linux-2.6.32.16/sound/core/seq/seq_lock.h 2010-07-09 14:50:39.000000000 -0400 |
55719 | @@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo | 55959 | @@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo |
55720 | #else /* SMP || CONFIG_SND_DEBUG */ | 55960 | #else /* SMP || CONFIG_SND_DEBUG */ |
55721 | 55961 | ||
@@ -55731,9 +55971,9 @@ diff -urNp linux-2.6.32.15/sound/core/seq/seq_lock.h linux-2.6.32.15/sound/core/ | |||
55731 | 55971 | ||
55732 | #endif /* SMP || CONFIG_SND_DEBUG */ | 55972 | #endif /* SMP || CONFIG_SND_DEBUG */ |
55733 | 55973 | ||
55734 | diff -urNp linux-2.6.32.15/sound/drivers/mts64.c linux-2.6.32.15/sound/drivers/mts64.c | 55974 | diff -urNp linux-2.6.32.16/sound/drivers/mts64.c linux-2.6.32.16/sound/drivers/mts64.c |
55735 | --- linux-2.6.32.15/sound/drivers/mts64.c 2010-03-15 11:52:04.000000000 -0400 | 55975 | --- linux-2.6.32.16/sound/drivers/mts64.c 2010-07-05 14:14:00.000000000 -0400 |
55736 | +++ linux-2.6.32.15/sound/drivers/mts64.c 2010-05-28 21:27:16.698950213 -0400 | 55976 | +++ linux-2.6.32.16/sound/drivers/mts64.c 2010-07-09 14:50:39.000000000 -0400 |
55737 | @@ -65,7 +65,7 @@ struct mts64 { | 55977 | @@ -65,7 +65,7 @@ struct mts64 { |
55738 | struct pardevice *pardev; | 55978 | struct pardevice *pardev; |
55739 | int pardev_claimed; | 55979 | int pardev_claimed; |
@@ -55782,9 +56022,9 @@ diff -urNp linux-2.6.32.15/sound/drivers/mts64.c linux-2.6.32.15/sound/drivers/m | |||
55782 | 56022 | ||
55783 | return 0; | 56023 | return 0; |
55784 | } | 56024 | } |
55785 | diff -urNp linux-2.6.32.15/sound/drivers/portman2x4.c linux-2.6.32.15/sound/drivers/portman2x4.c | 56025 | diff -urNp linux-2.6.32.16/sound/drivers/portman2x4.c linux-2.6.32.16/sound/drivers/portman2x4.c |
55786 | --- linux-2.6.32.15/sound/drivers/portman2x4.c 2010-03-15 11:52:04.000000000 -0400 | 56026 | --- linux-2.6.32.16/sound/drivers/portman2x4.c 2010-07-05 14:14:00.000000000 -0400 |
55787 | +++ linux-2.6.32.15/sound/drivers/portman2x4.c 2010-05-28 21:27:16.698950213 -0400 | 56027 | +++ linux-2.6.32.16/sound/drivers/portman2x4.c 2010-07-09 14:50:39.000000000 -0400 |
55788 | @@ -83,7 +83,7 @@ struct portman { | 56028 | @@ -83,7 +83,7 @@ struct portman { |
55789 | struct pardevice *pardev; | 56029 | struct pardevice *pardev; |
55790 | int pardev_claimed; | 56030 | int pardev_claimed; |
@@ -55794,9 +56034,9 @@ diff -urNp linux-2.6.32.15/sound/drivers/portman2x4.c linux-2.6.32.15/sound/driv | |||
55794 | int mode[PORTMAN_NUM_INPUT_PORTS]; | 56034 | int mode[PORTMAN_NUM_INPUT_PORTS]; |
55795 | struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; | 56035 | struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; |
55796 | }; | 56036 | }; |
55797 | diff -urNp linux-2.6.32.15/sound/oss/sb_audio.c linux-2.6.32.15/sound/oss/sb_audio.c | 56037 | diff -urNp linux-2.6.32.16/sound/oss/sb_audio.c linux-2.6.32.16/sound/oss/sb_audio.c |
55798 | --- linux-2.6.32.15/sound/oss/sb_audio.c 2010-03-15 11:52:04.000000000 -0400 | 56038 | --- linux-2.6.32.16/sound/oss/sb_audio.c 2010-07-05 14:14:00.000000000 -0400 |
55799 | +++ linux-2.6.32.15/sound/oss/sb_audio.c 2010-05-28 21:27:16.698950213 -0400 | 56039 | +++ linux-2.6.32.16/sound/oss/sb_audio.c 2010-07-09 14:50:39.000000000 -0400 |
55800 | @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, | 56040 | @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, |
55801 | buf16 = (signed short *)(localbuf + localoffs); | 56041 | buf16 = (signed short *)(localbuf + localoffs); |
55802 | while (c) | 56042 | while (c) |
@@ -55806,9 +56046,9 @@ diff -urNp linux-2.6.32.15/sound/oss/sb_audio.c linux-2.6.32.15/sound/oss/sb_aud | |||
55806 | if (copy_from_user(lbuf8, | 56046 | if (copy_from_user(lbuf8, |
55807 | userbuf+useroffs + p, | 56047 | userbuf+useroffs + p, |
55808 | locallen)) | 56048 | locallen)) |
55809 | diff -urNp linux-2.6.32.15/sound/pci/ac97/ac97_codec.c linux-2.6.32.15/sound/pci/ac97/ac97_codec.c | 56049 | diff -urNp linux-2.6.32.16/sound/pci/ac97/ac97_codec.c linux-2.6.32.16/sound/pci/ac97/ac97_codec.c |
55810 | --- linux-2.6.32.15/sound/pci/ac97/ac97_codec.c 2010-03-15 11:52:04.000000000 -0400 | 56050 | --- linux-2.6.32.16/sound/pci/ac97/ac97_codec.c 2010-07-05 14:14:00.000000000 -0400 |
55811 | +++ linux-2.6.32.15/sound/pci/ac97/ac97_codec.c 2010-05-28 21:27:16.698950213 -0400 | 56051 | +++ linux-2.6.32.16/sound/pci/ac97/ac97_codec.c 2010-07-09 14:50:39.000000000 -0400 |
55812 | @@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc | 56052 | @@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc |
55813 | } | 56053 | } |
55814 | 56054 | ||
@@ -55818,9 +56058,9 @@ diff -urNp linux-2.6.32.15/sound/pci/ac97/ac97_codec.c linux-2.6.32.15/sound/pci | |||
55818 | 56058 | ||
55819 | #ifdef CONFIG_SND_AC97_POWER_SAVE | 56059 | #ifdef CONFIG_SND_AC97_POWER_SAVE |
55820 | static void do_update_power(struct work_struct *work) | 56060 | static void do_update_power(struct work_struct *work) |
55821 | diff -urNp linux-2.6.32.15/sound/pci/ac97/ac97_patch.c linux-2.6.32.15/sound/pci/ac97/ac97_patch.c | 56061 | diff -urNp linux-2.6.32.16/sound/pci/ac97/ac97_patch.c linux-2.6.32.16/sound/pci/ac97/ac97_patch.c |
55822 | --- linux-2.6.32.15/sound/pci/ac97/ac97_patch.c 2010-04-04 20:41:50.084493253 -0400 | 56062 | --- linux-2.6.32.16/sound/pci/ac97/ac97_patch.c 2010-07-05 14:14:00.000000000 -0400 |
55823 | +++ linux-2.6.32.15/sound/pci/ac97/ac97_patch.c 2010-05-28 21:27:16.698950213 -0400 | 56063 | +++ linux-2.6.32.16/sound/pci/ac97/ac97_patch.c 2010-07-09 14:50:39.000000000 -0400 |
55824 | @@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd | 56064 | @@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd |
55825 | return 0; | 56065 | return 0; |
55826 | } | 56066 | } |
@@ -56127,9 +56367,9 @@ diff -urNp linux-2.6.32.15/sound/pci/ac97/ac97_patch.c linux-2.6.32.15/sound/pci | |||
56127 | .build_specific = patch_ucb1400_specific, | 56367 | .build_specific = patch_ucb1400_specific, |
56128 | }; | 56368 | }; |
56129 | 56369 | ||
56130 | diff -urNp linux-2.6.32.15/sound/pci/ens1370.c linux-2.6.32.15/sound/pci/ens1370.c | 56370 | diff -urNp linux-2.6.32.16/sound/pci/ens1370.c linux-2.6.32.16/sound/pci/ens1370.c |
56131 | --- linux-2.6.32.15/sound/pci/ens1370.c 2010-03-15 11:52:04.000000000 -0400 | 56371 | --- linux-2.6.32.16/sound/pci/ens1370.c 2010-07-05 14:14:00.000000000 -0400 |
56132 | +++ linux-2.6.32.15/sound/pci/ens1370.c 2010-05-28 21:27:16.698950213 -0400 | 56372 | +++ linux-2.6.32.16/sound/pci/ens1370.c 2010-07-09 14:50:39.000000000 -0400 |
56133 | @@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci | 56373 | @@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci |
56134 | { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ | 56374 | { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ |
56135 | { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */ | 56375 | { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */ |
@@ -56139,9 +56379,9 @@ diff -urNp linux-2.6.32.15/sound/pci/ens1370.c linux-2.6.32.15/sound/pci/ens1370 | |||
56139 | }; | 56379 | }; |
56140 | 56380 | ||
56141 | MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); | 56381 | MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); |
56142 | diff -urNp linux-2.6.32.15/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.15/sound/pci/hda/patch_intelhdmi.c | 56382 | diff -urNp linux-2.6.32.16/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.16/sound/pci/hda/patch_intelhdmi.c |
56143 | --- linux-2.6.32.15/sound/pci/hda/patch_intelhdmi.c 2010-03-15 11:52:04.000000000 -0400 | 56383 | --- linux-2.6.32.16/sound/pci/hda/patch_intelhdmi.c 2010-07-05 14:14:00.000000000 -0400 |
56144 | +++ linux-2.6.32.15/sound/pci/hda/patch_intelhdmi.c 2010-05-28 21:27:16.698950213 -0400 | 56384 | +++ linux-2.6.32.16/sound/pci/hda/patch_intelhdmi.c 2010-07-09 14:50:39.000000000 -0400 |
56145 | @@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str | 56385 | @@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str |
56146 | cp_ready); | 56386 | cp_ready); |
56147 | 56387 | ||
@@ -56157,9 +56397,9 @@ diff -urNp linux-2.6.32.15/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.15/sound | |||
56157 | } | 56397 | } |
56158 | 56398 | ||
56159 | 56399 | ||
56160 | diff -urNp linux-2.6.32.15/sound/pci/intel8x0.c linux-2.6.32.15/sound/pci/intel8x0.c | 56400 | diff -urNp linux-2.6.32.16/sound/pci/intel8x0.c linux-2.6.32.16/sound/pci/intel8x0.c |
56161 | --- linux-2.6.32.15/sound/pci/intel8x0.c 2010-03-15 11:52:04.000000000 -0400 | 56401 | --- linux-2.6.32.16/sound/pci/intel8x0.c 2010-07-05 14:14:00.000000000 -0400 |
56162 | +++ linux-2.6.32.15/sound/pci/intel8x0.c 2010-05-28 21:27:16.698950213 -0400 | 56402 | +++ linux-2.6.32.16/sound/pci/intel8x0.c 2010-07-09 14:50:39.000000000 -0400 |
56163 | @@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0 | 56403 | @@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0 |
56164 | { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ | 56404 | { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ |
56165 | { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */ | 56405 | { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */ |
@@ -56178,9 +56418,9 @@ diff -urNp linux-2.6.32.15/sound/pci/intel8x0.c linux-2.6.32.15/sound/pci/intel8 | |||
56178 | }; | 56418 | }; |
56179 | 56419 | ||
56180 | static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, | 56420 | static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, |
56181 | diff -urNp linux-2.6.32.15/sound/pci/intel8x0m.c linux-2.6.32.15/sound/pci/intel8x0m.c | 56421 | diff -urNp linux-2.6.32.16/sound/pci/intel8x0m.c linux-2.6.32.16/sound/pci/intel8x0m.c |
56182 | --- linux-2.6.32.15/sound/pci/intel8x0m.c 2010-03-15 11:52:04.000000000 -0400 | 56422 | --- linux-2.6.32.16/sound/pci/intel8x0m.c 2010-07-05 14:14:00.000000000 -0400 |
56183 | +++ linux-2.6.32.15/sound/pci/intel8x0m.c 2010-05-28 21:27:16.703208428 -0400 | 56423 | +++ linux-2.6.32.16/sound/pci/intel8x0m.c 2010-07-09 14:50:39.000000000 -0400 |
56184 | @@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0 | 56424 | @@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0 |
56185 | { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ | 56425 | { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ |
56186 | { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ | 56426 | { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ |
@@ -56199,9 +56439,9 @@ diff -urNp linux-2.6.32.15/sound/pci/intel8x0m.c linux-2.6.32.15/sound/pci/intel | |||
56199 | }; | 56439 | }; |
56200 | 56440 | ||
56201 | static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, | 56441 | static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, |
56202 | diff -urNp linux-2.6.32.15/usr/gen_init_cpio.c linux-2.6.32.15/usr/gen_init_cpio.c | 56442 | diff -urNp linux-2.6.32.16/usr/gen_init_cpio.c linux-2.6.32.16/usr/gen_init_cpio.c |
56203 | --- linux-2.6.32.15/usr/gen_init_cpio.c 2010-03-15 11:52:04.000000000 -0400 | 56443 | --- linux-2.6.32.16/usr/gen_init_cpio.c 2010-07-05 14:14:00.000000000 -0400 |
56204 | +++ linux-2.6.32.15/usr/gen_init_cpio.c 2010-05-28 21:27:16.703208428 -0400 | 56444 | +++ linux-2.6.32.16/usr/gen_init_cpio.c 2010-07-09 14:50:39.000000000 -0400 |
56205 | @@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, | 56445 | @@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, |
56206 | int retval; | 56446 | int retval; |
56207 | int rc = -1; | 56447 | int rc = -1; |
@@ -56224,9 +56464,9 @@ diff -urNp linux-2.6.32.15/usr/gen_init_cpio.c linux-2.6.32.15/usr/gen_init_cpio | |||
56224 | } else | 56464 | } else |
56225 | break; | 56465 | break; |
56226 | } | 56466 | } |
56227 | diff -urNp linux-2.6.32.15/virt/kvm/kvm_main.c linux-2.6.32.15/virt/kvm/kvm_main.c | 56467 | diff -urNp linux-2.6.32.16/virt/kvm/kvm_main.c linux-2.6.32.16/virt/kvm/kvm_main.c |
56228 | --- linux-2.6.32.15/virt/kvm/kvm_main.c 2010-04-29 17:49:38.869035092 -0400 | 56468 | --- linux-2.6.32.16/virt/kvm/kvm_main.c 2010-07-05 14:14:00.000000000 -0400 |
56229 | +++ linux-2.6.32.15/virt/kvm/kvm_main.c 2010-05-28 21:27:16.731271133 -0400 | 56469 | +++ linux-2.6.32.16/virt/kvm/kvm_main.c 2010-07-09 14:50:39.000000000 -0400 |
56230 | @@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode | 56470 | @@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode |
56231 | return 0; | 56471 | return 0; |
56232 | } | 56472 | } |
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD index 5aab872ef9..d9aaf94794 100644 --- a/main/linux-vserver/APKBUILD +++ b/main/linux-vserver/APKBUILD | |||
@@ -2,10 +2,10 @@ | |||
2 | 2 | ||
3 | _flavor=vserver | 3 | _flavor=vserver |
4 | pkgname=linux-${_flavor} | 4 | pkgname=linux-${_flavor} |
5 | pkgver=2.6.32.15 | 5 | pkgver=2.6.32.16 |
6 | 6 | ||
7 | _kernver=2.6.32 | 7 | _kernver=2.6.32 |
8 | pkgrel=1 | 8 | pkgrel=0 |
9 | pkgdesc="Linux kernel with vserver" | 9 | pkgdesc="Linux kernel with vserver" |
10 | url="http://linux-vserver.org/" | 10 | url="http://linux-vserver.org/" |
11 | depends="mkinitfs linux-firmware" | 11 | depends="mkinitfs linux-firmware" |
@@ -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.15-vs2.3.0.36.29.4.diff | 18 | http://vserver.13thfloor.at/Experimental/patch-2.6.32.16-vs2.3.0.36.29.4.diff |
19 | kernelconfig.x86 | 19 | kernelconfig.x86 |
20 | " | 20 | " |
21 | subpackages="$pkgname-dev" | 21 | subpackages="$pkgname-dev" |
@@ -118,6 +118,6 @@ dev() { | |||
118 | } | 118 | } |
119 | 119 | ||
120 | md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 | 120 | md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 |
121 | 5c9251844c2819eddee4dba1293bd46d patch-2.6.32.15.bz2 | 121 | 744890f9651962ceae7663d44b19df65 patch-2.6.32.16.bz2 |
122 | 8680ecd1342691a5974fb08d7d60beb2 patch-2.6.32.15-vs2.3.0.36.29.4.diff | 122 | 24354a6fd8798792b9ee21f086721cd9 patch-2.6.32.16-vs2.3.0.36.29.4.diff |
123 | 884ba32b4edb6c51426e826c44063e98 kernelconfig.x86" | 123 | 884ba32b4edb6c51426e826c44063e98 kernelconfig.x86" |
diff --git a/main/lua/APKBUILD b/main/lua/APKBUILD index c5b63eb932..5a3613eaf5 100644 --- a/main/lua/APKBUILD +++ b/main/lua/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=lua | 2 | pkgname=lua |
3 | pkgver=5.1.4 | 3 | pkgver=5.1.4 |
4 | pkgrel=5 | 4 | pkgrel=6 |
5 | pkgdesc="A powerful light-weight programming language designed for extending applications." | 5 | pkgdesc="A powerful light-weight programming language designed for extending applications." |
6 | url="http://www.lua.org/" | 6 | url="http://www.lua.org/" |
7 | license="MIT" | 7 | license="MIT" |
@@ -9,6 +9,7 @@ depends= | |||
9 | makedepends="readline-dev libtool" | 9 | makedepends="readline-dev libtool" |
10 | subpackages="$pkgname-dev $pkgname-doc" | 10 | subpackages="$pkgname-dev $pkgname-doc" |
11 | source="http://www.$pkgname.org/ftp/$pkgname-$pkgver.tar.gz | 11 | source="http://www.$pkgname.org/ftp/$pkgname-$pkgver.tar.gz |
12 | http://www.lua.org/ftp/patch-lua-5.1.4-2 | ||
12 | lua-5.1-make.patch | 13 | lua-5.1-make.patch |
13 | lua-5.1-module_paths.patch | 14 | lua-5.1-module_paths.patch |
14 | " | 15 | " |
@@ -16,9 +17,13 @@ source="http://www.$pkgname.org/ftp/$pkgname-$pkgver.tar.gz | |||
16 | build () | 17 | build () |
17 | { | 18 | { |
18 | cd "$srcdir"/$pkgname-$pkgver | 19 | cd "$srcdir"/$pkgname-$pkgver |
19 | for i in ../*.patch; do | 20 | for i in $source; do |
20 | msg "Applying $i" | 21 | case $i in |
21 | patch -p1 < $i || return 1 | 22 | patch*|*.patch) |
23 | msg "Applying $i" | ||
24 | patch -p1 -i "$srcdir"/$i || return 1 | ||
25 | ;; | ||
26 | esac | ||
22 | done | 27 | done |
23 | 28 | ||
24 | # correct lua versioning | 29 | # correct lua versioning |
@@ -46,5 +51,6 @@ package() { | |||
46 | install -D -m 644 doc/luac.1 "$pkgdir"/usr/share/man/man1/luac.1 | 51 | install -D -m 644 doc/luac.1 "$pkgdir"/usr/share/man/man1/luac.1 |
47 | } | 52 | } |
48 | md5sums="d0870f2de55d59c1c8419f36e8fac150 lua-5.1.4.tar.gz | 53 | md5sums="d0870f2de55d59c1c8419f36e8fac150 lua-5.1.4.tar.gz |
54 | 1239310e0c4a581c7831e596f95cc6cd patch-lua-5.1.4-2 | ||
49 | 0145ff6036eb6bfdab427dc8f0c3f3c0 lua-5.1-make.patch | 55 | 0145ff6036eb6bfdab427dc8f0c3f3c0 lua-5.1-make.patch |
50 | e60ef15deefb72a5930c498f1184aced lua-5.1-module_paths.patch" | 56 | e60ef15deefb72a5930c498f1184aced lua-5.1-module_paths.patch" |
diff --git a/main/lvm2/APKBUILD b/main/lvm2/APKBUILD index 4316aadeaa..ffc932c743 100644 --- a/main/lvm2/APKBUILD +++ b/main/lvm2/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=lvm2 | 2 | pkgname=lvm2 |
3 | pkgver=2.02.68 | 3 | pkgver=2.02.70 |
4 | pkgrel=0 | 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/" |
@@ -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="20357ea7918c4e967e558de53ec74969 LVM2.2.02.68.tgz | 50 | md5sums="39c26d5a821754cc347d7a19e82d4a24 LVM2.2.02.70.tgz |
51 | 6f65f902cf19f144a42b8d6aceadf395 lvm.initd | 51 | 6f65f902cf19f144a42b8d6aceadf395 lvm.initd |
52 | ec36d5fe4561220304e406c5c797e71f lvm.confd" | 52 | ec36d5fe4561220304e406c5c797e71f lvm.confd" |
diff --git a/main/man-pages/APKBUILD b/main/man-pages/APKBUILD index 78336bd569..3d126c701a 100644 --- a/main/man-pages/APKBUILD +++ b/main/man-pages/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=man-pages | 2 | pkgname=man-pages |
3 | pkgver=3.24 | 3 | pkgver=3.25 |
4 | _posixver=2003-a | 4 | _posixver=2003-a |
5 | pkgrel=0 | 5 | pkgrel=0 |
6 | pkgdesc="Linux man pages" | 6 | pkgdesc="Linux man pages" |
@@ -12,8 +12,7 @@ options="!strip" | |||
12 | source="http://www.kernel.org/pub/linux/docs/$pkgname/$pkgname-$pkgver.tar.gz | 12 | source="http://www.kernel.org/pub/linux/docs/$pkgname/$pkgname-$pkgver.tar.gz |
13 | http://www.kernel.org/pub/linux/docs/$pkgname/$pkgname-posix/$pkgname-posix-${_posixver}.tar.bz2" | 13 | http://www.kernel.org/pub/linux/docs/$pkgname/$pkgname-posix/$pkgname-posix-${_posixver}.tar.bz2" |
14 | 14 | ||
15 | build () | 15 | build() { |
16 | { | ||
17 | cd "$srcdir"/$pkgname-$pkgver | 16 | cd "$srcdir"/$pkgname-$pkgver |
18 | mkdir -p "$srcdir"/$pkgname-$pkgver/man0 | 17 | mkdir -p "$srcdir"/$pkgname-$pkgver/man0 |
19 | for sect in 0 1 3; do | 18 | for sect in 0 1 3; do |
@@ -22,10 +21,14 @@ build () | |||
22 | mv "$srcdir"/$pkgname-posix-${_posixver}/man${sect}p/* \ | 21 | mv "$srcdir"/$pkgname-posix-${_posixver}/man${sect}p/* \ |
23 | "$srcdir"/$pkgname-$pkgver/man$sect/ | 22 | "$srcdir"/$pkgname-$pkgver/man$sect/ |
24 | done | 23 | done |
24 | } | ||
25 | |||
26 | package() { | ||
27 | cd "$srcdir"/$pkgname-$pkgver | ||
25 | make prefix="$pkgdir"/usr install || return 1 | 28 | make prefix="$pkgdir"/usr install || return 1 |
26 | # provided by libiconv-doc | 29 | # provided by libiconv-doc |
27 | rm "$pkgdir"/usr/share/man/man3/iconv* | 30 | rm "$pkgdir"/usr/share/man/man3/iconv* |
28 | 31 | ||
29 | } | 32 | } |
30 | md5sums="083fc666f1f1143157901e96c9810539 man-pages-3.24.tar.gz | 33 | md5sums="98ec2324abea77d7a992470dd44d140c man-pages-3.25.tar.gz |
31 | 7c78aff03c0a6767ba483d34f19e4b09 man-pages-posix-2003-a.tar.bz2" | 34 | 7c78aff03c0a6767ba483d34f19e4b09 man-pages-posix-2003-a.tar.bz2" |
diff --git a/main/man/APKBUILD b/main/man/APKBUILD index 3be9fdbd1e..f5ada93f55 100644 --- a/main/man/APKBUILD +++ b/main/man/APKBUILD | |||
@@ -11,17 +11,24 @@ source="http://primates.ximian.com/~flucifredi/$pkgname/$pkgname-$pkgver.tar.gz | |||
11 | whatis.periodic.daily | 11 | whatis.periodic.daily |
12 | $pkgname-troff.patch" | 12 | $pkgname-troff.patch" |
13 | 13 | ||
14 | build () { | 14 | _builddir="$srcdir/$pkgname-$pkgver" |
15 | prepare() { | ||
16 | cd "$_builddir" | ||
15 | local i | 17 | local i |
16 | cd "$srcdir/$pkgname-$pkgver" | ||
17 | for i in ../*.patch; do | 18 | for i in ../*.patch; do |
18 | msg "Applying $i" | 19 | msg "Applying $i" |
19 | patch -p1 -i $i || return 1 | 20 | patch -p1 -i $i || return 1 |
20 | done | 21 | done |
22 | } | ||
21 | 23 | ||
24 | build () { | ||
25 | cd "$_builddir" | ||
22 | ./configure -confdir=/etc +sgid +fhs +lang none | 26 | ./configure -confdir=/etc +sgid +fhs +lang none |
23 | |||
24 | make || return 1 | 27 | make || return 1 |
28 | } | ||
29 | |||
30 | package() { | ||
31 | cd "$_builddir" | ||
25 | make PREFIX="$pkgdir" install || return 1 | 32 | make PREFIX="$pkgdir" install || return 1 |
26 | 33 | ||
27 | sed -i -e "s|-Tlatin1||g" \ | 34 | sed -i -e "s|-Tlatin1||g" \ |
diff --git a/main/man/test.out b/main/man/test.out new file mode 100644 index 0000000000..b2ea959ca3 --- /dev/null +++ b/main/man/test.out | |||
@@ -0,0 +1,289 @@ | |||
1 | execve("/usr/bin/man", ["man", "fopen"], [/* 14 vars */]) = 0 | ||
2 | mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|0x4000000, -1, 0) = 0xb781c000 | ||
3 | stat("/etc/ld.so.cache", {st_mode=S_IFREG|0644, st_size=7627, ...}) = 0 | ||
4 | open("/etc/ld.so.cache", O_RDONLY|O_CLOEXEC) = 3 | ||
5 | mmap2(NULL, 7627, PROT_READ, MAP_SHARED, 3, 0) = 0xb781a000 | ||
6 | close(3) = 0 | ||
7 | open("/lib/libc.so.0.9.32", O_RDONLY) = 3 | ||
8 | fstat(3, {st_mode=S_IFREG|0755, st_size=306224, ...}) = 0 | ||
9 | mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|0x4000000, -1, 0) = 0xb7819000 | ||
10 | read(3, "\177ELF\1\1\1\0\0\0\0\0\0\0\0\0\3\0\3\0\1\0\0\0@\260\0\0004\0\0\0"..., 4096) = 4096 | ||
11 | mmap2(NULL, 327680, PROT_NONE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb77c9000 | ||
12 | mmap2(0xb77c9000, 298552, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_FIXED, 3, 0) = 0xb77c9000 | ||
13 | mmap2(0xb7812000, 4862, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED, 3, 0x49) = 0xb7812000 | ||
14 | mmap2(0xb7814000, 16644, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0xb7814000 | ||
15 | close(3) = 0 | ||
16 | munmap(0xb7819000, 4096) = 0 | ||
17 | munmap(0xb781a000, 7627) = 0 | ||
18 | stat("/lib/ld-uClibc.so.0.9.32", {st_mode=S_IFREG|0755, st_size=25248, ...}) = 0 | ||
19 | mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|0x4000000, -1, 0) = 0xb781b000 | ||
20 | set_thread_area({entry_number:-1 -> 6, base_addr:0xb781b6a0, limit:1048575, seg_32bit:1, contents:0, read_exec_only:0, limit_in_pages:1, seg_not_present:0, useable:1}) = 0 | ||
21 | open("/dev/urandom", O_RDONLY) = 3 | ||
22 | read(3, "\252\2559i", 4) = 4 | ||
23 | close(3) = 0 | ||
24 | mprotect(0xb7812000, 4096, PROT_READ) = 0 | ||
25 | mprotect(0xb7824000, 4096, PROT_READ) = 0 | ||
26 | ioctl(0, SNDCTL_TMR_TIMEBASE or TCGETS, {B38400 opost isig icanon echo ...}) = 0 | ||
27 | ioctl(1, SNDCTL_TMR_TIMEBASE or TCGETS, {B38400 opost isig icanon echo ...}) = 0 | ||
28 | brk(0) = 0xb7971000 | ||
29 | brk(0xb7972000) = 0xb7972000 | ||
30 | getuid32() = 1000 | ||
31 | geteuid32() = 1000 | ||
32 | getgid32() = 1000 | ||
33 | getegid32() = 1000 | ||
34 | ioctl(0, SNDCTL_TMR_TIMEBASE or TCGETS, {B38400 opost isig icanon echo ...}) = 0 | ||
35 | ioctl(1, SNDCTL_TMR_TIMEBASE or TCGETS, {B38400 opost isig icanon echo ...}) = 0 | ||
36 | ioctl(0, TIOCGWINSZ, {ws_row=59, ws_col=80, ws_xpixel=0, ws_ypixel=0}) = 0 | ||
37 | open("/etc/man.conf", O_RDONLY) = 3 | ||
38 | ioctl(3, SNDCTL_TMR_TIMEBASE or TCGETS, 0xbf8abc08) = -1 ENOTTY (Inappropriate ioctl for device) | ||
39 | brk(0xb7973000) = 0xb7973000 | ||
40 | read(3, "#\n# Generated automatically from"..., 4096) = 4096 | ||
41 | brk(0xb7976000) = 0xb7976000 | ||
42 | brk(0xb7979000) = 0xb7979000 | ||
43 | brk(0xb797c000) = 0xb797c000 | ||
44 | brk(0xb797f000) = 0xb797f000 | ||
45 | brk(0xb7982000) = 0xb7982000 | ||
46 | brk(0xb7985000) = 0xb7985000 | ||
47 | brk(0xb7988000) = 0xb7988000 | ||
48 | brk(0xb798b000) = 0xb798b000 | ||
49 | brk(0xb798e000) = 0xb798e000 | ||
50 | brk(0xb7991000) = 0xb7991000 | ||
51 | brk(0xb7994000) = 0xb7994000 | ||
52 | brk(0xb7997000) = 0xb7997000 | ||
53 | brk(0xb799a000) = 0xb799a000 | ||
54 | brk(0xb799d000) = 0xb799d000 | ||
55 | read(3, " when man is invoked without opt"..., 4096) = 439 | ||
56 | read(3, "", 4096) = 0 | ||
57 | stat("/usr/local/share/man", {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0 | ||
58 | stat("/usr/share/man", {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0 | ||
59 | stat("/usr/man", {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0 | ||
60 | stat("/usr/local/man", 0xbf8a7ac8) = -1 ENOENT (No such file or directory) | ||
61 | stat("/usr/X11R6/man", 0xbf8a7ac8) = -1 ENOENT (No such file or directory) | ||
62 | ioctl(0, SNDCTL_TMR_TIMEBASE or TCGETS, {B38400 opost isig icanon echo ...}) = 0 | ||
63 | ioctl(1, SNDCTL_TMR_TIMEBASE or TCGETS, {B38400 opost isig icanon echo ...}) = 0 | ||
64 | open("/usr/local/share/man/html1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
65 | open("/usr/local/share/man/man1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
66 | open("/var/cache/man/local/cat1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
67 | open("/usr/local/share/man/cat1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
68 | open("/usr/share/man/html1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
69 | open("/usr/share/man/man1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 | ||
70 | fstat(4, {st_mode=S_IFDIR|0755, st_size=24576, ...}) = 0 | ||
71 | brk(0xb799e000) = 0xb799e000 | ||
72 | getdents(4, /* 195 entries */, 4096) = 4092 | ||
73 | getdents(4, /* 105 entries */, 4096) = 2228 | ||
74 | getdents(4, /* 0 entries */, 4096) = 0 | ||
75 | close(4) = 0 | ||
76 | open("/usr/share/man/man1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 | ||
77 | fstat(4, {st_mode=S_IFDIR|0755, st_size=24576, ...}) = 0 | ||
78 | getdents(4, /* 195 entries */, 4096) = 4092 | ||
79 | getdents(4, /* 105 entries */, 4096) = 2228 | ||
80 | getdents(4, /* 0 entries */, 4096) = 0 | ||
81 | close(4) = 0 | ||
82 | open("/var/cache/man/cat1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
83 | open("/usr/share/man/cat1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 | ||
84 | fstat(4, {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0 | ||
85 | getdents(4, /* 2 entries */, 4096) = 32 | ||
86 | getdents(4, /* 0 entries */, 4096) = 0 | ||
87 | close(4) = 0 | ||
88 | open("/usr/share/man/cat1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 | ||
89 | fstat(4, {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0 | ||
90 | getdents(4, /* 2 entries */, 4096) = 32 | ||
91 | getdents(4, /* 0 entries */, 4096) = 0 | ||
92 | close(4) = 0 | ||
93 | open("/usr/man/html1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
94 | open("/usr/man/man1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
95 | open("/var/cache/man/cat1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
96 | open("/usr/man/cat1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
97 | open("/usr/local/share/man/html1p/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
98 | open("/usr/local/share/man/man1p/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
99 | open("/var/cache/man/local/cat1p/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
100 | open("/usr/local/share/man/cat1p/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
101 | open("/usr/share/man/html1p/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
102 | open("/usr/share/man/man1p/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
103 | open("/var/cache/man/cat1p/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
104 | open("/usr/share/man/cat1p/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
105 | open("/usr/man/html1p/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
106 | open("/usr/man/man1p/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
107 | open("/var/cache/man/cat1p/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
108 | open("/usr/man/cat1p/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
109 | open("/usr/local/share/man/html8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
110 | open("/usr/local/share/man/man8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
111 | open("/var/cache/man/local/cat8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
112 | open("/usr/local/share/man/cat8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
113 | open("/usr/share/man/html8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
114 | open("/usr/share/man/man8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 | ||
115 | fstat(4, {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0 | ||
116 | brk(0xb799f000) = 0xb799f000 | ||
117 | getdents(4, /* 20 entries */, 4096) = 460 | ||
118 | getdents(4, /* 0 entries */, 4096) = 0 | ||
119 | close(4) = 0 | ||
120 | open("/usr/share/man/man8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 | ||
121 | fstat(4, {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0 | ||
122 | getdents(4, /* 20 entries */, 4096) = 460 | ||
123 | getdents(4, /* 0 entries */, 4096) = 0 | ||
124 | close(4) = 0 | ||
125 | open("/var/cache/man/cat8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
126 | open("/usr/share/man/cat8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 | ||
127 | fstat(4, {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0 | ||
128 | getdents(4, /* 2 entries */, 4096) = 32 | ||
129 | getdents(4, /* 0 entries */, 4096) = 0 | ||
130 | close(4) = 0 | ||
131 | open("/usr/share/man/cat8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 | ||
132 | fstat(4, {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0 | ||
133 | getdents(4, /* 2 entries */, 4096) = 32 | ||
134 | getdents(4, /* 0 entries */, 4096) = 0 | ||
135 | close(4) = 0 | ||
136 | open("/usr/man/html8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
137 | open("/usr/man/man8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
138 | open("/var/cache/man/cat8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
139 | open("/usr/man/cat8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
140 | open("/usr/local/share/man/html2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
141 | open("/usr/local/share/man/man2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
142 | open("/var/cache/man/local/cat2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
143 | open("/usr/local/share/man/cat2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
144 | open("/usr/share/man/html2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
145 | open("/usr/share/man/man2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 | ||
146 | fstat(4, {st_mode=S_IFDIR|0755, st_size=36864, ...}) = 0 | ||
147 | getdents(4, /* 172 entries */, 4096) = 4084 | ||
148 | getdents(4, /* 173 entries */, 4096) = 4096 | ||
149 | getdents(4, /* 77 entries */, 4096) = 1772 | ||
150 | getdents(4, /* 0 entries */, 4096) = 0 | ||
151 | close(4) = 0 | ||
152 | open("/usr/share/man/man2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 | ||
153 | fstat(4, {st_mode=S_IFDIR|0755, st_size=36864, ...}) = 0 | ||
154 | getdents(4, /* 172 entries */, 4096) = 4084 | ||
155 | getdents(4, /* 173 entries */, 4096) = 4096 | ||
156 | getdents(4, /* 77 entries */, 4096) = 1772 | ||
157 | getdents(4, /* 0 entries */, 4096) = 0 | ||
158 | close(4) = 0 | ||
159 | open("/var/cache/man/cat2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
160 | open("/usr/share/man/cat2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
161 | open("/usr/man/html2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
162 | open("/usr/man/man2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
163 | open("/var/cache/man/cat2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
164 | open("/usr/man/cat2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
165 | open("/usr/local/share/man/html3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
166 | open("/usr/local/share/man/man3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 | ||
167 | fstat(4, {st_mode=S_IFDIR|0755, st_size=90112, ...}) = 0 | ||
168 | getdents(4, /* 2 entries */, 4096) = 32 | ||
169 | getdents(4, /* 0 entries */, 4096) = 0 | ||
170 | close(4) = 0 | ||
171 | open("/usr/local/share/man/man3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 | ||
172 | fstat(4, {st_mode=S_IFDIR|0755, st_size=90112, ...}) = 0 | ||
173 | getdents(4, /* 2 entries */, 4096) = 32 | ||
174 | getdents(4, /* 0 entries */, 4096) = 0 | ||
175 | close(4) = 0 | ||
176 | open("/var/cache/man/local/cat3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
177 | open("/usr/local/share/man/cat3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
178 | open("/usr/share/man/html3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
179 | open("/usr/share/man/man3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 | ||
180 | fstat(4, {st_mode=S_IFDIR|0755, st_size=299008, ...}) = 0 | ||
181 | getdents(4, /* 153 entries */, 4096) = 4080 | ||
182 | getdents(4, /* 150 entries */, 4096) = 4084 | ||
183 | getdents(4, /* 148 entries */, 4096) = 4088 | ||
184 | getdents(4, /* 150 entries */, 4096) = 4076 | ||
185 | getdents(4, /* 151 entries */, 4096) = 4088 | ||
186 | getdents(4, /* 153 entries */, 4096) = 4092 | ||
187 | getdents(4, /* 149 entries */, 4096) = 4096 | ||
188 | getdents(4, /* 154 entries */, 4096) = 4076 | ||
189 | getdents(4, /* 147 entries */, 4096) = 4080 | ||
190 | getdents(4, /* 155 entries */, 4096) = 4084 | ||
191 | getdents(4, /* 143 entries */, 4096) = 4088 | ||
192 | getdents(4, /* 152 entries */, 4096) = 4092 | ||
193 | getdents(4, /* 153 entries */, 4096) = 4084 | ||
194 | getdents(4, /* 150 entries */, 4096) = 4080 | ||
195 | getdents(4, /* 152 entries */, 4096) = 4076 | ||
196 | getdents(4, /* 152 entries */, 4096) = 4080 | ||
197 | getdents(4, /* 145 entries */, 4096) = 4080 | ||
198 | getdents(4, /* 156 entries */, 4096) = 4072 | ||
199 | getdents(4, /* 148 entries */, 4096) = 4072 | ||
200 | getdents(4, /* 155 entries */, 4096) = 4088 | ||
201 | getdents(4, /* 150 entries */, 4096) = 4080 | ||
202 | getdents(4, /* 147 entries */, 4096) = 4068 | ||
203 | getdents(4, /* 153 entries */, 4096) = 4088 | ||
204 | getdents(4, /* 149 entries */, 4096) = 4092 | ||
205 | getdents(4, /* 143 entries */, 4096) = 4084 | ||
206 | getdents(4, /* 151 entries */, 4096) = 4084 | ||
207 | getdents(4, /* 152 entries */, 4096) = 4096 | ||
208 | getdents(4, /* 153 entries */, 4096) = 4076 | ||
209 | getdents(4, /* 152 entries */, 4096) = 4080 | ||
210 | getdents(4, /* 86 entries */, 4096) = 2340 | ||
211 | getdents(4, /* 0 entries */, 4096) = 0 | ||
212 | close(4) = 0 | ||
213 | open("/usr/share/man/man3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 | ||
214 | fstat(4, {st_mode=S_IFDIR|0755, st_size=299008, ...}) = 0 | ||
215 | getdents(4, /* 153 entries */, 4096) = 4080 | ||
216 | getdents(4, /* 150 entries */, 4096) = 4084 | ||
217 | getdents(4, /* 148 entries */, 4096) = 4088 | ||
218 | getdents(4, /* 150 entries */, 4096) = 4076 | ||
219 | getdents(4, /* 151 entries */, 4096) = 4088 | ||
220 | getdents(4, /* 153 entries */, 4096) = 4092 | ||
221 | getdents(4, /* 149 entries */, 4096) = 4096 | ||
222 | getdents(4, /* 154 entries */, 4096) = 4076 | ||
223 | getdents(4, /* 147 entries */, 4096) = 4080 | ||
224 | getdents(4, /* 155 entries */, 4096) = 4084 | ||
225 | getdents(4, /* 143 entries */, 4096) = 4088 | ||
226 | getdents(4, /* 152 entries */, 4096) = 4092 | ||
227 | getdents(4, /* 153 entries */, 4096) = 4084 | ||
228 | getdents(4, /* 150 entries */, 4096) = 4080 | ||
229 | getdents(4, /* 152 entries */, 4096) = 4076 | ||
230 | getdents(4, /* 152 entries */, 4096) = 4080 | ||
231 | getdents(4, /* 145 entries */, 4096) = 4080 | ||
232 | getdents(4, /* 156 entries */, 4096) = 4072 | ||
233 | getdents(4, /* 148 entries */, 4096) = 4072 | ||
234 | getdents(4, /* 155 entries */, 4096) = 4088 | ||
235 | getdents(4, /* 150 entries */, 4096) = 4080 | ||
236 | getdents(4, /* 147 entries */, 4096) = 4068 | ||
237 | getdents(4, /* 153 entries */, 4096) = 4088 | ||
238 | getdents(4, /* 149 entries */, 4096) = 4092 | ||
239 | getdents(4, /* 143 entries */, 4096) = 4084 | ||
240 | getdents(4, /* 151 entries */, 4096) = 4084 | ||
241 | getdents(4, /* 152 entries */, 4096) = 4096 | ||
242 | getdents(4, /* 153 entries */, 4096) = 4076 | ||
243 | getdents(4, /* 152 entries */, 4096) = 4080 | ||
244 | getdents(4, /* 86 entries */, 4096) = 2340 | ||
245 | getdents(4, /* 0 entries */, 4096) = 0 | ||
246 | close(4) = 0 | ||
247 | access("/usr/share/man/man3/fopen.3", R_OK) = 0 | ||
248 | open("/usr/man/html3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
249 | open("/usr/man/man3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 | ||
250 | fstat(4, {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0 | ||
251 | getdents(4, /* 2 entries */, 4096) = 32 | ||
252 | getdents(4, /* 0 entries */, 4096) = 0 | ||
253 | close(4) = 0 | ||
254 | open("/usr/man/man3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 | ||
255 | fstat(4, {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0 | ||
256 | getdents(4, /* 2 entries */, 4096) = 32 | ||
257 | getdents(4, /* 0 entries */, 4096) = 0 | ||
258 | close(4) = 0 | ||
259 | open("/var/cache/man/cat3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
260 | open("/usr/man/cat3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) | ||
261 | access("/usr/share/man/man3/fopen.3", R_OK) = 0 | ||
262 | open("/usr/share/man/man3/fopen.3", O_RDONLY) = 4 | ||
263 | ioctl(4, SNDCTL_TMR_TIMEBASE or TCGETS, 0xbf8a6b78) = -1 ENOTTY (Inappropriate ioctl for device) | ||
264 | read(4, ".\\\" Copyright (c) 1990, 1991 The"..., 4096) = 4096 | ||
265 | close(4) = 0 | ||
266 | stat("/usr/share/man/man3/fopen.3", {st_mode=S_IFREG|0644, st_size=8720, ...}) = 0 | ||
267 | stat("/var/cache/man/cat3/fopen.3.bz2", 0xbf8a8b48) = -1 ENOENT (No such file or directory) | ||
268 | stat("/var/cache/man/cat3/fopen.3.bz2", 0xbf8a8c28) = -1 ENOENT (No such file or directory) | ||
269 | open("/var/cache/man/cat3/fopen.3.bz2", O_WRONLY|O_CREAT|O_TRUNC, 0666) = -1 ENOENT (No such file or directory) | ||
270 | ioctl(0, SNDCTL_TMR_TIMEBASE or TCGETS, {B38400 opost isig icanon echo ...}) = 0 | ||
271 | ioctl(1, SNDCTL_TMR_TIMEBASE or TCGETS, {B38400 opost isig icanon echo ...}) = 0 | ||
272 | open("/usr/share/man/man3/fopen.3", O_RDONLY) = 4 | ||
273 | ioctl(4, SNDCTL_TMR_TIMEBASE or TCGETS, 0xbf8a2b38) = -1 ENOTTY (Inappropriate ioctl for device) | ||
274 | read(4, ".\\\" Copyright (c) 1990, 1991 The"..., 4096) = 4096 | ||
275 | close(4) = 0 | ||
276 | rt_sigaction(SIGINT, {0xb782cd1c, [INT], SA_RESTORER|SA_RESTART, 0xb77d43b7}, {SIG_DFL, [], 0}, 8) = 0 | ||
277 | rt_sigaction(SIGINT, {SIG_IGN, [], SA_RESTORER, 0xb77d43b7}, {0xb782cd1c, [INT], SA_RESTORER|SA_RESTART, 0xb77d43b7}, 8) = 0 | ||
278 | rt_sigaction(SIGQUIT, {SIG_IGN, [], SA_RESTORER, 0xb77d43b7}, {SIG_DFL, [], 0}, 8) = 0 | ||
279 | rt_sigprocmask(SIG_BLOCK, [CHLD], [], 8) = 0 | ||
280 | clone(child_stack=0, flags=CLONE_PARENT_SETTID|SIGCHLD, parent_tidptr=0xbf8a8bb4) = 31161 | ||
281 | waitpid(31161, <stdin>:1:1: bad syntax | ||
282 | <stdin>: Not a manual | ||
283 | [{WIFEXITED(s) && WEXITSTATUS(s) == 0}], 0) = 31161 | ||
284 | rt_sigaction(SIGINT, {0xb782cd1c, [INT], SA_RESTORER|SA_RESTART, 0xb77d43b7}, NULL, 8) = 0 | ||
285 | rt_sigaction(SIGQUIT, {SIG_DFL, [], SA_RESTORER, 0xb77d43b7}, NULL, 8) = 0 | ||
286 | rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0 | ||
287 | --- SIGCHLD (Child exited) @ 0 (0) --- | ||
288 | rt_sigaction(SIGINT, {SIG_DFL, [INT], SA_RESTORER|SA_RESTART, 0xb77d43b7}, {0xb782cd1c, [INT], SA_RESTORER|SA_RESTART, 0xb77d43b7}, 8) = 0 | ||
289 | exit_group(0) = ? | ||
diff --git a/main/mc/APKBUILD b/main/mc/APKBUILD new file mode 100644 index 0000000000..72d59ce281 --- /dev/null +++ b/main/mc/APKBUILD | |||
@@ -0,0 +1,42 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
2 | pkgname=mc | ||
3 | pkgver=4.7.0.7 | ||
4 | pkgrel=0 | ||
5 | pkgdesc="A filemanager/shell that emulates Norton Commander" | ||
6 | url="http://www.ibiblio.org/mc/" | ||
7 | license="GPL" | ||
8 | depends="" | ||
9 | makedepends="e2fsprogs-dev glib-dev pcre-dev slang-dev" | ||
10 | source="http://www.midnight-commander.org/downloads/mc-$pkgver.tar.bz2" | ||
11 | |||
12 | _builddir="$srcdir"/$pkgname-$pkgver | ||
13 | build() { | ||
14 | cd "$_builddir" | ||
15 | ./configure --prefix=/usr \ | ||
16 | --libexecdir=/usr/lib \ | ||
17 | --mandir=/usr/share/man \ | ||
18 | --sysconfdir=/etc \ | ||
19 | --enable-background \ | ||
20 | --enable-charset \ | ||
21 | --enable-largefile \ | ||
22 | --with-edit \ | ||
23 | --with-mmap \ | ||
24 | --with-screen=slang \ | ||
25 | --with-subshell \ | ||
26 | --with-vfs \ | ||
27 | --without-debug \ | ||
28 | --without-gnome \ | ||
29 | --without-gpm-mouse \ | ||
30 | --without-included-gettext \ | ||
31 | --without-samba \ | ||
32 | --without-x \ | ||
33 | || return 1 | ||
34 | make || return 1 | ||
35 | } | ||
36 | |||
37 | package() { | ||
38 | cd "$_builddir" | ||
39 | make DESTDIR="$pkgdir" install || return 1 | ||
40 | } | ||
41 | |||
42 | md5sums="23e35ad8917fc752dffedb06b5d0bf98 mc-4.7.0.7.tar.bz2" | ||
diff --git a/main/mpg123/APKBUILD b/main/mpg123/APKBUILD index a043024737..ba7d7e7be4 100644 --- a/main/mpg123/APKBUILD +++ b/main/mpg123/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=mpg123 | 2 | pkgname=mpg123 |
3 | pkgver=1.12.1 | 3 | pkgver=1.12.3 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3" | 5 | pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3" |
6 | url="http://sourceforge.net/projects/mpg123" | 6 | url="http://sourceforge.net/projects/mpg123" |
7 | license="GPL2 LGPL2" | 7 | license="GPL2 LGPL2" |
@@ -33,4 +33,4 @@ dev() { | |||
33 | mv "$subpkgdir"/usr/lib/mpg123/output_* "$pkgdir"/usr/lib/mpg123/ | 33 | mv "$subpkgdir"/usr/lib/mpg123/output_* "$pkgdir"/usr/lib/mpg123/ |
34 | } | 34 | } |
35 | 35 | ||
36 | md5sums="e7d810a75d22954169f1530a436aca4c mpg123-1.12.1.tar.bz2" | 36 | md5sums="c1568be2d1715786bd6b1a89ec6fa7ef mpg123-1.12.3.tar.bz2" |
diff --git a/main/mplayer/APKBUILD b/main/mplayer/APKBUILD index f5f1ae7bd0..26cb1371ad 100644 --- a/main/mplayer/APKBUILD +++ b/main/mplayer/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=mplayer | 2 | pkgname=mplayer |
3 | pkgver=1.0_rc4_p20100506 | 3 | pkgver=1.0_rc4_p20100612 |
4 | _svnver=SVN-r30554 | 4 | _svnver=SVN-r30554 |
5 | pkgrel=5 | 5 | pkgrel=0 |
6 | pkgdesc="A movie player for linux" | 6 | pkgdesc="A movie player for linux" |
7 | url="http://www.mplayerhq.hu/" | 7 | url="http://www.mplayerhq.hu/" |
8 | license="GPL" | 8 | license="GPL" |
@@ -15,7 +15,7 @@ makedepends="libxxf86dga-dev libxv-dev libmad-dev lame-dev libao-dev | |||
15 | # cdparanoia libcaca lirc-utils libgl-dev smbclient-dev | 15 | # cdparanoia libcaca lirc-utils libgl-dev smbclient-dev |
16 | # aalib-dev jack-audio-connection-kit libmng-dev libxss-dev | 16 | # aalib-dev jack-audio-connection-kit libmng-dev libxss-dev |
17 | 17 | ||
18 | source="http://mirrors.kernel.org/gentoo/distfiles/$pkgname-$pkgver.tar.bz2" | 18 | source="http://dev.alpinelinux.org/distfiles/$pkgname-$pkgver.tar.bz2" |
19 | 19 | ||
20 | build() { | 20 | build() { |
21 | cd "$srcdir"/$pkgname-$pkgver | 21 | cd "$srcdir"/$pkgname-$pkgver |
@@ -65,4 +65,4 @@ package() { | |||
65 | "$pkgdir"/usr/share/mplayer/subfont.ttf || return 1 | 65 | "$pkgdir"/usr/share/mplayer/subfont.ttf || return 1 |
66 | rm -rf "$pkgdir"/usr/share/mplayer/font | 66 | rm -rf "$pkgdir"/usr/share/mplayer/font |
67 | } | 67 | } |
68 | md5sums="38126e7d1cf4044115a617dc331cddcc mplayer-1.0_rc4_p20100506.tar.bz2" | 68 | md5sums="9b2cf68e1f2a20dec54fc6cb22f7e025 mplayer-1.0_rc4_p20100612.tar.bz2" |
diff --git a/main/mysql/APKBUILD b/main/mysql/APKBUILD index 492767901f..e2f837506c 100644 --- a/main/mysql/APKBUILD +++ b/main/mysql/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=mysql | 3 | pkgname=mysql |
4 | pkgver=5.1.47 | 4 | pkgver=5.1.48 |
5 | pkgrel=0 | 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/" |
@@ -77,6 +77,6 @@ client() { | |||
77 | done | 77 | done |
78 | } | 78 | } |
79 | 79 | ||
80 | md5sums="02b9964b3966832f3d6bc87524bfd73f mysql-5.1.47.tar.gz | 80 | md5sums="d04c54d1cfbd8c6c8650c8d078f885b2 mysql-5.1.48.tar.gz |
81 | 25d08b02bff6aa379dc45859b7a3f28a mysql.initd | 81 | 25d08b02bff6aa379dc45859b7a3f28a mysql.initd |
82 | 15a7e3ddd6a40bf5a1eb3a8c69d9c34c mysql.mycnf" | 82 | 15a7e3ddd6a40bf5a1eb3a8c69d9c34c mysql.mycnf" |
diff --git a/main/nfs-utils/APKBUILD b/main/nfs-utils/APKBUILD index 4807e752ca..45e1c89e8d 100644 --- a/main/nfs-utils/APKBUILD +++ b/main/nfs-utils/APKBUILD | |||
@@ -1,28 +1,39 @@ | |||
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=nfs-utils | 3 | pkgname=nfs-utils |
4 | pkgver=1.2.0 | 4 | pkgver=1.2.2 |
5 | pkgrel=3 | 5 | pkgrel=0 |
6 | pkgdesc="kernel-mode NFS" | 6 | pkgdesc="kernel-mode NFS" |
7 | url="http://nfs.sourceforge.net/" | 7 | url="http://nfs.sourceforge.net/" |
8 | license="GPL" | 8 | license="GPL" |
9 | depends="portmap" | 9 | depends="rpcbind" |
10 | makedepends="e2fsprogs-dev" | 10 | makedepends="util-linux-ng-dev libtirpc-dev libcap-dev" |
11 | subpackages="$pkgname-doc rpcgen" | 11 | subpackages="$pkgname-doc rpcgen" |
12 | source="http://downloads.sourceforge.net/nfs/$pkgname-$pkgver.tar.bz2 | 12 | source="http://downloads.sourceforge.net/nfs/$pkgname-$pkgver.tar.bz2 |
13 | nfs.initd | 13 | nfs.initd |
14 | nfsmount.initd | ||
15 | rpc.gssd.initd | ||
16 | rpc.idmapd.initd | ||
17 | rpc.pipefs.initd | ||
18 | rpc.statd.initd | ||
19 | rpc.svcgssd.initd | ||
20 | |||
14 | nfs.confd | 21 | nfs.confd |
15 | nfs.exports | 22 | nfs.exports |
16 | nfs-utils-no-exec.patch | 23 | nfs-utils-no-exec.patch |
17 | nfs-utils-mtab-sym.patch" | 24 | nfs-utils-mtab-sym.patch" |
18 | 25 | ||
19 | build() { | 26 | prepare() { |
20 | cd "$srcdir/$pkgname-$pkgver" | 27 | cd "$srcdir/$pkgname-$pkgver" |
21 | |||
22 | for i in "$srcdir"/*.patch; do | 28 | for i in "$srcdir"/*.patch; do |
23 | msg "Applying $i" | 29 | msg "Applying $i" |
24 | patch -p0 -i "${i}" || return 1 | 30 | patch -p0 -i "${i}" || return 1 |
25 | done | 31 | done |
32 | sed -i -e '/^#include <libio.h>/d' support/include/sockaddr.h | ||
33 | } | ||
34 | |||
35 | build() { | ||
36 | cd "$srcdir/$pkgname-$pkgver" | ||
26 | 37 | ||
27 | ./configure --prefix=/usr \ | 38 | ./configure --prefix=/usr \ |
28 | --sysconfdir=/etc \ | 39 | --sysconfdir=/etc \ |
@@ -43,7 +54,13 @@ package() { | |||
43 | cd "$srcdir/$pkgname-$pkgver" | 54 | cd "$srcdir/$pkgname-$pkgver" |
44 | make -j1 DESTDIR="$pkgdir" install | 55 | make -j1 DESTDIR="$pkgdir" install |
45 | 56 | ||
46 | install -m755 -D "$srcdir"/nfs.initd "$pkgdir"/etc/init.d/nfs | 57 | for i in nfs rpc.gssd rpc.pipefs rpc.svcgssd nfsmount rpc.idmapd \ |
58 | rpc.statd; do | ||
59 | install -m755 -D "$srcdir"/$i.initd "$pkgdir"/etc/init.d/$i \ | ||
60 | || return 1 | ||
61 | done | ||
62 | |||
63 | |||
47 | install -m644 -D "$srcdir"/nfs.confd "$pkgdir"/etc/conf.d/nfs | 64 | install -m644 -D "$srcdir"/nfs.confd "$pkgdir"/etc/conf.d/nfs |
48 | install -m644 -D "$srcdir"/nfs.exports "$pkgdir"/etc/exports | 65 | install -m644 -D "$srcdir"/nfs.exports "$pkgdir"/etc/exports |
49 | } | 66 | } |
@@ -54,8 +71,14 @@ rpcgen() { | |||
54 | install -m755 -D tools/rpcgen/rpcgen "$subpkgdir"/usr/bin/rpcgen | 71 | install -m755 -D tools/rpcgen/rpcgen "$subpkgdir"/usr/bin/rpcgen |
55 | } | 72 | } |
56 | 73 | ||
57 | md5sums="779cf81044e92cb51ad590960e7b3671 nfs-utils-1.2.0.tar.bz2 | 74 | md5sums="dad92f64db3266c7757f71bb53ee8f35 nfs-utils-1.2.2.tar.bz2 |
58 | 23240b9ab44ef7d6b6c437c0ae34915d nfs.initd | 75 | f1873e0441b8c3b4b90023c038d755ec nfs.initd |
76 | d514fb87ce5de9909f43d99012352f09 nfsmount.initd | ||
77 | 144b0e1f7d32265abe4c499a47af6154 rpc.gssd.initd | ||
78 | 650f68e51a02ba84c272960fc302c445 rpc.idmapd.initd | ||
79 | 80772890099fafdb8af3d6dd3db242c2 rpc.pipefs.initd | ||
80 | 37fdb069a5fcabea507012497bb95c53 rpc.statd.initd | ||
81 | 20e71ab412555b2dc9b50f346f68e5c8 rpc.svcgssd.initd | ||
59 | 09135438d6df50b868bbe5a2260f973c nfs.confd | 82 | 09135438d6df50b868bbe5a2260f973c nfs.confd |
60 | 4f1bb7b2412ce5952ecb5ec22d8ed99d nfs.exports | 83 | 4f1bb7b2412ce5952ecb5ec22d8ed99d nfs.exports |
61 | 5e0963b0889e779ff36af0299d17d6cb nfs-utils-no-exec.patch | 84 | 5e0963b0889e779ff36af0299d17d6cb nfs-utils-no-exec.patch |
diff --git a/main/nfs-utils/nfs.initd b/main/nfs-utils/nfs.initd index ba3920e422..6f6ba98ceb 100644 --- a/main/nfs-utils/nfs.initd +++ b/main/nfs-utils/nfs.initd | |||
@@ -1,7 +1,7 @@ | |||
1 | #!/sbin/runscript | 1 | #!/sbin/runscript |
2 | # Copyright 1999-2009 Gentoo Foundation | 2 | # Copyright 1999-2009 Gentoo Foundation |
3 | # Distributed under the terms of the GNU General Public License v2 | 3 | # Distributed under the terms of the GNU General Public License v2 |
4 | # $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.18 2009/02/27 01:41:55 vapier Exp $ | 4 | # $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.19 2009/05/30 22:01:43 vapier Exp $ |
5 | 5 | ||
6 | opts="reload" | 6 | opts="reload" |
7 | 7 | ||
@@ -23,9 +23,9 @@ depend() { | |||
23 | fi | 23 | fi |
24 | fi | 24 | fi |
25 | config /etc/exports | 25 | config /etc/exports |
26 | need portmap rpc.statd ${myneed} | 26 | need portmap rpc.statd ${myneed} ${NFS_NEEDED_SERVICES} |
27 | use ypbind net dns rpc.rquotad rpc.idmapd rpc.svcgssd | 27 | use ypbind net dns rpc.rquotad rpc.idmapd rpc.svcgssd |
28 | after firewall quota | 28 | after quota |
29 | } | 29 | } |
30 | 30 | ||
31 | mkdir_nfsdirs() { | 31 | mkdir_nfsdirs() { |
diff --git a/main/nfs-utils/nfsmount.initd b/main/nfs-utils/nfsmount.initd new file mode 100644 index 0000000000..9ae2c520d2 --- /dev/null +++ b/main/nfs-utils/nfsmount.initd | |||
@@ -0,0 +1,42 @@ | |||
1 | #!/sbin/runscript | ||
2 | # Copyright 1999-2009 Gentoo Foundation | ||
3 | # Distributed under the terms of the GNU General Public License v2 | ||
4 | # $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v 1.13 2009/01/31 22:15:02 vapier Exp $ | ||
5 | |||
6 | [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs | ||
7 | |||
8 | depend() { | ||
9 | local myneed="" | ||
10 | if [ -e /etc/fstab ] ; then | ||
11 | awk '!/^[[:space:]]*#/ && $3 == "nfs4" { exit ($4 ~ /sec=krb/ ? 10 : 20) }' /etc/fstab | ||
12 | local ret=$? | ||
13 | [ ${ret} -eq 10 ] && myneed="${myneed} rpc.gssd" | ||
14 | [ ${ret} -eq 20 ] && myneed="${myneed} rpc.idmapd" | ||
15 | fi | ||
16 | config /etc/fstab | ||
17 | need net portmap rpc.statd ${myneed} | ||
18 | use ypbind dns rpc.idmapd rpc.gssd | ||
19 | } | ||
20 | |||
21 | start() { | ||
22 | if [ -x /usr/sbin/sm-notify ] ; then | ||
23 | ebegin "Starting NFS sm-notify" | ||
24 | /usr/sbin/sm-notify ${OPTS_SMNOTIFY} | ||
25 | eend $? | ||
26 | fi | ||
27 | |||
28 | # Make sure nfs support is loaded in the kernel #64709 | ||
29 | if [ -e /proc/modules ] && ! grep -qs 'nfs$' /proc/filesystems ; then | ||
30 | modprobe -q nfs | ||
31 | fi | ||
32 | |||
33 | ebegin "Mounting NFS filesystems" | ||
34 | mount -a -t nfs,nfs4 | ||
35 | eend $? | ||
36 | } | ||
37 | |||
38 | stop() { | ||
39 | ebegin "Unmounting NFS filesystems" | ||
40 | umount -a -t nfs,nfs4 | ||
41 | eend $? | ||
42 | } | ||
diff --git a/main/nfs-utils/rpc.gssd.initd b/main/nfs-utils/rpc.gssd.initd new file mode 100644 index 0000000000..f1b8f87745 --- /dev/null +++ b/main/nfs-utils/rpc.gssd.initd | |||
@@ -0,0 +1,24 @@ | |||
1 | #!/sbin/runscript | ||
2 | # Copyright 1999-2008 Gentoo Foundation | ||
3 | # Distributed under the terms of the GNU General Public License v2 | ||
4 | # $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd,v 1.11 2008/10/26 09:02:47 vapier Exp $ | ||
5 | |||
6 | [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs | ||
7 | |||
8 | depend() { | ||
9 | use ypbind net | ||
10 | need portmap rpc.pipefs | ||
11 | after quota | ||
12 | } | ||
13 | |||
14 | start() { | ||
15 | ebegin "Starting gssd" | ||
16 | start-stop-daemon --start --exec /usr/sbin/rpc.gssd -- ${OPTS_RPC_GSSD} | ||
17 | eend $? | ||
18 | } | ||
19 | |||
20 | stop() { | ||
21 | ebegin "Stopping gssd" | ||
22 | start-stop-daemon --stop --exec /usr/sbin/rpc.gssd | ||
23 | eend $? | ||
24 | } | ||
diff --git a/main/nfs-utils/rpc.idmapd.initd b/main/nfs-utils/rpc.idmapd.initd new file mode 100644 index 0000000000..52838b5da7 --- /dev/null +++ b/main/nfs-utils/rpc.idmapd.initd | |||
@@ -0,0 +1,26 @@ | |||
1 | #!/sbin/runscript | ||
2 | # Copyright 1999-2008 Gentoo Foundation | ||
3 | # Distributed under the terms of the GNU General Public License v2 | ||
4 | # $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.idmapd.initd,v 1.8 2009/03/14 18:43:18 vapier Exp $ | ||
5 | |||
6 | [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs | ||
7 | |||
8 | rpc_bin=/usr/sbin/rpc.idmapd | ||
9 | |||
10 | depend() { | ||
11 | use ypbind net | ||
12 | need portmap rpc.pipefs | ||
13 | after quota | ||
14 | } | ||
15 | |||
16 | start() { | ||
17 | ebegin "Starting idmapd" | ||
18 | ${rpc_bin} ${OPTS_RPC_IDMAPD} | ||
19 | eend $? "make sure DNOTIFY support is enabled ..." | ||
20 | } | ||
21 | |||
22 | stop() { | ||
23 | ebegin "Stopping idmapd" | ||
24 | start-stop-daemon --stop --exec ${rpc_bin} | ||
25 | eend $? | ||
26 | } | ||
diff --git a/main/nfs-utils/rpc.pipefs.initd b/main/nfs-utils/rpc.pipefs.initd new file mode 100644 index 0000000000..701ac77892 --- /dev/null +++ b/main/nfs-utils/rpc.pipefs.initd | |||
@@ -0,0 +1,24 @@ | |||
1 | #!/sbin/runscript | ||
2 | # Copyright 1999-2008 Gentoo Foundation | ||
3 | # Distributed under the terms of the GNU General Public License v2 | ||
4 | # $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.pipefs.initd,v 1.1 2008/10/26 09:02:47 vapier Exp $ | ||
5 | |||
6 | mount_pipefs() { | ||
7 | # if rpc_pipefs is not available, try to load sunrpc for it #219566 | ||
8 | grep -qs rpc_pipefs /proc/filesystems || modprobe -q sunrpc | ||
9 | # if still not available, let's bail | ||
10 | grep -qs rpc_pipefs /proc/filesystems || return 1 | ||
11 | |||
12 | # now just do it for kicks | ||
13 | mkdir -p /var/lib/nfs/rpc_pipefs | ||
14 | mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs | ||
15 | } | ||
16 | |||
17 | start() { | ||
18 | # if things are already mounted, let's just return | ||
19 | grep -qs "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts && return 0 | ||
20 | |||
21 | ebegin "Mounting RPC pipefs" | ||
22 | mount_pipefs | ||
23 | eend $? | ||
24 | } | ||
diff --git a/main/nfs-utils/rpc.statd.initd b/main/nfs-utils/rpc.statd.initd new file mode 100644 index 0000000000..b19e5a3881 --- /dev/null +++ b/main/nfs-utils/rpc.statd.initd | |||
@@ -0,0 +1,33 @@ | |||
1 | #!/sbin/runscript | ||
2 | # Copyright 1999-2009 Gentoo Foundation | ||
3 | # Distributed under the terms of the GNU General Public License v2 | ||
4 | # $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v 1.7 2009/01/31 22:16:11 vapier Exp $ | ||
5 | |||
6 | [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs | ||
7 | |||
8 | rpc_bin=/usr/sbin/rpc.statd | ||
9 | rpc_pid=/var/run/rpc.statd.pid | ||
10 | |||
11 | depend() { | ||
12 | use ypbind net | ||
13 | need portmap | ||
14 | after quota | ||
15 | } | ||
16 | |||
17 | start() { | ||
18 | # Don't start rpc.statd if already started by someone else ... | ||
19 | # Don't try and kill it if it's already dead ... | ||
20 | if killall -q -0 ${rpc_bin} ; then | ||
21 | return 0 | ||
22 | fi | ||
23 | |||
24 | ebegin "Starting NFS statd" | ||
25 | start-stop-daemon --start --exec ${rpc_bin} -- --no-notify ${OPTS_RPC_STATD} | ||
26 | eend $? | ||
27 | } | ||
28 | |||
29 | stop() { | ||
30 | ebegin "Stopping NFS statd" | ||
31 | start-stop-daemon --stop --exec ${rpc_bin} --pidfile /var/run/rpc.statd.pid | ||
32 | eend $? | ||
33 | } | ||
diff --git a/main/nfs-utils/rpc.svcgssd.initd b/main/nfs-utils/rpc.svcgssd.initd new file mode 100644 index 0000000000..74383e24db --- /dev/null +++ b/main/nfs-utils/rpc.svcgssd.initd | |||
@@ -0,0 +1,24 @@ | |||
1 | #!/sbin/runscript | ||
2 | # Copyright 1999-2008 Gentoo Foundation | ||
3 | # Distributed under the terms of the GNU General Public License v2 | ||
4 | # $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.svcgssd.initd,v 1.5 2008/10/26 09:02:47 vapier Exp $ | ||
5 | |||
6 | [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs | ||
7 | |||
8 | depend() { | ||
9 | use ypbind net | ||
10 | need portmap rpc.pipefs | ||
11 | after quota | ||
12 | } | ||
13 | |||
14 | start() { | ||
15 | ebegin "Starting svcgssd" | ||
16 | start-stop-daemon --start --exec /usr/sbin/rpc.svcgssd -- ${OPTS_RPC_SVCGSSD} | ||
17 | eend $? | ||
18 | } | ||
19 | |||
20 | stop() { | ||
21 | ebegin "Stopping svcgssd" | ||
22 | start-stop-daemon --stop --exec /usr/sbin/rpc.svcgssd | ||
23 | eend $? | ||
24 | } | ||
diff --git a/main/p7zip/APKBUILD b/main/p7zip/APKBUILD index 19ecadb2c5..bf29829f83 100644 --- a/main/p7zip/APKBUILD +++ b/main/p7zip/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=p7zip | 2 | pkgname=p7zip |
3 | pkgver=9.04 | 3 | pkgver=9.13 |
4 | pkgrel=2 | 4 | pkgrel=0 |
5 | pkgdesc="A command-line port of the 7zip compression utility" | 5 | pkgdesc="A command-line port of the 7zip compression utility" |
6 | url="http://p7zip.sourceforge.net" | 6 | url="http://p7zip.sourceforge.net" |
7 | license="GPL" | 7 | license="GPL" |
@@ -30,5 +30,5 @@ package() { | |||
30 | # install -m755 -D contrib/VirtualFileSystemForMidnightCommander/u7z "$pkgdir"/usr/share/mc/extfs/u7z | 30 | # install -m755 -D contrib/VirtualFileSystemForMidnightCommander/u7z "$pkgdir"/usr/share/mc/extfs/u7z |
31 | } | 31 | } |
32 | 32 | ||
33 | md5sums="9194ebf9a2b3735d236aed001de5f6f8 p7zip_9.04_src_all.tar.bz2 | 33 | md5sums="8ddb5053db3b1f2696407d01be145779 p7zip_9.13_src_all.tar.bz2 |
34 | 8e8f415267bb5db179e4a8ed75985244 p7zip-cc-cxx.patch" | 34 | 8e8f415267bb5db179e4a8ed75985244 p7zip-cc-cxx.patch" |
diff --git a/main/pcre/APKBUILD b/main/pcre/APKBUILD index c091226e11..6c5bb028ae 100644 --- a/main/pcre/APKBUILD +++ b/main/pcre/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=pcre | 2 | pkgname=pcre |
3 | pkgver=8.02 | 3 | pkgver=8.10 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="Perl-compatible regular expression library" | 5 | pkgdesc="Perl-compatible regular expression library" |
6 | url="http://pcre.sourceforge.net" | 6 | url="http://pcre.sourceforge.net" |
7 | license="BSD" | 7 | license="BSD" |
@@ -27,4 +27,4 @@ package() { | |||
27 | make DESTDIR="$pkgdir" install || return 1 | 27 | make DESTDIR="$pkgdir" install || return 1 |
28 | } | 28 | } |
29 | 29 | ||
30 | md5sums="27948c1b5f5c1eabc23cba1ebe4c316f pcre-8.02.tar.bz2" | 30 | md5sums="780867a700e9d4e4b9cb47aa5453e4b2 pcre-8.10.tar.bz2" |
diff --git a/main/php/APKBUILD b/main/php/APKBUILD index 7078294843..f933f01bd4 100644 --- a/main/php/APKBUILD +++ b/main/php/APKBUILD | |||
@@ -3,7 +3,7 @@ | |||
3 | pkgname=php | 3 | pkgname=php |
4 | pkgver=5.3.2 | 4 | pkgver=5.3.2 |
5 | _suhosinver=${pkgver}-0.9.9.1 | 5 | _suhosinver=${pkgver}-0.9.9.1 |
6 | pkgrel=7 | 6 | pkgrel=8 |
7 | pkgdesc="The PHP language runtime engine" | 7 | pkgdesc="The PHP language runtime engine" |
8 | url="http://www.php.net/" | 8 | url="http://www.php.net/" |
9 | license="PHP-3" | 9 | license="PHP-3" |
@@ -65,6 +65,7 @@ source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2 | |||
65 | http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz | 65 | http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz |
66 | php-install-pear-xml.patch | 66 | php-install-pear-xml.patch |
67 | zend_execute_API.c.patch | 67 | zend_execute_API.c.patch |
68 | CVE-2010-2225.patch | ||
68 | " | 69 | " |
69 | 70 | ||
70 | _extdir="/usr/lib/php/20090626" | 71 | _extdir="/usr/lib/php/20090626" |
@@ -75,6 +76,8 @@ build() { | |||
75 | # beat the pear installer into using xml.so | 76 | # beat the pear installer into using xml.so |
76 | patch -p1 -i "$srcdir"/php-install-pear-xml.patch || return 1 | 77 | patch -p1 -i "$srcdir"/php-install-pear-xml.patch || return 1 |
77 | 78 | ||
79 | patch -p0 -i "$srcdir"/CVE-2010-2225.patch || return 1 | ||
80 | |||
78 | # apply suhosin patch | 81 | # apply suhosin patch |
79 | gunzip -c ${srcdir}/suhosin-patch-${_suhosinver}.patch.gz \ | 82 | gunzip -c ${srcdir}/suhosin-patch-${_suhosinver}.patch.gz \ |
80 | | patch -p1 || return 1 | 83 | | patch -p1 || return 1 |
@@ -259,4 +262,5 @@ dev() { | |||
259 | md5sums="46f500816125202c48a458d0133254a4 php-5.3.2.tar.bz2 | 262 | md5sums="46f500816125202c48a458d0133254a4 php-5.3.2.tar.bz2 |
260 | 4647b05330862d6a1fc4469245cc6ade suhosin-patch-5.3.2-0.9.9.1.patch.gz | 263 | 4647b05330862d6a1fc4469245cc6ade suhosin-patch-5.3.2-0.9.9.1.patch.gz |
261 | 5111e3be06d391f8772587c675240fab php-install-pear-xml.patch | 264 | 5111e3be06d391f8772587c675240fab php-install-pear-xml.patch |
262 | 55f9d24316a57e0c0f6b4b84791a1a17 zend_execute_API.c.patch" | 265 | 55f9d24316a57e0c0f6b4b84791a1a17 zend_execute_API.c.patch |
266 | 373a2705d03a13b77b590026b0ae47aa CVE-2010-2225.patch" | ||
diff --git a/main/php/CVE-2010-2225.patch b/main/php/CVE-2010-2225.patch new file mode 100644 index 0000000000..08c71f26b0 --- /dev/null +++ b/main/php/CVE-2010-2225.patch | |||
@@ -0,0 +1,194 @@ | |||
1 | Index: ext/spl/tests/SplObjectStorage_unserialize_nested.phpt | ||
2 | =================================================================== | ||
3 | --- ext/spl/tests/SplObjectStorage_unserialize_nested.phpt (revision 0) | ||
4 | +++ ext/spl/tests/SplObjectStorage_unserialize_nested.phpt (revision 300843) | ||
5 | @@ -0,0 +1,47 @@ | ||
6 | +--TEST-- | ||
7 | +SPL: Test unserializing tested & linked storage | ||
8 | +--FILE-- | ||
9 | +<?php | ||
10 | +$o = new StdClass(); | ||
11 | +$a = new StdClass(); | ||
12 | + | ||
13 | +$o->a = $a; | ||
14 | + | ||
15 | +$so = new SplObjectStorage(); | ||
16 | + | ||
17 | +$so[$o] = 1; | ||
18 | +$so[$a] = 2; | ||
19 | + | ||
20 | +$s = serialize($so); | ||
21 | +echo $s."\n"; | ||
22 | + | ||
23 | +$so1 = unserialize($s); | ||
24 | +var_dump($so1); | ||
25 | + | ||
26 | +--EXPECTF-- | ||
27 | +C:16:"SplObjectStorage":76:{x:i:2;O:8:"stdClass":1:{s:1:"a";O:8:"stdClass":0:{}},i:1;;r:2;,i:2;;m:a:0:{}} | ||
28 | +object(SplObjectStorage)#4 (1) { | ||
29 | + ["storage":"SplObjectStorage":private]=> | ||
30 | + array(2) { | ||
31 | + ["%s"]=> | ||
32 | + array(2) { | ||
33 | + ["obj"]=> | ||
34 | + object(stdClass)#5 (1) { | ||
35 | + ["a"]=> | ||
36 | + object(stdClass)#6 (0) { | ||
37 | + } | ||
38 | + } | ||
39 | + ["inf"]=> | ||
40 | + int(1) | ||
41 | + } | ||
42 | + ["%s"]=> | ||
43 | + array(2) { | ||
44 | + ["obj"]=> | ||
45 | + object(stdClass)#6 (0) { | ||
46 | + } | ||
47 | + ["inf"]=> | ||
48 | + int(2) | ||
49 | + } | ||
50 | + } | ||
51 | +} | ||
52 | + | ||
53 | Index: ext/spl/tests/SplObjectStorage_unserialize_bad.phpt | ||
54 | =================================================================== | ||
55 | --- ext/spl/tests/SplObjectStorage_unserialize_bad.phpt (revision 0) | ||
56 | +++ ext/spl/tests/SplObjectStorage_unserialize_bad.phpt (revision 300843) | ||
57 | @@ -0,0 +1,45 @@ | ||
58 | +--TEST-- | ||
59 | +SPL: Test that serialized blob contains unique elements (CVE-2010-2225) | ||
60 | +--FILE-- | ||
61 | +<?php | ||
62 | + | ||
63 | +$badblobs = array( | ||
64 | +'x:i:2;i:0;,i:1;;i:0;,i:2;;m:a:0:{}', | ||
65 | +'x:i:3;O:8:"stdClass":0:{},O:8:"stdClass":0:{};R:1;,i:1;;O:8:"stdClass":0:{},r:2;;m:a:0:{}', | ||
66 | +'x:i:3;O:8:"stdClass":0:{},O:8:"stdClass":0:{};r:1;,i:1;;O:8:"stdClass":0:{},r:2;;m:a:0:{}', | ||
67 | +); | ||
68 | +foreach($badblobs as $blob) { | ||
69 | +try { | ||
70 | + $so = new SplObjectStorage(); | ||
71 | + $so->unserialize($blob); | ||
72 | + var_dump($so); | ||
73 | +} catch(UnexpectedValueException $e) { | ||
74 | + echo $e->getMessage()."\n"; | ||
75 | +} | ||
76 | +} | ||
77 | +--EXPECTF-- | ||
78 | +Error at offset 6 of 34 bytes | ||
79 | +Error at offset 46 of 89 bytes | ||
80 | +object(SplObjectStorage)#2 (1) { | ||
81 | + ["storage":"SplObjectStorage":private]=> | ||
82 | + array(2) { | ||
83 | + ["%s"]=> | ||
84 | + array(2) { | ||
85 | + ["obj"]=> | ||
86 | + object(stdClass)#3 (0) { | ||
87 | + } | ||
88 | + ["inf"]=> | ||
89 | + int(1) | ||
90 | + } | ||
91 | + ["%s"]=> | ||
92 | + array(2) { | ||
93 | + ["obj"]=> | ||
94 | + object(stdClass)#1 (0) { | ||
95 | + } | ||
96 | + ["inf"]=> | ||
97 | + object(stdClass)#4 (0) { | ||
98 | + } | ||
99 | + } | ||
100 | + } | ||
101 | +} | ||
102 | + | ||
103 | Index: ext/spl/spl_observer.c | ||
104 | =================================================================== | ||
105 | --- ext/spl/spl_observer.c (revision 300842) | ||
106 | +++ ext/spl/spl_observer.c (revision 300843) | ||
107 | @@ -115,6 +115,7 @@ | ||
108 | zval_ptr_dtor(&element->inf); | ||
109 | } /* }}} */ | ||
110 | |||
111 | + | ||
112 | spl_SplObjectStorageElement* spl_object_storage_get(spl_SplObjectStorage *intern, zval *obj TSRMLS_DC) /* {{{ */ | ||
113 | { | ||
114 | spl_SplObjectStorageElement *element; | ||
115 | @@ -632,15 +633,24 @@ | ||
116 | zval_ptr_dtor(&pcount); | ||
117 | |||
118 | while(count-- > 0) { | ||
119 | + spl_SplObjectStorageElement *pelement; | ||
120 | + | ||
121 | if (*p != ';') { | ||
122 | goto outexcept; | ||
123 | } | ||
124 | ++p; | ||
125 | + if(*p != 'O' && *p != 'C' && *p != 'r') { | ||
126 | + goto outexcept; | ||
127 | + } | ||
128 | ALLOC_INIT_ZVAL(pentry); | ||
129 | if (!php_var_unserialize(&pentry, &p, s + buf_len, &var_hash TSRMLS_CC)) { | ||
130 | zval_ptr_dtor(&pentry); | ||
131 | goto outexcept; | ||
132 | } | ||
133 | + if(Z_TYPE_P(pentry) != IS_OBJECT) { | ||
134 | + zval_ptr_dtor(&pentry); | ||
135 | + goto outexcept; | ||
136 | + } | ||
137 | ALLOC_INIT_ZVAL(pinf); | ||
138 | if (*p == ',') { /* new version has inf */ | ||
139 | ++p; | ||
140 | @@ -649,6 +659,16 @@ | ||
141 | goto outexcept; | ||
142 | } | ||
143 | } | ||
144 | + | ||
145 | + pelement = spl_object_storage_get(intern, pentry TSRMLS_CC); | ||
146 | + if(pelement) { | ||
147 | + if(pelement->inf) { | ||
148 | + var_push_dtor(&var_hash, &pelement->inf); | ||
149 | + } | ||
150 | + if(pelement->obj) { | ||
151 | + var_push_dtor(&var_hash, &pelement->obj); | ||
152 | + } | ||
153 | + } | ||
154 | spl_object_storage_attach(intern, pentry, pinf TSRMLS_CC); | ||
155 | zval_ptr_dtor(&pentry); | ||
156 | zval_ptr_dtor(&pinf); | ||
157 | Index: ext/standard/var_unserializer.c | ||
158 | =================================================================== | ||
159 | --- ext/standard/var_unserializer.c (revision 300842) | ||
160 | +++ ext/standard/var_unserializer.c (revision 300843) | ||
161 | @@ -56,7 +56,7 @@ | ||
162 | var_hash->data[var_hash->used_slots++] = *rval; | ||
163 | } | ||
164 | |||
165 | -static inline void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval) | ||
166 | +PHPAPI void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval) | ||
167 | { | ||
168 | var_entries *var_hash = var_hashx->first_dtor, *prev = NULL; | ||
169 | |||
170 | Index: ext/standard/php_var.h | ||
171 | =================================================================== | ||
172 | --- ext/standard/php_var.h (revision 300842) | ||
173 | +++ ext/standard/php_var.h (revision 300843) | ||
174 | @@ -60,6 +60,7 @@ | ||
175 | var_destroy(&(var_hash)) | ||
176 | |||
177 | PHPAPI void var_replace(php_unserialize_data_t *var_hash, zval *ozval, zval **nzval); | ||
178 | +PHPAPI void var_push_dtor(php_unserialize_data_t *var_hash, zval **val); | ||
179 | PHPAPI void var_destroy(php_unserialize_data_t *var_hash); | ||
180 | |||
181 | #define PHP_VAR_UNSERIALIZE_ZVAL_CHANGED(var_hash, ozval, nzval) \ | ||
182 | Index: ext/standard/var_unserializer.re | ||
183 | =================================================================== | ||
184 | --- ext/standard/var_unserializer.re (revision 300842) | ||
185 | +++ ext/standard/var_unserializer.re (revision 300843) | ||
186 | @@ -54,7 +54,7 @@ | ||
187 | var_hash->data[var_hash->used_slots++] = *rval; | ||
188 | } | ||
189 | |||
190 | -static inline void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval) | ||
191 | +PHPAPI void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval) | ||
192 | { | ||
193 | var_entries *var_hash = var_hashx->first_dtor, *prev = NULL; | ||
194 | |||
diff --git a/main/postfix/APKBUILD b/main/postfix/APKBUILD index a2213c269d..1bd86bb1ee 100644 --- a/main/postfix/APKBUILD +++ b/main/postfix/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=postfix | 2 | pkgname=postfix |
3 | pkgver=2.7.0 | 3 | pkgver=2.7.1 |
4 | pkgrel=0 | 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/" |
@@ -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.7.0-dynamic-maps.patch | 15 | postfix-2.7.1-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="df648f59421604e895cce56325f00bae postfix-2.7.0.tar.gz | 148 | md5sums="b7a5c3ccd309156a65d6f8d2683d4fa1 postfix-2.7.1.tar.gz |
149 | 6bbabcd041aefaf40e1f3ee1fc1d6d7e postfix.initd | 149 | 6bbabcd041aefaf40e1f3ee1fc1d6d7e postfix.initd |
150 | 4d9c373e8a35bfb5bfa9b899e64fb70a postfix-2.7.0-dynamic-maps.patch | 150 | 8f3ca3a512357d03fdb7abd9d39f4596 postfix-2.7.1-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.7.0-dynamic-maps.patch b/main/postfix/postfix-2.7.1-dynamic-maps.patch index da1c799bec..bfc19a1524 100644 --- a/main/postfix/postfix-2.7.0-dynamic-maps.patch +++ b/main/postfix/postfix-2.7.1-dynamic-maps.patch | |||
@@ -1,8 +1,8 @@ | |||
1 | commit 98599e6387147a26d8433e85a4a61ef5c4240e83 | 1 | commit a6b79e8091c5e75d5d0a6b45b6652f0378583686 |
2 | Author: Natanael Copa <ncopa@alpinelinux.org> | 2 | Author: Natanael Copa <ncopa@alpinelinux.org> |
3 | Date: Mon May 31 14:49:38 2010 +0000 | 3 | Date: Tue Jul 6 08:16:25 2010 +0000 |
4 | 4 | ||
5 | added dynamic maps | 5 | patch for dynamic maps |
6 | 6 | ||
7 | diff --git a/conf/postfix-files b/conf/postfix-files | 7 | diff --git a/conf/postfix-files b/conf/postfix-files |
8 | index 7ff93ea..7cae109 100644 | 8 | index 7ff93ea..7cae109 100644 |
@@ -577,7 +577,7 @@ index 9829d28..d7dc53c 100644 | |||
577 | #define dict_get(dp, key) ((const char *) (dp)->lookup((dp), (key))) | 577 | #define dict_get(dp, key) ((const char *) (dp)->lookup((dp), (key))) |
578 | #define dict_put(dp, key, val) (dp)->update((dp), (key), (val)) | 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 | 579 | diff --git a/src/util/dict_db.c b/src/util/dict_db.c |
580 | index e4b301d..8dc9c9d 100644 | 580 | index 9e82f9b..93264e6 100644 |
581 | --- a/src/util/dict_db.c | 581 | --- a/src/util/dict_db.c |
582 | +++ b/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, | 583 | @@ -675,6 +675,12 @@ static DICT *dict_db_open(const char *class, const char *path, int open_flags, |
@@ -590,7 +590,7 @@ index e4b301d..8dc9c9d 100644 | |||
590 | + if ((errno = db->upgrade(db,db_path,0)) != 0) | 590 | + if ((errno = db->upgrade(db,db_path,0)) != 0) |
591 | + msg_fatal("upgrade of database %s: %m",db_path); | 591 | + msg_fatal("upgrade of database %s: %m",db_path); |
592 | + } | 592 | + } |
593 | #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) | 593 | #if DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) |
594 | if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 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); | 595 | msg_fatal("open database %s: %m", db_path); |
596 | diff --git a/src/util/dict_dbm.c b/src/util/dict_dbm.c | 596 | diff --git a/src/util/dict_dbm.c b/src/util/dict_dbm.c |
diff --git a/main/rpcbind/0001-uclibc-nss.patch b/main/rpcbind/0001-uclibc-nss.patch new file mode 100644 index 0000000000..3685c03b66 --- /dev/null +++ b/main/rpcbind/0001-uclibc-nss.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From b8f0d7b7318ba344c25785d6f5cf3f8de98012d4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Tue, 2 Feb 2010 09:36:03 +0000 | ||
4 | Subject: [PATCH 1/2] uclibc-nss | ||
5 | |||
6 | --- | ||
7 | src/rpcbind.c | 4 ++++ | ||
8 | 1 files changed, 4 insertions(+), 0 deletions(-) | ||
9 | |||
10 | diff --git a/src/rpcbind.c b/src/rpcbind.c | ||
11 | index 525ffba..1fe1a60 100644 | ||
12 | --- a/src/rpcbind.c | ||
13 | +++ b/src/rpcbind.c | ||
14 | @@ -67,7 +67,11 @@ | ||
15 | #include <pwd.h> | ||
16 | #include <string.h> | ||
17 | #include <errno.h> | ||
18 | +#if defined(__UCLIBC__) | ||
19 | +#define __nss_configure_lookup(x,y) | ||
20 | +#else | ||
21 | #include <nss.h> | ||
22 | +#endif | ||
23 | #include "config.h" | ||
24 | #include "rpcbind.h" | ||
25 | |||
26 | -- | ||
27 | 1.6.6.1 | ||
28 | |||
diff --git a/main/rpcbind/0002-uclibc-rpcsvc-defines.patch b/main/rpcbind/0002-uclibc-rpcsvc-defines.patch new file mode 100644 index 0000000000..e394966f5c --- /dev/null +++ b/main/rpcbind/0002-uclibc-rpcsvc-defines.patch | |||
@@ -0,0 +1,58 @@ | |||
1 | From 077add040c2e30d3ac507362f4afe350f47be027 Mon Sep 17 00:00:00 2001 | ||
2 | From: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Tue, 2 Feb 2010 09:47:57 +0000 | ||
4 | Subject: [PATCH 2/2] uclibc-rpcsvc-defines | ||
5 | |||
6 | --- | ||
7 | src/security.c | 28 ++++++++++++++++++++++++++++ | ||
8 | 1 files changed, 28 insertions(+), 0 deletions(-) | ||
9 | |||
10 | diff --git a/src/security.c b/src/security.c | ||
11 | index 0edeac6..e9fed55 100644 | ||
12 | --- a/src/security.c | ||
13 | +++ b/src/security.c | ||
14 | @@ -20,6 +20,32 @@ | ||
15 | /* | ||
16 | * XXX for special case checks in check_callit. | ||
17 | */ | ||
18 | +#if defined(__UCLIBC__) | ||
19 | + | ||
20 | +#define MOUNTPROC_MNT 1 | ||
21 | +#define MOUNTPROC_UMNT 3 | ||
22 | + | ||
23 | +#define NFS_PROGRAM 100003 | ||
24 | +#define YPPROG 100004 | ||
25 | +#define MOUNTPROG 100005 | ||
26 | +#define YPBINDPROG 100007 | ||
27 | +#define YPPASSWDPROG 100009 | ||
28 | +#define RQUOTAPROG 100011 | ||
29 | + | ||
30 | +#define YPPROC_NULL 0 | ||
31 | +#define YPPROC_DOMAIN 1 | ||
32 | +#define YPPROC_DOMAIN_NONACK 2 | ||
33 | +#define YPPROC_MATCH 3 | ||
34 | +#define YPPROC_FIRST 4 | ||
35 | +#define YPPROC_NEXT 5 | ||
36 | +#define YPPROC_XFR 6 | ||
37 | +#define YPPROC_CLEAR 7 | ||
38 | +#define YPPROC_ALL 8 | ||
39 | + | ||
40 | +#define YPBINDPROC_SETDOM 2 | ||
41 | + | ||
42 | +#else | ||
43 | + | ||
44 | #include <rpcsvc/mount.h> | ||
45 | #include <rpcsvc/rquota.h> | ||
46 | #include <rpcsvc/nfs_prot.h> | ||
47 | @@ -27,6 +53,8 @@ | ||
48 | #include <rpcsvc/ypclnt.h> | ||
49 | #include <rpcsvc/yppasswd.h> | ||
50 | |||
51 | +#endif | ||
52 | + | ||
53 | #include "rpcbind.h" | ||
54 | |||
55 | #ifdef LIBWRAP | ||
56 | -- | ||
57 | 1.6.6.1 | ||
58 | |||
diff --git a/main/rpcbind/APKBUILD b/main/rpcbind/APKBUILD new file mode 100644 index 0000000000..3574ffece0 --- /dev/null +++ b/main/rpcbind/APKBUILD | |||
@@ -0,0 +1,42 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
2 | pkgname=rpcbind | ||
3 | pkgver=0.2.0 | ||
4 | pkgrel=0 | ||
5 | pkgdesc="portmap replacement which supports RPC over various protocols" | ||
6 | url="http://rpcbind.sourceforge.net" | ||
7 | license="custom" | ||
8 | depends= | ||
9 | makedepends="libtirpc-dev" | ||
10 | subpackages="$pkgname-doc" | ||
11 | source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 | ||
12 | 0001-uclibc-nss.patch | ||
13 | 0002-uclibc-rpcsvc-defines.patch | ||
14 | rpcbind.initd | ||
15 | rpcbind.confd" | ||
16 | |||
17 | _builddir="$srcdir"/$pkgname-$pkgver | ||
18 | prepare() { | ||
19 | cd "$_builddir" | ||
20 | for i in "$srcdir"/*.patch; do | ||
21 | patch -p1 -i "$i" || return 1 | ||
22 | done | ||
23 | } | ||
24 | |||
25 | build() { | ||
26 | cd "$_builddir" | ||
27 | ./configure --prefix=/usr --bindir=/sbin | ||
28 | make || return 1 | ||
29 | } | ||
30 | |||
31 | package() { | ||
32 | cd "$_builddir" | ||
33 | make DESTDIR="$pkgdir" install || return 1 | ||
34 | install -Dm755 "$srcdir"/rpcbind.initd "$pkgdir"/etc/init.d/rpcbind | ||
35 | install -Dm644 "$srcdir"/rpcbind.confd "$pkgdir"/etc/conf.d/rpcbind | ||
36 | install -D -m644 COPYING "$pkgdir"/usr/share/licenses/rpcbind/COPYING | ||
37 | } | ||
38 | md5sums="1a77ddb1aaea8099ab19c351eeb26316 rpcbind-0.2.0.tar.bz2 | ||
39 | 6d9718d8bdab633ef7cf83225aaed367 0001-uclibc-nss.patch | ||
40 | 944234c5ef6902d25bd6dfc95f979ed6 0002-uclibc-rpcsvc-defines.patch | ||
41 | 381a2722c69b4597af532381f1ffeae0 rpcbind.initd | ||
42 | 1ad5c8dcf432c8f23ba740f4c32a7c60 rpcbind.confd" | ||
diff --git a/main/rpcbind/rpcbind.confd b/main/rpcbind/rpcbind.confd new file mode 100644 index 0000000000..ddc09172d1 --- /dev/null +++ b/main/rpcbind/rpcbind.confd | |||
@@ -0,0 +1,4 @@ | |||
1 | # /etc/conf.d/rpcbind | ||
2 | |||
3 | # Options for `rpcbind`. | ||
4 | #RPCBIND_OPTS="-l" | ||
diff --git a/main/rpcbind/rpcbind.initd b/main/rpcbind/rpcbind.initd new file mode 100644 index 0000000000..897e8e5a88 --- /dev/null +++ b/main/rpcbind/rpcbind.initd | |||
@@ -0,0 +1,25 @@ | |||
1 | #!/sbin/runscript | ||
2 | # Copyright 1999-2007 Gentoo Foundation | ||
3 | # Distributed under the terms of the GNU General Public License v2 | ||
4 | # $Header: /var/cvsroot/gentoo-x86/net-nds/rpcbind/files/rpcbind.initd,v 1.1 2007/12/29 09:13:55 vapier Exp $ | ||
5 | |||
6 | depend() { | ||
7 | use net | ||
8 | before inetd xinetd | ||
9 | after firewall | ||
10 | provide portmap | ||
11 | } | ||
12 | |||
13 | start() { | ||
14 | ebegin "Starting rpcbind" | ||
15 | start-stop-daemon --start --quiet --exec /sbin/rpcbind \ | ||
16 | -- ${RPCBIND_OPTS} | ||
17 | eend $? | ||
18 | } | ||
19 | |||
20 | stop() { | ||
21 | ebegin "Stopping rpcbind" | ||
22 | start-stop-daemon --stop --quiet --exec /sbin/rpcbind | ||
23 | eend $? | ||
24 | } | ||
25 | |||
diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD index 22e516527f..0996fbefeb 100644 --- a/main/squid/APKBUILD +++ b/main/squid/APKBUILD | |||
@@ -1,9 +1,9 @@ | |||
1 | # Contributor: Carlo Landmeter <clandmeter@gmail.com> | 1 | # Contributor: Carlo Landmeter <clandmeter@gmail.com> |
2 | # Maintainer: Carlo Landmeter <clandmeter@gmail.com> | 2 | # Maintainer: Carlo Landmeter <clandmeter@gmail.com> |
3 | pkgname=squid | 3 | pkgname=squid |
4 | pkgver=2.7.7 | 4 | pkgver=2.7.9 |
5 | _ver=2.7.STABLE7 | 5 | _ver=2.7.STABLE9 |
6 | pkgrel=5 | 6 | pkgrel=0 |
7 | pkgdesc="A full-featured Web proxy cache server." | 7 | pkgdesc="A full-featured Web proxy cache server." |
8 | url="http://www.squid-cache.org" | 8 | url="http://www.squid-cache.org" |
9 | install="squid.pre-install squid.pre-upgrade squid.post-install" | 9 | install="squid.pre-install squid.pre-upgrade squid.post-install" |
@@ -78,6 +78,7 @@ build() { | |||
78 | --enable-digest-auth-helpers="password" \ | 78 | --enable-digest-auth-helpers="password" \ |
79 | --enable-storeio="aufs,ufs,diskd,coss,null" \ | 79 | --enable-storeio="aufs,ufs,diskd,coss,null" \ |
80 | --enable-basic-auth-helpers="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM,squid_radius_auth" \ | 80 | --enable-basic-auth-helpers="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM,squid_radius_auth" \ |
81 | --enable-epoll \ | ||
81 | --enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \ | 82 | --enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \ |
82 | --enable-ntlm-auth-helpers="SMB,fakeauth,no_check" \ | 83 | --enable-ntlm-auth-helpers="SMB,fakeauth,no_check" \ |
83 | --enable-negotiate-auth-helpers="squid_kerb_auth" \ | 84 | --enable-negotiate-auth-helpers="squid_kerb_auth" \ |
@@ -290,7 +291,7 @@ errors_ukrainian_utf8() { | |||
290 | } | 291 | } |
291 | 292 | ||
292 | 293 | ||
293 | md5sums="c18b0371fca813d5e7c7e0baf87baa22 squid-2.7.STABLE7.tar.bz2 | 294 | md5sums="3c6642c85470b1079207d43bba25a819 squid-2.7.STABLE9.tar.bz2 |
294 | 57fed05adc40acab6a5480ec7a014154 squid.initd | 295 | 57fed05adc40acab6a5480ec7a014154 squid.initd |
295 | 44b052db7910f386ef88ddcf69c9ba4e squid.confd | 296 | 44b052db7910f386ef88ddcf69c9ba4e squid.confd |
296 | 3827f71d940b47eb385a1a1d92a51d66 squid-2.7-gentoo.patch | 297 | 3827f71d940b47eb385a1a1d92a51d66 squid-2.7-gentoo.patch |
diff --git a/main/sudo/APKBUILD b/main/sudo/APKBUILD index 1beaa580e7..e3e2d93462 100644 --- a/main/sudo/APKBUILD +++ b/main/sudo/APKBUILD | |||
@@ -1,7 +1,11 @@ | |||
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_p7 | 3 | pkgver=1.7.3 |
4 | _realver=${pkgver%_*}${pkgver#*_} | 4 | if [ "${pkgver%_*}" != "$pkgver" ]; then |
5 | _realver=${pkgver%_*}${pkgver#*_} | ||
6 | else | ||
7 | _realver=$pkgver | ||
8 | fi | ||
5 | pkgrel=0 | 9 | pkgrel=0 |
6 | pkgdesc="Give certain users the ability to run some commands as root" | 10 | pkgdesc="Give certain users the ability to run some commands as root" |
7 | url="http://www.sudo.ws/sudo/" | 11 | url="http://www.sudo.ws/sudo/" |
@@ -27,4 +31,4 @@ package() { | |||
27 | make -j1 DESTDIR="$pkgdir" install || return 1 | 31 | make -j1 DESTDIR="$pkgdir" install || return 1 |
28 | } | 32 | } |
29 | 33 | ||
30 | md5sums="3ac78668427a53e12d7639fdfab2f1af sudo-1.7.2p7.tar.gz" | 34 | md5sums="c22115b47cb2591bceedb914b673f031 sudo-1.7.3.tar.gz" |
diff --git a/main/sylpheed/APKBUILD b/main/sylpheed/APKBUILD index 5d7dc146ad..ffc2d81e36 100644 --- a/main/sylpheed/APKBUILD +++ b/main/sylpheed/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=sylpheed | 2 | pkgname=sylpheed |
3 | pkgver=3.0.2 | 3 | pkgver=3.0.3 |
4 | pkgrel=2 | 4 | pkgrel=0 |
5 | pkgdesc="Lightweight and user-friendly e-mail client" | 5 | pkgdesc="Lightweight and user-friendly e-mail client" |
6 | url="http://sylpheed.sraoss.jp/en/" | 6 | url="http://sylpheed.sraoss.jp/en/" |
7 | license="GPL" | 7 | license="GPL" |
@@ -22,4 +22,4 @@ package() { | |||
22 | cd "$srcdir/sylpheed-$pkgver" | 22 | cd "$srcdir/sylpheed-$pkgver" |
23 | make DESTDIR="$pkgdir" install || return 1 | 23 | make DESTDIR="$pkgdir" install || return 1 |
24 | } | 24 | } |
25 | md5sums="2ee330c737b02418d8692bd193f8b176 sylpheed-3.0.2.tar.bz2" | 25 | md5sums="c69e5787868c7a8b5fe74cc24ffca189 sylpheed-3.0.3.tar.bz2" |
diff --git a/main/syslinux/APKBUILD b/main/syslinux/APKBUILD index bc55a97ec0..03c2018b68 100644 --- a/main/syslinux/APKBUILD +++ b/main/syslinux/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=syslinux | 2 | pkgname=syslinux |
3 | pkgver=4.00 | 3 | pkgver=4.01 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="a boot loader for the Linux operating system which operates off an MS-DOS/Windows FAT filesystem." | 5 | pkgdesc="a boot loader for the Linux operating system which operates off an MS-DOS/Windows FAT filesystem." |
6 | url="http://syslinux.org" | 6 | url="http://syslinux.org" |
@@ -27,4 +27,4 @@ package() { | |||
27 | make INSTALLROOT="$pkgdir" MANDIR=/usr/share/man local-install | 27 | make INSTALLROOT="$pkgdir" MANDIR=/usr/share/man local-install |
28 | } | 28 | } |
29 | 29 | ||
30 | md5sums="5a475dc9a37ecf7b0beec93eca474f5c syslinux-4.00.tar.bz2" | 30 | md5sums="fbc5b153928d0489e429c7ab4384b0d9 syslinux-4.01.tar.bz2" |
diff --git a/main/transmission/APKBUILD b/main/transmission/APKBUILD index 71ced6a53c..35b5807ff9 100644 --- a/main/transmission/APKBUILD +++ b/main/transmission/APKBUILD | |||
@@ -1,13 +1,14 @@ | |||
1 | # Maintainer:Carlo Landmeter | 1 | # Maintainer:Carlo Landmeter |
2 | pkgname=transmission | 2 | pkgname=transmission |
3 | pkgver=1.93 | 3 | pkgver=2.01 |
4 | pkgrel=0 | 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" |
8 | license="MIT" | 8 | license="MIT" |
9 | depends= | 9 | depends= |
10 | makedepends="openssl-dev pkgconfig curl-dev gtk+-dev intltool" | 10 | makedepends="openssl-dev pkgconfig curl-dev gtk+-dev intltool libevent-dev |
11 | libnotify-dev dbus-glib-dev" | ||
11 | source="http://download.m0k.org/transmission/files/transmission-$pkgver.tar.bz2 | 12 | source="http://download.m0k.org/transmission/files/transmission-$pkgver.tar.bz2 |
12 | transmission-daemon.initd | 13 | transmission-daemon.initd |
13 | transmission-daemon.confd | 14 | transmission-daemon.confd |
@@ -46,6 +47,6 @@ cli() { | |||
46 | "$subpkgdir"/usr/bin/ | 47 | "$subpkgdir"/usr/bin/ |
47 | } | 48 | } |
48 | 49 | ||
49 | md5sums="f68358d03e46bec5704bbaa894990152 transmission-1.93.tar.bz2 | 50 | md5sums="2e896b86fd55c3563ef85cd01a2141a3 transmission-2.01.tar.bz2 |
50 | f65b8ae46f8ac89b35844109b3aa0c18 transmission-daemon.initd | 51 | f65b8ae46f8ac89b35844109b3aa0c18 transmission-daemon.initd |
51 | 89478a70fcd93463e1dd8d751da994da transmission-daemon.confd" | 52 | 89478a70fcd93463e1dd8d751da994da transmission-daemon.confd" |
diff --git a/main/ttf-dejavu/APKBUILD b/main/ttf-dejavu/APKBUILD index a03d07ff57..4bd153a2d3 100644 --- a/main/ttf-dejavu/APKBUILD +++ b/main/ttf-dejavu/APKBUILD | |||
@@ -1,27 +1,24 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=ttf-dejavu | 2 | pkgname=ttf-dejavu |
3 | pkgver=2.29 | 3 | pkgver=2.31 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="Font family based on the Bitstream Vera Fonts with a wider range of characters" | 5 | pkgdesc="Font family based on the Bitstream Vera Fonts with a wider range of characters" |
6 | url="http://dejavu.sourceforge.net/" | 6 | url="http://dejavu.sourceforge.net/" |
7 | license="custom" | 7 | license="custom" |
8 | depends="fontconfig encodings mkfontdir mkfontscale" | 8 | depends="fontconfig encodings mkfontdir mkfontscale" |
9 | makedepends="" | ||
10 | makedepends="pkgconfig font-util-dev" | 9 | makedepends="pkgconfig font-util-dev" |
11 | install="ttf-dejavu.post-install ttf-dejavu.post-upgrade ttf-dejavu.post-deinstall" | 10 | install= |
12 | source="http://downloads.sourceforge.net/dejavu/dejavu-fonts-ttf-$pkgver.tar.bz2 | 11 | source="http://downloads.sourceforge.net/dejavu/dejavu-fonts-ttf-$pkgver.tar.bz2" |
13 | $install" | ||
14 | 12 | ||
13 | build() { | ||
14 | return 0 | ||
15 | } | ||
15 | 16 | ||
16 | build () | 17 | package() { |
17 | { | ||
18 | cd "$srcdir/dejavu-fonts-ttf-$pkgver" | 18 | cd "$srcdir/dejavu-fonts-ttf-$pkgver" |
19 | mkdir -p "$pkgdir/usr/share/fonts/TTF" || return 1 | 19 | mkdir -p "$pkgdir/usr/share/fonts/TTF" || return 1 |
20 | install -m644 ttf/*.ttf "$pkgdir/usr/share/fonts/TTF" || return 1 | 20 | install -m644 ttf/*.ttf "$pkgdir/usr/share/fonts/TTF" || return 1 |
21 | install -D -m644 LICENSE "$pkgdir/usr/share/licenses/ttf-dejavu/LICENSE" || return 1 | 21 | install -D -m644 LICENSE "$pkgdir/usr/share/licenses/ttf-dejavu/LICENSE" || return 1 |
22 | } | 22 | } |
23 | 23 | ||
24 | md5sums="d8feb7d57d8b7cbac409df435daa9849 dejavu-fonts-ttf-2.29.tar.bz2 | 24 | md5sums="a794a75d8c43c83f0226207cd3aaf666 dejavu-fonts-ttf-2.31.tar.bz2" |
25 | 856423a62dc28d29f91586286173b1ef ttf-dejavu.post-install | ||
26 | 856423a62dc28d29f91586286173b1ef ttf-dejavu.post-upgrade | ||
27 | 856423a62dc28d29f91586286173b1ef ttf-dejavu.post-deinstall" | ||
diff --git a/main/ttf-dejavu/ttf-dejavu.post-deinstall b/main/ttf-dejavu/ttf-dejavu.post-deinstall deleted file mode 120000 index 8d3da7cfdf..0000000000 --- a/main/ttf-dejavu/ttf-dejavu.post-deinstall +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | ttf-dejavu.post-install \ No newline at end of file | ||
diff --git a/main/ttf-dejavu/ttf-dejavu.post-install b/main/ttf-dejavu/ttf-dejavu.post-install deleted file mode 100644 index 90aedc0b1e..0000000000 --- a/main/ttf-dejavu/ttf-dejavu.post-install +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | fc-cache -fs | ||
4 | mkfontscale usr/share/fonts/TTF | ||
5 | mkfontdir usr/share/fonts/TTF | ||
6 | |||
diff --git a/main/ttf-dejavu/ttf-dejavu.post-upgrade b/main/ttf-dejavu/ttf-dejavu.post-upgrade deleted file mode 120000 index 8d3da7cfdf..0000000000 --- a/main/ttf-dejavu/ttf-dejavu.post-upgrade +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | ttf-dejavu.post-install \ No newline at end of file | ||
diff --git a/main/util-linux-ng/APKBUILD b/main/util-linux-ng/APKBUILD index 604d924432..035e911950 100644 --- a/main/util-linux-ng/APKBUILD +++ b/main/util-linux-ng/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Contributor: Leonardo Arena <rnalrd@gmail.com> | 1 | # Contributor: Leonardo Arena <rnalrd@gmail.com> |
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
3 | pkgname=util-linux-ng | 3 | pkgname=util-linux-ng |
4 | pkgver=2.17.2 | 4 | pkgver=2.18 |
5 | pkgrel=0 | 5 | pkgrel=0 |
6 | pkgdesc="Random collection of Linux utilities" | 6 | pkgdesc="Random collection of Linux utilities" |
7 | arch="" | 7 | arch="" |
@@ -11,7 +11,7 @@ depends= | |||
11 | # use GNU sed til bb sed is fixed | 11 | # use GNU sed til bb sed is fixed |
12 | makedepends="zlib-dev sed ncurses-dev" | 12 | makedepends="zlib-dev sed ncurses-dev" |
13 | install= | 13 | install= |
14 | source="http://www.kernel.org/pub/linux/utils/util-linux-ng/v2.17/$pkgname-$pkgver.tar.gz" | 14 | source="http://www.kernel.org/pub/linux/utils/util-linux-ng/v$pkgver/$pkgname-$pkgver.tar.gz" |
15 | subpackages="$pkgname-doc $pkgname-dev libuuid libblkid sfdisk cfdisk" | 15 | subpackages="$pkgname-doc $pkgname-dev libuuid libblkid sfdisk cfdisk" |
16 | replaces="e2fsprogs" | 16 | replaces="e2fsprogs" |
17 | 17 | ||
@@ -74,4 +74,4 @@ cfdisk() { | |||
74 | mv "$pkgdir"/sbin/cfdisk "$subpkgdir"/sbin/ | 74 | mv "$pkgdir"/sbin/cfdisk "$subpkgdir"/sbin/ |
75 | } | 75 | } |
76 | 76 | ||
77 | md5sums="4c810430e86d53b6ea5e7ae279b39186 util-linux-ng-2.17.2.tar.gz" | 77 | md5sums="aff22adfff1bf39cd3f13371b95a3d3a util-linux-ng-2.18.tar.gz" |
diff --git a/main/x264/APKBUILD b/main/x264/APKBUILD index 737ac4fe8f..b6d0a61289 100644 --- a/main/x264/APKBUILD +++ b/main/x264/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=x264 | 2 | pkgname=x264 |
3 | pkgver=20100410 | 3 | pkgver=20100607 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="free library for encoding H264/AVC video streams" | 5 | pkgdesc="free library for encoding H264/AVC video streams" |
6 | url="http://www.videolan.org/developers/x264.html" | 6 | url="http://www.videolan.org/developers/x264.html" |
@@ -26,4 +26,4 @@ package() { | |||
26 | cd "$_builddir" | 26 | cd "$_builddir" |
27 | make DESTDIR="$pkgdir" bindir=/usr/bin libdir=/usr/lib includedir=/usr/include install || return 1 | 27 | make DESTDIR="$pkgdir" bindir=/usr/bin libdir=/usr/lib includedir=/usr/include install || return 1 |
28 | } | 28 | } |
29 | md5sums="13195a516eece721dc743b1dd787a02f x264-snapshot-20100410-2245.tar.bz2" | 29 | md5sums="d796cbb3eb4ce5126b861aed64d0058e x264-snapshot-20100607-2245.tar.bz2" |
diff --git a/main/xfce4-appfinder/APKBUILD b/main/xfce4-appfinder/APKBUILD index 5787f36ed9..139c320e44 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.2 | 3 | pkgver=4.6.2 |
4 | pkgrel=0 | 4 | pkgrel=1 |
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" |
@@ -9,7 +9,7 @@ depends="hicolor-icon-theme" | |||
9 | makedepends="pkgconfig thunar-dev libxfce4menu-dev intltool gtk+-dev | 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= |
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 | build () { | 15 | build () { |
diff --git a/main/xfce4-appfinder/xfce4-appfinder.post-deinstall b/main/xfce4-appfinder/xfce4-appfinder.post-deinstall deleted file mode 120000 index 18abfee4f8..0000000000 --- a/main/xfce4-appfinder/xfce4-appfinder.post-deinstall +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | xfce4-appfinder.post-install \ No newline at end of file | ||
diff --git a/main/xfce4-appfinder/xfce4-appfinder.post-install b/main/xfce4-appfinder/xfce4-appfinder.post-install deleted file mode 100644 index c523d78da0..0000000000 --- a/main/xfce4-appfinder/xfce4-appfinder.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-appfinder/xfce4-appfinder.post-upgrade b/main/xfce4-appfinder/xfce4-appfinder.post-upgrade deleted file mode 120000 index 18abfee4f8..0000000000 --- a/main/xfce4-appfinder/xfce4-appfinder.post-upgrade +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | xfce4-appfinder.post-install \ No newline at end of file | ||
diff --git a/main/xfce4/APKBUILD b/main/xfce4/APKBUILD index 97db75c18c..c5d191df53 100644 --- a/main/xfce4/APKBUILD +++ b/main/xfce4/APKBUILD | |||
@@ -1,14 +1,33 @@ | |||
1 | # Contributor: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Contributor: Natanael Copa <ncopa@alpinelinux.org> |
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
3 | pkgname=xfce4 | 3 | pkgname=xfce4 |
4 | pkgver=4.6 | 4 | pkgver=4.6.2 |
5 | pkgrel=1 | 5 | pkgrel=0 |
6 | pkgdesc="XFCE 4 meta package" | 6 | pkgdesc="XFCE 4 meta package" |
7 | url="http://www.xfce.org" | 7 | url="http://www.xfce.org" |
8 | license="GPL" | 8 | license="GPL" |
9 | depends="thunar xfce-utils xfce4-panel xfce4-session orage terminal mousepad | 9 | depends=" |
10 | xfce4-settings xfdesktop xfwm4 xfce4-mixer xfce4-appfinder | 10 | exo>=0.3.107 |
11 | tango-icon-theme ttf-dejavu gtk-xfce-engine" | 11 | gtk-xfce-engine>=2.6.0 |
12 | libxfce4menu>=4.6.2 | ||
13 | libxfce4util>=4.6.2 | ||
14 | libxfcegui4>=4.6.4 | ||
15 | mousepad | ||
16 | orage | ||
17 | tango-icon-theme | ||
18 | terminal | ||
19 | thunar>=1.0.2 | ||
20 | ttf-dejavu | ||
21 | xfce-utils>=4.6.2 | ||
22 | xfce4-appfinder>=4.6.2 | ||
23 | xfce4-mixer | ||
24 | xfce4-panel>=4.6.4 | ||
25 | xfce4-session>=4.6.2 | ||
26 | xfce4-settings>=4.6.5 | ||
27 | xfconf>=4.6.2 | ||
28 | xfdesktop>=4.6.2 | ||
29 | xfwm4>=4.6.2 | ||
30 | " | ||
12 | 31 | ||
13 | makedepends= | 32 | makedepends= |
14 | install= | 33 | install= |
diff --git a/testing/atomic-ops/APKBUILD b/testing/atomic-ops/APKBUILD deleted file mode 100644 index 7c9dc2cf2f..0000000000 --- a/testing/atomic-ops/APKBUILD +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | # Contributor: Natanael Copa <ncopa@alpinelinux.org> | ||
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | pkgname=atomic-ops | ||
4 | _ver=7.2 | ||
5 | _suff=alpha4 | ||
6 | pkgver=${_ver}_${_suff} | ||
7 | _realver=${_ver}${_suff} | ||
8 | pkgrel=0 | ||
9 | pkgdesc="A library for atomic operations" | ||
10 | url="http://www.hpl.hp.com/research/linux/atomic_ops/download.php4" | ||
11 | license="GPL" | ||
12 | depends="" | ||
13 | makedepends="" | ||
14 | install= | ||
15 | subpackages= | ||
16 | source="http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-$_realver.tar.gz" | ||
17 | |||
18 | _builddir="$srcdir"/libatomic_ops-${_realver} | ||
19 | build() { | ||
20 | cd "$_builddir" | ||
21 | chmod +x install-sh | ||
22 | ./configure --prefix=/usr \ | ||
23 | --sysconfdir=/etc \ | ||
24 | --mandir=/usr/share/man \ | ||
25 | --infodir=/usr/share/info | ||
26 | make || return 1 | ||
27 | } | ||
28 | |||
29 | package() { | ||
30 | cd "$_builddir" | ||
31 | make DESTDIR="$pkgdir" install | ||
32 | } | ||
33 | |||
34 | md5sums="e82723a24fd846fe37bd6a03728776e1 libatomic_ops-7.2alpha4.tar.gz" | ||
diff --git a/testing/ircii/APKBUILD b/testing/ircii/APKBUILD deleted file mode 100644 index 1c16d509aa..0000000000 --- a/testing/ircii/APKBUILD +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | # Contributor: Michael Mason <ms13sp@gmail.com> | ||
2 | # Maintainer: Michael Mason <ms13sp@gmail.com> | ||
3 | pkgname=ircii | ||
4 | pkgver=20080314 | ||
5 | pkgrel=1 | ||
6 | pkgdesc="Universal IRC for Unix systems" | ||
7 | url="http://www.eterna.com.au/ircii/" | ||
8 | license="GPL" | ||
9 | depends= | ||
10 | makedepends= | ||
11 | install= | ||
12 | subpackages="$pkgname-doc $pkgname-dev" | ||
13 | source="ftp://ircii.warped.com/pub/ircII/ircii-20080314.tar.bz2" | ||
14 | |||
15 | build() { | ||
16 | cd "$srcdir/$pkgname-$pkgver" | ||
17 | |||
18 | ./configure --prefix=/usr \ | ||
19 | --sysconfdir=/etc \ | ||
20 | --mandir=/usr/share/man \ | ||
21 | --infodir=/usr/share/info | ||
22 | make || return 1 | ||
23 | } | ||
24 | |||
25 | package() { | ||
26 | cd "$srcdir/$pkgname-$pkgver" | ||
27 | make -j1 DESTDIR="$pkgdir" install | ||
28 | } | ||
29 | |||
30 | md5sums="da7fcf2a442bd25f303778eb6466eb19 ircii-20080314.tar.bz2" | ||
diff --git a/testing/kamailio/APKBUILD b/testing/kamailio/APKBUILD deleted file mode 100644 index db7af6dac5..0000000000 --- a/testing/kamailio/APKBUILD +++ /dev/null | |||
@@ -1,155 +0,0 @@ | |||
1 | # Contributor: Michael Mason <ms13sp@gmail.com> | ||
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | pkgname=kamailio | ||
4 | pkgver=3.0.2 | ||
5 | pkgrel=3 | ||
6 | pkgdesc="Open Source SIP Server" | ||
7 | url="http://www.kamailio.org/" | ||
8 | pkgusers="kamailio" | ||
9 | pkggroups="kamailio" | ||
10 | license="GPL" | ||
11 | depends= | ||
12 | makedepends="bison flex expat-dev postgresql-dev pcre-dev | ||
13 | libxml2-dev curl-dev unixodbc-dev confuse-dev" | ||
14 | install= | ||
15 | subpackages="$pkgname-doc $pkgname-postgres $pkgname-presence | ||
16 | $pkgname-mediaproxy $pkgname-unixodbc" | ||
17 | source="http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src.tar.gz | ||
18 | kamailio.cfg | ||
19 | kamailio.initd | ||
20 | kamailio.pre-install | ||
21 | kamailio.post-install | ||
22 | kamailio-3-backslash.patch | ||
23 | " | ||
24 | |||
25 | _builddir="$srcdir"/$pkgname-$pkgver | ||
26 | # Makefile does not handle newline | ||
27 | _presence="presence presence_xml presence_mwi pua pua_bla pua_mi pua_usrloc pua_xmpp rls xcap_client presence_dialoginfo pua_dialoginfo" | ||
28 | |||
29 | _modules="db_postgres mediaproxy db_unixodbc carrierroute xmlrpc tm $_presence" | ||
30 | |||
31 | |||
32 | prepare() { | ||
33 | cd "$_builddir" | ||
34 | patch -p1 -i "$srcdir"/kamailio-3-backslash.patch || return 1 | ||
35 | |||
36 | sed -i \ | ||
37 | -e "s:-O9 -funroll-loops:$CFLAGS:g" \ | ||
38 | Makefile.defs \ | ||
39 | || return 1 | ||
40 | |||
41 | # -e 's:^cfg-target.*:cfg-target = $(cfg-dir):' \ | ||
42 | # -e 's:^cfg-prefix.*:cfg-prefix = $(basedir):' \ | ||
43 | |||
44 | cd utils/kamctl/ | ||
45 | sed -i -e 's:/var/run/kamailio.pid:/var/run/kamailio/kamailio.pid:g' \ | ||
46 | kamctl.base kamctlrc || return 1 | ||
47 | # we actually dont need bash | ||
48 | sed -i -e 's:/bin/bash:/bin/sh:' kamctl kamdbctl \ | ||
49 | || return 1 | ||
50 | # Set email_address field as not required field (could be null) | ||
51 | cd dbtext/kamailio | ||
52 | sed -i -e 's:email_address(string):email_address(string,null):' subscriber \ | ||
53 | || return 1 | ||
54 | |||
55 | } | ||
56 | |||
57 | build() { | ||
58 | cd "$_builddir" | ||
59 | make LOCALBASE=/usr \ | ||
60 | cfg_target=/etc/kamailio/ \ | ||
61 | MODS_MYSQL=yes \ | ||
62 | MODS_PCRE=yes \ | ||
63 | MODS_RADIUS= \ | ||
64 | TLS= \ | ||
65 | include_modules="$_modules" \ | ||
66 | all || return 1 | ||
67 | } | ||
68 | |||
69 | package() { | ||
70 | cd "$_builddir" | ||
71 | make LOCALBASE=/usr \ | ||
72 | cfg_target=/etc/kamailio/ \ | ||
73 | MODS_MYSQL=yes \ | ||
74 | MODS_PCRE=yes \ | ||
75 | MODS_RADIUS= \ | ||
76 | TLS= \ | ||
77 | include_modules="$_modules" \ | ||
78 | basedir="$pkgdir" \ | ||
79 | cfg_prefix="$pkgdir" \ | ||
80 | install || return 1 | ||
81 | |||
82 | # move default config to -doc package and use our own default config | ||
83 | |||
84 | mv "$pkgdir"/etc/kamailio/kamailio.cfg \ | ||
85 | "$pkgdir"/usr/share/doc/kamailio/ | ||
86 | install -m644 -D "$srcdir"/kamailio.cfg \ | ||
87 | "$pkgdir"/etc/kamailio/kamailio.cfg | ||
88 | |||
89 | install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname | ||
90 | install -d -o kamailio "$pkgdir"/var/run/kamailio | ||
91 | } | ||
92 | |||
93 | _mv_mod() { | ||
94 | local moddir=usr/lib/kamailio/modules i= | ||
95 | mkdir -p "$subpkgdir"/$moddir | ||
96 | for i in $@; do | ||
97 | mv "$pkgdir"/$moddir/$i.so "$subpkgdir"/$moddir/ || return 1 | ||
98 | done | ||
99 | } | ||
100 | |||
101 | _mv_mod_k() { | ||
102 | local moddir=usr/lib/kamailio/modules_k i= | ||
103 | mkdir -p "$subpkgdir"/$moddir | ||
104 | for i in $@; do | ||
105 | mv "$pkgdir"/$moddir/$i.so "$subpkgdir"/$moddir/ || return 1 | ||
106 | done | ||
107 | } | ||
108 | |||
109 | |||
110 | mysql() { | ||
111 | pkgdesc="MySQL support for kamailio" | ||
112 | depends="kamailio mysql-client" | ||
113 | _mv_mod db_mysql | ||
114 | mkdir -p "$subpkgdir"/usr/share/kamailio | ||
115 | mv "$pkgdir"/usr/share/kamailio/mysql \ | ||
116 | "$subpkgdir"/usr/share/kamailio/ | ||
117 | } | ||
118 | |||
119 | postgres() { | ||
120 | pkgdesc="PostgreSQL support for kamailio" | ||
121 | depends="kamailio postgresql-client" | ||
122 | _mv_mod db_postgres | ||
123 | mkdir -p "$subpkgdir"/usr/share/kamailio | ||
124 | mv "$pkgdir"/usr/share/kamailio/postgres \ | ||
125 | "$subpkgdir"/usr/share/kamailio/ | ||
126 | } | ||
127 | |||
128 | pcre() { | ||
129 | pkgdesc="Regular expressions support for kamailio" | ||
130 | _mv_mod dialplan lcr regex | ||
131 | } | ||
132 | |||
133 | presence() { | ||
134 | pkgdesc="Presence support for kamailio" | ||
135 | _mv_mod_k $_presence | ||
136 | } | ||
137 | |||
138 | mediaproxy() { | ||
139 | pkgdesc="Mediaproxy support for kamailio" | ||
140 | depends="kamailio" | ||
141 | _mv_mod mediaproxy | ||
142 | } | ||
143 | |||
144 | unixodbc() { | ||
145 | pkgdesc="UnixODBC support for kamailio" | ||
146 | depends="kamailio" | ||
147 | _mv_mod_k db_unixodbc | ||
148 | } | ||
149 | |||
150 | md5sums="dd039e078a77032a423fb15f9685ad31 kamailio-3.0.2_src.tar.gz | ||
151 | a3c959ec568c43a905710e7d25cd8c25 kamailio.cfg | ||
152 | 81100c479890a2a8c2628db22fdd1a0c kamailio.initd | ||
153 | c646af2dd31f5c4289a2f802c873d98f kamailio.pre-install | ||
154 | 3fbaf633ff1620d0d526fc4047c7bed9 kamailio.post-install | ||
155 | 36f81be3a082a81497e261ac8e6c5414 kamailio-3-backslash.patch" | ||
diff --git a/testing/kamailio/kamailio.cfg b/testing/kamailio/kamailio.cfg deleted file mode 100644 index 1558cce9ca..0000000000 --- a/testing/kamailio/kamailio.cfg +++ /dev/null | |||
@@ -1,107 +0,0 @@ | |||
1 | # Sample Kamailio Configuration | ||
2 | # 23 June 2010 - For Alpine Linux | ||
3 | # Accepts all registrations; routes calls to any registered AOR | ||
4 | |||
5 | #-------------------------------------------------------- | ||
6 | # Section 1: Global Definitions | ||
7 | #-------------------------------------------------------- | ||
8 | debug = 2 | ||
9 | fork = yes | ||
10 | log_stderror = no | ||
11 | # listen = 0.0.0.0 | ||
12 | port = 5060 | ||
13 | children = 4 | ||
14 | |||
15 | dns = no | ||
16 | rev_dns = no | ||
17 | |||
18 | mpath = "/usr/lib/kamailio/modules_k/:/usr/lib/kamailio/modules/" | ||
19 | |||
20 | #-------------------------------------------------------- | ||
21 | # Section 2: Modules | ||
22 | #-------------------------------------------------------- | ||
23 | |||
24 | loadmodule "tm.so" | ||
25 | loadmodule "sl.so" | ||
26 | loadmodule "tmx.so" | ||
27 | loadmodule "rr.so" | ||
28 | loadmodule "maxfwd.so" | ||
29 | loadmodule "usrloc.so" | ||
30 | loadmodule "registrar.so" | ||
31 | loadmodule "mi_fifo.so" | ||
32 | loadmodule "pv.so" | ||
33 | loadmodule "xlog.so" | ||
34 | |||
35 | #-------------------------------------------------------- | ||
36 | # Section 3: Module Configuration | ||
37 | #-------------------------------------------------------- | ||
38 | |||
39 | modparam ( "usrloc", "db_mode", 0 ) | ||
40 | modparam ( "rr", "enable_full_lr", 1 ) | ||
41 | modparam ( "mi_fifo", "fifo_name", "/tmp/kamailio_fifo") | ||
42 | |||
43 | #-------------------------------------------------------- | ||
44 | # Section 4: Main Route Block | ||
45 | #-------------------------------------------------------- | ||
46 | |||
47 | route | ||
48 | { | ||
49 | # Uncomment next line if you want to see | ||
50 | # each incoming message | ||
51 | xlog( "L_INFO", "$rm: $fu -> $ru" ); | ||
52 | |||
53 | if (!mf_process_maxfwd_header("10")) | ||
54 | { | ||
55 | sl_send_reply("483", "Too Many Hops"); | ||
56 | return; | ||
57 | } | ||
58 | |||
59 | if (msg:len > 4096) | ||
60 | { | ||
61 | sl_send_reply("513", "Message too big" ); | ||
62 | return; | ||
63 | } | ||
64 | |||
65 | if (method == "REGISTER" ) | ||
66 | { | ||
67 | route(REGISTER); | ||
68 | return; | ||
69 | } | ||
70 | |||
71 | loose_route(); | ||
72 | |||
73 | if (!lookup("location")) { | ||
74 | sl_send_reply("404", "User Not Found"); | ||
75 | return; | ||
76 | } | ||
77 | |||
78 | route(RELAY); | ||
79 | |||
80 | } | ||
81 | #-------------------------------------------------------- | ||
82 | # Section 5: Secondary Route Blocks | ||
83 | #-------------------------------------------------------- | ||
84 | |||
85 | # - Default message handler | ||
86 | route[RELAY] { | ||
87 | if (!t_relay()) { | ||
88 | sl_reply_error(); | ||
89 | } | ||
90 | } | ||
91 | |||
92 | #- Registration Request | ||
93 | route[REGISTER] { | ||
94 | if (!save("location")) { | ||
95 | sl_reply_error(); | ||
96 | } | ||
97 | } | ||
98 | |||
99 | #-------------------------------------------------------- | ||
100 | # Section 6: Reply Route Block | ||
101 | #-------------------------------------------------------- | ||
102 | |||
103 | |||
104 | #-------------------------------------------------------- | ||
105 | # Section 7: Failure Route Block | ||
106 | #-------------------------------------------------------- | ||
107 | |||
diff --git a/testing/kamailio/kamailio.initd b/testing/kamailio/kamailio.initd deleted file mode 100644 index ee4e2ecef1..0000000000 --- a/testing/kamailio/kamailio.initd +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | #!/sbin/runscript | ||
2 | |||
3 | daemon=/usr/sbin/kamailio | ||
4 | pidfile=/var/run/kamailio/kamailio.pid | ||
5 | |||
6 | depend() { | ||
7 | need net | ||
8 | after firewall | ||
9 | } | ||
10 | |||
11 | start() { | ||
12 | ebegin "Starting Kamailio" | ||
13 | start-stop-daemon --start --quiet --pidfile $pidfile --exec $daemon \ | ||
14 | -- \ | ||
15 | -u ${KAMAILIO_USER:-kamailio} \ | ||
16 | -g ${KAMAILIO_GROUP:-kamailio} \ | ||
17 | -P $pidfile \ | ||
18 | ${KAMAILIO_OPTS:-} | ||
19 | eend $? | ||
20 | } | ||
21 | |||
22 | stop() { | ||
23 | ebegin "Stopping Kamailio" | ||
24 | start-stop-daemon --stop --quiet --pidfile $pidfile | ||
25 | eend $? | ||
26 | } | ||
diff --git a/testing/kamailio/kamailio.post-install b/testing/kamailio/kamailio.post-install deleted file mode 100644 index 19fc932dd6..0000000000 --- a/testing/kamailio/kamailio.post-install +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | chown -R kamailio:kamailio /var/run/kamailio | ||
4 | chgrp kamailio /etc/kamailio/kamailio.cfg | ||
5 | exit 0 | ||
diff --git a/testing/kamailio/kamailio.pre-install b/testing/kamailio/kamailio.pre-install deleted file mode 100644 index 78dfa38bf3..0000000000 --- a/testing/kamailio/kamailio.pre-install +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | adduser -H -h /var/empty -s /bin/false -D kamailio 2>/dev/null | ||
4 | |||
5 | exit 0 | ||
diff --git a/testing/libgee/APKBUILD b/testing/libgee/APKBUILD new file mode 100644 index 0000000000..23c52d98bf --- /dev/null +++ b/testing/libgee/APKBUILD | |||
@@ -0,0 +1,25 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
2 | pkgname=libgee | ||
3 | pkgver=0.5.1 | ||
4 | pkgrel=0 | ||
5 | pkgdesc="GObject collection library" | ||
6 | url="http://live.gnome.org/Libgee" | ||
7 | license="LGPL2.1" | ||
8 | depends="" | ||
9 | makedepends=" glib-dev" | ||
10 | subpackages="$pkgname-dev" | ||
11 | source="http://ftp.gnome.org/pub/GNOME/sources/libgee/0.5/libgee-$pkgver.tar.bz2" | ||
12 | |||
13 | _builddir="$srcdir"/$pkgname-$pkgver | ||
14 | build() { | ||
15 | cd "$srcdir/$pkgname-$pkgver" | ||
16 | ./configure --prefix=/usr --disable-static || return 1 | ||
17 | make || return 1 | ||
18 | } | ||
19 | |||
20 | package() { | ||
21 | cd "$_builddir" | ||
22 | make DESTDIR="$pkgdir" install || return 1 | ||
23 | } | ||
24 | |||
25 | md5sums="59789b5b266beadfb8b51bf2c96211b3 libgee-0.5.1.tar.bz2" | ||
diff --git a/testing/mdocml/APKBUILD b/testing/mdocml/APKBUILD new file mode 100644 index 0000000000..03ede31f40 --- /dev/null +++ b/testing/mdocml/APKBUILD | |||
@@ -0,0 +1,33 @@ | |||
1 | # Contributor: | ||
2 | # Maintainer: | ||
3 | pkgname=mdocml | ||
4 | pkgver=1.10.4 | ||
5 | pkgrel=0 | ||
6 | pkgdesc="Roff implementation" | ||
7 | url="http://mdocml.bsd.lv/" | ||
8 | license="BSD" | ||
9 | depends= | ||
10 | makedepends= | ||
11 | install= | ||
12 | subpackages="$pkgname-doc" | ||
13 | source="http://mdocml.bsd.lv/snapshots/mdocml-$pkgver.tar.gz" | ||
14 | |||
15 | _builddir="$srcdir"/$pkgname-$pkgver | ||
16 | |||
17 | prepare() { | ||
18 | cd "$_builddir" | ||
19 | sed -i -e 's:/usr/local:/usr:' Makefile || return 1 | ||
20 | } | ||
21 | |||
22 | build() { | ||
23 | cd "$_builddir" | ||
24 | make || return 1 | ||
25 | } | ||
26 | |||
27 | package() { | ||
28 | cd "$_builddir" | ||
29 | make DESTDIR="$pkgdir" MANDIR=/usr/share/man \ | ||
30 | EXAMPLEDIR=/usr/share/doc/mdocml/examples install | ||
31 | } | ||
32 | |||
33 | md5sums="f23e40cd64f4312b0c4e2d72e7999298 mdocml-1.10.4.tar.gz" | ||
diff --git a/testing/open-vm-tools/APKBUILD b/testing/open-vm-tools/APKBUILD new file mode 100644 index 0000000000..97a3a7753a --- /dev/null +++ b/testing/open-vm-tools/APKBUILD | |||
@@ -0,0 +1,109 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
2 | pkgname=open-vm-tools | ||
3 | pkgver=8.4.2 | ||
4 | _pkgsubver=261024 | ||
5 | pkgrel=0 | ||
6 | pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools." | ||
7 | url="http://open-vm-tools.sourceforge.net/" | ||
8 | license="LGPL" | ||
9 | subpackages="$pkgname-gtk" | ||
10 | makedepends="procps-dev libdnet-dev icu-dev glib-dev pkgconfig bash | ||
11 | libtirpc-dev rpcgen icu-dev automake autoconf | ||
12 | gtk+-dev libxext-dev libxinerama-dev libxtst-dev gtkmm-dev | ||
13 | libnotify-dev libxrandr-dev | ||
14 | " | ||
15 | source="http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-$_pkgsubver.tar.gz | ||
16 | getloadavg-uclibc.patch | ||
17 | codeset-uclibc.patch | ||
18 | ecvt.patch | ||
19 | iconv-uclibc.patch | ||
20 | libm.patch | ||
21 | checkvm-pie-safety.patch | ||
22 | resume-vm-default.patch | ||
23 | suspend-vm-default.patch | ||
24 | open-vm-tools.initd | ||
25 | open-vm.initd | ||
26 | open-vm.confd | ||
27 | " | ||
28 | |||
29 | _builddir="$srcdir"/$pkgname-$pkgver-$_pkgsubver | ||
30 | |||
31 | prepare() { | ||
32 | cd "$_builddir" | ||
33 | for i in "$srcdir"/*.patch; do | ||
34 | [ -r "$i" ] || continue | ||
35 | patch -p1 -i "$i" || return 1 | ||
36 | done | ||
37 | |||
38 | sed -i -e 's/__unused1/st_atim.tv_nsec/g' \ | ||
39 | -e 's/__unused2/st_mtim.tv_nsec/g' \ | ||
40 | -e 's/__unused3/st_ctim.tv_nsec/g' \ | ||
41 | lib/file/filePosix.c lib/hgfsServer/hgfsServerLinux.c \ | ||
42 | || return 1 | ||
43 | |||
44 | # workaround automake-1.10 issue | ||
45 | # http://ramblingfoo.blogspot.com/2007/07/required-file-configrpath-not-found.html | ||
46 | touch config/config.rpath | ||
47 | aclocal -I m4 && autoconf && automake | ||
48 | } | ||
49 | |||
50 | build() { | ||
51 | cd "$_builddir" | ||
52 | ./configure --prefix=/usr \ | ||
53 | --disable-unity \ | ||
54 | --with-dnet \ | ||
55 | --with-icu \ | ||
56 | --with-procps \ | ||
57 | --with-x \ | ||
58 | --without-kernel-modules \ | ||
59 | --without-pam \ | ||
60 | || return 1 | ||
61 | make || return 1 | ||
62 | } | ||
63 | |||
64 | package() { | ||
65 | cd "$_builddir" | ||
66 | make install DESTDIR=$pkgdir || return 1 | ||
67 | |||
68 | # one of the plugins seems to be linked to libhgfsServer | ||
69 | # create a link to abuild gets happy | ||
70 | ln -s open-vm-tools/plugins/vmsvc/libhgfsServer.so \ | ||
71 | "$pkgdir"/usr/lib/libhgfsServer.so.0 | ||
72 | |||
73 | # dont bother create a -dev package | ||
74 | rm -f "$pkgdir"/usr/lib/*.a "$pkgdir"/usr/lib/*.la | ||
75 | |||
76 | install -Dm644 "$srcdir"/open-vm-tools.desktop \ | ||
77 | "$pkgdir"/etc/xdg/open-vm-tools.desktop | ||
78 | install -Dm755 "$srcdir"/open-vm-tools.initd \ | ||
79 | "$pkgdir"/etc/init.d/open-vm-tools | ||
80 | install -Dm644 "$srcdir"/open-vm.confd "$pkgdir"/etc/conf.d/open-vm | ||
81 | install -Dm755 "$srcdir"/open-vm.initd "$pkgdir"/etc/init.d/open-vm | ||
82 | } | ||
83 | |||
84 | gtk() { | ||
85 | pkgdesc="Xorg apps and plugins for open-vm-tools" | ||
86 | mkdir -p "$subpkgdir"/usr/bin \ | ||
87 | "$subpkgdir"/usr/lib/open-vm-tools/plugins/vmusr \ | ||
88 | "$subpkgdir"/etc/ | ||
89 | mv "$pkgdir"/usr/bin/vmware-toolbox \ | ||
90 | "$pkgdir"/usr/bin/vmware-user \ | ||
91 | "$subpkgdir"/usr/bin/ | ||
92 | mv "$pkgdir"/usr/lib/open-vm-tools/plugins/vmusr/libresolutionSet.so \ | ||
93 | "$pkgdir"/usr/lib/open-vm-tools/plugins/vmusr/libvixUser.so \ | ||
94 | "$subpkgdir"/usr/lib/open-vm-tools/plugins/vmusr/ | ||
95 | mv "$pkgdir"/etc/xdg "$subpkgdir"/etc/ | ||
96 | } | ||
97 | |||
98 | md5sums="4d9ddc865b42fc6982c3078031500486 open-vm-tools-8.4.2-261024.tar.gz | ||
99 | bf2398b976d849bfd29a02763984a68a getloadavg-uclibc.patch | ||
100 | 82840b6bed002284b9bd2358707ee826 codeset-uclibc.patch | ||
101 | 840e4d6ff3f53fc22bdedf4d64aabc91 ecvt.patch | ||
102 | 454827c50f5b1290dd647717e87d0f5a iconv-uclibc.patch | ||
103 | 7d02fc25aba5c248f3d98dac238f175b libm.patch | ||
104 | 7ba4dea8fc5c285e4837f9e33d835083 checkvm-pie-safety.patch | ||
105 | 2606c0d5b180a77634ad26343d68852d resume-vm-default.patch | ||
106 | c6d7a6640bb26c22e632aea21b04227b suspend-vm-default.patch | ||
107 | c79ca03660fa75d00028325f53a37b4e open-vm-tools.initd | ||
108 | b56e3e6ebde04054b27e23e7c6d0d22c open-vm.initd | ||
109 | 2570d31a242f40eae8f8f2517536dd5f open-vm.confd" | ||
diff --git a/testing/open-vm-tools/checkvm-pie-safety.patch b/testing/open-vm-tools/checkvm-pie-safety.patch new file mode 100644 index 0000000000..5a879c94b7 --- /dev/null +++ b/testing/open-vm-tools/checkvm-pie-safety.patch | |||
@@ -0,0 +1,67 @@ | |||
1 | From: Gordon Malm <gengor@gentoo.org> | ||
2 | |||
3 | Make inline asm PIC-safe (do not clobber ebx). | ||
4 | |||
5 | Thanks and credit to Anthony Basile for all his help and testing. | ||
6 | |||
7 | Reference: http://bugs.gentoo.org/200376 | ||
8 | |||
9 | --- a/checkvm/checkvm.c | ||
10 | +++ b/checkvm/checkvm.c | ||
11 | @@ -79,8 +79,16 @@ | ||
12 | { | ||
13 | uint32 eax, ebx, ecx, edx; | ||
14 | |||
15 | - __asm__ volatile("inl (%%dx)" : | ||
16 | - "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) : | ||
17 | + __asm__ volatile( | ||
18 | +#if defined __PIC__ && !vm_x86_64 // %ebx is reserved by the compiler. | ||
19 | + "movl %%ebx, %3 \n\t" | ||
20 | + "inl (%%dx) \n\t" | ||
21 | + "xchgl %%ebx, %3 \n\t" : | ||
22 | + "=a"(eax), "=c"(ecx), "=d"(edx), "=r"(ebx) : | ||
23 | +#else | ||
24 | + "inl (%%dx)" : | ||
25 | + "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) : | ||
26 | +#endif | ||
27 | "0"(BDOOR_MAGIC), "1"(BDOOR_CMD_GETVERSION), | ||
28 | "2"(BDOOR_PORT) : "memory"); | ||
29 | version[0] = eax; | ||
30 | @@ -96,8 +104,16 @@ | ||
31 | { | ||
32 | uint32 eax, ebx, ecx, edx; | ||
33 | |||
34 | - __asm__ volatile("inl (%%dx)" : | ||
35 | - "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) : | ||
36 | + __asm__ volatile( | ||
37 | +#if defined __PIC__ && !vm_x86_64 // %ebx is reserved by the compiler. | ||
38 | + "movl %%ebx, %3 \n\t" | ||
39 | + "inl (%%dx) \n\t" | ||
40 | + "xchgl %%ebx, %3 \n\t" : | ||
41 | + "=a"(eax), "=c"(ecx), "=d"(edx), "=r"(ebx) : | ||
42 | +#else | ||
43 | + "inl (%%dx)" : | ||
44 | + "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) : | ||
45 | +#endif | ||
46 | "0"(BDOOR_MAGIC), "1"(BDOOR_CMD_GETHWVERSION), | ||
47 | "2"(BDOOR_PORT) : "memory"); | ||
48 | *hwVersion = eax; | ||
49 | @@ -112,8 +128,16 @@ | ||
50 | { | ||
51 | uint32 eax, ebx, ecx, edx; | ||
52 | |||
53 | - __asm__ volatile("inl (%%dx)" : | ||
54 | - "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) : | ||
55 | + __asm__ volatile( | ||
56 | +#if defined __PIC__ && !vm_x86_64 // %ebx is reserved by the compiler. | ||
57 | + "movl %%ebx, %3 \n\t" | ||
58 | + "inl (%%dx) \n\t" | ||
59 | + "xchgl %%ebx, %3 \n\t" : | ||
60 | + "=a"(eax), "=c"(ecx), "=d"(edx), "=r"(ebx) : | ||
61 | +#else | ||
62 | + "inl (%%dx)" : | ||
63 | + "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) : | ||
64 | +#endif | ||
65 | "0"(BDOOR_MAGIC), "1"(BDOOR_CMD_GETSCREENSIZE), | ||
66 | "2"(BDOOR_PORT) : "memory"); | ||
67 | *screensize = eax; | ||
diff --git a/testing/open-vm-tools/codeset-uclibc.patch b/testing/open-vm-tools/codeset-uclibc.patch new file mode 100644 index 0000000000..b26df16611 --- /dev/null +++ b/testing/open-vm-tools/codeset-uclibc.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | --- ./lib/misc/codesetOld.c.orig | ||
2 | +++ ./lib/misc/codesetOld.c | ||
3 | @@ -723,7 +723,7 @@ | ||
4 | { | ||
5 | char *codeset; | ||
6 | |||
7 | -#if defined(__linux__) | ||
8 | +#if defined(__linux__) && !defined(__UCLIBC__) | ||
9 | |||
10 | locale_t new = newlocale(LC_CTYPE_MASK, "", NULL); | ||
11 | if (!new) { | ||
12 | @@ -739,7 +739,7 @@ | ||
13 | codeset = Util_SafeStrdup(nl_langinfo_l(CODESET, new)); | ||
14 | freelocale(new); | ||
15 | |||
16 | -#elif defined(sun) | ||
17 | +#elif defined(sun) || defined(__UCLIBC__) | ||
18 | |||
19 | char *locale = setlocale(LC_CTYPE, NULL); | ||
20 | if (!setlocale(LC_CTYPE, "")) { | ||
diff --git a/testing/open-vm-tools/ecvt.patch b/testing/open-vm-tools/ecvt.patch new file mode 100644 index 0000000000..53e88e9989 --- /dev/null +++ b/testing/open-vm-tools/ecvt.patch | |||
@@ -0,0 +1,205 @@ | |||
1 | commit e996e91ca5951c50769dcaa8e074daa973006849 | ||
2 | Author: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Thu Jul 8 06:39:36 2010 +0000 | ||
4 | |||
5 | add ecvt() implementation | ||
6 | |||
7 | diff --git a/lib/string/Makefile.am b/lib/string/Makefile.am | ||
8 | index 1edab81..5f2e7ab 100644 | ||
9 | --- a/lib/string/Makefile.am | ||
10 | +++ b/lib/string/Makefile.am | ||
11 | @@ -23,6 +23,7 @@ libString_la_SOURCES += bsd_vsnprintf.c | ||
12 | libString_la_SOURCES += bsd_vsnwprintf.c | ||
13 | libString_la_SOURCES += convertutf.c | ||
14 | libString_la_SOURCES += str.c | ||
15 | +libString_la_SOURCES += ecvt.c | ||
16 | |||
17 | AM_CFLAGS = @LIB_STRING_CPPFLAGS@ | ||
18 | |||
19 | diff --git a/lib/string/bsd_output_shared.c b/lib/string/bsd_output_shared.c | ||
20 | index 3616947..321d6f1 100644 | ||
21 | --- a/lib/string/bsd_output_shared.c | ||
22 | +++ b/lib/string/bsd_output_shared.c | ||
23 | @@ -64,6 +64,9 @@ | ||
24 | |||
25 | #ifndef NO_FLOATING_POINT | ||
26 | |||
27 | +extern char* ecvt(double arg, int ndigits, int *decptp, int *signp); | ||
28 | +extern char* fcvt(double arg, int ndigits, int *decptp, int *signp); | ||
29 | + | ||
30 | /* | ||
31 | *----------------------------------------------------------------------------- | ||
32 | * | ||
33 | diff --git a/lib/string/ecvt.c b/lib/string/ecvt.c | ||
34 | new file mode 100644 | ||
35 | index 0000000..1979c3d | ||
36 | --- /dev/null | ||
37 | +++ b/lib/string/ecvt.c | ||
38 | @@ -0,0 +1,167 @@ | ||
39 | +/* | ||
40 | + * Copyright (c) 1999 Apple Computer, Inc. All rights reserved. | ||
41 | + * | ||
42 | + * @APPLE_LICENSE_HEADER_START@ | ||
43 | + * | ||
44 | + * This file contains Original Code and/or Modifications of Original Code | ||
45 | + * as defined in and that are subject to the Apple Public Source License | ||
46 | + * Version 2.0 (the 'License'). You may not use this file except in | ||
47 | + * compliance with the License. Please obtain a copy of the License at | ||
48 | + * http://www.opensource.apple.com/apsl/ and read it before using this | ||
49 | + * file. | ||
50 | + * | ||
51 | + * The Original Code and all software distributed under the License are | ||
52 | + * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER | ||
53 | + * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, | ||
54 | + * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, | ||
55 | + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. | ||
56 | + * Please see the License for the specific language governing rights and | ||
57 | + * limitations under the License. | ||
58 | + * | ||
59 | + * @APPLE_LICENSE_HEADER_END@ | ||
60 | + */ | ||
61 | +/* | ||
62 | + * ecvt converts to decimal | ||
63 | + * the number of digits is specified by ndigit | ||
64 | + * decptp is set to the position of the decimal point | ||
65 | + * signp is set to 0 for positive, 1 for negative | ||
66 | + */ | ||
67 | + | ||
68 | + | ||
69 | +static double ecvt_rint(double x); | ||
70 | + | ||
71 | +static char *cvt(); | ||
72 | + | ||
73 | +/* big enough to handle %.20f conversion of 1e308 */ | ||
74 | +#define NDIG 350 | ||
75 | + | ||
76 | +char* | ||
77 | +ecvt(arg, ndigits, decptp, signp) | ||
78 | +double arg; | ||
79 | +int ndigits, *decptp, *signp; | ||
80 | +{ | ||
81 | + return(cvt(arg, ndigits, decptp, signp, 1)); | ||
82 | +} | ||
83 | + | ||
84 | +char* | ||
85 | +fcvt(arg, ndigits, decptp, signp) | ||
86 | +double arg; | ||
87 | +int ndigits, *decptp, *signp; | ||
88 | +{ | ||
89 | + return(cvt(arg, ndigits, decptp, signp, 0)); | ||
90 | +} | ||
91 | + | ||
92 | +static char* | ||
93 | +cvt(arg, ndigits, decptp, signp, eflag) | ||
94 | +double arg; | ||
95 | +int ndigits, *decptp, *signp; | ||
96 | +int eflag; | ||
97 | +{ | ||
98 | + register int decpt; | ||
99 | + double fi, fj; | ||
100 | + register char *p, *p1; | ||
101 | + static char buf[NDIG] = { 0 }; | ||
102 | + double modf(); | ||
103 | + | ||
104 | + if (ndigits < 0) | ||
105 | + ndigits = 0; | ||
106 | + if (ndigits >= NDIG-1) | ||
107 | + ndigits = NDIG-2; | ||
108 | + | ||
109 | + decpt = 0; | ||
110 | + *signp = 0; | ||
111 | + p = &buf[0]; | ||
112 | + | ||
113 | + if (arg == 0) { | ||
114 | + *decptp = 0; | ||
115 | + while (p < &buf[ndigits]) | ||
116 | + *p++ = '0'; | ||
117 | + *p = '\0'; | ||
118 | + return(buf); | ||
119 | + } else if (arg < 0) { | ||
120 | + *signp = 1; | ||
121 | + arg = -arg; | ||
122 | + } | ||
123 | + | ||
124 | + arg = modf(arg, &fi); | ||
125 | + p1 = &buf[NDIG]; | ||
126 | + | ||
127 | + /* | ||
128 | + * Do integer part | ||
129 | + */ | ||
130 | + if (fi != 0) { | ||
131 | + while (fi != 0) { | ||
132 | + fj = modf(fi/10, &fi); | ||
133 | + /**--p1 = (int)((fj+.03)*10) + '0';*/ | ||
134 | + *--p1 = (int)ecvt_rint((fj)*10) + '0'; | ||
135 | + decpt++; | ||
136 | + } | ||
137 | + while (p1 < &buf[NDIG]) | ||
138 | + *p++ = *p1++; | ||
139 | + } else if (arg > 0) { | ||
140 | + while ((fj = arg*10) < 1) { | ||
141 | + arg = fj; | ||
142 | + decpt--; | ||
143 | + } | ||
144 | + } | ||
145 | + *decptp = decpt; | ||
146 | + | ||
147 | + /* | ||
148 | + * do fraction part | ||
149 | + * p pts to where fraction should be concatenated | ||
150 | + * p1 is how far conversion must go to | ||
151 | + */ | ||
152 | + p1 = &buf[ndigits]; | ||
153 | + if (eflag==0) { | ||
154 | + /* fcvt must provide ndigits after decimal pt */ | ||
155 | + p1 += decpt; | ||
156 | + /* if decpt was negative, we might done for fcvt */ | ||
157 | + if (p1 < &buf[0]) { | ||
158 | + buf[0] = '\0'; | ||
159 | + return(buf); | ||
160 | + } | ||
161 | + } | ||
162 | + while (p <= p1 && p < &buf[NDIG]) { | ||
163 | + arg *= 10; | ||
164 | + arg = modf(arg, &fj); | ||
165 | + *p++ = (int)fj + '0'; | ||
166 | + } | ||
167 | + /* | ||
168 | + * if we converted all the way to the end of the | ||
169 | + * buf, don't mess with rounding since there's nothing | ||
170 | + * significant out here anyway | ||
171 | + */ | ||
172 | + if (p1 >= &buf[NDIG]) { | ||
173 | + buf[NDIG-1] = '\0'; | ||
174 | + return(buf); | ||
175 | + } | ||
176 | + /* | ||
177 | + * round by adding 5 to last digit and propagating | ||
178 | + * carries | ||
179 | + */ | ||
180 | + p = p1; | ||
181 | + *p1 += 5; | ||
182 | + while (*p1 > '9') { | ||
183 | + *p1 = '0'; | ||
184 | + if (p1 > buf) | ||
185 | + ++*--p1; | ||
186 | + else { | ||
187 | + *p1 = '1'; | ||
188 | + (*decptp)++; | ||
189 | + if (eflag == 0) { | ||
190 | + if (p > buf) | ||
191 | + *p = '0'; | ||
192 | + p++; | ||
193 | + } | ||
194 | + } | ||
195 | + } | ||
196 | + *p = '\0'; | ||
197 | + return(buf); | ||
198 | +} | ||
199 | + | ||
200 | +static double ecvt_rint(double x) | ||
201 | +{ | ||
202 | + asm("frndint" : "=t" (x) : "0" (x)); | ||
203 | + return(x); | ||
204 | +} | ||
205 | + | ||
diff --git a/testing/open-vm-tools/getloadavg-uclibc.patch b/testing/open-vm-tools/getloadavg-uclibc.patch new file mode 100644 index 0000000000..247bd70374 --- /dev/null +++ b/testing/open-vm-tools/getloadavg-uclibc.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | diff --git a/lib/misc/hostinfoPosix.c b/lib/misc/hostinfoPosix.c | ||
2 | index eeeb620..67387be 100644 | ||
3 | --- a/lib/misc/hostinfoPosix.c | ||
4 | +++ b/lib/misc/hostinfoPosix.c | ||
5 | @@ -1355,8 +1355,16 @@ HostinfoGetLoadAverage(float *avg0, // IN/OUT: | ||
6 | float *avg1, // IN/OUT: | ||
7 | float *avg2) // IN/OUT: | ||
8 | { | ||
9 | +#if defined(__UCLIBC__) | ||
10 | + FILE *f; | ||
11 | + if ((f = fopen("/proc/loadavg", "r")) == NULL) | ||
12 | + return FALSE; | ||
13 | + fscanf(f, "%f %f %f", avg0, avg1, avg2); | ||
14 | + fclose(f); | ||
15 | + return TRUE; | ||
16 | + | ||
17 | /* getloadavg(3) was introduced with glibc 2.2 */ | ||
18 | -#if defined(GLIBC_VERSION_22) || defined(__APPLE__) | ||
19 | +#elif defined(GLIBC_VERSION_22) || defined(__APPLE__) | ||
20 | double avg[3]; | ||
21 | int res; | ||
22 | |||
diff --git a/testing/open-vm-tools/iconv-uclibc.patch b/testing/open-vm-tools/iconv-uclibc.patch new file mode 100644 index 0000000000..6b256db880 --- /dev/null +++ b/testing/open-vm-tools/iconv-uclibc.patch | |||
@@ -0,0 +1,12 @@ | |||
1 | --- ./configure.ac.orig | ||
2 | +++ ./configure.ac | ||
3 | @@ -1059,6 +1059,9 @@ | ||
4 | AC_DEFINE([NO_MULTIMON], 1, [Define to 1 if building without multimon support.]) | ||
5 | fi | ||
6 | |||
7 | +AM_ICONV | ||
8 | +LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD $LIBICONV" | ||
9 | + | ||
10 | if test "$os$userSpaceBitness" = "linux64" || test "$HAVE_SYS_SETUID" = "yes"; then | ||
11 | LIB_MISC_CPPFLAGS="$LIB_MISC_CPPFLAGS -DGLIBC_VERSION_21" | ||
12 | fi | ||
diff --git a/testing/open-vm-tools/libm.patch b/testing/open-vm-tools/libm.patch new file mode 100644 index 0000000000..cd013f4d20 --- /dev/null +++ b/testing/open-vm-tools/libm.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | --- a/hgfsmounter/Makefile.am | ||
2 | +++ b/hgfsmounter/Makefile.am | ||
3 | @@ -23,6 +23,7 @@ | ||
4 | mount_vmhgfs_LDADD += ../lib/panicDefault/libPanicDefault.la | ||
5 | mount_vmhgfs_LDADD += ../lib/panic/libPanic.la | ||
6 | mount_vmhgfs_LDADD += ../lib/stubs/libStubs.la | ||
7 | +mount_vmhgfs_LDADD += -lm | ||
8 | |||
9 | mount_vmhgfs_SOURCES = | ||
10 | mount_vmhgfs_SOURCES += hgfsmounter.c | ||
11 | --- a/rpctool/Makefile.am | ||
12 | +++ b/rpctool/Makefile.am | ||
13 | @@ -25,4 +25,5 @@ | ||
14 | vmware_rpctool_LDADD += ../lib/message/libMessage.la | ||
15 | vmware_rpctool_LDADD += ../lib/backdoor/libBackdoor.la | ||
16 | vmware_rpctool_LDADD += ../lib/string/libString.la | ||
17 | +vmware_rpctool_LDADD += -lm | ||
18 | |||
diff --git a/testing/open-vm-tools/open-vm-tools.desktop b/testing/open-vm-tools/open-vm-tools.desktop new file mode 100644 index 0000000000..2107a62e0b --- /dev/null +++ b/testing/open-vm-tools/open-vm-tools.desktop | |||
@@ -0,0 +1,7 @@ | |||
1 | [Desktop Entry] | ||
2 | Encoding=UTF-8 | ||
3 | Type=Application | ||
4 | Exec=vmware-user | ||
5 | Name=VMware User Agent | ||
6 | X-KDE-autostart-phase=1 | ||
7 | NoDisplay=true | ||
diff --git a/testing/open-vm-tools/open-vm-tools.initd b/testing/open-vm-tools/open-vm-tools.initd new file mode 100644 index 0000000000..ee85c4d297 --- /dev/null +++ b/testing/open-vm-tools/open-vm-tools.initd | |||
@@ -0,0 +1,76 @@ | |||
1 | #!/sbin/runscript | ||
2 | # Copyright 1999-2007 Gentoo Foundation | ||
3 | # Distributed under the terms of the GNU General Public License v2 | ||
4 | # $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/files/open-vm-tools.initd,v 1.2 2009/12/20 14:05:43 vadimk Exp $ | ||
5 | |||
6 | DND_TMPDIR="/tmp/VMwareDnD" | ||
7 | USER_GROUP="root:vmware" | ||
8 | DND_TMPDIR_PERMS="1777" | ||
9 | GUESTD_BIN="/usr/bin/vmtoolsd" | ||
10 | PIDFILE="/var/run/vmtoolsd.pid" | ||
11 | MOUNTPOINT="/proc/fs/vmblock/mountPoint" | ||
12 | |||
13 | depend() { | ||
14 | before checkfs fsck net X | ||
15 | } | ||
16 | |||
17 | start() { | ||
18 | if [ "${VM_DRAG_AND_DROP}" == "yes" ]; | ||
19 | then | ||
20 | |||
21 | if ! grep -q -w vmblock /proc/modules; | ||
22 | then | ||
23 | ebegin "Loading vmblock module" | ||
24 | modprobe vmblock | ||
25 | eend $? | ||
26 | sleep 0.25 | ||
27 | fi | ||
28 | |||
29 | if [[ ! -d "${DND_TMPDIR}" ]]; | ||
30 | then | ||
31 | # einfo "Creating the VM drag and drop directory" | ||
32 | mkdir "${DND_TMPDIR}" | ||
33 | chown "${USER_GROUP}" "${DND_TMPDIR}" | ||
34 | chmod "${DND_TMPDIR_PERMS}" "${DND_TMPDIR}" | ||
35 | fi | ||
36 | |||
37 | # DnD_TMPDIR must exist before vmblock can be mounted | ||
38 | ebegin "Mounting vmblock device" | ||
39 | mount -t vmblock none ${MOUNTPOINT} | ||
40 | eend $? | ||
41 | fi | ||
42 | |||
43 | ebegin "Starting vmtoolsd" | ||
44 | start-stop-daemon --chuid "${USER_GROUP}" --start --quiet --background --make-pidfile --pidfile "${PIDFILE}" --exec ${GUESTD_BIN} | ||
45 | eend $? | ||
46 | } | ||
47 | |||
48 | stop() { | ||
49 | local ret | ||
50 | |||
51 | if [ "${VM_DRAG_AND_DROP}" == "yes" ]; | ||
52 | then | ||
53 | ebegin "Cleaning the contents of ${DND_TMPDIR}" | ||
54 | # First check, whether ${DND_TMPDIR} isn valid... we shouldn't risk deleting the content of ""/* | ||
55 | if [[ ! -z "${DND_TMPDIR}" ]] && [[ "${DND_TMPDIR}" != "/" ]]; | ||
56 | then | ||
57 | rm -rf ${DND_TMPDIR}/* | ||
58 | ret=0 | ||
59 | else | ||
60 | eerror "Not cleaning up ${DND_TMPDIR}, please check definition of variable" | ||
61 | ret=1 | ||
62 | fi | ||
63 | eend $ret | ||
64 | |||
65 | ebegin "Unmounting vmblock device" | ||
66 | if grep -q -w "${MOUNTPOINT}" /proc/mounts; | ||
67 | then | ||
68 | umount ${MOUNTPOINT} 1>&2 > /dev/null | ||
69 | fi | ||
70 | eend 0 | ||
71 | fi | ||
72 | |||
73 | ebegin "Stopping vmtoolsd" | ||
74 | start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" | ||
75 | eend $? | ||
76 | } | ||
diff --git a/testing/open-vm-tools/open-vm.confd b/testing/open-vm-tools/open-vm.confd new file mode 100644 index 0000000000..4414fabdb4 --- /dev/null +++ b/testing/open-vm-tools/open-vm.confd | |||
@@ -0,0 +1,2 @@ | |||
1 | # Set this to no to disable drag and drop (and vmblock) loading. | ||
2 | VM_DRAG_AND_DROP="yes" | ||
diff --git a/testing/open-vm-tools/open-vm.initd b/testing/open-vm-tools/open-vm.initd new file mode 100644 index 0000000000..d4f96cc876 --- /dev/null +++ b/testing/open-vm-tools/open-vm.initd | |||
@@ -0,0 +1,76 @@ | |||
1 | #!/sbin/runscript | ||
2 | # Copyright 1999-2007 Gentoo Foundation | ||
3 | # Distributed under the terms of the GNU General Public License v2 | ||
4 | # $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/files/open-vm.initd,v 1.2 2008/02/01 12:33:36 flameeyes Exp $ | ||
5 | |||
6 | DND_TMPDIR="/tmp/VMwareDnD" | ||
7 | USER_GROUP="root:vmware" | ||
8 | DND_TMPDIR_PERMS="1777" | ||
9 | GUESTD_BIN="/usr/sbin/vmware-guestd" | ||
10 | PIDFILE="/var/run/vmware-guestd.pid" | ||
11 | MOUNTPOINT="/proc/fs/vmblock/mountPoint" | ||
12 | |||
13 | depend() { | ||
14 | before checkfs fsck net X | ||
15 | } | ||
16 | |||
17 | start() { | ||
18 | if [ "${VM_DRAG_AND_DROP}" == "yes" ]; | ||
19 | then | ||
20 | |||
21 | if ! grep -q -w vmblock /proc/modules; | ||
22 | then | ||
23 | ebegin "Loading vmblock module" | ||
24 | modprobe vmblock | ||
25 | eend $? | ||
26 | sleep 0.25 | ||
27 | fi | ||
28 | |||
29 | if [[ ! -d "${DND_TMPDIR}" ]]; | ||
30 | then | ||
31 | # einfo "Creating the VM drag and drop directory" | ||
32 | mkdir "${DND_TMPDIR}" | ||
33 | chown "${USER_GROUP}" "${DND_TMPDIR}" | ||
34 | chmod "${DND_TMPDIR_PERMS}" "${DND_TMPDIR}" | ||
35 | fi | ||
36 | |||
37 | # DnD_TMPDIR must exist before vmblock can be mounted | ||
38 | ebegin "Mounting vmblock device" | ||
39 | mount -t vmblock none ${MOUNTPOINT} | ||
40 | eend $? | ||
41 | fi | ||
42 | |||
43 | ebegin "Starting vmware-guestd" | ||
44 | start-stop-daemon --chuid "${USER_GROUP}" --start --quiet --exec ${GUESTD_BIN} -- --background "${PIDFILE}" | ||
45 | eend $? | ||
46 | } | ||
47 | |||
48 | stop() { | ||
49 | local ret | ||
50 | |||
51 | if [ "${VM_DRAG_AND_DROP}" == "yes" ]; | ||
52 | then | ||
53 | ebegin "Cleaning the contents of ${DND_TMPDIR}" | ||
54 | # First check, whether ${DND_TMPDIR} isn valid... we shouldn't risk deleting the content of ""/* | ||
55 | if [[ ! -z "${DND_TMPDIR}" ]] && [[ "${DND_TMPDIR}" != "/" ]]; | ||
56 | then | ||
57 | rm -rf ${DND_TMPDIR}/* | ||
58 | ret=0 | ||
59 | else | ||
60 | eerror "Not cleaning up ${DND_TMPDIR}, please check definition of variable" | ||
61 | ret=1 | ||
62 | fi | ||
63 | eend $ret | ||
64 | |||
65 | ebegin "Unmounting vmblock device" | ||
66 | if grep -q -w "${MOUNTPOINT}" /proc/mounts; | ||
67 | then | ||
68 | umount ${MOUNTPOINT} 1>&2 > /dev/null | ||
69 | fi | ||
70 | eend 0 | ||
71 | fi | ||
72 | |||
73 | ebegin "Stopping vmware-guestd" | ||
74 | start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" | ||
75 | eend $? | ||
76 | } | ||
diff --git a/testing/open-vm-tools/resume-vm-default.patch b/testing/open-vm-tools/resume-vm-default.patch new file mode 100644 index 0000000000..4d89a47f52 --- /dev/null +++ b/testing/open-vm-tools/resume-vm-default.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | --- ./scripts/linux/resume-vm-default.orig | ||
2 | +++ ./scripts/linux/resume-vm-default | ||
3 | @@ -25,37 +25,6 @@ | ||
4 | echo `date` ": Executing '$0'" | ||
5 | echo | ||
6 | |||
7 | -find_networking_script() { | ||
8 | - local script="error" | ||
9 | - for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do | ||
10 | - if [ -d "$dir/rc0.d" ] && | ||
11 | - [ -d "$dir/rc1.d" ] && | ||
12 | - [ -d "$dir/rc2.d" ] && | ||
13 | - [ -d "$dir/rc3.d" ] && | ||
14 | - [ -d "$dir/rc4.d" ] && | ||
15 | - [ -d "$dir/rc5.d" ] && | ||
16 | - [ -d "$dir/rc6.d" ]; then | ||
17 | - | ||
18 | - # Now find the appropriate networking script. | ||
19 | - if [ -d "$dir/init.d" ]; then | ||
20 | - if [ -x "$dir/init.d/network" ]; then | ||
21 | - script="$dir/init.d/network" | ||
22 | - elif [ -x "$dir/init.d/networking" ]; then | ||
23 | - script="$dir/init.d/networking" | ||
24 | - fi | ||
25 | - else | ||
26 | - if [ -x "$dir/network" ]; then | ||
27 | - script="$dir/network" | ||
28 | - elif [ -x "$dir/networking" ]; then | ||
29 | - script="$dir/networking" | ||
30 | - fi | ||
31 | - fi | ||
32 | - fi | ||
33 | - done | ||
34 | - | ||
35 | - echo "$script" | ||
36 | -} | ||
37 | - | ||
38 | rescue_NIC() { | ||
39 | niclist="/var/run/vmware-active-nics" | ||
40 | |||
41 | @@ -121,7 +90,7 @@ | ||
42 | |||
43 | wakeNetworkManager | ||
44 | |||
45 | -network=`find_networking_script` | ||
46 | +network=/etc/init.d/networking | ||
47 | if [ "$network" != "error" ]; then | ||
48 | "$network" restart | ||
49 | # Continue even if the networking init script wasn't successful. | ||
diff --git a/testing/open-vm-tools/suspend-vm-default.patch b/testing/open-vm-tools/suspend-vm-default.patch new file mode 100644 index 0000000000..38f8ae71d8 --- /dev/null +++ b/testing/open-vm-tools/suspend-vm-default.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | --- a/scripts/linux/suspend-vm-default.org 2009-05-13 15:02:03.000000000 +0400 | ||
2 | +++ b/scripts/linux/suspend-vm-default 2009-05-13 15:05:18.394228810 +0400 | ||
3 | @@ -25,37 +25,6 @@ | ||
4 | echo `date` ": Executing '$0'" | ||
5 | echo | ||
6 | |||
7 | -find_networking_script() { | ||
8 | - local script="error" | ||
9 | - for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do | ||
10 | - if [ -d "$dir/rc0.d" ] && | ||
11 | - [ -d "$dir/rc1.d" ] && | ||
12 | - [ -d "$dir/rc2.d" ] && | ||
13 | - [ -d "$dir/rc3.d" ] && | ||
14 | - [ -d "$dir/rc4.d" ] && | ||
15 | - [ -d "$dir/rc5.d" ] && | ||
16 | - [ -d "$dir/rc6.d" ]; then | ||
17 | - | ||
18 | - # Now find the appropriate networking script. | ||
19 | - if [ -d "$dir/init.d" ]; then | ||
20 | - if [ -x "$dir/init.d/network" ]; then | ||
21 | - script="$dir/init.d/network" | ||
22 | - elif [ -x "$dir/init.d/networking" ]; then | ||
23 | - script="$dir/init.d/networking" | ||
24 | - fi | ||
25 | - else | ||
26 | - if [ -x "$dir/network" ]; then | ||
27 | - script="$dir/network" | ||
28 | - elif [ -x "$dir/networking" ]; then | ||
29 | - script="$dir/networking" | ||
30 | - fi | ||
31 | - fi | ||
32 | - fi | ||
33 | - done | ||
34 | - | ||
35 | - echo "$script" | ||
36 | -} | ||
37 | - | ||
38 | save_active_NIC_list() { | ||
39 | ifconfig_path=`which ifconfig 2>/dev/null` | ||
40 | if [ $? ]; then | ||
41 | @@ -76,7 +45,7 @@ | ||
42 | |||
43 | save_active_NIC_list | ||
44 | |||
45 | -network=`find_networking_script` | ||
46 | +network=/etc/init.d/networking | ||
47 | if [ "$network" != "error" ]; then | ||
48 | "$network" stop | ||
49 | # If the network is down, this may fail but that's not a good reason | ||
diff --git a/testing/squidguard/APKBUILD b/testing/squidguard/APKBUILD new file mode 100644 index 0000000000..522386ea2e --- /dev/null +++ b/testing/squidguard/APKBUILD | |||
@@ -0,0 +1,46 @@ | |||
1 | # Maintainer: Leonardo Arena <rnalrd@gmail.com> | ||
2 | pkgname=squidguard | ||
3 | _realname=squidGuard | ||
4 | pkgver=1.4 | ||
5 | pkgrel=0 | ||
6 | pkgdesc="Squid URL redirector" | ||
7 | url="http://www.squidguard.org" | ||
8 | license="GPL" | ||
9 | depends= | ||
10 | makedepends="flex bison db-dev" | ||
11 | install="$pkgname.post-install" | ||
12 | subpackages="" | ||
13 | source="http://www.squidguard.org/Downloads/$_realname-$pkgver.tar.gz | ||
14 | squidguard-1.4-gentoo.patch | ||
15 | squidguard-1.4-upstream-fixes.patch | ||
16 | squidguard-1.4-vsnprintf.patch" | ||
17 | |||
18 | _builddir="$srcdir"/$_realname-$pkgver | ||
19 | |||
20 | prepare() { | ||
21 | cd "$_builddir" | ||
22 | patch -p1 < ../../squidguard-1.4-gentoo.patch | ||
23 | patch -p1 < ../../squidguard-1.4-upstream-fixes.patch | ||
24 | patch -p1 < ../../squidguard-1.4-vsnprintf.patch | ||
25 | } | ||
26 | |||
27 | build() { | ||
28 | cd "$_builddir" | ||
29 | ./configure --prefix=/usr \ | ||
30 | --sysconfdir=/etc \ | ||
31 | --with-sg-config=/etc/squidGuard/squidGuard.conf \ | ||
32 | --with-sg-logdir=/var/log/squidGuard | ||
33 | make || return 1 | ||
34 | } | ||
35 | |||
36 | package() { | ||
37 | cd "$_builddir" | ||
38 | make INSTDIR="$pkgdir" install | ||
39 | install -D -m644 ../../squidGuard.conf.blocksites $pkgdir/etc/squidGuard/squidGuard.conf | ||
40 | install -D -m644 ../../blockedsites $pkgdir/etc/squidGuard/blockedsites | ||
41 | } | ||
42 | |||
43 | md5sums="de834150998c1386c30feae196f16b06 squidGuard-1.4.tar.gz | ||
44 | ba58e934fe2f75fcb5dfbe054e045449 squidguard-1.4-gentoo.patch | ||
45 | 4b512e930dede70ddf36d4f7c75a598f squidguard-1.4-upstream-fixes.patch | ||
46 | 8878c72f27e45dab99e5d0197d50caec squidguard-1.4-vsnprintf.patch" | ||
diff --git a/testing/squidguard/blockedsites b/testing/squidguard/blockedsites new file mode 100644 index 0000000000..46279a47ee --- /dev/null +++ b/testing/squidguard/blockedsites | |||
@@ -0,0 +1 @@ | |||
sex.com | |||
diff --git a/testing/squidguard/squidGuard.conf.blocksites b/testing/squidguard/squidGuard.conf.blocksites new file mode 100644 index 0000000000..eaa8cdeef0 --- /dev/null +++ b/testing/squidguard/squidGuard.conf.blocksites | |||
@@ -0,0 +1,13 @@ | |||
1 | logdir /var/log/squidGuard | ||
2 | dbhome /etc/squidGuard/db | ||
3 | |||
4 | dest blockedsites { | ||
5 | domainlist blockedsites | ||
6 | } | ||
7 | |||
8 | acl { | ||
9 | default { | ||
10 | pass !blockedsites all | ||
11 | redirect http://www.sample.com/empty.png | ||
12 | } | ||
13 | } | ||
diff --git a/testing/squidguard/squidGuard.conf.minimal b/testing/squidguard/squidGuard.conf.minimal new file mode 100644 index 0000000000..3b0ebf55c7 --- /dev/null +++ b/testing/squidguard/squidGuard.conf.minimal | |||
@@ -0,0 +1,7 @@ | |||
1 | logdir /var/log/squidGuard | ||
2 | |||
3 | acl { | ||
4 | default { | ||
5 | pass all | ||
6 | } | ||
7 | } | ||
diff --git a/testing/squidguard/squidguard-1.4-gentoo.patch b/testing/squidguard/squidguard-1.4-gentoo.patch new file mode 100644 index 0000000000..60b5461e9e --- /dev/null +++ b/testing/squidguard/squidguard-1.4-gentoo.patch | |||
@@ -0,0 +1,74 @@ | |||
1 | diff -Nru squidGuard-1.4.orig/Makefile.in squidGuard-1.4/Makefile.in | ||
2 | --- squidGuard-1.4.orig/Makefile.in 2008-05-17 18:36:44.000000000 +0000 | ||
3 | +++ squidGuard-1.4/Makefile.in 2009-01-10 13:02:14.000000000 +0000 | ||
4 | @@ -43,7 +43,7 @@ | ||
5 | # Dependencies for installing | ||
6 | # | ||
7 | |||
8 | -install: install-build install-conf | ||
9 | +install: install-build | ||
10 | |||
11 | install-conf: | ||
12 | @echo Installing configuration file ; | ||
13 | @@ -85,10 +85,10 @@ | ||
14 | |||
15 | install-build: | ||
16 | @echo Installing squidGuard | ||
17 | - @if [ ! -d $(bindir) ]; then \ | ||
18 | - $(MKINSTALLDIRS) $(bindir) ; \ | ||
19 | + @if [ ! -d "$(INSTDIR)"/$(bindir) ]; then \ | ||
20 | + $(MKINSTALLDIRS) "$(INSTDIR)"/$(bindir) ; \ | ||
21 | fi ; \ | ||
22 | - cp src/squidGuard $(bindir) || exit 1 ; \ | ||
23 | + cp src/squidGuard "$(INSTDIR)"/$(bindir) || exit 1 ; \ | ||
24 | echo Done. ; | ||
25 | |||
26 | clean:: | ||
27 | diff -Nru squidGuard-1.4.orig/src/Makefile.in squidGuard-1.4/src/Makefile.in | ||
28 | --- squidGuard-1.4.orig/src/Makefile.in 2009-01-03 20:05:39.000000000 +0000 | ||
29 | +++ squidGuard-1.4/src/Makefile.in 2009-01-10 13:02:14.000000000 +0000 | ||
30 | @@ -110,6 +110,8 @@ | ||
31 | mv -f y.tab.c y.tab.c.bison | ||
32 | mv -f y.tab.h y.tab.h.bison | ||
33 | |||
34 | +sg.y sg.l: | ||
35 | + | ||
36 | # | ||
37 | # Dependencies for installing | ||
38 | # | ||
39 | @@ -122,8 +124,8 @@ | ||
40 | |||
41 | install.bin:: squidGuard | ||
42 | @echo making $@ in `basename \`pwd\`` | ||
43 | - @$(MKDIR) $(bindir) $(logdir) $(cfgdir) | ||
44 | - $(INSTALL_PROGRAM) squidGuard $(bindir)/squidGuard | ||
45 | + @$(MKDIR) "$(INSTDIR)"/$(bindir) "$(INSTDIR)"/$(logdir) "$(INSTDIR)"/$(cfgdir) | ||
46 | + $(INSTALL_PROGRAM) squidGuard "$(INSTDIR)"/$(bindir)/squidGuard | ||
47 | |||
48 | uninstall.bin:: | ||
49 | @echo making $@ in `basename \`pwd\`` | ||
50 | diff -Nru squidGuard-1.4.orig/src/sgDb.c squidGuard-1.4/src/sgDb.c | ||
51 | --- squidGuard-1.4.orig/src/sgDb.c 2008-07-14 18:29:41.000000000 +0000 | ||
52 | +++ squidGuard-1.4/src/sgDb.c 2009-01-10 13:02:14.000000000 +0000 | ||
53 | @@ -103,13 +103,21 @@ | ||
54 | if(createdb) | ||
55 | flag = flag | DB_TRUNCATE; | ||
56 | if ((ret = | ||
57 | +#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) | ||
58 | + Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) { | ||
59 | +#else | ||
60 | Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) { | ||
61 | +#endif | ||
62 | (void) Db->dbp->close(Db->dbp, 0); | ||
63 | sgLogFatalError("Error db_open: %s", strerror(ret)); | ||
64 | } | ||
65 | } else { | ||
66 | if ((ret = | ||
67 | +#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) | ||
68 | + Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) { | ||
69 | +#else | ||
70 | Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) { | ||
71 | +#endif | ||
72 | sgLogFatalError("Error db_open: %s", strerror(ret)); | ||
73 | } | ||
74 | } | ||
diff --git a/testing/squidguard/squidguard-1.4-upstream-fixes.patch b/testing/squidguard/squidguard-1.4-upstream-fixes.patch new file mode 100644 index 0000000000..007e6b4c36 --- /dev/null +++ b/testing/squidguard/squidguard-1.4-upstream-fixes.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | diff -Nru squidGuard-1.4.orig/src/sgDiv.c.in squidGuard-1.4/src/sgDiv.c.in | ||
2 | --- squidGuard-1.4.orig/src/sgDiv.c.in 2008-07-14 18:02:43.000000000 +0200 | ||
3 | +++ squidGuard-1.4/src/sgDiv.c.in 2009-11-28 09:33:05.000000000 +0100 | ||
4 | @@ -745,7 +745,7 @@ | ||
5 | p++; | ||
6 | break; | ||
7 | case 'u': /* Requested URL */ | ||
8 | - strcat(buf, req->orig); | ||
9 | + strncat(buf, req->orig, 2048); | ||
10 | p++; | ||
11 | break; | ||
12 | default: | ||
13 | diff -Nru squidGuard-1.4.orig/src/sg.h.in squidGuard-1.4/src/sg.h.in | ||
14 | --- squidGuard-1.4.orig/src/sg.h.in 2007-11-16 17:58:32.000000000 +0100 | ||
15 | +++ squidGuard-1.4/src/sg.h.in 2009-11-28 09:33:37.000000000 +0100 | ||
16 | @@ -73,7 +73,7 @@ | ||
17 | #define REQUEST_TYPE_REDIRECT 2 | ||
18 | #define REQUEST_TYPE_PASS 3 | ||
19 | |||
20 | -#define MAX_BUF 4096 | ||
21 | +#define MAX_BUF 12288 | ||
22 | |||
23 | #define DEFAULT_LOGFILE "squidGuard.log" | ||
24 | #define WARNING_LOGFILE "squidGuard.log" | ||
diff --git a/testing/squidguard/squidguard-1.4-vsnprintf.patch b/testing/squidguard/squidguard-1.4-vsnprintf.patch new file mode 100644 index 0000000000..bf4efec604 --- /dev/null +++ b/testing/squidguard/squidguard-1.4-vsnprintf.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | diff -Nru squidGuard-1.4.orig/configure.in squidGuard-1.4/configure.in | ||
2 | --- squidGuard-1.4.orig/configure.in 2009-04-26 12:28:49.000000000 +0000 | ||
3 | +++ squidGuard-1.4/configure.in 2009-04-26 12:29:35.000000000 +0000 | ||
4 | @@ -421,7 +421,7 @@ | ||
5 | AC_CHECK_FUNCS(regexec, , AC_MSG_ERROR([No regexec library function.])) | ||
6 | AC_CHECK_FUNCS(strdup, , AC_MSG_ERROR([No strdup library function.])) | ||
7 | AC_CHECK_FUNCS(strerror, , AC_MSG_ERROR([No strerror library function.])) | ||
8 | -AC_CHECK_FUNCS(vsprintf, , AC_MSG_ERROR([No vsprintf library function.])) | ||
9 | +AC_CHECK_FUNCS(vsnprintf, , AC_MSG_ERROR([No vsnprintf library function.])) | ||
10 | AC_CHECK_FUNCS(sigaction) | ||
11 | AC_CHECK_FUNCS(signal) | ||
12 | |||
13 | diff -Nru squidGuard-1.4.orig/src/sgLog.c squidGuard-1.4/src/sgLog.c | ||
14 | --- squidGuard-1.4.orig/src/sgLog.c 2007-11-16 16:58:32.000000000 +0000 | ||
15 | +++ squidGuard-1.4/src/sgLog.c 2009-04-26 12:31:40.000000000 +0000 | ||
16 | @@ -55,7 +55,7 @@ | ||
17 | char msg[MAX_BUF]; | ||
18 | va_list ap; | ||
19 | VA_START(ap, format); | ||
20 | - if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) | ||
21 | + if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) | ||
22 | fprintf(stderr,"overflow in vsprintf (sgLog): %s",strerror(errno)); | ||
23 | va_end(ap); | ||
24 | date = niso(0); | ||
25 | @@ -87,8 +87,8 @@ | ||
26 | char msg[MAX_BUF]; | ||
27 | va_list ap; | ||
28 | VA_START(ap, format); | ||
29 | - if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) | ||
30 | - sgLogFatalError("overflow in vsprintf (sgLogError): %s",strerror(errno)); | ||
31 | + if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) | ||
32 | + fprintf(stderr,"overflow in vsprintf (sgLogError): %s",strerror(errno)); | ||
33 | va_end(ap); | ||
34 | sgLog(globalErrorLog,"%s",msg); | ||
35 | } | ||
36 | @@ -104,7 +104,7 @@ | ||
37 | char msg[MAX_BUF]; | ||
38 | va_list ap; | ||
39 | VA_START(ap, format); | ||
40 | - if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) | ||
41 | + if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) | ||
42 | return; | ||
43 | va_end(ap); | ||
44 | sgLog(globalErrorLog,"%s",msg); | ||
diff --git a/testing/squidguard/squidguard.post-install b/testing/squidguard/squidguard.post-install new file mode 100644 index 0000000000..2620de05f4 --- /dev/null +++ b/testing/squidguard/squidguard.post-install | |||
@@ -0,0 +1,3 @@ | |||
1 | #!/bin/sh | ||
2 | mkdir /var/log/squidGuard &>/dev/null | ||
3 | chown squid.squid /var/log/squidGuard | ||
diff --git a/testing/tbl/APKBUILD b/testing/tbl/APKBUILD new file mode 100644 index 0000000000..de2286ea68 --- /dev/null +++ b/testing/tbl/APKBUILD | |||
@@ -0,0 +1,39 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
2 | pkgname=tbl | ||
3 | pkgver=0.1.5 | ||
4 | pkgrel=0 | ||
5 | pkgdesc="Utility to format tables for troff" | ||
6 | url="http://tbl.bsd.lv/" | ||
7 | license="ISC" | ||
8 | depends= | ||
9 | makedepends= | ||
10 | install= | ||
11 | subpackages="$pkgname-doc" | ||
12 | source="http://tbl.bsd.lv/snapshots/tbl-$pkgver.tar.gz | ||
13 | tbl-install.patch" | ||
14 | |||
15 | _builddir="$srcdir"/$pkgname-$pkgver | ||
16 | |||
17 | prepare() { | ||
18 | cd "$_builddir" | ||
19 | for i in $source; do | ||
20 | case $i in | ||
21 | *.patch) | ||
22 | patch -p1 -i "$srcdir"/$i || return 1 | ||
23 | ;; | ||
24 | esac | ||
25 | done | ||
26 | } | ||
27 | |||
28 | build() { | ||
29 | cd "$_builddir" | ||
30 | make || return 1 | ||
31 | } | ||
32 | |||
33 | package() { | ||
34 | cd "$_builddir" | ||
35 | make DESTDIR="$pkgdir" PREFIX=/usr MANDIR=/usr/share/man install | ||
36 | } | ||
37 | |||
38 | md5sums="633edde9037b0a01b045b05e655ee7c9 tbl-0.1.5.tar.gz | ||
39 | e4f29245b659de9814ff1a7a1c98ffb2 tbl-install.patch" | ||
diff --git a/testing/tbl/tbl-install.patch b/testing/tbl/tbl-install.patch new file mode 100644 index 0000000000..72465ea2d8 --- /dev/null +++ b/testing/tbl/tbl-install.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | --- ./Makefile.orig | ||
2 | +++ ./Makefile | ||
3 | @@ -64,11 +64,11 @@ | ||
4 | install -m 0444 tbl-$(VERSION).md5 $(PREFIX)/snapshots/tbl.md5 | ||
5 | |||
6 | install: | ||
7 | - mkdir -p $(BINDIR) | ||
8 | - mkdir -p $(MANDIR)/man5 | ||
9 | - $(INSTALL_PROGRAM) tbl $(BINDIR) | ||
10 | - $(INSTALL_MAN) tbl.5 $(MANDIR)/man5 | ||
11 | - $(INSTALL_MAN) tbl.1 $(MANDIR)/man1 | ||
12 | + mkdir -p $(DESTDIR)$(BINDIR) | ||
13 | + mkdir -p $(DESTDIR)$(MANDIR)/man5 | ||
14 | + $(INSTALL_PROGRAM) tbl $(DESTDIR)$(BINDIR) | ||
15 | + $(INSTALL_MAN) tbl.5 $(DESTDIR)$(MANDIR)/man5 | ||
16 | + $(INSTALL_MAN) tbl.1 $(DESTDIR)$(MANDIR)/man1 | ||
17 | |||
18 | main.o: main.c tbl.h | ||
19 | |||