diff options
Diffstat (limited to 'main')
90 files changed, 6509 insertions, 4169 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgdesc="Script to build Alpine Packages" pkgname=abuild -pkgver=2.3 -pkgrel=1 +pkgver=2.4 +pkgrel=0 url=http://git.alpinelinux.org/cgit/abuild/ source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2 - abuild-conflict-message.patch " depends="fakeroot file sudo pax-utils openssl apk-tools" makedepends="openssl-dev pkgconfig" @@ -34,5 +33,4 @@ package() { install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf } -md5sums="7c738e0018202160366b8329ec693502 abuild-2.3.tar.bz2 -45ee7aa6e00732a8c36d7740fb8d2aeb abuild-conflict-message.patch" +md5sums="84cde3b9c263b91b2381591a6342aaa6 abuild-2.4.tar.bz2" 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-base pkgver=2.0 -pkgrel=2 +pkgrel=3 pkgdesc="Meta package for minimal alpine base" url="http://alpinelinux.org" license="GPL" depends="alpine-baselayout alpine-conf apk-tools busybox busybox-initscripts - openrc uclibc-utils" + openrc uclibc-utils bbsuid" makedepends= install= 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 @@ +From 49a6f8a8b52060d8fe0f97aa6f1d5c47b40b65c1 Mon Sep 17 00:00:00 2001 +From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> +Date: Tue, 6 Jul 2010 22:31:33 +0200 +Subject: [PATCH 1/5] Fix regression of AC_CONFIG_SUBDIRS with multiple arguments. + +* lib/autoconf/status.m4 (AC_CONFIG_SUBDIRS): Do not assume the +argument is a single word. +* tests/torture.at (Deep Package): Extend test to cover this. +(Non-literal AC_CONFIG_SUBDIRS): New test. +* doc/autoconf.texi (Subdirectories): Add example marker. +* NEWS: Update. +Report by Bruno Haible. + +Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> +--- + ChangeLog | 12 ++++++++++ + NEWS | 2 + + doc/autoconf.texi | 1 + + lib/autoconf/status.m4 | 2 +- + tests/torture.at | 54 +++++++++++++++++++++++++++++++++++++++++++++++- + 5 files changed, 69 insertions(+), 2 deletions(-) + +diff --git a/doc/autoconf.texi b/doc/autoconf.texi +index 0c106c7..39c2ba6 100644 +--- a/doc/autoconf.texi ++++ b/doc/autoconf.texi +@@ -3617,6 +3617,7 @@ Make @code{AC_OUTPUT} run @command{configure} in each subdirectory + be a literal, i.e., please do not use: + + @example ++@c If you change this example, adjust tests/torture.at:Non-literal AC_CONFIG_SUBDIRS. + if test "x$package_foo_enabled" = xyes; then + my_subdirs="$my_subdirs foo" + fi +diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4 +index 52b7a3d..b9e7026 100644 +--- a/lib/autoconf/status.m4 ++++ b/lib/autoconf/status.m4 +@@ -1102,7 +1102,7 @@ AC_DEFUN([AC_CONFIG_SUBDIRS], + _AC_CONFIG_COMPUTE_DEST(], [))])]dnl + [m4_append([_AC_LIST_SUBDIRS], [$1], [ + ])]dnl +-[AS_LITERAL_WORD_IF([$1], [], ++[AS_LITERAL_IF([$1], [], + [AC_DIAGNOSE([syntax], [$0: you should use literals])])]dnl + [AC_SUBST([subdirs], ["$subdirs m4_normalize([$1])"])]) + +diff --git a/tests/torture.at b/tests/torture.at +index 5f13874..e7f61ed 100644 +--- a/tests/torture.at ++++ b/tests/torture.at +@@ -1567,7 +1567,9 @@ AC_ARG_VAR([INNER2], [an inner2 variable]) + AC_OUTPUT + ]]) + +-AT_CHECK([autoreconf -Wall -v], [0], [ignore], [ignore]) ++AT_CHECK([autoreconf -Wall -v], [0], [ignore], [stderr]) ++# We should not warn about nonliteral argument to AC_CONFIG_SUBDIRS here. ++AT_CHECK([grep 'AC_CONFIG_SUBDIRS:.*literals' stderr], [1]) + AT_CHECK([test -f inner/configure]) + AT_CHECK([test -f inner/innermost/configure]) + AT_CHECK([test -f inner/innermost/config.hin]) +@@ -1693,6 +1695,56 @@ AT_CHECK([test -f inner/myfile], 0) + AT_CLEANUP + + ++## ------------------------------- ## ++## Non-literal AC_CONFIG_SUBDIRS. ## ++## ------------------------------- ## ++ ++AT_SETUP([Non-literal AC_CONFIG_SUBDIRS]) ++AT_KEYWORDS([autoreconf]) ++ ++# We use aclocal (via autoreconf). ++AT_CHECK([aclocal --version || exit 77], [], [ignore], [ignore]) ++ ++AT_DATA([install-sh], []) ++AT_DATA([configure.in], ++[[AC_INIT(GNU Outer, 1.0) ++ ++my_subdirs= ++# Taken from autoconf.texi:Subdirectories. ++if test "x$package_foo_enabled" = xyes; then ++ my_subdirs="$my_subdirs foo" ++fi ++AC_CONFIG_SUBDIRS([$my_subdirs]) ++AC_OUTPUT ++]]) ++ ++AS_MKDIR_P([foo]) ++ ++AT_DATA([foo/configure], ++[[#! /bin/sh ++touch innerfile ++exit 0 ++]]) ++chmod +x foo/configure ++ ++# autoreconf should warn without -Wno-syntax, but should not fail without -Werror. ++AT_CHECK([autoreconf -Werror -v], [1], [ignore], [stderr]) ++AT_CHECK([grep 'AC_CONFIG_SUBDIRS:.*literals' stderr], [0], [ignore]) ++AT_CHECK([autoreconf -v], [0], [ignore], [stderr]) ++AT_CHECK([grep 'AC_CONFIG_SUBDIRS:.*literals' stderr], [0], [ignore]) ++# We cannot assume aclocal won't warn (aclocal-1.9 does not understand -W* ++# options), so check autoconf only. ++AT_CHECK([autoconf --force -Wno-syntax], 0, [ignore], [stderr]) ++AT_CHECK([grep 'AC_CONFIG_SUBDIRS:.*literals' stderr], [1]) ++ ++AT_CHECK([./configure $configure_options], [0], [ignore]) ++AT_CHECK([test ! -f foo/innerfile]) ++# Running the outer configure should trigger the inner. ++AT_CHECK([./configure $configure_options package_foo_enabled=yes], [0], [ignore]) ++AT_CHECK([test -f foo/innerfile]) ++ ++AT_CLEANUP ++ + + ## ----------------- ## + ## Empty directory. ## +-- +1.7.1.1 + 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 @@ +From dfda4402552ac26ce91399e2a812aee4772a512e Mon Sep 17 00:00:00 2001 +From: Eric Blake <eblake@redhat.com> +Date: Tue, 6 Jul 2010 22:00:44 +0200 +Subject: [PATCH 2/5] Fix regression of AC_CHECK_SIZEOF on pointer types. + +* lib/autoconf/types.m4 (AC_CHECK_SIZEOF): Translate `*' to `p' +when checking literal-ness of the type, for pointer types. +* lib/m4sugar/m4sh.m4 (_AS_TR_SH): Also consider `*' as literal. +(_AS_TR_CPP): Likewise. +* tests/semantics.at (AC_CHECK_ALIGNOF struct): When checking +for numeric answer, be sure to not allow variable references. +(AC_CHECK_SIZEOF struct): Likewise. Also, test the +`AC_CHECK_SIZEOF([int *])' example from the manual. +* doc/autoconf.texi (Generic Compiler Characteristics): Add +example marker. +* NEWS: Update. +Reports by Nishio Futoshi and Roberto Bagnara. + +Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> +--- + ChangeLog | 17 +++++++++++++++++ + NEWS | 3 +++ + doc/autoconf.texi | 1 + + lib/autoconf/types.m4 | 2 +- + lib/m4sugar/m4sh.m4 | 4 ++-- + tests/semantics.at | 10 +++++++--- + 6 files changed, 31 insertions(+), 6 deletions(-) + +diff --git a/doc/autoconf.texi b/doc/autoconf.texi +index 39c2ba6..76b01c9 100644 +--- a/doc/autoconf.texi ++++ b/doc/autoconf.texi +@@ -6957,6 +6957,7 @@ argument was used when cross-compiling. + For example, the call + + @example ++@c If you change this example, adjust tests/semantics.at:AC_F77_DUMMY_MAIN usage. + AC_CHECK_SIZEOF([int *]) + @end example + +diff --git a/lib/autoconf/types.m4 b/lib/autoconf/types.m4 +index ee07148..9f482da 100644 +--- a/lib/autoconf/types.m4 ++++ b/lib/autoconf/types.m4 +@@ -763,7 +763,7 @@ Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.]) + # AC_CHECK_SIZEOF(TYPE, [IGNORED], [INCLUDES = DEFAULT-INCLUDES]) + # --------------------------------------------------------------- + AC_DEFUN([AC_CHECK_SIZEOF], +-[AS_LITERAL_IF([$1], [], ++[AS_LITERAL_IF(m4_translit([[$1]], [*], [p]), [], + [m4_fatal([$0: requires literal arguments])])]dnl + [# The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4 +index e1d03d9..6fbc9e1 100644 +--- a/lib/m4sugar/m4sh.m4 ++++ b/lib/m4sugar/m4sh.m4 +@@ -1779,7 +1779,7 @@ m4_defun_init([AS_TR_SH], + [_$0(m4_expand([$1]))]) + + m4_define([_AS_TR_SH], +-[_AS_LITERAL_IF([$1], [ ][ ++[_AS_LITERAL_IF([$1], [*][ ][ + ])([], [$0_INDIR], [$0_LITERAL])([$1])]) + + m4_define([_AS_TR_SH_LITERAL], +@@ -1812,7 +1812,7 @@ m4_defun_init([AS_TR_CPP], + [_$0(m4_expand([$1]))]) + + m4_define([_AS_TR_CPP], +-[_AS_LITERAL_IF([$1], [ ][ ++[_AS_LITERAL_IF([$1], [*][ ][ + ])([], [$0_INDIR], [$0_LITERAL])([$1])]) + + m4_define([_AS_TR_CPP_LITERAL], +diff --git a/tests/semantics.at b/tests/semantics.at +index b703fd4..48136cd 100644 +--- a/tests/semantics.at ++++ b/tests/semantics.at +@@ -350,7 +350,7 @@ AT_CHECK_MACRO_CROSS([AC_CHECK_ALIGNOF struct], + [[AC_CHECK_ALIGNOF([struct { char c; }]) + AC_CHECK_ALIGNOF([struct nosuchstruct]) + ]], +-[AT_CHECK([[grep "#define ALIGNOF_STRUCT___CHAR_C___ [^0]" config.h]], ++[AT_CHECK([[grep "#define ALIGNOF_STRUCT___CHAR_C___ [1-9]" config.h]], + 0, ignore) + AT_CHECK([[grep "#define ALIGNOF_STRUCT_NOSUCHSTRUCT 0" config.h]], + 0, ignore) +@@ -379,13 +379,17 @@ AT_CHECK_MACRO_CROSS([AC_CHECK_SIZEOF struct], + AC_CHECK_SIZEOF([struct x], [], [struct x { char c; int x; };]) + AC_CHECK_SIZEOF([const struct x], [], [struct x { const char *p; int x; };]) + AC_CHECK_SIZEOF([struct nosuchstruct]) ++# Taken from autoconf.texi:Generic Compiler Characteristics. ++AC_CHECK_SIZEOF([int *]) + ]], +-[AT_CHECK([[grep "#define SIZEOF_STRUCT_X [^0]" config.h]], ++[AT_CHECK([[grep "#define SIZEOF_STRUCT_X [1-9]" config.h]], + 0, ignore) +-AT_CHECK([[grep "#define SIZEOF_CONST_STRUCT_X [^0]" config.h]], ++AT_CHECK([[grep "#define SIZEOF_CONST_STRUCT_X [1-9]" config.h]], + 0, ignore) + AT_CHECK([[grep "#define SIZEOF_STRUCT_NOSUCHSTRUCT 0" config.h]], + 0, ignore) ++AT_CHECK([[grep "#define SIZEOF_INT_P [1-9]" config.h]], ++ 0, ignore) + ]) + + +-- +1.7.1.1 + 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=autoconf -pkgver=2.64 -pkgrel=0 +pkgver=2.66 +pkgrel=1 pkgdesc="A GNU tool for automatically configuring source code" license="GPL2 GPL3" url="http://www.gnu.org/software/autoconf" depends="m4 perl" -source="ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz" +source="ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz + 0001-Fix-regression-of-AC_CONFIG_SUBDIRS-with-multiple-ar.patch + 0002-Fix-regression-of-AC_CHECK_SIZEOF-on-pointer-types.patch + " subpackages="$pkgname-doc" +prepare() { + cd "$srcdir"/$pkgname-$pkgver + for i in $source; do + case $i in + *.patch) + msg "Applying $i" + patch -p1 -i "$srcdir"/$i || return 1 + esac + done +} + build() { cd "$srcdir"/$pkgname-$pkgver M4=/usr/bin/m4 ./configure --prefix=/usr make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 rm -f "$pkgdir"/usr/share/info/dir # conflict with bintuils rm -f "$pkgdir"/usr/share/info/standards.info } -md5sums="30a198cef839471dd4926e92ab485361 autoconf-2.64.tar.gz" +md5sums="fb00d77cbc468994c55919298af1ff02 autoconf-2.66.tar.gz +f01c3e92881326c68e62c1cf57aad0ad 0001-Fix-regression-of-AC_CONFIG_SUBDIRS-with-multiple-ar.patch +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 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname="bacula" pkgver=5.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="Enterprise ready, network based backup program" url="http://www.bacula.org" license="GPL2" @@ -29,11 +29,8 @@ prepare () { build() { cd "$srcdir/$pkgname-$pkgver" export LDFLAGS= - # Need to run configure at least once # in order to do not go into an infinite loop - ./configure - make configure - make distclean + aclocal && autoconf && automake ./configure --prefix=/usr \ --sysconfdir=/etc/bacula \ @@ -56,11 +53,7 @@ build() { --with-sd-user=bacula \ --with-sd-group=bacula \ --with-fd-user=root \ - --with-fd-group=root \ - --with-dir-password=PuemReTsKKObLe3TTaU73a3dPWwISW \ - --with-fd-password=Mbh1ujsgZ2ogRFVjPWD9TAVMFP6o8E \ - --with-sd-password=icpaksuq0gpDStLT8Uqgk1HIozFnx1 \ - --with-db-password=BQrlfPPfdXdMHlJID0HrGHZde2Lqd9 + --with-fd-group=root make || return 1 } 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 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bind -pkgver=9.7.0_p1 +pkgver=9.7.1 _ver=${pkgver%_p*} _p=${pkgver#*_p} -pkgrel=2 +pkgrel=0 pkgdesc="BIND - Berkeley Internet Name Domain - Name Server and tools" url="http://www.isc.org" license="as-is" @@ -12,7 +12,7 @@ depends= makedepends="openssl-dev perl" install="$pkgname.pre-install $pkgname.post-install" subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-tools" -source="http://ftp.isc.org/isc/bind9/${_ver}-P${_p}/bind-${_ver}-P${_p}.tar.gz +source="http://ftp.isc.org/isc/bind9/${_ver}/bind-${_ver}.tar.gz bind.so_bsdcompat.patch $pkgname.initd $pkgname.confd @@ -22,7 +22,7 @@ source="http://ftp.isc.org/isc/bind9/${_ver}-P${_p}/bind-${_ver}-P${_p}.tar.gz $pkgname.named.ca " -_builddir="$srcdir/bind-${_ver}-P${_p}" +_builddir="$srcdir/bind-${_ver}" prepare() { cd "$_builddir" @@ -92,7 +92,7 @@ tools() { done } -md5sums="78e3e38c6252e41ded1afa1aeb183622 bind-9.7.0-P1.tar.gz +md5sums="712c425e59cb4aa9309bc4716283742f bind-9.7.1.tar.gz f270a5b0a28ab6e818840c5c368ddbcc bind.so_bsdcompat.patch 92914193cc603d8d81ef00534ce9c1c9 bind.initd 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox -pkgver=1.16.1 -pkgrel=4 +pkgver=1.16.2 +pkgrel=2 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net license="GPL-2" @@ -11,14 +11,8 @@ subpackages="$pkgname-static" triggers="busybox.trigger:/bin /usr/bin /sbin /usr/sbin /lib/modules/*" source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 $pkgname-1.11.1-bb.patch + diff.patch flock-bb.patch - http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-ash.patch - http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-cpio.patch - http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-dhcpd.patch - http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-dnsd.patch - http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-hwclock.patch - http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-indexcgi.patch - http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-sed.patch busyboxconfig" _builddir="$srcdir"/$pkgname-$pkgver @@ -74,14 +68,8 @@ static() { } -md5sums="319486ec65078d07fde26eb620fecde7 busybox-1.16.1.tar.bz2 +md5sums="2ba980f720a5bdce4ec05423519acc35 busybox-1.16.2.tar.bz2 4c0f3b486eaa0674961b7ddcd0c60a9b busybox-1.11.1-bb.patch +5ce533f9727761c31de5b5f9df568f2f diff.patch 20d9beea7d0c0aaca14553a8f98fee12 flock-bb.patch -b328c15e90c58c44f283838f224c3c97 busybox-1.16.1-ash.patch -301feec832c938c235d370ae09f90713 busybox-1.16.1-cpio.patch -54607ef7a80b6c3aa397788ce9166cc3 busybox-1.16.1-dhcpd.patch -9fd18c9833253119996039429bee1992 busybox-1.16.1-dnsd.patch -b16ad6491dcb4f053f84ae2c4064918d busybox-1.16.1-hwclock.patch -c3bc34309334c456b6f905f0708c914f busybox-1.16.1-indexcgi.patch -8e1ef2dc70aaaa6f1af1d5e0541de103 busybox-1.16.1-sed.patch 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 @@ +commit 61f5f7823c4f217dd9bad2f1df547f81b9338c76 +Author: Matheus Izvekov <mizvekov@gmail.com> +Date: Fri Jul 9 19:40:00 2010 +0200 + + diff: fix "diff dir1 dir2/". Closes bug 2203 + + Signed-off-by: Matheus Izvekov <mizvekov@gmail.com> + Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> + +diff --git a/editors/diff.c b/editors/diff.c +index 07594e8..8d91b83 100644 +--- a/editors/diff.c ++++ b/editors/diff.c +@@ -760,9 +760,11 @@ static int FAST_FUNC add_to_dirlist(const char *filename, + void *userdata, int depth UNUSED_PARAM) + { + struct dlist *const l = userdata; ++ const char *file = filename + l->len; + l->dl = xrealloc_vector(l->dl, 6, l->e); +- /* + 1 skips "/" after dirname */ +- l->dl[l->e] = xstrdup(filename + l->len + 1); ++ while(*file == '/') ++ file++; ++ l->dl[l->e] = xstrdup(file); + l->e++; + return TRUE; + } +diff --git a/testsuite/diff.tests b/testsuite/diff.tests +index 06d5a4f..27a4b33 100755 +--- a/testsuite/diff.tests ++++ b/testsuite/diff.tests +@@ -4,7 +4,7 @@ + + . ./testing.sh + +-# testing "test name" "options" "expected result" "file input" "stdin" ++# testing "test name" "commands" "expected result" "file input" "stdin" + + # diff outputs date/time in the header, which should not be analysed + # NB: sed has tab character in s command! +@@ -100,9 +100,11 @@ testing "diff always takes context from old file" \ + "abc\na c\ndef\n" \ + "a c\n" + +-# testing "test name" "options" "expected result" "file input" "stdin" ++# testing "test name" "commands" "expected result" "file input" "stdin" + ++# clean up + rm -rf diff1 diff2 ++ + mkdir diff1 diff2 diff2/subdir + echo qwe >diff1/- + echo asd >diff2/subdir/- +@@ -187,4 +189,29 @@ SKIP= + # clean up + rm -rf diff1 diff2 + ++# NOT using directory structure from prev test... ++mkdir diff1 diff2 ++echo qwe >diff1/- ++echo rty >diff2/- ++optional FEATURE_DIFF_DIR ++testing "diff diff1 diff2/" \ ++ "diff -ur diff1 diff2/ | $TRIM_TAB; diff -ur .///diff1 diff2//// | $TRIM_TAB" \ ++"\ ++--- diff1/- +++++ diff2/- ++@@ -1 +1 @@ ++-qwe +++rty ++--- .///diff1/- +++++ diff2////- ++@@ -1 +1 @@ ++-qwe +++rty ++" \ ++ "" "" ++SKIP= ++ ++# clean up ++rm -rf diff1 diff2 ++ + 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 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=c-ares -pkgver=1.7.0 -pkgrel=1 +pkgver=1.7.3 +pkgrel=0 pkgdesc="An asynchronously DNS/names resolver library" url="http://c-ares.haxx.se/" license="GPL" @@ -26,4 +26,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="15ab7852306b554b0b1145f41005a3bb c-ares-1.7.0.tar.gz" +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 @@ # Contributor: # Maintainer: pkgname=collectd -pkgver=4.9.1 -pkgrel=3 +pkgver=4.10.1 +pkgrel=0 pkgdesc="The system statistics collection daemon" url="http://collectd.org" license="GPL" @@ -79,5 +79,5 @@ postgresql() { _plugin postgresql; } mysql() { _plugin mysql; } network() { _plugin network; } -md5sums="5753496651c8c84afaea1fe290876bfc collectd-4.9.1.tar.bz2 +md5sums="8cd79b4ebdb9dbeb51ba52d3463a06ef collectd-4.10.1.tar.bz2 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=coreutils pkgver=8.5 -pkgrel=0 +pkgrel=1 pkgdesc="The basic file, shell and text manipulation utilities" url="http://www.gnu.org/software/coreutils/" license="GPL" @@ -19,7 +19,9 @@ build() { --mandir=/usr/share/man \ --infodir=/usr/share/info \ --disable-nls \ - --without-gmp + --without-gmp \ + --enable-no-install-program=arch,hostname,su,kill,uptime \ + || return 1 make || return 1 } 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dhcp -pkgver=4.1.0_p1 -_realver=4.1.0p1 -pkgrel=10 +pkgver=4.1.1_p1 +_realver=4.1.1-P1 +pkgrel=1 pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)" url="https://www.isc.org/" license="GPL" @@ -21,7 +21,7 @@ source="http://ftp.isc.org/isc/dhcp/dhcp-4.1-history/$pkgname-$_realver.tar.gz prepare() { cd "$srcdir/$pkgname-$_realver" patch -p1 -i "$srcdir"/dhcp-3.0-fix-perms.patch || return 1 - patch -p1 -i ../linux_ipv6_discover.patch || return 1 + # patch -p1 -i ../linux_ipv6_discover.patch || return 1 } build() { @@ -74,7 +74,7 @@ dhcrelay() { "$subpkgdir"/etc/conf.d/dhcrelay } -md5sums="325ff8338c5a21f89d5304ac13ffebdf dhcp-4.1.0p1.tar.gz +md5sums="ee390a35687dd75dbfc32c856c0938d1 dhcp-4.1.1-P1.tar.gz 37abf1fb047a353e91b022fafdabf39a linux_ipv6_discover.patch a9eaf182dae3984670da52f20ae10fba dhcp-3.0-fix-perms.patch 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dhcpcd-ui -pkgver=0.4.3 -pkgrel=1 +pkgver=0.5.1 +pkgrel=0 pkgdesc="A GTK+ monitor and configuration GUI for dhcpcd" -url="http://roy.marples.name/projects/dhcpcd-dbus" +url="http://roy.marples.name/projects/dhcpcd-ui" license="BSD-2" depends="dhcpcd-dbus" makedepends="glib-dev gtk+-dev dbus-dev libnotify-dev pkgconfig" install= -subpackages= +subpackages="$pkgname-doc" source="http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr make PREFIX=/usr } @@ -22,4 +23,4 @@ package() { install } -md5sums="2a01fa94c79699807131c488b47d9dc8 dhcpcd-ui-0.4.3.tar.bz2" +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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dhcpcd pkgver=5.2.5 -pkgrel=0 +pkgrel=1 pkgdesc="RFC2131 compliant DHCP client" url="http://roy.marples.name/projects/dhcpcd/" license="BSD-2" depends= -makedepends="" +makedepends= install= subpackages="$pkgname-doc" -source="http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2" +source="http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2 + dhcpcd.initd" build() { cd "$srcdir/$pkgname-$pkgver" @@ -23,6 +24,8 @@ build() { package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install + install -Dm755 "$srcdir"/dhcpcd.initd "$pkgdir"/etc/init.d/dhcpcd } -md5sums="79f5452252026c0547886f89ab87adf1 dhcpcd-5.2.5.tar.bz2" +md5sums="79f5452252026c0547886f89ab87adf1 dhcpcd-5.2.5.tar.bz2 +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 @@ +#!/sbin/runscript +# Copyright 2007-2008 Roy Marples <roy@marples.name> +# All rights reserved. Released under the 2-clause BSD license. + +command=/sbin/dhcpcd +pidfile=/var/run/dhcpcd.pid +command_args=-q +name="DHCP Client Daemon" + +depend() +{ + provide net + need localmount + use logger network + after bootmisc modules + before dns +} 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=djbdns pkgver=1.05 -pkgrel=36 +pkgrel=37 pkgdesc="Excellent high-performance DNS services" url="http://cr.yp.to/djbdns.html" license="public-domain" @@ -101,4 +101,4 @@ fe48165a920cf843ceb9a4ee50bf74c0 tinydns.initd e09c3a6ba6917e16f4736ab5c070dbe9 dnscache.pre-install e5cada3b032da84c4a0e41ef8b3108cb dnscache.initd 2b3d02e88f70603c760bf368ab3ed636 dnscache.confd -805b6989f945d727788f1908fe3fce81 dnscache.monthly" +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 cp -f "$DST" "$ZONEFILE" fi - if [ "$ZONE" == "@" ]; then + if [ "$ZONE" = "@" ]; then ZONE="." fi @@ -28,9 +28,7 @@ for ZONEFILE in $ZONES; do # Refresh zone info dnsqr ns $ZONE | awk '/^answer: ./ { print $5 }' | sort -u | xargs dnsip > $TMPF - - grep "^$" $TMPF 1> /dev/null - if [ $? != 0 ]; then + if egrep -q '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' $TMPF; then cmp -s $ZONEFILE $TMPF if [ "$?" != 0 ]; then 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dovecot pkgver=1.2.12 -pkgrel=0 +pkgrel=3 pkgdesc="IMAP and POP3 server" url="http://www.dovecot.org/" 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 @@ # based on doc/mkcert.sh # Generates a self-signed certificate. -# Edit dovecot-openssl.cnf before running this. OPENSSL=${OPENSSL-openssl} SSLDIR=${SSLDIR-/etc/ssl/dovecot} @@ -12,8 +11,17 @@ OPENSSLCONFIG=${OPENSSLCONFIG-/etc/dovecot/dovecot-openssl.cnf} CERTDIR=$SSLDIR KEYDIR=$SSLDIR -CERTFILE=$CERTDIR/server.pem -KEYFILE=$KEYDIR/server.key +# parse cert and key file from dovecot.conf +dovecot_conf=/etc/dovecot/dovecot.conf +ssl_cert_file= +ssl_key_file= +if [ -r "$dovecot_conf" ]; then + ssl_cert_file=$(awk -F'[[:space:]]*=[[:space:]]*' '/^ssl_cert_file/ { print $2}' $dovecot_conf) + ssl_cert_file=$(awk -F'[[:space:]]*=[[:space:]]*' '/^ssl_key_file/ { print $2}' $dovecot_conf) +fi + +CERTFILE=${ssl_cert_file:-$CERTDIR/server.pem} +KEYFILE=${ssl_key_file:-$KEYDIR/server.key} if [ -e "$CERTFILE" ]; then echo "Keeiping existing $CERTFILE" @@ -25,6 +33,11 @@ if [ -e "$KEYFILE" ]; then exit 0 fi +if [ ! -c /dev/urandom ] && [ ! -c /dev/random ]; then + echo "No /dev/urandom or /dev/random so ssl cert not created" + exit 1 +fi + $OPENSSL req -new -x509 -nodes -config $OPENSSLCONFIG -out $CERTFILE -keyout $KEYFILE -days 365 || exit 2 chmod 0600 $KEYFILE 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=feh -pkgver=1.7 +pkgver=1.8 pkgrel=0 pkgdesc="feh is a fast, lightweight image viewer which uses imlib2" url="http://www.linuxbrit.co.uk/feh/" @@ -23,4 +23,4 @@ package() { make DESTDIR=$pkgdir docsdir=/usr/share/doc/feh install || return 1 install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -md5sums="59181976384d1f5bddae016b39334e2e feh-1.7.tar.bz2" +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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ffmpeg pkgver=0.6 -pkgrel=0 +pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" url="http://ffmpeg.mplayerhq.hu/" 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 @@ # Contributor: Carlo Landmeter <clandmeter at gmail> # Maintainer: Carlo Landmeter <clandmeter at gmail> pkgname=freetype -pkgver=2.3.8 -pkgrel=1 +pkgver=2.3.12 +pkgrel=0 pkgdesc="TrueType font rendering library" url="http://freetype.sourceforge.net" license="GPL" -depends="zlib" +depends= makedepends="zlib-dev" subpackages="$pkgname-dev" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz @@ -16,25 +16,32 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz 40-memcpy-fix.patch " -build() { - cd "$srcdir/$pkgname-$pkgver" +_builddir="$srcdir/$pkgname-$pkgver" +prepare() { + cd "$_builddir" for i in "$srcdir"/*.patch; do msg "Applying ${i}" patch -p0 -i $i || return 1 done +} +build() { + cd "$_builddir" ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ --disable-static make || return 1 - make -j1 DESTDIR="$pkgdir" install +} +package() { + cd "$_builddir" + make -j1 DESTDIR="$pkgdir" install } -md5sums="ebd7d255fd72b7f86c94501b80c50009 freetype-2.3.8.tar.gz +md5sums="6fc690d9b34154b51a919ff466cea90c freetype-2.3.12.tar.gz 9ff19e742968c29e3ba52b08d6bf0a50 10-bytecode.patch 376b94c06b113a62a3437e4130bb3fc3 20-enable-spr.patch 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gimp -pkgver=2.6.9 +pkgver=2.6.10 pkgrel=0 pkgdesc="GNU Image Manipulation Program" url="http://www.gimp.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 ln -s gimptool-2.0 "$pkgdir/usr/bin/gimptool" || return 1 } -md5sums="e5d0cc6f3ce127e51d7f3d3124b16a99 gimp-2.6.9.tar.bz2" +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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gnumeric -pkgver=1.10.6 +pkgver=1.10.7 pkgrel=0 pkgdesc="A GNOME Spreadsheet Program" url="http://www.gnome.org/projects/gnumeric/" @@ -27,4 +27,4 @@ package() { cd "$_builddir" make -j1 DESTDIR="$pkgdir" install || return 1 } -md5sums="2c83cafd6e2b69d10122d9e4343bf4ba gnumeric-1.10.6.tar.bz2" +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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gpicview pkgver=0.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="Picture viewer of the LXDE Desktop" url="http://wiki.lxde.org/en/GPicView" license="GPL-2" -depends="gtk+-dev intltool jpeg-dev" +depends= +makedepends="gtk+-dev intltool jpeg-dev" source="http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.gz" 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gst-plugins-ugly pkgver=0.10.15 -pkgrel=0 +pkgrel=1 pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)" url="http://gstreamer.freedesktop.org/" license="LGPL" @@ -9,7 +9,7 @@ depends= #"gstreamer0.10-ugly>=0.10.11 libdvdread>=4.1.3 lame>=3.98.2 libmpeg2>= makedepends="pkgconfig lame-dev libmpeg2-dev a52dec-dev libid3tag-dev libmad-dev glib-dev liboil-dev gstreamer-dev gst-plugins-base-dev x264-dev" -source="http://gstreamer.freedesktop.org//src/gst-plugins-ugly/gst-plugins-ugly-$pkgver.tar.bz2" +source="http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-$pkgver.tar.bz2" build() { 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 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=imagemagick -pkgver=6.6.2.0 +pkgver=6.6.3.0 _pkgver=${pkgver%.*}-${pkgver##*.} pkgrel=0 pkgdesc="A collection of tools and libraries for many image formats" @@ -47,4 +47,4 @@ dev() { "$pkgdir"/usr/lib/ImageMagick-$_v/modules-Q16/filters/ } -md5sums="d84ec4e436b0b4f79812ac89703777a6 ImageMagick-6.6.2-0.tar.gz" +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 @@ +# Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ircii -pkgver=20060725 -pkgrel=1 -pkgdesc="ircII is an IRC and ICB client that runs under most UNIX platforms." +pkgver=20080314 +pkgrel=2 +pkgdesc="Universal IRC for Unix systems" url="http://www.eterna.com.au/ircii/" -license="GPL-2" -subpackages="$pkgname-doc" +license="GPL" depends= -# original source seems to be dead. use gentoo. -#source="ftp://ircii.warped.com/pub/ircII/$pkgname-$pkgver.tar.bz2" -source="http://distfiles.gentoo.org/distfiles/$pkgname-$pkgver.tar.bz2" +makedepends="ncurses-dev" +install= +subpackages="$pkgname-doc $pkgname-dev" +source="ftp://ircii.warped.com/pub/ircII/ircii-20080314.tar.bz2" build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr \ + --sysconfdir=/etc \ --mandir=/usr/share/man \ - --enable-ipv6 + --infodir=/usr/share/info \ + --with-default-server=irc.freenode.net \ + || return 1 make || return 1 - make -j1 DESTDIR="$pkgdir" install || return 1 } -md5sums="280ae54367627591c1c43c765eb9d59b ircii-20060725.tar.bz2" +package() { + cd "$srcdir/$pkgname-$pkgver" + make -j1 DESTDIR="$pkgdir" install +} + +md5sums="da7fcf2a442bd25f303778eb6466eb19 ircii-20080314.tar.bz2" diff --git a/main/ircservices/APKBUILD b/main/ircservices/APKBUILD new file mode 100644 index 0000000000..46a07c3c36 --- /dev/null +++ b/main/ircservices/APKBUILD @@ -0,0 +1,86 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=ircservices +pkgver=5.1.23 +pkgrel=1 +pkgdesc="Services for IRC (NickServ, ChanServ, MemoServ)" +url="http://www.ircservices.za.net/" +license="GPL" +depends= +makedepends="perl" +install=$pkgname.pre-install +pkgusers="ircservices" +pkggroups="ircservices" +subpackages="$pkgname-doc" +source="http://www.ircservices.za.net/download/$pkgname-$pkgver.tar.gz + $pkgname.initd" + +prepare() { + cd "$srcdir"/$pkgname-$pkgver + sed -i \ + -e "s/-m 750/-m 755/" \ + -e "s/-m 640/-m 644/" \ + configure +} + +build() { + cd "$srcdir"/$pkgname-$pkgver + RUNGROUP=ircservices ./configure \ + -cc "$CC" \ + -cflags "$CFLAGS" \ + -bindest /usr/bin \ + -datdest /var/lib/ircservices \ + || return 1 + + # build targets one by one as paralell builds breaks + make config-check &&\ + make ircservices &&\ + make languages &&\ + make tools +} + +package() { + cd "$srcdir"/$pkgname-$pkgver +# export INSTALL_PREFIX="$pkgdir" + make -j1 \ + BINDEST="$pkgdir"/usr/bin \ + DATDEST="$pkgdir"/var/lib/ircservices \ + install || return 1 + + install -d "$pkgdir"/usr/share/man/man8 + install docs/ircservices.8 "$pkgdir"/usr/share/man/man8/ircservices.8 + install docs/convert-db.8 \ + "$pkgdir"/usr/share/man/man8/ircservices-convert-db.8 + + # try conform to FHS + cd "$pkgdir" + install -d etc/ircservices usr/share/ircservices var/log/ircservices + + mv var/lib/ircservices/convert-db usr/bin/ircservices-convert-db + + mv var/lib/ircservices/example-ircservices.conf \ + etc/ircservices/ircservices.conf + ln -s /etc/ircservices/ircservices.conf \ + var/lib/ircservices/ircservices.conf + + mv var/lib/ircservices/example-modules.conf \ + etc/ircservices/modules.conf + ln -s /etc/ircservices/modules.conf var/lib/ircservices/modules.conf + + mv var/lib/ircservices/languages \ + var/lib/ircservices/helpfiles \ + usr/share/ircservices/ + ln -s /usr/share/ircservices/languages var/lib/ircservices/ + ln -s /usr/share/ircservices/helpfiles var/lib/ircservices/ + + install -Dm755 "$srcdir"/ircservices.initd \ + etc/init.d/ircservices + + chown ircservices:ircservices var/lib/ircservices \ + var/log/ircservices + + chown root:ircservices etc/ircservices/ircservices.conf \ + etc/ircservices/modules.conf +} + +md5sums="666351f44adf57effc310a7a5943c9a2 ircservices-5.1.23.tar.gz +279ea42c5d97b47787b5959c9981fbaa ircservices.initd" diff --git a/main/ircservices/ircservices.confd b/main/ircservices/ircservices.confd new file mode 100644 index 0000000000..31cc902d21 --- /dev/null +++ b/main/ircservices/ircservices.confd @@ -0,0 +1,6 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/files/ircservices.conf.d,v 1.2 2005/05/16 15:36:11 swegener Exp $ + +# Se this to true to have ircservices depend on a local ircd to be up +LOCALIRCD="false" diff --git a/main/ircservices/ircservices.initd b/main/ircservices/ircservices.initd new file mode 100644 index 0000000000..8c2a11e8ba --- /dev/null +++ b/main/ircservices/ircservices.initd @@ -0,0 +1,29 @@ +#!/sbin/runscript +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/files/ircservices.init.d,v 1.5 2006/11/05 22:23:08 swegener Exp $ + +depend() { + need net + after firewall + use ircd +} + +start() { + ebegin "Starting IRC Services" + start-stop-daemon --start --quiet --exec /usr/bin/ircservices \ + --chuid ircservices \ + -- \ + -dir=/var/lib/ircservices \ + -log=/var/log/ircservices/ircservices.log \ + &>/dev/null + eend $? +} + +stop() { + ebegin "Stopping IRC Services" + start-stop-daemon --stop --quiet \ + --pidfile /var/lib/ircservices/ircservices.pid + eend $? + rm -f /var/lib/ircservices/ircservices.pid +} diff --git a/main/ircservices/ircservices.pre-install b/main/ircservices/ircservices.pre-install new file mode 100644 index 0000000000..093f888563 --- /dev/null +++ b/main/ircservices/ircservices.pre-install @@ -0,0 +1,5 @@ +#!/bin/sh + +adduser -h /var/lib/ircservices -s /bin/false -S -D ircservices 2>/dev/null +exit 0 + 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 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=kamailio -pkgver=1.5.4 -pkgrel=1 +pkgver=3.0.2 +pkgrel=4 pkgdesc="Open Source SIP Server" url="http://www.kamailio.org/" pkgusers="kamailio" pkggroups="kamailio" license="GPL" depends= -makedepends="bison flex expat-dev postgresql-dev mysql-dev pcre-dev +makedepends="bison flex expat-dev postgresql-dev pcre-dev mysql-dev libxml2-dev curl-dev unixodbc-dev confuse-dev" -install="$pkgname.pre-install $pkgname.post-install" -subpackages="$pkgname-doc $pkgname-mysql $pkgname-postgres $pkgname-pcre - $pkgname-presence $pkgname-mediaproxy $pkgname-unixodbc" -source="http://www.kamailio.org/pub/kamailio/$pkgver/src/$pkgname-$pkgver-notls_src.tar.gz +install= +subpackages="$pkgname-doc $pkgname-postgres $pkgname-presence $pkgname-pcre + $pkgname-mediaproxy $pkgname-unixodbc $pkgname-mysql" +source="http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src.tar.gz kamailio.cfg kamailio.initd - kamailio-backslash.patch + kamailio.pre-install + kamailio.post-install + kamailio-3-backslash.patch " +_builddir="$srcdir"/$pkgname-$pkgver + + +_default="carrierroute xmlrpc tm" +_presence="presence presence_xml presence_mwi pua pua_bla pua_mi pua_usrloc pua_xmpp rls xcap_client presence_dialoginfo pua_dialoginfo" +_pcre="dialplan lcr regex" +_postgres="db_postgres" +_mysql="db_mysql" +_mediaproxy="mediaproxy" +_odbc="db_unixodbc" +# Makefile does not handle newline +_modules="$_default $_postgres $_mediaproxy $_odbc $_presence $_mysql $_pcre" + + prepare() { - cd "$srcdir/$pkgname-$pkgver-notls" - patch -p1 -i "$srcdir"/kamailio-backslash.patch || return 1 + cd "$_builddir" + patch -p1 -i "$srcdir"/kamailio-3-backslash.patch || return 1 - sed -i -e 's:^cfg-target.*:cfg-target = $(cfg-dir):' \ - -e 's:^cfg-prefix.*:cfg-prefix = $(basedir):' Makefile.defs \ + sed -i \ + -e "s:-O9 -funroll-loops:$CFLAGS:g" \ + Makefile.defs \ || return 1 - cd scripts + +# -e 's:^cfg-target.*:cfg-target = $(cfg-dir):' \ +# -e 's:^cfg-prefix.*:cfg-prefix = $(basedir):' \ + + cd utils/kamctl/ sed -i -e 's:/var/run/kamailio.pid:/var/run/kamailio/kamailio.pid:g' \ kamctl.base kamctlrc || return 1 # we actually dont need bash @@ -37,32 +58,37 @@ prepare() { cd dbtext/kamailio sed -i -e 's:email_address(string):email_address(string,null):' subscriber \ || return 1 + } build() { - cd "$srcdir/$pkgname-$pkgver-notls" - make prefix=/usr \ - cfg-dir=/etc/kamailio/ \ + cd "$_builddir" + + # workaround parallel build issue + make -C lib/kcore strcommon.o || return 1 + + make LOCALBASE=/usr \ + cfg_target=/etc/kamailio/ \ MODS_MYSQL=yes \ MODS_PCRE=yes \ - MODS_PRESENCE=yes \ MODS_RADIUS= \ TLS= \ - include_modules="db_postgres mediaproxy db_unixodbc carrierroute" \ + include_modules="$_modules" \ all || return 1 } package() { - cd "$srcdir/$pkgname-$pkgver-notls" - make prefix=/usr \ - cfg-dir=/etc/kamailio/ \ + cd "$_builddir" + make LOCALBASE=/usr \ + cfg_target=/etc/kamailio/ \ MODS_MYSQL=yes \ MODS_PCRE=yes \ - MODS_PRESENCE=yes \ MODS_RADIUS= \ TLS= \ - include_modules="db_postgres mediaproxy db_unixodbc carrierroute" \ - basedir="$pkgdir" install || return 1 + include_modules="$_modules" \ + basedir="$pkgdir" \ + cfg_prefix="$pkgdir" \ + install || return 1 # move default config to -doc package and use our own default config @@ -83,6 +109,14 @@ _mv_mod() { done } +_mv_mod_k() { + local moddir=usr/lib/kamailio/modules_k i= + mkdir -p "$subpkgdir"/$moddir + for i in $@; do + mv "$pkgdir"/$moddir/$i.so "$subpkgdir"/$moddir/ || return 1 + done +} + mysql() { pkgdesc="MySQL support for kamailio" @@ -104,29 +138,30 @@ postgres() { pcre() { pkgdesc="Regular expressions support for kamailio" - _mv_mod dialplan lcr regex + _mv_mod dialplan lcr + _mv_mod_k regex } presence() { - pkgdesc="Precense support for kamailio" - _mv_mod presence presence_xml presence_mwi pua pua_bla pua_mi \ - pua_usrloc pua_xmpp rls xcap_client presence_dialoginfo \ - pua_dialoginfo + pkgdesc="Presence support for kamailio" + _mv_mod_k $_presence } mediaproxy() { pkgdesc="Mediaproxy support for kamailio" depends="kamailio" - _mv_mod mediaproxy + _mv_mod $_mediaproxy } unixodbc() { pkgdesc="UnixODBC support for kamailio" depends="kamailio" - _mv_mod db_unixodbc + _mv_mod_k $_odbc } -md5sums="127233aff2f20566b54f84555602132d kamailio-1.5.4-notls_src.tar.gz -eb665248ee39cf755a247286affc5cbb kamailio.cfg -8ac6c260f090aea0ca344f18f9a2a904 kamailio.initd -3259980a45d9ad3fc6fca83414021d07 kamailio-backslash.patch" +md5sums="dd039e078a77032a423fb15f9685ad31 kamailio-3.0.2_src.tar.gz +a3c959ec568c43a905710e7d25cd8c25 kamailio.cfg +81100c479890a2a8c2628db22fdd1a0c kamailio.initd +c646af2dd31f5c4289a2f802c873d98f kamailio.pre-install +3fbaf633ff1620d0d526fc4047c7bed9 kamailio.post-install +36f81be3a082a81497e261ac8e6c5414 kamailio-3-backslash.patch" diff --git a/main/kamailio/kamailio-backslash.patch b/main/kamailio/kamailio-3-backslash.patch index 9cc6036895..f132aebab4 100644 --- a/main/kamailio/kamailio-backslash.patch +++ b/main/kamailio/kamailio-3-backslash.patch @@ -1,7 +1,7 @@ diff --git a/scripts/kamdbctl.base b/scripts/kamdbctl.base index 83f5a8a..5b640be 100644 ---- a/scripts/kamdbctl.base -+++ b/scripts/kamdbctl.base +--- a/utils/kamctl/kamdbctl.base ++++ b/utils/kamctl/kamdbctl.base @@ -32,13 +32,13 @@ INSTALL_PRESENCE_TABLES=${INSTALL_PRESENCE_TABLES:-ask} # Used by dbtext and db_berkeley to define tables to be created, used by 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 @@ -# Demonstration Kamailio Configuration for AlpineLinux - +# Sample Kamailio Configuration +# 23 June 2010 - For Alpine Linux +# Accepts all registrations; routes calls to any registered AOR #-------------------------------------------------------- # Section 1: Global Definitions #-------------------------------------------------------- -debug = 3 +debug = 2 fork = yes log_stderror = no -listen = 0.0.0.0 +# listen = 0.0.0.0 port = 5060 children = 4 dns = no rev_dns = no -mpath = "/usr/lib/kamailio/modules/" +mpath = "/usr/lib/kamailio/modules_k/:/usr/lib/kamailio/modules/" + #-------------------------------------------------------- # Section 2: Modules #-------------------------------------------------------- -loadmodule "sl.so" loadmodule "tm.so" +loadmodule "sl.so" +loadmodule "tmx.so" loadmodule "rr.so" loadmodule "maxfwd.so" loadmodule "usrloc.so" loadmodule "registrar.so" loadmodule "mi_fifo.so" +loadmodule "pv.so" +loadmodule "xlog.so" #-------------------------------------------------------- -# Section 1: Module Configuration +# Section 3: Module Configuration #-------------------------------------------------------- modparam ( "usrloc", "db_mode", 0 ) @@ -36,26 +41,30 @@ modparam ( "rr", "enable_full_lr", 1 ) modparam ( "mi_fifo", "fifo_name", "/tmp/kamailio_fifo") #-------------------------------------------------------- -# Section 1: Main Route Block +# Section 4: Main Route Block #-------------------------------------------------------- route - { + { + # Uncomment next line if you want to see + # each incoming message + xlog( "L_INFO", "$rm: $fu -> $ru" ); + if (!mf_process_maxfwd_header("10")) { sl_send_reply("483", "Too Many Hops"); return; } - - if (msg:len > max_len) + + if (msg:len > 4096) { - sl_send_reply("513", "Message Overflow"); + sl_send_reply("513", "Message too big" ); return; } if (method == "REGISTER" ) { - route(2); + route(REGISTER); return; } @@ -66,42 +75,33 @@ route return; } - route(1); + route(RELAY); } #-------------------------------------------------------- -# Section 1: Secondary Route Blocks +# Section 5: Secondary Route Blocks #-------------------------------------------------------- # - Default message handler -route[1] { +route[RELAY] { if (!t_relay()) { sl_reply_error(); } } #- Registration Request -route[2] { +route[REGISTER] { if (!save("location")) { sl_reply_error(); } } #-------------------------------------------------------- -# Section 1: Reply Route Block +# Section 6: Reply Route Block #-------------------------------------------------------- #-------------------------------------------------------- -# Section 1: Failure Route Block +# Section 7: Failure Route Block #-------------------------------------------------------- - - - - - - - - - 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 pidfile=/var/run/kamailio/kamailio.pid depend() { - need net logger + need net after firewall } 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 @@ #!/bin/sh -addgroup kamailio 2>/dev/null -adduser -G kamailio -h /var/run/kamailio -s /bin/false -S -D -H kamailio 2>/dev/null +adduser -H -h /var/empty -s /bin/false -D kamailio 2>/dev/null + 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 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=libcap-ng +pkgver=0.6.4 +pkgrel=0 +pkgdesc="posix capabilities library" +url="http://people.redhat.com/sgrubb/libcap-ng/index.html" +license="GPL" +depends= +makedepends="python" +install= +subpackages="$pkgname-dev $pkgname-doc $pkgname-utils" +source="http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-$pkgver.tar.gz" + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + # apply patches here +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install +} + +utils() { + pkgdesc="posix capabilities utils" + mkdir -p "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/ +} + +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 @@ # Contributor: Timo Teras <timo.teras@iki.fi> # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=libpri -pkgver=1.4.11.2 +pkgver=1.4.11.3 pkgrel=0 pkgdesc="Primary Rate ISDN (PRI) library" url="http://www.asterisk.orig" @@ -28,4 +28,4 @@ package() { make LDCONFIG="echo" INSTALL_PREFIX="$pkgdir" install } -md5sums="320d55151e180b2fc13abfee8e2e73d8 libpri-1.4.11.2.tar.gz" +md5sums="f3ad31bc623b8335c65b8e85d46117b4 libpri-1.4.11.3.tar.gz" diff --git a/main/libtirpc/APKBUILD b/main/libtirpc/APKBUILD new file mode 100644 index 0000000000..ecac43adc3 --- /dev/null +++ b/main/libtirpc/APKBUILD @@ -0,0 +1,47 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=libtirpc +pkgver=0.2.1 +pkgrel=2 +pkgdesc="Transport Independent RPC library (SunRPC replacement)" +url="http://libtirpc.sourceforge.net/" +license="GPL2" +depends= +makedepends="libgssglue-dev heimdal-dev autoconf automake libtool" +subpackages="$pkgname-dev $pkgname-doc" +source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 + nis.h + libtirpc-no-des.patch" + +depends_dev="libgssglue-dev heimdal-dev" +prepare() { + cd "$srcdir"/$pkgname-$pkgver + for i in $source; do + case $i in + *.patch) + msg "Applying $i" + patch -p1 -i "$srcdir"/$i || return 1 + ;; + esac + done + # uclibc does not provide nis.h so provide our own + mkdir src/rpcsvc + cp "$srcdir"/nis.h src/rpcsvc/ + + sh bootstrap && libtoolize +} + +build() { + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr \ + --enable-gss + make || return 1 +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR="$pkgdir" install || return 1 + install -D -m644 doc/etc_netconfig "$pkgdir"/etc/netconfig +} +md5sums="d77eb15f464bf9d6e66259eaf78b2a4e libtirpc-0.2.1.tar.bz2 +082dff1bc78bdcbac6d305c1534fe3c0 nis.h +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 @@ +--- ./src/Makefile.am.orig ++++ ./src/Makefile.am +@@ -40,7 +40,7 @@ + # release number of your package. This is an abuse that only fosters + # misunderstanding of the purpose of library versions." + # +-libtirpc_la_LDFLAGS = -lnsl -lpthread -version-info 1:10:0 ++libtirpc_la_LDFLAGS = -lpthread -version-info 1:10:0 + + libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \ + clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \ +@@ -50,7 +50,7 @@ + rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ + rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_generic.c \ + svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ +- auth_time.c auth_des.c authdes_prot.c ++ auth_time.c + + ## XDR + libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c +--- ./src/rpc_soc.c.orig ++++ ./src/rpc_soc.c +@@ -479,6 +479,7 @@ + (resultproc_t) rpc_wrap_bcast, "udp"); + } + ++#if 0 + /* + * Create the client des authentication object. Obsoleted by + * authdes_seccreate(). +@@ -511,6 +512,7 @@ + return (dummy); + } + ++#endif + /* + * Create a client handle for a unix connection. Obsoleted by clnt_vc_create() + */ diff --git a/main/libtirpc/nis.h b/main/libtirpc/nis.h new file mode 100644 index 0000000000..a03a25f37b --- /dev/null +++ b/main/libtirpc/nis.h @@ -0,0 +1,542 @@ +/* + * Sun RPC is a product of Sun Microsystems, Inc. and is provided for + * unrestricted use provided that this legend is included on all tape + * media and as a part of the software program in whole or part. Users + * may copy or modify Sun RPC without charge, but are not authorized + * to license or distribute it to anyone else except as part of a product or + * program developed by the user or with the express written consent of + * Sun Microsystems, Inc. + * + * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE + * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR + * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. + * + * Sun RPC is provided with no support and without any obligation on the + * part of Sun Microsystems, Inc. to assist in its use, correction, + * modification or enhancement. + * + * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE + * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC + * OR ANY PART THEREOF. + * + * In no event will Sun Microsystems, Inc. be liable for any lost revenue + * or profits or other special, indirect and consequential damages, even if + * Sun has been advised of the possibility of such damages. + * + * Sun Microsystems, Inc. + * 2550 Garcia Avenue + * Mountain View, California 94043 + */ + +#ifndef _RPCSVC_NIS_H +#define _RPCSVC_NIS_H 1 + +#include <features.h> +//#include <rpc/rpc.h> +//#include <rpcsvc/nis_tags.h> + +__BEGIN_DECLS + +/* + * nis.h + * + * This file is the main include file for NIS clients. It contains + * both the client library function defines and the various data + * structures used by the NIS service. It includes the file nis_tags.h + * which defines the tag values. This allows the tags to change without + * having to change the nis.x file. + * + * NOTE : THIS FILE IS NOT GENERATED WITH RPCGEN ! SO YOU HAVE TO + * ADD ALL THE CHANGES ON nis_*.x FILES HERE AGAIN ! + * + * I have removed all the Solaris internal structs and variables, + * because they are not supported, Sun changed them between various + * releases and they shouldn't be used in user programs. + * <kukuk@suse.de> + */ + + +#ifndef __nis_object_h +#define __nis_object_h + +#define NIS_MAXSTRINGLEN 255 +#define NIS_MAXNAMELEN 1024 +#define NIS_MAXATTRNAME 32 +#define NIS_MAXATTRVAL 2048 +#define NIS_MAXCOLUMNS 64 +#define NIS_MAXATTR 16 +#define NIS_MAXPATH 1024 +#define NIS_MAXREPLICAS 128 +#define NIS_MAXLINKS 16 +#define NIS_PK_NONE 0 +#define NIS_PK_DH 1 +#define NIS_PK_RSA 2 +#define NIS_PK_KERB 3 +#define NIS_PK_DHEXT 4 + +struct nis_attr { + char *zattr_ndx; + struct { + u_int zattr_val_len; + char *zattr_val_val; + } zattr_val; +}; +typedef struct nis_attr nis_attr; + +typedef char *nis_name; + +enum zotypes { + BOGUS_OBJ = 0, + NO_OBJ = 1, + DIRECTORY_OBJ = 2, + GROUP_OBJ = 3, + TABLE_OBJ = 4, + ENTRY_OBJ = 5, + LINK_OBJ = 6, + PRIVATE_OBJ = 7, + NIS_BOGUS_OBJ = 0, + NIS_NO_OBJ = 1, + NIS_DIRECTORY_OBJ = 2, + NIS_GROUP_OBJ = 3, + NIS_TABLE_OBJ = 4, + NIS_ENTRY_OBJ = 5, + NIS_LINK_OBJ = 6, + NIS_PRIVATE_OBJ = 7 +}; +typedef enum zotypes zotypes; + +enum nstype { + UNKNOWN = 0, + NIS = 1, + SUNYP = 2, + IVY = 3, + DNS = 4, + X500 = 5, + DNANS = 6, + XCHS = 7, + CDS = 8, +}; +typedef enum nstype nstype; + +struct oar_mask { + uint32_t oa_rights; + zotypes oa_otype; +}; +typedef struct oar_mask oar_mask; + +struct endpoint { + char *uaddr; + char *family; + char *proto; +}; +typedef struct endpoint endpoint; + +struct nis_server { + nis_name name; + struct { + u_int ep_len; + endpoint *ep_val; + } ep; + uint32_t key_type; + netobj pkey; +}; +typedef struct nis_server nis_server; + +struct directory_obj { + nis_name do_name; + nstype do_type; + struct { + u_int do_servers_len; + nis_server *do_servers_val; + } do_servers; + uint32_t do_ttl; + struct { + u_int do_armask_len; + oar_mask *do_armask_val; + } do_armask; +}; +typedef struct directory_obj directory_obj; + +#define EN_BINARY 1 +#define EN_CRYPT 2 +#define EN_XDR 4 +#define EN_MODIFIED 8 +#define EN_ASN1 64 + +struct entry_col { + uint32_t ec_flags; + struct { + u_int ec_value_len; + char *ec_value_val; + } ec_value; +}; +typedef struct entry_col entry_col; + +struct entry_obj { + char *en_type; + struct { + u_int en_cols_len; + entry_col *en_cols_val; + } en_cols; +}; +typedef struct entry_obj entry_obj; + +struct group_obj { + uint32_t gr_flags; + struct { + u_int gr_members_len; + nis_name *gr_members_val; + } gr_members; +}; +typedef struct group_obj group_obj; + +struct link_obj { + zotypes li_rtype; + struct { + u_int li_attrs_len; + nis_attr *li_attrs_val; + } li_attrs; + nis_name li_name; +}; +typedef struct link_obj link_obj; + +#define TA_BINARY 1 +#define TA_CRYPT 2 +#define TA_XDR 4 +#define TA_SEARCHABLE 8 +#define TA_CASE 16 +#define TA_MODIFIED 32 +#define TA_ASN1 64 + +struct table_col { + char *tc_name; + uint32_t tc_flags; + uint32_t tc_rights; +}; +typedef struct table_col table_col; + +struct table_obj { + char *ta_type; + int ta_maxcol; + u_char ta_sep; + struct { + u_int ta_cols_len; + table_col *ta_cols_val; + } ta_cols; + char *ta_path; +}; +typedef struct table_obj table_obj; + +struct objdata { + zotypes zo_type; + union { + struct directory_obj di_data; + struct group_obj gr_data; + struct table_obj ta_data; + struct entry_obj en_data; + struct link_obj li_data; + struct { + u_int po_data_len; + char *po_data_val; + } po_data; + } objdata_u; +}; +typedef struct objdata objdata; + +struct nis_oid { + uint32_t ctime; + uint32_t mtime; +}; +typedef struct nis_oid nis_oid; + +struct nis_object { + nis_oid zo_oid; + nis_name zo_name; + nis_name zo_owner; + nis_name zo_group; + nis_name zo_domain; + uint32_t zo_access; + uint32_t zo_ttl; + objdata zo_data; +}; +typedef struct nis_object nis_object; + +#endif /* if __nis_object_h */ + +enum nis_error { + NIS_SUCCESS = 0, + NIS_S_SUCCESS = 1, + NIS_NOTFOUND = 2, + NIS_S_NOTFOUND = 3, + NIS_CACHEEXPIRED = 4, + NIS_NAMEUNREACHABLE = 5, + NIS_UNKNOWNOBJ = 6, + NIS_TRYAGAIN = 7, + NIS_SYSTEMERROR = 8, + NIS_CHAINBROKEN = 9, + NIS_PERMISSION = 10, + NIS_NOTOWNER = 11, + NIS_NOT_ME = 12, + NIS_NOMEMORY = 13, + NIS_NAMEEXISTS = 14, + NIS_NOTMASTER = 15, + NIS_INVALIDOBJ = 16, + NIS_BADNAME = 17, + NIS_NOCALLBACK = 18, + NIS_CBRESULTS = 19, + NIS_NOSUCHNAME = 20, + NIS_NOTUNIQUE = 21, + NIS_IBMODERROR = 22, + NIS_NOSUCHTABLE = 23, + NIS_TYPEMISMATCH = 24, + NIS_LINKNAMEERROR = 25, + NIS_PARTIAL = 26, + NIS_TOOMANYATTRS = 27, + NIS_RPCERROR = 28, + NIS_BADATTRIBUTE = 29, + NIS_NOTSEARCHABLE = 30, + NIS_CBERROR = 31, + NIS_FOREIGNNS = 32, + NIS_BADOBJECT = 33, + NIS_NOTSAMEOBJ = 34, + NIS_MODFAIL = 35, + NIS_BADREQUEST = 36, + NIS_NOTEMPTY = 37, + NIS_COLDSTART_ERR = 38, + NIS_RESYNC = 39, + NIS_FAIL = 40, + NIS_UNAVAIL = 41, + NIS_RES2BIG = 42, + NIS_SRVAUTH = 43, + NIS_CLNTAUTH = 44, + NIS_NOFILESPACE = 45, + NIS_NOPROC = 46, + NIS_DUMPLATER = 47, +}; +typedef enum nis_error nis_error; + +struct nis_result { + nis_error status; + struct { + u_int objects_len; + nis_object *objects_val; + } objects; + netobj cookie; + uint32_t zticks; + uint32_t dticks; + uint32_t aticks; + uint32_t cticks; +}; +typedef struct nis_result nis_result; + +struct ns_request { + nis_name ns_name; + struct { + u_int ns_object_len; + nis_object *ns_object_val; + } ns_object; +}; +typedef struct ns_request ns_request; + +struct ib_request { + nis_name ibr_name; + struct { + u_int ibr_srch_len; + nis_attr *ibr_srch_val; + } ibr_srch; + uint32_t ibr_flags; + struct { + u_int ibr_obj_len; + nis_object *ibr_obj_val; + } ibr_obj; + struct { + u_int ibr_cbhost_len; + nis_server *ibr_cbhost_val; + } ibr_cbhost; + u_int ibr_bufsize; + netobj ibr_cookie; +}; +typedef struct ib_request ib_request; + +struct ping_args { + nis_name dir; + uint32_t stamp; +}; +typedef struct ping_args ping_args; + +enum log_entry_t { + LOG_NOP = 0, + ADD_NAME = 1, + REM_NAME = 2, + MOD_NAME_OLD = 3, + MOD_NAME_NEW = 4, + ADD_IBASE = 5, + REM_IBASE = 6, + MOD_IBASE = 7, + UPD_STAMP = 8, +}; +typedef enum log_entry_t log_entry_t; + +struct log_entry { + uint32_t le_time; + log_entry_t le_type; + nis_name le_princp; + nis_name le_name; + struct { + u_int le_attrs_len; + nis_attr *le_attrs_val; + } le_attrs; + nis_object le_object; +}; +typedef struct log_entry log_entry; + +struct log_result { + nis_error lr_status; + netobj lr_cookie; + struct { + u_int lr_entries_len; + log_entry *lr_entries_val; + } lr_entries; +}; +typedef struct log_result log_result; + +struct cp_result { + nis_error cp_status; + uint32_t cp_zticks; + uint32_t cp_dticks; +}; +typedef struct cp_result cp_result; + +struct nis_tag { + uint32_t tag_type; + char *tag_val; +}; +typedef struct nis_tag nis_tag; + +struct nis_taglist { + struct { + u_int tags_len; + nis_tag *tags_val; + } tags; +}; +typedef struct nis_taglist nis_taglist; + +struct dump_args { + nis_name da_dir; + uint32_t da_time; + struct { + u_int da_cbhost_len; + nis_server *da_cbhost_val; + } da_cbhost; +}; +typedef struct dump_args dump_args; + +struct fd_args { + nis_name dir_name; + nis_name requester; +}; +typedef struct fd_args fd_args; + +struct fd_result { + nis_error status; + nis_name source; + struct { + u_int dir_data_len; + char *dir_data_val; + } dir_data; + struct { + u_int signature_len; + char *signature_val; + } signature; +}; +typedef struct fd_result fd_result; + +/* Generic client creating flags */ +#define ZMH_VC 1 +#define ZMH_DG 2 +#define ZMH_AUTH 4 + +/* Testing Access rights for objects */ + +#define NIS_READ_ACC 1 +#define NIS_MODIFY_ACC 2 +#define NIS_CREATE_ACC 4 +#define NIS_DESTROY_ACC 8 +/* Test macros. a == access rights, m == desired rights. */ +#define NIS_WORLD(a, m) (((a) & (m)) != 0) +#define NIS_GROUP(a, m) (((a) & ((m) << 8)) != 0) +#define NIS_OWNER(a, m) (((a) & ((m) << 16)) != 0) +#define NIS_NOBODY(a, m) (((a) & ((m) << 24)) != 0) +/* + * EOL Alert - The following non-prefixed test macros are + * here for backward compatability, and will be not be present + * in future releases - use the NIS_*() macros above. + */ +#define WORLD(a, m) (((a) & (m)) != 0) +#define GROUP(a, m) (((a) & ((m) << 8)) != 0) +#define OWNER(a, m) (((a) & ((m) << 16)) != 0) +#define NOBODY(a, m) (((a) & ((m) << 24)) != 0) + +#define OATYPE(d, n) (((d)->do_armask.do_armask_val+n)->oa_otype) +#define OARIGHTS(d, n) (((d)->do_armask.do_armask_val+n)->oa_rights) +#define WORLD_DEFAULT (NIS_READ_ACC) +#define GROUP_DEFAULT (NIS_READ_ACC << 8) +#define OWNER_DEFAULT ((NIS_READ_ACC + NIS_MODIFY_ACC + NIS_CREATE_ACC +\ + NIS_DESTROY_ACC) << 16) +#define DEFAULT_RIGHTS (WORLD_DEFAULT | GROUP_DEFAULT | OWNER_DEFAULT) + +/* Result manipulation defines ... */ +#define NIS_RES_NUMOBJ(x) ((x)->objects.objects_len) +#define NIS_RES_OBJECT(x) ((x)->objects.objects_val) +#define NIS_RES_COOKIE(x) ((x)->cookie) +#define NIS_RES_STATUS(x) ((x)->status) + +/* These defines make getting at the variant part of the object easier. */ +#define TA_data zo_data.objdata_u.ta_data +#define EN_data zo_data.objdata_u.en_data +#define DI_data zo_data.objdata_u.di_data +#define LI_data zo_data.objdata_u.li_data +#define GR_data zo_data.objdata_u.gr_data + +#define __type_of(o) ((o)->zo_data.zo_type) + +/* Declarations for the internal subroutines in nislib.c */ +enum name_pos {SAME_NAME, HIGHER_NAME, LOWER_NAME, NOT_SEQUENTIAL, BAD_NAME}; +typedef enum name_pos name_pos; + +/* + * Defines for getting at column data in entry objects. Because RPCGEN + * generates some rather wordy structures, we create some defines that + * collapse the needed keystrokes to access a particular value using + * these definitions they take an nis_object *, and an int and return + * a u_char * for Value, and an int for length. + */ +#define ENTRY_VAL(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val +#define ENTRY_LEN(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len + + +/* Prototypes, and extern declarations for the NIS library functions. */ +//#include <rpcsvc/nislib.h> +#endif + +/* + * nis_3.h + * + * This file contains definitions that are only of interest to the actual + * service daemon and client stubs. Normal users of NIS will not include + * this file. + * + * NOTE : This include file is automatically created by a combination + * of rpcgen and sed. DO NOT EDIT IT, change the nis.x file instead + * and then remake this file. + */ +#ifndef __nis_3_h +#define __nis_3_h + +#define NIS_PROG 100300 +#define NIS_VERSION 3 + + +__END_DECLS + +#endif /* ! _RPCSVC_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 @@ _flavor=grsec pkgname=linux-${_flavor} -pkgver=2.6.32.15 +pkgver=2.6.32.16 _kernver=2.6.32 -pkgrel=9 +pkgrel=1 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" @@ -14,7 +14,7 @@ _config=${config:-kernelconfig.${CARCH:-x86}} install= source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 - grsecurity-2.2.0-2.6.32.15-201006271253.patch + grsecurity-2.2.0-2.6.32.16-201007112149.patch 0001-grsec-revert-conflicting-flow-cache-changes.patch 0002-gre-fix-hard-header-destination-address-checking.patch 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch @@ -147,8 +147,8 @@ firmware() { } md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 -5c9251844c2819eddee4dba1293bd46d patch-2.6.32.15.bz2 -98a8ab1e328d67e40657ef5e4b9d1b37 grsecurity-2.2.0-2.6.32.15-201006271253.patch +744890f9651962ceae7663d44b19df65 patch-2.6.32.16.bz2 +34e3f7fe893034d29530ec1bd5584a33 grsecurity-2.2.0-2.6.32.16-201007112149.patch 1d247140abec49b96250aec9aa59b324 0001-grsec-revert-conflicting-flow-cache-changes.patch 437317f88ec13ace8d39c31983a41696 0002-gre-fix-hard-header-destination-address-checking.patch 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 @@ -diff -urNp linux-2.6.32.15/arch/alpha/include/asm/elf.h linux-2.6.32.15/arch/alpha/include/asm/elf.h ---- linux-2.6.32.15/arch/alpha/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/alpha/include/asm/elf.h 2010-05-28 21:27:14.402915497 -0400 +diff -urNp linux-2.6.32.16/arch/alpha/include/asm/elf.h linux-2.6.32.16/arch/alpha/include/asm/elf.h +--- linux-2.6.32.16/arch/alpha/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/alpha/include/asm/elf.h 2010-07-09 14:50:34.000000000 -0400 @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #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 /* $0 is set by ld.so to a pointer to a function which might be registered using atexit. This provides a mean for the dynamic linker to call DT_FINI functions for shared libraries that have -diff -urNp linux-2.6.32.15/arch/alpha/include/asm/pgtable.h linux-2.6.32.15/arch/alpha/include/asm/pgtable.h ---- linux-2.6.32.15/arch/alpha/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/alpha/include/asm/pgtable.h 2010-05-28 21:27:14.420270024 -0400 +diff -urNp linux-2.6.32.16/arch/alpha/include/asm/pgtable.h linux-2.6.32.16/arch/alpha/include/asm/pgtable.h +--- linux-2.6.32.16/arch/alpha/include/asm/pgtable.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/alpha/include/asm/pgtable.h 2010-07-09 14:50:34.000000000 -0400 @@ -101,6 +101,17 @@ struct vm_area_struct; #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS) #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 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE) #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x)) -diff -urNp linux-2.6.32.15/arch/alpha/kernel/module.c linux-2.6.32.15/arch/alpha/kernel/module.c ---- linux-2.6.32.15/arch/alpha/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/alpha/kernel/module.c 2010-05-28 21:27:14.523207400 -0400 +diff -urNp linux-2.6.32.16/arch/alpha/kernel/module.c linux-2.6.32.16/arch/alpha/kernel/module.c +--- linux-2.6.32.16/arch/alpha/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/alpha/kernel/module.c 2010-07-09 14:50:34.000000000 -0400 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, /* 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 got = sechdrs[me->arch.gotsecindex].sh_addr; for (i = 0; i < n; i++) { -diff -urNp linux-2.6.32.15/arch/alpha/kernel/osf_sys.c linux-2.6.32.15/arch/alpha/kernel/osf_sys.c ---- linux-2.6.32.15/arch/alpha/kernel/osf_sys.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/alpha/kernel/osf_sys.c 2010-05-28 21:27:14.523207400 -0400 +diff -urNp linux-2.6.32.16/arch/alpha/kernel/osf_sys.c linux-2.6.32.16/arch/alpha/kernel/osf_sys.c +--- linux-2.6.32.16/arch/alpha/kernel/osf_sys.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/alpha/kernel/osf_sys.c 2010-07-09 14:50:34.000000000 -0400 @@ -1205,6 +1205,10 @@ arch_get_unmapped_area(struct file *filp merely specific addresses, but regions of memory -- perhaps 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 if (addr != (unsigned long) -ENOMEM) return addr; -diff -urNp linux-2.6.32.15/arch/alpha/mm/fault.c linux-2.6.32.15/arch/alpha/mm/fault.c ---- linux-2.6.32.15/arch/alpha/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/alpha/mm/fault.c 2010-05-28 21:27:14.523207400 -0400 +diff -urNp linux-2.6.32.16/arch/alpha/mm/fault.c linux-2.6.32.16/arch/alpha/mm/fault.c +--- linux-2.6.32.16/arch/alpha/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/alpha/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * __reload_thread(pcb); } @@ -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 } else if (!cause) { /* Allow reads even for write-only mappings */ if (!(vma->vm_flags & (VM_READ | VM_WRITE))) -diff -urNp linux-2.6.32.15/arch/arm/include/asm/elf.h linux-2.6.32.15/arch/arm/include/asm/elf.h ---- linux-2.6.32.15/arch/arm/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/arm/include/asm/elf.h 2010-05-28 21:27:14.523207400 -0400 +diff -urNp linux-2.6.32.16/arch/arm/include/asm/elf.h linux-2.6.32.16/arch/arm/include/asm/elf.h +--- linux-2.6.32.16/arch/arm/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/arm/include/asm/elf.h 2010-07-09 14:50:34.000000000 -0400 @@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t the loader. We need to make sure that it is out of the way of the program 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 /* When the program starts, a1 contains a pointer to a function to be registered with atexit, as per the SVR4 ABI. A value of 0 means we -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 ---- linux-2.6.32.15/arch/arm/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/arm/include/asm/kmap_types.h 2010-05-28 21:27:14.523207400 -0400 +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 +--- linux-2.6.32.16/arch/arm/include/asm/kmap_types.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/arm/include/asm/kmap_types.h 2010-07-09 14:50:34.000000000 -0400 @@ -19,6 +19,7 @@ enum km_type { KM_SOFTIRQ0, 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 KM_TYPE_NR }; -diff -urNp linux-2.6.32.15/arch/arm/include/asm/uaccess.h linux-2.6.32.15/arch/arm/include/asm/uaccess.h ---- linux-2.6.32.15/arch/arm/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/arm/include/asm/uaccess.h 2010-05-28 21:27:14.539151073 -0400 +diff -urNp linux-2.6.32.16/arch/arm/include/asm/uaccess.h linux-2.6.32.16/arch/arm/include/asm/uaccess.h +--- linux-2.6.32.16/arch/arm/include/asm/uaccess.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/arm/include/asm/uaccess.h 2010-07-09 14:50:34.000000000 -0400 @@ -403,6 +403,9 @@ extern unsigned long __must_check __strn 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 if (access_ok(VERIFY_WRITE, to, n)) n = __copy_to_user(to, from, n); return n; -diff -urNp linux-2.6.32.15/arch/arm/kernel/kgdb.c linux-2.6.32.15/arch/arm/kernel/kgdb.c ---- linux-2.6.32.15/arch/arm/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/arm/kernel/kgdb.c 2010-05-28 21:27:14.539151073 -0400 +diff -urNp linux-2.6.32.16/arch/arm/kernel/kgdb.c linux-2.6.32.16/arch/arm/kernel/kgdb.c +--- linux-2.6.32.16/arch/arm/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/arm/kernel/kgdb.c 2010-07-09 14:50:34.000000000 -0400 @@ -190,7 +190,7 @@ void kgdb_arch_exit(void) * and we handle the normal undef case within the do_undefinstr * 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 #ifndef __ARMEB__ .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7} #else /* ! __ARMEB__ */ -diff -urNp linux-2.6.32.15/arch/arm/mach-at91/pm.c linux-2.6.32.15/arch/arm/mach-at91/pm.c ---- linux-2.6.32.15/arch/arm/mach-at91/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/arm/mach-at91/pm.c 2010-05-28 21:27:14.600189804 -0400 +diff -urNp linux-2.6.32.16/arch/arm/mach-at91/pm.c linux-2.6.32.16/arch/arm/mach-at91/pm.c +--- linux-2.6.32.16/arch/arm/mach-at91/pm.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/arm/mach-at91/pm.c 2010-07-09 14:50:34.000000000 -0400 @@ -348,7 +348,7 @@ static void at91_pm_end(void) } @@ -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 .valid = at91_pm_valid_state, .begin = at91_pm_begin, .enter = at91_pm_enter, -diff -urNp linux-2.6.32.15/arch/arm/mach-omap1/pm.c linux-2.6.32.15/arch/arm/mach-omap1/pm.c ---- linux-2.6.32.15/arch/arm/mach-omap1/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/arm/mach-omap1/pm.c 2010-05-28 21:27:14.600189804 -0400 +diff -urNp linux-2.6.32.16/arch/arm/mach-omap1/pm.c linux-2.6.32.16/arch/arm/mach-omap1/pm.c +--- linux-2.6.32.16/arch/arm/mach-omap1/pm.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/arm/mach-omap1/pm.c 2010-07-09 14:50:34.000000000 -0400 @@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq @@ -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 .prepare = omap_pm_prepare, .enter = omap_pm_enter, .finish = omap_pm_finish, -diff -urNp linux-2.6.32.15/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.15/arch/arm/mach-omap2/pm24xx.c ---- linux-2.6.32.15/arch/arm/mach-omap2/pm24xx.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/arm/mach-omap2/pm24xx.c 2010-05-28 21:27:14.650418612 -0400 +diff -urNp linux-2.6.32.16/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.16/arch/arm/mach-omap2/pm24xx.c +--- linux-2.6.32.16/arch/arm/mach-omap2/pm24xx.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/arm/mach-omap2/pm24xx.c 2010-07-09 14:50:34.000000000 -0400 @@ -326,7 +326,7 @@ static void omap2_pm_finish(void) enable_hlt(); } @@ -333,9 +333,9 @@ diff -urNp linux-2.6.32.15/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.15/arch/arm .prepare = omap2_pm_prepare, .enter = omap2_pm_enter, .finish = omap2_pm_finish, -diff -urNp linux-2.6.32.15/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.15/arch/arm/mach-omap2/pm34xx.c ---- linux-2.6.32.15/arch/arm/mach-omap2/pm34xx.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/arm/mach-omap2/pm34xx.c 2010-05-28 21:27:14.651073283 -0400 +diff -urNp linux-2.6.32.16/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.16/arch/arm/mach-omap2/pm34xx.c +--- linux-2.6.32.16/arch/arm/mach-omap2/pm34xx.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/arm/mach-omap2/pm34xx.c 2010-07-09 14:50:34.000000000 -0400 @@ -401,7 +401,7 @@ static void omap3_pm_end(void) return; } @@ -345,9 +345,9 @@ diff -urNp linux-2.6.32.15/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.15/arch/arm .begin = omap3_pm_begin, .end = omap3_pm_end, .prepare = omap3_pm_prepare, -diff -urNp linux-2.6.32.15/arch/arm/mach-pnx4008/pm.c linux-2.6.32.15/arch/arm/mach-pnx4008/pm.c ---- linux-2.6.32.15/arch/arm/mach-pnx4008/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/arm/mach-pnx4008/pm.c 2010-05-28 21:27:14.651073283 -0400 +diff -urNp linux-2.6.32.16/arch/arm/mach-pnx4008/pm.c linux-2.6.32.16/arch/arm/mach-pnx4008/pm.c +--- linux-2.6.32.16/arch/arm/mach-pnx4008/pm.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/arm/mach-pnx4008/pm.c 2010-07-09 14:50:34.000000000 -0400 @@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat (state == PM_SUSPEND_MEM); } @@ -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 .enter = pnx4008_pm_enter, .valid = pnx4008_pm_valid, }; -diff -urNp linux-2.6.32.15/arch/arm/mach-pxa/pm.c linux-2.6.32.15/arch/arm/mach-pxa/pm.c ---- linux-2.6.32.15/arch/arm/mach-pxa/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/arm/mach-pxa/pm.c 2010-05-28 21:27:14.651073283 -0400 +diff -urNp linux-2.6.32.16/arch/arm/mach-pxa/pm.c linux-2.6.32.16/arch/arm/mach-pxa/pm.c +--- linux-2.6.32.16/arch/arm/mach-pxa/pm.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/arm/mach-pxa/pm.c 2010-07-09 14:50:34.000000000 -0400 @@ -95,7 +95,7 @@ void pxa_pm_finish(void) pxa_cpu_pm_fns->finish(); } @@ -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- .valid = pxa_pm_valid, .enter = pxa_pm_enter, .prepare = pxa_pm_prepare, -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 ---- linux-2.6.32.15/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/arm/mach-pxa/sharpsl_pm.c 2010-05-28 21:27:14.674954367 -0400 +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 +--- linux-2.6.32.16/arch/arm/mach-pxa/sharpsl_pm.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/arm/mach-pxa/sharpsl_pm.c 2010-07-09 14:50:34.000000000 -0400 @@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status } @@ -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 .prepare = pxa_pm_prepare, .finish = pxa_pm_finish, .enter = corgi_pxa_pm_enter, -diff -urNp linux-2.6.32.15/arch/arm/mach-sa1100/pm.c linux-2.6.32.15/arch/arm/mach-sa1100/pm.c ---- linux-2.6.32.15/arch/arm/mach-sa1100/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/arm/mach-sa1100/pm.c 2010-05-28 21:27:14.674954367 -0400 +diff -urNp linux-2.6.32.16/arch/arm/mach-sa1100/pm.c linux-2.6.32.16/arch/arm/mach-sa1100/pm.c +--- linux-2.6.32.16/arch/arm/mach-sa1100/pm.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/arm/mach-sa1100/pm.c 2010-07-09 14:50:34.000000000 -0400 @@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp) return virt_to_phys(sp); } @@ -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 .enter = sa11x0_pm_enter, .valid = suspend_valid_only_mem, }; -diff -urNp linux-2.6.32.15/arch/arm/mm/fault.c linux-2.6.32.15/arch/arm/mm/fault.c ---- linux-2.6.32.15/arch/arm/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/arm/mm/fault.c 2010-05-28 21:27:14.683127211 -0400 +diff -urNp linux-2.6.32.16/arch/arm/mm/fault.c linux-2.6.32.16/arch/arm/mm/fault.c +--- linux-2.6.32.16/arch/arm/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/arm/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 @@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk, } #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 /* * First Level Translation Fault Handler * -diff -urNp linux-2.6.32.15/arch/arm/mm/mmap.c linux-2.6.32.15/arch/arm/mm/mmap.c ---- linux-2.6.32.15/arch/arm/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/arm/mm/mmap.c 2010-05-28 21:27:14.704140649 -0400 +diff -urNp linux-2.6.32.16/arch/arm/mm/mmap.c linux-2.6.32.16/arch/arm/mm/mmap.c +--- linux-2.6.32.16/arch/arm/mm/mmap.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/arm/mm/mmap.c 2010-07-09 14:50:34.000000000 -0400 @@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp if (len > TASK_SIZE) 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 mm->cached_hole_size = 0; goto full_search; } -diff -urNp linux-2.6.32.15/arch/arm/plat-s3c/pm.c linux-2.6.32.15/arch/arm/plat-s3c/pm.c ---- linux-2.6.32.15/arch/arm/plat-s3c/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/arm/plat-s3c/pm.c 2010-05-28 21:27:14.704140649 -0400 +diff -urNp linux-2.6.32.16/arch/arm/plat-s3c/pm.c linux-2.6.32.16/arch/arm/plat-s3c/pm.c +--- linux-2.6.32.16/arch/arm/plat-s3c/pm.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/arm/plat-s3c/pm.c 2010-07-09 14:50:34.000000000 -0400 @@ -355,7 +355,7 @@ static void s3c_pm_finish(void) s3c_pm_check_cleanup(); } @@ -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- .enter = s3c_pm_enter, .prepare = s3c_pm_prepare, .finish = s3c_pm_finish, -diff -urNp linux-2.6.32.15/arch/avr32/include/asm/elf.h linux-2.6.32.15/arch/avr32/include/asm/elf.h ---- linux-2.6.32.15/arch/avr32/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/avr32/include/asm/elf.h 2010-05-28 21:27:14.704140649 -0400 +diff -urNp linux-2.6.32.16/arch/avr32/include/asm/elf.h linux-2.6.32.16/arch/avr32/include/asm/elf.h +--- linux-2.6.32.16/arch/avr32/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/avr32/include/asm/elf.h 2010-07-09 14:50:34.000000000 -0400 @@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg the loader. We need to make sure that it is out of the way of the program 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 /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space, -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 ---- linux-2.6.32.15/arch/avr32/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/avr32/include/asm/kmap_types.h 2010-05-28 21:27:14.706951400 -0400 +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 +--- linux-2.6.32.16/arch/avr32/include/asm/kmap_types.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/avr32/include/asm/kmap_types.h 2010-07-09 14:50:34.000000000 -0400 @@ -22,7 +22,8 @@ D(10) KM_IRQ0, D(11) KM_IRQ1, 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 }; #undef D -diff -urNp linux-2.6.32.15/arch/avr32/mach-at32ap/pm.c linux-2.6.32.15/arch/avr32/mach-at32ap/pm.c ---- linux-2.6.32.15/arch/avr32/mach-at32ap/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/avr32/mach-at32ap/pm.c 2010-05-28 21:27:14.706951400 -0400 +diff -urNp linux-2.6.32.16/arch/avr32/mach-at32ap/pm.c linux-2.6.32.16/arch/avr32/mach-at32ap/pm.c +--- linux-2.6.32.16/arch/avr32/mach-at32ap/pm.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/avr32/mach-at32ap/pm.c 2010-07-09 14:50:34.000000000 -0400 @@ -176,7 +176,7 @@ out: return 0; } @@ -539,9 +539,9 @@ diff -urNp linux-2.6.32.15/arch/avr32/mach-at32ap/pm.c linux-2.6.32.15/arch/avr3 .valid = avr32_pm_valid_state, .enter = avr32_pm_enter, }; -diff -urNp linux-2.6.32.15/arch/avr32/mm/fault.c linux-2.6.32.15/arch/avr32/mm/fault.c ---- linux-2.6.32.15/arch/avr32/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/avr32/mm/fault.c 2010-05-28 21:27:14.706951400 -0400 +diff -urNp linux-2.6.32.16/arch/avr32/mm/fault.c linux-2.6.32.16/arch/avr32/mm/fault.c +--- linux-2.6.32.16/arch/avr32/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/avr32/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru 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 if (exception_trace && printk_ratelimit()) printk("%s%s[%d]: segfault at %08lx pc %08lx " "sp %08lx ecr %lu\n", -diff -urNp linux-2.6.32.15/arch/blackfin/kernel/kgdb.c linux-2.6.32.15/arch/blackfin/kernel/kgdb.c ---- linux-2.6.32.15/arch/blackfin/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/blackfin/kernel/kgdb.c 2010-05-28 21:27:14.706951400 -0400 +diff -urNp linux-2.6.32.16/arch/blackfin/kernel/kgdb.c linux-2.6.32.16/arch/blackfin/kernel/kgdb.c +--- linux-2.6.32.16/arch/blackfin/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/blackfin/kernel/kgdb.c 2010-07-09 14:50:34.000000000 -0400 @@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto return -1; /* this means that we do not want to exit from the handler */ } @@ -595,9 +595,9 @@ diff -urNp linux-2.6.32.15/arch/blackfin/kernel/kgdb.c linux-2.6.32.15/arch/blac .gdb_bpt_instr = {0xa1}, #ifdef CONFIG_SMP .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP, -diff -urNp linux-2.6.32.15/arch/blackfin/mach-common/pm.c linux-2.6.32.15/arch/blackfin/mach-common/pm.c ---- linux-2.6.32.15/arch/blackfin/mach-common/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/blackfin/mach-common/pm.c 2010-05-28 21:27:14.706951400 -0400 +diff -urNp linux-2.6.32.16/arch/blackfin/mach-common/pm.c linux-2.6.32.16/arch/blackfin/mach-common/pm.c +--- linux-2.6.32.16/arch/blackfin/mach-common/pm.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/blackfin/mach-common/pm.c 2010-07-09 14:50:34.000000000 -0400 @@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t return 0; } @@ -607,9 +607,9 @@ diff -urNp linux-2.6.32.15/arch/blackfin/mach-common/pm.c linux-2.6.32.15/arch/b .enter = bfin_pm_enter, .valid = bfin_pm_valid, }; -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 ---- linux-2.6.32.15/arch/frv/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/frv/include/asm/kmap_types.h 2010-05-28 21:27:14.706951400 -0400 +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 +--- linux-2.6.32.16/arch/frv/include/asm/kmap_types.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/frv/include/asm/kmap_types.h 2010-07-09 14:50:34.000000000 -0400 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, 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 KM_TYPE_NR }; -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 ---- linux-2.6.32.15/arch/ia64/hp/common/hwsw_iommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/ia64/hp/common/hwsw_iommu.c 2010-05-28 21:27:14.706951400 -0400 +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 +--- linux-2.6.32.16/arch/ia64/hp/common/hwsw_iommu.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/ia64/hp/common/hwsw_iommu.c 2010-07-09 14:50:34.000000000 -0400 @@ -17,7 +17,7 @@ #include <linux/swiotlb.h> #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 { if (use_swiotlb(dev)) return &swiotlb_dma_ops; -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 ---- linux-2.6.32.15/arch/ia64/hp/common/sba_iommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/ia64/hp/common/sba_iommu.c 2010-05-28 21:27:14.706951400 -0400 +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 +--- linux-2.6.32.16/arch/ia64/hp/common/sba_iommu.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/ia64/hp/common/sba_iommu.c 2010-07-09 14:50:34.000000000 -0400 @@ -2077,7 +2077,7 @@ static struct acpi_driver acpi_sba_ioc_d }, }; @@ -660,9 +660,9 @@ diff -urNp linux-2.6.32.15/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.15/arch/ .alloc_coherent = sba_alloc_coherent, .free_coherent = sba_free_coherent, .map_page = sba_map_page, -diff -urNp linux-2.6.32.15/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.15/arch/ia64/ia32/binfmt_elf32.c ---- linux-2.6.32.15/arch/ia64/ia32/binfmt_elf32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/ia64/ia32/binfmt_elf32.c 2010-05-28 21:27:14.706951400 -0400 +diff -urNp linux-2.6.32.16/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.16/arch/ia64/ia32/binfmt_elf32.c +--- linux-2.6.32.16/arch/ia64/ia32/binfmt_elf32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/ia64/ia32/binfmt_elf32.c 2010-07-09 14:50:34.000000000 -0400 @@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_ #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 /* Ugly but avoids duplication */ #include "../../../fs/binfmt_elf.c" -diff -urNp linux-2.6.32.15/arch/ia64/ia32/ia32priv.h linux-2.6.32.15/arch/ia64/ia32/ia32priv.h ---- linux-2.6.32.15/arch/ia64/ia32/ia32priv.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/ia64/ia32/ia32priv.h 2010-05-28 21:27:14.716122970 -0400 +diff -urNp linux-2.6.32.16/arch/ia64/ia32/ia32priv.h linux-2.6.32.16/arch/ia64/ia32/ia32priv.h +--- linux-2.6.32.16/arch/ia64/ia32/ia32priv.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/ia64/ia32/ia32priv.h 2010-07-09 14:50:34.000000000 -0400 @@ -296,7 +296,14 @@ typedef struct compat_siginfo { #define ELF_DATA ELFDATA2LSB #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 #define IA32_GATE_OFFSET IA32_PAGE_OFFSET #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE -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 ---- linux-2.6.32.15/arch/ia64/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/ia64/include/asm/dma-mapping.h 2010-05-28 21:27:14.716122970 -0400 +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 +--- linux-2.6.32.16/arch/ia64/include/asm/dma-mapping.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/ia64/include/asm/dma-mapping.h 2010-07-09 14:50:34.000000000 -0400 @@ -12,7 +12,7 @@ #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 return ops->dma_supported(dev, mask); } -diff -urNp linux-2.6.32.15/arch/ia64/include/asm/elf.h linux-2.6.32.15/arch/ia64/include/asm/elf.h ---- linux-2.6.32.15/arch/ia64/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/ia64/include/asm/elf.h 2010-05-28 21:27:14.716122970 -0400 +diff -urNp linux-2.6.32.16/arch/ia64/include/asm/elf.h linux-2.6.32.16/arch/ia64/include/asm/elf.h +--- linux-2.6.32.16/arch/ia64/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/ia64/include/asm/elf.h 2010-07-09 14:50:34.000000000 -0400 @@ -43,6 +43,13 @@ */ #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 #define PT_IA_64_UNWIND 0x70000001 /* IA-64 relocations: */ -diff -urNp linux-2.6.32.15/arch/ia64/include/asm/machvec.h linux-2.6.32.15/arch/ia64/include/asm/machvec.h ---- linux-2.6.32.15/arch/ia64/include/asm/machvec.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/ia64/include/asm/machvec.h 2010-05-28 21:27:14.716122970 -0400 +diff -urNp linux-2.6.32.16/arch/ia64/include/asm/machvec.h linux-2.6.32.16/arch/ia64/include/asm/machvec.h +--- linux-2.6.32.16/arch/ia64/include/asm/machvec.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/ia64/include/asm/machvec.h 2010-07-09 14:50:34.000000000 -0400 @@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event /* DMA-mapping interface: */ 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/ /* * Define default versions so we can extend machvec for new platforms without having -diff -urNp linux-2.6.32.15/arch/ia64/include/asm/pgtable.h linux-2.6.32.15/arch/ia64/include/asm/pgtable.h ---- linux-2.6.32.15/arch/ia64/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/ia64/include/asm/pgtable.h 2010-05-28 21:27:14.716122970 -0400 +diff -urNp linux-2.6.32.16/arch/ia64/include/asm/pgtable.h linux-2.6.32.16/arch/ia64/include/asm/pgtable.h +--- linux-2.6.32.16/arch/ia64/include/asm/pgtable.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/ia64/include/asm/pgtable.h 2010-07-09 14:50:34.000000000 -0400 @@ -143,6 +143,17 @@ #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) #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/ #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX) #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX) #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX) -diff -urNp linux-2.6.32.15/arch/ia64/include/asm/uaccess.h linux-2.6.32.15/arch/ia64/include/asm/uaccess.h ---- linux-2.6.32.15/arch/ia64/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/ia64/include/asm/uaccess.h 2010-05-28 21:27:14.728159079 -0400 +diff -urNp linux-2.6.32.16/arch/ia64/include/asm/uaccess.h linux-2.6.32.16/arch/ia64/include/asm/uaccess.h +--- linux-2.6.32.16/arch/ia64/include/asm/uaccess.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/ia64/include/asm/uaccess.h 2010-07-09 14:50:34.000000000 -0400 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ const void *__cu_from = (from); \ 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/ __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ __cu_len; \ }) -diff -urNp linux-2.6.32.15/arch/ia64/kernel/dma-mapping.c linux-2.6.32.15/arch/ia64/kernel/dma-mapping.c ---- linux-2.6.32.15/arch/ia64/kernel/dma-mapping.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/ia64/kernel/dma-mapping.c 2010-05-28 21:27:14.731127928 -0400 +diff -urNp linux-2.6.32.16/arch/ia64/kernel/dma-mapping.c linux-2.6.32.16/arch/ia64/kernel/dma-mapping.c +--- linux-2.6.32.16/arch/ia64/kernel/dma-mapping.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/ia64/kernel/dma-mapping.c 2010-07-09 14:50:34.000000000 -0400 @@ -3,7 +3,7 @@ /* Set this to 1 if there is a HW IOMMU in the system */ 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 { return dma_ops; } -diff -urNp linux-2.6.32.15/arch/ia64/kernel/module.c linux-2.6.32.15/arch/ia64/kernel/module.c ---- linux-2.6.32.15/arch/ia64/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/ia64/kernel/module.c 2010-05-28 21:27:14.734962469 -0400 +diff -urNp linux-2.6.32.16/arch/ia64/kernel/module.c linux-2.6.32.16/arch/ia64/kernel/module.c +--- linux-2.6.32.16/arch/ia64/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/ia64/kernel/module.c 2010-07-09 14:50:34.000000000 -0400 @@ -315,8 +315,7 @@ module_alloc (unsigned long size) void 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 mod->arch.gp = gp; DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); } -diff -urNp linux-2.6.32.15/arch/ia64/kernel/pci-dma.c linux-2.6.32.15/arch/ia64/kernel/pci-dma.c ---- linux-2.6.32.15/arch/ia64/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/ia64/kernel/pci-dma.c 2010-05-28 21:27:14.734962469 -0400 +diff -urNp linux-2.6.32.16/arch/ia64/kernel/pci-dma.c linux-2.6.32.16/arch/ia64/kernel/pci-dma.c +--- linux-2.6.32.16/arch/ia64/kernel/pci-dma.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/ia64/kernel/pci-dma.c 2010-07-09 14:50:44.000000000 -0400 @@ -43,7 +43,7 @@ struct device fallback_dev = { .dma_mask = &fallback_dev.coherent_dma_mask, }; @@ -946,9 +946,51 @@ diff -urNp linux-2.6.32.15/arch/ia64/kernel/pci-dma.c linux-2.6.32.15/arch/ia64/ static int __init pci_iommu_init(void) { -diff -urNp linux-2.6.32.15/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.15/arch/ia64/kernel/pci-swiotlb.c ---- linux-2.6.32.15/arch/ia64/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/ia64/kernel/pci-swiotlb.c 2010-05-28 21:27:14.734962469 -0400 +@@ -96,15 +96,34 @@ int iommu_dma_supported(struct device *d + } + EXPORT_SYMBOL(iommu_dma_supported); + ++extern void *intel_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t *dma_handle, gfp_t flags); ++extern void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr, dma_addr_t dma_handle); ++extern int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int nelems, enum dma_data_direction dir, struct dma_attrs *attrs); ++extern void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist, int nelems, enum dma_data_direction dir, struct dma_attrs *attrs); ++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); ++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); ++extern int intel_mapping_error(struct device *dev, dma_addr_t dma_addr); ++ ++static const struct dma_map_ops intel_iommu_dma_ops = { ++ /* from drivers/pci/intel-iommu.c:intel_dma_ops */ ++ .alloc_coherent = intel_alloc_coherent, ++ .free_coherent = intel_free_coherent, ++ .map_sg = intel_map_sg, ++ .unmap_sg = intel_unmap_sg, ++ .map_page = intel_map_page, ++ .unmap_page = intel_unmap_page, ++ .mapping_error = intel_mapping_error, ++ ++ .sync_single_for_cpu = machvec_dma_sync_single, ++ .sync_sg_for_cpu = machvec_dma_sync_sg, ++ .sync_single_for_device = machvec_dma_sync_single, ++ .sync_sg_for_device = machvec_dma_sync_sg, ++ .dma_supported = iommu_dma_supported, ++}; ++ + void __init pci_iommu_alloc(void) + { +- dma_ops = &intel_dma_ops; +- +- dma_ops->sync_single_for_cpu = machvec_dma_sync_single; +- dma_ops->sync_sg_for_cpu = machvec_dma_sync_sg; +- dma_ops->sync_single_for_device = machvec_dma_sync_single; +- dma_ops->sync_sg_for_device = machvec_dma_sync_sg; +- dma_ops->dma_supported = iommu_dma_supported; ++ dma_ops = &intel_iommu_dma_ops; + + /* + * The order of these functions is important for +diff -urNp linux-2.6.32.16/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.16/arch/ia64/kernel/pci-swiotlb.c +--- linux-2.6.32.16/arch/ia64/kernel/pci-swiotlb.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/ia64/kernel/pci-swiotlb.c 2010-07-09 14:50:34.000000000 -0400 @@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); } @@ -958,9 +1000,9 @@ diff -urNp linux-2.6.32.15/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.15/arch/i .alloc_coherent = ia64_swiotlb_alloc_coherent, .free_coherent = swiotlb_free_coherent, .map_page = swiotlb_map_page, -diff -urNp linux-2.6.32.15/arch/ia64/kernel/sys_ia64.c linux-2.6.32.15/arch/ia64/kernel/sys_ia64.c ---- linux-2.6.32.15/arch/ia64/kernel/sys_ia64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/ia64/kernel/sys_ia64.c 2010-05-28 21:27:14.734962469 -0400 +diff -urNp linux-2.6.32.16/arch/ia64/kernel/sys_ia64.c linux-2.6.32.16/arch/ia64/kernel/sys_ia64.c +--- linux-2.6.32.16/arch/ia64/kernel/sys_ia64.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/ia64/kernel/sys_ia64.c 2010-07-09 14:50:34.000000000 -0400 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil if (REGION_NUMBER(addr) == RGN_HPAGE) 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 goto full_search; } return -ENOMEM; -diff -urNp linux-2.6.32.15/arch/ia64/kernel/topology.c linux-2.6.32.15/arch/ia64/kernel/topology.c ---- linux-2.6.32.15/arch/ia64/kernel/topology.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/ia64/kernel/topology.c 2010-05-28 21:27:14.743147071 -0400 +diff -urNp linux-2.6.32.16/arch/ia64/kernel/topology.c linux-2.6.32.16/arch/ia64/kernel/topology.c +--- linux-2.6.32.16/arch/ia64/kernel/topology.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/ia64/kernel/topology.c 2010-07-09 14:50:34.000000000 -0400 @@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject return ret; } @@ -999,9 +1041,9 @@ diff -urNp linux-2.6.32.15/arch/ia64/kernel/topology.c linux-2.6.32.15/arch/ia64 .show = cache_show }; -diff -urNp linux-2.6.32.15/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.15/arch/ia64/kernel/vmlinux.lds.S ---- linux-2.6.32.15/arch/ia64/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/ia64/kernel/vmlinux.lds.S 2010-05-28 21:27:14.743147071 -0400 +diff -urNp linux-2.6.32.16/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.16/arch/ia64/kernel/vmlinux.lds.S +--- linux-2.6.32.16/arch/ia64/kernel/vmlinux.lds.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/ia64/kernel/vmlinux.lds.S 2010-07-09 14:50:34.000000000 -0400 @@ -190,7 +190,7 @@ SECTIONS /* Per-cpu data: */ . = 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 . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits * into percpu page size */ -diff -urNp linux-2.6.32.15/arch/ia64/mm/fault.c linux-2.6.32.15/arch/ia64/mm/fault.c ---- linux-2.6.32.15/arch/ia64/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/ia64/mm/fault.c 2010-05-28 21:27:14.743147071 -0400 +diff -urNp linux-2.6.32.16/arch/ia64/mm/fault.c linux-2.6.32.16/arch/ia64/mm/fault.c +--- linux-2.6.32.16/arch/ia64/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/ia64/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned return pte_present(pte); } @@ -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 survive: /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.32.15/arch/ia64/mm/init.c linux-2.6.32.15/arch/ia64/mm/init.c ---- linux-2.6.32.15/arch/ia64/mm/init.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/ia64/mm/init.c 2010-05-28 21:27:14.755165915 -0400 +diff -urNp linux-2.6.32.16/arch/ia64/mm/init.c linux-2.6.32.16/arch/ia64/mm/init.c +--- linux-2.6.32.16/arch/ia64/mm/init.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/ia64/mm/init.c 2010-07-09 14:50:34.000000000 -0400 @@ -122,6 +122,19 @@ ia64_init_addr_space (void) vma->vm_start = current->thread.rbs_bot & PAGE_MASK; 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 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); down_write(¤t->mm->mmap_sem); if (insert_vm_struct(current->mm, vma)) { -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 ---- linux-2.6.32.15/arch/ia64/sn/pci/pci_dma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/ia64/sn/pci/pci_dma.c 2010-05-28 21:27:14.755165915 -0400 +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 +--- linux-2.6.32.16/arch/ia64/sn/pci/pci_dma.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/ia64/sn/pci/pci_dma.c 2010-07-09 14:50:34.000000000 -0400 @@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus * return ret; } @@ -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/ .alloc_coherent = sn_dma_alloc_coherent, .free_coherent = sn_dma_free_coherent, .map_page = sn_dma_map_page, -diff -urNp linux-2.6.32.15/arch/m32r/lib/usercopy.c linux-2.6.32.15/arch/m32r/lib/usercopy.c ---- linux-2.6.32.15/arch/m32r/lib/usercopy.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/m32r/lib/usercopy.c 2010-05-28 21:27:14.755165915 -0400 +diff -urNp linux-2.6.32.16/arch/m32r/lib/usercopy.c linux-2.6.32.16/arch/m32r/lib/usercopy.c +--- linux-2.6.32.16/arch/m32r/lib/usercopy.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/m32r/lib/usercopy.c 2010-07-09 14:50:34.000000000 -0400 @@ -14,6 +14,9 @@ unsigned long __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 prefetchw(to); if (access_ok(VERIFY_READ, from, n)) __copy_user_zeroing(to,from,n); -diff -urNp linux-2.6.32.15/arch/mips/alchemy/devboards/pm.c linux-2.6.32.15/arch/mips/alchemy/devboards/pm.c ---- linux-2.6.32.15/arch/mips/alchemy/devboards/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/mips/alchemy/devboards/pm.c 2010-05-28 21:27:14.755165915 -0400 +diff -urNp linux-2.6.32.16/arch/mips/alchemy/devboards/pm.c linux-2.6.32.16/arch/mips/alchemy/devboards/pm.c +--- linux-2.6.32.16/arch/mips/alchemy/devboards/pm.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/mips/alchemy/devboards/pm.c 2010-07-09 14:50:34.000000000 -0400 @@ -78,7 +78,7 @@ static void db1x_pm_end(void) } @@ -1133,9 +1175,9 @@ diff -urNp linux-2.6.32.15/arch/mips/alchemy/devboards/pm.c linux-2.6.32.15/arch .valid = suspend_valid_only_mem, .begin = db1x_pm_begin, .enter = db1x_pm_enter, -diff -urNp linux-2.6.32.15/arch/mips/include/asm/elf.h linux-2.6.32.15/arch/mips/include/asm/elf.h ---- linux-2.6.32.15/arch/mips/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/mips/include/asm/elf.h 2010-05-28 21:27:14.755165915 -0400 +diff -urNp linux-2.6.32.16/arch/mips/include/asm/elf.h linux-2.6.32.16/arch/mips/include/asm/elf.h +--- linux-2.6.32.16/arch/mips/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/mips/include/asm/elf.h 2010-07-09 14:50:34.000000000 -0400 @@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) #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 +#endif + #endif /* _ASM_ELF_H */ -diff -urNp linux-2.6.32.15/arch/mips/include/asm/page.h linux-2.6.32.15/arch/mips/include/asm/page.h ---- linux-2.6.32.15/arch/mips/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/mips/include/asm/page.h 2010-05-28 21:27:14.755165915 -0400 +diff -urNp linux-2.6.32.16/arch/mips/include/asm/page.h linux-2.6.32.16/arch/mips/include/asm/page.h +--- linux-2.6.32.16/arch/mips/include/asm/page.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/mips/include/asm/page.h 2010-07-09 14:50:34.000000000 -0400 @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa #ifdef CONFIG_CPU_MIPS32 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 #else typedef struct { unsigned long long pte; } pte_t; #define pte_val(x) ((x).pte) -diff -urNp linux-2.6.32.15/arch/mips/include/asm/system.h linux-2.6.32.15/arch/mips/include/asm/system.h ---- linux-2.6.32.15/arch/mips/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/mips/include/asm/system.h 2010-05-28 21:27:14.755165915 -0400 +diff -urNp linux-2.6.32.16/arch/mips/include/asm/system.h linux-2.6.32.16/arch/mips/include/asm/system.h +--- linux-2.6.32.16/arch/mips/include/asm/system.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/mips/include/asm/system.h 2010-07-09 14:50:34.000000000 -0400 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); */ #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 +#define arch_align_stack(x) ((x) & ALMASK) #endif /* _ASM_SYSTEM_H */ -diff -urNp linux-2.6.32.15/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.15/arch/mips/kernel/binfmt_elfn32.c ---- linux-2.6.32.15/arch/mips/kernel/binfmt_elfn32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/mips/kernel/binfmt_elfn32.c 2010-05-28 21:27:14.755165915 -0400 +diff -urNp linux-2.6.32.16/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.16/arch/mips/kernel/binfmt_elfn32.c +--- linux-2.6.32.16/arch/mips/kernel/binfmt_elfn32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/mips/kernel/binfmt_elfn32.c 2010-07-09 14:50:34.000000000 -0400 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #undef ELF_ET_DYN_BASE #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 #include <asm/processor.h> #include <linux/module.h> #include <linux/elfcore.h> -diff -urNp linux-2.6.32.15/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.15/arch/mips/kernel/binfmt_elfo32.c ---- linux-2.6.32.15/arch/mips/kernel/binfmt_elfo32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/mips/kernel/binfmt_elfo32.c 2010-05-28 21:27:14.755165915 -0400 +diff -urNp linux-2.6.32.16/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.16/arch/mips/kernel/binfmt_elfo32.c +--- linux-2.6.32.16/arch/mips/kernel/binfmt_elfo32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/mips/kernel/binfmt_elfo32.c 2010-07-09 14:50:34.000000000 -0400 @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #undef ELF_ET_DYN_BASE #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 #include <asm/processor.h> /* -diff -urNp linux-2.6.32.15/arch/mips/kernel/kgdb.c linux-2.6.32.15/arch/mips/kernel/kgdb.c ---- linux-2.6.32.15/arch/mips/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/mips/kernel/kgdb.c 2010-05-28 21:27:14.771146775 -0400 +diff -urNp linux-2.6.32.16/arch/mips/kernel/kgdb.c linux-2.6.32.16/arch/mips/kernel/kgdb.c +--- linux-2.6.32.16/arch/mips/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/mips/kernel/kgdb.c 2010-07-09 14:50:34.000000000 -0400 @@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto return -1; } @@ -1216,9 +1258,9 @@ diff -urNp linux-2.6.32.15/arch/mips/kernel/kgdb.c linux-2.6.32.15/arch/mips/ker struct kgdb_arch arch_kgdb_ops; /* -diff -urNp linux-2.6.32.15/arch/mips/kernel/process.c linux-2.6.32.15/arch/mips/kernel/process.c ---- linux-2.6.32.15/arch/mips/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/mips/kernel/process.c 2010-05-28 21:27:14.796819534 -0400 +diff -urNp linux-2.6.32.16/arch/mips/kernel/process.c linux-2.6.32.16/arch/mips/kernel/process.c +--- linux-2.6.32.16/arch/mips/kernel/process.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/mips/kernel/process.c 2010-07-09 14:50:34.000000000 -0400 @@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru out: 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/ - - return sp & ALMASK; -} -diff -urNp linux-2.6.32.15/arch/mips/kernel/syscall.c linux-2.6.32.15/arch/mips/kernel/syscall.c ---- linux-2.6.32.15/arch/mips/kernel/syscall.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/mips/kernel/syscall.c 2010-05-28 21:27:14.796819534 -0400 +diff -urNp linux-2.6.32.16/arch/mips/kernel/syscall.c linux-2.6.32.16/arch/mips/kernel/syscall.c +--- linux-2.6.32.16/arch/mips/kernel/syscall.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/mips/kernel/syscall.c 2010-07-09 14:50:34.000000000 -0400 @@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str do_color_align = 0; 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/ if (do_color_align) addr = COLOUR_ALIGN(addr, pgoff); else -diff -urNp linux-2.6.32.15/arch/mips/mm/fault.c linux-2.6.32.15/arch/mips/mm/fault.c ---- linux-2.6.32.15/arch/mips/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/mips/mm/fault.c 2010-05-28 21:27:14.796819534 -0400 +diff -urNp linux-2.6.32.16/arch/mips/mm/fault.c linux-2.6.32.16/arch/mips/mm/fault.c +--- linux-2.6.32.16/arch/mips/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/mips/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 @@ -26,6 +26,23 @@ #include <asm/ptrace.h> #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 /* * This routine handles page faults. It determines the address, * and the problem, and then passes it off to one of the appropriate -diff -urNp linux-2.6.32.15/arch/parisc/include/asm/elf.h linux-2.6.32.15/arch/parisc/include/asm/elf.h ---- linux-2.6.32.15/arch/parisc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/parisc/include/asm/elf.h 2010-05-28 21:27:14.796819534 -0400 +diff -urNp linux-2.6.32.16/arch/parisc/include/asm/elf.h linux-2.6.32.16/arch/parisc/include/asm/elf.h +--- linux-2.6.32.16/arch/parisc/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/parisc/include/asm/elf.h 2010-07-09 14:50:34.000000000 -0400 @@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration.. #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 /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space, but it's not easy, and we've already done it here. */ -diff -urNp linux-2.6.32.15/arch/parisc/include/asm/pgtable.h linux-2.6.32.15/arch/parisc/include/asm/pgtable.h ---- linux-2.6.32.15/arch/parisc/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/parisc/include/asm/pgtable.h 2010-05-28 21:27:14.796819534 -0400 +diff -urNp linux-2.6.32.16/arch/parisc/include/asm/pgtable.h linux-2.6.32.16/arch/parisc/include/asm/pgtable.h +--- linux-2.6.32.16/arch/parisc/include/asm/pgtable.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/parisc/include/asm/pgtable.h 2010-07-09 14:50:34.000000000 -0400 @@ -207,6 +207,17 @@ #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) #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 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) -diff -urNp linux-2.6.32.15/arch/parisc/kernel/module.c linux-2.6.32.15/arch/parisc/kernel/module.c ---- linux-2.6.32.15/arch/parisc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/parisc/kernel/module.c 2010-05-28 21:27:14.796819534 -0400 +diff -urNp linux-2.6.32.16/arch/parisc/kernel/module.c linux-2.6.32.16/arch/parisc/kernel/module.c +--- linux-2.6.32.16/arch/parisc/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/parisc/kernel/module.c 2010-07-09 14:50:34.000000000 -0400 @@ -95,16 +95,38 @@ /* 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 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n", me->arch.unwind_section, table, end, gp); -diff -urNp linux-2.6.32.15/arch/parisc/kernel/sys_parisc.c linux-2.6.32.15/arch/parisc/kernel/sys_parisc.c ---- linux-2.6.32.15/arch/parisc/kernel/sys_parisc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/parisc/kernel/sys_parisc.c 2010-05-28 21:27:14.796819534 -0400 +diff -urNp linux-2.6.32.16/arch/parisc/kernel/sys_parisc.c linux-2.6.32.16/arch/parisc/kernel/sys_parisc.c +--- linux-2.6.32.16/arch/parisc/kernel/sys_parisc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/parisc/kernel/sys_parisc.c 2010-07-09 14:50:34.000000000 -0400 @@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str if (flags & MAP_FIXED) 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/ if (filp) { addr = get_shared_area(filp->f_mapping, addr, len, pgoff); -diff -urNp linux-2.6.32.15/arch/parisc/kernel/traps.c linux-2.6.32.15/arch/parisc/kernel/traps.c ---- linux-2.6.32.15/arch/parisc/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/parisc/kernel/traps.c 2010-05-28 21:27:14.796819534 -0400 +diff -urNp linux-2.6.32.16/arch/parisc/kernel/traps.c linux-2.6.32.16/arch/parisc/kernel/traps.c +--- linux-2.6.32.16/arch/parisc/kernel/traps.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/parisc/kernel/traps.c 2010-07-09 14:50:34.000000000 -0400 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod 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 fault_address = regs->iaoq[0]; fault_space = regs->iasq[0]; -diff -urNp linux-2.6.32.15/arch/parisc/mm/fault.c linux-2.6.32.15/arch/parisc/mm/fault.c ---- linux-2.6.32.15/arch/parisc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/parisc/mm/fault.c 2010-05-28 21:27:14.796819534 -0400 +diff -urNp linux-2.6.32.16/arch/parisc/mm/fault.c linux-2.6.32.16/arch/parisc/mm/fault.c +--- linux-2.6.32.16/arch/parisc/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/parisc/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 @@ -15,6 +15,7 @@ #include <linux/sched.h> #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 /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/device.h linux-2.6.32.15/arch/powerpc/include/asm/device.h ---- linux-2.6.32.15/arch/powerpc/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/include/asm/device.h 2010-05-28 21:27:14.796819534 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/device.h linux-2.6.32.16/arch/powerpc/include/asm/device.h +--- linux-2.6.32.16/arch/powerpc/include/asm/device.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/include/asm/device.h 2010-07-09 14:50:34.000000000 -0400 @@ -14,7 +14,7 @@ struct dev_archdata { struct device_node *of_node; @@ -1637,9 +1679,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/device.h linux-2.6.32.15/arc /* * When an iommu is in use, dma_data is used as a ptr to the base of the -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 ---- linux-2.6.32.15/arch/powerpc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/include/asm/dma-mapping.h 2010-05-28 21:27:14.796819534 -0400 +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 +--- linux-2.6.32.16/arch/powerpc/include/asm/dma-mapping.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/include/asm/dma-mapping.h 2010-07-09 14:50:34.000000000 -0400 @@ -69,9 +69,9 @@ static inline unsigned long device_to_ma #ifdef CONFIG_PPC64 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 if (dma_ops->mapping_error) return dma_ops->mapping_error(dev, dma_addr); -diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/elf.h linux-2.6.32.15/arch/powerpc/include/asm/elf.h ---- linux-2.6.32.15/arch/powerpc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/include/asm/elf.h 2010-05-28 21:27:14.799129463 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/elf.h linux-2.6.32.16/arch/powerpc/include/asm/elf.h +--- linux-2.6.32.16/arch/powerpc/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/include/asm/elf.h 2010-07-09 14:50:34.000000000 -0400 @@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E the loader. We need to make sure that it is out of the way of the program 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 #endif /* __KERNEL__ */ /* -diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/iommu.h linux-2.6.32.15/arch/powerpc/include/asm/iommu.h ---- linux-2.6.32.15/arch/powerpc/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/include/asm/iommu.h 2010-05-28 21:27:14.799129463 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/iommu.h linux-2.6.32.16/arch/powerpc/include/asm/iommu.h +--- linux-2.6.32.16/arch/powerpc/include/asm/iommu.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/include/asm/iommu.h 2010-07-09 14:50:34.000000000 -0400 @@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi extern void iommu_init_early_dart(void); 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 #ifdef CONFIG_PCI extern void pci_iommu_init(void); extern void pci_direct_iommu_init(void); -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 ---- linux-2.6.32.15/arch/powerpc/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/include/asm/kmap_types.h 2010-05-28 21:27:14.799129463 -0400 +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 +--- linux-2.6.32.16/arch/powerpc/include/asm/kmap_types.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/include/asm/kmap_types.h 2010-07-09 14:50:34.000000000 -0400 @@ -26,6 +26,7 @@ enum km_type { KM_SOFTIRQ1, 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 KM_TYPE_NR }; -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 ---- linux-2.6.32.15/arch/powerpc/include/asm/page_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/include/asm/page_64.h 2010-05-28 21:27:14.799129463 -0400 +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 +--- linux-2.6.32.16/arch/powerpc/include/asm/page_64.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/include/asm/page_64.h 2010-07-09 14:50:34.000000000 -0400 @@ -180,15 +180,18 @@ do { \ * stack by default, so in the absense of a PT_GNU_STACK program header * 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 #include <asm-generic/getorder.h> -diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/page.h linux-2.6.32.15/arch/powerpc/include/asm/page.h ---- linux-2.6.32.15/arch/powerpc/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/include/asm/page.h 2010-05-28 21:27:14.799129463 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/page.h linux-2.6.32.16/arch/powerpc/include/asm/page.h +--- linux-2.6.32.16/arch/powerpc/include/asm/page.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/include/asm/page.h 2010-07-09 14:50:34.000000000 -0400 @@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr; * and needs to be executable. This means the whole heap ends * 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/ #ifndef __ASSEMBLY__ #undef STRICT_MM_TYPECHECKS -diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/pci.h linux-2.6.32.15/arch/powerpc/include/asm/pci.h ---- linux-2.6.32.15/arch/powerpc/include/asm/pci.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/include/asm/pci.h 2010-05-28 21:27:14.803145185 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/pci.h linux-2.6.32.16/arch/powerpc/include/asm/pci.h +--- linux-2.6.32.16/arch/powerpc/include/asm/pci.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/include/asm/pci.h 2010-07-09 14:50:34.000000000 -0400 @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq } @@ -1828,9 +1870,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/pci.h linux-2.6.32.15/arch/p #else /* CONFIG_PCI */ #define set_pci_dma_ops(d) #define get_pci_dma_ops() NULL -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 ---- linux-2.6.32.15/arch/powerpc/include/asm/pte-hash32.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/include/asm/pte-hash32.h 2010-05-28 21:27:14.803145185 -0400 +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 +--- linux-2.6.32.16/arch/powerpc/include/asm/pte-hash32.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/include/asm/pte-hash32.h 2010-07-09 14:50:34.000000000 -0400 @@ -21,6 +21,7 @@ #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ #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 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */ #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ -diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/reg.h linux-2.6.32.15/arch/powerpc/include/asm/reg.h ---- linux-2.6.32.15/arch/powerpc/include/asm/reg.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/include/asm/reg.h 2010-05-28 21:27:14.803145185 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/reg.h linux-2.6.32.16/arch/powerpc/include/asm/reg.h +--- linux-2.6.32.16/arch/powerpc/include/asm/reg.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/include/asm/reg.h 2010-07-09 14:50:34.000000000 -0400 @@ -191,6 +191,7 @@ #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ #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 #define DSISR_PROTFAULT 0x08000000 /* protection fault */ #define DSISR_ISSTORE 0x02000000 /* access was a store */ #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ -diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.15/arch/powerpc/include/asm/swiotlb.h ---- linux-2.6.32.15/arch/powerpc/include/asm/swiotlb.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/include/asm/swiotlb.h 2010-05-28 21:27:14.803145185 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.16/arch/powerpc/include/asm/swiotlb.h +--- linux-2.6.32.16/arch/powerpc/include/asm/swiotlb.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/include/asm/swiotlb.h 2010-07-09 14:50:34.000000000 -0400 @@ -13,7 +13,7 @@ #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 static inline void dma_mark_clean(void *addr, size_t size) {} -diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h ---- linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h 2010-05-28 21:27:14.803145185 -0400 -@@ -327,52 +327,6 @@ do { \ +diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/uaccess.h linux-2.6.32.16/arch/powerpc/include/asm/uaccess.h +--- linux-2.6.32.16/arch/powerpc/include/asm/uaccess.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/include/asm/uaccess.h 2010-07-09 14:50:34.000000000 -0400 +@@ -13,6 +13,8 @@ + #define VERIFY_READ 0 + #define VERIFY_WRITE 1 + ++extern void check_object_size(const void *ptr, unsigned long n, bool to); ++ + /* + * The fs value determines whether argument validity checking should be + * performed or not. If get_fs() == USER_DS, checking is performed, with +@@ -327,52 +329,6 @@ do { \ extern unsigned long __copy_tofrom_user(void __user *to, const void __user *from, unsigned long size); @@ -1918,7 +1969,7 @@ diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h linux-2.6.32.15/ar static inline unsigned long __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n) { -@@ -396,6 +350,10 @@ static inline unsigned long __copy_from_ +@@ -396,6 +352,10 @@ static inline unsigned long __copy_from_ if (ret == 0) return 0; } @@ -1929,7 +1980,7 @@ diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h linux-2.6.32.15/ar return __copy_tofrom_user((__force void __user *)to, from, n); } -@@ -422,6 +380,10 @@ static inline unsigned long __copy_to_us +@@ -422,6 +382,10 @@ static inline unsigned long __copy_to_us if (ret == 0) return 0; } @@ -1940,7 +1991,7 @@ diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h linux-2.6.32.15/ar return __copy_tofrom_user(to, (__force const void __user *)from, n); } -@@ -439,6 +401,92 @@ static inline unsigned long __copy_to_us +@@ -439,6 +403,92 @@ static inline unsigned long __copy_to_us return __copy_to_user_inatomic(to, from, size); } @@ -2033,9 +2084,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h linux-2.6.32.15/ar extern unsigned long __clear_user(void __user *addr, unsigned long size); static inline unsigned long clear_user(void __user *addr, unsigned long size) -diff -urNp linux-2.6.32.15/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.15/arch/powerpc/kernel/cacheinfo.c ---- linux-2.6.32.15/arch/powerpc/kernel/cacheinfo.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/kernel/cacheinfo.c 2010-05-28 21:27:14.807143556 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.16/arch/powerpc/kernel/cacheinfo.c +--- linux-2.6.32.16/arch/powerpc/kernel/cacheinfo.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/kernel/cacheinfo.c 2010-07-09 14:50:34.000000000 -0400 @@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde &cache_assoc_attr, }; @@ -2045,9 +2096,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.15/arch/ .show = cache_index_show, }; -diff -urNp linux-2.6.32.15/arch/powerpc/kernel/dma.c linux-2.6.32.15/arch/powerpc/kernel/dma.c ---- linux-2.6.32.15/arch/powerpc/kernel/dma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/kernel/dma.c 2010-05-28 21:27:14.807143556 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/kernel/dma.c linux-2.6.32.16/arch/powerpc/kernel/dma.c +--- linux-2.6.32.16/arch/powerpc/kernel/dma.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/kernel/dma.c 2010-07-09 14:50:34.000000000 -0400 @@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl } #endif @@ -2057,9 +2108,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/dma.c linux-2.6.32.15/arch/powerp .alloc_coherent = dma_direct_alloc_coherent, .free_coherent = dma_direct_free_coherent, .map_sg = dma_direct_map_sg, -diff -urNp linux-2.6.32.15/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.15/arch/powerpc/kernel/dma-iommu.c ---- linux-2.6.32.15/arch/powerpc/kernel/dma-iommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/kernel/dma-iommu.c 2010-05-28 21:27:14.807143556 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.16/arch/powerpc/kernel/dma-iommu.c +--- linux-2.6.32.16/arch/powerpc/kernel/dma-iommu.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/kernel/dma-iommu.c 2010-07-09 14:50:34.000000000 -0400 @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de } @@ -2069,9 +2120,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.15/arch/ { struct iommu_table *tbl = get_iommu_table_base(dev); -diff -urNp linux-2.6.32.15/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.15/arch/powerpc/kernel/dma-swiotlb.c ---- linux-2.6.32.15/arch/powerpc/kernel/dma-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/kernel/dma-swiotlb.c 2010-05-28 21:27:14.807143556 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.16/arch/powerpc/kernel/dma-swiotlb.c +--- linux-2.6.32.16/arch/powerpc/kernel/dma-swiotlb.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/kernel/dma-swiotlb.c 2010-07-09 14:50:34.000000000 -0400 @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; * map_page, and unmap_page on highmem, use normal dma_ops * 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 .alloc_coherent = dma_direct_alloc_coherent, .free_coherent = dma_direct_free_coherent, .map_sg = swiotlb_map_sg_attrs, -diff -urNp linux-2.6.32.15/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.15/arch/powerpc/kernel/exceptions-64e.S ---- linux-2.6.32.15/arch/powerpc/kernel/exceptions-64e.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/kernel/exceptions-64e.S 2010-05-28 21:27:14.823138187 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.16/arch/powerpc/kernel/exceptions-64e.S +--- linux-2.6.32.16/arch/powerpc/kernel/exceptions-64e.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/kernel/exceptions-64e.S 2010-07-09 14:50:34.000000000 -0400 @@ -455,6 +455,7 @@ storage_fault_common: std r14,_DAR(r1) 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/ addi r3,r1,STACK_FRAME_OVERHEAD ld r4,_DAR(r1) bl .bad_page_fault -diff -urNp linux-2.6.32.15/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.15/arch/powerpc/kernel/exceptions-64s.S ---- linux-2.6.32.15/arch/powerpc/kernel/exceptions-64s.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/kernel/exceptions-64s.S 2010-05-28 21:27:14.834966791 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.16/arch/powerpc/kernel/exceptions-64s.S +--- linux-2.6.32.16/arch/powerpc/kernel/exceptions-64s.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/kernel/exceptions-64s.S 2010-07-09 14:50:34.000000000 -0400 @@ -818,10 +818,10 @@ handle_page_fault: 11: ld r4,_DAR(r1) 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/ mr r5,r3 addi r3,r1,STACK_FRAME_OVERHEAD lwz r4,_DAR(r1) -diff -urNp linux-2.6.32.15/arch/powerpc/kernel/ibmebus.c linux-2.6.32.15/arch/powerpc/kernel/ibmebus.c ---- linux-2.6.32.15/arch/powerpc/kernel/ibmebus.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/kernel/ibmebus.c 2010-05-28 21:27:14.834966791 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/kernel/ibmebus.c linux-2.6.32.16/arch/powerpc/kernel/ibmebus.c +--- linux-2.6.32.16/arch/powerpc/kernel/ibmebus.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/kernel/ibmebus.c 2010-07-09 14:50:34.000000000 -0400 @@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct return 1; } @@ -2129,9 +2180,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/ibmebus.c linux-2.6.32.15/arch/po .alloc_coherent = ibmebus_alloc_coherent, .free_coherent = ibmebus_free_coherent, .map_sg = ibmebus_map_sg, -diff -urNp linux-2.6.32.15/arch/powerpc/kernel/kgdb.c linux-2.6.32.15/arch/powerpc/kernel/kgdb.c ---- linux-2.6.32.15/arch/powerpc/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/kernel/kgdb.c 2010-05-28 21:27:14.834966791 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/kernel/kgdb.c linux-2.6.32.16/arch/powerpc/kernel/kgdb.c +--- linux-2.6.32.16/arch/powerpc/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/kernel/kgdb.c 2010-07-09 14:50:34.000000000 -0400 @@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0) 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 .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08}, }; -diff -urNp linux-2.6.32.15/arch/powerpc/kernel/module_32.c linux-2.6.32.15/arch/powerpc/kernel/module_32.c ---- linux-2.6.32.15/arch/powerpc/kernel/module_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/kernel/module_32.c 2010-05-28 21:27:14.841132469 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/kernel/module_32.c linux-2.6.32.16/arch/powerpc/kernel/module_32.c +--- linux-2.6.32.16/arch/powerpc/kernel/module_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/kernel/module_32.c 2010-07-09 14:50:34.000000000 -0400 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr me->arch.core_plt_section = i; } @@ -2182,9 +2233,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/module_32.c linux-2.6.32.15/arch/ /* Find this entry, or if that fails, the next avail. entry */ while (entry->jump[0]) { -diff -urNp linux-2.6.32.15/arch/powerpc/kernel/module.c linux-2.6.32.15/arch/powerpc/kernel/module.c ---- linux-2.6.32.15/arch/powerpc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/kernel/module.c 2010-05-28 21:27:14.841132469 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/kernel/module.c linux-2.6.32.16/arch/powerpc/kernel/module.c +--- linux-2.6.32.16/arch/powerpc/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/kernel/module.c 2010-07-09 14:50:34.000000000 -0400 @@ -31,11 +31,24 @@ 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 static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, const char *name) -diff -urNp linux-2.6.32.15/arch/powerpc/kernel/pci-common.c linux-2.6.32.15/arch/powerpc/kernel/pci-common.c ---- linux-2.6.32.15/arch/powerpc/kernel/pci-common.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/kernel/pci-common.c 2010-05-28 21:27:14.841132469 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/kernel/pci-common.c linux-2.6.32.16/arch/powerpc/kernel/pci-common.c +--- linux-2.6.32.16/arch/powerpc/kernel/pci-common.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/kernel/pci-common.c 2010-07-09 14:50:34.000000000 -0400 @@ -50,14 +50,14 @@ resource_size_t isa_mem_base; unsigned int ppc_pci_flags = 0; @@ -2245,9 +2296,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/pci-common.c linux-2.6.32.15/arch { return pci_dma_ops; } -diff -urNp linux-2.6.32.15/arch/powerpc/kernel/process.c linux-2.6.32.15/arch/powerpc/kernel/process.c ---- linux-2.6.32.15/arch/powerpc/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/kernel/process.c 2010-05-28 21:27:14.843133123 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/kernel/process.c linux-2.6.32.16/arch/powerpc/kernel/process.c +--- linux-2.6.32.16/arch/powerpc/kernel/process.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/kernel/process.c 2010-07-09 14:50:34.000000000 -0400 @@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned sp -= get_random_int() & ~PAGE_MASK; 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 - - return ret; -} -diff -urNp linux-2.6.32.15/arch/powerpc/kernel/signal_32.c linux-2.6.32.15/arch/powerpc/kernel/signal_32.c ---- linux-2.6.32.15/arch/powerpc/kernel/signal_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/kernel/signal_32.c 2010-05-28 21:27:14.843133123 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/kernel/signal_32.c linux-2.6.32.16/arch/powerpc/kernel/signal_32.c +--- linux-2.6.32.16/arch/powerpc/kernel/signal_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/kernel/signal_32.c 2010-07-09 14:50:34.000000000 -0400 @@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig /* Save user registers on the stack */ 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/ if (save_user_regs(regs, frame, 0, 1)) goto badframe; regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; -diff -urNp linux-2.6.32.15/arch/powerpc/kernel/signal_64.c linux-2.6.32.15/arch/powerpc/kernel/signal_64.c ---- linux-2.6.32.15/arch/powerpc/kernel/signal_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/kernel/signal_64.c 2010-05-28 21:27:14.843133123 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/kernel/signal_64.c linux-2.6.32.16/arch/powerpc/kernel/signal_64.c +--- linux-2.6.32.16/arch/powerpc/kernel/signal_64.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/kernel/signal_64.c 2010-07-09 14:50:34.000000000 -0400 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct current->thread.fpscr.val = 0; @@ -2324,9 +2375,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/signal_64.c linux-2.6.32.15/arch/ regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; } else { err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); -diff -urNp linux-2.6.32.15/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.15/arch/powerpc/kernel/sys_ppc32.c ---- linux-2.6.32.15/arch/powerpc/kernel/sys_ppc32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/kernel/sys_ppc32.c 2010-05-28 21:27:14.843133123 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.16/arch/powerpc/kernel/sys_ppc32.c +--- linux-2.6.32.16/arch/powerpc/kernel/sys_ppc32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/kernel/sys_ppc32.c 2010-07-09 14:50:34.000000000 -0400 @@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct if (oldlenp) { 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/ } return error; } -diff -urNp linux-2.6.32.15/arch/powerpc/kernel/vdso.c linux-2.6.32.15/arch/powerpc/kernel/vdso.c ---- linux-2.6.32.15/arch/powerpc/kernel/vdso.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/kernel/vdso.c 2010-05-28 21:27:14.843133123 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/kernel/vdso.c linux-2.6.32.16/arch/powerpc/kernel/vdso.c +--- linux-2.6.32.16/arch/powerpc/kernel/vdso.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/kernel/vdso.c 2010-07-09 14:50:34.000000000 -0400 @@ -36,6 +36,7 @@ #include <asm/firmware.h> #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 if (IS_ERR_VALUE(vdso_base)) { rc = vdso_base; goto fail_mmapsem; -diff -urNp linux-2.6.32.15/arch/powerpc/kernel/vio.c linux-2.6.32.15/arch/powerpc/kernel/vio.c ---- linux-2.6.32.15/arch/powerpc/kernel/vio.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/kernel/vio.c 2010-05-28 21:27:14.843133123 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/kernel/vio.c linux-2.6.32.16/arch/powerpc/kernel/vio.c +--- linux-2.6.32.16/arch/powerpc/kernel/vio.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/kernel/vio.c 2010-07-09 14:50:34.000000000 -0400 @@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc vio_cmo_dealloc(viodev, alloc_size); } @@ -2394,9 +2445,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/kernel/vio.c linux-2.6.32.15/arch/powerp viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops; } -diff -urNp linux-2.6.32.15/arch/powerpc/lib/usercopy_64.c linux-2.6.32.15/arch/powerpc/lib/usercopy_64.c ---- linux-2.6.32.15/arch/powerpc/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/lib/usercopy_64.c 2010-05-28 21:27:14.843133123 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/lib/usercopy_64.c linux-2.6.32.16/arch/powerpc/lib/usercopy_64.c +--- linux-2.6.32.16/arch/powerpc/lib/usercopy_64.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/lib/usercopy_64.c 2010-07-09 14:50:34.000000000 -0400 @@ -9,22 +9,6 @@ #include <linux/module.h> #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 -EXPORT_SYMBOL(copy_to_user); EXPORT_SYMBOL(copy_in_user); -diff -urNp linux-2.6.32.15/arch/powerpc/mm/fault.c linux-2.6.32.15/arch/powerpc/mm/fault.c ---- linux-2.6.32.15/arch/powerpc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/mm/fault.c 2010-05-28 21:27:14.843133123 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/mm/fault.c linux-2.6.32.16/arch/powerpc/mm/fault.c +--- linux-2.6.32.16/arch/powerpc/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 @@ -30,6 +30,10 @@ #include <linux/kprobes.h> #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/ _exception(SIGSEGV, regs, code, address); return 0; } -diff -urNp linux-2.6.32.15/arch/powerpc/mm/mmap_64.c linux-2.6.32.15/arch/powerpc/mm/mmap_64.c ---- linux-2.6.32.15/arch/powerpc/mm/mmap_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/mm/mmap_64.c 2010-05-28 21:27:14.843133123 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/mm/mmap_64.c linux-2.6.32.16/arch/powerpc/mm/mmap_64.c +--- linux-2.6.32.16/arch/powerpc/mm/mmap_64.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/mm/mmap_64.c 2010-07-09 14:50:34.000000000 -0400 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str */ 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 mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.32.15/arch/powerpc/mm/slice.c linux-2.6.32.15/arch/powerpc/mm/slice.c ---- linux-2.6.32.15/arch/powerpc/mm/slice.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/mm/slice.c 2010-05-28 21:27:14.843133123 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/mm/slice.c linux-2.6.32.16/arch/powerpc/mm/slice.c +--- linux-2.6.32.16/arch/powerpc/mm/slice.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/mm/slice.c 2010-07-09 14:50:34.000000000 -0400 @@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un if (fixed && addr > (mm->task_size - len)) 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/ /* If hint, make sure it matches our alignment restrictions */ if (!fixed && addr) { addr = _ALIGN_UP(addr, 1ul << pshift); -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 ---- linux-2.6.32.15/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-05-28 21:27:14.843133123 -0400 +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 +--- linux-2.6.32.16/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-07-09 14:50:34.000000000 -0400 @@ -235,7 +235,7 @@ static void lite5200_pm_end(void) lite5200_pm_target_state = PM_SUSPEND_ON; } @@ -2588,9 +2639,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.3 .valid = lite5200_pm_valid, .begin = lite5200_pm_begin, .prepare = lite5200_pm_prepare, -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 ---- linux-2.6.32.15/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-05-28 21:27:14.843133123 -0400 +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 +--- linux-2.6.32.16/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-07-09 14:50:34.000000000 -0400 @@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void) iounmap(mbar); } @@ -2600,9 +2651,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32 .valid = mpc52xx_pm_valid, .prepare = mpc52xx_pm_prepare, .enter = mpc52xx_pm_enter, -diff -urNp linux-2.6.32.15/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.15/arch/powerpc/platforms/83xx/suspend.c ---- linux-2.6.32.15/arch/powerpc/platforms/83xx/suspend.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/platforms/83xx/suspend.c 2010-05-28 21:27:14.843133123 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.16/arch/powerpc/platforms/83xx/suspend.c +--- linux-2.6.32.16/arch/powerpc/platforms/83xx/suspend.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/platforms/83xx/suspend.c 2010-07-09 14:50:34.000000000 -0400 @@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void) return ret; } @@ -2612,9 +2663,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.15 .valid = mpc83xx_suspend_valid, .begin = mpc83xx_suspend_begin, .enter = mpc83xx_suspend_enter, -diff -urNp linux-2.6.32.15/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.15/arch/powerpc/platforms/cell/iommu.c ---- linux-2.6.32.15/arch/powerpc/platforms/cell/iommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/platforms/cell/iommu.c 2010-05-28 21:27:14.864087018 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.16/arch/powerpc/platforms/cell/iommu.c +--- linux-2.6.32.16/arch/powerpc/platforms/cell/iommu.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/platforms/cell/iommu.c 2010-07-09 14:50:34.000000000 -0400 @@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc 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 .alloc_coherent = dma_fixed_alloc_coherent, .free_coherent = dma_fixed_free_coherent, .map_sg = dma_fixed_map_sg, -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 ---- linux-2.6.32.15/arch/powerpc/platforms/ps3/system-bus.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/platforms/ps3/system-bus.c 2010-05-28 21:27:14.867153288 -0400 +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 +--- linux-2.6.32.16/arch/powerpc/platforms/ps3/system-bus.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/platforms/ps3/system-bus.c 2010-07-09 14:50:34.000000000 -0400 @@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi return mask >= DMA_BIT_MASK(32); } @@ -2645,9 +2696,9 @@ diff -urNp linux-2.6.32.15/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32. .alloc_coherent = ps3_alloc_coherent, .free_coherent = ps3_free_coherent, .map_sg = ps3_ioc0_map_sg, -diff -urNp linux-2.6.32.15/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.15/arch/powerpc/platforms/pseries/Kconfig ---- linux-2.6.32.15/arch/powerpc/platforms/pseries/Kconfig 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/powerpc/platforms/pseries/Kconfig 2010-05-28 21:27:14.867153288 -0400 +diff -urNp linux-2.6.32.16/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.16/arch/powerpc/platforms/pseries/Kconfig +--- linux-2.6.32.16/arch/powerpc/platforms/pseries/Kconfig 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/powerpc/platforms/pseries/Kconfig 2010-07-09 14:50:34.000000000 -0400 @@ -2,6 +2,8 @@ config PPC_PSERIES depends on PPC64 && PPC_BOOK3S 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 select PPC_I8259 select PPC_RTAS select RTAS_ERROR_LOGGING -diff -urNp linux-2.6.32.15/arch/s390/include/asm/elf.h linux-2.6.32.15/arch/s390/include/asm/elf.h ---- linux-2.6.32.15/arch/s390/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/s390/include/asm/elf.h 2010-05-28 21:27:14.871031796 -0400 +diff -urNp linux-2.6.32.16/arch/s390/include/asm/elf.h linux-2.6.32.16/arch/s390/include/asm/elf.h +--- linux-2.6.32.16/arch/s390/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/s390/include/asm/elf.h 2010-07-09 14:50:35.000000000 -0400 @@ -164,6 +164,13 @@ extern unsigned int vdso_enabled; that it will "exec", and that there is sufficient room for the brk. */ #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 /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. */ -diff -urNp linux-2.6.32.15/arch/s390/include/asm/setup.h linux-2.6.32.15/arch/s390/include/asm/setup.h ---- linux-2.6.32.15/arch/s390/include/asm/setup.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/s390/include/asm/setup.h 2010-05-28 21:27:14.871031796 -0400 +diff -urNp linux-2.6.32.16/arch/s390/include/asm/setup.h linux-2.6.32.16/arch/s390/include/asm/setup.h +--- linux-2.6.32.16/arch/s390/include/asm/setup.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/s390/include/asm/setup.h 2010-07-09 14:50:35.000000000 -0400 @@ -50,13 +50,13 @@ extern unsigned long memory_end; void detect_memory_layout(struct mem_chunk chunk[]); @@ -2693,9 +2744,9 @@ diff -urNp linux-2.6.32.15/arch/s390/include/asm/setup.h linux-2.6.32.15/arch/s3 #else #define s390_noexec (0) #endif -diff -urNp linux-2.6.32.15/arch/s390/include/asm/uaccess.h linux-2.6.32.15/arch/s390/include/asm/uaccess.h ---- linux-2.6.32.15/arch/s390/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/s390/include/asm/uaccess.h 2010-05-28 21:27:14.871031796 -0400 +diff -urNp linux-2.6.32.16/arch/s390/include/asm/uaccess.h linux-2.6.32.16/arch/s390/include/asm/uaccess.h +--- linux-2.6.32.16/arch/s390/include/asm/uaccess.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/s390/include/asm/uaccess.h 2010-07-09 14:50:35.000000000 -0400 @@ -232,6 +232,10 @@ static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n) { @@ -2728,9 +2779,9 @@ diff -urNp linux-2.6.32.15/arch/s390/include/asm/uaccess.h linux-2.6.32.15/arch/ if (access_ok(VERIFY_READ, from, n)) n = __copy_from_user(to, from, n); else -diff -urNp linux-2.6.32.15/arch/s390/Kconfig linux-2.6.32.15/arch/s390/Kconfig ---- linux-2.6.32.15/arch/s390/Kconfig 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/s390/Kconfig 2010-05-28 21:27:14.871031796 -0400 +diff -urNp linux-2.6.32.16/arch/s390/Kconfig linux-2.6.32.16/arch/s390/Kconfig +--- linux-2.6.32.16/arch/s390/Kconfig 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/s390/Kconfig 2010-07-09 14:50:35.000000000 -0400 @@ -194,28 +194,26 @@ config AUDIT_ARCH 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 comment "Code generation options" -diff -urNp linux-2.6.32.15/arch/s390/kernel/module.c linux-2.6.32.15/arch/s390/kernel/module.c ---- linux-2.6.32.15/arch/s390/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/s390/kernel/module.c 2010-05-28 21:27:14.871031796 -0400 +diff -urNp linux-2.6.32.16/arch/s390/kernel/module.c linux-2.6.32.16/arch/s390/kernel/module.c +--- linux-2.6.32.16/arch/s390/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/s390/kernel/module.c 2010-07-09 14:50:35.000000000 -0400 @@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, /* 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 rela->r_addend - loc; if (r_type == R_390_GOTPC) *(unsigned int *) loc = val; -diff -urNp linux-2.6.32.15/arch/s390/kernel/setup.c linux-2.6.32.15/arch/s390/kernel/setup.c ---- linux-2.6.32.15/arch/s390/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/s390/kernel/setup.c 2010-05-28 21:27:14.871031796 -0400 +diff -urNp linux-2.6.32.16/arch/s390/kernel/setup.c linux-2.6.32.16/arch/s390/kernel/setup.c +--- linux-2.6.32.16/arch/s390/kernel/setup.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/s390/kernel/setup.c 2010-07-09 14:50:35.000000000 -0400 @@ -306,9 +306,6 @@ static int __init early_parse_mem(char * early_param("mem", early_parse_mem); @@ -2898,9 +2949,9 @@ diff -urNp linux-2.6.32.15/arch/s390/kernel/setup.c linux-2.6.32.15/arch/s390/ke static void setup_addressing_mode(void) { if (s390_noexec) { -diff -urNp linux-2.6.32.15/arch/s390/mm/mmap.c linux-2.6.32.15/arch/s390/mm/mmap.c ---- linux-2.6.32.15/arch/s390/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/s390/mm/mmap.c 2010-05-28 21:27:14.871031796 -0400 +diff -urNp linux-2.6.32.16/arch/s390/mm/mmap.c linux-2.6.32.16/arch/s390/mm/mmap.c +--- linux-2.6.32.16/arch/s390/mm/mmap.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/s390/mm/mmap.c 2010-07-09 14:50:35.000000000 -0400 @@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str */ 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 mm->get_unmapped_area = s390_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -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 ---- linux-2.6.32.15/arch/sh/boards/mach-hp6xx/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sh/boards/mach-hp6xx/pm.c 2010-05-28 21:27:14.871031796 -0400 +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 +--- linux-2.6.32.16/arch/sh/boards/mach-hp6xx/pm.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sh/boards/mach-hp6xx/pm.c 2010-07-09 14:50:35.000000000 -0400 @@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_ return 0; } @@ -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 .enter = hp6x0_pm_enter, .valid = suspend_valid_only_mem, }; -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 ---- linux-2.6.32.15/arch/sh/kernel/cpu/sh4/sq.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sh/kernel/cpu/sh4/sq.c 2010-05-28 21:27:14.871031796 -0400 +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 +--- linux-2.6.32.16/arch/sh/kernel/cpu/sh4/sq.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sh/kernel/cpu/sh4/sq.c 2010-07-09 14:50:35.000000000 -0400 @@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[ NULL, }; @@ -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 .show = sq_sysfs_show, .store = sq_sysfs_store, }; -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 ---- linux-2.6.32.15/arch/sh/kernel/cpu/shmobile/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sh/kernel/cpu/shmobile/pm.c 2010-05-28 21:27:14.871031796 -0400 +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 +--- linux-2.6.32.16/arch/sh/kernel/cpu/shmobile/pm.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sh/kernel/cpu/shmobile/pm.c 2010-07-09 14:50:35.000000000 -0400 @@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s return 0; } @@ -2983,9 +3034,9 @@ diff -urNp linux-2.6.32.15/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.15/arch .enter = sh_pm_enter, .valid = suspend_valid_only_mem, }; -diff -urNp linux-2.6.32.15/arch/sh/kernel/kgdb.c linux-2.6.32.15/arch/sh/kernel/kgdb.c ---- linux-2.6.32.15/arch/sh/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sh/kernel/kgdb.c 2010-05-28 21:27:14.871031796 -0400 +diff -urNp linux-2.6.32.16/arch/sh/kernel/kgdb.c linux-2.6.32.16/arch/sh/kernel/kgdb.c +--- linux-2.6.32.16/arch/sh/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sh/kernel/kgdb.c 2010-07-09 14:50:35.000000000 -0400 @@ -271,7 +271,7 @@ void kgdb_arch_exit(void) { } @@ -2995,10 +3046,10 @@ diff -urNp linux-2.6.32.15/arch/sh/kernel/kgdb.c linux-2.6.32.15/arch/sh/kernel/ /* Breakpoint instruction: trapa #0x3c */ #ifdef CONFIG_CPU_LITTLE_ENDIAN .gdb_bpt_instr = { 0x3c, 0xc3 }, -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 ---- linux-2.6.32.15/arch/sparc/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/include/asm/atomic_64.h 2010-05-28 21:27:14.871031796 -0400 -@@ -14,18 +14,38 @@ +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 +--- linux-2.6.32.16/arch/sparc/include/asm/atomic_64.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/include/asm/atomic_64.h 2010-07-09 14:50:35.000000000 -0400 +@@ -14,18 +14,39 @@ #define ATOMIC64_INIT(i) { (i) } #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 extern void atomic_sub(int, atomic_t *); +extern void atomic_sub_unchecked(int, atomic_unchecked_t *); extern void atomic64_sub(int, atomic64_t *); ++extern void atomic64_sub_unchecked(int, atomic64_unchecked_t *); extern int atomic_add_ret(int, atomic_t *); 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 extern int atomic_sub_ret(int, atomic_t *); extern int atomic64_sub_ret(int, atomic64_t *); -@@ -34,6 +54,7 @@ extern int atomic64_sub_ret(int, atomic6 +@@ -34,6 +55,7 @@ extern int atomic64_sub_ret(int, atomic6 #define atomic_inc_return(v) atomic_add_ret(1, v) #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 #define atomic_sub_return(i, v) atomic_sub_ret(i, v) #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v) -@@ -59,7 +80,15 @@ extern int atomic64_sub_ret(int, atomic6 +@@ -59,10 +81,26 @@ extern int atomic64_sub_ret(int, atomic6 #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0) #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 +} #define atomic_dec(v) atomic_sub(1, v) ++static inline void atomic_dec_unchecked(atomic_unchecked_t *v) ++{ ++ atomic_sub_unchecked(1, v); ++} #define atomic64_dec(v) atomic64_sub(1, v) -@@ -72,17 +101,28 @@ extern int atomic64_sub_ret(int, atomic6 ++static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v) ++{ ++ atomic64_sub_unchecked(1, v); ++} + + #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0) + #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0) +@@ -72,17 +110,28 @@ extern int atomic64_sub_ret(int, atomic6 static inline int atomic_add_unless(atomic_t *v, int a, int u) { @@ -3094,7 +3157,7 @@ diff -urNp linux-2.6.32.15/arch/sparc/include/asm/atomic_64.h linux-2.6.32.15/ar } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) -@@ -93,17 +133,28 @@ static inline int atomic_add_unless(atom +@@ -93,17 +142,28 @@ static inline int atomic_add_unless(atom static inline int atomic64_add_unless(atomic64_t *v, long a, long u) { @@ -3127,9 +3190,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/include/asm/atomic_64.h linux-2.6.32.15/ar } #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) -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 ---- linux-2.6.32.15/arch/sparc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/include/asm/dma-mapping.h 2010-05-28 21:27:14.871031796 -0400 +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 +--- linux-2.6.32.16/arch/sparc/include/asm/dma-mapping.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/include/asm/dma-mapping.h 2010-07-09 14:50:35.000000000 -0400 @@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) #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/ debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); ops->free_coherent(dev, size, cpu_addr, dma_handle); -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 ---- linux-2.6.32.15/arch/sparc/include/asm/elf_32.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/include/asm/elf_32.h 2010-05-28 21:27:14.871031796 -0400 +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 +--- linux-2.6.32.16/arch/sparc/include/asm/elf_32.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/include/asm/elf_32.h 2010-07-09 14:50:35.000000000 -0400 @@ -116,6 +116,13 @@ typedef struct { #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/ /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. This can NOT be done in userspace on Sparc. */ -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 ---- linux-2.6.32.15/arch/sparc/include/asm/elf_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/include/asm/elf_64.h 2010-05-28 21:27:14.871031796 -0400 +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 +--- linux-2.6.32.16/arch/sparc/include/asm/elf_64.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/include/asm/elf_64.h 2010-07-09 14:50:35.000000000 -0400 @@ -163,6 +163,12 @@ typedef struct { #define ELF_ET_DYN_BASE 0x0000010000000000UL #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/ /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. */ -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 ---- linux-2.6.32.15/arch/sparc/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/include/asm/pgtable_32.h 2010-05-28 21:27:14.871031796 -0400 +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 +--- linux-2.6.32.16/arch/sparc/include/asm/pgtable_32.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/include/asm/pgtable_32.h 2010-07-09 14:50:35.000000000 -0400 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) BTFIXUPDEF_INT(page_none) 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 extern unsigned long page_kernel; #ifdef MODULE -diff -urNp linux-2.6.32.15/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.15/arch/sparc/include/asm/pgtsrmmu.h ---- linux-2.6.32.15/arch/sparc/include/asm/pgtsrmmu.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/include/asm/pgtsrmmu.h 2010-05-28 21:27:14.871031796 -0400 +diff -urNp linux-2.6.32.16/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.16/arch/sparc/include/asm/pgtsrmmu.h +--- linux-2.6.32.16/arch/sparc/include/asm/pgtsrmmu.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/include/asm/pgtsrmmu.h 2010-07-09 14:50:35.000000000 -0400 @@ -115,6 +115,13 @@ SRMMU_EXEC | SRMMU_REF) #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 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ SRMMU_DIRTY | SRMMU_REF) -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 ---- linux-2.6.32.15/arch/sparc/include/asm/spinlock_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/include/asm/spinlock_64.h 2010-05-28 21:27:14.871031796 -0400 +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 +--- linux-2.6.32.16/arch/sparc/include/asm/spinlock_64.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/include/asm/spinlock_64.h 2010-07-09 14:50:35.000000000 -0400 @@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw __asm__ __volatile__ ( "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/ " cas [%2], %0, %1\n" " cmp %0, %1\n" " bne,pn %%xcc, 1b\n" -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 ---- linux-2.6.32.15/arch/sparc/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/include/asm/uaccess_32.h 2010-05-28 21:27:14.871031796 -0400 +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 +--- linux-2.6.32.16/arch/sparc/include/asm/uaccess_32.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/include/asm/uaccess_32.h 2010-07-09 14:50:35.000000000 -0400 @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __ 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 return __copy_user((__force void __user *) to, from, n); } -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 ---- linux-2.6.32.15/arch/sparc/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/include/asm/uaccess_64.h 2010-05-28 21:27:14.871031796 -0400 +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 +--- linux-2.6.32.16/arch/sparc/include/asm/uaccess_64.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/include/asm/uaccess_64.h 2010-07-09 14:50:35.000000000 -0400 @@ -9,6 +9,7 @@ #include <linux/compiler.h> #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 #include <asm/asi.h> #include <asm/system.h> #include <asm/spitfire.h> -@@ -203,6 +204,7 @@ __asm__ __volatile__( \ - : "=r" (x) : "r" (__m(addr)), "i" (retval)) - - extern int __get_user_bad(void); -+extern void check_object_size(const void *ptr, unsigned long n, bool to); - - extern unsigned long __must_check ___copy_from_user(void *to, - const void __user *from, -@@ -212,8 +214,15 @@ extern unsigned long copy_from_user_fixu +@@ -212,8 +213,15 @@ extern unsigned long copy_from_user_fixu static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long size) { @@ -3389,7 +3444,7 @@ diff -urNp linux-2.6.32.15/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.15/a if (unlikely(ret)) ret = copy_from_user_fixup(to, from, size); return ret; -@@ -228,8 +237,15 @@ extern unsigned long copy_to_user_fixup( +@@ -228,8 +236,15 @@ extern unsigned long copy_to_user_fixup( static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long size) { @@ -3406,9 +3461,21 @@ diff -urNp linux-2.6.32.15/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.15/a if (unlikely(ret)) ret = copy_to_user_fixup(to, from, size); return ret; -diff -urNp linux-2.6.32.15/arch/sparc/kernel/iommu.c linux-2.6.32.15/arch/sparc/kernel/iommu.c ---- linux-2.6.32.15/arch/sparc/kernel/iommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/kernel/iommu.c 2010-05-28 21:27:14.874960218 -0400 +diff -urNp linux-2.6.32.16/arch/sparc/include/asm/uaccess.h linux-2.6.32.16/arch/sparc/include/asm/uaccess.h +--- linux-2.6.32.16/arch/sparc/include/asm/uaccess.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/include/asm/uaccess.h 2010-07-09 14:50:35.000000000 -0400 +@@ -1,5 +1,8 @@ + #ifndef ___ASM_SPARC_UACCESS_H + #define ___ASM_SPARC_UACCESS_H ++ ++extern void check_object_size(const void *ptr, unsigned long n, bool to); ++ + #if defined(__sparc__) && defined(__arch64__) + #include <asm/uaccess_64.h> + #else +diff -urNp linux-2.6.32.16/arch/sparc/kernel/iommu.c linux-2.6.32.16/arch/sparc/kernel/iommu.c +--- linux-2.6.32.16/arch/sparc/kernel/iommu.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/kernel/iommu.c 2010-07-09 14:50:35.000000000 -0400 @@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc spin_unlock_irqrestore(&iommu->lock, flags); } @@ -3427,9 +3494,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/kernel/iommu.c linux-2.6.32.15/arch/sparc/ EXPORT_SYMBOL(dma_ops); extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); -diff -urNp linux-2.6.32.15/arch/sparc/kernel/ioport.c linux-2.6.32.15/arch/sparc/kernel/ioport.c ---- linux-2.6.32.15/arch/sparc/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/kernel/ioport.c 2010-05-28 21:27:14.874960218 -0400 +diff -urNp linux-2.6.32.16/arch/sparc/kernel/ioport.c linux-2.6.32.16/arch/sparc/kernel/ioport.c +--- linux-2.6.32.16/arch/sparc/kernel/ioport.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/kernel/ioport.c 2010-07-09 14:50:35.000000000 -0400 @@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru BUG(); } @@ -3457,9 +3524,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/kernel/ioport.c linux-2.6.32.15/arch/sparc .alloc_coherent = pci32_alloc_coherent, .free_coherent = pci32_free_coherent, .map_page = pci32_map_page, -diff -urNp linux-2.6.32.15/arch/sparc/kernel/kgdb_32.c linux-2.6.32.15/arch/sparc/kernel/kgdb_32.c ---- linux-2.6.32.15/arch/sparc/kernel/kgdb_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/kernel/kgdb_32.c 2010-05-28 21:27:14.874960218 -0400 +diff -urNp linux-2.6.32.16/arch/sparc/kernel/kgdb_32.c linux-2.6.32.16/arch/sparc/kernel/kgdb_32.c +--- linux-2.6.32.16/arch/sparc/kernel/kgdb_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/kernel/kgdb_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -158,7 +158,7 @@ void kgdb_arch_exit(void) { } @@ -3469,9 +3536,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/kernel/kgdb_32.c linux-2.6.32.15/arch/spar /* Breakpoint instruction: ta 0x7d */ .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, }; -diff -urNp linux-2.6.32.15/arch/sparc/kernel/kgdb_64.c linux-2.6.32.15/arch/sparc/kernel/kgdb_64.c ---- linux-2.6.32.15/arch/sparc/kernel/kgdb_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/kernel/kgdb_64.c 2010-05-28 21:27:14.874960218 -0400 +diff -urNp linux-2.6.32.16/arch/sparc/kernel/kgdb_64.c linux-2.6.32.16/arch/sparc/kernel/kgdb_64.c +--- linux-2.6.32.16/arch/sparc/kernel/kgdb_64.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/kernel/kgdb_64.c 2010-07-09 14:50:35.000000000 -0400 @@ -180,7 +180,7 @@ void kgdb_arch_exit(void) { } @@ -3481,9 +3548,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/kernel/kgdb_64.c linux-2.6.32.15/arch/spar /* Breakpoint instruction: ta 0x72 */ .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, }; -diff -urNp linux-2.6.32.15/arch/sparc/kernel/Makefile linux-2.6.32.15/arch/sparc/kernel/Makefile ---- linux-2.6.32.15/arch/sparc/kernel/Makefile 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/kernel/Makefile 2010-05-28 21:27:14.874960218 -0400 +diff -urNp linux-2.6.32.16/arch/sparc/kernel/Makefile linux-2.6.32.16/arch/sparc/kernel/Makefile +--- linux-2.6.32.16/arch/sparc/kernel/Makefile 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/kernel/Makefile 2010-07-09 14:50:35.000000000 -0400 @@ -3,7 +3,7 @@ # @@ -3493,9 +3560,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/kernel/Makefile linux-2.6.32.15/arch/sparc extra-y := head_$(BITS).o extra-y += init_task.o -diff -urNp linux-2.6.32.15/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.15/arch/sparc/kernel/pci_sun4v.c ---- linux-2.6.32.15/arch/sparc/kernel/pci_sun4v.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/kernel/pci_sun4v.c 2010-05-28 21:27:14.874960218 -0400 +diff -urNp linux-2.6.32.16/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.16/arch/sparc/kernel/pci_sun4v.c +--- linux-2.6.32.16/arch/sparc/kernel/pci_sun4v.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/kernel/pci_sun4v.c 2010-07-09 14:50:35.000000000 -0400 @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic spin_unlock_irqrestore(&iommu->lock, flags); } @@ -3505,9 +3572,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.15/arch/sp .alloc_coherent = dma_4v_alloc_coherent, .free_coherent = dma_4v_free_coherent, .map_page = dma_4v_map_page, -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 ---- linux-2.6.32.15/arch/sparc/kernel/sys_sparc_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/kernel/sys_sparc_32.c 2010-05-28 21:27:14.874960218 -0400 +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 +--- linux-2.6.32.16/arch/sparc/kernel/sys_sparc_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/kernel/sys_sparc_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str if (ARCH_SUN4C && len > 0x20000000) 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 if (flags & MAP_SHARED) addr = COLOUR_ALIGN(addr); -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 ---- linux-2.6.32.15/arch/sparc/kernel/sys_sparc_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/kernel/sys_sparc_64.c 2010-05-28 21:27:14.874960218 -0400 +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 +--- linux-2.6.32.16/arch/sparc/kernel/sys_sparc_64.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/kernel/sys_sparc_64.c 2010-07-09 14:50:35.000000000 -0400 @@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str /* We do not accept a shared mapping if it would violate * 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 mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.32.15/arch/sparc/kernel/traps_64.c linux-2.6.32.15/arch/sparc/kernel/traps_64.c ---- linux-2.6.32.15/arch/sparc/kernel/traps_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/kernel/traps_64.c 2010-05-28 21:27:14.874960218 -0400 +diff -urNp linux-2.6.32.16/arch/sparc/kernel/traps_64.c linux-2.6.32.16/arch/sparc/kernel/traps_64.c +--- linux-2.6.32.16/arch/sparc/kernel/traps_64.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/kernel/traps_64.c 2010-07-09 14:50:35.000000000 -0400 @@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long 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 dump_tl1_traplog((struct tl1_traplog *)(regs + 1)); sprintf (buffer, "Bad trap %lx at tl>0", lvl); -diff -urNp linux-2.6.32.15/arch/sparc/lib/atomic_64.S linux-2.6.32.15/arch/sparc/lib/atomic_64.S ---- linux-2.6.32.15/arch/sparc/lib/atomic_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/lib/atomic_64.S 2010-05-28 21:27:14.874960218 -0400 +diff -urNp linux-2.6.32.16/arch/sparc/lib/atomic_64.S linux-2.6.32.16/arch/sparc/lib/atomic_64.S +--- linux-2.6.32.16/arch/sparc/lib/atomic_64.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/lib/atomic_64.S 2010-07-09 14:50:35.000000000 -0400 @@ -18,7 +18,12 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ 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 casx [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %xcc, 2f -@@ -110,7 +185,12 @@ atomic64_sub: /* %o0 = decrement, %o1 = +@@ -105,12 +180,32 @@ atomic64_sub: /* %o0 = decrement, %o1 = + 2: BACKOFF_SPIN(%o2, %o3, 1b) + .size atomic64_sub, .-atomic64_sub + ++ .globl atomic64_sub_unchecked ++ .type atomic64_sub_unchecked,#function ++atomic64_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */ ++ BACKOFF_SETUP(%o2) ++1: ldx [%o1], %g1 ++ subcc %g1, %o0, %g7 ++ casx [%o1], %g1, %g7 ++ cmp %g1, %g7 ++ bne,pn %xcc, 2f ++ nop ++ retl ++ nop ++2: BACKOFF_SPIN(%o2, %o3, 1b) ++ .size atomic64_sub_unchecked, .-atomic64_sub_unchecked ++ + .globl atomic64_add_ret + .type atomic64_add_ret,#function atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */ BACKOFF_SETUP(%o2) 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 casx [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %xcc, 2f -@@ -121,12 +201,33 @@ atomic64_add_ret: /* %o0 = increment, %o +@@ -121,12 +216,33 @@ atomic64_add_ret: /* %o0 = increment, %o 2: BACKOFF_SPIN(%o2, %o3, 1b) .size atomic64_add_ret, .-atomic64_add_ret @@ -3828,10 +3915,10 @@ diff -urNp linux-2.6.32.15/arch/sparc/lib/atomic_64.S linux-2.6.32.15/arch/sparc casx [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %xcc, 2f -diff -urNp linux-2.6.32.15/arch/sparc/lib/ksyms.c linux-2.6.32.15/arch/sparc/lib/ksyms.c ---- linux-2.6.32.15/arch/sparc/lib/ksyms.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/lib/ksyms.c 2010-05-28 21:27:14.874960218 -0400 -@@ -144,8 +144,10 @@ EXPORT_SYMBOL(__downgrade_write); +diff -urNp linux-2.6.32.16/arch/sparc/lib/ksyms.c linux-2.6.32.16/arch/sparc/lib/ksyms.c +--- linux-2.6.32.16/arch/sparc/lib/ksyms.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/lib/ksyms.c 2010-07-09 14:50:35.000000000 -0400 +@@ -144,12 +144,15 @@ EXPORT_SYMBOL(__downgrade_write); /* Atomic counter implementation. */ 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 EXPORT_SYMBOL(atomic_sub_ret); EXPORT_SYMBOL(atomic64_add); EXPORT_SYMBOL(atomic64_add_ret); -diff -urNp linux-2.6.32.15/arch/sparc/lib/rwsem_64.S linux-2.6.32.15/arch/sparc/lib/rwsem_64.S ---- linux-2.6.32.15/arch/sparc/lib/rwsem_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/lib/rwsem_64.S 2010-05-28 21:27:14.874960218 -0400 + EXPORT_SYMBOL(atomic64_sub); ++EXPORT_SYMBOL(atomic64_sub_unchecked); + EXPORT_SYMBOL(atomic64_sub_ret); + + /* Atomic bit operations. */ +diff -urNp linux-2.6.32.16/arch/sparc/lib/rwsem_64.S linux-2.6.32.16/arch/sparc/lib/rwsem_64.S +--- linux-2.6.32.16/arch/sparc/lib/rwsem_64.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/lib/rwsem_64.S 2010-07-09 14:50:35.000000000 -0400 @@ -11,7 +11,12 @@ .globl __down_read __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/ cas [%o0], %g3, %g7 cmp %g3, %g7 bne,pn %icc, 1b -diff -urNp linux-2.6.32.15/arch/sparc/Makefile linux-2.6.32.15/arch/sparc/Makefile ---- linux-2.6.32.15/arch/sparc/Makefile 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/Makefile 2010-05-28 21:27:14.874960218 -0400 +diff -urNp linux-2.6.32.16/arch/sparc/Makefile linux-2.6.32.16/arch/sparc/Makefile +--- linux-2.6.32.16/arch/sparc/Makefile 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/Makefile 2010-07-09 14:50:35.000000000 -0400 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc # Export what is needed by arch/sparc/boot/Makefile 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 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) VMLINUX_MAIN += $(drivers-y) $(net-y) -diff -urNp linux-2.6.32.15/arch/sparc/mm/fault_32.c linux-2.6.32.15/arch/sparc/mm/fault_32.c ---- linux-2.6.32.15/arch/sparc/mm/fault_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/mm/fault_32.c 2010-05-28 21:27:14.874960218 -0400 +diff -urNp linux-2.6.32.16/arch/sparc/mm/fault_32.c linux-2.6.32.16/arch/sparc/mm/fault_32.c +--- linux-2.6.32.16/arch/sparc/mm/fault_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/mm/fault_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -21,6 +21,9 @@ #include <linux/interrupt.h> #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 /* Allow reads even for write-only mappings */ if(!(vma->vm_flags & (VM_READ | VM_EXEC))) goto bad_area; -diff -urNp linux-2.6.32.15/arch/sparc/mm/fault_64.c linux-2.6.32.15/arch/sparc/mm/fault_64.c ---- linux-2.6.32.15/arch/sparc/mm/fault_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/mm/fault_64.c 2010-05-28 21:27:14.878908357 -0400 +diff -urNp linux-2.6.32.16/arch/sparc/mm/fault_64.c linux-2.6.32.16/arch/sparc/mm/fault_64.c +--- linux-2.6.32.16/arch/sparc/mm/fault_64.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/mm/fault_64.c 2010-07-09 14:50:35.000000000 -0400 @@ -20,6 +20,9 @@ #include <linux/kprobes.h> #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 /* Pure DTLB misses do not tell us whether the fault causing * load/store/atomic was a write or not, it only says that there * was no match. So in such a case we (carefully) read the -diff -urNp linux-2.6.32.15/arch/sparc/mm/init_32.c linux-2.6.32.15/arch/sparc/mm/init_32.c ---- linux-2.6.32.15/arch/sparc/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/mm/init_32.c 2010-05-28 21:27:14.878908357 -0400 +diff -urNp linux-2.6.32.16/arch/sparc/mm/init_32.c linux-2.6.32.16/arch/sparc/mm/init_32.c +--- linux-2.6.32.16/arch/sparc/mm/init_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/mm/init_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -317,6 +317,9 @@ extern void device_scan(void); pgprot_t PAGE_SHARED __read_mostly; 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 protection_map[12] = PAGE_READONLY; protection_map[13] = PAGE_READONLY; protection_map[14] = PAGE_SHARED; -diff -urNp linux-2.6.32.15/arch/sparc/mm/Makefile linux-2.6.32.15/arch/sparc/mm/Makefile ---- linux-2.6.32.15/arch/sparc/mm/Makefile 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/mm/Makefile 2010-05-28 21:27:14.878908357 -0400 +diff -urNp linux-2.6.32.16/arch/sparc/mm/Makefile linux-2.6.32.16/arch/sparc/mm/Makefile +--- linux-2.6.32.16/arch/sparc/mm/Makefile 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/mm/Makefile 2010-07-09 14:50:35.000000000 -0400 @@ -2,7 +2,7 @@ # @@ -4810,9 +4902,9 @@ diff -urNp linux-2.6.32.15/arch/sparc/mm/Makefile linux-2.6.32.15/arch/sparc/mm/ obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o obj-y += fault_$(BITS).o -diff -urNp linux-2.6.32.15/arch/sparc/mm/srmmu.c linux-2.6.32.15/arch/sparc/mm/srmmu.c ---- linux-2.6.32.15/arch/sparc/mm/srmmu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/sparc/mm/srmmu.c 2010-05-28 21:27:14.878908357 -0400 +diff -urNp linux-2.6.32.16/arch/sparc/mm/srmmu.c linux-2.6.32.16/arch/sparc/mm/srmmu.c +--- linux-2.6.32.16/arch/sparc/mm/srmmu.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/sparc/mm/srmmu.c 2010-07-09 14:50:35.000000000 -0400 @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void) PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); 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 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); -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 ---- linux-2.6.32.15/arch/um/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/um/include/asm/kmap_types.h 2010-05-28 21:27:14.883145356 -0400 +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 +--- linux-2.6.32.16/arch/um/include/asm/kmap_types.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/um/include/asm/kmap_types.h 2010-07-09 14:50:35.000000000 -0400 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, 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 KM_TYPE_NR }; -diff -urNp linux-2.6.32.15/arch/um/include/asm/page.h linux-2.6.32.15/arch/um/include/asm/page.h ---- linux-2.6.32.15/arch/um/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/um/include/asm/page.h 2010-05-28 21:27:14.883145356 -0400 +diff -urNp linux-2.6.32.16/arch/um/include/asm/page.h linux-2.6.32.16/arch/um/include/asm/page.h +--- linux-2.6.32.16/arch/um/include/asm/page.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/um/include/asm/page.h 2010-07-09 14:50:35.000000000 -0400 @@ -14,6 +14,9 @@ #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) #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 #ifndef __ASSEMBLY__ struct page; -diff -urNp linux-2.6.32.15/arch/um/sys-i386/syscalls.c linux-2.6.32.15/arch/um/sys-i386/syscalls.c ---- linux-2.6.32.15/arch/um/sys-i386/syscalls.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/um/sys-i386/syscalls.c 2010-05-28 21:27:14.883145356 -0400 +diff -urNp linux-2.6.32.16/arch/um/sys-i386/syscalls.c linux-2.6.32.16/arch/um/sys-i386/syscalls.c +--- linux-2.6.32.16/arch/um/sys-i386/syscalls.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/um/sys-i386/syscalls.c 2010-07-09 14:50:35.000000000 -0400 @@ -11,6 +11,21 @@ #include "asm/uaccess.h" #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 /* * Perform the select(nd, in, out, ex, tv) and mmap() system * calls. Linux/i386 didn't use to be able to handle more than -diff -urNp linux-2.6.32.15/arch/x86/boot/bitops.h linux-2.6.32.15/arch/x86/boot/bitops.h ---- linux-2.6.32.15/arch/x86/boot/bitops.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/boot/bitops.h 2010-05-28 21:27:14.891136655 -0400 +diff -urNp linux-2.6.32.16/arch/x86/boot/bitops.h linux-2.6.32.16/arch/x86/boot/bitops.h +--- linux-2.6.32.16/arch/x86/boot/bitops.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/boot/bitops.h 2010-07-09 14:50:35.000000000 -0400 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int u8 v; 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/ } #endif /* BOOT_BITOPS_H */ -diff -urNp linux-2.6.32.15/arch/x86/boot/boot.h linux-2.6.32.15/arch/x86/boot/boot.h ---- linux-2.6.32.15/arch/x86/boot/boot.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/boot/boot.h 2010-05-28 21:27:14.891136655 -0400 +diff -urNp linux-2.6.32.16/arch/x86/boot/boot.h linux-2.6.32.16/arch/x86/boot/boot.h +--- linux-2.6.32.16/arch/x86/boot/boot.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/boot/boot.h 2010-07-09 14:50:35.000000000 -0400 @@ -82,7 +82,7 @@ static inline void io_delay(void) static inline u16 ds(void) { @@ -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 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); return diff; } -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 ---- linux-2.6.32.15/arch/x86/boot/compressed/head_32.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/boot/compressed/head_32.S 2010-05-28 21:27:14.891136655 -0400 +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 +--- linux-2.6.32.16/arch/x86/boot/compressed/head_32.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/boot/compressed/head_32.S 2010-07-09 14:50:35.000000000 -0400 @@ -76,7 +76,7 @@ ENTRY(startup_32) notl %eax 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 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) jmp 1b 2: -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 ---- linux-2.6.32.15/arch/x86/boot/compressed/head_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/boot/compressed/head_64.S 2010-05-28 21:27:14.891136655 -0400 +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 +--- linux-2.6.32.16/arch/x86/boot/compressed/head_64.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/boot/compressed/head_64.S 2010-07-09 14:50:35.000000000 -0400 @@ -91,7 +91,7 @@ ENTRY(startup_32) notl %eax 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 #endif /* Target address to relocate to for decompression */ -diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/misc.c linux-2.6.32.15/arch/x86/boot/compressed/misc.c ---- linux-2.6.32.15/arch/x86/boot/compressed/misc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/boot/compressed/misc.c 2010-05-28 21:27:14.895019280 -0400 +diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/misc.c linux-2.6.32.16/arch/x86/boot/compressed/misc.c +--- linux-2.6.32.16/arch/x86/boot/compressed/misc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/boot/compressed/misc.c 2010-07-09 14:50:35.000000000 -0400 @@ -288,7 +288,7 @@ static void parse_elf(void *output) case PT_LOAD: #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/ error("Wrong destination address"); #endif -diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.15/arch/x86/boot/compressed/mkpiggy.c ---- linux-2.6.32.15/arch/x86/boot/compressed/mkpiggy.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/boot/compressed/mkpiggy.c 2010-05-28 21:27:14.895019280 -0400 +diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.16/arch/x86/boot/compressed/mkpiggy.c +--- linux-2.6.32.16/arch/x86/boot/compressed/mkpiggy.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/boot/compressed/mkpiggy.c 2010-07-09 14:50:35.000000000 -0400 @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) 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 offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ printf(".section \".rodata.compressed\",\"a\",@progbits\n"); -diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/relocs.c linux-2.6.32.15/arch/x86/boot/compressed/relocs.c ---- linux-2.6.32.15/arch/x86/boot/compressed/relocs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/boot/compressed/relocs.c 2010-05-28 21:27:14.895019280 -0400 +diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/relocs.c linux-2.6.32.16/arch/x86/boot/compressed/relocs.c +--- linux-2.6.32.16/arch/x86/boot/compressed/relocs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/boot/compressed/relocs.c 2010-07-09 14:50:44.000000000 -0400 @@ -10,8 +10,11 @@ #define USE_BSD #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 + +#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_X86_32) + /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */ -+ if (!strcmp(sec_name(sym->st_shndx), ".data") && !strcmp(sym_name(sym_strtab, sym), "_etext")) ++ if (!strcmp(sec_name(sym->st_shndx), ".module.text") && !strcmp(sym_name(sym_strtab, sym), "_etext")) + continue; + if (!strcmp(sec_name(sym->st_shndx), ".init.text")) + continue; @@ -5206,9 +5298,9 @@ diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/relocs.c linux-2.6.32.15/arc read_shdrs(fp); read_strtabs(fp); read_symtabs(fp); -diff -urNp linux-2.6.32.15/arch/x86/boot/cpucheck.c linux-2.6.32.15/arch/x86/boot/cpucheck.c ---- linux-2.6.32.15/arch/x86/boot/cpucheck.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/boot/cpucheck.c 2010-05-28 21:27:14.895019280 -0400 +diff -urNp linux-2.6.32.16/arch/x86/boot/cpucheck.c linux-2.6.32.16/arch/x86/boot/cpucheck.c +--- linux-2.6.32.16/arch/x86/boot/cpucheck.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/boot/cpucheck.c 2010-07-09 14:50:35.000000000 -0400 @@ -74,7 +74,7 @@ static int has_fpu(void) u16 fcw = -1, fsw = -1; 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 err = check_flags(); } -diff -urNp linux-2.6.32.15/arch/x86/boot/header.S linux-2.6.32.15/arch/x86/boot/header.S ---- linux-2.6.32.15/arch/x86/boot/header.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/boot/header.S 2010-05-28 21:27:14.895019280 -0400 +diff -urNp linux-2.6.32.16/arch/x86/boot/header.S linux-2.6.32.16/arch/x86/boot/header.S +--- linux-2.6.32.16/arch/x86/boot/header.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/boot/header.S 2010-07-09 14:50:35.000000000 -0400 @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical # single linked list of # 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/ #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) #define VO_INIT_SIZE (VO__end - VO__text) -diff -urNp linux-2.6.32.15/arch/x86/boot/memory.c linux-2.6.32.15/arch/x86/boot/memory.c ---- linux-2.6.32.15/arch/x86/boot/memory.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/boot/memory.c 2010-05-28 21:27:14.895019280 -0400 +diff -urNp linux-2.6.32.16/arch/x86/boot/memory.c linux-2.6.32.16/arch/x86/boot/memory.c +--- linux-2.6.32.16/arch/x86/boot/memory.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/boot/memory.c 2010-07-09 14:50:35.000000000 -0400 @@ -19,7 +19,7 @@ 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/ struct biosregs ireg, oreg; struct e820entry *desc = boot_params.e820_map; static struct e820entry buf; /* static so it is zeroed */ -diff -urNp linux-2.6.32.15/arch/x86/boot/video.c linux-2.6.32.15/arch/x86/boot/video.c ---- linux-2.6.32.15/arch/x86/boot/video.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/boot/video.c 2010-05-28 21:27:14.895019280 -0400 +diff -urNp linux-2.6.32.16/arch/x86/boot/video.c linux-2.6.32.16/arch/x86/boot/video.c +--- linux-2.6.32.16/arch/x86/boot/video.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/boot/video.c 2010-07-09 14:50:35.000000000 -0400 @@ -90,7 +90,7 @@ static void store_mode_params(void) static unsigned int get_entry(void) { @@ -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 int key; unsigned int v; -diff -urNp linux-2.6.32.15/arch/x86/boot/video-vesa.c linux-2.6.32.15/arch/x86/boot/video-vesa.c ---- linux-2.6.32.15/arch/x86/boot/video-vesa.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/boot/video-vesa.c 2010-05-28 21:27:14.895019280 -0400 +diff -urNp linux-2.6.32.16/arch/x86/boot/video-vesa.c linux-2.6.32.16/arch/x86/boot/video-vesa.c +--- linux-2.6.32.16/arch/x86/boot/video-vesa.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/boot/video-vesa.c 2010-07-09 14:50:35.000000000 -0400 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) 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 } /* -diff -urNp linux-2.6.32.15/arch/x86/ia32/ia32entry.S linux-2.6.32.15/arch/x86/ia32/ia32entry.S ---- linux-2.6.32.15/arch/x86/ia32/ia32entry.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/ia32/ia32entry.S 2010-05-28 21:27:14.895019280 -0400 +diff -urNp linux-2.6.32.16/arch/x86/ia32/ia32entry.S linux-2.6.32.16/arch/x86/ia32/ia32entry.S +--- linux-2.6.32.16/arch/x86/ia32/ia32entry.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/ia32/ia32entry.S 2010-07-09 14:50:35.000000000 -0400 @@ -13,6 +13,7 @@ #include <asm/thread_info.h> #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 /* * No need to follow this irqs on/off section: the syscall * disabled irqs and here we enable it straight after entry: -diff -urNp linux-2.6.32.15/arch/x86/ia32/ia32_signal.c linux-2.6.32.15/arch/x86/ia32/ia32_signal.c ---- linux-2.6.32.15/arch/x86/ia32/ia32_signal.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/ia32/ia32_signal.c 2010-05-28 21:27:14.895019280 -0400 +diff -urNp linux-2.6.32.16/arch/x86/ia32/ia32_signal.c linux-2.6.32.16/arch/x86/ia32/ia32_signal.c +--- linux-2.6.32.16/arch/x86/ia32/ia32_signal.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/ia32/ia32_signal.c 2010-07-09 14:50:35.000000000 -0400 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct sp -= frame_size; /* 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/ }; frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); -diff -urNp linux-2.6.32.15/arch/x86/include/asm/alternative.h linux-2.6.32.15/arch/x86/include/asm/alternative.h ---- linux-2.6.32.15/arch/x86/include/asm/alternative.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/alternative.h 2010-05-28 21:27:14.895019280 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/alternative.h linux-2.6.32.16/arch/x86/include/asm/alternative.h +--- linux-2.6.32.16/arch/x86/include/asm/alternative.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/alternative.h 2010-07-09 14:50:35.000000000 -0400 @@ -85,7 +85,7 @@ static inline void alternatives_smp_swit " .byte 662b-661b\n" /* sourcelen */ \ " .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 "663:\n\t" newinstr "\n664:\n" /* replacement */ \ ".previous" -diff -urNp linux-2.6.32.15/arch/x86/include/asm/apm.h linux-2.6.32.15/arch/x86/include/asm/apm.h ---- linux-2.6.32.15/arch/x86/include/asm/apm.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/apm.h 2010-05-28 21:27:14.903156603 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/apm.h linux-2.6.32.16/arch/x86/include/asm/apm.h +--- linux-2.6.32.16/arch/x86/include/asm/apm.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/apm.h 2010-07-09 14:50:35.000000000 -0400 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 __asm__ __volatile__(APM_DO_ZERO_SEGS "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 "setc %%bl\n\t" "popl %%ebp\n\t" "popl %%edi\n\t" -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 ---- linux-2.6.32.15/arch/x86/include/asm/atomic_32.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/atomic_32.h 2010-05-28 21:27:14.903156603 -0400 +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 +--- linux-2.6.32.16/arch/x86/include/asm/atomic_32.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/atomic_32.h 2010-07-09 14:50:35.000000000 -0400 @@ -25,6 +25,17 @@ static inline int atomic_read(const atom } @@ -5654,7 +5746,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_32.h linux-2.6.32.15/arch : "+m" (v->counter)); } -@@ -103,7 +202,18 @@ static inline void atomic_inc(atomic_t * +@@ -103,7 +202,30 @@ static inline void atomic_inc(atomic_t * */ static inline void atomic_dec(atomic_t *v) { @@ -5671,10 +5763,22 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_32.h linux-2.6.32.15/arch + _ASM_EXTABLE(0b, 1b) +#endif + ++ : "+m" (v->counter)); ++} ++ ++/** ++ * atomic_dec_unchecked - decrement atomic variable ++ * @v: pointer of type atomic_t ++ * ++ * Atomically decrements @v by 1. ++ */ ++static inline void atomic_dec_unchecked(atomic_unchecked_t *v) ++{ ++ asm volatile(LOCK_PREFIX "decl %0\n" : "+m" (v->counter)); } -@@ -119,7 +229,19 @@ static inline int atomic_dec_and_test(at +@@ -119,7 +241,19 @@ static inline int atomic_dec_and_test(at { unsigned char c; @@ -5695,7 +5799,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_32.h linux-2.6.32.15/arch : "+m" (v->counter), "=qm" (c) : : "memory"); return c != 0; -@@ -137,7 +259,19 @@ static inline int atomic_inc_and_test(at +@@ -137,7 +271,19 @@ static inline int atomic_inc_and_test(at { unsigned char c; @@ -5716,7 +5820,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_32.h linux-2.6.32.15/arch : "+m" (v->counter), "=qm" (c) : : "memory"); return c != 0; -@@ -156,7 +290,16 @@ static inline int atomic_add_negative(in +@@ -156,7 +302,16 @@ static inline int atomic_add_negative(in { unsigned char c; @@ -5734,7 +5838,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_32.h linux-2.6.32.15/arch : "+m" (v->counter), "=qm" (c) : "ir" (i) : "memory"); return c; -@@ -179,6 +322,46 @@ static inline int atomic_add_return(int +@@ -179,6 +334,46 @@ static inline int atomic_add_return(int #endif /* Modern 486+ processor */ __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 asm volatile(LOCK_PREFIX "xaddl %0, %1" : "+r" (i), "+m" (v->counter) : : "memory"); -@@ -227,22 +410,34 @@ static inline int atomic_xchg(atomic_t * +@@ -227,22 +422,34 @@ static inline int atomic_xchg(atomic_t * */ static inline int atomic_add_unless(atomic_t *v, int a, int u) { @@ -5820,7 +5924,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_32.h linux-2.6.32.15/arch #define atomic_dec_return(v) (atomic_sub_return(1, v)) /* These are x86-specific, used by some header files */ -@@ -266,6 +461,14 @@ typedef struct { +@@ -266,6 +473,14 @@ typedef struct { u64 __aligned(8) counter; } atomic64_t; @@ -5835,9 +5939,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_32.h linux-2.6.32.15/arch #define ATOMIC64_INIT(val) { (val) } extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val); -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 ---- linux-2.6.32.15/arch/x86/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/atomic_64.h 2010-05-28 21:27:14.906924566 -0400 +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 +--- linux-2.6.32.16/arch/x86/include/asm/atomic_64.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/atomic_64.h 2010-07-09 14:50:35.000000000 -0400 @@ -24,6 +24,17 @@ static inline int atomic_read(const atom } @@ -5989,7 +6093,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch : "=m" (v->counter) : "m" (v->counter)); } -@@ -103,7 +204,19 @@ static inline void atomic_inc(atomic_t * +@@ -103,7 +204,32 @@ static inline void atomic_inc(atomic_t * */ static inline void atomic_dec(atomic_t *v) { @@ -6007,10 +6111,23 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch + _ASM_EXTABLE(0b, 1b) +#endif + ++ : "=m" (v->counter) ++ : "m" (v->counter)); ++} ++ ++/** ++ * atomic_dec_unchecked - decrement atomic variable ++ * @v: pointer of type atomic_t ++ * ++ * Atomically decrements @v by 1. ++ */ ++static inline void atomic_dec_unchecked(atomic_unchecked_t *v) ++{ ++ asm volatile(LOCK_PREFIX "decl %0\n" : "=m" (v->counter) : "m" (v->counter)); } -@@ -120,7 +233,20 @@ static inline int atomic_dec_and_test(at +@@ -120,7 +246,20 @@ static inline int atomic_dec_and_test(at { unsigned char c; @@ -6032,7 +6149,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch : "=m" (v->counter), "=qm" (c) : "m" (v->counter) : "memory"); return c != 0; -@@ -138,7 +264,20 @@ static inline int atomic_inc_and_test(at +@@ -138,7 +277,20 @@ static inline int atomic_inc_and_test(at { unsigned char c; @@ -6054,7 +6171,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch : "=m" (v->counter), "=qm" (c) : "m" (v->counter) : "memory"); return c != 0; -@@ -157,7 +296,16 @@ static inline int atomic_add_negative(in +@@ -157,7 +309,16 @@ static inline int atomic_add_negative(in { unsigned char c; @@ -6072,7 +6189,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch : "=m" (v->counter), "=qm" (c) : "ir" (i), "m" (v->counter) : "memory"); return c; -@@ -173,7 +321,15 @@ static inline int atomic_add_negative(in +@@ -173,7 +334,15 @@ static inline int atomic_add_negative(in static inline int atomic_add_return(int i, atomic_t *v) { 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 : "+r" (i), "+m" (v->counter) : : "memory"); return i + __i; -@@ -204,6 +360,18 @@ static inline long atomic64_read(const a +@@ -204,6 +373,18 @@ static inline long atomic64_read(const a } /** @@ -6108,7 +6225,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch * atomic64_set - set atomic64 variable * @v: pointer to type atomic64_t * @i: required value -@@ -216,6 +384,18 @@ static inline void atomic64_set(atomic64 +@@ -216,6 +397,18 @@ static inline void atomic64_set(atomic64 } /** @@ -6127,7 +6244,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch * atomic64_add - add integer to atomic64 variable * @i: integer value to add * @v: pointer to type atomic64_t -@@ -224,6 +404,28 @@ static inline void atomic64_set(atomic64 +@@ -224,6 +417,28 @@ static inline void atomic64_set(atomic64 */ static inline void atomic64_add(long i, atomic64_t *v) { @@ -6156,7 +6273,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch asm volatile(LOCK_PREFIX "addq %1,%0" : "=m" (v->counter) : "er" (i), "m" (v->counter)); -@@ -238,7 +440,15 @@ static inline void atomic64_add(long i, +@@ -238,7 +453,15 @@ static inline void atomic64_add(long i, */ static inline void atomic64_sub(long i, atomic64_t *v) { @@ -6173,7 +6290,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch : "=m" (v->counter) : "er" (i), "m" (v->counter)); } -@@ -256,7 +466,16 @@ static inline int atomic64_sub_and_test( +@@ -256,7 +479,16 @@ static inline int atomic64_sub_and_test( { unsigned char c; @@ -6191,7 +6308,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch : "=m" (v->counter), "=qm" (c) : "er" (i), "m" (v->counter) : "memory"); return c; -@@ -270,6 +489,31 @@ static inline int atomic64_sub_and_test( +@@ -270,6 +502,31 @@ static inline int atomic64_sub_and_test( */ static inline void atomic64_inc(atomic64_t *v) { @@ -6223,7 +6340,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch asm volatile(LOCK_PREFIX "incq %0" : "=m" (v->counter) : "m" (v->counter)); -@@ -283,7 +527,19 @@ static inline void atomic64_inc(atomic64 +@@ -283,7 +540,32 @@ static inline void atomic64_inc(atomic64 */ static inline void atomic64_dec(atomic64_t *v) { @@ -6241,10 +6358,23 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch + _ASM_EXTABLE(0b, 1b) +#endif + ++ : "=m" (v->counter) ++ : "m" (v->counter)); ++} ++ ++/** ++ * atomic64_dec_unchecked - decrement atomic64 variable ++ * @v: pointer to type atomic64_t ++ * ++ * Atomically decrements @v by 1. ++ */ ++static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v) ++{ ++ asm volatile(LOCK_PREFIX "decq %0\n" : "=m" (v->counter) : "m" (v->counter)); } -@@ -300,7 +556,20 @@ static inline int atomic64_dec_and_test( +@@ -300,7 +582,20 @@ static inline int atomic64_dec_and_test( { unsigned char c; @@ -6266,7 +6396,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch : "=m" (v->counter), "=qm" (c) : "m" (v->counter) : "memory"); return c != 0; -@@ -318,7 +587,20 @@ static inline int atomic64_inc_and_test( +@@ -318,7 +613,20 @@ static inline int atomic64_inc_and_test( { unsigned char c; @@ -6288,7 +6418,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch : "=m" (v->counter), "=qm" (c) : "m" (v->counter) : "memory"); return c != 0; -@@ -337,7 +619,16 @@ static inline int atomic64_add_negative( +@@ -337,7 +645,16 @@ static inline int atomic64_add_negative( { unsigned char c; @@ -6306,7 +6436,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch : "=m" (v->counter), "=qm" (c) : "er" (i), "m" (v->counter) : "memory"); return c; -@@ -353,7 +644,31 @@ static inline int atomic64_add_negative( +@@ -353,7 +670,31 @@ static inline int atomic64_add_negative( static inline long atomic64_add_return(long i, atomic64_t *v) { 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 : "+r" (i), "+m" (v->counter) : : "memory"); return i + __i; -@@ -365,6 +680,7 @@ static inline long atomic64_sub_return(l +@@ -365,6 +706,7 @@ static inline long atomic64_sub_return(l } #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 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v))) static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new) -@@ -398,17 +714,29 @@ static inline long atomic_xchg(atomic_t +@@ -398,17 +740,29 @@ static inline long atomic_xchg(atomic_t */ static inline int atomic_add_unless(atomic_t *v, int a, int u) { @@ -6381,7 +6511,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) -@@ -424,17 +752,29 @@ static inline int atomic_add_unless(atom +@@ -424,17 +778,29 @@ static inline int atomic_add_unless(atom */ static inline int atomic64_add_unless(atomic64_t *v, long a, long u) { @@ -6405,7 +6535,7 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch + : "=r" (new) + : "0" (c), "er" (a)); + -+ old = atomic64_cmpxchg((v), c, new); ++ old = atomic64_cmpxchg(v, c, new); if (likely(old == c)) break; 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 } /** -diff -urNp linux-2.6.32.15/arch/x86/include/asm/boot.h linux-2.6.32.15/arch/x86/include/asm/boot.h ---- linux-2.6.32.15/arch/x86/include/asm/boot.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/boot.h 2010-05-28 21:27:14.906924566 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/boot.h linux-2.6.32.16/arch/x86/include/asm/boot.h +--- linux-2.6.32.16/arch/x86/include/asm/boot.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/boot.h 2010-07-09 14:50:35.000000000 -0400 @@ -11,10 +11,15 @@ #include <asm/pgtable_types.h> @@ -6435,9 +6565,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/boot.h linux-2.6.32.15/arch/x86/ /* Minimum kernel alignment, as a power of two */ #ifdef CONFIG_X86_64 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT -diff -urNp linux-2.6.32.15/arch/x86/include/asm/cacheflush.h linux-2.6.32.15/arch/x86/include/asm/cacheflush.h ---- linux-2.6.32.15/arch/x86/include/asm/cacheflush.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/cacheflush.h 2010-05-28 21:27:14.906924566 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/cacheflush.h linux-2.6.32.16/arch/x86/include/asm/cacheflush.h +--- linux-2.6.32.16/arch/x86/include/asm/cacheflush.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/cacheflush.h 2010-07-09 14:50:35.000000000 -0400 @@ -60,7 +60,7 @@ PAGEFLAG(WC, WC) static inline unsigned long get_page_memtype(struct page *pg) { @@ -6456,9 +6586,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/cacheflush.h linux-2.6.32.15/arc ClearPageUncached(pg); ClearPageWC(pg); break; -diff -urNp linux-2.6.32.15/arch/x86/include/asm/cache.h linux-2.6.32.15/arch/x86/include/asm/cache.h ---- linux-2.6.32.15/arch/x86/include/asm/cache.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/cache.h 2010-05-28 21:27:14.906924566 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/cache.h linux-2.6.32.16/arch/x86/include/asm/cache.h +--- linux-2.6.32.16/arch/x86/include/asm/cache.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/cache.h 2010-07-09 14:50:35.000000000 -0400 @@ -8,6 +8,7 @@ #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) @@ -6467,9 +6597,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/cache.h linux-2.6.32.15/arch/x86 #ifdef CONFIG_X86_VSMP /* vSMP Internode cacheline shift */ -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 ---- linux-2.6.32.15/arch/x86/include/asm/checksum_32.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/checksum_32.h 2010-05-28 21:27:14.906924566 -0400 +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 +--- linux-2.6.32.16/arch/x86/include/asm/checksum_32.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/checksum_32.h 2010-07-09 14:50:35.000000000 -0400 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene int len, __wsum sum, 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 len, sum, NULL, err_ptr); if (len) -diff -urNp linux-2.6.32.15/arch/x86/include/asm/desc.h linux-2.6.32.15/arch/x86/include/asm/desc.h ---- linux-2.6.32.15/arch/x86/include/asm/desc.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/desc.h 2010-05-28 21:27:14.906924566 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/desc.h linux-2.6.32.16/arch/x86/include/asm/desc.h +--- linux-2.6.32.16/arch/x86/include/asm/desc.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/desc.h 2010-07-09 14:50:35.000000000 -0400 @@ -4,6 +4,7 @@ #include <asm/desc_defs.h> #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/ +#endif + #endif /* _ASM_X86_DESC_H */ -diff -urNp linux-2.6.32.15/arch/x86/include/asm/device.h linux-2.6.32.15/arch/x86/include/asm/device.h ---- linux-2.6.32.15/arch/x86/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/device.h 2010-05-28 21:27:14.911025615 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/device.h linux-2.6.32.16/arch/x86/include/asm/device.h +--- linux-2.6.32.16/arch/x86/include/asm/device.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/device.h 2010-07-09 14:50:35.000000000 -0400 @@ -6,7 +6,7 @@ struct dev_archdata { void *acpi_handle; #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 #endif #ifdef CONFIG_DMAR void *iommu; /* hook for IOMMU specific extension */ -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 ---- linux-2.6.32.15/arch/x86/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/dma-mapping.h 2010-05-28 21:27:14.911025615 -0400 +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 +--- linux-2.6.32.16/arch/x86/include/asm/dma-mapping.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/dma-mapping.h 2010-07-09 14:50:35.000000000 -0400 @@ -25,9 +25,9 @@ extern int iommu_merge; extern struct device x86_dma_fallback_dev; 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 WARN_ON(irqs_disabled()); /* for portability */ -diff -urNp linux-2.6.32.15/arch/x86/include/asm/e820.h linux-2.6.32.15/arch/x86/include/asm/e820.h ---- linux-2.6.32.15/arch/x86/include/asm/e820.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/e820.h 2010-05-28 21:27:14.911025615 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/e820.h linux-2.6.32.16/arch/x86/include/asm/e820.h +--- linux-2.6.32.16/arch/x86/include/asm/e820.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/e820.h 2010-07-09 14:50:35.000000000 -0400 @@ -133,7 +133,7 @@ extern char *default_machine_specific_me #define ISA_END_ADDRESS 0x100000 #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/ #define BIOS_END 0x00100000 #ifdef __KERNEL__ -diff -urNp linux-2.6.32.15/arch/x86/include/asm/elf.h linux-2.6.32.15/arch/x86/include/asm/elf.h ---- linux-2.6.32.15/arch/x86/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/elf.h 2010-05-28 21:27:14.911025615 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/elf.h linux-2.6.32.16/arch/x86/include/asm/elf.h +--- linux-2.6.32.16/arch/x86/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/elf.h 2010-07-09 14:50:35.000000000 -0400 @@ -257,7 +257,25 @@ extern int force_personality32; the loader. We need to make sure that it is out of the way of the program 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 -#define arch_randomize_brk arch_randomize_brk - #endif /* _ASM_X86_ELF_H */ -diff -urNp linux-2.6.32.15/arch/x86/include/asm/futex.h linux-2.6.32.15/arch/x86/include/asm/futex.h ---- linux-2.6.32.15/arch/x86/include/asm/futex.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/futex.h 2010-05-28 21:27:14.911025615 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/futex.h linux-2.6.32.16/arch/x86/include/asm/futex.h +--- linux-2.6.32.16/arch/x86/include/asm/futex.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/futex.h 2010-07-09 14:50:35.000000000 -0400 @@ -11,17 +11,54 @@ #include <asm/processor.h> #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 : "memory" ); -diff -urNp linux-2.6.32.15/arch/x86/include/asm/i387.h linux-2.6.32.15/arch/x86/include/asm/i387.h ---- linux-2.6.32.15/arch/x86/include/asm/i387.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/i387.h 2010-05-28 21:27:14.911025615 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/i387.h linux-2.6.32.16/arch/x86/include/asm/i387.h +--- linux-2.6.32.16/arch/x86/include/asm/i387.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/i387.h 2010-07-09 14:50:35.000000000 -0400 @@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc { 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/ /* * These must be called with preempt disabled -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 ---- linux-2.6.32.15/arch/x86/include/asm/io_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/io_64.h 2010-05-28 21:27:14.911025615 -0400 +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 +--- linux-2.6.32.16/arch/x86/include/asm/io_64.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/io_64.h 2010-07-09 14:50:35.000000000 -0400 @@ -140,6 +140,17 @@ __OUTS(l) #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 #include <asm-generic/iomap.h> void __memcpy_fromio(void *, unsigned long, unsigned); -diff -urNp linux-2.6.32.15/arch/x86/include/asm/iommu.h linux-2.6.32.15/arch/x86/include/asm/iommu.h ---- linux-2.6.32.15/arch/x86/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/iommu.h 2010-05-28 21:27:14.911025615 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/iommu.h linux-2.6.32.16/arch/x86/include/asm/iommu.h +--- linux-2.6.32.16/arch/x86/include/asm/iommu.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/iommu.h 2010-07-09 14:50:35.000000000 -0400 @@ -3,7 +3,7 @@ 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 extern int force_iommu, no_iommu; extern int iommu_detected; extern int iommu_pass_through; -diff -urNp linux-2.6.32.15/arch/x86/include/asm/irqflags.h linux-2.6.32.15/arch/x86/include/asm/irqflags.h ---- linux-2.6.32.15/arch/x86/include/asm/irqflags.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/irqflags.h 2010-05-28 21:27:14.911025615 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/irqflags.h linux-2.6.32.16/arch/x86/include/asm/irqflags.h +--- linux-2.6.32.16/arch/x86/include/asm/irqflags.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/irqflags.h 2010-07-09 14:50:35.000000000 -0400 @@ -142,6 +142,11 @@ static inline unsigned long __raw_local_ sti; \ sysexit @@ -7027,10 +7157,10 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/irqflags.h linux-2.6.32.15/arch/ #else #define INTERRUPT_RETURN iret #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit -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 ---- linux-2.6.32.15/arch/x86/include/asm/kvm_host.h 2010-04-29 17:49:37.497949072 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/kvm_host.h 2010-05-28 21:27:14.911025615 -0400 -@@ -532,7 +532,7 @@ struct kvm_x86_ops { +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 +--- linux-2.6.32.16/arch/x86/include/asm/kvm_host.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/kvm_host.h 2010-07-09 14:50:35.000000000 -0400 +@@ -533,7 +533,7 @@ struct kvm_x86_ops { const struct trace_print_flags *exit_reasons_str; }; @@ -7039,9 +7169,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/kvm_host.h linux-2.6.32.15/arch/ int kvm_mmu_module_init(void); void kvm_mmu_module_exit(void); -diff -urNp linux-2.6.32.15/arch/x86/include/asm/local.h linux-2.6.32.15/arch/x86/include/asm/local.h ---- linux-2.6.32.15/arch/x86/include/asm/local.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/local.h 2010-05-28 21:27:14.911025615 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/local.h linux-2.6.32.16/arch/x86/include/asm/local.h +--- linux-2.6.32.16/arch/x86/include/asm/local.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/local.h 2010-07-09 14:50:35.000000000 -0400 @@ -18,26 +18,90 @@ typedef struct { 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 : "+r" (i), "+m" (l->a.counter) : : "memory"); return i + __i; -diff -urNp linux-2.6.32.15/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.15/arch/x86/include/asm/mc146818rtc.h ---- linux-2.6.32.15/arch/x86/include/asm/mc146818rtc.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/mc146818rtc.h 2010-05-28 21:27:14.911025615 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.16/arch/x86/include/asm/mc146818rtc.h +--- linux-2.6.32.16/arch/x86/include/asm/mc146818rtc.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/mc146818rtc.h 2010-07-09 14:50:35.000000000 -0400 @@ -81,8 +81,8 @@ static inline unsigned char current_lock #else #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 #define do_i_have_lock_cmos() 0 #define current_lock_cmos_reg() 0 #endif -diff -urNp linux-2.6.32.15/arch/x86/include/asm/microcode.h linux-2.6.32.15/arch/x86/include/asm/microcode.h ---- linux-2.6.32.15/arch/x86/include/asm/microcode.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/microcode.h 2010-05-28 21:27:14.911025615 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/microcode.h linux-2.6.32.16/arch/x86/include/asm/microcode.h +--- linux-2.6.32.16/arch/x86/include/asm/microcode.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/microcode.h 2010-07-09 14:50:35.000000000 -0400 @@ -12,13 +12,13 @@ struct device; enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; @@ -7323,9 +7453,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/microcode.h linux-2.6.32.15/arch { return NULL; } -diff -urNp linux-2.6.32.15/arch/x86/include/asm/mman.h linux-2.6.32.15/arch/x86/include/asm/mman.h ---- linux-2.6.32.15/arch/x86/include/asm/mman.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/mman.h 2010-05-28 21:27:14.911025615 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/mman.h linux-2.6.32.16/arch/x86/include/asm/mman.h +--- linux-2.6.32.16/arch/x86/include/asm/mman.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/mman.h 2010-07-09 14:50:35.000000000 -0400 @@ -5,4 +5,14 @@ #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/ +#endif + #endif /* _ASM_X86_MMAN_H */ -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 ---- linux-2.6.32.15/arch/x86/include/asm/mmu_context.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/mmu_context.h 2010-05-28 21:27:14.915041226 -0400 +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 +--- linux-2.6.32.16/arch/x86/include/asm/mmu_context.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/mmu_context.h 2010-07-09 14:50:35.000000000 -0400 @@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m 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 } #define activate_mm(prev, next) \ -diff -urNp linux-2.6.32.15/arch/x86/include/asm/mmu.h linux-2.6.32.15/arch/x86/include/asm/mmu.h ---- linux-2.6.32.15/arch/x86/include/asm/mmu.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/mmu.h 2010-05-28 21:27:14.915041226 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/mmu.h linux-2.6.32.16/arch/x86/include/asm/mmu.h +--- linux-2.6.32.16/arch/x86/include/asm/mmu.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/mmu.h 2010-07-09 14:50:35.000000000 -0400 @@ -9,10 +9,23 @@ * we put the segment information here. */ @@ -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 } mm_context_t; #ifdef CONFIG_SMP -diff -urNp linux-2.6.32.15/arch/x86/include/asm/module.h linux-2.6.32.15/arch/x86/include/asm/module.h ---- linux-2.6.32.15/arch/x86/include/asm/module.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/module.h 2010-05-28 21:27:14.915041226 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/module.h linux-2.6.32.16/arch/x86/include/asm/module.h +--- linux-2.6.32.16/arch/x86/include/asm/module.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/module.h 2010-07-09 14:50:35.000000000 -0400 @@ -59,13 +59,31 @@ #error unknown processor family #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 #endif #endif /* _ASM_X86_MODULE_H */ -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 ---- linux-2.6.32.15/arch/x86/include/asm/page_32_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/page_32_types.h 2010-05-28 21:27:14.915041226 -0400 +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 +--- linux-2.6.32.16/arch/x86/include/asm/page_32_types.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/page_32_types.h 2010-07-09 14:50:35.000000000 -0400 @@ -15,6 +15,10 @@ */ #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/ #ifdef CONFIG_4KSTACKS #define THREAD_ORDER 0 #else -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 ---- linux-2.6.32.15/arch/x86/include/asm/page_64_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/page_64_types.h 2010-05-28 21:27:14.915041226 -0400 +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 +--- linux-2.6.32.16/arch/x86/include/asm/page_64_types.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/page_64_types.h 2010-07-09 14:50:35.000000000 -0400 @@ -39,6 +39,9 @@ #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START) #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/ /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */ #define __PHYSICAL_MASK_SHIFT 46 #define __VIRTUAL_MASK_SHIFT 47 -diff -urNp linux-2.6.32.15/arch/x86/include/asm/paravirt.h linux-2.6.32.15/arch/x86/include/asm/paravirt.h ---- linux-2.6.32.15/arch/x86/include/asm/paravirt.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/paravirt.h 2010-06-19 10:03:50.008525890 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/paravirt.h linux-2.6.32.16/arch/x86/include/asm/paravirt.h +--- linux-2.6.32.16/arch/x86/include/asm/paravirt.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/paravirt.h 2010-07-09 14:50:35.000000000 -0400 @@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned pv_mmu_ops.set_fixmap(idx, phys, flags); } @@ -7570,12 +7700,12 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/paravirt.h linux-2.6.32.15/arch/ +#ifdef CONFIG_PAX_KERNEXEC +static inline unsigned long pax_open_kernel(void) +{ -+ return pv_mmu_ops.pax_open_kernel(); ++ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel); +} + +static inline unsigned long pax_close_kernel(void) +{ -+ return pv_mmu_ops.pax_close_kernel(); ++ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel); +} +#else +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/ #endif /* CONFIG_X86_32 */ #endif /* __ASSEMBLY__ */ -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 ---- linux-2.6.32.15/arch/x86/include/asm/paravirt_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/paravirt_types.h 2010-05-28 21:27:14.915041226 -0400 +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 +--- linux-2.6.32.16/arch/x86/include/asm/paravirt_types.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/paravirt_types.h 2010-07-09 14:50:35.000000000 -0400 @@ -316,6 +316,12 @@ struct pv_mmu_ops { an mfn. We can tell which is which from the index. */ 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 }; struct raw_spinlock; -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 ---- linux-2.6.32.15/arch/x86/include/asm/pci_x86.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/pci_x86.h 2010-05-28 21:27:14.915041226 -0400 +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 +--- linux-2.6.32.16/arch/x86/include/asm/pci_x86.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/pci_x86.h 2010-07-09 14:50:35.000000000 -0400 @@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct extern void (*pcibios_disable_irq)(struct pci_dev *dev); @@ -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 extern bool port_cf9_safe; /* arch_initcall level */ -diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgalloc.h linux-2.6.32.15/arch/x86/include/asm/pgalloc.h ---- linux-2.6.32.15/arch/x86/include/asm/pgalloc.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/pgalloc.h 2010-05-28 21:27:14.915041226 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgalloc.h linux-2.6.32.16/arch/x86/include/asm/pgalloc.h +--- linux-2.6.32.16/arch/x86/include/asm/pgalloc.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/pgalloc.h 2010-07-09 14:50:35.000000000 -0400 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s pmd_t *pmd, pte_t *pte) { @@ -7674,9 +7804,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgalloc.h linux-2.6.32.15/arch/x set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); } -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 ---- linux-2.6.32.15/arch/x86/include/asm/pgtable-2level.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/pgtable-2level.h 2010-05-28 21:27:14.915041226 -0400 +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 +--- linux-2.6.32.16/arch/x86/include/asm/pgtable-2level.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/pgtable-2level.h 2010-07-09 14:50:35.000000000 -0400 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t 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 } static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) -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 ---- linux-2.6.32.15/arch/x86/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/pgtable_32.h 2010-05-28 21:27:14.915041226 -0400 +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 +--- linux-2.6.32.16/arch/x86/include/asm/pgtable_32.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/pgtable_32.h 2010-07-09 14:50:35.000000000 -0400 @@ -26,8 +26,6 @@ struct mm_struct; 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 /* * kern_addr_valid() is (1) for FLATMEM and (0) for * SPARSEMEM and DISCONTIGMEM -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 ---- linux-2.6.32.15/arch/x86/include/asm/pgtable_32_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/pgtable_32_types.h 2010-05-28 21:27:14.915041226 -0400 +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 +--- linux-2.6.32.16/arch/x86/include/asm/pgtable_32_types.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/pgtable_32_types.h 2010-07-09 14:50:35.000000000 -0400 @@ -8,7 +8,7 @@ */ #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. #define MODULES_VADDR VMALLOC_START #define MODULES_END VMALLOC_END #define MODULES_LEN (MODULES_VADDR - MODULES_END) -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 ---- linux-2.6.32.15/arch/x86/include/asm/pgtable-3level.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/pgtable-3level.h 2010-06-19 10:03:50.008525890 -0400 +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 +--- linux-2.6.32.16/arch/x86/include/asm/pgtable-3level.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/pgtable-3level.h 2010-07-09 14:50:35.000000000 -0400 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic 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 } /* -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 ---- linux-2.6.32.15/arch/x86/include/asm/pgtable_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/pgtable_64.h 2010-06-19 10:03:50.008525890 -0400 +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 +--- linux-2.6.32.16/arch/x86/include/asm/pgtable_64.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/pgtable_64.h 2010-07-09 14:50:35.000000000 -0400 @@ -16,10 +16,13 @@ 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 } static inline void native_pgd_clear(pgd_t *pgd) -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 ---- linux-2.6.32.15/arch/x86/include/asm/pgtable_64_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/pgtable_64_types.h 2010-05-28 21:27:14.915041226 -0400 +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 +--- linux-2.6.32.16/arch/x86/include/asm/pgtable_64_types.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/pgtable_64_types.h 2010-07-09 14:50:35.000000000 -0400 @@ -59,5 +59,7 @@ typedef struct { pteval_t pte; } pte_t; #define MODULES_VADDR _AC(0xffffffffa0000000, UL) #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. +#define MODULES_EXEC_END MODULES_END #endif /* _ASM_X86_PGTABLE_64_DEFS_H */ -diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable.h linux-2.6.32.15/arch/x86/include/asm/pgtable.h ---- linux-2.6.32.15/arch/x86/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/pgtable.h 2010-06-19 10:03:50.008525890 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable.h linux-2.6.32.16/arch/x86/include/asm/pgtable.h +--- linux-2.6.32.16/arch/x86/include/asm/pgtable.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/pgtable.h 2010-07-09 14:50:35.000000000 -0400 @@ -74,12 +74,51 @@ extern struct list_head pgd_list; #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 #include <asm-generic/pgtable.h> #endif /* __ASSEMBLY__ */ -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 ---- linux-2.6.32.15/arch/x86/include/asm/pgtable_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/pgtable_types.h 2010-05-28 21:27:14.918896182 -0400 +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 +--- linux-2.6.32.16/arch/x86/include/asm/pgtable_types.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/pgtable_types.h 2010-07-09 14:50:35.000000000 -0400 @@ -16,12 +16,11 @@ #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ #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/ #define pgprot_writecombine pgprot_writecombine extern pgprot_t pgprot_writecombine(pgprot_t prot); -diff -urNp linux-2.6.32.15/arch/x86/include/asm/processor.h linux-2.6.32.15/arch/x86/include/asm/processor.h ---- linux-2.6.32.15/arch/x86/include/asm/processor.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/processor.h 2010-05-28 21:27:14.918896182 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/processor.h linux-2.6.32.16/arch/x86/include/asm/processor.h +--- linux-2.6.32.16/arch/x86/include/asm/processor.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/processor.h 2010-07-09 14:50:35.000000000 -0400 @@ -272,7 +272,7 @@ struct tss_struct { } ____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 #define KSTK_EIP(task) (task_pt_regs(task)->ip) /* Get/set a process' ability to use the timestamp counter instruction */ -diff -urNp linux-2.6.32.15/arch/x86/include/asm/ptrace.h linux-2.6.32.15/arch/x86/include/asm/ptrace.h ---- linux-2.6.32.15/arch/x86/include/asm/ptrace.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/ptrace.h 2010-05-28 21:27:14.918896182 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/ptrace.h linux-2.6.32.16/arch/x86/include/asm/ptrace.h +--- linux-2.6.32.16/arch/x86/include/asm/ptrace.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/ptrace.h 2010-07-09 14:50:35.000000000 -0400 @@ -151,28 +151,29 @@ static inline unsigned long regs_return_ } @@ -8218,9 +8348,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/ptrace.h linux-2.6.32.15/arch/x8 #endif } -diff -urNp linux-2.6.32.15/arch/x86/include/asm/reboot.h linux-2.6.32.15/arch/x86/include/asm/reboot.h ---- linux-2.6.32.15/arch/x86/include/asm/reboot.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/reboot.h 2010-05-28 21:27:14.918896182 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/reboot.h linux-2.6.32.16/arch/x86/include/asm/reboot.h +--- linux-2.6.32.16/arch/x86/include/asm/reboot.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/reboot.h 2010-07-09 14:50:35.000000000 -0400 @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; 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 typedef void (*nmi_shootdown_cb)(int, struct die_args*); void nmi_shootdown_cpus(nmi_shootdown_cb callback); -diff -urNp linux-2.6.32.15/arch/x86/include/asm/rwsem.h linux-2.6.32.15/arch/x86/include/asm/rwsem.h ---- linux-2.6.32.15/arch/x86/include/asm/rwsem.h 2010-04-29 17:49:37.501451369 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/rwsem.h 2010-05-28 21:27:14.918896182 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/rwsem.h linux-2.6.32.16/arch/x86/include/asm/rwsem.h +--- linux-2.6.32.16/arch/x86/include/asm/rwsem.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/rwsem.h 2010-07-09 14:50:35.000000000 -0400 @@ -118,10 +118,26 @@ static inline void __down_read(struct rw { 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 : "+r" (tmp), "+m" (sem->count) : : "memory"); -diff -urNp linux-2.6.32.15/arch/x86/include/asm/segment.h linux-2.6.32.15/arch/x86/include/asm/segment.h ---- linux-2.6.32.15/arch/x86/include/asm/segment.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/segment.h 2010-05-28 21:27:14.918896182 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/segment.h linux-2.6.32.16/arch/x86/include/asm/segment.h +--- linux-2.6.32.16/arch/x86/include/asm/segment.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/segment.h 2010-07-09 14:50:35.000000000 -0400 @@ -62,8 +62,8 @@ * 26 - ESPFIX small SS * 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 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8) #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3) #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3) -diff -urNp linux-2.6.32.15/arch/x86/include/asm/spinlock.h linux-2.6.32.15/arch/x86/include/asm/spinlock.h ---- linux-2.6.32.15/arch/x86/include/asm/spinlock.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/spinlock.h 2010-05-28 21:27:14.918896182 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/spinlock.h linux-2.6.32.16/arch/x86/include/asm/spinlock.h +--- linux-2.6.32.16/arch/x86/include/asm/spinlock.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/spinlock.h 2010-07-09 14:50:35.000000000 -0400 @@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r static inline void __raw_read_lock(raw_rwlock_t *rw) { @@ -8645,9 +8775,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/spinlock.h linux-2.6.32.15/arch/ : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); } -diff -urNp linux-2.6.32.15/arch/x86/include/asm/system.h linux-2.6.32.15/arch/x86/include/asm/system.h ---- linux-2.6.32.15/arch/x86/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/system.h 2010-05-28 21:27:14.922894828 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/system.h linux-2.6.32.16/arch/x86/include/asm/system.h +--- linux-2.6.32.16/arch/x86/include/asm/system.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/system.h 2010-07-09 14:50:35.000000000 -0400 @@ -200,7 +200,7 @@ static inline unsigned long get_limit(un { 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 extern void free_init_pages(char *what, unsigned long begin, unsigned long end); void default_idle(void); -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 ---- linux-2.6.32.15/arch/x86/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/uaccess_32.h 2010-05-28 21:27:14.922894828 -0400 +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 +--- linux-2.6.32.16/arch/x86/include/asm/uaccess_32.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/uaccess_32.h 2010-07-09 14:50:35.000000000 -0400 @@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u static __always_inline unsigned long __must_check __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 long __must_check strncpy_from_user(char *dst, const char __user *src, long count); long __must_check __strncpy_from_user(char *dst, -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 ---- linux-2.6.32.15/arch/x86/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/uaccess_64.h 2010-05-28 21:27:14.922894828 -0400 +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 +--- linux-2.6.32.16/arch/x86/include/asm/uaccess_64.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/uaccess_64.h 2010-07-09 14:50:35.000000000 -0400 @@ -9,6 +9,9 @@ #include <linux/prefetch.h> #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 copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); #endif /* _ASM_X86_UACCESS_64_H */ -diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess.h linux-2.6.32.15/arch/x86/include/asm/uaccess.h ---- linux-2.6.32.15/arch/x86/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/uaccess.h 2010-05-28 21:27:14.922894828 -0400 -@@ -8,6 +8,8 @@ +diff -urNp linux-2.6.32.16/arch/x86/include/asm/uaccess.h linux-2.6.32.16/arch/x86/include/asm/uaccess.h +--- linux-2.6.32.16/arch/x86/include/asm/uaccess.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/uaccess.h 2010-07-11 21:16:08.000000000 -0400 +@@ -8,12 +8,15 @@ #include <linux/thread_info.h> #include <linux/prefetch.h> #include <linux/string.h> +#include <linux/sched.h> -+#include <linux/slab.h> #include <asm/asm.h> #include <asm/page.h> -@@ -29,7 +31,12 @@ + #define VERIFY_READ 0 + #define VERIFY_WRITE 1 + ++extern void check_object_size(const void *ptr, unsigned long n, bool to); ++ + /* + * The fs value determines whether argument validity checking should be + * performed or not. If get_fs() == USER_DS, checking is performed, with +@@ -29,7 +32,12 @@ #define get_ds() (KERNEL_DS) #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 #define segment_eq(a, b) ((a).seg == (b).seg) -@@ -77,7 +84,33 @@ +@@ -77,7 +85,33 @@ * checks that the pointer is in the user space range - after calling * this function, memory access functions may still return -EFAULT. */ @@ -9052,9 +9189,22 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess.h linux-2.6.32.15/arch/x /* * The exception table consists of pairs of addresses: the first is the -@@ -183,13 +216,21 @@ extern int __get_user_bad(void); +@@ -179,17 +213,34 @@ extern int __get_user_bad(void); + __ret_gu; \ + }) + ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++#define __put_user_x(size, x, ptr, __ret_pu) \ ++ ({ \ ++ int __dummy; \ ++ asm volatile("call __put_user_" #size : "=a" (__ret_pu), "=c" (__dummy) \ ++ : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx"); \ ++ }) ++#else + #define __put_user_x(size, x, ptr, __ret_pu) \ asm volatile("call __put_user_" #size : "=a" (__ret_pu) \ : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") ++#endif - +#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 ".section .fixup,\"ax\"\n" \ "4: movl %3,%0\n" \ " jmp 3b\n" \ -@@ -197,15 +238,18 @@ extern int __get_user_bad(void); +@@ -197,15 +248,18 @@ extern int __get_user_bad(void); _ASM_EXTABLE(1b, 4b) \ _ASM_EXTABLE(2b, 4b) \ : "=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 #define __put_user_x8(x, ptr, __ret_pu) \ asm volatile("call __put_user_8" : "=a" (__ret_pu) \ -@@ -374,16 +418,18 @@ do { \ +@@ -374,16 +428,18 @@ do { \ } while (0) #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 #define __get_user_size_ex(x, ptr, size) \ do { \ -@@ -407,10 +453,12 @@ do { \ +@@ -407,10 +463,12 @@ do { \ } while (0) #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 #define __put_user_nocheck(x, ptr, size) \ ({ \ -@@ -424,13 +472,24 @@ do { \ +@@ -424,13 +482,24 @@ do { \ int __gu_err; \ unsigned long __gu_val; \ __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 /* * Tell gcc we read from memory instead of writing: this is because -@@ -438,21 +497,26 @@ struct __large_struct { unsigned long bu +@@ -438,21 +507,26 @@ struct __large_struct { unsigned long bu * aliasing issues. */ #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 /* * uaccess_try and catch -@@ -530,7 +594,7 @@ struct __large_struct { unsigned long bu +@@ -530,7 +604,7 @@ struct __large_struct { unsigned long bu #define get_user_ex(x, ptr) do { \ unsigned long __gue_val; \ __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 } while (0) #ifdef CONFIG_X86_WP_WORKS_OK -@@ -567,6 +631,7 @@ extern struct movsl_mask { +@@ -567,6 +641,7 @@ extern struct movsl_mask { #define ARCH_HAS_NOCACHE_UACCESS 1 @@ -9212,9 +9362,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess.h linux-2.6.32.15/arch/x #ifdef CONFIG_X86_32 # include "uaccess_32.h" #else -diff -urNp linux-2.6.32.15/arch/x86/include/asm/vgtod.h linux-2.6.32.15/arch/x86/include/asm/vgtod.h ---- linux-2.6.32.15/arch/x86/include/asm/vgtod.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/vgtod.h 2010-05-28 21:27:14.922894828 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/vgtod.h linux-2.6.32.16/arch/x86/include/asm/vgtod.h +--- linux-2.6.32.16/arch/x86/include/asm/vgtod.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/vgtod.h 2010-07-09 14:50:35.000000000 -0400 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data { int sysctl_enabled; 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 cycle_t (*vread)(void); cycle_t cycle_last; cycle_t mask; -diff -urNp linux-2.6.32.15/arch/x86/include/asm/vmi.h linux-2.6.32.15/arch/x86/include/asm/vmi.h ---- linux-2.6.32.15/arch/x86/include/asm/vmi.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/vmi.h 2010-05-28 21:27:14.922894828 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/vmi.h linux-2.6.32.16/arch/x86/include/asm/vmi.h +--- linux-2.6.32.16/arch/x86/include/asm/vmi.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/vmi.h 2010-07-09 14:50:35.000000000 -0400 @@ -191,6 +191,7 @@ struct vrom_header { u8 reserved[96]; /* Reserved for headers */ 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 } __attribute__((packed)); struct pnp_header { -diff -urNp linux-2.6.32.15/arch/x86/include/asm/vsyscall.h linux-2.6.32.15/arch/x86/include/asm/vsyscall.h ---- linux-2.6.32.15/arch/x86/include/asm/vsyscall.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/vsyscall.h 2010-05-28 21:27:14.922894828 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/vsyscall.h linux-2.6.32.16/arch/x86/include/asm/vsyscall.h +--- linux-2.6.32.16/arch/x86/include/asm/vsyscall.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/vsyscall.h 2010-07-09 14:50:35.000000000 -0400 @@ -15,9 +15,10 @@ enum vsyscall_num { #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/ #endif /* __KERNEL__ */ #endif /* _ASM_X86_VSYSCALL_H */ -diff -urNp linux-2.6.32.15/arch/x86/include/asm/xsave.h linux-2.6.32.15/arch/x86/include/asm/xsave.h ---- linux-2.6.32.15/arch/x86/include/asm/xsave.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/include/asm/xsave.h 2010-05-28 21:27:14.922894828 -0400 +diff -urNp linux-2.6.32.16/arch/x86/include/asm/xsave.h linux-2.6.32.16/arch/x86/include/asm/xsave.h +--- linux-2.6.32.16/arch/x86/include/asm/xsave.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/include/asm/xsave.h 2010-07-09 14:50:35.000000000 -0400 @@ -56,6 +56,12 @@ static inline int xrstor_checking(struct static inline int xsave_user(struct xsave_struct __user *buf) { @@ -9295,9 +9445,9 @@ diff -urNp linux-2.6.32.15/arch/x86/include/asm/xsave.h linux-2.6.32.15/arch/x86 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n" "2:\n" ".section .fixup,\"ax\"\n" -diff -urNp linux-2.6.32.15/arch/x86/Kconfig linux-2.6.32.15/arch/x86/Kconfig ---- linux-2.6.32.15/arch/x86/Kconfig 2010-05-15 13:20:18.407099662 -0400 -+++ linux-2.6.32.15/arch/x86/Kconfig 2010-06-19 11:15:06.486972627 -0400 +diff -urNp linux-2.6.32.16/arch/x86/Kconfig linux-2.6.32.16/arch/x86/Kconfig +--- linux-2.6.32.16/arch/x86/Kconfig 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/Kconfig 2010-07-09 14:50:35.000000000 -0400 @@ -1083,7 +1083,7 @@ config PAGE_OFFSET hex 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 ---help--- Map the 32-bit VDSO to the predictable old-style address too. ---help--- -diff -urNp linux-2.6.32.15/arch/x86/Kconfig.cpu linux-2.6.32.15/arch/x86/Kconfig.cpu ---- linux-2.6.32.15/arch/x86/Kconfig.cpu 2010-04-29 17:49:37.481119841 -0400 -+++ linux-2.6.32.15/arch/x86/Kconfig.cpu 2010-05-28 21:27:14.922894828 -0400 +diff -urNp linux-2.6.32.16/arch/x86/Kconfig.cpu linux-2.6.32.16/arch/x86/Kconfig.cpu +--- linux-2.6.32.16/arch/x86/Kconfig.cpu 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/Kconfig.cpu 2010-07-09 14:50:35.000000000 -0400 @@ -340,7 +340,7 @@ config X86_PPRO_FENCE 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 config X86_MINIMUM_CPU_FAMILY int -diff -urNp linux-2.6.32.15/arch/x86/Kconfig.debug linux-2.6.32.15/arch/x86/Kconfig.debug ---- linux-2.6.32.15/arch/x86/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/Kconfig.debug 2010-05-28 21:27:14.926914091 -0400 +diff -urNp linux-2.6.32.16/arch/x86/Kconfig.debug linux-2.6.32.16/arch/x86/Kconfig.debug +--- linux-2.6.32.16/arch/x86/Kconfig.debug 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/Kconfig.debug 2010-07-09 14:50:35.000000000 -0400 @@ -99,7 +99,7 @@ config X86_PTDUMP config DEBUG_RODATA 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 ---help--- Mark the kernel read-only data as write-protected in the pagetables, in order to catch accidental (and incorrect) writes to such const -diff -urNp linux-2.6.32.15/arch/x86/kernel/acpi/boot.c linux-2.6.32.15/arch/x86/kernel/acpi/boot.c ---- linux-2.6.32.15/arch/x86/kernel/acpi/boot.c 2010-04-04 20:41:49.916475305 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/acpi/boot.c 2010-05-28 21:27:14.939148318 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/acpi/boot.c linux-2.6.32.16/arch/x86/kernel/acpi/boot.c +--- linux-2.6.32.16/arch/x86/kernel/acpi/boot.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/acpi/boot.c 2010-07-09 14:50:35.000000000 -0400 @@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), }, @@ -9398,9 +9548,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/acpi/boot.c linux-2.6.32.15/arch/x86/ }; /* -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 ---- linux-2.6.32.15/arch/x86/kernel/acpi/realmode/wakeup.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/acpi/realmode/wakeup.S 2010-05-28 21:27:14.939148318 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/acpi/realmode/wakeup.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/acpi/realmode/wakeup.S 2010-07-09 14:50:35.000000000 -0400 @@ -104,7 +104,7 @@ _start: movl %eax, %ecx 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 wrmsr 1: -diff -urNp linux-2.6.32.15/arch/x86/kernel/acpi/sleep.c linux-2.6.32.15/arch/x86/kernel/acpi/sleep.c ---- linux-2.6.32.15/arch/x86/kernel/acpi/sleep.c 2010-05-15 13:20:18.407099662 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/acpi/sleep.c 2010-05-28 21:27:14.943027635 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/acpi/sleep.c linux-2.6.32.16/arch/x86/kernel/acpi/sleep.c +--- linux-2.6.32.16/arch/x86/kernel/acpi/sleep.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/acpi/sleep.c 2010-07-09 14:50:35.000000000 -0400 @@ -11,11 +11,12 @@ #include <linux/cpumask.h> #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 } -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 ---- linux-2.6.32.15/arch/x86/kernel/acpi/wakeup_32.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/acpi/wakeup_32.S 2010-05-28 21:27:14.943027635 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/acpi/wakeup_32.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/acpi/wakeup_32.S 2010-07-09 14:50:35.000000000 -0400 @@ -30,13 +30,11 @@ wakeup_pmode_return: # and restore the stack ... but you need gdt for this to work 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 bogus_magic: jmp bogus_magic -diff -urNp linux-2.6.32.15/arch/x86/kernel/alternative.c linux-2.6.32.15/arch/x86/kernel/alternative.c ---- linux-2.6.32.15/arch/x86/kernel/alternative.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/alternative.c 2010-05-28 21:27:14.943027635 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/alternative.c linux-2.6.32.16/arch/x86/kernel/alternative.c +--- linux-2.6.32.16/arch/x86/kernel/alternative.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/alternative.c 2010-07-09 14:50:35.000000000 -0400 @@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str 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 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf, (unsigned long)p->instr, p->len); +@@ -475,7 +475,7 @@ void __init alternative_instructions(voi + if (smp_alt_once) + free_init_pages("SMP alternatives", + (unsigned long)__smp_locks, +- (unsigned long)__smp_locks_end); ++ PAGE_ALIGN((unsigned long)__smp_locks_end)); + + restart_nmi(); + } @@ -492,12 +492,16 @@ void __init alternative_instructions(voi * instructions. And on the local CPU you need to be protected again NMI or MCE * 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 + BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]); return addr; } -diff -urNp linux-2.6.32.15/arch/x86/kernel/amd_iommu.c linux-2.6.32.15/arch/x86/kernel/amd_iommu.c ---- linux-2.6.32.15/arch/x86/kernel/amd_iommu.c 2010-04-29 17:49:37.521943068 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/amd_iommu.c 2010-05-28 21:27:14.959145751 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/amd_iommu.c linux-2.6.32.16/arch/x86/kernel/amd_iommu.c +--- linux-2.6.32.16/arch/x86/kernel/amd_iommu.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/amd_iommu.c 2010-07-09 14:50:35.000000000 -0400 @@ -2074,7 +2074,7 @@ static void prealloc_protection_domains( } } @@ -9563,9 +9722,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/amd_iommu.c linux-2.6.32.15/arch/x86/ .alloc_coherent = alloc_coherent, .free_coherent = free_coherent, .map_page = map_page, -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 ---- linux-2.6.32.15/arch/x86/kernel/apic/io_apic.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/apic/io_apic.c 2010-05-28 21:27:14.967145332 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/apic/io_apic.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/apic/io_apic.c 2010-07-09 14:50:35.000000000 -0400 @@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, 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 { spin_unlock(&vector_lock); } -diff -urNp linux-2.6.32.15/arch/x86/kernel/apm_32.c linux-2.6.32.15/arch/x86/kernel/apm_32.c ---- linux-2.6.32.15/arch/x86/kernel/apm_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/apm_32.c 2010-05-28 21:27:14.975148965 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/apm_32.c linux-2.6.32.16/arch/x86/kernel/apm_32.c +--- linux-2.6.32.16/arch/x86/kernel/apm_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/apm_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock); * This is for buggy BIOS's that refer to (real mode) segment 0x40 * 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 proc_create("apm", 0, NULL, &apm_file_ops); -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 ---- linux-2.6.32.15/arch/x86/kernel/asm-offsets_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/asm-offsets_32.c 2010-05-28 21:27:14.975148965 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/asm-offsets_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/asm-offsets_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -115,6 +115,11 @@ void foo(void) OFFSET(PV_CPU_iret, pv_cpu_ops, iret); 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 #endif #ifdef CONFIG_XEN -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 ---- linux-2.6.32.15/arch/x86/kernel/asm-offsets_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/asm-offsets_64.c 2010-05-28 21:27:14.975148965 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/asm-offsets_64.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/asm-offsets_64.c 2010-07-09 14:50:35.000000000 -0400 @@ -63,6 +63,18 @@ int main(void) OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); 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 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); BLANK(); DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); -diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/common.c linux-2.6.32.15/arch/x86/kernel/cpu/common.c ---- linux-2.6.32.15/arch/x86/kernel/cpu/common.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/cpu/common.c 2010-05-28 21:27:14.975148965 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/common.c linux-2.6.32.16/arch/x86/kernel/cpu/common.c +--- linux-2.6.32.16/arch/x86/kernel/cpu/common.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/cpu/common.c 2010-07-09 14:50:35.000000000 -0400 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon 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 struct thread_struct *thread = &curr->thread; if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { -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 ---- linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-05-28 21:27:14.975148965 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-07-09 14:50:35.000000000 -0400 @@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), }, @@ -9874,9 +10033,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6. }; static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) -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 ---- linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-05-28 21:27:14.975148965 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-07-09 14:50:35.000000000 -0400 @@ -225,7 +225,7 @@ static struct cpu_model models[] = { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL }, { &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 }; #undef _BANIAS #undef BANIAS -diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/intel.c linux-2.6.32.15/arch/x86/kernel/cpu/intel.c ---- linux-2.6.32.15/arch/x86/kernel/cpu/intel.c 2010-05-15 13:20:18.427075180 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/cpu/intel.c 2010-05-28 21:27:14.975148965 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/intel.c linux-2.6.32.16/arch/x86/kernel/cpu/intel.c +--- linux-2.6.32.16/arch/x86/kernel/cpu/intel.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/cpu/intel.c 2010-07-09 14:50:35.000000000 -0400 @@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug * Update the IDT descriptor and reload the IDT so that * 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/ load_idt(&idt_descr); } #endif -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 ---- linux-2.6.32.15/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-05-28 20:16:44.430924650 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-05-28 21:27:14.987166265 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-07-09 14:50:35.000000000 -0400 @@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob return ret; } @@ -9910,9 +10069,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.15 .show = show, .store = store, }; -diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/Makefile linux-2.6.32.15/arch/x86/kernel/cpu/Makefile ---- linux-2.6.32.15/arch/x86/kernel/cpu/Makefile 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/cpu/Makefile 2010-05-28 21:27:14.987166265 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/Makefile linux-2.6.32.16/arch/x86/kernel/cpu/Makefile +--- linux-2.6.32.16/arch/x86/kernel/cpu/Makefile 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/cpu/Makefile 2010-07-09 14:50:35.000000000 -0400 @@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER CFLAGS_REMOVE_common.o = -pg endif @@ -9924,9 +10083,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/Makefile linux-2.6.32.15/arch/x86 obj-y := intel_cacheinfo.o addon_cpuid_features.o obj-y += proc.o capflags.o powerflags.o common.o obj-y += vmware.o hypervisor.o sched.o -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 ---- linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-05-28 21:27:14.995163789 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-07-09 14:50:35.000000000 -0400 @@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob return ret; } @@ -9936,9 +10095,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.15/ .show = show, .store = store, }; -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 ---- linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce.c 2010-05-28 21:27:15.011149672 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce.c 2010-07-09 14:50:35.000000000 -0400 @@ -187,7 +187,7 @@ static void print_mce(struct mce *m) !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "", 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 }; /* -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 ---- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/amd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/amd.c 2010-05-28 21:27:15.011149672 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/amd.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/amd.c 2010-07-09 14:50:35.000000000 -0400 @@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base return 0; } @@ -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 .vendor = X86_VENDOR_AMD, .set = amd_set_mtrr, .get = amd_get_mtrr, -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 ---- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/centaur.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/centaur.c 2010-05-28 21:27:15.011149672 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/centaur.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/centaur.c 2010-07-09 14:50:35.000000000 -0400 @@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long return 0; } @@ -10015,9 +10174,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.15/ar .vendor = X86_VENDOR_CENTAUR, .set = centaur_set_mcr, .get = centaur_get_mcr, -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 ---- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-05-28 21:27:15.011149672 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-07-09 14:50:35.000000000 -0400 @@ -265,7 +265,7 @@ static void cyrix_set_all(void) post_set(); } @@ -10027,9 +10186,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.15/arch .vendor = X86_VENDOR_CYRIX, .set_all = cyrix_set_all, .set = cyrix_set_arr, -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 ---- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/generic.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/generic.c 2010-05-28 21:27:15.011149672 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/generic.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/generic.c 2010-07-09 14:50:35.000000000 -0400 @@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ { 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 .use_intel_if = 1, .set_all = generic_set_all, .get = generic_get_mtrr, -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 ---- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/main.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/main.c 2010-05-28 21:27:15.011149672 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/main.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/main.c 2010-07-09 14:50:35.000000000 -0400 @@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); u64 size_or_mask, size_and_mask; 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/ { if (ops->vendor && ops->vendor < X86_VENDOR_NUM) mtrr_ops[ops->vendor] = ops; -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 ---- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-05-28 21:27:15.011149672 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-07-09 14:50:35.000000000 -0400 @@ -12,19 +12,19 @@ extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; @@ -10122,9 +10281,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.15/arch/ #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd) #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1) -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 ---- linux-2.6.32.15/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-05-28 21:27:15.011149672 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-07-09 14:50:35.000000000 -0400 @@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk { /* 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 static struct wd_ops intel_arch_wd_ops __read_mostly = { .reserve = single_msr_reserve, .unreserve = single_msr_unreserve, -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 ---- linux-2.6.32.15/arch/x86/kernel/cpu/perf_event.c 2010-04-29 17:49:37.537108997 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/cpu/perf_event.c 2010-05-28 21:27:15.015028232 -0400 -@@ -2354,7 +2354,7 @@ perf_callchain_user(struct pt_regs *regs +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 +--- linux-2.6.32.16/arch/x86/kernel/cpu/perf_event.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/cpu/perf_event.c 2010-07-09 14:50:35.000000000 -0400 +@@ -2357,7 +2357,7 @@ perf_callchain_user(struct pt_regs *regs break; 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 } } -diff -urNp linux-2.6.32.15/arch/x86/kernel/crash.c linux-2.6.32.15/arch/x86/kernel/crash.c ---- linux-2.6.32.15/arch/x86/kernel/crash.c 2010-04-29 17:49:37.537108997 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/crash.c 2010-05-28 21:27:15.015028232 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/crash.c linux-2.6.32.16/arch/x86/kernel/crash.c +--- linux-2.6.32.16/arch/x86/kernel/crash.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/crash.c 2010-07-09 14:50:35.000000000 -0400 @@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu, regs = args->regs; @@ -10182,9 +10341,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/crash.c linux-2.6.32.15/arch/x86/kern crash_fixup_ss_esp(&fixed_regs, regs); regs = &fixed_regs; } -diff -urNp linux-2.6.32.15/arch/x86/kernel/doublefault_32.c linux-2.6.32.15/arch/x86/kernel/doublefault_32.c ---- linux-2.6.32.15/arch/x86/kernel/doublefault_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/doublefault_32.c 2010-05-28 21:27:15.015028232 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/doublefault_32.c linux-2.6.32.16/arch/x86/kernel/doublefault_32.c +--- linux-2.6.32.16/arch/x86/kernel/doublefault_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/doublefault_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -11,7 +11,7 @@ #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 .fs = __KERNEL_PERCPU, .__cr3 = __pa_nodebug(swapper_pg_dir), -diff -urNp linux-2.6.32.15/arch/x86/kernel/dumpstack_32.c linux-2.6.32.15/arch/x86/kernel/dumpstack_32.c ---- linux-2.6.32.15/arch/x86/kernel/dumpstack_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/dumpstack_32.c 2010-05-28 21:27:15.015028232 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/dumpstack_32.c linux-2.6.32.16/arch/x86/kernel/dumpstack_32.c +--- linux-2.6.32.16/arch/x86/kernel/dumpstack_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/dumpstack_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs * When in-kernel, we also print out the stack and code at the * 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 if (ip < PAGE_OFFSET) return 0; if (probe_kernel_address((unsigned short *)ip, ud2)) -diff -urNp linux-2.6.32.15/arch/x86/kernel/dumpstack.c linux-2.6.32.15/arch/x86/kernel/dumpstack.c ---- linux-2.6.32.15/arch/x86/kernel/dumpstack.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/dumpstack.c 2010-05-28 21:27:15.023156603 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/dumpstack.c linux-2.6.32.16/arch/x86/kernel/dumpstack.c +--- linux-2.6.32.16/arch/x86/kernel/dumpstack.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/dumpstack.c 2010-07-09 14:50:35.000000000 -0400 @@ -180,7 +180,7 @@ void dump_stack(void) #endif @@ -10293,9 +10452,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/dumpstack.c linux-2.6.32.15/arch/x86/ report_bug(regs->ip, regs); if (__die(str, regs, err)) -diff -urNp linux-2.6.32.15/arch/x86/kernel/e820.c linux-2.6.32.15/arch/x86/kernel/e820.c ---- linux-2.6.32.15/arch/x86/kernel/e820.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/e820.c 2010-05-28 21:27:15.023156603 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/e820.c linux-2.6.32.16/arch/x86/kernel/e820.c +--- linux-2.6.32.16/arch/x86/kernel/e820.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/e820.c 2010-07-09 14:50:35.000000000 -0400 @@ -733,7 +733,7 @@ struct early_res { }; 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 }; static int __init find_overlapped_early(u64 start, u64 end) -diff -urNp linux-2.6.32.15/arch/x86/kernel/efi_32.c linux-2.6.32.15/arch/x86/kernel/efi_32.c ---- linux-2.6.32.15/arch/x86/kernel/efi_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/efi_32.c 2010-05-28 21:27:15.023156603 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/efi_32.c linux-2.6.32.16/arch/x86/kernel/efi_32.c +--- linux-2.6.32.16/arch/x86/kernel/efi_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/efi_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -38,70 +38,38 @@ */ @@ -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 /* * After the lock is released, the original page table is restored. -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 ---- linux-2.6.32.15/arch/x86/kernel/efi_stub_32.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/efi_stub_32.S 2010-05-28 21:27:15.031137412 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/efi_stub_32.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/efi_stub_32.S 2010-07-09 14:50:35.000000000 -0400 @@ -6,6 +6,7 @@ */ @@ -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 saved_return_addr: .long 0 efi_rt_function_ptr: -diff -urNp linux-2.6.32.15/arch/x86/kernel/entry_32.S linux-2.6.32.15/arch/x86/kernel/entry_32.S ---- linux-2.6.32.15/arch/x86/kernel/entry_32.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/entry_32.S 2010-06-19 10:03:50.008525890 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/entry_32.S linux-2.6.32.16/arch/x86/kernel/entry_32.S +--- linux-2.6.32.16/arch/x86/kernel/entry_32.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/entry_32.S 2010-07-09 14:50:35.000000000 -0400 @@ -191,7 +191,67 @@ #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 RESTORE_REGS lss 12+4(%esp), %esp # back to espfix stack CFI_ADJUST_CFA_OFFSET -24 -diff -urNp linux-2.6.32.15/arch/x86/kernel/entry_64.S linux-2.6.32.15/arch/x86/kernel/entry_64.S ---- linux-2.6.32.15/arch/x86/kernel/entry_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/entry_64.S 2010-05-28 21:27:15.031137412 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/entry_64.S linux-2.6.32.16/arch/x86/kernel/entry_64.S +--- linux-2.6.32.16/arch/x86/kernel/entry_64.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/entry_64.S 2010-07-09 14:50:35.000000000 -0400 @@ -53,6 +53,7 @@ #include <asm/paravirt.h> #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 RESTORE_ALL 8 jmp irq_return nmi_userspace: -diff -urNp linux-2.6.32.15/arch/x86/kernel/ftrace.c linux-2.6.32.15/arch/x86/kernel/ftrace.c ---- linux-2.6.32.15/arch/x86/kernel/ftrace.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/ftrace.c 2010-05-28 21:27:15.031137412 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/ftrace.c linux-2.6.32.16/arch/x86/kernel/ftrace.c +--- linux-2.6.32.16/arch/x86/kernel/ftrace.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/ftrace.c 2010-07-09 14:50:35.000000000 -0400 @@ -149,7 +149,9 @@ void ftrace_nmi_enter(void) { 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 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) return -EFAULT; -diff -urNp linux-2.6.32.15/arch/x86/kernel/head32.c linux-2.6.32.15/arch/x86/kernel/head32.c ---- linux-2.6.32.15/arch/x86/kernel/head32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/head32.c 2010-05-28 21:27:15.031137412 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/head32.c linux-2.6.32.16/arch/x86/kernel/head32.c +--- linux-2.6.32.16/arch/x86/kernel/head32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/head32.c 2010-07-09 14:50:35.000000000 -0400 @@ -16,6 +16,7 @@ #include <asm/apic.h> #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 #ifdef CONFIG_BLK_DEV_INITRD /* Reserve INITRD */ -diff -urNp linux-2.6.32.15/arch/x86/kernel/head_32.S linux-2.6.32.15/arch/x86/kernel/head_32.S ---- linux-2.6.32.15/arch/x86/kernel/head_32.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/head_32.S 2010-06-19 10:03:50.008525890 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/head_32.S linux-2.6.32.16/arch/x86/kernel/head_32.S +--- linux-2.6.32.16/arch/x86/kernel/head_32.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/head_32.S 2010-07-09 14:50:35.000000000 -0400 @@ -19,10 +19,17 @@ #include <asm/setup.h> #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 + /* Be sure this is zeroed to avoid false validations in Xen */ + .fill PAGE_SIZE_asm - GDT_SIZE,1,0 + .endr -diff -urNp linux-2.6.32.15/arch/x86/kernel/head_64.S linux-2.6.32.15/arch/x86/kernel/head_64.S ---- linux-2.6.32.15/arch/x86/kernel/head_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/head_64.S 2010-05-28 21:27:15.039159907 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/head_64.S linux-2.6.32.16/arch/x86/kernel/head_64.S +--- linux-2.6.32.16/arch/x86/kernel/head_64.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/head_64.S 2010-07-09 14:50:35.000000000 -0400 @@ -19,6 +19,7 @@ #include <asm/cache.h> #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 __PAGE_ALIGNED_BSS .align PAGE_SIZE -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 ---- linux-2.6.32.15/arch/x86/kernel/i386_ksyms_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/i386_ksyms_32.c 2010-05-28 21:27:15.039159907 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/i386_ksyms_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/i386_ksyms_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); EXPORT_SYMBOL(cmpxchg8b_emu); #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/ +#ifdef CONFIG_PAX_KERNEXEC +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); +#endif -diff -urNp linux-2.6.32.15/arch/x86/kernel/init_task.c linux-2.6.32.15/arch/x86/kernel/init_task.c ---- linux-2.6.32.15/arch/x86/kernel/init_task.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/init_task.c 2010-05-28 21:27:15.039159907 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/init_task.c linux-2.6.32.16/arch/x86/kernel/init_task.c +--- linux-2.6.32.16/arch/x86/kernel/init_task.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/init_task.c 2010-07-09 14:50:35.000000000 -0400 @@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task); * section. Since TSS's are completely CPU-local, we want them * 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/ - +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; +EXPORT_SYMBOL(init_tss); -diff -urNp linux-2.6.32.15/arch/x86/kernel/ioport.c linux-2.6.32.15/arch/x86/kernel/ioport.c ---- linux-2.6.32.15/arch/x86/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/ioport.c 2010-06-19 21:48:03.327550760 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/ioport.c linux-2.6.32.16/arch/x86/kernel/ioport.c +--- linux-2.6.32.16/arch/x86/kernel/ioport.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/ioport.c 2010-07-09 14:50:35.000000000 -0400 @@ -6,6 +6,7 @@ #include <linux/sched.h> #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 if (!capable(CAP_SYS_RAWIO)) return -EPERM; } -diff -urNp linux-2.6.32.15/arch/x86/kernel/irq_32.c linux-2.6.32.15/arch/x86/kernel/irq_32.c ---- linux-2.6.32.15/arch/x86/kernel/irq_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/irq_32.c 2010-05-28 21:27:15.039159907 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/irq_32.c linux-2.6.32.16/arch/x86/kernel/irq_32.c +--- linux-2.6.32.16/arch/x86/kernel/irq_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/irq_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc return 0; @@ -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 call_on_stack(__do_softirq, isp); /* -diff -urNp linux-2.6.32.15/arch/x86/kernel/kgdb.c linux-2.6.32.15/arch/x86/kernel/kgdb.c ---- linux-2.6.32.15/arch/x86/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/kgdb.c 2010-05-28 21:27:15.039159907 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/kgdb.c linux-2.6.32.16/arch/x86/kernel/kgdb.c +--- linux-2.6.32.16/arch/x86/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/kgdb.c 2010-07-09 14:50:35.000000000 -0400 @@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception return instruction_pointer(regs); } @@ -12186,9 +12345,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/kgdb.c linux-2.6.32.15/arch/x86/kerne /* Breakpoint instruction: */ .gdb_bpt_instr = { 0xcc }, .flags = KGDB_HW_BREAKPOINT, -diff -urNp linux-2.6.32.15/arch/x86/kernel/kprobes.c linux-2.6.32.15/arch/x86/kernel/kprobes.c ---- linux-2.6.32.15/arch/x86/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/kprobes.c 2010-05-28 21:27:15.039159907 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/kprobes.c linux-2.6.32.16/arch/x86/kernel/kprobes.c +--- linux-2.6.32.16/arch/x86/kernel/kprobes.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/kprobes.c 2010-07-09 14:50:35.000000000 -0400 @@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f char op; 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 return ret; switch (val) { -diff -urNp linux-2.6.32.15/arch/x86/kernel/ldt.c linux-2.6.32.15/arch/x86/kernel/ldt.c ---- linux-2.6.32.15/arch/x86/kernel/ldt.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/ldt.c 2010-05-28 21:27:15.039159907 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/ldt.c linux-2.6.32.16/arch/x86/kernel/ldt.c +--- linux-2.6.32.16/arch/x86/kernel/ldt.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/ldt.c 2010-07-09 14:50:35.000000000 -0400 @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i if (reload) { #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 fill_ldt(&ldt, &ldt_info); if (oldmode) ldt.avl = 0; -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 ---- linux-2.6.32.15/arch/x86/kernel/machine_kexec_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/machine_kexec_32.c 2010-05-28 21:27:15.043064911 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/machine_kexec_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/machine_kexec_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -26,7 +26,7 @@ #include <asm/system.h> #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 relocate_kernel_ptr = control_page; page_list[PA_CONTROL_PAGE] = __pa(control_page); -diff -urNp linux-2.6.32.15/arch/x86/kernel/microcode_amd.c linux-2.6.32.15/arch/x86/kernel/microcode_amd.c ---- linux-2.6.32.15/arch/x86/kernel/microcode_amd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/microcode_amd.c 2010-05-28 21:27:15.043064911 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/microcode_amd.c linux-2.6.32.16/arch/x86/kernel/microcode_amd.c +--- linux-2.6.32.16/arch/x86/kernel/microcode_amd.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/microcode_amd.c 2010-07-09 14:50:35.000000000 -0400 @@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c uci->mc = NULL; } @@ -12399,9 +12558,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/microcode_amd.c linux-2.6.32.15/arch/ { return µcode_amd_ops; } -diff -urNp linux-2.6.32.15/arch/x86/kernel/microcode_core.c linux-2.6.32.15/arch/x86/kernel/microcode_core.c ---- linux-2.6.32.15/arch/x86/kernel/microcode_core.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/microcode_core.c 2010-05-28 21:27:15.043064911 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/microcode_core.c linux-2.6.32.16/arch/x86/kernel/microcode_core.c +--- linux-2.6.32.16/arch/x86/kernel/microcode_core.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/microcode_core.c 2010-07-09 14:50:35.000000000 -0400 @@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); #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 /* * Synchronization. -diff -urNp linux-2.6.32.15/arch/x86/kernel/microcode_intel.c linux-2.6.32.15/arch/x86/kernel/microcode_intel.c ---- linux-2.6.32.15/arch/x86/kernel/microcode_intel.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/microcode_intel.c 2010-05-28 21:27:15.043064911 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/microcode_intel.c linux-2.6.32.16/arch/x86/kernel/microcode_intel.c +--- linux-2.6.32.16/arch/x86/kernel/microcode_intel.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/microcode_intel.c 2010-07-09 14:50:35.000000000 -0400 @@ -443,13 +443,13 @@ static enum ucode_state request_microcod 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 { return µcode_intel_ops; } -diff -urNp linux-2.6.32.15/arch/x86/kernel/module.c linux-2.6.32.15/arch/x86/kernel/module.c ---- linux-2.6.32.15/arch/x86/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/module.c 2010-05-28 21:27:15.043064911 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/module.c linux-2.6.32.16/arch/x86/kernel/module.c +--- linux-2.6.32.16/arch/x86/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/module.c 2010-07-09 14:50:35.000000000 -0400 @@ -34,7 +34,7 @@ #define DEBUGP(fmt...) #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 #if 0 if ((s64)val != *(s32 *)loc) goto overflow; -diff -urNp linux-2.6.32.15/arch/x86/kernel/paravirt.c linux-2.6.32.15/arch/x86/kernel/paravirt.c ---- linux-2.6.32.15/arch/x86/kernel/paravirt.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/paravirt.c 2010-05-28 21:27:15.043064911 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/paravirt.c linux-2.6.32.16/arch/x86/kernel/paravirt.c +--- linux-2.6.32.16/arch/x86/kernel/paravirt.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/paravirt.c 2010-07-09 14:50:35.000000000 -0400 @@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu * corresponding structure. */ 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 }; EXPORT_SYMBOL_GPL(pv_time_ops); -diff -urNp linux-2.6.32.15/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.15/arch/x86/kernel/paravirt-spinlocks.c ---- linux-2.6.32.15/arch/x86/kernel/paravirt-spinlocks.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/paravirt-spinlocks.c 2010-05-28 21:27:15.043064911 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.16/arch/x86/kernel/paravirt-spinlocks.c +--- linux-2.6.32.16/arch/x86/kernel/paravirt-spinlocks.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/paravirt-spinlocks.c 2010-07-09 14:50:35.000000000 -0400 @@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * __raw_spin_lock(lock); } @@ -12709,9 +12868,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.15/ #ifdef CONFIG_SMP .spin_is_locked = __ticket_spin_is_locked, .spin_is_contended = __ticket_spin_is_contended, -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 ---- linux-2.6.32.15/arch/x86/kernel/pci-calgary_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/pci-calgary_64.c 2010-05-28 21:27:15.043064911 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/pci-calgary_64.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/pci-calgary_64.c 2010-07-09 14:50:35.000000000 -0400 @@ -472,7 +472,7 @@ static void calgary_free_coherent(struct free_pages((unsigned long)vaddr, get_order(size)); } @@ -12721,9 +12880,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.15/arch .alloc_coherent = calgary_alloc_coherent, .free_coherent = calgary_free_coherent, .map_sg = calgary_map_sg, -diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-dma.c linux-2.6.32.15/arch/x86/kernel/pci-dma.c ---- linux-2.6.32.15/arch/x86/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/pci-dma.c 2010-05-28 21:27:15.043064911 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-dma.c linux-2.6.32.16/arch/x86/kernel/pci-dma.c +--- linux-2.6.32.16/arch/x86/kernel/pci-dma.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/pci-dma.c 2010-07-09 14:50:35.000000000 -0400 @@ -14,7 +14,7 @@ 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 #ifdef CONFIG_PCI if (mask > 0xffffffff && forbid_dac > 0) { -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 ---- linux-2.6.32.15/arch/x86/kernel/pci-gart_64.c 2010-05-15 13:20:18.438563899 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/pci-gart_64.c 2010-05-28 21:27:15.047155410 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/pci-gart_64.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/pci-gart_64.c 2010-07-09 14:50:35.000000000 -0400 @@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag return -1; } @@ -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 .map_sg = gart_map_sg, .unmap_sg = gart_unmap_sg, .map_page = gart_map_page, -diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-nommu.c linux-2.6.32.15/arch/x86/kernel/pci-nommu.c ---- linux-2.6.32.15/arch/x86/kernel/pci-nommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/pci-nommu.c 2010-05-28 21:27:15.047155410 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-nommu.c linux-2.6.32.16/arch/x86/kernel/pci-nommu.c +--- linux-2.6.32.16/arch/x86/kernel/pci-nommu.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/pci-nommu.c 2010-07-09 14:50:35.000000000 -0400 @@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str flush_write_buffers(); } @@ -12766,9 +12925,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-nommu.c linux-2.6.32.15/arch/x86/ .alloc_coherent = dma_generic_alloc_coherent, .free_coherent = nommu_free_coherent, .map_sg = nommu_map_sg, -diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.15/arch/x86/kernel/pci-swiotlb.c ---- linux-2.6.32.15/arch/x86/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/pci-swiotlb.c 2010-05-28 21:27:15.047155410 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.16/arch/x86/kernel/pci-swiotlb.c +--- linux-2.6.32.16/arch/x86/kernel/pci-swiotlb.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/pci-swiotlb.c 2010-07-09 14:50:35.000000000 -0400 @@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent( return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); } @@ -12778,9 +12937,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.15/arch/x8 .mapping_error = swiotlb_dma_mapping_error, .alloc_coherent = x86_swiotlb_alloc_coherent, .free_coherent = swiotlb_free_coherent, -diff -urNp linux-2.6.32.15/arch/x86/kernel/process_32.c linux-2.6.32.15/arch/x86/kernel/process_32.c ---- linux-2.6.32.15/arch/x86/kernel/process_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/process_32.c 2010-05-28 21:27:15.047155410 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/process_32.c linux-2.6.32.16/arch/x86/kernel/process_32.c +--- linux-2.6.32.16/arch/x86/kernel/process_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/process_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as unsigned long thread_saved_pc(struct task_struct *tsk) { @@ -12875,9 +13034,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/process_32.c linux-2.6.32.15/arch/x86 + load_sp0(init_tss + smp_processor_id(), thread); +} +#endif -diff -urNp linux-2.6.32.15/arch/x86/kernel/process_64.c linux-2.6.32.15/arch/x86/kernel/process_64.c ---- linux-2.6.32.15/arch/x86/kernel/process_64.c 2010-05-15 13:20:18.438563899 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/process_64.c 2010-05-28 21:27:15.047155410 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/process_64.c linux-2.6.32.16/arch/x86/kernel/process_64.c +--- linux-2.6.32.16/arch/x86/kernel/process_64.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/process_64.c 2010-07-09 14:50:35.000000000 -0400 @@ -91,7 +91,7 @@ static void __exit_idle(void) void exit_idle(void) { @@ -12920,9 +13079,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/process_64.c linux-2.6.32.15/arch/x86 return 0; ip = *(u64 *)(fp+8); if (!in_sched_functions(ip)) -diff -urNp linux-2.6.32.15/arch/x86/kernel/process.c linux-2.6.32.15/arch/x86/kernel/process.c ---- linux-2.6.32.15/arch/x86/kernel/process.c 2010-05-28 20:16:44.430924650 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/process.c 2010-05-28 21:27:15.047155410 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/process.c linux-2.6.32.16/arch/x86/kernel/process.c +--- linux-2.6.32.16/arch/x86/kernel/process.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/process.c 2010-07-09 14:50:35.000000000 -0400 @@ -73,7 +73,7 @@ void exit_thread(void) unsigned long *bp = t->io_bitmap_ptr; @@ -12960,9 +13119,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/process.c linux-2.6.32.15/arch/x86/ke - return randomize_range(mm->brk, range_end, 0) ? : mm->brk; -} - -diff -urNp linux-2.6.32.15/arch/x86/kernel/ptrace.c linux-2.6.32.15/arch/x86/kernel/ptrace.c ---- linux-2.6.32.15/arch/x86/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/ptrace.c 2010-05-28 21:27:15.047155410 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/ptrace.c linux-2.6.32.16/arch/x86/kernel/ptrace.c +--- linux-2.6.32.16/arch/x86/kernel/ptrace.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/ptrace.c 2010-07-09 14:50:35.000000000 -0400 @@ -925,7 +925,7 @@ static const struct user_regset_view use long arch_ptrace(struct task_struct *child, long request, long addr, long data) { @@ -13031,9 +13190,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/ptrace.c linux-2.6.32.15/arch/x86/ker /* Send us the fake SIGTRAP */ force_sig_info(SIGTRAP, &info, tsk); -diff -urNp linux-2.6.32.15/arch/x86/kernel/reboot.c linux-2.6.32.15/arch/x86/kernel/reboot.c ---- linux-2.6.32.15/arch/x86/kernel/reboot.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/reboot.c 2010-05-28 21:27:15.050883545 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/reboot.c linux-2.6.32.16/arch/x86/kernel/reboot.c +--- linux-2.6.32.16/arch/x86/kernel/reboot.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/reboot.c 2010-07-09 14:50:35.000000000 -0400 @@ -33,7 +33,7 @@ void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); @@ -13110,10 +13269,10 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/reboot.c linux-2.6.32.15/arch/x86/ker /* Set up the IDT for real mode. */ load_idt(&real_mode_idt); -diff -urNp linux-2.6.32.15/arch/x86/kernel/setup.c linux-2.6.32.15/arch/x86/kernel/setup.c ---- linux-2.6.32.15/arch/x86/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/setup.c 2010-05-28 21:27:15.062911922 -0400 -@@ -771,14 +771,14 @@ void __init setup_arch(char **cmdline_p) +diff -urNp linux-2.6.32.16/arch/x86/kernel/setup.c linux-2.6.32.16/arch/x86/kernel/setup.c +--- linux-2.6.32.16/arch/x86/kernel/setup.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/setup.c 2010-07-09 14:50:35.000000000 -0400 +@@ -782,14 +782,14 @@ void __init setup_arch(char **cmdline_p) if (!boot_params.hdr.root_flags) 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 data_resource.end = virt_to_phys(_edata)-1; bss_resource.start = virt_to_phys(&__bss_start); bss_resource.end = virt_to_phys(&__bss_stop)-1; -diff -urNp linux-2.6.32.15/arch/x86/kernel/setup_percpu.c linux-2.6.32.15/arch/x86/kernel/setup_percpu.c ---- linux-2.6.32.15/arch/x86/kernel/setup_percpu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/setup_percpu.c 2010-05-28 21:27:15.062911922 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/setup_percpu.c linux-2.6.32.16/arch/x86/kernel/setup_percpu.c +--- linux-2.6.32.16/arch/x86/kernel/setup_percpu.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/setup_percpu.c 2010-07-09 14:50:35.000000000 -0400 @@ -25,19 +25,17 @@ # define DBG(x...) #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 /* * Up to this point, the boot CPU has been using .data.init * area. Reload any changed state for the boot CPU. -diff -urNp linux-2.6.32.15/arch/x86/kernel/signal.c linux-2.6.32.15/arch/x86/kernel/signal.c ---- linux-2.6.32.15/arch/x86/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/signal.c 2010-05-28 21:27:15.062911922 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/signal.c linux-2.6.32.16/arch/x86/kernel/signal.c +--- linux-2.6.32.16/arch/x86/kernel/signal.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/signal.c 2010-07-09 14:50:35.000000000 -0400 @@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi * Align the stack pointer according to the i386 ABI, * 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 return; if (current_thread_info()->status & TS_RESTORE_SIGMASK) -diff -urNp linux-2.6.32.15/arch/x86/kernel/smpboot.c linux-2.6.32.15/arch/x86/kernel/smpboot.c ---- linux-2.6.32.15/arch/x86/kernel/smpboot.c 2010-04-04 20:41:49.920655481 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/smpboot.c 2010-05-28 21:27:15.062911922 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/smpboot.c linux-2.6.32.16/arch/x86/kernel/smpboot.c +--- linux-2.6.32.16/arch/x86/kernel/smpboot.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/smpboot.c 2010-07-09 14:50:35.000000000 -0400 @@ -729,7 +729,11 @@ do_rest: (unsigned long)task_stack_page(c_idle.idle) - 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 #ifdef CONFIG_X86_32 /* init low mem mapping */ clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY, -diff -urNp linux-2.6.32.15/arch/x86/kernel/step.c linux-2.6.32.15/arch/x86/kernel/step.c ---- linux-2.6.32.15/arch/x86/kernel/step.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/step.c 2010-05-28 21:27:15.062911922 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/step.c linux-2.6.32.16/arch/x86/kernel/step.c +--- linux-2.6.32.16/arch/x86/kernel/step.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/step.c 2010-07-09 14:50:35.000000000 -0400 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc struct desc_struct *desc; 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 /* 32-bit mode: register increment */ return 0; /* 64-bit mode: REX prefix */ -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 ---- linux-2.6.32.15/arch/x86/kernel/syscall_table_32.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/syscall_table_32.S 2010-05-28 21:27:15.062911922 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/syscall_table_32.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/syscall_table_32.S 2010-07-09 14:50:35.000000000 -0400 @@ -1,3 +1,4 @@ +.section .rodata,"a",@progbits ENTRY(sys_call_table) .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ .long sys_exit -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 ---- linux-2.6.32.15/arch/x86/kernel/sys_i386_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/sys_i386_32.c 2010-05-28 21:27:15.062911922 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/sys_i386_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/sys_i386_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -24,6 +24,21 @@ #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 } case 1: /* iBCS2 emulator entry point */ if (!segment_eq(get_fs(), get_ds())) -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 ---- linux-2.6.32.15/arch/x86/kernel/sys_x86_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/sys_x86_64.c 2010-05-28 21:27:15.062911922 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/sys_x86_64.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/sys_x86_64.c 2010-07-09 14:50:35.000000000 -0400 @@ -32,8 +32,8 @@ out: return error; } @@ -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 mm->cached_hole_size = ~0UL; return addr; -diff -urNp linux-2.6.32.15/arch/x86/kernel/time.c linux-2.6.32.15/arch/x86/kernel/time.c ---- linux-2.6.32.15/arch/x86/kernel/time.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/time.c 2010-05-28 21:27:15.062911922 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/time.c linux-2.6.32.16/arch/x86/kernel/time.c +--- linux-2.6.32.16/arch/x86/kernel/time.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/time.c 2010-07-09 14:50:35.000000000 -0400 @@ -26,17 +26,13 @@ int timer_ack; #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 } return pc; } -diff -urNp linux-2.6.32.15/arch/x86/kernel/tls.c linux-2.6.32.15/arch/x86/kernel/tls.c ---- linux-2.6.32.15/arch/x86/kernel/tls.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/tls.c 2010-05-28 21:27:15.062911922 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/tls.c linux-2.6.32.16/arch/x86/kernel/tls.c +--- linux-2.6.32.16/arch/x86/kernel/tls.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/tls.c 2010-07-09 14:50:35.000000000 -0400 @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) 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 set_tls_desc(p, idx, &info, 1); return 0; -diff -urNp linux-2.6.32.15/arch/x86/kernel/trampoline_32.S linux-2.6.32.15/arch/x86/kernel/trampoline_32.S ---- linux-2.6.32.15/arch/x86/kernel/trampoline_32.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/trampoline_32.S 2010-05-28 21:27:15.062911922 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/trampoline_32.S linux-2.6.32.16/arch/x86/kernel/trampoline_32.S +--- linux-2.6.32.16/arch/x86/kernel/trampoline_32.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/trampoline_32.S 2010-07-09 14:50:35.000000000 -0400 @@ -32,6 +32,12 @@ #include <asm/segment.h> #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/ # These need to be in the same 64K segment as the above; # hence we don't use the boot_gdt_descr defined in head.S -diff -urNp linux-2.6.32.15/arch/x86/kernel/traps.c linux-2.6.32.15/arch/x86/kernel/traps.c ---- linux-2.6.32.15/arch/x86/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/traps.c 2010-05-28 21:27:15.067055592 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/traps.c linux-2.6.32.16/arch/x86/kernel/traps.c +--- linux-2.6.32.16/arch/x86/kernel/traps.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/traps.c 2010-07-09 14:50:35.000000000 -0400 @@ -69,12 +69,6 @@ asmlinkage int system_call(void); /* 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 handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code); return; } -diff -urNp linux-2.6.32.15/arch/x86/kernel/tsc.c linux-2.6.32.15/arch/x86/kernel/tsc.c ---- linux-2.6.32.15/arch/x86/kernel/tsc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/tsc.c 2010-05-28 21:27:15.067055592 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/tsc.c linux-2.6.32.16/arch/x86/kernel/tsc.c +--- linux-2.6.32.16/arch/x86/kernel/tsc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/tsc.c 2010-07-09 14:50:35.000000000 -0400 @@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), }, @@ -13921,9 +14080,9 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/tsc.c linux-2.6.32.15/arch/x86/kernel }; static void __init check_system_tsc_reliable(void) -diff -urNp linux-2.6.32.15/arch/x86/kernel/vm86_32.c linux-2.6.32.15/arch/x86/kernel/vm86_32.c ---- linux-2.6.32.15/arch/x86/kernel/vm86_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/vm86_32.c 2010-05-28 21:27:15.067055592 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/vm86_32.c linux-2.6.32.16/arch/x86/kernel/vm86_32.c +--- linux-2.6.32.16/arch/x86/kernel/vm86_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/vm86_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -41,6 +41,7 @@ #include <linux/ptrace.h> #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 if (get_user(segoffs, intr_ptr)) goto cannot_handle; if ((segoffs >> 16) == BIOSSEG) -diff -urNp linux-2.6.32.15/arch/x86/kernel/vmi_32.c linux-2.6.32.15/arch/x86/kernel/vmi_32.c ---- linux-2.6.32.15/arch/x86/kernel/vmi_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/vmi_32.c 2010-05-28 21:27:15.067055592 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/vmi_32.c linux-2.6.32.16/arch/x86/kernel/vmi_32.c +--- linux-2.6.32.16/arch/x86/kernel/vmi_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/vmi_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); @@ -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 return; local_irq_save(flags); -diff -urNp linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S ---- linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S 2010-05-28 21:27:15.067055592 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.16/arch/x86/kernel/vmlinux.lds.S +--- linux-2.6.32.16/arch/x86/kernel/vmlinux.lds.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/vmlinux.lds.S 2010-07-10 08:19:32.000000000 -0400 @@ -26,6 +26,22 @@ #include <asm/page_types.h> #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 PHDRS { text PT_LOAD FLAGS(5); /* R_E */ - data PT_LOAD FLAGS(7); /* RWE */ ++#ifdef CONFIG_X86_32 ++ module PT_LOAD FLAGS(5); /* R_E */ ++#endif +#ifdef CONFIG_XEN + rodata PT_LOAD FLAGS(5); /* R_E */ +#else + rodata PT_LOAD FLAGS(4); /* R__ */ +#endif -+#ifdef CONFIG_X86_32 -+ module PT_LOAD FLAGS(5); /* R_E */ -+#endif + data PT_LOAD FLAGS(6); /* RW_ */ #ifdef CONFIG_X86_64 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 HEAD_TEXT #ifdef CONFIG_X86_32 . = ALIGN(PAGE_SIZE); -@@ -82,28 +113,64 @@ SECTIONS +@@ -82,28 +113,69 @@ SECTIONS IRQENTRY_TEXT *(.fixup) *(.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 - NOTES :text :note + . += __KERNEL_TEXT_OFFSET; -+ -+ . = ALIGN(PAGE_SIZE); -+ NOTES :rodata :note - EXCEPTION_TABLE(16) :text = 0x9090 -+ EXCEPTION_TABLE(16) :rodata - - RO_DATA(PAGE_SIZE) - +#ifdef CONFIG_X86_32 + . = ALIGN(PAGE_SIZE); -+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) { -+ *(.idt) -+ . = ALIGN(PAGE_SIZE); -+ *(.empty_zero_page) -+ *(.swapper_pg_pmd) -+ *(.swapper_pg_dir) -+ } -+ -+ . = ALIGN(PAGE_SIZE); + .vmi.rom : AT(ADDR(.vmi.rom) - LOAD_OFFSET) { + *(.vmi.rom) + } :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 + MODULES_EXEC_VADDR = .; + BYTE(0) + . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024); -+ . = ALIGN(PMD_SIZE); ++ . = ALIGN(HPAGE_SIZE); + MODULES_EXEC_END = . - 1; +#endif + + } :module +#endif + - /* Data */ - .data : AT(ADDR(.data) - LOAD_OFFSET) { ++ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) { + /* End of text section */ + _etext = . - __KERNEL_TEXT_OFFSET; ++ } ++ ++#ifdef CONFIG_X86_32 ++ . = ALIGN(PAGE_SIZE); ++ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) { ++ *(.idt) ++ . = ALIGN(PAGE_SIZE); ++ *(.empty_zero_page) ++ *(.swapper_pg_pmd) ++ *(.swapper_pg_dir) ++ } :rodata ++#endif ++ ++ . = ALIGN(PAGE_SIZE); ++ NOTES :rodata :note ++ ++ EXCEPTION_TABLE(16) :rodata + + RO_DATA(PAGE_SIZE) + + /* Data */ + .data : AT(ADDR(.data) - LOAD_OFFSET) { + +#ifdef CONFIG_PAX_KERNEXEC -+ . = ALIGN(PMD_SIZE); ++ . = ALIGN(HPAGE_SIZE); +#else + . = ALIGN(PAGE_SIZE); +#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 PAGE_ALIGNED_DATA(PAGE_SIZE) -@@ -166,12 +233,6 @@ SECTIONS +@@ -166,12 +238,6 @@ SECTIONS } vgetcpu_mode = VVIRT(.vgetcpu_mode); @@ -14327,7 +14491,7 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.15/arch/x8 .vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) { *(.vsyscall_3) } -@@ -187,12 +248,19 @@ SECTIONS +@@ -187,12 +253,19 @@ SECTIONS #endif /* CONFIG_X86_64 */ /* 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 + BYTE(0) + +#ifdef CONFIG_PAX_KERNEXEC -+ . = ALIGN(PMD_SIZE); ++ . = ALIGN(HPAGE_SIZE); +#else + . = ALIGN(PAGE_SIZE); +#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 /* * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the * output PHDR, so the next output section - .init.text - should -@@ -201,12 +269,27 @@ SECTIONS +@@ -201,12 +274,27 @@ SECTIONS PERCPU_VADDR(0, :percpu) #endif @@ -14371,7 +14535,7 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.15/arch/x8 + * .exit.text is discard at runtime, not link time, to deal with + * references from .altinstructions and .eh_frame + */ -+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) { ++ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) { + EXIT_TEXT + . = ALIGN(16); + } :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 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) { __x86_cpu_dev_start = .; -@@ -232,19 +315,11 @@ SECTIONS +@@ -232,19 +320,11 @@ SECTIONS *(.altinstr_replacement) } @@ -14404,7 +14568,7 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.15/arch/x8 PERCPU(PAGE_SIZE) #endif -@@ -267,12 +342,6 @@ SECTIONS +@@ -267,12 +347,6 @@ SECTIONS . = ALIGN(PAGE_SIZE); } @@ -14417,15 +14581,15 @@ diff -urNp linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.15/arch/x8 /* BSS */ . = ALIGN(PAGE_SIZE); .bss : AT(ADDR(.bss) - LOAD_OFFSET) { -@@ -288,6 +357,7 @@ SECTIONS +@@ -288,6 +362,7 @@ SECTIONS __brk_base = .; . += 64 * 1024; /* 64k alignment slop space */ *(.brk_reservation) /* areas brk users have reserved */ -+ . = ALIGN(PMD_SIZE); ++ . = ALIGN(HPAGE_SIZE); __brk_limit = .; } -@@ -316,13 +386,12 @@ SECTIONS +@@ -316,13 +391,12 @@ SECTIONS * for the boot processor. */ #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 "kernel image bigger than KERNEL_IMAGE_SIZE"); #ifdef CONFIG_SMP -diff -urNp linux-2.6.32.15/arch/x86/kernel/vsyscall_64.c linux-2.6.32.15/arch/x86/kernel/vsyscall_64.c ---- linux-2.6.32.15/arch/x86/kernel/vsyscall_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/vsyscall_64.c 2010-05-28 21:27:15.067055592 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/vsyscall_64.c linux-2.6.32.16/arch/x86/kernel/vsyscall_64.c +--- linux-2.6.32.16/arch/x86/kernel/vsyscall_64.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/vsyscall_64.c 2010-07-09 14:50:35.000000000 -0400 @@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa 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 }; #endif -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 ---- linux-2.6.32.15/arch/x86/kernel/x8664_ksyms_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/x8664_ksyms_64.c 2010-05-28 21:27:15.067055592 -0400 +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 +--- linux-2.6.32.16/arch/x86/kernel/x8664_ksyms_64.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/x8664_ksyms_64.c 2010-07-09 14:50:35.000000000 -0400 @@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); 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 EXPORT_SYMBOL(__copy_from_user_inatomic); EXPORT_SYMBOL(copy_page); -diff -urNp linux-2.6.32.15/arch/x86/kernel/xsave.c linux-2.6.32.15/arch/x86/kernel/xsave.c ---- linux-2.6.32.15/arch/x86/kernel/xsave.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kernel/xsave.c 2010-05-28 21:27:15.067055592 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kernel/xsave.c linux-2.6.32.16/arch/x86/kernel/xsave.c +--- linux-2.6.32.16/arch/x86/kernel/xsave.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kernel/xsave.c 2010-07-09 14:50:35.000000000 -0400 @@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_ fx_sw_user->xstate_size > fx_sw_user->extended_size) 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 buf); if (unlikely(err)) { /* -diff -urNp linux-2.6.32.15/arch/x86/kvm/emulate.c linux-2.6.32.15/arch/x86/kvm/emulate.c ---- linux-2.6.32.15/arch/x86/kvm/emulate.c 2010-04-29 17:49:37.541027029 -0400 -+++ linux-2.6.32.15/arch/x86/kvm/emulate.c 2010-05-28 21:27:15.086896808 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kvm/emulate.c linux-2.6.32.16/arch/x86/kvm/emulate.c +--- linux-2.6.32.16/arch/x86/kvm/emulate.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kvm/emulate.c 2010-07-09 14:50:35.000000000 -0400 @@ -81,8 +81,8 @@ #define Src2CL (1<<29) #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 switch ((_dst).bytes) { \ case 1: \ ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ -diff -urNp linux-2.6.32.15/arch/x86/kvm/lapic.c linux-2.6.32.15/arch/x86/kvm/lapic.c ---- linux-2.6.32.15/arch/x86/kvm/lapic.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/kvm/lapic.c 2010-05-28 21:27:15.086896808 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kvm/lapic.c linux-2.6.32.16/arch/x86/kvm/lapic.c +--- linux-2.6.32.16/arch/x86/kvm/lapic.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kvm/lapic.c 2010-07-09 14:50:35.000000000 -0400 @@ -52,7 +52,7 @@ #define APIC_BUS_CYCLE_NS 1 @@ -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 #define APIC_LVT_NUM 6 /* 14 is the version for Xeon and Pentium 8.4.8*/ -diff -urNp linux-2.6.32.15/arch/x86/kvm/svm.c linux-2.6.32.15/arch/x86/kvm/svm.c ---- linux-2.6.32.15/arch/x86/kvm/svm.c 2010-04-29 17:49:37.601044544 -0400 -+++ linux-2.6.32.15/arch/x86/kvm/svm.c 2010-05-28 21:27:15.086896808 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kvm/svm.c linux-2.6.32.16/arch/x86/kvm/svm.c +--- linux-2.6.32.16/arch/x86/kvm/svm.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kvm/svm.c 2010-07-09 14:50:35.000000000 -0400 @@ -2395,9 +2395,12 @@ static int handle_exit(struct kvm_run *k static void reload_tss(struct kvm_vcpu *vcpu) { @@ -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 .cpu_has_kvm_support = has_svm, .disabled_by_bios = is_disabled, .hardware_setup = svm_hardware_setup, -diff -urNp linux-2.6.32.15/arch/x86/kvm/vmx.c linux-2.6.32.15/arch/x86/kvm/vmx.c ---- linux-2.6.32.15/arch/x86/kvm/vmx.c 2010-04-29 17:49:37.601044544 -0400 -+++ linux-2.6.32.15/arch/x86/kvm/vmx.c 2010-05-28 21:27:15.091170095 -0400 -@@ -568,7 +568,11 @@ static void reload_tss(void) +diff -urNp linux-2.6.32.16/arch/x86/kvm/vmx.c linux-2.6.32.16/arch/x86/kvm/vmx.c +--- linux-2.6.32.16/arch/x86/kvm/vmx.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kvm/vmx.c 2010-07-09 14:50:35.000000000 -0400 +@@ -569,7 +569,11 @@ static void reload_tss(void) kvm_get_gdt(&gdt); 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 load_TR_desc(); } -@@ -1395,8 +1399,11 @@ static __init int hardware_setup(void) +@@ -1405,8 +1409,11 @@ static __init int hardware_setup(void) if (!cpu_has_vmx_flexpriority()) flexpriority_enabled = 0; @@ -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 if (enable_ept && !cpu_has_vmx_ept_2m_page()) kvm_disable_largepages(); -@@ -2347,7 +2354,7 @@ static int vmx_vcpu_setup(struct vcpu_vm +@@ -2357,7 +2364,7 @@ static int vmx_vcpu_setup(struct vcpu_vm vmcs_writel(HOST_IDTR_BASE, dt.base); /* 22.2.4 */ 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 vmcs_write32(VM_EXIT_MSR_STORE_COUNT, 0); vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, 0); vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, 0); -@@ -3703,6 +3710,12 @@ static void vmx_vcpu_run(struct kvm_vcpu +@@ -3713,6 +3720,12 @@ static void vmx_vcpu_run(struct kvm_vcpu "jmp .Lkvm_vmx_return \n\t" ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t" ".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 /* Save guest registers, load host registers, keep flags */ "xchg %0, (%%"R"sp) \n\t" "mov %%"R"ax, %c[rax](%0) \n\t" -@@ -3749,8 +3762,13 @@ static void vmx_vcpu_run(struct kvm_vcpu +@@ -3759,8 +3772,13 @@ static void vmx_vcpu_run(struct kvm_vcpu [r15]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_R15])), #endif [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 #ifdef CONFIG_X86_64 , "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15" #endif -@@ -3767,7 +3785,7 @@ static void vmx_vcpu_run(struct kvm_vcpu +@@ -3777,7 +3795,7 @@ static void vmx_vcpu_run(struct kvm_vcpu if (vmx->rmode.irq.pending) fixup_rmode_irq(vmx); @@ -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 vmx->launched = 1; vmx_complete_interrupts(vmx); -@@ -3942,7 +3960,7 @@ static bool vmx_gb_page_enable(void) +@@ -3952,7 +3970,7 @@ static bool vmx_gb_page_enable(void) return false; } @@ -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 .cpu_has_kvm_support = cpu_has_kvm_support, .disabled_by_bios = vmx_disabled_by_bios, .hardware_setup = hardware_setup, -diff -urNp linux-2.6.32.15/arch/x86/kvm/x86.c linux-2.6.32.15/arch/x86/kvm/x86.c ---- linux-2.6.32.15/arch/x86/kvm/x86.c 2010-05-15 13:20:18.454567530 -0400 -+++ linux-2.6.32.15/arch/x86/kvm/x86.c 2010-05-28 21:27:15.095006556 -0400 +diff -urNp linux-2.6.32.16/arch/x86/kvm/x86.c linux-2.6.32.16/arch/x86/kvm/x86.c +--- linux-2.6.32.16/arch/x86/kvm/x86.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/kvm/x86.c 2010-07-09 14:50:35.000000000 -0400 @@ -81,45 +81,45 @@ static void update_cr8_intercept(struct static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, 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 { NULL } }; -@@ -1635,7 +1635,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru +@@ -1638,7 +1638,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, struct kvm_interrupt *irq) { @@ -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 return -EINVAL; if (irqchip_in_kernel(vcpu->kvm)) return -ENXIO; -@@ -3205,10 +3205,10 @@ static struct notifier_block kvmclock_cp +@@ -3212,10 +3212,10 @@ static struct notifier_block kvmclock_cp .notifier_call = kvmclock_cpufreq_notifier }; @@ -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 if (kvm_x86_ops) { printk(KERN_ERR "kvm: already loaded the other module\n"); -diff -urNp linux-2.6.32.15/arch/x86/lib/checksum_32.S linux-2.6.32.15/arch/x86/lib/checksum_32.S ---- linux-2.6.32.15/arch/x86/lib/checksum_32.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/lib/checksum_32.S 2010-05-28 21:27:15.095006556 -0400 +diff -urNp linux-2.6.32.16/arch/x86/lib/checksum_32.S linux-2.6.32.16/arch/x86/lib/checksum_32.S +--- linux-2.6.32.16/arch/x86/lib/checksum_32.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/lib/checksum_32.S 2010-07-09 14:50:35.000000000 -0400 @@ -28,7 +28,8 @@ #include <linux/linkage.h> #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 #undef ROUND #undef ROUND1 -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 ---- linux-2.6.32.15/arch/x86/lib/clear_page_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/lib/clear_page_64.S 2010-05-28 21:27:15.095006556 -0400 +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 +--- linux-2.6.32.16/arch/x86/lib/clear_page_64.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/lib/clear_page_64.S 2010-07-09 14:50:35.000000000 -0400 @@ -43,7 +43,7 @@ ENDPROC(clear_page) #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 1: .byte 0xeb /* jmp <disp8> */ .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 2: -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 ---- linux-2.6.32.15/arch/x86/lib/copy_page_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/lib/copy_page_64.S 2010-05-28 21:27:15.095006556 -0400 +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 +--- linux-2.6.32.16/arch/x86/lib/copy_page_64.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/lib/copy_page_64.S 2010-07-09 14:50:35.000000000 -0400 @@ -104,7 +104,7 @@ ENDPROC(copy_page) #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/ 1: .byte 0xeb /* jmp <disp8> */ .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 2: -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 ---- linux-2.6.32.15/arch/x86/lib/copy_user_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/lib/copy_user_64.S 2010-05-28 21:27:15.095006556 -0400 +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 +--- linux-2.6.32.16/arch/x86/lib/copy_user_64.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/lib/copy_user_64.S 2010-07-09 14:50:35.000000000 -0400 @@ -15,13 +15,14 @@ #include <asm/asm-offsets.h> #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/ movl %edx,%ecx xorl %eax,%eax rep -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 ---- linux-2.6.32.15/arch/x86/lib/copy_user_nocache_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/lib/copy_user_nocache_64.S 2010-05-28 21:27:15.095006556 -0400 +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 +--- linux-2.6.32.16/arch/x86/lib/copy_user_nocache_64.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/lib/copy_user_nocache_64.S 2010-07-09 14:50:35.000000000 -0400 @@ -14,6 +14,7 @@ #include <asm/current.h> #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 cmpl $8,%edx jb 20f /* less then 8 bytes, go to byte copy loop */ ALIGN_DESTINATION -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 ---- linux-2.6.32.15/arch/x86/lib/csum-wrappers_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/lib/csum-wrappers_64.c 2010-05-28 21:27:15.095006556 -0400 +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 +--- linux-2.6.32.16/arch/x86/lib/csum-wrappers_64.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/lib/csum-wrappers_64.c 2010-07-09 14:50:35.000000000 -0400 @@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _ len -= 2; } @@ -15180,9 +15344,9 @@ diff -urNp linux-2.6.32.15/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.15/arch/ return csum_partial_copy_generic(src, (void __force *)dst, len, isum, NULL, errp); } -diff -urNp linux-2.6.32.15/arch/x86/lib/getuser.S linux-2.6.32.15/arch/x86/lib/getuser.S ---- linux-2.6.32.15/arch/x86/lib/getuser.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/lib/getuser.S 2010-05-28 21:27:15.095006556 -0400 +diff -urNp linux-2.6.32.16/arch/x86/lib/getuser.S linux-2.6.32.16/arch/x86/lib/getuser.S +--- linux-2.6.32.16/arch/x86/lib/getuser.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/lib/getuser.S 2010-07-09 14:50:35.000000000 -0400 @@ -33,14 +33,38 @@ #include <asm/asm-offsets.h> #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 xor %edx,%edx mov $(-EFAULT),%_ASM_AX ret -diff -urNp linux-2.6.32.15/arch/x86/lib/memcpy_64.S linux-2.6.32.15/arch/x86/lib/memcpy_64.S ---- linux-2.6.32.15/arch/x86/lib/memcpy_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/lib/memcpy_64.S 2010-05-28 21:27:15.095006556 -0400 +diff -urNp linux-2.6.32.16/arch/x86/lib/memcpy_64.S linux-2.6.32.16/arch/x86/lib/memcpy_64.S +--- linux-2.6.32.16/arch/x86/lib/memcpy_64.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/lib/memcpy_64.S 2010-07-09 14:50:35.000000000 -0400 @@ -128,7 +128,7 @@ ENDPROC(__memcpy) * It is also a lot simpler. Use this when possible: */ @@ -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 1: .byte 0xeb /* jmp <disp8> */ .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.15/arch/x86/lib/memset_64.S linux-2.6.32.15/arch/x86/lib/memset_64.S ---- linux-2.6.32.15/arch/x86/lib/memset_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/lib/memset_64.S 2010-05-28 21:27:15.095006556 -0400 +diff -urNp linux-2.6.32.16/arch/x86/lib/memset_64.S linux-2.6.32.16/arch/x86/lib/memset_64.S +--- linux-2.6.32.16/arch/x86/lib/memset_64.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/lib/memset_64.S 2010-07-09 14:50:35.000000000 -0400 @@ -118,7 +118,7 @@ ENDPROC(__memset) #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 1: .byte 0xeb /* jmp <disp8> */ .byte (memset_c - memset) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.15/arch/x86/lib/mmx_32.c linux-2.6.32.15/arch/x86/lib/mmx_32.c ---- linux-2.6.32.15/arch/x86/lib/mmx_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/lib/mmx_32.c 2010-05-28 21:27:15.095006556 -0400 +diff -urNp linux-2.6.32.16/arch/x86/lib/mmx_32.c linux-2.6.32.16/arch/x86/lib/mmx_32.c +--- linux-2.6.32.16/arch/x86/lib/mmx_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/lib/mmx_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * { 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 from += 64; to += 64; -diff -urNp linux-2.6.32.15/arch/x86/lib/putuser.S linux-2.6.32.15/arch/x86/lib/putuser.S ---- linux-2.6.32.15/arch/x86/lib/putuser.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/lib/putuser.S 2010-05-28 21:27:15.095006556 -0400 +diff -urNp linux-2.6.32.16/arch/x86/lib/putuser.S linux-2.6.32.16/arch/x86/lib/putuser.S +--- linux-2.6.32.16/arch/x86/lib/putuser.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/lib/putuser.S 2010-07-11 20:00:44.000000000 -0400 @@ -15,7 +15,8 @@ #include <asm/thread_info.h> #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 movl $-EFAULT,%eax EXIT END(bad_put_user) -diff -urNp linux-2.6.32.15/arch/x86/lib/usercopy_32.c linux-2.6.32.15/arch/x86/lib/usercopy_32.c ---- linux-2.6.32.15/arch/x86/lib/usercopy_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/lib/usercopy_32.c 2010-05-28 21:27:15.107152206 -0400 +diff -urNp linux-2.6.32.16/arch/x86/lib/usercopy_32.c linux-2.6.32.16/arch/x86/lib/usercopy_32.c +--- linux-2.6.32.16/arch/x86/lib/usercopy_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/lib/usercopy_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned * Copy a null terminated string from userspace. */ @@ -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 +#endif + +EXPORT_SYMBOL(set_fs); -diff -urNp linux-2.6.32.15/arch/x86/lib/usercopy_64.c linux-2.6.32.15/arch/x86/lib/usercopy_64.c ---- linux-2.6.32.15/arch/x86/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/lib/usercopy_64.c 2010-05-28 21:27:15.107152206 -0400 +diff -urNp linux-2.6.32.16/arch/x86/lib/usercopy_64.c linux-2.6.32.16/arch/x86/lib/usercopy_64.c +--- linux-2.6.32.16/arch/x86/lib/usercopy_64.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/lib/usercopy_64.c 2010-07-09 14:50:35.000000000 -0400 @@ -42,6 +42,8 @@ long __strncpy_from_user(char *dst, const char __user *src, long count) { @@ -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 } EXPORT_SYMBOL(copy_in_user); -diff -urNp linux-2.6.32.15/arch/x86/Makefile linux-2.6.32.15/arch/x86/Makefile ---- linux-2.6.32.15/arch/x86/Makefile 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/Makefile 2010-05-28 21:27:15.107152206 -0400 +diff -urNp linux-2.6.32.16/arch/x86/Makefile linux-2.6.32.16/arch/x86/Makefile +--- linux-2.6.32.16/arch/x86/Makefile 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/Makefile 2010-07-09 14:50:35.000000000 -0400 @@ -189,3 +189,12 @@ define archhelp echo ' FDARGS="..." arguments for the booted kernel' 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 + +archprepare: + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) -diff -urNp linux-2.6.32.15/arch/x86/mm/extable.c linux-2.6.32.15/arch/x86/mm/extable.c ---- linux-2.6.32.15/arch/x86/mm/extable.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/mm/extable.c 2010-05-28 21:27:15.107152206 -0400 +diff -urNp linux-2.6.32.16/arch/x86/mm/extable.c linux-2.6.32.16/arch/x86/mm/extable.c +--- linux-2.6.32.16/arch/x86/mm/extable.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/mm/extable.c 2010-07-09 14:50:35.000000000 -0400 @@ -1,14 +1,71 @@ #include <linux/module.h> #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 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; extern u32 pnp_bios_is_utter_crap; pnp_bios_is_utter_crap = 1; -diff -urNp linux-2.6.32.15/arch/x86/mm/fault.c linux-2.6.32.15/arch/x86/mm/fault.c ---- linux-2.6.32.15/arch/x86/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/mm/fault.c 2010-06-19 10:03:50.012498759 -0400 +diff -urNp linux-2.6.32.16/arch/x86/mm/fault.c linux-2.6.32.16/arch/x86/mm/fault.c +--- linux-2.6.32.16/arch/x86/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/mm/fault.c 2010-07-09 14:50:35.000000000 -0400 @@ -11,10 +11,19 @@ #include <linux/kprobes.h> /* __kprobes, ... */ #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 + + return ret ? -EFAULT : 0; +} -diff -urNp linux-2.6.32.15/arch/x86/mm/gup.c linux-2.6.32.15/arch/x86/mm/gup.c ---- linux-2.6.32.15/arch/x86/mm/gup.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/mm/gup.c 2010-05-28 21:27:15.107152206 -0400 +diff -urNp linux-2.6.32.16/arch/x86/mm/gup.c linux-2.6.32.16/arch/x86/mm/gup.c +--- linux-2.6.32.16/arch/x86/mm/gup.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/mm/gup.c 2010-07-09 14:50:35.000000000 -0400 @@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long addr = start; 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 (void __user *)start, len))) return 0; -diff -urNp linux-2.6.32.15/arch/x86/mm/highmem_32.c linux-2.6.32.15/arch/x86/mm/highmem_32.c ---- linux-2.6.32.15/arch/x86/mm/highmem_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/mm/highmem_32.c 2010-05-28 21:27:15.107152206 -0400 +diff -urNp linux-2.6.32.16/arch/x86/mm/highmem_32.c linux-2.6.32.16/arch/x86/mm/highmem_32.c +--- linux-2.6.32.16/arch/x86/mm/highmem_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/mm/highmem_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page idx = type + KM_TYPE_NR*smp_processor_id(); 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/ return (void *)vaddr; } -diff -urNp linux-2.6.32.15/arch/x86/mm/hugetlbpage.c linux-2.6.32.15/arch/x86/mm/hugetlbpage.c ---- linux-2.6.32.15/arch/x86/mm/hugetlbpage.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/mm/hugetlbpage.c 2010-05-28 21:27:15.107152206 -0400 +diff -urNp linux-2.6.32.16/arch/x86/mm/hugetlbpage.c linux-2.6.32.16/arch/x86/mm/hugetlbpage.c +--- linux-2.6.32.16/arch/x86/mm/hugetlbpage.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/mm/hugetlbpage.c 2010-07-09 14:50:35.000000000 -0400 @@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe struct hstate *h = hstate_file(file); 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 (!vma || addr + len <= vma->vm_start)) return addr; } -diff -urNp linux-2.6.32.15/arch/x86/mm/init_32.c linux-2.6.32.15/arch/x86/mm/init_32.c ---- linux-2.6.32.15/arch/x86/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/mm/init_32.c 2010-05-28 21:27:15.114903294 -0400 +diff -urNp linux-2.6.32.16/arch/x86/mm/init_32.c linux-2.6.32.16/arch/x86/mm/init_32.c +--- linux-2.6.32.16/arch/x86/mm/init_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/mm/init_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) } @@ -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 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); printk(KERN_INFO "Write protecting the kernel text: %luk\n", size >> 10); -diff -urNp linux-2.6.32.15/arch/x86/mm/init_64.c linux-2.6.32.15/arch/x86/mm/init_64.c ---- linux-2.6.32.15/arch/x86/mm/init_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/mm/init_64.c 2010-05-28 21:27:15.114903294 -0400 +diff -urNp linux-2.6.32.16/arch/x86/mm/init_64.c linux-2.6.32.16/arch/x86/mm/init_64.c +--- linux-2.6.32.16/arch/x86/mm/init_64.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/mm/init_64.c 2010-07-09 14:50:35.000000000 -0400 @@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, pmd = fill_pmd(pud, vaddr); 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 return "[vdso]"; if (vma == &gate_vma) return "[vsyscall]"; -diff -urNp linux-2.6.32.15/arch/x86/mm/init.c linux-2.6.32.15/arch/x86/mm/init.c ---- linux-2.6.32.15/arch/x86/mm/init.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/mm/init.c 2010-06-19 10:03:50.012498759 -0400 +diff -urNp linux-2.6.32.16/arch/x86/mm/init.c linux-2.6.32.16/arch/x86/mm/init.c +--- linux-2.6.32.16/arch/x86/mm/init.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/mm/init.c 2010-07-09 14:50:35.000000000 -0400 @@ -69,11 +69,7 @@ static void __init find_early_table_spac * cause a hotspot and fill up ZONE_DMA. The page tables * 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 return 1; if (iomem_is_exclusive(pagenr << PAGE_SHIFT)) return 0; -@@ -379,6 +381,89 @@ void free_init_pages(char *what, unsigne +@@ -379,6 +381,88 @@ void free_init_pages(char *what, unsigne void free_initmem(void) { + +#ifdef CONFIG_PAX_KERNEXEC -+ pgd_t *pgd; -+ pud_t *pud; -+ pmd_t *pmd; -+ +#ifdef CONFIG_X86_32 + /* PaX: limit KERNEL_CS to actual size */ + 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 +#endif + +#else ++ pgd_t *pgd; ++ pud_t *pud; ++ pmd_t *pmd; + unsigned long addr, end; + + /* 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 free_init_pages("unused kernel memory", (unsigned long)(&__init_begin), (unsigned long)(&__init_end)); -diff -urNp linux-2.6.32.15/arch/x86/mm/iomap_32.c linux-2.6.32.15/arch/x86/mm/iomap_32.c ---- linux-2.6.32.15/arch/x86/mm/iomap_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/mm/iomap_32.c 2010-05-28 21:27:15.114903294 -0400 +diff -urNp linux-2.6.32.16/arch/x86/mm/iomap_32.c linux-2.6.32.16/arch/x86/mm/iomap_32.c +--- linux-2.6.32.16/arch/x86/mm/iomap_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/mm/iomap_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long debug_kmap_atomic(type); 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 arch_flush_lazy_mmu_mode(); return (void *)vaddr; -diff -urNp linux-2.6.32.15/arch/x86/mm/ioremap.c linux-2.6.32.15/arch/x86/mm/ioremap.c ---- linux-2.6.32.15/arch/x86/mm/ioremap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/mm/ioremap.c 2010-05-28 21:27:15.114903294 -0400 +diff -urNp linux-2.6.32.16/arch/x86/mm/ioremap.c linux-2.6.32.16/arch/x86/mm/ioremap.c +--- linux-2.6.32.16/arch/x86/mm/ioremap.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/mm/ioremap.c 2010-07-09 14:50:35.000000000 -0400 @@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr) * Second special case: Some BIOSen report the PC BIOS * 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 /* * The boot-ioremap range spans multiple pmds, for which -diff -urNp linux-2.6.32.15/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.15/arch/x86/mm/kmemcheck/kmemcheck.c ---- linux-2.6.32.15/arch/x86/mm/kmemcheck/kmemcheck.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/mm/kmemcheck/kmemcheck.c 2010-05-28 21:27:15.114903294 -0400 +diff -urNp linux-2.6.32.16/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.16/arch/x86/mm/kmemcheck/kmemcheck.c +--- linux-2.6.32.16/arch/x86/mm/kmemcheck/kmemcheck.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/mm/kmemcheck/kmemcheck.c 2010-07-09 14:50:35.000000000 -0400 @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg * memory (e.g. tracked pages)? For now, we need this to avoid * 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 return false; pte = kmemcheck_pte_lookup(address); -diff -urNp linux-2.6.32.15/arch/x86/mm/mmap.c linux-2.6.32.15/arch/x86/mm/mmap.c ---- linux-2.6.32.15/arch/x86/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/mm/mmap.c 2010-05-28 21:27:15.114903294 -0400 +diff -urNp linux-2.6.32.16/arch/x86/mm/mmap.c linux-2.6.32.16/arch/x86/mm/mmap.c +--- linux-2.6.32.16/arch/x86/mm/mmap.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/mm/mmap.c 2010-07-09 14:50:35.000000000 -0400 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size * Leave an at least ~128 MB hole with possible stack randomization. */ @@ -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 mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.32.15/arch/x86/mm/numa_32.c linux-2.6.32.15/arch/x86/mm/numa_32.c ---- linux-2.6.32.15/arch/x86/mm/numa_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/mm/numa_32.c 2010-05-28 21:27:15.118897735 -0400 +diff -urNp linux-2.6.32.16/arch/x86/mm/numa_32.c linux-2.6.32.16/arch/x86/mm/numa_32.c +--- linux-2.6.32.16/arch/x86/mm/numa_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/mm/numa_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int } #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 extern unsigned long highend_pfn, highstart_pfn; #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) -diff -urNp linux-2.6.32.15/arch/x86/mm/pageattr.c linux-2.6.32.15/arch/x86/mm/pageattr.c ---- linux-2.6.32.15/arch/x86/mm/pageattr.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/mm/pageattr.c 2010-06-19 10:03:50.012498759 -0400 +diff -urNp linux-2.6.32.16/arch/x86/mm/pageattr.c linux-2.6.32.16/arch/x86/mm/pageattr.c +--- linux-2.6.32.16/arch/x86/mm/pageattr.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/mm/pageattr.c 2010-07-09 14:50:35.000000000 -0400 @@ -261,16 +261,17 @@ static inline pgprot_t static_protection * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support. */ @@ -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 +#else list_for_each_entry(page, &pgd_list, lru) { - pgd_t *pgd; -+ pgd_t *pgd = (pgd_t *)page_address(page);; ++ pgd_t *pgd = (pgd_t *)page_address(page); +#endif + 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 } static int -diff -urNp linux-2.6.32.15/arch/x86/mm/pageattr-test.c linux-2.6.32.15/arch/x86/mm/pageattr-test.c ---- linux-2.6.32.15/arch/x86/mm/pageattr-test.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/mm/pageattr-test.c 2010-05-28 21:27:15.118897735 -0400 +diff -urNp linux-2.6.32.16/arch/x86/mm/pageattr-test.c linux-2.6.32.16/arch/x86/mm/pageattr-test.c +--- linux-2.6.32.16/arch/x86/mm/pageattr-test.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/mm/pageattr-test.c 2010-07-09 14:50:35.000000000 -0400 @@ -36,7 +36,7 @@ enum { 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/ } struct split_state { -diff -urNp linux-2.6.32.15/arch/x86/mm/pat.c linux-2.6.32.15/arch/x86/mm/pat.c ---- linux-2.6.32.15/arch/x86/mm/pat.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/mm/pat.c 2010-05-28 21:27:15.118897735 -0400 +diff -urNp linux-2.6.32.16/arch/x86/mm/pat.c linux-2.6.32.16/arch/x86/mm/pat.c +--- linux-2.6.32.16/arch/x86/mm/pat.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/mm/pat.c 2010-07-09 14:50:35.000000000 -0400 @@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct 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 cattr_name(want_flags), (unsigned long long)paddr, (unsigned long long)(paddr + size), -diff -urNp linux-2.6.32.15/arch/x86/mm/pgtable_32.c linux-2.6.32.15/arch/x86/mm/pgtable_32.c ---- linux-2.6.32.15/arch/x86/mm/pgtable_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/mm/pgtable_32.c 2010-05-28 21:27:15.118897735 -0400 +diff -urNp linux-2.6.32.16/arch/x86/mm/pgtable_32.c linux-2.6.32.16/arch/x86/mm/pgtable_32.c +--- linux-2.6.32.16/arch/x86/mm/pgtable_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/mm/pgtable_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, return; } @@ -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/ /* * It's enough to flush this one mapping. -diff -urNp linux-2.6.32.15/arch/x86/mm/pgtable.c linux-2.6.32.15/arch/x86/mm/pgtable.c ---- linux-2.6.32.15/arch/x86/mm/pgtable.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/mm/pgtable.c 2010-06-19 10:03:50.012498759 -0400 +diff -urNp linux-2.6.32.16/arch/x86/mm/pgtable.c linux-2.6.32.16/arch/x86/mm/pgtable.c +--- linux-2.6.32.16/arch/x86/mm/pgtable.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/mm/pgtable.c 2010-07-09 14:50:35.000000000 -0400 @@ -83,8 +83,59 @@ static inline void pgd_list_del(pgd_t *p list_del(&page->lru); } @@ -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 pgd_dtor(pgd); paravirt_pgd_free(mm, pgd); free_page((unsigned long)pgd); -diff -urNp linux-2.6.32.15/arch/x86/mm/setup_nx.c linux-2.6.32.15/arch/x86/mm/setup_nx.c ---- linux-2.6.32.15/arch/x86/mm/setup_nx.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/mm/setup_nx.c 2010-05-28 21:27:15.118897735 -0400 +diff -urNp linux-2.6.32.16/arch/x86/mm/setup_nx.c linux-2.6.32.16/arch/x86/mm/setup_nx.c +--- linux-2.6.32.16/arch/x86/mm/setup_nx.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/mm/setup_nx.c 2010-07-09 14:50:35.000000000 -0400 @@ -4,11 +4,10 @@ #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 __supported_pte_mask &= ~_PAGE_NX; } #endif -diff -urNp linux-2.6.32.15/arch/x86/mm/tlb.c linux-2.6.32.15/arch/x86/mm/tlb.c ---- linux-2.6.32.15/arch/x86/mm/tlb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/mm/tlb.c 2010-05-28 21:27:15.118897735 -0400 +diff -urNp linux-2.6.32.16/arch/x86/mm/tlb.c linux-2.6.32.16/arch/x86/mm/tlb.c +--- linux-2.6.32.16/arch/x86/mm/tlb.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/mm/tlb.c 2010-07-09 14:50:35.000000000 -0400 @@ -12,7 +12,7 @@ #include <asm/uv/uv.h> @@ -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 } EXPORT_SYMBOL_GPL(leave_mm); -diff -urNp linux-2.6.32.15/arch/x86/oprofile/backtrace.c linux-2.6.32.15/arch/x86/oprofile/backtrace.c ---- linux-2.6.32.15/arch/x86/oprofile/backtrace.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/oprofile/backtrace.c 2010-05-28 21:27:15.118897735 -0400 +diff -urNp linux-2.6.32.16/arch/x86/oprofile/backtrace.c linux-2.6.32.16/arch/x86/oprofile/backtrace.c +--- linux-2.6.32.16/arch/x86/oprofile/backtrace.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/oprofile/backtrace.c 2010-07-09 14:50:35.000000000 -0400 @@ -57,7 +57,7 @@ static struct frame_head *dump_user_back struct frame_head bufhead[2]; @@ -18948,9 +19111,9 @@ diff -urNp linux-2.6.32.15/arch/x86/oprofile/backtrace.c linux-2.6.32.15/arch/x8 unsigned long stack = kernel_stack_pointer(regs); if (depth) dump_trace(NULL, regs, (unsigned long *)stack, 0, -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 ---- linux-2.6.32.15/arch/x86/oprofile/op_model_p4.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/oprofile/op_model_p4.c 2010-05-28 21:27:15.118897735 -0400 +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 +--- linux-2.6.32.16/arch/x86/oprofile/op_model_p4.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/oprofile/op_model_p4.c 2010-07-09 14:50:35.000000000 -0400 @@ -50,7 +50,7 @@ static inline void setup_num_counters(vo #endif } @@ -18960,9 +19123,9 @@ diff -urNp linux-2.6.32.15/arch/x86/oprofile/op_model_p4.c linux-2.6.32.15/arch/ { #ifdef CONFIG_SMP return smp_num_siblings == 2 ? 2 : 1; -diff -urNp linux-2.6.32.15/arch/x86/pci/common.c linux-2.6.32.15/arch/x86/pci/common.c ---- linux-2.6.32.15/arch/x86/pci/common.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/pci/common.c 2010-05-28 21:27:15.118897735 -0400 +diff -urNp linux-2.6.32.16/arch/x86/pci/common.c linux-2.6.32.16/arch/x86/pci/common.c +--- linux-2.6.32.16/arch/x86/pci/common.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/pci/common.c 2010-07-09 14:50:35.000000000 -0400 @@ -31,8 +31,8 @@ int noioapicreroute = 1; int pcibios_last_bus = -1; 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 }; void __init dmi_check_pciprobe(void) -diff -urNp linux-2.6.32.15/arch/x86/pci/direct.c linux-2.6.32.15/arch/x86/pci/direct.c ---- linux-2.6.32.15/arch/x86/pci/direct.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/pci/direct.c 2010-05-28 21:27:15.118897735 -0400 +diff -urNp linux-2.6.32.16/arch/x86/pci/direct.c linux-2.6.32.16/arch/x86/pci/direct.c +--- linux-2.6.32.16/arch/x86/pci/direct.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/pci/direct.c 2010-07-09 14:50:35.000000000 -0400 @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int #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 { u32 x = 0; int year, devfn; -diff -urNp linux-2.6.32.15/arch/x86/pci/fixup.c linux-2.6.32.15/arch/x86/pci/fixup.c ---- linux-2.6.32.15/arch/x86/pci/fixup.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/pci/fixup.c 2010-05-28 21:27:15.118897735 -0400 +diff -urNp linux-2.6.32.16/arch/x86/pci/fixup.c linux-2.6.32.16/arch/x86/pci/fixup.c +--- linux-2.6.32.16/arch/x86/pci/fixup.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/pci/fixup.c 2010-07-09 14:50:35.000000000 -0400 @@ -364,7 +364,7 @@ static const struct dmi_system_id __devi DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), }, @@ -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 }; static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) -diff -urNp linux-2.6.32.15/arch/x86/pci/irq.c linux-2.6.32.15/arch/x86/pci/irq.c ---- linux-2.6.32.15/arch/x86/pci/irq.c 2010-04-29 17:49:37.625451376 -0400 -+++ linux-2.6.32.15/arch/x86/pci/irq.c 2010-05-28 21:27:15.118897735 -0400 +diff -urNp linux-2.6.32.16/arch/x86/pci/irq.c linux-2.6.32.16/arch/x86/pci/irq.c +--- linux-2.6.32.16/arch/x86/pci/irq.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/pci/irq.c 2010-07-09 14:50:35.000000000 -0400 @@ -543,7 +543,7 @@ static __init int intel_router_probe(str static struct pci_device_id __initdata pirq_440gx[] = { { 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 }; int __init pcibios_irq_init(void) -diff -urNp linux-2.6.32.15/arch/x86/pci/mmconfig_32.c linux-2.6.32.15/arch/x86/pci/mmconfig_32.c ---- linux-2.6.32.15/arch/x86/pci/mmconfig_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/pci/mmconfig_32.c 2010-05-28 21:27:15.118897735 -0400 +diff -urNp linux-2.6.32.16/arch/x86/pci/mmconfig_32.c linux-2.6.32.16/arch/x86/pci/mmconfig_32.c +--- linux-2.6.32.16/arch/x86/pci/mmconfig_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/pci/mmconfig_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int return 0; } @@ -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 .read = pci_mmcfg_read, .write = pci_mmcfg_write, }; -diff -urNp linux-2.6.32.15/arch/x86/pci/mmconfig_64.c linux-2.6.32.15/arch/x86/pci/mmconfig_64.c ---- linux-2.6.32.15/arch/x86/pci/mmconfig_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/pci/mmconfig_64.c 2010-05-28 21:27:15.118897735 -0400 +diff -urNp linux-2.6.32.16/arch/x86/pci/mmconfig_64.c linux-2.6.32.16/arch/x86/pci/mmconfig_64.c +--- linux-2.6.32.16/arch/x86/pci/mmconfig_64.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/pci/mmconfig_64.c 2010-07-09 14:50:35.000000000 -0400 @@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int return 0; } @@ -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 .read = pci_mmcfg_read, .write = pci_mmcfg_write, }; -diff -urNp linux-2.6.32.15/arch/x86/pci/numaq_32.c linux-2.6.32.15/arch/x86/pci/numaq_32.c ---- linux-2.6.32.15/arch/x86/pci/numaq_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/pci/numaq_32.c 2010-05-28 21:27:15.118897735 -0400 +diff -urNp linux-2.6.32.16/arch/x86/pci/numaq_32.c linux-2.6.32.16/arch/x86/pci/numaq_32.c +--- linux-2.6.32.16/arch/x86/pci/numaq_32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/pci/numaq_32.c 2010-07-09 14:50:35.000000000 -0400 @@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i #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/ .read = pci_conf1_mq_read, .write = pci_conf1_mq_write }; -diff -urNp linux-2.6.32.15/arch/x86/pci/olpc.c linux-2.6.32.15/arch/x86/pci/olpc.c ---- linux-2.6.32.15/arch/x86/pci/olpc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/pci/olpc.c 2010-05-28 21:27:15.118897735 -0400 +diff -urNp linux-2.6.32.16/arch/x86/pci/olpc.c linux-2.6.32.16/arch/x86/pci/olpc.c +--- linux-2.6.32.16/arch/x86/pci/olpc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/pci/olpc.c 2010-07-09 14:50:35.000000000 -0400 @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s return 0; } @@ -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 .read = pci_olpc_read, .write = pci_olpc_write, }; -diff -urNp linux-2.6.32.15/arch/x86/pci/pcbios.c linux-2.6.32.15/arch/x86/pci/pcbios.c ---- linux-2.6.32.15/arch/x86/pci/pcbios.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/pci/pcbios.c 2010-05-28 21:27:15.135148926 -0400 +diff -urNp linux-2.6.32.16/arch/x86/pci/pcbios.c linux-2.6.32.16/arch/x86/pci/pcbios.c +--- linux-2.6.32.16/arch/x86/pci/pcbios.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/pci/pcbios.c 2010-07-09 14:50:35.000000000 -0400 @@ -56,50 +56,93 @@ union bios32 { static struct { 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 return !(ret & 0xff00); } EXPORT_SYMBOL(pcibios_set_irq_routing); -diff -urNp linux-2.6.32.15/arch/x86/power/cpu.c linux-2.6.32.15/arch/x86/power/cpu.c ---- linux-2.6.32.15/arch/x86/power/cpu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/power/cpu.c 2010-05-28 21:27:15.135148926 -0400 +diff -urNp linux-2.6.32.16/arch/x86/power/cpu.c linux-2.6.32.16/arch/x86/power/cpu.c +--- linux-2.6.32.16/arch/x86/power/cpu.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/power/cpu.c 2010-07-09 14:50:35.000000000 -0400 @@ -126,7 +126,7 @@ static void do_fpu_end(void) static void fix_processor_context(void) { @@ -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 syscall_init(); /* This sets MSR_*STAR and related */ #endif -diff -urNp linux-2.6.32.15/arch/x86/vdso/Makefile linux-2.6.32.15/arch/x86/vdso/Makefile ---- linux-2.6.32.15/arch/x86/vdso/Makefile 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/vdso/Makefile 2010-05-28 21:27:15.135148926 -0400 +diff -urNp linux-2.6.32.16/arch/x86/vdso/Makefile linux-2.6.32.16/arch/x86/vdso/Makefile +--- linux-2.6.32.16/arch/x86/vdso/Makefile 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/vdso/Makefile 2010-07-09 14:50:35.000000000 -0400 @@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ -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/ GCOV_PROFILE := n # -diff -urNp linux-2.6.32.15/arch/x86/vdso/vclock_gettime.c linux-2.6.32.15/arch/x86/vdso/vclock_gettime.c ---- linux-2.6.32.15/arch/x86/vdso/vclock_gettime.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/vdso/vclock_gettime.c 2010-05-28 21:27:15.151704467 -0400 +diff -urNp linux-2.6.32.16/arch/x86/vdso/vclock_gettime.c linux-2.6.32.16/arch/x86/vdso/vclock_gettime.c +--- linux-2.6.32.16/arch/x86/vdso/vclock_gettime.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/vdso/vclock_gettime.c 2010-07-09 14:50:35.000000000 -0400 @@ -22,24 +22,48 @@ #include <asm/hpet.h> #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 } int gettimeofday(struct timeval *, struct timezone *) __attribute__((weak, alias("__vdso_gettimeofday"))); -diff -urNp linux-2.6.32.15/arch/x86/vdso/vdso32-setup.c linux-2.6.32.15/arch/x86/vdso/vdso32-setup.c ---- linux-2.6.32.15/arch/x86/vdso/vdso32-setup.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/vdso/vdso32-setup.c 2010-05-28 21:27:15.151704467 -0400 +diff -urNp linux-2.6.32.16/arch/x86/vdso/vdso32-setup.c linux-2.6.32.16/arch/x86/vdso/vdso32-setup.c +--- linux-2.6.32.16/arch/x86/vdso/vdso32-setup.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/vdso/vdso32-setup.c 2010-07-09 14:50:35.000000000 -0400 @@ -25,6 +25,7 @@ #include <asm/tlbflush.h> #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 return &gate_vma; return NULL; } -diff -urNp linux-2.6.32.15/arch/x86/vdso/vdso.lds.S linux-2.6.32.15/arch/x86/vdso/vdso.lds.S ---- linux-2.6.32.15/arch/x86/vdso/vdso.lds.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/vdso/vdso.lds.S 2010-05-28 21:27:15.151704467 -0400 +diff -urNp linux-2.6.32.16/arch/x86/vdso/vdso.lds.S linux-2.6.32.16/arch/x86/vdso/vdso.lds.S +--- linux-2.6.32.16/arch/x86/vdso/vdso.lds.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/vdso/vdso.lds.S 2010-07-09 14:50:35.000000000 -0400 @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; #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 +VEXTERN(fallback_time) +VEXTERN(getcpu) +#undef VEXTERN -diff -urNp linux-2.6.32.15/arch/x86/vdso/vextern.h linux-2.6.32.15/arch/x86/vdso/vextern.h ---- linux-2.6.32.15/arch/x86/vdso/vextern.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/vdso/vextern.h 2010-05-28 21:27:15.151704467 -0400 +diff -urNp linux-2.6.32.16/arch/x86/vdso/vextern.h linux-2.6.32.16/arch/x86/vdso/vextern.h +--- linux-2.6.32.16/arch/x86/vdso/vextern.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/vdso/vextern.h 2010-07-09 14:50:35.000000000 -0400 @@ -11,6 +11,5 @@ put into vextern.h and be referenced as a pointer with vdso prefix. 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 -VEXTERN(jiffies) VEXTERN(vgetcpu_mode) VEXTERN(vsyscall_gtod_data) -diff -urNp linux-2.6.32.15/arch/x86/vdso/vma.c linux-2.6.32.15/arch/x86/vdso/vma.c ---- linux-2.6.32.15/arch/x86/vdso/vma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/vdso/vma.c 2010-05-28 21:27:15.151704467 -0400 +diff -urNp linux-2.6.32.16/arch/x86/vdso/vma.c linux-2.6.32.16/arch/x86/vdso/vma.c +--- linux-2.6.32.16/arch/x86/vdso/vma.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/vdso/vma.c 2010-07-09 14:50:35.000000000 -0400 @@ -57,7 +57,7 @@ static int __init init_vdso_vars(void) if (!vbase) 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 - return 0; -} -__setup("vdso=", vdso_setup); -diff -urNp linux-2.6.32.15/arch/x86/xen/enlighten.c linux-2.6.32.15/arch/x86/xen/enlighten.c ---- linux-2.6.32.15/arch/x86/xen/enlighten.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/xen/enlighten.c 2010-05-29 16:33:34.251291763 -0400 +diff -urNp linux-2.6.32.16/arch/x86/xen/enlighten.c linux-2.6.32.16/arch/x86/xen/enlighten.c +--- linux-2.6.32.16/arch/x86/xen/enlighten.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/xen/enlighten.c 2010-07-09 14:50:35.000000000 -0400 @@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); 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 xen_smp_init(); pgd = (pgd_t *)xen_start_info->pt_base; -diff -urNp linux-2.6.32.15/arch/x86/xen/mmu.c linux-2.6.32.15/arch/x86/xen/mmu.c ---- linux-2.6.32.15/arch/x86/xen/mmu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/xen/mmu.c 2010-05-28 21:27:15.151704467 -0400 +diff -urNp linux-2.6.32.16/arch/x86/xen/mmu.c linux-2.6.32.16/arch/x86/xen/mmu.c +--- linux-2.6.32.16/arch/x86/xen/mmu.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/xen/mmu.c 2010-07-09 14:50:35.000000000 -0400 @@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable convert_pfn_mfn(init_level4_pgt); 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 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); -diff -urNp linux-2.6.32.15/arch/x86/xen/smp.c linux-2.6.32.15/arch/x86/xen/smp.c ---- linux-2.6.32.15/arch/x86/xen/smp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/xen/smp.c 2010-05-28 21:27:15.155009648 -0400 +diff -urNp linux-2.6.32.16/arch/x86/xen/smp.c linux-2.6.32.16/arch/x86/xen/smp.c +--- linux-2.6.32.16/arch/x86/xen/smp.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/xen/smp.c 2010-07-09 14:50:35.000000000 -0400 @@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ { 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 ctxt->user_regs.ss = __KERNEL_DS; #ifdef CONFIG_X86_32 ctxt->user_regs.fs = __KERNEL_PERCPU; -diff -urNp linux-2.6.32.15/arch/x86/xen/xen-head.S linux-2.6.32.15/arch/x86/xen/xen-head.S ---- linux-2.6.32.15/arch/x86/xen/xen-head.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/xen/xen-head.S 2010-05-28 21:27:15.155009648 -0400 +diff -urNp linux-2.6.32.16/arch/x86/xen/xen-head.S linux-2.6.32.16/arch/x86/xen/xen-head.S +--- linux-2.6.32.16/arch/x86/xen/xen-head.S 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/xen/xen-head.S 2010-07-09 14:50:35.000000000 -0400 @@ -19,6 +19,17 @@ ENTRY(startup_xen) #ifdef CONFIG_X86_32 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/ #else mov %rsi,xen_start_info mov $init_thread_union+THREAD_SIZE,%rsp -diff -urNp linux-2.6.32.15/arch/x86/xen/xen-ops.h linux-2.6.32.15/arch/x86/xen/xen-ops.h ---- linux-2.6.32.15/arch/x86/xen/xen-ops.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/arch/x86/xen/xen-ops.h 2010-05-28 21:27:15.155009648 -0400 +diff -urNp linux-2.6.32.16/arch/x86/xen/xen-ops.h linux-2.6.32.16/arch/x86/xen/xen-ops.h +--- linux-2.6.32.16/arch/x86/xen/xen-ops.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/arch/x86/xen/xen-ops.h 2010-07-09 14:50:35.000000000 -0400 @@ -10,8 +10,6 @@ extern const char xen_hypervisor_callback[]; 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 struct trap_info; void xen_copy_trap_info(struct trap_info *traps); -diff -urNp linux-2.6.32.15/block/blk-integrity.c linux-2.6.32.15/block/blk-integrity.c ---- linux-2.6.32.15/block/blk-integrity.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/block/blk-integrity.c 2010-05-28 21:27:15.167161810 -0400 +diff -urNp linux-2.6.32.16/block/blk-integrity.c linux-2.6.32.16/block/blk-integrity.c +--- linux-2.6.32.16/block/blk-integrity.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/block/blk-integrity.c 2010-07-09 14:50:35.000000000 -0400 @@ -278,7 +278,7 @@ static struct attribute *integrity_attrs NULL, }; @@ -19890,9 +20053,9 @@ diff -urNp linux-2.6.32.15/block/blk-integrity.c linux-2.6.32.15/block/blk-integ .show = &integrity_attr_show, .store = &integrity_attr_store, }; -diff -urNp linux-2.6.32.15/block/blk-iopoll.c linux-2.6.32.15/block/blk-iopoll.c ---- linux-2.6.32.15/block/blk-iopoll.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/block/blk-iopoll.c 2010-05-28 21:27:15.167161810 -0400 +diff -urNp linux-2.6.32.16/block/blk-iopoll.c linux-2.6.32.16/block/blk-iopoll.c +--- linux-2.6.32.16/block/blk-iopoll.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/block/blk-iopoll.c 2010-07-09 14:50:35.000000000 -0400 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo } 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 { struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); int rearm = 0, budget = blk_iopoll_budget; -diff -urNp linux-2.6.32.15/block/blk-map.c linux-2.6.32.15/block/blk-map.c ---- linux-2.6.32.15/block/blk-map.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/block/blk-map.c 2010-05-28 21:27:15.167161810 -0400 +diff -urNp linux-2.6.32.16/block/blk-map.c linux-2.6.32.16/block/blk-map.c +--- linux-2.6.32.16/block/blk-map.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/block/blk-map.c 2010-07-09 14:50:35.000000000 -0400 @@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ * direct dma. else, set up kernel bounce buffers */ @@ -19923,9 +20086,9 @@ diff -urNp linux-2.6.32.15/block/blk-map.c linux-2.6.32.15/block/blk-map.c if (do_copy) bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); else -diff -urNp linux-2.6.32.15/block/blk-softirq.c linux-2.6.32.15/block/blk-softirq.c ---- linux-2.6.32.15/block/blk-softirq.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/block/blk-softirq.c 2010-05-28 21:27:15.179152446 -0400 +diff -urNp linux-2.6.32.16/block/blk-softirq.c linux-2.6.32.16/block/blk-softirq.c +--- linux-2.6.32.16/block/blk-softirq.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/block/blk-softirq.c 2010-07-09 14:50:35.000000000 -0400 @@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, * Softirq action handler - move entries to local list and loop over them * 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 { struct list_head *cpu_list, local_list; -diff -urNp linux-2.6.32.15/block/blk-sysfs.c linux-2.6.32.15/block/blk-sysfs.c ---- linux-2.6.32.15/block/blk-sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/block/blk-sysfs.c 2010-05-28 21:27:15.179152446 -0400 +diff -urNp linux-2.6.32.16/block/blk-sysfs.c linux-2.6.32.16/block/blk-sysfs.c +--- linux-2.6.32.16/block/blk-sysfs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/block/blk-sysfs.c 2010-07-09 14:50:35.000000000 -0400 @@ -414,7 +414,7 @@ static void blk_release_queue(struct kob kmem_cache_free(blk_requestq_cachep, q); } @@ -19947,9 +20110,9 @@ diff -urNp linux-2.6.32.15/block/blk-sysfs.c linux-2.6.32.15/block/blk-sysfs.c .show = queue_attr_show, .store = queue_attr_store, }; -diff -urNp linux-2.6.32.15/block/elevator.c linux-2.6.32.15/block/elevator.c ---- linux-2.6.32.15/block/elevator.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/block/elevator.c 2010-05-28 21:27:15.179152446 -0400 +diff -urNp linux-2.6.32.16/block/elevator.c linux-2.6.32.16/block/elevator.c +--- linux-2.6.32.16/block/elevator.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/block/elevator.c 2010-07-09 14:50:35.000000000 -0400 @@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str return error; } @@ -19959,9 +20122,9 @@ diff -urNp linux-2.6.32.15/block/elevator.c linux-2.6.32.15/block/elevator.c .show = elv_attr_show, .store = elv_attr_store, }; -diff -urNp linux-2.6.32.15/crypto/lrw.c linux-2.6.32.15/crypto/lrw.c ---- linux-2.6.32.15/crypto/lrw.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/crypto/lrw.c 2010-05-28 21:27:15.179152446 -0400 +diff -urNp linux-2.6.32.16/crypto/lrw.c linux-2.6.32.16/crypto/lrw.c +--- linux-2.6.32.16/crypto/lrw.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/crypto/lrw.c 2010-07-09 14:50:35.000000000 -0400 @@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par struct priv *ctx = crypto_tfm_ctx(parent); 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 int bsize = crypto_cipher_blocksize(child); crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); -diff -urNp linux-2.6.32.15/Documentation/dontdiff linux-2.6.32.15/Documentation/dontdiff ---- linux-2.6.32.15/Documentation/dontdiff 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/Documentation/dontdiff 2010-05-28 21:27:15.179152446 -0400 +diff -urNp linux-2.6.32.16/Documentation/dontdiff linux-2.6.32.16/Documentation/dontdiff +--- linux-2.6.32.16/Documentation/dontdiff 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/Documentation/dontdiff 2010-07-09 14:50:35.000000000 -0400 @@ -3,6 +3,7 @@ *.bin *.cpio @@ -20081,9 +20244,9 @@ diff -urNp linux-2.6.32.15/Documentation/dontdiff linux-2.6.32.15/Documentation/ zImage* zconf.hash.c +zoffset.h -diff -urNp linux-2.6.32.15/Documentation/kernel-parameters.txt linux-2.6.32.15/Documentation/kernel-parameters.txt ---- linux-2.6.32.15/Documentation/kernel-parameters.txt 2010-05-15 13:20:18.374565913 -0400 -+++ linux-2.6.32.15/Documentation/kernel-parameters.txt 2010-05-28 21:27:15.179152446 -0400 +diff -urNp linux-2.6.32.16/Documentation/kernel-parameters.txt linux-2.6.32.16/Documentation/kernel-parameters.txt +--- linux-2.6.32.16/Documentation/kernel-parameters.txt 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/Documentation/kernel-parameters.txt 2010-07-09 14:50:35.000000000 -0400 @@ -1836,6 +1836,12 @@ and is between 256 and 4096 characters. the specified number of seconds. This is to be used if 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 pcbit= [HW,ISDN] pcd. [PARIDE] -diff -urNp linux-2.6.32.15/drivers/acpi/acpi_pad.c linux-2.6.32.15/drivers/acpi/acpi_pad.c ---- linux-2.6.32.15/drivers/acpi/acpi_pad.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/acpi/acpi_pad.c 2010-06-19 10:03:45.704801524 -0400 +diff -urNp linux-2.6.32.16/drivers/acpi/acpi_pad.c linux-2.6.32.16/drivers/acpi/acpi_pad.c +--- linux-2.6.32.16/drivers/acpi/acpi_pad.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/acpi/acpi_pad.c 2010-07-09 14:50:35.000000000 -0400 @@ -30,7 +30,7 @@ #include <acpi/acpi_bus.h> #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/ #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" #define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 static DEFINE_MUTEX(isolated_cpus_lock); -diff -urNp linux-2.6.32.15/drivers/acpi/battery.c linux-2.6.32.15/drivers/acpi/battery.c ---- linux-2.6.32.15/drivers/acpi/battery.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/acpi/battery.c 2010-05-28 21:27:15.179152446 -0400 +diff -urNp linux-2.6.32.16/drivers/acpi/battery.c linux-2.6.32.16/drivers/acpi/battery.c +--- linux-2.6.32.16/drivers/acpi/battery.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/acpi/battery.c 2010-07-09 14:50:35.000000000 -0400 @@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm); } @@ -20121,9 +20284,9 @@ diff -urNp linux-2.6.32.15/drivers/acpi/battery.c linux-2.6.32.15/drivers/acpi/b mode_t mode; const char *name; } acpi_battery_file[] = { -diff -urNp linux-2.6.32.15/drivers/acpi/blacklist.c linux-2.6.32.15/drivers/acpi/blacklist.c ---- linux-2.6.32.15/drivers/acpi/blacklist.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/acpi/blacklist.c 2010-05-28 21:27:15.179152446 -0400 +diff -urNp linux-2.6.32.16/drivers/acpi/blacklist.c linux-2.6.32.16/drivers/acpi/blacklist.c +--- linux-2.6.32.16/drivers/acpi/blacklist.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/acpi/blacklist.c 2010-07-09 14:50:35.000000000 -0400 @@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, "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 }; #if CONFIG_ACPI_BLACKLIST_YEAR -diff -urNp linux-2.6.32.15/drivers/acpi/dock.c linux-2.6.32.15/drivers/acpi/dock.c ---- linux-2.6.32.15/drivers/acpi/dock.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/acpi/dock.c 2010-05-28 21:27:15.179152446 -0400 +diff -urNp linux-2.6.32.16/drivers/acpi/dock.c linux-2.6.32.16/drivers/acpi/dock.c +--- linux-2.6.32.16/drivers/acpi/dock.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/acpi/dock.c 2010-07-09 14:50:35.000000000 -0400 @@ -77,7 +77,7 @@ struct dock_dependent_device { struct list_head list; 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 void *context) { struct dock_dependent_device *dd; -diff -urNp linux-2.6.32.15/drivers/acpi/osl.c linux-2.6.32.15/drivers/acpi/osl.c ---- linux-2.6.32.15/drivers/acpi/osl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/acpi/osl.c 2010-05-28 21:27:15.183173771 -0400 +diff -urNp linux-2.6.32.16/drivers/acpi/osl.c linux-2.6.32.16/drivers/acpi/osl.c +--- linux-2.6.32.16/drivers/acpi/osl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/acpi/osl.c 2010-07-09 14:50:35.000000000 -0400 @@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres void __iomem *virt_addr; @@ -20175,9 +20338,9 @@ diff -urNp linux-2.6.32.15/drivers/acpi/osl.c linux-2.6.32.15/drivers/acpi/osl.c switch (width) { case 8: -diff -urNp linux-2.6.32.15/drivers/acpi/power_meter.c linux-2.6.32.15/drivers/acpi/power_meter.c ---- linux-2.6.32.15/drivers/acpi/power_meter.c 2010-05-15 13:20:18.454567530 -0400 -+++ linux-2.6.32.15/drivers/acpi/power_meter.c 2010-05-28 21:27:15.191153765 -0400 +diff -urNp linux-2.6.32.16/drivers/acpi/power_meter.c linux-2.6.32.16/drivers/acpi/power_meter.c +--- linux-2.6.32.16/drivers/acpi/power_meter.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/acpi/power_meter.c 2010-07-09 14:50:35.000000000 -0400 @@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d return res; @@ -20187,9 +20350,9 @@ diff -urNp linux-2.6.32.15/drivers/acpi/power_meter.c linux-2.6.32.15/drivers/ac mutex_lock(&resource->lock); resource->trip[attr->index - 7] = temp; -diff -urNp linux-2.6.32.15/drivers/acpi/proc.c linux-2.6.32.15/drivers/acpi/proc.c ---- linux-2.6.32.15/drivers/acpi/proc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/acpi/proc.c 2010-05-28 21:27:15.191153765 -0400 +diff -urNp linux-2.6.32.16/drivers/acpi/proc.c linux-2.6.32.16/drivers/acpi/proc.c +--- linux-2.6.32.16/drivers/acpi/proc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/acpi/proc.c 2010-07-09 14:50:35.000000000 -0400 @@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f size_t count, loff_t * ppos) { @@ -20225,9 +20388,9 @@ diff -urNp linux-2.6.32.15/drivers/acpi/proc.c linux-2.6.32.15/drivers/acpi/proc dev->wakeup.state.enabled = dev->wakeup.state.enabled ? 0 : 1; found_dev = dev; -diff -urNp linux-2.6.32.15/drivers/acpi/processor_core.c linux-2.6.32.15/drivers/acpi/processor_core.c ---- linux-2.6.32.15/drivers/acpi/processor_core.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/acpi/processor_core.c 2010-05-28 21:27:15.191153765 -0400 +diff -urNp linux-2.6.32.16/drivers/acpi/processor_core.c linux-2.6.32.16/drivers/acpi/processor_core.c +--- linux-2.6.32.16/drivers/acpi/processor_core.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/acpi/processor_core.c 2010-07-09 14:50:35.000000000 -0400 @@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add( return 0; } @@ -20237,9 +20400,9 @@ diff -urNp linux-2.6.32.15/drivers/acpi/processor_core.c linux-2.6.32.15/drivers /* * Buggy BIOS check -diff -urNp linux-2.6.32.15/drivers/acpi/processor_idle.c linux-2.6.32.15/drivers/acpi/processor_idle.c ---- linux-2.6.32.15/drivers/acpi/processor_idle.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/acpi/processor_idle.c 2010-05-28 21:27:15.191153765 -0400 +diff -urNp linux-2.6.32.16/drivers/acpi/processor_idle.c linux-2.6.32.16/drivers/acpi/processor_idle.c +--- linux-2.6.32.16/drivers/acpi/processor_idle.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/acpi/processor_idle.c 2010-07-09 14:50:35.000000000 -0400 @@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), 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 }; -diff -urNp linux-2.6.32.15/drivers/acpi/sbshc.c linux-2.6.32.15/drivers/acpi/sbshc.c ---- linux-2.6.32.15/drivers/acpi/sbshc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/acpi/sbshc.c 2010-05-31 11:26:43.164958464 -0400 +diff -urNp linux-2.6.32.16/drivers/acpi/sbshc.c linux-2.6.32.16/drivers/acpi/sbshc.c +--- linux-2.6.32.16/drivers/acpi/sbshc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/acpi/sbshc.c 2010-07-09 14:50:35.000000000 -0400 @@ -17,7 +17,7 @@ #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 #define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC" struct acpi_smb_hc { -diff -urNp linux-2.6.32.15/drivers/acpi/sleep.c linux-2.6.32.15/drivers/acpi/sleep.c ---- linux-2.6.32.15/drivers/acpi/sleep.c 2010-05-28 20:16:44.438931092 -0400 -+++ linux-2.6.32.15/drivers/acpi/sleep.c 2010-05-28 21:27:15.191153765 -0400 +diff -urNp linux-2.6.32.16/drivers/acpi/sleep.c linux-2.6.32.16/drivers/acpi/sleep.c +--- linux-2.6.32.16/drivers/acpi/sleep.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/acpi/sleep.c 2010-07-09 14:50:35.000000000 -0400 @@ -302,7 +302,7 @@ static int acpi_suspend_state_valid(susp } } @@ -20300,9 +20463,9 @@ diff -urNp linux-2.6.32.15/drivers/acpi/sleep.c linux-2.6.32.15/drivers/acpi/sle .begin = acpi_hibernation_begin_old, .end = acpi_pm_end, .pre_snapshot = acpi_hibernation_pre_snapshot_old, -diff -urNp linux-2.6.32.15/drivers/acpi/video.c linux-2.6.32.15/drivers/acpi/video.c ---- linux-2.6.32.15/drivers/acpi/video.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/acpi/video.c 2010-05-28 21:27:15.203165017 -0400 +diff -urNp linux-2.6.32.16/drivers/acpi/video.c linux-2.6.32.16/drivers/acpi/video.c +--- linux-2.6.32.16/drivers/acpi/video.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/acpi/video.c 2010-07-09 14:50:35.000000000 -0400 @@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str vd->brightness->levels[request_level]); } @@ -20312,9 +20475,9 @@ diff -urNp linux-2.6.32.15/drivers/acpi/video.c linux-2.6.32.15/drivers/acpi/vid .get_brightness = acpi_video_get_brightness, .update_status = acpi_video_set_brightness, }; -diff -urNp linux-2.6.32.15/drivers/ata/ahci.c linux-2.6.32.15/drivers/ata/ahci.c ---- linux-2.6.32.15/drivers/ata/ahci.c 2010-04-29 17:49:37.661448235 -0400 -+++ linux-2.6.32.15/drivers/ata/ahci.c 2010-05-28 21:27:15.203165017 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/ahci.c linux-2.6.32.16/drivers/ata/ahci.c +--- linux-2.6.32.16/drivers/ata/ahci.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/ahci.c 2010-07-09 14:50:35.000000000 -0400 @@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh .sdev_attrs = ahci_sdev_attrs, }; @@ -20354,9 +20517,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/ahci.c linux-2.6.32.15/drivers/ata/ahci.c }; -diff -urNp linux-2.6.32.15/drivers/ata/ata_generic.c linux-2.6.32.15/drivers/ata/ata_generic.c ---- linux-2.6.32.15/drivers/ata/ata_generic.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/ata_generic.c 2010-05-28 21:27:15.203165017 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/ata_generic.c linux-2.6.32.16/drivers/ata/ata_generic.c +--- linux-2.6.32.16/drivers/ata/ata_generic.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/ata_generic.c 2010-07-09 14:50:35.000000000 -0400 @@ -95,7 +95,7 @@ static struct scsi_host_template generic ATA_BMDMA_SHT(DRV_NAME), }; @@ -20366,9 +20529,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/ata_generic.c linux-2.6.32.15/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_unknown, .set_mode = generic_set_mode, -diff -urNp linux-2.6.32.15/drivers/ata/ata_piix.c linux-2.6.32.15/drivers/ata/ata_piix.c ---- linux-2.6.32.15/drivers/ata/ata_piix.c 2010-04-29 17:49:37.669446700 -0400 -+++ linux-2.6.32.15/drivers/ata/ata_piix.c 2010-05-28 21:27:15.203165017 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/ata_piix.c linux-2.6.32.16/drivers/ata/ata_piix.c +--- linux-2.6.32.16/drivers/ata/ata_piix.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/ata_piix.c 2010-07-09 14:50:35.000000000 -0400 @@ -299,7 +299,7 @@ static const struct pci_device_id piix_p { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, /* 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 }; static const char *oemstrs[] = { "Tecra M3,", -diff -urNp linux-2.6.32.15/drivers/ata/libata-acpi.c linux-2.6.32.15/drivers/ata/libata-acpi.c ---- linux-2.6.32.15/drivers/ata/libata-acpi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/libata-acpi.c 2010-05-28 21:27:15.203165017 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/libata-acpi.c linux-2.6.32.16/drivers/ata/libata-acpi.c +--- linux-2.6.32.16/drivers/ata/libata-acpi.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/libata-acpi.c 2010-07-09 14:50:35.000000000 -0400 @@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han ata_acpi_uevent(dev->link->ap, dev, event); } @@ -20450,10 +20613,10 @@ diff -urNp linux-2.6.32.15/drivers/ata/libata-acpi.c linux-2.6.32.15/drivers/ata .handler = ata_acpi_ap_notify_dock, .uevent = ata_acpi_ap_uevent, }; -diff -urNp linux-2.6.32.15/drivers/ata/libata-core.c linux-2.6.32.15/drivers/ata/libata-core.c ---- linux-2.6.32.15/drivers/ata/libata-core.c 2010-04-29 17:49:37.689144697 -0400 -+++ linux-2.6.32.15/drivers/ata/libata-core.c 2010-05-28 21:27:15.207155482 -0400 -@@ -896,7 +896,7 @@ static const struct ata_xfer_ent { +diff -urNp linux-2.6.32.16/drivers/ata/libata-core.c linux-2.6.32.16/drivers/ata/libata-core.c +--- linux-2.6.32.16/drivers/ata/libata-core.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/libata-core.c 2010-07-09 14:50:35.000000000 -0400 +@@ -900,7 +900,7 @@ static const struct ata_xfer_ent { { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 }, { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 }, { 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 }; /** -@@ -3163,7 +3163,7 @@ static const struct ata_timing ata_timin +@@ -3168,7 +3168,7 @@ static const struct ata_timing ata_timin { XFER_UDMA_5, 0, 0, 0, 0, 0, 0, 0, 0, 20 }, { XFER_UDMA_6, 0, 0, 0, 0, 0, 0, 0, 0, 15 }, @@ -20471,7 +20634,7 @@ diff -urNp linux-2.6.32.15/drivers/ata/libata-core.c linux-2.6.32.15/drivers/ata }; #define ENOUGH(v, unit) (((v)-1)/(unit)+1) -@@ -4388,7 +4388,7 @@ static const struct ata_blacklist_entry +@@ -4393,7 +4393,7 @@ static const struct ata_blacklist_entry { "PIONEER DVD-RW DVRTD08", "1.00", ATA_HORKAGE_NOSETXFER }, /* 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 }; static int strn_pattern_cmp(const char *patt, const char *name, int wildchar) -@@ -5964,7 +5964,7 @@ static void ata_host_stop(struct device +@@ -5969,7 +5969,7 @@ static void ata_host_stop(struct device * LOCKING: * None. */ @@ -20489,7 +20652,7 @@ diff -urNp linux-2.6.32.15/drivers/ata/libata-core.c linux-2.6.32.15/drivers/ata { static DEFINE_SPINLOCK(lock); const struct ata_port_operations *cur; -@@ -5976,6 +5976,7 @@ static void ata_finalize_port_ops(struct +@@ -5981,6 +5981,7 @@ static void ata_finalize_port_ops(struct return; 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 for (cur = ops->inherits; cur; cur = cur->inherits) { void **inherit = (void **)cur; -@@ -5989,8 +5990,9 @@ static void ata_finalize_port_ops(struct +@@ -5994,8 +5995,9 @@ static void ata_finalize_port_ops(struct if (IS_ERR(*pp)) *pp = NULL; @@ -20508,7 +20671,7 @@ diff -urNp linux-2.6.32.15/drivers/ata/libata-core.c linux-2.6.32.15/drivers/ata spin_unlock(&lock); } -@@ -6087,7 +6089,7 @@ int ata_host_start(struct ata_host *host +@@ -6092,7 +6094,7 @@ int ata_host_start(struct ata_host *host */ /* KILLME - the only user left is ipr */ 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 { spin_lock_init(&host->lock); host->dev = dev; -@@ -6750,7 +6752,7 @@ static void ata_dummy_error_handler(stru +@@ -6755,7 +6757,7 @@ static void ata_dummy_error_handler(stru /* truly dummy */ } @@ -20526,9 +20689,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/libata-core.c linux-2.6.32.15/drivers/ata .qc_prep = ata_noop_qc_prep, .qc_issue = ata_dummy_qc_issue, .error_handler = ata_dummy_error_handler, -diff -urNp linux-2.6.32.15/drivers/ata/libata-eh.c linux-2.6.32.15/drivers/ata/libata-eh.c ---- linux-2.6.32.15/drivers/ata/libata-eh.c 2010-05-15 13:20:18.462978524 -0400 -+++ linux-2.6.32.15/drivers/ata/libata-eh.c 2010-05-28 21:27:15.215165530 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/libata-eh.c linux-2.6.32.16/drivers/ata/libata-eh.c +--- linux-2.6.32.16/drivers/ata/libata-eh.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/libata-eh.c 2010-07-09 14:50:35.000000000 -0400 @@ -3586,7 +3586,7 @@ void ata_do_eh(struct ata_port *ap, ata_ */ 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 ata_reset_fn_t hardreset = ops->hardreset; /* ignore built-in hardreset if SCR access is not available */ -diff -urNp linux-2.6.32.15/drivers/ata/libata-pmp.c linux-2.6.32.15/drivers/ata/libata-pmp.c ---- linux-2.6.32.15/drivers/ata/libata-pmp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/libata-pmp.c 2010-05-28 21:27:15.215165530 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/libata-pmp.c linux-2.6.32.16/drivers/ata/libata-pmp.c +--- linux-2.6.32.16/drivers/ata/libata-pmp.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/libata-pmp.c 2010-07-09 14:50:35.000000000 -0400 @@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str */ 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/ int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; struct ata_link *pmp_link = &ap->link; struct ata_device *pmp_dev = pmp_link->device; -diff -urNp linux-2.6.32.15/drivers/ata/pata_acpi.c linux-2.6.32.15/drivers/ata/pata_acpi.c ---- linux-2.6.32.15/drivers/ata/pata_acpi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_acpi.c 2010-05-28 21:27:15.215165530 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_acpi.c linux-2.6.32.16/drivers/ata/pata_acpi.c +--- linux-2.6.32.16/drivers/ata/pata_acpi.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_acpi.c 2010-07-09 14:50:35.000000000 -0400 @@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s ATA_BMDMA_SHT(DRV_NAME), }; @@ -20562,9 +20725,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_acpi.c linux-2.6.32.15/drivers/ata/p .inherits = &ata_bmdma_port_ops, .qc_issue = pacpi_qc_issue, .cable_detect = pacpi_cable_detect, -diff -urNp linux-2.6.32.15/drivers/ata/pata_ali.c linux-2.6.32.15/drivers/ata/pata_ali.c ---- linux-2.6.32.15/drivers/ata/pata_ali.c 2010-04-29 17:49:37.689144697 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_ali.c 2010-05-28 21:27:15.215165530 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_ali.c linux-2.6.32.16/drivers/ata/pata_ali.c +--- linux-2.6.32.16/drivers/ata/pata_ali.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_ali.c 2010-07-09 14:50:35.000000000 -0400 @@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht * Port operations for PIO only ALi */ @@ -20610,9 +20773,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_ali.c linux-2.6.32.15/drivers/ata/pa .inherits = &ali_dma_base_ops, .check_atapi_dma = ali_check_atapi_dma, .dev_config = ali_warn_atapi_dma, -diff -urNp linux-2.6.32.15/drivers/ata/pata_amd.c linux-2.6.32.15/drivers/ata/pata_amd.c ---- linux-2.6.32.15/drivers/ata/pata_amd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_amd.c 2010-05-28 21:27:15.215165530 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_amd.c linux-2.6.32.16/drivers/ata/pata_amd.c +--- linux-2.6.32.16/drivers/ata/pata_amd.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_amd.c 2010-07-09 14:50:35.000000000 -0400 @@ -397,28 +397,28 @@ static const struct ata_port_operations .prereset = amd_pre_reset, }; @@ -20662,9 +20825,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_amd.c linux-2.6.32.15/drivers/ata/pa .inherits = &nv_base_port_ops, .set_piomode = nv133_set_piomode, .set_dmamode = nv133_set_dmamode, -diff -urNp linux-2.6.32.15/drivers/ata/pata_artop.c linux-2.6.32.15/drivers/ata/pata_artop.c ---- linux-2.6.32.15/drivers/ata/pata_artop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_artop.c 2010-05-28 21:27:15.215165530 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_artop.c linux-2.6.32.16/drivers/ata/pata_artop.c +--- linux-2.6.32.16/drivers/ata/pata_artop.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_artop.c 2010-07-09 14:50:35.000000000 -0400 @@ -311,7 +311,7 @@ static struct scsi_host_template artop_s ATA_BMDMA_SHT(DRV_NAME), }; @@ -20683,9 +20846,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_artop.c linux-2.6.32.15/drivers/ata/ .inherits = &ata_bmdma_port_ops, .cable_detect = artop6260_cable_detect, .set_piomode = artop6260_set_piomode, -diff -urNp linux-2.6.32.15/drivers/ata/pata_at32.c linux-2.6.32.15/drivers/ata/pata_at32.c ---- linux-2.6.32.15/drivers/ata/pata_at32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_at32.c 2010-05-28 21:27:15.215165530 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_at32.c linux-2.6.32.16/drivers/ata/pata_at32.c +--- linux-2.6.32.16/drivers/ata/pata_at32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_at32.c 2010-07-09 14:50:35.000000000 -0400 @@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh ATA_PIO_SHT(DRV_NAME), }; @@ -20695,9 +20858,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_at32.c linux-2.6.32.15/drivers/ata/p .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = pata_at32_set_piomode, -diff -urNp linux-2.6.32.15/drivers/ata/pata_at91.c linux-2.6.32.15/drivers/ata/pata_at91.c ---- linux-2.6.32.15/drivers/ata/pata_at91.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_at91.c 2010-05-28 21:27:15.227169983 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_at91.c linux-2.6.32.16/drivers/ata/pata_at91.c +--- linux-2.6.32.16/drivers/ata/pata_at91.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_at91.c 2010-07-09 14:50:35.000000000 -0400 @@ -195,7 +195,7 @@ static struct scsi_host_template pata_at ATA_PIO_SHT(DRV_NAME), }; @@ -20707,9 +20870,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_at91.c linux-2.6.32.15/drivers/ata/p .inherits = &ata_sff_port_ops, .sff_data_xfer = pata_at91_data_xfer_noirq, -diff -urNp linux-2.6.32.15/drivers/ata/pata_atiixp.c linux-2.6.32.15/drivers/ata/pata_atiixp.c ---- linux-2.6.32.15/drivers/ata/pata_atiixp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_atiixp.c 2010-05-28 21:27:15.227169983 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_atiixp.c linux-2.6.32.16/drivers/ata/pata_atiixp.c +--- linux-2.6.32.16/drivers/ata/pata_atiixp.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_atiixp.c 2010-07-09 14:50:35.000000000 -0400 @@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -20719,9 +20882,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_atiixp.c linux-2.6.32.15/drivers/ata .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, -diff -urNp linux-2.6.32.15/drivers/ata/pata_atp867x.c linux-2.6.32.15/drivers/ata/pata_atp867x.c ---- linux-2.6.32.15/drivers/ata/pata_atp867x.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_atp867x.c 2010-05-28 21:27:15.227169983 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_atp867x.c linux-2.6.32.16/drivers/ata/pata_atp867x.c +--- linux-2.6.32.16/drivers/ata/pata_atp867x.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_atp867x.c 2010-07-09 14:50:35.000000000 -0400 @@ -274,7 +274,7 @@ static struct scsi_host_template atp867x ATA_BMDMA_SHT(DRV_NAME), }; @@ -20731,9 +20894,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_atp867x.c linux-2.6.32.15/drivers/at .inherits = &ata_bmdma_port_ops, .cable_detect = atp867x_cable_detect, .set_piomode = atp867x_set_piomode, -diff -urNp linux-2.6.32.15/drivers/ata/pata_bf54x.c linux-2.6.32.15/drivers/ata/pata_bf54x.c ---- linux-2.6.32.15/drivers/ata/pata_bf54x.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_bf54x.c 2010-05-28 21:27:15.235166526 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_bf54x.c linux-2.6.32.16/drivers/ata/pata_bf54x.c +--- linux-2.6.32.16/drivers/ata/pata_bf54x.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_bf54x.c 2010-07-09 14:50:35.000000000 -0400 @@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -20743,9 +20906,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_bf54x.c linux-2.6.32.15/drivers/ata/ .inherits = &ata_sff_port_ops, .set_piomode = bfin_set_piomode, -diff -urNp linux-2.6.32.15/drivers/ata/pata_cmd640.c linux-2.6.32.15/drivers/ata/pata_cmd640.c ---- linux-2.6.32.15/drivers/ata/pata_cmd640.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_cmd640.c 2010-05-28 21:27:15.235166526 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_cmd640.c linux-2.6.32.16/drivers/ata/pata_cmd640.c +--- linux-2.6.32.16/drivers/ata/pata_cmd640.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_cmd640.c 2010-07-09 14:50:35.000000000 -0400 @@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -20755,9 +20918,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_cmd640.c linux-2.6.32.15/drivers/ata .inherits = &ata_bmdma_port_ops, /* In theory xfer_noirq is not needed once we kill the prefetcher */ .sff_data_xfer = ata_sff_data_xfer_noirq, -diff -urNp linux-2.6.32.15/drivers/ata/pata_cmd64x.c linux-2.6.32.15/drivers/ata/pata_cmd64x.c ---- linux-2.6.32.15/drivers/ata/pata_cmd64x.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_cmd64x.c 2010-05-28 21:27:15.235166526 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_cmd64x.c linux-2.6.32.16/drivers/ata/pata_cmd64x.c +--- linux-2.6.32.16/drivers/ata/pata_cmd64x.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_cmd64x.c 2010-07-09 14:50:35.000000000 -0400 @@ -275,18 +275,18 @@ static const struct ata_port_operations .set_dmamode = cmd64x_set_dmamode, }; @@ -20780,9 +20943,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_cmd64x.c linux-2.6.32.15/drivers/ata .inherits = &cmd64x_base_ops, .bmdma_stop = cmd648_bmdma_stop, .cable_detect = cmd648_cable_detect, -diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5520.c linux-2.6.32.15/drivers/ata/pata_cs5520.c ---- linux-2.6.32.15/drivers/ata/pata_cs5520.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_cs5520.c 2010-05-28 21:27:15.239154462 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_cs5520.c linux-2.6.32.16/drivers/ata/pata_cs5520.c +--- linux-2.6.32.16/drivers/ata/pata_cs5520.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_cs5520.c 2010-07-09 14:50:35.000000000 -0400 @@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -20792,9 +20955,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5520.c linux-2.6.32.15/drivers/ata .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5530.c linux-2.6.32.15/drivers/ata/pata_cs5530.c ---- linux-2.6.32.15/drivers/ata/pata_cs5530.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_cs5530.c 2010-05-28 21:27:15.239154462 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_cs5530.c linux-2.6.32.16/drivers/ata/pata_cs5530.c +--- linux-2.6.32.16/drivers/ata/pata_cs5530.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_cs5530.c 2010-07-09 14:50:35.000000000 -0400 @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -20804,9 +20967,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5530.c linux-2.6.32.15/drivers/ata .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, -diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5535.c linux-2.6.32.15/drivers/ata/pata_cs5535.c ---- linux-2.6.32.15/drivers/ata/pata_cs5535.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_cs5535.c 2010-05-28 21:27:15.239154462 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_cs5535.c linux-2.6.32.16/drivers/ata/pata_cs5535.c +--- linux-2.6.32.16/drivers/ata/pata_cs5535.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_cs5535.c 2010-07-09 14:50:35.000000000 -0400 @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -20816,9 +20979,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5535.c linux-2.6.32.15/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = cs5535_cable_detect, .set_piomode = cs5535_set_piomode, -diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5536.c linux-2.6.32.15/drivers/ata/pata_cs5536.c ---- linux-2.6.32.15/drivers/ata/pata_cs5536.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_cs5536.c 2010-05-28 21:27:15.239154462 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_cs5536.c linux-2.6.32.16/drivers/ata/pata_cs5536.c +--- linux-2.6.32.16/drivers/ata/pata_cs5536.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_cs5536.c 2010-07-09 14:50:35.000000000 -0400 @@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -20828,9 +20991,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5536.c linux-2.6.32.15/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = cs5536_cable_detect, .set_piomode = cs5536_set_piomode, -diff -urNp linux-2.6.32.15/drivers/ata/pata_cypress.c linux-2.6.32.15/drivers/ata/pata_cypress.c ---- linux-2.6.32.15/drivers/ata/pata_cypress.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_cypress.c 2010-05-28 21:27:15.243179627 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_cypress.c linux-2.6.32.16/drivers/ata/pata_cypress.c +--- linux-2.6.32.16/drivers/ata/pata_cypress.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_cypress.c 2010-07-09 14:50:35.000000000 -0400 @@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69 ATA_BMDMA_SHT(DRV_NAME), }; @@ -20840,9 +21003,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_cypress.c linux-2.6.32.15/drivers/at .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = cy82c693_set_piomode, -diff -urNp linux-2.6.32.15/drivers/ata/pata_efar.c linux-2.6.32.15/drivers/ata/pata_efar.c ---- linux-2.6.32.15/drivers/ata/pata_efar.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_efar.c 2010-05-28 21:27:15.243179627 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_efar.c linux-2.6.32.16/drivers/ata/pata_efar.c +--- linux-2.6.32.16/drivers/ata/pata_efar.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_efar.c 2010-07-09 14:50:35.000000000 -0400 @@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -20852,9 +21015,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_efar.c linux-2.6.32.15/drivers/ata/p .inherits = &ata_bmdma_port_ops, .cable_detect = efar_cable_detect, .set_piomode = efar_set_piomode, -diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt366.c linux-2.6.32.15/drivers/ata/pata_hpt366.c ---- linux-2.6.32.15/drivers/ata/pata_hpt366.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_hpt366.c 2010-05-28 21:27:15.243179627 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_hpt366.c linux-2.6.32.16/drivers/ata/pata_hpt366.c +--- linux-2.6.32.16/drivers/ata/pata_hpt366.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_hpt366.c 2010-07-09 14:50:35.000000000 -0400 @@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_ * Configuration for HPT366/68 */ @@ -20864,9 +21027,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt366.c linux-2.6.32.15/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = hpt36x_cable_detect, .mode_filter = hpt366_filter, -diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt37x.c linux-2.6.32.15/drivers/ata/pata_hpt37x.c ---- linux-2.6.32.15/drivers/ata/pata_hpt37x.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_hpt37x.c 2010-05-28 21:27:15.247200461 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_hpt37x.c linux-2.6.32.16/drivers/ata/pata_hpt37x.c +--- linux-2.6.32.16/drivers/ata/pata_hpt37x.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_hpt37x.c 2010-07-09 14:50:35.000000000 -0400 @@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_ * Configuration for HPT370 */ @@ -20903,9 +21066,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt37x.c linux-2.6.32.15/drivers/ata .inherits = &hpt372_port_ops, .prereset = hpt374_fn1_pre_reset, }; -diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt3x2n.c linux-2.6.32.15/drivers/ata/pata_hpt3x2n.c ---- linux-2.6.32.15/drivers/ata/pata_hpt3x2n.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_hpt3x2n.c 2010-05-28 21:27:15.247200461 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_hpt3x2n.c linux-2.6.32.16/drivers/ata/pata_hpt3x2n.c +--- linux-2.6.32.16/drivers/ata/pata_hpt3x2n.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_hpt3x2n.c 2010-07-09 14:50:35.000000000 -0400 @@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n * Configuration for HPT3x2n. */ @@ -20915,9 +21078,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt3x2n.c linux-2.6.32.15/drivers/at .inherits = &ata_bmdma_port_ops, .bmdma_stop = hpt3x2n_bmdma_stop, -diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt3x3.c linux-2.6.32.15/drivers/ata/pata_hpt3x3.c ---- linux-2.6.32.15/drivers/ata/pata_hpt3x3.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_hpt3x3.c 2010-05-28 21:27:15.247200461 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_hpt3x3.c linux-2.6.32.16/drivers/ata/pata_hpt3x3.c +--- linux-2.6.32.16/drivers/ata/pata_hpt3x3.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_hpt3x3.c 2010-07-09 14:50:35.000000000 -0400 @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -20927,9 +21090,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt3x3.c linux-2.6.32.15/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = hpt3x3_set_piomode, -diff -urNp linux-2.6.32.15/drivers/ata/pata_icside.c linux-2.6.32.15/drivers/ata/pata_icside.c ---- linux-2.6.32.15/drivers/ata/pata_icside.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_icside.c 2010-05-28 21:27:15.251151122 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_icside.c linux-2.6.32.16/drivers/ata/pata_icside.c +--- linux-2.6.32.16/drivers/ata/pata_icside.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_icside.c 2010-07-09 14:50:35.000000000 -0400 @@ -319,7 +319,7 @@ static void pata_icside_postreset(struct } } @@ -20939,9 +21102,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_icside.c linux-2.6.32.15/drivers/ata .inherits = &ata_sff_port_ops, /* no need to build any PRD tables for DMA */ .qc_prep = ata_noop_qc_prep, -diff -urNp linux-2.6.32.15/drivers/ata/pata_isapnp.c linux-2.6.32.15/drivers/ata/pata_isapnp.c ---- linux-2.6.32.15/drivers/ata/pata_isapnp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_isapnp.c 2010-05-28 21:27:15.251151122 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_isapnp.c linux-2.6.32.16/drivers/ata/pata_isapnp.c +--- linux-2.6.32.16/drivers/ata/pata_isapnp.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_isapnp.c 2010-07-09 14:50:35.000000000 -0400 @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ ATA_PIO_SHT(DRV_NAME), }; @@ -20957,9 +21120,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_isapnp.c linux-2.6.32.15/drivers/ata .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, /* No altstatus so we don't want to use the lost interrupt poll */ -diff -urNp linux-2.6.32.15/drivers/ata/pata_it8213.c linux-2.6.32.15/drivers/ata/pata_it8213.c ---- linux-2.6.32.15/drivers/ata/pata_it8213.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_it8213.c 2010-05-28 21:27:15.251151122 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_it8213.c linux-2.6.32.16/drivers/ata/pata_it8213.c +--- linux-2.6.32.16/drivers/ata/pata_it8213.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_it8213.c 2010-07-09 14:50:35.000000000 -0400 @@ -234,7 +234,7 @@ static struct scsi_host_template it8213_ }; @@ -20969,9 +21132,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_it8213.c linux-2.6.32.15/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = it8213_cable_detect, .set_piomode = it8213_set_piomode, -diff -urNp linux-2.6.32.15/drivers/ata/pata_it821x.c linux-2.6.32.15/drivers/ata/pata_it821x.c ---- linux-2.6.32.15/drivers/ata/pata_it821x.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_it821x.c 2010-05-28 21:27:15.251151122 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_it821x.c linux-2.6.32.16/drivers/ata/pata_it821x.c +--- linux-2.6.32.16/drivers/ata/pata_it821x.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_it821x.c 2010-07-09 14:50:35.000000000 -0400 @@ -800,7 +800,7 @@ static struct scsi_host_template it821x_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -20999,9 +21162,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_it821x.c linux-2.6.32.15/drivers/ata .inherits = &ata_bmdma_port_ops, .check_atapi_dma= it821x_check_atapi_dma, -diff -urNp linux-2.6.32.15/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.15/drivers/ata/pata_ixp4xx_cf.c ---- linux-2.6.32.15/drivers/ata/pata_ixp4xx_cf.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_ixp4xx_cf.c 2010-05-28 21:27:15.251151122 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.16/drivers/ata/pata_ixp4xx_cf.c +--- linux-2.6.32.16/drivers/ata/pata_ixp4xx_cf.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_ixp4xx_cf.c 2010-07-09 14:50:35.000000000 -0400 @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ ATA_PIO_SHT(DRV_NAME), }; @@ -21011,9 +21174,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.15/drivers/ .inherits = &ata_sff_port_ops, .sff_data_xfer = ixp4xx_mmio_data_xfer, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.15/drivers/ata/pata_jmicron.c linux-2.6.32.15/drivers/ata/pata_jmicron.c ---- linux-2.6.32.15/drivers/ata/pata_jmicron.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_jmicron.c 2010-05-28 21:27:15.251151122 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_jmicron.c linux-2.6.32.16/drivers/ata/pata_jmicron.c +--- linux-2.6.32.16/drivers/ata/pata_jmicron.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_jmicron.c 2010-07-09 14:50:35.000000000 -0400 @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron ATA_BMDMA_SHT(DRV_NAME), }; @@ -21023,9 +21186,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_jmicron.c linux-2.6.32.15/drivers/at .inherits = &ata_bmdma_port_ops, .prereset = jmicron_pre_reset, }; -diff -urNp linux-2.6.32.15/drivers/ata/pata_legacy.c linux-2.6.32.15/drivers/ata/pata_legacy.c ---- linux-2.6.32.15/drivers/ata/pata_legacy.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_legacy.c 2010-05-28 21:27:15.251151122 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_legacy.c linux-2.6.32.16/drivers/ata/pata_legacy.c +--- linux-2.6.32.16/drivers/ata/pata_legacy.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_legacy.c 2010-07-09 14:50:35.000000000 -0400 @@ -106,7 +106,7 @@ struct legacy_probe { 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 struct legacy_data *ld = &legacy_data[probe->slot]; struct ata_host *host = NULL; struct ata_port *ap; -diff -urNp linux-2.6.32.15/drivers/ata/pata_marvell.c linux-2.6.32.15/drivers/ata/pata_marvell.c ---- linux-2.6.32.15/drivers/ata/pata_marvell.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_marvell.c 2010-05-28 21:27:15.251151122 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_marvell.c linux-2.6.32.16/drivers/ata/pata_marvell.c +--- linux-2.6.32.16/drivers/ata/pata_marvell.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_marvell.c 2010-07-09 14:50:35.000000000 -0400 @@ -100,7 +100,7 @@ static struct scsi_host_template marvell ATA_BMDMA_SHT(DRV_NAME), }; @@ -21149,9 +21312,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_marvell.c linux-2.6.32.15/drivers/at .inherits = &ata_bmdma_port_ops, .cable_detect = marvell_cable_detect, .prereset = marvell_pre_reset, -diff -urNp linux-2.6.32.15/drivers/ata/pata_mpc52xx.c linux-2.6.32.15/drivers/ata/pata_mpc52xx.c ---- linux-2.6.32.15/drivers/ata/pata_mpc52xx.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_mpc52xx.c 2010-05-28 21:27:15.251151122 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_mpc52xx.c linux-2.6.32.16/drivers/ata/pata_mpc52xx.c +--- linux-2.6.32.16/drivers/ata/pata_mpc52xx.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_mpc52xx.c 2010-07-09 14:50:35.000000000 -0400 @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx ATA_PIO_SHT(DRV_NAME), }; @@ -21161,9 +21324,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_mpc52xx.c linux-2.6.32.15/drivers/at .inherits = &ata_sff_port_ops, .sff_dev_select = mpc52xx_ata_dev_select, .set_piomode = mpc52xx_ata_set_piomode, -diff -urNp linux-2.6.32.15/drivers/ata/pata_mpiix.c linux-2.6.32.15/drivers/ata/pata_mpiix.c ---- linux-2.6.32.15/drivers/ata/pata_mpiix.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_mpiix.c 2010-05-28 21:27:15.251151122 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_mpiix.c linux-2.6.32.16/drivers/ata/pata_mpiix.c +--- linux-2.6.32.16/drivers/ata/pata_mpiix.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_mpiix.c 2010-07-09 14:50:35.000000000 -0400 @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s ATA_PIO_SHT(DRV_NAME), }; @@ -21173,9 +21336,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_mpiix.c linux-2.6.32.15/drivers/ata/ .inherits = &ata_sff_port_ops, .qc_issue = mpiix_qc_issue, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.15/drivers/ata/pata_netcell.c linux-2.6.32.15/drivers/ata/pata_netcell.c ---- linux-2.6.32.15/drivers/ata/pata_netcell.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_netcell.c 2010-05-28 21:27:15.251151122 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_netcell.c linux-2.6.32.16/drivers/ata/pata_netcell.c +--- linux-2.6.32.16/drivers/ata/pata_netcell.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_netcell.c 2010-07-09 14:50:35.000000000 -0400 @@ -34,7 +34,7 @@ static struct scsi_host_template netcell ATA_BMDMA_SHT(DRV_NAME), }; @@ -21185,9 +21348,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_netcell.c linux-2.6.32.15/drivers/at .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_80wire, .read_id = netcell_read_id, -diff -urNp linux-2.6.32.15/drivers/ata/pata_ninja32.c linux-2.6.32.15/drivers/ata/pata_ninja32.c ---- linux-2.6.32.15/drivers/ata/pata_ninja32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_ninja32.c 2010-05-28 21:27:15.251151122 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_ninja32.c linux-2.6.32.16/drivers/ata/pata_ninja32.c +--- linux-2.6.32.16/drivers/ata/pata_ninja32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_ninja32.c 2010-07-09 14:50:35.000000000 -0400 @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 ATA_BMDMA_SHT(DRV_NAME), }; @@ -21197,9 +21360,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_ninja32.c linux-2.6.32.15/drivers/at .inherits = &ata_bmdma_port_ops, .sff_dev_select = ninja32_dev_select, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.15/drivers/ata/pata_ns87410.c linux-2.6.32.15/drivers/ata/pata_ns87410.c ---- linux-2.6.32.15/drivers/ata/pata_ns87410.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_ns87410.c 2010-05-28 21:27:15.251151122 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_ns87410.c linux-2.6.32.16/drivers/ata/pata_ns87410.c +--- linux-2.6.32.16/drivers/ata/pata_ns87410.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_ns87410.c 2010-07-09 14:50:35.000000000 -0400 @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 ATA_PIO_SHT(DRV_NAME), }; @@ -21209,9 +21372,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_ns87410.c linux-2.6.32.15/drivers/at .inherits = &ata_sff_port_ops, .qc_issue = ns87410_qc_issue, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.15/drivers/ata/pata_ns87415.c linux-2.6.32.15/drivers/ata/pata_ns87415.c ---- linux-2.6.32.15/drivers/ata/pata_ns87415.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_ns87415.c 2010-05-28 21:27:15.251151122 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_ns87415.c linux-2.6.32.16/drivers/ata/pata_ns87415.c +--- linux-2.6.32.16/drivers/ata/pata_ns87415.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_ns87415.c 2010-07-09 14:50:35.000000000 -0400 @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at } #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 .inherits = &ns87415_pata_ops, .sff_tf_read = ns87560_tf_read, .sff_check_status = ns87560_check_status, -diff -urNp linux-2.6.32.15/drivers/ata/pata_octeon_cf.c linux-2.6.32.15/drivers/ata/pata_octeon_cf.c ---- linux-2.6.32.15/drivers/ata/pata_octeon_cf.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_octeon_cf.c 2010-05-28 21:27:15.251151122 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_octeon_cf.c linux-2.6.32.16/drivers/ata/pata_octeon_cf.c +--- linux-2.6.32.16/drivers/ata/pata_octeon_cf.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_octeon_cf.c 2010-07-09 14:50:35.000000000 -0400 @@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s return 0; } @@ -21241,9 +21404,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_octeon_cf.c linux-2.6.32.15/drivers/ static struct ata_port_operations octeon_cf_ops = { .inherits = &ata_sff_port_ops, .check_atapi_dma = octeon_cf_check_atapi_dma, -diff -urNp linux-2.6.32.15/drivers/ata/pata_oldpiix.c linux-2.6.32.15/drivers/ata/pata_oldpiix.c ---- linux-2.6.32.15/drivers/ata/pata_oldpiix.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_oldpiix.c 2010-05-28 21:27:15.251151122 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_oldpiix.c linux-2.6.32.16/drivers/ata/pata_oldpiix.c +--- linux-2.6.32.16/drivers/ata/pata_oldpiix.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_oldpiix.c 2010-07-09 14:50:35.000000000 -0400 @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix ATA_BMDMA_SHT(DRV_NAME), }; @@ -21253,9 +21416,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_oldpiix.c linux-2.6.32.15/drivers/at .inherits = &ata_bmdma_port_ops, .qc_issue = oldpiix_qc_issue, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.15/drivers/ata/pata_opti.c linux-2.6.32.15/drivers/ata/pata_opti.c ---- linux-2.6.32.15/drivers/ata/pata_opti.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_opti.c 2010-05-28 21:27:15.263188611 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_opti.c linux-2.6.32.16/drivers/ata/pata_opti.c +--- linux-2.6.32.16/drivers/ata/pata_opti.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_opti.c 2010-07-09 14:50:35.000000000 -0400 @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh ATA_PIO_SHT(DRV_NAME), }; @@ -21265,9 +21428,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_opti.c linux-2.6.32.15/drivers/ata/p .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = opti_set_piomode, -diff -urNp linux-2.6.32.15/drivers/ata/pata_optidma.c linux-2.6.32.15/drivers/ata/pata_optidma.c ---- linux-2.6.32.15/drivers/ata/pata_optidma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_optidma.c 2010-05-28 21:27:15.263188611 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_optidma.c linux-2.6.32.16/drivers/ata/pata_optidma.c +--- linux-2.6.32.16/drivers/ata/pata_optidma.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_optidma.c 2010-07-09 14:50:35.000000000 -0400 @@ -337,7 +337,7 @@ static struct scsi_host_template optidma ATA_BMDMA_SHT(DRV_NAME), }; @@ -21286,9 +21449,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_optidma.c linux-2.6.32.15/drivers/at .inherits = &optidma_port_ops, .set_piomode = optiplus_set_pio_mode, .set_dmamode = optiplus_set_dma_mode, -diff -urNp linux-2.6.32.15/drivers/ata/pata_palmld.c linux-2.6.32.15/drivers/ata/pata_palmld.c ---- linux-2.6.32.15/drivers/ata/pata_palmld.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_palmld.c 2010-05-28 21:27:15.263188611 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_palmld.c linux-2.6.32.16/drivers/ata/pata_palmld.c +--- linux-2.6.32.16/drivers/ata/pata_palmld.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_palmld.c 2010-07-09 14:50:35.000000000 -0400 @@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ ATA_PIO_SHT(DRV_NAME), }; @@ -21298,9 +21461,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_palmld.c linux-2.6.32.15/drivers/ata .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.15/drivers/ata/pata_pcmcia.c linux-2.6.32.15/drivers/ata/pata_pcmcia.c ---- linux-2.6.32.15/drivers/ata/pata_pcmcia.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_pcmcia.c 2010-05-28 21:27:15.263188611 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_pcmcia.c linux-2.6.32.16/drivers/ata/pata_pcmcia.c +--- linux-2.6.32.16/drivers/ata/pata_pcmcia.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_pcmcia.c 2010-07-09 14:50:35.000000000 -0400 @@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_ ATA_PIO_SHT(DRV_NAME), }; @@ -21327,9 +21490,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_pcmcia.c linux-2.6.32.15/drivers/ata info = kzalloc(sizeof(*info), GFP_KERNEL); if (info == NULL) -diff -urNp linux-2.6.32.15/drivers/ata/pata_pdc2027x.c linux-2.6.32.15/drivers/ata/pata_pdc2027x.c ---- linux-2.6.32.15/drivers/ata/pata_pdc2027x.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_pdc2027x.c 2010-05-28 21:27:15.263188611 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_pdc2027x.c linux-2.6.32.16/drivers/ata/pata_pdc2027x.c +--- linux-2.6.32.16/drivers/ata/pata_pdc2027x.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_pdc2027x.c 2010-07-09 14:50:35.000000000 -0400 @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 ATA_BMDMA_SHT(DRV_NAME), }; @@ -21347,9 +21510,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_pdc2027x.c linux-2.6.32.15/drivers/a .inherits = &pdc2027x_pata100_ops, .mode_filter = pdc2027x_mode_filter, .set_piomode = pdc2027x_set_piomode, -diff -urNp linux-2.6.32.15/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.15/drivers/ata/pata_pdc202xx_old.c ---- linux-2.6.32.15/drivers/ata/pata_pdc202xx_old.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_pdc202xx_old.c 2010-05-28 21:27:15.263188611 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.16/drivers/ata/pata_pdc202xx_old.c +--- linux-2.6.32.16/drivers/ata/pata_pdc202xx_old.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_pdc202xx_old.c 2010-07-09 14:50:35.000000000 -0400 @@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x ATA_BMDMA_SHT(DRV_NAME), }; @@ -21368,9 +21531,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.15/drive .inherits = &pdc2024x_port_ops, .check_atapi_dma = pdc2026x_check_atapi_dma, -diff -urNp linux-2.6.32.15/drivers/ata/pata_platform.c linux-2.6.32.15/drivers/ata/pata_platform.c ---- linux-2.6.32.15/drivers/ata/pata_platform.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_platform.c 2010-05-28 21:27:15.263188611 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_platform.c linux-2.6.32.16/drivers/ata/pata_platform.c +--- linux-2.6.32.16/drivers/ata/pata_platform.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_platform.c 2010-07-09 14:50:35.000000000 -0400 @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl ATA_PIO_SHT(DRV_NAME), }; @@ -21380,9 +21543,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_platform.c linux-2.6.32.15/drivers/a .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, .cable_detect = ata_cable_unknown, -diff -urNp linux-2.6.32.15/drivers/ata/pata_qdi.c linux-2.6.32.15/drivers/ata/pata_qdi.c ---- linux-2.6.32.15/drivers/ata/pata_qdi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_qdi.c 2010-05-28 21:27:15.263188611 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_qdi.c linux-2.6.32.16/drivers/ata/pata_qdi.c +--- linux-2.6.32.16/drivers/ata/pata_qdi.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_qdi.c 2010-07-09 14:50:35.000000000 -0400 @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht ATA_PIO_SHT(DRV_NAME), }; @@ -21401,9 +21564,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_qdi.c linux-2.6.32.15/drivers/ata/pa .inherits = &qdi6500_port_ops, .set_piomode = qdi6580_set_piomode, }; -diff -urNp linux-2.6.32.15/drivers/ata/pata_radisys.c linux-2.6.32.15/drivers/ata/pata_radisys.c ---- linux-2.6.32.15/drivers/ata/pata_radisys.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_radisys.c 2010-05-28 21:27:15.267180677 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_radisys.c linux-2.6.32.16/drivers/ata/pata_radisys.c +--- linux-2.6.32.16/drivers/ata/pata_radisys.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_radisys.c 2010-07-09 14:50:35.000000000 -0400 @@ -187,7 +187,7 @@ static struct scsi_host_template radisys ATA_BMDMA_SHT(DRV_NAME), }; @@ -21413,9 +21576,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_radisys.c linux-2.6.32.15/drivers/at .inherits = &ata_bmdma_port_ops, .qc_issue = radisys_qc_issue, .cable_detect = ata_cable_unknown, -diff -urNp linux-2.6.32.15/drivers/ata/pata_rb532_cf.c linux-2.6.32.15/drivers/ata/pata_rb532_cf.c ---- linux-2.6.32.15/drivers/ata/pata_rb532_cf.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_rb532_cf.c 2010-05-28 21:27:15.267180677 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_rb532_cf.c linux-2.6.32.16/drivers/ata/pata_rb532_cf.c +--- linux-2.6.32.16/drivers/ata/pata_rb532_cf.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_rb532_cf.c 2010-07-09 14:50:35.000000000 -0400 @@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle return IRQ_HANDLED; } @@ -21425,9 +21588,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_rb532_cf.c linux-2.6.32.15/drivers/a .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer32, }; -diff -urNp linux-2.6.32.15/drivers/ata/pata_rdc.c linux-2.6.32.15/drivers/ata/pata_rdc.c ---- linux-2.6.32.15/drivers/ata/pata_rdc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_rdc.c 2010-05-28 21:27:15.267180677 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_rdc.c linux-2.6.32.16/drivers/ata/pata_rdc.c +--- linux-2.6.32.16/drivers/ata/pata_rdc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_rdc.c 2010-07-09 14:50:35.000000000 -0400 @@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p pci_write_config_byte(dev, 0x48, udma_enable); } @@ -21437,9 +21600,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_rdc.c linux-2.6.32.15/drivers/ata/pa .inherits = &ata_bmdma32_port_ops, .cable_detect = rdc_pata_cable_detect, .set_piomode = rdc_set_piomode, -diff -urNp linux-2.6.32.15/drivers/ata/pata_rz1000.c linux-2.6.32.15/drivers/ata/pata_rz1000.c ---- linux-2.6.32.15/drivers/ata/pata_rz1000.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_rz1000.c 2010-05-28 21:27:15.267180677 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_rz1000.c linux-2.6.32.16/drivers/ata/pata_rz1000.c +--- linux-2.6.32.16/drivers/ata/pata_rz1000.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_rz1000.c 2010-07-09 14:50:35.000000000 -0400 @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ ATA_PIO_SHT(DRV_NAME), }; @@ -21449,9 +21612,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_rz1000.c linux-2.6.32.15/drivers/ata .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_mode = rz1000_set_mode, -diff -urNp linux-2.6.32.15/drivers/ata/pata_sc1200.c linux-2.6.32.15/drivers/ata/pata_sc1200.c ---- linux-2.6.32.15/drivers/ata/pata_sc1200.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_sc1200.c 2010-05-28 21:27:15.267180677 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_sc1200.c linux-2.6.32.16/drivers/ata/pata_sc1200.c +--- linux-2.6.32.16/drivers/ata/pata_sc1200.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_sc1200.c 2010-07-09 14:50:35.000000000 -0400 @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -21461,9 +21624,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_sc1200.c linux-2.6.32.15/drivers/ata .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, .qc_issue = sc1200_qc_issue, -diff -urNp linux-2.6.32.15/drivers/ata/pata_scc.c linux-2.6.32.15/drivers/ata/pata_scc.c ---- linux-2.6.32.15/drivers/ata/pata_scc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_scc.c 2010-05-28 21:27:15.267180677 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_scc.c linux-2.6.32.16/drivers/ata/pata_scc.c +--- linux-2.6.32.16/drivers/ata/pata_scc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_scc.c 2010-07-09 14:50:35.000000000 -0400 @@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -21473,9 +21636,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_scc.c linux-2.6.32.15/drivers/ata/pa .inherits = &ata_bmdma_port_ops, .set_piomode = scc_set_piomode, -diff -urNp linux-2.6.32.15/drivers/ata/pata_sch.c linux-2.6.32.15/drivers/ata/pata_sch.c ---- linux-2.6.32.15/drivers/ata/pata_sch.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_sch.c 2010-05-28 21:27:15.267180677 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_sch.c linux-2.6.32.16/drivers/ata/pata_sch.c +--- linux-2.6.32.16/drivers/ata/pata_sch.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_sch.c 2010-07-09 14:50:35.000000000 -0400 @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -21485,9 +21648,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_sch.c linux-2.6.32.15/drivers/ata/pa .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_unknown, .set_piomode = sch_set_piomode, -diff -urNp linux-2.6.32.15/drivers/ata/pata_serverworks.c linux-2.6.32.15/drivers/ata/pata_serverworks.c ---- linux-2.6.32.15/drivers/ata/pata_serverworks.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_serverworks.c 2010-05-28 21:27:15.267180677 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_serverworks.c linux-2.6.32.16/drivers/ata/pata_serverworks.c +--- linux-2.6.32.16/drivers/ata/pata_serverworks.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_serverworks.c 2010-07-09 14:50:35.000000000 -0400 @@ -299,7 +299,7 @@ static struct scsi_host_template serverw ATA_BMDMA_SHT(DRV_NAME), }; @@ -21506,9 +21669,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_serverworks.c linux-2.6.32.15/driver .inherits = &serverworks_osb4_port_ops, .mode_filter = serverworks_csb_filter, }; -diff -urNp linux-2.6.32.15/drivers/ata/pata_sil680.c linux-2.6.32.15/drivers/ata/pata_sil680.c ---- linux-2.6.32.15/drivers/ata/pata_sil680.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_sil680.c 2010-05-28 21:27:15.267180677 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_sil680.c linux-2.6.32.16/drivers/ata/pata_sil680.c +--- linux-2.6.32.16/drivers/ata/pata_sil680.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_sil680.c 2010-07-09 14:50:35.000000000 -0400 @@ -194,7 +194,7 @@ static struct scsi_host_template sil680_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -21518,9 +21681,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_sil680.c linux-2.6.32.15/drivers/ata .inherits = &ata_bmdma32_port_ops, .cable_detect = sil680_cable_detect, .set_piomode = sil680_set_piomode, -diff -urNp linux-2.6.32.15/drivers/ata/pata_sis.c linux-2.6.32.15/drivers/ata/pata_sis.c ---- linux-2.6.32.15/drivers/ata/pata_sis.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_sis.c 2010-05-28 21:27:15.267180677 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_sis.c linux-2.6.32.16/drivers/ata/pata_sis.c +--- linux-2.6.32.16/drivers/ata/pata_sis.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_sis.c 2010-07-09 14:50:35.000000000 -0400 @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -21576,9 +21739,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_sis.c linux-2.6.32.15/drivers/ata/pa .inherits = &sis_base_ops, .set_piomode = sis_old_set_piomode, .set_dmamode = sis_old_set_dmamode, -diff -urNp linux-2.6.32.15/drivers/ata/pata_sl82c105.c linux-2.6.32.15/drivers/ata/pata_sl82c105.c ---- linux-2.6.32.15/drivers/ata/pata_sl82c105.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_sl82c105.c 2010-05-28 21:27:15.267180677 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_sl82c105.c linux-2.6.32.16/drivers/ata/pata_sl82c105.c +--- linux-2.6.32.16/drivers/ata/pata_sl82c105.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_sl82c105.c 2010-07-09 14:50:35.000000000 -0400 @@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10 ATA_BMDMA_SHT(DRV_NAME), }; @@ -21588,9 +21751,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_sl82c105.c linux-2.6.32.15/drivers/a .inherits = &ata_bmdma_port_ops, .qc_defer = sl82c105_qc_defer, .bmdma_start = sl82c105_bmdma_start, -diff -urNp linux-2.6.32.15/drivers/ata/pata_triflex.c linux-2.6.32.15/drivers/ata/pata_triflex.c ---- linux-2.6.32.15/drivers/ata/pata_triflex.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_triflex.c 2010-05-28 21:27:15.267180677 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_triflex.c linux-2.6.32.16/drivers/ata/pata_triflex.c +--- linux-2.6.32.16/drivers/ata/pata_triflex.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_triflex.c 2010-07-09 14:50:35.000000000 -0400 @@ -178,7 +178,7 @@ static struct scsi_host_template triflex ATA_BMDMA_SHT(DRV_NAME), }; @@ -21600,9 +21763,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_triflex.c linux-2.6.32.15/drivers/at .inherits = &ata_bmdma_port_ops, .bmdma_start = triflex_bmdma_start, .bmdma_stop = triflex_bmdma_stop, -diff -urNp linux-2.6.32.15/drivers/ata/pata_via.c linux-2.6.32.15/drivers/ata/pata_via.c ---- linux-2.6.32.15/drivers/ata/pata_via.c 2010-04-29 17:49:37.709698369 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_via.c 2010-05-28 21:27:15.267180677 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_via.c linux-2.6.32.16/drivers/ata/pata_via.c +--- linux-2.6.32.16/drivers/ata/pata_via.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_via.c 2010-07-09 14:50:35.000000000 -0400 @@ -419,7 +419,7 @@ static struct scsi_host_template via_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -21621,9 +21784,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_via.c linux-2.6.32.15/drivers/ata/pa .inherits = &via_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, }; -diff -urNp linux-2.6.32.15/drivers/ata/pata_winbond.c linux-2.6.32.15/drivers/ata/pata_winbond.c ---- linux-2.6.32.15/drivers/ata/pata_winbond.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pata_winbond.c 2010-05-28 21:27:15.267180677 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pata_winbond.c linux-2.6.32.16/drivers/ata/pata_winbond.c +--- linux-2.6.32.16/drivers/ata/pata_winbond.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pata_winbond.c 2010-07-09 14:50:35.000000000 -0400 @@ -125,7 +125,7 @@ static struct scsi_host_template winbond ATA_PIO_SHT(DRV_NAME), }; @@ -21633,9 +21796,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pata_winbond.c linux-2.6.32.15/drivers/at .inherits = &ata_sff_port_ops, .sff_data_xfer = winbond_data_xfer, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.15/drivers/ata/pdc_adma.c linux-2.6.32.15/drivers/ata/pdc_adma.c ---- linux-2.6.32.15/drivers/ata/pdc_adma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/pdc_adma.c 2010-05-28 21:27:15.267180677 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/pdc_adma.c linux-2.6.32.16/drivers/ata/pdc_adma.c +--- linux-2.6.32.16/drivers/ata/pdc_adma.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/pdc_adma.c 2010-07-09 14:50:35.000000000 -0400 @@ -145,7 +145,7 @@ static struct scsi_host_template adma_at .dma_boundary = ADMA_DMA_BOUNDARY, }; @@ -21645,9 +21808,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/pdc_adma.c linux-2.6.32.15/drivers/ata/pd .inherits = &ata_sff_port_ops, .lost_interrupt = ATA_OP_NULL, -diff -urNp linux-2.6.32.15/drivers/ata/sata_fsl.c linux-2.6.32.15/drivers/ata/sata_fsl.c ---- linux-2.6.32.15/drivers/ata/sata_fsl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/sata_fsl.c 2010-05-28 21:27:15.270965204 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/sata_fsl.c linux-2.6.32.16/drivers/ata/sata_fsl.c +--- linux-2.6.32.16/drivers/ata/sata_fsl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/sata_fsl.c 2010-07-09 14:50:35.000000000 -0400 @@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -21657,9 +21820,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_fsl.c linux-2.6.32.15/drivers/ata/sa .inherits = &sata_pmp_port_ops, .qc_defer = ata_std_qc_defer, -diff -urNp linux-2.6.32.15/drivers/ata/sata_inic162x.c linux-2.6.32.15/drivers/ata/sata_inic162x.c ---- linux-2.6.32.15/drivers/ata/sata_inic162x.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/sata_inic162x.c 2010-05-28 21:27:15.270965204 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/sata_inic162x.c linux-2.6.32.16/drivers/ata/sata_inic162x.c +--- linux-2.6.32.16/drivers/ata/sata_inic162x.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/sata_inic162x.c 2010-07-09 14:50:35.000000000 -0400 @@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po return 0; } @@ -21669,9 +21832,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_inic162x.c linux-2.6.32.15/drivers/a .inherits = &sata_port_ops, .check_atapi_dma = inic_check_atapi_dma, -diff -urNp linux-2.6.32.15/drivers/ata/sata_mv.c linux-2.6.32.15/drivers/ata/sata_mv.c ---- linux-2.6.32.15/drivers/ata/sata_mv.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/sata_mv.c 2010-05-28 21:27:15.270965204 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/sata_mv.c linux-2.6.32.16/drivers/ata/sata_mv.c +--- linux-2.6.32.16/drivers/ata/sata_mv.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/sata_mv.c 2010-07-09 14:50:35.000000000 -0400 @@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht .dma_boundary = MV_DMA_BOUNDARY, }; @@ -21699,9 +21862,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_mv.c linux-2.6.32.15/drivers/ata/sat .inherits = &mv6_ops, .dev_config = ATA_OP_NULL, .qc_prep = mv_qc_prep_iie, -diff -urNp linux-2.6.32.15/drivers/ata/sata_nv.c linux-2.6.32.15/drivers/ata/sata_nv.c ---- linux-2.6.32.15/drivers/ata/sata_nv.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/sata_nv.c 2010-05-28 21:27:15.275100842 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/sata_nv.c linux-2.6.32.16/drivers/ata/sata_nv.c +--- linux-2.6.32.16/drivers/ata/sata_nv.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/sata_nv.c 2010-07-09 14:50:35.000000000 -0400 @@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc * cases. Define nv_hardreset() which only kicks in for post-boot * 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 .inherits = &nv_generic_ops, .qc_defer = ata_std_qc_defer, -diff -urNp linux-2.6.32.15/drivers/ata/sata_promise.c linux-2.6.32.15/drivers/ata/sata_promise.c ---- linux-2.6.32.15/drivers/ata/sata_promise.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/sata_promise.c 2010-05-28 21:27:15.275100842 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/sata_promise.c linux-2.6.32.16/drivers/ata/sata_promise.c +--- linux-2.6.32.16/drivers/ata/sata_promise.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/sata_promise.c 2010-07-09 14:50:35.000000000 -0400 @@ -195,7 +195,7 @@ static const struct ata_port_operations .error_handler = pdc_error_handler, }; @@ -21773,9 +21936,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_promise.c linux-2.6.32.15/drivers/at .inherits = &pdc_common_ops, .cable_detect = pdc_pata_cable_detect, .freeze = pdc_freeze, -diff -urNp linux-2.6.32.15/drivers/ata/sata_qstor.c linux-2.6.32.15/drivers/ata/sata_qstor.c ---- linux-2.6.32.15/drivers/ata/sata_qstor.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/sata_qstor.c 2010-05-28 21:27:15.275100842 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/sata_qstor.c linux-2.6.32.16/drivers/ata/sata_qstor.c +--- linux-2.6.32.16/drivers/ata/sata_qstor.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/sata_qstor.c 2010-07-09 14:50:35.000000000 -0400 @@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_ .dma_boundary = QS_DMA_BOUNDARY, }; @@ -21785,9 +21948,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_qstor.c linux-2.6.32.15/drivers/ata/ .inherits = &ata_sff_port_ops, .check_atapi_dma = qs_check_atapi_dma, -diff -urNp linux-2.6.32.15/drivers/ata/sata_sil24.c linux-2.6.32.15/drivers/ata/sata_sil24.c ---- linux-2.6.32.15/drivers/ata/sata_sil24.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/sata_sil24.c 2010-05-28 21:27:15.275100842 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/sata_sil24.c linux-2.6.32.16/drivers/ata/sata_sil24.c +--- linux-2.6.32.16/drivers/ata/sata_sil24.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/sata_sil24.c 2010-07-09 14:50:35.000000000 -0400 @@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -21797,9 +21960,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_sil24.c linux-2.6.32.15/drivers/ata/ .inherits = &sata_pmp_port_ops, .qc_defer = sil24_qc_defer, -diff -urNp linux-2.6.32.15/drivers/ata/sata_sil.c linux-2.6.32.15/drivers/ata/sata_sil.c ---- linux-2.6.32.15/drivers/ata/sata_sil.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/sata_sil.c 2010-05-28 21:27:15.275100842 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/sata_sil.c linux-2.6.32.16/drivers/ata/sata_sil.c +--- linux-2.6.32.16/drivers/ata/sata_sil.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/sata_sil.c 2010-07-09 14:50:35.000000000 -0400 @@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht .sg_tablesize = ATA_MAX_PRD }; @@ -21809,9 +21972,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_sil.c linux-2.6.32.15/drivers/ata/sa .inherits = &ata_bmdma32_port_ops, .dev_config = sil_dev_config, .set_mode = sil_set_mode, -diff -urNp linux-2.6.32.15/drivers/ata/sata_sis.c linux-2.6.32.15/drivers/ata/sata_sis.c ---- linux-2.6.32.15/drivers/ata/sata_sis.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/sata_sis.c 2010-05-28 21:27:15.275100842 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/sata_sis.c linux-2.6.32.16/drivers/ata/sata_sis.c +--- linux-2.6.32.16/drivers/ata/sata_sis.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/sata_sis.c 2010-07-09 14:50:35.000000000 -0400 @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -21821,9 +21984,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_sis.c linux-2.6.32.15/drivers/ata/sa .inherits = &ata_bmdma_port_ops, .scr_read = sis_scr_read, .scr_write = sis_scr_write, -diff -urNp linux-2.6.32.15/drivers/ata/sata_svw.c linux-2.6.32.15/drivers/ata/sata_svw.c ---- linux-2.6.32.15/drivers/ata/sata_svw.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/sata_svw.c 2010-05-28 21:27:15.275100842 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/sata_svw.c linux-2.6.32.16/drivers/ata/sata_svw.c +--- linux-2.6.32.16/drivers/ata/sata_svw.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/sata_svw.c 2010-07-09 14:50:35.000000000 -0400 @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata }; @@ -21833,9 +21996,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_svw.c linux-2.6.32.15/drivers/ata/sa .inherits = &ata_bmdma_port_ops, .sff_tf_load = k2_sata_tf_load, .sff_tf_read = k2_sata_tf_read, -diff -urNp linux-2.6.32.15/drivers/ata/sata_sx4.c linux-2.6.32.15/drivers/ata/sata_sx4.c ---- linux-2.6.32.15/drivers/ata/sata_sx4.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/sata_sx4.c 2010-05-28 21:27:15.275100842 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/sata_sx4.c linux-2.6.32.16/drivers/ata/sata_sx4.c +--- linux-2.6.32.16/drivers/ata/sata_sx4.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/sata_sx4.c 2010-07-09 14:50:35.000000000 -0400 @@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat }; @@ -21845,9 +22008,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_sx4.c linux-2.6.32.15/drivers/ata/sa .inherits = &ata_sff_port_ops, .check_atapi_dma = pdc_check_atapi_dma, -diff -urNp linux-2.6.32.15/drivers/ata/sata_uli.c linux-2.6.32.15/drivers/ata/sata_uli.c ---- linux-2.6.32.15/drivers/ata/sata_uli.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/sata_uli.c 2010-05-28 21:27:15.275100842 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/sata_uli.c linux-2.6.32.16/drivers/ata/sata_uli.c +--- linux-2.6.32.16/drivers/ata/sata_uli.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/sata_uli.c 2010-07-09 14:50:35.000000000 -0400 @@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -21857,9 +22020,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_uli.c linux-2.6.32.15/drivers/ata/sa .inherits = &ata_bmdma_port_ops, .scr_read = uli_scr_read, .scr_write = uli_scr_write, -diff -urNp linux-2.6.32.15/drivers/ata/sata_via.c linux-2.6.32.15/drivers/ata/sata_via.c ---- linux-2.6.32.15/drivers/ata/sata_via.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/sata_via.c 2010-05-28 21:27:15.275100842 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/sata_via.c linux-2.6.32.16/drivers/ata/sata_via.c +--- linux-2.6.32.16/drivers/ata/sata_via.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/sata_via.c 2010-07-09 14:50:35.000000000 -0400 @@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -21897,9 +22060,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_via.c linux-2.6.32.15/drivers/ata/sa .inherits = &svia_base_ops, .hardreset = sata_std_hardreset, .scr_read = vt8251_scr_read, -diff -urNp linux-2.6.32.15/drivers/ata/sata_vsc.c linux-2.6.32.15/drivers/ata/sata_vsc.c ---- linux-2.6.32.15/drivers/ata/sata_vsc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ata/sata_vsc.c 2010-05-28 21:27:15.275100842 -0400 +diff -urNp linux-2.6.32.16/drivers/ata/sata_vsc.c linux-2.6.32.16/drivers/ata/sata_vsc.c +--- linux-2.6.32.16/drivers/ata/sata_vsc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ata/sata_vsc.c 2010-07-09 14:50:35.000000000 -0400 @@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat }; @@ -21909,9 +22072,9 @@ diff -urNp linux-2.6.32.15/drivers/ata/sata_vsc.c linux-2.6.32.15/drivers/ata/sa .inherits = &ata_bmdma_port_ops, /* The IRQ handling is not quite standard SFF behaviour so we cannot use the default lost interrupt handler */ -diff -urNp linux-2.6.32.15/drivers/atm/adummy.c linux-2.6.32.15/drivers/atm/adummy.c ---- linux-2.6.32.15/drivers/atm/adummy.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/atm/adummy.c 2010-05-28 21:27:15.275100842 -0400 +diff -urNp linux-2.6.32.16/drivers/atm/adummy.c linux-2.6.32.16/drivers/atm/adummy.c +--- linux-2.6.32.16/drivers/atm/adummy.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/atm/adummy.c 2010-07-09 14:50:35.000000000 -0400 @@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct vcc->pop(vcc, skb); else @@ -21921,9 +22084,9 @@ diff -urNp linux-2.6.32.15/drivers/atm/adummy.c linux-2.6.32.15/drivers/atm/adum return 0; } -diff -urNp linux-2.6.32.15/drivers/atm/ambassador.c linux-2.6.32.15/drivers/atm/ambassador.c ---- linux-2.6.32.15/drivers/atm/ambassador.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/atm/ambassador.c 2010-05-28 21:27:15.283225651 -0400 +diff -urNp linux-2.6.32.16/drivers/atm/ambassador.c linux-2.6.32.16/drivers/atm/ambassador.c +--- linux-2.6.32.16/drivers/atm/ambassador.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/atm/ambassador.c 2010-07-09 14:50:35.000000000 -0400 @@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); @@ -21960,9 +22123,9 @@ diff -urNp linux-2.6.32.15/drivers/atm/ambassador.c linux-2.6.32.15/drivers/atm/ return -ENOMEM; // ? } -diff -urNp linux-2.6.32.15/drivers/atm/atmtcp.c linux-2.6.32.15/drivers/atm/atmtcp.c ---- linux-2.6.32.15/drivers/atm/atmtcp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/atm/atmtcp.c 2010-05-28 21:27:15.287736634 -0400 +diff -urNp linux-2.6.32.16/drivers/atm/atmtcp.c linux-2.6.32.16/drivers/atm/atmtcp.c +--- linux-2.6.32.16/drivers/atm/atmtcp.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/atm/atmtcp.c 2010-07-09 14:50:35.000000000 -0400 @@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc if (vcc->pop) vcc->pop(vcc,skb); 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 done: if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); -diff -urNp linux-2.6.32.15/drivers/atm/eni.c linux-2.6.32.15/drivers/atm/eni.c ---- linux-2.6.32.15/drivers/atm/eni.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/atm/eni.c 2010-05-28 21:27:15.299117902 -0400 +diff -urNp linux-2.6.32.16/drivers/atm/eni.c linux-2.6.32.16/drivers/atm/eni.c +--- linux-2.6.32.16/drivers/atm/eni.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/atm/eni.c 2010-07-09 14:50:35.000000000 -0400 @@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc) DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", 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 wake_up(&eni_dev->tx_wait); dma_complete++; } -diff -urNp linux-2.6.32.15/drivers/atm/firestream.c linux-2.6.32.15/drivers/atm/firestream.c ---- linux-2.6.32.15/drivers/atm/firestream.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/atm/firestream.c 2010-05-28 21:27:15.303175631 -0400 +diff -urNp linux-2.6.32.16/drivers/atm/firestream.c linux-2.6.32.16/drivers/atm/firestream.c +--- linux-2.6.32.16/drivers/atm/firestream.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/atm/firestream.c 2010-07-09 14:50:35.000000000 -0400 @@ -748,7 +748,7 @@ static void process_txdone_queue (struct } } @@ -22096,9 +22259,9 @@ diff -urNp linux-2.6.32.15/drivers/atm/firestream.c linux-2.6.32.15/drivers/atm/ break; default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", -diff -urNp linux-2.6.32.15/drivers/atm/fore200e.c linux-2.6.32.15/drivers/atm/fore200e.c ---- linux-2.6.32.15/drivers/atm/fore200e.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/atm/fore200e.c 2010-05-28 21:27:15.311169155 -0400 +diff -urNp linux-2.6.32.16/drivers/atm/fore200e.c linux-2.6.32.16/drivers/atm/fore200e.c +--- linux-2.6.32.16/drivers/atm/fore200e.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/atm/fore200e.c 2010-07-09 14:50:35.000000000 -0400 @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 #endif /* 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 fore200e->tx_sat++; DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", -diff -urNp linux-2.6.32.15/drivers/atm/he.c linux-2.6.32.15/drivers/atm/he.c ---- linux-2.6.32.15/drivers/atm/he.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/atm/he.c 2010-05-28 21:27:15.311169155 -0400 +diff -urNp linux-2.6.32.16/drivers/atm/he.c linux-2.6.32.16/drivers/atm/he.c +--- linux-2.6.32.16/drivers/atm/he.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/atm/he.c 2010-07-09 14:50:35.000000000 -0400 @@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i 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 return 0; } -diff -urNp linux-2.6.32.15/drivers/atm/horizon.c linux-2.6.32.15/drivers/atm/horizon.c ---- linux-2.6.32.15/drivers/atm/horizon.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/atm/horizon.c 2010-05-28 21:27:15.311169155 -0400 +diff -urNp linux-2.6.32.16/drivers/atm/horizon.c linux-2.6.32.16/drivers/atm/horizon.c +--- linux-2.6.32.16/drivers/atm/horizon.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/atm/horizon.c 2010-07-09 14:50:35.000000000 -0400 @@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, { 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 // free the skb hrz_kfree_skb (skb); -diff -urNp linux-2.6.32.15/drivers/atm/idt77252.c linux-2.6.32.15/drivers/atm/idt77252.c ---- linux-2.6.32.15/drivers/atm/idt77252.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/atm/idt77252.c 2010-05-28 21:27:15.326952874 -0400 +diff -urNp linux-2.6.32.16/drivers/atm/idt77252.c linux-2.6.32.16/drivers/atm/idt77252.c +--- linux-2.6.32.16/drivers/atm/idt77252.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/atm/idt77252.c 2010-07-09 14:50:35.000000000 -0400 @@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str else 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 return -ENOMEM; } atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); -diff -urNp linux-2.6.32.15/drivers/atm/iphase.c linux-2.6.32.15/drivers/atm/iphase.c ---- linux-2.6.32.15/drivers/atm/iphase.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/atm/iphase.c 2010-05-28 21:27:15.326952874 -0400 +diff -urNp linux-2.6.32.16/drivers/atm/iphase.c linux-2.6.32.16/drivers/atm/iphase.c +--- linux-2.6.32.16/drivers/atm/iphase.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/atm/iphase.c 2010-07-09 14:50:35.000000000 -0400 @@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev) status = (u_short) (buf_desc_ptr->desc_mode); 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 if (iavcc->vc_desc_cnt > 10) { vcc->tx_quota = vcc->tx_quota * 3 / 4; printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); -diff -urNp linux-2.6.32.15/drivers/atm/lanai.c linux-2.6.32.15/drivers/atm/lanai.c ---- linux-2.6.32.15/drivers/atm/lanai.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/atm/lanai.c 2010-05-28 21:27:15.331218290 -0400 +diff -urNp linux-2.6.32.16/drivers/atm/lanai.c linux-2.6.32.16/drivers/atm/lanai.c +--- linux-2.6.32.16/drivers/atm/lanai.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/atm/lanai.c 2010-07-09 14:50:35.000000000 -0400 @@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); 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 lvcc->stats.x.aal5.service_rxcrc++; lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); -diff -urNp linux-2.6.32.15/drivers/atm/nicstar.c linux-2.6.32.15/drivers/atm/nicstar.c ---- linux-2.6.32.15/drivers/atm/nicstar.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/atm/nicstar.c 2010-05-28 21:27:15.368039837 -0400 +diff -urNp linux-2.6.32.16/drivers/atm/nicstar.c linux-2.6.32.16/drivers/atm/nicstar.c +--- linux-2.6.32.16/drivers/atm/nicstar.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/atm/nicstar.c 2010-07-09 14:50:35.000000000 -0400 @@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, if ((vc = (vc_map *) vcc->dev_data) == NULL) { @@ -22778,9 +22941,9 @@ diff -urNp linux-2.6.32.15/drivers/atm/nicstar.c linux-2.6.32.15/drivers/atm/nic } } -diff -urNp linux-2.6.32.15/drivers/atm/solos-pci.c linux-2.6.32.15/drivers/atm/solos-pci.c ---- linux-2.6.32.15/drivers/atm/solos-pci.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/atm/solos-pci.c 2010-05-28 21:27:15.368039837 -0400 +diff -urNp linux-2.6.32.16/drivers/atm/solos-pci.c linux-2.6.32.16/drivers/atm/solos-pci.c +--- linux-2.6.32.16/drivers/atm/solos-pci.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/atm/solos-pci.c 2010-07-09 14:50:35.000000000 -0400 @@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg) } 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 solos_pop(vcc, oldskb); } else dev_kfree_skb_irq(oldskb); -diff -urNp linux-2.6.32.15/drivers/atm/suni.c linux-2.6.32.15/drivers/atm/suni.c ---- linux-2.6.32.15/drivers/atm/suni.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/atm/suni.c 2010-05-28 21:27:15.368039837 -0400 +diff -urNp linux-2.6.32.16/drivers/atm/suni.c linux-2.6.32.16/drivers/atm/suni.c +--- linux-2.6.32.16/drivers/atm/suni.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/atm/suni.c 2010-07-09 14:50:35.000000000 -0400 @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); @@ -22813,9 +22976,9 @@ diff -urNp linux-2.6.32.15/drivers/atm/suni.c linux-2.6.32.15/drivers/atm/suni.c static void suni_hz(unsigned long from_timer) -diff -urNp linux-2.6.32.15/drivers/atm/uPD98402.c linux-2.6.32.15/drivers/atm/uPD98402.c ---- linux-2.6.32.15/drivers/atm/uPD98402.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/atm/uPD98402.c 2010-05-28 21:27:15.368039837 -0400 +diff -urNp linux-2.6.32.16/drivers/atm/uPD98402.c linux-2.6.32.16/drivers/atm/uPD98402.c +--- linux-2.6.32.16/drivers/atm/uPD98402.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/atm/uPD98402.c 2010-07-09 14:50:35.000000000 -0400 @@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d struct sonet_stats tmp; 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 return 0; } -diff -urNp linux-2.6.32.15/drivers/atm/zatm.c linux-2.6.32.15/drivers/atm/zatm.c ---- linux-2.6.32.15/drivers/atm/zatm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/atm/zatm.c 2010-05-28 21:27:15.375178174 -0400 +diff -urNp linux-2.6.32.16/drivers/atm/zatm.c linux-2.6.32.16/drivers/atm/zatm.c +--- linux-2.6.32.16/drivers/atm/zatm.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/atm/zatm.c 2010-07-09 14:50:35.000000000 -0400 @@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy } 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 wake_up(&zatm_vcc->tx_wait); } -diff -urNp linux-2.6.32.15/drivers/base/bus.c linux-2.6.32.15/drivers/base/bus.c ---- linux-2.6.32.15/drivers/base/bus.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/base/bus.c 2010-05-28 21:27:15.383215309 -0400 +diff -urNp linux-2.6.32.16/drivers/base/bus.c linux-2.6.32.16/drivers/base/bus.c +--- linux-2.6.32.16/drivers/base/bus.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/base/bus.c 2010-07-09 14:50:36.000000000 -0400 @@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob return ret; } @@ -22920,9 +23083,9 @@ diff -urNp linux-2.6.32.15/drivers/base/bus.c linux-2.6.32.15/drivers/base/bus.c .filter = bus_uevent_filter, }; -diff -urNp linux-2.6.32.15/drivers/base/class.c linux-2.6.32.15/drivers/base/class.c ---- linux-2.6.32.15/drivers/base/class.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/base/class.c 2010-05-28 21:27:15.383215309 -0400 +diff -urNp linux-2.6.32.16/drivers/base/class.c linux-2.6.32.16/drivers/base/class.c +--- linux-2.6.32.16/drivers/base/class.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/base/class.c 2010-07-09 14:50:36.000000000 -0400 @@ -63,7 +63,7 @@ static void class_release(struct kobject kfree(cp); } @@ -22932,9 +23095,9 @@ diff -urNp linux-2.6.32.15/drivers/base/class.c linux-2.6.32.15/drivers/base/cla .show = class_attr_show, .store = class_attr_store, }; -diff -urNp linux-2.6.32.15/drivers/base/core.c linux-2.6.32.15/drivers/base/core.c ---- linux-2.6.32.15/drivers/base/core.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/base/core.c 2010-05-28 21:27:15.386909095 -0400 +diff -urNp linux-2.6.32.16/drivers/base/core.c linux-2.6.32.16/drivers/base/core.c +--- linux-2.6.32.16/drivers/base/core.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/base/core.c 2010-07-09 14:50:36.000000000 -0400 @@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob return ret; } @@ -22953,9 +23116,9 @@ diff -urNp linux-2.6.32.15/drivers/base/core.c linux-2.6.32.15/drivers/base/core .filter = dev_uevent_filter, .name = dev_uevent_name, .uevent = dev_uevent, -diff -urNp linux-2.6.32.15/drivers/base/memory.c linux-2.6.32.15/drivers/base/memory.c ---- linux-2.6.32.15/drivers/base/memory.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/base/memory.c 2010-05-28 21:27:15.386909095 -0400 +diff -urNp linux-2.6.32.16/drivers/base/memory.c linux-2.6.32.16/drivers/base/memory.c +--- linux-2.6.32.16/drivers/base/memory.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/base/memory.c 2010-07-09 14:50:36.000000000 -0400 @@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks return retval; } @@ -22965,9 +23128,9 @@ diff -urNp linux-2.6.32.15/drivers/base/memory.c linux-2.6.32.15/drivers/base/me .name = memory_uevent_name, .uevent = memory_uevent, }; -diff -urNp linux-2.6.32.15/drivers/base/sys.c linux-2.6.32.15/drivers/base/sys.c ---- linux-2.6.32.15/drivers/base/sys.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/base/sys.c 2010-05-28 21:27:15.395045412 -0400 +diff -urNp linux-2.6.32.16/drivers/base/sys.c linux-2.6.32.16/drivers/base/sys.c +--- linux-2.6.32.16/drivers/base/sys.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/base/sys.c 2010-07-09 14:50:36.000000000 -0400 @@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc return -EIO; } @@ -22986,9 +23149,9 @@ diff -urNp linux-2.6.32.15/drivers/base/sys.c linux-2.6.32.15/drivers/base/sys.c .show = sysdev_class_show, .store = sysdev_class_store, }; -diff -urNp linux-2.6.32.15/drivers/block/pktcdvd.c linux-2.6.32.15/drivers/block/pktcdvd.c ---- linux-2.6.32.15/drivers/block/pktcdvd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/block/pktcdvd.c 2010-05-28 21:27:15.403194679 -0400 +diff -urNp linux-2.6.32.16/drivers/block/pktcdvd.c linux-2.6.32.16/drivers/block/pktcdvd.c +--- linux-2.6.32.16/drivers/block/pktcdvd.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/block/pktcdvd.c 2010-07-09 14:50:36.000000000 -0400 @@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob return len; } @@ -22998,9 +23161,9 @@ diff -urNp linux-2.6.32.15/drivers/block/pktcdvd.c linux-2.6.32.15/drivers/block .show = kobj_pkt_show, .store = kobj_pkt_store }; -diff -urNp linux-2.6.32.15/drivers/char/agp/frontend.c linux-2.6.32.15/drivers/char/agp/frontend.c ---- linux-2.6.32.15/drivers/char/agp/frontend.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/agp/frontend.c 2010-05-28 21:27:15.403194679 -0400 +diff -urNp linux-2.6.32.16/drivers/char/agp/frontend.c linux-2.6.32.16/drivers/char/agp/frontend.c +--- linux-2.6.32.16/drivers/char/agp/frontend.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/agp/frontend.c 2010-07-09 14:50:36.000000000 -0400 @@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) 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 return -EFAULT; client = agp_find_client_by_pid(reserve.pid); -diff -urNp linux-2.6.32.15/drivers/char/agp/intel-agp.c linux-2.6.32.15/drivers/char/agp/intel-agp.c ---- linux-2.6.32.15/drivers/char/agp/intel-agp.c 2010-04-29 17:49:37.777981896 -0400 -+++ linux-2.6.32.15/drivers/char/agp/intel-agp.c 2010-05-28 21:27:15.403194679 -0400 +diff -urNp linux-2.6.32.16/drivers/char/agp/intel-agp.c linux-2.6.32.16/drivers/char/agp/intel-agp.c +--- linux-2.6.32.16/drivers/char/agp/intel-agp.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/agp/intel-agp.c 2010-07-09 14:50:36.000000000 -0400 @@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB), 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/ }; MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); -diff -urNp linux-2.6.32.15/drivers/char/hpet.c linux-2.6.32.15/drivers/char/hpet.c ---- linux-2.6.32.15/drivers/char/hpet.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/hpet.c 2010-05-28 21:27:15.403194679 -0400 +diff -urNp linux-2.6.32.16/drivers/char/hpet.c linux-2.6.32.16/drivers/char/hpet.c +--- linux-2.6.32.16/drivers/char/hpet.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/hpet.c 2010-07-09 14:50:36.000000000 -0400 @@ -430,7 +430,7 @@ static int hpet_release(struct inode *in return 0; } @@ -23052,9 +23215,9 @@ diff -urNp linux-2.6.32.15/drivers/char/hpet.c linux-2.6.32.15/drivers/char/hpet static int __init hpet_init(void) { -diff -urNp linux-2.6.32.15/drivers/char/hvc_beat.c linux-2.6.32.15/drivers/char/hvc_beat.c ---- linux-2.6.32.15/drivers/char/hvc_beat.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/hvc_beat.c 2010-05-28 21:27:15.403194679 -0400 +diff -urNp linux-2.6.32.16/drivers/char/hvc_beat.c linux-2.6.32.16/drivers/char/hvc_beat.c +--- linux-2.6.32.16/drivers/char/hvc_beat.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/hvc_beat.c 2010-07-09 14:50:36.000000000 -0400 @@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v return cnt; } @@ -23064,9 +23227,9 @@ diff -urNp linux-2.6.32.15/drivers/char/hvc_beat.c linux-2.6.32.15/drivers/char/ .get_chars = hvc_beat_get_chars, .put_chars = hvc_beat_put_chars, }; -diff -urNp linux-2.6.32.15/drivers/char/hvc_console.c linux-2.6.32.15/drivers/char/hvc_console.c ---- linux-2.6.32.15/drivers/char/hvc_console.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/hvc_console.c 2010-05-28 21:27:15.403194679 -0400 +diff -urNp linux-2.6.32.16/drivers/char/hvc_console.c linux-2.6.32.16/drivers/char/hvc_console.c +--- linux-2.6.32.16/drivers/char/hvc_console.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/hvc_console.c 2010-07-09 14:50:36.000000000 -0400 @@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind * console interfaces but can still be used as a tty device. This has to be * 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 { struct hvc_struct *hp; int i; -diff -urNp linux-2.6.32.15/drivers/char/hvc_console.h linux-2.6.32.15/drivers/char/hvc_console.h ---- linux-2.6.32.15/drivers/char/hvc_console.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/hvc_console.h 2010-05-28 21:27:15.403194679 -0400 +diff -urNp linux-2.6.32.16/drivers/char/hvc_console.h linux-2.6.32.16/drivers/char/hvc_console.h +--- linux-2.6.32.16/drivers/char/hvc_console.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/hvc_console.h 2010-07-09 14:50:36.000000000 -0400 @@ -55,7 +55,7 @@ struct hvc_struct { int outbuf_size; 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 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ extern int hvc_remove(struct hvc_struct *hp); -diff -urNp linux-2.6.32.15/drivers/char/hvc_iseries.c linux-2.6.32.15/drivers/char/hvc_iseries.c ---- linux-2.6.32.15/drivers/char/hvc_iseries.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/hvc_iseries.c 2010-05-28 21:27:15.403194679 -0400 +diff -urNp linux-2.6.32.16/drivers/char/hvc_iseries.c linux-2.6.32.16/drivers/char/hvc_iseries.c +--- linux-2.6.32.16/drivers/char/hvc_iseries.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/hvc_iseries.c 2010-07-09 14:50:36.000000000 -0400 @@ -197,7 +197,7 @@ done: return sent; } @@ -23132,9 +23295,9 @@ diff -urNp linux-2.6.32.15/drivers/char/hvc_iseries.c linux-2.6.32.15/drivers/ch .get_chars = get_chars, .put_chars = put_chars, .notifier_add = notifier_add_irq, -diff -urNp linux-2.6.32.15/drivers/char/hvc_iucv.c linux-2.6.32.15/drivers/char/hvc_iucv.c ---- linux-2.6.32.15/drivers/char/hvc_iucv.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/hvc_iucv.c 2010-05-28 21:27:15.403194679 -0400 +diff -urNp linux-2.6.32.16/drivers/char/hvc_iucv.c linux-2.6.32.16/drivers/char/hvc_iucv.c +--- linux-2.6.32.16/drivers/char/hvc_iucv.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/hvc_iucv.c 2010-07-09 14:50:36.000000000 -0400 @@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru @@ -23144,9 +23307,9 @@ diff -urNp linux-2.6.32.15/drivers/char/hvc_iucv.c linux-2.6.32.15/drivers/char/ .get_chars = hvc_iucv_get_chars, .put_chars = hvc_iucv_put_chars, .notifier_add = hvc_iucv_notifier_add, -diff -urNp linux-2.6.32.15/drivers/char/hvc_rtas.c linux-2.6.32.15/drivers/char/hvc_rtas.c ---- linux-2.6.32.15/drivers/char/hvc_rtas.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/hvc_rtas.c 2010-05-28 21:27:15.407096871 -0400 +diff -urNp linux-2.6.32.16/drivers/char/hvc_rtas.c linux-2.6.32.16/drivers/char/hvc_rtas.c +--- linux-2.6.32.16/drivers/char/hvc_rtas.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/hvc_rtas.c 2010-07-09 14:50:36.000000000 -0400 @@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ return i; } @@ -23156,9 +23319,9 @@ diff -urNp linux-2.6.32.15/drivers/char/hvc_rtas.c linux-2.6.32.15/drivers/char/ .get_chars = hvc_rtas_read_console, .put_chars = hvc_rtas_write_console, }; -diff -urNp linux-2.6.32.15/drivers/char/hvcs.c linux-2.6.32.15/drivers/char/hvcs.c ---- linux-2.6.32.15/drivers/char/hvcs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/hvcs.c 2010-05-28 21:27:15.407096871 -0400 +diff -urNp linux-2.6.32.16/drivers/char/hvcs.c linux-2.6.32.16/drivers/char/hvcs.c +--- linux-2.6.32.16/drivers/char/hvcs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/hvcs.c 2010-07-09 14:50:36.000000000 -0400 @@ -269,7 +269,7 @@ struct hvcs_struct { unsigned int index; @@ -23253,9 +23416,9 @@ diff -urNp linux-2.6.32.15/drivers/char/hvcs.c linux-2.6.32.15/drivers/char/hvcs return 0; return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; -diff -urNp linux-2.6.32.15/drivers/char/hvc_udbg.c linux-2.6.32.15/drivers/char/hvc_udbg.c ---- linux-2.6.32.15/drivers/char/hvc_udbg.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/hvc_udbg.c 2010-05-28 21:27:15.407096871 -0400 +diff -urNp linux-2.6.32.16/drivers/char/hvc_udbg.c linux-2.6.32.16/drivers/char/hvc_udbg.c +--- linux-2.6.32.16/drivers/char/hvc_udbg.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/hvc_udbg.c 2010-07-09 14:50:36.000000000 -0400 @@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno return i; } @@ -23265,9 +23428,9 @@ diff -urNp linux-2.6.32.15/drivers/char/hvc_udbg.c linux-2.6.32.15/drivers/char/ .get_chars = hvc_udbg_get, .put_chars = hvc_udbg_put, }; -diff -urNp linux-2.6.32.15/drivers/char/hvc_vio.c linux-2.6.32.15/drivers/char/hvc_vio.c ---- linux-2.6.32.15/drivers/char/hvc_vio.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/hvc_vio.c 2010-05-28 21:27:15.407096871 -0400 +diff -urNp linux-2.6.32.16/drivers/char/hvc_vio.c linux-2.6.32.16/drivers/char/hvc_vio.c +--- linux-2.6.32.16/drivers/char/hvc_vio.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/hvc_vio.c 2010-07-09 14:50:36.000000000 -0400 @@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v return got; } @@ -23277,9 +23440,9 @@ diff -urNp linux-2.6.32.15/drivers/char/hvc_vio.c linux-2.6.32.15/drivers/char/h .get_chars = filtered_get_chars, .put_chars = hvc_put_chars, .notifier_add = notifier_add_irq, -diff -urNp linux-2.6.32.15/drivers/char/hvc_xen.c linux-2.6.32.15/drivers/char/hvc_xen.c ---- linux-2.6.32.15/drivers/char/hvc_xen.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/hvc_xen.c 2010-05-28 21:27:15.407096871 -0400 +diff -urNp linux-2.6.32.16/drivers/char/hvc_xen.c linux-2.6.32.16/drivers/char/hvc_xen.c +--- linux-2.6.32.16/drivers/char/hvc_xen.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/hvc_xen.c 2010-07-09 14:50:36.000000000 -0400 @@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno return recv; } @@ -23289,9 +23452,9 @@ diff -urNp linux-2.6.32.15/drivers/char/hvc_xen.c linux-2.6.32.15/drivers/char/h .get_chars = read_console, .put_chars = write_console, .notifier_add = notifier_add_irq, -diff -urNp linux-2.6.32.15/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.15/drivers/char/ipmi/ipmi_msghandler.c ---- linux-2.6.32.15/drivers/char/ipmi/ipmi_msghandler.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/ipmi/ipmi_msghandler.c 2010-05-28 21:27:15.407096871 -0400 +diff -urNp linux-2.6.32.16/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.16/drivers/char/ipmi/ipmi_msghandler.c +--- linux-2.6.32.16/drivers/char/ipmi/ipmi_msghandler.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/ipmi/ipmi_msghandler.c 2010-07-09 14:50:36.000000000 -0400 @@ -414,7 +414,7 @@ struct ipmi_smi { struct proc_dir_entry *proc_dir; 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 intf->proc_dir = NULL; -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 ---- linux-2.6.32.15/drivers/char/ipmi/ipmi_si_intf.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/ipmi/ipmi_si_intf.c 2010-05-28 21:27:15.407096871 -0400 +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 +--- linux-2.6.32.16/drivers/char/ipmi/ipmi_si_intf.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/ipmi/ipmi_si_intf.c 2010-07-09 14:50:36.000000000 -0400 @@ -277,7 +277,7 @@ struct smi_info { unsigned char slave_addr; @@ -23346,7 +23509,7 @@ diff -urNp linux-2.6.32.15/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.15/driv #define SI_MAX_PARMS 4 -@@ -2926,7 +2926,7 @@ static int try_smi_init(struct smi_info +@@ -2931,7 +2931,7 @@ static int try_smi_init(struct smi_info atomic_set(&new_smi->req_events, 0); new_smi->run_to_completion = 0; 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 new_smi->interrupt_disabled = 0; atomic_set(&new_smi->stop_operation, 0); -diff -urNp linux-2.6.32.15/drivers/char/keyboard.c linux-2.6.32.15/drivers/char/keyboard.c ---- linux-2.6.32.15/drivers/char/keyboard.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/keyboard.c 2010-05-28 21:27:15.407096871 -0400 +diff -urNp linux-2.6.32.16/drivers/char/keyboard.c linux-2.6.32.16/drivers/char/keyboard.c +--- linux-2.6.32.16/drivers/char/keyboard.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/keyboard.c 2010-07-09 14:50:36.000000000 -0400 @@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u kbd->kbdmode == VC_MEDIUMRAW) && 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/ }; MODULE_DEVICE_TABLE(input, kbd_ids); -diff -urNp linux-2.6.32.15/drivers/char/mem.c linux-2.6.32.15/drivers/char/mem.c ---- linux-2.6.32.15/drivers/char/mem.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/mem.c 2010-05-28 21:27:15.407096871 -0400 +diff -urNp linux-2.6.32.16/drivers/char/mem.c linux-2.6.32.16/drivers/char/mem.c +--- linux-2.6.32.16/drivers/char/mem.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/mem.c 2010-07-09 14:50:36.000000000 -0400 @@ -18,6 +18,7 @@ #include <linux/raw.h> #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 }; static int memory_open(struct inode *inode, struct file *filp) -diff -urNp linux-2.6.32.15/drivers/char/nvram.c linux-2.6.32.15/drivers/char/nvram.c ---- linux-2.6.32.15/drivers/char/nvram.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/nvram.c 2010-05-28 21:27:15.407096871 -0400 +diff -urNp linux-2.6.32.16/drivers/char/nvram.c linux-2.6.32.16/drivers/char/nvram.c +--- linux-2.6.32.16/drivers/char/nvram.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/nvram.c 2010-07-09 14:50:36.000000000 -0400 @@ -429,7 +429,10 @@ static const struct file_operations nvra static struct miscdevice nvram_dev = { 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 }; static int __init nvram_init(void) -diff -urNp linux-2.6.32.15/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.15/drivers/char/pcmcia/ipwireless/tty.c ---- linux-2.6.32.15/drivers/char/pcmcia/ipwireless/tty.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/pcmcia/ipwireless/tty.c 2010-05-28 21:27:15.407096871 -0400 +diff -urNp linux-2.6.32.16/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.16/drivers/char/pcmcia/ipwireless/tty.c +--- linux-2.6.32.16/drivers/char/pcmcia/ipwireless/tty.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/pcmcia/ipwireless/tty.c 2010-07-09 14:50:36.000000000 -0400 @@ -51,7 +51,7 @@ struct ipw_tty { int tty_type; 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/ do_ipw_close(ttyj); ipwireless_disassociate_network_ttys(network, ttyj->channel_idx); -diff -urNp linux-2.6.32.15/drivers/char/pty.c linux-2.6.32.15/drivers/char/pty.c ---- linux-2.6.32.15/drivers/char/pty.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/pty.c 2010-05-28 21:27:15.411167470 -0400 +diff -urNp linux-2.6.32.16/drivers/char/pty.c linux-2.6.32.16/drivers/char/pty.c +--- linux-2.6.32.16/drivers/char/pty.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/pty.c 2010-07-09 14:50:36.000000000 -0400 @@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode return ret; } @@ -23642,9 +23805,9 @@ diff -urNp linux-2.6.32.15/drivers/char/pty.c linux-2.6.32.15/drivers/char/pty.c cdev_init(&ptmx_cdev, &ptmx_fops); if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) -diff -urNp linux-2.6.32.15/drivers/char/random.c linux-2.6.32.15/drivers/char/random.c ---- linux-2.6.32.15/drivers/char/random.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/random.c 2010-05-28 21:27:15.411167470 -0400 +diff -urNp linux-2.6.32.16/drivers/char/random.c linux-2.6.32.16/drivers/char/random.c +--- linux-2.6.32.16/drivers/char/random.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/random.c 2010-07-09 14:50:36.000000000 -0400 @@ -254,8 +254,13 @@ /* * 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 static int max_write_thresh = INPUT_POOL_WORDS * 32; static char sysctl_bootid[16]; -diff -urNp linux-2.6.32.15/drivers/char/sonypi.c linux-2.6.32.15/drivers/char/sonypi.c ---- linux-2.6.32.15/drivers/char/sonypi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/sonypi.c 2010-05-28 21:27:15.411167470 -0400 +diff -urNp linux-2.6.32.16/drivers/char/sonypi.c linux-2.6.32.16/drivers/char/sonypi.c +--- linux-2.6.32.16/drivers/char/sonypi.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/sonypi.c 2010-07-09 14:50:36.000000000 -0400 @@ -491,7 +491,7 @@ static struct sonypi_device { spinlock_t fifo_lock; 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 mutex_unlock(&sonypi_device.lock); unlock_kernel(); return 0; -diff -urNp linux-2.6.32.15/drivers/char/tpm/tpm_bios.c linux-2.6.32.15/drivers/char/tpm/tpm_bios.c ---- linux-2.6.32.15/drivers/char/tpm/tpm_bios.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/tpm/tpm_bios.c 2010-05-28 21:27:15.411167470 -0400 +diff -urNp linux-2.6.32.16/drivers/char/tpm/tpm_bios.c linux-2.6.32.16/drivers/char/tpm/tpm_bios.c +--- linux-2.6.32.16/drivers/char/tpm/tpm_bios.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/tpm/tpm_bios.c 2010-07-09 14:50:36.000000000 -0400 @@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start event = addr; @@ -23762,9 +23925,9 @@ diff -urNp linux-2.6.32.15/drivers/char/tpm/tpm_bios.c linux-2.6.32.15/drivers/c memcpy(log->bios_event_log, virt, len); -diff -urNp linux-2.6.32.15/drivers/char/tty_io.c linux-2.6.32.15/drivers/char/tty_io.c ---- linux-2.6.32.15/drivers/char/tty_io.c 2010-04-29 17:49:37.826084348 -0400 -+++ linux-2.6.32.15/drivers/char/tty_io.c 2010-05-28 21:27:15.411167470 -0400 +diff -urNp linux-2.6.32.16/drivers/char/tty_io.c linux-2.6.32.16/drivers/char/tty_io.c +--- linux-2.6.32.16/drivers/char/tty_io.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/tty_io.c 2010-07-09 14:50:36.000000000 -0400 @@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list DEFINE_MUTEX(tty_mutex); 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 /* * Initialize the console device. This is called *early*, so * we can't necessarily depend on lots of kernel help here. -diff -urNp linux-2.6.32.15/drivers/char/tty_ldisc.c linux-2.6.32.15/drivers/char/tty_ldisc.c ---- linux-2.6.32.15/drivers/char/tty_ldisc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/tty_ldisc.c 2010-05-28 21:27:15.411167470 -0400 +diff -urNp linux-2.6.32.16/drivers/char/tty_ldisc.c linux-2.6.32.16/drivers/char/tty_ldisc.c +--- linux-2.6.32.16/drivers/char/tty_ldisc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/tty_ldisc.c 2010-07-09 14:50:36.000000000 -0400 @@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc * if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { 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 module_put(ldops->owner); spin_unlock_irqrestore(&tty_ldisc_lock, flags); } -diff -urNp linux-2.6.32.15/drivers/char/virtio_console.c linux-2.6.32.15/drivers/char/virtio_console.c ---- linux-2.6.32.15/drivers/char/virtio_console.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/virtio_console.c 2010-05-28 21:27:15.411167470 -0400 +diff -urNp linux-2.6.32.16/drivers/char/virtio_console.c linux-2.6.32.16/drivers/char/virtio_console.c +--- linux-2.6.32.16/drivers/char/virtio_console.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/virtio_console.c 2010-07-09 14:50:36.000000000 -0400 @@ -44,6 +44,7 @@ static unsigned int in_len; static char *in, *inbuf; @@ -23962,39 +24125,55 @@ diff -urNp linux-2.6.32.15/drivers/char/virtio_console.c linux-2.6.32.15/drivers static struct hv_ops virtio_cons; /* The hvc device */ -diff -urNp linux-2.6.32.15/drivers/char/vt_ioctl.c linux-2.6.32.15/drivers/char/vt_ioctl.c ---- linux-2.6.32.15/drivers/char/vt_ioctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/char/vt_ioctl.c 2010-05-28 21:27:15.414917676 -0400 -@@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __ +diff -urNp linux-2.6.32.16/drivers/char/vt_ioctl.c linux-2.6.32.16/drivers/char/vt_ioctl.c +--- linux-2.6.32.16/drivers/char/vt_ioctl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/char/vt_ioctl.c 2010-07-11 12:11:58.000000000 -0400 +@@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __ + if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry))) + return -EFAULT; + +- if (!capable(CAP_SYS_TTY_CONFIG)) +- perm = 0; +- + switch (cmd) { + case KDGKBENT: + key_map = key_maps[s]; +@@ -224,8 +221,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __ + val = (i ? K_HOLE : K_NOSUCHMAP); + return put_user(val, &user_kbe->kb_value); case KDSKBENT: ++ if (!capable(CAP_SYS_TTY_CONFIG)) ++ perm = 0; ++ if (!perm) return -EPERM; + -+#ifdef CONFIG_GRKERNSEC -+ if (!capable(CAP_SYS_TTY_CONFIG)) -+ return -EPERM; -+#endif -+ if (!i && v == K_NOSUCHMAP) { /* deallocate map */ key_map = key_maps[s]; -@@ -366,6 +372,13 @@ do_kdgkb_ioctl(int cmd, struct kbsentry - goto reterr; - } +@@ -325,9 +326,6 @@ do_kdgkb_ioctl(int cmd, struct kbsentry + int i, j, k; + int ret; -+#ifdef CONFIG_GRKERNSEC -+ if (!capable(CAP_SYS_TTY_CONFIG)) { -+ ret = -EPERM; -+ goto reterr; -+ } -+#endif +- if (!capable(CAP_SYS_TTY_CONFIG)) +- perm = 0; +- + kbs = kmalloc(sizeof(*kbs), GFP_KERNEL); + if (!kbs) { + ret = -ENOMEM; +@@ -361,6 +359,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry + kfree(kbs); + return ((p && *p) ? -EOVERFLOW : 0); + case KDSKBSENT: ++ if (!capable(CAP_SYS_TTY_CONFIG)) ++ perm = 0; + - q = func_table[i]; - first_free = funcbufptr + (funcbufsize - funcbufleft); - for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) -diff -urNp linux-2.6.32.15/drivers/cpufreq/cpufreq.c linux-2.6.32.15/drivers/cpufreq/cpufreq.c ---- linux-2.6.32.15/drivers/cpufreq/cpufreq.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/cpufreq/cpufreq.c 2010-05-28 21:27:15.418968453 -0400 + if (!perm) { + ret = -EPERM; + goto reterr; +diff -urNp linux-2.6.32.16/drivers/cpufreq/cpufreq.c linux-2.6.32.16/drivers/cpufreq/cpufreq.c +--- linux-2.6.32.16/drivers/cpufreq/cpufreq.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/cpufreq/cpufreq.c 2010-07-09 14:50:36.000000000 -0400 @@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct complete(&policy->kobj_unregister); } @@ -24004,9 +24183,9 @@ diff -urNp linux-2.6.32.15/drivers/cpufreq/cpufreq.c linux-2.6.32.15/drivers/cpu .show = show, .store = store, }; -diff -urNp linux-2.6.32.15/drivers/cpuidle/sysfs.c linux-2.6.32.15/drivers/cpuidle/sysfs.c ---- linux-2.6.32.15/drivers/cpuidle/sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/cpuidle/sysfs.c 2010-05-28 21:27:15.418968453 -0400 +diff -urNp linux-2.6.32.16/drivers/cpuidle/sysfs.c linux-2.6.32.16/drivers/cpuidle/sysfs.c +--- linux-2.6.32.16/drivers/cpuidle/sysfs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/cpuidle/sysfs.c 2010-07-09 14:50:36.000000000 -0400 @@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj return ret; } @@ -24034,9 +24213,9 @@ diff -urNp linux-2.6.32.15/drivers/cpuidle/sysfs.c linux-2.6.32.15/drivers/cpuid { kobject_put(&device->kobjs[i]->kobj); wait_for_completion(&device->kobjs[i]->kobj_unregister); -diff -urNp linux-2.6.32.15/drivers/dma/ioat/dma.c linux-2.6.32.15/drivers/dma/ioat/dma.c ---- linux-2.6.32.15/drivers/dma/ioat/dma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/dma/ioat/dma.c 2010-05-28 21:27:15.418968453 -0400 +diff -urNp linux-2.6.32.16/drivers/dma/ioat/dma.c linux-2.6.32.16/drivers/dma/ioat/dma.c +--- linux-2.6.32.16/drivers/dma/ioat/dma.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/dma/ioat/dma.c 2010-07-09 14:50:36.000000000 -0400 @@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str return entry->show(&chan->common, page); } @@ -24046,9 +24225,9 @@ diff -urNp linux-2.6.32.15/drivers/dma/ioat/dma.c linux-2.6.32.15/drivers/dma/io .show = ioat_attr_show, }; -diff -urNp linux-2.6.32.15/drivers/dma/ioat/dma.h linux-2.6.32.15/drivers/dma/ioat/dma.h ---- linux-2.6.32.15/drivers/dma/ioat/dma.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/dma/ioat/dma.h 2010-05-28 21:27:15.418968453 -0400 +diff -urNp linux-2.6.32.16/drivers/dma/ioat/dma.h linux-2.6.32.16/drivers/dma/ioat/dma.h +--- linux-2.6.32.16/drivers/dma/ioat/dma.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/dma/ioat/dma.h 2010-07-09 14:50:36.000000000 -0400 @@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c unsigned long *phys_complete); 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 extern struct ioat_sysfs_entry ioat_version_attr; extern struct ioat_sysfs_entry ioat_cap_attr; #endif /* IOATDMA_H */ -diff -urNp linux-2.6.32.15/drivers/edac/edac_core.h linux-2.6.32.15/drivers/edac/edac_core.h ---- linux-2.6.32.15/drivers/edac/edac_core.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/edac/edac_core.h 2010-05-28 21:27:15.418968453 -0400 +diff -urNp linux-2.6.32.16/drivers/edac/edac_core.h linux-2.6.32.16/drivers/edac/edac_core.h +--- linux-2.6.32.16/drivers/edac/edac_core.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/edac/edac_core.h 2010-07-09 14:50:36.000000000 -0400 @@ -99,11 +99,11 @@ extern int edac_debug_level; #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 #endif /* !CONFIG_EDAC_DEBUG */ -diff -urNp linux-2.6.32.15/drivers/edac/edac_device_sysfs.c linux-2.6.32.15/drivers/edac/edac_device_sysfs.c ---- linux-2.6.32.15/drivers/edac/edac_device_sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/edac/edac_device_sysfs.c 2010-05-28 21:27:15.418968453 -0400 +diff -urNp linux-2.6.32.16/drivers/edac/edac_device_sysfs.c linux-2.6.32.16/drivers/edac/edac_device_sysfs.c +--- linux-2.6.32.16/drivers/edac/edac_device_sysfs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/edac/edac_device_sysfs.c 2010-07-09 14:50:36.000000000 -0400 @@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s } @@ -24108,9 +24287,9 @@ diff -urNp linux-2.6.32.15/drivers/edac/edac_device_sysfs.c linux-2.6.32.15/driv .show = edac_dev_block_show, .store = edac_dev_block_store }; -diff -urNp linux-2.6.32.15/drivers/edac/edac_mc_sysfs.c linux-2.6.32.15/drivers/edac/edac_mc_sysfs.c ---- linux-2.6.32.15/drivers/edac/edac_mc_sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/edac/edac_mc_sysfs.c 2010-05-28 21:27:15.418968453 -0400 +diff -urNp linux-2.6.32.16/drivers/edac/edac_mc_sysfs.c linux-2.6.32.16/drivers/edac/edac_mc_sysfs.c +--- linux-2.6.32.16/drivers/edac/edac_mc_sysfs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/edac/edac_mc_sysfs.c 2010-07-09 14:50:36.000000000 -0400 @@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob return -EIO; } @@ -24129,9 +24308,9 @@ diff -urNp linux-2.6.32.15/drivers/edac/edac_mc_sysfs.c linux-2.6.32.15/drivers/ .show = mcidev_show, .store = mcidev_store }; -diff -urNp linux-2.6.32.15/drivers/edac/edac_pci_sysfs.c linux-2.6.32.15/drivers/edac/edac_pci_sysfs.c ---- linux-2.6.32.15/drivers/edac/edac_pci_sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/edac/edac_pci_sysfs.c 2010-05-28 21:27:15.418968453 -0400 +diff -urNp linux-2.6.32.16/drivers/edac/edac_pci_sysfs.c linux-2.6.32.16/drivers/edac/edac_pci_sysfs.c +--- linux-2.6.32.16/drivers/edac/edac_pci_sysfs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/edac/edac_pci_sysfs.c 2010-07-09 14:50:36.000000000 -0400 @@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s } @@ -24150,9 +24329,9 @@ diff -urNp linux-2.6.32.15/drivers/edac/edac_pci_sysfs.c linux-2.6.32.15/drivers .show = edac_pci_dev_show, .store = edac_pci_dev_store }; -diff -urNp linux-2.6.32.15/drivers/firewire/core-cdev.c linux-2.6.32.15/drivers/firewire/core-cdev.c ---- linux-2.6.32.15/drivers/firewire/core-cdev.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/firewire/core-cdev.c 2010-05-28 21:27:15.422980793 -0400 +diff -urNp linux-2.6.32.16/drivers/firewire/core-cdev.c linux-2.6.32.16/drivers/firewire/core-cdev.c +--- linux-2.6.32.16/drivers/firewire/core-cdev.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/firewire/core-cdev.c 2010-07-09 14:50:36.000000000 -0400 @@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie int ret; @@ -24163,9 +24342,9 @@ diff -urNp linux-2.6.32.15/drivers/firewire/core-cdev.c linux-2.6.32.15/drivers/ return -EINVAL; r = kmalloc(sizeof(*r), GFP_KERNEL); -diff -urNp linux-2.6.32.15/drivers/firmware/dmi_scan.c linux-2.6.32.15/drivers/firmware/dmi_scan.c ---- linux-2.6.32.15/drivers/firmware/dmi_scan.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/firmware/dmi_scan.c 2010-05-28 21:27:15.422980793 -0400 +diff -urNp linux-2.6.32.16/drivers/firmware/dmi_scan.c linux-2.6.32.16/drivers/firmware/dmi_scan.c +--- linux-2.6.32.16/drivers/firmware/dmi_scan.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/firmware/dmi_scan.c 2010-07-09 14:50:36.000000000 -0400 @@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) } } @@ -24178,9 +24357,9 @@ diff -urNp linux-2.6.32.15/drivers/firmware/dmi_scan.c linux-2.6.32.15/drivers/f p = dmi_ioremap(0xF0000, 0x10000); if (p == NULL) goto error; -diff -urNp linux-2.6.32.15/drivers/firmware/edd.c linux-2.6.32.15/drivers/firmware/edd.c ---- linux-2.6.32.15/drivers/firmware/edd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/firmware/edd.c 2010-05-28 21:27:15.422980793 -0400 +diff -urNp linux-2.6.32.16/drivers/firmware/edd.c linux-2.6.32.16/drivers/firmware/edd.c +--- linux-2.6.32.16/drivers/firmware/edd.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/firmware/edd.c 2010-07-09 14:50:36.000000000 -0400 @@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str return ret; } @@ -24190,9 +24369,9 @@ diff -urNp linux-2.6.32.15/drivers/firmware/edd.c linux-2.6.32.15/drivers/firmwa .show = edd_attr_show, }; -diff -urNp linux-2.6.32.15/drivers/firmware/efivars.c linux-2.6.32.15/drivers/firmware/efivars.c ---- linux-2.6.32.15/drivers/firmware/efivars.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/firmware/efivars.c 2010-05-28 21:27:15.422980793 -0400 +diff -urNp linux-2.6.32.16/drivers/firmware/efivars.c linux-2.6.32.16/drivers/firmware/efivars.c +--- linux-2.6.32.16/drivers/firmware/efivars.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/firmware/efivars.c 2010-07-09 14:50:36.000000000 -0400 @@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct return ret; } @@ -24202,9 +24381,9 @@ diff -urNp linux-2.6.32.15/drivers/firmware/efivars.c linux-2.6.32.15/drivers/fi .show = efivar_attr_show, .store = efivar_attr_store, }; -diff -urNp linux-2.6.32.15/drivers/firmware/iscsi_ibft.c linux-2.6.32.15/drivers/firmware/iscsi_ibft.c ---- linux-2.6.32.15/drivers/firmware/iscsi_ibft.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/firmware/iscsi_ibft.c 2010-05-28 21:27:15.431186849 -0400 +diff -urNp linux-2.6.32.16/drivers/firmware/iscsi_ibft.c linux-2.6.32.16/drivers/firmware/iscsi_ibft.c +--- linux-2.6.32.16/drivers/firmware/iscsi_ibft.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/firmware/iscsi_ibft.c 2010-07-09 14:50:36.000000000 -0400 @@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc return ret; } @@ -24214,9 +24393,9 @@ diff -urNp linux-2.6.32.15/drivers/firmware/iscsi_ibft.c linux-2.6.32.15/drivers .show = ibft_show_attribute, }; -diff -urNp linux-2.6.32.15/drivers/firmware/memmap.c linux-2.6.32.15/drivers/firmware/memmap.c ---- linux-2.6.32.15/drivers/firmware/memmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/firmware/memmap.c 2010-05-28 21:27:15.446919696 -0400 +diff -urNp linux-2.6.32.16/drivers/firmware/memmap.c linux-2.6.32.16/drivers/firmware/memmap.c +--- linux-2.6.32.16/drivers/firmware/memmap.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/firmware/memmap.c 2010-07-09 14:50:36.000000000 -0400 @@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = { NULL }; @@ -24226,9 +24405,9 @@ diff -urNp linux-2.6.32.15/drivers/firmware/memmap.c linux-2.6.32.15/drivers/fir .show = memmap_attr_show, }; -diff -urNp linux-2.6.32.15/drivers/gpu/drm/drm_drv.c linux-2.6.32.15/drivers/gpu/drm/drm_drv.c ---- linux-2.6.32.15/drivers/gpu/drm/drm_drv.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/gpu/drm/drm_drv.c 2010-05-28 21:27:15.446919696 -0400 +diff -urNp linux-2.6.32.16/drivers/gpu/drm/drm_drv.c linux-2.6.32.16/drivers/gpu/drm/drm_drv.c +--- linux-2.6.32.16/drivers/gpu/drm/drm_drv.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/gpu/drm/drm_drv.c 2010-07-09 14:50:36.000000000 -0400 @@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc char *kdata = NULL; @@ -24238,9 +24417,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/drm_drv.c linux-2.6.32.15/drivers/gpu ++file_priv->ioctl_count; DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", -diff -urNp linux-2.6.32.15/drivers/gpu/drm/drm_fops.c linux-2.6.32.15/drivers/gpu/drm/drm_fops.c ---- linux-2.6.32.15/drivers/gpu/drm/drm_fops.c 2010-04-29 17:49:37.845185844 -0400 -+++ linux-2.6.32.15/drivers/gpu/drm/drm_fops.c 2010-05-28 21:27:15.451193295 -0400 +diff -urNp linux-2.6.32.16/drivers/gpu/drm/drm_fops.c linux-2.6.32.16/drivers/gpu/drm/drm_fops.c +--- linux-2.6.32.16/drivers/gpu/drm/drm_fops.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/gpu/drm/drm_fops.c 2010-07-09 14:50:36.000000000 -0400 @@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * } @@ -24292,9 +24471,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/drm_fops.c linux-2.6.32.15/drivers/gp if (atomic_read(&dev->ioctl_count)) { DRM_ERROR("Device busy: %d\n", atomic_read(&dev->ioctl_count)); -diff -urNp linux-2.6.32.15/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.15/drivers/gpu/drm/drm_ioctl.c ---- linux-2.6.32.15/drivers/gpu/drm/drm_ioctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/gpu/drm/drm_ioctl.c 2010-05-28 21:27:15.451193295 -0400 +diff -urNp linux-2.6.32.16/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.16/drivers/gpu/drm/drm_ioctl.c +--- linux-2.6.32.16/drivers/gpu/drm/drm_ioctl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/gpu/drm/drm_ioctl.c 2010-07-09 14:50:36.000000000 -0400 @@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev, stats->data[i].value = (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 stats->data[i].type = dev->types[i]; } -diff -urNp linux-2.6.32.15/drivers/gpu/drm/drm_lock.c linux-2.6.32.15/drivers/gpu/drm/drm_lock.c ---- linux-2.6.32.15/drivers/gpu/drm/drm_lock.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/gpu/drm/drm_lock.c 2010-05-28 21:27:15.451193295 -0400 +diff -urNp linux-2.6.32.16/drivers/gpu/drm/drm_lock.c linux-2.6.32.16/drivers/gpu/drm/drm_lock.c +--- linux-2.6.32.16/drivers/gpu/drm/drm_lock.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/gpu/drm/drm_lock.c 2010-07-09 14:50:36.000000000 -0400 @@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi if (drm_lock_take(&master->lock, lock->context)) { 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 /* kernel_context_switch isn't used by any of the x86 drm * modules but is required by the Sparc driver. -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 ---- linux-2.6.32.15/drivers/gpu/drm/i810/i810_dma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/gpu/drm/i810/i810_dma.c 2010-05-28 21:27:15.455180050 -0400 +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 +--- linux-2.6.32.16/drivers/gpu/drm/i810/i810_dma.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/gpu/drm/i810/i810_dma.c 2010-07-09 14:50:36.000000000 -0400 @@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de dma->buflist[vertex->idx], 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 sarea_priv->last_enqueue = dev_priv->counter - 1; sarea_priv->last_dispatch = (int)hw_status[5]; -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 ---- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7017.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7017.c 2010-05-28 21:27:15.455180050 -0400 +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 +--- linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7017.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7017.c 2010-07-09 14:50:36.000000000 -0400 @@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_ } } @@ -24362,9 +24541,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.15/dri .init = ch7017_init, .detect = ch7017_detect, .mode_valid = ch7017_mode_valid, -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 ---- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-05-28 21:27:15.459183485 -0400 +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 +--- linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-07-09 14:50:36.000000000 -0400 @@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_ } } @@ -24374,9 +24553,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.15/dri .init = ch7xxx_init, .detect = ch7xxx_detect, .mode_valid = ch7xxx_mode_valid, -diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo.h linux-2.6.32.15/drivers/gpu/drm/i915/dvo.h ---- linux-2.6.32.15/drivers/gpu/drm/i915/dvo.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo.h 2010-05-28 21:27:15.463172433 -0400 +diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo.h linux-2.6.32.16/drivers/gpu/drm/i915/dvo.h +--- linux-2.6.32.16/drivers/gpu/drm/i915/dvo.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/gpu/drm/i915/dvo.h 2010-07-09 14:50:36.000000000 -0400 @@ -135,23 +135,23 @@ struct intel_dvo_dev_ops { * * \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 +extern const struct intel_dvo_dev_ops ch7017_ops; #endif /* _INTEL_DVO_H */ -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 ---- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ivch.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ivch.c 2010-05-28 21:27:15.463172433 -0400 +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 +--- linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ivch.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ivch.c 2010-07-09 14:50:36.000000000 -0400 @@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv } } @@ -24421,9 +24600,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.15/drive .init = ivch_init, .dpms = ivch_dpms, .save = ivch_save, -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 ---- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_sil164.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_sil164.c 2010-05-28 21:27:15.463172433 -0400 +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 +--- linux-2.6.32.16/drivers/gpu/drm/i915/dvo_sil164.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/gpu/drm/i915/dvo_sil164.c 2010-07-09 14:50:36.000000000 -0400 @@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_ } } @@ -24433,9 +24612,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.15/dri .init = sil164_init, .detect = sil164_detect, .mode_valid = sil164_mode_valid, -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 ---- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_tfp410.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_tfp410.c 2010-05-28 21:27:15.463172433 -0400 +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 +--- linux-2.6.32.16/drivers/gpu/drm/i915/dvo_tfp410.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/gpu/drm/i915/dvo_tfp410.c 2010-07-09 14:50:36.000000000 -0400 @@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_ } } @@ -24445,9 +24624,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.15/dri .init = tfp410_init, .detect = tfp410_detect, .mode_valid = tfp410_mode_valid, -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 ---- linux-2.6.32.15/drivers/gpu/drm/i915/i915_drv.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/gpu/drm/i915/i915_drv.c 2010-05-28 21:27:15.463172433 -0400 +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 +--- linux-2.6.32.16/drivers/gpu/drm/i915/i915_drv.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/gpu/drm/i915/i915_drv.c 2010-07-09 14:50:36.000000000 -0400 @@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev) return i915_resume(dev); } @@ -24457,9 +24636,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.15/drive .fault = i915_gem_fault, .open = drm_gem_vm_open, .close = drm_gem_vm_close, -diff -urNp linux-2.6.32.15/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.15/drivers/gpu/drm/radeon/mkregtable.c ---- linux-2.6.32.15/drivers/gpu/drm/radeon/mkregtable.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/gpu/drm/radeon/mkregtable.c 2010-05-28 21:27:15.467181648 -0400 +diff -urNp linux-2.6.32.16/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.16/drivers/gpu/drm/radeon/mkregtable.c +--- linux-2.6.32.16/drivers/gpu/drm/radeon/mkregtable.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/gpu/drm/radeon/mkregtable.c 2010-07-09 14:50:36.000000000 -0400 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, regex_t mask_rex; 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 if (regcomp (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { -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 ---- linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_atombios.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_atombios.c 2010-05-28 21:27:15.467181648 -0400 +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 +--- linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_atombios.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_atombios.c 2010-07-09 14:50:36.000000000 -0400 @@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o } } @@ -24504,9 +24683,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); -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 ---- linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_display.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_display.c 2010-05-28 21:27:15.467181648 -0400 +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 +--- linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_display.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_display.c 2010-07-09 14:50:36.000000000 -0400 @@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl 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. } else error = abs(current_freq - freq); vco_diff = abs(vco - best_vco); -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 ---- linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_state.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_state.c 2010-05-28 21:27:15.475020618 -0400 -@@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm +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 +--- linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_state.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_state.c 2010-07-09 14:50:36.000000000 -0400 +@@ -3021,7 +3021,7 @@ static int radeon_cp_getparam(struct drm { drm_radeon_private_t *dev_priv = dev->dev_private; 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 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); -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 ---- linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_ttm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_ttm.c 2010-05-28 21:27:15.475020618 -0400 +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 +--- linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_ttm.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_ttm.c 2010-07-09 14:50:36.000000000 -0400 @@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic DRM_INFO("radeon: ttm finalized\n"); } @@ -24582,9 +24761,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.15/d } -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 ---- linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo.c 2010-05-28 21:27:15.483213986 -0400 +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 +--- linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo.c 2010-07-09 14:50:36.000000000 -0400 @@ -39,7 +39,7 @@ #include <linux/module.h> @@ -24603,9 +24782,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.15/drivers/ .show = &ttm_bo_global_show }; -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 ---- linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-05-28 21:27:15.483213986 -0400 +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 +--- linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-07-09 14:50:36.000000000 -0400 @@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are { 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 /* * Work around locking order reversal in fault / nopfn * between mmap_sem and bo_reserve: Perform a trylock operation -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 ---- linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_global.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_global.c 2010-05-28 21:27:15.487089783 -0400 +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 +--- linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_global.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_global.c 2010-07-09 14:50:36.000000000 -0400 @@ -36,7 +36,7 @@ struct ttm_global_item { 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 ref->release(ref); item->object = NULL; } -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 ---- linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_memory.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_memory.c 2010-05-28 21:27:15.487089783 -0400 +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 +--- linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_memory.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_memory.c 2010-07-09 14:50:36.000000000 -0400 @@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at NULL }; @@ -24698,9 +24877,9 @@ diff -urNp linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.15/driv .show = &ttm_mem_zone_show, .store = &ttm_mem_zone_store }; -diff -urNp linux-2.6.32.15/drivers/hid/usbhid/hiddev.c linux-2.6.32.15/drivers/hid/usbhid/hiddev.c ---- linux-2.6.32.15/drivers/hid/usbhid/hiddev.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/hid/usbhid/hiddev.c 2010-05-28 21:27:15.487089783 -0400 +diff -urNp linux-2.6.32.16/drivers/hid/usbhid/hiddev.c linux-2.6.32.16/drivers/hid/usbhid/hiddev.c +--- linux-2.6.32.16/drivers/hid/usbhid/hiddev.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/hid/usbhid/hiddev.c 2010-07-09 14:50:36.000000000 -0400 @@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi return put_user(HID_VERSION, (int __user *)arg); @@ -24710,9 +24889,9 @@ diff -urNp linux-2.6.32.15/drivers/hid/usbhid/hiddev.c linux-2.6.32.15/drivers/h return -EINVAL; for (i = 0; i < hid->maxcollection; i++) -diff -urNp linux-2.6.32.15/drivers/hwmon/k8temp.c linux-2.6.32.15/drivers/hwmon/k8temp.c ---- linux-2.6.32.15/drivers/hwmon/k8temp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/hwmon/k8temp.c 2010-05-28 21:27:15.487089783 -0400 +diff -urNp linux-2.6.32.16/drivers/hwmon/k8temp.c linux-2.6.32.16/drivers/hwmon/k8temp.c +--- linux-2.6.32.16/drivers/hwmon/k8temp.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/hwmon/k8temp.c 2010-07-09 14:50:36.000000000 -0400 @@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n 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/ }; MODULE_DEVICE_TABLE(pci, k8temp_ids); -diff -urNp linux-2.6.32.15/drivers/hwmon/sis5595.c linux-2.6.32.15/drivers/hwmon/sis5595.c ---- linux-2.6.32.15/drivers/hwmon/sis5595.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/hwmon/sis5595.c 2010-05-28 21:27:15.495189257 -0400 +diff -urNp linux-2.6.32.16/drivers/hwmon/sis5595.c linux-2.6.32.16/drivers/hwmon/sis5595.c +--- linux-2.6.32.16/drivers/hwmon/sis5595.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/hwmon/sis5595.c 2010-07-09 14:50:36.000000000 -0400 @@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda 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 }; MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); -diff -urNp linux-2.6.32.15/drivers/hwmon/via686a.c linux-2.6.32.15/drivers/hwmon/via686a.c ---- linux-2.6.32.15/drivers/hwmon/via686a.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/hwmon/via686a.c 2010-05-28 21:27:15.495189257 -0400 +diff -urNp linux-2.6.32.16/drivers/hwmon/via686a.c linux-2.6.32.16/drivers/hwmon/via686a.c +--- linux-2.6.32.16/drivers/hwmon/via686a.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/hwmon/via686a.c 2010-07-09 14:50:36.000000000 -0400 @@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda 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 }; MODULE_DEVICE_TABLE(pci, via686a_pci_ids); -diff -urNp linux-2.6.32.15/drivers/hwmon/vt8231.c linux-2.6.32.15/drivers/hwmon/vt8231.c ---- linux-2.6.32.15/drivers/hwmon/vt8231.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/hwmon/vt8231.c 2010-05-28 21:27:15.507004721 -0400 +diff -urNp linux-2.6.32.16/drivers/hwmon/vt8231.c linux-2.6.32.16/drivers/hwmon/vt8231.c +--- linux-2.6.32.16/drivers/hwmon/vt8231.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/hwmon/vt8231.c 2010-07-09 14:50:36.000000000 -0400 @@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri 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/ }; MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); -diff -urNp linux-2.6.32.15/drivers/hwmon/w83791d.c linux-2.6.32.15/drivers/hwmon/w83791d.c ---- linux-2.6.32.15/drivers/hwmon/w83791d.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/hwmon/w83791d.c 2010-05-28 21:27:15.507004721 -0400 +diff -urNp linux-2.6.32.16/drivers/hwmon/w83791d.c linux-2.6.32.16/drivers/hwmon/w83791d.c +--- linux-2.6.32.16/drivers/hwmon/w83791d.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/hwmon/w83791d.c 2010-07-09 14:50:36.000000000 -0400 @@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli struct i2c_board_info *info); 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 static struct w83791d_data *w83791d_update_device(struct device *dev); #ifdef DEBUG -diff -urNp linux-2.6.32.15/drivers/i2c/busses/i2c-i801.c linux-2.6.32.15/drivers/i2c/busses/i2c-i801.c ---- linux-2.6.32.15/drivers/i2c/busses/i2c-i801.c 2010-04-29 17:49:37.945518391 -0400 -+++ linux-2.6.32.15/drivers/i2c/busses/i2c-i801.c 2010-05-28 21:27:15.507004721 -0400 +diff -urNp linux-2.6.32.16/drivers/i2c/busses/i2c-i801.c linux-2.6.32.16/drivers/i2c/busses/i2c-i801.c +--- linux-2.6.32.16/drivers/i2c/busses/i2c-i801.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/i2c/busses/i2c-i801.c 2010-07-09 14:50:36.000000000 -0400 @@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, { 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 }; MODULE_DEVICE_TABLE (pci, i801_ids); -diff -urNp linux-2.6.32.15/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.15/drivers/i2c/busses/i2c-piix4.c ---- linux-2.6.32.15/drivers/i2c/busses/i2c-piix4.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/i2c/busses/i2c-piix4.c 2010-05-28 21:27:15.507004721 -0400 +diff -urNp linux-2.6.32.16/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.16/drivers/i2c/busses/i2c-piix4.c +--- linux-2.6.32.16/drivers/i2c/busses/i2c-piix4.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/i2c/busses/i2c-piix4.c 2010-07-09 14:50:36.000000000 -0400 @@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat .ident = "IBM", .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 }; MODULE_DEVICE_TABLE (pci, piix4_ids); -diff -urNp linux-2.6.32.15/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.15/drivers/i2c/busses/i2c-sis630.c ---- linux-2.6.32.15/drivers/i2c/busses/i2c-sis630.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/i2c/busses/i2c-sis630.c 2010-05-28 21:27:15.507004721 -0400 +diff -urNp linux-2.6.32.16/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.16/drivers/i2c/busses/i2c-sis630.c +--- linux-2.6.32.16/drivers/i2c/busses/i2c-sis630.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/i2c/busses/i2c-sis630.c 2010-07-09 14:50:36.000000000 -0400 @@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter static struct pci_device_id sis630_ids[] __devinitdata = { { 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 }; MODULE_DEVICE_TABLE (pci, sis630_ids); -diff -urNp linux-2.6.32.15/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.15/drivers/i2c/busses/i2c-sis96x.c ---- linux-2.6.32.15/drivers/i2c/busses/i2c-sis96x.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/i2c/busses/i2c-sis96x.c 2010-05-28 21:27:15.507004721 -0400 +diff -urNp linux-2.6.32.16/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.16/drivers/i2c/busses/i2c-sis96x.c +--- linux-2.6.32.16/drivers/i2c/busses/i2c-sis96x.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/i2c/busses/i2c-sis96x.c 2010-07-09 14:50:36.000000000 -0400 @@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter 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 }; MODULE_DEVICE_TABLE (pci, sis96x_ids); -diff -urNp linux-2.6.32.15/drivers/ide/ide-cd.c linux-2.6.32.15/drivers/ide/ide-cd.c ---- linux-2.6.32.15/drivers/ide/ide-cd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ide/ide-cd.c 2010-05-28 21:27:15.510961438 -0400 +diff -urNp linux-2.6.32.16/drivers/ide/ide-cd.c linux-2.6.32.16/drivers/ide/ide-cd.c +--- linux-2.6.32.16/drivers/ide/ide-cd.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ide/ide-cd.c 2010-07-09 14:50:36.000000000 -0400 @@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_ alignment = queue_dma_alignment(q) | q->dma_pad_mask; 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- drive->dma = 0; } } -diff -urNp linux-2.6.32.15/drivers/ieee1394/dv1394.c linux-2.6.32.15/drivers/ieee1394/dv1394.c ---- linux-2.6.32.15/drivers/ieee1394/dv1394.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ieee1394/dv1394.c 2010-05-28 21:27:15.527187024 -0400 +diff -urNp linux-2.6.32.16/drivers/ieee1394/dv1394.c linux-2.6.32.16/drivers/ieee1394/dv1394.c +--- linux-2.6.32.16/drivers/ieee1394/dv1394.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ieee1394/dv1394.c 2010-07-09 14:50:36.000000000 -0400 @@ -739,7 +739,7 @@ static void frame_prepare(struct video_c based upon DIF section and sequence */ @@ -24862,9 +25041,9 @@ diff -urNp linux-2.6.32.15/drivers/ieee1394/dv1394.c linux-2.6.32.15/drivers/iee }; MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); -diff -urNp linux-2.6.32.15/drivers/ieee1394/eth1394.c linux-2.6.32.15/drivers/ieee1394/eth1394.c ---- linux-2.6.32.15/drivers/ieee1394/eth1394.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ieee1394/eth1394.c 2010-05-28 21:27:15.544607394 -0400 +diff -urNp linux-2.6.32.16/drivers/ieee1394/eth1394.c linux-2.6.32.16/drivers/ieee1394/eth1394.c +--- linux-2.6.32.16/drivers/ieee1394/eth1394.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ieee1394/eth1394.c 2010-07-09 14:50:36.000000000 -0400 @@ -446,7 +446,7 @@ static const struct ieee1394_device_id e .specifier_id = ETHER1394_GASP_SPECIFIER_ID, .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 }; MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); -diff -urNp linux-2.6.32.15/drivers/ieee1394/hosts.c linux-2.6.32.15/drivers/ieee1394/hosts.c ---- linux-2.6.32.15/drivers/ieee1394/hosts.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ieee1394/hosts.c 2010-05-28 21:27:15.544607394 -0400 +diff -urNp linux-2.6.32.16/drivers/ieee1394/hosts.c linux-2.6.32.16/drivers/ieee1394/hosts.c +--- linux-2.6.32.16/drivers/ieee1394/hosts.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ieee1394/hosts.c 2010-07-09 14:50:36.000000000 -0400 @@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso } @@ -24885,9 +25064,9 @@ diff -urNp linux-2.6.32.15/drivers/ieee1394/hosts.c linux-2.6.32.15/drivers/ieee .transmit_packet = dummy_transmit_packet, .devctl = dummy_devctl, .isoctl = dummy_isoctl -diff -urNp linux-2.6.32.15/drivers/ieee1394/ohci1394.c linux-2.6.32.15/drivers/ieee1394/ohci1394.c ---- linux-2.6.32.15/drivers/ieee1394/ohci1394.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ieee1394/ohci1394.c 2010-05-28 21:27:15.555018453 -0400 +diff -urNp linux-2.6.32.16/drivers/ieee1394/ohci1394.c linux-2.6.32.16/drivers/ieee1394/ohci1394.c +--- linux-2.6.32.16/drivers/ieee1394/ohci1394.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ieee1394/ohci1394.c 2010-07-09 14:50:36.000000000 -0400 @@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_ printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args) @@ -24909,9 +25088,9 @@ diff -urNp linux-2.6.32.15/drivers/ieee1394/ohci1394.c linux-2.6.32.15/drivers/i }; MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); -diff -urNp linux-2.6.32.15/drivers/ieee1394/raw1394.c linux-2.6.32.15/drivers/ieee1394/raw1394.c ---- linux-2.6.32.15/drivers/ieee1394/raw1394.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ieee1394/raw1394.c 2010-05-28 21:27:15.555018453 -0400 +diff -urNp linux-2.6.32.16/drivers/ieee1394/raw1394.c linux-2.6.32.16/drivers/ieee1394/raw1394.c +--- linux-2.6.32.16/drivers/ieee1394/raw1394.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ieee1394/raw1394.c 2010-07-09 14:50:36.000000000 -0400 @@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, .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 }; MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); -diff -urNp linux-2.6.32.15/drivers/ieee1394/sbp2.c linux-2.6.32.15/drivers/ieee1394/sbp2.c ---- linux-2.6.32.15/drivers/ieee1394/sbp2.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ieee1394/sbp2.c 2010-05-28 21:27:15.555018453 -0400 +diff -urNp linux-2.6.32.16/drivers/ieee1394/sbp2.c linux-2.6.32.16/drivers/ieee1394/sbp2.c +--- linux-2.6.32.16/drivers/ieee1394/sbp2.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ieee1394/sbp2.c 2010-07-09 14:50:36.000000000 -0400 @@ -290,7 +290,7 @@ static const struct ieee1394_device_id s .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, .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 { int ret; -diff -urNp linux-2.6.32.15/drivers/ieee1394/video1394.c linux-2.6.32.15/drivers/ieee1394/video1394.c ---- linux-2.6.32.15/drivers/ieee1394/video1394.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/ieee1394/video1394.c 2010-05-28 21:27:15.559201489 -0400 +diff -urNp linux-2.6.32.16/drivers/ieee1394/video1394.c linux-2.6.32.16/drivers/ieee1394/video1394.c +--- linux-2.6.32.16/drivers/ieee1394/video1394.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/ieee1394/video1394.c 2010-07-09 14:50:36.000000000 -0400 @@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, .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/ }; MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); -diff -urNp linux-2.6.32.15/drivers/infiniband/core/cm.c linux-2.6.32.15/drivers/infiniband/core/cm.c ---- linux-2.6.32.15/drivers/infiniband/core/cm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/infiniband/core/cm.c 2010-05-28 21:27:15.559201489 -0400 +diff -urNp linux-2.6.32.16/drivers/infiniband/core/cm.c linux-2.6.32.16/drivers/infiniband/core/cm.c +--- linux-2.6.32.16/drivers/infiniband/core/cm.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/infiniband/core/cm.c 2010-07-09 14:50:36.000000000 -0400 @@ -112,7 +112,7 @@ static char const counter_group_names[CM 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/ .show = cm_show_counter }; -diff -urNp linux-2.6.32.15/drivers/infiniband/core/sysfs.c linux-2.6.32.15/drivers/infiniband/core/sysfs.c ---- linux-2.6.32.15/drivers/infiniband/core/sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/infiniband/core/sysfs.c 2010-05-28 21:27:15.563689341 -0400 +diff -urNp linux-2.6.32.16/drivers/infiniband/core/sysfs.c linux-2.6.32.16/drivers/infiniband/core/sysfs.c +--- linux-2.6.32.16/drivers/infiniband/core/sysfs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/infiniband/core/sysfs.c 2010-07-09 14:50:36.000000000 -0400 @@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob return port_attr->show(p, port_attr, buf); } @@ -25112,9 +25291,9 @@ diff -urNp linux-2.6.32.15/drivers/infiniband/core/sysfs.c linux-2.6.32.15/drive .show = port_attr_show }; -diff -urNp linux-2.6.32.15/drivers/input/keyboard/atkbd.c linux-2.6.32.15/drivers/input/keyboard/atkbd.c ---- linux-2.6.32.15/drivers/input/keyboard/atkbd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/input/keyboard/atkbd.c 2010-05-28 21:27:15.568704406 -0400 +diff -urNp linux-2.6.32.16/drivers/input/keyboard/atkbd.c linux-2.6.32.16/drivers/input/keyboard/atkbd.c +--- linux-2.6.32.16/drivers/input/keyboard/atkbd.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/input/keyboard/atkbd.c 2010-07-09 14:50:36.000000000 -0400 @@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri .id = SERIO_ANY, .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 }; MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); -diff -urNp linux-2.6.32.15/drivers/input/mouse/lifebook.c linux-2.6.32.15/drivers/input/mouse/lifebook.c ---- linux-2.6.32.15/drivers/input/mouse/lifebook.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/input/mouse/lifebook.c 2010-05-28 21:27:15.572693057 -0400 +diff -urNp linux-2.6.32.16/drivers/input/mouse/lifebook.c linux-2.6.32.16/drivers/input/mouse/lifebook.c +--- linux-2.6.32.16/drivers/input/mouse/lifebook.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/input/mouse/lifebook.c 2010-07-09 14:50:36.000000000 -0400 @@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), }, @@ -25136,10 +25315,10 @@ diff -urNp linux-2.6.32.15/drivers/input/mouse/lifebook.c linux-2.6.32.15/driver }; static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) -diff -urNp linux-2.6.32.15/drivers/input/mouse/psmouse-base.c linux-2.6.32.15/drivers/input/mouse/psmouse-base.c ---- linux-2.6.32.15/drivers/input/mouse/psmouse-base.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/input/mouse/psmouse-base.c 2010-05-28 21:27:15.580689971 -0400 -@@ -1409,7 +1409,7 @@ static struct serio_device_id psmouse_se +diff -urNp linux-2.6.32.16/drivers/input/mouse/psmouse-base.c linux-2.6.32.16/drivers/input/mouse/psmouse-base.c +--- linux-2.6.32.16/drivers/input/mouse/psmouse-base.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/input/mouse/psmouse-base.c 2010-07-09 14:50:36.000000000 -0400 +@@ -1415,7 +1415,7 @@ static struct serio_device_id psmouse_se .id = SERIO_ANY, .extra = SERIO_ANY, }, @@ -25148,9 +25327,9 @@ diff -urNp linux-2.6.32.15/drivers/input/mouse/psmouse-base.c linux-2.6.32.15/dr }; MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); -diff -urNp linux-2.6.32.15/drivers/input/mouse/synaptics.c linux-2.6.32.15/drivers/input/mouse/synaptics.c ---- linux-2.6.32.15/drivers/input/mouse/synaptics.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/input/mouse/synaptics.c 2010-05-28 21:27:15.587725031 -0400 +diff -urNp linux-2.6.32.16/drivers/input/mouse/synaptics.c linux-2.6.32.16/drivers/input/mouse/synaptics.c +--- linux-2.6.32.16/drivers/input/mouse/synaptics.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/input/mouse/synaptics.c 2010-07-09 14:50:36.000000000 -0400 @@ -437,7 +437,7 @@ static void synaptics_process_packet(str break; case 2: @@ -25179,9 +25358,9 @@ diff -urNp linux-2.6.32.15/drivers/input/mouse/synaptics.c linux-2.6.32.15/drive }; #endif -diff -urNp linux-2.6.32.15/drivers/input/mousedev.c linux-2.6.32.15/drivers/input/mousedev.c ---- linux-2.6.32.15/drivers/input/mousedev.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/input/mousedev.c 2010-05-28 21:27:15.592694173 -0400 +diff -urNp linux-2.6.32.16/drivers/input/mousedev.c linux-2.6.32.16/drivers/input/mousedev.c +--- linux-2.6.32.16/drivers/input/mousedev.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/input/mousedev.c 2010-07-09 14:50:36.000000000 -0400 @@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han #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 }; static int psaux_registered; #endif -diff -urNp linux-2.6.32.15/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.15/drivers/input/serio/i8042-x86ia64io.h ---- linux-2.6.32.15/drivers/input/serio/i8042-x86ia64io.h 2010-04-04 20:41:49.956500002 -0400 -+++ linux-2.6.32.15/drivers/input/serio/i8042-x86ia64io.h 2010-05-28 21:27:15.592694173 -0400 +diff -urNp linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h +--- linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h 2010-07-09 14:50:36.000000000 -0400 @@ -172,7 +172,7 @@ static const struct dmi_system_id __init DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), }, @@ -25248,9 +25427,9 @@ diff -urNp linux-2.6.32.15/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.15 }; #endif /* CONFIG_X86 */ -diff -urNp linux-2.6.32.15/drivers/input/serio/serio_raw.c linux-2.6.32.15/drivers/input/serio/serio_raw.c ---- linux-2.6.32.15/drivers/input/serio/serio_raw.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/input/serio/serio_raw.c 2010-05-28 21:27:15.596690001 -0400 +diff -urNp linux-2.6.32.16/drivers/input/serio/serio_raw.c linux-2.6.32.16/drivers/input/serio/serio_raw.c +--- linux-2.6.32.16/drivers/input/serio/serio_raw.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/input/serio/serio_raw.c 2010-07-09 14:50:36.000000000 -0400 @@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_ .id = SERIO_ANY, .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 }; MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); -diff -urNp linux-2.6.32.15/drivers/isdn/gigaset/common.c linux-2.6.32.15/drivers/isdn/gigaset/common.c ---- linux-2.6.32.15/drivers/isdn/gigaset/common.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/isdn/gigaset/common.c 2010-05-28 21:27:15.600680043 -0400 +diff -urNp linux-2.6.32.16/drivers/isdn/gigaset/common.c linux-2.6.32.16/drivers/isdn/gigaset/common.c +--- linux-2.6.32.16/drivers/isdn/gigaset/common.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/isdn/gigaset/common.c 2010-07-09 14:50:36.000000000 -0400 @@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct cs->commands_pending = 0; 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 cs->dev = NULL; cs->tty = NULL; cs->tty_dev = NULL; -diff -urNp linux-2.6.32.15/drivers/isdn/gigaset/gigaset.h linux-2.6.32.15/drivers/isdn/gigaset/gigaset.h ---- linux-2.6.32.15/drivers/isdn/gigaset/gigaset.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/isdn/gigaset/gigaset.h 2010-05-28 21:27:15.600680043 -0400 +diff -urNp linux-2.6.32.16/drivers/isdn/gigaset/gigaset.h linux-2.6.32.16/drivers/isdn/gigaset/gigaset.h +--- linux-2.6.32.16/drivers/isdn/gigaset/gigaset.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/isdn/gigaset/gigaset.h 2010-07-09 14:50:36.000000000 -0400 @@ -446,7 +446,7 @@ struct cardstate { spinlock_t cmdlock; 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 struct tty_struct *tty; struct tasklet_struct if_wake_tasklet; unsigned control_state; -diff -urNp linux-2.6.32.15/drivers/isdn/gigaset/interface.c linux-2.6.32.15/drivers/isdn/gigaset/interface.c ---- linux-2.6.32.15/drivers/isdn/gigaset/interface.c 2010-04-04 20:41:49.956500002 -0400 -+++ linux-2.6.32.15/drivers/isdn/gigaset/interface.c 2010-05-28 21:27:15.600680043 -0400 +diff -urNp linux-2.6.32.16/drivers/isdn/gigaset/interface.c linux-2.6.32.16/drivers/isdn/gigaset/interface.c +--- linux-2.6.32.16/drivers/isdn/gigaset/interface.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/isdn/gigaset/interface.c 2010-07-09 14:50:36.000000000 -0400 @@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt return -ERESTARTSYS; // FIXME -EINTR? 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 dev_warn(cs->dev, "%s: device not opened\n", __func__); goto out; } -diff -urNp linux-2.6.32.15/drivers/isdn/hardware/avm/b1.c linux-2.6.32.15/drivers/isdn/hardware/avm/b1.c ---- linux-2.6.32.15/drivers/isdn/hardware/avm/b1.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/isdn/hardware/avm/b1.c 2010-05-28 21:27:15.600680043 -0400 +diff -urNp linux-2.6.32.16/drivers/isdn/hardware/avm/b1.c linux-2.6.32.16/drivers/isdn/hardware/avm/b1.c +--- linux-2.6.32.16/drivers/isdn/hardware/avm/b1.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/isdn/hardware/avm/b1.c 2010-07-09 14:50:36.000000000 -0400 @@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo } 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 return -EFAULT; } else { memcpy(buf, dp, left); -diff -urNp linux-2.6.32.15/drivers/isdn/icn/icn.c linux-2.6.32.15/drivers/isdn/icn/icn.c ---- linux-2.6.32.15/drivers/isdn/icn/icn.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/isdn/icn/icn.c 2010-05-28 21:27:15.600680043 -0400 +diff -urNp linux-2.6.32.16/drivers/isdn/icn/icn.c linux-2.6.32.16/drivers/isdn/icn/icn.c +--- linux-2.6.32.16/drivers/isdn/icn/icn.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/isdn/icn/icn.c 2010-07-09 14:50:36.000000000 -0400 @@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len if (count > len) 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 return -EFAULT; } else memcpy(msg, buf, count); -diff -urNp linux-2.6.32.15/drivers/lguest/core.c linux-2.6.32.15/drivers/lguest/core.c ---- linux-2.6.32.15/drivers/lguest/core.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/lguest/core.c 2010-05-28 21:27:15.600680043 -0400 +diff -urNp linux-2.6.32.16/drivers/lguest/core.c linux-2.6.32.16/drivers/lguest/core.c +--- linux-2.6.32.16/drivers/lguest/core.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/lguest/core.c 2010-07-09 14:50:36.000000000 -0400 @@ -91,9 +91,17 @@ static __init int map_switcher(void) * it's worked so far. The end address needs +1 because __get_vm_area * 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/ if (!switcher_vma) { err = -ENOMEM; printk("lguest: could not map switcher pages high\n"); -diff -urNp linux-2.6.32.15/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.15/drivers/macintosh/via-pmu-backlight.c ---- linux-2.6.32.15/drivers/macintosh/via-pmu-backlight.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/macintosh/via-pmu-backlight.c 2010-05-28 21:27:15.600680043 -0400 +diff -urNp linux-2.6.32.16/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.16/drivers/macintosh/via-pmu-backlight.c +--- linux-2.6.32.16/drivers/macintosh/via-pmu-backlight.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/macintosh/via-pmu-backlight.c 2010-07-09 14:50:36.000000000 -0400 @@ -15,7 +15,7 @@ #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 .get_brightness = pmu_backlight_get_brightness, .update_status = pmu_backlight_update_status, -diff -urNp linux-2.6.32.15/drivers/macintosh/via-pmu.c linux-2.6.32.15/drivers/macintosh/via-pmu.c ---- linux-2.6.32.15/drivers/macintosh/via-pmu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/macintosh/via-pmu.c 2010-05-28 21:27:15.608683910 -0400 +diff -urNp linux-2.6.32.16/drivers/macintosh/via-pmu.c linux-2.6.32.16/drivers/macintosh/via-pmu.c +--- linux-2.6.32.16/drivers/macintosh/via-pmu.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/macintosh/via-pmu.c 2010-07-09 14:50:36.000000000 -0400 @@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); } @@ -25461,9 +25640,9 @@ diff -urNp linux-2.6.32.15/drivers/macintosh/via-pmu.c linux-2.6.32.15/drivers/m .enter = powerbook_sleep, .valid = pmu_sleep_valid, }; -diff -urNp linux-2.6.32.15/drivers/md/bitmap.c linux-2.6.32.15/drivers/md/bitmap.c ---- linux-2.6.32.15/drivers/md/bitmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/md/bitmap.c 2010-05-28 21:27:15.608683910 -0400 +diff -urNp linux-2.6.32.16/drivers/md/bitmap.c linux-2.6.32.16/drivers/md/bitmap.c +--- linux-2.6.32.16/drivers/md/bitmap.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/md/bitmap.c 2010-07-09 14:50:36.000000000 -0400 @@ -58,7 +58,7 @@ # if DEBUG > 0 # 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 # endif #endif -diff -urNp linux-2.6.32.15/drivers/md/dm-sysfs.c linux-2.6.32.15/drivers/md/dm-sysfs.c ---- linux-2.6.32.15/drivers/md/dm-sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/md/dm-sysfs.c 2010-05-28 21:27:15.608683910 -0400 +diff -urNp linux-2.6.32.16/drivers/md/dm-sysfs.c linux-2.6.32.16/drivers/md/dm-sysfs.c +--- linux-2.6.32.16/drivers/md/dm-sysfs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/md/dm-sysfs.c 2010-07-09 14:50:36.000000000 -0400 @@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = { NULL, }; @@ -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 .show = dm_attr_show, }; -diff -urNp linux-2.6.32.15/drivers/md/dm-table.c linux-2.6.32.15/drivers/md/dm-table.c ---- linux-2.6.32.15/drivers/md/dm-table.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/md/dm-table.c 2010-05-28 21:27:15.608683910 -0400 +diff -urNp linux-2.6.32.16/drivers/md/dm-table.c linux-2.6.32.16/drivers/md/dm-table.c +--- linux-2.6.32.16/drivers/md/dm-table.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/md/dm-table.c 2010-07-09 14:50:36.000000000 -0400 @@ -359,7 +359,7 @@ static int device_area_is_invalid(struct if (!dev_size) 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 DMWARN("%s: %s too small for target: " "start=%llu, len=%llu, dev_size=%llu", dm_device_name(ti->table->md), bdevname(bdev, b), -diff -urNp linux-2.6.32.15/drivers/md/md.c linux-2.6.32.15/drivers/md/md.c ---- linux-2.6.32.15/drivers/md/md.c 2010-05-15 13:20:18.542567696 -0400 -+++ linux-2.6.32.15/drivers/md/md.c 2010-05-28 21:27:15.608683910 -0400 +diff -urNp linux-2.6.32.16/drivers/md/md.c linux-2.6.32.16/drivers/md/md.c +--- linux-2.6.32.16/drivers/md/md.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/md/md.c 2010-07-09 14:50:36.000000000 -0400 @@ -2514,7 +2514,7 @@ static void rdev_free(struct kobject *ko mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj); 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 .show = md_attr_show, .store = md_attr_store, }; -@@ -6010,7 +6010,7 @@ static int md_seq_show(struct seq_file * +@@ -6039,7 +6039,7 @@ static int md_seq_show(struct seq_file * chunk_kb ? "KB" : "B"); if (bitmap->file) { 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 } seq_printf(seq, "\n"); -@@ -6104,7 +6104,7 @@ static int is_mddev_idle(mddev_t *mddev, +@@ -6133,7 +6133,7 @@ static int is_mddev_idle(mddev_t *mddev, struct gendisk *disk = rdev->bdev->bd_contains->bd_disk; curr_events = (int)part_stat_read(&disk->part0, sectors[0]) + (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 /* sync IO will cause sync_io to increase before the disk_stats * as sync_io is counted when a request starts, and * disk_stats is counted when it completes. -diff -urNp linux-2.6.32.15/drivers/md/md.h linux-2.6.32.15/drivers/md/md.h ---- linux-2.6.32.15/drivers/md/md.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/md/md.h 2010-05-28 21:27:15.608683910 -0400 +diff -urNp linux-2.6.32.16/drivers/md/md.h linux-2.6.32.16/drivers/md/md.h +--- linux-2.6.32.16/drivers/md/md.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/md/md.h 2010-07-09 14:50:36.000000000 -0400 @@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_ 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 } struct mdk_personality -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 ---- linux-2.6.32.15/drivers/media/dvb/dvb-core/dvbdev.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/media/dvb/dvb-core/dvbdev.c 2010-05-28 21:27:15.616695200 -0400 +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 +--- linux-2.6.32.16/drivers/media/dvb/dvb-core/dvbdev.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/media/dvb/dvb-core/dvbdev.c 2010-07-09 14:50:36.000000000 -0400 @@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt const struct dvb_device *template, void *priv, int type) { @@ -25559,9 +25738,9 @@ diff -urNp linux-2.6.32.15/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.15/d struct file_operations *dvbdevfops; struct device *clsdev; int minor; -diff -urNp linux-2.6.32.15/drivers/media/radio/radio-cadet.c linux-2.6.32.15/drivers/media/radio/radio-cadet.c ---- linux-2.6.32.15/drivers/media/radio/radio-cadet.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/media/radio/radio-cadet.c 2010-05-28 21:27:15.616695200 -0400 +diff -urNp linux-2.6.32.16/drivers/media/radio/radio-cadet.c linux-2.6.32.16/drivers/media/radio/radio-cadet.c +--- linux-2.6.32.16/drivers/media/radio/radio-cadet.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/media/radio/radio-cadet.c 2010-07-09 14:50:36.000000000 -0400 @@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f while (i < count && dev->rdsin != dev->rdsout) 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 return -EFAULT; return i; } -diff -urNp linux-2.6.32.15/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.15/drivers/media/video/usbvideo/konicawc.c ---- linux-2.6.32.15/drivers/media/video/usbvideo/konicawc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/media/video/usbvideo/konicawc.c 2010-05-28 21:27:15.628727154 -0400 +diff -urNp linux-2.6.32.16/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.16/drivers/media/video/usbvideo/konicawc.c +--- linux-2.6.32.16/drivers/media/video/usbvideo/konicawc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/media/video/usbvideo/konicawc.c 2010-07-09 14:50:36.000000000 -0400 @@ -225,7 +225,7 @@ static void konicawc_register_input(stru int error; @@ -25583,9 +25762,9 @@ diff -urNp linux-2.6.32.15/drivers/media/video/usbvideo/konicawc.c linux-2.6.32. cam->input = input_dev = input_allocate_device(); if (!input_dev) { -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 ---- linux-2.6.32.15/drivers/media/video/usbvideo/quickcam_messenger.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/media/video/usbvideo/quickcam_messenger.c 2010-05-28 21:27:15.630929247 -0400 +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 +--- linux-2.6.32.16/drivers/media/video/usbvideo/quickcam_messenger.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/media/video/usbvideo/quickcam_messenger.c 2010-07-09 14:50:36.000000000 -0400 @@ -89,7 +89,7 @@ static void qcm_register_input(struct qc int error; @@ -25595,9 +25774,9 @@ diff -urNp linux-2.6.32.15/drivers/media/video/usbvideo/quickcam_messenger.c lin cam->input = input_dev = input_allocate_device(); if (!input_dev) { -diff -urNp linux-2.6.32.15/drivers/message/fusion/mptdebug.h linux-2.6.32.15/drivers/message/fusion/mptdebug.h ---- linux-2.6.32.15/drivers/message/fusion/mptdebug.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/message/fusion/mptdebug.h 2010-05-28 21:27:15.630929247 -0400 +diff -urNp linux-2.6.32.16/drivers/message/fusion/mptdebug.h linux-2.6.32.16/drivers/message/fusion/mptdebug.h +--- linux-2.6.32.16/drivers/message/fusion/mptdebug.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/message/fusion/mptdebug.h 2010-07-09 14:50:36.000000000 -0400 @@ -71,7 +71,7 @@ CMD; \ } @@ -25607,9 +25786,9 @@ diff -urNp linux-2.6.32.15/drivers/message/fusion/mptdebug.h linux-2.6.32.15/dri #endif -diff -urNp linux-2.6.32.15/drivers/message/fusion/mptsas.c linux-2.6.32.15/drivers/message/fusion/mptsas.c ---- linux-2.6.32.15/drivers/message/fusion/mptsas.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/message/fusion/mptsas.c 2010-05-28 21:27:15.639064560 -0400 +diff -urNp linux-2.6.32.16/drivers/message/fusion/mptsas.c linux-2.6.32.16/drivers/message/fusion/mptsas.c +--- linux-2.6.32.16/drivers/message/fusion/mptsas.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/message/fusion/mptsas.c 2010-07-09 14:50:36.000000000 -0400 @@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin return 0; } @@ -25658,9 +25837,9 @@ diff -urNp linux-2.6.32.15/drivers/message/fusion/mptsas.c linux-2.6.32.15/drive static inline struct sas_port * mptsas_get_port(struct mptsas_phyinfo *phy_info) { -diff -urNp linux-2.6.32.15/drivers/message/i2o/i2o_proc.c linux-2.6.32.15/drivers/message/i2o/i2o_proc.c ---- linux-2.6.32.15/drivers/message/i2o/i2o_proc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/message/i2o/i2o_proc.c 2010-05-28 21:27:15.639064560 -0400 +diff -urNp linux-2.6.32.16/drivers/message/i2o/i2o_proc.c linux-2.6.32.16/drivers/message/i2o/i2o_proc.c +--- linux-2.6.32.16/drivers/message/i2o/i2o_proc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/message/i2o/i2o_proc.c 2010-07-09 14:50:36.000000000 -0400 @@ -259,13 +259,6 @@ static char *scsi_devices[] = { "Array Controller Device" }; @@ -25747,9 +25926,9 @@ diff -urNp linux-2.6.32.15/drivers/message/i2o/i2o_proc.c linux-2.6.32.15/driver return 0; } -diff -urNp linux-2.6.32.15/drivers/misc/kgdbts.c linux-2.6.32.15/drivers/misc/kgdbts.c ---- linux-2.6.32.15/drivers/misc/kgdbts.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/misc/kgdbts.c 2010-05-28 21:27:15.650946222 -0400 +diff -urNp linux-2.6.32.16/drivers/misc/kgdbts.c linux-2.6.32.16/drivers/misc/kgdbts.c +--- linux-2.6.32.16/drivers/misc/kgdbts.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/misc/kgdbts.c 2010-07-09 14:50:36.000000000 -0400 @@ -118,7 +118,7 @@ } while (0) #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 .name = "kgdbts", .read_char = kgdbts_get_char, .write_char = kgdbts_put_char, -diff -urNp linux-2.6.32.15/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.15/drivers/misc/sgi-gru/gruhandles.c ---- linux-2.6.32.15/drivers/misc/sgi-gru/gruhandles.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/misc/sgi-gru/gruhandles.c 2010-05-28 21:27:15.650946222 -0400 +diff -urNp linux-2.6.32.16/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.16/drivers/misc/sgi-gru/gruhandles.c +--- linux-2.6.32.16/drivers/misc/sgi-gru/gruhandles.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/misc/sgi-gru/gruhandles.c 2010-07-09 14:50:36.000000000 -0400 @@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic 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 if (mcs_op_statistics[op].max < clks) mcs_op_statistics[op].max = clks; } -diff -urNp linux-2.6.32.15/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.15/drivers/misc/sgi-gru/gruprocfs.c ---- linux-2.6.32.15/drivers/misc/sgi-gru/gruprocfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/misc/sgi-gru/gruprocfs.c 2010-05-28 21:27:15.650946222 -0400 +diff -urNp linux-2.6.32.16/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.16/drivers/misc/sgi-gru/gruprocfs.c +--- linux-2.6.32.16/drivers/misc/sgi-gru/gruprocfs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/misc/sgi-gru/gruprocfs.c 2010-07-09 14:50:36.000000000 -0400 @@ -32,9 +32,9 @@ #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 max = mcs_op_statistics[op].max; seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, count ? total / count : 0, max); -diff -urNp linux-2.6.32.15/drivers/misc/sgi-gru/grutables.h linux-2.6.32.15/drivers/misc/sgi-gru/grutables.h ---- linux-2.6.32.15/drivers/misc/sgi-gru/grutables.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/misc/sgi-gru/grutables.h 2010-05-28 21:27:15.650946222 -0400 +diff -urNp linux-2.6.32.16/drivers/misc/sgi-gru/grutables.h linux-2.6.32.16/drivers/misc/sgi-gru/grutables.h +--- linux-2.6.32.16/drivers/misc/sgi-gru/grutables.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/misc/sgi-gru/grutables.h 2010-07-09 14:50:36.000000000 -0400 @@ -167,84 +167,84 @@ extern unsigned int gru_max_gids; * GRU statistics. */ @@ -25994,9 +26173,9 @@ diff -urNp linux-2.6.32.15/drivers/misc/sgi-gru/grutables.h linux-2.6.32.15/driv } while (0) #ifdef CONFIG_SGI_GRU_DEBUG -diff -urNp linux-2.6.32.15/drivers/mtd/devices/doc2000.c linux-2.6.32.15/drivers/mtd/devices/doc2000.c ---- linux-2.6.32.15/drivers/mtd/devices/doc2000.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/mtd/devices/doc2000.c 2010-05-28 21:27:15.650946222 -0400 +diff -urNp linux-2.6.32.16/drivers/mtd/devices/doc2000.c linux-2.6.32.16/drivers/mtd/devices/doc2000.c +--- linux-2.6.32.16/drivers/mtd/devices/doc2000.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/mtd/devices/doc2000.c 2010-07-09 14:50:36.000000000 -0400 @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt /* 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 printk(KERN_WARNING "ECC needs a full sector write (adr: %lx size %lx)\n", (long) to, (long) len); -diff -urNp linux-2.6.32.15/drivers/mtd/devices/doc2001.c linux-2.6.32.15/drivers/mtd/devices/doc2001.c ---- linux-2.6.32.15/drivers/mtd/devices/doc2001.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/mtd/devices/doc2001.c 2010-05-28 21:27:15.650946222 -0400 +diff -urNp linux-2.6.32.16/drivers/mtd/devices/doc2001.c linux-2.6.32.16/drivers/mtd/devices/doc2001.c +--- linux-2.6.32.16/drivers/mtd/devices/doc2001.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/mtd/devices/doc2001.c 2010-07-09 14:50:36.000000000 -0400 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt struct Nand *mychip = &this->chips[from >> (this->chipshift)]; @@ -26018,9 +26197,9 @@ diff -urNp linux-2.6.32.15/drivers/mtd/devices/doc2001.c linux-2.6.32.15/drivers return -EINVAL; /* Don't allow a single read to cross a 512-byte block boundary */ -diff -urNp linux-2.6.32.15/drivers/mtd/ubi/build.c linux-2.6.32.15/drivers/mtd/ubi/build.c ---- linux-2.6.32.15/drivers/mtd/ubi/build.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/mtd/ubi/build.c 2010-05-28 21:27:15.650946222 -0400 +diff -urNp linux-2.6.32.16/drivers/mtd/ubi/build.c linux-2.6.32.16/drivers/mtd/ubi/build.c +--- linux-2.6.32.16/drivers/mtd/ubi/build.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/mtd/ubi/build.c 2010-07-09 14:50:36.000000000 -0400 @@ -1255,7 +1255,7 @@ module_exit(ubi_exit); static int __init bytes_str_to_int(const char *str) { @@ -26060,9 +26239,9 @@ diff -urNp linux-2.6.32.15/drivers/mtd/ubi/build.c linux-2.6.32.15/drivers/mtd/u } /** -diff -urNp linux-2.6.32.15/drivers/net/e1000e/82571.c linux-2.6.32.15/drivers/net/e1000e/82571.c ---- linux-2.6.32.15/drivers/net/e1000e/82571.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/net/e1000e/82571.c 2010-05-28 21:27:15.655178202 -0400 +diff -urNp linux-2.6.32.16/drivers/net/e1000e/82571.c linux-2.6.32.16/drivers/net/e1000e/82571.c +--- linux-2.6.32.16/drivers/net/e1000e/82571.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/e1000e/82571.c 2010-07-09 14:50:36.000000000 -0400 @@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s { 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 .acquire_nvm = e1000_acquire_nvm_82571, .read_nvm = e1000e_read_nvm_eerd, .release_nvm = e1000_release_nvm_82571, -diff -urNp linux-2.6.32.15/drivers/net/e1000e/e1000.h linux-2.6.32.15/drivers/net/e1000e/e1000.h ---- linux-2.6.32.15/drivers/net/e1000e/e1000.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/net/e1000e/e1000.h 2010-05-28 21:27:15.655178202 -0400 +diff -urNp linux-2.6.32.16/drivers/net/e1000e/e1000.h linux-2.6.32.16/drivers/net/e1000e/e1000.h +--- linux-2.6.32.16/drivers/net/e1000e/e1000.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/e1000e/e1000.h 2010-07-09 14:50:36.000000000 -0400 @@ -375,9 +375,9 @@ struct e1000_info { u32 pba; 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 }; /* hardware capability, feature, and workaround flags */ -diff -urNp linux-2.6.32.15/drivers/net/e1000e/es2lan.c linux-2.6.32.15/drivers/net/e1000e/es2lan.c ---- linux-2.6.32.15/drivers/net/e1000e/es2lan.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/net/e1000e/es2lan.c 2010-05-28 21:27:15.655178202 -0400 +diff -urNp linux-2.6.32.16/drivers/net/e1000e/es2lan.c linux-2.6.32.16/drivers/net/e1000e/es2lan.c +--- linux-2.6.32.16/drivers/net/e1000e/es2lan.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/e1000e/es2lan.c 2010-07-09 14:50:36.000000000 -0400 @@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es { 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 .acquire_nvm = e1000_acquire_nvm_80003es2lan, .read_nvm = e1000e_read_nvm_eerd, .release_nvm = e1000_release_nvm_80003es2lan, -diff -urNp linux-2.6.32.15/drivers/net/e1000e/hw.h linux-2.6.32.15/drivers/net/e1000e/hw.h ---- linux-2.6.32.15/drivers/net/e1000e/hw.h 2010-04-04 20:41:49.956500002 -0400 -+++ linux-2.6.32.15/drivers/net/e1000e/hw.h 2010-05-28 21:27:15.659202304 -0400 +diff -urNp linux-2.6.32.16/drivers/net/e1000e/hw.h linux-2.6.32.16/drivers/net/e1000e/hw.h +--- linux-2.6.32.16/drivers/net/e1000e/hw.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/e1000e/hw.h 2010-07-09 14:50:36.000000000 -0400 @@ -756,34 +756,34 @@ struct e1000_mac_operations { /* 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 }; struct e1000_mac_info { -diff -urNp linux-2.6.32.15/drivers/net/e1000e/ich8lan.c linux-2.6.32.15/drivers/net/e1000e/ich8lan.c ---- linux-2.6.32.15/drivers/net/e1000e/ich8lan.c 2010-04-04 20:41:49.960543003 -0400 -+++ linux-2.6.32.15/drivers/net/e1000e/ich8lan.c 2010-05-28 21:27:15.659202304 -0400 +diff -urNp linux-2.6.32.16/drivers/net/e1000e/ich8lan.c linux-2.6.32.16/drivers/net/e1000e/ich8lan.c +--- linux-2.6.32.16/drivers/net/e1000e/ich8lan.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/e1000e/ich8lan.c 2010-07-09 14:50:36.000000000 -0400 @@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan } } @@ -26262,9 +26441,9 @@ diff -urNp linux-2.6.32.15/drivers/net/e1000e/ich8lan.c linux-2.6.32.15/drivers/ .acquire_nvm = e1000_acquire_nvm_ich8lan, .read_nvm = e1000_read_nvm_ich8lan, .release_nvm = e1000_release_nvm_ich8lan, -diff -urNp linux-2.6.32.15/drivers/net/ibmveth.c linux-2.6.32.15/drivers/net/ibmveth.c ---- linux-2.6.32.15/drivers/net/ibmveth.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/net/ibmveth.c 2010-05-28 21:27:15.659202304 -0400 +diff -urNp linux-2.6.32.16/drivers/net/ibmveth.c linux-2.6.32.16/drivers/net/ibmveth.c +--- linux-2.6.32.16/drivers/net/ibmveth.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/ibmveth.c 2010-07-09 14:50:36.000000000 -0400 @@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr NULL, }; @@ -26274,9 +26453,9 @@ diff -urNp linux-2.6.32.15/drivers/net/ibmveth.c linux-2.6.32.15/drivers/net/ibm .show = veth_pool_show, .store = veth_pool_store, }; -diff -urNp linux-2.6.32.15/drivers/net/igb/e1000_82575.c linux-2.6.32.15/drivers/net/igb/e1000_82575.c ---- linux-2.6.32.15/drivers/net/igb/e1000_82575.c 2010-04-29 17:49:38.085476187 -0400 -+++ linux-2.6.32.15/drivers/net/igb/e1000_82575.c 2010-05-28 21:27:15.659202304 -0400 +diff -urNp linux-2.6.32.16/drivers/net/igb/e1000_82575.c linux-2.6.32.16/drivers/net/igb/e1000_82575.c +--- linux-2.6.32.16/drivers/net/igb/e1000_82575.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/igb/e1000_82575.c 2010-07-09 14:50:36.000000000 -0400 @@ -1401,7 +1401,7 @@ void igb_vmdq_set_replication_pf(struct wr32(E1000_VT_CTL, vt_ctl); } @@ -26302,9 +26481,9 @@ diff -urNp linux-2.6.32.15/drivers/net/igb/e1000_82575.c linux-2.6.32.15/drivers .acquire = igb_acquire_nvm_82575, .read = igb_read_nvm_eerd, .release = igb_release_nvm_82575, -diff -urNp linux-2.6.32.15/drivers/net/igb/e1000_hw.h linux-2.6.32.15/drivers/net/igb/e1000_hw.h ---- linux-2.6.32.15/drivers/net/igb/e1000_hw.h 2010-04-29 17:49:38.085476187 -0400 -+++ linux-2.6.32.15/drivers/net/igb/e1000_hw.h 2010-05-28 21:27:15.659202304 -0400 +diff -urNp linux-2.6.32.16/drivers/net/igb/e1000_hw.h linux-2.6.32.16/drivers/net/igb/e1000_hw.h +--- linux-2.6.32.16/drivers/net/igb/e1000_hw.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/igb/e1000_hw.h 2010-07-09 14:50:36.000000000 -0400 @@ -303,17 +303,17 @@ struct e1000_phy_operations { }; @@ -26330,9 +26509,9 @@ diff -urNp linux-2.6.32.15/drivers/net/igb/e1000_hw.h linux-2.6.32.15/drivers/ne }; extern const struct e1000_info e1000_82575_info; -diff -urNp linux-2.6.32.15/drivers/net/irda/vlsi_ir.c linux-2.6.32.15/drivers/net/irda/vlsi_ir.c ---- linux-2.6.32.15/drivers/net/irda/vlsi_ir.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/net/irda/vlsi_ir.c 2010-05-28 21:27:15.662946876 -0400 +diff -urNp linux-2.6.32.16/drivers/net/irda/vlsi_ir.c linux-2.6.32.16/drivers/net/irda/vlsi_ir.c +--- linux-2.6.32.16/drivers/net/irda/vlsi_ir.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/irda/vlsi_ir.c 2010-07-09 14:50:36.000000000 -0400 @@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit( /* no race - tx-ring already empty */ 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 spin_unlock_irqrestore(&idev->lock, flags); dev_kfree_skb_any(skb); return NETDEV_TX_OK; -diff -urNp linux-2.6.32.15/drivers/net/iseries_veth.c linux-2.6.32.15/drivers/net/iseries_veth.c ---- linux-2.6.32.15/drivers/net/iseries_veth.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/net/iseries_veth.c 2010-05-28 21:27:15.662946876 -0400 +diff -urNp linux-2.6.32.16/drivers/net/iseries_veth.c linux-2.6.32.16/drivers/net/iseries_veth.c +--- linux-2.6.32.16/drivers/net/iseries_veth.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/iseries_veth.c 2010-07-09 14:50:36.000000000 -0400 @@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul NULL }; @@ -26370,9 +26549,9 @@ diff -urNp linux-2.6.32.15/drivers/net/iseries_veth.c linux-2.6.32.15/drivers/ne .show = veth_port_attribute_show }; -diff -urNp linux-2.6.32.15/drivers/net/pcnet32.c linux-2.6.32.15/drivers/net/pcnet32.c ---- linux-2.6.32.15/drivers/net/pcnet32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/net/pcnet32.c 2010-05-28 21:27:15.662946876 -0400 +diff -urNp linux-2.6.32.16/drivers/net/pcnet32.c linux-2.6.32.16/drivers/net/pcnet32.c +--- linux-2.6.32.16/drivers/net/pcnet32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/pcnet32.c 2010-07-09 14:50:36.000000000 -0400 @@ -79,7 +79,7 @@ static int cards_found; /* * 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 { 0x300, 0x320, 0x340, 0x360, 0 }; static int pcnet32_debug = 0; -diff -urNp linux-2.6.32.15/drivers/net/tg3.h linux-2.6.32.15/drivers/net/tg3.h ---- linux-2.6.32.15/drivers/net/tg3.h 2010-04-04 20:41:49.968494922 -0400 -+++ linux-2.6.32.15/drivers/net/tg3.h 2010-05-28 21:27:15.662946876 -0400 +diff -urNp linux-2.6.32.16/drivers/net/tg3.h linux-2.6.32.16/drivers/net/tg3.h +--- linux-2.6.32.16/drivers/net/tg3.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/tg3.h 2010-07-09 14:50:36.000000000 -0400 @@ -95,6 +95,7 @@ #define CHIPREV_ID_5750_A0 0x4000 #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 #define CHIPREV_ID_5750_C2 0x4202 #define CHIPREV_ID_5752_A0_HW 0x5000 #define CHIPREV_ID_5752_A0 0x6000 -diff -urNp linux-2.6.32.15/drivers/net/tulip/de4x5.c linux-2.6.32.15/drivers/net/tulip/de4x5.c ---- linux-2.6.32.15/drivers/net/tulip/de4x5.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/net/tulip/de4x5.c 2010-05-28 21:27:15.696210343 -0400 +diff -urNp linux-2.6.32.16/drivers/net/tulip/de4x5.c linux-2.6.32.16/drivers/net/tulip/de4x5.c +--- linux-2.6.32.16/drivers/net/tulip/de4x5.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/tulip/de4x5.c 2010-07-09 14:50:36.000000000 -0400 @@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru for (i=0; i<ETH_ALEN; i++) { 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 return -EFAULT; break; } -diff -urNp linux-2.6.32.15/drivers/net/usb/hso.c linux-2.6.32.15/drivers/net/usb/hso.c ---- linux-2.6.32.15/drivers/net/usb/hso.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/net/usb/hso.c 2010-05-28 21:27:15.699197955 -0400 +diff -urNp linux-2.6.32.16/drivers/net/usb/hso.c linux-2.6.32.16/drivers/net/usb/hso.c +--- linux-2.6.32.16/drivers/net/usb/hso.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/usb/hso.c 2010-07-09 14:50:36.000000000 -0400 @@ -258,7 +258,7 @@ struct hso_serial { /* 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 result = hso_start_serial_device(serial_table[i], GFP_NOIO); hso_kick_transmit(dev2ser(serial_table[i])); -diff -urNp linux-2.6.32.15/drivers/net/wireless/b43/debugfs.c linux-2.6.32.15/drivers/net/wireless/b43/debugfs.c ---- linux-2.6.32.15/drivers/net/wireless/b43/debugfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/net/wireless/b43/debugfs.c 2010-05-28 21:27:15.699197955 -0400 +diff -urNp linux-2.6.32.16/drivers/net/wireless/b43/debugfs.c linux-2.6.32.16/drivers/net/wireless/b43/debugfs.c +--- linux-2.6.32.16/drivers/net/wireless/b43/debugfs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/wireless/b43/debugfs.c 2010-07-09 14:50:36.000000000 -0400 @@ -43,7 +43,7 @@ static struct dentry *rootdir; struct b43_debugfs_fops { 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 /* Offset of struct b43_dfs_file in struct b43_dfsentry */ size_t file_struct_offset; }; -diff -urNp linux-2.6.32.15/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.15/drivers/net/wireless/b43legacy/debugfs.c ---- linux-2.6.32.15/drivers/net/wireless/b43legacy/debugfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/net/wireless/b43legacy/debugfs.c 2010-05-28 21:27:15.699197955 -0400 +diff -urNp linux-2.6.32.16/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.16/drivers/net/wireless/b43legacy/debugfs.c +--- linux-2.6.32.16/drivers/net/wireless/b43legacy/debugfs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/wireless/b43legacy/debugfs.c 2010-07-09 14:50:36.000000000 -0400 @@ -44,7 +44,7 @@ static struct dentry *rootdir; struct b43legacy_debugfs_fops { 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 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ size_t file_struct_offset; /* Take wl->irq_lock before calling read/write? */ -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 ---- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-05-28 21:27:15.699197955 -0400 +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 +--- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-07-09 14:50:36.000000000 -0400 @@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = }, }; @@ -26531,9 +26710,9 @@ diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32. .ucode = &iwl5000_ucode, .lib = &iwl1000_lib, .hcmd = &iwl5000_hcmd, -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 ---- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-04-04 20:41:49.972919715 -0400 -+++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-05-28 21:27:15.707206768 -0400 +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 +--- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-07-09 14:50:36.000000000 -0400 @@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945 .build_addsta_hcmd = iwl3945_build_addsta_hcmd, }; @@ -26543,9 +26722,9 @@ diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32. .ucode = &iwl3945_ucode, .lib = &iwl3945_lib, .hcmd = &iwl3945_hcmd, -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 ---- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-05-28 20:16:44.442935997 -0400 -+++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-05-28 21:27:15.707206768 -0400 +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 +--- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-07-09 14:50:36.000000000 -0400 @@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib = }, }; @@ -26555,9 +26734,9 @@ diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32. .ucode = &iwl4965_ucode, .lib = &iwl4965_lib, .hcmd = &iwl4965_hcmd, -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 ---- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-05-28 20:16:44.446927415 -0400 -+++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-05-28 21:27:15.707206768 -0400 +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 +--- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-07-09 14:50:36.000000000 -0400 @@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib = }, }; @@ -26575,9 +26754,9 @@ diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32. .ucode = &iwl5000_ucode, .lib = &iwl5150_lib, .hcmd = &iwl5000_hcmd, -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 ---- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-05-28 21:27:15.707206768 -0400 +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 +--- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-07-09 14:50:36.000000000 -0400 @@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000 .calc_rssi = iwl5000_calc_rssi, }; @@ -26587,9 +26766,9 @@ diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32. .ucode = &iwl5000_ucode, .lib = &iwl6000_lib, .hcmd = &iwl5000_hcmd, -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 ---- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-05-28 21:27:15.707206768 -0400 +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 +--- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-07-09 14:50:36.000000000 -0400 @@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri #endif @@ -26601,10 +26780,10 @@ diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32 static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level, void *p, u32 len) {} -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 ---- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-05-28 21:27:15.707206768 -0400 -@@ -67,7 +67,7 @@ struct iwl_tx_queue; +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 +--- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-07-09 14:50:36.000000000 -0400 +@@ -68,7 +68,7 @@ struct iwl_tx_queue; /* shared structures from iwl-5000.c */ 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 extern struct iwl_ucode_ops iwl5000_ucode; extern struct iwl_lib_ops iwl5000_lib; extern struct iwl_hcmd_ops iwl5000_hcmd; -diff -urNp linux-2.6.32.15/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.15/drivers/net/wireless/libertas/debugfs.c ---- linux-2.6.32.15/drivers/net/wireless/libertas/debugfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/net/wireless/libertas/debugfs.c 2010-05-28 21:27:15.715208538 -0400 +diff -urNp linux-2.6.32.16/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.16/drivers/net/wireless/libertas/debugfs.c +--- linux-2.6.32.16/drivers/net/wireless/libertas/debugfs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/wireless/libertas/debugfs.c 2010-07-09 14:50:36.000000000 -0400 @@ -708,7 +708,7 @@ out_unlock: struct lbs_debugfs_files { const char *name; @@ -26625,9 +26804,9 @@ diff -urNp linux-2.6.32.15/drivers/net/wireless/libertas/debugfs.c linux-2.6.32. }; static const struct lbs_debugfs_files debugfs_files[] = { -diff -urNp linux-2.6.32.15/drivers/net/wireless/rndis_wlan.c linux-2.6.32.15/drivers/net/wireless/rndis_wlan.c ---- linux-2.6.32.15/drivers/net/wireless/rndis_wlan.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/net/wireless/rndis_wlan.c 2010-05-28 21:27:15.715208538 -0400 +diff -urNp linux-2.6.32.16/drivers/net/wireless/rndis_wlan.c linux-2.6.32.16/drivers/net/wireless/rndis_wlan.c +--- linux-2.6.32.16/drivers/net/wireless/rndis_wlan.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/net/wireless/rndis_wlan.c 2010-07-09 14:50:36.000000000 -0400 @@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn 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 rts_threshold = 2347; tmp = cpu_to_le32(rts_threshold); -diff -urNp linux-2.6.32.15/drivers/oprofile/buffer_sync.c linux-2.6.32.15/drivers/oprofile/buffer_sync.c ---- linux-2.6.32.15/drivers/oprofile/buffer_sync.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/oprofile/buffer_sync.c 2010-05-28 21:27:15.718942362 -0400 +diff -urNp linux-2.6.32.16/drivers/oprofile/buffer_sync.c linux-2.6.32.16/drivers/oprofile/buffer_sync.c +--- linux-2.6.32.16/drivers/oprofile/buffer_sync.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/oprofile/buffer_sync.c 2010-07-09 14:50:36.000000000 -0400 @@ -340,7 +340,7 @@ static void add_data(struct op_entry *en if (cookie == NO_COOKIE) offset = pc; @@ -26675,9 +26854,9 @@ diff -urNp linux-2.6.32.15/drivers/oprofile/buffer_sync.c linux-2.6.32.15/driver } } release_mm(mm); -diff -urNp linux-2.6.32.15/drivers/oprofile/event_buffer.c linux-2.6.32.15/drivers/oprofile/event_buffer.c ---- linux-2.6.32.15/drivers/oprofile/event_buffer.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/oprofile/event_buffer.c 2010-05-28 21:27:15.718942362 -0400 +diff -urNp linux-2.6.32.16/drivers/oprofile/event_buffer.c linux-2.6.32.16/drivers/oprofile/event_buffer.c +--- linux-2.6.32.16/drivers/oprofile/event_buffer.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/oprofile/event_buffer.c 2010-07-09 14:50:36.000000000 -0400 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value } @@ -26687,9 +26866,9 @@ diff -urNp linux-2.6.32.15/drivers/oprofile/event_buffer.c linux-2.6.32.15/drive return; } -diff -urNp linux-2.6.32.15/drivers/oprofile/oprof.c linux-2.6.32.15/drivers/oprofile/oprof.c ---- linux-2.6.32.15/drivers/oprofile/oprof.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/oprofile/oprof.c 2010-05-28 21:27:15.718942362 -0400 +diff -urNp linux-2.6.32.16/drivers/oprofile/oprof.c linux-2.6.32.16/drivers/oprofile/oprof.c +--- linux-2.6.32.16/drivers/oprofile/oprof.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/oprofile/oprof.c 2010-07-09 14:50:36.000000000 -0400 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st if (oprofile_ops.switch_events()) return; @@ -26699,9 +26878,9 @@ diff -urNp linux-2.6.32.15/drivers/oprofile/oprof.c linux-2.6.32.15/drivers/opro start_switch_worker(); } -diff -urNp linux-2.6.32.15/drivers/oprofile/oprofilefs.c linux-2.6.32.15/drivers/oprofile/oprofilefs.c ---- linux-2.6.32.15/drivers/oprofile/oprofilefs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/oprofile/oprofilefs.c 2010-05-28 21:27:15.718942362 -0400 +diff -urNp linux-2.6.32.16/drivers/oprofile/oprofilefs.c linux-2.6.32.16/drivers/oprofile/oprofilefs.c +--- linux-2.6.32.16/drivers/oprofile/oprofilefs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/oprofile/oprofilefs.c 2010-07-09 14:50:37.000000000 -0400 @@ -187,7 +187,7 @@ static const struct file_operations atom @@ -26711,9 +26890,9 @@ diff -urNp linux-2.6.32.15/drivers/oprofile/oprofilefs.c linux-2.6.32.15/drivers { struct dentry *d = __oprofilefs_create_file(sb, root, name, &atomic_ro_fops, 0444); -diff -urNp linux-2.6.32.15/drivers/oprofile/oprofile_stats.c linux-2.6.32.15/drivers/oprofile/oprofile_stats.c ---- linux-2.6.32.15/drivers/oprofile/oprofile_stats.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/oprofile/oprofile_stats.c 2010-05-28 21:27:15.718942362 -0400 +diff -urNp linux-2.6.32.16/drivers/oprofile/oprofile_stats.c linux-2.6.32.16/drivers/oprofile/oprofile_stats.c +--- linux-2.6.32.16/drivers/oprofile/oprofile_stats.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/oprofile/oprofile_stats.c 2010-07-09 14:50:37.000000000 -0400 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void) cpu_buf->sample_invalid_eip = 0; } @@ -26731,9 +26910,9 @@ diff -urNp linux-2.6.32.15/drivers/oprofile/oprofile_stats.c linux-2.6.32.15/dri } -diff -urNp linux-2.6.32.15/drivers/oprofile/oprofile_stats.h linux-2.6.32.15/drivers/oprofile/oprofile_stats.h ---- linux-2.6.32.15/drivers/oprofile/oprofile_stats.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/oprofile/oprofile_stats.h 2010-05-28 21:27:15.718942362 -0400 +diff -urNp linux-2.6.32.16/drivers/oprofile/oprofile_stats.h linux-2.6.32.16/drivers/oprofile/oprofile_stats.h +--- linux-2.6.32.16/drivers/oprofile/oprofile_stats.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/oprofile/oprofile_stats.h 2010-07-09 14:50:37.000000000 -0400 @@ -13,11 +13,11 @@ #include <asm/atomic.h> @@ -26751,9 +26930,9 @@ diff -urNp linux-2.6.32.15/drivers/oprofile/oprofile_stats.h linux-2.6.32.15/dri }; extern struct oprofile_stat_struct oprofile_stats; -diff -urNp linux-2.6.32.15/drivers/parisc/pdc_stable.c linux-2.6.32.15/drivers/parisc/pdc_stable.c ---- linux-2.6.32.15/drivers/parisc/pdc_stable.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/parisc/pdc_stable.c 2010-05-28 21:27:15.727198333 -0400 +diff -urNp linux-2.6.32.16/drivers/parisc/pdc_stable.c linux-2.6.32.16/drivers/parisc/pdc_stable.c +--- linux-2.6.32.16/drivers/parisc/pdc_stable.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/parisc/pdc_stable.c 2010-07-09 14:50:37.000000000 -0400 @@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj return ret; } @@ -26763,9 +26942,9 @@ diff -urNp linux-2.6.32.15/drivers/parisc/pdc_stable.c linux-2.6.32.15/drivers/p .show = pdcspath_attr_show, .store = pdcspath_attr_store, }; -diff -urNp linux-2.6.32.15/drivers/parport/procfs.c linux-2.6.32.15/drivers/parport/procfs.c ---- linux-2.6.32.15/drivers/parport/procfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/parport/procfs.c 2010-05-28 21:27:15.727198333 -0400 +diff -urNp linux-2.6.32.16/drivers/parport/procfs.c linux-2.6.32.16/drivers/parport/procfs.c +--- linux-2.6.32.16/drivers/parport/procfs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/parport/procfs.c 2010-07-09 14:50:37.000000000 -0400 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t *ppos += len; @@ -26784,9 +26963,9 @@ diff -urNp linux-2.6.32.15/drivers/parport/procfs.c linux-2.6.32.15/drivers/parp } #endif /* IEEE1284.3 support. */ -diff -urNp linux-2.6.32.15/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.15/drivers/pci/hotplug/acpiphp_glue.c ---- linux-2.6.32.15/drivers/pci/hotplug/acpiphp_glue.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/pci/hotplug/acpiphp_glue.c 2010-05-28 21:27:15.727198333 -0400 +diff -urNp linux-2.6.32.16/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.16/drivers/pci/hotplug/acpiphp_glue.c +--- linux-2.6.32.16/drivers/pci/hotplug/acpiphp_glue.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/pci/hotplug/acpiphp_glue.c 2010-07-09 14:50:37.000000000 -0400 @@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif } @@ -26796,9 +26975,9 @@ diff -urNp linux-2.6.32.15/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.15/dr .handler = handle_hotplug_event_func, }; -diff -urNp linux-2.6.32.15/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.15/drivers/pci/hotplug/cpqphp_nvram.c ---- linux-2.6.32.15/drivers/pci/hotplug/cpqphp_nvram.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/pci/hotplug/cpqphp_nvram.c 2010-05-28 21:27:15.727198333 -0400 +diff -urNp linux-2.6.32.16/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.16/drivers/pci/hotplug/cpqphp_nvram.c +--- linux-2.6.32.16/drivers/pci/hotplug/cpqphp_nvram.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/pci/hotplug/cpqphp_nvram.c 2010-07-09 14:50:37.000000000 -0400 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ 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 dbg("int15 entry = %p\n", compaq_int15_entry_point); /* initialize our int15 lock */ -diff -urNp linux-2.6.32.15/drivers/pci/hotplug/fakephp.c linux-2.6.32.15/drivers/pci/hotplug/fakephp.c ---- linux-2.6.32.15/drivers/pci/hotplug/fakephp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/pci/hotplug/fakephp.c 2010-05-28 21:27:15.727198333 -0400 +diff -urNp linux-2.6.32.16/drivers/pci/hotplug/fakephp.c linux-2.6.32.16/drivers/pci/hotplug/fakephp.c +--- linux-2.6.32.16/drivers/pci/hotplug/fakephp.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/pci/hotplug/fakephp.c 2010-07-09 14:50:37.000000000 -0400 @@ -73,7 +73,7 @@ static void legacy_release(struct kobjec } @@ -26825,10 +27004,70 @@ diff -urNp linux-2.6.32.15/drivers/pci/hotplug/fakephp.c linux-2.6.32.15/drivers .store = legacy_store, .show = legacy_show }, .release = &legacy_release, -diff -urNp linux-2.6.32.15/drivers/pci/intel-iommu.c linux-2.6.32.15/drivers/pci/intel-iommu.c ---- linux-2.6.32.15/drivers/pci/intel-iommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/pci/intel-iommu.c 2010-05-28 21:27:15.730990089 -0400 -@@ -2950,7 +2950,7 @@ static int intel_mapping_error(struct de +diff -urNp linux-2.6.32.16/drivers/pci/intel-iommu.c linux-2.6.32.16/drivers/pci/intel-iommu.c +--- linux-2.6.32.16/drivers/pci/intel-iommu.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/pci/intel-iommu.c 2010-07-09 14:50:44.000000000 -0400 +@@ -2647,7 +2647,7 @@ error: + return 0; + } + +-static dma_addr_t intel_map_page(struct device *dev, struct page *page, ++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) +@@ -2723,7 +2723,7 @@ static void add_unmap(struct dmar_domain + spin_unlock_irqrestore(&async_umap_flush_lock, flags); + } + +-static void intel_unmap_page(struct device *dev, dma_addr_t dev_addr, ++void intel_unmap_page(struct device *dev, dma_addr_t dev_addr, + size_t size, enum dma_data_direction dir, + struct dma_attrs *attrs) + { +@@ -2772,7 +2772,7 @@ static void intel_unmap_page(struct devi + } + } + +-static void *intel_alloc_coherent(struct device *hwdev, size_t size, ++void *intel_alloc_coherent(struct device *hwdev, size_t size, + dma_addr_t *dma_handle, gfp_t flags) + { + void *vaddr; +@@ -2804,7 +2804,7 @@ static void *intel_alloc_coherent(struct + return NULL; + } + +-static void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr, ++void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr, + dma_addr_t dma_handle) + { + int order; +@@ -2816,7 +2816,7 @@ static void intel_free_coherent(struct d + free_pages((unsigned long)vaddr, order); + } + +-static void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist, ++void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist, + int nelems, enum dma_data_direction dir, + struct dma_attrs *attrs) + { +@@ -2876,7 +2876,7 @@ static int intel_nontranslate_map_sg(str + return nelems; + } + +-static int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int nelems, ++int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int nelems, + enum dma_data_direction dir, struct dma_attrs *attrs) + { + int i; +@@ -2945,12 +2945,12 @@ static int intel_map_sg(struct device *h + return nelems; + } + +-static int intel_mapping_error(struct device *dev, dma_addr_t dma_addr) ++int intel_mapping_error(struct device *dev, dma_addr_t dma_addr) + { return !dma_addr; } @@ -26837,9 +27076,9 @@ diff -urNp linux-2.6.32.15/drivers/pci/intel-iommu.c linux-2.6.32.15/drivers/pci .alloc_coherent = intel_alloc_coherent, .free_coherent = intel_free_coherent, .map_sg = intel_map_sg, -diff -urNp linux-2.6.32.15/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.15/drivers/pci/pcie/portdrv_pci.c ---- linux-2.6.32.15/drivers/pci/pcie/portdrv_pci.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/pci/pcie/portdrv_pci.c 2010-05-28 21:27:15.730990089 -0400 +diff -urNp linux-2.6.32.16/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.16/drivers/pci/pcie/portdrv_pci.c +--- linux-2.6.32.16/drivers/pci/pcie/portdrv_pci.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/pci/pcie/portdrv_pci.c 2010-07-09 14:50:37.000000000 -0400 @@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru static const struct pci_device_id port_pci_ids[] = { { /* 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 }; MODULE_DEVICE_TABLE(pci, port_pci_ids); -diff -urNp linux-2.6.32.15/drivers/pci/probe.c linux-2.6.32.15/drivers/pci/probe.c ---- linux-2.6.32.15/drivers/pci/probe.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/pci/probe.c 2010-05-28 21:27:15.739209869 -0400 +diff -urNp linux-2.6.32.16/drivers/pci/probe.c linux-2.6.32.16/drivers/pci/probe.c +--- linux-2.6.32.16/drivers/pci/probe.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/pci/probe.c 2010-07-09 14:50:37.000000000 -0400 @@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity( return ret; } @@ -26869,9 +27108,9 @@ diff -urNp linux-2.6.32.15/drivers/pci/probe.c linux-2.6.32.15/drivers/pci/probe struct device_attribute *attr, char *buf) { -diff -urNp linux-2.6.32.15/drivers/pci/proc.c linux-2.6.32.15/drivers/pci/proc.c ---- linux-2.6.32.15/drivers/pci/proc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/pci/proc.c 2010-05-28 21:27:15.739209869 -0400 +diff -urNp linux-2.6.32.16/drivers/pci/proc.c linux-2.6.32.16/drivers/pci/proc.c +--- linux-2.6.32.16/drivers/pci/proc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/pci/proc.c 2010-07-09 14:50:37.000000000 -0400 @@ -480,7 +480,16 @@ static const struct file_operations proc static int __init pci_proc_init(void) { @@ -26889,9 +27128,9 @@ diff -urNp linux-2.6.32.15/drivers/pci/proc.c linux-2.6.32.15/drivers/pci/proc.c proc_create("devices", 0, proc_bus_pci_dir, &proc_bus_pci_dev_operations); proc_initialized = 1; -diff -urNp linux-2.6.32.15/drivers/pci/slot.c linux-2.6.32.15/drivers/pci/slot.c ---- linux-2.6.32.15/drivers/pci/slot.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/pci/slot.c 2010-05-28 21:27:15.739209869 -0400 +diff -urNp linux-2.6.32.16/drivers/pci/slot.c linux-2.6.32.16/drivers/pci/slot.c +--- linux-2.6.32.16/drivers/pci/slot.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/pci/slot.c 2010-07-09 14:50:37.000000000 -0400 @@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc return attribute->store ? attribute->store(slot, buf, len) : -EIO; } @@ -26901,9 +27140,9 @@ diff -urNp linux-2.6.32.15/drivers/pci/slot.c linux-2.6.32.15/drivers/pci/slot.c .show = pci_slot_attr_show, .store = pci_slot_attr_store, }; -diff -urNp linux-2.6.32.15/drivers/pcmcia/ti113x.h linux-2.6.32.15/drivers/pcmcia/ti113x.h ---- linux-2.6.32.15/drivers/pcmcia/ti113x.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/pcmcia/ti113x.h 2010-05-28 21:27:15.743188935 -0400 +diff -urNp linux-2.6.32.16/drivers/pcmcia/ti113x.h linux-2.6.32.16/drivers/pcmcia/ti113x.h +--- linux-2.6.32.16/drivers/pcmcia/ti113x.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/pcmcia/ti113x.h 2010-07-09 14:50:37.000000000 -0400 @@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID, 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 }; static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) -diff -urNp linux-2.6.32.15/drivers/pcmcia/yenta_socket.c linux-2.6.32.15/drivers/pcmcia/yenta_socket.c ---- linux-2.6.32.15/drivers/pcmcia/yenta_socket.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/pcmcia/yenta_socket.c 2010-05-28 21:27:15.751196243 -0400 +diff -urNp linux-2.6.32.16/drivers/pcmcia/yenta_socket.c linux-2.6.32.16/drivers/pcmcia/yenta_socket.c +--- linux-2.6.32.16/drivers/pcmcia/yenta_socket.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/pcmcia/yenta_socket.c 2010-07-09 14:50:37.000000000 -0400 @@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table /* 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 }; MODULE_DEVICE_TABLE(pci, yenta_table); -diff -urNp linux-2.6.32.15/drivers/platform/x86/acer-wmi.c linux-2.6.32.15/drivers/platform/x86/acer-wmi.c ---- linux-2.6.32.15/drivers/platform/x86/acer-wmi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/platform/x86/acer-wmi.c 2010-05-28 21:27:15.759196972 -0400 +diff -urNp linux-2.6.32.16/drivers/platform/x86/acer-wmi.c linux-2.6.32.16/drivers/platform/x86/acer-wmi.c +--- linux-2.6.32.16/drivers/platform/x86/acer-wmi.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/platform/x86/acer-wmi.c 2010-07-09 14:50:37.000000000 -0400 @@ -918,7 +918,7 @@ static int update_bl_status(struct backl return 0; } @@ -26937,9 +27176,9 @@ diff -urNp linux-2.6.32.15/drivers/platform/x86/acer-wmi.c linux-2.6.32.15/drive .get_brightness = read_brightness, .update_status = update_bl_status, }; -diff -urNp linux-2.6.32.15/drivers/platform/x86/asus_acpi.c linux-2.6.32.15/drivers/platform/x86/asus_acpi.c ---- linux-2.6.32.15/drivers/platform/x86/asus_acpi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/platform/x86/asus_acpi.c 2010-05-28 21:27:15.759196972 -0400 +diff -urNp linux-2.6.32.16/drivers/platform/x86/asus_acpi.c linux-2.6.32.16/drivers/platform/x86/asus_acpi.c +--- linux-2.6.32.16/drivers/platform/x86/asus_acpi.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/platform/x86/asus_acpi.c 2010-07-09 14:50:37.000000000 -0400 @@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_ return 0; } @@ -26949,9 +27188,9 @@ diff -urNp linux-2.6.32.15/drivers/platform/x86/asus_acpi.c linux-2.6.32.15/driv .get_brightness = read_brightness, .update_status = set_brightness_status, }; -diff -urNp linux-2.6.32.15/drivers/platform/x86/asus-laptop.c linux-2.6.32.15/drivers/platform/x86/asus-laptop.c ---- linux-2.6.32.15/drivers/platform/x86/asus-laptop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/platform/x86/asus-laptop.c 2010-05-28 21:27:15.759196972 -0400 +diff -urNp linux-2.6.32.16/drivers/platform/x86/asus-laptop.c linux-2.6.32.16/drivers/platform/x86/asus-laptop.c +--- linux-2.6.32.16/drivers/platform/x86/asus-laptop.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/platform/x86/asus-laptop.c 2010-07-09 14:50:37.000000000 -0400 @@ -250,7 +250,7 @@ static struct backlight_device *asus_bac */ 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 .get_brightness = read_brightness, .update_status = update_bl_status, }; -diff -urNp linux-2.6.32.15/drivers/platform/x86/compal-laptop.c linux-2.6.32.15/drivers/platform/x86/compal-laptop.c ---- linux-2.6.32.15/drivers/platform/x86/compal-laptop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/platform/x86/compal-laptop.c 2010-05-28 21:27:15.759196972 -0400 +diff -urNp linux-2.6.32.16/drivers/platform/x86/compal-laptop.c linux-2.6.32.16/drivers/platform/x86/compal-laptop.c +--- linux-2.6.32.16/drivers/platform/x86/compal-laptop.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/platform/x86/compal-laptop.c 2010-07-09 14:50:37.000000000 -0400 @@ -163,7 +163,7 @@ static int bl_update_status(struct backl return set_lcd_level(b->props.brightness); } @@ -26973,9 +27212,9 @@ diff -urNp linux-2.6.32.15/drivers/platform/x86/compal-laptop.c linux-2.6.32.15/ .get_brightness = bl_get_brightness, .update_status = bl_update_status, }; -diff -urNp linux-2.6.32.15/drivers/platform/x86/dell-laptop.c linux-2.6.32.15/drivers/platform/x86/dell-laptop.c ---- linux-2.6.32.15/drivers/platform/x86/dell-laptop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/platform/x86/dell-laptop.c 2010-05-28 21:27:15.759196972 -0400 +diff -urNp linux-2.6.32.16/drivers/platform/x86/dell-laptop.c linux-2.6.32.16/drivers/platform/x86/dell-laptop.c +--- linux-2.6.32.16/drivers/platform/x86/dell-laptop.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/platform/x86/dell-laptop.c 2010-07-09 14:50:37.000000000 -0400 @@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac return buffer.output[1]; } @@ -26985,9 +27224,9 @@ diff -urNp linux-2.6.32.15/drivers/platform/x86/dell-laptop.c linux-2.6.32.15/dr .get_brightness = dell_get_intensity, .update_status = dell_send_intensity, }; -diff -urNp linux-2.6.32.15/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.15/drivers/platform/x86/eeepc-laptop.c ---- linux-2.6.32.15/drivers/platform/x86/eeepc-laptop.c 2010-04-29 17:49:38.317493070 -0400 -+++ linux-2.6.32.15/drivers/platform/x86/eeepc-laptop.c 2010-05-28 21:27:15.759196972 -0400 +diff -urNp linux-2.6.32.16/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.16/drivers/platform/x86/eeepc-laptop.c +--- linux-2.6.32.16/drivers/platform/x86/eeepc-laptop.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/platform/x86/eeepc-laptop.c 2010-07-09 14:50:37.000000000 -0400 @@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device */ 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 .get_brightness = read_brightness, .update_status = update_bl_status, }; -diff -urNp linux-2.6.32.15/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.15/drivers/platform/x86/fujitsu-laptop.c ---- linux-2.6.32.15/drivers/platform/x86/fujitsu-laptop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/platform/x86/fujitsu-laptop.c 2010-05-28 21:27:15.759196972 -0400 +diff -urNp linux-2.6.32.16/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.16/drivers/platform/x86/fujitsu-laptop.c +--- linux-2.6.32.16/drivers/platform/x86/fujitsu-laptop.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/platform/x86/fujitsu-laptop.c 2010-07-09 14:50:37.000000000 -0400 @@ -436,7 +436,7 @@ static int bl_update_status(struct backl return ret; } @@ -27009,9 +27248,9 @@ diff -urNp linux-2.6.32.15/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.15 .get_brightness = bl_get_brightness, .update_status = bl_update_status, }; -diff -urNp linux-2.6.32.15/drivers/platform/x86/msi-laptop.c linux-2.6.32.15/drivers/platform/x86/msi-laptop.c ---- linux-2.6.32.15/drivers/platform/x86/msi-laptop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/platform/x86/msi-laptop.c 2010-05-28 21:27:15.759196972 -0400 +diff -urNp linux-2.6.32.16/drivers/platform/x86/msi-laptop.c linux-2.6.32.16/drivers/platform/x86/msi-laptop.c +--- linux-2.6.32.16/drivers/platform/x86/msi-laptop.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/platform/x86/msi-laptop.c 2010-07-09 14:50:37.000000000 -0400 @@ -161,7 +161,7 @@ static int bl_update_status(struct backl return set_lcd_level(b->props.brightness); } @@ -27021,9 +27260,9 @@ diff -urNp linux-2.6.32.15/drivers/platform/x86/msi-laptop.c linux-2.6.32.15/dri .get_brightness = bl_get_brightness, .update_status = bl_update_status, }; -diff -urNp linux-2.6.32.15/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.15/drivers/platform/x86/panasonic-laptop.c ---- linux-2.6.32.15/drivers/platform/x86/panasonic-laptop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/platform/x86/panasonic-laptop.c 2010-05-28 21:27:15.759196972 -0400 +diff -urNp linux-2.6.32.16/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.16/drivers/platform/x86/panasonic-laptop.c +--- linux-2.6.32.16/drivers/platform/x86/panasonic-laptop.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/platform/x86/panasonic-laptop.c 2010-07-09 14:50:37.000000000 -0400 @@ -352,7 +352,7 @@ static int bl_set_status(struct backligh return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright); } @@ -27033,9 +27272,9 @@ diff -urNp linux-2.6.32.15/drivers/platform/x86/panasonic-laptop.c linux-2.6.32. .get_brightness = bl_get, .update_status = bl_set_status, }; -diff -urNp linux-2.6.32.15/drivers/platform/x86/sony-laptop.c linux-2.6.32.15/drivers/platform/x86/sony-laptop.c ---- linux-2.6.32.15/drivers/platform/x86/sony-laptop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/platform/x86/sony-laptop.c 2010-05-28 21:27:15.759196972 -0400 +diff -urNp linux-2.6.32.16/drivers/platform/x86/sony-laptop.c linux-2.6.32.16/drivers/platform/x86/sony-laptop.c +--- linux-2.6.32.16/drivers/platform/x86/sony-laptop.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/platform/x86/sony-laptop.c 2010-07-09 14:50:37.000000000 -0400 @@ -850,7 +850,7 @@ static int sony_backlight_get_brightness } @@ -27045,9 +27284,9 @@ diff -urNp linux-2.6.32.15/drivers/platform/x86/sony-laptop.c linux-2.6.32.15/dr .update_status = sony_backlight_update_status, .get_brightness = sony_backlight_get_brightness, }; -diff -urNp linux-2.6.32.15/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.15/drivers/platform/x86/thinkpad_acpi.c ---- linux-2.6.32.15/drivers/platform/x86/thinkpad_acpi.c 2010-04-29 17:49:38.333363657 -0400 -+++ linux-2.6.32.15/drivers/platform/x86/thinkpad_acpi.c 2010-05-28 21:27:15.763212426 -0400 +diff -urNp linux-2.6.32.16/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.16/drivers/platform/x86/thinkpad_acpi.c +--- linux-2.6.32.16/drivers/platform/x86/thinkpad_acpi.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/platform/x86/thinkpad_acpi.c 2010-07-09 14:50:37.000000000 -0400 @@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha BACKLIGHT_UPDATE_HOTKEY); } @@ -27057,9 +27296,9 @@ diff -urNp linux-2.6.32.15/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.15/ .get_brightness = brightness_get, .update_status = brightness_update_status, }; -diff -urNp linux-2.6.32.15/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.15/drivers/platform/x86/toshiba_acpi.c ---- linux-2.6.32.15/drivers/platform/x86/toshiba_acpi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/platform/x86/toshiba_acpi.c 2010-05-28 21:27:15.763212426 -0400 +diff -urNp linux-2.6.32.16/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.16/drivers/platform/x86/toshiba_acpi.c +--- linux-2.6.32.16/drivers/platform/x86/toshiba_acpi.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/platform/x86/toshiba_acpi.c 2010-07-09 14:50:37.000000000 -0400 @@ -671,7 +671,7 @@ static acpi_status remove_device(void) return AE_OK; } @@ -27069,9 +27308,9 @@ diff -urNp linux-2.6.32.15/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.15/d .get_brightness = get_lcd, .update_status = set_lcd_status, }; -diff -urNp linux-2.6.32.15/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.15/drivers/pnp/pnpbios/bioscalls.c ---- linux-2.6.32.15/drivers/pnp/pnpbios/bioscalls.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/pnp/pnpbios/bioscalls.c 2010-05-28 21:27:15.763212426 -0400 +diff -urNp linux-2.6.32.16/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.16/drivers/pnp/pnpbios/bioscalls.c +--- linux-2.6.32.16/drivers/pnp/pnpbios/bioscalls.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/pnp/pnpbios/bioscalls.c 2010-07-09 14:50:37.000000000 -0400 @@ -60,7 +60,7 @@ do { \ set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ } while(0) @@ -27128,9 +27367,9 @@ diff -urNp linux-2.6.32.15/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.15/drive + + pax_close_kernel(); } -diff -urNp linux-2.6.32.15/drivers/pnp/quirks.c linux-2.6.32.15/drivers/pnp/quirks.c ---- linux-2.6.32.15/drivers/pnp/quirks.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/pnp/quirks.c 2010-05-28 21:27:15.763212426 -0400 +diff -urNp linux-2.6.32.16/drivers/pnp/quirks.c linux-2.6.32.16/drivers/pnp/quirks.c +--- linux-2.6.32.16/drivers/pnp/quirks.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/pnp/quirks.c 2010-07-09 14:50:37.000000000 -0400 @@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = { /* PnP resources that might overlap PCI BARs */ {"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 }; void pnp_fixup_device(struct pnp_dev *dev) -diff -urNp linux-2.6.32.15/drivers/pnp/resource.c linux-2.6.32.15/drivers/pnp/resource.c ---- linux-2.6.32.15/drivers/pnp/resource.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/pnp/resource.c 2010-05-28 21:27:15.763212426 -0400 +diff -urNp linux-2.6.32.16/drivers/pnp/resource.c linux-2.6.32.16/drivers/pnp/resource.c +--- linux-2.6.32.16/drivers/pnp/resource.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/pnp/resource.c 2010-07-09 14:50:37.000000000 -0400 @@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s return 1; @@ -27161,9 +27400,9 @@ diff -urNp linux-2.6.32.15/drivers/pnp/resource.c linux-2.6.32.15/drivers/pnp/re return 0; /* check if the resource is reserved */ -diff -urNp linux-2.6.32.15/drivers/s390/cio/qdio_perf.c linux-2.6.32.15/drivers/s390/cio/qdio_perf.c ---- linux-2.6.32.15/drivers/s390/cio/qdio_perf.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/s390/cio/qdio_perf.c 2010-05-28 21:27:15.763212426 -0400 +diff -urNp linux-2.6.32.16/drivers/s390/cio/qdio_perf.c linux-2.6.32.16/drivers/s390/cio/qdio_perf.c +--- linux-2.6.32.16/drivers/s390/cio/qdio_perf.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/s390/cio/qdio_perf.c 2010-07-09 14:50:37.000000000 -0400 @@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_ static int qdio_perf_proc_show(struct seq_file *m, void *v) { @@ -27239,9 +27478,9 @@ diff -urNp linux-2.6.32.15/drivers/s390/cio/qdio_perf.c linux-2.6.32.15/drivers/ seq_printf(m, "\n"); return 0; } -diff -urNp linux-2.6.32.15/drivers/s390/cio/qdio_perf.h linux-2.6.32.15/drivers/s390/cio/qdio_perf.h ---- linux-2.6.32.15/drivers/s390/cio/qdio_perf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/s390/cio/qdio_perf.h 2010-05-28 21:27:15.763212426 -0400 +diff -urNp linux-2.6.32.16/drivers/s390/cio/qdio_perf.h linux-2.6.32.16/drivers/s390/cio/qdio_perf.h +--- linux-2.6.32.16/drivers/s390/cio/qdio_perf.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/s390/cio/qdio_perf.h 2010-07-09 14:50:37.000000000 -0400 @@ -13,46 +13,46 @@ 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/ } int qdio_setup_perf_stats(void); -diff -urNp linux-2.6.32.15/drivers/scsi/ipr.c linux-2.6.32.15/drivers/scsi/ipr.c ---- linux-2.6.32.15/drivers/scsi/ipr.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/scsi/ipr.c 2010-05-28 21:27:15.787650200 -0400 +diff -urNp linux-2.6.32.16/drivers/scsi/ipr.c linux-2.6.32.16/drivers/scsi/ipr.c +--- linux-2.6.32.16/drivers/scsi/ipr.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/scsi/ipr.c 2010-07-09 14:50:37.000000000 -0400 @@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q return true; } @@ -27326,9 +27565,9 @@ diff -urNp linux-2.6.32.15/drivers/scsi/ipr.c linux-2.6.32.15/drivers/scsi/ipr.c .phy_reset = ipr_ata_phy_reset, .hardreset = ipr_sata_reset, .post_internal_cmd = ipr_ata_post_internal, -diff -urNp linux-2.6.32.15/drivers/scsi/libfc/fc_exch.c linux-2.6.32.15/drivers/scsi/libfc/fc_exch.c ---- linux-2.6.32.15/drivers/scsi/libfc/fc_exch.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/scsi/libfc/fc_exch.c 2010-05-28 21:27:15.795200668 -0400 +diff -urNp linux-2.6.32.16/drivers/scsi/libfc/fc_exch.c linux-2.6.32.16/drivers/scsi/libfc/fc_exch.c +--- linux-2.6.32.16/drivers/scsi/libfc/fc_exch.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/scsi/libfc/fc_exch.c 2010-07-09 14:50:37.000000000 -0400 @@ -86,12 +86,12 @@ struct fc_exch_mgr { * all together if not used XXX */ @@ -27450,9 +27689,9 @@ diff -urNp linux-2.6.32.15/drivers/scsi/libfc/fc_exch.c linux-2.6.32.15/drivers/ fc_frame_free(fp); } -diff -urNp linux-2.6.32.15/drivers/scsi/libsas/sas_ata.c linux-2.6.32.15/drivers/scsi/libsas/sas_ata.c ---- linux-2.6.32.15/drivers/scsi/libsas/sas_ata.c 2010-05-15 13:20:18.878584179 -0400 -+++ linux-2.6.32.15/drivers/scsi/libsas/sas_ata.c 2010-05-28 21:27:15.803426462 -0400 +diff -urNp linux-2.6.32.16/drivers/scsi/libsas/sas_ata.c linux-2.6.32.16/drivers/scsi/libsas/sas_ata.c +--- linux-2.6.32.16/drivers/scsi/libsas/sas_ata.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/scsi/libsas/sas_ata.c 2010-07-09 14:50:37.000000000 -0400 @@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l } } @@ -27462,9 +27701,9 @@ diff -urNp linux-2.6.32.15/drivers/scsi/libsas/sas_ata.c linux-2.6.32.15/drivers .phy_reset = sas_ata_phy_reset, .post_internal_cmd = sas_ata_post_internal, .qc_prep = ata_noop_qc_prep, -diff -urNp linux-2.6.32.15/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.15/drivers/scsi/mpt2sas/mpt2sas_debug.h ---- linux-2.6.32.15/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-05-28 21:27:15.803426462 -0400 +diff -urNp linux-2.6.32.16/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.16/drivers/scsi/mpt2sas/mpt2sas_debug.h +--- linux-2.6.32.16/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-07-09 14:50:37.000000000 -0400 @@ -79,7 +79,7 @@ CMD; \ } @@ -27474,9 +27713,9 @@ diff -urNp linux-2.6.32.15/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.15/ #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */ -diff -urNp linux-2.6.32.15/drivers/scsi/scsi_logging.h linux-2.6.32.15/drivers/scsi/scsi_logging.h ---- linux-2.6.32.15/drivers/scsi/scsi_logging.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/scsi/scsi_logging.h 2010-05-28 21:27:15.803426462 -0400 +diff -urNp linux-2.6.32.16/drivers/scsi/scsi_logging.h linux-2.6.32.16/drivers/scsi/scsi_logging.h +--- linux-2.6.32.16/drivers/scsi/scsi_logging.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/scsi/scsi_logging.h 2010-07-09 14:50:37.000000000 -0400 @@ -51,7 +51,7 @@ do { \ } while (0); \ } 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 #endif /* CONFIG_SCSI_LOGGING */ /* -diff -urNp linux-2.6.32.15/drivers/scsi/sg.c linux-2.6.32.15/drivers/scsi/sg.c ---- linux-2.6.32.15/drivers/scsi/sg.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/scsi/sg.c 2010-05-28 21:27:15.803426462 -0400 +diff -urNp linux-2.6.32.16/drivers/scsi/sg.c linux-2.6.32.16/drivers/scsi/sg.c +--- linux-2.6.32.16/drivers/scsi/sg.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/scsi/sg.c 2010-07-09 14:50:37.000000000 -0400 @@ -2292,7 +2292,7 @@ struct sg_proc_leaf { const struct file_operations * fops; }; @@ -27507,9 +27746,9 @@ diff -urNp linux-2.6.32.15/drivers/scsi/sg.c linux-2.6.32.15/drivers/scsi/sg.c sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); if (!sg_proc_sgp) -diff -urNp linux-2.6.32.15/drivers/serial/8250_pci.c linux-2.6.32.15/drivers/serial/8250_pci.c ---- linux-2.6.32.15/drivers/serial/8250_pci.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/serial/8250_pci.c 2010-05-28 21:27:15.803426462 -0400 +diff -urNp linux-2.6.32.16/drivers/serial/8250_pci.c linux-2.6.32.16/drivers/serial/8250_pci.c +--- linux-2.6.32.16/drivers/serial/8250_pci.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/serial/8250_pci.c 2010-07-09 14:50:37.000000000 -0400 @@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t PCI_ANY_ID, PCI_ANY_ID, 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 }; static struct pci_driver serial_pci_driver = { -diff -urNp linux-2.6.32.15/drivers/serial/kgdboc.c linux-2.6.32.15/drivers/serial/kgdboc.c ---- linux-2.6.32.15/drivers/serial/kgdboc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/serial/kgdboc.c 2010-05-28 21:27:15.803426462 -0400 +diff -urNp linux-2.6.32.16/drivers/serial/kgdboc.c linux-2.6.32.16/drivers/serial/kgdboc.c +--- linux-2.6.32.16/drivers/serial/kgdboc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/serial/kgdboc.c 2010-07-09 14:50:37.000000000 -0400 @@ -18,7 +18,7 @@ #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 .name = "kgdboc", .read_char = kgdboc_get_char, .write_char = kgdboc_put_char, -diff -urNp linux-2.6.32.15/drivers/staging/android/binder.c linux-2.6.32.15/drivers/staging/android/binder.c ---- linux-2.6.32.15/drivers/staging/android/binder.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/android/binder.c 2010-05-28 21:27:15.815152627 -0400 +diff -urNp linux-2.6.32.16/drivers/staging/android/binder.c linux-2.6.32.16/drivers/staging/android/binder.c +--- linux-2.6.32.16/drivers/staging/android/binder.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/android/binder.c 2010-07-09 14:50:37.000000000 -0400 @@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); } @@ -27552,9 +27791,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/android/binder.c linux-2.6.32.15/driv .open = binder_vma_open, .close = binder_vma_close, }; -diff -urNp linux-2.6.32.15/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.15/drivers/staging/b3dfg/b3dfg.c ---- linux-2.6.32.15/drivers/staging/b3dfg/b3dfg.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/b3dfg/b3dfg.c 2010-05-28 21:27:15.815152627 -0400 +diff -urNp linux-2.6.32.16/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.16/drivers/staging/b3dfg/b3dfg.c +--- linux-2.6.32.16/drivers/staging/b3dfg/b3dfg.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/b3dfg/b3dfg.c 2010-07-09 14:50:37.000000000 -0400 @@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are return VM_FAULT_NOPAGE; } @@ -27573,9 +27812,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.15/drivers .owner = THIS_MODULE, .open = b3dfg_open, .release = b3dfg_release, -diff -urNp linux-2.6.32.15/drivers/staging/comedi/comedi_fops.c linux-2.6.32.15/drivers/staging/comedi/comedi_fops.c ---- linux-2.6.32.15/drivers/staging/comedi/comedi_fops.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/comedi/comedi_fops.c 2010-05-28 21:27:15.815152627 -0400 +diff -urNp linux-2.6.32.16/drivers/staging/comedi/comedi_fops.c linux-2.6.32.16/drivers/staging/comedi/comedi_fops.c +--- linux-2.6.32.16/drivers/staging/comedi/comedi_fops.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/comedi/comedi_fops.c 2010-07-09 14:50:37.000000000 -0400 @@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct mutex_unlock(&dev->mutex); } @@ -27585,9 +27824,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/comedi/comedi_fops.c linux-2.6.32.15/ .close = comedi_unmap, }; -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 ---- linux-2.6.32.15/drivers/staging/dream/qdsp5/adsp_driver.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/dream/qdsp5/adsp_driver.c 2010-05-28 21:27:15.815152627 -0400 +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 +--- linux-2.6.32.16/drivers/staging/dream/qdsp5/adsp_driver.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/dream/qdsp5/adsp_driver.c 2010-07-09 14:50:37.000000000 -0400 @@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi static dev_t adsp_devno; 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 .owner = THIS_MODULE, .open = adsp_open, .unlocked_ioctl = adsp_ioctl, -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 ---- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_aac.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_aac.c 2010-05-28 21:27:15.819209681 -0400 +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 +--- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_aac.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_aac.c 2010-07-09 14:50:37.000000000 -0400 @@ -1022,7 +1022,7 @@ done: return rc; } @@ -27609,9 +27848,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32. .owner = THIS_MODULE, .open = audio_open, .release = audio_release, -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 ---- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-05-28 21:27:15.823076824 -0400 +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 +--- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-07-09 14:50:37.000000000 -0400 @@ -833,7 +833,7 @@ done: return rc; } @@ -27621,9 +27860,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.3 .owner = THIS_MODULE, .open = audamrnb_open, .release = audamrnb_release, -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 ---- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_evrc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_evrc.c 2010-05-28 21:27:15.823076824 -0400 +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 +--- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_evrc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_evrc.c 2010-07-09 14:50:37.000000000 -0400 @@ -805,7 +805,7 @@ dma_fail: return rc; } @@ -27633,9 +27872,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32 .owner = THIS_MODULE, .open = audevrc_open, .release = audevrc_release, -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 ---- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_in.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_in.c 2010-05-28 21:27:15.823076824 -0400 +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 +--- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_in.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_in.c 2010-07-09 14:50:37.000000000 -0400 @@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino return 0; } @@ -27654,9 +27893,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.1 .owner = THIS_MODULE, .open = audpre_open, .unlocked_ioctl = audpre_ioctl, -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 ---- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_mp3.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_mp3.c 2010-05-28 21:27:15.823076824 -0400 +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 +--- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_mp3.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_mp3.c 2010-07-09 14:50:37.000000000 -0400 @@ -941,7 +941,7 @@ done: return rc; } @@ -27666,9 +27905,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32. .owner = THIS_MODULE, .open = audio_open, .release = audio_release, -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 ---- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_out.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_out.c 2010-05-28 21:27:15.823076824 -0400 +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 +--- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_out.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_out.c 2010-07-09 14:50:37.000000000 -0400 @@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod return 0; } @@ -27687,9 +27926,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32. .owner = THIS_MODULE, .open = audpp_open, .unlocked_ioctl = audpp_ioctl, -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 ---- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-05-28 21:27:15.841738212 -0400 +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 +--- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-07-09 14:50:37.000000000 -0400 @@ -816,7 +816,7 @@ err: return rc; } @@ -27699,9 +27938,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.3 .owner = THIS_MODULE, .open = audqcelp_open, .release = audqcelp_release, -diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.15/drivers/staging/dream/qdsp5/snd.c ---- linux-2.6.32.15/drivers/staging/dream/qdsp5/snd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/dream/qdsp5/snd.c 2010-05-28 21:27:15.841738212 -0400 +diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.16/drivers/staging/dream/qdsp5/snd.c +--- linux-2.6.32.16/drivers/staging/dream/qdsp5/snd.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/dream/qdsp5/snd.c 2010-07-09 14:50:37.000000000 -0400 @@ -242,7 +242,7 @@ err: return rc; } @@ -27711,9 +27950,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.15/dri .owner = THIS_MODULE, .open = snd_open, .release = snd_release, -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 ---- linux-2.6.32.15/drivers/staging/dream/smd/smd_qmi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/dream/smd/smd_qmi.c 2010-05-28 21:27:15.841738212 -0400 +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 +--- linux-2.6.32.16/drivers/staging/dream/smd/smd_qmi.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/dream/smd/smd_qmi.c 2010-07-09 14:50:37.000000000 -0400 @@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, return 0; } @@ -27723,9 +27962,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.15/d .owner = THIS_MODULE, .read = qmi_read, .write = qmi_write, -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 ---- linux-2.6.32.15/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-05-28 21:27:15.841738212 -0400 +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 +--- linux-2.6.32.16/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-07-09 14:50:37.000000000 -0400 @@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file return rc; } @@ -27744,9 +27983,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/dream/smd/smd_rpcrouter_device.c linu .owner = THIS_MODULE, .open = rpcrouter_open, .release = rpcrouter_release, -diff -urNp linux-2.6.32.15/drivers/staging/dst/dcore.c linux-2.6.32.15/drivers/staging/dst/dcore.c ---- linux-2.6.32.15/drivers/staging/dst/dcore.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/dst/dcore.c 2010-05-28 21:27:15.841738212 -0400 +diff -urNp linux-2.6.32.16/drivers/staging/dst/dcore.c linux-2.6.32.16/drivers/staging/dst/dcore.c +--- linux-2.6.32.16/drivers/staging/dst/dcore.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/dst/dcore.c 2010-07-09 14:50:37.000000000 -0400 @@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi return 0; } @@ -27765,9 +28004,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/dst/dcore.c linux-2.6.32.15/drivers/s snprintf(n->name, sizeof(n->name), "%s", ctl->name); err = dst_node_sysfs_init(n); -diff -urNp linux-2.6.32.15/drivers/staging/dst/trans.c linux-2.6.32.15/drivers/staging/dst/trans.c ---- linux-2.6.32.15/drivers/staging/dst/trans.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/dst/trans.c 2010-05-28 21:27:15.842942312 -0400 +diff -urNp linux-2.6.32.16/drivers/staging/dst/trans.c linux-2.6.32.16/drivers/staging/dst/trans.c +--- linux-2.6.32.16/drivers/staging/dst/trans.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/dst/trans.c 2010-07-09 14:50:37.000000000 -0400 @@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, t->error = 0; 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 t->enc = bio_data_dir(bio); dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen); -diff -urNp linux-2.6.32.15/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.15/drivers/staging/go7007/go7007-v4l2.c ---- linux-2.6.32.15/drivers/staging/go7007/go7007-v4l2.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/go7007/go7007-v4l2.c 2010-05-28 21:27:15.842942312 -0400 +diff -urNp linux-2.6.32.16/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.16/drivers/staging/go7007/go7007-v4l2.c +--- linux-2.6.32.16/drivers/staging/go7007/go7007-v4l2.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/go7007/go7007-v4l2.c 2010-07-09 14:50:37.000000000 -0400 @@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are return 0; } @@ -27789,9 +28028,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.15/ .open = go7007_vm_open, .close = go7007_vm_close, .fault = go7007_vm_fault, -diff -urNp linux-2.6.32.15/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.15/drivers/staging/hv/blkvsc_drv.c ---- linux-2.6.32.15/drivers/staging/hv/blkvsc_drv.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/hv/blkvsc_drv.c 2010-05-28 21:27:15.842942312 -0400 +diff -urNp linux-2.6.32.16/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.16/drivers/staging/hv/blkvsc_drv.c +--- linux-2.6.32.16/drivers/staging/hv/blkvsc_drv.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/hv/blkvsc_drv.c 2010-07-09 14:50:37.000000000 -0400 @@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV /* The one and only one */ 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 .owner = THIS_MODULE, .open = blkvsc_open, .release = blkvsc_release, -diff -urNp linux-2.6.32.15/drivers/staging/hv/Hv.c linux-2.6.32.15/drivers/staging/hv/Hv.c ---- linux-2.6.32.15/drivers/staging/hv/Hv.c 2010-05-15 13:20:18.963900073 -0400 -+++ linux-2.6.32.15/drivers/staging/hv/Hv.c 2010-06-19 10:03:50.012498759 -0400 +diff -urNp linux-2.6.32.16/drivers/staging/hv/Hv.c linux-2.6.32.16/drivers/staging/hv/Hv.c +--- linux-2.6.32.16/drivers/staging/hv/Hv.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/hv/Hv.c 2010-07-09 14:50:37.000000000 -0400 @@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, vo u64 outputAddress = (Output) ? virt_to_phys(Output) : 0; 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 DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>", Control, Input, Output); -diff -urNp linux-2.6.32.15/drivers/staging/panel/panel.c linux-2.6.32.15/drivers/staging/panel/panel.c ---- linux-2.6.32.15/drivers/staging/panel/panel.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/panel/panel.c 2010-05-28 21:27:15.842942312 -0400 +diff -urNp linux-2.6.32.16/drivers/staging/panel/panel.c linux-2.6.32.16/drivers/staging/panel/panel.c +--- linux-2.6.32.16/drivers/staging/panel/panel.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/panel/panel.c 2010-07-09 14:50:37.000000000 -0400 @@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino return 0; } @@ -27834,9 +28073,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/panel/panel.c linux-2.6.32.15/drivers .read = keypad_read, /* read */ .open = keypad_open, /* open */ .release = keypad_release, /* close */ -diff -urNp linux-2.6.32.15/drivers/staging/phison/phison.c linux-2.6.32.15/drivers/staging/phison/phison.c ---- linux-2.6.32.15/drivers/staging/phison/phison.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/phison/phison.c 2010-05-28 21:27:15.842942312 -0400 +diff -urNp linux-2.6.32.16/drivers/staging/phison/phison.c linux-2.6.32.16/drivers/staging/phison/phison.c +--- linux-2.6.32.16/drivers/staging/phison/phison.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/phison/phison.c 2010-07-09 14:50:37.000000000 -0400 @@ -43,7 +43,7 @@ static struct scsi_host_template phison_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -27846,9 +28085,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/phison/phison.c linux-2.6.32.15/drive .inherits = &ata_bmdma_port_ops, .prereset = phison_pre_reset, }; -diff -urNp linux-2.6.32.15/drivers/staging/poch/poch.c linux-2.6.32.15/drivers/staging/poch/poch.c ---- linux-2.6.32.15/drivers/staging/poch/poch.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/poch/poch.c 2010-05-28 21:27:15.842942312 -0400 +diff -urNp linux-2.6.32.16/drivers/staging/poch/poch.c linux-2.6.32.16/drivers/staging/poch/poch.c +--- linux-2.6.32.16/drivers/staging/poch/poch.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/poch/poch.c 2010-07-09 14:50:37.000000000 -0400 @@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod return 0; } @@ -27858,9 +28097,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/poch/poch.c linux-2.6.32.15/drivers/s .owner = THIS_MODULE, .open = poch_open, .release = poch_release, -diff -urNp linux-2.6.32.15/drivers/staging/pohmelfs/inode.c linux-2.6.32.15/drivers/staging/pohmelfs/inode.c ---- linux-2.6.32.15/drivers/staging/pohmelfs/inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/pohmelfs/inode.c 2010-05-28 21:27:15.842942312 -0400 +diff -urNp linux-2.6.32.16/drivers/staging/pohmelfs/inode.c linux-2.6.32.16/drivers/staging/pohmelfs/inode.c +--- linux-2.6.32.16/drivers/staging/pohmelfs/inode.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/pohmelfs/inode.c 2010-07-09 14:50:37.000000000 -0400 @@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su mutex_init(&psb->mcache_lock); 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 psb->trans_max_pages = 100; -diff -urNp linux-2.6.32.15/drivers/staging/pohmelfs/mcache.c linux-2.6.32.15/drivers/staging/pohmelfs/mcache.c ---- linux-2.6.32.15/drivers/staging/pohmelfs/mcache.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/pohmelfs/mcache.c 2010-05-28 21:27:15.842942312 -0400 +diff -urNp linux-2.6.32.16/drivers/staging/pohmelfs/mcache.c linux-2.6.32.16/drivers/staging/pohmelfs/mcache.c +--- linux-2.6.32.16/drivers/staging/pohmelfs/mcache.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/pohmelfs/mcache.c 2010-07-09 14:50:37.000000000 -0400 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ m->data = data; 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 mutex_lock(&psb->mcache_lock); err = pohmelfs_mcache_insert(psb, m); -diff -urNp linux-2.6.32.15/drivers/staging/pohmelfs/netfs.h linux-2.6.32.15/drivers/staging/pohmelfs/netfs.h ---- linux-2.6.32.15/drivers/staging/pohmelfs/netfs.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/pohmelfs/netfs.h 2010-05-28 21:27:15.846971345 -0400 +diff -urNp linux-2.6.32.16/drivers/staging/pohmelfs/netfs.h linux-2.6.32.16/drivers/staging/pohmelfs/netfs.h +--- linux-2.6.32.16/drivers/staging/pohmelfs/netfs.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/pohmelfs/netfs.h 2010-07-09 14:50:37.000000000 -0400 @@ -570,7 +570,7 @@ struct pohmelfs_config; struct pohmelfs_sb { 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 unsigned long mcache_timeout; unsigned int idx; -diff -urNp linux-2.6.32.15/drivers/staging/sep/sep_driver.c linux-2.6.32.15/drivers/staging/sep/sep_driver.c ---- linux-2.6.32.15/drivers/staging/sep/sep_driver.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/sep/sep_driver.c 2010-05-28 21:27:15.859198868 -0400 +diff -urNp linux-2.6.32.16/drivers/staging/sep/sep_driver.c linux-2.6.32.16/drivers/staging/sep/sep_driver.c +--- linux-2.6.32.16/drivers/staging/sep/sep_driver.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/sep/sep_driver.c 2010-07-09 14:50:37.000000000 -0400 @@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver static dev_t sep_devno; @@ -27906,9 +28145,9 @@ diff -urNp linux-2.6.32.15/drivers/staging/sep/sep_driver.c linux-2.6.32.15/driv .owner = THIS_MODULE, .ioctl = sep_ioctl, .poll = sep_poll, -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 ---- linux-2.6.32.15/drivers/staging/vme/devices/vme_user.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/staging/vme/devices/vme_user.c 2010-05-28 21:27:15.859198868 -0400 +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 +--- linux-2.6.32.16/drivers/staging/vme/devices/vme_user.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/staging/vme/devices/vme_user.c 2010-07-09 14:50:37.000000000 -0400 @@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode * static int __init vme_user_probe(struct device *, int, int); 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 .open = vme_user_open, .release = vme_user_release, .read = vme_user_read, -diff -urNp linux-2.6.32.15/drivers/uio/uio.c linux-2.6.32.15/drivers/uio/uio.c ---- linux-2.6.32.15/drivers/uio/uio.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/uio/uio.c 2010-05-28 21:27:15.859198868 -0400 +diff -urNp linux-2.6.32.16/drivers/uio/uio.c linux-2.6.32.16/drivers/uio/uio.c +--- linux-2.6.32.16/drivers/uio/uio.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/uio/uio.c 2010-07-09 14:50:37.000000000 -0400 @@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj return entry->show(mem, buf); } @@ -27939,9 +28178,9 @@ diff -urNp linux-2.6.32.15/drivers/uio/uio.c linux-2.6.32.15/drivers/uio/uio.c .show = portio_type_show, }; -diff -urNp linux-2.6.32.15/drivers/usb/atm/usbatm.c linux-2.6.32.15/drivers/usb/atm/usbatm.c ---- linux-2.6.32.15/drivers/usb/atm/usbatm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/usb/atm/usbatm.c 2010-05-28 21:27:15.859198868 -0400 +diff -urNp linux-2.6.32.16/drivers/usb/atm/usbatm.c linux-2.6.32.16/drivers/usb/atm/usbatm.c +--- linux-2.6.32.16/drivers/usb/atm/usbatm.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/usb/atm/usbatm.c 2010-07-09 14:50:37.000000000 -0400 @@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru if (printk_ratelimit()) 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/ if (!left--) { if (instance->disconnected) -diff -urNp linux-2.6.32.15/drivers/usb/class/cdc-acm.c linux-2.6.32.15/drivers/usb/class/cdc-acm.c ---- linux-2.6.32.15/drivers/usb/class/cdc-acm.c 2010-04-29 17:49:38.389083173 -0400 -+++ linux-2.6.32.15/drivers/usb/class/cdc-acm.c 2010-05-28 21:27:15.867210979 -0400 -@@ -1535,7 +1535,7 @@ static struct usb_device_id acm_ids[] = +diff -urNp linux-2.6.32.16/drivers/usb/class/cdc-acm.c linux-2.6.32.16/drivers/usb/class/cdc-acm.c +--- linux-2.6.32.16/drivers/usb/class/cdc-acm.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/usb/class/cdc-acm.c 2010-07-09 14:50:37.000000000 -0400 +@@ -1537,7 +1537,7 @@ static struct usb_device_id acm_ids[] = USB_CDC_ACM_PROTO_AT_CDMA) }, /* 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 }; MODULE_DEVICE_TABLE(usb, acm_ids); -diff -urNp linux-2.6.32.15/drivers/usb/class/usblp.c linux-2.6.32.15/drivers/usb/class/usblp.c ---- linux-2.6.32.15/drivers/usb/class/usblp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/usb/class/usblp.c 2010-05-28 21:27:15.875212570 -0400 +diff -urNp linux-2.6.32.16/drivers/usb/class/usblp.c linux-2.6.32.16/drivers/usb/class/usblp.c +--- linux-2.6.32.16/drivers/usb/class/usblp.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/usb/class/usblp.c 2010-07-09 14:50:37.000000000 -0400 @@ -228,7 +228,7 @@ static const struct quirk_printer_struct { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */ { 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 }; MODULE_DEVICE_TABLE (usb, usblp_ids); -diff -urNp linux-2.6.32.15/drivers/usb/core/hcd.c linux-2.6.32.15/drivers/usb/core/hcd.c ---- linux-2.6.32.15/drivers/usb/core/hcd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/usb/core/hcd.c 2010-05-28 21:27:15.887216714 -0400 +diff -urNp linux-2.6.32.16/drivers/usb/core/hcd.c linux-2.6.32.16/drivers/usb/core/hcd.c +--- linux-2.6.32.16/drivers/usb/core/hcd.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/usb/core/hcd.c 2010-07-09 14:50:37.000000000 -0400 @@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd #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 { if (mon_ops) -diff -urNp linux-2.6.32.15/drivers/usb/core/hcd.h linux-2.6.32.15/drivers/usb/core/hcd.h ---- linux-2.6.32.15/drivers/usb/core/hcd.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/usb/core/hcd.h 2010-05-28 21:27:15.887216714 -0400 +diff -urNp linux-2.6.32.16/drivers/usb/core/hcd.h linux-2.6.32.16/drivers/usb/core/hcd.h +--- linux-2.6.32.16/drivers/usb/core/hcd.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/usb/core/hcd.h 2010-07-09 14:50:37.000000000 -0400 @@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) @@ -28105,9 +28344,9 @@ diff -urNp linux-2.6.32.15/drivers/usb/core/hcd.h linux-2.6.32.15/drivers/usb/co void usb_mon_deregister(void); #else -diff -urNp linux-2.6.32.15/drivers/usb/core/hub.c linux-2.6.32.15/drivers/usb/core/hub.c ---- linux-2.6.32.15/drivers/usb/core/hub.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/usb/core/hub.c 2010-05-28 21:27:15.887216714 -0400 +diff -urNp linux-2.6.32.16/drivers/usb/core/hub.c linux-2.6.32.16/drivers/usb/core/hub.c +--- linux-2.6.32.16/drivers/usb/core/hub.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/usb/core/hub.c 2010-07-09 14:50:37.000000000 -0400 @@ -3397,7 +3397,7 @@ static struct usb_device_id hub_id_table .bDeviceClass = USB_CLASS_HUB}, { .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 }; MODULE_DEVICE_TABLE (usb, hub_id_table); -diff -urNp linux-2.6.32.15/drivers/usb/core/message.c linux-2.6.32.15/drivers/usb/core/message.c ---- linux-2.6.32.15/drivers/usb/core/message.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/usb/core/message.c 2010-05-28 21:27:15.898958902 -0400 +diff -urNp linux-2.6.32.16/drivers/usb/core/message.c linux-2.6.32.16/drivers/usb/core/message.c +--- linux-2.6.32.16/drivers/usb/core/message.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/usb/core/message.c 2010-07-09 14:50:37.000000000 -0400 @@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); 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 if (!smallbuf) return buf; memcpy(smallbuf, buf, len); -diff -urNp linux-2.6.32.15/drivers/usb/host/ehci-pci.c linux-2.6.32.15/drivers/usb/host/ehci-pci.c ---- linux-2.6.32.15/drivers/usb/host/ehci-pci.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/usb/host/ehci-pci.c 2010-05-28 21:27:15.898958902 -0400 +diff -urNp linux-2.6.32.16/drivers/usb/host/ehci-pci.c linux-2.6.32.16/drivers/usb/host/ehci-pci.c +--- linux-2.6.32.16/drivers/usb/host/ehci-pci.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/usb/host/ehci-pci.c 2010-07-09 14:50:37.000000000 -0400 @@ -422,7 +422,7 @@ static const struct pci_device_id pci_id PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), .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 }; MODULE_DEVICE_TABLE(pci, pci_ids); -diff -urNp linux-2.6.32.15/drivers/usb/host/uhci-hcd.c linux-2.6.32.15/drivers/usb/host/uhci-hcd.c ---- linux-2.6.32.15/drivers/usb/host/uhci-hcd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/usb/host/uhci-hcd.c 2010-05-28 21:27:15.903225521 -0400 +diff -urNp linux-2.6.32.16/drivers/usb/host/uhci-hcd.c linux-2.6.32.16/drivers/usb/host/uhci-hcd.c +--- linux-2.6.32.16/drivers/usb/host/uhci-hcd.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/usb/host/uhci-hcd.c 2010-07-09 14:50:37.000000000 -0400 @@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p /* handle any USB UHCI controller */ 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 }; MODULE_DEVICE_TABLE(pci, uhci_pci_ids); -diff -urNp linux-2.6.32.15/drivers/usb/misc/appledisplay.c linux-2.6.32.15/drivers/usb/misc/appledisplay.c ---- linux-2.6.32.15/drivers/usb/misc/appledisplay.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/usb/misc/appledisplay.c 2010-05-28 21:27:15.903225521 -0400 +diff -urNp linux-2.6.32.16/drivers/usb/misc/appledisplay.c linux-2.6.32.16/drivers/usb/misc/appledisplay.c +--- linux-2.6.32.16/drivers/usb/misc/appledisplay.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/usb/misc/appledisplay.c 2010-07-09 14:50:37.000000000 -0400 @@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes return pdata->msgdata[1]; } @@ -28167,9 +28406,9 @@ diff -urNp linux-2.6.32.15/drivers/usb/misc/appledisplay.c linux-2.6.32.15/drive .get_brightness = appledisplay_bl_get_brightness, .update_status = appledisplay_bl_update_status, }; -diff -urNp linux-2.6.32.15/drivers/usb/mon/mon_main.c linux-2.6.32.15/drivers/usb/mon/mon_main.c ---- linux-2.6.32.15/drivers/usb/mon/mon_main.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/usb/mon/mon_main.c 2010-05-28 21:27:15.903225521 -0400 +diff -urNp linux-2.6.32.16/drivers/usb/mon/mon_main.c linux-2.6.32.16/drivers/usb/mon/mon_main.c +--- linux-2.6.32.16/drivers/usb/mon/mon_main.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/usb/mon/mon_main.c 2010-07-09 14:50:37.000000000 -0400 @@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { /* * 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 .urb_submit = mon_submit, .urb_submit_error = mon_submit_error, .urb_complete = mon_complete, -diff -urNp linux-2.6.32.15/drivers/usb/storage/debug.h linux-2.6.32.15/drivers/usb/storage/debug.h ---- linux-2.6.32.15/drivers/usb/storage/debug.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/usb/storage/debug.h 2010-05-28 21:27:15.903225521 -0400 +diff -urNp linux-2.6.32.16/drivers/usb/storage/debug.h linux-2.6.32.16/drivers/usb/storage/debug.h +--- linux-2.6.32.16/drivers/usb/storage/debug.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/usb/storage/debug.h 2010-07-09 14:50:37.000000000 -0400 @@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char #define US_DEBUGPX(x...) printk( x ) #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 #endif #endif -diff -urNp linux-2.6.32.15/drivers/usb/storage/usb.c linux-2.6.32.15/drivers/usb/storage/usb.c ---- linux-2.6.32.15/drivers/usb/storage/usb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/usb/storage/usb.c 2010-05-28 21:27:15.915209208 -0400 +diff -urNp linux-2.6.32.16/drivers/usb/storage/usb.c linux-2.6.32.16/drivers/usb/storage/usb.c +--- linux-2.6.32.16/drivers/usb/storage/usb.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/usb/storage/usb.c 2010-07-09 14:50:37.000000000 -0400 @@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l 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 }; #undef UNUSUAL_DEV -diff -urNp linux-2.6.32.15/drivers/usb/storage/usual-tables.c linux-2.6.32.15/drivers/usb/storage/usual-tables.c ---- linux-2.6.32.15/drivers/usb/storage/usual-tables.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/usb/storage/usual-tables.c 2010-05-28 21:27:15.915209208 -0400 +diff -urNp linux-2.6.32.16/drivers/usb/storage/usual-tables.c linux-2.6.32.16/drivers/usb/storage/usual-tables.c +--- linux-2.6.32.16/drivers/usb/storage/usual-tables.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/usb/storage/usual-tables.c 2010-07-09 14:50:37.000000000 -0400 @@ -48,7 +48,7 @@ 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 }; EXPORT_SYMBOL_GPL(usb_storage_usb_ids); -diff -urNp linux-2.6.32.15/drivers/uwb/wlp/messages.c linux-2.6.32.15/drivers/uwb/wlp/messages.c ---- linux-2.6.32.15/drivers/uwb/wlp/messages.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/uwb/wlp/messages.c 2010-05-28 21:27:15.915209208 -0400 +diff -urNp linux-2.6.32.16/drivers/uwb/wlp/messages.c linux-2.6.32.16/drivers/uwb/wlp/messages.c +--- linux-2.6.32.16/drivers/uwb/wlp/messages.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/uwb/wlp/messages.c 2010-07-09 14:50:37.000000000 -0400 @@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct size_t len = skb->len; 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 enum wlp_assc_error assc_err; char enonce_buf[WLP_WSS_NONCE_STRSIZE]; char rnonce_buf[WLP_WSS_NONCE_STRSIZE]; -diff -urNp linux-2.6.32.15/drivers/uwb/wlp/sysfs.c linux-2.6.32.15/drivers/uwb/wlp/sysfs.c ---- linux-2.6.32.15/drivers/uwb/wlp/sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/uwb/wlp/sysfs.c 2010-05-28 21:27:15.915209208 -0400 +diff -urNp linux-2.6.32.16/drivers/uwb/wlp/sysfs.c linux-2.6.32.16/drivers/uwb/wlp/sysfs.c +--- linux-2.6.32.16/drivers/uwb/wlp/sysfs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/uwb/wlp/sysfs.c 2010-07-09 14:50:37.000000000 -0400 @@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec return ret; } @@ -28244,9 +28483,9 @@ diff -urNp linux-2.6.32.15/drivers/uwb/wlp/sysfs.c linux-2.6.32.15/drivers/uwb/w .show = wlp_wss_attr_show, .store = wlp_wss_attr_store, }; -diff -urNp linux-2.6.32.15/drivers/video/atmel_lcdfb.c linux-2.6.32.15/drivers/video/atmel_lcdfb.c ---- linux-2.6.32.15/drivers/video/atmel_lcdfb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/atmel_lcdfb.c 2010-05-28 21:27:15.915209208 -0400 +diff -urNp linux-2.6.32.16/drivers/video/atmel_lcdfb.c linux-2.6.32.16/drivers/video/atmel_lcdfb.c +--- linux-2.6.32.16/drivers/video/atmel_lcdfb.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/atmel_lcdfb.c 2010-07-09 14:50:37.000000000 -0400 @@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); } @@ -28256,9 +28495,9 @@ diff -urNp linux-2.6.32.15/drivers/video/atmel_lcdfb.c linux-2.6.32.15/drivers/v .update_status = atmel_bl_update_status, .get_brightness = atmel_bl_get_brightness, }; -diff -urNp linux-2.6.32.15/drivers/video/aty/aty128fb.c linux-2.6.32.15/drivers/video/aty/aty128fb.c ---- linux-2.6.32.15/drivers/video/aty/aty128fb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/aty/aty128fb.c 2010-05-28 21:27:15.931199110 -0400 +diff -urNp linux-2.6.32.16/drivers/video/aty/aty128fb.c linux-2.6.32.16/drivers/video/aty/aty128fb.c +--- linux-2.6.32.16/drivers/video/aty/aty128fb.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/aty/aty128fb.c 2010-07-09 14:50:37.000000000 -0400 @@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru return bd->props.brightness; } @@ -28268,9 +28507,9 @@ diff -urNp linux-2.6.32.15/drivers/video/aty/aty128fb.c linux-2.6.32.15/drivers/ .get_brightness = aty128_bl_get_brightness, .update_status = aty128_bl_update_status, }; -diff -urNp linux-2.6.32.15/drivers/video/aty/atyfb_base.c linux-2.6.32.15/drivers/video/aty/atyfb_base.c ---- linux-2.6.32.15/drivers/video/aty/atyfb_base.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/aty/atyfb_base.c 2010-05-28 21:27:15.939052461 -0400 +diff -urNp linux-2.6.32.16/drivers/video/aty/atyfb_base.c linux-2.6.32.16/drivers/video/aty/atyfb_base.c +--- linux-2.6.32.16/drivers/video/aty/atyfb_base.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/aty/atyfb_base.c 2010-07-09 14:50:37.000000000 -0400 @@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct return bd->props.brightness; } @@ -28280,9 +28519,9 @@ diff -urNp linux-2.6.32.15/drivers/video/aty/atyfb_base.c linux-2.6.32.15/driver .get_brightness = aty_bl_get_brightness, .update_status = aty_bl_update_status, }; -diff -urNp linux-2.6.32.15/drivers/video/aty/radeon_backlight.c linux-2.6.32.15/drivers/video/aty/radeon_backlight.c ---- linux-2.6.32.15/drivers/video/aty/radeon_backlight.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/aty/radeon_backlight.c 2010-05-28 21:27:15.939052461 -0400 +diff -urNp linux-2.6.32.16/drivers/video/aty/radeon_backlight.c linux-2.6.32.16/drivers/video/aty/radeon_backlight.c +--- linux-2.6.32.16/drivers/video/aty/radeon_backlight.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/aty/radeon_backlight.c 2010-07-09 14:50:37.000000000 -0400 @@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru return bd->props.brightness; } @@ -28292,9 +28531,9 @@ diff -urNp linux-2.6.32.15/drivers/video/aty/radeon_backlight.c linux-2.6.32.15/ .get_brightness = radeon_bl_get_brightness, .update_status = radeon_bl_update_status, }; -diff -urNp linux-2.6.32.15/drivers/video/backlight/adp5520_bl.c linux-2.6.32.15/drivers/video/backlight/adp5520_bl.c ---- linux-2.6.32.15/drivers/video/backlight/adp5520_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/backlight/adp5520_bl.c 2010-05-28 21:27:15.939052461 -0400 +diff -urNp linux-2.6.32.16/drivers/video/backlight/adp5520_bl.c linux-2.6.32.16/drivers/video/backlight/adp5520_bl.c +--- linux-2.6.32.16/drivers/video/backlight/adp5520_bl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/backlight/adp5520_bl.c 2010-07-09 14:50:37.000000000 -0400 @@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str return error ? data->current_brightness : reg_val; } @@ -28304,9 +28543,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/adp5520_bl.c linux-2.6.32.15/ .update_status = adp5520_bl_update_status, .get_brightness = adp5520_bl_get_brightness, }; -diff -urNp linux-2.6.32.15/drivers/video/backlight/adx_bl.c linux-2.6.32.15/drivers/video/backlight/adx_bl.c ---- linux-2.6.32.15/drivers/video/backlight/adx_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/backlight/adx_bl.c 2010-05-28 21:27:15.939052461 -0400 +diff -urNp linux-2.6.32.16/drivers/video/backlight/adx_bl.c linux-2.6.32.16/drivers/video/backlight/adx_bl.c +--- linux-2.6.32.16/drivers/video/backlight/adx_bl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/backlight/adx_bl.c 2010-07-09 14:50:37.000000000 -0400 @@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct return 1; } @@ -28316,9 +28555,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/adx_bl.c linux-2.6.32.15/driv .options = 0, .update_status = adx_backlight_update_status, .get_brightness = adx_backlight_get_brightness, -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 ---- linux-2.6.32.15/drivers/video/backlight/atmel-pwm-bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/backlight/atmel-pwm-bl.c 2010-05-28 21:27:15.939052461 -0400 +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 +--- linux-2.6.32.16/drivers/video/backlight/atmel-pwm-bl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/backlight/atmel-pwm-bl.c 2010-07-09 14:50:37.000000000 -0400 @@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct return pwm_channel_enable(&pwmbl->pwmc); } @@ -28328,9 +28567,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.1 .get_brightness = atmel_pwm_bl_get_intensity, .update_status = atmel_pwm_bl_set_intensity, }; -diff -urNp linux-2.6.32.15/drivers/video/backlight/backlight.c linux-2.6.32.15/drivers/video/backlight/backlight.c ---- linux-2.6.32.15/drivers/video/backlight/backlight.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/backlight/backlight.c 2010-05-28 21:27:15.939052461 -0400 +diff -urNp linux-2.6.32.16/drivers/video/backlight/backlight.c linux-2.6.32.16/drivers/video/backlight/backlight.c +--- linux-2.6.32.16/drivers/video/backlight/backlight.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/backlight/backlight.c 2010-07-09 14:50:37.000000000 -0400 @@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update); * ERR_PTR() or a pointer to the newly allocated device. */ @@ -28340,9 +28579,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/backlight.c linux-2.6.32.15/d { struct backlight_device *new_bd; int rc; -diff -urNp linux-2.6.32.15/drivers/video/backlight/corgi_lcd.c linux-2.6.32.15/drivers/video/backlight/corgi_lcd.c ---- linux-2.6.32.15/drivers/video/backlight/corgi_lcd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/backlight/corgi_lcd.c 2010-05-28 21:27:15.939052461 -0400 +diff -urNp linux-2.6.32.16/drivers/video/backlight/corgi_lcd.c linux-2.6.32.16/drivers/video/backlight/corgi_lcd.c +--- linux-2.6.32.16/drivers/video/backlight/corgi_lcd.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/backlight/corgi_lcd.c 2010-07-09 14:50:37.000000000 -0400 @@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit } 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 .get_brightness = corgi_bl_get_intensity, .update_status = corgi_bl_update_status, }; -diff -urNp linux-2.6.32.15/drivers/video/backlight/cr_bllcd.c linux-2.6.32.15/drivers/video/backlight/cr_bllcd.c ---- linux-2.6.32.15/drivers/video/backlight/cr_bllcd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/backlight/cr_bllcd.c 2010-05-28 21:27:15.939052461 -0400 +diff -urNp linux-2.6.32.16/drivers/video/backlight/cr_bllcd.c linux-2.6.32.16/drivers/video/backlight/cr_bllcd.c +--- linux-2.6.32.16/drivers/video/backlight/cr_bllcd.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/backlight/cr_bllcd.c 2010-07-09 14:50:37.000000000 -0400 @@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st return intensity; } @@ -28364,9 +28603,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/cr_bllcd.c linux-2.6.32.15/dr .get_brightness = cr_backlight_get_intensity, .update_status = cr_backlight_set_intensity, }; -diff -urNp linux-2.6.32.15/drivers/video/backlight/da903x_bl.c linux-2.6.32.15/drivers/video/backlight/da903x_bl.c ---- linux-2.6.32.15/drivers/video/backlight/da903x_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/backlight/da903x_bl.c 2010-05-28 21:27:15.939052461 -0400 +diff -urNp linux-2.6.32.16/drivers/video/backlight/da903x_bl.c linux-2.6.32.16/drivers/video/backlight/da903x_bl.c +--- linux-2.6.32.16/drivers/video/backlight/da903x_bl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/backlight/da903x_bl.c 2010-07-09 14:50:37.000000000 -0400 @@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne return data->current_brightness; } @@ -28376,9 +28615,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/da903x_bl.c linux-2.6.32.15/d .update_status = da903x_backlight_update_status, .get_brightness = da903x_backlight_get_brightness, }; -diff -urNp linux-2.6.32.15/drivers/video/backlight/generic_bl.c linux-2.6.32.15/drivers/video/backlight/generic_bl.c ---- linux-2.6.32.15/drivers/video/backlight/generic_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/backlight/generic_bl.c 2010-05-28 21:27:15.939052461 -0400 +diff -urNp linux-2.6.32.16/drivers/video/backlight/generic_bl.c linux-2.6.32.16/drivers/video/backlight/generic_bl.c +--- linux-2.6.32.16/drivers/video/backlight/generic_bl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/backlight/generic_bl.c 2010-07-09 14:50:37.000000000 -0400 @@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit) } 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/ .options = BL_CORE_SUSPENDRESUME, .get_brightness = genericbl_get_intensity, .update_status = genericbl_send_intensity, -diff -urNp linux-2.6.32.15/drivers/video/backlight/hp680_bl.c linux-2.6.32.15/drivers/video/backlight/hp680_bl.c ---- linux-2.6.32.15/drivers/video/backlight/hp680_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/backlight/hp680_bl.c 2010-05-28 21:27:15.939052461 -0400 +diff -urNp linux-2.6.32.16/drivers/video/backlight/hp680_bl.c linux-2.6.32.16/drivers/video/backlight/hp680_bl.c +--- linux-2.6.32.16/drivers/video/backlight/hp680_bl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/backlight/hp680_bl.c 2010-07-09 14:50:37.000000000 -0400 @@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct return current_intensity; } @@ -28400,9 +28639,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/hp680_bl.c linux-2.6.32.15/dr .get_brightness = hp680bl_get_intensity, .update_status = hp680bl_set_intensity, }; -diff -urNp linux-2.6.32.15/drivers/video/backlight/jornada720_bl.c linux-2.6.32.15/drivers/video/backlight/jornada720_bl.c ---- linux-2.6.32.15/drivers/video/backlight/jornada720_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/backlight/jornada720_bl.c 2010-05-28 21:27:15.943207359 -0400 +diff -urNp linux-2.6.32.16/drivers/video/backlight/jornada720_bl.c linux-2.6.32.16/drivers/video/backlight/jornada720_bl.c +--- linux-2.6.32.16/drivers/video/backlight/jornada720_bl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/backlight/jornada720_bl.c 2010-07-09 14:50:37.000000000 -0400 @@ -93,7 +93,7 @@ out: return ret; } @@ -28412,9 +28651,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/jornada720_bl.c linux-2.6.32. .get_brightness = jornada_bl_get_brightness, .update_status = jornada_bl_update_status, .options = BL_CORE_SUSPENDRESUME, -diff -urNp linux-2.6.32.15/drivers/video/backlight/kb3886_bl.c linux-2.6.32.15/drivers/video/backlight/kb3886_bl.c ---- linux-2.6.32.15/drivers/video/backlight/kb3886_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/backlight/kb3886_bl.c 2010-05-28 21:27:15.943207359 -0400 +diff -urNp linux-2.6.32.16/drivers/video/backlight/kb3886_bl.c linux-2.6.32.16/drivers/video/backlight/kb3886_bl.c +--- linux-2.6.32.16/drivers/video/backlight/kb3886_bl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/backlight/kb3886_bl.c 2010-07-09 14:50:37.000000000 -0400 @@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct return kb3886bl_intensity; } @@ -28424,9 +28663,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/kb3886_bl.c linux-2.6.32.15/d .get_brightness = kb3886bl_get_intensity, .update_status = kb3886bl_send_intensity, }; -diff -urNp linux-2.6.32.15/drivers/video/backlight/locomolcd.c linux-2.6.32.15/drivers/video/backlight/locomolcd.c ---- linux-2.6.32.15/drivers/video/backlight/locomolcd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/backlight/locomolcd.c 2010-05-28 21:27:15.943207359 -0400 +diff -urNp linux-2.6.32.16/drivers/video/backlight/locomolcd.c linux-2.6.32.16/drivers/video/backlight/locomolcd.c +--- linux-2.6.32.16/drivers/video/backlight/locomolcd.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/backlight/locomolcd.c 2010-07-09 14:50:37.000000000 -0400 @@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc return current_intensity; } @@ -28436,9 +28675,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/locomolcd.c linux-2.6.32.15/d .get_brightness = locomolcd_get_intensity, .update_status = locomolcd_set_intensity, }; -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 ---- linux-2.6.32.15/drivers/video/backlight/mbp_nvidia_bl.c 2010-04-29 17:49:38.397382140 -0400 -+++ linux-2.6.32.15/drivers/video/backlight/mbp_nvidia_bl.c 2010-05-28 21:27:15.943207359 -0400 +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 +--- linux-2.6.32.16/drivers/video/backlight/mbp_nvidia_bl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/backlight/mbp_nvidia_bl.c 2010-07-09 14:50:37.000000000 -0400 @@ -33,7 +33,7 @@ struct dmi_match_data { unsigned long iostart; 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. }; /* Module parameters. */ -diff -urNp linux-2.6.32.15/drivers/video/backlight/omap1_bl.c linux-2.6.32.15/drivers/video/backlight/omap1_bl.c ---- linux-2.6.32.15/drivers/video/backlight/omap1_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/backlight/omap1_bl.c 2010-05-28 21:27:15.943207359 -0400 +diff -urNp linux-2.6.32.16/drivers/video/backlight/omap1_bl.c linux-2.6.32.16/drivers/video/backlight/omap1_bl.c +--- linux-2.6.32.16/drivers/video/backlight/omap1_bl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/backlight/omap1_bl.c 2010-07-09 14:50:37.000000000 -0400 @@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b return bl->current_intensity; } @@ -28460,9 +28699,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/omap1_bl.c linux-2.6.32.15/dr .get_brightness = omapbl_get_intensity, .update_status = omapbl_update_status, }; -diff -urNp linux-2.6.32.15/drivers/video/backlight/progear_bl.c linux-2.6.32.15/drivers/video/backlight/progear_bl.c ---- linux-2.6.32.15/drivers/video/backlight/progear_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/backlight/progear_bl.c 2010-05-28 21:27:15.943207359 -0400 +diff -urNp linux-2.6.32.16/drivers/video/backlight/progear_bl.c linux-2.6.32.16/drivers/video/backlight/progear_bl.c +--- linux-2.6.32.16/drivers/video/backlight/progear_bl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/backlight/progear_bl.c 2010-07-09 14:50:37.000000000 -0400 @@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc return intensity - HW_LEVEL_MIN; } @@ -28472,9 +28711,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/progear_bl.c linux-2.6.32.15/ .get_brightness = progearbl_get_intensity, .update_status = progearbl_set_intensity, }; -diff -urNp linux-2.6.32.15/drivers/video/backlight/pwm_bl.c linux-2.6.32.15/drivers/video/backlight/pwm_bl.c ---- linux-2.6.32.15/drivers/video/backlight/pwm_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/backlight/pwm_bl.c 2010-05-28 21:27:15.943207359 -0400 +diff -urNp linux-2.6.32.16/drivers/video/backlight/pwm_bl.c linux-2.6.32.16/drivers/video/backlight/pwm_bl.c +--- linux-2.6.32.16/drivers/video/backlight/pwm_bl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/backlight/pwm_bl.c 2010-07-09 14:50:37.000000000 -0400 @@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness( return bl->props.brightness; } @@ -28484,9 +28723,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/pwm_bl.c linux-2.6.32.15/driv .update_status = pwm_backlight_update_status, .get_brightness = pwm_backlight_get_brightness, }; -diff -urNp linux-2.6.32.15/drivers/video/backlight/tosa_bl.c linux-2.6.32.15/drivers/video/backlight/tosa_bl.c ---- linux-2.6.32.15/drivers/video/backlight/tosa_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/backlight/tosa_bl.c 2010-05-28 21:27:15.943207359 -0400 +diff -urNp linux-2.6.32.16/drivers/video/backlight/tosa_bl.c linux-2.6.32.16/drivers/video/backlight/tosa_bl.c +--- linux-2.6.32.16/drivers/video/backlight/tosa_bl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/backlight/tosa_bl.c 2010-07-09 14:50:37.000000000 -0400 @@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct return props->brightness; } @@ -28496,9 +28735,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/tosa_bl.c linux-2.6.32.15/dri .get_brightness = tosa_bl_get_brightness, .update_status = tosa_bl_update_status, }; -diff -urNp linux-2.6.32.15/drivers/video/backlight/wm831x_bl.c linux-2.6.32.15/drivers/video/backlight/wm831x_bl.c ---- linux-2.6.32.15/drivers/video/backlight/wm831x_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/backlight/wm831x_bl.c 2010-05-28 21:27:15.943207359 -0400 +diff -urNp linux-2.6.32.16/drivers/video/backlight/wm831x_bl.c linux-2.6.32.16/drivers/video/backlight/wm831x_bl.c +--- linux-2.6.32.16/drivers/video/backlight/wm831x_bl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/backlight/wm831x_bl.c 2010-07-09 14:50:37.000000000 -0400 @@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne return data->current_brightness; } @@ -28508,9 +28747,9 @@ diff -urNp linux-2.6.32.15/drivers/video/backlight/wm831x_bl.c linux-2.6.32.15/d .options = BL_CORE_SUSPENDRESUME, .update_status = wm831x_backlight_update_status, .get_brightness = wm831x_backlight_get_brightness, -diff -urNp linux-2.6.32.15/drivers/video/bf54x-lq043fb.c linux-2.6.32.15/drivers/video/bf54x-lq043fb.c ---- linux-2.6.32.15/drivers/video/bf54x-lq043fb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/bf54x-lq043fb.c 2010-05-28 21:27:15.943207359 -0400 +diff -urNp linux-2.6.32.16/drivers/video/bf54x-lq043fb.c linux-2.6.32.16/drivers/video/bf54x-lq043fb.c +--- linux-2.6.32.16/drivers/video/bf54x-lq043fb.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/bf54x-lq043fb.c 2010-07-09 14:50:37.000000000 -0400 @@ -463,7 +463,7 @@ static int bl_get_brightness(struct back return 0; } @@ -28520,9 +28759,9 @@ diff -urNp linux-2.6.32.15/drivers/video/bf54x-lq043fb.c linux-2.6.32.15/drivers .get_brightness = bl_get_brightness, }; -diff -urNp linux-2.6.32.15/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.15/drivers/video/bfin-t350mcqb-fb.c ---- linux-2.6.32.15/drivers/video/bfin-t350mcqb-fb.c 2010-05-28 20:16:44.454934408 -0400 -+++ linux-2.6.32.15/drivers/video/bfin-t350mcqb-fb.c 2010-05-28 21:27:15.943207359 -0400 +diff -urNp linux-2.6.32.16/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.16/drivers/video/bfin-t350mcqb-fb.c +--- linux-2.6.32.16/drivers/video/bfin-t350mcqb-fb.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/bfin-t350mcqb-fb.c 2010-07-09 14:50:37.000000000 -0400 @@ -381,7 +381,7 @@ static int bl_get_brightness(struct back return 0; } @@ -28532,9 +28771,9 @@ diff -urNp linux-2.6.32.15/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.15/driv .get_brightness = bl_get_brightness, }; -diff -urNp linux-2.6.32.15/drivers/video/fbcmap.c linux-2.6.32.15/drivers/video/fbcmap.c ---- linux-2.6.32.15/drivers/video/fbcmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/fbcmap.c 2010-05-28 21:27:15.943207359 -0400 +diff -urNp linux-2.6.32.16/drivers/video/fbcmap.c linux-2.6.32.16/drivers/video/fbcmap.c +--- linux-2.6.32.16/drivers/video/fbcmap.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/fbcmap.c 2010-07-09 14:50:37.000000000 -0400 @@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user rc = -ENODEV; goto out; @@ -28545,9 +28784,9 @@ diff -urNp linux-2.6.32.15/drivers/video/fbcmap.c linux-2.6.32.15/drivers/video/ rc = -EINVAL; goto out1; } -diff -urNp linux-2.6.32.15/drivers/video/fbmem.c linux-2.6.32.15/drivers/video/fbmem.c ---- linux-2.6.32.15/drivers/video/fbmem.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/fbmem.c 2010-05-28 21:27:15.947209363 -0400 +diff -urNp linux-2.6.32.16/drivers/video/fbmem.c linux-2.6.32.16/drivers/video/fbmem.c +--- linux-2.6.32.16/drivers/video/fbmem.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/fbmem.c 2010-07-09 14:50:37.000000000 -0400 @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in image->dx += image->width + 8; } @@ -28575,9 +28814,9 @@ diff -urNp linux-2.6.32.15/drivers/video/fbmem.c linux-2.6.32.15/drivers/video/f return -EINVAL; if (!registered_fb[con2fb.framebuffer]) request_module("fb%d", con2fb.framebuffer); -diff -urNp linux-2.6.32.15/drivers/video/fbmon.c linux-2.6.32.15/drivers/video/fbmon.c ---- linux-2.6.32.15/drivers/video/fbmon.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/fbmon.c 2010-05-28 21:27:15.947209363 -0400 +diff -urNp linux-2.6.32.16/drivers/video/fbmon.c linux-2.6.32.16/drivers/video/fbmon.c +--- linux-2.6.32.16/drivers/video/fbmon.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/fbmon.c 2010-07-09 14:50:37.000000000 -0400 @@ -45,7 +45,7 @@ #ifdef DEBUG #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 #endif #define FBMON_FIX_HEADER 1 -diff -urNp linux-2.6.32.15/drivers/video/i810/i810_accel.c linux-2.6.32.15/drivers/video/i810/i810_accel.c ---- linux-2.6.32.15/drivers/video/i810/i810_accel.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/i810/i810_accel.c 2010-05-28 21:27:15.947209363 -0400 +diff -urNp linux-2.6.32.16/drivers/video/i810/i810_accel.c linux-2.6.32.16/drivers/video/i810/i810_accel.c +--- linux-2.6.32.16/drivers/video/i810/i810_accel.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/i810/i810_accel.c 2010-07-09 14:50:37.000000000 -0400 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct } } @@ -28598,9 +28837,9 @@ diff -urNp linux-2.6.32.15/drivers/video/i810/i810_accel.c linux-2.6.32.15/drive i810_report_error(mmio); par->dev_flags |= LOCKUP; info->pixmap.scan_align = 1; -diff -urNp linux-2.6.32.15/drivers/video/i810/i810_main.c linux-2.6.32.15/drivers/video/i810/i810_main.c ---- linux-2.6.32.15/drivers/video/i810/i810_main.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/i810/i810_main.c 2010-05-28 21:27:15.987994154 -0400 +diff -urNp linux-2.6.32.16/drivers/video/i810/i810_main.c linux-2.6.32.16/drivers/video/i810/i810_main.c +--- linux-2.6.32.16/drivers/video/i810/i810_main.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/i810/i810_main.c 2010-07-09 14:50:37.000000000 -0400 @@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, { 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 }; static struct pci_driver i810fb_driver = { -diff -urNp linux-2.6.32.15/drivers/video/modedb.c linux-2.6.32.15/drivers/video/modedb.c ---- linux-2.6.32.15/drivers/video/modedb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/modedb.c 2010-05-28 21:27:15.987994154 -0400 +diff -urNp linux-2.6.32.16/drivers/video/modedb.c linux-2.6.32.16/drivers/video/modedb.c +--- linux-2.6.32.16/drivers/video/modedb.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/modedb.c 2010-07-09 14:50:37.000000000 -0400 @@ -38,240 +38,240 @@ static const struct fb_videomode modedb[ { /* 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/ }, }; -diff -urNp linux-2.6.32.15/drivers/video/nvidia/nv_backlight.c linux-2.6.32.15/drivers/video/nvidia/nv_backlight.c ---- linux-2.6.32.15/drivers/video/nvidia/nv_backlight.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/nvidia/nv_backlight.c 2010-05-28 21:27:15.987994154 -0400 +diff -urNp linux-2.6.32.16/drivers/video/nvidia/nv_backlight.c linux-2.6.32.16/drivers/video/nvidia/nv_backlight.c +--- linux-2.6.32.16/drivers/video/nvidia/nv_backlight.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/nvidia/nv_backlight.c 2010-07-09 14:50:37.000000000 -0400 @@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru return bd->props.brightness; } @@ -28925,9 +29164,9 @@ diff -urNp linux-2.6.32.15/drivers/video/nvidia/nv_backlight.c linux-2.6.32.15/d .get_brightness = nvidia_bl_get_brightness, .update_status = nvidia_bl_update_status, }; -diff -urNp linux-2.6.32.15/drivers/video/riva/fbdev.c linux-2.6.32.15/drivers/video/riva/fbdev.c ---- linux-2.6.32.15/drivers/video/riva/fbdev.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/riva/fbdev.c 2010-05-28 21:27:15.987994154 -0400 +diff -urNp linux-2.6.32.16/drivers/video/riva/fbdev.c linux-2.6.32.16/drivers/video/riva/fbdev.c +--- linux-2.6.32.16/drivers/video/riva/fbdev.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/riva/fbdev.c 2010-07-09 14:50:37.000000000 -0400 @@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct return bd->props.brightness; } @@ -28937,9 +29176,9 @@ diff -urNp linux-2.6.32.15/drivers/video/riva/fbdev.c linux-2.6.32.15/drivers/vi .get_brightness = riva_bl_get_brightness, .update_status = riva_bl_update_status, }; -diff -urNp linux-2.6.32.15/drivers/video/uvesafb.c linux-2.6.32.15/drivers/video/uvesafb.c ---- linux-2.6.32.15/drivers/video/uvesafb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/uvesafb.c 2010-05-28 21:27:15.987994154 -0400 +diff -urNp linux-2.6.32.16/drivers/video/uvesafb.c linux-2.6.32.16/drivers/video/uvesafb.c +--- linux-2.6.32.16/drivers/video/uvesafb.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/uvesafb.c 2010-07-09 14:50:37.000000000 -0400 @@ -18,6 +18,7 @@ #include <linux/fb.h> #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 } framebuffer_release(info); -diff -urNp linux-2.6.32.15/drivers/video/vesafb.c linux-2.6.32.15/drivers/video/vesafb.c ---- linux-2.6.32.15/drivers/video/vesafb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/video/vesafb.c 2010-05-28 21:27:15.987994154 -0400 +diff -urNp linux-2.6.32.16/drivers/video/vesafb.c linux-2.6.32.16/drivers/video/vesafb.c +--- linux-2.6.32.16/drivers/video/vesafb.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/video/vesafb.c 2010-07-09 14:50:37.000000000 -0400 @@ -9,6 +9,7 @@ */ @@ -29121,9 +29360,9 @@ diff -urNp linux-2.6.32.15/drivers/video/vesafb.c linux-2.6.32.15/drivers/video/ if (info->screen_base) iounmap(info->screen_base); framebuffer_release(info); -diff -urNp linux-2.6.32.15/drivers/xen/sys-hypervisor.c linux-2.6.32.15/drivers/xen/sys-hypervisor.c ---- linux-2.6.32.15/drivers/xen/sys-hypervisor.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/drivers/xen/sys-hypervisor.c 2010-05-28 21:27:15.987994154 -0400 +diff -urNp linux-2.6.32.16/drivers/xen/sys-hypervisor.c linux-2.6.32.16/drivers/xen/sys-hypervisor.c +--- linux-2.6.32.16/drivers/xen/sys-hypervisor.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/drivers/xen/sys-hypervisor.c 2010-07-09 14:50:37.000000000 -0400 @@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko return 0; } @@ -29133,9 +29372,9 @@ diff -urNp linux-2.6.32.15/drivers/xen/sys-hypervisor.c linux-2.6.32.15/drivers/ .show = hyp_sysfs_show, .store = hyp_sysfs_store, }; -diff -urNp linux-2.6.32.15/fs/9p/vfs_inode.c linux-2.6.32.15/fs/9p/vfs_inode.c ---- linux-2.6.32.15/fs/9p/vfs_inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/9p/vfs_inode.c 2010-05-28 21:27:15.987994154 -0400 +diff -urNp linux-2.6.32.16/fs/9p/vfs_inode.c linux-2.6.32.16/fs/9p/vfs_inode.c +--- linux-2.6.32.16/fs/9p/vfs_inode.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/9p/vfs_inode.c 2010-07-09 14:50:37.000000000 -0400 @@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct static void 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 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, IS_ERR(s) ? "<error>" : s); -diff -urNp linux-2.6.32.15/fs/aio.c linux-2.6.32.15/fs/aio.c ---- linux-2.6.32.15/fs/aio.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/aio.c 2010-05-28 21:27:15.995209124 -0400 +diff -urNp linux-2.6.32.16/fs/aio.c linux-2.6.32.16/fs/aio.c +--- linux-2.6.32.16/fs/aio.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/aio.c 2010-07-09 14:50:37.000000000 -0400 @@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx size += sizeof(struct io_event) * nr_events; 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 return -EINVAL; nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); -diff -urNp linux-2.6.32.15/fs/attr.c linux-2.6.32.15/fs/attr.c ---- linux-2.6.32.15/fs/attr.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/attr.c 2010-05-28 21:27:15.995209124 -0400 +diff -urNp linux-2.6.32.16/fs/attr.c linux-2.6.32.16/fs/attr.c +--- linux-2.6.32.16/fs/attr.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/attr.c 2010-07-09 14:50:37.000000000 -0400 @@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode unsigned long limit; @@ -29168,9 +29407,9 @@ diff -urNp linux-2.6.32.15/fs/attr.c linux-2.6.32.15/fs/attr.c if (limit != RLIM_INFINITY && offset > limit) goto out_sig; if (offset > inode->i_sb->s_maxbytes) -diff -urNp linux-2.6.32.15/fs/autofs/root.c linux-2.6.32.15/fs/autofs/root.c ---- linux-2.6.32.15/fs/autofs/root.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/autofs/root.c 2010-05-28 21:27:15.995209124 -0400 +diff -urNp linux-2.6.32.16/fs/autofs/root.c linux-2.6.32.16/fs/autofs/root.c +--- linux-2.6.32.16/fs/autofs/root.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/autofs/root.c 2010-07-09 14:50:37.000000000 -0400 @@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in set_bit(n,sbi->symlink_bitmap); 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 if (!sl->data) { clear_bit(n,sbi->symlink_bitmap); unlock_kernel(); -diff -urNp linux-2.6.32.15/fs/autofs4/symlink.c linux-2.6.32.15/fs/autofs4/symlink.c ---- linux-2.6.32.15/fs/autofs4/symlink.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/autofs4/symlink.c 2010-05-28 21:27:15.995209124 -0400 +diff -urNp linux-2.6.32.16/fs/autofs4/symlink.c linux-2.6.32.16/fs/autofs4/symlink.c +--- linux-2.6.32.16/fs/autofs4/symlink.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/autofs4/symlink.c 2010-07-09 14:50:37.000000000 -0400 @@ -15,7 +15,7 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) { @@ -29193,9 +29432,9 @@ diff -urNp linux-2.6.32.15/fs/autofs4/symlink.c linux-2.6.32.15/fs/autofs4/symli return NULL; } -diff -urNp linux-2.6.32.15/fs/befs/linuxvfs.c linux-2.6.32.15/fs/befs/linuxvfs.c ---- linux-2.6.32.15/fs/befs/linuxvfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/befs/linuxvfs.c 2010-05-28 21:27:16.011217374 -0400 +diff -urNp linux-2.6.32.16/fs/befs/linuxvfs.c linux-2.6.32.16/fs/befs/linuxvfs.c +--- linux-2.6.32.16/fs/befs/linuxvfs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/befs/linuxvfs.c 2010-07-09 14:50:37.000000000 -0400 @@ -493,7 +493,7 @@ static void befs_put_link(struct dentry { 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 if (!IS_ERR(link)) kfree(link); } -diff -urNp linux-2.6.32.15/fs/binfmt_aout.c linux-2.6.32.15/fs/binfmt_aout.c ---- linux-2.6.32.15/fs/binfmt_aout.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/binfmt_aout.c 2010-05-28 21:27:16.011217374 -0400 +diff -urNp linux-2.6.32.16/fs/binfmt_aout.c linux-2.6.32.16/fs/binfmt_aout.c +--- linux-2.6.32.16/fs/binfmt_aout.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/binfmt_aout.c 2010-07-09 14:50:37.000000000 -0400 @@ -16,6 +16,7 @@ #include <linux/string.h> #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 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, fd_offset + ex.a_text); up_write(¤t->mm->mmap_sem); -diff -urNp linux-2.6.32.15/fs/binfmt_elf.c linux-2.6.32.15/fs/binfmt_elf.c ---- linux-2.6.32.15/fs/binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/binfmt_elf.c 2010-05-28 21:27:16.011217374 -0400 +diff -urNp linux-2.6.32.16/fs/binfmt_elf.c linux-2.6.32.16/fs/binfmt_elf.c +--- linux-2.6.32.16/fs/binfmt_elf.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/binfmt_elf.c 2010-07-09 14:50:37.000000000 -0400 @@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str #define elf_core_dump NULL #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 static int __init init_elf_binfmt(void) { return register_binfmt(&elf_format); -diff -urNp linux-2.6.32.15/fs/binfmt_flat.c linux-2.6.32.15/fs/binfmt_flat.c ---- linux-2.6.32.15/fs/binfmt_flat.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/binfmt_flat.c 2010-05-28 21:27:16.018905555 -0400 +diff -urNp linux-2.6.32.16/fs/binfmt_flat.c linux-2.6.32.16/fs/binfmt_flat.c +--- linux-2.6.32.16/fs/binfmt_flat.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/binfmt_flat.c 2010-07-09 14:50:37.000000000 -0400 @@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b realdatastart = (unsigned long) -ENOMEM; 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 ret = result; goto err; } -diff -urNp linux-2.6.32.15/fs/binfmt_misc.c linux-2.6.32.15/fs/binfmt_misc.c ---- linux-2.6.32.15/fs/binfmt_misc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/binfmt_misc.c 2010-05-28 21:27:16.018905555 -0400 +diff -urNp linux-2.6.32.16/fs/binfmt_misc.c linux-2.6.32.16/fs/binfmt_misc.c +--- linux-2.6.32.16/fs/binfmt_misc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/binfmt_misc.c 2010-07-09 14:50:37.000000000 -0400 @@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl static struct tree_descr bm_files[] = { [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 }; int err = simple_fill_super(sb, 0x42494e4d, bm_files); if (!err) -diff -urNp linux-2.6.32.15/fs/bio.c linux-2.6.32.15/fs/bio.c ---- linux-2.6.32.15/fs/bio.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/bio.c 2010-05-28 21:27:16.018905555 -0400 +diff -urNp linux-2.6.32.16/fs/bio.c linux-2.6.32.16/fs/bio.c +--- linux-2.6.32.16/fs/bio.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/bio.c 2010-07-09 14:50:37.000000000 -0400 @@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr i = 0; @@ -29981,9 +30220,9 @@ diff -urNp linux-2.6.32.15/fs/bio.c linux-2.6.32.15/fs/bio.c __bio_for_each_segment(bvec, bio, i, 0) { char *addr = page_address(bvec->bv_page); -diff -urNp linux-2.6.32.15/fs/block_dev.c linux-2.6.32.15/fs/block_dev.c ---- linux-2.6.32.15/fs/block_dev.c 2010-04-29 17:49:38.421500081 -0400 -+++ linux-2.6.32.15/fs/block_dev.c 2010-05-28 21:27:16.030907926 -0400 +diff -urNp linux-2.6.32.16/fs/block_dev.c linux-2.6.32.16/fs/block_dev.c +--- linux-2.6.32.16/fs/block_dev.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/block_dev.c 2010-07-09 14:50:37.000000000 -0400 @@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev, else if (bdev->bd_contains == bdev) 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 res = 0; /* is a partition of a device that is being partitioned */ else if (bdev->bd_contains->bd_holder != NULL) res = -EBUSY; /* is a partition of a held device */ -diff -urNp linux-2.6.32.15/fs/btrfs/ctree.c linux-2.6.32.15/fs/btrfs/ctree.c ---- linux-2.6.32.15/fs/btrfs/ctree.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/btrfs/ctree.c 2010-05-28 21:27:16.047217370 -0400 +diff -urNp linux-2.6.32.16/fs/btrfs/ctree.c linux-2.6.32.16/fs/btrfs/ctree.c +--- linux-2.6.32.16/fs/btrfs/ctree.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/btrfs/ctree.c 2010-07-09 14:50:37.000000000 -0400 @@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran 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 btrfs_cpu_key_to_disk(&disk_key, cpu_key); ret = fixup_low_keys(trans, root, path, &disk_key, 1); } -diff -urNp linux-2.6.32.15/fs/btrfs/disk-io.c linux-2.6.32.15/fs/btrfs/disk-io.c ---- linux-2.6.32.15/fs/btrfs/disk-io.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/btrfs/disk-io.c 2010-05-28 21:27:16.055226050 -0400 +diff -urNp linux-2.6.32.16/fs/btrfs/disk-io.c linux-2.6.32.16/fs/btrfs/disk-io.c +--- linux-2.6.32.16/fs/btrfs/disk-io.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/btrfs/disk-io.c 2010-07-09 14:50:37.000000000 -0400 @@ -39,7 +39,7 @@ #include "tree-log.h" #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 .write_cache_pages_lock_hook = btree_lock_page_hook, .readpage_end_io_hook = btree_readpage_end_io_hook, .submit_bio_hook = btree_submit_bio_hook, -diff -urNp linux-2.6.32.15/fs/btrfs/extent_io.h linux-2.6.32.15/fs/btrfs/extent_io.h ---- linux-2.6.32.15/fs/btrfs/extent_io.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/btrfs/extent_io.h 2010-05-28 21:27:16.055226050 -0400 +diff -urNp linux-2.6.32.16/fs/btrfs/extent_io.h linux-2.6.32.16/fs/btrfs/extent_io.h +--- linux-2.6.32.16/fs/btrfs/extent_io.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/btrfs/extent_io.h 2010-07-09 14:50:37.000000000 -0400 @@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s struct bio *bio, int mirror_num, 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_ }; struct extent_state { -diff -urNp linux-2.6.32.15/fs/btrfs/free-space-cache.c linux-2.6.32.15/fs/btrfs/free-space-cache.c ---- linux-2.6.32.15/fs/btrfs/free-space-cache.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/btrfs/free-space-cache.c 2010-05-28 21:27:16.067008196 -0400 +diff -urNp linux-2.6.32.16/fs/btrfs/free-space-cache.c linux-2.6.32.16/fs/btrfs/free-space-cache.c +--- linux-2.6.32.16/fs/btrfs/free-space-cache.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/btrfs/free-space-cache.c 2010-07-09 14:50:37.000000000 -0400 @@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf 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/ if (entry->bitmap && entry->bytes > bytes + empty_size) { ret = btrfs_bitmap_cluster(block_group, entry, cluster, -diff -urNp linux-2.6.32.15/fs/btrfs/inode.c linux-2.6.32.15/fs/btrfs/inode.c ---- linux-2.6.32.15/fs/btrfs/inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/btrfs/inode.c 2010-05-28 21:27:16.071504594 -0400 +diff -urNp linux-2.6.32.16/fs/btrfs/inode.c linux-2.6.32.16/fs/btrfs/inode.c +--- linux-2.6.32.16/fs/btrfs/inode.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/btrfs/inode.c 2010-07-09 14:50:37.000000000 -0400 @@ -63,7 +63,7 @@ static const struct inode_operations btr static const struct address_space_operations btrfs_aops; 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 .fill_delalloc = run_delalloc_range, .submit_bio_hook = btrfs_submit_bio_hook, .merge_bio_hook = btrfs_merge_bio_hook, -diff -urNp linux-2.6.32.15/fs/btrfs/sysfs.c linux-2.6.32.15/fs/btrfs/sysfs.c ---- linux-2.6.32.15/fs/btrfs/sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/btrfs/sysfs.c 2010-05-28 21:27:16.071504594 -0400 +diff -urNp linux-2.6.32.16/fs/btrfs/sysfs.c linux-2.6.32.16/fs/btrfs/sysfs.c +--- linux-2.6.32.16/fs/btrfs/sysfs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/btrfs/sysfs.c 2010-07-09 14:50:37.000000000 -0400 @@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko complete(&root->kobj_unregister); } @@ -30148,9 +30387,9 @@ diff -urNp linux-2.6.32.15/fs/btrfs/sysfs.c linux-2.6.32.15/fs/btrfs/sysfs.c .show = btrfs_root_attr_show, .store = btrfs_root_attr_store, }; -diff -urNp linux-2.6.32.15/fs/buffer.c linux-2.6.32.15/fs/buffer.c ---- linux-2.6.32.15/fs/buffer.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/buffer.c 2010-05-28 21:27:16.083222448 -0400 +diff -urNp linux-2.6.32.16/fs/buffer.c linux-2.6.32.16/fs/buffer.c +--- linux-2.6.32.16/fs/buffer.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/buffer.c 2010-07-09 14:50:37.000000000 -0400 @@ -25,6 +25,7 @@ #include <linux/percpu.h> #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 #include <linux/blkdev.h> #include <linux/file.h> #include <linux/quotaops.h> -diff -urNp linux-2.6.32.15/fs/cachefiles/bind.c linux-2.6.32.15/fs/cachefiles/bind.c ---- linux-2.6.32.15/fs/cachefiles/bind.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/cachefiles/bind.c 2010-05-28 21:27:16.083222448 -0400 +diff -urNp linux-2.6.32.16/fs/cachefiles/bind.c linux-2.6.32.16/fs/cachefiles/bind.c +--- linux-2.6.32.16/fs/cachefiles/bind.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/cachefiles/bind.c 2010-07-09 14:50:37.000000000 -0400 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef args); @@ -30178,9 +30417,9 @@ diff -urNp linux-2.6.32.15/fs/cachefiles/bind.c linux-2.6.32.15/fs/cachefiles/bi cache->bcull_percent < cache->brun_percent && cache->brun_percent < 100); -diff -urNp linux-2.6.32.15/fs/cachefiles/daemon.c linux-2.6.32.15/fs/cachefiles/daemon.c ---- linux-2.6.32.15/fs/cachefiles/daemon.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/cachefiles/daemon.c 2010-05-28 21:27:16.091216728 -0400 +diff -urNp linux-2.6.32.16/fs/cachefiles/daemon.c linux-2.6.32.16/fs/cachefiles/daemon.c +--- linux-2.6.32.16/fs/cachefiles/daemon.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/cachefiles/daemon.c 2010-07-09 14:50:37.000000000 -0400 @@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s if (test_bit(CACHEFILES_DEAD, &cache->flags)) return -EIO; @@ -30208,9 +30447,9 @@ diff -urNp linux-2.6.32.15/fs/cachefiles/daemon.c linux-2.6.32.15/fs/cachefiles/ return cachefiles_daemon_range_error(cache, args); cache->bstop_percent = bstop; -diff -urNp linux-2.6.32.15/fs/cachefiles/rdwr.c linux-2.6.32.15/fs/cachefiles/rdwr.c ---- linux-2.6.32.15/fs/cachefiles/rdwr.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/cachefiles/rdwr.c 2010-05-28 21:27:16.091216728 -0400 +diff -urNp linux-2.6.32.16/fs/cachefiles/rdwr.c linux-2.6.32.16/fs/cachefiles/rdwr.c +--- linux-2.6.32.16/fs/cachefiles/rdwr.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/cachefiles/rdwr.c 2010-07-09 14:50:37.000000000 -0400 @@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache old_fs = get_fs(); 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 set_fs(old_fs); kunmap(page); if (ret != len) -diff -urNp linux-2.6.32.15/fs/cifs/cifs_uniupr.h linux-2.6.32.15/fs/cifs/cifs_uniupr.h ---- linux-2.6.32.15/fs/cifs/cifs_uniupr.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/cifs/cifs_uniupr.h 2010-05-28 21:27:16.091216728 -0400 +diff -urNp linux-2.6.32.16/fs/cifs/cifs_uniupr.h linux-2.6.32.16/fs/cifs/cifs_uniupr.h +--- linux-2.6.32.16/fs/cifs/cifs_uniupr.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/cifs/cifs_uniupr.h 2010-07-09 14:50:37.000000000 -0400 @@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa {0x0490, 0x04cc, UniCaseRangeU0490}, {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 }; #endif -diff -urNp linux-2.6.32.15/fs/cifs/link.c linux-2.6.32.15/fs/cifs/link.c ---- linux-2.6.32.15/fs/cifs/link.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/cifs/link.c 2010-05-28 21:27:16.091216728 -0400 +diff -urNp linux-2.6.32.16/fs/cifs/link.c linux-2.6.32.16/fs/cifs/link.c +--- linux-2.6.32.16/fs/cifs/link.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/cifs/link.c 2010-07-09 14:50:37.000000000 -0400 @@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct 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 if (!IS_ERR(p)) kfree(p); } -diff -urNp linux-2.6.32.15/fs/compat_binfmt_elf.c linux-2.6.32.15/fs/compat_binfmt_elf.c ---- linux-2.6.32.15/fs/compat_binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/compat_binfmt_elf.c 2010-05-28 21:27:16.091216728 -0400 +diff -urNp linux-2.6.32.16/fs/compat_binfmt_elf.c linux-2.6.32.16/fs/compat_binfmt_elf.c +--- linux-2.6.32.16/fs/compat_binfmt_elf.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/compat_binfmt_elf.c 2010-07-09 14:50:37.000000000 -0400 @@ -29,10 +29,12 @@ #undef elfhdr #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 #define elf_addr_t Elf32_Addr /* -diff -urNp linux-2.6.32.15/fs/compat.c linux-2.6.32.15/fs/compat.c ---- linux-2.6.32.15/fs/compat.c 2010-05-28 20:16:44.454934408 -0400 -+++ linux-2.6.32.15/fs/compat.c 2010-05-28 21:27:16.095276039 -0400 +diff -urNp linux-2.6.32.16/fs/compat.c linux-2.6.32.16/fs/compat.c +--- linux-2.6.32.16/fs/compat.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/compat.c 2010-07-09 14:50:37.000000000 -0400 @@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc, if (!kmapped_page || kpos != (pos & PAGE_MASK)) { 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 out: if (bprm->mm) mmput(bprm->mm); -diff -urNp linux-2.6.32.15/fs/compat_ioctl.c linux-2.6.32.15/fs/compat_ioctl.c ---- linux-2.6.32.15/fs/compat_ioctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/compat_ioctl.c 2010-05-28 21:27:16.111229439 -0400 +diff -urNp linux-2.6.32.16/fs/compat_ioctl.c linux-2.6.32.16/fs/compat_ioctl.c +--- linux-2.6.32.16/fs/compat_ioctl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/compat_ioctl.c 2010-07-09 14:50:37.000000000 -0400 @@ -1827,15 +1827,15 @@ struct ioctl_trans { }; @@ -30384,9 +30623,9 @@ diff -urNp linux-2.6.32.15/fs/compat_ioctl.c linux-2.6.32.15/fs/compat_ioctl.c /* ioctl should not be warned about even if it's not implemented. Valid reasons to use this: -diff -urNp linux-2.6.32.15/fs/debugfs/inode.c linux-2.6.32.15/fs/debugfs/inode.c ---- linux-2.6.32.15/fs/debugfs/inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/debugfs/inode.c 2010-05-28 21:27:16.111229439 -0400 +diff -urNp linux-2.6.32.16/fs/debugfs/inode.c linux-2.6.32.16/fs/debugfs/inode.c +--- linux-2.6.32.16/fs/debugfs/inode.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/debugfs/inode.c 2010-07-09 14:50:37.000000000 -0400 @@ -128,7 +128,7 @@ static inline int debugfs_positive(struc 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 return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); } -diff -urNp linux-2.6.32.15/fs/dlm/lockspace.c linux-2.6.32.15/fs/dlm/lockspace.c ---- linux-2.6.32.15/fs/dlm/lockspace.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/dlm/lockspace.c 2010-05-28 21:27:16.111229439 -0400 +diff -urNp linux-2.6.32.16/fs/dlm/lockspace.c linux-2.6.32.16/fs/dlm/lockspace.c +--- linux-2.6.32.16/fs/dlm/lockspace.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/dlm/lockspace.c 2010-07-09 14:50:37.000000000 -0400 @@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc kfree(ls); } @@ -30408,9 +30647,9 @@ diff -urNp linux-2.6.32.15/fs/dlm/lockspace.c linux-2.6.32.15/fs/dlm/lockspace.c .show = dlm_attr_show, .store = dlm_attr_store, }; -diff -urNp linux-2.6.32.15/fs/ecryptfs/inode.c linux-2.6.32.15/fs/ecryptfs/inode.c ---- linux-2.6.32.15/fs/ecryptfs/inode.c 2010-04-29 17:49:38.429034237 -0400 -+++ linux-2.6.32.15/fs/ecryptfs/inode.c 2010-05-28 21:27:16.111229439 -0400 +diff -urNp linux-2.6.32.16/fs/ecryptfs/inode.c linux-2.6.32.16/fs/ecryptfs/inode.c +--- linux-2.6.32.16/fs/ecryptfs/inode.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/ecryptfs/inode.c 2010-07-09 14:50:37.000000000 -0400 @@ -655,7 +655,7 @@ static int ecryptfs_readlink_lower(struc old_fs = get_fs(); 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 set_fs(old_fs); if (rc < 0) goto out_free; -diff -urNp linux-2.6.32.15/fs/exec.c linux-2.6.32.15/fs/exec.c ---- linux-2.6.32.15/fs/exec.c 2010-05-28 20:16:44.454934408 -0400 -+++ linux-2.6.32.15/fs/exec.c 2010-05-28 21:27:16.119217721 -0400 +diff -urNp linux-2.6.32.16/fs/exec.c linux-2.6.32.16/fs/exec.c +--- linux-2.6.32.16/fs/exec.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/exec.c 2010-07-09 14:50:37.000000000 -0400 @@ -56,12 +56,24 @@ #include <linux/fsnotify.h> #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 /* * lock_kernel() because format_corename() is controlled by sysctl, which * uses lock_kernel() -diff -urNp linux-2.6.32.15/fs/ext2/balloc.c linux-2.6.32.15/fs/ext2/balloc.c ---- linux-2.6.32.15/fs/ext2/balloc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/ext2/balloc.c 2010-05-28 21:27:16.139352882 -0400 +diff -urNp linux-2.6.32.16/fs/ext2/balloc.c linux-2.6.32.16/fs/ext2/balloc.c +--- linux-2.6.32.16/fs/ext2/balloc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/ext2/balloc.c 2010-07-09 14:50:37.000000000 -0400 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e 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 sbi->s_resuid != current_fsuid() && (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-2.6.32.15/fs/ext2/xattr.c linux-2.6.32.15/fs/ext2/xattr.c ---- linux-2.6.32.15/fs/ext2/xattr.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/ext2/xattr.c 2010-05-28 21:27:16.139352882 -0400 +diff -urNp linux-2.6.32.16/fs/ext2/xattr.c linux-2.6.32.16/fs/ext2/xattr.c +--- linux-2.6.32.16/fs/ext2/xattr.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/ext2/xattr.c 2010-07-09 14:50:37.000000000 -0400 @@ -85,8 +85,8 @@ printk("\n"); \ } 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 #endif static int ext2_xattr_set2(struct inode *, struct buffer_head *, -diff -urNp linux-2.6.32.15/fs/ext3/balloc.c linux-2.6.32.15/fs/ext3/balloc.c ---- linux-2.6.32.15/fs/ext3/balloc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/ext3/balloc.c 2010-05-28 21:27:16.139352882 -0400 +diff -urNp linux-2.6.32.16/fs/ext3/balloc.c linux-2.6.32.16/fs/ext3/balloc.c +--- linux-2.6.32.16/fs/ext3/balloc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/ext3/balloc.c 2010-07-09 14:50:37.000000000 -0400 @@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e 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 sbi->s_resuid != current_fsuid() && (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-2.6.32.15/fs/ext3/namei.c linux-2.6.32.15/fs/ext3/namei.c ---- linux-2.6.32.15/fs/ext3/namei.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/ext3/namei.c 2010-05-28 21:27:16.139352882 -0400 +diff -urNp linux-2.6.32.16/fs/ext3/namei.c linux-2.6.32.16/fs/ext3/namei.c +--- linux-2.6.32.16/fs/ext3/namei.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/ext3/namei.c 2010-07-09 14:50:37.000000000 -0400 @@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split char *data1 = (*bh)->b_data, *data2; 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 bh2 = ext3_append (handle, dir, &newblock, &err); if (!(bh2)) { -diff -urNp linux-2.6.32.15/fs/ext3/xattr.c linux-2.6.32.15/fs/ext3/xattr.c ---- linux-2.6.32.15/fs/ext3/xattr.c 2010-04-29 17:49:38.429034237 -0400 -+++ linux-2.6.32.15/fs/ext3/xattr.c 2010-05-28 21:27:16.139352882 -0400 +diff -urNp linux-2.6.32.16/fs/ext3/xattr.c linux-2.6.32.16/fs/ext3/xattr.c +--- linux-2.6.32.16/fs/ext3/xattr.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/ext3/xattr.c 2010-07-09 14:50:37.000000000 -0400 @@ -89,8 +89,8 @@ printk("\n"); \ } 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 #endif static void ext3_xattr_cache_insert(struct buffer_head *); -diff -urNp linux-2.6.32.15/fs/ext4/balloc.c linux-2.6.32.15/fs/ext4/balloc.c ---- linux-2.6.32.15/fs/ext4/balloc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/ext4/balloc.c 2010-05-28 21:27:16.143235197 -0400 +diff -urNp linux-2.6.32.16/fs/ext4/balloc.c linux-2.6.32.16/fs/ext4/balloc.c +--- linux-2.6.32.16/fs/ext4/balloc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/ext4/balloc.c 2010-07-09 14:50:37.000000000 -0400 @@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_ /* Hm, nope. Are (enough) root reserved blocks available? */ 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 if (free_blocks >= (nblocks + dirty_blocks)) return 1; } -diff -urNp linux-2.6.32.15/fs/ext4/ioctl.c linux-2.6.32.15/fs/ext4/ioctl.c ---- linux-2.6.32.15/fs/ext4/ioctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/ext4/ioctl.c 2010-05-28 21:27:16.143235197 -0400 +diff -urNp linux-2.6.32.16/fs/ext4/ioctl.c linux-2.6.32.16/fs/ext4/ioctl.c +--- linux-2.6.32.16/fs/ext4/ioctl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/ext4/ioctl.c 2010-07-09 14:50:37.000000000 -0400 @@ -221,6 +221,9 @@ setversion_out: struct file *donor_filp; 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 if (!(filp->f_mode & FMODE_READ) || !(filp->f_mode & FMODE_WRITE)) return -EBADF; -diff -urNp linux-2.6.32.15/fs/ext4/namei.c linux-2.6.32.15/fs/ext4/namei.c ---- linux-2.6.32.15/fs/ext4/namei.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/ext4/namei.c 2010-05-28 21:27:16.151243127 -0400 +diff -urNp linux-2.6.32.16/fs/ext4/namei.c linux-2.6.32.16/fs/ext4/namei.c +--- linux-2.6.32.16/fs/ext4/namei.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/ext4/namei.c 2010-07-09 14:50:37.000000000 -0400 @@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split char *data1 = (*bh)->b_data, *data2; 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 bh2 = ext4_append (handle, dir, &newblock, &err); if (!(bh2)) { -diff -urNp linux-2.6.32.15/fs/ext4/super.c linux-2.6.32.15/fs/ext4/super.c ---- linux-2.6.32.15/fs/ext4/super.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/ext4/super.c 2010-05-28 21:27:16.155228523 -0400 +diff -urNp linux-2.6.32.16/fs/ext4/super.c linux-2.6.32.16/fs/ext4/super.c +--- linux-2.6.32.16/fs/ext4/super.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/ext4/super.c 2010-07-09 14:50:38.000000000 -0400 @@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje } @@ -31023,9 +31262,9 @@ diff -urNp linux-2.6.32.15/fs/ext4/super.c linux-2.6.32.15/fs/ext4/super.c .show = ext4_attr_show, .store = ext4_attr_store, }; -diff -urNp linux-2.6.32.15/fs/ext4/xattr.c linux-2.6.32.15/fs/ext4/xattr.c ---- linux-2.6.32.15/fs/ext4/xattr.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/ext4/xattr.c 2010-05-28 21:27:16.155228523 -0400 +diff -urNp linux-2.6.32.16/fs/ext4/xattr.c linux-2.6.32.16/fs/ext4/xattr.c +--- linux-2.6.32.16/fs/ext4/xattr.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/ext4/xattr.c 2010-07-09 14:50:38.000000000 -0400 @@ -82,8 +82,8 @@ printk("\n"); \ } 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 #endif static void ext4_xattr_cache_insert(struct buffer_head *); -diff -urNp linux-2.6.32.15/fs/fcntl.c linux-2.6.32.15/fs/fcntl.c ---- linux-2.6.32.15/fs/fcntl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/fcntl.c 2010-05-28 21:27:16.158915754 -0400 -@@ -344,6 +344,7 @@ static long do_fcntl(int fd, unsigned in +diff -urNp linux-2.6.32.16/fs/fcntl.c linux-2.6.32.16/fs/fcntl.c +--- linux-2.6.32.16/fs/fcntl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/fcntl.c 2010-07-10 08:04:59.000000000 -0400 +@@ -223,6 +223,11 @@ int __f_setown(struct file *filp, struct + if (err) + return err; + ++ if (gr_handle_chroot_fowner(pid, type)) ++ return -ENOENT; ++ if (gr_check_protected_task_fowner(pid, type)) ++ return -EACCES; ++ + f_modown(filp, pid, type, force); + return 0; + } +@@ -344,6 +349,7 @@ static long do_fcntl(int fd, unsigned in switch (cmd) { case F_DUPFD: 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 if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) break; err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0); -@@ -500,7 +501,8 @@ static inline int sigio_perm(struct task - ret = ((fown->euid == 0 || - fown->euid == cred->suid || fown->euid == cred->uid || - fown->uid == cred->suid || fown->uid == cred->uid) && -- !security_file_send_sigiotask(p, fown, sig)); -+ !security_file_send_sigiotask(p, fown, sig) && -+ !gr_check_protected_task(p) && !gr_pid_is_chrooted(p)); - rcu_read_unlock(); - return ret; - } -diff -urNp linux-2.6.32.15/fs/fifo.c linux-2.6.32.15/fs/fifo.c ---- linux-2.6.32.15/fs/fifo.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/fifo.c 2010-05-28 21:27:16.158915754 -0400 +diff -urNp linux-2.6.32.16/fs/fifo.c linux-2.6.32.16/fs/fifo.c +--- linux-2.6.32.16/fs/fifo.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/fifo.c 2010-07-09 14:50:38.000000000 -0400 @@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode */ 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 free_pipe_info(inode); err_nocleanup: -diff -urNp linux-2.6.32.15/fs/file.c linux-2.6.32.15/fs/file.c ---- linux-2.6.32.15/fs/file.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/file.c 2010-05-28 21:27:16.158915754 -0400 +diff -urNp linux-2.6.32.16/fs/file.c linux-2.6.32.16/fs/file.c +--- linux-2.6.32.16/fs/file.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/file.c 2010-07-09 14:50:38.000000000 -0400 @@ -14,6 +14,7 @@ #include <linux/slab.h> #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 if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) return -EMFILE; -diff -urNp linux-2.6.32.15/fs/fs_struct.c linux-2.6.32.15/fs/fs_struct.c ---- linux-2.6.32.15/fs/fs_struct.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/fs_struct.c 2010-05-28 21:27:16.158915754 -0400 -@@ -45,10 +45,12 @@ void chroot_fs_refs(struct path *old_roo - struct task_struct *g, *p; - struct fs_struct *fs; - int count = 0; -+ unsigned long flags; +diff -urNp linux-2.6.32.16/fs/fs_struct.c linux-2.6.32.16/fs/fs_struct.c +--- linux-2.6.32.16/fs/fs_struct.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/fs_struct.c 2010-07-09 14:50:38.000000000 -0400 +@@ -4,6 +4,7 @@ + #include <linux/path.h> + #include <linux/slab.h> + #include <linux/fs_struct.h> ++#include <linux/grsecurity.h> - read_lock(&tasklist_lock); - do_each_thread(g, p) { - task_lock(p); -+ gr_fs_write_lock_irqsave(p, flags); - fs = p->fs; - if (fs) { - write_lock(&fs->lock); -@@ -66,6 +68,7 @@ void chroot_fs_refs(struct path *old_roo + /* + * Replace the fs->{rootmnt,root} with {mnt,dentry}. Put the old values. +@@ -17,6 +18,7 @@ void set_fs_root(struct fs_struct *fs, s + old_root = fs->root; + fs->root = *path; + path_get(path); ++ gr_set_chroot_entries(current, path); + write_unlock(&fs->lock); + if (old_root.dentry) + path_put(&old_root); +@@ -56,6 +58,7 @@ void chroot_fs_refs(struct path *old_roo + && fs->root.mnt == old_root->mnt) { + path_get(new_root); + fs->root = *new_root; ++ gr_set_chroot_entries(p, new_root); + count++; } - write_unlock(&fs->lock); - } -+ gr_fs_write_unlock_irqrestore(p, flags); - task_unlock(p); - } while_each_thread(g, p); - read_unlock(&tasklist_lock); -@@ -83,14 +86,17 @@ void free_fs_struct(struct fs_struct *fs - void exit_fs(struct task_struct *tsk) - { - struct fs_struct *fs = tsk->fs; -+ unsigned long flags; - - if (fs) { - int kill; + if (fs->pwd.dentry == old_root->dentry +@@ -89,7 +92,8 @@ void exit_fs(struct task_struct *tsk) task_lock(tsk); -+ gr_fs_write_lock_irqsave(tsk, flags); write_lock(&fs->lock); tsk->fs = NULL; - kill = !--fs->users; ++ gr_clear_chroot_entries(tsk); + kill = !atomic_dec_return(&fs->users); write_unlock(&fs->lock); -+ gr_fs_write_unlock_irqrestore(tsk, flags); task_unlock(tsk); if (kill) - free_fs_struct(fs); -@@ -102,7 +108,7 @@ struct fs_struct *copy_fs_struct(struct +@@ -102,7 +106,7 @@ struct fs_struct *copy_fs_struct(struct struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL); /* We don't need to lock fs - think why ;-) */ 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 fs->in_exec = 0; rwlock_init(&fs->lock); fs->umask = old->umask; -@@ -121,15 +127,18 @@ int unshare_fs_struct(void) - struct fs_struct *fs = current->fs; - struct fs_struct *new_fs = copy_fs_struct(fs); - int kill; -+ unsigned long flags; - - if (!new_fs) - return -ENOMEM; +@@ -127,8 +131,9 @@ int unshare_fs_struct(void) task_lock(current); -+ gr_fs_write_lock_irqsave(current, flags); write_lock(&fs->lock); - kill = !--fs->users; + kill = !atomic_dec_return(&fs->users); current->fs = new_fs; ++ gr_set_chroot_entries(current, &new_fs->root); write_unlock(&fs->lock); -+ gr_fs_write_unlock_irqrestore(current, flags); task_unlock(current); - if (kill) -@@ -147,7 +156,7 @@ EXPORT_SYMBOL(current_umask); +@@ -147,7 +152,7 @@ EXPORT_SYMBOL(current_umask); /* to be mentioned only in INIT_TASK */ 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 .lock = __RW_LOCK_UNLOCKED(init_fs.lock), .umask = 0022, }; -@@ -155,6 +164,7 @@ struct fs_struct init_fs = { - void daemonize_fs_struct(void) - { - struct fs_struct *fs = current->fs; -+ unsigned long flags; - - if (fs) { - int kill; -@@ -162,13 +172,15 @@ void daemonize_fs_struct(void) +@@ -162,12 +167,13 @@ void daemonize_fs_struct(void) task_lock(current); 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 + atomic_inc(&init_fs.users); write_unlock(&init_fs.lock); -+ gr_fs_write_lock_irqsave(current, flags); write_lock(&fs->lock); current->fs = &init_fs; - kill = !--fs->users; ++ gr_set_chroot_entries(current, ¤t->fs->root); + kill = !atomic_dec_return(&fs->users); write_unlock(&fs->lock); -+ gr_fs_write_unlock_irqrestore(current, flags); task_unlock(current); - if (kill) -diff -urNp linux-2.6.32.15/fs/fuse/control.c linux-2.6.32.15/fs/fuse/control.c ---- linux-2.6.32.15/fs/fuse/control.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/fuse/control.c 2010-05-28 21:27:16.158915754 -0400 +diff -urNp linux-2.6.32.16/fs/fuse/control.c linux-2.6.32.16/fs/fuse/control.c +--- linux-2.6.32.16/fs/fuse/control.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/fuse/control.c 2010-07-09 14:50:38.000000000 -0400 @@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co 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 struct fuse_conn *fc; int err; -diff -urNp linux-2.6.32.15/fs/fuse/cuse.c linux-2.6.32.15/fs/fuse/cuse.c ---- linux-2.6.32.15/fs/fuse/cuse.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/fuse/cuse.c 2010-05-28 21:27:16.158915754 -0400 +diff -urNp linux-2.6.32.16/fs/fuse/cuse.c linux-2.6.32.16/fs/fuse/cuse.c +--- linux-2.6.32.16/fs/fuse/cuse.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/fuse/cuse.c 2010-07-09 14:50:38.000000000 -0400 @@ -528,8 +528,18 @@ static int cuse_channel_release(struct i return rc; } @@ -31307,9 +31523,9 @@ diff -urNp linux-2.6.32.15/fs/fuse/cuse.c linux-2.6.32.15/fs/fuse/cuse.c cuse_class = class_create(THIS_MODULE, "cuse"); if (IS_ERR(cuse_class)) return PTR_ERR(cuse_class); -diff -urNp linux-2.6.32.15/fs/fuse/dev.c linux-2.6.32.15/fs/fuse/dev.c ---- linux-2.6.32.15/fs/fuse/dev.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/fuse/dev.c 2010-05-28 21:27:16.158915754 -0400 +diff -urNp linux-2.6.32.16/fs/fuse/dev.c linux-2.6.32.16/fs/fuse/dev.c +--- linux-2.6.32.16/fs/fuse/dev.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/fuse/dev.c 2010-07-09 14:50:38.000000000 -0400 @@ -745,7 +745,7 @@ __releases(&fc->lock) * request_end(). Otherwise add it to the processing list, and set * 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 const struct file_operations fuse_dev_operations = { .owner = THIS_MODULE, -diff -urNp linux-2.6.32.15/fs/fuse/dir.c linux-2.6.32.15/fs/fuse/dir.c ---- linux-2.6.32.15/fs/fuse/dir.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/fuse/dir.c 2010-05-28 21:27:16.167243337 -0400 +diff -urNp linux-2.6.32.16/fs/fuse/dir.c linux-2.6.32.16/fs/fuse/dir.c +--- linux-2.6.32.16/fs/fuse/dir.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/fuse/dir.c 2010-07-09 14:50:38.000000000 -0400 @@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de return link; } @@ -31427,9 +31643,9 @@ diff -urNp linux-2.6.32.15/fs/fuse/dir.c linux-2.6.32.15/fs/fuse/dir.c { if (!IS_ERR(link)) free_page((unsigned long) link); -diff -urNp linux-2.6.32.15/fs/fuse/fuse_i.h linux-2.6.32.15/fs/fuse/fuse_i.h ---- linux-2.6.32.15/fs/fuse/fuse_i.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/fuse/fuse_i.h 2010-05-28 21:27:16.167243337 -0400 +diff -urNp linux-2.6.32.16/fs/fuse/fuse_i.h linux-2.6.32.16/fs/fuse/fuse_i.h +--- linux-2.6.32.16/fs/fuse/fuse_i.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/fuse/fuse_i.h 2010-07-09 14:50:38.000000000 -0400 @@ -521,6 +521,16 @@ extern const struct file_operations fuse 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 /** * Inode to nodeid comparison. */ -diff -urNp linux-2.6.32.15/fs/gfs2/sys.c linux-2.6.32.15/fs/gfs2/sys.c ---- linux-2.6.32.15/fs/gfs2/sys.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/gfs2/sys.c 2010-05-28 21:27:16.167243337 -0400 +diff -urNp linux-2.6.32.16/fs/gfs2/sys.c linux-2.6.32.16/fs/gfs2/sys.c +--- linux-2.6.32.16/fs/gfs2/sys.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/gfs2/sys.c 2010-07-09 14:50:38.000000000 -0400 @@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko return a->store ? a->store(sdp, buf, len) : len; } @@ -31468,9 +31684,9 @@ diff -urNp linux-2.6.32.15/fs/gfs2/sys.c linux-2.6.32.15/fs/gfs2/sys.c .uevent = gfs2_uevent, }; -diff -urNp linux-2.6.32.15/fs/hfs/inode.c linux-2.6.32.15/fs/hfs/inode.c ---- linux-2.6.32.15/fs/hfs/inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/hfs/inode.c 2010-05-28 21:27:16.171892577 -0400 +diff -urNp linux-2.6.32.16/fs/hfs/inode.c linux-2.6.32.16/fs/hfs/inode.c +--- linux-2.6.32.16/fs/hfs/inode.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/hfs/inode.c 2010-07-09 14:50:38.000000000 -0400 @@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode, 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 hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, sizeof(struct hfs_cat_file)); if (rec.type != HFS_CDR_FIL || -diff -urNp linux-2.6.32.15/fs/hfsplus/inode.c linux-2.6.32.15/fs/hfsplus/inode.c ---- linux-2.6.32.15/fs/hfsplus/inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/hfsplus/inode.c 2010-05-28 21:27:16.171892577 -0400 +diff -urNp linux-2.6.32.16/fs/hfsplus/inode.c linux-2.6.32.16/fs/hfsplus/inode.c +--- linux-2.6.32.16/fs/hfsplus/inode.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/hfsplus/inode.c 2010-07-09 14:50:38.000000000 -0400 @@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode struct hfsplus_cat_folder *folder = &entry.folder; @@ -31528,9 +31744,9 @@ diff -urNp linux-2.6.32.15/fs/hfsplus/inode.c linux-2.6.32.15/fs/hfsplus/inode.c hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, sizeof(struct hfsplus_cat_file)); hfsplus_inode_write_fork(inode, &file->data_fork); -diff -urNp linux-2.6.32.15/fs/hugetlbfs/inode.c linux-2.6.32.15/fs/hugetlbfs/inode.c ---- linux-2.6.32.15/fs/hugetlbfs/inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/hugetlbfs/inode.c 2010-05-28 21:27:16.171892577 -0400 +diff -urNp linux-2.6.32.16/fs/hugetlbfs/inode.c linux-2.6.32.16/fs/hugetlbfs/inode.c +--- linux-2.6.32.16/fs/hugetlbfs/inode.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/hugetlbfs/inode.c 2010-07-09 14:50:38.000000000 -0400 @@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs .kill_sb = kill_litter_super, }; @@ -31540,9 +31756,9 @@ diff -urNp linux-2.6.32.15/fs/hugetlbfs/inode.c linux-2.6.32.15/fs/hugetlbfs/ino static int can_do_hugetlb_shm(void) { -diff -urNp linux-2.6.32.15/fs/ioctl.c linux-2.6.32.15/fs/ioctl.c ---- linux-2.6.32.15/fs/ioctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/ioctl.c 2010-05-28 21:27:16.175116356 -0400 +diff -urNp linux-2.6.32.16/fs/ioctl.c linux-2.6.32.16/fs/ioctl.c +--- linux-2.6.32.16/fs/ioctl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/ioctl.c 2010-07-09 14:50:38.000000000 -0400 @@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema u64 phys, u64 len, u32 flags) { @@ -31570,9 +31786,9 @@ diff -urNp linux-2.6.32.15/fs/ioctl.c linux-2.6.32.15/fs/ioctl.c error = -EFAULT; return error; -diff -urNp linux-2.6.32.15/fs/jffs2/debug.h linux-2.6.32.15/fs/jffs2/debug.h ---- linux-2.6.32.15/fs/jffs2/debug.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/jffs2/debug.h 2010-05-28 21:27:16.175116356 -0400 +diff -urNp linux-2.6.32.16/fs/jffs2/debug.h linux-2.6.32.16/fs/jffs2/debug.h +--- linux-2.6.32.16/fs/jffs2/debug.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/jffs2/debug.h 2010-07-09 14:50:38.000000000 -0400 @@ -52,13 +52,13 @@ #if CONFIG_JFFS2_FS_DEBUG > 0 #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 #endif /* "Sanity" checks */ -diff -urNp linux-2.6.32.15/fs/jffs2/erase.c linux-2.6.32.15/fs/jffs2/erase.c ---- linux-2.6.32.15/fs/jffs2/erase.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/jffs2/erase.c 2010-05-28 21:27:16.175116356 -0400 +diff -urNp linux-2.6.32.16/fs/jffs2/erase.c linux-2.6.32.16/fs/jffs2/erase.c +--- linux-2.6.32.16/fs/jffs2/erase.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/jffs2/erase.c 2010-07-09 14:50:38.000000000 -0400 @@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru struct jffs2_unknown_node marker = { .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 }; jffs2_prealloc_raw_node_refs(c, jeb, 1); -diff -urNp linux-2.6.32.15/fs/jffs2/summary.h linux-2.6.32.15/fs/jffs2/summary.h ---- linux-2.6.32.15/fs/jffs2/summary.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/jffs2/summary.h 2010-05-28 21:27:16.175116356 -0400 +diff -urNp linux-2.6.32.16/fs/jffs2/summary.h linux-2.6.32.16/fs/jffs2/summary.h +--- linux-2.6.32.16/fs/jffs2/summary.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/jffs2/summary.h 2010-07-09 14:50:38.000000000 -0400 @@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ #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 #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) #endif /* CONFIG_JFFS2_SUMMARY */ -diff -urNp linux-2.6.32.15/fs/jffs2/wbuf.c linux-2.6.32.15/fs/jffs2/wbuf.c ---- linux-2.6.32.15/fs/jffs2/wbuf.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/jffs2/wbuf.c 2010-05-28 21:27:16.175116356 -0400 +diff -urNp linux-2.6.32.16/fs/jffs2/wbuf.c linux-2.6.32.16/fs/jffs2/wbuf.c +--- linux-2.6.32.16/fs/jffs2/wbuf.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/jffs2/wbuf.c 2010-07-09 14:50:38.000000000 -0400 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o { .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 }; /* -diff -urNp linux-2.6.32.15/fs/lockd/svc.c linux-2.6.32.15/fs/lockd/svc.c ---- linux-2.6.32.15/fs/lockd/svc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/lockd/svc.c 2010-05-28 21:27:16.175116356 -0400 +diff -urNp linux-2.6.32.16/fs/lockd/svc.c linux-2.6.32.16/fs/lockd/svc.c +--- linux-2.6.32.16/fs/lockd/svc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/lockd/svc.c 2010-07-09 14:50:38.000000000 -0400 @@ -43,7 +43,7 @@ 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 EXPORT_SYMBOL_GPL(nlmsvc_ops); static DEFINE_MUTEX(nlmsvc_mutex); -diff -urNp linux-2.6.32.15/fs/locks.c linux-2.6.32.15/fs/locks.c ---- linux-2.6.32.15/fs/locks.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/locks.c 2010-05-28 21:27:16.191151426 -0400 +diff -urNp linux-2.6.32.16/fs/locks.c linux-2.6.32.16/fs/locks.c +--- linux-2.6.32.16/fs/locks.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/locks.c 2010-07-09 14:50:38.000000000 -0400 @@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil return; @@ -31767,9 +31983,9 @@ diff -urNp linux-2.6.32.15/fs/locks.c linux-2.6.32.15/fs/locks.c } lock_kernel(); -diff -urNp linux-2.6.32.15/fs/namei.c linux-2.6.32.15/fs/namei.c ---- linux-2.6.32.15/fs/namei.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/namei.c 2010-05-28 21:27:16.199231859 -0400 +diff -urNp linux-2.6.32.16/fs/namei.c linux-2.6.32.16/fs/namei.c +--- linux-2.6.32.16/fs/namei.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/namei.c 2010-07-09 14:50:38.000000000 -0400 @@ -638,7 +638,7 @@ static __always_inline int __do_follow_l cookie = dentry->d_inode->i_op->follow_link(dentry, nd); 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 exit6: mnt_drop_write(oldnd.path.mnt); exit5: -diff -urNp linux-2.6.32.15/fs/namespace.c linux-2.6.32.15/fs/namespace.c ---- linux-2.6.32.15/fs/namespace.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/namespace.c 2010-05-28 21:27:16.199231859 -0400 +diff -urNp linux-2.6.32.16/fs/namespace.c linux-2.6.32.16/fs/namespace.c +--- linux-2.6.32.16/fs/namespace.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/namespace.c 2010-07-09 14:50:38.000000000 -0400 @@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn if (!(sb->s_flags & MS_RDONLY)) 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 return retval; } -@@ -1955,6 +1961,16 @@ long do_mount(char *dev_name, char *dir_ +@@ -1962,6 +1968,16 @@ long do_mount(char *dev_name, char *dir_ if (retval) goto dput_out; @@ -32136,7 +32352,7 @@ diff -urNp linux-2.6.32.15/fs/namespace.c linux-2.6.32.15/fs/namespace.c if (flags & MS_REMOUNT) retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags, data_page); -@@ -1969,6 +1985,9 @@ long do_mount(char *dev_name, char *dir_ +@@ -1976,6 +1992,9 @@ long do_mount(char *dev_name, char *dir_ dev_name, data_page); dput_out: 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 return retval; } -@@ -2175,6 +2194,12 @@ SYSCALL_DEFINE2(pivot_root, const char _ +@@ -2182,6 +2201,12 @@ SYSCALL_DEFINE2(pivot_root, const char _ goto out1; } @@ -32159,9 +32375,9 @@ diff -urNp linux-2.6.32.15/fs/namespace.c linux-2.6.32.15/fs/namespace.c read_lock(¤t->fs->lock); root = current->fs->root; path_get(¤t->fs->root); -diff -urNp linux-2.6.32.15/fs/nfs/inode.c linux-2.6.32.15/fs/nfs/inode.c ---- linux-2.6.32.15/fs/nfs/inode.c 2010-04-04 20:41:50.045778117 -0400 -+++ linux-2.6.32.15/fs/nfs/inode.c 2010-05-28 21:27:16.199231859 -0400 +diff -urNp linux-2.6.32.16/fs/nfs/inode.c linux-2.6.32.16/fs/nfs/inode.c +--- linux-2.6.32.16/fs/nfs/inode.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/nfs/inode.c 2010-07-09 14:50:38.000000000 -0400 @@ -965,16 +965,16 @@ static int nfs_size_need_update(const st return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); } @@ -32182,9 +32398,9 @@ diff -urNp linux-2.6.32.15/fs/nfs/inode.c linux-2.6.32.15/fs/nfs/inode.c } void nfs_fattr_init(struct nfs_fattr *fattr) -diff -urNp linux-2.6.32.15/fs/nfs/nfs4proc.c linux-2.6.32.15/fs/nfs/nfs4proc.c ---- linux-2.6.32.15/fs/nfs/nfs4proc.c 2010-04-29 17:49:38.445067399 -0400 -+++ linux-2.6.32.15/fs/nfs/nfs4proc.c 2010-05-28 21:27:16.210892100 -0400 +diff -urNp linux-2.6.32.16/fs/nfs/nfs4proc.c linux-2.6.32.16/fs/nfs/nfs4proc.c +--- linux-2.6.32.16/fs/nfs/nfs4proc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/nfs/nfs4proc.c 2010-07-09 14:50:38.000000000 -0400 @@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state) { @@ -32455,9 +32671,9 @@ diff -urNp linux-2.6.32.15/fs/nfs/nfs4proc.c linux-2.6.32.15/fs/nfs/nfs4proc.c int err; err = nfs4_set_lock_state(state, fl); -diff -urNp linux-2.6.32.15/fs/nfsd/lockd.c linux-2.6.32.15/fs/nfsd/lockd.c ---- linux-2.6.32.15/fs/nfsd/lockd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/nfsd/lockd.c 2010-05-28 21:27:16.210892100 -0400 +diff -urNp linux-2.6.32.16/fs/nfsd/lockd.c linux-2.6.32.16/fs/nfsd/lockd.c +--- linux-2.6.32.16/fs/nfsd/lockd.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/nfsd/lockd.c 2010-07-09 14:50:38.000000000 -0400 @@ -67,7 +67,7 @@ nlm_fclose(struct file *filp) fput(filp); } @@ -32467,9 +32683,9 @@ diff -urNp linux-2.6.32.15/fs/nfsd/lockd.c linux-2.6.32.15/fs/nfsd/lockd.c .fopen = nlm_fopen, /* open file for locking */ .fclose = nlm_fclose, /* close file */ }; -diff -urNp linux-2.6.32.15/fs/nfsd/vfs.c linux-2.6.32.15/fs/nfsd/vfs.c ---- linux-2.6.32.15/fs/nfsd/vfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/nfsd/vfs.c 2010-05-28 21:27:16.218925750 -0400 +diff -urNp linux-2.6.32.16/fs/nfsd/vfs.c linux-2.6.32.16/fs/nfsd/vfs.c +--- linux-2.6.32.16/fs/nfsd/vfs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/nfsd/vfs.c 2010-07-09 14:50:38.000000000 -0400 @@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st } else { 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 set_fs(oldfs); if (host_err < 0) -diff -urNp linux-2.6.32.15/fs/nls/nls_base.c linux-2.6.32.15/fs/nls/nls_base.c ---- linux-2.6.32.15/fs/nls/nls_base.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/nls/nls_base.c 2010-05-28 21:27:16.218925750 -0400 +diff -urNp linux-2.6.32.16/fs/nls/nls_base.c linux-2.6.32.16/fs/nls/nls_base.c +--- linux-2.6.32.16/fs/nls/nls_base.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/nls/nls_base.c 2010-07-09 14:50:38.000000000 -0400 @@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */}, {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 }; #define UNICODE_MAX 0x0010ffff -diff -urNp linux-2.6.32.15/fs/ntfs/file.c linux-2.6.32.15/fs/ntfs/file.c ---- linux-2.6.32.15/fs/ntfs/file.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/ntfs/file.c 2010-05-28 21:27:16.227248042 -0400 +diff -urNp linux-2.6.32.16/fs/ntfs/file.c linux-2.6.32.16/fs/ntfs/file.c +--- linux-2.6.32.16/fs/ntfs/file.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/ntfs/file.c 2010-07-09 14:50:38.000000000 -0400 @@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_ #endif /* NTFS_RW */ }; @@ -32521,9 +32737,9 @@ diff -urNp linux-2.6.32.15/fs/ntfs/file.c linux-2.6.32.15/fs/ntfs/file.c -const struct inode_operations ntfs_empty_inode_ops = {}; +const struct inode_operations ntfs_empty_inode_ops __read_only; -diff -urNp linux-2.6.32.15/fs/ocfs2/cluster/masklog.c linux-2.6.32.15/fs/ocfs2/cluster/masklog.c ---- linux-2.6.32.15/fs/ocfs2/cluster/masklog.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/ocfs2/cluster/masklog.c 2010-05-28 21:27:16.227248042 -0400 +diff -urNp linux-2.6.32.16/fs/ocfs2/cluster/masklog.c linux-2.6.32.16/fs/ocfs2/cluster/masklog.c +--- linux-2.6.32.16/fs/ocfs2/cluster/masklog.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/ocfs2/cluster/masklog.c 2010-07-09 14:50:38.000000000 -0400 @@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject return mlog_mask_store(mlog_attr->mask, buf, count); } @@ -32533,9 +32749,9 @@ diff -urNp linux-2.6.32.15/fs/ocfs2/cluster/masklog.c linux-2.6.32.15/fs/ocfs2/c .show = mlog_show, .store = mlog_store, }; -diff -urNp linux-2.6.32.15/fs/ocfs2/localalloc.c linux-2.6.32.15/fs/ocfs2/localalloc.c ---- linux-2.6.32.15/fs/ocfs2/localalloc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/ocfs2/localalloc.c 2010-05-28 21:27:16.227248042 -0400 +diff -urNp linux-2.6.32.16/fs/ocfs2/localalloc.c linux-2.6.32.16/fs/ocfs2/localalloc.c +--- linux-2.6.32.16/fs/ocfs2/localalloc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/ocfs2/localalloc.c 2010-07-09 14:50:38.000000000 -0400 @@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo goto bail; } @@ -32545,9 +32761,9 @@ diff -urNp linux-2.6.32.15/fs/ocfs2/localalloc.c linux-2.6.32.15/fs/ocfs2/locala status = 0; bail: -diff -urNp linux-2.6.32.15/fs/ocfs2/ocfs2.h linux-2.6.32.15/fs/ocfs2/ocfs2.h ---- linux-2.6.32.15/fs/ocfs2/ocfs2.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/ocfs2/ocfs2.h 2010-05-28 21:27:16.227248042 -0400 +diff -urNp linux-2.6.32.16/fs/ocfs2/ocfs2.h linux-2.6.32.16/fs/ocfs2/ocfs2.h +--- linux-2.6.32.16/fs/ocfs2/ocfs2.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/ocfs2/ocfs2.h 2010-07-09 14:50:38.000000000 -0400 @@ -217,11 +217,11 @@ enum ocfs2_vol_state 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 }; enum ocfs2_local_alloc_state -diff -urNp linux-2.6.32.15/fs/ocfs2/suballoc.c linux-2.6.32.15/fs/ocfs2/suballoc.c ---- linux-2.6.32.15/fs/ocfs2/suballoc.c 2010-04-29 17:49:38.449086403 -0400 -+++ linux-2.6.32.15/fs/ocfs2/suballoc.c 2010-05-28 21:27:16.227248042 -0400 +diff -urNp linux-2.6.32.16/fs/ocfs2/suballoc.c linux-2.6.32.16/fs/ocfs2/suballoc.c +--- linux-2.6.32.16/fs/ocfs2/suballoc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/ocfs2/suballoc.c 2010-07-09 14:50:38.000000000 -0400 @@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s mlog_errno(status); 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 } } if (status < 0) { -diff -urNp linux-2.6.32.15/fs/ocfs2/super.c linux-2.6.32.15/fs/ocfs2/super.c ---- linux-2.6.32.15/fs/ocfs2/super.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/ocfs2/super.c 2010-05-28 21:27:16.247317121 -0400 +diff -urNp linux-2.6.32.16/fs/ocfs2/super.c linux-2.6.32.16/fs/ocfs2/super.c +--- linux-2.6.32.16/fs/ocfs2/super.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/ocfs2/super.c 2010-07-09 14:50:38.000000000 -0400 @@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s "%10s => GlobalAllocs: %d LocalAllocs: %d " "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 /* Copy the blockcheck stats from the superblock probe */ osb->osb_ecc_stats = *stats; -diff -urNp linux-2.6.32.15/fs/open.c linux-2.6.32.15/fs/open.c ---- linux-2.6.32.15/fs/open.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/open.c 2010-05-28 21:27:16.247317121 -0400 +diff -urNp linux-2.6.32.16/fs/open.c linux-2.6.32.16/fs/open.c +--- linux-2.6.32.16/fs/open.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/open.c 2010-07-09 14:50:38.000000000 -0400 @@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l if (length < 0) return -EINVAL; @@ -32826,9 +33042,9 @@ diff -urNp linux-2.6.32.15/fs/open.c linux-2.6.32.15/fs/open.c mnt_drop_write(file->f_path.mnt); out_fput: fput(file); -diff -urNp linux-2.6.32.15/fs/pipe.c linux-2.6.32.15/fs/pipe.c ---- linux-2.6.32.15/fs/pipe.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/pipe.c 2010-05-28 21:27:16.247317121 -0400 +diff -urNp linux-2.6.32.16/fs/pipe.c linux-2.6.32.16/fs/pipe.c +--- linux-2.6.32.16/fs/pipe.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/pipe.c 2010-07-09 14:50:38.000000000 -0400 @@ -401,9 +401,9 @@ redo: } 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 inode->i_fop = &rdwr_pipefifo_fops; /* -diff -urNp linux-2.6.32.15/fs/proc/array.c linux-2.6.32.15/fs/proc/array.c ---- linux-2.6.32.15/fs/proc/array.c 2010-05-28 20:16:44.454934408 -0400 -+++ linux-2.6.32.15/fs/proc/array.c 2010-05-28 22:32:01.011402212 -0400 +diff -urNp linux-2.6.32.16/fs/proc/array.c linux-2.6.32.16/fs/proc/array.c +--- linux-2.6.32.16/fs/proc/array.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/proc/array.c 2010-07-09 14:50:38.000000000 -0400 @@ -321,6 +321,21 @@ static inline void task_context_switch_c p->nivcsw); } @@ -33045,9 +33261,9 @@ diff -urNp linux-2.6.32.15/fs/proc/array.c linux-2.6.32.15/fs/proc/array.c + return sprintf(buffer, "%pI4\n", &task->signal->curr_ip); +} +#endif -diff -urNp linux-2.6.32.15/fs/proc/base.c linux-2.6.32.15/fs/proc/base.c ---- linux-2.6.32.15/fs/proc/base.c 2010-05-15 13:20:19.242597763 -0400 -+++ linux-2.6.32.15/fs/proc/base.c 2010-05-28 21:27:16.250934990 -0400 +diff -urNp linux-2.6.32.16/fs/proc/base.c linux-2.6.32.16/fs/proc/base.c +--- linux-2.6.32.16/fs/proc/base.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/proc/base.c 2010-07-10 14:56:09.000000000 -0400 @@ -102,6 +102,22 @@ struct pid_entry { union proc_op op; }; @@ -33289,17 +33505,7 @@ diff -urNp linux-2.6.32.15/fs/proc/base.c linux-2.6.32.15/fs/proc/base.c if (!IS_ERR(s)) __putname(s); } -@@ -2433,6 +2527,9 @@ static struct dentry *proc_base_lookup(s - if (p > last) - goto out; - -+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task)) -+ goto out; -+ - error = proc_base_instantiate(dir, dentry, task, p); - - out: -@@ -2519,7 +2616,7 @@ static const struct pid_entry tgid_base_ +@@ -2519,7 +2613,7 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_SCHED_DEBUG REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), #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 INF("syscall", S_IRUSR, proc_pid_syscall), #endif INF("cmdline", S_IRUGO, proc_pid_cmdline), -@@ -2547,7 +2644,7 @@ static const struct pid_entry tgid_base_ +@@ -2547,7 +2641,7 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_KALLSYMS INF("wchan", S_IRUGO, proc_pid_wchan), #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 ONE("stack", S_IRUSR, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -@@ -2577,6 +2674,9 @@ static const struct pid_entry tgid_base_ +@@ -2577,6 +2671,9 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_TASK_IO_ACCOUNTING INF("io", S_IRUGO, proc_tgid_io_accounting), #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 }; static int proc_tgid_base_readdir(struct file * filp, -@@ -2701,7 +2801,14 @@ static struct dentry *proc_pid_instantia +@@ -2701,7 +2798,14 @@ static struct dentry *proc_pid_instantia if (!inode) goto out; @@ -33342,11 +33548,11 @@ diff -urNp linux-2.6.32.15/fs/proc/base.c linux-2.6.32.15/fs/proc/base.c inode->i_op = &proc_tgid_base_inode_operations; inode->i_fop = &proc_tgid_base_operations; inode->i_flags|=S_IMMUTABLE; -@@ -2743,7 +2850,11 @@ struct dentry *proc_pid_lookup(struct in +@@ -2743,7 +2847,11 @@ struct dentry *proc_pid_lookup(struct in if (!task) goto out; -+ if (gr_check_hidden_task(task)) ++ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task)) + goto out_put_task; + 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 put_task_struct(task); out: return result; -@@ -2808,6 +2919,11 @@ int proc_pid_readdir(struct file * filp, +@@ -2808,6 +2916,11 @@ int proc_pid_readdir(struct file * filp, { unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY; 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 struct tgid_iter iter; struct pid_namespace *ns; -@@ -2826,8 +2942,27 @@ int proc_pid_readdir(struct file * filp, +@@ -2826,8 +2939,27 @@ int proc_pid_readdir(struct file * filp, for (iter = next_tgid(ns, iter); iter.task; 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 put_task_struct(iter.task); goto out; } -@@ -2853,7 +2988,7 @@ static const struct pid_entry tid_base_s +@@ -2853,7 +2985,7 @@ static const struct pid_entry tid_base_s #ifdef CONFIG_SCHED_DEBUG REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), #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 INF("syscall", S_IRUSR, proc_pid_syscall), #endif INF("cmdline", S_IRUGO, proc_pid_cmdline), -@@ -2880,7 +3015,7 @@ static const struct pid_entry tid_base_s +@@ -2880,7 +3012,7 @@ static const struct pid_entry tid_base_s #ifdef CONFIG_KALLSYMS INF("wchan", S_IRUGO, proc_pid_wchan), #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 ONE("stack", S_IRUSR, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -diff -urNp linux-2.6.32.15/fs/proc/cmdline.c linux-2.6.32.15/fs/proc/cmdline.c ---- linux-2.6.32.15/fs/proc/cmdline.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/proc/cmdline.c 2010-05-28 21:27:16.250934990 -0400 +diff -urNp linux-2.6.32.16/fs/proc/cmdline.c linux-2.6.32.16/fs/proc/cmdline.c +--- linux-2.6.32.16/fs/proc/cmdline.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/proc/cmdline.c 2010-07-09 14:50:38.000000000 -0400 @@ -23,7 +23,11 @@ static const struct file_operations cmdl 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 return 0; } module_init(proc_cmdline_init); -diff -urNp linux-2.6.32.15/fs/proc/devices.c linux-2.6.32.15/fs/proc/devices.c ---- linux-2.6.32.15/fs/proc/devices.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/proc/devices.c 2010-05-28 21:27:16.250934990 -0400 +diff -urNp linux-2.6.32.16/fs/proc/devices.c linux-2.6.32.16/fs/proc/devices.c +--- linux-2.6.32.16/fs/proc/devices.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/proc/devices.c 2010-07-09 14:50:38.000000000 -0400 @@ -64,7 +64,11 @@ static const struct file_operations proc 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 return 0; } module_init(proc_devices_init); -diff -urNp linux-2.6.32.15/fs/proc/inode.c linux-2.6.32.15/fs/proc/inode.c ---- linux-2.6.32.15/fs/proc/inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/proc/inode.c 2010-05-28 21:27:16.250934990 -0400 +diff -urNp linux-2.6.32.16/fs/proc/inode.c linux-2.6.32.16/fs/proc/inode.c +--- linux-2.6.32.16/fs/proc/inode.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/proc/inode.c 2010-07-09 14:50:38.000000000 -0400 @@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe if (de->mode) { 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 } if (de->size) inode->i_size = de->size; -diff -urNp linux-2.6.32.15/fs/proc/internal.h linux-2.6.32.15/fs/proc/internal.h ---- linux-2.6.32.15/fs/proc/internal.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/proc/internal.h 2010-05-28 21:27:16.250934990 -0400 +diff -urNp linux-2.6.32.16/fs/proc/internal.h linux-2.6.32.16/fs/proc/internal.h +--- linux-2.6.32.16/fs/proc/internal.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/proc/internal.h 2010-07-09 14:50:38.000000000 -0400 @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi struct pid *pid, struct task_struct *task); 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 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); extern const struct file_operations proc_maps_operations; -diff -urNp linux-2.6.32.15/fs/proc/Kconfig linux-2.6.32.15/fs/proc/Kconfig ---- linux-2.6.32.15/fs/proc/Kconfig 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/proc/Kconfig 2010-05-28 21:27:16.250934990 -0400 +diff -urNp linux-2.6.32.16/fs/proc/Kconfig linux-2.6.32.16/fs/proc/Kconfig +--- linux-2.6.32.16/fs/proc/Kconfig 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/proc/Kconfig 2010-07-09 14:50:38.000000000 -0400 @@ -30,12 +30,12 @@ config PROC_FS 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 bool "Enable /proc page monitoring" if EMBEDDED help Various /proc files exist to monitor process memory utilization: -diff -urNp linux-2.6.32.15/fs/proc/kcore.c linux-2.6.32.15/fs/proc/kcore.c ---- linux-2.6.32.15/fs/proc/kcore.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/proc/kcore.c 2010-05-28 21:27:16.250934990 -0400 +diff -urNp linux-2.6.32.16/fs/proc/kcore.c linux-2.6.32.16/fs/proc/kcore.c +--- linux-2.6.32.16/fs/proc/kcore.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/proc/kcore.c 2010-07-09 14:50:38.000000000 -0400 @@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use 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 if (!capable(CAP_SYS_RAWIO)) return -EPERM; if (kcore_need_update) -diff -urNp linux-2.6.32.15/fs/proc/meminfo.c linux-2.6.32.15/fs/proc/meminfo.c ---- linux-2.6.32.15/fs/proc/meminfo.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/proc/meminfo.c 2010-05-28 21:27:16.250934990 -0400 +diff -urNp linux-2.6.32.16/fs/proc/meminfo.c linux-2.6.32.16/fs/proc/meminfo.c +--- linux-2.6.32.16/fs/proc/meminfo.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/proc/meminfo.c 2010-07-09 14:50:38.000000000 -0400 @@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_ vmi.used >> 10, 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 #endif ); -diff -urNp linux-2.6.32.15/fs/proc/nommu.c linux-2.6.32.15/fs/proc/nommu.c ---- linux-2.6.32.15/fs/proc/nommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/proc/nommu.c 2010-05-28 21:27:16.250934990 -0400 +diff -urNp linux-2.6.32.16/fs/proc/nommu.c linux-2.6.32.16/fs/proc/nommu.c +--- linux-2.6.32.16/fs/proc/nommu.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/proc/nommu.c 2010-07-09 14:50:38.000000000 -0400 @@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ if (len < 1) 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 } seq_putc(m, '\n'); -diff -urNp linux-2.6.32.15/fs/proc/proc_net.c linux-2.6.32.15/fs/proc/proc_net.c ---- linux-2.6.32.15/fs/proc/proc_net.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/proc/proc_net.c 2010-05-28 21:27:16.250934990 -0400 +diff -urNp linux-2.6.32.16/fs/proc/proc_net.c linux-2.6.32.16/fs/proc/proc_net.c +--- linux-2.6.32.16/fs/proc/proc_net.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/proc/proc_net.c 2010-07-09 14:50:38.000000000 -0400 @@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str struct task_struct *task; 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 rcu_read_lock(); task = pid_task(proc_pid(dir), PIDTYPE_PID); -diff -urNp linux-2.6.32.15/fs/proc/proc_sysctl.c linux-2.6.32.15/fs/proc/proc_sysctl.c ---- linux-2.6.32.15/fs/proc/proc_sysctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/proc/proc_sysctl.c 2010-05-28 21:27:16.250934990 -0400 +diff -urNp linux-2.6.32.16/fs/proc/proc_sysctl.c linux-2.6.32.16/fs/proc/proc_sysctl.c +--- linux-2.6.32.16/fs/proc/proc_sysctl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/proc/proc_sysctl.c 2010-07-09 14:50:38.000000000 -0400 @@ -7,6 +7,8 @@ #include <linux/security.h> #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 generic_fillattr(inode, stat); if (table) stat->mode = (stat->mode & S_IFMT) | table->mode; -diff -urNp linux-2.6.32.15/fs/proc/root.c linux-2.6.32.15/fs/proc/root.c ---- linux-2.6.32.15/fs/proc/root.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/proc/root.c 2010-05-28 21:27:16.250934990 -0400 +diff -urNp linux-2.6.32.16/fs/proc/root.c linux-2.6.32.16/fs/proc/root.c +--- linux-2.6.32.16/fs/proc/root.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/proc/root.c 2010-07-09 14:50:38.000000000 -0400 @@ -134,7 +134,15 @@ void __init proc_root_init(void) #ifdef CONFIG_PROC_DEVICETREE 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 proc_sys_init(); } -diff -urNp linux-2.6.32.15/fs/proc/task_mmu.c linux-2.6.32.15/fs/proc/task_mmu.c ---- linux-2.6.32.15/fs/proc/task_mmu.c 2010-05-28 20:16:44.454934408 -0400 -+++ linux-2.6.32.15/fs/proc/task_mmu.c 2010-05-28 21:27:16.250934990 -0400 +diff -urNp linux-2.6.32.16/fs/proc/task_mmu.c linux-2.6.32.16/fs/proc/task_mmu.c +--- linux-2.6.32.16/fs/proc/task_mmu.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/proc/task_mmu.c 2010-07-09 14:50:38.000000000 -0400 @@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct "VmStk:\t%8lu kB\n" "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 mss.resident >> 10, (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), mss.shared_clean >> 10, -diff -urNp linux-2.6.32.15/fs/proc/task_nommu.c linux-2.6.32.15/fs/proc/task_nommu.c ---- linux-2.6.32.15/fs/proc/task_nommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/proc/task_nommu.c 2010-05-28 21:27:16.250934990 -0400 +diff -urNp linux-2.6.32.16/fs/proc/task_nommu.c linux-2.6.32.16/fs/proc/task_nommu.c +--- linux-2.6.32.16/fs/proc/task_nommu.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/proc/task_nommu.c 2010-07-09 14:50:38.000000000 -0400 @@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct else 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 } seq_putc(m, '\n'); -diff -urNp linux-2.6.32.15/fs/readdir.c linux-2.6.32.15/fs/readdir.c ---- linux-2.6.32.15/fs/readdir.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/readdir.c 2010-05-28 21:27:16.250934990 -0400 +diff -urNp linux-2.6.32.16/fs/readdir.c linux-2.6.32.16/fs/readdir.c +--- linux-2.6.32.16/fs/readdir.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/readdir.c 2010-07-09 14:50:38.000000000 -0400 @@ -16,6 +16,7 @@ #include <linux/security.h> #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 buf.count = count; buf.error = 0; -diff -urNp linux-2.6.32.15/fs/reiserfs/do_balan.c linux-2.6.32.15/fs/reiserfs/do_balan.c ---- linux-2.6.32.15/fs/reiserfs/do_balan.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/reiserfs/do_balan.c 2010-05-28 21:27:16.255227340 -0400 +diff -urNp linux-2.6.32.16/fs/reiserfs/do_balan.c linux-2.6.32.16/fs/reiserfs/do_balan.c +--- linux-2.6.32.16/fs/reiserfs/do_balan.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/reiserfs/do_balan.c 2010-07-09 14:50:38.000000000 -0400 @@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, return; } @@ -33868,9 +34074,9 @@ diff -urNp linux-2.6.32.15/fs/reiserfs/do_balan.c linux-2.6.32.15/fs/reiserfs/do do_balance_starts(tb); /* balance leaf returns 0 except if combining L R and S into -diff -urNp linux-2.6.32.15/fs/reiserfs/item_ops.c linux-2.6.32.15/fs/reiserfs/item_ops.c ---- linux-2.6.32.15/fs/reiserfs/item_ops.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/reiserfs/item_ops.c 2010-05-28 21:27:16.255227340 -0400 +diff -urNp linux-2.6.32.16/fs/reiserfs/item_ops.c linux-2.6.32.16/fs/reiserfs/item_ops.c +--- linux-2.6.32.16/fs/reiserfs/item_ops.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/reiserfs/item_ops.c 2010-07-09 14:50:38.000000000 -0400 @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i vi->vi_index, vi->vi_type, vi->vi_ih); } @@ -33925,9 +34131,9 @@ diff -urNp linux-2.6.32.15/fs/reiserfs/item_ops.c linux-2.6.32.15/fs/reiserfs/it &stat_data_ops, &indirect_ops, &direct_ops, -diff -urNp linux-2.6.32.15/fs/reiserfs/procfs.c linux-2.6.32.15/fs/reiserfs/procfs.c ---- linux-2.6.32.15/fs/reiserfs/procfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/reiserfs/procfs.c 2010-05-28 21:27:16.255227340 -0400 +diff -urNp linux-2.6.32.16/fs/reiserfs/procfs.c linux-2.6.32.16/fs/reiserfs/procfs.c +--- linux-2.6.32.16/fs/reiserfs/procfs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/reiserfs/procfs.c 2010-07-09 14:50:38.000000000 -0400 @@ -123,7 +123,7 @@ static int show_super(struct seq_file *m "SMALL_TAILS " : "NO_TAILS ", 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 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes), SF(s_do_balance), SF(s_unneeded_left_neighbor), SF(s_good_search_by_key_reada), SF(s_bmaps), -diff -urNp linux-2.6.32.15/fs/select.c linux-2.6.32.15/fs/select.c ---- linux-2.6.32.15/fs/select.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/select.c 2010-05-28 21:27:16.263231213 -0400 +diff -urNp linux-2.6.32.16/fs/select.c linux-2.6.32.16/fs/select.c +--- linux-2.6.32.16/fs/select.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/select.c 2010-07-09 14:50:38.000000000 -0400 @@ -20,6 +20,7 @@ #include <linux/module.h> #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 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) return -EINVAL; -diff -urNp linux-2.6.32.15/fs/seq_file.c linux-2.6.32.15/fs/seq_file.c ---- linux-2.6.32.15/fs/seq_file.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/seq_file.c 2010-05-28 21:27:16.267126788 -0400 +diff -urNp linux-2.6.32.16/fs/seq_file.c linux-2.6.32.16/fs/seq_file.c +--- linux-2.6.32.16/fs/seq_file.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/seq_file.c 2010-07-09 14:50:38.000000000 -0400 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, return 0; } @@ -33999,9 +34205,9 @@ diff -urNp linux-2.6.32.15/fs/seq_file.c linux-2.6.32.15/fs/seq_file.c if (!m->buf) goto Enomem; m->count = 0; -diff -urNp linux-2.6.32.15/fs/smbfs/symlink.c linux-2.6.32.15/fs/smbfs/symlink.c ---- linux-2.6.32.15/fs/smbfs/symlink.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/smbfs/symlink.c 2010-05-28 21:27:16.267126788 -0400 +diff -urNp linux-2.6.32.16/fs/smbfs/symlink.c linux-2.6.32.16/fs/smbfs/symlink.c +--- linux-2.6.32.16/fs/smbfs/symlink.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/smbfs/symlink.c 2010-07-09 14:50:38.000000000 -0400 @@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent 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 if (!IS_ERR(s)) __putname(s); } -diff -urNp linux-2.6.32.15/fs/splice.c linux-2.6.32.15/fs/splice.c ---- linux-2.6.32.15/fs/splice.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/splice.c 2010-05-28 21:27:16.267126788 -0400 +diff -urNp linux-2.6.32.16/fs/splice.c linux-2.6.32.16/fs/splice.c +--- linux-2.6.32.16/fs/splice.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/splice.c 2010-07-09 14:50:38.000000000 -0400 @@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode pipe_lock(pipe); @@ -34152,9 +34358,9 @@ diff -urNp linux-2.6.32.15/fs/splice.c linux-2.6.32.15/fs/splice.c ret = -EAGAIN; pipe_unlock(ipipe); -diff -urNp linux-2.6.32.15/fs/sysfs/file.c linux-2.6.32.15/fs/sysfs/file.c ---- linux-2.6.32.15/fs/sysfs/file.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/sysfs/file.c 2010-05-28 21:27:16.267126788 -0400 +diff -urNp linux-2.6.32.16/fs/sysfs/file.c linux-2.6.32.16/fs/sysfs/file.c +--- linux-2.6.32.16/fs/sysfs/file.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/sysfs/file.c 2010-07-09 14:50:38.000000000 -0400 @@ -53,7 +53,7 @@ struct sysfs_buffer { size_t count; 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 int error = -EACCES; char *p; -diff -urNp linux-2.6.32.15/fs/sysfs/symlink.c linux-2.6.32.15/fs/sysfs/symlink.c ---- linux-2.6.32.15/fs/sysfs/symlink.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/sysfs/symlink.c 2010-05-28 21:27:16.267126788 -0400 +diff -urNp linux-2.6.32.16/fs/sysfs/symlink.c linux-2.6.32.16/fs/sysfs/symlink.c +--- linux-2.6.32.16/fs/sysfs/symlink.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/sysfs/symlink.c 2010-07-09 14:50:38.000000000 -0400 @@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de 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 if (!IS_ERR(page)) free_page((unsigned long)page); } -diff -urNp linux-2.6.32.15/fs/udf/balloc.c linux-2.6.32.15/fs/udf/balloc.c ---- linux-2.6.32.15/fs/udf/balloc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/udf/balloc.c 2010-05-28 21:27:16.267126788 -0400 +diff -urNp linux-2.6.32.16/fs/udf/balloc.c linux-2.6.32.16/fs/udf/balloc.c +--- linux-2.6.32.16/fs/udf/balloc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/udf/balloc.c 2010-07-09 14:50:38.000000000 -0400 @@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc 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 udf_debug("%d < %d || %d + %d > %d\n", bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count, partmap->s_partition_len); -diff -urNp linux-2.6.32.15/fs/udf/misc.c linux-2.6.32.15/fs/udf/misc.c ---- linux-2.6.32.15/fs/udf/misc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/udf/misc.c 2010-05-28 21:27:16.271177364 -0400 +diff -urNp linux-2.6.32.16/fs/udf/misc.c linux-2.6.32.16/fs/udf/misc.c +--- linux-2.6.32.16/fs/udf/misc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/udf/misc.c 2010-07-09 14:50:38.000000000 -0400 @@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat iinfo->i_lenEAttr += size; 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 return NULL; } -diff -urNp linux-2.6.32.15/fs/udf/udfdecl.h linux-2.6.32.15/fs/udf/udfdecl.h ---- linux-2.6.32.15/fs/udf/udfdecl.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/udf/udfdecl.h 2010-05-28 21:27:16.271177364 -0400 +diff -urNp linux-2.6.32.16/fs/udf/udfdecl.h linux-2.6.32.16/fs/udf/udfdecl.h +--- linux-2.6.32.16/fs/udf/udfdecl.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/udf/udfdecl.h 2010-07-09 14:50:38.000000000 -0400 @@ -26,7 +26,7 @@ do { \ printk(f, ##a); \ } 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 #endif #define udf_info(f, a...) \ -diff -urNp linux-2.6.32.15/fs/utimes.c linux-2.6.32.15/fs/utimes.c ---- linux-2.6.32.15/fs/utimes.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/utimes.c 2010-05-28 21:27:16.271177364 -0400 +diff -urNp linux-2.6.32.16/fs/utimes.c linux-2.6.32.16/fs/utimes.c +--- linux-2.6.32.16/fs/utimes.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/utimes.c 2010-07-09 14:50:38.000000000 -0400 @@ -1,6 +1,7 @@ #include <linux/compiler.h> #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 mutex_lock(&inode->i_mutex); error = notify_change(path->dentry, &newattrs); mutex_unlock(&inode->i_mutex); -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 ---- linux-2.6.32.15/fs/xfs/linux-2.6/xfs_ioctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/xfs/linux-2.6/xfs_ioctl.c 2010-05-28 21:27:16.275231809 -0400 +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 +--- linux-2.6.32.16/fs/xfs/linux-2.6/xfs_ioctl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/xfs/linux-2.6/xfs_ioctl.c 2010-07-09 14:50:38.000000000 -0400 @@ -134,7 +134,7 @@ xfs_find_handle( } @@ -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 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32))) goto out_put; -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 ---- linux-2.6.32.15/fs/xfs/linux-2.6/xfs_iops.c 2010-04-29 17:49:38.453075413 -0400 -+++ linux-2.6.32.15/fs/xfs/linux-2.6/xfs_iops.c 2010-05-28 21:27:16.279036027 -0400 +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 +--- linux-2.6.32.16/fs/xfs/linux-2.6/xfs_iops.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/xfs/linux-2.6/xfs_iops.c 2010-07-09 14:50:38.000000000 -0400 @@ -468,7 +468,7 @@ xfs_vn_put_link( struct nameidata *nd, 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 if (!IS_ERR(s)) kfree(s); -diff -urNp linux-2.6.32.15/fs/xfs/xfs_bmap.c linux-2.6.32.15/fs/xfs/xfs_bmap.c ---- linux-2.6.32.15/fs/xfs/xfs_bmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/fs/xfs/xfs_bmap.c 2010-05-28 21:27:16.327077893 -0400 +diff -urNp linux-2.6.32.16/fs/xfs/xfs_bmap.c linux-2.6.32.16/fs/xfs/xfs_bmap.c +--- linux-2.6.32.16/fs/xfs/xfs_bmap.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/fs/xfs/xfs_bmap.c 2010-07-09 14:50:38.000000000 -0400 @@ -360,7 +360,7 @@ xfs_bmap_validate_ret( int nmap, 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 #endif /* DEBUG */ #if defined(XFS_RW_TRACE) -diff -urNp linux-2.6.32.15/grsecurity/gracl_alloc.c linux-2.6.32.15/grsecurity/gracl_alloc.c ---- linux-2.6.32.15/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/gracl_alloc.c 2010-05-28 21:27:16.327077893 -0400 +diff -urNp linux-2.6.32.16/grsecurity/gracl_alloc.c linux-2.6.32.16/grsecurity/gracl_alloc.c +--- linux-2.6.32.16/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/gracl_alloc.c 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,105 @@ +#include <linux/kernel.h> +#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 + else + return 1; +} -diff -urNp linux-2.6.32.15/grsecurity/gracl.c linux-2.6.32.15/grsecurity/gracl.c ---- linux-2.6.32.15/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/gracl.c 2010-06-26 14:00:02.982610280 -0400 -@@ -0,0 +1,3899 @@ +diff -urNp linux-2.6.32.16/grsecurity/gracl.c linux-2.6.32.16/grsecurity/gracl.c +--- linux-2.6.32.16/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/gracl.c 2010-07-10 08:10:31.000000000 -0400 +@@ -0,0 +1,3919 @@ +#include <linux/kernel.h> +#include <linux/module.h> +#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 + return 0; +} + ++int ++gr_check_protected_task_fowner(struct pid *pid, enum pid_type type) ++{ ++ struct task_struct *p; ++ int ret = 0; ++ ++ if (unlikely(!(gr_status & GR_READY) || !pid)) ++ return ret; ++ ++ read_lock(&tasklist_lock); ++ do_each_pid_task(pid, type, p) { ++ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) && ++ p->acl != current->acl) { ++ ret = 1; ++ goto out; ++ } ++ } while_each_pid_task(pid, type, p); ++out: ++ read_unlock(&tasklist_lock); ++ ++ return ret; ++} ++ +void +gr_copy_label(struct task_struct *tsk) +{ @@ -38218,7 +38447,6 @@ diff -urNp linux-2.6.32.15/grsecurity/gracl.c linux-2.6.32.15/grsecurity/gracl.c + read_lock(&tasklist_lock); + task = find_task_by_vpid(pid); + if (task) { -+ gr_fs_read_lock(task); +#ifdef CONFIG_GRKERNSEC_CHROOT + if (proc_is_chrooted(task)) + ret = -EACCES; @@ -38237,8 +38465,6 @@ diff -urNp linux-2.6.32.15/grsecurity/gracl.c linux-2.6.32.15/grsecurity/gracl.c + if (!(task->acl->mode & GR_VIEW)) + ret = -EACCES; + } -+ -+ gr_fs_read_unlock(task); + } else + ret = -ENOENT; + @@ -38326,9 +38552,9 @@ diff -urNp linux-2.6.32.15/grsecurity/gracl.c linux-2.6.32.15/grsecurity/gracl.c +EXPORT_SYMBOL(gr_check_group_change); +#endif + -diff -urNp linux-2.6.32.15/grsecurity/gracl_cap.c linux-2.6.32.15/grsecurity/gracl_cap.c ---- linux-2.6.32.15/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/gracl_cap.c 2010-06-19 21:06:17.097881201 -0400 +diff -urNp linux-2.6.32.16/grsecurity/gracl_cap.c linux-2.6.32.16/grsecurity/gracl_cap.c +--- linux-2.6.32.16/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/gracl_cap.c 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,138 @@ +#include <linux/kernel.h> +#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 + return 0; +} + -diff -urNp linux-2.6.32.15/grsecurity/gracl_fs.c linux-2.6.32.15/grsecurity/gracl_fs.c ---- linux-2.6.32.15/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/gracl_fs.c 2010-05-28 21:27:16.327077893 -0400 +diff -urNp linux-2.6.32.16/grsecurity/gracl_fs.c linux-2.6.32.16/grsecurity/gracl_fs.c +--- linux-2.6.32.16/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/gracl_fs.c 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,424 @@ +#include <linux/kernel.h> +#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 + + return 0; +} -diff -urNp linux-2.6.32.15/grsecurity/gracl_ip.c linux-2.6.32.15/grsecurity/gracl_ip.c ---- linux-2.6.32.15/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/gracl_ip.c 2010-05-28 21:27:16.327077893 -0400 +diff -urNp linux-2.6.32.16/grsecurity/gracl_ip.c linux-2.6.32.16/grsecurity/gracl_ip.c +--- linux-2.6.32.16/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/gracl_ip.c 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,339 @@ +#include <linux/kernel.h> +#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 + + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); +} -diff -urNp linux-2.6.32.15/grsecurity/gracl_learn.c linux-2.6.32.15/grsecurity/gracl_learn.c ---- linux-2.6.32.15/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/gracl_learn.c 2010-05-28 21:27:16.327077893 -0400 +diff -urNp linux-2.6.32.16/grsecurity/gracl_learn.c linux-2.6.32.16/grsecurity/gracl_learn.c +--- linux-2.6.32.16/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/gracl_learn.c 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,211 @@ +#include <linux/kernel.h> +#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 + .release = close_learn, + .poll = poll_learn, +}; -diff -urNp linux-2.6.32.15/grsecurity/gracl_res.c linux-2.6.32.15/grsecurity/gracl_res.c ---- linux-2.6.32.15/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/gracl_res.c 2010-05-28 21:27:16.331240103 -0400 -@@ -0,0 +1,65 @@ +diff -urNp linux-2.6.32.16/grsecurity/gracl_res.c linux-2.6.32.16/grsecurity/gracl_res.c +--- linux-2.6.32.16/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/gracl_res.c 2010-07-09 14:50:38.000000000 -0400 +@@ -0,0 +1,67 @@ +#include <linux/kernel.h> +#include <linux/sched.h> +#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 + const int res, const unsigned long wanted, const int gt) +{ + const struct cred *cred; ++ unsigned long rlim; + + if (!gr_acl_is_enabled() && !grsec_resource_logging) + return; + + // not yet supported resource -+ if (!restab_log[res]) ++ if (unlikely(!restab_log[res])) ++ return; ++ ++ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME) ++ rlim = task->signal->rlim[res].rlim_max; ++ else ++ rlim = task->signal->rlim[res].rlim_cur; ++ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim))) + return; + + 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 + goto out_rcu_unlock; + rcu_read_unlock(); + -+ preempt_disable(); -+ -+ if (unlikely(((gt && wanted > task->signal->rlim[res].rlim_cur) || -+ (!gt && wanted >= task->signal->rlim[res].rlim_cur)) && -+ task->signal->rlim[res].rlim_cur != RLIM_INFINITY)) -+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], task->signal->rlim[res].rlim_cur); -+ preempt_enable_no_resched(); ++ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim); + + return; +out_rcu_unlock: + rcu_read_unlock(); + return; +} -diff -urNp linux-2.6.32.15/grsecurity/gracl_segv.c linux-2.6.32.15/grsecurity/gracl_segv.c ---- linux-2.6.32.15/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/gracl_segv.c 2010-05-28 21:27:16.331240103 -0400 +diff -urNp linux-2.6.32.16/grsecurity/gracl_segv.c linux-2.6.32.16/grsecurity/gracl_segv.c +--- linux-2.6.32.16/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/gracl_segv.c 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,310 @@ +#include <linux/kernel.h> +#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 + + return; +} -diff -urNp linux-2.6.32.15/grsecurity/gracl_shm.c linux-2.6.32.15/grsecurity/gracl_shm.c ---- linux-2.6.32.15/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/gracl_shm.c 2010-06-26 14:01:55.746591444 -0400 +diff -urNp linux-2.6.32.16/grsecurity/gracl_shm.c linux-2.6.32.16/grsecurity/gracl_shm.c +--- linux-2.6.32.16/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/gracl_shm.c 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,40 @@ +#include <linux/kernel.h> +#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 + + return 1; +} -diff -urNp linux-2.6.32.15/grsecurity/grsec_chdir.c linux-2.6.32.15/grsecurity/grsec_chdir.c ---- linux-2.6.32.15/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/grsec_chdir.c 2010-05-28 21:27:16.331240103 -0400 +diff -urNp linux-2.6.32.16/grsecurity/grsec_chdir.c linux-2.6.32.16/grsecurity/grsec_chdir.c +--- linux-2.6.32.16/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/grsec_chdir.c 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,19 @@ +#include <linux/kernel.h> +#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 +#endif + return; +} -diff -urNp linux-2.6.32.15/grsecurity/grsec_chroot.c linux-2.6.32.15/grsecurity/grsec_chroot.c ---- linux-2.6.32.15/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/grsec_chroot.c 2010-06-26 14:05:26.054819575 -0400 -@@ -0,0 +1,355 @@ +diff -urNp linux-2.6.32.16/grsecurity/grsec_chroot.c linux-2.6.32.16/grsecurity/grsec_chroot.c +--- linux-2.6.32.16/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/grsec_chroot.c 2010-07-10 08:10:14.000000000 -0400 +@@ -0,0 +1,389 @@ +#include <linux/kernel.h> +#include <linux/module.h> +#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/ +#include <linux/grsecurity.h> +#include <linux/grinternal.h> + ++void gr_set_chroot_entries(struct task_struct *task, struct path *path) ++{ ++#ifdef CONFIG_GRKERNSEC ++ if (task->pid > 1 && path->dentry != init_task.fs->root.dentry && ++ path->dentry != task->nsproxy->mnt_ns->root->mnt_root) ++ task->gr_is_chrooted = 1; ++ else ++ task->gr_is_chrooted = 0; ++ ++ task->gr_chroot_dentry = path->dentry; ++#endif ++ return; ++} ++ ++void gr_clear_chroot_entries(struct task_struct *task) ++{ ++#ifdef CONFIG_GRKERNSEC ++ task->gr_is_chrooted = 0; ++ task->gr_chroot_dentry = NULL; ++#endif ++ return; ++} ++ +int +gr_handle_chroot_unix(const pid_t pid) +{ @@ -39938,15 +40189,12 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_chroot.c linux-2.6.32.15/grsecurity/ + if (spid) { + struct task_struct *p; + p = pid_task(spid, PIDTYPE_PID); -+ gr_fs_read_lock(p); + if (unlikely(!have_same_root(current, p))) { -+ gr_fs_read_unlock(p); + read_unlock(&tasklist_lock); + rcu_read_unlock(); + gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG); + return 0; + } -+ gr_fs_read_unlock(p); + } + read_unlock(&tasklist_lock); + rcu_read_unlock(); @@ -39991,19 +40239,39 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_chroot.c linux-2.6.32.15/grsecurity/ +} + +int ++gr_handle_chroot_fowner(struct pid *pid, enum pid_type type) ++{ ++#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK ++ struct task_struct *p; ++ int ret = 0; ++ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid) ++ return ret; ++ ++ read_lock(&tasklist_lock); ++ do_each_pid_task(pid, type, p) { ++ if (!have_same_root(current, p)) { ++ ret = 1; ++ goto out; ++ } ++ } while_each_pid_task(pid, type, p); ++out: ++ read_unlock(&tasklist_lock); ++ return ret; ++#endif ++ return 0; ++} ++ ++int +gr_pid_is_chrooted(struct task_struct *p) +{ +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK + if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL) + return 0; + -+ gr_fs_read_lock(p); + if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) || + !have_same_root(current, p)) { -+ gr_fs_read_unlock(p); + return 1; + } -+ gr_fs_read_unlock(p); +#endif + return 0; +} @@ -40099,31 +40367,25 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_chroot.c linux-2.6.32.15/grsecurity/ + if (pid) { + struct task_struct *p; + p = pid_task(pid, PIDTYPE_PID); -+ gr_fs_read_lock(p); + starttime = p->start_time.tv_sec; + if (unlikely(!have_same_root(current, p) && + time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime))) { -+ gr_fs_read_unlock(p); + read_unlock(&tasklist_lock); + rcu_read_unlock(); + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG); + return 0; + } -+ gr_fs_read_unlock(p); + } else { + pid = find_vpid(shm_lapid); + if (pid) { + struct task_struct *p; + p = pid_task(pid, PIDTYPE_PID); -+ gr_fs_read_lock(p); + if (unlikely(!have_same_root(current, p))) { -+ gr_fs_read_unlock(p); + read_unlock(&tasklist_lock); + rcu_read_unlock(); + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG); + return 0; + } -+ gr_fs_read_unlock(p); + } + } + @@ -40263,10 +40525,10 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_chroot.c linux-2.6.32.15/grsecurity/ +#ifdef CONFIG_SECURITY +EXPORT_SYMBOL(gr_handle_chroot_caps); +#endif -diff -urNp linux-2.6.32.15/grsecurity/grsec_disabled.c linux-2.6.32.15/grsecurity/grsec_disabled.c ---- linux-2.6.32.15/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/grsec_disabled.c 2010-05-28 21:27:16.331240103 -0400 -@@ -0,0 +1,426 @@ +diff -urNp linux-2.6.32.16/grsecurity/grsec_disabled.c linux-2.6.32.16/grsecurity/grsec_disabled.c +--- linux-2.6.32.16/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/grsec_disabled.c 2010-07-10 07:45:05.000000000 -0400 +@@ -0,0 +1,431 @@ +#include <linux/kernel.h> +#include <linux/module.h> +#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 + return 0; +} + ++int ++gr_check_protected_task_fowner(struct pid *pid, enum pid_type type) ++{ ++ return 0; ++} ++ +void +gr_copy_label(struct task_struct *tsk) +{ @@ -40684,7 +40952,6 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_disabled.c linux-2.6.32.15/grsecurit + return 0; +} + -+ +EXPORT_SYMBOL(gr_is_capable); +EXPORT_SYMBOL(gr_is_capable_nolog); +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 +EXPORT_SYMBOL(gr_check_user_change); +EXPORT_SYMBOL(gr_check_group_change); +#endif -diff -urNp linux-2.6.32.15/grsecurity/grsec_exec.c linux-2.6.32.15/grsecurity/grsec_exec.c ---- linux-2.6.32.15/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/grsec_exec.c 2010-05-28 21:27:16.331240103 -0400 +diff -urNp linux-2.6.32.16/grsecurity/grsec_exec.c linux-2.6.32.16/grsecurity/grsec_exec.c +--- linux-2.6.32.16/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/grsec_exec.c 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,89 @@ +#include <linux/kernel.h> +#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 +#endif + return; +} -diff -urNp linux-2.6.32.15/grsecurity/grsec_fifo.c linux-2.6.32.15/grsecurity/grsec_fifo.c ---- linux-2.6.32.15/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/grsec_fifo.c 2010-05-28 21:27:16.331240103 -0400 +diff -urNp linux-2.6.32.16/grsecurity/grsec_fifo.c linux-2.6.32.16/grsecurity/grsec_fifo.c +--- linux-2.6.32.16/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/grsec_fifo.c 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,24 @@ +#include <linux/kernel.h> +#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 +#endif + return 0; +} -diff -urNp linux-2.6.32.15/grsecurity/grsec_fork.c linux-2.6.32.15/grsecurity/grsec_fork.c ---- linux-2.6.32.15/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/grsec_fork.c 2010-05-28 21:27:16.331240103 -0400 +diff -urNp linux-2.6.32.16/grsecurity/grsec_fork.c linux-2.6.32.16/grsecurity/grsec_fork.c +--- linux-2.6.32.16/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/grsec_fork.c 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,15 @@ +#include <linux/kernel.h> +#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 +#endif + return; +} -diff -urNp linux-2.6.32.15/grsecurity/grsec_init.c linux-2.6.32.15/grsecurity/grsec_init.c ---- linux-2.6.32.15/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/grsec_init.c 2010-06-27 12:52:54.615758098 -0400 +diff -urNp linux-2.6.32.16/grsecurity/grsec_init.c linux-2.6.32.16/grsecurity/grsec_init.c +--- linux-2.6.32.16/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/grsec_init.c 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,258 @@ +#include <linux/kernel.h> +#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 + + return; +} -diff -urNp linux-2.6.32.15/grsecurity/grsec_link.c linux-2.6.32.15/grsecurity/grsec_link.c ---- linux-2.6.32.15/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/grsec_link.c 2010-05-28 21:27:16.331240103 -0400 +diff -urNp linux-2.6.32.16/grsecurity/grsec_link.c linux-2.6.32.16/grsecurity/grsec_link.c +--- linux-2.6.32.16/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/grsec_link.c 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,43 @@ +#include <linux/kernel.h> +#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 +#endif + return 0; +} -diff -urNp linux-2.6.32.15/grsecurity/grsec_log.c linux-2.6.32.15/grsecurity/grsec_log.c ---- linux-2.6.32.15/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/grsec_log.c 2010-05-28 21:27:16.331240103 -0400 -@@ -0,0 +1,296 @@ +diff -urNp linux-2.6.32.16/grsecurity/grsec_log.c linux-2.6.32.16/grsecurity/grsec_log.c +--- linux-2.6.32.16/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/grsec_log.c 2010-07-09 14:50:38.000000000 -0400 +@@ -0,0 +1,306 @@ +#include <linux/kernel.h> +#include <linux/sched.h> +#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 +#include <linux/fs.h> +#include <linux/grinternal.h> + ++#ifdef CONFIG_TREE_PREEMPT_RCU ++#define DISABLE_PREEMPT() preempt_disable() ++#define ENABLE_PREEMPT() preempt_enable() ++#else ++#define DISABLE_PREEMPT() ++#define ENABLE_PREEMPT() ++#endif ++ +#define BEGIN_LOCKS(x) \ ++ DISABLE_PREEMPT(); \ + rcu_read_lock(); \ + read_lock(&tasklist_lock); \ + 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 + read_unlock(&grsec_exec_file_lock); \ + read_unlock(&tasklist_lock); \ + rcu_read_unlock(); \ ++ ENABLE_PREEMPT(); \ + if (x == GR_DONT_AUDIT) \ + gr_handle_alertkill(current) + @@ -41442,9 +41719,9 @@ diff -urNp linux-2.6.32.15/grsecurity/grsec_log.c linux-2.6.32.15/grsecurity/grs + gr_log_end(audit); + END_LOCKS(audit); +} -diff -urNp linux-2.6.32.15/grsecurity/grsec_mem.c linux-2.6.32.15/grsecurity/grsec_mem.c ---- linux-2.6.32.15/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/grsec_mem.c 2010-05-28 21:27:16.331240103 -0400 +diff -urNp linux-2.6.32.16/grsecurity/grsec_mem.c linux-2.6.32.16/grsecurity/grsec_mem.c +--- linux-2.6.32.16/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/grsec_mem.c 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,85 @@ +#include <linux/kernel.h> +#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 + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); + return; +} -diff -urNp linux-2.6.32.15/grsecurity/grsec_mount.c linux-2.6.32.15/grsecurity/grsec_mount.c ---- linux-2.6.32.15/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/grsec_mount.c 2010-05-28 21:27:16.331240103 -0400 +diff -urNp linux-2.6.32.16/grsecurity/grsec_mount.c linux-2.6.32.16/grsecurity/grsec_mount.c +--- linux-2.6.32.16/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/grsec_mount.c 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,62 @@ +#include <linux/kernel.h> +#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 +#endif + return 0; +} -diff -urNp linux-2.6.32.15/grsecurity/grsec_ptrace.c linux-2.6.32.15/grsecurity/grsec_ptrace.c ---- linux-2.6.32.15/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/grsec_ptrace.c 2010-05-28 21:27:16.331240103 -0400 +diff -urNp linux-2.6.32.16/grsecurity/grsec_ptrace.c linux-2.6.32.16/grsecurity/grsec_ptrace.c +--- linux-2.6.32.16/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/grsec_ptrace.c 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,14 @@ +#include <linux/kernel.h> +#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/ +#endif + return; +} -diff -urNp linux-2.6.32.15/grsecurity/grsec_sig.c linux-2.6.32.15/grsecurity/grsec_sig.c ---- linux-2.6.32.15/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/grsec_sig.c 2010-05-28 21:27:16.331240103 -0400 +diff -urNp linux-2.6.32.16/grsecurity/grsec_sig.c linux-2.6.32.16/grsecurity/grsec_sig.c +--- linux-2.6.32.16/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/grsec_sig.c 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,65 @@ +#include <linux/kernel.h> +#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 + return; +} + -diff -urNp linux-2.6.32.15/grsecurity/grsec_sock.c linux-2.6.32.15/grsecurity/grsec_sock.c ---- linux-2.6.32.15/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/grsec_sock.c 2010-05-28 21:27:16.331240103 -0400 +diff -urNp linux-2.6.32.16/grsecurity/grsec_sock.c linux-2.6.32.16/grsecurity/grsec_sock.c +--- linux-2.6.32.16/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/grsec_sock.c 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,271 @@ +#include <linux/kernel.h> +#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 + return current_cap(); +#endif +} -diff -urNp linux-2.6.32.15/grsecurity/grsec_sysctl.c linux-2.6.32.15/grsecurity/grsec_sysctl.c ---- linux-2.6.32.15/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/grsec_sysctl.c 2010-06-19 21:32:37.093947224 -0400 +diff -urNp linux-2.6.32.16/grsecurity/grsec_sysctl.c linux-2.6.32.16/grsecurity/grsec_sysctl.c +--- linux-2.6.32.16/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/grsec_sysctl.c 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,459 @@ +#include <linux/kernel.h> +#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/ + { .ctl_name = 0 } +}; +#endif -diff -urNp linux-2.6.32.15/grsecurity/grsec_textrel.c linux-2.6.32.15/grsecurity/grsec_textrel.c ---- linux-2.6.32.15/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/grsec_textrel.c 2010-05-28 21:27:16.331240103 -0400 +diff -urNp linux-2.6.32.16/grsecurity/grsec_textrel.c linux-2.6.32.16/grsecurity/grsec_textrel.c +--- linux-2.6.32.16/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/grsec_textrel.c 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,16 @@ +#include <linux/kernel.h> +#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 +#endif + return; +} -diff -urNp linux-2.6.32.15/grsecurity/grsec_time.c linux-2.6.32.15/grsecurity/grsec_time.c ---- linux-2.6.32.15/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/grsec_time.c 2010-05-28 21:27:16.331240103 -0400 +diff -urNp linux-2.6.32.16/grsecurity/grsec_time.c linux-2.6.32.16/grsecurity/grsec_time.c +--- linux-2.6.32.16/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/grsec_time.c 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,13 @@ +#include <linux/kernel.h> +#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 +#endif + return; +} -diff -urNp linux-2.6.32.15/grsecurity/grsec_tpe.c linux-2.6.32.15/grsecurity/grsec_tpe.c ---- linux-2.6.32.15/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/grsec_tpe.c 2010-05-28 21:27:16.331240103 -0400 +diff -urNp linux-2.6.32.16/grsecurity/grsec_tpe.c linux-2.6.32.16/grsecurity/grsec_tpe.c +--- linux-2.6.32.16/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/grsec_tpe.c 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,38 @@ +#include <linux/kernel.h> +#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 +#endif + return 1; +} -diff -urNp linux-2.6.32.15/grsecurity/grsum.c linux-2.6.32.15/grsecurity/grsum.c ---- linux-2.6.32.15/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/grsum.c 2010-06-26 13:55:39.510774424 -0400 +diff -urNp linux-2.6.32.16/grsecurity/grsum.c linux-2.6.32.16/grsecurity/grsum.c +--- linux-2.6.32.16/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/grsum.c 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,61 @@ +#include <linux/err.h> +#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 + + return retval; +} -diff -urNp linux-2.6.32.15/grsecurity/Kconfig linux-2.6.32.15/grsecurity/Kconfig ---- linux-2.6.32.15/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/Kconfig 2010-06-26 14:17:55.584309817 -0400 +diff -urNp linux-2.6.32.16/grsecurity/Kconfig linux-2.6.32.16/grsecurity/Kconfig +--- linux-2.6.32.16/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/Kconfig 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,981 @@ +# +# grecurity configuration @@ -43385,14 +43662,14 @@ diff -urNp linux-2.6.32.15/grsecurity/Kconfig linux-2.6.32.15/grsecurity/Kconfig + help + If you say Y here, neither TCP resets nor ICMP + destination-unreachable packets will be sent in response to packets -+ send to ports for which no associated listening process exists. ++ sent to ports for which no associated listening process exists. + This feature supports both IPV4 and IPV6 and exempts the + loopback interface from blackholing. Enabling this feature + makes a host more resilient to DoS attacks and reduces network + visibility against scanners. + + The blackhole feature as-implemented is equivalent to the FreeBSD -+ blackhole feature, as prevents RST responses to all packets, not ++ blackhole feature, as it prevents RST responses to all packets, not + just SYNs. Under most application behavior this causes no + problems, but applications (like haproxy) may not close certain + 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 +endmenu + +endmenu -diff -urNp linux-2.6.32.15/grsecurity/Makefile linux-2.6.32.15/grsecurity/Makefile ---- linux-2.6.32.15/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/grsecurity/Makefile 2010-05-28 21:27:16.331240103 -0400 +diff -urNp linux-2.6.32.16/grsecurity/Makefile linux-2.6.32.16/grsecurity/Makefile +--- linux-2.6.32.16/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/grsecurity/Makefile 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,29 @@ +# grsecurity's ACL system was originally written in 2001 by Michael Dalton +# 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 + @-chmod -f 700 . + @echo ' grsec: protected kernel image paths' +endif -diff -urNp linux-2.6.32.15/include/acpi/acoutput.h linux-2.6.32.15/include/acpi/acoutput.h ---- linux-2.6.32.15/include/acpi/acoutput.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/acpi/acoutput.h 2010-05-28 21:27:16.336579957 -0400 +diff -urNp linux-2.6.32.16/include/acpi/acoutput.h linux-2.6.32.16/include/acpi/acoutput.h +--- linux-2.6.32.16/include/acpi/acoutput.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/acpi/acoutput.h 2010-07-09 14:50:38.000000000 -0400 @@ -264,8 +264,8 @@ * leaving no executable debug code! */ @@ -43598,9 +43875,9 @@ diff -urNp linux-2.6.32.15/include/acpi/acoutput.h linux-2.6.32.15/include/acpi/ #endif /* ACPI_DEBUG_OUTPUT */ -diff -urNp linux-2.6.32.15/include/acpi/acpi_drivers.h linux-2.6.32.15/include/acpi/acpi_drivers.h ---- linux-2.6.32.15/include/acpi/acpi_drivers.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/acpi/acpi_drivers.h 2010-05-28 21:27:16.336579957 -0400 +diff -urNp linux-2.6.32.16/include/acpi/acpi_drivers.h linux-2.6.32.16/include/acpi/acpi_drivers.h +--- linux-2.6.32.16/include/acpi/acpi_drivers.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/acpi/acpi_drivers.h 2010-07-09 14:50:38.000000000 -0400 @@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp Dock Station -------------------------------------------------------------------------- */ @@ -43630,9 +43907,9 @@ diff -urNp linux-2.6.32.15/include/acpi/acpi_drivers.h linux-2.6.32.15/include/a void *context) { return -ENODEV; -diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/include/asm-generic/atomic-long.h ---- linux-2.6.32.15/include/asm-generic/atomic-long.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/asm-generic/atomic-long.h 2010-05-28 21:27:16.339120729 -0400 +diff -urNp linux-2.6.32.16/include/asm-generic/atomic-long.h linux-2.6.32.16/include/asm-generic/atomic-long.h +--- linux-2.6.32.16/include/asm-generic/atomic-long.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/asm-generic/atomic-long.h 2010-07-09 14:50:38.000000000 -0400 @@ -22,6 +22,12 @@ 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 static inline void atomic_long_dec(atomic_long_t *l) { atomic64_t *v = (atomic64_t *)l; -@@ -59,6 +92,15 @@ static inline void atomic_long_add(long +@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomi + atomic64_dec(v); + } + ++#ifdef CONFIG_PAX_REFCOUNT ++static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l) ++{ ++ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l; ++ ++ atomic64_dec_unchecked(v); ++} ++#endif ++ + static inline void atomic_long_add(long i, atomic_long_t *l) + { + atomic64_t *v = (atomic64_t *)l; +@@ -59,6 +101,15 @@ static inline void atomic_long_add(long atomic64_add(i, v); } @@ -43710,7 +44003,7 @@ diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/inc static inline void atomic_long_sub(long i, atomic_long_t *l) { atomic64_t *v = (atomic64_t *)l; -@@ -115,6 +157,15 @@ static inline long atomic_long_inc_retur +@@ -115,6 +166,15 @@ static inline long atomic_long_inc_retur return (long)atomic64_inc_return(v); } @@ -43726,7 +44019,7 @@ diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/inc static inline long atomic_long_dec_return(atomic_long_t *l) { atomic64_t *v = (atomic64_t *)l; -@@ -140,6 +191,12 @@ static inline long atomic_long_add_unles +@@ -140,6 +200,12 @@ static inline long atomic_long_add_unles typedef atomic_t atomic_long_t; @@ -43739,7 +44032,7 @@ diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/inc #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i) static inline long atomic_long_read(atomic_long_t *l) { -@@ -148,6 +205,15 @@ static inline long atomic_long_read(atom +@@ -148,6 +214,15 @@ static inline long atomic_long_read(atom return (long)atomic_read(v); } @@ -43755,7 +44048,7 @@ diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/inc static inline void atomic_long_set(atomic_long_t *l, long i) { atomic_t *v = (atomic_t *)l; -@@ -155,6 +221,15 @@ static inline void atomic_long_set(atomi +@@ -155,6 +230,15 @@ static inline void atomic_long_set(atomi atomic_set(v, i); } @@ -43771,7 +44064,7 @@ diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/inc static inline void atomic_long_inc(atomic_long_t *l) { atomic_t *v = (atomic_t *)l; -@@ -162,6 +237,15 @@ static inline void atomic_long_inc(atomi +@@ -162,6 +246,15 @@ static inline void atomic_long_inc(atomi atomic_inc(v); } @@ -43787,7 +44080,23 @@ diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/inc static inline void atomic_long_dec(atomic_long_t *l) { atomic_t *v = (atomic_t *)l; -@@ -176,6 +260,15 @@ static inline void atomic_long_add(long +@@ -169,6 +262,15 @@ static inline void atomic_long_dec(atomi + atomic_dec(v); + } + ++#ifdef CONFIG_PAX_REFCOUNT ++static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l) ++{ ++ atomic_unchecked_t *v = (atomic_unchecked_t *)l; ++ ++ atomic_dec_unchecked(v); ++} ++#endif ++ + static inline void atomic_long_add(long i, atomic_long_t *l) + { + atomic_t *v = (atomic_t *)l; +@@ -176,6 +278,15 @@ static inline void atomic_long_add(long atomic_add(i, v); } @@ -43803,7 +44112,7 @@ diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/inc static inline void atomic_long_sub(long i, atomic_long_t *l) { atomic_t *v = (atomic_t *)l; -@@ -232,6 +325,15 @@ static inline long atomic_long_inc_retur +@@ -232,6 +343,15 @@ static inline long atomic_long_inc_retur return (long)atomic_inc_return(v); } @@ -43819,7 +44128,7 @@ diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/inc static inline long atomic_long_dec_return(atomic_long_t *l) { atomic_t *v = (atomic_t *)l; -@@ -255,4 +357,33 @@ static inline long atomic_long_add_unles +@@ -255,4 +375,35 @@ static inline long atomic_long_add_unles #endif /* BITS_PER_LONG == 64 */ @@ -43837,6 +44146,7 @@ diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/inc + atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL); + atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL); + atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL); ++ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL); +} +#else +#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 +#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v)) +#define atomic_long_inc_unchecked(v) atomic_long_inc(v) +#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v) ++#define atomic_long_dec_unchecked(v) atomic_long_dec(v) +#endif + #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ -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 ---- linux-2.6.32.15/include/asm-generic/dma-mapping-common.h 2010-05-28 20:16:44.458924952 -0400 -+++ linux-2.6.32.15/include/asm-generic/dma-mapping-common.h 2010-05-28 21:27:16.339120729 -0400 +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 +--- linux-2.6.32.16/include/asm-generic/dma-mapping-common.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/asm-generic/dma-mapping-common.h 2010-07-09 14:50:38.000000000 -0400 @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ enum dma_data_direction dir, 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 BUG_ON(!valid_dma_direction(dir)); if (ops->sync_sg_for_device) -diff -urNp linux-2.6.32.15/include/asm-generic/futex.h linux-2.6.32.15/include/asm-generic/futex.h ---- linux-2.6.32.15/include/asm-generic/futex.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/asm-generic/futex.h 2010-05-28 21:27:16.343246556 -0400 +diff -urNp linux-2.6.32.16/include/asm-generic/futex.h linux-2.6.32.16/include/asm-generic/futex.h +--- linux-2.6.32.16/include/asm-generic/futex.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/asm-generic/futex.h 2010-07-09 14:50:38.000000000 -0400 @@ -6,7 +6,7 @@ #include <asm/errno.h> @@ -43985,9 +44296,9 @@ diff -urNp linux-2.6.32.15/include/asm-generic/futex.h linux-2.6.32.15/include/a { return -ENOSYS; } -diff -urNp linux-2.6.32.15/include/asm-generic/int-l64.h linux-2.6.32.15/include/asm-generic/int-l64.h ---- linux-2.6.32.15/include/asm-generic/int-l64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/asm-generic/int-l64.h 2010-05-28 21:27:16.343246556 -0400 +diff -urNp linux-2.6.32.16/include/asm-generic/int-l64.h linux-2.6.32.16/include/asm-generic/int-l64.h +--- linux-2.6.32.16/include/asm-generic/int-l64.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/asm-generic/int-l64.h 2010-07-09 14:50:38.000000000 -0400 @@ -46,6 +46,8 @@ typedef unsigned int u32; typedef signed long s64; 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 #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.32.15/include/asm-generic/int-ll64.h linux-2.6.32.15/include/asm-generic/int-ll64.h ---- linux-2.6.32.15/include/asm-generic/int-ll64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/asm-generic/int-ll64.h 2010-05-28 21:27:16.343246556 -0400 +diff -urNp linux-2.6.32.16/include/asm-generic/int-ll64.h linux-2.6.32.16/include/asm-generic/int-ll64.h +--- linux-2.6.32.16/include/asm-generic/int-ll64.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/asm-generic/int-ll64.h 2010-07-09 14:50:38.000000000 -0400 @@ -51,6 +51,8 @@ typedef unsigned int u32; typedef signed long long s64; 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 #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.32.15/include/asm-generic/kmap_types.h linux-2.6.32.15/include/asm-generic/kmap_types.h ---- linux-2.6.32.15/include/asm-generic/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/asm-generic/kmap_types.h 2010-05-28 21:27:16.343246556 -0400 +diff -urNp linux-2.6.32.16/include/asm-generic/kmap_types.h linux-2.6.32.16/include/asm-generic/kmap_types.h +--- linux-2.6.32.16/include/asm-generic/kmap_types.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/asm-generic/kmap_types.h 2010-07-09 14:50:38.000000000 -0400 @@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY, KMAP_D(16) KM_IRQ_PTE, 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 }; #undef KMAP_D -diff -urNp linux-2.6.32.15/include/asm-generic/pgtable.h linux-2.6.32.15/include/asm-generic/pgtable.h ---- linux-2.6.32.15/include/asm-generic/pgtable.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/asm-generic/pgtable.h 2010-05-28 21:27:16.343246556 -0400 +diff -urNp linux-2.6.32.16/include/asm-generic/pgtable.h linux-2.6.32.16/include/asm-generic/pgtable.h +--- linux-2.6.32.16/include/asm-generic/pgtable.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/asm-generic/pgtable.h 2010-07-09 14:50:38.000000000 -0400 @@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar unsigned long size); #endif @@ -44040,9 +44351,9 @@ diff -urNp linux-2.6.32.15/include/asm-generic/pgtable.h linux-2.6.32.15/include #endif /* !__ASSEMBLY__ */ #endif /* _ASM_GENERIC_PGTABLE_H */ -diff -urNp linux-2.6.32.15/include/asm-generic/vmlinux.lds.h linux-2.6.32.15/include/asm-generic/vmlinux.lds.h ---- linux-2.6.32.15/include/asm-generic/vmlinux.lds.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/asm-generic/vmlinux.lds.h 2010-05-28 21:27:16.343246556 -0400 +diff -urNp linux-2.6.32.16/include/asm-generic/vmlinux.lds.h linux-2.6.32.16/include/asm-generic/vmlinux.lds.h +--- linux-2.6.32.16/include/asm-generic/vmlinux.lds.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/asm-generic/vmlinux.lds.h 2010-07-09 14:50:38.000000000 -0400 @@ -199,6 +199,7 @@ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ 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 /** * PERCPU - define output section for percpu area, simple version -diff -urNp linux-2.6.32.15/include/drm/drm_pciids.h linux-2.6.32.15/include/drm/drm_pciids.h ---- linux-2.6.32.15/include/drm/drm_pciids.h 2010-04-29 17:49:38.529851956 -0400 -+++ linux-2.6.32.15/include/drm/drm_pciids.h 2010-05-28 21:27:16.343246556 -0400 +diff -urNp linux-2.6.32.16/include/drm/drm_pciids.h linux-2.6.32.16/include/drm/drm_pciids.h +--- linux-2.6.32.16/include/drm/drm_pciids.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/drm/drm_pciids.h 2010-07-09 14:50:38.000000000 -0400 @@ -377,7 +377,7 @@ {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {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/ {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ - {0, 0, 0} + {0, 0, 0, 0, 0, 0} -diff -urNp linux-2.6.32.15/include/drm/drmP.h linux-2.6.32.15/include/drm/drmP.h ---- linux-2.6.32.15/include/drm/drmP.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/drm/drmP.h 2010-05-28 21:27:16.343246556 -0400 +diff -urNp linux-2.6.32.16/include/drm/drmP.h linux-2.6.32.16/include/drm/drmP.h +--- linux-2.6.32.16/include/drm/drmP.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/drm/drmP.h 2010-07-09 14:50:38.000000000 -0400 @@ -814,7 +814,7 @@ struct drm_driver { void (*vgaarb_irq)(struct drm_device *dev, bool state); @@ -44217,9 +44528,9 @@ diff -urNp linux-2.6.32.15/include/drm/drmP.h linux-2.6.32.15/include/drm/drmP.h /*@} */ struct list_head filelist; -diff -urNp linux-2.6.32.15/include/linux/a.out.h linux-2.6.32.15/include/linux/a.out.h ---- linux-2.6.32.15/include/linux/a.out.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/a.out.h 2010-05-28 21:27:16.343246556 -0400 +diff -urNp linux-2.6.32.16/include/linux/a.out.h linux-2.6.32.16/include/linux/a.out.h +--- linux-2.6.32.16/include/linux/a.out.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/a.out.h 2010-07-09 14:50:38.000000000 -0400 @@ -39,6 +39,14 @@ enum machine_type { M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ }; @@ -44235,9 +44546,9 @@ diff -urNp linux-2.6.32.15/include/linux/a.out.h linux-2.6.32.15/include/linux/a #if !defined (N_MAGIC) #define N_MAGIC(exec) ((exec).a_info & 0xffff) #endif -diff -urNp linux-2.6.32.15/include/linux/atmdev.h linux-2.6.32.15/include/linux/atmdev.h ---- linux-2.6.32.15/include/linux/atmdev.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/atmdev.h 2010-05-28 21:27:16.343246556 -0400 +diff -urNp linux-2.6.32.16/include/linux/atmdev.h linux-2.6.32.16/include/linux/atmdev.h +--- linux-2.6.32.16/include/linux/atmdev.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/atmdev.h 2010-07-09 14:50:38.000000000 -0400 @@ -237,7 +237,7 @@ struct compat_atm_iobuf { #endif @@ -44247,9 +44558,9 @@ diff -urNp linux-2.6.32.15/include/linux/atmdev.h linux-2.6.32.15/include/linux/ __AAL_STAT_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.32.15/include/linux/backlight.h linux-2.6.32.15/include/linux/backlight.h ---- linux-2.6.32.15/include/linux/backlight.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/backlight.h 2010-05-28 21:27:16.343246556 -0400 +diff -urNp linux-2.6.32.16/include/linux/backlight.h linux-2.6.32.16/include/linux/backlight.h +--- linux-2.6.32.16/include/linux/backlight.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/backlight.h 2010-07-09 14:50:38.000000000 -0400 @@ -36,18 +36,18 @@ struct backlight_device; struct fb_info; @@ -44291,9 +44602,9 @@ diff -urNp linux-2.6.32.15/include/linux/backlight.h linux-2.6.32.15/include/lin extern void backlight_device_unregister(struct backlight_device *bd); extern void backlight_force_update(struct backlight_device *bd, enum backlight_update_reason reason); -diff -urNp linux-2.6.32.15/include/linux/binfmts.h linux-2.6.32.15/include/linux/binfmts.h ---- linux-2.6.32.15/include/linux/binfmts.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/binfmts.h 2010-05-28 21:27:16.343246556 -0400 +diff -urNp linux-2.6.32.16/include/linux/binfmts.h linux-2.6.32.16/include/linux/binfmts.h +--- linux-2.6.32.16/include/linux/binfmts.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/binfmts.h 2010-07-09 14:50:38.000000000 -0400 @@ -78,6 +78,7 @@ struct linux_binfmt { int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); 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 unsigned long min_coredump; /* minimal dump size */ int hasvdso; }; -diff -urNp linux-2.6.32.15/include/linux/blkdev.h linux-2.6.32.15/include/linux/blkdev.h ---- linux-2.6.32.15/include/linux/blkdev.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/blkdev.h 2010-05-28 21:27:16.347237122 -0400 +diff -urNp linux-2.6.32.16/include/linux/blkdev.h linux-2.6.32.16/include/linux/blkdev.h +--- linux-2.6.32.16/include/linux/blkdev.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/blkdev.h 2010-07-09 14:50:38.000000000 -0400 @@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc #endif /* CONFIG_BLK_DEV_INTEGRITY */ @@ -44336,9 +44647,9 @@ diff -urNp linux-2.6.32.15/include/linux/blkdev.h linux-2.6.32.15/include/linux/ }; extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, -diff -urNp linux-2.6.32.15/include/linux/cache.h linux-2.6.32.15/include/linux/cache.h ---- linux-2.6.32.15/include/linux/cache.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/cache.h 2010-05-28 21:27:16.347237122 -0400 +diff -urNp linux-2.6.32.16/include/linux/cache.h linux-2.6.32.16/include/linux/cache.h +--- linux-2.6.32.16/include/linux/cache.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/cache.h 2010-07-09 14:50:38.000000000 -0400 @@ -16,6 +16,10 @@ #define __read_mostly #endif @@ -44350,9 +44661,9 @@ diff -urNp linux-2.6.32.15/include/linux/cache.h linux-2.6.32.15/include/linux/c #ifndef ____cacheline_aligned #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) #endif -diff -urNp linux-2.6.32.15/include/linux/capability.h linux-2.6.32.15/include/linux/capability.h ---- linux-2.6.32.15/include/linux/capability.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/capability.h 2010-05-28 21:27:16.347237122 -0400 +diff -urNp linux-2.6.32.16/include/linux/capability.h linux-2.6.32.16/include/linux/capability.h +--- linux-2.6.32.16/include/linux/capability.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/capability.h 2010-07-09 14:50:38.000000000 -0400 @@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff (security_real_capable_noaudit((t), (cap)) == 0) @@ -44361,9 +44672,9 @@ diff -urNp linux-2.6.32.15/include/linux/capability.h linux-2.6.32.15/include/li /* audit system wants to get cap info from files as well */ struct dentry; -diff -urNp linux-2.6.32.15/include/linux/compiler-gcc4.h linux-2.6.32.15/include/linux/compiler-gcc4.h ---- linux-2.6.32.15/include/linux/compiler-gcc4.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/compiler-gcc4.h 2010-05-28 21:27:16.347237122 -0400 +diff -urNp linux-2.6.32.16/include/linux/compiler-gcc4.h linux-2.6.32.16/include/linux/compiler-gcc4.h +--- linux-2.6.32.16/include/linux/compiler-gcc4.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/compiler-gcc4.h 2010-07-09 14:50:38.000000000 -0400 @@ -36,4 +36,8 @@ the kernel context */ #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 +#define __bos0(ptr) __bos((ptr), 0) +#define __bos1(ptr) __bos((ptr), 1) #endif -diff -urNp linux-2.6.32.15/include/linux/compiler.h linux-2.6.32.15/include/linux/compiler.h ---- linux-2.6.32.15/include/linux/compiler.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/compiler.h 2010-05-28 21:27:16.347237122 -0400 +diff -urNp linux-2.6.32.16/include/linux/compiler.h linux-2.6.32.16/include/linux/compiler.h +--- linux-2.6.32.16/include/linux/compiler.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/compiler.h 2010-07-09 14:50:38.000000000 -0400 @@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_ #define __cold #endif @@ -44399,9 +44710,9 @@ diff -urNp linux-2.6.32.15/include/linux/compiler.h linux-2.6.32.15/include/linu /* Simple shorthand for a section definition */ #ifndef __section # define __section(S) __attribute__ ((__section__(#S))) -diff -urNp linux-2.6.32.15/include/linux/decompress/mm.h linux-2.6.32.15/include/linux/decompress/mm.h ---- linux-2.6.32.15/include/linux/decompress/mm.h 2010-04-04 20:41:50.048452804 -0400 -+++ linux-2.6.32.15/include/linux/decompress/mm.h 2010-05-28 21:27:16.347237122 -0400 +diff -urNp linux-2.6.32.16/include/linux/decompress/mm.h linux-2.6.32.16/include/linux/decompress/mm.h +--- linux-2.6.32.16/include/linux/decompress/mm.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/decompress/mm.h 2010-07-09 14:50:38.000000000 -0400 @@ -78,7 +78,7 @@ static void free(void *where) * warnings when not needed (indeed large_malloc / large_free are not * 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 #define free(a) kfree(a) #define large_malloc(a) vmalloc(a) -diff -urNp linux-2.6.32.15/include/linux/dma-mapping.h linux-2.6.32.15/include/linux/dma-mapping.h ---- linux-2.6.32.15/include/linux/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/dma-mapping.h 2010-05-28 21:27:16.347237122 -0400 +diff -urNp linux-2.6.32.16/include/linux/dma-mapping.h linux-2.6.32.16/include/linux/dma-mapping.h +--- linux-2.6.32.16/include/linux/dma-mapping.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/dma-mapping.h 2010-07-09 14:50:38.000000000 -0400 @@ -16,50 +16,50 @@ enum dma_data_direction { }; @@ -44480,9 +44791,9 @@ diff -urNp linux-2.6.32.15/include/linux/dma-mapping.h linux-2.6.32.15/include/l }; #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) -diff -urNp linux-2.6.32.15/include/linux/dst.h linux-2.6.32.15/include/linux/dst.h ---- linux-2.6.32.15/include/linux/dst.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/dst.h 2010-05-28 21:27:16.347237122 -0400 +diff -urNp linux-2.6.32.16/include/linux/dst.h linux-2.6.32.16/include/linux/dst.h +--- linux-2.6.32.16/include/linux/dst.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/dst.h 2010-07-09 14:50:38.000000000 -0400 @@ -380,7 +380,7 @@ struct dst_node struct thread_pool *pool; @@ -44492,9 +44803,9 @@ diff -urNp linux-2.6.32.15/include/linux/dst.h linux-2.6.32.15/include/linux/dst /* * How frequently and how many times transaction -diff -urNp linux-2.6.32.15/include/linux/elf.h linux-2.6.32.15/include/linux/elf.h ---- linux-2.6.32.15/include/linux/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/elf.h 2010-05-28 21:27:16.347237122 -0400 +diff -urNp linux-2.6.32.16/include/linux/elf.h linux-2.6.32.16/include/linux/elf.h +--- linux-2.6.32.16/include/linux/elf.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/elf.h 2010-07-09 14:50:38.000000000 -0400 @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; #define PT_GNU_EH_FRAME 0x6474e550 @@ -44567,9 +44878,9 @@ diff -urNp linux-2.6.32.15/include/linux/elf.h linux-2.6.32.15/include/linux/elf #endif -diff -urNp linux-2.6.32.15/include/linux/fs.h linux-2.6.32.15/include/linux/fs.h ---- linux-2.6.32.15/include/linux/fs.h 2010-04-29 17:49:38.529851956 -0400 -+++ linux-2.6.32.15/include/linux/fs.h 2010-05-28 21:27:16.347237122 -0400 +diff -urNp linux-2.6.32.16/include/linux/fs.h linux-2.6.32.16/include/linux/fs.h +--- linux-2.6.32.16/include/linux/fs.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/fs.h 2010-07-10 08:00:09.000000000 -0400 @@ -90,6 +90,11 @@ struct inodes_stat_t { /* Expect random access pattern */ #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 }; struct lock_manager { -@@ -1439,7 +1444,7 @@ struct fiemap_extent_info { +@@ -1441,7 +1446,7 @@ struct fiemap_extent_info { unsigned int fi_flags; /* Flags as passed from user */ unsigned int fi_extents_mapped; /* Number of mapped extents */ 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 * array */ }; int fiemap_fill_next_extent(struct fiemap_extent_info *info, u64 logical, -@@ -1556,30 +1561,30 @@ extern ssize_t vfs_writev(struct file *, +@@ -1558,30 +1563,30 @@ extern ssize_t vfs_writev(struct file *, unsigned long, loff_t *); 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 }; /* -diff -urNp linux-2.6.32.15/include/linux/fs_struct.h linux-2.6.32.15/include/linux/fs_struct.h ---- linux-2.6.32.15/include/linux/fs_struct.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/fs_struct.h 2010-05-28 21:27:16.347237122 -0400 +diff -urNp linux-2.6.32.16/include/linux/fs_struct.h linux-2.6.32.16/include/linux/fs_struct.h +--- linux-2.6.32.16/include/linux/fs_struct.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/fs_struct.h 2010-07-09 14:50:38.000000000 -0400 @@ -4,7 +4,7 @@ #include <linux/path.h> @@ -44743,9 +45054,9 @@ diff -urNp linux-2.6.32.15/include/linux/fs_struct.h linux-2.6.32.15/include/lin rwlock_t lock; int umask; int in_exec; -diff -urNp linux-2.6.32.15/include/linux/genhd.h linux-2.6.32.15/include/linux/genhd.h ---- linux-2.6.32.15/include/linux/genhd.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/genhd.h 2010-05-28 21:27:16.355225759 -0400 +diff -urNp linux-2.6.32.16/include/linux/genhd.h linux-2.6.32.16/include/linux/genhd.h +--- linux-2.6.32.16/include/linux/genhd.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/genhd.h 2010-07-09 14:50:38.000000000 -0400 @@ -161,7 +161,7 @@ struct gendisk { 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 struct work_struct async_notify; #ifdef CONFIG_BLK_DEV_INTEGRITY struct blk_integrity *integrity; -diff -urNp linux-2.6.32.15/include/linux/gracl.h linux-2.6.32.15/include/linux/gracl.h ---- linux-2.6.32.15/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/include/linux/gracl.h 2010-06-19 21:06:17.097881201 -0400 +diff -urNp linux-2.6.32.16/include/linux/gracl.h linux-2.6.32.16/include/linux/gracl.h +--- linux-2.6.32.16/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/include/linux/gracl.h 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,310 @@ +#ifndef GR_ACL_H +#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 + +#endif + -diff -urNp linux-2.6.32.15/include/linux/gralloc.h linux-2.6.32.15/include/linux/gralloc.h ---- linux-2.6.32.15/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/include/linux/gralloc.h 2010-05-28 21:27:16.355225759 -0400 +diff -urNp linux-2.6.32.16/include/linux/gralloc.h linux-2.6.32.16/include/linux/gralloc.h +--- linux-2.6.32.16/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/include/linux/gralloc.h 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,9 @@ +#ifndef __GRALLOC_H +#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 +void *acl_alloc_num(unsigned long num, unsigned long len); + +#endif -diff -urNp linux-2.6.32.15/include/linux/grdefs.h linux-2.6.32.15/include/linux/grdefs.h ---- linux-2.6.32.15/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/include/linux/grdefs.h 2010-05-28 21:27:16.355225759 -0400 +diff -urNp linux-2.6.32.16/include/linux/grdefs.h linux-2.6.32.16/include/linux/grdefs.h +--- linux-2.6.32.16/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/include/linux/grdefs.h 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,136 @@ +#ifndef GRDEFS_H +#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/ +}; + +#endif -diff -urNp linux-2.6.32.15/include/linux/grinternal.h linux-2.6.32.15/include/linux/grinternal.h ---- linux-2.6.32.15/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/include/linux/grinternal.h 2010-06-19 21:46:05.111766483 -0400 -@@ -0,0 +1,215 @@ +diff -urNp linux-2.6.32.16/include/linux/grinternal.h linux-2.6.32.16/include/linux/grinternal.h +--- linux-2.6.32.16/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/include/linux/grinternal.h 2010-07-09 14:50:38.000000000 -0400 +@@ -0,0 +1,211 @@ +#ifndef __GRINTERNAL_H +#define __GRINTERNAL_H + @@ -45331,13 +45642,9 @@ diff -urNp linux-2.6.32.15/include/linux/grinternal.h linux-2.6.32.15/include/li + gr_to_filename1(tsk->parent->exec_file->f_path.dentry, \ + tsk->parent->exec_file->f_vfsmnt) : "/") + -+#define proc_is_chrooted(tsk_a) ((tsk_a->pid > 1) && (tsk_a->fs != NULL) && \ -+ ((init_task.fs->root.dentry != tsk_a->fs->root.dentry) && \ -+ (tsk_a->nsproxy->mnt_ns->root->mnt_root != \ -+ tsk_a->fs->root.dentry))) ++#define proc_is_chrooted(tsk_a) (tsk_a->gr_is_chrooted) + -+#define have_same_root(tsk_a,tsk_b) ((tsk_a->fs != NULL) && (tsk_b->fs != NULL) && \ -+ (tsk_a->fs->root.dentry == tsk_b->fs->root.dentry)) ++#define have_same_root(tsk_a,tsk_b) (tsk_a->gr_chroot_dentry == tsk_b->gr_chroot_dentry) + +#define DEFAULTSECARGS(task, cred, pcred) gr_task_fullpath(task), task->comm, \ + 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 +#endif + +#endif -diff -urNp linux-2.6.32.15/include/linux/grmsg.h linux-2.6.32.15/include/linux/grmsg.h ---- linux-2.6.32.15/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/include/linux/grmsg.h 2010-06-19 21:06:17.097881201 -0400 +diff -urNp linux-2.6.32.16/include/linux/grmsg.h linux-2.6.32.16/include/linux/grmsg.h +--- linux-2.6.32.16/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/include/linux/grmsg.h 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1,108 @@ +#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" +#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 +#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by " +#define GR_VM86_MSG "denied use of vm86 by " +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by " -diff -urNp linux-2.6.32.15/include/linux/grsecurity.h linux-2.6.32.15/include/linux/grsecurity.h ---- linux-2.6.32.15/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/include/linux/grsecurity.h 2010-06-19 21:45:41.506145931 -0400 -@@ -0,0 +1,200 @@ +diff -urNp linux-2.6.32.16/include/linux/grsecurity.h linux-2.6.32.16/include/linux/grsecurity.h +--- linux-2.6.32.16/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/include/linux/grsecurity.h 2010-07-10 07:56:56.000000000 -0400 +@@ -0,0 +1,203 @@ +#ifndef GR_SECURITY_H +#define GR_SECURITY_H +#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 +void gr_del_task_from_ip_table(struct task_struct *p); + +int gr_pid_is_chrooted(struct task_struct *p); ++int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type); +int gr_handle_chroot_nice(void); +int gr_handle_chroot_sysctl(const int op); +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 + +int gr_tpe_allow(const struct file *file); + -+int gr_random_pid(void); ++void gr_set_chroot_entries(struct task_struct *task, struct path *path); ++void gr_clear_chroot_entries(struct task_struct *task); + +void gr_log_forkfail(const int retval); +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 +int gr_handle_signal(const struct task_struct *p, const int sig); +int gr_check_crash_uid(const uid_t uid); +int gr_check_protected_task(const struct task_struct *task); ++int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type); +int gr_acl_handle_mmap(const struct file *file, + const unsigned long prot); +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 +#endif + +#endif -diff -urNp linux-2.6.32.15/include/linux/hdpu_features.h linux-2.6.32.15/include/linux/hdpu_features.h ---- linux-2.6.32.15/include/linux/hdpu_features.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/hdpu_features.h 2010-05-28 21:27:16.355225759 -0400 +diff -urNp linux-2.6.32.16/include/linux/hdpu_features.h linux-2.6.32.16/include/linux/hdpu_features.h +--- linux-2.6.32.16/include/linux/hdpu_features.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/hdpu_features.h 2010-07-09 14:50:38.000000000 -0400 @@ -3,7 +3,7 @@ struct cpustate_t { 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 unsigned char cached_val; int inited; unsigned long *set_addr; -diff -urNp linux-2.6.32.15/include/linux/highmem.h linux-2.6.32.15/include/linux/highmem.h ---- linux-2.6.32.15/include/linux/highmem.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/highmem.h 2010-05-28 21:27:16.372277939 -0400 +diff -urNp linux-2.6.32.16/include/linux/highmem.h linux-2.6.32.16/include/linux/highmem.h +--- linux-2.6.32.16/include/linux/highmem.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/highmem.h 2010-07-09 14:50:38.000000000 -0400 @@ -137,6 +137,18 @@ static inline void clear_highpage(struct kunmap_atomic(kaddr, KM_USER0); } @@ -45791,34 +46101,9 @@ diff -urNp linux-2.6.32.15/include/linux/highmem.h linux-2.6.32.15/include/linux static inline void zero_user_segments(struct page *page, unsigned start1, unsigned end1, unsigned start2, unsigned end2) -diff -urNp linux-2.6.32.15/include/linux/init_task.h linux-2.6.32.15/include/linux/init_task.h ---- linux-2.6.32.15/include/linux/init_task.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/init_task.h 2010-05-28 21:27:16.377048812 -0400 -@@ -115,6 +115,13 @@ extern struct cred init_cred; - # define INIT_PERF_EVENTS(tsk) - #endif - -+#ifdef CONFIG_GRKERNSEC -+# define INIT_GR_FS_LOCK \ -+ .gr_fs_lock = __RW_LOCK_UNLOCKED(gr_fs_lock), -+#else -+# define INIT_GR_FS_LOCK -+#endif -+ - /* - * INIT_TASK is used to set up the first task table, touch at - * your own risk!. Base=0, limit=0x1fffff (=2MB) -@@ -184,6 +191,7 @@ extern struct cred init_cred; - INIT_FTRACE_GRAPH \ - INIT_TRACE_RECURSION \ - INIT_TASK_RCU_PREEMPT(tsk) \ -+ INIT_GR_FS_LOCK \ - } - - -diff -urNp linux-2.6.32.15/include/linux/interrupt.h linux-2.6.32.15/include/linux/interrupt.h ---- linux-2.6.32.15/include/linux/interrupt.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/interrupt.h 2010-05-28 21:27:16.377048812 -0400 +diff -urNp linux-2.6.32.16/include/linux/interrupt.h linux-2.6.32.16/include/linux/interrupt.h +--- linux-2.6.32.16/include/linux/interrupt.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/interrupt.h 2010-07-09 14:50:38.000000000 -0400 @@ -357,7 +357,7 @@ enum /* map softirq index to softirq name. update 'softirq_to_name' in * 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 extern void softirq_init(void); #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0) extern void raise_softirq_irqoff(unsigned int nr); -diff -urNp linux-2.6.32.15/include/linux/jbd2.h linux-2.6.32.15/include/linux/jbd2.h ---- linux-2.6.32.15/include/linux/jbd2.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/jbd2.h 2010-05-28 21:27:16.377048812 -0400 +diff -urNp linux-2.6.32.16/include/linux/jbd2.h linux-2.6.32.16/include/linux/jbd2.h +--- linux-2.6.32.16/include/linux/jbd2.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/jbd2.h 2010-07-09 14:50:38.000000000 -0400 @@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; } \ } 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 #endif static inline void *jbd2_alloc(size_t size, gfp_t flags) -diff -urNp linux-2.6.32.15/include/linux/jbd.h linux-2.6.32.15/include/linux/jbd.h ---- linux-2.6.32.15/include/linux/jbd.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/jbd.h 2010-05-28 21:27:16.377048812 -0400 +diff -urNp linux-2.6.32.16/include/linux/jbd.h linux-2.6.32.16/include/linux/jbd.h +--- linux-2.6.32.16/include/linux/jbd.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/jbd.h 2010-07-09 14:50:38.000000000 -0400 @@ -66,7 +66,7 @@ extern u8 journal_enable_debug; } \ } 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 #endif static inline void *jbd_alloc(size_t size, gfp_t flags) -diff -urNp linux-2.6.32.15/include/linux/kallsyms.h linux-2.6.32.15/include/linux/kallsyms.h ---- linux-2.6.32.15/include/linux/kallsyms.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/kallsyms.h 2010-05-28 21:27:16.377048812 -0400 +diff -urNp linux-2.6.32.16/include/linux/kallsyms.h linux-2.6.32.16/include/linux/kallsyms.h +--- linux-2.6.32.16/include/linux/kallsyms.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/kallsyms.h 2010-07-09 14:50:38.000000000 -0400 @@ -15,7 +15,8 @@ struct module; @@ -45890,9 +46175,9 @@ diff -urNp linux-2.6.32.15/include/linux/kallsyms.h linux-2.6.32.15/include/linu /* This macro allows us to keep printk typechecking */ static void __check_printsym_format(const char *fmt, ...) -diff -urNp linux-2.6.32.15/include/linux/kgdb.h linux-2.6.32.15/include/linux/kgdb.h ---- linux-2.6.32.15/include/linux/kgdb.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/kgdb.h 2010-05-28 21:27:16.379237094 -0400 +diff -urNp linux-2.6.32.16/include/linux/kgdb.h linux-2.6.32.16/include/linux/kgdb.h +--- linux-2.6.32.16/include/linux/kgdb.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/kgdb.h 2010-07-09 14:50:38.000000000 -0400 @@ -251,20 +251,20 @@ struct kgdb_arch { */ 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 extern int kgdb_hex2long(char **ptr, unsigned long *long_val); extern int kgdb_mem2hex(char *mem, char *buf, int count); -diff -urNp linux-2.6.32.15/include/linux/kobject.h linux-2.6.32.15/include/linux/kobject.h ---- linux-2.6.32.15/include/linux/kobject.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/kobject.h 2010-05-28 21:27:16.379237094 -0400 +diff -urNp linux-2.6.32.16/include/linux/kobject.h linux-2.6.32.16/include/linux/kobject.h +--- linux-2.6.32.16/include/linux/kobject.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/kobject.h 2010-07-09 14:50:38.000000000 -0400 @@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob 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 struct kobject *parent_kobj); static inline struct kset *to_kset(struct kobject *kobj) -diff -urNp linux-2.6.32.15/include/linux/kvm_host.h linux-2.6.32.15/include/linux/kvm_host.h ---- linux-2.6.32.15/include/linux/kvm_host.h 2010-04-29 17:49:38.529851956 -0400 -+++ linux-2.6.32.15/include/linux/kvm_host.h 2010-05-28 21:27:16.379237094 -0400 +diff -urNp linux-2.6.32.16/include/linux/kvm_host.h linux-2.6.32.16/include/linux/kvm_host.h +--- linux-2.6.32.16/include/linux/kvm_host.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/kvm_host.h 2010-07-09 14:50:38.000000000 -0400 @@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc void vcpu_load(struct kvm_vcpu *vcpu); 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 void kvm_arch_exit(void); int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); -diff -urNp linux-2.6.32.15/include/linux/libata.h linux-2.6.32.15/include/linux/libata.h ---- linux-2.6.32.15/include/linux/libata.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/libata.h 2010-05-28 21:27:16.391248013 -0400 +diff -urNp linux-2.6.32.16/include/linux/libata.h linux-2.6.32.16/include/linux/libata.h +--- linux-2.6.32.16/include/linux/libata.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/libata.h 2010-07-09 14:50:38.000000000 -0400 @@ -64,11 +64,11 @@ #ifdef ATA_VERBOSE_DEBUG #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/ extern int ata_scsi_detect(struct scsi_host_template *sht); extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); -diff -urNp linux-2.6.32.15/include/linux/lockd/bind.h linux-2.6.32.15/include/linux/lockd/bind.h ---- linux-2.6.32.15/include/linux/lockd/bind.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/lockd/bind.h 2010-05-28 21:27:16.391248013 -0400 +diff -urNp linux-2.6.32.16/include/linux/lockd/bind.h linux-2.6.32.16/include/linux/lockd/bind.h +--- linux-2.6.32.16/include/linux/lockd/bind.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/lockd/bind.h 2010-07-09 14:50:38.000000000 -0400 @@ -23,13 +23,13 @@ struct svc_rqst; * This is the set of functions for lockd->nfsd communication */ @@ -46083,9 +46368,9 @@ diff -urNp linux-2.6.32.15/include/linux/lockd/bind.h linux-2.6.32.15/include/li /* * Similar to nfs_client_initdata, but without the NFS-specific -diff -urNp linux-2.6.32.15/include/linux/mm.h linux-2.6.32.15/include/linux/mm.h ---- linux-2.6.32.15/include/linux/mm.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/mm.h 2010-05-31 11:15:44.592892079 -0400 +diff -urNp linux-2.6.32.16/include/linux/mm.h linux-2.6.32.16/include/linux/mm.h +--- linux-2.6.32.16/include/linux/mm.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/mm.h 2010-07-09 14:50:38.000000000 -0400 @@ -102,7 +102,14 @@ extern unsigned int kobjsize(const void #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 #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */ -diff -urNp linux-2.6.32.15/include/linux/mm_types.h linux-2.6.32.15/include/linux/mm_types.h ---- linux-2.6.32.15/include/linux/mm_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/mm_types.h 2010-05-28 21:27:16.391248013 -0400 +diff -urNp linux-2.6.32.16/include/linux/mm_types.h linux-2.6.32.16/include/linux/mm_types.h +--- linux-2.6.32.16/include/linux/mm_types.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/mm_types.h 2010-07-09 14:50:38.000000000 -0400 @@ -186,6 +186,8 @@ struct vm_area_struct { #ifdef CONFIG_NUMA 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 }; /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ -diff -urNp linux-2.6.32.15/include/linux/mmu_notifier.h linux-2.6.32.15/include/linux/mmu_notifier.h ---- linux-2.6.32.15/include/linux/mmu_notifier.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/mmu_notifier.h 2010-05-28 21:27:16.391248013 -0400 +diff -urNp linux-2.6.32.16/include/linux/mmu_notifier.h linux-2.6.32.16/include/linux/mmu_notifier.h +--- linux-2.6.32.16/include/linux/mmu_notifier.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/mmu_notifier.h 2010-07-09 14:50:38.000000000 -0400 @@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr */ #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/ }) #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \ -diff -urNp linux-2.6.32.15/include/linux/mod_devicetable.h linux-2.6.32.15/include/linux/mod_devicetable.h ---- linux-2.6.32.15/include/linux/mod_devicetable.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/mod_devicetable.h 2010-05-28 21:27:16.391248013 -0400 +diff -urNp linux-2.6.32.16/include/linux/mod_devicetable.h linux-2.6.32.16/include/linux/mod_devicetable.h +--- linux-2.6.32.16/include/linux/mod_devicetable.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/mod_devicetable.h 2010-07-09 14:50:38.000000000 -0400 @@ -12,7 +12,7 @@ typedef unsigned long kernel_ulong_t; #endif @@ -46229,9 +46514,9 @@ diff -urNp linux-2.6.32.15/include/linux/mod_devicetable.h linux-2.6.32.15/inclu struct hid_device_id { __u16 bus; -diff -urNp linux-2.6.32.15/include/linux/module.h linux-2.6.32.15/include/linux/module.h ---- linux-2.6.32.15/include/linux/module.h 2010-05-28 20:16:44.458924952 -0400 -+++ linux-2.6.32.15/include/linux/module.h 2010-05-28 21:27:16.391248013 -0400 +diff -urNp linux-2.6.32.16/include/linux/module.h linux-2.6.32.16/include/linux/module.h +--- linux-2.6.32.16/include/linux/module.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/module.h 2010-07-09 14:50:38.000000000 -0400 @@ -287,16 +287,16 @@ struct module int (*init)(void); @@ -46304,9 +46589,9 @@ diff -urNp linux-2.6.32.15/include/linux/module.h linux-2.6.32.15/include/linux/ } /* Search for module by name: must hold module_mutex. */ -diff -urNp linux-2.6.32.15/include/linux/moduleloader.h linux-2.6.32.15/include/linux/moduleloader.h ---- linux-2.6.32.15/include/linux/moduleloader.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/moduleloader.h 2010-05-28 21:27:16.391248013 -0400 +diff -urNp linux-2.6.32.16/include/linux/moduleloader.h linux-2.6.32.16/include/linux/moduleloader.h +--- linux-2.6.32.16/include/linux/moduleloader.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/moduleloader.h 2010-07-09 14:50:38.000000000 -0400 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st sections. Returns NULL on failure. */ 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/ /* Apply the given relocation to the (simplified) ELF. Return -error or 0. */ int apply_relocate(Elf_Shdr *sechdrs, -diff -urNp linux-2.6.32.15/include/linux/namei.h linux-2.6.32.15/include/linux/namei.h ---- linux-2.6.32.15/include/linux/namei.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/namei.h 2010-05-28 21:27:16.394947878 -0400 +diff -urNp linux-2.6.32.16/include/linux/namei.h linux-2.6.32.16/include/linux/namei.h +--- linux-2.6.32.16/include/linux/namei.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/namei.h 2010-07-09 14:50:38.000000000 -0400 @@ -22,7 +22,7 @@ struct nameidata { unsigned int flags; 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 { return nd->saved_names[nd->depth]; } -diff -urNp linux-2.6.32.15/include/linux/nodemask.h linux-2.6.32.15/include/linux/nodemask.h ---- linux-2.6.32.15/include/linux/nodemask.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/nodemask.h 2010-05-28 21:27:16.394947878 -0400 +diff -urNp linux-2.6.32.16/include/linux/nodemask.h linux-2.6.32.16/include/linux/nodemask.h +--- linux-2.6.32.16/include/linux/nodemask.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/nodemask.h 2010-07-09 14:50:38.000000000 -0400 @@ -464,11 +464,11 @@ static inline int num_node_state(enum no #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 }) #define num_online_nodes() num_node_state(N_ONLINE) -diff -urNp linux-2.6.32.15/include/linux/oprofile.h linux-2.6.32.15/include/linux/oprofile.h ---- linux-2.6.32.15/include/linux/oprofile.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/oprofile.h 2010-05-28 21:27:16.394947878 -0400 +diff -urNp linux-2.6.32.16/include/linux/oprofile.h linux-2.6.32.16/include/linux/oprofile.h +--- linux-2.6.32.16/include/linux/oprofile.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/oprofile.h 2010-07-09 14:50:38.000000000 -0400 @@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, 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 /** create a directory */ struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, -diff -urNp linux-2.6.32.15/include/linux/pipe_fs_i.h linux-2.6.32.15/include/linux/pipe_fs_i.h ---- linux-2.6.32.15/include/linux/pipe_fs_i.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/pipe_fs_i.h 2010-05-28 21:27:16.394947878 -0400 +diff -urNp linux-2.6.32.16/include/linux/pipe_fs_i.h linux-2.6.32.16/include/linux/pipe_fs_i.h +--- linux-2.6.32.16/include/linux/pipe_fs_i.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/pipe_fs_i.h 2010-07-09 14:50:38.000000000 -0400 @@ -46,9 +46,9 @@ struct pipe_inode_info { wait_queue_head_t wait; 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 unsigned int r_counter; unsigned int w_counter; struct fasync_struct *fasync_readers; -diff -urNp linux-2.6.32.15/include/linux/poison.h linux-2.6.32.15/include/linux/poison.h ---- linux-2.6.32.15/include/linux/poison.h 2010-05-15 13:20:19.331913169 -0400 -+++ linux-2.6.32.15/include/linux/poison.h 2010-05-28 21:27:16.394947878 -0400 +diff -urNp linux-2.6.32.16/include/linux/poison.h linux-2.6.32.16/include/linux/poison.h +--- linux-2.6.32.16/include/linux/poison.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/poison.h 2010-07-09 14:50:38.000000000 -0400 @@ -19,8 +19,8 @@ * under normal circumstances, used to verify that nobody uses * 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/ /********** include/linux/timer.h **********/ /* -diff -urNp linux-2.6.32.15/include/linux/proc_fs.h linux-2.6.32.15/include/linux/proc_fs.h ---- linux-2.6.32.15/include/linux/proc_fs.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/proc_fs.h 2010-05-28 21:27:16.394947878 -0400 +diff -urNp linux-2.6.32.16/include/linux/proc_fs.h linux-2.6.32.16/include/linux/proc_fs.h +--- linux-2.6.32.16/include/linux/proc_fs.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/proc_fs.h 2010-07-09 14:50:38.000000000 -0400 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro return proc_create_data(name, mode, parent, proc_fops, NULL); } @@ -46443,9 +46728,9 @@ diff -urNp linux-2.6.32.15/include/linux/proc_fs.h linux-2.6.32.15/include/linux static inline struct proc_dir_entry *create_proc_read_entry(const char *name, mode_t mode, struct proc_dir_entry *base, read_proc_t *read_proc, void * data) -diff -urNp linux-2.6.32.15/include/linux/random.h linux-2.6.32.15/include/linux/random.h ---- linux-2.6.32.15/include/linux/random.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/random.h 2010-05-28 21:27:16.394947878 -0400 +diff -urNp linux-2.6.32.16/include/linux/random.h linux-2.6.32.16/include/linux/random.h +--- linux-2.6.32.16/include/linux/random.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/random.h 2010-07-09 14:50:38.000000000 -0400 @@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l u32 random32(void); 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/ #endif /* __KERNEL___ */ #endif /* _LINUX_RANDOM_H */ -diff -urNp linux-2.6.32.15/include/linux/reiserfs_fs.h linux-2.6.32.15/include/linux/reiserfs_fs.h ---- linux-2.6.32.15/include/linux/reiserfs_fs.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/reiserfs_fs.h 2010-05-28 21:27:16.394947878 -0400 +diff -urNp linux-2.6.32.16/include/linux/reiserfs_fs.h linux-2.6.32.16/include/linux/reiserfs_fs.h +--- linux-2.6.32.16/include/linux/reiserfs_fs.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/reiserfs_fs.h 2010-07-09 14:50:38.000000000 -0400 @@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ @@ -46507,9 +46792,9 @@ diff -urNp linux-2.6.32.15/include/linux/reiserfs_fs.h linux-2.6.32.15/include/l #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize) #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize) -diff -urNp linux-2.6.32.15/include/linux/reiserfs_fs_sb.h linux-2.6.32.15/include/linux/reiserfs_fs_sb.h ---- linux-2.6.32.15/include/linux/reiserfs_fs_sb.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/reiserfs_fs_sb.h 2010-05-28 21:27:16.394947878 -0400 +diff -urNp linux-2.6.32.16/include/linux/reiserfs_fs_sb.h linux-2.6.32.16/include/linux/reiserfs_fs_sb.h +--- linux-2.6.32.16/include/linux/reiserfs_fs_sb.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/reiserfs_fs_sb.h 2010-07-09 14:50:38.000000000 -0400 @@ -377,7 +377,7 @@ struct reiserfs_sb_info { /* Comment? -Hans */ 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 // tree gets re-balanced unsigned long s_properties; /* File system properties. Currently holds on-disk FS format */ -diff -urNp linux-2.6.32.15/include/linux/sched.h linux-2.6.32.15/include/linux/sched.h ---- linux-2.6.32.15/include/linux/sched.h 2010-05-28 20:16:44.458924952 -0400 -+++ linux-2.6.32.15/include/linux/sched.h 2010-05-28 21:27:16.403248422 -0400 +diff -urNp linux-2.6.32.16/include/linux/sched.h linux-2.6.32.16/include/linux/sched.h +--- linux-2.6.32.16/include/linux/sched.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/sched.h 2010-07-09 14:50:38.000000000 -0400 @@ -101,6 +101,7 @@ struct bio; struct fs_struct; 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 struct io_context *io_context; unsigned long ptrace_message; -@@ -1520,6 +1532,19 @@ struct task_struct { +@@ -1520,6 +1532,20 @@ struct task_struct { unsigned long default_timer_slack_ns; struct list_head *scm_work_list; + +#ifdef CONFIG_GRKERNSEC + /* grsecurity */ -+ rwlock_t gr_fs_lock; ++ struct dentry *gr_chroot_dentry; + struct acl_subject_label *acl; + struct acl_role_label *role; + 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 + u8 acl_sp_role; + u8 is_writable; + u8 brute; ++ u8 gr_is_chrooted; +#endif + #ifdef CONFIG_FUNCTION_GRAPH_TRACER /* Index of current stored adress in ret_stack */ int curr_ret_stack; -@@ -1543,6 +1568,52 @@ struct task_struct { +@@ -1543,6 +1569,52 @@ struct task_struct { #endif /* CONFIG_TRACING */ }; @@ -46682,7 +46968,7 @@ diff -urNp linux-2.6.32.15/include/linux/sched.h linux-2.6.32.15/include/linux/s /* Future-safe accessor for struct task_struct's cpus_allowed. */ #define tsk_cpumask(tsk) (&(tsk)->cpus_allowed) -@@ -2142,7 +2213,7 @@ extern void __cleanup_sighand(struct sig +@@ -2142,7 +2214,7 @@ extern void __cleanup_sighand(struct sig extern void exit_itimers(struct signal_struct *); extern void flush_itimer_signals(void); @@ -46691,41 +46977,7 @@ diff -urNp linux-2.6.32.15/include/linux/sched.h linux-2.6.32.15/include/linux/s extern void daemonize(const char *, ...); extern int allow_signal(int); -@@ -2244,6 +2315,33 @@ static inline void task_unlock(struct ta - spin_unlock(&p->alloc_lock); - } - -+/* grsec: protects only ->fs as task_lock is overkill and we can't -+ be using a spin_lock in interrupt context -+*/ -+#ifdef CONFIG_GRKERNSEC -+#define gr_fs_write_lock_irqsave(x, y) \ -+ write_lock_irqsave(&x->gr_fs_lock, y) -+#define gr_fs_write_unlock_irqrestore(x, y) \ -+ write_unlock_irqrestore(&x->gr_fs_lock, y) -+#else -+#define gr_fs_write_lock_irqsave(x, y) -+#define gr_fs_write_unlock_irqrestore(x, y) -+#endif -+ -+static inline void gr_fs_read_lock(struct task_struct *p) -+{ -+#ifdef CONFIG_GRKERNSEC -+ read_lock(&p->gr_fs_lock); -+#endif -+} -+ -+static inline void gr_fs_read_unlock(struct task_struct *p) -+{ -+#ifdef CONFIG_GRKERNSEC -+ read_unlock(&p->gr_fs_lock); -+#endif -+} -+ - extern struct sighand_struct *lock_task_sighand(struct task_struct *tsk, - unsigned long *flags); - -@@ -2255,8 +2353,8 @@ static inline void unlock_task_sighand(s +@@ -2255,8 +2327,8 @@ static inline void unlock_task_sighand(s #ifndef __HAVE_THREAD_FUNCTIONS @@ -46736,7 +46988,7 @@ diff -urNp linux-2.6.32.15/include/linux/sched.h linux-2.6.32.15/include/linux/s static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org) { -@@ -2271,13 +2369,31 @@ static inline unsigned long *end_of_stac +@@ -2271,13 +2343,31 @@ static inline unsigned long *end_of_stac #endif @@ -46770,9 +47022,9 @@ diff -urNp linux-2.6.32.15/include/linux/sched.h linux-2.6.32.15/include/linux/s extern void thread_info_cache_init(void); #ifdef CONFIG_DEBUG_STACK_USAGE -diff -urNp linux-2.6.32.15/include/linux/screen_info.h linux-2.6.32.15/include/linux/screen_info.h ---- linux-2.6.32.15/include/linux/screen_info.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/screen_info.h 2010-05-28 21:27:16.403248422 -0400 +diff -urNp linux-2.6.32.16/include/linux/screen_info.h linux-2.6.32.16/include/linux/screen_info.h +--- linux-2.6.32.16/include/linux/screen_info.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/screen_info.h 2010-07-09 14:50:38.000000000 -0400 @@ -42,7 +42,8 @@ struct screen_info { __u16 pages; /* 0x32 */ __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 } __attribute__((packed)); #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ -diff -urNp linux-2.6.32.15/include/linux/security.h linux-2.6.32.15/include/linux/security.h ---- linux-2.6.32.15/include/linux/security.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/security.h 2010-05-28 21:27:16.403248422 -0400 +diff -urNp linux-2.6.32.16/include/linux/security.h linux-2.6.32.16/include/linux/security.h +--- linux-2.6.32.16/include/linux/security.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/security.h 2010-07-09 14:50:38.000000000 -0400 @@ -34,6 +34,7 @@ #include <linux/key.h> #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 #include <net/flow.h> /* Maximum number of letters for an LSM name string */ -diff -urNp linux-2.6.32.15/include/linux/shm.h linux-2.6.32.15/include/linux/shm.h ---- linux-2.6.32.15/include/linux/shm.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/shm.h 2010-05-28 21:27:16.403248422 -0400 +diff -urNp linux-2.6.32.16/include/linux/shm.h linux-2.6.32.16/include/linux/shm.h +--- linux-2.6.32.16/include/linux/shm.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/shm.h 2010-07-09 14:50:38.000000000 -0400 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke pid_t shm_cprid; 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 }; /* shm_mode upper byte flags */ -diff -urNp linux-2.6.32.15/include/linux/slab.h linux-2.6.32.15/include/linux/slab.h ---- linux-2.6.32.15/include/linux/slab.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/slab.h 2010-05-28 21:27:16.407250185 -0400 +diff -urNp linux-2.6.32.16/include/linux/slab.h linux-2.6.32.16/include/linux/slab.h +--- linux-2.6.32.16/include/linux/slab.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/slab.h 2010-07-09 14:50:38.000000000 -0400 @@ -11,6 +11,7 @@ #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 +}) + #endif /* _LINUX_SLAB_H */ -diff -urNp linux-2.6.32.15/include/linux/slub_def.h linux-2.6.32.15/include/linux/slub_def.h ---- linux-2.6.32.15/include/linux/slub_def.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/slub_def.h 2010-05-28 21:27:16.407250185 -0400 +diff -urNp linux-2.6.32.16/include/linux/slub_def.h linux-2.6.32.16/include/linux/slub_def.h +--- linux-2.6.32.16/include/linux/slub_def.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/slub_def.h 2010-07-09 14:50:38.000000000 -0400 @@ -86,7 +86,7 @@ struct kmem_cache { struct kmem_cache_order_objects max; 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 void (*ctor)(void *); int inuse; /* Offset to metadata */ int align; /* Alignment */ -diff -urNp linux-2.6.32.15/include/linux/sonet.h linux-2.6.32.15/include/linux/sonet.h ---- linux-2.6.32.15/include/linux/sonet.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/sonet.h 2010-05-28 21:27:16.407250185 -0400 +diff -urNp linux-2.6.32.16/include/linux/sonet.h linux-2.6.32.16/include/linux/sonet.h +--- linux-2.6.32.16/include/linux/sonet.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/sonet.h 2010-07-09 14:50:38.000000000 -0400 @@ -61,7 +61,7 @@ struct sonet_stats { #include <asm/atomic.h> @@ -46906,9 +47158,9 @@ diff -urNp linux-2.6.32.15/include/linux/sonet.h linux-2.6.32.15/include/linux/s __SONET_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.32.15/include/linux/suspend.h linux-2.6.32.15/include/linux/suspend.h ---- linux-2.6.32.15/include/linux/suspend.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/suspend.h 2010-05-28 21:27:16.407250185 -0400 +diff -urNp linux-2.6.32.16/include/linux/suspend.h linux-2.6.32.16/include/linux/suspend.h +--- linux-2.6.32.16/include/linux/suspend.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/suspend.h 2010-07-09 14:50:38.000000000 -0400 @@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t; * which require special recovery actions in that situation. */ @@ -46997,9 +47249,9 @@ diff -urNp linux-2.6.32.15/include/linux/suspend.h linux-2.6.32.15/include/linux static inline int hibernate(void) { return -ENOSYS; } static inline bool system_entering_hibernation(void) { return false; } #endif /* CONFIG_HIBERNATION */ -diff -urNp linux-2.6.32.15/include/linux/sysctl.h linux-2.6.32.15/include/linux/sysctl.h ---- linux-2.6.32.15/include/linux/sysctl.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/sysctl.h 2010-05-28 21:27:16.423734148 -0400 +diff -urNp linux-2.6.32.16/include/linux/sysctl.h linux-2.6.32.16/include/linux/sysctl.h +--- linux-2.6.32.16/include/linux/sysctl.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/sysctl.h 2010-07-09 14:50:38.000000000 -0400 @@ -164,7 +164,11 @@ enum KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ }; @@ -47013,9 +47265,9 @@ diff -urNp linux-2.6.32.15/include/linux/sysctl.h linux-2.6.32.15/include/linux/ /* CTL_VM names: */ enum -diff -urNp linux-2.6.32.15/include/linux/sysfs.h linux-2.6.32.15/include/linux/sysfs.h ---- linux-2.6.32.15/include/linux/sysfs.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/sysfs.h 2010-05-28 21:27:16.423734148 -0400 +diff -urNp linux-2.6.32.16/include/linux/sysfs.h linux-2.6.32.16/include/linux/sysfs.h +--- linux-2.6.32.16/include/linux/sysfs.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/sysfs.h 2010-07-09 14:50:38.000000000 -0400 @@ -75,8 +75,8 @@ struct bin_attribute { }; @@ -47027,9 +47279,9 @@ diff -urNp linux-2.6.32.15/include/linux/sysfs.h linux-2.6.32.15/include/linux/s }; struct sysfs_dirent; -diff -urNp linux-2.6.32.15/include/linux/thread_info.h linux-2.6.32.15/include/linux/thread_info.h ---- linux-2.6.32.15/include/linux/thread_info.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/thread_info.h 2010-05-28 21:27:16.423734148 -0400 +diff -urNp linux-2.6.32.16/include/linux/thread_info.h linux-2.6.32.16/include/linux/thread_info.h +--- linux-2.6.32.16/include/linux/thread_info.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/thread_info.h 2010-07-09 14:50:38.000000000 -0400 @@ -23,7 +23,7 @@ struct restart_block { }; /* 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 u32 val; u32 flags; u32 bitset; -diff -urNp linux-2.6.32.15/include/linux/tty.h linux-2.6.32.15/include/linux/tty.h ---- linux-2.6.32.15/include/linux/tty.h 2010-04-04 20:41:50.060586306 -0400 -+++ linux-2.6.32.15/include/linux/tty.h 2010-05-28 21:27:16.423734148 -0400 +diff -urNp linux-2.6.32.16/include/linux/tty.h linux-2.6.32.16/include/linux/tty.h +--- linux-2.6.32.16/include/linux/tty.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/tty.h 2010-07-09 14:50:38.000000000 -0400 @@ -13,6 +13,7 @@ #include <linux/tty_driver.h> #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 /* n_tty.c */ extern struct tty_ldisc_ops tty_ldisc_N_TTY; -diff -urNp linux-2.6.32.15/include/linux/tty_ldisc.h linux-2.6.32.15/include/linux/tty_ldisc.h ---- linux-2.6.32.15/include/linux/tty_ldisc.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/tty_ldisc.h 2010-05-28 21:27:16.423734148 -0400 +diff -urNp linux-2.6.32.16/include/linux/tty_ldisc.h linux-2.6.32.16/include/linux/tty_ldisc.h +--- linux-2.6.32.16/include/linux/tty_ldisc.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/tty_ldisc.h 2010-07-09 14:50:38.000000000 -0400 @@ -139,7 +139,7 @@ struct tty_ldisc_ops { 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 }; struct tty_ldisc { -diff -urNp linux-2.6.32.15/include/linux/types.h linux-2.6.32.15/include/linux/types.h ---- linux-2.6.32.15/include/linux/types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/types.h 2010-05-28 21:27:16.427051097 -0400 +diff -urNp linux-2.6.32.16/include/linux/types.h linux-2.6.32.16/include/linux/types.h +--- linux-2.6.32.16/include/linux/types.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/types.h 2010-07-09 14:50:38.000000000 -0400 @@ -191,10 +191,26 @@ typedef struct { volatile int counter; } 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 #endif struct ustat { -diff -urNp linux-2.6.32.15/include/linux/uaccess.h linux-2.6.32.15/include/linux/uaccess.h ---- linux-2.6.32.15/include/linux/uaccess.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/uaccess.h 2010-05-28 21:27:16.427051097 -0400 +diff -urNp linux-2.6.32.16/include/linux/uaccess.h linux-2.6.32.16/include/linux/uaccess.h +--- linux-2.6.32.16/include/linux/uaccess.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/uaccess.h 2010-07-09 14:50:38.000000000 -0400 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ long ret; \ 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 +extern long probe_kernel_write(void *dst, const void *src, size_t size); #endif /* __LINUX_UACCESS_H__ */ -diff -urNp linux-2.6.32.15/include/linux/vmalloc.h linux-2.6.32.15/include/linux/vmalloc.h ---- linux-2.6.32.15/include/linux/vmalloc.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/linux/vmalloc.h 2010-05-28 21:27:16.427051097 -0400 +diff -urNp linux-2.6.32.16/include/linux/vmalloc.h linux-2.6.32.16/include/linux/vmalloc.h +--- linux-2.6.32.16/include/linux/vmalloc.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/linux/vmalloc.h 2010-07-09 14:50:38.000000000 -0400 @@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining #define VM_MAP 0x00000004 /* vmap()ed pages */ #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 +}) + #endif /* _LINUX_VMALLOC_H */ -diff -urNp linux-2.6.32.15/include/net/irda/ircomm_tty.h linux-2.6.32.15/include/net/irda/ircomm_tty.h ---- linux-2.6.32.15/include/net/irda/ircomm_tty.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/net/irda/ircomm_tty.h 2010-05-28 21:27:16.427051097 -0400 +diff -urNp linux-2.6.32.16/include/net/irda/ircomm_tty.h linux-2.6.32.16/include/net/irda/ircomm_tty.h +--- linux-2.6.32.16/include/net/irda/ircomm_tty.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/net/irda/ircomm_tty.h 2010-07-09 14:50:38.000000000 -0400 @@ -105,8 +105,8 @@ struct ircomm_tty_cb { unsigned short close_delay; 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 /* Protect concurent access to : * o self->open_count -diff -urNp linux-2.6.32.15/include/net/neighbour.h linux-2.6.32.15/include/net/neighbour.h ---- linux-2.6.32.15/include/net/neighbour.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/net/neighbour.h 2010-05-28 21:27:16.427051097 -0400 +diff -urNp linux-2.6.32.16/include/net/neighbour.h linux-2.6.32.16/include/net/neighbour.h +--- linux-2.6.32.16/include/net/neighbour.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/net/neighbour.h 2010-07-09 14:50:38.000000000 -0400 @@ -125,12 +125,12 @@ struct neighbour struct neigh_ops { @@ -47286,9 +47538,9 @@ diff -urNp linux-2.6.32.15/include/net/neighbour.h linux-2.6.32.15/include/net/n }; struct pneigh_entry -diff -urNp linux-2.6.32.15/include/net/sctp/sctp.h linux-2.6.32.15/include/net/sctp/sctp.h ---- linux-2.6.32.15/include/net/sctp/sctp.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/net/sctp/sctp.h 2010-05-28 21:27:16.427051097 -0400 +diff -urNp linux-2.6.32.16/include/net/sctp/sctp.h linux-2.6.32.16/include/net/sctp/sctp.h +--- linux-2.6.32.16/include/net/sctp/sctp.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/net/sctp/sctp.h 2010-07-09 14:50:38.000000000 -0400 @@ -305,8 +305,8 @@ extern int sctp_debug_flag; #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 #define SCTP_ENABLE_DEBUG #define SCTP_DISABLE_DEBUG #define SCTP_ASSERT(expr, str, func) -diff -urNp linux-2.6.32.15/include/net/tcp.h linux-2.6.32.15/include/net/tcp.h ---- linux-2.6.32.15/include/net/tcp.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/net/tcp.h 2010-05-28 21:27:16.427051097 -0400 +diff -urNp linux-2.6.32.16/include/net/tcp.h linux-2.6.32.16/include/net/tcp.h +--- linux-2.6.32.16/include/net/tcp.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/net/tcp.h 2010-07-09 14:50:38.000000000 -0400 @@ -1420,6 +1420,7 @@ enum tcp_seq_states { struct tcp_seq_afinfo { 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 struct file_operations seq_fops; struct seq_operations seq_ops; }; -diff -urNp linux-2.6.32.15/include/net/udp.h linux-2.6.32.15/include/net/udp.h ---- linux-2.6.32.15/include/net/udp.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/net/udp.h 2010-05-28 21:27:16.427051097 -0400 +diff -urNp linux-2.6.32.16/include/net/udp.h linux-2.6.32.16/include/net/udp.h +--- linux-2.6.32.16/include/net/udp.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/net/udp.h 2010-07-09 14:50:38.000000000 -0400 @@ -187,6 +187,7 @@ struct udp_seq_afinfo { char *name; 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 struct file_operations seq_fops; struct seq_operations seq_ops; }; -diff -urNp linux-2.6.32.15/include/sound/ac97_codec.h linux-2.6.32.15/include/sound/ac97_codec.h ---- linux-2.6.32.15/include/sound/ac97_codec.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/sound/ac97_codec.h 2010-05-28 21:27:16.427051097 -0400 +diff -urNp linux-2.6.32.16/include/sound/ac97_codec.h linux-2.6.32.16/include/sound/ac97_codec.h +--- linux-2.6.32.16/include/sound/ac97_codec.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/sound/ac97_codec.h 2010-07-09 14:50:38.000000000 -0400 @@ -419,15 +419,15 @@ struct snd_ac97; @@ -47357,9 +47609,9 @@ diff -urNp linux-2.6.32.15/include/sound/ac97_codec.h linux-2.6.32.15/include/so void *private_data; void (*private_free) (struct snd_ac97 *ac97); /* --- */ -diff -urNp linux-2.6.32.15/include/trace/events/irq.h linux-2.6.32.15/include/trace/events/irq.h ---- linux-2.6.32.15/include/trace/events/irq.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/trace/events/irq.h 2010-05-28 21:27:16.427051097 -0400 +diff -urNp linux-2.6.32.16/include/trace/events/irq.h linux-2.6.32.16/include/trace/events/irq.h +--- linux-2.6.32.16/include/trace/events/irq.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/trace/events/irq.h 2010-07-09 14:50:38.000000000 -0400 @@ -34,7 +34,7 @@ */ 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 TP_ARGS(h, vec), -diff -urNp linux-2.6.32.15/include/video/uvesafb.h linux-2.6.32.15/include/video/uvesafb.h ---- linux-2.6.32.15/include/video/uvesafb.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/include/video/uvesafb.h 2010-05-28 21:27:16.427051097 -0400 +diff -urNp linux-2.6.32.16/include/video/uvesafb.h linux-2.6.32.16/include/video/uvesafb.h +--- linux-2.6.32.16/include/video/uvesafb.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/include/video/uvesafb.h 2010-07-09 14:50:38.000000000 -0400 @@ -177,6 +177,7 @@ struct uvesafb_par { u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ 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 void *pmi_start; void *pmi_pal; u8 *vbe_state_orig; /* -diff -urNp linux-2.6.32.15/init/do_mounts.c linux-2.6.32.15/init/do_mounts.c ---- linux-2.6.32.15/init/do_mounts.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/init/do_mounts.c 2010-05-28 21:27:16.427051097 -0400 +diff -urNp linux-2.6.32.16/init/do_mounts.c linux-2.6.32.16/init/do_mounts.c +--- linux-2.6.32.16/init/do_mounts.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/init/do_mounts.c 2010-07-09 14:50:38.000000000 -0400 @@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa 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 + sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL); + sys_chroot((__force char __user *)"."); } -diff -urNp linux-2.6.32.15/init/do_mounts.h linux-2.6.32.15/init/do_mounts.h ---- linux-2.6.32.15/init/do_mounts.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/init/do_mounts.h 2010-05-28 21:27:16.427051097 -0400 +diff -urNp linux-2.6.32.16/init/do_mounts.h linux-2.6.32.16/init/do_mounts.h +--- linux-2.6.32.16/init/do_mounts.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/init/do_mounts.h 2010-07-09 14:50:38.000000000 -0400 @@ -15,15 +15,15 @@ extern int root_mountflags; 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 return 0; if (!S_ISBLK(stat.st_mode)) return 0; -diff -urNp linux-2.6.32.15/init/do_mounts_initrd.c linux-2.6.32.15/init/do_mounts_initrd.c ---- linux-2.6.32.15/init/do_mounts_initrd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/init/do_mounts_initrd.c 2010-05-28 21:27:16.427051097 -0400 +diff -urNp linux-2.6.32.16/init/do_mounts_initrd.c linux-2.6.32.16/init/do_mounts_initrd.c +--- linux-2.6.32.16/init/do_mounts_initrd.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/init/do_mounts_initrd.c 2010-07-09 14:50:38.000000000 -0400 @@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel sys_close(old_fd);sys_close(root_fd); 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 + sys_unlink((__force const char __user *)"/initrd.image"); return 0; } -diff -urNp linux-2.6.32.15/init/do_mounts_md.c linux-2.6.32.15/init/do_mounts_md.c ---- linux-2.6.32.15/init/do_mounts_md.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/init/do_mounts_md.c 2010-05-28 21:27:16.427051097 -0400 +diff -urNp linux-2.6.32.16/init/do_mounts_md.c linux-2.6.32.16/init/do_mounts_md.c +--- linux-2.6.32.16/init/do_mounts_md.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/init/do_mounts_md.c 2010-07-09 14:50:38.000000000 -0400 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void) partitioned ? "_d" : "", minor, 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 if (fd >= 0) { sys_ioctl(fd, RAID_AUTORUN, raid_autopart); sys_close(fd); -diff -urNp linux-2.6.32.15/init/initramfs.c linux-2.6.32.15/init/initramfs.c ---- linux-2.6.32.15/init/initramfs.c 2010-05-15 13:20:19.362999772 -0400 -+++ linux-2.6.32.15/init/initramfs.c 2010-05-28 21:27:16.427051097 -0400 +diff -urNp linux-2.6.32.16/init/initramfs.c linux-2.6.32.16/init/initramfs.c +--- linux-2.6.32.16/init/initramfs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/init/initramfs.c 2010-07-09 14:50:38.000000000 -0400 @@ -74,7 +74,7 @@ static void __init free_hash(void) } } @@ -47704,9 +47956,9 @@ diff -urNp linux-2.6.32.15/init/initramfs.c linux-2.6.32.15/init/initramfs.c state = SkipIt; next_state = Reset; return 0; -diff -urNp linux-2.6.32.15/init/Kconfig linux-2.6.32.15/init/Kconfig ---- linux-2.6.32.15/init/Kconfig 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/init/Kconfig 2010-05-29 16:35:52.581909467 -0400 +diff -urNp linux-2.6.32.16/init/Kconfig linux-2.6.32.16/init/Kconfig +--- linux-2.6.32.16/init/Kconfig 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/init/Kconfig 2010-07-09 14:50:38.000000000 -0400 @@ -1026,7 +1026,7 @@ config SLUB_DEBUG config COMPAT_BRK @@ -47716,9 +47968,9 @@ diff -urNp linux-2.6.32.15/init/Kconfig linux-2.6.32.15/init/Kconfig help Randomizing heap placement makes heap exploits harder, but it also breaks ancient binaries (including anything libc5 based). -diff -urNp linux-2.6.32.15/init/main.c linux-2.6.32.15/init/main.c ---- linux-2.6.32.15/init/main.c 2010-04-04 20:41:50.060586306 -0400 -+++ linux-2.6.32.15/init/main.c 2010-06-19 10:03:39.368801195 -0400 +diff -urNp linux-2.6.32.16/init/main.c linux-2.6.32.16/init/main.c +--- linux-2.6.32.16/init/main.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/init/main.c 2010-07-09 14:50:38.000000000 -0400 @@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) #ifdef CONFIG_TC 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 /* * Ok, we have completed the initial bootup, and * we're essentially up and running. Get rid of the -diff -urNp linux-2.6.32.15/init/noinitramfs.c linux-2.6.32.15/init/noinitramfs.c ---- linux-2.6.32.15/init/noinitramfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/init/noinitramfs.c 2010-05-28 21:27:16.427051097 -0400 +diff -urNp linux-2.6.32.16/init/noinitramfs.c linux-2.6.32.16/init/noinitramfs.c +--- linux-2.6.32.16/init/noinitramfs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/init/noinitramfs.c 2010-07-09 14:50:38.000000000 -0400 @@ -29,7 +29,7 @@ static int __init default_rootfs(void) { int err; @@ -47884,9 +48136,9 @@ diff -urNp linux-2.6.32.15/init/noinitramfs.c linux-2.6.32.15/init/noinitramfs.c if (err < 0) goto out; -diff -urNp linux-2.6.32.15/ipc/ipc_sysctl.c linux-2.6.32.15/ipc/ipc_sysctl.c ---- linux-2.6.32.15/ipc/ipc_sysctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/ipc/ipc_sysctl.c 2010-05-28 21:27:16.427051097 -0400 +diff -urNp linux-2.6.32.16/ipc/ipc_sysctl.c linux-2.6.32.16/ipc/ipc_sysctl.c +--- linux-2.6.32.16/ipc/ipc_sysctl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/ipc/ipc_sysctl.c 2010-07-09 14:50:38.000000000 -0400 @@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[] .extra1 = &zero, .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 }; static int __init ipc_sysctl_init(void) -diff -urNp linux-2.6.32.15/ipc/mqueue.c linux-2.6.32.15/ipc/mqueue.c ---- linux-2.6.32.15/ipc/mqueue.c 2010-04-04 20:41:50.060586306 -0400 -+++ linux-2.6.32.15/ipc/mqueue.c 2010-05-28 21:27:16.431938706 -0400 +diff -urNp linux-2.6.32.16/ipc/mqueue.c linux-2.6.32.16/ipc/mqueue.c +--- linux-2.6.32.16/ipc/mqueue.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/ipc/mqueue.c 2010-07-09 14:50:38.000000000 -0400 @@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st mq_bytes = (mq_msg_tblsz + (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 spin_lock(&mq_lock); if (u->mq_bytes + mq_bytes < u->mq_bytes || u->mq_bytes + mq_bytes > -diff -urNp linux-2.6.32.15/ipc/shm.c linux-2.6.32.15/ipc/shm.c ---- linux-2.6.32.15/ipc/shm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/ipc/shm.c 2010-05-28 21:27:16.431938706 -0400 +diff -urNp linux-2.6.32.16/ipc/shm.c linux-2.6.32.16/ipc/shm.c +--- linux-2.6.32.16/ipc/shm.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/ipc/shm.c 2010-07-09 14:50:38.000000000 -0400 @@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name static int sysvipc_shm_proc_show(struct seq_file *s, void *it); #endif @@ -47971,9 +48223,9 @@ diff -urNp linux-2.6.32.15/ipc/shm.c linux-2.6.32.15/ipc/shm.c size = i_size_read(path.dentry->d_inode); shm_unlock(shp); -diff -urNp linux-2.6.32.15/kernel/acct.c linux-2.6.32.15/kernel/acct.c ---- linux-2.6.32.15/kernel/acct.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/acct.c 2010-05-28 21:27:16.431938706 -0400 +diff -urNp linux-2.6.32.16/kernel/acct.c linux-2.6.32.16/kernel/acct.c +--- linux-2.6.32.16/kernel/acct.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/acct.c 2010-07-09 14:50:38.000000000 -0400 @@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a */ 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 sizeof(acct_t), &file->f_pos); current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; set_fs(fs); -diff -urNp linux-2.6.32.15/kernel/capability.c linux-2.6.32.15/kernel/capability.c ---- linux-2.6.32.15/kernel/capability.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/capability.c 2010-05-28 21:27:16.431938706 -0400 +diff -urNp linux-2.6.32.16/kernel/capability.c linux-2.6.32.16/kernel/capability.c +--- linux-2.6.32.16/kernel/capability.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/capability.c 2010-07-09 14:50:38.000000000 -0400 @@ -306,10 +306,21 @@ int capable(int cap) BUG(); } @@ -48009,9 +48261,9 @@ diff -urNp linux-2.6.32.15/kernel/capability.c linux-2.6.32.15/kernel/capability + EXPORT_SYMBOL(capable); +EXPORT_SYMBOL(capable_nolog); -diff -urNp linux-2.6.32.15/kernel/configs.c linux-2.6.32.15/kernel/configs.c ---- linux-2.6.32.15/kernel/configs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/configs.c 2010-05-28 21:27:16.431938706 -0400 +diff -urNp linux-2.6.32.16/kernel/configs.c linux-2.6.32.16/kernel/configs.c +--- linux-2.6.32.16/kernel/configs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/configs.c 2010-07-09 14:50:38.000000000 -0400 @@ -73,8 +73,19 @@ static int __init ikconfig_init(void) struct proc_dir_entry *entry; @@ -48032,9 +48284,9 @@ diff -urNp linux-2.6.32.15/kernel/configs.c linux-2.6.32.15/kernel/configs.c if (!entry) return -ENOMEM; -diff -urNp linux-2.6.32.15/kernel/cpu.c linux-2.6.32.15/kernel/cpu.c ---- linux-2.6.32.15/kernel/cpu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/cpu.c 2010-05-28 21:27:16.431938706 -0400 +diff -urNp linux-2.6.32.16/kernel/cpu.c linux-2.6.32.16/kernel/cpu.c +--- linux-2.6.32.16/kernel/cpu.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/cpu.c 2010-07-09 14:50:38.000000000 -0400 @@ -19,7 +19,7 @@ /* Serializes the updates to cpu_online_mask, cpu_present_mask */ 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 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. * Should always be manipulated under cpu_add_remove_lock -diff -urNp linux-2.6.32.15/kernel/cred.c linux-2.6.32.15/kernel/cred.c ---- linux-2.6.32.15/kernel/cred.c 2010-05-15 13:20:19.362999772 -0400 -+++ linux-2.6.32.15/kernel/cred.c 2010-05-28 21:27:16.431938706 -0400 +diff -urNp linux-2.6.32.16/kernel/cred.c linux-2.6.32.16/kernel/cred.c +--- linux-2.6.32.16/kernel/cred.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/cred.c 2010-07-09 14:50:38.000000000 -0400 @@ -520,6 +520,8 @@ int commit_creds(struct cred *new) 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 /* dumpability changes */ if (old->euid != new->euid || old->egid != new->egid || -diff -urNp linux-2.6.32.15/kernel/exit.c linux-2.6.32.15/kernel/exit.c ---- linux-2.6.32.15/kernel/exit.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/exit.c 2010-05-28 21:27:16.431938706 -0400 +diff -urNp linux-2.6.32.16/kernel/exit.c linux-2.6.32.16/kernel/exit.c +--- linux-2.6.32.16/kernel/exit.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/exit.c 2010-07-09 14:50:38.000000000 -0400 @@ -56,6 +56,10 @@ #include <asm/mmu_context.h> #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 get_task_struct(p); read_unlock(&tasklist_lock); -diff -urNp linux-2.6.32.15/kernel/fork.c linux-2.6.32.15/kernel/fork.c ---- linux-2.6.32.15/kernel/fork.c 2010-05-28 20:16:44.458924952 -0400 -+++ linux-2.6.32.15/kernel/fork.c 2010-05-28 21:27:16.436716677 -0400 +diff -urNp linux-2.6.32.16/kernel/fork.c linux-2.6.32.16/kernel/fork.c +--- linux-2.6.32.16/kernel/fork.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/fork.c 2010-07-09 14:50:38.000000000 -0400 @@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru *stackend = STACK_END_MAGIC; /* for overflow detection */ @@ -48211,7 +48463,7 @@ diff -urNp linux-2.6.32.15/kernel/fork.c linux-2.6.32.15/kernel/fork.c /* a new mm has just been created */ arch_dup_mmap(oldmm, mm); retval = 0; -@@ -731,7 +757,7 @@ static int copy_fs(unsigned long clone_f +@@ -731,13 +757,14 @@ static int copy_fs(unsigned long clone_f write_unlock(&fs->lock); return -EAGAIN; } @@ -48220,7 +48472,14 @@ diff -urNp linux-2.6.32.15/kernel/fork.c linux-2.6.32.15/kernel/fork.c write_unlock(&fs->lock); return 0; } -@@ -1027,10 +1053,13 @@ static struct task_struct *copy_process( + tsk->fs = copy_fs_struct(fs); + if (!tsk->fs) + return -ENOMEM; ++ gr_set_chroot_entries(tsk, &tsk->fs->root); + return 0; + } + +@@ -1027,10 +1054,13 @@ static struct task_struct *copy_process( DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled); #endif retval = -EAGAIN; @@ -48236,18 +48495,7 @@ diff -urNp linux-2.6.32.15/kernel/fork.c linux-2.6.32.15/kernel/fork.c goto bad_fork_free; } -@@ -1059,6 +1088,10 @@ static struct task_struct *copy_process( - p->vfork_done = NULL; - spin_lock_init(&p->alloc_lock); - -+#ifdef CONFIG_GRKERNSEC -+ rwlock_init(&p->gr_fs_lock); -+#endif -+ - init_sigpending(&p->pending); - - p->utime = cputime_zero; -@@ -1177,6 +1210,8 @@ static struct task_struct *copy_process( +@@ -1177,6 +1207,8 @@ static struct task_struct *copy_process( goto bad_fork_free_pid; } @@ -48256,7 +48504,7 @@ diff -urNp linux-2.6.32.15/kernel/fork.c linux-2.6.32.15/kernel/fork.c p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL; /* * Clear TID on mm_release()? -@@ -1342,6 +1377,8 @@ bad_fork_cleanup_count: +@@ -1342,6 +1374,8 @@ bad_fork_cleanup_count: bad_fork_free: free_task(p); fork_out: @@ -48265,7 +48513,7 @@ diff -urNp linux-2.6.32.15/kernel/fork.c linux-2.6.32.15/kernel/fork.c return ERR_PTR(retval); } -@@ -1435,6 +1472,8 @@ long do_fork(unsigned long clone_flags, +@@ -1435,6 +1469,8 @@ long do_fork(unsigned long clone_flags, if (clone_flags & CLONE_PARENT_SETTID) put_user(nr, parent_tidptr); @@ -48274,7 +48522,7 @@ diff -urNp linux-2.6.32.15/kernel/fork.c linux-2.6.32.15/kernel/fork.c if (clone_flags & CLONE_VFORK) { p->vfork_done = &vfork; init_completion(&vfork); -@@ -1567,7 +1606,7 @@ static int unshare_fs(unsigned long unsh +@@ -1567,7 +1603,7 @@ static int unshare_fs(unsigned long unsh return 0; /* 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 return 0; *new_fsp = copy_fs_struct(fs); -@@ -1687,14 +1726,18 @@ SYSCALL_DEFINE1(unshare, unsigned long, - task_lock(current); - - if (new_fs) { -+ unsigned long flags; -+ -+ gr_fs_write_lock_irqsave(current, flags); +@@ -1690,7 +1726,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, fs = current->fs; write_lock(&fs->lock); current->fs = new_fs; - if (--fs->users) ++ gr_set_chroot_entries(current, ¤t->fs->root); + if (atomic_dec_return(&fs->users)) new_fs = NULL; else new_fs = fs; - write_unlock(&fs->lock); -+ gr_fs_write_unlock_irqrestore(current, flags); - } - - if (new_mm) { -diff -urNp linux-2.6.32.15/kernel/futex.c linux-2.6.32.15/kernel/futex.c ---- linux-2.6.32.15/kernel/futex.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/futex.c 2010-05-28 21:27:16.439128347 -0400 +diff -urNp linux-2.6.32.16/kernel/futex.c linux-2.6.32.16/kernel/futex.c +--- linux-2.6.32.16/kernel/futex.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/futex.c 2010-07-09 14:50:38.000000000 -0400 @@ -54,6 +54,7 @@ #include <linux/mount.h> #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 { unsigned long uentry; -diff -urNp linux-2.6.32.15/kernel/futex_compat.c linux-2.6.32.15/kernel/futex_compat.c ---- linux-2.6.32.15/kernel/futex_compat.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/futex_compat.c 2010-05-28 21:27:16.439128347 -0400 +diff -urNp linux-2.6.32.16/kernel/futex_compat.c linux-2.6.32.16/kernel/futex_compat.c +--- linux-2.6.32.16/kernel/futex_compat.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/futex_compat.c 2010-07-09 15:16:46.000000000 -0400 @@ -10,6 +10,7 @@ #include <linux/compat.h> #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 struct compat_robust_list_head __user *head; unsigned long ret; - const struct cred *cred = current_cred(), *pcred; -+ const struct cred *cred = current_cred(); +#ifndef CONFIG_GRKERNSEC_PROC_MEMMAP ++ const struct cred *cred = current_cred(); + const struct cred *pcred; +#endif @@ -48413,9 +48651,9 @@ diff -urNp linux-2.6.32.15/kernel/futex_compat.c linux-2.6.32.15/kernel/futex_co head = p->compat_robust_list; read_unlock(&tasklist_lock); } -diff -urNp linux-2.6.32.15/kernel/gcov/base.c linux-2.6.32.15/kernel/gcov/base.c ---- linux-2.6.32.15/kernel/gcov/base.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/gcov/base.c 2010-05-28 21:27:16.439128347 -0400 +diff -urNp linux-2.6.32.16/kernel/gcov/base.c linux-2.6.32.16/kernel/gcov/base.c +--- linux-2.6.32.16/kernel/gcov/base.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/gcov/base.c 2010-07-09 14:50:38.000000000 -0400 @@ -102,11 +102,6 @@ void gcov_enable_events(void) } @@ -48437,9 +48675,9 @@ diff -urNp linux-2.6.32.15/kernel/gcov/base.c linux-2.6.32.15/kernel/gcov/base.c if (prev) prev->next = info->next; else -diff -urNp linux-2.6.32.15/kernel/hrtimer.c linux-2.6.32.15/kernel/hrtimer.c ---- linux-2.6.32.15/kernel/hrtimer.c 2010-04-04 20:41:50.064534828 -0400 -+++ linux-2.6.32.15/kernel/hrtimer.c 2010-05-28 21:27:16.439128347 -0400 +diff -urNp linux-2.6.32.16/kernel/hrtimer.c linux-2.6.32.16/kernel/hrtimer.c +--- linux-2.6.32.16/kernel/hrtimer.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/hrtimer.c 2010-07-09 14:50:38.000000000 -0400 @@ -1382,7 +1382,7 @@ void hrtimer_peek_ahead_timers(void) local_irq_restore(flags); } @@ -48449,9 +48687,9 @@ diff -urNp linux-2.6.32.15/kernel/hrtimer.c linux-2.6.32.15/kernel/hrtimer.c { hrtimer_peek_ahead_timers(); } -diff -urNp linux-2.6.32.15/kernel/kallsyms.c linux-2.6.32.15/kernel/kallsyms.c ---- linux-2.6.32.15/kernel/kallsyms.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/kallsyms.c 2010-05-28 21:27:16.439128347 -0400 +diff -urNp linux-2.6.32.16/kernel/kallsyms.c linux-2.6.32.16/kernel/kallsyms.c +--- linux-2.6.32.16/kernel/kallsyms.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/kallsyms.c 2010-07-09 14:50:44.000000000 -0400 @@ -11,6 +11,9 @@ * Changed the compression method from stem compression to "table lookup" * 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 #include <linux/kallsyms.h> #include <linux/module.h> #include <linux/init.h> -@@ -51,6 +54,9 @@ extern const unsigned long kallsyms_mark +@@ -51,23 +54,48 @@ extern const unsigned long kallsyms_mark static inline int is_kernel_inittext(unsigned long addr) { + if (system_state != SYSTEM_BOOTING) + return 0; + ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) ++ if (addr >= ktla_ktva((unsigned long)_sinittext) ++ && addr <= ktla_ktva((unsigned long)_einittext)) ++#else if (addr >= (unsigned long)_sinittext && addr <= (unsigned long)_einittext) ++#endif return 1; -@@ -67,6 +73,26 @@ static inline int is_kernel_text(unsigne ++ + return 0; + } - static inline int is_kernel(unsigned long addr) + static inline int is_kernel_text(unsigned long addr) { -+ if (is_kernel_inittext(addr)) -+ return 1; + +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) -+#ifdef CONFIG_MODULES -+ if ((unsigned long)MODULES_EXEC_VADDR <= ktla_ktva(addr) && ktla_ktva(addr) <= (unsigned long)MODULES_EXEC_END) -+ return 0; ++ if (addr >= ktla_ktva((unsigned long)_stext) ++ && addr <= ktla_ktva((unsigned long)_etext)) ++#else + if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) || + arch_is_kernel_text(addr)) +#endif + return 1; + -+ if (is_kernel_text(addr)) -+ return 1; + return in_gate_area_no_task(addr); + } + + static inline int is_kernel(unsigned long addr) + { + -+ if (ktla_ktva((unsigned long)_stext) <= addr && addr < ktla_ktva((unsigned long)_etext)) ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) ++ if (is_kernel_text(addr) || is_kernel_inittext(addr)) + return 1; + -+ if ((addr >= (unsigned long)_sdata && addr <= (unsigned long)_end)) -+ return 1; -+ return in_gate_area_no_task(addr); ++ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end) ++#else + if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end) +#endif + - if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end) return 1; return in_gate_area_no_task(addr); -@@ -413,7 +439,6 @@ static unsigned long get_ksymbol_core(st + } +@@ -413,7 +441,6 @@ static unsigned long get_ksymbol_core(st static void reset_iter(struct kallsym_iter *iter, loff_t new_pos) { @@ -48507,7 +48757,7 @@ diff -urNp linux-2.6.32.15/kernel/kallsyms.c linux-2.6.32.15/kernel/kallsyms.c iter->nameoff = get_symbol_offset(new_pos); iter->pos = new_pos; } -@@ -461,6 +486,11 @@ static int s_show(struct seq_file *m, vo +@@ -461,6 +488,11 @@ static int s_show(struct seq_file *m, vo { struct kallsym_iter *iter = m->private; @@ -48519,7 +48769,7 @@ diff -urNp linux-2.6.32.15/kernel/kallsyms.c linux-2.6.32.15/kernel/kallsyms.c /* Some debugging symbols have no name. Ignore them. */ if (!iter->name[0]) return 0; -@@ -501,7 +531,7 @@ static int kallsyms_open(struct inode *i +@@ -501,7 +533,7 @@ static int kallsyms_open(struct inode *i struct kallsym_iter *iter; int ret; @@ -48528,9 +48778,9 @@ diff -urNp linux-2.6.32.15/kernel/kallsyms.c linux-2.6.32.15/kernel/kallsyms.c if (!iter) return -ENOMEM; reset_iter(iter, 0); -diff -urNp linux-2.6.32.15/kernel/kgdb.c linux-2.6.32.15/kernel/kgdb.c ---- linux-2.6.32.15/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/kgdb.c 2010-05-28 21:27:16.439128347 -0400 +diff -urNp linux-2.6.32.16/kernel/kgdb.c linux-2.6.32.16/kernel/kgdb.c +--- linux-2.6.32.16/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/kgdb.c 2010-07-09 14:50:38.000000000 -0400 @@ -86,7 +86,7 @@ static int kgdb_io_module_registered; /* Guard for recursive entry */ 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 { BUG_ON(kgdb_connected); -diff -urNp linux-2.6.32.15/kernel/kmod.c linux-2.6.32.15/kernel/kmod.c ---- linux-2.6.32.15/kernel/kmod.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/kmod.c 2010-05-28 21:27:16.439128347 -0400 +diff -urNp linux-2.6.32.16/kernel/kmod.c linux-2.6.32.16/kernel/kmod.c +--- linux-2.6.32.16/kernel/kmod.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/kmod.c 2010-07-09 14:50:38.000000000 -0400 @@ -90,6 +90,18 @@ int __request_module(bool wait, const ch if (ret >= MODULE_NAME_LEN) return -ENAMETOOLONG; @@ -48580,9 +48830,9 @@ diff -urNp linux-2.6.32.15/kernel/kmod.c linux-2.6.32.15/kernel/kmod.c /* If modprobe needs a service that is in a module, we get a recursive * loop. Limit the number of running kmod threads to max_threads/2 or * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method -diff -urNp linux-2.6.32.15/kernel/kprobes.c linux-2.6.32.15/kernel/kprobes.c ---- linux-2.6.32.15/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/kprobes.c 2010-05-28 21:27:16.439128347 -0400 +diff -urNp linux-2.6.32.16/kernel/kprobes.c linux-2.6.32.16/kernel/kprobes.c +--- linux-2.6.32.16/kernel/kprobes.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/kprobes.c 2010-07-09 14:50:38.000000000 -0400 @@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_ * kernel image and loaded module images reside. This is required * 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 head = &kprobe_table[i]; preempt_disable(); -diff -urNp linux-2.6.32.15/kernel/lockdep.c linux-2.6.32.15/kernel/lockdep.c ---- linux-2.6.32.15/kernel/lockdep.c 2010-06-01 15:02:53.017540947 -0400 -+++ linux-2.6.32.15/kernel/lockdep.c 2010-06-01 15:06:14.633871339 -0400 +diff -urNp linux-2.6.32.16/kernel/lockdep.c linux-2.6.32.16/kernel/lockdep.c +--- linux-2.6.32.16/kernel/lockdep.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/lockdep.c 2010-07-09 14:50:38.000000000 -0400 @@ -577,6 +577,10 @@ static int static_obj(void *obj) int i; #endif @@ -48651,9 +48901,9 @@ diff -urNp linux-2.6.32.15/kernel/lockdep.c linux-2.6.32.15/kernel/lockdep.c printk("the code is fine but needs lockdep annotation.\n"); printk("turning off the locking correctness validator.\n"); dump_stack(); -diff -urNp linux-2.6.32.15/kernel/lockdep_proc.c linux-2.6.32.15/kernel/lockdep_proc.c ---- linux-2.6.32.15/kernel/lockdep_proc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/lockdep_proc.c 2010-05-28 21:27:16.439128347 -0400 +diff -urNp linux-2.6.32.16/kernel/lockdep_proc.c linux-2.6.32.16/kernel/lockdep_proc.c +--- linux-2.6.32.16/kernel/lockdep_proc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/lockdep_proc.c 2010-07-09 14:50:38.000000000 -0400 @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v 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_ const char *name = class->name; if (!name) { -diff -urNp linux-2.6.32.15/kernel/module.c linux-2.6.32.15/kernel/module.c ---- linux-2.6.32.15/kernel/module.c 2010-06-01 15:02:53.053672396 -0400 -+++ linux-2.6.32.15/kernel/module.c 2010-06-01 15:03:15.410128488 -0400 +diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c +--- linux-2.6.32.16/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/module.c 2010-07-09 14:50:38.000000000 -0400 @@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq static BLOCKING_NOTIFIER_HEAD(module_notify_list); @@ -49205,9 +49455,9 @@ diff -urNp linux-2.6.32.15/kernel/module.c linux-2.6.32.15/kernel/module.c mod = NULL; } return mod; -diff -urNp linux-2.6.32.15/kernel/panic.c linux-2.6.32.15/kernel/panic.c ---- linux-2.6.32.15/kernel/panic.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/panic.c 2010-05-28 21:27:16.442904432 -0400 +diff -urNp linux-2.6.32.16/kernel/panic.c linux-2.6.32.16/kernel/panic.c +--- linux-2.6.32.16/kernel/panic.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/panic.c 2010-07-09 14:50:38.000000000 -0400 @@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null); */ 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 __builtin_return_address(0)); } EXPORT_SYMBOL(__stack_chk_fail); -diff -urNp linux-2.6.32.15/kernel/params.c linux-2.6.32.15/kernel/params.c ---- linux-2.6.32.15/kernel/params.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/params.c 2010-05-28 21:27:16.442904432 -0400 +diff -urNp linux-2.6.32.16/kernel/params.c linux-2.6.32.16/kernel/params.c +--- linux-2.6.32.16/kernel/params.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/params.c 2010-07-09 14:50:38.000000000 -0400 @@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct return ret; } @@ -49239,9 +49489,9 @@ diff -urNp linux-2.6.32.15/kernel/params.c linux-2.6.32.15/kernel/params.c .filter = uevent_filter, }; -diff -urNp linux-2.6.32.15/kernel/pid.c linux-2.6.32.15/kernel/pid.c ---- linux-2.6.32.15/kernel/pid.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/pid.c 2010-05-28 21:27:16.442904432 -0400 +diff -urNp linux-2.6.32.16/kernel/pid.c linux-2.6.32.16/kernel/pid.c +--- linux-2.6.32.16/kernel/pid.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/pid.c 2010-07-09 14:50:38.000000000 -0400 @@ -33,6 +33,7 @@ #include <linux/rculist.h> #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 } struct task_struct *find_task_by_vpid(pid_t vnr) -diff -urNp linux-2.6.32.15/kernel/posix-cpu-timers.c linux-2.6.32.15/kernel/posix-cpu-timers.c ---- linux-2.6.32.15/kernel/posix-cpu-timers.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/posix-cpu-timers.c 2010-05-28 21:27:16.442904432 -0400 +diff -urNp linux-2.6.32.16/kernel/posix-cpu-timers.c linux-2.6.32.16/kernel/posix-cpu-timers.c +--- linux-2.6.32.16/kernel/posix-cpu-timers.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/posix-cpu-timers.c 2010-07-09 14:50:38.000000000 -0400 @@ -6,6 +6,7 @@ #include <linux/posix-timers.h> #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 #include <asm/uaccess.h> #include <linux/kernel_stat.h> #include <trace/events/timer.h> -@@ -1044,6 +1045,7 @@ static void check_thread_timers(struct t - __group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk); - return; - } -+ gr_learn_resource(tsk, RLIMIT_RTTIME, tsk->rt.timeout, 1); - if (tsk->rt.timeout > DIV_ROUND_UP(*soft, USEC_PER_SEC/HZ)) { +@@ -1035,6 +1036,7 @@ static void check_thread_timers(struct t + unsigned long hard = sig->rlim[RLIMIT_RTTIME].rlim_max; + unsigned long *soft = &sig->rlim[RLIMIT_RTTIME].rlim_cur; + ++ gr_learn_resource(tsk, RLIMIT_RTTIME, tsk->rt.timeout * (USEC_PER_SEC/HZ), 1); + if (hard != RLIM_INFINITY && + tsk->rt.timeout > DIV_ROUND_UP(hard, USEC_PER_SEC/HZ)) { /* - * At the soft limit, send a SIGXCPU every second. -@@ -1206,6 +1208,7 @@ static void check_process_timers(struct - __group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk); - return; - } +@@ -1198,6 +1200,7 @@ static void check_process_timers(struct + if (sig->rlim[RLIMIT_CPU].rlim_cur != RLIM_INFINITY) { + unsigned long psecs = cputime_to_secs(ptime); + cputime_t x; + gr_learn_resource(tsk, RLIMIT_CPU, psecs, 0); - if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) { + if (psecs >= sig->rlim[RLIMIT_CPU].rlim_max) { /* - * At the soft limit, send a SIGXCPU every second. -diff -urNp linux-2.6.32.15/kernel/power/hibernate.c linux-2.6.32.15/kernel/power/hibernate.c ---- linux-2.6.32.15/kernel/power/hibernate.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/power/hibernate.c 2010-05-28 21:27:16.442904432 -0400 + * At the hard limit, we just die. +diff -urNp linux-2.6.32.16/kernel/power/hibernate.c linux-2.6.32.16/kernel/power/hibernate.c +--- linux-2.6.32.16/kernel/power/hibernate.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/power/hibernate.c 2010-07-09 14:50:38.000000000 -0400 @@ -48,14 +48,14 @@ enum { 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 { if (ops && !(ops->begin && ops->end && ops->pre_snapshot && ops->prepare && ops->finish && ops->enter && ops->pre_restore -diff -urNp linux-2.6.32.15/kernel/power/poweroff.c linux-2.6.32.15/kernel/power/poweroff.c ---- linux-2.6.32.15/kernel/power/poweroff.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/power/poweroff.c 2010-05-28 21:27:16.442904432 -0400 +diff -urNp linux-2.6.32.16/kernel/power/poweroff.c linux-2.6.32.16/kernel/power/poweroff.c +--- linux-2.6.32.16/kernel/power/poweroff.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/power/poweroff.c 2010-07-09 14:50:38.000000000 -0400 @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof .enable_mask = SYSRQ_ENABLE_BOOT, }; @@ -49334,9 +49584,9 @@ diff -urNp linux-2.6.32.15/kernel/power/poweroff.c linux-2.6.32.15/kernel/power/ { register_sysrq_key('o', &sysrq_poweroff_op); return 0; -diff -urNp linux-2.6.32.15/kernel/power/process.c linux-2.6.32.15/kernel/power/process.c ---- linux-2.6.32.15/kernel/power/process.c 2010-04-29 17:49:38.590000225 -0400 -+++ linux-2.6.32.15/kernel/power/process.c 2010-05-28 21:27:16.442904432 -0400 +diff -urNp linux-2.6.32.16/kernel/power/process.c linux-2.6.32.16/kernel/power/process.c +--- linux-2.6.32.16/kernel/power/process.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/power/process.c 2010-07-09 14:50:38.000000000 -0400 @@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_ struct timeval start, end; 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 do_gettimeofday(&end); elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start); -diff -urNp linux-2.6.32.15/kernel/power/suspend.c linux-2.6.32.15/kernel/power/suspend.c ---- linux-2.6.32.15/kernel/power/suspend.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/power/suspend.c 2010-05-28 21:27:16.442904432 -0400 +diff -urNp linux-2.6.32.16/kernel/power/suspend.c linux-2.6.32.16/kernel/power/suspend.c +--- linux-2.6.32.16/kernel/power/suspend.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/power/suspend.c 2010-07-09 14:50:38.000000000 -0400 @@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M [PM_SUSPEND_MEM] = "mem", }; @@ -49395,9 +49645,9 @@ diff -urNp linux-2.6.32.15/kernel/power/suspend.c linux-2.6.32.15/kernel/power/s { mutex_lock(&pm_mutex); suspend_ops = ops; -diff -urNp linux-2.6.32.15/kernel/printk.c linux-2.6.32.15/kernel/printk.c ---- linux-2.6.32.15/kernel/printk.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/printk.c 2010-05-28 21:27:16.442904432 -0400 +diff -urNp linux-2.6.32.16/kernel/printk.c linux-2.6.32.16/kernel/printk.c +--- linux-2.6.32.16/kernel/printk.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/printk.c 2010-07-09 14:50:38.000000000 -0400 @@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf char c; 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 error = security_syslog(type); if (error) return error; -diff -urNp linux-2.6.32.15/kernel/ptrace.c linux-2.6.32.15/kernel/ptrace.c ---- linux-2.6.32.15/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/ptrace.c 2010-05-28 21:27:16.442904432 -0400 +diff -urNp linux-2.6.32.16/kernel/ptrace.c linux-2.6.32.16/kernel/ptrace.c +--- linux-2.6.32.16/kernel/ptrace.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/ptrace.c 2010-07-09 14:50:38.000000000 -0400 @@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru cred->gid != tcred->egid || 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 } int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data) -diff -urNp linux-2.6.32.15/kernel/rcutree.c linux-2.6.32.15/kernel/rcutree.c ---- linux-2.6.32.15/kernel/rcutree.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/rcutree.c 2010-05-28 21:27:16.442904432 -0400 +diff -urNp linux-2.6.32.16/kernel/rcutree.c linux-2.6.32.16/kernel/rcutree.c +--- linux-2.6.32.16/kernel/rcutree.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/rcutree.c 2010-07-09 14:50:38.000000000 -0400 @@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state /* * 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 { /* * Memory references from any prior RCU read-side critical sections -diff -urNp linux-2.6.32.15/kernel/relay.c linux-2.6.32.15/kernel/relay.c ---- linux-2.6.32.15/kernel/relay.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/relay.c 2010-05-28 21:27:16.442904432 -0400 +diff -urNp linux-2.6.32.16/kernel/relay.c linux-2.6.32.16/kernel/relay.c +--- linux-2.6.32.16/kernel/relay.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/relay.c 2010-07-09 14:50:38.000000000 -0400 @@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi return 0; @@ -49518,9 +49768,9 @@ diff -urNp linux-2.6.32.15/kernel/relay.c linux-2.6.32.15/kernel/relay.c return ret; if (read_start + ret == nonpad_end) -diff -urNp linux-2.6.32.15/kernel/resource.c linux-2.6.32.15/kernel/resource.c ---- linux-2.6.32.15/kernel/resource.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/resource.c 2010-05-28 21:27:16.442904432 -0400 +diff -urNp linux-2.6.32.16/kernel/resource.c linux-2.6.32.16/kernel/resource.c +--- linux-2.6.32.16/kernel/resource.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/resource.c 2010-07-09 14:50:38.000000000 -0400 @@ -132,8 +132,18 @@ static const struct file_operations proc 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 return 0; } __initcall(ioresources_init); -diff -urNp linux-2.6.32.15/kernel/sched.c linux-2.6.32.15/kernel/sched.c ---- linux-2.6.32.15/kernel/sched.c 2010-04-29 17:49:38.609495328 -0400 -+++ linux-2.6.32.15/kernel/sched.c 2010-05-28 21:27:16.447114196 -0400 +diff -urNp linux-2.6.32.16/kernel/sched.c linux-2.6.32.16/kernel/sched.c +--- linux-2.6.32.16/kernel/sched.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/sched.c 2010-07-09 14:50:38.000000000 -0400 @@ -4841,7 +4841,7 @@ out: * In CONFIG_NO_HZ case, the idle load balance owner will do the * 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 return -EPERM; retval = security_task_setnice(current, nice); -@@ -6293,6 +6296,8 @@ recheck: - if (rt_policy(policy)) { - unsigned long rlim_rtprio; - -+ gr_learn_resource(p, RLIMIT_RTPRIO, param->sched_priority, 1); -+ - if (!lock_task_sighand(p, &flags)) - return -ESRCH; - rlim_rtprio = p->signal->rlim[RLIMIT_RTPRIO].rlim_cur; -@@ -7452,7 +7457,7 @@ static struct ctl_table sd_ctl_dir[] = { +@@ -7452,7 +7455,7 @@ static struct ctl_table sd_ctl_dir[] = { .procname = "sched_domain", .mode = 0555, }, @@ -49589,7 +49830,7 @@ diff -urNp linux-2.6.32.15/kernel/sched.c linux-2.6.32.15/kernel/sched.c }; static struct ctl_table sd_ctl_root[] = { -@@ -7462,7 +7467,7 @@ static struct ctl_table sd_ctl_root[] = +@@ -7462,7 +7465,7 @@ static struct ctl_table sd_ctl_root[] = .mode = 0555, .child = sd_ctl_dir, }, @@ -49598,9 +49839,9 @@ diff -urNp linux-2.6.32.15/kernel/sched.c linux-2.6.32.15/kernel/sched.c }; static struct ctl_table *sd_alloc_ctl_entry(int n) -diff -urNp linux-2.6.32.15/kernel/signal.c linux-2.6.32.15/kernel/signal.c ---- linux-2.6.32.15/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/signal.c 2010-05-28 21:27:16.447114196 -0400 +diff -urNp linux-2.6.32.16/kernel/signal.c linux-2.6.32.16/kernel/signal.c +--- linux-2.6.32.16/kernel/signal.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/signal.c 2010-07-09 14:50:38.000000000 -0400 @@ -41,12 +41,12 @@ 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 if (is_global_init(tsk)) return 1; if (handler != SIG_IGN && handler != SIG_DFL) -@@ -625,6 +628,9 @@ static int check_kill_permission(int sig +@@ -627,6 +630,9 @@ static int check_kill_permission(int sig } } @@ -49654,7 +49895,7 @@ diff -urNp linux-2.6.32.15/kernel/signal.c linux-2.6.32.15/kernel/signal.c return security_task_kill(t, info, sig, 0); } -@@ -966,7 +972,7 @@ __group_send_sig_info(int sig, struct si +@@ -968,7 +974,7 @@ __group_send_sig_info(int sig, struct si return send_signal(sig, info, p, 1); } @@ -49663,7 +49904,7 @@ diff -urNp linux-2.6.32.15/kernel/signal.c linux-2.6.32.15/kernel/signal.c specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t) { return send_signal(sig, info, t, 0); -@@ -1020,6 +1026,9 @@ force_sig_info(int sig, struct siginfo * +@@ -1022,6 +1028,9 @@ force_sig_info(int sig, struct siginfo * ret = specific_send_sig_info(sig, info, t); spin_unlock_irqrestore(&t->sighand->siglock, flags); @@ -49673,7 +49914,7 @@ diff -urNp linux-2.6.32.15/kernel/signal.c linux-2.6.32.15/kernel/signal.c return ret; } -@@ -1079,8 +1088,11 @@ int group_send_sig_info(int sig, struct +@@ -1081,8 +1090,11 @@ int group_send_sig_info(int sig, struct { int ret = check_kill_permission(sig, info, p); @@ -49686,9 +49927,9 @@ diff -urNp linux-2.6.32.15/kernel/signal.c linux-2.6.32.15/kernel/signal.c return ret; } -diff -urNp linux-2.6.32.15/kernel/smp.c linux-2.6.32.15/kernel/smp.c ---- linux-2.6.32.15/kernel/smp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/smp.c 2010-05-28 21:27:16.447114196 -0400 +diff -urNp linux-2.6.32.16/kernel/smp.c linux-2.6.32.16/kernel/smp.c +--- linux-2.6.32.16/kernel/smp.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/smp.c 2010-07-09 14:50:38.000000000 -0400 @@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void } 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 { spin_unlock_irq(&call_function.lock); } -diff -urNp linux-2.6.32.15/kernel/softirq.c linux-2.6.32.15/kernel/softirq.c ---- linux-2.6.32.15/kernel/softirq.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/softirq.c 2010-05-28 21:27:16.447114196 -0400 +diff -urNp linux-2.6.32.16/kernel/softirq.c linux-2.6.32.16/kernel/softirq.c +--- linux-2.6.32.16/kernel/softirq.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/softirq.c 2010-07-09 14:50:38.000000000 -0400 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec 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 { struct tasklet_struct *list; -diff -urNp linux-2.6.32.15/kernel/sys.c linux-2.6.32.15/kernel/sys.c ---- linux-2.6.32.15/kernel/sys.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/sys.c 2010-05-28 21:27:16.447114196 -0400 +diff -urNp linux-2.6.32.16/kernel/sys.c linux-2.6.32.16/kernel/sys.c +--- linux-2.6.32.16/kernel/sys.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/sys.c 2010-07-09 14:50:38.000000000 -0400 @@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru error = -EACCES; goto out; @@ -49911,9 +50152,9 @@ diff -urNp linux-2.6.32.15/kernel/sys.c linux-2.6.32.15/kernel/sys.c error = -EINVAL; break; } -diff -urNp linux-2.6.32.15/kernel/sysctl.c linux-2.6.32.15/kernel/sysctl.c ---- linux-2.6.32.15/kernel/sysctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/sysctl.c 2010-05-28 21:27:16.447114196 -0400 +diff -urNp linux-2.6.32.16/kernel/sysctl.c linux-2.6.32.16/kernel/sysctl.c +--- linux-2.6.32.16/kernel/sysctl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/sysctl.c 2010-07-09 14:50:38.000000000 -0400 @@ -63,6 +63,13 @@ static int deprecated_sysctl_warning(struct __sysctl_args *args); @@ -50035,9 +50276,9 @@ diff -urNp linux-2.6.32.15/kernel/sysctl.c linux-2.6.32.15/kernel/sysctl.c error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC)); if (error) return error; -diff -urNp linux-2.6.32.15/kernel/taskstats.c linux-2.6.32.15/kernel/taskstats.c ---- linux-2.6.32.15/kernel/taskstats.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/taskstats.c 2010-05-28 21:27:16.447114196 -0400 +diff -urNp linux-2.6.32.16/kernel/taskstats.c linux-2.6.32.16/kernel/taskstats.c +--- linux-2.6.32.16/kernel/taskstats.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/taskstats.c 2010-07-09 14:50:38.000000000 -0400 @@ -26,9 +26,12 @@ #include <linux/cgroup.h> #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 if (!alloc_cpumask_var(&mask, GFP_KERNEL)) return -ENOMEM; -diff -urNp linux-2.6.32.15/kernel/time/tick-broadcast.c linux-2.6.32.15/kernel/time/tick-broadcast.c ---- linux-2.6.32.15/kernel/time/tick-broadcast.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/time/tick-broadcast.c 2010-05-28 21:27:16.447114196 -0400 +diff -urNp linux-2.6.32.16/kernel/time/tick-broadcast.c linux-2.6.32.16/kernel/time/tick-broadcast.c +--- linux-2.6.32.16/kernel/time/tick-broadcast.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/time/tick-broadcast.c 2010-07-09 14:50:38.000000000 -0400 @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl * then clear the broadcast bit. */ @@ -50073,9 +50314,9 @@ diff -urNp linux-2.6.32.15/kernel/time/tick-broadcast.c linux-2.6.32.15/kernel/t cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); tick_broadcast_clear_oneshot(cpu); -diff -urNp linux-2.6.32.15/kernel/time.c linux-2.6.32.15/kernel/time.c ---- linux-2.6.32.15/kernel/time.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/time.c 2010-05-28 21:27:16.451020026 -0400 +diff -urNp linux-2.6.32.16/kernel/time.c linux-2.6.32.16/kernel/time.c +--- linux-2.6.32.16/kernel/time.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/time.c 2010-07-09 14:50:38.000000000 -0400 @@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, return err; @@ -50113,9 +50354,9 @@ diff -urNp linux-2.6.32.15/kernel/time.c linux-2.6.32.15/kernel/time.c { #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) return (USEC_PER_SEC / HZ) * j; -diff -urNp linux-2.6.32.15/kernel/timer.c linux-2.6.32.15/kernel/timer.c ---- linux-2.6.32.15/kernel/timer.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/timer.c 2010-05-28 21:27:16.451020026 -0400 +diff -urNp linux-2.6.32.16/kernel/timer.c linux-2.6.32.16/kernel/timer.c +--- linux-2.6.32.16/kernel/timer.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/timer.c 2010-07-09 14:50:38.000000000 -0400 @@ -1207,7 +1207,7 @@ void update_process_times(int user_tick) /* * 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 { struct tvec_base *base = __get_cpu_var(tvec_bases); -diff -urNp linux-2.6.32.15/kernel/trace/ftrace.c linux-2.6.32.15/kernel/trace/ftrace.c ---- linux-2.6.32.15/kernel/trace/ftrace.c 2010-04-04 20:41:50.068477203 -0400 -+++ linux-2.6.32.15/kernel/trace/ftrace.c 2010-05-28 21:27:16.451020026 -0400 +diff -urNp linux-2.6.32.16/kernel/trace/ftrace.c linux-2.6.32.16/kernel/trace/ftrace.c +--- linux-2.6.32.16/kernel/trace/ftrace.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/trace/ftrace.c 2010-07-09 14:50:38.000000000 -0400 @@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod, 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 } /* -diff -urNp linux-2.6.32.15/kernel/trace/Kconfig linux-2.6.32.15/kernel/trace/Kconfig ---- linux-2.6.32.15/kernel/trace/Kconfig 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/trace/Kconfig 2010-05-28 21:27:16.451020026 -0400 +diff -urNp linux-2.6.32.16/kernel/trace/Kconfig linux-2.6.32.16/kernel/trace/Kconfig +--- linux-2.6.32.16/kernel/trace/Kconfig 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/trace/Kconfig 2010-07-09 14:50:38.000000000 -0400 @@ -126,6 +126,7 @@ if FTRACE config FUNCTION_TRACER 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 select FUNCTION_TRACER select STACKTRACE select KALLSYMS -diff -urNp linux-2.6.32.15/kernel/trace/ring_buffer.c linux-2.6.32.15/kernel/trace/ring_buffer.c ---- linux-2.6.32.15/kernel/trace/ring_buffer.c 2010-04-04 20:41:50.072525146 -0400 -+++ linux-2.6.32.15/kernel/trace/ring_buffer.c 2010-05-28 21:27:16.451020026 -0400 +diff -urNp linux-2.6.32.16/kernel/trace/ring_buffer.c linux-2.6.32.16/kernel/trace/ring_buffer.c +--- linux-2.6.32.16/kernel/trace/ring_buffer.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/trace/ring_buffer.c 2010-07-09 14:50:38.000000000 -0400 @@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st * the reader page). But if the next page is a header page, * 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 rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer, struct buffer_page *page, struct list_head *list) { -diff -urNp linux-2.6.32.15/kernel/trace/trace.c linux-2.6.32.15/kernel/trace/trace.c ---- linux-2.6.32.15/kernel/trace/trace.c 2010-04-04 20:41:50.072525146 -0400 -+++ linux-2.6.32.15/kernel/trace/trace.c 2010-05-28 21:27:16.451020026 -0400 +diff -urNp linux-2.6.32.16/kernel/trace/trace.c linux-2.6.32.16/kernel/trace/trace.c +--- linux-2.6.32.16/kernel/trace/trace.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/trace/trace.c 2010-07-09 14:50:38.000000000 -0400 @@ -3808,10 +3808,9 @@ static const struct file_operations trac }; #endif @@ -50207,9 +50448,9 @@ diff -urNp linux-2.6.32.15/kernel/trace/trace.c linux-2.6.32.15/kernel/trace/tra static int once; struct dentry *d_tracer; -diff -urNp linux-2.6.32.15/kernel/trace/trace_events.c linux-2.6.32.15/kernel/trace/trace_events.c ---- linux-2.6.32.15/kernel/trace/trace_events.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/trace/trace_events.c 2010-05-28 21:27:16.451020026 -0400 +diff -urNp linux-2.6.32.16/kernel/trace/trace_events.c linux-2.6.32.16/kernel/trace/trace_events.c +--- linux-2.6.32.16/kernel/trace/trace_events.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/trace/trace_events.c 2010-07-09 14:50:38.000000000 -0400 @@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list * Modules must own their file_operations to keep up with * 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 struct ftrace_module_file_ops { struct list_head list; struct module *mod; -diff -urNp linux-2.6.32.15/kernel/trace/trace_output.c linux-2.6.32.15/kernel/trace/trace_output.c ---- linux-2.6.32.15/kernel/trace/trace_output.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/trace/trace_output.c 2010-05-28 21:27:16.451020026 -0400 +diff -urNp linux-2.6.32.16/kernel/trace/trace_output.c linux-2.6.32.16/kernel/trace/trace_output.c +--- linux-2.6.32.16/kernel/trace/trace_output.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/trace/trace_output.c 2010-07-09 14:50:38.000000000 -0400 @@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s, return 0; 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 if (p) { s->len = p - s->buffer; return 1; -diff -urNp linux-2.6.32.15/kernel/trace/trace_stack.c linux-2.6.32.15/kernel/trace/trace_stack.c ---- linux-2.6.32.15/kernel/trace/trace_stack.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/trace/trace_stack.c 2010-05-28 21:27:16.451020026 -0400 +diff -urNp linux-2.6.32.16/kernel/trace/trace_stack.c linux-2.6.32.16/kernel/trace/trace_stack.c +--- linux-2.6.32.16/kernel/trace/trace_stack.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/trace/trace_stack.c 2010-07-09 14:50:38.000000000 -0400 @@ -50,7 +50,7 @@ static inline void check_stack(void) return; @@ -50243,9 +50484,9 @@ diff -urNp linux-2.6.32.15/kernel/trace/trace_stack.c linux-2.6.32.15/kernel/tra return; local_irq_save(flags); -diff -urNp linux-2.6.32.15/kernel/utsname_sysctl.c linux-2.6.32.15/kernel/utsname_sysctl.c ---- linux-2.6.32.15/kernel/utsname_sysctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/kernel/utsname_sysctl.c 2010-05-28 21:27:16.451020026 -0400 +diff -urNp linux-2.6.32.16/kernel/utsname_sysctl.c linux-2.6.32.16/kernel/utsname_sysctl.c +--- linux-2.6.32.16/kernel/utsname_sysctl.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/kernel/utsname_sysctl.c 2010-07-09 14:50:38.000000000 -0400 @@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[] .proc_handler = proc_do_uts_string, .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 }; static int __init utsname_sysctl_init(void) -diff -urNp linux-2.6.32.15/lib/bug.c linux-2.6.32.15/lib/bug.c ---- linux-2.6.32.15/lib/bug.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/lib/bug.c 2010-05-28 21:27:16.451020026 -0400 +diff -urNp linux-2.6.32.16/lib/bug.c linux-2.6.32.16/lib/bug.c +--- linux-2.6.32.16/lib/bug.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/lib/bug.c 2010-07-09 14:50:38.000000000 -0400 @@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l return BUG_TRAP_TYPE_NONE; @@ -50276,9 +50517,9 @@ diff -urNp linux-2.6.32.15/lib/bug.c linux-2.6.32.15/lib/bug.c printk(KERN_EMERG "------------[ cut here ]------------\n"); -diff -urNp linux-2.6.32.15/lib/debugobjects.c linux-2.6.32.15/lib/debugobjects.c ---- linux-2.6.32.15/lib/debugobjects.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/lib/debugobjects.c 2010-05-28 21:27:16.455065280 -0400 +diff -urNp linux-2.6.32.16/lib/debugobjects.c linux-2.6.32.16/lib/debugobjects.c +--- linux-2.6.32.16/lib/debugobjects.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/lib/debugobjects.c 2010-07-09 14:50:38.000000000 -0400 @@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi if (limit > 4) return; @@ -50288,9 +50529,9 @@ diff -urNp linux-2.6.32.15/lib/debugobjects.c linux-2.6.32.15/lib/debugobjects.c if (is_on_stack == onstack) return; -diff -urNp linux-2.6.32.15/lib/dma-debug.c linux-2.6.32.15/lib/dma-debug.c ---- linux-2.6.32.15/lib/dma-debug.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/lib/dma-debug.c 2010-05-28 21:27:16.463242745 -0400 +diff -urNp linux-2.6.32.16/lib/dma-debug.c linux-2.6.32.16/lib/dma-debug.c +--- linux-2.6.32.16/lib/dma-debug.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/lib/dma-debug.c 2010-07-09 14:50:38.000000000 -0400 @@ -861,7 +861,7 @@ out: 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 err_printk(dev, NULL, "DMA-API: device driver maps memory from" "stack [addr=%p]\n", addr); } -diff -urNp linux-2.6.32.15/lib/idr.c linux-2.6.32.15/lib/idr.c ---- linux-2.6.32.15/lib/idr.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/lib/idr.c 2010-05-28 21:27:16.463242745 -0400 +diff -urNp linux-2.6.32.16/lib/idr.c linux-2.6.32.16/lib/idr.c +--- linux-2.6.32.16/lib/idr.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/lib/idr.c 2010-07-09 14:50:38.000000000 -0400 @@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1; @@ -50312,9 +50553,9 @@ diff -urNp linux-2.6.32.15/lib/idr.c linux-2.6.32.15/lib/idr.c *starting_id = id; return IDR_NEED_TO_GROW; } -diff -urNp linux-2.6.32.15/lib/inflate.c linux-2.6.32.15/lib/inflate.c ---- linux-2.6.32.15/lib/inflate.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/lib/inflate.c 2010-05-28 21:27:16.463242745 -0400 +diff -urNp linux-2.6.32.16/lib/inflate.c linux-2.6.32.16/lib/inflate.c +--- linux-2.6.32.16/lib/inflate.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/lib/inflate.c 2010-07-09 14:50:38.000000000 -0400 @@ -266,7 +266,7 @@ static void free(void *where) malloc_ptr = free_mem_ptr; } @@ -50324,9 +50565,9 @@ diff -urNp linux-2.6.32.15/lib/inflate.c linux-2.6.32.15/lib/inflate.c #define free(a) kfree(a) #endif -diff -urNp linux-2.6.32.15/lib/Kconfig.debug linux-2.6.32.15/lib/Kconfig.debug ---- linux-2.6.32.15/lib/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/lib/Kconfig.debug 2010-05-28 21:27:16.463242745 -0400 +diff -urNp linux-2.6.32.16/lib/Kconfig.debug linux-2.6.32.16/lib/Kconfig.debug +--- linux-2.6.32.16/lib/Kconfig.debug 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/lib/Kconfig.debug 2010-07-09 14:50:38.000000000 -0400 @@ -905,7 +905,7 @@ config LATENCYTOP select STACKTRACE select SCHEDSTATS @@ -50336,9 +50577,9 @@ diff -urNp linux-2.6.32.15/lib/Kconfig.debug linux-2.6.32.15/lib/Kconfig.debug help Enable this option if you want to use the LatencyTOP tool to find out which userspace is blocking on what kernel operations. -diff -urNp linux-2.6.32.15/lib/kobject.c linux-2.6.32.15/lib/kobject.c ---- linux-2.6.32.15/lib/kobject.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/lib/kobject.c 2010-05-28 21:27:16.463242745 -0400 +diff -urNp linux-2.6.32.16/lib/kobject.c linux-2.6.32.16/lib/kobject.c +--- linux-2.6.32.16/lib/kobject.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/lib/kobject.c 2010-07-09 14:50:38.000000000 -0400 @@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko return ret; } @@ -50366,9 +50607,9 @@ diff -urNp linux-2.6.32.15/lib/kobject.c linux-2.6.32.15/lib/kobject.c struct kobject *parent_kobj) { struct kset *kset; -diff -urNp linux-2.6.32.15/lib/kobject_uevent.c linux-2.6.32.15/lib/kobject_uevent.c ---- linux-2.6.32.15/lib/kobject_uevent.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/lib/kobject_uevent.c 2010-05-28 21:27:16.463242745 -0400 +diff -urNp linux-2.6.32.16/lib/kobject_uevent.c linux-2.6.32.16/lib/kobject_uevent.c +--- linux-2.6.32.16/lib/kobject_uevent.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/lib/kobject_uevent.c 2010-07-09 14:50:38.000000000 -0400 @@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k const char *subsystem; 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 u64 seq; int i = 0; int retval = 0; -diff -urNp linux-2.6.32.15/lib/parser.c linux-2.6.32.15/lib/parser.c ---- linux-2.6.32.15/lib/parser.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/lib/parser.c 2010-05-28 21:27:16.463242745 -0400 +diff -urNp linux-2.6.32.16/lib/parser.c linux-2.6.32.16/lib/parser.c +--- linux-2.6.32.16/lib/parser.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/lib/parser.c 2010-07-09 14:50:38.000000000 -0400 @@ -126,7 +126,7 @@ static int match_number(substring_t *s, char *buf; int ret; @@ -50390,9 +50631,9 @@ diff -urNp linux-2.6.32.15/lib/parser.c linux-2.6.32.15/lib/parser.c if (!buf) return -ENOMEM; memcpy(buf, s->from, s->to - s->from); -diff -urNp linux-2.6.32.15/lib/radix-tree.c linux-2.6.32.15/lib/radix-tree.c ---- linux-2.6.32.15/lib/radix-tree.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/lib/radix-tree.c 2010-05-28 21:27:16.471246042 -0400 +diff -urNp linux-2.6.32.16/lib/radix-tree.c linux-2.6.32.16/lib/radix-tree.c +--- linux-2.6.32.16/lib/radix-tree.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/lib/radix-tree.c 2010-07-09 14:50:38.000000000 -0400 @@ -81,7 +81,7 @@ struct radix_tree_preload { int nr; 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 static inline gfp_t root_gfp_mask(struct radix_tree_root *root) { -diff -urNp linux-2.6.32.15/lib/random32.c linux-2.6.32.15/lib/random32.c ---- linux-2.6.32.15/lib/random32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/lib/random32.c 2010-05-28 21:27:16.471246042 -0400 +diff -urNp linux-2.6.32.16/lib/random32.c linux-2.6.32.16/lib/random32.c +--- linux-2.6.32.16/lib/random32.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/lib/random32.c 2010-07-09 14:50:38.000000000 -0400 @@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * */ 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 } /** -diff -urNp linux-2.6.32.15/localversion-grsec linux-2.6.32.15/localversion-grsec ---- linux-2.6.32.15/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.15/localversion-grsec 2010-05-28 21:27:16.471246042 -0400 +diff -urNp linux-2.6.32.16/localversion-grsec linux-2.6.32.16/localversion-grsec +--- linux-2.6.32.16/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.16/localversion-grsec 2010-07-09 14:50:38.000000000 -0400 @@ -0,0 +1 @@ +-grsec -diff -urNp linux-2.6.32.15/Makefile linux-2.6.32.15/Makefile ---- linux-2.6.32.15/Makefile 2010-06-01 15:02:53.005442437 -0400 -+++ linux-2.6.32.15/Makefile 2010-06-01 15:03:15.405630699 -0400 +diff -urNp linux-2.6.32.16/Makefile linux-2.6.32.16/Makefile +--- linux-2.6.32.16/Makefile 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/Makefile 2010-07-09 14:50:38.000000000 -0400 @@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" HOSTCC = gcc @@ -50442,10 +50683,10 @@ diff -urNp linux-2.6.32.15/Makefile linux-2.6.32.15/Makefile vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ -diff -urNp linux-2.6.32.15/mm/filemap.c linux-2.6.32.15/mm/filemap.c ---- linux-2.6.32.15/mm/filemap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/mm/filemap.c 2010-05-28 21:27:16.479250347 -0400 -@@ -1622,7 +1622,7 @@ int generic_file_mmap(struct file * file +diff -urNp linux-2.6.32.16/mm/filemap.c linux-2.6.32.16/mm/filemap.c +--- linux-2.6.32.16/mm/filemap.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/filemap.c 2010-07-09 14:50:38.000000000 -0400 +@@ -1628,7 +1628,7 @@ int generic_file_mmap(struct file * file struct address_space *mapping = file->f_mapping; 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 file_accessed(file); vma->vm_ops = &generic_file_vm_ops; vma->vm_flags |= VM_CAN_NONLINEAR; -@@ -2018,6 +2018,7 @@ inline int generic_write_checks(struct f +@@ -2024,6 +2024,7 @@ inline int generic_write_checks(struct f *pos = i_size_read(inode); 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 if (*pos >= limit) { send_sig(SIGXFSZ, current, 0); return -EFBIG; -diff -urNp linux-2.6.32.15/mm/fremap.c linux-2.6.32.15/mm/fremap.c ---- linux-2.6.32.15/mm/fremap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/mm/fremap.c 2010-05-28 21:27:16.487251224 -0400 +diff -urNp linux-2.6.32.16/mm/fremap.c linux-2.6.32.16/mm/fremap.c +--- linux-2.6.32.16/mm/fremap.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/fremap.c 2010-07-09 14:50:38.000000000 -0400 @@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign retry: 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 /* * Make sure the vma is shared, that it supports prefaulting, * and that the remapped range is valid and fully within -diff -urNp linux-2.6.32.15/mm/highmem.c linux-2.6.32.15/mm/highmem.c ---- linux-2.6.32.15/mm/highmem.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/mm/highmem.c 2010-05-28 21:27:16.487251224 -0400 +diff -urNp linux-2.6.32.16/mm/highmem.c linux-2.6.32.16/mm/highmem.c +--- linux-2.6.32.16/mm/highmem.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/highmem.c 2010-07-09 14:50:38.000000000 -0400 @@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void) * So no dangers, even with speculative execution. */ @@ -50505,9 +50746,9 @@ diff -urNp linux-2.6.32.15/mm/highmem.c linux-2.6.32.15/mm/highmem.c pkmap_count[last_pkmap_nr] = 1; set_page_address(page, (void *)vaddr); -diff -urNp linux-2.6.32.15/mm/hugetlb.c linux-2.6.32.15/mm/hugetlb.c ---- linux-2.6.32.15/mm/hugetlb.c 2010-05-28 20:16:44.458924952 -0400 -+++ linux-2.6.32.15/mm/hugetlb.c 2010-05-28 21:27:16.487251224 -0400 +diff -urNp linux-2.6.32.16/mm/hugetlb.c linux-2.6.32.16/mm/hugetlb.c +--- linux-2.6.32.16/mm/hugetlb.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/hugetlb.c 2010-07-09 14:50:38.000000000 -0400 @@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s return 1; } @@ -50587,9 +50828,9 @@ diff -urNp linux-2.6.32.15/mm/hugetlb.c linux-2.6.32.15/mm/hugetlb.c ptep = huge_pte_alloc(mm, address, huge_page_size(h)); if (!ptep) return VM_FAULT_OOM; -diff -urNp linux-2.6.32.15/mm/Kconfig linux-2.6.32.15/mm/Kconfig ---- linux-2.6.32.15/mm/Kconfig 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/mm/Kconfig 2010-05-28 21:27:16.487251224 -0400 +diff -urNp linux-2.6.32.16/mm/Kconfig linux-2.6.32.16/mm/Kconfig +--- linux-2.6.32.16/mm/Kconfig 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/Kconfig 2010-07-09 14:50:38.000000000 -0400 @@ -228,7 +228,7 @@ config KSM config DEFAULT_MMAP_MIN_ADDR 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 help This is the portion of low virtual memory which should be protected from userspace allocation. Keeping a user from writing to low pages -diff -urNp linux-2.6.32.15/mm/maccess.c linux-2.6.32.15/mm/maccess.c ---- linux-2.6.32.15/mm/maccess.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/mm/maccess.c 2010-05-28 21:27:16.487251224 -0400 +diff -urNp linux-2.6.32.16/mm/maccess.c linux-2.6.32.16/mm/maccess.c +--- linux-2.6.32.16/mm/maccess.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/maccess.c 2010-07-09 14:50:38.000000000 -0400 @@ -14,7 +14,7 @@ * Safely read from address @src to the buffer at @dst. If a kernel fault * 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 { long ret; mm_segment_t old_fs = get_fs(); -diff -urNp linux-2.6.32.15/mm/madvise.c linux-2.6.32.15/mm/madvise.c ---- linux-2.6.32.15/mm/madvise.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/mm/madvise.c 2010-05-28 21:27:16.487251224 -0400 +diff -urNp linux-2.6.32.16/mm/madvise.c linux-2.6.32.16/mm/madvise.c +--- linux-2.6.32.16/mm/madvise.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/madvise.c 2010-07-09 14:50:38.000000000 -0400 @@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a pgoff_t pgoff; 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 error = 0; if (end == start) goto out; -diff -urNp linux-2.6.32.15/mm/memory.c linux-2.6.32.15/mm/memory.c ---- linux-2.6.32.15/mm/memory.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/mm/memory.c 2010-06-19 10:03:50.012498759 -0400 +diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c +--- linux-2.6.32.16/mm/memory.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/memory.c 2010-07-09 14:50:38.000000000 -0400 @@ -48,6 +48,7 @@ #include <linux/ksm.h> #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 /* * Make sure the vDSO gets into every core dump. * Dumping its contents makes post-mortem fully interpretable later -diff -urNp linux-2.6.32.15/mm/memory-failure.c linux-2.6.32.15/mm/memory-failure.c ---- linux-2.6.32.15/mm/memory-failure.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/mm/memory-failure.c 2010-05-28 21:27:16.487251224 -0400 +diff -urNp linux-2.6.32.16/mm/memory-failure.c linux-2.6.32.16/mm/memory-failure.c +--- linux-2.6.32.16/mm/memory-failure.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/memory-failure.c 2010-07-09 14:50:38.000000000 -0400 @@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r 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 /* * We need/can do nothing about count=0 pages. -diff -urNp linux-2.6.32.15/mm/mempolicy.c linux-2.6.32.15/mm/mempolicy.c ---- linux-2.6.32.15/mm/mempolicy.c 2010-04-04 20:41:50.072525146 -0400 -+++ linux-2.6.32.15/mm/mempolicy.c 2010-05-28 21:27:16.487251224 -0400 +diff -urNp linux-2.6.32.16/mm/mempolicy.c linux-2.6.32.16/mm/mempolicy.c +--- linux-2.6.32.16/mm/mempolicy.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/mempolicy.c 2010-07-09 14:50:38.000000000 -0400 @@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st struct vm_area_struct *next; int err; @@ -51236,9 +51477,9 @@ diff -urNp linux-2.6.32.15/mm/mempolicy.c linux-2.6.32.15/mm/mempolicy.c } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { seq_printf(m, " heap"); } else if (vma->vm_start <= mm->start_stack && -diff -urNp linux-2.6.32.15/mm/migrate.c linux-2.6.32.15/mm/migrate.c ---- linux-2.6.32.15/mm/migrate.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/mm/migrate.c 2010-05-28 21:27:16.491098771 -0400 +diff -urNp linux-2.6.32.16/mm/migrate.c linux-2.6.32.16/mm/migrate.c +--- linux-2.6.32.16/mm/migrate.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/migrate.c 2010-07-09 14:50:38.000000000 -0400 @@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, if (!mm) return -EINVAL; @@ -51264,9 +51505,9 @@ diff -urNp linux-2.6.32.15/mm/migrate.c linux-2.6.32.15/mm/migrate.c rcu_read_unlock(); err = -EPERM; goto out; -diff -urNp linux-2.6.32.15/mm/mlock.c linux-2.6.32.15/mm/mlock.c ---- linux-2.6.32.15/mm/mlock.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/mm/mlock.c 2010-05-28 21:27:16.499256346 -0400 +diff -urNp linux-2.6.32.16/mm/mlock.c linux-2.6.32.16/mm/mlock.c +--- linux-2.6.32.16/mm/mlock.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/mlock.c 2010-07-09 14:50:38.000000000 -0400 @@ -13,6 +13,7 @@ #include <linux/pagemap.h> #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 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || capable(CAP_IPC_LOCK)) ret = do_mlockall(flags); -diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c ---- linux-2.6.32.15/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/mm/mmap.c 2010-05-28 21:27:16.502950026 -0400 +diff -urNp linux-2.6.32.16/mm/mmap.c linux-2.6.32.16/mm/mmap.c +--- linux-2.6.32.16/mm/mmap.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/mmap.c 2010-07-09 14:50:38.000000000 -0400 @@ -45,6 +45,16 @@ #define arch_rebalance_pgtables(addr, len) (addr) #endif @@ -52201,19 +52442,15 @@ diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c /* * this is really a simplified "do_mmap". it only handles * anonymous maps. eventually we may be able to do some -@@ -1984,6 +2317,11 @@ unsigned long do_brk(unsigned long addr, +@@ -1984,6 +2317,7 @@ unsigned long do_brk(unsigned long addr, struct rb_node ** rb_link, * rb_parent; pgoff_t pgoff = addr >> PAGE_SHIFT; int error; + unsigned long charged; -+ -+#ifdef CONFIG_PAX_SEGMEXEC -+ struct vm_area_struct *vma_m = NULL; -+#endif len = PAGE_ALIGN(len); if (!len) -@@ -1995,16 +2333,30 @@ unsigned long do_brk(unsigned long addr, +@@ -1995,16 +2329,30 @@ unsigned long do_brk(unsigned long addr, flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags; @@ -52245,7 +52482,7 @@ diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c locked += mm->locked_vm; lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur; lock_limit >>= PAGE_SHIFT; -@@ -2021,22 +2373,22 @@ unsigned long do_brk(unsigned long addr, +@@ -2021,22 +2369,22 @@ unsigned long do_brk(unsigned long addr, /* * Clear old maps. this also does some error checking for us */ @@ -52272,7 +52509,7 @@ diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c return -ENOMEM; /* Can we just expand an old private anonymous mapping? */ -@@ -2050,10 +2402,21 @@ unsigned long do_brk(unsigned long addr, +@@ -2050,7 +2398,7 @@ unsigned long do_brk(unsigned long addr, */ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL); if (!vma) { @@ -52281,21 +52518,7 @@ diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c return -ENOMEM; } -+#ifdef CONFIG_PAX_SEGMEXEC -+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (flags & VM_EXEC)) { -+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL); -+ if (!vma_m) { -+ kmem_cache_free(vm_area_cachep, vma); -+ vm_unacct_memory(charged); -+ return -ENOMEM; -+ } -+ } -+#endif -+ - vma->vm_mm = mm; - vma->vm_start = addr; - vma->vm_end = addr + len; -@@ -2062,11 +2425,12 @@ unsigned long do_brk(unsigned long addr, +@@ -2062,11 +2410,12 @@ unsigned long do_brk(unsigned long addr, vma->vm_page_prot = vm_get_page_prot(flags); vma_link(mm, vma, prev, rb_link, rb_parent); out: @@ -52310,7 +52533,7 @@ diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c return addr; } -@@ -2113,8 +2477,10 @@ void exit_mmap(struct mm_struct *mm) +@@ -2113,8 +2462,10 @@ void exit_mmap(struct mm_struct *mm) * Walk the list again, actually closing and freeing it, * with preemption enabled, without holding any MM locks. */ @@ -52322,7 +52545,7 @@ diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT); } -@@ -2128,6 +2494,10 @@ int insert_vm_struct(struct mm_struct * +@@ -2128,6 +2479,10 @@ int insert_vm_struct(struct mm_struct * struct vm_area_struct * __vma, * prev; struct rb_node ** rb_link, * rb_parent; @@ -52333,7 +52556,7 @@ diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c /* * The vm_pgoff of a purely anonymous vma should be irrelevant * until its first write fault, when page's anon_vma and index -@@ -2150,7 +2520,22 @@ int insert_vm_struct(struct mm_struct * +@@ -2150,7 +2505,22 @@ int insert_vm_struct(struct mm_struct * if ((vma->vm_flags & VM_ACCOUNT) && security_vm_enough_memory_mm(mm, vma_pages(vma))) return -ENOMEM; @@ -52356,7 +52579,7 @@ diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c return 0; } -@@ -2168,6 +2553,8 @@ struct vm_area_struct *copy_vma(struct v +@@ -2168,6 +2538,8 @@ struct vm_area_struct *copy_vma(struct v struct rb_node **rb_link, *rb_parent; struct mempolicy *pol; @@ -52365,7 +52588,7 @@ diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c /* * If anonymous vma has not yet been faulted, update new pgoff * to match new location, to increase its chance of merging. -@@ -2211,6 +2598,35 @@ struct vm_area_struct *copy_vma(struct v +@@ -2211,6 +2583,35 @@ struct vm_area_struct *copy_vma(struct v return new_vma; } @@ -52401,7 +52624,7 @@ diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c /* * Return true if the calling process may expand its vm space by the passed * number of pages -@@ -2221,7 +2637,7 @@ int may_expand_vm(struct mm_struct *mm, +@@ -2221,7 +2622,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long lim; 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 if (cur + npages > lim) return 0; return 1; -@@ -2290,6 +2706,15 @@ int install_special_mapping(struct mm_st +@@ -2290,6 +2691,15 @@ int install_special_mapping(struct mm_st vma->vm_start = addr; vma->vm_end = addr + len; @@ -52426,9 +52649,9 @@ diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); -diff -urNp linux-2.6.32.15/mm/mprotect.c linux-2.6.32.15/mm/mprotect.c ---- linux-2.6.32.15/mm/mprotect.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/mm/mprotect.c 2010-05-28 21:27:16.502950026 -0400 +diff -urNp linux-2.6.32.16/mm/mprotect.c linux-2.6.32.16/mm/mprotect.c +--- linux-2.6.32.16/mm/mprotect.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/mprotect.c 2010-07-09 14:50:38.000000000 -0400 @@ -24,10 +24,16 @@ #include <linux/mmu_notifier.h> #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 nstart = tmp; if (nstart < prev->vm_end) -diff -urNp linux-2.6.32.15/mm/mremap.c linux-2.6.32.15/mm/mremap.c ---- linux-2.6.32.15/mm/mremap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/mm/mremap.c 2010-05-28 21:27:16.502950026 -0400 +diff -urNp linux-2.6.32.16/mm/mremap.c linux-2.6.32.16/mm/mremap.c +--- linux-2.6.32.16/mm/mremap.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/mremap.c 2010-07-09 14:50:38.000000000 -0400 @@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str continue; 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 } out: if (ret & ~PAGE_MASK) -diff -urNp linux-2.6.32.15/mm/nommu.c linux-2.6.32.15/mm/nommu.c ---- linux-2.6.32.15/mm/nommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/mm/nommu.c 2010-05-28 21:27:16.502950026 -0400 +diff -urNp linux-2.6.32.16/mm/nommu.c linux-2.6.32.16/mm/nommu.c +--- linux-2.6.32.16/mm/nommu.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/nommu.c 2010-07-09 14:50:38.000000000 -0400 @@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m EXPORT_SYMBOL(find_vma); @@ -52748,9 +52971,9 @@ diff -urNp linux-2.6.32.15/mm/nommu.c linux-2.6.32.15/mm/nommu.c * expand a stack to a given address * - not supported under NOMMU conditions */ -diff -urNp linux-2.6.32.15/mm/page_alloc.c linux-2.6.32.15/mm/page_alloc.c ---- linux-2.6.32.15/mm/page_alloc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/mm/page_alloc.c 2010-05-28 21:27:16.530961628 -0400 +diff -urNp linux-2.6.32.16/mm/page_alloc.c linux-2.6.32.16/mm/page_alloc.c +--- linux-2.6.32.16/mm/page_alloc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/page_alloc.c 2010-07-09 14:50:38.000000000 -0400 @@ -586,6 +586,10 @@ static void __free_pages_ok(struct page int bad = 0; 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 struct zone *zone, unsigned long zonesize) {} #endif /* CONFIG_SPARSEMEM */ -diff -urNp linux-2.6.32.15/mm/percpu.c linux-2.6.32.15/mm/percpu.c ---- linux-2.6.32.15/mm/percpu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/mm/percpu.c 2010-05-28 21:27:16.530961628 -0400 +diff -urNp linux-2.6.32.16/mm/percpu.c linux-2.6.32.16/mm/percpu.c +--- linux-2.6.32.16/mm/percpu.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/percpu.c 2010-07-09 14:50:38.000000000 -0400 @@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu static unsigned int pcpu_last_unit_cpu __read_mostly; @@ -52819,9 +53042,9 @@ diff -urNp linux-2.6.32.15/mm/percpu.c linux-2.6.32.15/mm/percpu.c EXPORT_SYMBOL_GPL(pcpu_base_addr); static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ -diff -urNp linux-2.6.32.15/mm/rmap.c linux-2.6.32.15/mm/rmap.c ---- linux-2.6.32.15/mm/rmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/mm/rmap.c 2010-05-28 21:27:16.539259032 -0400 +diff -urNp linux-2.6.32.16/mm/rmap.c linux-2.6.32.16/mm/rmap.c +--- linux-2.6.32.16/mm/rmap.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/rmap.c 2010-07-09 14:50:38.000000000 -0400 @@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru struct mm_struct *mm = vma->vm_mm; 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 vma->anon_vma = anon_vma; list_add_tail(&vma->anon_vma_node, &anon_vma->head); allocated = NULL; -diff -urNp linux-2.6.32.15/mm/shmem.c linux-2.6.32.15/mm/shmem.c ---- linux-2.6.32.15/mm/shmem.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/mm/shmem.c 2010-05-28 21:27:16.543245570 -0400 +diff -urNp linux-2.6.32.16/mm/shmem.c linux-2.6.32.16/mm/shmem.c +--- linux-2.6.32.16/mm/shmem.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/shmem.c 2010-07-09 14:50:38.000000000 -0400 @@ -31,7 +31,7 @@ #include <linux/swap.h> #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 #ifdef CONFIG_SHMEM /* -diff -urNp linux-2.6.32.15/mm/slab.c linux-2.6.32.15/mm/slab.c ---- linux-2.6.32.15/mm/slab.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/mm/slab.c 2010-05-31 11:16:00.657200601 -0400 +diff -urNp linux-2.6.32.16/mm/slab.c linux-2.6.32.16/mm/slab.c +--- linux-2.6.32.16/mm/slab.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/slab.c 2010-07-09 14:50:38.000000000 -0400 @@ -308,7 +308,7 @@ struct kmem_list3 { * Need this for bootstrapping a per node allocator. */ @@ -52970,9 +53193,9 @@ diff -urNp linux-2.6.32.15/mm/slab.c linux-2.6.32.15/mm/slab.c /** * ksize - get the actual amount of memory allocated for a given object * @objp: Pointer to the object -diff -urNp linux-2.6.32.15/mm/slob.c linux-2.6.32.15/mm/slob.c ---- linux-2.6.32.15/mm/slob.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/mm/slob.c 2010-05-31 11:16:35.308884479 -0400 +diff -urNp linux-2.6.32.16/mm/slob.c linux-2.6.32.16/mm/slob.c +--- linux-2.6.32.16/mm/slob.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/slob.c 2010-07-09 14:50:38.000000000 -0400 @@ -29,7 +29,7 @@ * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls * 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 } trace_kmem_cache_free(_RET_IP_, b); -diff -urNp linux-2.6.32.15/mm/slub.c linux-2.6.32.15/mm/slub.c ---- linux-2.6.32.15/mm/slub.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/mm/slub.c 2010-05-31 11:16:21.137686742 -0400 +diff -urNp linux-2.6.32.16/mm/slub.c linux-2.6.32.16/mm/slub.c +--- linux-2.6.32.16/mm/slub.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/slub.c 2010-07-09 14:50:38.000000000 -0400 @@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache * 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 return 0; } module_init(slab_proc_init); -diff -urNp linux-2.6.32.15/mm/util.c linux-2.6.32.15/mm/util.c ---- linux-2.6.32.15/mm/util.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/mm/util.c 2010-05-28 21:27:16.563017088 -0400 +diff -urNp linux-2.6.32.16/mm/util.c linux-2.6.32.16/mm/util.c +--- linux-2.6.32.16/mm/util.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/util.c 2010-07-09 14:50:38.000000000 -0400 @@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user); void arch_pick_mmap_layout(struct mm_struct *mm) { @@ -53474,9 +53697,9 @@ diff -urNp linux-2.6.32.15/mm/util.c linux-2.6.32.15/mm/util.c mm->get_unmapped_area = arch_get_unmapped_area; mm->unmap_area = arch_unmap_area; } -diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c ---- linux-2.6.32.15/mm/vmalloc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/mm/vmalloc.c 2010-05-28 21:27:16.567244417 -0400 +diff -urNp linux-2.6.32.16/mm/vmalloc.c linux-2.6.32.16/mm/vmalloc.c +--- linux-2.6.32.16/mm/vmalloc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/mm/vmalloc.c 2010-07-09 14:50:44.000000000 -0400 @@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, 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 /* * nr is a running index into the array which helps higher level -@@ -101,17 +113,30 @@ static int vmap_pte_range(pmd_t *pmd, un +@@ -101,17 +113,32 @@ static int vmap_pte_range(pmd_t *pmd, un pte = pte_alloc_kernel(pmd, addr); if (!pte) return -ENOMEM; @@ -53521,7 +53744,9 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c - if (WARN_ON(!page)) - return -ENOMEM; +#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) -+ if (pgprot_val(prot) & _PAGE_NX) ++ if (!(pgprot_val(prot) & _PAGE_NX)) ++ BUG_ON(!pte_exec(*pte) || pte_pfn(*pte) != __pa(addr) >> PAGE_SHIFT); ++ else +#endif + + 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 } static int vmap_pmd_range(pud_t *pud, unsigned long addr, -@@ -192,11 +217,20 @@ int is_vmalloc_or_module_addr(const void +@@ -192,11 +219,20 @@ int is_vmalloc_or_module_addr(const void * and fall back on vmalloc() if that fails. Others * just put it in the vmalloc space. */ @@ -53565,7 +53790,22 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c return is_vmalloc_addr(x); } -@@ -292,13 +326,13 @@ static void __insert_vmap_area(struct vm +@@ -217,8 +253,14 @@ struct page *vmalloc_to_page(const void + + if (!pgd_none(*pgd)) { + pud_t *pud = pud_offset(pgd, addr); ++#ifdef CONFIG_X86 ++ if (!pud_large(*pud)) ++#endif + if (!pud_none(*pud)) { + pmd_t *pmd = pmd_offset(pud, addr); ++#ifdef CONFIG_X86 ++ if (!pmd_large(*pmd)) ++#endif + if (!pmd_none(*pmd)) { + pte_t *ptep, pte; + +@@ -292,13 +334,13 @@ static void __insert_vmap_area(struct vm struct rb_node *tmp; while (*p) { @@ -53583,7 +53823,7 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c p = &(*p)->rb_right; else BUG(); -@@ -1223,6 +1257,16 @@ static struct vm_struct *__get_vm_area_n +@@ -1223,6 +1265,16 @@ static struct vm_struct *__get_vm_area_n struct vm_struct *area; 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 if (flags & VM_IOREMAP) { int bit = fls(size); -@@ -1448,6 +1492,11 @@ void *vmap(struct page **pages, unsigned +@@ -1448,6 +1500,11 @@ void *vmap(struct page **pages, unsigned if (count > totalram_pages) return NULL; @@ -53612,7 +53852,7 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c area = get_vm_area_caller((count << PAGE_SHIFT), flags, __builtin_return_address(0)); if (!area) -@@ -1558,6 +1607,13 @@ static void *__vmalloc_node(unsigned lon +@@ -1558,6 +1615,13 @@ static void *__vmalloc_node(unsigned lon if (!size || (size >> PAGE_SHIFT) > totalram_pages) return NULL; @@ -53626,7 +53866,7 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c area = __get_vm_area_node(size, align, VM_ALLOC, VMALLOC_START, VMALLOC_END, node, gfp_mask, caller); -@@ -1576,6 +1632,7 @@ static void *__vmalloc_node(unsigned lon +@@ -1576,6 +1640,7 @@ static void *__vmalloc_node(unsigned lon return addr; } @@ -53634,7 +53874,7 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot) { return __vmalloc_node(size, 1, gfp_mask, prot, -1, -@@ -1592,6 +1649,7 @@ EXPORT_SYMBOL(__vmalloc); +@@ -1592,6 +1657,7 @@ EXPORT_SYMBOL(__vmalloc); * For tight control over page level allocator and protection flags * use __vmalloc() instead. */ @@ -53642,7 +53882,7 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c void *vmalloc(unsigned long size) { return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, -@@ -1606,6 +1664,7 @@ EXPORT_SYMBOL(vmalloc); +@@ -1606,6 +1672,7 @@ EXPORT_SYMBOL(vmalloc); * The resulting memory area is zeroed so it can be mapped to userspace * without leaking data. */ @@ -53650,7 +53890,7 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c void *vmalloc_user(unsigned long size) { struct vm_struct *area; -@@ -1633,6 +1692,7 @@ EXPORT_SYMBOL(vmalloc_user); +@@ -1633,6 +1700,7 @@ EXPORT_SYMBOL(vmalloc_user); * For tight control over page level allocator and protection flags * use __vmalloc() instead. */ @@ -53658,7 +53898,7 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c void *vmalloc_node(unsigned long size, int node) { return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, -@@ -1655,10 +1715,10 @@ EXPORT_SYMBOL(vmalloc_node); +@@ -1655,10 +1723,10 @@ EXPORT_SYMBOL(vmalloc_node); * For tight control over page level allocator and protection flags * use __vmalloc() instead. */ @@ -53671,7 +53911,7 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c -1, __builtin_return_address(0)); } -@@ -1677,6 +1737,7 @@ void *vmalloc_exec(unsigned long size) +@@ -1677,6 +1745,7 @@ void *vmalloc_exec(unsigned long size) * Allocate enough 32bit PA addressable pages to cover @size from the * page level allocator and map them into contiguous kernel virtual space. */ @@ -53679,7 +53919,7 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c void *vmalloc_32(unsigned long size) { return __vmalloc_node(size, 1, GFP_VMALLOC32, PAGE_KERNEL, -@@ -1691,6 +1752,7 @@ EXPORT_SYMBOL(vmalloc_32); +@@ -1691,6 +1760,7 @@ EXPORT_SYMBOL(vmalloc_32); * The resulting memory area is 32bit addressable and zeroed so it can be * mapped to userspace without leaking data. */ @@ -53687,9 +53927,9 @@ diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c void *vmalloc_32_user(unsigned long size) { struct vm_struct *area; -diff -urNp linux-2.6.32.15/net/8021q/vlan.c linux-2.6.32.15/net/8021q/vlan.c ---- linux-2.6.32.15/net/8021q/vlan.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/8021q/vlan.c 2010-05-28 21:27:16.567244417 -0400 +diff -urNp linux-2.6.32.16/net/8021q/vlan.c linux-2.6.32.16/net/8021q/vlan.c +--- linux-2.6.32.16/net/8021q/vlan.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/8021q/vlan.c 2010-07-09 14:50:38.000000000 -0400 @@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net err = -EPERM; 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 struct vlan_net *vn; vn = net_generic(net, vlan_net_id); -diff -urNp linux-2.6.32.15/net/atm/atm_misc.c linux-2.6.32.15/net/atm/atm_misc.c ---- linux-2.6.32.15/net/atm/atm_misc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/atm/atm_misc.c 2010-05-28 21:27:16.567244417 -0400 +diff -urNp linux-2.6.32.16/net/atm/atm_misc.c linux-2.6.32.16/net/atm/atm_misc.c +--- linux-2.6.32.16/net/atm/atm_misc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/atm/atm_misc.c 2010-07-09 14:50:38.000000000 -0400 @@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) 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 __SONET_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.32.15/net/atm/proc.c linux-2.6.32.15/net/atm/proc.c ---- linux-2.6.32.15/net/atm/proc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/atm/proc.c 2010-05-28 21:27:16.567244417 -0400 +diff -urNp linux-2.6.32.16/net/atm/proc.c linux-2.6.32.16/net/atm/proc.c +--- linux-2.6.32.16/net/atm/proc.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/atm/proc.c 2010-07-09 14:50:38.000000000 -0400 @@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s const struct k_atm_aal_stats *stats) { @@ -53755,9 +53995,9 @@ diff -urNp linux-2.6.32.15/net/atm/proc.c linux-2.6.32.15/net/atm/proc.c } static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev) -diff -urNp linux-2.6.32.15/net/atm/resources.c linux-2.6.32.15/net/atm/resources.c ---- linux-2.6.32.15/net/atm/resources.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/atm/resources.c 2010-05-28 21:27:16.579274907 -0400 +diff -urNp linux-2.6.32.16/net/atm/resources.c linux-2.6.32.16/net/atm/resources.c +--- linux-2.6.32.16/net/atm/resources.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/atm/resources.c 2010-07-09 14:50:38.000000000 -0400 @@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev * static void copy_aal_stats(struct k_atm_aal_stats *from, 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 __AAL_STAT_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.32.15/net/bridge/br_private.h linux-2.6.32.15/net/bridge/br_private.h ---- linux-2.6.32.15/net/bridge/br_private.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/bridge/br_private.h 2010-05-28 21:27:16.579274907 -0400 +diff -urNp linux-2.6.32.16/net/bridge/br_private.h linux-2.6.32.16/net/bridge/br_private.h +--- linux-2.6.32.16/net/bridge/br_private.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/bridge/br_private.h 2010-07-09 14:50:38.000000000 -0400 @@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event, #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 extern int br_sysfs_addif(struct net_bridge_port *p); /* br_sysfs_br.c */ -diff -urNp linux-2.6.32.15/net/bridge/br_stp_if.c linux-2.6.32.15/net/bridge/br_stp_if.c ---- linux-2.6.32.15/net/bridge/br_stp_if.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/bridge/br_stp_if.c 2010-05-28 21:27:16.579274907 -0400 +diff -urNp linux-2.6.32.16/net/bridge/br_stp_if.c linux-2.6.32.16/net/bridge/br_stp_if.c +--- linux-2.6.32.16/net/bridge/br_stp_if.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/bridge/br_stp_if.c 2010-07-09 14:50:38.000000000 -0400 @@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg char *envp[] = { NULL }; @@ -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_ printk(KERN_INFO "%s: userspace STP stopped, return code %d\n", br->dev->name, r); -diff -urNp linux-2.6.32.15/net/bridge/br_sysfs_if.c linux-2.6.32.15/net/bridge/br_sysfs_if.c ---- linux-2.6.32.15/net/bridge/br_sysfs_if.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/bridge/br_sysfs_if.c 2010-05-28 21:27:16.579274907 -0400 +diff -urNp linux-2.6.32.16/net/bridge/br_sysfs_if.c linux-2.6.32.16/net/bridge/br_sysfs_if.c +--- linux-2.6.32.16/net/bridge/br_sysfs_if.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/bridge/br_sysfs_if.c 2010-07-09 14:50:38.000000000 -0400 @@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje return ret; } @@ -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 .show = brport_show, .store = brport_store, }; -diff -urNp linux-2.6.32.15/net/core/dev.c linux-2.6.32.15/net/core/dev.c ---- linux-2.6.32.15/net/core/dev.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/core/dev.c 2010-05-28 21:27:16.595266161 -0400 +diff -urNp linux-2.6.32.16/net/core/dev.c linux-2.6.32.16/net/core/dev.c +--- linux-2.6.32.16/net/core/dev.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/core/dev.c 2010-07-09 14:50:39.000000000 -0400 @@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb) } 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 { struct list_head *list = &__get_cpu_var(softnet_data).poll_list; unsigned long time_limit = jiffies + 2; -diff -urNp linux-2.6.32.15/net/core/flow.c linux-2.6.32.15/net/core/flow.c ---- linux-2.6.32.15/net/core/flow.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/core/flow.c 2010-05-28 21:27:16.595266161 -0400 +diff -urNp linux-2.6.32.16/net/core/flow.c linux-2.6.32.16/net/core/flow.c +--- linux-2.6.32.16/net/core/flow.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/core/flow.c 2010-07-09 14:50:39.000000000 -0400 @@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT( 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 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) -diff -urNp linux-2.6.32.15/net/dccp/ccids/ccid3.c linux-2.6.32.15/net/dccp/ccids/ccid3.c ---- linux-2.6.32.15/net/dccp/ccids/ccid3.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/dccp/ccids/ccid3.c 2010-05-28 21:27:16.595266161 -0400 +diff -urNp linux-2.6.32.16/net/dccp/ccids/ccid3.c linux-2.6.32.16/net/dccp/ccids/ccid3.c +--- linux-2.6.32.16/net/dccp/ccids/ccid3.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/dccp/ccids/ccid3.c 2010-07-09 14:50:39.000000000 -0400 @@ -41,7 +41,7 @@ static int ccid3_debug; #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 #endif /* -diff -urNp linux-2.6.32.15/net/dccp/dccp.h linux-2.6.32.15/net/dccp/dccp.h ---- linux-2.6.32.15/net/dccp/dccp.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/dccp/dccp.h 2010-05-28 21:27:16.595266161 -0400 +diff -urNp linux-2.6.32.16/net/dccp/dccp.h linux-2.6.32.16/net/dccp/dccp.h +--- linux-2.6.32.16/net/dccp/dccp.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/dccp/dccp.h 2010-07-09 14:50:39.000000000 -0400 @@ -44,9 +44,9 @@ extern int dccp_debug; #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a) #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 #endif extern struct inet_hashinfo dccp_hashinfo; -diff -urNp linux-2.6.32.15/net/decnet/sysctl_net_decnet.c linux-2.6.32.15/net/decnet/sysctl_net_decnet.c ---- linux-2.6.32.15/net/decnet/sysctl_net_decnet.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/decnet/sysctl_net_decnet.c 2010-05-28 21:27:16.595266161 -0400 +diff -urNp linux-2.6.32.16/net/decnet/sysctl_net_decnet.c linux-2.6.32.16/net/decnet/sysctl_net_decnet.c +--- linux-2.6.32.16/net/decnet/sysctl_net_decnet.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/decnet/sysctl_net_decnet.c 2010-07-09 14:50:39.000000000 -0400 @@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t 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 return -EFAULT; *lenp = len; -diff -urNp linux-2.6.32.15/net/ipv4/inet_hashtables.c linux-2.6.32.15/net/ipv4/inet_hashtables.c ---- linux-2.6.32.15/net/ipv4/inet_hashtables.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/ipv4/inet_hashtables.c 2010-05-28 21:27:16.600259316 -0400 +diff -urNp linux-2.6.32.16/net/ipv4/inet_hashtables.c linux-2.6.32.16/net/ipv4/inet_hashtables.c +--- linux-2.6.32.16/net/ipv4/inet_hashtables.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/ipv4/inet_hashtables.c 2010-07-09 14:50:39.000000000 -0400 @@ -18,11 +18,14 @@ #include <linux/sched.h> #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 if (tw) { inet_twsk_deschedule(tw, death_row); inet_twsk_put(tw); -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 ---- linux-2.6.32.15/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-05-28 21:27:16.600259316 -0400 +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 +--- linux-2.6.32.16/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-07-09 14:50:39.000000000 -0400 @@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( *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 if (*octets == NULL) { if (net_ratelimit()) printk("OOM in bsalg (%d)\n", __LINE__); -diff -urNp linux-2.6.32.15/net/ipv4/tcp_ipv4.c linux-2.6.32.15/net/ipv4/tcp_ipv4.c ---- linux-2.6.32.15/net/ipv4/tcp_ipv4.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/ipv4/tcp_ipv4.c 2010-05-28 21:27:16.600259316 -0400 +diff -urNp linux-2.6.32.16/net/ipv4/tcp_ipv4.c linux-2.6.32.16/net/ipv4/tcp_ipv4.c +--- linux-2.6.32.16/net/ipv4/tcp_ipv4.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/ipv4/tcp_ipv4.c 2010-07-09 14:50:39.000000000 -0400 @@ -84,6 +84,9 @@ int sysctl_tcp_tw_reuse __read_mostly; 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 tcp_v4_send_reset(NULL, skb); } -diff -urNp linux-2.6.32.15/net/ipv4/tcp_minisocks.c linux-2.6.32.15/net/ipv4/tcp_minisocks.c ---- linux-2.6.32.15/net/ipv4/tcp_minisocks.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/ipv4/tcp_minisocks.c 2010-05-28 21:27:16.600259316 -0400 +diff -urNp linux-2.6.32.16/net/ipv4/tcp_minisocks.c linux-2.6.32.16/net/ipv4/tcp_minisocks.c +--- linux-2.6.32.16/net/ipv4/tcp_minisocks.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/ipv4/tcp_minisocks.c 2010-07-09 14:50:39.000000000 -0400 @@ -26,6 +26,10 @@ #include <net/inet_common.h> #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 if (!(flg & TCP_FLAG_RST)) req->rsk_ops->send_reset(sk, skb); -diff -urNp linux-2.6.32.15/net/ipv4/tcp_probe.c linux-2.6.32.15/net/ipv4/tcp_probe.c ---- linux-2.6.32.15/net/ipv4/tcp_probe.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/ipv4/tcp_probe.c 2010-05-28 21:27:16.600259316 -0400 +diff -urNp linux-2.6.32.16/net/ipv4/tcp_probe.c linux-2.6.32.16/net/ipv4/tcp_probe.c +--- linux-2.6.32.16/net/ipv4/tcp_probe.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/ipv4/tcp_probe.c 2010-07-09 14:50:39.000000000 -0400 @@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file if (cnt + width >= len) 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 return -EFAULT; cnt += width; } -diff -urNp linux-2.6.32.15/net/ipv4/tcp_timer.c linux-2.6.32.15/net/ipv4/tcp_timer.c ---- linux-2.6.32.15/net/ipv4/tcp_timer.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/ipv4/tcp_timer.c 2010-05-28 21:27:16.600259316 -0400 +diff -urNp linux-2.6.32.16/net/ipv4/tcp_timer.c linux-2.6.32.16/net/ipv4/tcp_timer.c +--- linux-2.6.32.16/net/ipv4/tcp_timer.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/ipv4/tcp_timer.c 2010-07-09 14:50:39.000000000 -0400 @@ -21,6 +21,10 @@ #include <linux/module.h> #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 if (retransmits_timed_out(sk, retry_until)) { /* Has it gone just too far? */ tcp_write_err(sk); -diff -urNp linux-2.6.32.15/net/ipv4/udp.c linux-2.6.32.15/net/ipv4/udp.c ---- linux-2.6.32.15/net/ipv4/udp.c 2010-05-28 20:16:44.458924952 -0400 -+++ linux-2.6.32.15/net/ipv4/udp.c 2010-05-28 21:27:16.624385427 -0400 +diff -urNp linux-2.6.32.16/net/ipv4/udp.c linux-2.6.32.16/net/ipv4/udp.c +--- linux-2.6.32.16/net/ipv4/udp.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/ipv4/udp.c 2010-07-09 14:50:39.000000000 -0400 @@ -86,6 +86,7 @@ #include <linux/types.h> #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 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); /* -diff -urNp linux-2.6.32.15/net/ipv6/exthdrs.c linux-2.6.32.15/net/ipv6/exthdrs.c ---- linux-2.6.32.15/net/ipv6/exthdrs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/ipv6/exthdrs.c 2010-05-28 21:27:16.624385427 -0400 +diff -urNp linux-2.6.32.16/net/ipv6/exthdrs.c linux-2.6.32.16/net/ipv6/exthdrs.c +--- linux-2.6.32.16/net/ipv6/exthdrs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/ipv6/exthdrs.c 2010-07-09 14:50:39.000000000 -0400 @@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt .type = IPV6_TLV_JUMBO, .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 }; int ipv6_parse_hopopts(struct sk_buff *skb) -diff -urNp linux-2.6.32.15/net/ipv6/raw.c linux-2.6.32.15/net/ipv6/raw.c ---- linux-2.6.32.15/net/ipv6/raw.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/ipv6/raw.c 2010-05-28 21:27:16.624385427 -0400 +diff -urNp linux-2.6.32.16/net/ipv6/raw.c linux-2.6.32.16/net/ipv6/raw.c +--- linux-2.6.32.16/net/ipv6/raw.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/ipv6/raw.c 2010-07-09 14:50:39.000000000 -0400 @@ -600,7 +600,7 @@ out: return err; } @@ -54159,9 +54399,9 @@ diff -urNp linux-2.6.32.15/net/ipv6/raw.c linux-2.6.32.15/net/ipv6/raw.c struct flowi *fl, struct rt6_info *rt, unsigned int flags) { -diff -urNp linux-2.6.32.15/net/ipv6/tcp_ipv6.c linux-2.6.32.15/net/ipv6/tcp_ipv6.c ---- linux-2.6.32.15/net/ipv6/tcp_ipv6.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/ipv6/tcp_ipv6.c 2010-06-26 14:14:12.642949877 -0400 +diff -urNp linux-2.6.32.16/net/ipv6/tcp_ipv6.c linux-2.6.32.16/net/ipv6/tcp_ipv6.c +--- linux-2.6.32.16/net/ipv6/tcp_ipv6.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/ipv6/tcp_ipv6.c 2010-07-09 14:50:39.000000000 -0400 @@ -88,6 +88,10 @@ static struct tcp_md5sig_key *tcp_v6_md5 } #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 tcp_v6_send_reset(NULL, skb); } -diff -urNp linux-2.6.32.15/net/ipv6/udp.c linux-2.6.32.15/net/ipv6/udp.c ---- linux-2.6.32.15/net/ipv6/udp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/ipv6/udp.c 2010-06-26 14:15:10.978789054 -0400 +diff -urNp linux-2.6.32.16/net/ipv6/udp.c linux-2.6.32.16/net/ipv6/udp.c +--- linux-2.6.32.16/net/ipv6/udp.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/ipv6/udp.c 2010-07-09 14:50:39.000000000 -0400 @@ -49,6 +49,10 @@ #include <linux/seq_file.h> #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 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev); kfree_skb(skb); -diff -urNp linux-2.6.32.15/net/irda/ircomm/ircomm_tty.c linux-2.6.32.15/net/irda/ircomm/ircomm_tty.c ---- linux-2.6.32.15/net/irda/ircomm/ircomm_tty.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/irda/ircomm/ircomm_tty.c 2010-05-28 21:27:16.634961077 -0400 +diff -urNp linux-2.6.32.16/net/irda/ircomm/ircomm_tty.c linux-2.6.32.16/net/irda/ircomm/ircomm_tty.c +--- linux-2.6.32.16/net/irda/ircomm/ircomm_tty.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/irda/ircomm/ircomm_tty.c 2010-07-09 14:50:39.000000000 -0400 @@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st add_wait_queue(&self->open_wait, &wait); @@ -54356,9 +54596,9 @@ diff -urNp linux-2.6.32.15/net/irda/ircomm/ircomm_tty.c linux-2.6.32.15/net/irda seq_printf(m, "Max data size: %d\n", self->max_data_size); seq_printf(m, "Max header size: %d\n", self->max_header_size); -diff -urNp linux-2.6.32.15/net/mac80211/ieee80211_i.h linux-2.6.32.15/net/mac80211/ieee80211_i.h ---- linux-2.6.32.15/net/mac80211/ieee80211_i.h 2010-04-04 20:41:50.080541354 -0400 -+++ linux-2.6.32.15/net/mac80211/ieee80211_i.h 2010-05-28 21:27:16.639255900 -0400 +diff -urNp linux-2.6.32.16/net/mac80211/ieee80211_i.h linux-2.6.32.16/net/mac80211/ieee80211_i.h +--- linux-2.6.32.16/net/mac80211/ieee80211_i.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/mac80211/ieee80211_i.h 2010-07-09 14:50:39.000000000 -0400 @@ -635,7 +635,7 @@ struct ieee80211_local { /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ 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 int monitors, cooked_mntrs; /* number of interfaces with corresponding FIF_ flags */ int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll; -diff -urNp linux-2.6.32.15/net/mac80211/iface.c linux-2.6.32.15/net/mac80211/iface.c ---- linux-2.6.32.15/net/mac80211/iface.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/mac80211/iface.c 2010-05-28 21:27:16.650898496 -0400 +diff -urNp linux-2.6.32.16/net/mac80211/iface.c linux-2.6.32.16/net/mac80211/iface.c +--- linux-2.6.32.16/net/mac80211/iface.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/mac80211/iface.c 2010-07-09 14:50:39.000000000 -0400 @@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev break; } @@ -54425,9 +54665,9 @@ diff -urNp linux-2.6.32.15/net/mac80211/iface.c linux-2.6.32.15/net/mac80211/ifa ieee80211_clear_tx_pending(local); ieee80211_stop_device(local); -diff -urNp linux-2.6.32.15/net/mac80211/main.c linux-2.6.32.15/net/mac80211/main.c ---- linux-2.6.32.15/net/mac80211/main.c 2010-04-04 20:41:50.080541354 -0400 -+++ linux-2.6.32.15/net/mac80211/main.c 2010-05-28 21:27:16.650898496 -0400 +diff -urNp linux-2.6.32.16/net/mac80211/main.c linux-2.6.32.16/net/mac80211/main.c +--- linux-2.6.32.16/net/mac80211/main.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/mac80211/main.c 2010-07-09 14:50:39.000000000 -0400 @@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211 local->hw.conf.power_level = power; } @@ -54437,9 +54677,9 @@ diff -urNp linux-2.6.32.15/net/mac80211/main.c linux-2.6.32.15/net/mac80211/main ret = drv_config(local, changed); /* * Goal: -diff -urNp linux-2.6.32.15/net/mac80211/pm.c linux-2.6.32.15/net/mac80211/pm.c ---- linux-2.6.32.15/net/mac80211/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/mac80211/pm.c 2010-05-28 21:27:16.650898496 -0400 +diff -urNp linux-2.6.32.16/net/mac80211/pm.c linux-2.6.32.16/net/mac80211/pm.c +--- linux-2.6.32.16/net/mac80211/pm.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/mac80211/pm.c 2010-07-09 14:50:39.000000000 -0400 @@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211 } @@ -54449,9 +54689,9 @@ diff -urNp linux-2.6.32.15/net/mac80211/pm.c linux-2.6.32.15/net/mac80211/pm.c ieee80211_stop_device(local); local->suspended = true; -diff -urNp linux-2.6.32.15/net/mac80211/rate.c linux-2.6.32.15/net/mac80211/rate.c ---- linux-2.6.32.15/net/mac80211/rate.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/mac80211/rate.c 2010-05-28 21:27:16.650898496 -0400 +diff -urNp linux-2.6.32.16/net/mac80211/rate.c linux-2.6.32.16/net/mac80211/rate.c +--- linux-2.6.32.16/net/mac80211/rate.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/mac80211/rate.c 2010-07-09 14:50:39.000000000 -0400 @@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct struct rate_control_ref *ref, *old; @@ -54461,9 +54701,9 @@ diff -urNp linux-2.6.32.15/net/mac80211/rate.c linux-2.6.32.15/net/mac80211/rate return -EBUSY; ref = rate_control_alloc(name, local); -diff -urNp linux-2.6.32.15/net/mac80211/tx.c linux-2.6.32.15/net/mac80211/tx.c ---- linux-2.6.32.15/net/mac80211/tx.c 2010-04-29 17:49:38.690617032 -0400 -+++ linux-2.6.32.15/net/mac80211/tx.c 2010-05-28 21:27:16.655282610 -0400 +diff -urNp linux-2.6.32.16/net/mac80211/tx.c linux-2.6.32.16/net/mac80211/tx.c +--- linux-2.6.32.16/net/mac80211/tx.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/mac80211/tx.c 2010-07-09 14:50:39.000000000 -0400 @@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct return cpu_to_le16(dur); } @@ -54473,9 +54713,9 @@ diff -urNp linux-2.6.32.15/net/mac80211/tx.c linux-2.6.32.15/net/mac80211/tx.c struct net_device *dev) { return local == wdev_priv(dev->ieee80211_ptr); -diff -urNp linux-2.6.32.15/net/mac80211/util.c linux-2.6.32.15/net/mac80211/util.c ---- linux-2.6.32.15/net/mac80211/util.c 2010-04-29 17:49:38.690617032 -0400 -+++ linux-2.6.32.15/net/mac80211/util.c 2010-05-28 21:27:16.655282610 -0400 +diff -urNp linux-2.6.32.16/net/mac80211/util.c linux-2.6.32.16/net/mac80211/util.c +--- linux-2.6.32.16/net/mac80211/util.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/mac80211/util.c 2010-07-09 14:50:39.000000000 -0400 @@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_ local->resuming = true; @@ -54493,9 +54733,9 @@ diff -urNp linux-2.6.32.15/net/mac80211/util.c linux-2.6.32.15/net/mac80211/util if (res) { WARN(local->suspended, "Harware became unavailable " "upon resume. This is could be a software issue" -diff -urNp linux-2.6.32.15/net/sctp/socket.c linux-2.6.32.15/net/sctp/socket.c ---- linux-2.6.32.15/net/sctp/socket.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/sctp/socket.c 2010-05-28 21:27:16.667233121 -0400 +diff -urNp linux-2.6.32.16/net/sctp/socket.c linux-2.6.32.16/net/sctp/socket.c +--- linux-2.6.32.16/net/sctp/socket.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/sctp/socket.c 2010-07-09 14:50:39.000000000 -0400 @@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc struct sctp_sndrcvinfo *sinfo; 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 SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n"); if (pp->fastreuse && sk->sk_reuse && -diff -urNp linux-2.6.32.15/net/socket.c linux-2.6.32.15/net/socket.c ---- linux-2.6.32.15/net/socket.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/socket.c 2010-05-28 21:27:16.671255671 -0400 +diff -urNp linux-2.6.32.16/net/socket.c linux-2.6.32.16/net/socket.c +--- linux-2.6.32.16/net/socket.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/socket.c 2010-07-09 14:50:39.000000000 -0400 @@ -87,6 +87,7 @@ #include <linux/wireless.h> #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 +extern int gr_handle_sock_all(const int family, const int type, + const int protocol); +extern int gr_handle_sock_server(const struct sockaddr *sck); -+extern int gr_handle_sock_server_other(const struct socket *sck); ++extern int gr_handle_sock_server_other(const struct sock *sck); +extern int gr_handle_sock_client(const struct sockaddr *sck); +extern int gr_search_connect(struct socket * sock, + 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 if ((unsigned)backlog > somaxconn) backlog = somaxconn; -+ if (gr_handle_sock_server_other(sock)) { ++ if (gr_handle_sock_server_other(sock->sk)) { + err = -EPERM; + goto error; + } @@ -54620,7 +54860,7 @@ diff -urNp linux-2.6.32.15/net/socket.c linux-2.6.32.15/net/socket.c newsock->type = sock->type; newsock->ops = sock->ops; -+ if (gr_handle_sock_server_other(sock)) { ++ if (gr_handle_sock_server_other(sock->sk)) { + err = -EPERM; + sock_release(newsock); + 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 err = security_socket_connect(sock, (struct sockaddr *)&address, addrlen); if (err) -diff -urNp linux-2.6.32.15/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.15/net/sunrpc/xprtrdma/svc_rdma.c ---- linux-2.6.32.15/net/sunrpc/xprtrdma/svc_rdma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/sunrpc/xprtrdma/svc_rdma.c 2010-05-28 21:27:16.671255671 -0400 +diff -urNp linux-2.6.32.16/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.16/net/sunrpc/xprtrdma/svc_rdma.c +--- linux-2.6.32.16/net/sunrpc/xprtrdma/svc_rdma.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/sunrpc/xprtrdma/svc_rdma.c 2010-07-09 14:50:39.000000000 -0400 @@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta len -= *ppos; 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 return -EFAULT; *lenp = len; *ppos += len; -diff -urNp linux-2.6.32.15/net/sysctl_net.c linux-2.6.32.15/net/sysctl_net.c ---- linux-2.6.32.15/net/sysctl_net.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/sysctl_net.c 2010-05-28 21:27:16.674940896 -0400 +diff -urNp linux-2.6.32.16/net/sysctl_net.c linux-2.6.32.16/net/sysctl_net.c +--- linux-2.6.32.16/net/sysctl_net.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/sysctl_net.c 2010-07-09 14:50:39.000000000 -0400 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct struct ctl_table *table) { @@ -54694,9 +54934,9 @@ diff -urNp linux-2.6.32.15/net/sysctl_net.c linux-2.6.32.15/net/sysctl_net.c int mode = (table->mode >> 6) & 7; return (mode << 6) | (mode << 3) | mode; } -diff -urNp linux-2.6.32.15/net/tipc/socket.c linux-2.6.32.15/net/tipc/socket.c ---- linux-2.6.32.15/net/tipc/socket.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/tipc/socket.c 2010-05-28 21:27:16.683249187 -0400 +diff -urNp linux-2.6.32.16/net/tipc/socket.c linux-2.6.32.16/net/tipc/socket.c +--- linux-2.6.32.16/net/tipc/socket.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/tipc/socket.c 2010-07-09 14:50:39.000000000 -0400 @@ -1449,8 +1449,9 @@ static int connect(struct socket *sock, } else { 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 sock->state = SS_DISCONNECTING; } -diff -urNp linux-2.6.32.15/net/unix/af_unix.c linux-2.6.32.15/net/unix/af_unix.c ---- linux-2.6.32.15/net/unix/af_unix.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/unix/af_unix.c 2010-05-28 21:27:16.686916709 -0400 +diff -urNp linux-2.6.32.16/net/unix/af_unix.c linux-2.6.32.16/net/unix/af_unix.c +--- linux-2.6.32.16/net/unix/af_unix.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/unix/af_unix.c 2010-07-09 14:50:39.000000000 -0400 @@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru err = -ECONNREFUSED; 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 list = &unix_socket_table[addr->hash]; } else { list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)]; -diff -urNp linux-2.6.32.15/net/wireless/wext.c linux-2.6.32.15/net/wireless/wext.c ---- linux-2.6.32.15/net/wireless/wext.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/wireless/wext.c 2010-05-28 21:27:16.686916709 -0400 +diff -urNp linux-2.6.32.16/net/wireless/wext.c linux-2.6.32.16/net/wireless/wext.c +--- linux-2.6.32.16/net/wireless/wext.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/wireless/wext.c 2010-07-09 14:50:39.000000000 -0400 @@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc */ @@ -54782,9 +55022,9 @@ diff -urNp linux-2.6.32.15/net/wireless/wext.c linux-2.6.32.15/net/wireless/wext /* Allow userspace to GET more than max so * we can support any size GET requests. * There is still a limit : -ENOMEM. -diff -urNp linux-2.6.32.15/net/xfrm/xfrm_policy.c linux-2.6.32.15/net/xfrm/xfrm_policy.c ---- linux-2.6.32.15/net/xfrm/xfrm_policy.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/net/xfrm/xfrm_policy.c 2010-05-28 21:27:16.686916709 -0400 +diff -urNp linux-2.6.32.16/net/xfrm/xfrm_policy.c linux-2.6.32.16/net/xfrm/xfrm_policy.c +--- linux-2.6.32.16/net/xfrm/xfrm_policy.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/net/xfrm/xfrm_policy.c 2010-07-09 14:50:39.000000000 -0400 @@ -1477,7 +1477,7 @@ free_dst: goto out; } @@ -54812,9 +55052,9 @@ diff -urNp linux-2.6.32.15/net/xfrm/xfrm_policy.c linux-2.6.32.15/net/xfrm/xfrm_ xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl) { #ifdef CONFIG_XFRM_SUB_POLICY -diff -urNp linux-2.6.32.15/samples/kobject/kset-example.c linux-2.6.32.15/samples/kobject/kset-example.c ---- linux-2.6.32.15/samples/kobject/kset-example.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/samples/kobject/kset-example.c 2010-05-28 21:27:16.686916709 -0400 +diff -urNp linux-2.6.32.16/samples/kobject/kset-example.c linux-2.6.32.16/samples/kobject/kset-example.c +--- linux-2.6.32.16/samples/kobject/kset-example.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/samples/kobject/kset-example.c 2010-07-09 14:50:39.000000000 -0400 @@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob } @@ -54824,9 +55064,9 @@ diff -urNp linux-2.6.32.15/samples/kobject/kset-example.c linux-2.6.32.15/sample .show = foo_attr_show, .store = foo_attr_store, }; -diff -urNp linux-2.6.32.15/scripts/basic/fixdep.c linux-2.6.32.15/scripts/basic/fixdep.c ---- linux-2.6.32.15/scripts/basic/fixdep.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/scripts/basic/fixdep.c 2010-05-28 21:27:16.686916709 -0400 +diff -urNp linux-2.6.32.16/scripts/basic/fixdep.c linux-2.6.32.16/scripts/basic/fixdep.c +--- linux-2.6.32.16/scripts/basic/fixdep.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/scripts/basic/fixdep.c 2010-07-09 14:50:39.000000000 -0400 @@ -222,9 +222,9 @@ static void use_config(char *m, int slen 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/ if (*p != INT_CONF) { fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", -diff -urNp linux-2.6.32.15/scripts/kallsyms.c linux-2.6.32.15/scripts/kallsyms.c ---- linux-2.6.32.15/scripts/kallsyms.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/scripts/kallsyms.c 2010-05-28 21:27:16.686916709 -0400 +diff -urNp linux-2.6.32.16/scripts/kallsyms.c linux-2.6.32.16/scripts/kallsyms.c +--- linux-2.6.32.16/scripts/kallsyms.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/scripts/kallsyms.c 2010-07-09 14:50:39.000000000 -0400 @@ -43,10 +43,10 @@ struct text_range { 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 }; #define text_range_text (&text_ranges[0]) #define text_range_inittext (&text_ranges[1]) -diff -urNp linux-2.6.32.15/scripts/mod/file2alias.c linux-2.6.32.15/scripts/mod/file2alias.c ---- linux-2.6.32.15/scripts/mod/file2alias.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/scripts/mod/file2alias.c 2010-05-28 21:27:16.686916709 -0400 +diff -urNp linux-2.6.32.16/scripts/mod/file2alias.c linux-2.6.32.16/scripts/mod/file2alias.c +--- linux-2.6.32.16/scripts/mod/file2alias.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/scripts/mod/file2alias.c 2010-07-09 14:50:39.000000000 -0400 @@ -72,7 +72,7 @@ static void device_id_check(const char * unsigned long size, unsigned long id_size, void *symval) @@ -54923,9 +55163,9 @@ diff -urNp linux-2.6.32.15/scripts/mod/file2alias.c linux-2.6.32.15/scripts/mod/ sprintf(alias, "dmi*"); -diff -urNp linux-2.6.32.15/scripts/mod/modpost.c linux-2.6.32.15/scripts/mod/modpost.c ---- linux-2.6.32.15/scripts/mod/modpost.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/scripts/mod/modpost.c 2010-05-28 21:27:16.694974041 -0400 +diff -urNp linux-2.6.32.16/scripts/mod/modpost.c linux-2.6.32.16/scripts/mod/modpost.c +--- linux-2.6.32.16/scripts/mod/modpost.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/scripts/mod/modpost.c 2010-07-09 14:50:39.000000000 -0400 @@ -835,6 +835,7 @@ enum mismatch { INIT_TO_EXIT, 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 goto close_write; tmp = NOFAIL(malloc(b->pos)); -diff -urNp linux-2.6.32.15/scripts/mod/modpost.h linux-2.6.32.15/scripts/mod/modpost.h ---- linux-2.6.32.15/scripts/mod/modpost.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/scripts/mod/modpost.h 2010-05-28 21:27:16.694974041 -0400 +diff -urNp linux-2.6.32.16/scripts/mod/modpost.h linux-2.6.32.16/scripts/mod/modpost.h +--- linux-2.6.32.16/scripts/mod/modpost.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/scripts/mod/modpost.h 2010-07-09 14:50:39.000000000 -0400 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e 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 struct module { struct module *next; -diff -urNp linux-2.6.32.15/scripts/mod/sumversion.c linux-2.6.32.15/scripts/mod/sumversion.c ---- linux-2.6.32.15/scripts/mod/sumversion.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/scripts/mod/sumversion.c 2010-05-28 21:27:16.694974041 -0400 +diff -urNp linux-2.6.32.16/scripts/mod/sumversion.c linux-2.6.32.16/scripts/mod/sumversion.c +--- linux-2.6.32.16/scripts/mod/sumversion.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/scripts/mod/sumversion.c 2010-07-09 14:50:39.000000000 -0400 @@ -455,7 +455,7 @@ static void write_version(const char *fi goto out; } @@ -55027,9 +55267,9 @@ diff -urNp linux-2.6.32.15/scripts/mod/sumversion.c linux-2.6.32.15/scripts/mod/ warn("writing sum in %s failed: %s\n", filename, strerror(errno)); goto out; -diff -urNp linux-2.6.32.15/scripts/pnmtologo.c linux-2.6.32.15/scripts/pnmtologo.c ---- linux-2.6.32.15/scripts/pnmtologo.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/scripts/pnmtologo.c 2010-05-28 21:27:16.694974041 -0400 +diff -urNp linux-2.6.32.16/scripts/pnmtologo.c linux-2.6.32.16/scripts/pnmtologo.c +--- linux-2.6.32.16/scripts/pnmtologo.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/scripts/pnmtologo.c 2010-07-09 14:50:39.000000000 -0400 @@ -237,14 +237,14 @@ static void write_header(void) fprintf(out, " * Linux logo %s\n", logoname); 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 logoname); write_hex_cnt = 0; for (i = 0; i < logo_clutsize; i++) { -diff -urNp linux-2.6.32.15/security/commoncap.c linux-2.6.32.15/security/commoncap.c ---- linux-2.6.32.15/security/commoncap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/security/commoncap.c 2010-05-28 21:27:16.694974041 -0400 +diff -urNp linux-2.6.32.16/security/commoncap.c linux-2.6.32.16/security/commoncap.c +--- linux-2.6.32.16/security/commoncap.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/security/commoncap.c 2010-07-09 14:50:39.000000000 -0400 @@ -27,7 +27,7 @@ #include <linux/sched.h> #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 return 0; } -diff -urNp linux-2.6.32.15/security/integrity/ima/ima_api.c linux-2.6.32.15/security/integrity/ima/ima_api.c ---- linux-2.6.32.15/security/integrity/ima/ima_api.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/security/integrity/ima/ima_api.c 2010-05-28 21:27:16.694974041 -0400 +diff -urNp linux-2.6.32.16/security/integrity/ima/ima_api.c linux-2.6.32.16/security/integrity/ima/ima_api.c +--- linux-2.6.32.16/security/integrity/ima/ima_api.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/security/integrity/ima/ima_api.c 2010-07-09 14:50:39.000000000 -0400 @@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino int result; @@ -55093,9 +55333,9 @@ diff -urNp linux-2.6.32.15/security/integrity/ima/ima_api.c linux-2.6.32.15/secu entry = kmalloc(sizeof(*entry), GFP_KERNEL); if (!entry) { -diff -urNp linux-2.6.32.15/security/integrity/ima/ima_fs.c linux-2.6.32.15/security/integrity/ima/ima_fs.c ---- linux-2.6.32.15/security/integrity/ima/ima_fs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/security/integrity/ima/ima_fs.c 2010-05-28 21:27:16.694974041 -0400 +diff -urNp linux-2.6.32.16/security/integrity/ima/ima_fs.c linux-2.6.32.16/security/integrity/ima/ima_fs.c +--- linux-2.6.32.16/security/integrity/ima/ima_fs.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/security/integrity/ima/ima_fs.c 2010-07-09 14:50:39.000000000 -0400 @@ -27,12 +27,12 @@ static int valid_policy = 1; #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 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); } -diff -urNp linux-2.6.32.15/security/integrity/ima/ima.h linux-2.6.32.15/security/integrity/ima/ima.h ---- linux-2.6.32.15/security/integrity/ima/ima.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/security/integrity/ima/ima.h 2010-05-28 21:27:16.694974041 -0400 +diff -urNp linux-2.6.32.16/security/integrity/ima/ima.h linux-2.6.32.16/security/integrity/ima/ima.h +--- linux-2.6.32.16/security/integrity/ima/ima.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/security/integrity/ima/ima.h 2010-07-09 14:50:39.000000000 -0400 @@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino extern spinlock_t ima_queue_lock; @@ -55125,9 +55365,9 @@ diff -urNp linux-2.6.32.15/security/integrity/ima/ima.h linux-2.6.32.15/security struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; }; extern struct ima_h_table ima_htable; -diff -urNp linux-2.6.32.15/security/integrity/ima/ima_queue.c linux-2.6.32.15/security/integrity/ima/ima_queue.c ---- linux-2.6.32.15/security/integrity/ima/ima_queue.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/security/integrity/ima/ima_queue.c 2010-05-28 21:27:16.694974041 -0400 +diff -urNp linux-2.6.32.16/security/integrity/ima/ima_queue.c linux-2.6.32.16/security/integrity/ima/ima_queue.c +--- linux-2.6.32.16/security/integrity/ima/ima_queue.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/security/integrity/ima/ima_queue.c 2010-07-09 14:50:39.000000000 -0400 @@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i INIT_LIST_HEAD(&qe->later); 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 key = ima_hash_key(entry->digest); hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); return 0; -diff -urNp linux-2.6.32.15/security/Kconfig linux-2.6.32.15/security/Kconfig ---- linux-2.6.32.15/security/Kconfig 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/security/Kconfig 2010-05-28 21:27:16.694974041 -0400 +diff -urNp linux-2.6.32.16/security/Kconfig linux-2.6.32.16/security/Kconfig +--- linux-2.6.32.16/security/Kconfig 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/security/Kconfig 2010-07-09 14:50:39.000000000 -0400 @@ -4,6 +4,499 @@ menu "Security options" @@ -55649,9 +55889,9 @@ diff -urNp linux-2.6.32.15/security/Kconfig linux-2.6.32.15/security/Kconfig help This is the portion of low virtual memory which should be protected from userspace allocation. Keeping a user from writing to low pages -diff -urNp linux-2.6.32.15/security/min_addr.c linux-2.6.32.15/security/min_addr.c ---- linux-2.6.32.15/security/min_addr.c 2010-05-28 20:16:44.458924952 -0400 -+++ linux-2.6.32.15/security/min_addr.c 2010-05-28 21:27:16.694974041 -0400 +diff -urNp linux-2.6.32.16/security/min_addr.c linux-2.6.32.16/security/min_addr.c +--- linux-2.6.32.16/security/min_addr.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/security/min_addr.c 2010-07-09 14:50:39.000000000 -0400 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG */ 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 } /* -diff -urNp linux-2.6.32.15/sound/aoa/codecs/onyx.c linux-2.6.32.15/sound/aoa/codecs/onyx.c ---- linux-2.6.32.15/sound/aoa/codecs/onyx.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/sound/aoa/codecs/onyx.c 2010-05-28 21:27:16.694974041 -0400 +diff -urNp linux-2.6.32.16/sound/aoa/codecs/onyx.c linux-2.6.32.16/sound/aoa/codecs/onyx.c +--- linux-2.6.32.16/sound/aoa/codecs/onyx.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/sound/aoa/codecs/onyx.c 2010-07-09 14:50:39.000000000 -0400 @@ -53,7 +53,7 @@ struct onyx { spdif_locked:1, 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 onyx->spdif_locked = onyx->analog_locked = 0; mutex_unlock(&onyx->mutex); -diff -urNp linux-2.6.32.15/sound/core/oss/pcm_oss.c linux-2.6.32.15/sound/core/oss/pcm_oss.c ---- linux-2.6.32.15/sound/core/oss/pcm_oss.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/sound/core/oss/pcm_oss.c 2010-05-28 21:27:16.698950213 -0400 +diff -urNp linux-2.6.32.16/sound/core/oss/pcm_oss.c linux-2.6.32.16/sound/core/oss/pcm_oss.c +--- linux-2.6.32.16/sound/core/oss/pcm_oss.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/sound/core/oss/pcm_oss.c 2010-07-09 14:50:39.000000000 -0400 @@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct } } @@ -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 #endif /* CONFIG_SND_VERBOSE_PROCFS */ /* -diff -urNp linux-2.6.32.15/sound/core/seq/seq_lock.h linux-2.6.32.15/sound/core/seq/seq_lock.h ---- linux-2.6.32.15/sound/core/seq/seq_lock.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/sound/core/seq/seq_lock.h 2010-05-28 21:27:16.698950213 -0400 +diff -urNp linux-2.6.32.16/sound/core/seq/seq_lock.h linux-2.6.32.16/sound/core/seq/seq_lock.h +--- linux-2.6.32.16/sound/core/seq/seq_lock.h 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/sound/core/seq/seq_lock.h 2010-07-09 14:50:39.000000000 -0400 @@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo #else /* SMP || CONFIG_SND_DEBUG */ @@ -55731,9 +55971,9 @@ diff -urNp linux-2.6.32.15/sound/core/seq/seq_lock.h linux-2.6.32.15/sound/core/ #endif /* SMP || CONFIG_SND_DEBUG */ -diff -urNp linux-2.6.32.15/sound/drivers/mts64.c linux-2.6.32.15/sound/drivers/mts64.c ---- linux-2.6.32.15/sound/drivers/mts64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/sound/drivers/mts64.c 2010-05-28 21:27:16.698950213 -0400 +diff -urNp linux-2.6.32.16/sound/drivers/mts64.c linux-2.6.32.16/sound/drivers/mts64.c +--- linux-2.6.32.16/sound/drivers/mts64.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/sound/drivers/mts64.c 2010-07-09 14:50:39.000000000 -0400 @@ -65,7 +65,7 @@ struct mts64 { struct pardevice *pardev; 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 return 0; } -diff -urNp linux-2.6.32.15/sound/drivers/portman2x4.c linux-2.6.32.15/sound/drivers/portman2x4.c ---- linux-2.6.32.15/sound/drivers/portman2x4.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/sound/drivers/portman2x4.c 2010-05-28 21:27:16.698950213 -0400 +diff -urNp linux-2.6.32.16/sound/drivers/portman2x4.c linux-2.6.32.16/sound/drivers/portman2x4.c +--- linux-2.6.32.16/sound/drivers/portman2x4.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/sound/drivers/portman2x4.c 2010-07-09 14:50:39.000000000 -0400 @@ -83,7 +83,7 @@ struct portman { struct pardevice *pardev; 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 int mode[PORTMAN_NUM_INPUT_PORTS]; struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; }; -diff -urNp linux-2.6.32.15/sound/oss/sb_audio.c linux-2.6.32.15/sound/oss/sb_audio.c ---- linux-2.6.32.15/sound/oss/sb_audio.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/sound/oss/sb_audio.c 2010-05-28 21:27:16.698950213 -0400 +diff -urNp linux-2.6.32.16/sound/oss/sb_audio.c linux-2.6.32.16/sound/oss/sb_audio.c +--- linux-2.6.32.16/sound/oss/sb_audio.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/sound/oss/sb_audio.c 2010-07-09 14:50:39.000000000 -0400 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, buf16 = (signed short *)(localbuf + localoffs); 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 if (copy_from_user(lbuf8, userbuf+useroffs + p, locallen)) -diff -urNp linux-2.6.32.15/sound/pci/ac97/ac97_codec.c linux-2.6.32.15/sound/pci/ac97/ac97_codec.c ---- linux-2.6.32.15/sound/pci/ac97/ac97_codec.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/sound/pci/ac97/ac97_codec.c 2010-05-28 21:27:16.698950213 -0400 +diff -urNp linux-2.6.32.16/sound/pci/ac97/ac97_codec.c linux-2.6.32.16/sound/pci/ac97/ac97_codec.c +--- linux-2.6.32.16/sound/pci/ac97/ac97_codec.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/sound/pci/ac97/ac97_codec.c 2010-07-09 14:50:39.000000000 -0400 @@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc } @@ -55818,9 +56058,9 @@ diff -urNp linux-2.6.32.15/sound/pci/ac97/ac97_codec.c linux-2.6.32.15/sound/pci #ifdef CONFIG_SND_AC97_POWER_SAVE static void do_update_power(struct work_struct *work) -diff -urNp linux-2.6.32.15/sound/pci/ac97/ac97_patch.c linux-2.6.32.15/sound/pci/ac97/ac97_patch.c ---- linux-2.6.32.15/sound/pci/ac97/ac97_patch.c 2010-04-04 20:41:50.084493253 -0400 -+++ linux-2.6.32.15/sound/pci/ac97/ac97_patch.c 2010-05-28 21:27:16.698950213 -0400 +diff -urNp linux-2.6.32.16/sound/pci/ac97/ac97_patch.c linux-2.6.32.16/sound/pci/ac97/ac97_patch.c +--- linux-2.6.32.16/sound/pci/ac97/ac97_patch.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/sound/pci/ac97/ac97_patch.c 2010-07-09 14:50:39.000000000 -0400 @@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd return 0; } @@ -56127,9 +56367,9 @@ diff -urNp linux-2.6.32.15/sound/pci/ac97/ac97_patch.c linux-2.6.32.15/sound/pci .build_specific = patch_ucb1400_specific, }; -diff -urNp linux-2.6.32.15/sound/pci/ens1370.c linux-2.6.32.15/sound/pci/ens1370.c ---- linux-2.6.32.15/sound/pci/ens1370.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/sound/pci/ens1370.c 2010-05-28 21:27:16.698950213 -0400 +diff -urNp linux-2.6.32.16/sound/pci/ens1370.c linux-2.6.32.16/sound/pci/ens1370.c +--- linux-2.6.32.16/sound/pci/ens1370.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/sound/pci/ens1370.c 2010-07-09 14:50:39.000000000 -0400 @@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ { 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 }; MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); -diff -urNp linux-2.6.32.15/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.15/sound/pci/hda/patch_intelhdmi.c ---- linux-2.6.32.15/sound/pci/hda/patch_intelhdmi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/sound/pci/hda/patch_intelhdmi.c 2010-05-28 21:27:16.698950213 -0400 +diff -urNp linux-2.6.32.16/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.16/sound/pci/hda/patch_intelhdmi.c +--- linux-2.6.32.16/sound/pci/hda/patch_intelhdmi.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/sound/pci/hda/patch_intelhdmi.c 2010-07-09 14:50:39.000000000 -0400 @@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str cp_ready); @@ -56157,9 +56397,9 @@ diff -urNp linux-2.6.32.15/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.15/sound } -diff -urNp linux-2.6.32.15/sound/pci/intel8x0.c linux-2.6.32.15/sound/pci/intel8x0.c ---- linux-2.6.32.15/sound/pci/intel8x0.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/sound/pci/intel8x0.c 2010-05-28 21:27:16.698950213 -0400 +diff -urNp linux-2.6.32.16/sound/pci/intel8x0.c linux-2.6.32.16/sound/pci/intel8x0.c +--- linux-2.6.32.16/sound/pci/intel8x0.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/sound/pci/intel8x0.c 2010-07-09 14:50:39.000000000 -0400 @@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ { 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 }; static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, -diff -urNp linux-2.6.32.15/sound/pci/intel8x0m.c linux-2.6.32.15/sound/pci/intel8x0m.c ---- linux-2.6.32.15/sound/pci/intel8x0m.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/sound/pci/intel8x0m.c 2010-05-28 21:27:16.703208428 -0400 +diff -urNp linux-2.6.32.16/sound/pci/intel8x0m.c linux-2.6.32.16/sound/pci/intel8x0m.c +--- linux-2.6.32.16/sound/pci/intel8x0m.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/sound/pci/intel8x0m.c 2010-07-09 14:50:39.000000000 -0400 @@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ { 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 }; static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, -diff -urNp linux-2.6.32.15/usr/gen_init_cpio.c linux-2.6.32.15/usr/gen_init_cpio.c ---- linux-2.6.32.15/usr/gen_init_cpio.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.15/usr/gen_init_cpio.c 2010-05-28 21:27:16.703208428 -0400 +diff -urNp linux-2.6.32.16/usr/gen_init_cpio.c linux-2.6.32.16/usr/gen_init_cpio.c +--- linux-2.6.32.16/usr/gen_init_cpio.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/usr/gen_init_cpio.c 2010-07-09 14:50:39.000000000 -0400 @@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, int retval; 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 } else break; } -diff -urNp linux-2.6.32.15/virt/kvm/kvm_main.c linux-2.6.32.15/virt/kvm/kvm_main.c ---- linux-2.6.32.15/virt/kvm/kvm_main.c 2010-04-29 17:49:38.869035092 -0400 -+++ linux-2.6.32.15/virt/kvm/kvm_main.c 2010-05-28 21:27:16.731271133 -0400 +diff -urNp linux-2.6.32.16/virt/kvm/kvm_main.c linux-2.6.32.16/virt/kvm/kvm_main.c +--- linux-2.6.32.16/virt/kvm/kvm_main.c 2010-07-05 14:14:00.000000000 -0400 ++++ linux-2.6.32.16/virt/kvm/kvm_main.c 2010-07-09 14:50:39.000000000 -0400 @@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode return 0; } 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 @@ _flavor=vserver pkgname=linux-${_flavor} -pkgver=2.6.32.15 +pkgver=2.6.32.16 _kernver=2.6.32 -pkgrel=1 +pkgrel=0 pkgdesc="Linux kernel with vserver" url="http://linux-vserver.org/" depends="mkinitfs linux-firmware" @@ -15,7 +15,7 @@ _config=${config:-kernelconfig.${CARCH:-x86}} install= source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 - http://vserver.13thfloor.at/Experimental/patch-2.6.32.15-vs2.3.0.36.29.4.diff + http://vserver.13thfloor.at/Experimental/patch-2.6.32.16-vs2.3.0.36.29.4.diff kernelconfig.x86 " subpackages="$pkgname-dev" @@ -118,6 +118,6 @@ dev() { } md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 -5c9251844c2819eddee4dba1293bd46d patch-2.6.32.15.bz2 -8680ecd1342691a5974fb08d7d60beb2 patch-2.6.32.15-vs2.3.0.36.29.4.diff +744890f9651962ceae7663d44b19df65 patch-2.6.32.16.bz2 +24354a6fd8798792b9ee21f086721cd9 patch-2.6.32.16-vs2.3.0.36.29.4.diff 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lua pkgver=5.1.4 -pkgrel=5 +pkgrel=6 pkgdesc="A powerful light-weight programming language designed for extending applications." url="http://www.lua.org/" license="MIT" @@ -9,6 +9,7 @@ depends= makedepends="readline-dev libtool" subpackages="$pkgname-dev $pkgname-doc" source="http://www.$pkgname.org/ftp/$pkgname-$pkgver.tar.gz + http://www.lua.org/ftp/patch-lua-5.1.4-2 lua-5.1-make.patch lua-5.1-module_paths.patch " @@ -16,9 +17,13 @@ source="http://www.$pkgname.org/ftp/$pkgname-$pkgver.tar.gz build () { cd "$srcdir"/$pkgname-$pkgver - for i in ../*.patch; do - msg "Applying $i" - patch -p1 < $i || return 1 + for i in $source; do + case $i in + patch*|*.patch) + msg "Applying $i" + patch -p1 -i "$srcdir"/$i || return 1 + ;; + esac done # correct lua versioning @@ -46,5 +51,6 @@ package() { install -D -m 644 doc/luac.1 "$pkgdir"/usr/share/man/man1/luac.1 } md5sums="d0870f2de55d59c1c8419f36e8fac150 lua-5.1.4.tar.gz +1239310e0c4a581c7831e596f95cc6cd patch-lua-5.1.4-2 0145ff6036eb6bfdab427dc8f0c3f3c0 lua-5.1-make.patch 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lvm2 -pkgver=2.02.68 +pkgver=2.02.70 pkgrel=0 pkgdesc="Logical Volume Manager 2 utilities" url="http://sourceware.org/lvm2/" @@ -47,6 +47,6 @@ dm() { mv "$pkgdir"/sbin/dm* "$subpkgdir"/sbin/ } -md5sums="20357ea7918c4e967e558de53ec74969 LVM2.2.02.68.tgz +md5sums="39c26d5a821754cc347d7a19e82d4a24 LVM2.2.02.70.tgz 6f65f902cf19f144a42b8d6aceadf395 lvm.initd 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=man-pages -pkgver=3.24 +pkgver=3.25 _posixver=2003-a pkgrel=0 pkgdesc="Linux man pages" @@ -12,8 +12,7 @@ options="!strip" source="http://www.kernel.org/pub/linux/docs/$pkgname/$pkgname-$pkgver.tar.gz http://www.kernel.org/pub/linux/docs/$pkgname/$pkgname-posix/$pkgname-posix-${_posixver}.tar.bz2" -build () -{ +build() { cd "$srcdir"/$pkgname-$pkgver mkdir -p "$srcdir"/$pkgname-$pkgver/man0 for sect in 0 1 3; do @@ -22,10 +21,14 @@ build () mv "$srcdir"/$pkgname-posix-${_posixver}/man${sect}p/* \ "$srcdir"/$pkgname-$pkgver/man$sect/ done +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make prefix="$pkgdir"/usr install || return 1 # provided by libiconv-doc rm "$pkgdir"/usr/share/man/man3/iconv* } -md5sums="083fc666f1f1143157901e96c9810539 man-pages-3.24.tar.gz +md5sums="98ec2324abea77d7a992470dd44d140c man-pages-3.25.tar.gz 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 whatis.periodic.daily $pkgname-troff.patch" -build () { +_builddir="$srcdir/$pkgname-$pkgver" +prepare() { + cd "$_builddir" local i - cd "$srcdir/$pkgname-$pkgver" for i in ../*.patch; do msg "Applying $i" patch -p1 -i $i || return 1 done +} +build () { + cd "$_builddir" ./configure -confdir=/etc +sgid +fhs +lang none - make || return 1 +} + +package() { + cd "$_builddir" make PREFIX="$pkgdir" install || return 1 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 @@ +execve("/usr/bin/man", ["man", "fopen"], [/* 14 vars */]) = 0 +mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|0x4000000, -1, 0) = 0xb781c000 +stat("/etc/ld.so.cache", {st_mode=S_IFREG|0644, st_size=7627, ...}) = 0 +open("/etc/ld.so.cache", O_RDONLY|O_CLOEXEC) = 3 +mmap2(NULL, 7627, PROT_READ, MAP_SHARED, 3, 0) = 0xb781a000 +close(3) = 0 +open("/lib/libc.so.0.9.32", O_RDONLY) = 3 +fstat(3, {st_mode=S_IFREG|0755, st_size=306224, ...}) = 0 +mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|0x4000000, -1, 0) = 0xb7819000 +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 +mmap2(NULL, 327680, PROT_NONE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb77c9000 +mmap2(0xb77c9000, 298552, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_FIXED, 3, 0) = 0xb77c9000 +mmap2(0xb7812000, 4862, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED, 3, 0x49) = 0xb7812000 +mmap2(0xb7814000, 16644, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0xb7814000 +close(3) = 0 +munmap(0xb7819000, 4096) = 0 +munmap(0xb781a000, 7627) = 0 +stat("/lib/ld-uClibc.so.0.9.32", {st_mode=S_IFREG|0755, st_size=25248, ...}) = 0 +mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|0x4000000, -1, 0) = 0xb781b000 +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 +open("/dev/urandom", O_RDONLY) = 3 +read(3, "\252\2559i", 4) = 4 +close(3) = 0 +mprotect(0xb7812000, 4096, PROT_READ) = 0 +mprotect(0xb7824000, 4096, PROT_READ) = 0 +ioctl(0, SNDCTL_TMR_TIMEBASE or TCGETS, {B38400 opost isig icanon echo ...}) = 0 +ioctl(1, SNDCTL_TMR_TIMEBASE or TCGETS, {B38400 opost isig icanon echo ...}) = 0 +brk(0) = 0xb7971000 +brk(0xb7972000) = 0xb7972000 +getuid32() = 1000 +geteuid32() = 1000 +getgid32() = 1000 +getegid32() = 1000 +ioctl(0, SNDCTL_TMR_TIMEBASE or TCGETS, {B38400 opost isig icanon echo ...}) = 0 +ioctl(1, SNDCTL_TMR_TIMEBASE or TCGETS, {B38400 opost isig icanon echo ...}) = 0 +ioctl(0, TIOCGWINSZ, {ws_row=59, ws_col=80, ws_xpixel=0, ws_ypixel=0}) = 0 +open("/etc/man.conf", O_RDONLY) = 3 +ioctl(3, SNDCTL_TMR_TIMEBASE or TCGETS, 0xbf8abc08) = -1 ENOTTY (Inappropriate ioctl for device) +brk(0xb7973000) = 0xb7973000 +read(3, "#\n# Generated automatically from"..., 4096) = 4096 +brk(0xb7976000) = 0xb7976000 +brk(0xb7979000) = 0xb7979000 +brk(0xb797c000) = 0xb797c000 +brk(0xb797f000) = 0xb797f000 +brk(0xb7982000) = 0xb7982000 +brk(0xb7985000) = 0xb7985000 +brk(0xb7988000) = 0xb7988000 +brk(0xb798b000) = 0xb798b000 +brk(0xb798e000) = 0xb798e000 +brk(0xb7991000) = 0xb7991000 +brk(0xb7994000) = 0xb7994000 +brk(0xb7997000) = 0xb7997000 +brk(0xb799a000) = 0xb799a000 +brk(0xb799d000) = 0xb799d000 +read(3, " when man is invoked without opt"..., 4096) = 439 +read(3, "", 4096) = 0 +stat("/usr/local/share/man", {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0 +stat("/usr/share/man", {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0 +stat("/usr/man", {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0 +stat("/usr/local/man", 0xbf8a7ac8) = -1 ENOENT (No such file or directory) +stat("/usr/X11R6/man", 0xbf8a7ac8) = -1 ENOENT (No such file or directory) +ioctl(0, SNDCTL_TMR_TIMEBASE or TCGETS, {B38400 opost isig icanon echo ...}) = 0 +ioctl(1, SNDCTL_TMR_TIMEBASE or TCGETS, {B38400 opost isig icanon echo ...}) = 0 +open("/usr/local/share/man/html1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/local/share/man/man1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/var/cache/man/local/cat1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/local/share/man/cat1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/share/man/html1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/share/man/man1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 +fstat(4, {st_mode=S_IFDIR|0755, st_size=24576, ...}) = 0 +brk(0xb799e000) = 0xb799e000 +getdents(4, /* 195 entries */, 4096) = 4092 +getdents(4, /* 105 entries */, 4096) = 2228 +getdents(4, /* 0 entries */, 4096) = 0 +close(4) = 0 +open("/usr/share/man/man1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 +fstat(4, {st_mode=S_IFDIR|0755, st_size=24576, ...}) = 0 +getdents(4, /* 195 entries */, 4096) = 4092 +getdents(4, /* 105 entries */, 4096) = 2228 +getdents(4, /* 0 entries */, 4096) = 0 +close(4) = 0 +open("/var/cache/man/cat1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/share/man/cat1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 +fstat(4, {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0 +getdents(4, /* 2 entries */, 4096) = 32 +getdents(4, /* 0 entries */, 4096) = 0 +close(4) = 0 +open("/usr/share/man/cat1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 +fstat(4, {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0 +getdents(4, /* 2 entries */, 4096) = 32 +getdents(4, /* 0 entries */, 4096) = 0 +close(4) = 0 +open("/usr/man/html1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/man/man1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/var/cache/man/cat1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/man/cat1/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/local/share/man/html1p/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/local/share/man/man1p/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/var/cache/man/local/cat1p/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/local/share/man/cat1p/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/share/man/html1p/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/share/man/man1p/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/var/cache/man/cat1p/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/share/man/cat1p/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/man/html1p/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/man/man1p/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/var/cache/man/cat1p/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/man/cat1p/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/local/share/man/html8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/local/share/man/man8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/var/cache/man/local/cat8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/local/share/man/cat8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/share/man/html8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/share/man/man8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 +fstat(4, {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0 +brk(0xb799f000) = 0xb799f000 +getdents(4, /* 20 entries */, 4096) = 460 +getdents(4, /* 0 entries */, 4096) = 0 +close(4) = 0 +open("/usr/share/man/man8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 +fstat(4, {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0 +getdents(4, /* 20 entries */, 4096) = 460 +getdents(4, /* 0 entries */, 4096) = 0 +close(4) = 0 +open("/var/cache/man/cat8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/share/man/cat8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 +fstat(4, {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0 +getdents(4, /* 2 entries */, 4096) = 32 +getdents(4, /* 0 entries */, 4096) = 0 +close(4) = 0 +open("/usr/share/man/cat8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 +fstat(4, {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0 +getdents(4, /* 2 entries */, 4096) = 32 +getdents(4, /* 0 entries */, 4096) = 0 +close(4) = 0 +open("/usr/man/html8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/man/man8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/var/cache/man/cat8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/man/cat8/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/local/share/man/html2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/local/share/man/man2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/var/cache/man/local/cat2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/local/share/man/cat2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/share/man/html2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/share/man/man2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 +fstat(4, {st_mode=S_IFDIR|0755, st_size=36864, ...}) = 0 +getdents(4, /* 172 entries */, 4096) = 4084 +getdents(4, /* 173 entries */, 4096) = 4096 +getdents(4, /* 77 entries */, 4096) = 1772 +getdents(4, /* 0 entries */, 4096) = 0 +close(4) = 0 +open("/usr/share/man/man2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 +fstat(4, {st_mode=S_IFDIR|0755, st_size=36864, ...}) = 0 +getdents(4, /* 172 entries */, 4096) = 4084 +getdents(4, /* 173 entries */, 4096) = 4096 +getdents(4, /* 77 entries */, 4096) = 1772 +getdents(4, /* 0 entries */, 4096) = 0 +close(4) = 0 +open("/var/cache/man/cat2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/share/man/cat2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/man/html2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/man/man2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/var/cache/man/cat2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/man/cat2/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/local/share/man/html3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/local/share/man/man3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 +fstat(4, {st_mode=S_IFDIR|0755, st_size=90112, ...}) = 0 +getdents(4, /* 2 entries */, 4096) = 32 +getdents(4, /* 0 entries */, 4096) = 0 +close(4) = 0 +open("/usr/local/share/man/man3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 +fstat(4, {st_mode=S_IFDIR|0755, st_size=90112, ...}) = 0 +getdents(4, /* 2 entries */, 4096) = 32 +getdents(4, /* 0 entries */, 4096) = 0 +close(4) = 0 +open("/var/cache/man/local/cat3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/local/share/man/cat3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/share/man/html3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/share/man/man3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 +fstat(4, {st_mode=S_IFDIR|0755, st_size=299008, ...}) = 0 +getdents(4, /* 153 entries */, 4096) = 4080 +getdents(4, /* 150 entries */, 4096) = 4084 +getdents(4, /* 148 entries */, 4096) = 4088 +getdents(4, /* 150 entries */, 4096) = 4076 +getdents(4, /* 151 entries */, 4096) = 4088 +getdents(4, /* 153 entries */, 4096) = 4092 +getdents(4, /* 149 entries */, 4096) = 4096 +getdents(4, /* 154 entries */, 4096) = 4076 +getdents(4, /* 147 entries */, 4096) = 4080 +getdents(4, /* 155 entries */, 4096) = 4084 +getdents(4, /* 143 entries */, 4096) = 4088 +getdents(4, /* 152 entries */, 4096) = 4092 +getdents(4, /* 153 entries */, 4096) = 4084 +getdents(4, /* 150 entries */, 4096) = 4080 +getdents(4, /* 152 entries */, 4096) = 4076 +getdents(4, /* 152 entries */, 4096) = 4080 +getdents(4, /* 145 entries */, 4096) = 4080 +getdents(4, /* 156 entries */, 4096) = 4072 +getdents(4, /* 148 entries */, 4096) = 4072 +getdents(4, /* 155 entries */, 4096) = 4088 +getdents(4, /* 150 entries */, 4096) = 4080 +getdents(4, /* 147 entries */, 4096) = 4068 +getdents(4, /* 153 entries */, 4096) = 4088 +getdents(4, /* 149 entries */, 4096) = 4092 +getdents(4, /* 143 entries */, 4096) = 4084 +getdents(4, /* 151 entries */, 4096) = 4084 +getdents(4, /* 152 entries */, 4096) = 4096 +getdents(4, /* 153 entries */, 4096) = 4076 +getdents(4, /* 152 entries */, 4096) = 4080 +getdents(4, /* 86 entries */, 4096) = 2340 +getdents(4, /* 0 entries */, 4096) = 0 +close(4) = 0 +open("/usr/share/man/man3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 +fstat(4, {st_mode=S_IFDIR|0755, st_size=299008, ...}) = 0 +getdents(4, /* 153 entries */, 4096) = 4080 +getdents(4, /* 150 entries */, 4096) = 4084 +getdents(4, /* 148 entries */, 4096) = 4088 +getdents(4, /* 150 entries */, 4096) = 4076 +getdents(4, /* 151 entries */, 4096) = 4088 +getdents(4, /* 153 entries */, 4096) = 4092 +getdents(4, /* 149 entries */, 4096) = 4096 +getdents(4, /* 154 entries */, 4096) = 4076 +getdents(4, /* 147 entries */, 4096) = 4080 +getdents(4, /* 155 entries */, 4096) = 4084 +getdents(4, /* 143 entries */, 4096) = 4088 +getdents(4, /* 152 entries */, 4096) = 4092 +getdents(4, /* 153 entries */, 4096) = 4084 +getdents(4, /* 150 entries */, 4096) = 4080 +getdents(4, /* 152 entries */, 4096) = 4076 +getdents(4, /* 152 entries */, 4096) = 4080 +getdents(4, /* 145 entries */, 4096) = 4080 +getdents(4, /* 156 entries */, 4096) = 4072 +getdents(4, /* 148 entries */, 4096) = 4072 +getdents(4, /* 155 entries */, 4096) = 4088 +getdents(4, /* 150 entries */, 4096) = 4080 +getdents(4, /* 147 entries */, 4096) = 4068 +getdents(4, /* 153 entries */, 4096) = 4088 +getdents(4, /* 149 entries */, 4096) = 4092 +getdents(4, /* 143 entries */, 4096) = 4084 +getdents(4, /* 151 entries */, 4096) = 4084 +getdents(4, /* 152 entries */, 4096) = 4096 +getdents(4, /* 153 entries */, 4096) = 4076 +getdents(4, /* 152 entries */, 4096) = 4080 +getdents(4, /* 86 entries */, 4096) = 2340 +getdents(4, /* 0 entries */, 4096) = 0 +close(4) = 0 +access("/usr/share/man/man3/fopen.3", R_OK) = 0 +open("/usr/man/html3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/man/man3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 +fstat(4, {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0 +getdents(4, /* 2 entries */, 4096) = 32 +getdents(4, /* 0 entries */, 4096) = 0 +close(4) = 0 +open("/usr/man/man3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 4 +fstat(4, {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0 +getdents(4, /* 2 entries */, 4096) = 32 +getdents(4, /* 0 entries */, 4096) = 0 +close(4) = 0 +open("/var/cache/man/cat3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +open("/usr/man/cat3/", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = -1 ENOENT (No such file or directory) +access("/usr/share/man/man3/fopen.3", R_OK) = 0 +open("/usr/share/man/man3/fopen.3", O_RDONLY) = 4 +ioctl(4, SNDCTL_TMR_TIMEBASE or TCGETS, 0xbf8a6b78) = -1 ENOTTY (Inappropriate ioctl for device) +read(4, ".\\\" Copyright (c) 1990, 1991 The"..., 4096) = 4096 +close(4) = 0 +stat("/usr/share/man/man3/fopen.3", {st_mode=S_IFREG|0644, st_size=8720, ...}) = 0 +stat("/var/cache/man/cat3/fopen.3.bz2", 0xbf8a8b48) = -1 ENOENT (No such file or directory) +stat("/var/cache/man/cat3/fopen.3.bz2", 0xbf8a8c28) = -1 ENOENT (No such file or directory) +open("/var/cache/man/cat3/fopen.3.bz2", O_WRONLY|O_CREAT|O_TRUNC, 0666) = -1 ENOENT (No such file or directory) +ioctl(0, SNDCTL_TMR_TIMEBASE or TCGETS, {B38400 opost isig icanon echo ...}) = 0 +ioctl(1, SNDCTL_TMR_TIMEBASE or TCGETS, {B38400 opost isig icanon echo ...}) = 0 +open("/usr/share/man/man3/fopen.3", O_RDONLY) = 4 +ioctl(4, SNDCTL_TMR_TIMEBASE or TCGETS, 0xbf8a2b38) = -1 ENOTTY (Inappropriate ioctl for device) +read(4, ".\\\" Copyright (c) 1990, 1991 The"..., 4096) = 4096 +close(4) = 0 +rt_sigaction(SIGINT, {0xb782cd1c, [INT], SA_RESTORER|SA_RESTART, 0xb77d43b7}, {SIG_DFL, [], 0}, 8) = 0 +rt_sigaction(SIGINT, {SIG_IGN, [], SA_RESTORER, 0xb77d43b7}, {0xb782cd1c, [INT], SA_RESTORER|SA_RESTART, 0xb77d43b7}, 8) = 0 +rt_sigaction(SIGQUIT, {SIG_IGN, [], SA_RESTORER, 0xb77d43b7}, {SIG_DFL, [], 0}, 8) = 0 +rt_sigprocmask(SIG_BLOCK, [CHLD], [], 8) = 0 +clone(child_stack=0, flags=CLONE_PARENT_SETTID|SIGCHLD, parent_tidptr=0xbf8a8bb4) = 31161 +waitpid(31161, <stdin>:1:1: bad syntax +<stdin>: Not a manual +[{WIFEXITED(s) && WEXITSTATUS(s) == 0}], 0) = 31161 +rt_sigaction(SIGINT, {0xb782cd1c, [INT], SA_RESTORER|SA_RESTART, 0xb77d43b7}, NULL, 8) = 0 +rt_sigaction(SIGQUIT, {SIG_DFL, [], SA_RESTORER, 0xb77d43b7}, NULL, 8) = 0 +rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0 +--- SIGCHLD (Child exited) @ 0 (0) --- +rt_sigaction(SIGINT, {SIG_DFL, [INT], SA_RESTORER|SA_RESTART, 0xb77d43b7}, {0xb782cd1c, [INT], SA_RESTORER|SA_RESTART, 0xb77d43b7}, 8) = 0 +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 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=mc +pkgver=4.7.0.7 +pkgrel=0 +pkgdesc="A filemanager/shell that emulates Norton Commander" +url="http://www.ibiblio.org/mc/" +license="GPL" +depends="" +makedepends="e2fsprogs-dev glib-dev pcre-dev slang-dev" +source="http://www.midnight-commander.org/downloads/mc-$pkgver.tar.bz2" + +_builddir="$srcdir"/$pkgname-$pkgver +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --libexecdir=/usr/lib \ + --mandir=/usr/share/man \ + --sysconfdir=/etc \ + --enable-background \ + --enable-charset \ + --enable-largefile \ + --with-edit \ + --with-mmap \ + --with-screen=slang \ + --with-subshell \ + --with-vfs \ + --without-debug \ + --without-gnome \ + --without-gpm-mouse \ + --without-included-gettext \ + --without-samba \ + --without-x \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 +} + +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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mpg123 -pkgver=1.12.1 -pkgrel=1 +pkgver=1.12.3 +pkgrel=0 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3" url="http://sourceforge.net/projects/mpg123" license="GPL2 LGPL2" @@ -33,4 +33,4 @@ dev() { mv "$subpkgdir"/usr/lib/mpg123/output_* "$pkgdir"/usr/lib/mpg123/ } -md5sums="e7d810a75d22954169f1530a436aca4c mpg123-1.12.1.tar.bz2" +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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mplayer -pkgver=1.0_rc4_p20100506 +pkgver=1.0_rc4_p20100612 _svnver=SVN-r30554 -pkgrel=5 +pkgrel=0 pkgdesc="A movie player for linux" url="http://www.mplayerhq.hu/" license="GPL" @@ -15,7 +15,7 @@ makedepends="libxxf86dga-dev libxv-dev libmad-dev lame-dev libao-dev # cdparanoia libcaca lirc-utils libgl-dev smbclient-dev # aalib-dev jack-audio-connection-kit libmng-dev libxss-dev -source="http://mirrors.kernel.org/gentoo/distfiles/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/distfiles/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir"/$pkgname-$pkgver @@ -65,4 +65,4 @@ package() { "$pkgdir"/usr/share/mplayer/subfont.ttf || return 1 rm -rf "$pkgdir"/usr/share/mplayer/font } -md5sums="38126e7d1cf4044115a617dc331cddcc mplayer-1.0_rc4_p20100506.tar.bz2" +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 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mysql -pkgver=5.1.47 +pkgver=5.1.48 pkgrel=0 pkgdesc="A fast SQL database server" url="http://www.mysql.com/" @@ -77,6 +77,6 @@ client() { done } -md5sums="02b9964b3966832f3d6bc87524bfd73f mysql-5.1.47.tar.gz +md5sums="d04c54d1cfbd8c6c8650c8d078f885b2 mysql-5.1.48.tar.gz 25d08b02bff6aa379dc45859b7a3f28a mysql.initd 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 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=nfs-utils -pkgver=1.2.0 -pkgrel=3 +pkgver=1.2.2 +pkgrel=0 pkgdesc="kernel-mode NFS" url="http://nfs.sourceforge.net/" license="GPL" -depends="portmap" -makedepends="e2fsprogs-dev" +depends="rpcbind" +makedepends="util-linux-ng-dev libtirpc-dev libcap-dev" subpackages="$pkgname-doc rpcgen" source="http://downloads.sourceforge.net/nfs/$pkgname-$pkgver.tar.bz2 nfs.initd + nfsmount.initd + rpc.gssd.initd + rpc.idmapd.initd + rpc.pipefs.initd + rpc.statd.initd + rpc.svcgssd.initd + nfs.confd nfs.exports nfs-utils-no-exec.patch nfs-utils-mtab-sym.patch" -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" - for i in "$srcdir"/*.patch; do msg "Applying $i" patch -p0 -i "${i}" || return 1 done + sed -i -e '/^#include <libio.h>/d' support/include/sockaddr.h +} + +build() { + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -43,7 +54,13 @@ package() { cd "$srcdir/$pkgname-$pkgver" make -j1 DESTDIR="$pkgdir" install - install -m755 -D "$srcdir"/nfs.initd "$pkgdir"/etc/init.d/nfs + for i in nfs rpc.gssd rpc.pipefs rpc.svcgssd nfsmount rpc.idmapd \ + rpc.statd; do + install -m755 -D "$srcdir"/$i.initd "$pkgdir"/etc/init.d/$i \ + || return 1 + done + + install -m644 -D "$srcdir"/nfs.confd "$pkgdir"/etc/conf.d/nfs install -m644 -D "$srcdir"/nfs.exports "$pkgdir"/etc/exports } @@ -54,8 +71,14 @@ rpcgen() { install -m755 -D tools/rpcgen/rpcgen "$subpkgdir"/usr/bin/rpcgen } -md5sums="779cf81044e92cb51ad590960e7b3671 nfs-utils-1.2.0.tar.bz2 -23240b9ab44ef7d6b6c437c0ae34915d nfs.initd +md5sums="dad92f64db3266c7757f71bb53ee8f35 nfs-utils-1.2.2.tar.bz2 +f1873e0441b8c3b4b90023c038d755ec nfs.initd +d514fb87ce5de9909f43d99012352f09 nfsmount.initd +144b0e1f7d32265abe4c499a47af6154 rpc.gssd.initd +650f68e51a02ba84c272960fc302c445 rpc.idmapd.initd +80772890099fafdb8af3d6dd3db242c2 rpc.pipefs.initd +37fdb069a5fcabea507012497bb95c53 rpc.statd.initd +20e71ab412555b2dc9b50f346f68e5c8 rpc.svcgssd.initd 09135438d6df50b868bbe5a2260f973c nfs.confd 4f1bb7b2412ce5952ecb5ec22d8ed99d nfs.exports 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 @@ #!/sbin/runscript # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.19 2009/05/30 22:01:43 vapier Exp $ opts="reload" @@ -23,9 +23,9 @@ depend() { fi fi config /etc/exports - need portmap rpc.statd ${myneed} + need portmap rpc.statd ${myneed} ${NFS_NEEDED_SERVICES} use ypbind net dns rpc.rquotad rpc.idmapd rpc.svcgssd - after firewall quota + after quota } 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 @@ +#!/sbin/runscript +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v 1.13 2009/01/31 22:15:02 vapier Exp $ + +[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs + +depend() { + local myneed="" + if [ -e /etc/fstab ] ; then + awk '!/^[[:space:]]*#/ && $3 == "nfs4" { exit ($4 ~ /sec=krb/ ? 10 : 20) }' /etc/fstab + local ret=$? + [ ${ret} -eq 10 ] && myneed="${myneed} rpc.gssd" + [ ${ret} -eq 20 ] && myneed="${myneed} rpc.idmapd" + fi + config /etc/fstab + need net portmap rpc.statd ${myneed} + use ypbind dns rpc.idmapd rpc.gssd +} + +start() { + if [ -x /usr/sbin/sm-notify ] ; then + ebegin "Starting NFS sm-notify" + /usr/sbin/sm-notify ${OPTS_SMNOTIFY} + eend $? + fi + + # Make sure nfs support is loaded in the kernel #64709 + if [ -e /proc/modules ] && ! grep -qs 'nfs$' /proc/filesystems ; then + modprobe -q nfs + fi + + ebegin "Mounting NFS filesystems" + mount -a -t nfs,nfs4 + eend $? +} + +stop() { + ebegin "Unmounting NFS filesystems" + umount -a -t nfs,nfs4 + eend $? +} 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 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd,v 1.11 2008/10/26 09:02:47 vapier Exp $ + +[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs + +depend() { + use ypbind net + need portmap rpc.pipefs + after quota +} + +start() { + ebegin "Starting gssd" + start-stop-daemon --start --exec /usr/sbin/rpc.gssd -- ${OPTS_RPC_GSSD} + eend $? +} + +stop() { + ebegin "Stopping gssd" + start-stop-daemon --stop --exec /usr/sbin/rpc.gssd + eend $? +} 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 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.idmapd.initd,v 1.8 2009/03/14 18:43:18 vapier Exp $ + +[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs + +rpc_bin=/usr/sbin/rpc.idmapd + +depend() { + use ypbind net + need portmap rpc.pipefs + after quota +} + +start() { + ebegin "Starting idmapd" + ${rpc_bin} ${OPTS_RPC_IDMAPD} + eend $? "make sure DNOTIFY support is enabled ..." +} + +stop() { + ebegin "Stopping idmapd" + start-stop-daemon --stop --exec ${rpc_bin} + eend $? +} 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 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.pipefs.initd,v 1.1 2008/10/26 09:02:47 vapier Exp $ + +mount_pipefs() { + # if rpc_pipefs is not available, try to load sunrpc for it #219566 + grep -qs rpc_pipefs /proc/filesystems || modprobe -q sunrpc + # if still not available, let's bail + grep -qs rpc_pipefs /proc/filesystems || return 1 + + # now just do it for kicks + mkdir -p /var/lib/nfs/rpc_pipefs + mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs +} + +start() { + # if things are already mounted, let's just return + grep -qs "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts && return 0 + + ebegin "Mounting RPC pipefs" + mount_pipefs + eend $? +} 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 @@ +#!/sbin/runscript +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v 1.7 2009/01/31 22:16:11 vapier Exp $ + +[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs + +rpc_bin=/usr/sbin/rpc.statd +rpc_pid=/var/run/rpc.statd.pid + +depend() { + use ypbind net + need portmap + after quota +} + +start() { + # Don't start rpc.statd if already started by someone else ... + # Don't try and kill it if it's already dead ... + if killall -q -0 ${rpc_bin} ; then + return 0 + fi + + ebegin "Starting NFS statd" + start-stop-daemon --start --exec ${rpc_bin} -- --no-notify ${OPTS_RPC_STATD} + eend $? +} + +stop() { + ebegin "Stopping NFS statd" + start-stop-daemon --stop --exec ${rpc_bin} --pidfile /var/run/rpc.statd.pid + eend $? +} 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 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.svcgssd.initd,v 1.5 2008/10/26 09:02:47 vapier Exp $ + +[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs + +depend() { + use ypbind net + need portmap rpc.pipefs + after quota +} + +start() { + ebegin "Starting svcgssd" + start-stop-daemon --start --exec /usr/sbin/rpc.svcgssd -- ${OPTS_RPC_SVCGSSD} + eend $? +} + +stop() { + ebegin "Stopping svcgssd" + start-stop-daemon --stop --exec /usr/sbin/rpc.svcgssd + eend $? +} 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=p7zip -pkgver=9.04 -pkgrel=2 +pkgver=9.13 +pkgrel=0 pkgdesc="A command-line port of the 7zip compression utility" url="http://p7zip.sourceforge.net" license="GPL" @@ -30,5 +30,5 @@ package() { # install -m755 -D contrib/VirtualFileSystemForMidnightCommander/u7z "$pkgdir"/usr/share/mc/extfs/u7z } -md5sums="9194ebf9a2b3735d236aed001de5f6f8 p7zip_9.04_src_all.tar.bz2 +md5sums="8ddb5053db3b1f2696407d01be145779 p7zip_9.13_src_all.tar.bz2 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pcre -pkgver=8.02 -pkgrel=1 +pkgver=8.10 +pkgrel=0 pkgdesc="Perl-compatible regular expression library" url="http://pcre.sourceforge.net" license="BSD" @@ -27,4 +27,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="27948c1b5f5c1eabc23cba1ebe4c316f pcre-8.02.tar.bz2" +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 @@ pkgname=php pkgver=5.3.2 _suhosinver=${pkgver}-0.9.9.1 -pkgrel=7 +pkgrel=8 pkgdesc="The PHP language runtime engine" url="http://www.php.net/" license="PHP-3" @@ -65,6 +65,7 @@ source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2 http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz php-install-pear-xml.patch zend_execute_API.c.patch + CVE-2010-2225.patch " _extdir="/usr/lib/php/20090626" @@ -75,6 +76,8 @@ build() { # beat the pear installer into using xml.so patch -p1 -i "$srcdir"/php-install-pear-xml.patch || return 1 + patch -p0 -i "$srcdir"/CVE-2010-2225.patch || return 1 + # apply suhosin patch gunzip -c ${srcdir}/suhosin-patch-${_suhosinver}.patch.gz \ | patch -p1 || return 1 @@ -259,4 +262,5 @@ dev() { md5sums="46f500816125202c48a458d0133254a4 php-5.3.2.tar.bz2 4647b05330862d6a1fc4469245cc6ade suhosin-patch-5.3.2-0.9.9.1.patch.gz 5111e3be06d391f8772587c675240fab php-install-pear-xml.patch -55f9d24316a57e0c0f6b4b84791a1a17 zend_execute_API.c.patch" +55f9d24316a57e0c0f6b4b84791a1a17 zend_execute_API.c.patch +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 @@ +Index: ext/spl/tests/SplObjectStorage_unserialize_nested.phpt +=================================================================== +--- ext/spl/tests/SplObjectStorage_unserialize_nested.phpt (revision 0) ++++ ext/spl/tests/SplObjectStorage_unserialize_nested.phpt (revision 300843) +@@ -0,0 +1,47 @@ ++--TEST-- ++SPL: Test unserializing tested & linked storage ++--FILE-- ++<?php ++$o = new StdClass(); ++$a = new StdClass(); ++ ++$o->a = $a; ++ ++$so = new SplObjectStorage(); ++ ++$so[$o] = 1; ++$so[$a] = 2; ++ ++$s = serialize($so); ++echo $s."\n"; ++ ++$so1 = unserialize($s); ++var_dump($so1); ++ ++--EXPECTF-- ++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:{}} ++object(SplObjectStorage)#4 (1) { ++ ["storage":"SplObjectStorage":private]=> ++ array(2) { ++ ["%s"]=> ++ array(2) { ++ ["obj"]=> ++ object(stdClass)#5 (1) { ++ ["a"]=> ++ object(stdClass)#6 (0) { ++ } ++ } ++ ["inf"]=> ++ int(1) ++ } ++ ["%s"]=> ++ array(2) { ++ ["obj"]=> ++ object(stdClass)#6 (0) { ++ } ++ ["inf"]=> ++ int(2) ++ } ++ } ++} ++ +Index: ext/spl/tests/SplObjectStorage_unserialize_bad.phpt +=================================================================== +--- ext/spl/tests/SplObjectStorage_unserialize_bad.phpt (revision 0) ++++ ext/spl/tests/SplObjectStorage_unserialize_bad.phpt (revision 300843) +@@ -0,0 +1,45 @@ ++--TEST-- ++SPL: Test that serialized blob contains unique elements (CVE-2010-2225) ++--FILE-- ++<?php ++ ++$badblobs = array( ++'x:i:2;i:0;,i:1;;i:0;,i:2;;m:a:0:{}', ++'x:i:3;O:8:"stdClass":0:{},O:8:"stdClass":0:{};R:1;,i:1;;O:8:"stdClass":0:{},r:2;;m:a:0:{}', ++'x:i:3;O:8:"stdClass":0:{},O:8:"stdClass":0:{};r:1;,i:1;;O:8:"stdClass":0:{},r:2;;m:a:0:{}', ++); ++foreach($badblobs as $blob) { ++try { ++ $so = new SplObjectStorage(); ++ $so->unserialize($blob); ++ var_dump($so); ++} catch(UnexpectedValueException $e) { ++ echo $e->getMessage()."\n"; ++} ++} ++--EXPECTF-- ++Error at offset 6 of 34 bytes ++Error at offset 46 of 89 bytes ++object(SplObjectStorage)#2 (1) { ++ ["storage":"SplObjectStorage":private]=> ++ array(2) { ++ ["%s"]=> ++ array(2) { ++ ["obj"]=> ++ object(stdClass)#3 (0) { ++ } ++ ["inf"]=> ++ int(1) ++ } ++ ["%s"]=> ++ array(2) { ++ ["obj"]=> ++ object(stdClass)#1 (0) { ++ } ++ ["inf"]=> ++ object(stdClass)#4 (0) { ++ } ++ } ++ } ++} ++ +Index: ext/spl/spl_observer.c +=================================================================== +--- ext/spl/spl_observer.c (revision 300842) ++++ ext/spl/spl_observer.c (revision 300843) +@@ -115,6 +115,7 @@ + zval_ptr_dtor(&element->inf); + } /* }}} */ + ++ + spl_SplObjectStorageElement* spl_object_storage_get(spl_SplObjectStorage *intern, zval *obj TSRMLS_DC) /* {{{ */ + { + spl_SplObjectStorageElement *element; +@@ -632,15 +633,24 @@ + zval_ptr_dtor(&pcount); + + while(count-- > 0) { ++ spl_SplObjectStorageElement *pelement; ++ + if (*p != ';') { + goto outexcept; + } + ++p; ++ if(*p != 'O' && *p != 'C' && *p != 'r') { ++ goto outexcept; ++ } + ALLOC_INIT_ZVAL(pentry); + if (!php_var_unserialize(&pentry, &p, s + buf_len, &var_hash TSRMLS_CC)) { + zval_ptr_dtor(&pentry); + goto outexcept; + } ++ if(Z_TYPE_P(pentry) != IS_OBJECT) { ++ zval_ptr_dtor(&pentry); ++ goto outexcept; ++ } + ALLOC_INIT_ZVAL(pinf); + if (*p == ',') { /* new version has inf */ + ++p; +@@ -649,6 +659,16 @@ + goto outexcept; + } + } ++ ++ pelement = spl_object_storage_get(intern, pentry TSRMLS_CC); ++ if(pelement) { ++ if(pelement->inf) { ++ var_push_dtor(&var_hash, &pelement->inf); ++ } ++ if(pelement->obj) { ++ var_push_dtor(&var_hash, &pelement->obj); ++ } ++ } + spl_object_storage_attach(intern, pentry, pinf TSRMLS_CC); + zval_ptr_dtor(&pentry); + zval_ptr_dtor(&pinf); +Index: ext/standard/var_unserializer.c +=================================================================== +--- ext/standard/var_unserializer.c (revision 300842) ++++ ext/standard/var_unserializer.c (revision 300843) +@@ -56,7 +56,7 @@ + var_hash->data[var_hash->used_slots++] = *rval; + } + +-static inline void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval) ++PHPAPI void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval) + { + var_entries *var_hash = var_hashx->first_dtor, *prev = NULL; + +Index: ext/standard/php_var.h +=================================================================== +--- ext/standard/php_var.h (revision 300842) ++++ ext/standard/php_var.h (revision 300843) +@@ -60,6 +60,7 @@ + var_destroy(&(var_hash)) + + PHPAPI void var_replace(php_unserialize_data_t *var_hash, zval *ozval, zval **nzval); ++PHPAPI void var_push_dtor(php_unserialize_data_t *var_hash, zval **val); + PHPAPI void var_destroy(php_unserialize_data_t *var_hash); + + #define PHP_VAR_UNSERIALIZE_ZVAL_CHANGED(var_hash, ozval, nzval) \ +Index: ext/standard/var_unserializer.re +=================================================================== +--- ext/standard/var_unserializer.re (revision 300842) ++++ ext/standard/var_unserializer.re (revision 300843) +@@ -54,7 +54,7 @@ + var_hash->data[var_hash->used_slots++] = *rval; + } + +-static inline void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval) ++PHPAPI void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval) + { + var_entries *var_hash = var_hashx->first_dtor, *prev = NULL; + 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=postfix -pkgver=2.7.0 +pkgver=2.7.1 pkgrel=0 pkgdesc="Secure and fast drop-in replacement for Sendmail (MTA)" url="http://www.postfix.org/" @@ -12,7 +12,7 @@ subpackages="$pkgname-doc $pkgname-ldap $pkgname-mysql $pkgname-pcre $pkgname-pgsql" source="ftp://ftp.porcupine.org/mirrors/$pkgname-release/official/$pkgname-$pkgver.tar.gz $pkgname.initd - postfix-2.7.0-dynamic-maps.patch + postfix-2.7.1-dynamic-maps.patch dynamicmaps.cf postfix-ldap.post-install postfix-mysql.post-install @@ -145,9 +145,9 @@ mysql() { _mv_dict mysql ;} pcre() { _mv_dict pcre ; } pgsql() { _mv_dict pgsql ; } -md5sums="df648f59421604e895cce56325f00bae postfix-2.7.0.tar.gz +md5sums="b7a5c3ccd309156a65d6f8d2683d4fa1 postfix-2.7.1.tar.gz 6bbabcd041aefaf40e1f3ee1fc1d6d7e postfix.initd -4d9c373e8a35bfb5bfa9b899e64fb70a postfix-2.7.0-dynamic-maps.patch +8f3ca3a512357d03fdb7abd9d39f4596 postfix-2.7.1-dynamic-maps.patch 442efd1a95b0c061dfb8ab75456e0f24 dynamicmaps.cf 2ebe51a882eb9d6d7866583eb6af3969 postfix-ldap.post-install 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 @@ -commit 98599e6387147a26d8433e85a4a61ef5c4240e83 +commit a6b79e8091c5e75d5d0a6b45b6652f0378583686 Author: Natanael Copa <ncopa@alpinelinux.org> -Date: Mon May 31 14:49:38 2010 +0000 +Date: Tue Jul 6 08:16:25 2010 +0000 - added dynamic maps + patch for dynamic maps diff --git a/conf/postfix-files b/conf/postfix-files index 7ff93ea..7cae109 100644 @@ -577,7 +577,7 @@ index 9829d28..d7dc53c 100644 #define dict_get(dp, key) ((const char *) (dp)->lookup((dp), (key))) #define dict_put(dp, key, val) (dp)->update((dp), (key), (val)) diff --git a/src/util/dict_db.c b/src/util/dict_db.c -index e4b301d..8dc9c9d 100644 +index 9e82f9b..93264e6 100644 --- a/src/util/dict_db.c +++ b/src/util/dict_db.c @@ -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 + if ((errno = db->upgrade(db,db_path,0)) != 0) + msg_fatal("upgrade of database %s: %m",db_path); + } - #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) + #if DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 0) msg_fatal("open database %s: %m", db_path); 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 @@ +From b8f0d7b7318ba344c25785d6f5cf3f8de98012d4 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Tue, 2 Feb 2010 09:36:03 +0000 +Subject: [PATCH 1/2] uclibc-nss + +--- + src/rpcbind.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/src/rpcbind.c b/src/rpcbind.c +index 525ffba..1fe1a60 100644 +--- a/src/rpcbind.c ++++ b/src/rpcbind.c +@@ -67,7 +67,11 @@ + #include <pwd.h> + #include <string.h> + #include <errno.h> ++#if defined(__UCLIBC__) ++#define __nss_configure_lookup(x,y) ++#else + #include <nss.h> ++#endif + #include "config.h" + #include "rpcbind.h" + +-- +1.6.6.1 + 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 @@ +From 077add040c2e30d3ac507362f4afe350f47be027 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Tue, 2 Feb 2010 09:47:57 +0000 +Subject: [PATCH 2/2] uclibc-rpcsvc-defines + +--- + src/security.c | 28 ++++++++++++++++++++++++++++ + 1 files changed, 28 insertions(+), 0 deletions(-) + +diff --git a/src/security.c b/src/security.c +index 0edeac6..e9fed55 100644 +--- a/src/security.c ++++ b/src/security.c +@@ -20,6 +20,32 @@ + /* + * XXX for special case checks in check_callit. + */ ++#if defined(__UCLIBC__) ++ ++#define MOUNTPROC_MNT 1 ++#define MOUNTPROC_UMNT 3 ++ ++#define NFS_PROGRAM 100003 ++#define YPPROG 100004 ++#define MOUNTPROG 100005 ++#define YPBINDPROG 100007 ++#define YPPASSWDPROG 100009 ++#define RQUOTAPROG 100011 ++ ++#define YPPROC_NULL 0 ++#define YPPROC_DOMAIN 1 ++#define YPPROC_DOMAIN_NONACK 2 ++#define YPPROC_MATCH 3 ++#define YPPROC_FIRST 4 ++#define YPPROC_NEXT 5 ++#define YPPROC_XFR 6 ++#define YPPROC_CLEAR 7 ++#define YPPROC_ALL 8 ++ ++#define YPBINDPROC_SETDOM 2 ++ ++#else ++ + #include <rpcsvc/mount.h> + #include <rpcsvc/rquota.h> + #include <rpcsvc/nfs_prot.h> +@@ -27,6 +53,8 @@ + #include <rpcsvc/ypclnt.h> + #include <rpcsvc/yppasswd.h> + ++#endif ++ + #include "rpcbind.h" + + #ifdef LIBWRAP +-- +1.6.6.1 + 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 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=rpcbind +pkgver=0.2.0 +pkgrel=0 +pkgdesc="portmap replacement which supports RPC over various protocols" +url="http://rpcbind.sourceforge.net" +license="custom" +depends= +makedepends="libtirpc-dev" +subpackages="$pkgname-doc" +source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 + 0001-uclibc-nss.patch + 0002-uclibc-rpcsvc-defines.patch + rpcbind.initd + rpcbind.confd" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in "$srcdir"/*.patch; do + patch -p1 -i "$i" || return 1 + done +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr --bindir=/sbin + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + install -Dm755 "$srcdir"/rpcbind.initd "$pkgdir"/etc/init.d/rpcbind + install -Dm644 "$srcdir"/rpcbind.confd "$pkgdir"/etc/conf.d/rpcbind + install -D -m644 COPYING "$pkgdir"/usr/share/licenses/rpcbind/COPYING +} +md5sums="1a77ddb1aaea8099ab19c351eeb26316 rpcbind-0.2.0.tar.bz2 +6d9718d8bdab633ef7cf83225aaed367 0001-uclibc-nss.patch +944234c5ef6902d25bd6dfc95f979ed6 0002-uclibc-rpcsvc-defines.patch +381a2722c69b4597af532381f1ffeae0 rpcbind.initd +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 @@ +# /etc/conf.d/rpcbind + +# Options for `rpcbind`. +#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 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-nds/rpcbind/files/rpcbind.initd,v 1.1 2007/12/29 09:13:55 vapier Exp $ + +depend() { + use net + before inetd xinetd + after firewall + provide portmap +} + +start() { + ebegin "Starting rpcbind" + start-stop-daemon --start --quiet --exec /sbin/rpcbind \ + -- ${RPCBIND_OPTS} + eend $? +} + +stop() { + ebegin "Stopping rpcbind" + start-stop-daemon --stop --quiet --exec /sbin/rpcbind + eend $? +} + 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 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=squid -pkgver=2.7.7 -_ver=2.7.STABLE7 -pkgrel=5 +pkgver=2.7.9 +_ver=2.7.STABLE9 +pkgrel=0 pkgdesc="A full-featured Web proxy cache server." url="http://www.squid-cache.org" install="squid.pre-install squid.pre-upgrade squid.post-install" @@ -78,6 +78,7 @@ build() { --enable-digest-auth-helpers="password" \ --enable-storeio="aufs,ufs,diskd,coss,null" \ --enable-basic-auth-helpers="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM,squid_radius_auth" \ + --enable-epoll \ --enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \ --enable-ntlm-auth-helpers="SMB,fakeauth,no_check" \ --enable-negotiate-auth-helpers="squid_kerb_auth" \ @@ -290,7 +291,7 @@ errors_ukrainian_utf8() { } -md5sums="c18b0371fca813d5e7c7e0baf87baa22 squid-2.7.STABLE7.tar.bz2 +md5sums="3c6642c85470b1079207d43bba25a819 squid-2.7.STABLE9.tar.bz2 57fed05adc40acab6a5480ec7a014154 squid.initd 44b052db7910f386ef88ddcf69c9ba4e squid.confd 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sudo -pkgver=1.7.2_p7 -_realver=${pkgver%_*}${pkgver#*_} +pkgver=1.7.3 +if [ "${pkgver%_*}" != "$pkgver" ]; then + _realver=${pkgver%_*}${pkgver#*_} +else + _realver=$pkgver +fi pkgrel=0 pkgdesc="Give certain users the ability to run some commands as root" url="http://www.sudo.ws/sudo/" @@ -27,4 +31,4 @@ package() { make -j1 DESTDIR="$pkgdir" install || return 1 } -md5sums="3ac78668427a53e12d7639fdfab2f1af sudo-1.7.2p7.tar.gz" +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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sylpheed -pkgver=3.0.2 -pkgrel=2 +pkgver=3.0.3 +pkgrel=0 pkgdesc="Lightweight and user-friendly e-mail client" url="http://sylpheed.sraoss.jp/en/" license="GPL" @@ -22,4 +22,4 @@ package() { cd "$srcdir/sylpheed-$pkgver" make DESTDIR="$pkgdir" install || return 1 } -md5sums="2ee330c737b02418d8692bd193f8b176 sylpheed-3.0.2.tar.bz2" +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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=syslinux -pkgver=4.00 +pkgver=4.01 pkgrel=0 pkgdesc="a boot loader for the Linux operating system which operates off an MS-DOS/Windows FAT filesystem." url="http://syslinux.org" @@ -27,4 +27,4 @@ package() { make INSTALLROOT="$pkgdir" MANDIR=/usr/share/man local-install } -md5sums="5a475dc9a37ecf7b0beec93eca474f5c syslinux-4.00.tar.bz2" +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 @@ # Maintainer:Carlo Landmeter pkgname=transmission -pkgver=1.93 +pkgver=2.01 pkgrel=0 pkgdesc="Lightweight GTK BitTorrent client" url="http://www.tansmissionbt.com" install="$pkgname.pre-install" license="MIT" depends= -makedepends="openssl-dev pkgconfig curl-dev gtk+-dev intltool" +makedepends="openssl-dev pkgconfig curl-dev gtk+-dev intltool libevent-dev + libnotify-dev dbus-glib-dev" source="http://download.m0k.org/transmission/files/transmission-$pkgver.tar.bz2 transmission-daemon.initd transmission-daemon.confd @@ -46,6 +47,6 @@ cli() { "$subpkgdir"/usr/bin/ } -md5sums="f68358d03e46bec5704bbaa894990152 transmission-1.93.tar.bz2 +md5sums="2e896b86fd55c3563ef85cd01a2141a3 transmission-2.01.tar.bz2 f65b8ae46f8ac89b35844109b3aa0c18 transmission-daemon.initd 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ttf-dejavu -pkgver=2.29 +pkgver=2.31 pkgrel=0 pkgdesc="Font family based on the Bitstream Vera Fonts with a wider range of characters" url="http://dejavu.sourceforge.net/" license="custom" depends="fontconfig encodings mkfontdir mkfontscale" -makedepends="" makedepends="pkgconfig font-util-dev" -install="ttf-dejavu.post-install ttf-dejavu.post-upgrade ttf-dejavu.post-deinstall" -source="http://downloads.sourceforge.net/dejavu/dejavu-fonts-ttf-$pkgver.tar.bz2 - $install" +install= +source="http://downloads.sourceforge.net/dejavu/dejavu-fonts-ttf-$pkgver.tar.bz2" +build() { + return 0 +} -build () -{ +package() { cd "$srcdir/dejavu-fonts-ttf-$pkgver" mkdir -p "$pkgdir/usr/share/fonts/TTF" || return 1 install -m644 ttf/*.ttf "$pkgdir/usr/share/fonts/TTF" || return 1 install -D -m644 LICENSE "$pkgdir/usr/share/licenses/ttf-dejavu/LICENSE" || return 1 } -md5sums="d8feb7d57d8b7cbac409df435daa9849 dejavu-fonts-ttf-2.29.tar.bz2 -856423a62dc28d29f91586286173b1ef ttf-dejavu.post-install -856423a62dc28d29f91586286173b1ef ttf-dejavu.post-upgrade -856423a62dc28d29f91586286173b1ef ttf-dejavu.post-deinstall" +md5sums="a794a75d8c43c83f0226207cd3aaf666 dejavu-fonts-ttf-2.31.tar.bz2" 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 @@ -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 @@ -#!/bin/sh - -fc-cache -fs -mkfontscale usr/share/fonts/TTF -mkfontdir usr/share/fonts/TTF - 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 @@ -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 @@ # Contributor: Leonardo Arena <rnalrd@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=util-linux-ng -pkgver=2.17.2 +pkgver=2.18 pkgrel=0 pkgdesc="Random collection of Linux utilities" arch="" @@ -11,7 +11,7 @@ depends= # use GNU sed til bb sed is fixed makedepends="zlib-dev sed ncurses-dev" install= -source="http://www.kernel.org/pub/linux/utils/util-linux-ng/v2.17/$pkgname-$pkgver.tar.gz" +source="http://www.kernel.org/pub/linux/utils/util-linux-ng/v$pkgver/$pkgname-$pkgver.tar.gz" subpackages="$pkgname-doc $pkgname-dev libuuid libblkid sfdisk cfdisk" replaces="e2fsprogs" @@ -74,4 +74,4 @@ cfdisk() { mv "$pkgdir"/sbin/cfdisk "$subpkgdir"/sbin/ } -md5sums="4c810430e86d53b6ea5e7ae279b39186 util-linux-ng-2.17.2.tar.gz" +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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=x264 -pkgver=20100410 +pkgver=20100607 pkgrel=0 pkgdesc="free library for encoding H264/AVC video streams" url="http://www.videolan.org/developers/x264.html" @@ -26,4 +26,4 @@ package() { cd "$_builddir" make DESTDIR="$pkgdir" bindir=/usr/bin libdir=/usr/lib includedir=/usr/include install || return 1 } -md5sums="13195a516eece721dc743b1dd787a02f x264-snapshot-20100410-2245.tar.bz2" +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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-appfinder pkgver=4.6.2 -pkgrel=0 +pkgrel=1 pkgdesc="Xfce application finder" url="http://www.xfce.org/" license="GPL-2" @@ -9,7 +9,7 @@ depends="hicolor-icon-theme" makedepends="pkgconfig thunar-dev libxfce4menu-dev intltool gtk+-dev libxfce4util-dev libxfcegui4-dev gettext-dev libiconv-dev startup-notification-dev libsm-dev expat-dev e2fsprogs-dev" -install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" +install= source="http://archive.xfce.org/src/xfce/$pkgname/4.6/$pkgname-$pkgver.tar.bz2" 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 @@ -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 @@ -#!/bin/sh - -gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - 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 @@ -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 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4 -pkgver=4.6 -pkgrel=1 +pkgver=4.6.2 +pkgrel=0 pkgdesc="XFCE 4 meta package" url="http://www.xfce.org" license="GPL" -depends="thunar xfce-utils xfce4-panel xfce4-session orage terminal mousepad - xfce4-settings xfdesktop xfwm4 xfce4-mixer xfce4-appfinder - tango-icon-theme ttf-dejavu gtk-xfce-engine" +depends=" + exo>=0.3.107 + gtk-xfce-engine>=2.6.0 + libxfce4menu>=4.6.2 + libxfce4util>=4.6.2 + libxfcegui4>=4.6.4 + mousepad + orage + tango-icon-theme + terminal + thunar>=1.0.2 + ttf-dejavu + xfce-utils>=4.6.2 + xfce4-appfinder>=4.6.2 + xfce4-mixer + xfce4-panel>=4.6.4 + xfce4-session>=4.6.2 + xfce4-settings>=4.6.5 + xfconf>=4.6.2 + xfdesktop>=4.6.2 + xfwm4>=4.6.2 + " makedepends= install= |