summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2010-09-26 19:27:33 +0000
committerCarlo Landmeter <clandmeter@gmail.com>2010-09-26 19:27:33 +0000
commit30e8feac61c3c7cc7e84159c29b00f5e49dbedef (patch)
tree26de2e814714096f0ae86a7846ec8e5b82be5db7
parent6267ff5c95ad547b5698bb2fe38a51475ad61da8 (diff)
parente59f25e6a0d9d18f07ee5b249c535edfbfdb832e (diff)
downloadaports-eglibc.tar.bz2
aports-eglibc.tar.xz
Merge branch 'master' into eglibceglibc
-rw-r--r--main/abiword/APKBUILD2
-rw-r--r--main/acf-freeswitch-vmail/APKBUILD4
-rw-r--r--main/apk-tools/0001-Makefile-do-not-require-lua-pkgconfig-unless-you-int.patch42
-rw-r--r--main/apk-tools/APKBUILD15
-rw-r--r--main/apk-tools/apk-tools-static.patch65
-rw-r--r--main/apk-tools/eglibc.patch57
-rw-r--r--main/bkeymaps/APKBUILD2
-rw-r--r--main/boost/APKBUILD2
-rw-r--r--main/bzip2/APKBUILD57
-rw-r--r--main/bzip2/bzip2-1.0.2-progress.patch175
-rw-r--r--main/bzip2/bzip2-1.0.3-no-test.patch9
-rw-r--r--main/bzip2/bzip2-1.0.4-POSIX-shell.patch4
-rw-r--r--main/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch12
-rw-r--r--main/bzip2/bzip2-1.0.4-saneso.patch13
-rw-r--r--main/bzip2/bzip2-1.0.6-saneso.patch13
-rw-r--r--main/cdrkit/APKBUILD2
-rw-r--r--main/dovecot/APKBUILD2
-rw-r--r--main/dpkg/APKBUILD2
-rw-r--r--main/enca/APKBUILD40
-rw-r--r--main/faac/APKBUILD8
-rw-r--r--main/ffmpeg/APKBUILD2
-rw-r--r--main/glew/APKBUILD32
-rw-r--r--main/glib/APKBUILD2
-rw-r--r--main/gst-plugins-bad/APKBUILD2
-rw-r--r--main/imlib2/APKBUILD2
-rw-r--r--main/libass/APKBUILD35
-rw-r--r--main/libbluray/APKBUILD36
-rw-r--r--main/libc0.9.32/APKBUILD4
-rw-r--r--main/libc0.9.32/bufsize.patch26
-rw-r--r--main/libc0.9.32/getproto.patch11
-rw-r--r--main/libcddb/APKBUILD39
-rw-r--r--main/libcdio/APKBUILD41
-rw-r--r--main/libgsf/APKBUILD2
-rw-r--r--main/libmicrohttpd/APKBUILD44
-rw-r--r--main/libmms/APKBUILD40
-rw-r--r--main/libmms/libmms-0.5-this-keyword.patch18
-rw-r--r--main/libmodplug/APKBUILD37
-rw-r--r--main/librsvg/APKBUILD2
-rw-r--r--main/libssh/APKBUILD36
-rw-r--r--main/libvdpau/APKBUILD38
-rw-r--r--main/lighttpd/APKBUILD2
-rw-r--r--main/links/APKBUILD2
-rw-r--r--main/linux-grsec/APKBUILD10
-rw-r--r--main/linux-grsec/grsecurity-2.2.0-2.6.32.22-201009221846.patch (renamed from main/linux-grsec/grsecurity-2.2.0-2.6.32.21-201009162222.patch)8606
-rw-r--r--main/linux-vserver/APKBUILD8
-rw-r--r--main/nagios/APKBUILD15
-rw-r--r--main/nagios/nagios.pre-install3
-rw-r--r--main/pcre/APKBUILD7
-rw-r--r--main/php/APKBUILD2
-rw-r--r--main/portmap/APKBUILD44
-rw-r--r--main/portmap/commit-queue1
-rw-r--r--main/portmap/portmap-6.0-tcpd.patch18
-rw-r--r--main/portmap/portmap.confd5
-rw-r--r--main/portmap/portmap.initd47
-rw-r--r--main/portmap/portmap.pre-install3
-rw-r--r--main/pwgen/APKBUILD30
-rw-r--r--main/py-gobject/APKBUILD3
-rw-r--r--main/python/APKBUILD2
-rw-r--r--main/rtmpdump/APKBUILD32
-rw-r--r--main/sdl_image/APKBUILD36
-rw-r--r--main/sdl_mixer/APKBUILD39
-rw-r--r--main/wavpack/APKBUILD43
-rw-r--r--main/wv/APKBUILD2
-rw-r--r--main/xfce4-xkb-plugin/APKBUILD2
-rw-r--r--testing/bluez/APKBUILD6
-rw-r--r--testing/gnokii/APKBUILD71
-rw-r--r--testing/gnokii/gnokii.patch12
-rw-r--r--testing/libsyncml/APKBUILD32
-rw-r--r--testing/libwbxml/APKBUILD33
-rw-r--r--testing/obexd/APKBUILD4
-rw-r--r--testing/obexftp/APKBUILD49
-rw-r--r--testing/obexftp/obexftp-0.23-gentoo.patch24
-rw-r--r--testing/openvpn-auth-ldap/APKBUILD41
-rw-r--r--testing/py-dbus/APKBUILD2
74 files changed, 5781 insertions, 4430 deletions
diff --git a/main/abiword/APKBUILD b/main/abiword/APKBUILD
index ef0be3ab8..d43aa80f6 100644
--- a/main/abiword/APKBUILD
+++ b/main/abiword/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=abiword
pkgver=2.8.6
-pkgrel=0
+pkgrel=1
pkgdesc="A fully-featured word processor"
url="http://www.abisource.com"
license="GPL"
diff --git a/main/acf-freeswitch-vmail/APKBUILD b/main/acf-freeswitch-vmail/APKBUILD
index a2b50c0ee..266e2176c 100644
--- a/main/acf-freeswitch-vmail/APKBUILD
+++ b/main/acf-freeswitch-vmail/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Ted Trask <ttrask01@yahoo.com>
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-freeswitch-vmail
-pkgver=0.0.4
+pkgver=0.0.5
pkgrel=0
pkgdesc="ACF for a web interface for freeswitch voicemail"
url="http://git.alpinelinux.org/cgit/$pkgname"
@@ -17,4 +17,4 @@ build() {
make DESTDIR="$pkgdir" install
}
-md5sums="2873793c3177ad35ecd1c14c62a773ec acf-freeswitch-vmail-0.0.4.tar.bz2"
+md5sums="f6c785f85d8a67441d2870bae08e7880 acf-freeswitch-vmail-0.0.5.tar.bz2"
diff --git a/main/apk-tools/0001-Makefile-do-not-require-lua-pkgconfig-unless-you-int.patch b/main/apk-tools/0001-Makefile-do-not-require-lua-pkgconfig-unless-you-int.patch
deleted file mode 100644
index 52ef14186..000000000
--- a/main/apk-tools/0001-Makefile-do-not-require-lua-pkgconfig-unless-you-int.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From fc4c60f233ebe9fe85b7b03d0cf5deec4ab1b32d Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 16 Jun 2010 07:37:17 +0000
-Subject: [PATCH] Makefile: do not require lua pkgconfig unless you intend build lua module
-
----
- src/Makefile | 11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index 50f9664..bea288e 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -1,12 +1,9 @@
--PKGDEPS := openssl zlib lua
--
--ifeq ($(shell pkg-config --print-errors --exists $(PKGDEPS) || echo fail),fail)
--$(error Build dependencies are not met)
--endif
-+PKGDEPS := openssl zlib
-
- # lua module
- ifneq ($(LUAAPK),)
- LIBAPK := YesPlease
-+PKGDEPS += lua
- shlibs-y += apk.so
- apk.so-objs := lua-apk.o
- CFLAGS_lua-apk.o := -DAPK_VERSION=\"$(FULL_VERSION)\"
-@@ -16,6 +13,10 @@ install-LUA_LIB-y := $(INSTALLDIR) $(DESTDIR)$(LUA_LIBDIR) \
- $(INSTALL) $(LUA_LIB-y) $(DESTDIR)$(LUA_LIBDIR)
- endif
-
-+ifeq ($(shell pkg-config --print-errors --exists $(PKGDEPS) || echo fail),fail)
-+$(error Build dependencies are not met)
-+endif
-+
- progs-y += apk
- apk-objs := apk.o add.o del.o fix.o update.o info.o \
- search.o upgrade.o cache.o ver.o index.o fetch.o \
---
-1.7.1
-
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index 3c9f6243c..f64df8a81 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,15 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apk-tools
-pkgver=2.0.5
-pkgrel=2
+pkgver=2.0.6
+pkgrel=0
pkgdesc="Alpine Package Keeper - package manager for alpine"
subpackages="$pkgname-static"
depends=
makedepends="zlib-dev openssl-dev pkgconfig"
source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
- 0001-Makefile-do-not-require-lua-pkgconfig-unless-you-int.patch
- apk-tools-static.patch
- eglibc.patch
"
url="http://git.alpinelinux.org/cgit/apk-tools/"
@@ -23,9 +20,6 @@ prepare() {
*.patch) patch -p1 -i "$srcdir"/$i || return 1
esac
done
- # the patch includes a symlink
- rm -f src/apk-static.c
- ln -s apk.c src/apk-static.c
}
build() {
@@ -53,7 +47,4 @@ static() {
"$subpkgdir"/sbin/apk.static
}
-md5sums="7f9234ab210557b064d7bd9b42833f0a apk-tools-2.0.5.tar.bz2
-f63d483b724e8e9344ce8cb965d5ed22 0001-Makefile-do-not-require-lua-pkgconfig-unless-you-int.patch
-3c1f21719a6c4aba51333cf0d88c5600 apk-tools-static.patch
-a4de86c6c4df6d4d125ff82e607797d6 eglibc.patch"
+md5sums="5933a61f91f44c5c534f8a62e6effb65 apk-tools-2.0.6.tar.bz2"
diff --git a/main/apk-tools/apk-tools-static.patch b/main/apk-tools/apk-tools-static.patch
deleted file mode 100644
index c122964b4..000000000
--- a/main/apk-tools/apk-tools-static.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-commit dd6008995a8e8509d71ffa906c837e7a320e8a15
-Author: Timo Teräs <timo.teras@iki.fi>
-Date: Wed Jun 30 16:53:56 2010 +0300
-
- static build: do not use openssl engines
-
- We want minimal static build. And this now also breaks with our openssl
- since it tries to automatically dlopen some of the engine modules.
-
-diff --git a/.gitignore b/.gitignore
-index f6f9cf6..2b22f52 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -1,4 +1,5 @@
- apk
-+apk.static
- *.o
- *.d
- *.cmd
-diff --git a/src/Makefile b/src/Makefile
-index bea288e..c9cda6a 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -41,9 +41,10 @@ endif
-
- CFLAGS_ALL += -D_ATFILE_SOURCE
- CFLAGS_apk.o := -DAPK_VERSION=\"$(FULL_VERSION)\"
-+CFLAGS_apk-static.o := -DAPK_VERSION=\"$(FULL_VERSION)\" -DOPENSSL_NO_ENGINE
-
- progs-$(STATIC) += apk.static
--apk.static-objs := $(apk-objs)
-+apk.static-objs := $(filter-out apk.o,$(apk-objs)) apk-static.o
- LDFLAGS_apk.static := -static
- LDFLAGS_apk += -nopie -L$(obj)
-
-diff --git a/src/apk-static.c b/src/apk-static.c
-new file mode 120000
-index 0000000..bf745af
---- /dev/null
-+++ b/src/apk-static.c
-@@ -0,0 +1 @@
-+apk.c
-\ No newline at end of file
-diff --git a/src/apk.c b/src/apk.c
-index 81bb950..4196f74 100644
---- a/src/apk.c
-+++ b/src/apk.c
-@@ -12,13 +12,17 @@
- #include <stdio.h>
- #include <fcntl.h>
- #include <ctype.h>
-+#include <errno.h>
- #include <stdarg.h>
- #include <stdlib.h>
- #include <string.h>
- #include <getopt.h>
- #include <sys/stat.h>
-
-+#include <openssl/crypto.h>
-+#ifndef OPENSSL_NO_ENGINE
- #include <openssl/engine.h>
-+#endif
-
- #include "apk_defines.h"
- #include "apk_database.h"
diff --git a/main/apk-tools/eglibc.patch b/main/apk-tools/eglibc.patch
deleted file mode 100644
index 32bf69a71..000000000
--- a/main/apk-tools/eglibc.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From b4adf7645ff6c14e19682b9ef17e15756c5b0b14 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 30 Aug 2010 13:04:25 +0000
-Subject: Fix building on eglibc
-
-Seems like recent eglibc requires that you include sys/stat.h
----
-diff --git a/src/archive.c b/src/archive.c
-index f60cb1b..3ac8a64 100644
---- a/src/archive.c
-+++ b/src/archive.c
-@@ -20,6 +20,7 @@
- #include <unistd.h>
- #include <sysexits.h>
- #include <sys/wait.h>
-+#include <sys/stat.h>
- #include <limits.h>
- #include <stdint.h>
-
-diff --git a/src/database.c b/src/database.c
-index 5dcd9e0..925aa4a 100644
---- a/src/database.c
-+++ b/src/database.c
-@@ -20,6 +20,7 @@
- #include <signal.h>
- #include <fnmatch.h>
- #include <sys/file.h>
-+#include <sys/stat.h>
-
- #include "apk_defines.h"
- #include "apk_package.h"
-diff --git a/src/io.c b/src/io.c
-index 2b0c892..5100d41 100644
---- a/src/io.c
-+++ b/src/io.c
-@@ -15,6 +15,7 @@
- #include <unistd.h>
- #include <malloc.h>
- #include <sys/mman.h>
-+#include <sys/stat.h>
- #include <pwd.h>
- #include <grp.h>
-
-diff --git a/src/package.c b/src/package.c
-index e73814a..8f15e7a 100644
---- a/src/package.c
-+++ b/src/package.c
-@@ -19,6 +19,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <sys/wait.h>
-+#include <sys/stat.h>
-
- #include <openssl/pem.h>
-
---
-cgit v0.8.3.1
diff --git a/main/bkeymaps/APKBUILD b/main/bkeymaps/APKBUILD
index 416b9811c..0534e3f0e 100644
--- a/main/bkeymaps/APKBUILD
+++ b/main/bkeymaps/APKBUILD
@@ -6,7 +6,7 @@ pkgdesc="Binary keymaps for busybox"
url="http://dev.alpinelinux.org/alpine/bkeymaps"
license="GPL"
depends="busybox"
-source="http://dev.alpinelinux.org/alpine/$pkgname/$pkgname-$pkgver.tar.gz"
+source="http://dev.alpinelinux.org/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
cd "$srcdir"/$pkgname-$pkgver
diff --git a/main/boost/APKBUILD b/main/boost/APKBUILD
index 069ae74d9..ea93269a9 100644
--- a/main/boost/APKBUILD
+++ b/main/boost/APKBUILD
@@ -8,7 +8,7 @@ _y=${_y#*.} # strip x.
_z=${pkgver##*.} # strip x.y.
_ver=${_x}_${_y}_${_z}
-pkgrel=2
+pkgrel=3
pkgdesc="Free peer-reviewed portable C++ source libraries"
url="http://www.boost.org/"
license="custom"
diff --git a/main/bzip2/APKBUILD b/main/bzip2/APKBUILD
index 1081978b5..23ffa6474 100644
--- a/main/bzip2/APKBUILD
+++ b/main/bzip2/APKBUILD
@@ -1,27 +1,33 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bzip2
-pkgver=1.0.5
-pkgrel=2
+pkgver=1.0.6
+pkgrel=0
pkgdesc="A high-quality data compression program"
url="http://sources.redhat.com/bzip2"
license="BZIP2"
depends=""
install="$pkgname.post-deinstall"
source="http://www.bzip.org/$pkgver/$pkgname-$pkgver.tar.gz
- $install
- bzip2-1.0.4-POSIX-shell.patch
bzip2-1.0.4-makefile-CFLAGS.patch
+ bzip2-1.0.6-saneso.patch
bzip2-1.0.4-man-links.patch
- bzip2-1.0.4-saneso.patch
+ bzip2-1.0.2-progress.patch
+ bzip2-1.0.3-no-test.patch
+ bzip2-1.0.4-POSIX-shell.patch
"
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-dev $pkgname-doc libbz2"
-build () {
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
local i
- cd "$srcdir"/$pkgname-$pkgver
- for i in ../*.patch; do
- msg "Applying ${i##*/}"
- patch -p1 < $i || return 1
+ cd "$_builddir"
+ for i in $source; do
+ case $i in
+ *.patch)
+ msg "Applying $i"
+ patch -p1 -i "$srcdir"/$i || return 1
+ ;;
+ esac
done
# Fix man path
@@ -36,13 +42,32 @@ build () {
-e "s:1\.0\.4:$pkgver:" \
bzip2.1 bzip2.txt Makefile-libbz2_so manual.* || return 1
+}
+
+build () {
+ cd "$_builddir"
make -f Makefile-libbz2_so all || return 1
make all || return 1
+}
+
+package() {
+ cd "$_builddir"
make PREFIX="$pkgdir"/usr install || return 1
+ install -D libbz2.so.$pkgver "$pkgdir"/usr/lib/libbz2.so.$pkgver
+ ln -s libbz2.so.$pkgver "$pkgdir"/usr/lib/libbz2.so
+ ln -s libbz2.so.$pkgver "$pkgdir"/usr/lib/libbz2.so.${pkgver%%.*}
}
-md5sums="3c15a0c8d1d3ee1c46a1634d00617b1a bzip2-1.0.5.tar.gz
-b84506d253e04db3c5af9016fead45a3 bzip2.post-deinstall
-2e9bcfeb1614b55f5ba2d087ac65a3fe bzip2-1.0.4-POSIX-shell.patch
-56b90131e3c2ae425b758de9c7be7682 bzip2-1.0.4-makefile-CFLAGS.patch
+
+libbz2() {
+ pkgdesc="Shared library for bz2"
+ mkdir -p "$subpkgdir"/usr/lib
+ mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir"/usr/lib/
+}
+
+md5sums="00b516f4704d4a7cb50a1d97e6e8e15b bzip2-1.0.6.tar.gz
+3675cd4db6affe64e1d7d40bc2ad4f26 bzip2-1.0.4-makefile-CFLAGS.patch
+d47a4aa8f08d101aa5aa0dd2030338d1 bzip2-1.0.6-saneso.patch
fd13ef6bc55276c7e3adc346bde56cd1 bzip2-1.0.4-man-links.patch
-643983e8134723ebe53c858b1a3938ad bzip2-1.0.4-saneso.patch"
+5f7a98f0aaaed6554126d30e28383ee0 bzip2-1.0.2-progress.patch
+804bd17c96297968a89fc4eddc9a6713 bzip2-1.0.3-no-test.patch
+55ac0e9be7821190b99376e0205707be bzip2-1.0.4-POSIX-shell.patch"
diff --git a/main/bzip2/bzip2-1.0.2-progress.patch b/main/bzip2/bzip2-1.0.2-progress.patch
new file mode 100644
index 000000000..2f389cfac
--- /dev/null
+++ b/main/bzip2/bzip2-1.0.2-progress.patch
@@ -0,0 +1,175 @@
+Ripped from Mandrake.
+
+http://bugs.gentoo.org/show_bug.cgi?id=82192
+
+--- bzip2-1.0.2.org/bzip2.1
++++ bzip2-1.0.2/bzip2.1
+@@ -235,6 +235,10 @@
+ Suppress non-essential warning messages. Messages pertaining to
+ I/O errors and other critical events will not be suppressed.
+ .TP
++.B \-p --show-progress
++Show percentage of input-file done and while compressing show the percentage
++of the original file the new file is.
++.TP
+ .B \-v --verbose
+ Verbose mode -- show the compression ratio for each file processed.
+ Further \-v's increase the verbosity level, spewing out lots of
+--- bzip2-1.0.2.org/bzip2.c
++++ bzip2-1.0.2/bzip2.c
+@@ -145,6 +145,7 @@
+ #include <signal.h>
+ #include <math.h>
+ #include <errno.h>
++#include <time.h>
+ #include <ctype.h>
+ #include "bzlib.h"
+
+@@ -301,6 +302,7 @@
+ Char progNameReally[FILE_NAME_LEN];
+ FILE *outputHandleJustInCase;
+ Int32 workFactor;
++Char showProgress;
+
+ static void panic ( Char* ) NORETURN;
+ static void ioError ( void ) NORETURN;
+@@ -425,6 +427,12 @@
+ UInt32 nbytes_in_lo32, nbytes_in_hi32;
+ UInt32 nbytes_out_lo32, nbytes_out_hi32;
+ Int32 bzerr, bzerr_dummy, ret;
++ double fileSize = 0; /* initialized to make the compiler stop crying */
++ /* double because big files might otherwhise give
++ * overflows. not long long since not all compilers
++ * support that one
++ */
++ time_t startTime, currentTime;
+
+ SET_BINARY_MODE(stream);
+ SET_BINARY_MODE(zStream);
+@@ -432,12 +440,21 @@
+ if (ferror(stream)) goto errhandler_io;
+ if (ferror(zStream)) goto errhandler_io;
+
++ if ((srcMode == SM_F2F || srcMode == SM_F2O) && showProgress == True) {
++ (void)fseek(stream, 0, SEEK_END);
++ fileSize = (double)ftell(stream);
++ rewind(stream);
++ if (verbosity >= 1)
++ fprintf(stderr, "Input-file size: %ld\n", (long)fileSize);
++ }
++
+ bzf = BZ2_bzWriteOpen ( &bzerr, zStream,
+ blockSize100k, verbosity, workFactor );
+ if (bzerr != BZ_OK) goto errhandler;
+
+ if (verbosity >= 2) fprintf ( stderr, "\n" );
+
++ time(&startTime);
+ while (True) {
+
+ if (myfeof(stream)) break;
+@@ -446,13 +463,32 @@
+ if (nIbuf > 0) BZ2_bzWrite ( &bzerr, bzf, (void*)ibuf, nIbuf );
+ if (bzerr != BZ_OK) goto errhandler;
+
++ if ((srcMode == SM_F2F || srcMode == SM_F2O) && showProgress == True)
++ {
++ time(&currentTime);
++
++ if ((currentTime - startTime) > 1) { /* show progress every 2 seconds */
++ double curInPos = (double)ftell(stream);
++ double curOutPos = (double)ftell(zStream);
++
++ startTime = currentTime;
++
++ fprintf(stderr, "%.2f%% done", (curInPos * 100.0) / fileSize);
++ if (srcMode == SM_F2F)
++ {
++ fprintf(stderr, ", new size: %.2f%%", (curOutPos * 100.0) / curInPos);
++ }
++
++ fprintf(stderr, " \r");
++ }
++ }
+ }
+
+ BZ2_bzWriteClose64 ( &bzerr, bzf, 0,
+ &nbytes_in_lo32, &nbytes_in_hi32,
+ &nbytes_out_lo32, &nbytes_out_hi32 );
+ if (bzerr != BZ_OK) goto errhandler;
+-
++
+ if (ferror(zStream)) goto errhandler_io;
+ ret = fflush ( zStream );
+ if (ret == EOF) goto errhandler_io;
+@@ -526,6 +562,8 @@
+ UChar unused[BZ_MAX_UNUSED];
+ Int32 nUnused;
+ UChar* unusedTmp;
++ double fileSize = 0; /* initialized to make the compiler stop crying */
++ time_t startTime, currentTime;
+
+ nUnused = 0;
+ streamNo = 0;
+@@ -533,9 +571,19 @@
+ SET_BINARY_MODE(stream);
+ SET_BINARY_MODE(zStream);
+
++ if ((srcMode == SM_F2F || srcMode == SM_F2O) && showProgress == True) {
++ long dummy = ftell(zStream);
++ (void)fseek(zStream, 0, SEEK_END);
++ fileSize = (double)ftell(zStream);
++ (void)fseek(zStream, dummy, SEEK_SET);
++ if (verbosity >= 1)
++ fprintf(stderr, "Input-file size: %ld\n", (long)fileSize);
++ }
++
+ if (ferror(stream)) goto errhandler_io;
+ if (ferror(zStream)) goto errhandler_io;
+
++ time(&startTime);
+ while (True) {
+
+ bzf = BZ2_bzReadOpen (
+@@ -551,6 +599,17 @@
+ if ((bzerr == BZ_OK || bzerr == BZ_STREAM_END) && nread > 0)
+ fwrite ( obuf, sizeof(UChar), nread, stream );
+ if (ferror(stream)) goto errhandler_io;
++
++ if ((srcMode == SM_F2F || srcMode == SM_F2O) && showProgress == True) {
++ time(&currentTime);
++ if ((currentTime - startTime) >= 2)
++ {
++ double curInPos = (double)ftell(zStream);
++ startTime = currentTime;
++
++ fprintf(stderr, "%.2f%% done\r", (curInPos * 100.0) / fileSize);
++ }
++ }
+ }
+ if (bzerr != BZ_STREAM_END) goto errhandler;
+
+@@ -1872,6 +1931,7 @@
+ deleteOutputOnInterrupt = False;
+ exitValue = 0;
+ i = j = 0; /* avoid bogus warning from egcs-1.1.X */
++ showProgress = False;
+
+ /*-- Set up signal handlers for mem access errors --*/
+ signal (SIGSEGV, mySIGSEGVorSIGBUScatcher);
+@@ -1949,6 +2009,7 @@
+ case 'k': keepInputFiles = True; break;
+ case 's': smallMode = True; break;
+ case 'q': noisy = False; break;
++ case 'p': showProgress = True; break;
+ case '1': blockSize100k = 1; break;
+ case '2': blockSize100k = 2; break;
+ case '3': blockSize100k = 3; break;
+@@ -1985,6 +2046,7 @@
+ if (ISFLAG("--keep")) keepInputFiles = True; else
+ if (ISFLAG("--small")) smallMode = True; else
+ if (ISFLAG("--quiet")) noisy = False; else
++ if (ISFLAG("--show-progress")) showProgress = True; else
+ if (ISFLAG("--version")) license(); else
+ if (ISFLAG("--license")) license(); else
+ if (ISFLAG("--exponential")) workFactor = 1; else
diff --git a/main/bzip2/bzip2-1.0.3-no-test.patch b/main/bzip2/bzip2-1.0.3-no-test.patch
new file mode 100644
index 000000000..fc876d504
--- /dev/null
+++ b/main/bzip2/bzip2-1.0.3-no-test.patch
@@ -0,0 +1,9 @@
+--- ./Makefile
++++ ./Makefile
+@@ -23,5 +23,5 @@
+ bzlib.o
+
+-all: libbz2.a bzip2 bzip2recover test
++all: libbz2.a bzip2 bzip2recover
+
+ bzip2: libbz2.a bzip2.o
diff --git a/main/bzip2/bzip2-1.0.4-POSIX-shell.patch b/main/bzip2/bzip2-1.0.4-POSIX-shell.patch
index 74f8df000..a5916eaff 100644
--- a/main/bzip2/bzip2-1.0.4-POSIX-shell.patch
+++ b/main/bzip2/bzip2-1.0.4-POSIX-shell.patch
@@ -3,8 +3,8 @@ with calls to sed so POSIX shells work
http://bugs.gentoo.org/193365
---- a/bzgrep
-+++ b/bzgrep
+--- ./bzgrep
++++ ./bzgrep
@@ -63,10 +63,9 @@
bzip2 -cdfq "$i" | $grep $opt "$pat"
r=$?
diff --git a/main/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch b/main/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch
index 85a3c6af6..cf146188c 100644
--- a/main/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch
+++ b/main/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch
@@ -1,5 +1,5 @@
---- a/Makefile
-+++ b/Makefile
+--- ./Makefile
++++ ./Makefile
@@ -18,10 +18,9 @@
CC=gcc
AR=ar
@@ -8,18 +8,18 @@
BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
-+CFLAGS+=-Wall -Winline $(BIGFILES)
++CFLAGS+=-Wall -Winline $(BIGFILES) $(CPPFLAGS)
# Where you want it installed when you do 'make install'
PREFIX=/usr/local
---- a/Makefile-libbz2_so
-+++ b/Makefile-libbz2_so
+--- ./Makefile-libbz2_so
++++ ./Makefile-libbz2_so
@@ -24,7 +24,7 @@
SHELL=/bin/sh
CC=gcc
BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
-+CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES)
++CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES) $(CPPFLAGS)
OBJS= blocksort.o \
huffman.o \
diff --git a/main/bzip2/bzip2-1.0.4-saneso.patch b/main/bzip2/bzip2-1.0.4-saneso.patch
deleted file mode 100644
index 9a71342ca..000000000
--- a/main/bzip2/bzip2-1.0.4-saneso.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile-libbz2_so
-+++ b/Makefile-libbz2_so
-@@ -35,8 +35,8 @@
- bzlib.o
-
- all: $(OBJS)
-- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS)
-- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4
-+ $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.4 $(OBJS)
-+ $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4
- rm -f libbz2.so.1.0
- ln -s libbz2.so.1.0.4 libbz2.so.1.0
-
diff --git a/main/bzip2/bzip2-1.0.6-saneso.patch b/main/bzip2/bzip2-1.0.6-saneso.patch
new file mode 100644
index 000000000..1968a63bf
--- /dev/null
+++ b/main/bzip2/bzip2-1.0.6-saneso.patch
@@ -0,0 +1,13 @@
+--- ./Makefile-libbz2_so
++++ ./Makefile-libbz2_so
+@@ -35,8 +35,8 @@
+ bzlib.o
+
+ all: $(OBJS)
+- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
+- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
++ $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS)
++ $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
+ rm -f libbz2.so.1.0
+ ln -s libbz2.so.1.0.6 libbz2.so.1.0
+
diff --git a/main/cdrkit/APKBUILD b/main/cdrkit/APKBUILD
index 1d17896b3..3d41fffa6 100644
--- a/main/cdrkit/APKBUILD
+++ b/main/cdrkit/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cdrkit
pkgver=1.1.10
-pkgrel=1
+pkgrel=3
pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction"
url="http://cdrkit.org/"
license="GPL2"
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 0646b648a..4ee074a15 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dovecot
pkgver=2.0.2
-pkgrel=0
+pkgrel=1
pkgdesc="IMAP and POP3 server"
url="http://www.dovecot.org/"
license="LGPL-2.1"
diff --git a/main/dpkg/APKBUILD b/main/dpkg/APKBUILD
index 5672b96e4..b4a9252aa 100644
--- a/main/dpkg/APKBUILD
+++ b/main/dpkg/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dpkg
pkgver=1.15.5.6
-pkgrel=1
+pkgrel=2
pkgdesc="The Debian Package Manager"
url="http://packages.debian.org/dpkg"
license="GPL"
diff --git a/main/enca/APKBUILD b/main/enca/APKBUILD
new file mode 100644
index 000000000..bac568143
--- /dev/null
+++ b/main/enca/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Carlo Landmeter
+# Maintainer:
+pkgname=enca
+pkgver=1.13
+pkgrel=0
+pkgdesc="Charset analyser and converter"
+url="http://freshmeat.net/projects/enca/"
+license="GPL"
+depends=
+makedepends=
+install=
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://dl.cihar.com/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+
+_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 \
+ --libexecdir=/usr/lib \
+ --enable-external \
+ --without-libiconv
+
+ make || return 1
+}
+
+package() {
+ cd "$_builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+md5sums="762bead5d9a0a5e55024e1102baaa89d enca-1.13.tar.bz2"
diff --git a/main/faac/APKBUILD b/main/faac/APKBUILD
index 1e196aac4..876ec52a6 100644
--- a/main/faac/APKBUILD
+++ b/main/faac/APKBUILD
@@ -14,9 +14,11 @@ source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.t
prepare() {
cd "$srcdir/$pkgname-$pkgver"
#taken from http://bugs.sourcemage.org/show_bug.cgi?id=15263
- [ "$ALPINE_LIBC" = "eglibc" ] && sed -i \
- "s/^\(.*strcasestr\)/\/\/ This is in libc and conflicts: \1 /" \
- common/mp4v2/mpeg4ip.h
+ if [ "$ALPINE_LIBC" = "eglibc" ]; then
+ sed -i \
+ "s/^\(.*strcasestr\)/\/\/ This is in libc and conflicts: \1 /" \
+ common/mp4v2/mpeg4ip.h
+ fi
}
build() {
diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD
index 2f10b0803..3885236fc 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=1
+pkgrel=2
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/glew/APKBUILD b/main/glew/APKBUILD
new file mode 100644
index 000000000..a6d1b1a8e
--- /dev/null
+++ b/main/glew/APKBUILD
@@ -0,0 +1,32 @@
+# Contributor: Carlo Landmeter
+# Maintainer:
+pkgname=glew
+pkgver=1.5.5
+pkgrel=0
+pkgdesc="A cross-platform C/C++ extension loading library"
+url="http://glew.sourceforge.net"
+license="GPL"
+depends=
+makedepends="libxmu-dev libxi-dev mesa-dev"
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tgz"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+ cd "$_builddir"
+ sed -i 's|lib64|lib|' config/Makefile.linux || return 1
+}
+
+build() {
+ cd "$_builddir"
+ make || return 1
+}
+
+package() {
+ cd "$_builddir"
+ make GLEW_DEST="${pkgdir}/usr" install
+ install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+md5sums="3621f27cfd3e33d5dbcc1111ecb5b762 glew-1.5.5.tgz"
diff --git a/main/glib/APKBUILD b/main/glib/APKBUILD
index 72b8de574..b58305b70 100644
--- a/main/glib/APKBUILD
+++ b/main/glib/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=glib
pkgver=2.24.2
-pkgrel=0
+pkgrel=1
pkgdesc="Common C routines used by Gtk+ and other libs"
url="http://www.gtk.org"
license='GPL'
diff --git a/main/gst-plugins-bad/APKBUILD b/main/gst-plugins-bad/APKBUILD
index 00c16be21..02e72a4a1 100644
--- a/main/gst-plugins-bad/APKBUILD
+++ b/main/gst-plugins-bad/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gst-plugins-bad
pkgver=0.10.20
-pkgrel=0
+pkgrel=1
pkgdesc="GStreamer bad plugins"
url="http://gstreamer.freedesktop.org/"
license="LGPL GPL"
diff --git a/main/imlib2/APKBUILD b/main/imlib2/APKBUILD
index 84ebef52e..bdd35753a 100644
--- a/main/imlib2/APKBUILD
+++ b/main/imlib2/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=imlib2
pkgver=1.4.4
-pkgrel=2
+pkgrel=3
pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support"
url="http://sourceforge.net/projects/enlightenment/"
license="BSD"
diff --git a/main/libass/APKBUILD b/main/libass/APKBUILD
new file mode 100644
index 000000000..2d0012426
--- /dev/null
+++ b/main/libass/APKBUILD
@@ -0,0 +1,35 @@
+# Contributor: Carlo Landmeter
+# Maintainer:
+pkgname=libass
+pkgver=0.9.11
+pkgrel=0
+pkgdesc="A portable library for SSA/ASS subtitles rendering"
+url="http://code.google.com/p/libass/"
+license="GPL"
+depends=""
+makedepends="pkgconfig enca-dev fontconfig-dev libpng-dev"
+subpackages="$pkgname-dev"
+source="http://libass.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2"
+
+_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
+}
+
+md5sums="f9042884397002ba40aa89dc7d34f59f libass-0.9.11.tar.bz2"
diff --git a/main/libbluray/APKBUILD b/main/libbluray/APKBUILD
new file mode 100644
index 000000000..85ebd4d80
--- /dev/null
+++ b/main/libbluray/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: Carlo Landmeter
+# Maintainer:
+pkgname=libbluray
+pkgver=20100902
+pkgrel=0
+pkgdesc="Blu-ray playback libraries"
+url="http://git.videolan.org/?p=libbluray.git;a=summary"
+license="GPL"
+depends=
+makedepends=
+install=
+subpackages="$pkgname-dev"
+source="http://alpine.nethq.org/distfiles/libbluray-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/$pkgname
+
+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
+}
+
+md5sums="c9ba7a906f5071affc347a6024f174d9 libbluray-20100902.tar.bz2"
diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD
index 12a01fa13..9d92dc76f 100644
--- a/main/libc0.9.32/APKBUILD
+++ b/main/libc0.9.32/APKBUILD
@@ -3,7 +3,7 @@ _abiver=0.9.32
pkgname=libc$_abiver
_gitver=1009151331
pkgver=${_abiver}_alpha0_git$_gitver
-pkgrel=1
+pkgrel=2
pkgdesc="C library for developing embedded Linux systems"
url=http://uclibc.org
license="LGPL-2"
@@ -27,6 +27,7 @@ source="http://build.alpinelinux.org:8010/distfiles/$_snapfile
0002-getservice-getservent_r-must-return-ERANGE-when-buff.patch
0003-config-parser-always-initialize-line-pointer.patch
+ bufsize.patch
uclibcconfig.x86
uclibcconfig.i486
"
@@ -122,5 +123,6 @@ md5sums="966c830f294a8ab5069cc03a61e1b2ed libc0.9.32-0.9.32_alpha0_git100915133
ba6e0370d1fc19e5903696de412507ef 0001-config-parser-do-not-assume-that-realloc-return-same.patch
19d923997f9625ce6f16d8128bbcba65 0002-getservice-getservent_r-must-return-ERANGE-when-buff.patch
99b817778f4ef3a1b194740ea08990b4 0003-config-parser-always-initialize-line-pointer.patch
+cf97d904c42c5fd165650472100b18a7 bufsize.patch
cffecb42bdec2da7cac718fa66cacbbe uclibcconfig.x86
cffecb42bdec2da7cac718fa66cacbbe uclibcconfig.i486"
diff --git a/main/libc0.9.32/bufsize.patch b/main/libc0.9.32/bufsize.patch
new file mode 100644
index 000000000..b52f155c6
--- /dev/null
+++ b/main/libc0.9.32/bufsize.patch
@@ -0,0 +1,26 @@
+diff --git a/libc/inet/getproto.c b/libc/inet/getproto.c
+index bcf507b..9858900 100644
+--- a/libc/inet/getproto.c
++++ b/libc/inet/getproto.c
+@@ -28,7 +28,7 @@ aliases: case sensitive optional space or tab separated list of other names
+ __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP);
+
+ #define MAXALIASES 35
+-#define BUFSZ (80) /* one line */
++#define BUFSZ (256) /* one line */
+ #define SBUFSIZE (BUFSZ + 1 + (sizeof(char *) * MAXALIASES))
+
+ static parser_t *protop = NULL;
+diff --git a/libc/inet/getservice.c b/libc/inet/getservice.c
+index c38ff80..dbbc19c 100644
+--- a/libc/inet/getservice.c
++++ b/libc/inet/getservice.c
+@@ -29,7 +29,7 @@ aliases: case sensitive optional space or tab separated list of other names
+ __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP);
+
+ #define MAXALIASES 35
+-#define BUFSZ (80) /* one line */
++#define BUFSZ (256) /* one line */
+ #define SBUFSIZE (BUFSZ + 1 + (sizeof(char *) * MAXALIASES))
+
+ static parser_t *servp = NULL;
diff --git a/main/libc0.9.32/getproto.patch b/main/libc0.9.32/getproto.patch
deleted file mode 100644
index c58847443..000000000
--- a/main/libc0.9.32/getproto.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./libc/inet/getproto.c.orig
-+++ ./libc/inet/getproto.c
-@@ -28,7 +28,7 @@
- __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP);
-
- #define MAXALIASES 35
--#define BUFSZ (80) /* one line */
-+#define BUFSZ (180) /* one line */
- #define SBUFSIZE (BUFSZ + 1 + (sizeof(char *) * MAXALIASES))
-
- static parser_t *protop = NULL;
diff --git a/main/libcddb/APKBUILD b/main/libcddb/APKBUILD
new file mode 100644
index 000000000..7e9024c79
--- /dev/null
+++ b/main/libcddb/APKBUILD
@@ -0,0 +1,39 @@
+# Contributor: Carlo Landmeter
+# Maintainer:
+pkgname=libcddb
+pkgver=1.3.2
+pkgrel=0
+pkgdesc="Library that implements the different protocols (CDDBP, HTTP, SMTP) to access data on a CDDB server (e.g. http://freedb.org)."
+url="http://sourceforge.net/projects/libcddb/"
+license="GPL"
+depends=
+makedepends=
+if [ "$ALPINE_LIBC" != "eglibc" ]; then
+ makedepends="libiconv-dev"
+fi
+install=
+subpackages="$pkgname-dev"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
+
+_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
+}
+
+md5sums="8bb4a6f542197e8e9648ae597cd6bc8a libcddb-1.3.2.tar.bz2"
diff --git a/main/libcdio/APKBUILD b/main/libcdio/APKBUILD
new file mode 100644
index 000000000..6271c73f3
--- /dev/null
+++ b/main/libcdio/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: Carlo Landmeter
+# Maintainer:
+pkgname=libcdio
+pkgver=0.82
+pkgrel=0
+pkgdesc="GNU Compact Disc Input and Control Library"
+url="http://www.gnu.org/software/libcdio/"
+license="GPL3"
+depends=
+makedepends="libcddb-dev ncurses-dev"
+if [ "$ALPINE_LIBC" != "eglibc" ]; then
+ makedepends="$makedepends libiconv-dev"
+fi
+install=
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://ftp.gnu.org/gnu/libcdio/${pkgname}-${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 \
+ --disable-vcd-info \
+ --enable-cpp-progs
+ make || return 1
+}
+
+package() {
+ cd "$_builddir"
+ make -j1 DESTDIR="$pkgdir" install
+}
+
+md5sums="1c29b18e01ab2b966162bc727bf3c360 libcdio-0.82.tar.gz"
diff --git a/main/libgsf/APKBUILD b/main/libgsf/APKBUILD
index 9f8292e2e..a73e143c7 100644
--- a/main/libgsf/APKBUILD
+++ b/main/libgsf/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libgsf
pkgver=1.14.18
-pkgrel=3
+pkgrel=4
pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats."
url="http://www.gnome.org/"
license="GPL LGPL"
diff --git a/main/libmicrohttpd/APKBUILD b/main/libmicrohttpd/APKBUILD
new file mode 100644
index 000000000..3c5fb9da0
--- /dev/null
+++ b/main/libmicrohttpd/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: Carlo Landmeter
+# Maintainer:
+pkgname=libmicrohttpd
+pkgver=0.9.0
+pkgrel=0
+pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application."
+url="http://www.gnu.org/software/libmicrohttpd/"
+license="GPL"
+depends=
+makedepends="curl-dev libgcrypt-dev"
+install=
+subpackages="$pkgname-dev $pkgname-doc"
+source="ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$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 \
+ --enable-largefile \
+ --enable-curl \
+ --enable-messages
+
+ make || return 1
+}
+
+package() {
+ cd "$_builddir"
+ make DESTDIR="$pkgdir" install
+ install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/include/platform.h \
+ ${pkgdir}/usr/include/platform.h
+ install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/include/plibc.h \
+ ${pkgdir}/usr/include/plibc.h
+}
+
+md5sums="9c0d681ee88cdbe332919e102ad27953 libmicrohttpd-0.9.0.tar.gz"
diff --git a/main/libmms/APKBUILD b/main/libmms/APKBUILD
new file mode 100644
index 000000000..0a133834f
--- /dev/null
+++ b/main/libmms/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Carlo Landmeter
+# Maintainer:
+pkgname=libmms
+pkgver=0.6
+pkgrel=0
+pkgdesc="MMS stream protocol library"
+url="http://sourceforge.net/projects/libmms/"
+license="LGPL"
+depends=
+makedepends="pkgconfig glib-dev"
+install=
+subpackages="$pkgname-dev"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+ libmms-0.5-this-keyword.patch
+"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+ cd "$_builddir"
+ patch -p1 -i "$srcdir"/libmms-0.5-this-keyword.patch || return 1
+}
+
+build() {
+ cd "$_builddir"
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --disable-static
+ make || return 1
+}
+
+package() {
+ cd "$_builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+md5sums="650ad04a4c8bd79246390b81b29680b6 libmms-0.6.tar.gz
+5266259060f5723d8ee639b8a541f835 libmms-0.5-this-keyword.patch"
diff --git a/main/libmms/libmms-0.5-this-keyword.patch b/main/libmms/libmms-0.5-this-keyword.patch
new file mode 100644
index 000000000..9d5ae762e
--- /dev/null
+++ b/main/libmms/libmms-0.5-this-keyword.patch
@@ -0,0 +1,18 @@
+diff -Nurp libmms-0.5.orig//src/mmsx.h libmms-0.5//src/mmsx.h
+--- libmms-0.5.orig//src/mmsx.h 2010-03-03 11:42:14.000000000 +0100
++++ libmms-0.5//src/mmsx.h 2010-03-03 11:42:46.000000000 +0100
+@@ -55,11 +55,11 @@ int mmsx_peek_header (mmsx_t *inst
+
+ mms_off_t mmsx_get_current_pos (mmsx_t *instance);
+
+-uint32_t mmsx_get_asf_header_len (mmsx_t *this);
++uint32_t mmsx_get_asf_header_len (mmsx_t *instance);
+
+-uint64_t mmsx_get_asf_packet_len (mmsx_t *this);
++uint64_t mmsx_get_asf_packet_len (mmsx_t *instance);
+
+-int mmsx_get_seekable (mmsx_t *this);
++int mmsx_get_seekable (mmsx_t *instance);
+
+ #ifdef __cplusplus
+ }
diff --git a/main/libmodplug/APKBUILD b/main/libmodplug/APKBUILD
new file mode 100644
index 000000000..931c1e1f0
--- /dev/null
+++ b/main/libmodplug/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: Carlo Landmeter
+# Maintainer:
+pkgname=libmodplug
+pkgver=0.8.8.1
+pkgrel=0
+pkgdesc="A MOD playing library"
+url="http://modplug-xmms.sourceforge.net/"
+license="custom"
+depends=
+makedepends=
+install=
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://downloads.sourceforge.net/modplug-xmms/$pkgname-$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
+ install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
+
+md5sums="f7fa53a60c650024ff51cca88341776b libmodplug-0.8.8.1.tar.gz"
diff --git a/main/librsvg/APKBUILD b/main/librsvg/APKBUILD
index 0c03bc47d..58170fc58 100644
--- a/main/librsvg/APKBUILD
+++ b/main/librsvg/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=librsvg
pkgver=2.26.3
-pkgrel=2
+pkgrel=3
pkgdesc="SAX-based renderer for SVG files into a GdkPixbuf"
url="http://librsvg.sourceforge.net/"
license="LGPL"
diff --git a/main/libssh/APKBUILD b/main/libssh/APKBUILD
new file mode 100644
index 000000000..0d40683ad
--- /dev/null
+++ b/main/libssh/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: Carlo Landmeter
+# Maintainer:
+pkgname=libssh
+pkgver=0.4.5
+pkgrel=0
+pkgdesc="Library for accessing ssh client services through C libraries"
+url="http://www.libssh.org/"
+license="LGPL"
+depends=
+makedepends="openssl-dev cmake"
+subpackages="$pkgname-dev"
+source="http://www.libssh.org/files/${pkgname}-${pkgver}.tar.gz"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+ cd "$_builddir"
+ # apply patches here
+}
+
+build() {
+ cd "$srcdir"
+
+ mkdir build && cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release
+ make || return 1
+}
+
+package() {
+ cd "$srcdir"/build
+ make DESTDIR="$pkgdir" install
+}
+
+md5sums="156bf2402f3251b50b15fe8598c9031d libssh-0.4.5.tar.gz"
diff --git a/main/libvdpau/APKBUILD b/main/libvdpau/APKBUILD
new file mode 100644
index 000000000..b38a2d42f
--- /dev/null
+++ b/main/libvdpau/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: Carlo Landmeter
+# Maintainer:
+pkgname=libvdpau
+pkgver=0.4
+pkgrel=0
+pkgdesc="Nvidia VDPAU library"
+url="http://cgit.freedesktop.org/~aplattner/libvdpau"
+license="custom"
+depends=
+makedepends="libx11-dev"
+install=
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${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
+ install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+}
+
+md5sums="06da6f81ad37708b33a20ed177a44d81 libvdpau-0.4.tar.gz"
diff --git a/main/lighttpd/APKBUILD b/main/lighttpd/APKBUILD
index c3747152b..750dca5b6 100644
--- a/main/lighttpd/APKBUILD
+++ b/main/lighttpd/APKBUILD
@@ -2,7 +2,7 @@
pkgname=lighttpd
pkgver=1.4.28
_streamver=2.2.0
-pkgrel=0
+pkgrel=3
pkgdesc="a secure, fast, compliant and very flexible web-server"
url="http://www.lighttpd.net/"
license="custom"
diff --git a/main/links/APKBUILD b/main/links/APKBUILD
index bc2e3f32c..93e1f615d 100644
--- a/main/links/APKBUILD
+++ b/main/links/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=links
pkgver=2.2
-pkgrel=2
+pkgrel=3
pkgdesc="A text WWW browser, similar to Lynx"
url="http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/"
license="GPL"
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index fa8288136..ea0b8a72d 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -2,9 +2,9 @@
_flavor=grsec
pkgname=linux-${_flavor}
-pkgver=2.6.32.21
+pkgver=2.6.32.22
_kernver=2.6.32
-pkgrel=5
+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.21-201009162222.patch
+ grsecurity-2.2.0-2.6.32.22-201009221846.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
@@ -150,8 +150,8 @@ firmware() {
}
md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
-29aa10a231882a6e52908642b572326f patch-2.6.32.21.bz2
-b5d2449d17fb6a4d0433264b6a4de5f7 grsecurity-2.2.0-2.6.32.21-201009162222.patch
+da1431a1d659298c6bd11714416c840f patch-2.6.32.22.bz2
+1e317ab1a66955c89e73200a1787b58d grsecurity-2.2.0-2.6.32.22-201009221846.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.21-201009162222.patch b/main/linux-grsec/grsecurity-2.2.0-2.6.32.22-201009221846.patch
index 4ed5e6728..41fb7c83f 100644
--- a/main/linux-grsec/grsecurity-2.2.0-2.6.32.21-201009162222.patch
+++ b/main/linux-grsec/grsecurity-2.2.0-2.6.32.22-201009221846.patch
@@ -1,6 +1,6 @@
-diff -urNp linux-2.6.32.21/arch/alpha/include/asm/elf.h linux-2.6.32.21/arch/alpha/include/asm/elf.h
---- linux-2.6.32.21/arch/alpha/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/alpha/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/alpha/include/asm/elf.h linux-2.6.32.22/arch/alpha/include/asm/elf.h
+--- linux-2.6.32.22/arch/alpha/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/alpha/include/asm/elf.h 2010-09-04 15:54:51.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.21/arch/alpha/include/asm/elf.h linux-2.6.32.21/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.21/arch/alpha/include/asm/pgtable.h linux-2.6.32.21/arch/alpha/include/asm/pgtable.h
---- linux-2.6.32.21/arch/alpha/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/alpha/include/asm/pgtable.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/alpha/include/asm/pgtable.h linux-2.6.32.22/arch/alpha/include/asm/pgtable.h
+--- linux-2.6.32.22/arch/alpha/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/alpha/include/asm/pgtable.h 2010-09-04 15:54:51.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.21/arch/alpha/include/asm/pgtable.h linux-2.6.32.21/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.21/arch/alpha/kernel/module.c linux-2.6.32.21/arch/alpha/kernel/module.c
---- linux-2.6.32.21/arch/alpha/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/alpha/kernel/module.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/alpha/kernel/module.c linux-2.6.32.22/arch/alpha/kernel/module.c
+--- linux-2.6.32.22/arch/alpha/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/alpha/kernel/module.c 2010-09-04 15:54:51.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,18 @@ diff -urNp linux-2.6.32.21/arch/alpha/kernel/module.c linux-2.6.32.21/arch/alpha
got = sechdrs[me->arch.gotsecindex].sh_addr;
for (i = 0; i < n; i++) {
-diff -urNp linux-2.6.32.21/arch/alpha/kernel/osf_sys.c linux-2.6.32.21/arch/alpha/kernel/osf_sys.c
---- linux-2.6.32.21/arch/alpha/kernel/osf_sys.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/alpha/kernel/osf_sys.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/alpha/kernel/osf_sys.c linux-2.6.32.22/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.32.22/arch/alpha/kernel/osf_sys.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/alpha/kernel/osf_sys.c 2010-09-17 18:34:04.000000000 -0400
+@@ -1169,7 +1169,7 @@ arch_get_unmapped_area_1(unsigned long a
+ /* At this point: (!vma || addr < vma->vm_end). */
+ if (limit - len < addr)
+ return -ENOMEM;
+- if (!vma || addr + len <= vma->vm_start)
++ if (check_heap_stack_gap(vma, addr, len))
+ return addr;
+ addr = vma->vm_end;
+ vma = vma->vm_next;
@@ -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 +82,9 @@ diff -urNp linux-2.6.32.21/arch/alpha/kernel/osf_sys.c linux-2.6.32.21/arch/alph
if (addr != (unsigned long) -ENOMEM)
return addr;
-diff -urNp linux-2.6.32.21/arch/alpha/mm/fault.c linux-2.6.32.21/arch/alpha/mm/fault.c
---- linux-2.6.32.21/arch/alpha/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/alpha/mm/fault.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/alpha/mm/fault.c linux-2.6.32.22/arch/alpha/mm/fault.c
+--- linux-2.6.32.22/arch/alpha/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/alpha/mm/fault.c 2010-09-04 15:54:51.000000000 -0400
@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
__reload_thread(pcb);
}
@@ -232,9 +241,9 @@ diff -urNp linux-2.6.32.21/arch/alpha/mm/fault.c linux-2.6.32.21/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.21/arch/arm/include/asm/elf.h linux-2.6.32.21/arch/arm/include/asm/elf.h
---- linux-2.6.32.21/arch/arm/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/arm/include/asm/elf.h linux-2.6.32.22/arch/arm/include/asm/elf.h
+--- linux-2.6.32.22/arch/arm/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/arm/include/asm/elf.h 2010-09-04 15:54:51.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 +260,9 @@ diff -urNp linux-2.6.32.21/arch/arm/include/asm/elf.h linux-2.6.32.21/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.21/arch/arm/include/asm/kmap_types.h linux-2.6.32.21/arch/arm/include/asm/kmap_types.h
---- linux-2.6.32.21/arch/arm/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/arm/include/asm/kmap_types.h linux-2.6.32.22/arch/arm/include/asm/kmap_types.h
+--- linux-2.6.32.22/arch/arm/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/arm/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400
@@ -19,6 +19,7 @@ enum km_type {
KM_SOFTIRQ0,
KM_SOFTIRQ1,
@@ -262,9 +271,9 @@ diff -urNp linux-2.6.32.21/arch/arm/include/asm/kmap_types.h linux-2.6.32.21/arc
KM_TYPE_NR
};
-diff -urNp linux-2.6.32.21/arch/arm/include/asm/uaccess.h linux-2.6.32.21/arch/arm/include/asm/uaccess.h
---- linux-2.6.32.21/arch/arm/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/arm/include/asm/uaccess.h linux-2.6.32.22/arch/arm/include/asm/uaccess.h
+--- linux-2.6.32.22/arch/arm/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/arm/include/asm/uaccess.h 2010-09-04 15:54:51.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 +294,9 @@ diff -urNp linux-2.6.32.21/arch/arm/include/asm/uaccess.h linux-2.6.32.21/arch/a
if (access_ok(VERIFY_WRITE, to, n))
n = __copy_to_user(to, from, n);
return n;
-diff -urNp linux-2.6.32.21/arch/arm/kernel/kgdb.c linux-2.6.32.21/arch/arm/kernel/kgdb.c
---- linux-2.6.32.21/arch/arm/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/arm/kernel/kgdb.c linux-2.6.32.22/arch/arm/kernel/kgdb.c
+--- linux-2.6.32.22/arch/arm/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/arm/kernel/kgdb.c 2010-09-04 15:54:51.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 +306,9 @@ diff -urNp linux-2.6.32.21/arch/arm/kernel/kgdb.c linux-2.6.32.21/arch/arm/kerne
#ifndef __ARMEB__
.gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}
#else /* ! __ARMEB__ */
-diff -urNp linux-2.6.32.21/arch/arm/mach-at91/pm.c linux-2.6.32.21/arch/arm/mach-at91/pm.c
---- linux-2.6.32.21/arch/arm/mach-at91/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/mach-at91/pm.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/arm/mach-at91/pm.c linux-2.6.32.22/arch/arm/mach-at91/pm.c
+--- linux-2.6.32.22/arch/arm/mach-at91/pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/arm/mach-at91/pm.c 2010-09-04 15:54:51.000000000 -0400
@@ -348,7 +348,7 @@ static void at91_pm_end(void)
}
@@ -309,9 +318,9 @@ diff -urNp linux-2.6.32.21/arch/arm/mach-at91/pm.c linux-2.6.32.21/arch/arm/mach
.valid = at91_pm_valid_state,
.begin = at91_pm_begin,
.enter = at91_pm_enter,
-diff -urNp linux-2.6.32.21/arch/arm/mach-omap1/pm.c linux-2.6.32.21/arch/arm/mach-omap1/pm.c
---- linux-2.6.32.21/arch/arm/mach-omap1/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/mach-omap1/pm.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/arm/mach-omap1/pm.c linux-2.6.32.22/arch/arm/mach-omap1/pm.c
+--- linux-2.6.32.22/arch/arm/mach-omap1/pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/arm/mach-omap1/pm.c 2010-09-04 15:54:51.000000000 -0400
@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq
@@ -321,9 +330,9 @@ diff -urNp linux-2.6.32.21/arch/arm/mach-omap1/pm.c linux-2.6.32.21/arch/arm/mac
.prepare = omap_pm_prepare,
.enter = omap_pm_enter,
.finish = omap_pm_finish,
-diff -urNp linux-2.6.32.21/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.21/arch/arm/mach-omap2/pm24xx.c
---- linux-2.6.32.21/arch/arm/mach-omap2/pm24xx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/mach-omap2/pm24xx.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.22/arch/arm/mach-omap2/pm24xx.c
+--- linux-2.6.32.22/arch/arm/mach-omap2/pm24xx.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/arm/mach-omap2/pm24xx.c 2010-09-04 15:54:51.000000000 -0400
@@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
enable_hlt();
}
@@ -333,9 +342,9 @@ diff -urNp linux-2.6.32.21/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.21/arch/arm
.prepare = omap2_pm_prepare,
.enter = omap2_pm_enter,
.finish = omap2_pm_finish,
-diff -urNp linux-2.6.32.21/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.21/arch/arm/mach-omap2/pm34xx.c
---- linux-2.6.32.21/arch/arm/mach-omap2/pm34xx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/mach-omap2/pm34xx.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.22/arch/arm/mach-omap2/pm34xx.c
+--- linux-2.6.32.22/arch/arm/mach-omap2/pm34xx.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/arm/mach-omap2/pm34xx.c 2010-09-04 15:54:51.000000000 -0400
@@ -401,7 +401,7 @@ static void omap3_pm_end(void)
return;
}
@@ -345,9 +354,9 @@ diff -urNp linux-2.6.32.21/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.21/arch/arm
.begin = omap3_pm_begin,
.end = omap3_pm_end,
.prepare = omap3_pm_prepare,
-diff -urNp linux-2.6.32.21/arch/arm/mach-pnx4008/pm.c linux-2.6.32.21/arch/arm/mach-pnx4008/pm.c
---- linux-2.6.32.21/arch/arm/mach-pnx4008/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/mach-pnx4008/pm.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/arm/mach-pnx4008/pm.c linux-2.6.32.22/arch/arm/mach-pnx4008/pm.c
+--- linux-2.6.32.22/arch/arm/mach-pnx4008/pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/arm/mach-pnx4008/pm.c 2010-09-04 15:54:51.000000000 -0400
@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat
(state == PM_SUSPEND_MEM);
}
@@ -357,9 +366,9 @@ diff -urNp linux-2.6.32.21/arch/arm/mach-pnx4008/pm.c linux-2.6.32.21/arch/arm/m
.enter = pnx4008_pm_enter,
.valid = pnx4008_pm_valid,
};
-diff -urNp linux-2.6.32.21/arch/arm/mach-pxa/pm.c linux-2.6.32.21/arch/arm/mach-pxa/pm.c
---- linux-2.6.32.21/arch/arm/mach-pxa/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/mach-pxa/pm.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/arm/mach-pxa/pm.c linux-2.6.32.22/arch/arm/mach-pxa/pm.c
+--- linux-2.6.32.22/arch/arm/mach-pxa/pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/arm/mach-pxa/pm.c 2010-09-04 15:54:51.000000000 -0400
@@ -95,7 +95,7 @@ void pxa_pm_finish(void)
pxa_cpu_pm_fns->finish();
}
@@ -369,9 +378,9 @@ diff -urNp linux-2.6.32.21/arch/arm/mach-pxa/pm.c linux-2.6.32.21/arch/arm/mach-
.valid = pxa_pm_valid,
.enter = pxa_pm_enter,
.prepare = pxa_pm_prepare,
-diff -urNp linux-2.6.32.21/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.21/arch/arm/mach-pxa/sharpsl_pm.c
---- linux-2.6.32.21/arch/arm/mach-pxa/sharpsl_pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/mach-pxa/sharpsl_pm.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.22/arch/arm/mach-pxa/sharpsl_pm.c
+--- linux-2.6.32.22/arch/arm/mach-pxa/sharpsl_pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/arm/mach-pxa/sharpsl_pm.c 2010-09-04 15:54:51.000000000 -0400
@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status
}
@@ -381,9 +390,9 @@ diff -urNp linux-2.6.32.21/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.21/arch/a
.prepare = pxa_pm_prepare,
.finish = pxa_pm_finish,
.enter = corgi_pxa_pm_enter,
-diff -urNp linux-2.6.32.21/arch/arm/mach-sa1100/pm.c linux-2.6.32.21/arch/arm/mach-sa1100/pm.c
---- linux-2.6.32.21/arch/arm/mach-sa1100/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/mach-sa1100/pm.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/arm/mach-sa1100/pm.c linux-2.6.32.22/arch/arm/mach-sa1100/pm.c
+--- linux-2.6.32.22/arch/arm/mach-sa1100/pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/arm/mach-sa1100/pm.c 2010-09-04 15:54:51.000000000 -0400
@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
return virt_to_phys(sp);
}
@@ -393,9 +402,9 @@ diff -urNp linux-2.6.32.21/arch/arm/mach-sa1100/pm.c linux-2.6.32.21/arch/arm/ma
.enter = sa11x0_pm_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.32.21/arch/arm/mm/fault.c linux-2.6.32.21/arch/arm/mm/fault.c
---- linux-2.6.32.21/arch/arm/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/mm/fault.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/arm/mm/fault.c linux-2.6.32.22/arch/arm/mm/fault.c
+--- linux-2.6.32.22/arch/arm/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/arm/mm/fault.c 2010-09-04 15:54:51.000000000 -0400
@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk,
}
#endif
@@ -444,9 +453,9 @@ diff -urNp linux-2.6.32.21/arch/arm/mm/fault.c linux-2.6.32.21/arch/arm/mm/fault
/*
* First Level Translation Fault Handler
*
-diff -urNp linux-2.6.32.21/arch/arm/mm/mmap.c linux-2.6.32.21/arch/arm/mm/mmap.c
---- linux-2.6.32.21/arch/arm/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/mm/mmap.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/arm/mm/mmap.c linux-2.6.32.22/arch/arm/mm/mmap.c
+--- linux-2.6.32.22/arch/arm/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/arm/mm/mmap.c 2010-09-17 18:34:04.000000000 -0400
@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
if (len > TASK_SIZE)
return -ENOMEM;
@@ -458,7 +467,13 @@ diff -urNp linux-2.6.32.21/arch/arm/mm/mmap.c linux-2.6.32.21/arch/arm/mm/mmap.c
if (addr) {
if (do_align)
addr = COLOUR_ALIGN(addr, pgoff);
-@@ -75,10 +79,10 @@ arch_get_unmapped_area(struct file *filp
+@@ -70,15 +74,14 @@ arch_get_unmapped_area(struct file *filp
+ addr = PAGE_ALIGN(addr);
+
+ vma = find_vma(mm, addr);
+- if (TASK_SIZE - len >= addr &&
+- (!vma || addr + len <= vma->vm_start))
++ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
return addr;
}
if (len > mm->cached_hole_size) {
@@ -472,7 +487,7 @@ diff -urNp linux-2.6.32.21/arch/arm/mm/mmap.c linux-2.6.32.21/arch/arm/mm/mmap.c
}
full_search:
-@@ -94,8 +98,8 @@ full_search:
+@@ -94,14 +97,14 @@ full_search:
* Start a new search - just in case we missed
* some holes.
*/
@@ -483,9 +498,16 @@ diff -urNp linux-2.6.32.21/arch/arm/mm/mmap.c linux-2.6.32.21/arch/arm/mm/mmap.c
mm->cached_hole_size = 0;
goto full_search;
}
-diff -urNp linux-2.6.32.21/arch/arm/plat-s3c/pm.c linux-2.6.32.21/arch/arm/plat-s3c/pm.c
---- linux-2.6.32.21/arch/arm/plat-s3c/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/plat-s3c/pm.c 2010-09-04 15:54:51.000000000 -0400
+ return -ENOMEM;
+ }
+- if (!vma || addr + len <= vma->vm_start) {
++ if (check_heap_stack_gap(vma, addr, len)) {
+ /*
+ * Remember the place where we stopped the search:
+ */
+diff -urNp linux-2.6.32.22/arch/arm/plat-s3c/pm.c linux-2.6.32.22/arch/arm/plat-s3c/pm.c
+--- linux-2.6.32.22/arch/arm/plat-s3c/pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/arm/plat-s3c/pm.c 2010-09-04 15:54:51.000000000 -0400
@@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
s3c_pm_check_cleanup();
}
@@ -495,9 +517,9 @@ diff -urNp linux-2.6.32.21/arch/arm/plat-s3c/pm.c linux-2.6.32.21/arch/arm/plat-
.enter = s3c_pm_enter,
.prepare = s3c_pm_prepare,
.finish = s3c_pm_finish,
-diff -urNp linux-2.6.32.21/arch/avr32/include/asm/elf.h linux-2.6.32.21/arch/avr32/include/asm/elf.h
---- linux-2.6.32.21/arch/avr32/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/avr32/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/avr32/include/asm/elf.h linux-2.6.32.22/arch/avr32/include/asm/elf.h
+--- linux-2.6.32.22/arch/avr32/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/avr32/include/asm/elf.h 2010-09-04 15:54:51.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 +536,9 @@ diff -urNp linux-2.6.32.21/arch/avr32/include/asm/elf.h linux-2.6.32.21/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.21/arch/avr32/include/asm/kmap_types.h linux-2.6.32.21/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.32.21/arch/avr32/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/avr32/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/avr32/include/asm/kmap_types.h linux-2.6.32.22/arch/avr32/include/asm/kmap_types.h
+--- linux-2.6.32.22/arch/avr32/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/avr32/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400
@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
D(11) KM_IRQ1,
D(12) KM_SOFTIRQ0,
@@ -527,9 +549,9 @@ diff -urNp linux-2.6.32.21/arch/avr32/include/asm/kmap_types.h linux-2.6.32.21/a
};
#undef D
-diff -urNp linux-2.6.32.21/arch/avr32/mach-at32ap/pm.c linux-2.6.32.21/arch/avr32/mach-at32ap/pm.c
---- linux-2.6.32.21/arch/avr32/mach-at32ap/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/avr32/mach-at32ap/pm.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/avr32/mach-at32ap/pm.c linux-2.6.32.22/arch/avr32/mach-at32ap/pm.c
+--- linux-2.6.32.22/arch/avr32/mach-at32ap/pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/avr32/mach-at32ap/pm.c 2010-09-04 15:54:51.000000000 -0400
@@ -176,7 +176,7 @@ out:
return 0;
}
@@ -539,9 +561,9 @@ diff -urNp linux-2.6.32.21/arch/avr32/mach-at32ap/pm.c linux-2.6.32.21/arch/avr3
.valid = avr32_pm_valid_state,
.enter = avr32_pm_enter,
};
-diff -urNp linux-2.6.32.21/arch/avr32/mm/fault.c linux-2.6.32.21/arch/avr32/mm/fault.c
---- linux-2.6.32.21/arch/avr32/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/avr32/mm/fault.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/avr32/mm/fault.c linux-2.6.32.22/arch/avr32/mm/fault.c
+--- linux-2.6.32.22/arch/avr32/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/avr32/mm/fault.c 2010-09-04 15:54:51.000000000 -0400
@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
int exception_trace = 1;
@@ -583,9 +605,9 @@ diff -urNp linux-2.6.32.21/arch/avr32/mm/fault.c linux-2.6.32.21/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.21/arch/blackfin/kernel/kgdb.c linux-2.6.32.21/arch/blackfin/kernel/kgdb.c
---- linux-2.6.32.21/arch/blackfin/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/blackfin/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/blackfin/kernel/kgdb.c linux-2.6.32.22/arch/blackfin/kernel/kgdb.c
+--- linux-2.6.32.22/arch/blackfin/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/blackfin/kernel/kgdb.c 2010-09-04 15:54:51.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 +617,9 @@ diff -urNp linux-2.6.32.21/arch/blackfin/kernel/kgdb.c linux-2.6.32.21/arch/blac
.gdb_bpt_instr = {0xa1},
#ifdef CONFIG_SMP
.flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
-diff -urNp linux-2.6.32.21/arch/blackfin/mach-common/pm.c linux-2.6.32.21/arch/blackfin/mach-common/pm.c
---- linux-2.6.32.21/arch/blackfin/mach-common/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/blackfin/mach-common/pm.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/blackfin/mach-common/pm.c linux-2.6.32.22/arch/blackfin/mach-common/pm.c
+--- linux-2.6.32.22/arch/blackfin/mach-common/pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/blackfin/mach-common/pm.c 2010-09-04 15:54:51.000000000 -0400
@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t
return 0;
}
@@ -607,9 +629,9 @@ diff -urNp linux-2.6.32.21/arch/blackfin/mach-common/pm.c linux-2.6.32.21/arch/b
.enter = bfin_pm_enter,
.valid = bfin_pm_valid,
};
-diff -urNp linux-2.6.32.21/arch/frv/include/asm/kmap_types.h linux-2.6.32.21/arch/frv/include/asm/kmap_types.h
---- linux-2.6.32.21/arch/frv/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/frv/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/frv/include/asm/kmap_types.h linux-2.6.32.22/arch/frv/include/asm/kmap_types.h
+--- linux-2.6.32.22/arch/frv/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/frv/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
@@ -618,9 +640,40 @@ diff -urNp linux-2.6.32.21/arch/frv/include/asm/kmap_types.h linux-2.6.32.21/arc
KM_TYPE_NR
};
-diff -urNp linux-2.6.32.21/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.21/arch/ia64/hp/common/hwsw_iommu.c
---- linux-2.6.32.21/arch/ia64/hp/common/hwsw_iommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/hp/common/hwsw_iommu.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/frv/mm/elf-fdpic.c linux-2.6.32.22/arch/frv/mm/elf-fdpic.c
+--- linux-2.6.32.22/arch/frv/mm/elf-fdpic.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/frv/mm/elf-fdpic.c 2010-09-17 18:34:04.000000000 -0400
+@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
+ if (addr) {
+ addr = PAGE_ALIGN(addr);
+ vma = find_vma(current->mm, addr);
+- if (TASK_SIZE - len >= addr &&
+- (!vma || addr + len <= vma->vm_start))
++ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
+ goto success;
+ }
+
+@@ -89,7 +88,7 @@ unsigned long arch_get_unmapped_area(str
+ for (; vma; vma = vma->vm_next) {
+ if (addr > limit)
+ break;
+- if (addr + len <= vma->vm_start)
++ if (check_heap_stack_gap(vma, addr, len))
+ goto success;
+ addr = vma->vm_end;
+ }
+@@ -104,7 +103,7 @@ unsigned long arch_get_unmapped_area(str
+ for (; vma; vma = vma->vm_next) {
+ if (addr > limit)
+ break;
+- if (addr + len <= vma->vm_start)
++ if (check_heap_stack_gap(vma, addr, len))
+ goto success;
+ addr = vma->vm_end;
+ }
+diff -urNp linux-2.6.32.22/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.22/arch/ia64/hp/common/hwsw_iommu.c
+--- linux-2.6.32.22/arch/ia64/hp/common/hwsw_iommu.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/ia64/hp/common/hwsw_iommu.c 2010-09-04 15:54:51.000000000 -0400
@@ -17,7 +17,7 @@
#include <linux/swiotlb.h>
#include <asm/machvec.h>
@@ -639,9 +692,9 @@ diff -urNp linux-2.6.32.21/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.21/arch
{
if (use_swiotlb(dev))
return &swiotlb_dma_ops;
-diff -urNp linux-2.6.32.21/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.21/arch/ia64/hp/common/sba_iommu.c
---- linux-2.6.32.21/arch/ia64/hp/common/sba_iommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/hp/common/sba_iommu.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.22/arch/ia64/hp/common/sba_iommu.c
+--- linux-2.6.32.22/arch/ia64/hp/common/sba_iommu.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/ia64/hp/common/sba_iommu.c 2010-09-04 15:54:51.000000000 -0400
@@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d
},
};
@@ -660,9 +713,9 @@ diff -urNp linux-2.6.32.21/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.21/arch/
.alloc_coherent = sba_alloc_coherent,
.free_coherent = sba_free_coherent,
.map_page = sba_map_page,
-diff -urNp linux-2.6.32.21/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.21/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.32.21/arch/ia64/ia32/binfmt_elf32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/ia32/binfmt_elf32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.22/arch/ia64/ia32/binfmt_elf32.c
+--- linux-2.6.32.22/arch/ia64/ia32/binfmt_elf32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/ia64/ia32/binfmt_elf32.c 2010-09-04 15:54:51.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 +730,9 @@ diff -urNp linux-2.6.32.21/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.21/arch/ia
/* Ugly but avoids duplication */
#include "../../../fs/binfmt_elf.c"
-diff -urNp linux-2.6.32.21/arch/ia64/ia32/ia32priv.h linux-2.6.32.21/arch/ia64/ia32/ia32priv.h
---- linux-2.6.32.21/arch/ia64/ia32/ia32priv.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/ia32/ia32priv.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/ia64/ia32/ia32priv.h linux-2.6.32.22/arch/ia64/ia32/ia32priv.h
+--- linux-2.6.32.22/arch/ia64/ia32/ia32priv.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/ia64/ia32/ia32priv.h 2010-09-04 15:54:51.000000000 -0400
@@ -296,7 +296,14 @@ typedef struct compat_siginfo {
#define ELF_DATA ELFDATA2LSB
#define ELF_ARCH EM_386
@@ -696,21 +749,9 @@ diff -urNp linux-2.6.32.21/arch/ia64/ia32/ia32priv.h linux-2.6.32.21/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.21/arch/ia64/include/asm/compat.h linux-2.6.32.21/arch/ia64/include/asm/compat.h
---- linux-2.6.32.21/arch/ia64/include/asm/compat.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/include/asm/compat.h 2010-09-15 02:02:57.000000000 -0400
-@@ -198,7 +198,7 @@ ptr_to_compat(void __user *uptr)
- }
-
- static __inline__ void __user *
--compat_alloc_user_space (long len)
-+arch_compat_alloc_user_space (long len)
- {
- struct pt_regs *regs = task_pt_regs(current);
- return (void __user *) (((regs->r12 & 0xffffffff) & -16) - len);
-diff -urNp linux-2.6.32.21/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.21/arch/ia64/include/asm/dma-mapping.h
---- linux-2.6.32.21/arch/ia64/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/include/asm/dma-mapping.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.22/arch/ia64/include/asm/dma-mapping.h
+--- linux-2.6.32.22/arch/ia64/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/ia64/include/asm/dma-mapping.h 2010-09-04 15:54:51.000000000 -0400
@@ -12,7 +12,7 @@
#define ARCH_HAS_DMA_GET_REQUIRED_MASK
@@ -754,9 +795,9 @@ diff -urNp linux-2.6.32.21/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.21/a
return ops->dma_supported(dev, mask);
}
-diff -urNp linux-2.6.32.21/arch/ia64/include/asm/elf.h linux-2.6.32.21/arch/ia64/include/asm/elf.h
---- linux-2.6.32.21/arch/ia64/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/ia64/include/asm/elf.h linux-2.6.32.22/arch/ia64/include/asm/elf.h
+--- linux-2.6.32.22/arch/ia64/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/ia64/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400
@@ -43,6 +43,13 @@
*/
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -771,9 +812,9 @@ diff -urNp linux-2.6.32.21/arch/ia64/include/asm/elf.h linux-2.6.32.21/arch/ia64
#define PT_IA_64_UNWIND 0x70000001
/* IA-64 relocations: */
-diff -urNp linux-2.6.32.21/arch/ia64/include/asm/machvec.h linux-2.6.32.21/arch/ia64/include/asm/machvec.h
---- linux-2.6.32.21/arch/ia64/include/asm/machvec.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/include/asm/machvec.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/ia64/include/asm/machvec.h linux-2.6.32.22/arch/ia64/include/asm/machvec.h
+--- linux-2.6.32.22/arch/ia64/include/asm/machvec.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/ia64/include/asm/machvec.h 2010-09-04 15:54:51.000000000 -0400
@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
/* DMA-mapping interface: */
typedef void ia64_mv_dma_init (void);
@@ -792,9 +833,9 @@ diff -urNp linux-2.6.32.21/arch/ia64/include/asm/machvec.h linux-2.6.32.21/arch/
/*
* Define default versions so we can extend machvec for new platforms without having
-diff -urNp linux-2.6.32.21/arch/ia64/include/asm/pgtable.h linux-2.6.32.21/arch/ia64/include/asm/pgtable.h
---- linux-2.6.32.21/arch/ia64/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/include/asm/pgtable.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/ia64/include/asm/pgtable.h linux-2.6.32.22/arch/ia64/include/asm/pgtable.h
+--- linux-2.6.32.22/arch/ia64/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/ia64/include/asm/pgtable.h 2010-09-04 15:54:51.000000000 -0400
@@ -12,7 +12,7 @@
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
@@ -822,9 +863,9 @@ diff -urNp linux-2.6.32.21/arch/ia64/include/asm/pgtable.h linux-2.6.32.21/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.21/arch/ia64/include/asm/uaccess.h linux-2.6.32.21/arch/ia64/include/asm/uaccess.h
---- linux-2.6.32.21/arch/ia64/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/ia64/include/asm/uaccess.h linux-2.6.32.22/arch/ia64/include/asm/uaccess.h
+--- linux-2.6.32.22/arch/ia64/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/ia64/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400
@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
const void *__cu_from = (from); \
long __cu_len = (n); \
@@ -843,9 +884,9 @@ diff -urNp linux-2.6.32.21/arch/ia64/include/asm/uaccess.h linux-2.6.32.21/arch/
__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
__cu_len; \
})
-diff -urNp linux-2.6.32.21/arch/ia64/kernel/dma-mapping.c linux-2.6.32.21/arch/ia64/kernel/dma-mapping.c
---- linux-2.6.32.21/arch/ia64/kernel/dma-mapping.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/kernel/dma-mapping.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/ia64/kernel/dma-mapping.c linux-2.6.32.22/arch/ia64/kernel/dma-mapping.c
+--- linux-2.6.32.22/arch/ia64/kernel/dma-mapping.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/ia64/kernel/dma-mapping.c 2010-09-04 15:54:51.000000000 -0400
@@ -3,7 +3,7 @@
/* Set this to 1 if there is a HW IOMMU in the system */
int iommu_detected __read_mostly;
@@ -864,9 +905,9 @@ diff -urNp linux-2.6.32.21/arch/ia64/kernel/dma-mapping.c linux-2.6.32.21/arch/i
{
return dma_ops;
}
-diff -urNp linux-2.6.32.21/arch/ia64/kernel/module.c linux-2.6.32.21/arch/ia64/kernel/module.c
---- linux-2.6.32.21/arch/ia64/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/kernel/module.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/ia64/kernel/module.c linux-2.6.32.22/arch/ia64/kernel/module.c
+--- linux-2.6.32.22/arch/ia64/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/ia64/kernel/module.c 2010-09-04 15:54:51.000000000 -0400
@@ -315,8 +315,7 @@ module_alloc (unsigned long size)
void
module_free (struct module *mod, void *module_region)
@@ -955,9 +996,9 @@ diff -urNp linux-2.6.32.21/arch/ia64/kernel/module.c linux-2.6.32.21/arch/ia64/k
mod->arch.gp = gp;
DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
}
-diff -urNp linux-2.6.32.21/arch/ia64/kernel/pci-dma.c linux-2.6.32.21/arch/ia64/kernel/pci-dma.c
---- linux-2.6.32.21/arch/ia64/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/kernel/pci-dma.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/ia64/kernel/pci-dma.c linux-2.6.32.22/arch/ia64/kernel/pci-dma.c
+--- linux-2.6.32.22/arch/ia64/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/ia64/kernel/pci-dma.c 2010-09-04 15:54:51.000000000 -0400
@@ -43,7 +43,7 @@ struct device fallback_dev = {
.dma_mask = &fallback_dev.coherent_dma_mask,
};
@@ -1009,9 +1050,9 @@ diff -urNp linux-2.6.32.21/arch/ia64/kernel/pci-dma.c linux-2.6.32.21/arch/ia64/
/*
* The order of these functions is important for
-diff -urNp linux-2.6.32.21/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.21/arch/ia64/kernel/pci-swiotlb.c
---- linux-2.6.32.21/arch/ia64/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/kernel/pci-swiotlb.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.22/arch/ia64/kernel/pci-swiotlb.c
+--- linux-2.6.32.22/arch/ia64/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/ia64/kernel/pci-swiotlb.c 2010-09-04 15:54:51.000000000 -0400
@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent
return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
}
@@ -1021,9 +1062,9 @@ diff -urNp linux-2.6.32.21/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.21/arch/i
.alloc_coherent = ia64_swiotlb_alloc_coherent,
.free_coherent = swiotlb_free_coherent,
.map_page = swiotlb_map_page,
-diff -urNp linux-2.6.32.21/arch/ia64/kernel/sys_ia64.c linux-2.6.32.21/arch/ia64/kernel/sys_ia64.c
---- linux-2.6.32.21/arch/ia64/kernel/sys_ia64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/kernel/sys_ia64.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/ia64/kernel/sys_ia64.c linux-2.6.32.22/arch/ia64/kernel/sys_ia64.c
+--- linux-2.6.32.22/arch/ia64/kernel/sys_ia64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/ia64/kernel/sys_ia64.c 2010-09-17 18:34:04.000000000 -0400
@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
if (REGION_NUMBER(addr) == RGN_HPAGE)
addr = 0;
@@ -1038,7 +1079,7 @@ diff -urNp linux-2.6.32.21/arch/ia64/kernel/sys_ia64.c linux-2.6.32.21/arch/ia64
if (!addr)
addr = mm->free_area_cache;
-@@ -61,9 +68,9 @@ arch_get_unmapped_area (struct file *fil
+@@ -61,14 +68,14 @@ arch_get_unmapped_area (struct file *fil
for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
/* At this point: (!vma || addr < vma->vm_end). */
if (TASK_SIZE - len < addr || RGN_MAP_LIMIT - len < REGION_OFFSET(addr)) {
@@ -1050,9 +1091,15 @@ diff -urNp linux-2.6.32.21/arch/ia64/kernel/sys_ia64.c linux-2.6.32.21/arch/ia64
goto full_search;
}
return -ENOMEM;
-diff -urNp linux-2.6.32.21/arch/ia64/kernel/topology.c linux-2.6.32.21/arch/ia64/kernel/topology.c
---- linux-2.6.32.21/arch/ia64/kernel/topology.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/kernel/topology.c 2010-09-04 15:54:51.000000000 -0400
+ }
+- if (!vma || addr + len <= vma->vm_start) {
++ if (check_heap_stack_gap(vma, addr, len)) {
+ /* Remember the address where we stopped this search: */
+ mm->free_area_cache = addr + len;
+ return addr;
+diff -urNp linux-2.6.32.22/arch/ia64/kernel/topology.c linux-2.6.32.22/arch/ia64/kernel/topology.c
+--- linux-2.6.32.22/arch/ia64/kernel/topology.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/ia64/kernel/topology.c 2010-09-04 15:54:51.000000000 -0400
@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject
return ret;
}
@@ -1062,9 +1109,9 @@ diff -urNp linux-2.6.32.21/arch/ia64/kernel/topology.c linux-2.6.32.21/arch/ia64
.show = cache_show
};
-diff -urNp linux-2.6.32.21/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.21/arch/ia64/kernel/vmlinux.lds.S
---- linux-2.6.32.21/arch/ia64/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/kernel/vmlinux.lds.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.22/arch/ia64/kernel/vmlinux.lds.S
+--- linux-2.6.32.22/arch/ia64/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/ia64/kernel/vmlinux.lds.S 2010-09-04 15:54:51.000000000 -0400
@@ -190,7 +190,7 @@ SECTIONS
/* Per-cpu data: */
. = ALIGN(PERCPU_PAGE_SIZE);
@@ -1074,9 +1121,9 @@ diff -urNp linux-2.6.32.21/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.21/arch/i
. = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits
* into percpu page size
*/
-diff -urNp linux-2.6.32.21/arch/ia64/mm/fault.c linux-2.6.32.21/arch/ia64/mm/fault.c
---- linux-2.6.32.21/arch/ia64/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/mm/fault.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/ia64/mm/fault.c linux-2.6.32.22/arch/ia64/mm/fault.c
+--- linux-2.6.32.22/arch/ia64/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/ia64/mm/fault.c 2010-09-04 15:54:51.000000000 -0400
@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned
return pte_present(pte);
}
@@ -1126,9 +1173,21 @@ diff -urNp linux-2.6.32.21/arch/ia64/mm/fault.c linux-2.6.32.21/arch/ia64/mm/fau
survive:
/*
* If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.32.21/arch/ia64/mm/init.c linux-2.6.32.21/arch/ia64/mm/init.c
---- linux-2.6.32.21/arch/ia64/mm/init.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/mm/init.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/ia64/mm/hugetlbpage.c linux-2.6.32.22/arch/ia64/mm/hugetlbpage.c
+--- linux-2.6.32.22/arch/ia64/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/ia64/mm/hugetlbpage.c 2010-09-17 18:34:04.000000000 -0400
+@@ -172,7 +172,7 @@ unsigned long hugetlb_get_unmapped_area(
+ /* At this point: (!vmm || addr < vmm->vm_end). */
+ if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
+ return -ENOMEM;
+- if (!vmm || (addr + len) <= vmm->vm_start)
++ if (check_heap_stack_gap(vmm, addr, len))
+ return addr;
+ addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
+ }
+diff -urNp linux-2.6.32.22/arch/ia64/mm/init.c linux-2.6.32.22/arch/ia64/mm/init.c
+--- linux-2.6.32.22/arch/ia64/mm/init.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/ia64/mm/init.c 2010-09-04 15:54:51.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;
@@ -1149,9 +1208,9 @@ diff -urNp linux-2.6.32.21/arch/ia64/mm/init.c linux-2.6.32.21/arch/ia64/mm/init
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
down_write(&current->mm->mmap_sem);
if (insert_vm_struct(current->mm, vma)) {
-diff -urNp linux-2.6.32.21/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.21/arch/ia64/sn/pci/pci_dma.c
---- linux-2.6.32.21/arch/ia64/sn/pci/pci_dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/sn/pci/pci_dma.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.22/arch/ia64/sn/pci/pci_dma.c
+--- linux-2.6.32.22/arch/ia64/sn/pci/pci_dma.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/ia64/sn/pci/pci_dma.c 2010-09-04 15:54:51.000000000 -0400
@@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus *
return ret;
}
@@ -1161,9 +1220,9 @@ diff -urNp linux-2.6.32.21/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.21/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.21/arch/m32r/lib/usercopy.c linux-2.6.32.21/arch/m32r/lib/usercopy.c
---- linux-2.6.32.21/arch/m32r/lib/usercopy.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/m32r/lib/usercopy.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/m32r/lib/usercopy.c linux-2.6.32.22/arch/m32r/lib/usercopy.c
+--- linux-2.6.32.22/arch/m32r/lib/usercopy.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/m32r/lib/usercopy.c 2010-09-04 15:54:51.000000000 -0400
@@ -14,6 +14,9 @@
unsigned long
__generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1184,9 +1243,9 @@ diff -urNp linux-2.6.32.21/arch/m32r/lib/usercopy.c linux-2.6.32.21/arch/m32r/li
prefetchw(to);
if (access_ok(VERIFY_READ, from, n))
__copy_user_zeroing(to,from,n);
-diff -urNp linux-2.6.32.21/arch/mips/alchemy/devboards/pm.c linux-2.6.32.21/arch/mips/alchemy/devboards/pm.c
---- linux-2.6.32.21/arch/mips/alchemy/devboards/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/mips/alchemy/devboards/pm.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/mips/alchemy/devboards/pm.c linux-2.6.32.22/arch/mips/alchemy/devboards/pm.c
+--- linux-2.6.32.22/arch/mips/alchemy/devboards/pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/mips/alchemy/devboards/pm.c 2010-09-04 15:54:51.000000000 -0400
@@ -78,7 +78,7 @@ static void db1x_pm_end(void)
}
@@ -1196,21 +1255,9 @@ diff -urNp linux-2.6.32.21/arch/mips/alchemy/devboards/pm.c linux-2.6.32.21/arch
.valid = suspend_valid_only_mem,
.begin = db1x_pm_begin,
.enter = db1x_pm_enter,
-diff -urNp linux-2.6.32.21/arch/mips/include/asm/compat.h linux-2.6.32.21/arch/mips/include/asm/compat.h
---- linux-2.6.32.21/arch/mips/include/asm/compat.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/mips/include/asm/compat.h 2010-09-15 02:02:57.000000000 -0400
-@@ -144,7 +144,7 @@ static inline compat_uptr_t ptr_to_compa
- return (u32)(unsigned long)uptr;
- }
-
--static inline void __user *compat_alloc_user_space(long len)
-+static inline void __user *arch_compat_alloc_user_space(long len)
- {
- struct pt_regs *regs = (struct pt_regs *)
- ((unsigned long) current_thread_info() + THREAD_SIZE - 32) - 1;
-diff -urNp linux-2.6.32.21/arch/mips/include/asm/elf.h linux-2.6.32.21/arch/mips/include/asm/elf.h
---- linux-2.6.32.21/arch/mips/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/mips/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/mips/include/asm/elf.h linux-2.6.32.22/arch/mips/include/asm/elf.h
+--- linux-2.6.32.22/arch/mips/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/mips/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400
@@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str
#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
#endif
@@ -1223,9 +1270,9 @@ diff -urNp linux-2.6.32.21/arch/mips/include/asm/elf.h linux-2.6.32.21/arch/mips
+#endif
+
#endif /* _ASM_ELF_H */
-diff -urNp linux-2.6.32.21/arch/mips/include/asm/page.h linux-2.6.32.21/arch/mips/include/asm/page.h
---- linux-2.6.32.21/arch/mips/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/mips/include/asm/page.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/mips/include/asm/page.h linux-2.6.32.22/arch/mips/include/asm/page.h
+--- linux-2.6.32.22/arch/mips/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/mips/include/asm/page.h 2010-09-04 15:54:51.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;
@@ -1235,9 +1282,9 @@ diff -urNp linux-2.6.32.21/arch/mips/include/asm/page.h linux-2.6.32.21/arch/mip
#else
typedef struct { unsigned long long pte; } pte_t;
#define pte_val(x) ((x).pte)
-diff -urNp linux-2.6.32.21/arch/mips/include/asm/system.h linux-2.6.32.21/arch/mips/include/asm/system.h
---- linux-2.6.32.21/arch/mips/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/mips/include/asm/system.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/mips/include/asm/system.h linux-2.6.32.22/arch/mips/include/asm/system.h
+--- linux-2.6.32.22/arch/mips/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/mips/include/asm/system.h 2010-09-04 15:54:51.000000000 -0400
@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
*/
#define __ARCH_WANT_UNLOCKED_CTXSW
@@ -1246,9 +1293,9 @@ diff -urNp linux-2.6.32.21/arch/mips/include/asm/system.h linux-2.6.32.21/arch/m
+#define arch_align_stack(x) ((x) & ALMASK)
#endif /* _ASM_SYSTEM_H */
-diff -urNp linux-2.6.32.21/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.21/arch/mips/kernel/binfmt_elfn32.c
---- linux-2.6.32.21/arch/mips/kernel/binfmt_elfn32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/mips/kernel/binfmt_elfn32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.22/arch/mips/kernel/binfmt_elfn32.c
+--- linux-2.6.32.22/arch/mips/kernel/binfmt_elfn32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/mips/kernel/binfmt_elfn32.c 2010-09-04 15:54:51.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)
@@ -1263,9 +1310,9 @@ diff -urNp linux-2.6.32.21/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.21/arch
#include <asm/processor.h>
#include <linux/module.h>
#include <linux/elfcore.h>
-diff -urNp linux-2.6.32.21/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.21/arch/mips/kernel/binfmt_elfo32.c
---- linux-2.6.32.21/arch/mips/kernel/binfmt_elfo32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/mips/kernel/binfmt_elfo32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.22/arch/mips/kernel/binfmt_elfo32.c
+--- linux-2.6.32.22/arch/mips/kernel/binfmt_elfo32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/mips/kernel/binfmt_elfo32.c 2010-09-04 15:54:51.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)
@@ -1280,9 +1327,9 @@ diff -urNp linux-2.6.32.21/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.21/arch
#include <asm/processor.h>
/*
-diff -urNp linux-2.6.32.21/arch/mips/kernel/kgdb.c linux-2.6.32.21/arch/mips/kernel/kgdb.c
---- linux-2.6.32.21/arch/mips/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/mips/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/mips/kernel/kgdb.c linux-2.6.32.22/arch/mips/kernel/kgdb.c
+--- linux-2.6.32.22/arch/mips/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/mips/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400
@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto
return -1;
}
@@ -1291,9 +1338,9 @@ diff -urNp linux-2.6.32.21/arch/mips/kernel/kgdb.c linux-2.6.32.21/arch/mips/ker
struct kgdb_arch arch_kgdb_ops;
/*
-diff -urNp linux-2.6.32.21/arch/mips/kernel/process.c linux-2.6.32.21/arch/mips/kernel/process.c
---- linux-2.6.32.21/arch/mips/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/mips/kernel/process.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/mips/kernel/process.c linux-2.6.32.22/arch/mips/kernel/process.c
+--- linux-2.6.32.22/arch/mips/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/mips/kernel/process.c 2010-09-04 15:54:51.000000000 -0400
@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru
out:
return pc;
@@ -1310,10 +1357,10 @@ diff -urNp linux-2.6.32.21/arch/mips/kernel/process.c linux-2.6.32.21/arch/mips/
-
- return sp & ALMASK;
-}
-diff -urNp linux-2.6.32.21/arch/mips/kernel/syscall.c linux-2.6.32.21/arch/mips/kernel/syscall.c
---- linux-2.6.32.21/arch/mips/kernel/syscall.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/mips/kernel/syscall.c 2010-09-04 15:54:51.000000000 -0400
-@@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str
+diff -urNp linux-2.6.32.22/arch/mips/kernel/syscall.c linux-2.6.32.22/arch/mips/kernel/syscall.c
+--- linux-2.6.32.22/arch/mips/kernel/syscall.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/mips/kernel/syscall.c 2010-09-17 18:34:04.000000000 -0400
+@@ -102,17 +102,21 @@ unsigned long arch_get_unmapped_area(str
do_color_align = 0;
if (filp || (flags & MAP_SHARED))
do_color_align = 1;
@@ -1325,8 +1372,12 @@ diff -urNp linux-2.6.32.21/arch/mips/kernel/syscall.c linux-2.6.32.21/arch/mips/
if (addr) {
if (do_color_align)
addr = COLOUR_ALIGN(addr, pgoff);
-@@ -112,7 +117,7 @@ unsigned long arch_get_unmapped_area(str
- (!vmm || addr + len <= vmm->vm_start))
+ else
+ addr = PAGE_ALIGN(addr);
+ vmm = find_vma(current->mm, addr);
+- if (task_size - len >= addr &&
+- (!vmm || addr + len <= vmm->vm_start))
++ if (task_size - len >= addr && check_heap_stack_gap(vmm, addr, len))
return addr;
}
- addr = TASK_UNMAPPED_BASE;
@@ -1334,9 +1385,18 @@ diff -urNp linux-2.6.32.21/arch/mips/kernel/syscall.c linux-2.6.32.21/arch/mips/
if (do_color_align)
addr = COLOUR_ALIGN(addr, pgoff);
else
-diff -urNp linux-2.6.32.21/arch/mips/mm/fault.c linux-2.6.32.21/arch/mips/mm/fault.c
---- linux-2.6.32.21/arch/mips/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/mips/mm/fault.c 2010-09-04 15:54:51.000000000 -0400
+@@ -122,7 +126,7 @@ unsigned long arch_get_unmapped_area(str
+ /* At this point: (!vmm || addr < vmm->vm_end). */
+ if (task_size - len < addr)
+ return -ENOMEM;
+- if (!vmm || addr + len <= vmm->vm_start)
++ if (check_heap_stack_gap(vmm, addr, len))
+ return addr;
+ addr = vmm->vm_end;
+ if (do_color_align)
+diff -urNp linux-2.6.32.22/arch/mips/mm/fault.c linux-2.6.32.22/arch/mips/mm/fault.c
+--- linux-2.6.32.22/arch/mips/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/mips/mm/fault.c 2010-09-04 15:54:51.000000000 -0400
@@ -26,6 +26,23 @@
#include <asm/ptrace.h>
#include <asm/highmem.h> /* For VMALLOC_END */
@@ -1361,21 +1421,9 @@ diff -urNp linux-2.6.32.21/arch/mips/mm/fault.c linux-2.6.32.21/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.21/arch/parisc/include/asm/compat.h linux-2.6.32.21/arch/parisc/include/asm/compat.h
---- linux-2.6.32.21/arch/parisc/include/asm/compat.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/parisc/include/asm/compat.h 2010-09-15 02:02:57.000000000 -0400
-@@ -146,7 +146,7 @@ static inline compat_uptr_t ptr_to_compa
- return (u32)(unsigned long)uptr;
- }
-
--static __inline__ void __user *compat_alloc_user_space(long len)
-+static __inline__ void __user *arch_compat_alloc_user_space(long len)
- {
- struct pt_regs *regs = &current->thread.regs;
- return (void __user *)regs->gr[30];
-diff -urNp linux-2.6.32.21/arch/parisc/include/asm/elf.h linux-2.6.32.21/arch/parisc/include/asm/elf.h
---- linux-2.6.32.21/arch/parisc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/parisc/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/parisc/include/asm/elf.h linux-2.6.32.22/arch/parisc/include/asm/elf.h
+--- linux-2.6.32.22/arch/parisc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/parisc/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400
@@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration..
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
@@ -1390,9 +1438,9 @@ diff -urNp linux-2.6.32.21/arch/parisc/include/asm/elf.h linux-2.6.32.21/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.21/arch/parisc/include/asm/pgtable.h linux-2.6.32.21/arch/parisc/include/asm/pgtable.h
---- linux-2.6.32.21/arch/parisc/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/parisc/include/asm/pgtable.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/parisc/include/asm/pgtable.h linux-2.6.32.22/arch/parisc/include/asm/pgtable.h
+--- linux-2.6.32.22/arch/parisc/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/parisc/include/asm/pgtable.h 2010-09-04 15:54:51.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
@@ -1411,9 +1459,9 @@ diff -urNp linux-2.6.32.21/arch/parisc/include/asm/pgtable.h linux-2.6.32.21/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.21/arch/parisc/kernel/module.c linux-2.6.32.21/arch/parisc/kernel/module.c
---- linux-2.6.32.21/arch/parisc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/parisc/kernel/module.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/parisc/kernel/module.c linux-2.6.32.22/arch/parisc/kernel/module.c
+--- linux-2.6.32.22/arch/parisc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/parisc/kernel/module.c 2010-09-04 15:54:51.000000000 -0400
@@ -95,16 +95,38 @@
/* three functions to determine where in the module core
@@ -1514,9 +1562,27 @@ diff -urNp linux-2.6.32.21/arch/parisc/kernel/module.c linux-2.6.32.21/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.21/arch/parisc/kernel/sys_parisc.c linux-2.6.32.21/arch/parisc/kernel/sys_parisc.c
---- linux-2.6.32.21/arch/parisc/kernel/sys_parisc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/parisc/kernel/sys_parisc.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/parisc/kernel/sys_parisc.c linux-2.6.32.22/arch/parisc/kernel/sys_parisc.c
+--- linux-2.6.32.22/arch/parisc/kernel/sys_parisc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/parisc/kernel/sys_parisc.c 2010-09-17 18:34:04.000000000 -0400
+@@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u
+ /* At this point: (!vma || addr < vma->vm_end). */
+ if (TASK_SIZE - len < addr)
+ return -ENOMEM;
+- if (!vma || addr + len <= vma->vm_start)
++ if (check_heap_stack_gap(vma, addr, len))
+ return addr;
+ addr = vma->vm_end;
+ }
+@@ -79,7 +79,7 @@ static unsigned long get_shared_area(str
+ /* At this point: (!vma || addr < vma->vm_end). */
+ if (TASK_SIZE - len < addr)
+ return -ENOMEM;
+- if (!vma || addr + len <= vma->vm_start)
++ if (check_heap_stack_gap(vma, addr, len))
+ return addr;
+ addr = DCACHE_ALIGN(vma->vm_end - offset) + offset;
+ if (addr < vma->vm_end) /* handle wraparound */
@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str
if (flags & MAP_FIXED)
return addr;
@@ -1526,9 +1592,9 @@ diff -urNp linux-2.6.32.21/arch/parisc/kernel/sys_parisc.c linux-2.6.32.21/arch/
if (filp) {
addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
-diff -urNp linux-2.6.32.21/arch/parisc/kernel/traps.c linux-2.6.32.21/arch/parisc/kernel/traps.c
---- linux-2.6.32.21/arch/parisc/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/parisc/kernel/traps.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/parisc/kernel/traps.c linux-2.6.32.22/arch/parisc/kernel/traps.c
+--- linux-2.6.32.22/arch/parisc/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/parisc/kernel/traps.c 2010-09-04 15:54:51.000000000 -0400
@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
down_read(&current->mm->mmap_sem);
@@ -1540,9 +1606,9 @@ diff -urNp linux-2.6.32.21/arch/parisc/kernel/traps.c linux-2.6.32.21/arch/paris
fault_address = regs->iaoq[0];
fault_space = regs->iasq[0];
-diff -urNp linux-2.6.32.21/arch/parisc/mm/fault.c linux-2.6.32.21/arch/parisc/mm/fault.c
---- linux-2.6.32.21/arch/parisc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/parisc/mm/fault.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/parisc/mm/fault.c linux-2.6.32.22/arch/parisc/mm/fault.c
+--- linux-2.6.32.22/arch/parisc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/parisc/mm/fault.c 2010-09-04 15:54:51.000000000 -0400
@@ -15,6 +15,7 @@
#include <linux/sched.h>
#include <linux/interrupt.h>
@@ -1712,21 +1778,9 @@ diff -urNp linux-2.6.32.21/arch/parisc/mm/fault.c linux-2.6.32.21/arch/parisc/mm
/*
* If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/compat.h linux-2.6.32.21/arch/powerpc/include/asm/compat.h
---- linux-2.6.32.21/arch/powerpc/include/asm/compat.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/compat.h 2010-09-15 02:02:57.000000000 -0400
-@@ -133,7 +133,7 @@ static inline compat_uptr_t ptr_to_compa
- return (u32)(unsigned long)uptr;
- }
-
--static inline void __user *compat_alloc_user_space(long len)
-+static inline void __user *arch_compat_alloc_user_space(long len)
- {
- struct pt_regs *regs = current->thread.regs;
- unsigned long usp = regs->gpr[1];
-diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/device.h linux-2.6.32.21/arch/powerpc/include/asm/device.h
---- linux-2.6.32.21/arch/powerpc/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/device.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/include/asm/device.h linux-2.6.32.22/arch/powerpc/include/asm/device.h
+--- linux-2.6.32.22/arch/powerpc/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/include/asm/device.h 2010-09-04 15:54:51.000000000 -0400
@@ -14,7 +14,7 @@ struct dev_archdata {
struct device_node *of_node;
@@ -1736,9 +1790,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/device.h linux-2.6.32.21/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.21/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.21/arch/powerpc/include/asm/dma-mapping.h
---- linux-2.6.32.21/arch/powerpc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/dma-mapping.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.22/arch/powerpc/include/asm/dma-mapping.h
+--- linux-2.6.32.22/arch/powerpc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/include/asm/dma-mapping.h 2010-09-04 15:54:51.000000000 -0400
@@ -69,9 +69,9 @@ static inline unsigned long device_to_ma
#ifdef CONFIG_PPC64
extern struct dma_map_ops dma_iommu_ops;
@@ -1805,9 +1859,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.2
if (dma_ops->mapping_error)
return dma_ops->mapping_error(dev, dma_addr);
-diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/elf.h linux-2.6.32.21/arch/powerpc/include/asm/elf.h
---- linux-2.6.32.21/arch/powerpc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/include/asm/elf.h linux-2.6.32.22/arch/powerpc/include/asm/elf.h
+--- linux-2.6.32.22/arch/powerpc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/include/asm/elf.h 2010-09-04 15:54:51.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. */
@@ -1840,9 +1894,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/elf.h linux-2.6.32.21/arch/p
#endif /* __KERNEL__ */
/*
-diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/iommu.h linux-2.6.32.21/arch/powerpc/include/asm/iommu.h
---- linux-2.6.32.21/arch/powerpc/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/iommu.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/include/asm/iommu.h linux-2.6.32.22/arch/powerpc/include/asm/iommu.h
+--- linux-2.6.32.22/arch/powerpc/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/include/asm/iommu.h 2010-09-04 15:54:51.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);
@@ -1853,9 +1907,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/iommu.h linux-2.6.32.21/arch
#ifdef CONFIG_PCI
extern void pci_iommu_init(void);
extern void pci_direct_iommu_init(void);
-diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.21/arch/powerpc/include/asm/kmap_types.h
---- linux-2.6.32.21/arch/powerpc/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.22/arch/powerpc/include/asm/kmap_types.h
+--- linux-2.6.32.22/arch/powerpc/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400
@@ -26,6 +26,7 @@ enum km_type {
KM_SOFTIRQ1,
KM_PPC_SYNC_PAGE,
@@ -1864,9 +1918,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.21
KM_TYPE_NR
};
-diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/page_64.h linux-2.6.32.21/arch/powerpc/include/asm/page_64.h
---- linux-2.6.32.21/arch/powerpc/include/asm/page_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/page_64.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/include/asm/page_64.h linux-2.6.32.22/arch/powerpc/include/asm/page_64.h
+--- linux-2.6.32.22/arch/powerpc/include/asm/page_64.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/include/asm/page_64.h 2010-09-04 15:54:51.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.
@@ -1888,9 +1942,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/page_64.h linux-2.6.32.21/ar
#include <asm-generic/getorder.h>
-diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/page.h linux-2.6.32.21/arch/powerpc/include/asm/page.h
---- linux-2.6.32.21/arch/powerpc/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/page.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/include/asm/page.h linux-2.6.32.22/arch/powerpc/include/asm/page.h
+--- linux-2.6.32.22/arch/powerpc/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/include/asm/page.h 2010-09-04 15:54:51.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.
@@ -1913,9 +1967,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/page.h linux-2.6.32.21/arch/
#ifndef __ASSEMBLY__
#undef STRICT_MM_TYPECHECKS
-diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/pci.h linux-2.6.32.21/arch/powerpc/include/asm/pci.h
---- linux-2.6.32.21/arch/powerpc/include/asm/pci.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/pci.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/include/asm/pci.h linux-2.6.32.22/arch/powerpc/include/asm/pci.h
+--- linux-2.6.32.22/arch/powerpc/include/asm/pci.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/include/asm/pci.h 2010-09-04 15:54:51.000000000 -0400
@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
}
@@ -1927,9 +1981,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/pci.h linux-2.6.32.21/arch/p
#else /* CONFIG_PCI */
#define set_pci_dma_ops(d)
#define get_pci_dma_ops() NULL
-diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.21/arch/powerpc/include/asm/pte-hash32.h
---- linux-2.6.32.21/arch/powerpc/include/asm/pte-hash32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/pte-hash32.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.22/arch/powerpc/include/asm/pte-hash32.h
+--- linux-2.6.32.22/arch/powerpc/include/asm/pte-hash32.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/include/asm/pte-hash32.h 2010-09-04 15:54:51.000000000 -0400
@@ -21,6 +21,7 @@
#define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
#define _PAGE_USER 0x004 /* usermode access allowed */
@@ -1938,9 +1992,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.21
#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.21/arch/powerpc/include/asm/reg.h linux-2.6.32.21/arch/powerpc/include/asm/reg.h
---- linux-2.6.32.21/arch/powerpc/include/asm/reg.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/reg.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/include/asm/reg.h linux-2.6.32.22/arch/powerpc/include/asm/reg.h
+--- linux-2.6.32.22/arch/powerpc/include/asm/reg.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/include/asm/reg.h 2010-09-04 15:54:51.000000000 -0400
@@ -191,6 +191,7 @@
#define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
#define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
@@ -1949,9 +2003,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/reg.h linux-2.6.32.21/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.21/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.21/arch/powerpc/include/asm/swiotlb.h
---- linux-2.6.32.21/arch/powerpc/include/asm/swiotlb.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/swiotlb.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.22/arch/powerpc/include/asm/swiotlb.h
+--- linux-2.6.32.22/arch/powerpc/include/asm/swiotlb.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/include/asm/swiotlb.h 2010-09-04 15:54:51.000000000 -0400
@@ -13,7 +13,7 @@
#include <linux/swiotlb.h>
@@ -1961,9 +2015,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.21/ar
static inline void dma_mark_clean(void *addr, size_t size) {}
-diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/uaccess.h linux-2.6.32.21/arch/powerpc/include/asm/uaccess.h
---- linux-2.6.32.21/arch/powerpc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/include/asm/uaccess.h linux-2.6.32.22/arch/powerpc/include/asm/uaccess.h
+--- linux-2.6.32.22/arch/powerpc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400
@@ -13,6 +13,8 @@
#define VERIFY_READ 0
#define VERIFY_WRITE 1
@@ -2141,9 +2195,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/uaccess.h linux-2.6.32.21/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.21/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.21/arch/powerpc/kernel/cacheinfo.c
---- linux-2.6.32.21/arch/powerpc/kernel/cacheinfo.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/cacheinfo.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.22/arch/powerpc/kernel/cacheinfo.c
+--- linux-2.6.32.22/arch/powerpc/kernel/cacheinfo.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/kernel/cacheinfo.c 2010-09-04 15:54:51.000000000 -0400
@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde
&cache_assoc_attr,
};
@@ -2153,9 +2207,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.21/arch/
.show = cache_index_show,
};
-diff -urNp linux-2.6.32.21/arch/powerpc/kernel/dma.c linux-2.6.32.21/arch/powerpc/kernel/dma.c
---- linux-2.6.32.21/arch/powerpc/kernel/dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/dma.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/kernel/dma.c linux-2.6.32.22/arch/powerpc/kernel/dma.c
+--- linux-2.6.32.22/arch/powerpc/kernel/dma.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/kernel/dma.c 2010-09-04 15:54:51.000000000 -0400
@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl
}
#endif
@@ -2165,9 +2219,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/dma.c linux-2.6.32.21/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.21/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.21/arch/powerpc/kernel/dma-iommu.c
---- linux-2.6.32.21/arch/powerpc/kernel/dma-iommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/dma-iommu.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.22/arch/powerpc/kernel/dma-iommu.c
+--- linux-2.6.32.22/arch/powerpc/kernel/dma-iommu.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/kernel/dma-iommu.c 2010-09-04 15:54:51.000000000 -0400
@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
}
@@ -2177,9 +2231,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.21/arch/
{
struct iommu_table *tbl = get_iommu_table_base(dev);
-diff -urNp linux-2.6.32.21/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.21/arch/powerpc/kernel/dma-swiotlb.c
---- linux-2.6.32.21/arch/powerpc/kernel/dma-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/dma-swiotlb.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.22/arch/powerpc/kernel/dma-swiotlb.c
+--- linux-2.6.32.22/arch/powerpc/kernel/dma-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/kernel/dma-swiotlb.c 2010-09-04 15:54:51.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.
@@ -2189,9 +2243,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.21/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.21/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.21/arch/powerpc/kernel/exceptions-64e.S
---- linux-2.6.32.21/arch/powerpc/kernel/exceptions-64e.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/exceptions-64e.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.22/arch/powerpc/kernel/exceptions-64e.S
+--- linux-2.6.32.22/arch/powerpc/kernel/exceptions-64e.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/kernel/exceptions-64e.S 2010-09-04 15:54:51.000000000 -0400
@@ -455,6 +455,7 @@ storage_fault_common:
std r14,_DAR(r1)
std r15,_DSISR(r1)
@@ -2210,9 +2264,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.21/
addi r3,r1,STACK_FRAME_OVERHEAD
ld r4,_DAR(r1)
bl .bad_page_fault
-diff -urNp linux-2.6.32.21/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.21/arch/powerpc/kernel/exceptions-64s.S
---- linux-2.6.32.21/arch/powerpc/kernel/exceptions-64s.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/exceptions-64s.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.22/arch/powerpc/kernel/exceptions-64s.S
+--- linux-2.6.32.22/arch/powerpc/kernel/exceptions-64s.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/kernel/exceptions-64s.S 2010-09-04 15:54:51.000000000 -0400
@@ -818,10 +818,10 @@ handle_page_fault:
11: ld r4,_DAR(r1)
ld r5,_DSISR(r1)
@@ -2225,9 +2279,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.21/
mr r5,r3
addi r3,r1,STACK_FRAME_OVERHEAD
lwz r4,_DAR(r1)
-diff -urNp linux-2.6.32.21/arch/powerpc/kernel/ibmebus.c linux-2.6.32.21/arch/powerpc/kernel/ibmebus.c
---- linux-2.6.32.21/arch/powerpc/kernel/ibmebus.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/ibmebus.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/kernel/ibmebus.c linux-2.6.32.22/arch/powerpc/kernel/ibmebus.c
+--- linux-2.6.32.22/arch/powerpc/kernel/ibmebus.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/kernel/ibmebus.c 2010-09-04 15:54:51.000000000 -0400
@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct
return 1;
}
@@ -2237,9 +2291,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/ibmebus.c linux-2.6.32.21/arch/po
.alloc_coherent = ibmebus_alloc_coherent,
.free_coherent = ibmebus_free_coherent,
.map_sg = ibmebus_map_sg,
-diff -urNp linux-2.6.32.21/arch/powerpc/kernel/kgdb.c linux-2.6.32.21/arch/powerpc/kernel/kgdb.c
---- linux-2.6.32.21/arch/powerpc/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/kernel/kgdb.c linux-2.6.32.22/arch/powerpc/kernel/kgdb.c
+--- linux-2.6.32.22/arch/powerpc/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400
@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct
if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0)
return 0;
@@ -2258,9 +2312,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/kgdb.c linux-2.6.32.21/arch/power
.gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
};
-diff -urNp linux-2.6.32.21/arch/powerpc/kernel/module_32.c linux-2.6.32.21/arch/powerpc/kernel/module_32.c
---- linux-2.6.32.21/arch/powerpc/kernel/module_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/module_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/kernel/module_32.c linux-2.6.32.22/arch/powerpc/kernel/module_32.c
+--- linux-2.6.32.22/arch/powerpc/kernel/module_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/kernel/module_32.c 2010-09-04 15:54:51.000000000 -0400
@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
me->arch.core_plt_section = i;
}
@@ -2290,9 +2344,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/module_32.c linux-2.6.32.21/arch/
/* Find this entry, or if that fails, the next avail. entry */
while (entry->jump[0]) {
-diff -urNp linux-2.6.32.21/arch/powerpc/kernel/module.c linux-2.6.32.21/arch/powerpc/kernel/module.c
---- linux-2.6.32.21/arch/powerpc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/module.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/kernel/module.c linux-2.6.32.22/arch/powerpc/kernel/module.c
+--- linux-2.6.32.22/arch/powerpc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/kernel/module.c 2010-09-04 15:54:51.000000000 -0400
@@ -31,11 +31,24 @@
LIST_HEAD(module_bug_list);
@@ -2332,9 +2386,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/module.c linux-2.6.32.21/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.21/arch/powerpc/kernel/pci-common.c linux-2.6.32.21/arch/powerpc/kernel/pci-common.c
---- linux-2.6.32.21/arch/powerpc/kernel/pci-common.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/pci-common.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/kernel/pci-common.c linux-2.6.32.22/arch/powerpc/kernel/pci-common.c
+--- linux-2.6.32.22/arch/powerpc/kernel/pci-common.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/kernel/pci-common.c 2010-09-04 15:54:51.000000000 -0400
@@ -50,14 +50,14 @@ resource_size_t isa_mem_base;
unsigned int ppc_pci_flags = 0;
@@ -2353,9 +2407,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/pci-common.c linux-2.6.32.21/arch
{
return pci_dma_ops;
}
-diff -urNp linux-2.6.32.21/arch/powerpc/kernel/process.c linux-2.6.32.21/arch/powerpc/kernel/process.c
---- linux-2.6.32.21/arch/powerpc/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/process.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/kernel/process.c linux-2.6.32.22/arch/powerpc/kernel/process.c
+--- linux-2.6.32.22/arch/powerpc/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/kernel/process.c 2010-09-04 15:54:51.000000000 -0400
@@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned
sp -= get_random_int() & ~PAGE_MASK;
return sp & ~0xf;
@@ -2408,9 +2462,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/process.c linux-2.6.32.21/arch/po
-
- return ret;
-}
-diff -urNp linux-2.6.32.21/arch/powerpc/kernel/signal_32.c linux-2.6.32.21/arch/powerpc/kernel/signal_32.c
---- linux-2.6.32.21/arch/powerpc/kernel/signal_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/signal_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/kernel/signal_32.c linux-2.6.32.22/arch/powerpc/kernel/signal_32.c
+--- linux-2.6.32.22/arch/powerpc/kernel/signal_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/kernel/signal_32.c 2010-09-04 15:54:51.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;
@@ -2420,9 +2474,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/signal_32.c linux-2.6.32.21/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.21/arch/powerpc/kernel/signal_64.c linux-2.6.32.21/arch/powerpc/kernel/signal_64.c
---- linux-2.6.32.21/arch/powerpc/kernel/signal_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/signal_64.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/kernel/signal_64.c linux-2.6.32.22/arch/powerpc/kernel/signal_64.c
+--- linux-2.6.32.22/arch/powerpc/kernel/signal_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/kernel/signal_64.c 2010-09-04 15:54:51.000000000 -0400
@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
current->thread.fpscr.val = 0;
@@ -2432,9 +2486,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/signal_64.c linux-2.6.32.21/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.21/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.21/arch/powerpc/kernel/sys_ppc32.c
---- linux-2.6.32.21/arch/powerpc/kernel/sys_ppc32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/sys_ppc32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.22/arch/powerpc/kernel/sys_ppc32.c
+--- linux-2.6.32.22/arch/powerpc/kernel/sys_ppc32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/kernel/sys_ppc32.c 2010-09-04 15:54:51.000000000 -0400
@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct
if (oldlenp) {
if (!error) {
@@ -2448,9 +2502,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.21/arch/
}
return error;
}
-diff -urNp linux-2.6.32.21/arch/powerpc/kernel/vdso.c linux-2.6.32.21/arch/powerpc/kernel/vdso.c
---- linux-2.6.32.21/arch/powerpc/kernel/vdso.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/vdso.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/kernel/vdso.c linux-2.6.32.22/arch/powerpc/kernel/vdso.c
+--- linux-2.6.32.22/arch/powerpc/kernel/vdso.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/kernel/vdso.c 2010-09-04 15:54:51.000000000 -0400
@@ -36,6 +36,7 @@
#include <asm/firmware.h>
#include <asm/vdso.h>
@@ -2477,9 +2531,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/vdso.c linux-2.6.32.21/arch/power
if (IS_ERR_VALUE(vdso_base)) {
rc = vdso_base;
goto fail_mmapsem;
-diff -urNp linux-2.6.32.21/arch/powerpc/kernel/vio.c linux-2.6.32.21/arch/powerpc/kernel/vio.c
---- linux-2.6.32.21/arch/powerpc/kernel/vio.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/vio.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/kernel/vio.c linux-2.6.32.22/arch/powerpc/kernel/vio.c
+--- linux-2.6.32.22/arch/powerpc/kernel/vio.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/kernel/vio.c 2010-09-04 15:54:51.000000000 -0400
@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc
vio_cmo_dealloc(viodev, alloc_size);
}
@@ -2502,9 +2556,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/vio.c linux-2.6.32.21/arch/powerp
viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
}
-diff -urNp linux-2.6.32.21/arch/powerpc/lib/usercopy_64.c linux-2.6.32.21/arch/powerpc/lib/usercopy_64.c
---- linux-2.6.32.21/arch/powerpc/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/lib/usercopy_64.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/lib/usercopy_64.c linux-2.6.32.22/arch/powerpc/lib/usercopy_64.c
+--- linux-2.6.32.22/arch/powerpc/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/lib/usercopy_64.c 2010-09-04 15:54:51.000000000 -0400
@@ -9,22 +9,6 @@
#include <linux/module.h>
#include <asm/uaccess.h>
@@ -2536,9 +2590,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/lib/usercopy_64.c linux-2.6.32.21/arch/p
-EXPORT_SYMBOL(copy_to_user);
EXPORT_SYMBOL(copy_in_user);
-diff -urNp linux-2.6.32.21/arch/powerpc/mm/fault.c linux-2.6.32.21/arch/powerpc/mm/fault.c
---- linux-2.6.32.21/arch/powerpc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/mm/fault.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/mm/fault.c linux-2.6.32.22/arch/powerpc/mm/fault.c
+--- linux-2.6.32.22/arch/powerpc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/mm/fault.c 2010-09-04 15:54:51.000000000 -0400
@@ -30,6 +30,10 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
@@ -2643,9 +2697,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/mm/fault.c linux-2.6.32.21/arch/powerpc/
_exception(SIGSEGV, regs, code, address);
return 0;
}
-diff -urNp linux-2.6.32.21/arch/powerpc/mm/mmap_64.c linux-2.6.32.21/arch/powerpc/mm/mmap_64.c
---- linux-2.6.32.21/arch/powerpc/mm/mmap_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/mm/mmap_64.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/mm/mmap_64.c linux-2.6.32.22/arch/powerpc/mm/mmap_64.c
+--- linux-2.6.32.22/arch/powerpc/mm/mmap_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/mm/mmap_64.c 2010-09-04 15:54:51.000000000 -0400
@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
@@ -2669,10 +2723,40 @@ diff -urNp linux-2.6.32.21/arch/powerpc/mm/mmap_64.c linux-2.6.32.21/arch/powerp
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-2.6.32.21/arch/powerpc/mm/slice.c linux-2.6.32.21/arch/powerpc/mm/slice.c
---- linux-2.6.32.21/arch/powerpc/mm/slice.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/mm/slice.c 2010-09-04 15:54:51.000000000 -0400
-@@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un
+diff -urNp linux-2.6.32.22/arch/powerpc/mm/slice.c linux-2.6.32.22/arch/powerpc/mm/slice.c
+--- linux-2.6.32.22/arch/powerpc/mm/slice.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/mm/slice.c 2010-09-17 18:34:04.000000000 -0400
+@@ -98,10 +98,9 @@ static int slice_area_is_free(struct mm_
+ if ((mm->task_size - len) < addr)
+ return 0;
+ vma = find_vma(mm, addr);
+- return (!vma || (addr + len) <= vma->vm_start);
++ return check_heap_stack_gap(vma, addr, len);
+ }
+
+-static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
+ {
+ return !slice_area_is_free(mm, slice << SLICE_LOW_SHIFT,
+ 1ul << SLICE_LOW_SHIFT);
+@@ -256,7 +255,7 @@ full_search:
+ addr = _ALIGN_UP(addr + 1, 1ul << SLICE_HIGH_SHIFT);
+ continue;
+ }
+- if (!vma || addr + len <= vma->vm_start) {
++ if (check_heap_stack_gap(vma, addr, len)) {
+ /*
+ * Remember the place where we stopped the search:
+ */
+@@ -336,7 +335,7 @@ static unsigned long slice_find_area_top
+ * return with success:
+ */
+ vma = find_vma(mm, addr);
+- if (!vma || (addr + len) <= vma->vm_start) {
++ if (check_heap_stack_gap(vma, addr, len)) {
+ /* remember the address as a hint for next time */
+ if (use_cache)
+ mm->free_area_cache = addr;
+@@ -426,6 +425,11 @@ unsigned long slice_get_unmapped_area(un
if (fixed && addr > (mm->task_size - len))
return -EINVAL;
@@ -2684,9 +2768,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/mm/slice.c linux-2.6.32.21/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.21/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.21/arch/powerpc/platforms/52xx/lite5200_pm.c
---- linux-2.6.32.21/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.22/arch/powerpc/platforms/52xx/lite5200_pm.c
+--- linux-2.6.32.22/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-09-04 15:54:51.000000000 -0400
@@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
lite5200_pm_target_state = PM_SUSPEND_ON;
}
@@ -2696,9 +2780,9 @@ diff -urNp linux-2.6.32.21/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.21/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.21/arch/powerpc/platforms/52xx/mpc52xx_pm.c
---- linux-2.6.32.21/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.22/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+--- linux-2.6.32.22/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-09-04 15:54:51.000000000 -0400
@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void)
iounmap(mbar);
}
@@ -2708,9 +2792,9 @@ diff -urNp linux-2.6.32.21/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.21/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.21/arch/powerpc/platforms/83xx/suspend.c
---- linux-2.6.32.21/arch/powerpc/platforms/83xx/suspend.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/platforms/83xx/suspend.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.22/arch/powerpc/platforms/83xx/suspend.c
+--- linux-2.6.32.22/arch/powerpc/platforms/83xx/suspend.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/platforms/83xx/suspend.c 2010-09-04 15:54:51.000000000 -0400
@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void)
return ret;
}
@@ -2720,9 +2804,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.21
.valid = mpc83xx_suspend_valid,
.begin = mpc83xx_suspend_begin,
.enter = mpc83xx_suspend_enter,
-diff -urNp linux-2.6.32.21/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.21/arch/powerpc/platforms/cell/iommu.c
---- linux-2.6.32.21/arch/powerpc/platforms/cell/iommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/platforms/cell/iommu.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.22/arch/powerpc/platforms/cell/iommu.c
+--- linux-2.6.32.22/arch/powerpc/platforms/cell/iommu.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/platforms/cell/iommu.c 2010-09-04 15:54:51.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);
@@ -2732,9 +2816,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.21/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.21/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.21/arch/powerpc/platforms/ps3/system-bus.c
---- linux-2.6.32.21/arch/powerpc/platforms/ps3/system-bus.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/platforms/ps3/system-bus.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.22/arch/powerpc/platforms/ps3/system-bus.c
+--- linux-2.6.32.22/arch/powerpc/platforms/ps3/system-bus.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/platforms/ps3/system-bus.c 2010-09-04 15:54:51.000000000 -0400
@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi
return mask >= DMA_BIT_MASK(32);
}
@@ -2753,9 +2837,9 @@ diff -urNp linux-2.6.32.21/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.21/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.21/arch/powerpc/platforms/pseries/Kconfig
---- linux-2.6.32.21/arch/powerpc/platforms/pseries/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/platforms/pseries/Kconfig 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.22/arch/powerpc/platforms/pseries/Kconfig
+--- linux-2.6.32.22/arch/powerpc/platforms/pseries/Kconfig 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/powerpc/platforms/pseries/Kconfig 2010-09-04 15:54:51.000000000 -0400
@@ -2,6 +2,8 @@ config PPC_PSERIES
depends on PPC64 && PPC_BOOK3S
bool "IBM pSeries & new (POWER5-based) iSeries"
@@ -2765,21 +2849,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.2
select PPC_I8259
select PPC_RTAS
select RTAS_ERROR_LOGGING
-diff -urNp linux-2.6.32.21/arch/s390/include/asm/compat.h linux-2.6.32.21/arch/s390/include/asm/compat.h
---- linux-2.6.32.21/arch/s390/include/asm/compat.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/s390/include/asm/compat.h 2010-09-15 02:02:57.000000000 -0400
-@@ -180,7 +180,7 @@ static inline int is_compat_task(void)
-
- #endif
-
--static inline void __user *compat_alloc_user_space(long len)
-+static inline void __user *arch_compat_alloc_user_space(long len)
- {
- unsigned long stack;
-
-diff -urNp linux-2.6.32.21/arch/s390/include/asm/elf.h linux-2.6.32.21/arch/s390/include/asm/elf.h
---- linux-2.6.32.21/arch/s390/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/s390/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/s390/include/asm/elf.h linux-2.6.32.22/arch/s390/include/asm/elf.h
+--- linux-2.6.32.22/arch/s390/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/s390/include/asm/elf.h 2010-09-04 15:54:51.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)
@@ -2794,9 +2866,9 @@ diff -urNp linux-2.6.32.21/arch/s390/include/asm/elf.h linux-2.6.32.21/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.21/arch/s390/include/asm/setup.h linux-2.6.32.21/arch/s390/include/asm/setup.h
---- linux-2.6.32.21/arch/s390/include/asm/setup.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/s390/include/asm/setup.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/s390/include/asm/setup.h linux-2.6.32.22/arch/s390/include/asm/setup.h
+--- linux-2.6.32.22/arch/s390/include/asm/setup.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/s390/include/asm/setup.h 2010-09-04 15:54:51.000000000 -0400
@@ -50,13 +50,13 @@ extern unsigned long memory_end;
void detect_memory_layout(struct mem_chunk chunk[]);
@@ -2813,9 +2885,9 @@ diff -urNp linux-2.6.32.21/arch/s390/include/asm/setup.h linux-2.6.32.21/arch/s3
#else
#define s390_noexec (0)
#endif
-diff -urNp linux-2.6.32.21/arch/s390/include/asm/uaccess.h linux-2.6.32.21/arch/s390/include/asm/uaccess.h
---- linux-2.6.32.21/arch/s390/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/s390/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/s390/include/asm/uaccess.h linux-2.6.32.22/arch/s390/include/asm/uaccess.h
+--- linux-2.6.32.22/arch/s390/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/s390/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400
@@ -232,6 +232,10 @@ static inline unsigned long __must_check
copy_to_user(void __user *to, const void *from, unsigned long n)
{
@@ -2848,9 +2920,9 @@ diff -urNp linux-2.6.32.21/arch/s390/include/asm/uaccess.h linux-2.6.32.21/arch/
if (access_ok(VERIFY_READ, from, n))
n = __copy_from_user(to, from, n);
else
-diff -urNp linux-2.6.32.21/arch/s390/Kconfig linux-2.6.32.21/arch/s390/Kconfig
---- linux-2.6.32.21/arch/s390/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/s390/Kconfig 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/s390/Kconfig linux-2.6.32.22/arch/s390/Kconfig
+--- linux-2.6.32.22/arch/s390/Kconfig 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/s390/Kconfig 2010-09-04 15:54:51.000000000 -0400
@@ -194,28 +194,26 @@ config AUDIT_ARCH
config S390_SWITCH_AMODE
@@ -2888,9 +2960,9 @@ diff -urNp linux-2.6.32.21/arch/s390/Kconfig linux-2.6.32.21/arch/s390/Kconfig
comment "Code generation options"
-diff -urNp linux-2.6.32.21/arch/s390/kernel/module.c linux-2.6.32.21/arch/s390/kernel/module.c
---- linux-2.6.32.21/arch/s390/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/s390/kernel/module.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/s390/kernel/module.c linux-2.6.32.22/arch/s390/kernel/module.c
+--- linux-2.6.32.22/arch/s390/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/s390/kernel/module.c 2010-09-04 15:54:51.000000000 -0400
@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
/* Increase core size by size of got & plt and set start
@@ -2962,9 +3034,9 @@ diff -urNp linux-2.6.32.21/arch/s390/kernel/module.c linux-2.6.32.21/arch/s390/k
rela->r_addend - loc;
if (r_type == R_390_GOTPC)
*(unsigned int *) loc = val;
-diff -urNp linux-2.6.32.21/arch/s390/kernel/setup.c linux-2.6.32.21/arch/s390/kernel/setup.c
---- linux-2.6.32.21/arch/s390/kernel/setup.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/s390/kernel/setup.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/s390/kernel/setup.c linux-2.6.32.22/arch/s390/kernel/setup.c
+--- linux-2.6.32.22/arch/s390/kernel/setup.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/s390/kernel/setup.c 2010-09-04 15:54:51.000000000 -0400
@@ -306,9 +306,6 @@ static int __init early_parse_mem(char *
early_param("mem", early_parse_mem);
@@ -3018,9 +3090,9 @@ diff -urNp linux-2.6.32.21/arch/s390/kernel/setup.c linux-2.6.32.21/arch/s390/ke
static void setup_addressing_mode(void)
{
if (s390_noexec) {
-diff -urNp linux-2.6.32.21/arch/s390/mm/mmap.c linux-2.6.32.21/arch/s390/mm/mmap.c
---- linux-2.6.32.21/arch/s390/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/s390/mm/mmap.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/s390/mm/mmap.c linux-2.6.32.22/arch/s390/mm/mmap.c
+--- linux-2.6.32.22/arch/s390/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/s390/mm/mmap.c 2010-09-04 15:54:51.000000000 -0400
@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
@@ -3067,9 +3139,9 @@ diff -urNp linux-2.6.32.21/arch/s390/mm/mmap.c linux-2.6.32.21/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.21/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.21/arch/sh/boards/mach-hp6xx/pm.c
---- linux-2.6.32.21/arch/sh/boards/mach-hp6xx/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sh/boards/mach-hp6xx/pm.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.22/arch/sh/boards/mach-hp6xx/pm.c
+--- linux-2.6.32.22/arch/sh/boards/mach-hp6xx/pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sh/boards/mach-hp6xx/pm.c 2010-09-04 15:54:51.000000000 -0400
@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
return 0;
}
@@ -3079,9 +3151,9 @@ diff -urNp linux-2.6.32.21/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.21/arch/s
.enter = hp6x0_pm_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.32.21/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.21/arch/sh/kernel/cpu/sh4/sq.c
---- linux-2.6.32.21/arch/sh/kernel/cpu/sh4/sq.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sh/kernel/cpu/sh4/sq.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.22/arch/sh/kernel/cpu/sh4/sq.c
+--- linux-2.6.32.22/arch/sh/kernel/cpu/sh4/sq.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sh/kernel/cpu/sh4/sq.c 2010-09-04 15:54:51.000000000 -0400
@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[
NULL,
};
@@ -3091,9 +3163,9 @@ diff -urNp linux-2.6.32.21/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.21/arch/sh/k
.show = sq_sysfs_show,
.store = sq_sysfs_store,
};
-diff -urNp linux-2.6.32.21/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.21/arch/sh/kernel/cpu/shmobile/pm.c
---- linux-2.6.32.21/arch/sh/kernel/cpu/shmobile/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sh/kernel/cpu/shmobile/pm.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.22/arch/sh/kernel/cpu/shmobile/pm.c
+--- linux-2.6.32.22/arch/sh/kernel/cpu/shmobile/pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sh/kernel/cpu/shmobile/pm.c 2010-09-04 15:54:51.000000000 -0400
@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s
return 0;
}
@@ -3103,9 +3175,9 @@ diff -urNp linux-2.6.32.21/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.21/arch
.enter = sh_pm_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.32.21/arch/sh/kernel/kgdb.c linux-2.6.32.21/arch/sh/kernel/kgdb.c
---- linux-2.6.32.21/arch/sh/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sh/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sh/kernel/kgdb.c linux-2.6.32.22/arch/sh/kernel/kgdb.c
+--- linux-2.6.32.22/arch/sh/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sh/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400
@@ -271,7 +271,7 @@ void kgdb_arch_exit(void)
{
}
@@ -3115,9 +3187,59 @@ diff -urNp linux-2.6.32.21/arch/sh/kernel/kgdb.c linux-2.6.32.21/arch/sh/kernel/
/* Breakpoint instruction: trapa #0x3c */
#ifdef CONFIG_CPU_LITTLE_ENDIAN
.gdb_bpt_instr = { 0x3c, 0xc3 },
-diff -urNp linux-2.6.32.21/arch/sparc/include/asm/atomic_64.h linux-2.6.32.21/arch/sparc/include/asm/atomic_64.h
---- linux-2.6.32.21/arch/sparc/include/asm/atomic_64.h 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/include/asm/atomic_64.h 2010-09-15 02:34:10.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sh/mm/mmap.c linux-2.6.32.22/arch/sh/mm/mmap.c
+--- linux-2.6.32.22/arch/sh/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sh/mm/mmap.c 2010-09-17 18:34:04.000000000 -0400
+@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
+ addr = PAGE_ALIGN(addr);
+
+ vma = find_vma(mm, addr);
+- if (TASK_SIZE - len >= addr &&
+- (!vma || addr + len <= vma->vm_start))
++ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
+ return addr;
+ }
+
+@@ -106,7 +105,7 @@ full_search:
+ }
+ return -ENOMEM;
+ }
+- if (likely(!vma || addr + len <= vma->vm_start)) {
++ if (likely(check_heap_stack_gap(vma, addr, len))) {
+ /*
+ * Remember the place where we stopped the search:
+ */
+@@ -157,8 +156,7 @@ arch_get_unmapped_area_topdown(struct fi
+ addr = PAGE_ALIGN(addr);
+
+ vma = find_vma(mm, addr);
+- if (TASK_SIZE - len >= addr &&
+- (!vma || addr + len <= vma->vm_start))
++ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
+ return addr;
+ }
+
+@@ -179,7 +177,7 @@ arch_get_unmapped_area_topdown(struct fi
+ /* make sure it can fit in the remaining address space */
+ if (likely(addr > len)) {
+ vma = find_vma(mm, addr-len);
+- if (!vma || addr <= vma->vm_start) {
++ if (check_heap_stack_gap(vma, addr - len, len)) {
+ /* remember the address as a hint for next time */
+ return (mm->free_area_cache = addr-len);
+ }
+@@ -199,7 +197,7 @@ arch_get_unmapped_area_topdown(struct fi
+ * return with success:
+ */
+ vma = find_vma(mm, addr);
+- if (likely(!vma || addr+len <= vma->vm_start)) {
++ if (likely(check_heap_stack_gap(vma, addr, len))) {
+ /* remember the address as a hint for next time */
+ return (mm->free_area_cache = addr);
+ }
+diff -urNp linux-2.6.32.22/arch/sparc/include/asm/atomic_64.h linux-2.6.32.22/arch/sparc/include/asm/atomic_64.h
+--- linux-2.6.32.22/arch/sparc/include/asm/atomic_64.h 2010-08-29 21:08:20.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/include/asm/atomic_64.h 2010-09-15 02:34:10.000000000 -0400
@@ -14,18 +14,40 @@
#define ATOMIC64_INIT(i) { (i) }
@@ -3268,21 +3390,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/include/asm/atomic_64.h linux-2.6.32.21/ar
}
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-2.6.32.21/arch/sparc/include/asm/compat.h linux-2.6.32.21/arch/sparc/include/asm/compat.h
---- linux-2.6.32.21/arch/sparc/include/asm/compat.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/include/asm/compat.h 2010-09-15 02:02:57.000000000 -0400
-@@ -166,7 +166,7 @@ static inline compat_uptr_t ptr_to_compa
- return (u32)(unsigned long)uptr;
- }
-
--static inline void __user *compat_alloc_user_space(long len)
-+static inline void __user *arch_compat_alloc_user_space(long len)
- {
- struct pt_regs *regs = current_thread_info()->kregs;
- unsigned long usp = regs->u_regs[UREG_I6];
-diff -urNp linux-2.6.32.21/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.21/arch/sparc/include/asm/dma-mapping.h
---- linux-2.6.32.21/arch/sparc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/include/asm/dma-mapping.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.22/arch/sparc/include/asm/dma-mapping.h
+--- linux-2.6.32.22/arch/sparc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/include/asm/dma-mapping.h 2010-09-04 15:54:51.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)
@@ -3314,9 +3424,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.21/
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.21/arch/sparc/include/asm/elf_32.h linux-2.6.32.21/arch/sparc/include/asm/elf_32.h
---- linux-2.6.32.21/arch/sparc/include/asm/elf_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/include/asm/elf_32.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/include/asm/elf_32.h linux-2.6.32.22/arch/sparc/include/asm/elf_32.h
+--- linux-2.6.32.22/arch/sparc/include/asm/elf_32.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/include/asm/elf_32.h 2010-09-04 15:54:51.000000000 -0400
@@ -116,6 +116,13 @@ typedef struct {
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
@@ -3331,9 +3441,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/include/asm/elf_32.h linux-2.6.32.21/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.21/arch/sparc/include/asm/elf_64.h linux-2.6.32.21/arch/sparc/include/asm/elf_64.h
---- linux-2.6.32.21/arch/sparc/include/asm/elf_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/include/asm/elf_64.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/include/asm/elf_64.h linux-2.6.32.22/arch/sparc/include/asm/elf_64.h
+--- linux-2.6.32.22/arch/sparc/include/asm/elf_64.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/include/asm/elf_64.h 2010-09-04 15:54:51.000000000 -0400
@@ -163,6 +163,12 @@ typedef struct {
#define ELF_ET_DYN_BASE 0x0000010000000000UL
#define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
@@ -3347,9 +3457,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/include/asm/elf_64.h linux-2.6.32.21/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.21/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.21/arch/sparc/include/asm/pgtable_32.h
---- linux-2.6.32.21/arch/sparc/include/asm/pgtable_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/include/asm/pgtable_32.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.22/arch/sparc/include/asm/pgtable_32.h
+--- linux-2.6.32.22/arch/sparc/include/asm/pgtable_32.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/include/asm/pgtable_32.h 2010-09-04 15:54:51.000000000 -0400
@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
BTFIXUPDEF_INT(page_none)
BTFIXUPDEF_INT(page_copy)
@@ -3381,9 +3491,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.21/a
extern unsigned long page_kernel;
#ifdef MODULE
-diff -urNp linux-2.6.32.21/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.21/arch/sparc/include/asm/pgtsrmmu.h
---- linux-2.6.32.21/arch/sparc/include/asm/pgtsrmmu.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/include/asm/pgtsrmmu.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.22/arch/sparc/include/asm/pgtsrmmu.h
+--- linux-2.6.32.22/arch/sparc/include/asm/pgtsrmmu.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/include/asm/pgtsrmmu.h 2010-09-04 15:54:51.000000000 -0400
@@ -115,6 +115,13 @@
SRMMU_EXEC | SRMMU_REF)
#define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -3398,9 +3508,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.21/arc
#define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
SRMMU_DIRTY | SRMMU_REF)
-diff -urNp linux-2.6.32.21/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.21/arch/sparc/include/asm/spinlock_64.h
---- linux-2.6.32.21/arch/sparc/include/asm/spinlock_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/include/asm/spinlock_64.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.22/arch/sparc/include/asm/spinlock_64.h
+--- linux-2.6.32.22/arch/sparc/include/asm/spinlock_64.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/include/asm/spinlock_64.h 2010-09-04 15:54:51.000000000 -0400
@@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw
__asm__ __volatile__ (
"1: ldsw [%2], %0\n"
@@ -3452,9 +3562,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.21/
" cas [%2], %0, %1\n"
" cmp %0, %1\n"
" bne,pn %%xcc, 1b\n"
-diff -urNp linux-2.6.32.21/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.21/arch/sparc/include/asm/uaccess_32.h
---- linux-2.6.32.21/arch/sparc/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/include/asm/uaccess_32.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.22/arch/sparc/include/asm/uaccess_32.h
+--- linux-2.6.32.22/arch/sparc/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/include/asm/uaccess_32.h 2010-09-04 15:54:51.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)
@@ -3506,9 +3616,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.21/a
return __copy_user((__force void __user *) to, from, n);
}
-diff -urNp linux-2.6.32.21/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.21/arch/sparc/include/asm/uaccess_64.h
---- linux-2.6.32.21/arch/sparc/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/include/asm/uaccess_64.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.22/arch/sparc/include/asm/uaccess_64.h
+--- linux-2.6.32.22/arch/sparc/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/include/asm/uaccess_64.h 2010-09-04 15:54:51.000000000 -0400
@@ -9,6 +9,7 @@
#include <linux/compiler.h>
#include <linux/string.h>
@@ -3551,9 +3661,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.21/a
if (unlikely(ret))
ret = copy_to_user_fixup(to, from, size);
return ret;
-diff -urNp linux-2.6.32.21/arch/sparc/include/asm/uaccess.h linux-2.6.32.21/arch/sparc/include/asm/uaccess.h
---- linux-2.6.32.21/arch/sparc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/include/asm/uaccess.h linux-2.6.32.22/arch/sparc/include/asm/uaccess.h
+--- linux-2.6.32.22/arch/sparc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400
@@ -1,5 +1,13 @@
#ifndef ___ASM_SPARC_UACCESS_H
#define ___ASM_SPARC_UACCESS_H
@@ -3568,9 +3678,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/include/asm/uaccess.h linux-2.6.32.21/arch
#if defined(__sparc__) && defined(__arch64__)
#include <asm/uaccess_64.h>
#else
-diff -urNp linux-2.6.32.21/arch/sparc/kernel/iommu.c linux-2.6.32.21/arch/sparc/kernel/iommu.c
---- linux-2.6.32.21/arch/sparc/kernel/iommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/kernel/iommu.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/kernel/iommu.c linux-2.6.32.22/arch/sparc/kernel/iommu.c
+--- linux-2.6.32.22/arch/sparc/kernel/iommu.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/kernel/iommu.c 2010-09-04 15:54:51.000000000 -0400
@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc
spin_unlock_irqrestore(&iommu->lock, flags);
}
@@ -3589,9 +3699,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/kernel/iommu.c linux-2.6.32.21/arch/sparc/
EXPORT_SYMBOL(dma_ops);
extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
-diff -urNp linux-2.6.32.21/arch/sparc/kernel/ioport.c linux-2.6.32.21/arch/sparc/kernel/ioport.c
---- linux-2.6.32.21/arch/sparc/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/kernel/ioport.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/kernel/ioport.c linux-2.6.32.22/arch/sparc/kernel/ioport.c
+--- linux-2.6.32.22/arch/sparc/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/kernel/ioport.c 2010-09-04 15:54:51.000000000 -0400
@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru
BUG();
}
@@ -3619,9 +3729,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/kernel/ioport.c linux-2.6.32.21/arch/sparc
.alloc_coherent = pci32_alloc_coherent,
.free_coherent = pci32_free_coherent,
.map_page = pci32_map_page,
-diff -urNp linux-2.6.32.21/arch/sparc/kernel/kgdb_32.c linux-2.6.32.21/arch/sparc/kernel/kgdb_32.c
---- linux-2.6.32.21/arch/sparc/kernel/kgdb_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/kernel/kgdb_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/kernel/kgdb_32.c linux-2.6.32.22/arch/sparc/kernel/kgdb_32.c
+--- linux-2.6.32.22/arch/sparc/kernel/kgdb_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/kernel/kgdb_32.c 2010-09-04 15:54:51.000000000 -0400
@@ -158,7 +158,7 @@ void kgdb_arch_exit(void)
{
}
@@ -3631,9 +3741,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/kernel/kgdb_32.c linux-2.6.32.21/arch/spar
/* Breakpoint instruction: ta 0x7d */
.gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d },
};
-diff -urNp linux-2.6.32.21/arch/sparc/kernel/kgdb_64.c linux-2.6.32.21/arch/sparc/kernel/kgdb_64.c
---- linux-2.6.32.21/arch/sparc/kernel/kgdb_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/kernel/kgdb_64.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/kernel/kgdb_64.c linux-2.6.32.22/arch/sparc/kernel/kgdb_64.c
+--- linux-2.6.32.22/arch/sparc/kernel/kgdb_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/kernel/kgdb_64.c 2010-09-04 15:54:51.000000000 -0400
@@ -180,7 +180,7 @@ void kgdb_arch_exit(void)
{
}
@@ -3643,9 +3753,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/kernel/kgdb_64.c linux-2.6.32.21/arch/spar
/* Breakpoint instruction: ta 0x72 */
.gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 },
};
-diff -urNp linux-2.6.32.21/arch/sparc/kernel/Makefile linux-2.6.32.21/arch/sparc/kernel/Makefile
---- linux-2.6.32.21/arch/sparc/kernel/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/kernel/Makefile 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/kernel/Makefile linux-2.6.32.22/arch/sparc/kernel/Makefile
+--- linux-2.6.32.22/arch/sparc/kernel/Makefile 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/kernel/Makefile 2010-09-04 15:54:51.000000000 -0400
@@ -3,7 +3,7 @@
#
@@ -3655,9 +3765,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/kernel/Makefile linux-2.6.32.21/arch/sparc
extra-y := head_$(BITS).o
extra-y += init_task.o
-diff -urNp linux-2.6.32.21/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.21/arch/sparc/kernel/pci_sun4v.c
---- linux-2.6.32.21/arch/sparc/kernel/pci_sun4v.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/kernel/pci_sun4v.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.22/arch/sparc/kernel/pci_sun4v.c
+--- linux-2.6.32.22/arch/sparc/kernel/pci_sun4v.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/kernel/pci_sun4v.c 2010-09-04 15:54:51.000000000 -0400
@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
spin_unlock_irqrestore(&iommu->lock, flags);
}
@@ -3667,9 +3777,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.21/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.21/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.21/arch/sparc/kernel/sys_sparc_32.c
---- linux-2.6.32.21/arch/sparc/kernel/sys_sparc_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/kernel/sys_sparc_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.22/arch/sparc/kernel/sys_sparc_32.c
+--- linux-2.6.32.22/arch/sparc/kernel/sys_sparc_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/kernel/sys_sparc_32.c 2010-09-17 18:34:04.000000000 -0400
@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
if (ARCH_SUN4C && len > 0x20000000)
return -ENOMEM;
@@ -3679,9 +3789,18 @@ diff -urNp linux-2.6.32.21/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.21/arch
if (flags & MAP_SHARED)
addr = COLOUR_ALIGN(addr);
-diff -urNp linux-2.6.32.21/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.21/arch/sparc/kernel/sys_sparc_64.c
---- linux-2.6.32.21/arch/sparc/kernel/sys_sparc_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/kernel/sys_sparc_64.c 2010-09-04 15:54:51.000000000 -0400
+@@ -72,7 +72,7 @@ unsigned long arch_get_unmapped_area(str
+ }
+ if (TASK_SIZE - PAGE_SIZE - len < addr)
+ return -ENOMEM;
+- if (!vmm || addr + len <= vmm->vm_start)
++ if (check_heap_stack_gap(vmm, addr, len))
+ return addr;
+ addr = vmm->vm_end;
+ if (flags & MAP_SHARED)
+diff -urNp linux-2.6.32.22/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.22/arch/sparc/kernel/sys_sparc_64.c
+--- linux-2.6.32.22/arch/sparc/kernel/sys_sparc_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/kernel/sys_sparc_64.c 2010-09-17 18:34:04.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.
@@ -3702,7 +3821,14 @@ diff -urNp linux-2.6.32.21/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.21/arch
if (addr) {
if (do_color_align)
addr = COLOUR_ALIGN(addr, pgoff);
-@@ -153,9 +157,9 @@ unsigned long arch_get_unmapped_area(str
+@@ -147,15 +151,14 @@ unsigned long arch_get_unmapped_area(str
+ addr = PAGE_ALIGN(addr);
+
+ vma = find_vma(mm, addr);
+- if (task_size - len >= addr &&
+- (!vma || addr + len <= vma->vm_start))
++ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
+ return addr;
}
if (len > mm->cached_hole_size) {
@@ -3714,7 +3840,7 @@ diff -urNp linux-2.6.32.21/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.21/arch
mm->cached_hole_size = 0;
}
-@@ -175,8 +179,8 @@ full_search:
+@@ -175,14 +178,14 @@ full_search:
vma = find_vma(mm, VA_EXCLUDE_END);
}
if (unlikely(task_size < addr)) {
@@ -3725,7 +3851,14 @@ diff -urNp linux-2.6.32.21/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.21/arch
mm->cached_hole_size = 0;
goto full_search;
}
-@@ -216,7 +220,7 @@ arch_get_unmapped_area_topdown(struct fi
+ return -ENOMEM;
+ }
+- if (likely(!vma || addr + len <= vma->vm_start)) {
++ if (likely(check_heap_stack_gap(vma, addr, len))) {
+ /*
+ * Remember the place where we stopped the search:
+ */
+@@ -216,7 +219,7 @@ arch_get_unmapped_area_topdown(struct fi
/* We do not accept a shared mapping if it would violate
* cache aliasing constraints.
*/
@@ -3734,7 +3867,35 @@ diff -urNp linux-2.6.32.21/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.21/arch
((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
return -EINVAL;
return addr;
-@@ -384,6 +388,12 @@ void arch_pick_mmap_layout(struct mm_str
+@@ -237,8 +240,7 @@ arch_get_unmapped_area_topdown(struct fi
+ addr = PAGE_ALIGN(addr);
+
+ vma = find_vma(mm, addr);
+- if (task_size - len >= addr &&
+- (!vma || addr + len <= vma->vm_start))
++ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
+ return addr;
+ }
+
+@@ -259,7 +261,7 @@ arch_get_unmapped_area_topdown(struct fi
+ /* make sure it can fit in the remaining address space */
+ if (likely(addr > len)) {
+ vma = find_vma(mm, addr-len);
+- if (!vma || addr <= vma->vm_start) {
++ if (check_heap_stack_gap(vma, addr - len, len)) {
+ /* remember the address as a hint for next time */
+ return (mm->free_area_cache = addr-len);
+ }
+@@ -279,7 +281,7 @@ arch_get_unmapped_area_topdown(struct fi
+ * return with success:
+ */
+ vma = find_vma(mm, addr);
+- if (likely(!vma || addr+len <= vma->vm_start)) {
++ if (likely(check_heap_stack_gap(vma, addr, len))) {
+ /* remember the address as a hint for next time */
+ return (mm->free_area_cache = addr);
+ }
+@@ -384,6 +386,12 @@ void arch_pick_mmap_layout(struct mm_str
current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY ||
sysctl_legacy_va_layout) {
mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
@@ -3747,7 +3908,7 @@ diff -urNp linux-2.6.32.21/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.21/arch
mm->get_unmapped_area = arch_get_unmapped_area;
mm->unmap_area = arch_unmap_area;
} else {
-@@ -398,6 +408,12 @@ void arch_pick_mmap_layout(struct mm_str
+@@ -398,6 +406,12 @@ void arch_pick_mmap_layout(struct mm_str
gap = (task_size / 6 * 5);
mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
@@ -3760,9 +3921,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.21/arch
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-2.6.32.21/arch/sparc/kernel/traps_64.c linux-2.6.32.21/arch/sparc/kernel/traps_64.c
---- linux-2.6.32.21/arch/sparc/kernel/traps_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/kernel/traps_64.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/kernel/traps_64.c linux-2.6.32.22/arch/sparc/kernel/traps_64.c
+--- linux-2.6.32.22/arch/sparc/kernel/traps_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/kernel/traps_64.c 2010-09-04 15:54:51.000000000 -0400
@@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long
lvl -= 0x100;
@@ -3794,9 +3955,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/kernel/traps_64.c linux-2.6.32.21/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.21/arch/sparc/lib/atomic_64.S linux-2.6.32.21/arch/sparc/lib/atomic_64.S
---- linux-2.6.32.21/arch/sparc/lib/atomic_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/lib/atomic_64.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/lib/atomic_64.S linux-2.6.32.22/arch/sparc/lib/atomic_64.S
+--- linux-2.6.32.22/arch/sparc/lib/atomic_64.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/lib/atomic_64.S 2010-09-04 15:54:51.000000000 -0400
@@ -18,7 +18,12 @@
atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
BACKOFF_SETUP(%o2)
@@ -4031,10 +4192,10 @@ diff -urNp linux-2.6.32.21/arch/sparc/lib/atomic_64.S linux-2.6.32.21/arch/sparc
casx [%o1], %g1, %g7
cmp %g1, %g7
bne,pn %xcc, 2f
-diff -urNp linux-2.6.32.21/arch/sparc/lib/ksyms.c linux-2.6.32.21/arch/sparc/lib/ksyms.c
---- linux-2.6.32.21/arch/sparc/lib/ksyms.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/lib/ksyms.c 2010-09-04 15:54:51.000000000 -0400
-@@ -144,12 +144,15 @@ EXPORT_SYMBOL(__downgrade_write);
+diff -urNp linux-2.6.32.22/arch/sparc/lib/ksyms.c linux-2.6.32.22/arch/sparc/lib/ksyms.c
+--- linux-2.6.32.22/arch/sparc/lib/ksyms.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/lib/ksyms.c 2010-09-17 17:45:39.000000000 -0400
+@@ -144,12 +144,17 @@ EXPORT_SYMBOL(__downgrade_write);
/* Atomic counter implementation. */
EXPORT_SYMBOL(atomic_add);
@@ -4044,15 +4205,17 @@ diff -urNp linux-2.6.32.21/arch/sparc/lib/ksyms.c linux-2.6.32.21/arch/sparc/lib
+EXPORT_SYMBOL(atomic_sub_unchecked);
EXPORT_SYMBOL(atomic_sub_ret);
EXPORT_SYMBOL(atomic64_add);
++EXPORT_SYMBOL(atomic64_add_unchecked);
EXPORT_SYMBOL(atomic64_add_ret);
++EXPORT_SYMBOL(atomic64_add_ret_unchecked);
EXPORT_SYMBOL(atomic64_sub);
+EXPORT_SYMBOL(atomic64_sub_unchecked);
EXPORT_SYMBOL(atomic64_sub_ret);
/* Atomic bit operations. */
-diff -urNp linux-2.6.32.21/arch/sparc/lib/rwsem_64.S linux-2.6.32.21/arch/sparc/lib/rwsem_64.S
---- linux-2.6.32.21/arch/sparc/lib/rwsem_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/lib/rwsem_64.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/lib/rwsem_64.S linux-2.6.32.22/arch/sparc/lib/rwsem_64.S
+--- linux-2.6.32.22/arch/sparc/lib/rwsem_64.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/lib/rwsem_64.S 2010-09-04 15:54:51.000000000 -0400
@@ -11,7 +11,12 @@
.globl __down_read
__down_read:
@@ -4151,9 +4314,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/lib/rwsem_64.S linux-2.6.32.21/arch/sparc/
cas [%o0], %g3, %g7
cmp %g3, %g7
bne,pn %icc, 1b
-diff -urNp linux-2.6.32.21/arch/sparc/Makefile linux-2.6.32.21/arch/sparc/Makefile
---- linux-2.6.32.21/arch/sparc/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/Makefile 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/Makefile linux-2.6.32.22/arch/sparc/Makefile
+--- linux-2.6.32.22/arch/sparc/Makefile 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/Makefile 2010-09-04 15:54:51.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
@@ -4163,9 +4326,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/Makefile linux-2.6.32.21/arch/sparc/Makefi
VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
VMLINUX_MAIN += $(drivers-y) $(net-y)
-diff -urNp linux-2.6.32.21/arch/sparc/mm/fault_32.c linux-2.6.32.21/arch/sparc/mm/fault_32.c
---- linux-2.6.32.21/arch/sparc/mm/fault_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/mm/fault_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/mm/fault_32.c linux-2.6.32.22/arch/sparc/mm/fault_32.c
+--- linux-2.6.32.22/arch/sparc/mm/fault_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/mm/fault_32.c 2010-09-04 15:54:51.000000000 -0400
@@ -21,6 +21,9 @@
#include <linux/interrupt.h>
#include <linux/module.h>
@@ -4469,9 +4632,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/mm/fault_32.c linux-2.6.32.21/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.21/arch/sparc/mm/fault_64.c linux-2.6.32.21/arch/sparc/mm/fault_64.c
---- linux-2.6.32.21/arch/sparc/mm/fault_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/mm/fault_64.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/mm/fault_64.c linux-2.6.32.22/arch/sparc/mm/fault_64.c
+--- linux-2.6.32.22/arch/sparc/mm/fault_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/mm/fault_64.c 2010-09-04 15:54:51.000000000 -0400
@@ -20,6 +20,9 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
@@ -4969,9 +5132,49 @@ diff -urNp linux-2.6.32.21/arch/sparc/mm/fault_64.c linux-2.6.32.21/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.21/arch/sparc/mm/init_32.c linux-2.6.32.21/arch/sparc/mm/init_32.c
---- linux-2.6.32.21/arch/sparc/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/mm/init_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/mm/hugetlbpage.c linux-2.6.32.22/arch/sparc/mm/hugetlbpage.c
+--- linux-2.6.32.22/arch/sparc/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/mm/hugetlbpage.c 2010-09-17 18:34:04.000000000 -0400
+@@ -69,7 +69,7 @@ full_search:
+ }
+ return -ENOMEM;
+ }
+- if (likely(!vma || addr + len <= vma->vm_start)) {
++ if (likely(check_heap_stack_gap(vma, addr, len))) {
+ /*
+ * Remember the place where we stopped the search:
+ */
+@@ -108,7 +108,7 @@ hugetlb_get_unmapped_area_topdown(struct
+ /* make sure it can fit in the remaining address space */
+ if (likely(addr > len)) {
+ vma = find_vma(mm, addr-len);
+- if (!vma || addr <= vma->vm_start) {
++ if (check_heap_stack_gap(vma, addr - len, len)) {
+ /* remember the address as a hint for next time */
+ return (mm->free_area_cache = addr-len);
+ }
+@@ -126,7 +126,7 @@ hugetlb_get_unmapped_area_topdown(struct
+ * return with success:
+ */
+ vma = find_vma(mm, addr);
+- if (likely(!vma || addr+len <= vma->vm_start)) {
++ if (likely(check_heap_stack_gap(vma, addr, len))) {
+ /* remember the address as a hint for next time */
+ return (mm->free_area_cache = addr);
+ }
+@@ -183,8 +183,7 @@ hugetlb_get_unmapped_area(struct file *f
+ if (addr) {
+ addr = ALIGN(addr, HPAGE_SIZE);
+ vma = find_vma(mm, addr);
+- if (task_size - len >= addr &&
+- (!vma || addr + len <= vma->vm_start))
++ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
+ return addr;
+ }
+ if (mm->get_unmapped_area == arch_get_unmapped_area)
+diff -urNp linux-2.6.32.22/arch/sparc/mm/init_32.c linux-2.6.32.22/arch/sparc/mm/init_32.c
+--- linux-2.6.32.22/arch/sparc/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/mm/init_32.c 2010-09-04 15:54:51.000000000 -0400
@@ -317,6 +317,9 @@ extern void device_scan(void);
pgprot_t PAGE_SHARED __read_mostly;
EXPORT_SYMBOL(PAGE_SHARED);
@@ -5006,9 +5209,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/mm/init_32.c linux-2.6.32.21/arch/sparc/mm
protection_map[12] = PAGE_READONLY;
protection_map[13] = PAGE_READONLY;
protection_map[14] = PAGE_SHARED;
-diff -urNp linux-2.6.32.21/arch/sparc/mm/Makefile linux-2.6.32.21/arch/sparc/mm/Makefile
---- linux-2.6.32.21/arch/sparc/mm/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/mm/Makefile 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/mm/Makefile linux-2.6.32.22/arch/sparc/mm/Makefile
+--- linux-2.6.32.22/arch/sparc/mm/Makefile 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/mm/Makefile 2010-09-04 15:54:51.000000000 -0400
@@ -2,7 +2,7 @@
#
@@ -5018,9 +5221,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/mm/Makefile linux-2.6.32.21/arch/sparc/mm/
obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
obj-y += fault_$(BITS).o
-diff -urNp linux-2.6.32.21/arch/sparc/mm/srmmu.c linux-2.6.32.21/arch/sparc/mm/srmmu.c
---- linux-2.6.32.21/arch/sparc/mm/srmmu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/mm/srmmu.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/sparc/mm/srmmu.c linux-2.6.32.22/arch/sparc/mm/srmmu.c
+--- linux-2.6.32.22/arch/sparc/mm/srmmu.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/sparc/mm/srmmu.c 2010-09-04 15:54:51.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));
@@ -5035,9 +5238,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/mm/srmmu.c linux-2.6.32.21/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.21/arch/um/include/asm/kmap_types.h linux-2.6.32.21/arch/um/include/asm/kmap_types.h
---- linux-2.6.32.21/arch/um/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/um/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/um/include/asm/kmap_types.h linux-2.6.32.22/arch/um/include/asm/kmap_types.h
+--- linux-2.6.32.22/arch/um/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/um/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
@@ -5046,9 +5249,9 @@ diff -urNp linux-2.6.32.21/arch/um/include/asm/kmap_types.h linux-2.6.32.21/arch
KM_TYPE_NR
};
-diff -urNp linux-2.6.32.21/arch/um/include/asm/page.h linux-2.6.32.21/arch/um/include/asm/page.h
---- linux-2.6.32.21/arch/um/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/um/include/asm/page.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/um/include/asm/page.h linux-2.6.32.22/arch/um/include/asm/page.h
+--- linux-2.6.32.22/arch/um/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/um/include/asm/page.h 2010-09-04 15:54:51.000000000 -0400
@@ -14,6 +14,9 @@
#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
@@ -5059,9 +5262,9 @@ diff -urNp linux-2.6.32.21/arch/um/include/asm/page.h linux-2.6.32.21/arch/um/in
#ifndef __ASSEMBLY__
struct page;
-diff -urNp linux-2.6.32.21/arch/um/sys-i386/syscalls.c linux-2.6.32.21/arch/um/sys-i386/syscalls.c
---- linux-2.6.32.21/arch/um/sys-i386/syscalls.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/um/sys-i386/syscalls.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/um/sys-i386/syscalls.c linux-2.6.32.22/arch/um/sys-i386/syscalls.c
+--- linux-2.6.32.22/arch/um/sys-i386/syscalls.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/um/sys-i386/syscalls.c 2010-09-04 15:54:51.000000000 -0400
@@ -11,6 +11,21 @@
#include "asm/uaccess.h"
#include "asm/unistd.h"
@@ -5084,9 +5287,9 @@ diff -urNp linux-2.6.32.21/arch/um/sys-i386/syscalls.c linux-2.6.32.21/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.21/arch/x86/boot/bitops.h linux-2.6.32.21/arch/x86/boot/bitops.h
---- linux-2.6.32.21/arch/x86/boot/bitops.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/boot/bitops.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/boot/bitops.h linux-2.6.32.22/arch/x86/boot/bitops.h
+--- linux-2.6.32.22/arch/x86/boot/bitops.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/boot/bitops.h 2010-09-04 15:54:51.000000000 -0400
@@ -26,7 +26,7 @@ static inline int variable_test_bit(int
u8 v;
const u32 *p = (const u32 *)addr;
@@ -5105,9 +5308,9 @@ diff -urNp linux-2.6.32.21/arch/x86/boot/bitops.h linux-2.6.32.21/arch/x86/boot/
}
#endif /* BOOT_BITOPS_H */
-diff -urNp linux-2.6.32.21/arch/x86/boot/boot.h linux-2.6.32.21/arch/x86/boot/boot.h
---- linux-2.6.32.21/arch/x86/boot/boot.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/boot/boot.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/boot/boot.h linux-2.6.32.22/arch/x86/boot/boot.h
+--- linux-2.6.32.22/arch/x86/boot/boot.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/boot/boot.h 2010-09-04 15:54:51.000000000 -0400
@@ -82,7 +82,7 @@ static inline void io_delay(void)
static inline u16 ds(void)
{
@@ -5126,9 +5329,9 @@ diff -urNp linux-2.6.32.21/arch/x86/boot/boot.h linux-2.6.32.21/arch/x86/boot/bo
: "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
return diff;
}
-diff -urNp linux-2.6.32.21/arch/x86/boot/compressed/head_32.S linux-2.6.32.21/arch/x86/boot/compressed/head_32.S
---- linux-2.6.32.21/arch/x86/boot/compressed/head_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/boot/compressed/head_32.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/boot/compressed/head_32.S linux-2.6.32.22/arch/x86/boot/compressed/head_32.S
+--- linux-2.6.32.22/arch/x86/boot/compressed/head_32.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/boot/compressed/head_32.S 2010-09-04 15:54:51.000000000 -0400
@@ -76,7 +76,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
@@ -5157,9 +5360,9 @@ diff -urNp linux-2.6.32.21/arch/x86/boot/compressed/head_32.S linux-2.6.32.21/ar
addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
jmp 1b
2:
-diff -urNp linux-2.6.32.21/arch/x86/boot/compressed/head_64.S linux-2.6.32.21/arch/x86/boot/compressed/head_64.S
---- linux-2.6.32.21/arch/x86/boot/compressed/head_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/boot/compressed/head_64.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/boot/compressed/head_64.S linux-2.6.32.22/arch/x86/boot/compressed/head_64.S
+--- linux-2.6.32.22/arch/x86/boot/compressed/head_64.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/boot/compressed/head_64.S 2010-09-04 15:54:51.000000000 -0400
@@ -91,7 +91,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
@@ -5178,9 +5381,9 @@ diff -urNp linux-2.6.32.21/arch/x86/boot/compressed/head_64.S linux-2.6.32.21/ar
#endif
/* Target address to relocate to for decompression */
-diff -urNp linux-2.6.32.21/arch/x86/boot/compressed/misc.c linux-2.6.32.21/arch/x86/boot/compressed/misc.c
---- linux-2.6.32.21/arch/x86/boot/compressed/misc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/boot/compressed/misc.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/boot/compressed/misc.c linux-2.6.32.22/arch/x86/boot/compressed/misc.c
+--- linux-2.6.32.22/arch/x86/boot/compressed/misc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/boot/compressed/misc.c 2010-09-04 15:54:51.000000000 -0400
@@ -288,7 +288,7 @@ static void parse_elf(void *output)
case PT_LOAD:
#ifdef CONFIG_RELOCATABLE
@@ -5199,9 +5402,9 @@ diff -urNp linux-2.6.32.21/arch/x86/boot/compressed/misc.c linux-2.6.32.21/arch/
error("Wrong destination address");
#endif
-diff -urNp linux-2.6.32.21/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.21/arch/x86/boot/compressed/mkpiggy.c
---- linux-2.6.32.21/arch/x86/boot/compressed/mkpiggy.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/boot/compressed/mkpiggy.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.22/arch/x86/boot/compressed/mkpiggy.c
+--- linux-2.6.32.22/arch/x86/boot/compressed/mkpiggy.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/boot/compressed/mkpiggy.c 2010-09-04 15:54:51.000000000 -0400
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
offs = (olen > ilen) ? olen - ilen : 0;
@@ -5211,9 +5414,9 @@ diff -urNp linux-2.6.32.21/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.21/ar
offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
printf(".section \".rodata.compressed\",\"a\",@progbits\n");
-diff -urNp linux-2.6.32.21/arch/x86/boot/compressed/relocs.c linux-2.6.32.21/arch/x86/boot/compressed/relocs.c
---- linux-2.6.32.21/arch/x86/boot/compressed/relocs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/boot/compressed/relocs.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/boot/compressed/relocs.c linux-2.6.32.22/arch/x86/boot/compressed/relocs.c
+--- linux-2.6.32.22/arch/x86/boot/compressed/relocs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/boot/compressed/relocs.c 2010-09-04 15:54:51.000000000 -0400
@@ -10,8 +10,11 @@
#define USE_BSD
#include <endian.h>
@@ -5414,9 +5617,9 @@ diff -urNp linux-2.6.32.21/arch/x86/boot/compressed/relocs.c linux-2.6.32.21/arc
read_shdrs(fp);
read_strtabs(fp);
read_symtabs(fp);
-diff -urNp linux-2.6.32.21/arch/x86/boot/cpucheck.c linux-2.6.32.21/arch/x86/boot/cpucheck.c
---- linux-2.6.32.21/arch/x86/boot/cpucheck.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/boot/cpucheck.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/boot/cpucheck.c linux-2.6.32.22/arch/x86/boot/cpucheck.c
+--- linux-2.6.32.22/arch/x86/boot/cpucheck.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/boot/cpucheck.c 2010-09-04 15:54:51.000000000 -0400
@@ -74,7 +74,7 @@ static int has_fpu(void)
u16 fcw = -1, fsw = -1;
u32 cr0;
@@ -5512,9 +5715,9 @@ diff -urNp linux-2.6.32.21/arch/x86/boot/cpucheck.c linux-2.6.32.21/arch/x86/boo
err = check_flags();
}
-diff -urNp linux-2.6.32.21/arch/x86/boot/header.S linux-2.6.32.21/arch/x86/boot/header.S
---- linux-2.6.32.21/arch/x86/boot/header.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/boot/header.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/boot/header.S linux-2.6.32.22/arch/x86/boot/header.S
+--- linux-2.6.32.22/arch/x86/boot/header.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/boot/header.S 2010-09-04 15:54:51.000000000 -0400
@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
# single linked list of
# struct setup_data
@@ -5524,9 +5727,9 @@ diff -urNp linux-2.6.32.21/arch/x86/boot/header.S linux-2.6.32.21/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.21/arch/x86/boot/memory.c linux-2.6.32.21/arch/x86/boot/memory.c
---- linux-2.6.32.21/arch/x86/boot/memory.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/boot/memory.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/boot/memory.c linux-2.6.32.22/arch/x86/boot/memory.c
+--- linux-2.6.32.22/arch/x86/boot/memory.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/boot/memory.c 2010-09-04 15:54:51.000000000 -0400
@@ -19,7 +19,7 @@
static int detect_memory_e820(void)
@@ -5536,9 +5739,9 @@ diff -urNp linux-2.6.32.21/arch/x86/boot/memory.c linux-2.6.32.21/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.21/arch/x86/boot/video.c linux-2.6.32.21/arch/x86/boot/video.c
---- linux-2.6.32.21/arch/x86/boot/video.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/boot/video.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/boot/video.c linux-2.6.32.22/arch/x86/boot/video.c
+--- linux-2.6.32.22/arch/x86/boot/video.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/boot/video.c 2010-09-04 15:54:51.000000000 -0400
@@ -90,7 +90,7 @@ static void store_mode_params(void)
static unsigned int get_entry(void)
{
@@ -5548,9 +5751,9 @@ diff -urNp linux-2.6.32.21/arch/x86/boot/video.c linux-2.6.32.21/arch/x86/boot/v
int key;
unsigned int v;
-diff -urNp linux-2.6.32.21/arch/x86/boot/video-vesa.c linux-2.6.32.21/arch/x86/boot/video-vesa.c
---- linux-2.6.32.21/arch/x86/boot/video-vesa.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/boot/video-vesa.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/boot/video-vesa.c linux-2.6.32.22/arch/x86/boot/video-vesa.c
+--- linux-2.6.32.22/arch/x86/boot/video-vesa.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/boot/video-vesa.c 2010-09-04 15:54:51.000000000 -0400
@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
boot_params.screen_info.vesapm_seg = oreg.es;
@@ -5559,9 +5762,9 @@ diff -urNp linux-2.6.32.21/arch/x86/boot/video-vesa.c linux-2.6.32.21/arch/x86/b
}
/*
-diff -urNp linux-2.6.32.21/arch/x86/ia32/ia32entry.S linux-2.6.32.21/arch/x86/ia32/ia32entry.S
---- linux-2.6.32.21/arch/x86/ia32/ia32entry.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/ia32/ia32entry.S 2010-09-15 02:02:53.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/ia32/ia32entry.S linux-2.6.32.22/arch/x86/ia32/ia32entry.S
+--- linux-2.6.32.22/arch/x86/ia32/ia32entry.S 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.22/arch/x86/ia32/ia32entry.S 2010-09-15 02:02:53.000000000 -0400
@@ -13,6 +13,7 @@
#include <asm/thread_info.h>
#include <asm/segment.h>
@@ -5570,29 +5773,7 @@ diff -urNp linux-2.6.32.21/arch/x86/ia32/ia32entry.S linux-2.6.32.21/arch/x86/ia
#include <linux/linkage.h>
/* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
-@@ -50,7 +51,12 @@
- /*
- * Reload arg registers from stack in case ptrace changed them.
- * We don't reload %eax because syscall_trace_enter() returned
-- * the value it wants us to use in the table lookup.
-+ * the %rax value we should see. Instead, we just truncate that
-+ * value to 32 bits again as we did on entry from user mode.
-+ * If it's a new value set by user_regset during entry tracing,
-+ * this matches the normal truncation of the user-mode value.
-+ * If it's -1 to make us punt the syscall, then (u32)-1 is still
-+ * an appropriately invalid value.
- */
- .macro LOAD_ARGS32 offset, _r9=0
- .if \_r9
-@@ -60,6 +66,7 @@
- movl \offset+48(%rsp),%edx
- movl \offset+56(%rsp),%esi
- movl \offset+64(%rsp),%edi
-+ movl %eax,%eax /* zero extension */
- .endm
-
- .macro CFI_STARTPROC32 simple
-@@ -114,6 +121,11 @@ ENTRY(ia32_sysenter_target)
+@@ -120,6 +121,11 @@ ENTRY(ia32_sysenter_target)
SWAPGS_UNSAFE_STACK
movq PER_CPU_VAR(kernel_stack), %rsp
addq $(KERNEL_STACK_OFFSET),%rsp
@@ -5604,7 +5785,7 @@ diff -urNp linux-2.6.32.21/arch/x86/ia32/ia32entry.S linux-2.6.32.21/arch/x86/ia
/*
* No need to follow this irqs on/off section: the syscall
* disabled irqs, here we enable it straight after entry:
-@@ -144,6 +156,12 @@ ENTRY(ia32_sysenter_target)
+@@ -150,6 +156,12 @@ ENTRY(ia32_sysenter_target)
SAVE_ARGS 0,0,1
/* no need to do an access_ok check here because rbp has been
32bit zero extended */
@@ -5617,16 +5798,7 @@ diff -urNp linux-2.6.32.21/arch/x86/ia32/ia32entry.S linux-2.6.32.21/arch/x86/ia
1: movl (%rbp),%ebp
.section __ex_table,"a"
.quad 1b,ia32_badarg
-@@ -153,7 +171,7 @@ ENTRY(ia32_sysenter_target)
- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
- CFI_REMEMBER_STATE
- jnz sysenter_tracesys
-- cmpl $(IA32_NR_syscalls-1),%eax
-+ cmpq $(IA32_NR_syscalls-1),%rax
- ja ia32_badsys
- sysenter_do_call:
- IA32_ARG_FIXUP
-@@ -166,6 +184,11 @@ sysenter_dispatch:
+@@ -172,6 +184,11 @@ sysenter_dispatch:
testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
jnz sysexit_audit
sysexit_from_sys_call:
@@ -5638,25 +5810,7 @@ diff -urNp linux-2.6.32.21/arch/x86/ia32/ia32entry.S linux-2.6.32.21/arch/x86/ia
andl $~TS_COMPAT,TI_status(%r10)
/* clear IF, that popfq doesn't enable interrupts early */
andl $~0x200,EFLAGS-R11(%rsp)
-@@ -195,7 +218,7 @@ sysexit_from_sys_call:
- movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
- call audit_syscall_entry
- movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
-- cmpl $(IA32_NR_syscalls-1),%eax
-+ cmpq $(IA32_NR_syscalls-1),%rax
- ja ia32_badsys
- movl %ebx,%edi /* reload 1st syscall arg */
- movl RCX-ARGOFFSET(%rsp),%esi /* reload 2nd syscall arg */
-@@ -248,7 +271,7 @@ sysenter_tracesys:
- call syscall_trace_enter
- LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
- RESTORE_REST
-- cmpl $(IA32_NR_syscalls-1),%eax
-+ cmpq $(IA32_NR_syscalls-1),%rax
- ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
- jmp sysenter_do_call
- CFI_ENDPROC
-@@ -284,6 +307,11 @@ ENTRY(ia32_cstar_target)
+@@ -290,6 +307,11 @@ ENTRY(ia32_cstar_target)
movl %esp,%r8d
CFI_REGISTER rsp,r8
movq PER_CPU_VAR(kernel_stack),%rsp
@@ -5668,7 +5822,7 @@ diff -urNp linux-2.6.32.21/arch/x86/ia32/ia32entry.S linux-2.6.32.21/arch/x86/ia
/*
* No need to follow this irqs on/off section: the syscall
* disabled irqs and here we enable it straight after entry:
-@@ -305,6 +333,12 @@ ENTRY(ia32_cstar_target)
+@@ -311,6 +333,12 @@ ENTRY(ia32_cstar_target)
/* no need to do an access_ok check here because r8 has been
32bit zero extended */
/* hardware stack frame is complete now */
@@ -5681,16 +5835,7 @@ diff -urNp linux-2.6.32.21/arch/x86/ia32/ia32entry.S linux-2.6.32.21/arch/x86/ia
1: movl (%r8),%r9d
.section __ex_table,"a"
.quad 1b,ia32_badarg
-@@ -314,7 +348,7 @@ ENTRY(ia32_cstar_target)
- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
- CFI_REMEMBER_STATE
- jnz cstar_tracesys
-- cmpl $IA32_NR_syscalls-1,%eax
-+ cmpq $IA32_NR_syscalls-1,%rax
- ja ia32_badsys
- cstar_do_call:
- IA32_ARG_FIXUP 1
-@@ -327,6 +361,11 @@ cstar_dispatch:
+@@ -333,6 +361,11 @@ cstar_dispatch:
testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
jnz sysretl_audit
sysretl_from_sys_call:
@@ -5702,16 +5847,7 @@ diff -urNp linux-2.6.32.21/arch/x86/ia32/ia32entry.S linux-2.6.32.21/arch/x86/ia
andl $~TS_COMPAT,TI_status(%r10)
RESTORE_ARGS 1,-ARG_SKIP,1,1,1
movl RIP-ARGOFFSET(%rsp),%ecx
-@@ -367,7 +406,7 @@ cstar_tracesys:
- LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace changed it */
- RESTORE_REST
- xchgl %ebp,%r9d
-- cmpl $(IA32_NR_syscalls-1),%eax
-+ cmpq $(IA32_NR_syscalls-1),%rax
- ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
- jmp cstar_do_call
- END(ia32_cstar_target)
-@@ -409,6 +448,11 @@ ENTRY(ia32_syscall)
+@@ -415,6 +448,11 @@ ENTRY(ia32_syscall)
CFI_REL_OFFSET rip,RIP-RIP
PARAVIRT_ADJUST_EXCEPTION_FRAME
SWAPGS
@@ -5723,27 +5859,9 @@ diff -urNp linux-2.6.32.21/arch/x86/ia32/ia32entry.S linux-2.6.32.21/arch/x86/ia
/*
* No need to follow this irqs on/off section: the syscall
* disabled irqs and here we enable it straight after entry:
-@@ -425,7 +469,7 @@ ENTRY(ia32_syscall)
- orl $TS_COMPAT,TI_status(%r10)
- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
- jnz ia32_tracesys
-- cmpl $(IA32_NR_syscalls-1),%eax
-+ cmpq $(IA32_NR_syscalls-1),%rax
- ja ia32_badsys
- ia32_do_call:
- IA32_ARG_FIXUP
-@@ -444,7 +488,7 @@ ia32_tracesys:
- call syscall_trace_enter
- LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
- RESTORE_REST
-- cmpl $(IA32_NR_syscalls-1),%eax
-+ cmpq $(IA32_NR_syscalls-1),%rax
- ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
- jmp ia32_do_call
- END(ia32_syscall)
-diff -urNp linux-2.6.32.21/arch/x86/ia32/ia32_signal.c linux-2.6.32.21/arch/x86/ia32/ia32_signal.c
---- linux-2.6.32.21/arch/x86/ia32/ia32_signal.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/ia32/ia32_signal.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/ia32/ia32_signal.c linux-2.6.32.22/arch/x86/ia32/ia32_signal.c
+--- linux-2.6.32.22/arch/x86/ia32/ia32_signal.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/ia32/ia32_signal.c 2010-09-04 15:54:51.000000000 -0400
@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
sp -= frame_size;
/* Align the stack pointer according to the i386 ABI,
@@ -5762,9 +5880,9 @@ diff -urNp linux-2.6.32.21/arch/x86/ia32/ia32_signal.c linux-2.6.32.21/arch/x86/
};
frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/alternative.h linux-2.6.32.21/arch/x86/include/asm/alternative.h
---- linux-2.6.32.21/arch/x86/include/asm/alternative.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/alternative.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/alternative.h linux-2.6.32.22/arch/x86/include/asm/alternative.h
+--- linux-2.6.32.22/arch/x86/include/asm/alternative.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/alternative.h 2010-09-04 15:54:51.000000000 -0400
@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit
" .byte 662b-661b\n" /* sourcelen */ \
" .byte 664f-663f\n" /* replacementlen */ \
@@ -5774,9 +5892,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/alternative.h linux-2.6.32.21/ar
"663:\n\t" newinstr "\n664:\n" /* replacement */ \
".previous"
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/apm.h linux-2.6.32.21/arch/x86/include/asm/apm.h
---- linux-2.6.32.21/arch/x86/include/asm/apm.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/apm.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/apm.h linux-2.6.32.22/arch/x86/include/asm/apm.h
+--- linux-2.6.32.22/arch/x86/include/asm/apm.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/apm.h 2010-09-04 15:54:51.000000000 -0400
@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
__asm__ __volatile__(APM_DO_ZERO_SEGS
"pushl %%edi\n\t"
@@ -5795,9 +5913,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/apm.h linux-2.6.32.21/arch/x86/i
"setc %%bl\n\t"
"popl %%ebp\n\t"
"popl %%edi\n\t"
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/atomic_32.h linux-2.6.32.21/arch/x86/include/asm/atomic_32.h
---- linux-2.6.32.21/arch/x86/include/asm/atomic_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/atomic_32.h 2010-09-15 02:35:26.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/atomic_32.h linux-2.6.32.22/arch/x86/include/asm/atomic_32.h
+--- linux-2.6.32.22/arch/x86/include/asm/atomic_32.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/atomic_32.h 2010-09-15 02:35:26.000000000 -0400
@@ -25,6 +25,17 @@ static inline int atomic_read(const atom
}
@@ -6143,9 +6261,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/atomic_32.h linux-2.6.32.21/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.21/arch/x86/include/asm/atomic_64.h linux-2.6.32.21/arch/x86/include/asm/atomic_64.h
---- linux-2.6.32.21/arch/x86/include/asm/atomic_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/atomic_64.h 2010-09-15 02:36:22.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/atomic_64.h linux-2.6.32.22/arch/x86/include/asm/atomic_64.h
+--- linux-2.6.32.22/arch/x86/include/asm/atomic_64.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/atomic_64.h 2010-09-21 20:46:18.000000000 -0400
@@ -24,6 +24,17 @@ static inline int atomic_read(const atom
}
@@ -6426,15 +6544,18 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/atomic_64.h linux-2.6.32.21/arch
: "+r" (i), "+m" (v->counter)
: : "memory");
return i + __i;
-@@ -185,6 +370,7 @@ static inline int atomic_sub_return(int
+@@ -185,6 +370,10 @@ static inline int atomic_sub_return(int
}
#define atomic_inc_return(v) (atomic_add_return(1, v))
-+#define atomic_inc_return_unchecked(v) (atomic_add_return_unchecked(1, v))
++static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
++{
++ return atomic_add_return_unchecked(1, v);
++}
#define atomic_dec_return(v) (atomic_sub_return(1, v))
/* The 64-bit atomic type */
-@@ -204,6 +390,18 @@ static inline long atomic64_read(const a
+@@ -204,6 +393,18 @@ static inline long atomic64_read(const a
}
/**
@@ -6453,7 +6574,7 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/atomic_64.h linux-2.6.32.21/arch
* atomic64_set - set atomic64 variable
* @v: pointer to type atomic64_t
* @i: required value
-@@ -216,6 +414,18 @@ static inline void atomic64_set(atomic64
+@@ -216,6 +417,18 @@ static inline void atomic64_set(atomic64
}
/**
@@ -6472,7 +6593,7 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/atomic_64.h linux-2.6.32.21/arch
* atomic64_add - add integer to atomic64 variable
* @i: integer value to add
* @v: pointer to type atomic64_t
-@@ -224,6 +434,28 @@ static inline void atomic64_set(atomic64
+@@ -224,6 +437,28 @@ static inline void atomic64_set(atomic64
*/
static inline void atomic64_add(long i, atomic64_t *v)
{
@@ -6501,7 +6622,7 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/atomic_64.h linux-2.6.32.21/arch
asm volatile(LOCK_PREFIX "addq %1,%0"
: "=m" (v->counter)
: "er" (i), "m" (v->counter));
-@@ -238,7 +470,15 @@ static inline void atomic64_add(long i,
+@@ -238,7 +473,15 @@ static inline void atomic64_add(long i,
*/
static inline void atomic64_sub(long i, atomic64_t *v)
{
@@ -6518,7 +6639,7 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/atomic_64.h linux-2.6.32.21/arch
: "=m" (v->counter)
: "er" (i), "m" (v->counter));
}
-@@ -256,7 +496,16 @@ static inline int atomic64_sub_and_test(
+@@ -256,7 +499,16 @@ static inline int atomic64_sub_and_test(
{
unsigned char c;
@@ -6536,7 +6657,7 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/atomic_64.h linux-2.6.32.21/arch
: "=m" (v->counter), "=qm" (c)
: "er" (i), "m" (v->counter) : "memory");
return c;
-@@ -270,6 +519,31 @@ static inline int atomic64_sub_and_test(
+@@ -270,6 +522,31 @@ static inline int atomic64_sub_and_test(
*/
static inline void atomic64_inc(atomic64_t *v)
{
@@ -6568,7 +6689,7 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/atomic_64.h linux-2.6.32.21/arch
asm volatile(LOCK_PREFIX "incq %0"
: "=m" (v->counter)
: "m" (v->counter));
-@@ -283,7 +557,32 @@ static inline void atomic64_inc(atomic64
+@@ -283,7 +560,32 @@ static inline void atomic64_inc(atomic64
*/
static inline void atomic64_dec(atomic64_t *v)
{
@@ -6602,7 +6723,7 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/atomic_64.h linux-2.6.32.21/arch
: "=m" (v->counter)
: "m" (v->counter));
}
-@@ -300,7 +599,20 @@ static inline int atomic64_dec_and_test(
+@@ -300,7 +602,20 @@ static inline int atomic64_dec_and_test(
{
unsigned char c;
@@ -6624,7 +6745,7 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/atomic_64.h linux-2.6.32.21/arch
: "=m" (v->counter), "=qm" (c)
: "m" (v->counter) : "memory");
return c != 0;
-@@ -318,7 +630,20 @@ static inline int atomic64_inc_and_test(
+@@ -318,7 +633,20 @@ static inline int atomic64_inc_and_test(
{
unsigned char c;
@@ -6646,7 +6767,7 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/atomic_64.h linux-2.6.32.21/arch
: "=m" (v->counter), "=qm" (c)
: "m" (v->counter) : "memory");
return c != 0;
-@@ -337,7 +662,16 @@ static inline int atomic64_add_negative(
+@@ -337,7 +665,16 @@ static inline int atomic64_add_negative(
{
unsigned char c;
@@ -6664,7 +6785,7 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/atomic_64.h linux-2.6.32.21/arch
: "=m" (v->counter), "=qm" (c)
: "er" (i), "m" (v->counter) : "memory");
return c;
-@@ -353,7 +687,31 @@ static inline int atomic64_add_negative(
+@@ -353,7 +690,31 @@ static inline int atomic64_add_negative(
static inline long atomic64_add_return(long i, atomic64_t *v)
{
long __i = i;
@@ -6697,7 +6818,7 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/atomic_64.h linux-2.6.32.21/arch
: "+r" (i), "+m" (v->counter)
: : "memory");
return i + __i;
-@@ -365,6 +723,10 @@ static inline long atomic64_sub_return(l
+@@ -365,6 +726,10 @@ static inline long atomic64_sub_return(l
}
#define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
@@ -6708,7 +6829,7 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/atomic_64.h linux-2.6.32.21/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 +760,29 @@ static inline long atomic_xchg(atomic_t
+@@ -398,17 +763,29 @@ static inline long atomic_xchg(atomic_t
*/
static inline int atomic_add_unless(atomic_t *v, int a, int u)
{
@@ -6742,7 +6863,7 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/atomic_64.h linux-2.6.32.21/arch
}
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-@@ -424,17 +798,29 @@ static inline int atomic_add_unless(atom
+@@ -424,17 +801,29 @@ static inline int atomic_add_unless(atom
*/
static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
{
@@ -6776,9 +6897,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/atomic_64.h linux-2.6.32.21/arch
}
/**
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/boot.h linux-2.6.32.21/arch/x86/include/asm/boot.h
---- linux-2.6.32.21/arch/x86/include/asm/boot.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/boot.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/boot.h linux-2.6.32.22/arch/x86/include/asm/boot.h
+--- linux-2.6.32.22/arch/x86/include/asm/boot.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/boot.h 2010-09-04 15:54:51.000000000 -0400
@@ -11,10 +11,15 @@
#include <asm/pgtable_types.h>
@@ -6796,9 +6917,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/boot.h linux-2.6.32.21/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.21/arch/x86/include/asm/cacheflush.h linux-2.6.32.21/arch/x86/include/asm/cacheflush.h
---- linux-2.6.32.21/arch/x86/include/asm/cacheflush.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/cacheflush.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/cacheflush.h linux-2.6.32.22/arch/x86/include/asm/cacheflush.h
+--- linux-2.6.32.22/arch/x86/include/asm/cacheflush.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/cacheflush.h 2010-09-04 15:54:51.000000000 -0400
@@ -60,7 +60,7 @@ PAGEFLAG(WC, WC)
static inline unsigned long get_page_memtype(struct page *pg)
{
@@ -6817,9 +6938,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/cacheflush.h linux-2.6.32.21/arc
ClearPageUncached(pg);
ClearPageWC(pg);
break;
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/cache.h linux-2.6.32.21/arch/x86/include/asm/cache.h
---- linux-2.6.32.21/arch/x86/include/asm/cache.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/cache.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/cache.h linux-2.6.32.22/arch/x86/include/asm/cache.h
+--- linux-2.6.32.22/arch/x86/include/asm/cache.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/cache.h 2010-09-04 15:54:51.000000000 -0400
@@ -8,6 +8,7 @@
#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
@@ -6828,9 +6949,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/cache.h linux-2.6.32.21/arch/x86
#ifdef CONFIG_X86_VSMP
/* vSMP Internode cacheline shift */
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/checksum_32.h linux-2.6.32.21/arch/x86/include/asm/checksum_32.h
---- linux-2.6.32.21/arch/x86/include/asm/checksum_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/checksum_32.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/checksum_32.h linux-2.6.32.22/arch/x86/include/asm/checksum_32.h
+--- linux-2.6.32.22/arch/x86/include/asm/checksum_32.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/checksum_32.h 2010-09-04 15:54:51.000000000 -0400
@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
int len, __wsum sum,
int *src_err_ptr, int *dst_err_ptr);
@@ -6864,21 +6985,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/checksum_32.h linux-2.6.32.21/ar
len, sum, NULL, err_ptr);
if (len)
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/compat.h linux-2.6.32.21/arch/x86/include/asm/compat.h
---- linux-2.6.32.21/arch/x86/include/asm/compat.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/compat.h 2010-09-15 02:03:09.000000000 -0400
-@@ -204,7 +204,7 @@ static inline compat_uptr_t ptr_to_compa
- return (u32)(unsigned long)uptr;
- }
-
--static inline void __user *compat_alloc_user_space(long len)
-+static inline void __user *arch_compat_alloc_user_space(long len)
- {
- struct pt_regs *regs = task_pt_regs(current);
- return (void __user *)regs->sp - len;
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/desc.h linux-2.6.32.21/arch/x86/include/asm/desc.h
---- linux-2.6.32.21/arch/x86/include/asm/desc.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/desc.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/desc.h linux-2.6.32.22/arch/x86/include/asm/desc.h
+--- linux-2.6.32.22/arch/x86/include/asm/desc.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/desc.h 2010-09-04 15:54:51.000000000 -0400
@@ -4,6 +4,7 @@
#include <asm/desc_defs.h>
#include <asm/ldt.h>
@@ -7048,9 +7157,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/desc.h linux-2.6.32.21/arch/x86/
+#endif
+
#endif /* _ASM_X86_DESC_H */
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/device.h linux-2.6.32.21/arch/x86/include/asm/device.h
---- linux-2.6.32.21/arch/x86/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/device.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/device.h linux-2.6.32.22/arch/x86/include/asm/device.h
+--- linux-2.6.32.22/arch/x86/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/device.h 2010-09-04 15:54:51.000000000 -0400
@@ -6,7 +6,7 @@ struct dev_archdata {
void *acpi_handle;
#endif
@@ -7060,9 +7169,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/device.h linux-2.6.32.21/arch/x8
#endif
#ifdef CONFIG_DMAR
void *iommu; /* hook for IOMMU specific extension */
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/dma-mapping.h linux-2.6.32.21/arch/x86/include/asm/dma-mapping.h
---- linux-2.6.32.21/arch/x86/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/dma-mapping.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/dma-mapping.h linux-2.6.32.22/arch/x86/include/asm/dma-mapping.h
+--- linux-2.6.32.22/arch/x86/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/dma-mapping.h 2010-09-04 15:54:51.000000000 -0400
@@ -25,9 +25,9 @@ extern int iommu_merge;
extern struct device x86_dma_fallback_dev;
extern int panic_on_overflow;
@@ -7102,9 +7211,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/dma-mapping.h linux-2.6.32.21/ar
WARN_ON(irqs_disabled()); /* for portability */
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/e820.h linux-2.6.32.21/arch/x86/include/asm/e820.h
---- linux-2.6.32.21/arch/x86/include/asm/e820.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/e820.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/e820.h linux-2.6.32.22/arch/x86/include/asm/e820.h
+--- linux-2.6.32.22/arch/x86/include/asm/e820.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/e820.h 2010-09-04 15:54:51.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)
@@ -7114,9 +7223,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/e820.h linux-2.6.32.21/arch/x86/
#define BIOS_END 0x00100000
#ifdef __KERNEL__
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/elf.h linux-2.6.32.21/arch/x86/include/asm/elf.h
---- linux-2.6.32.21/arch/x86/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/elf.h linux-2.6.32.22/arch/x86/include/asm/elf.h
+--- linux-2.6.32.22/arch/x86/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/elf.h 2010-09-04 15:54:51.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. */
@@ -7170,9 +7279,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/elf.h linux-2.6.32.21/arch/x86/i
-#define arch_randomize_brk arch_randomize_brk
-
#endif /* _ASM_X86_ELF_H */
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/futex.h linux-2.6.32.21/arch/x86/include/asm/futex.h
---- linux-2.6.32.21/arch/x86/include/asm/futex.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/futex.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/futex.h linux-2.6.32.22/arch/x86/include/asm/futex.h
+--- linux-2.6.32.22/arch/x86/include/asm/futex.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/futex.h 2010-09-04 15:54:51.000000000 -0400
@@ -11,17 +11,54 @@
#include <asm/processor.h>
#include <asm/system.h>
@@ -7309,9 +7418,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/futex.h linux-2.6.32.21/arch/x86
: "memory"
);
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/i387.h linux-2.6.32.21/arch/x86/include/asm/i387.h
---- linux-2.6.32.21/arch/x86/include/asm/i387.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/i387.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/i387.h linux-2.6.32.22/arch/x86/include/asm/i387.h
+--- linux-2.6.32.22/arch/x86/include/asm/i387.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/i387.h 2010-09-04 15:54:51.000000000 -0400
@@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc
{
int err;
@@ -7352,9 +7461,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/i387.h linux-2.6.32.21/arch/x86/
/*
* These must be called with preempt disabled
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/io_64.h linux-2.6.32.21/arch/x86/include/asm/io_64.h
---- linux-2.6.32.21/arch/x86/include/asm/io_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/io_64.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/io_64.h linux-2.6.32.22/arch/x86/include/asm/io_64.h
+--- linux-2.6.32.22/arch/x86/include/asm/io_64.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/io_64.h 2010-09-04 15:54:51.000000000 -0400
@@ -140,6 +140,17 @@ __OUTS(l)
#include <linux/vmalloc.h>
@@ -7373,9 +7482,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/io_64.h linux-2.6.32.21/arch/x86
#include <asm-generic/iomap.h>
void __memcpy_fromio(void *, unsigned long, unsigned);
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/iommu.h linux-2.6.32.21/arch/x86/include/asm/iommu.h
---- linux-2.6.32.21/arch/x86/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/iommu.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/iommu.h linux-2.6.32.22/arch/x86/include/asm/iommu.h
+--- linux-2.6.32.22/arch/x86/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/iommu.h 2010-09-04 15:54:51.000000000 -0400
@@ -3,7 +3,7 @@
extern void pci_iommu_shutdown(void);
@@ -7385,9 +7494,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/iommu.h linux-2.6.32.21/arch/x86
extern int force_iommu, no_iommu;
extern int iommu_detected;
extern int iommu_pass_through;
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/irqflags.h linux-2.6.32.21/arch/x86/include/asm/irqflags.h
---- linux-2.6.32.21/arch/x86/include/asm/irqflags.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/irqflags.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/irqflags.h linux-2.6.32.22/arch/x86/include/asm/irqflags.h
+--- linux-2.6.32.22/arch/x86/include/asm/irqflags.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/irqflags.h 2010-09-04 15:54:51.000000000 -0400
@@ -142,6 +142,11 @@ static inline unsigned long __raw_local_
sti; \
sysexit
@@ -7400,9 +7509,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/irqflags.h linux-2.6.32.21/arch/
#else
#define INTERRUPT_RETURN iret
#define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/kvm_host.h linux-2.6.32.21/arch/x86/include/asm/kvm_host.h
---- linux-2.6.32.21/arch/x86/include/asm/kvm_host.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/kvm_host.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/kvm_host.h linux-2.6.32.22/arch/x86/include/asm/kvm_host.h
+--- linux-2.6.32.22/arch/x86/include/asm/kvm_host.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/kvm_host.h 2010-09-04 15:54:51.000000000 -0400
@@ -533,7 +533,7 @@ struct kvm_x86_ops {
const struct trace_print_flags *exit_reasons_str;
};
@@ -7412,9 +7521,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/kvm_host.h linux-2.6.32.21/arch/
int kvm_mmu_module_init(void);
void kvm_mmu_module_exit(void);
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/local.h linux-2.6.32.21/arch/x86/include/asm/local.h
---- linux-2.6.32.21/arch/x86/include/asm/local.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/local.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/local.h linux-2.6.32.22/arch/x86/include/asm/local.h
+--- linux-2.6.32.22/arch/x86/include/asm/local.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/local.h 2010-09-04 15:54:51.000000000 -0400
@@ -18,26 +18,90 @@ typedef struct {
static inline void local_inc(local_t *l)
@@ -7639,9 +7748,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/local.h linux-2.6.32.21/arch/x86
: "+r" (i), "+m" (l->a.counter)
: : "memory");
return i + __i;
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.21/arch/x86/include/asm/mc146818rtc.h
---- linux-2.6.32.21/arch/x86/include/asm/mc146818rtc.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/mc146818rtc.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.22/arch/x86/include/asm/mc146818rtc.h
+--- linux-2.6.32.22/arch/x86/include/asm/mc146818rtc.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/mc146818rtc.h 2010-09-04 15:54:51.000000000 -0400
@@ -81,8 +81,8 @@ static inline unsigned char current_lock
#else
#define lock_cmos_prefix(reg) do {} while (0)
@@ -7653,9 +7762,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.21/ar
#define do_i_have_lock_cmos() 0
#define current_lock_cmos_reg() 0
#endif
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/microcode.h linux-2.6.32.21/arch/x86/include/asm/microcode.h
---- linux-2.6.32.21/arch/x86/include/asm/microcode.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/microcode.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/microcode.h linux-2.6.32.22/arch/x86/include/asm/microcode.h
+--- linux-2.6.32.22/arch/x86/include/asm/microcode.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/microcode.h 2010-09-04 15:54:51.000000000 -0400
@@ -12,13 +12,13 @@ struct device;
enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
@@ -7696,9 +7805,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/microcode.h linux-2.6.32.21/arch
{
return NULL;
}
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/mman.h linux-2.6.32.21/arch/x86/include/asm/mman.h
---- linux-2.6.32.21/arch/x86/include/asm/mman.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/mman.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/mman.h linux-2.6.32.22/arch/x86/include/asm/mman.h
+--- linux-2.6.32.22/arch/x86/include/asm/mman.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/mman.h 2010-09-04 15:54:51.000000000 -0400
@@ -5,4 +5,14 @@
#include <asm-generic/mman.h>
@@ -7714,9 +7823,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/mman.h linux-2.6.32.21/arch/x86/
+#endif
+
#endif /* _ASM_X86_MMAN_H */
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/mmu_context.h linux-2.6.32.21/arch/x86/include/asm/mmu_context.h
---- linux-2.6.32.21/arch/x86/include/asm/mmu_context.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/mmu_context.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/mmu_context.h linux-2.6.32.22/arch/x86/include/asm/mmu_context.h
+--- linux-2.6.32.22/arch/x86/include/asm/mmu_context.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/mmu_context.h 2010-09-04 15:54:51.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)
@@ -7841,9 +7950,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/mmu_context.h linux-2.6.32.21/ar
}
#define activate_mm(prev, next) \
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/mmu.h linux-2.6.32.21/arch/x86/include/asm/mmu.h
---- linux-2.6.32.21/arch/x86/include/asm/mmu.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/mmu.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/mmu.h linux-2.6.32.22/arch/x86/include/asm/mmu.h
+--- linux-2.6.32.22/arch/x86/include/asm/mmu.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/mmu.h 2010-09-04 15:54:51.000000000 -0400
@@ -9,10 +9,23 @@
* we put the segment information here.
*/
@@ -7870,9 +7979,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/mmu.h linux-2.6.32.21/arch/x86/i
} mm_context_t;
#ifdef CONFIG_SMP
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/module.h linux-2.6.32.21/arch/x86/include/asm/module.h
---- linux-2.6.32.21/arch/x86/include/asm/module.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/module.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/module.h linux-2.6.32.22/arch/x86/include/asm/module.h
+--- linux-2.6.32.22/arch/x86/include/asm/module.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/module.h 2010-09-04 15:54:51.000000000 -0400
@@ -59,13 +59,31 @@
#error unknown processor family
#endif
@@ -7906,9 +8015,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/module.h linux-2.6.32.21/arch/x8
#endif
#endif /* _ASM_X86_MODULE_H */
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/page_32_types.h linux-2.6.32.21/arch/x86/include/asm/page_32_types.h
---- linux-2.6.32.21/arch/x86/include/asm/page_32_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/page_32_types.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/page_32_types.h linux-2.6.32.22/arch/x86/include/asm/page_32_types.h
+--- linux-2.6.32.22/arch/x86/include/asm/page_32_types.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/page_32_types.h 2010-09-04 15:54:51.000000000 -0400
@@ -15,6 +15,10 @@
*/
#define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL)
@@ -7920,9 +8029,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/page_32_types.h linux-2.6.32.21/
#ifdef CONFIG_4KSTACKS
#define THREAD_ORDER 0
#else
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/paravirt.h linux-2.6.32.21/arch/x86/include/asm/paravirt.h
---- linux-2.6.32.21/arch/x86/include/asm/paravirt.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/paravirt.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/paravirt.h linux-2.6.32.22/arch/x86/include/asm/paravirt.h
+--- linux-2.6.32.22/arch/x86/include/asm/paravirt.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/paravirt.h 2010-09-04 15:54:51.000000000 -0400
@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned
pv_mmu_ops.set_fixmap(idx, phys, flags);
}
@@ -7976,9 +8085,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/paravirt.h linux-2.6.32.21/arch/
#endif /* CONFIG_X86_32 */
#endif /* __ASSEMBLY__ */
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/paravirt_types.h linux-2.6.32.21/arch/x86/include/asm/paravirt_types.h
---- linux-2.6.32.21/arch/x86/include/asm/paravirt_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/paravirt_types.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/paravirt_types.h linux-2.6.32.22/arch/x86/include/asm/paravirt_types.h
+--- linux-2.6.32.22/arch/x86/include/asm/paravirt_types.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/paravirt_types.h 2010-09-04 15:54:51.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,
@@ -7992,9 +8101,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/paravirt_types.h linux-2.6.32.21
};
struct raw_spinlock;
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/pci_x86.h linux-2.6.32.21/arch/x86/include/asm/pci_x86.h
---- linux-2.6.32.21/arch/x86/include/asm/pci_x86.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/pci_x86.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/pci_x86.h linux-2.6.32.22/arch/x86/include/asm/pci_x86.h
+--- linux-2.6.32.22/arch/x86/include/asm/pci_x86.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/pci_x86.h 2010-09-04 15:54:51.000000000 -0400
@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct
extern void (*pcibios_disable_irq)(struct pci_dev *dev);
@@ -8017,9 +8126,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/pci_x86.h linux-2.6.32.21/arch/x
extern bool port_cf9_safe;
/* arch_initcall level */
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgalloc.h linux-2.6.32.21/arch/x86/include/asm/pgalloc.h
---- linux-2.6.32.21/arch/x86/include/asm/pgalloc.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/pgalloc.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/pgalloc.h linux-2.6.32.22/arch/x86/include/asm/pgalloc.h
+--- linux-2.6.32.22/arch/x86/include/asm/pgalloc.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/pgalloc.h 2010-09-04 15:54:51.000000000 -0400
@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
pmd_t *pmd, pte_t *pte)
{
@@ -8034,9 +8143,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgalloc.h linux-2.6.32.21/arch/x
set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
}
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.21/arch/x86/include/asm/pgtable-2level.h
---- linux-2.6.32.21/arch/x86/include/asm/pgtable-2level.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/pgtable-2level.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.22/arch/x86/include/asm/pgtable-2level.h
+--- linux-2.6.32.22/arch/x86/include/asm/pgtable-2level.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/pgtable-2level.h 2010-09-04 15:54:51.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)
@@ -8047,9 +8156,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.21
}
static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable_32.h linux-2.6.32.21/arch/x86/include/asm/pgtable_32.h
---- linux-2.6.32.21/arch/x86/include/asm/pgtable_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/pgtable_32.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/pgtable_32.h linux-2.6.32.22/arch/x86/include/asm/pgtable_32.h
+--- linux-2.6.32.22/arch/x86/include/asm/pgtable_32.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/pgtable_32.h 2010-09-04 15:54:51.000000000 -0400
@@ -26,8 +26,6 @@
struct mm_struct;
struct vm_area_struct;
@@ -8091,9 +8200,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable_32.h linux-2.6.32.21/arc
/*
* kern_addr_valid() is (1) for FLATMEM and (0) for
* SPARSEMEM and DISCONTIGMEM
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.21/arch/x86/include/asm/pgtable_32_types.h
---- linux-2.6.32.21/arch/x86/include/asm/pgtable_32_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/pgtable_32_types.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.22/arch/x86/include/asm/pgtable_32_types.h
+--- linux-2.6.32.22/arch/x86/include/asm/pgtable_32_types.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/pgtable_32_types.h 2010-09-04 15:54:51.000000000 -0400
@@ -8,7 +8,7 @@
*/
#ifdef CONFIG_X86_PAE
@@ -8123,9 +8232,9 @@ diff -urNp linux-2.6.32.21/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.21/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.21/arch/x86/include/asm/pgtable-3level.h
---- linux-2.6.32.21/arch/x86/include/asm/pgtable-3level.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/pgtable-3level.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.22/arch/x86/include/asm/pgtable-3level.h
+--- linux-2.6.32.22/arch/x86/include/asm/pgtable-3level.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/pgtable-3level.h 2010-09-04 15:54:51.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)
@@ -8143,9 +8252,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.21
}
/*
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable_64.h linux-2.6.32.21/arch/x86/include/asm/pgtable_64.h
---- linux-2.6.32.21/arch/x86/include/asm/pgtable_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/pgtable_64.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/pgtable_64.h linux-2.6.32.22/arch/x86/include/asm/pgtable_64.h
+--- linux-2.6.32.22/arch/x86/include/asm/pgtable_64.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/pgtable_64.h 2010-09-04 15:54:51.000000000 -0400
@@ -16,10 +16,13 @@
extern pud_t level3_kernel_pgt[512];
@@ -8182,9 +8291,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable_64.h linux-2.6.32.21/arc
}
static inline void native_pgd_clear(pgd_t *pgd)
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.21/arch/x86/include/asm/pgtable_64_types.h
---- linux-2.6.32.21/arch/x86/include/asm/pgtable_64_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/pgtable_64_types.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.22/arch/x86/include/asm/pgtable_64_types.h
+--- linux-2.6.32.22/arch/x86/include/asm/pgtable_64_types.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/pgtable_64_types.h 2010-09-04 15:54:51.000000000 -0400
@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
#define MODULES_VADDR _AC(0xffffffffa0000000, UL)
#define MODULES_END _AC(0xffffffffff000000, UL)
@@ -8196,9 +8305,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.
+#define ktva_ktla(addr) (addr)
#endif /* _ASM_X86_PGTABLE_64_DEFS_H */
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable.h linux-2.6.32.21/arch/x86/include/asm/pgtable.h
---- linux-2.6.32.21/arch/x86/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/pgtable.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/pgtable.h linux-2.6.32.22/arch/x86/include/asm/pgtable.h
+--- linux-2.6.32.22/arch/x86/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/pgtable.h 2010-09-04 15:54:51.000000000 -0400
@@ -74,12 +74,51 @@ extern struct list_head pgd_list;
#define arch_end_context_switch(prev) do {} while(0)
@@ -8368,9 +8477,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable.h linux-2.6.32.21/arch/x
#include <asm-generic/pgtable.h>
#endif /* __ASSEMBLY__ */
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable_types.h linux-2.6.32.21/arch/x86/include/asm/pgtable_types.h
---- linux-2.6.32.21/arch/x86/include/asm/pgtable_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/pgtable_types.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/pgtable_types.h linux-2.6.32.22/arch/x86/include/asm/pgtable_types.h
+--- linux-2.6.32.22/arch/x86/include/asm/pgtable_types.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/pgtable_types.h 2010-09-04 15:54:51.000000000 -0400
@@ -16,12 +16,11 @@
#define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
#define _PAGE_BIT_PAT 7 /* on 4KB pages */
@@ -8491,9 +8600,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable_types.h linux-2.6.32.21/
#define pgprot_writecombine pgprot_writecombine
extern pgprot_t pgprot_writecombine(pgprot_t prot);
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/processor.h linux-2.6.32.21/arch/x86/include/asm/processor.h
---- linux-2.6.32.21/arch/x86/include/asm/processor.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/processor.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/processor.h linux-2.6.32.22/arch/x86/include/asm/processor.h
+--- linux-2.6.32.22/arch/x86/include/asm/processor.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/processor.h 2010-09-04 15:54:51.000000000 -0400
@@ -272,7 +272,7 @@ struct tss_struct {
} ____cacheline_aligned;
@@ -8578,9 +8687,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/processor.h linux-2.6.32.21/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.21/arch/x86/include/asm/ptrace.h linux-2.6.32.21/arch/x86/include/asm/ptrace.h
---- linux-2.6.32.21/arch/x86/include/asm/ptrace.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/ptrace.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/ptrace.h linux-2.6.32.22/arch/x86/include/asm/ptrace.h
+--- linux-2.6.32.22/arch/x86/include/asm/ptrace.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/ptrace.h 2010-09-04 15:54:51.000000000 -0400
@@ -151,28 +151,29 @@ static inline unsigned long regs_return_
}
@@ -8617,9 +8726,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/ptrace.h linux-2.6.32.21/arch/x8
#endif
}
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/reboot.h linux-2.6.32.21/arch/x86/include/asm/reboot.h
---- linux-2.6.32.21/arch/x86/include/asm/reboot.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/reboot.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/reboot.h linux-2.6.32.22/arch/x86/include/asm/reboot.h
+--- linux-2.6.32.22/arch/x86/include/asm/reboot.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/reboot.h 2010-09-04 15:54:51.000000000 -0400
@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
void native_machine_crash_shutdown(struct pt_regs *regs);
@@ -8629,9 +8738,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/reboot.h linux-2.6.32.21/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.21/arch/x86/include/asm/rwsem.h linux-2.6.32.21/arch/x86/include/asm/rwsem.h
---- linux-2.6.32.21/arch/x86/include/asm/rwsem.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/rwsem.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/rwsem.h linux-2.6.32.22/arch/x86/include/asm/rwsem.h
+--- linux-2.6.32.22/arch/x86/include/asm/rwsem.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/rwsem.h 2010-09-04 15:54:51.000000000 -0400
@@ -118,10 +118,26 @@ static inline void __down_read(struct rw
{
asm volatile("# beginning down_read\n\t"
@@ -8867,9 +8976,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/rwsem.h linux-2.6.32.21/arch/x86
: "+r" (tmp), "+m" (sem->count)
: : "memory");
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/segment.h linux-2.6.32.21/arch/x86/include/asm/segment.h
---- linux-2.6.32.21/arch/x86/include/asm/segment.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/segment.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/segment.h linux-2.6.32.22/arch/x86/include/asm/segment.h
+--- linux-2.6.32.22/arch/x86/include/asm/segment.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/segment.h 2010-09-04 15:54:51.000000000 -0400
@@ -62,8 +62,8 @@
* 26 - ESPFIX small SS
* 27 - per-cpu [ offset to per-cpu data area ]
@@ -8938,9 +9047,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/segment.h linux-2.6.32.21/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.21/arch/x86/include/asm/spinlock.h linux-2.6.32.21/arch/x86/include/asm/spinlock.h
---- linux-2.6.32.21/arch/x86/include/asm/spinlock.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/spinlock.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/spinlock.h linux-2.6.32.22/arch/x86/include/asm/spinlock.h
+--- linux-2.6.32.22/arch/x86/include/asm/spinlock.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/spinlock.h 2010-09-04 15:54:51.000000000 -0400
@@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r
static inline void __raw_read_lock(raw_rwlock_t *rw)
{
@@ -9044,9 +9153,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/spinlock.h linux-2.6.32.21/arch/
: "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
}
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/system.h linux-2.6.32.21/arch/x86/include/asm/system.h
---- linux-2.6.32.21/arch/x86/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/system.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/system.h linux-2.6.32.22/arch/x86/include/asm/system.h
+--- linux-2.6.32.22/arch/x86/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/system.h 2010-09-04 15:54:51.000000000 -0400
@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un
{
unsigned long __limit;
@@ -9065,9 +9174,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/system.h linux-2.6.32.21/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.21/arch/x86/include/asm/uaccess_32.h linux-2.6.32.21/arch/x86/include/asm/uaccess_32.h
---- linux-2.6.32.21/arch/x86/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/uaccess_32.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/uaccess_32.h linux-2.6.32.22/arch/x86/include/asm/uaccess_32.h
+--- linux-2.6.32.22/arch/x86/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/uaccess_32.h 2010-09-04 15:54:51.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)
@@ -9197,9 +9306,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/uaccess_32.h linux-2.6.32.21/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.21/arch/x86/include/asm/uaccess_64.h linux-2.6.32.21/arch/x86/include/asm/uaccess_64.h
---- linux-2.6.32.21/arch/x86/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/uaccess_64.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/uaccess_64.h linux-2.6.32.22/arch/x86/include/asm/uaccess_64.h
+--- linux-2.6.32.22/arch/x86/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/uaccess_64.h 2010-09-04 15:54:51.000000000 -0400
@@ -9,6 +9,9 @@
#include <linux/prefetch.h>
#include <linux/lockdep.h>
@@ -9391,9 +9500,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/uaccess_64.h linux-2.6.32.21/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.21/arch/x86/include/asm/uaccess.h linux-2.6.32.21/arch/x86/include/asm/uaccess.h
---- linux-2.6.32.21/arch/x86/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/uaccess.h linux-2.6.32.22/arch/x86/include/asm/uaccess.h
+--- linux-2.6.32.22/arch/x86/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/uaccess.h 2010-09-16 23:14:31.000000000 -0400
@@ -8,12 +8,15 @@
#include <linux/thread_info.h>
#include <linux/prefetch.h>
@@ -9458,22 +9567,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/uaccess.h linux-2.6.32.21/arch/x
/*
* The exception table consists of pairs of addresses: the first is the
-@@ -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) \
+@@ -183,13 +217,21 @@ extern int __get_user_bad(void);
asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
: "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
-+#endif
-
+#ifdef CONFIG_X86_32
@@ -9496,7 +9592,7 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/uaccess.h linux-2.6.32.21/arch/x
".section .fixup,\"ax\"\n" \
"4: movl %3,%0\n" \
" jmp 3b\n" \
-@@ -197,15 +248,18 @@ extern int __get_user_bad(void);
+@@ -197,15 +239,18 @@ extern int __get_user_bad(void);
_ASM_EXTABLE(1b, 4b) \
_ASM_EXTABLE(2b, 4b) \
: "=r" (err) \
@@ -9519,7 +9615,7 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/uaccess.h linux-2.6.32.21/arch/x
#define __put_user_x8(x, ptr, __ret_pu) \
asm volatile("call __put_user_8" : "=a" (__ret_pu) \
-@@ -374,16 +428,18 @@ do { \
+@@ -374,16 +419,18 @@ do { \
} while (0)
#define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
@@ -9541,7 +9637,7 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/uaccess.h linux-2.6.32.21/arch/x
#define __get_user_size_ex(x, ptr, size) \
do { \
-@@ -407,10 +463,12 @@ do { \
+@@ -407,10 +454,12 @@ do { \
} while (0)
#define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
@@ -9556,7 +9652,7 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/uaccess.h linux-2.6.32.21/arch/x
#define __put_user_nocheck(x, ptr, size) \
({ \
-@@ -424,13 +482,24 @@ do { \
+@@ -424,13 +473,24 @@ do { \
int __gu_err; \
unsigned long __gu_val; \
__get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
@@ -9583,7 +9679,7 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/uaccess.h linux-2.6.32.21/arch/x
/*
* Tell gcc we read from memory instead of writing: this is because
-@@ -438,21 +507,26 @@ struct __large_struct { unsigned long bu
+@@ -438,21 +498,26 @@ struct __large_struct { unsigned long bu
* aliasing issues.
*/
#define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
@@ -9614,7 +9710,7 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/uaccess.h linux-2.6.32.21/arch/x
/*
* uaccess_try and catch
-@@ -530,7 +604,7 @@ struct __large_struct { unsigned long bu
+@@ -530,7 +595,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)))); \
@@ -9623,7 +9719,7 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/uaccess.h linux-2.6.32.21/arch/x
} while (0)
#ifdef CONFIG_X86_WP_WORKS_OK
-@@ -567,6 +641,7 @@ extern struct movsl_mask {
+@@ -567,6 +632,7 @@ extern struct movsl_mask {
#define ARCH_HAS_NOCACHE_UACCESS 1
@@ -9631,9 +9727,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/uaccess.h linux-2.6.32.21/arch/x
#ifdef CONFIG_X86_32
# include "uaccess_32.h"
#else
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/vgtod.h linux-2.6.32.21/arch/x86/include/asm/vgtod.h
---- linux-2.6.32.21/arch/x86/include/asm/vgtod.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/vgtod.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/vgtod.h linux-2.6.32.22/arch/x86/include/asm/vgtod.h
+--- linux-2.6.32.22/arch/x86/include/asm/vgtod.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/vgtod.h 2010-09-04 15:54:51.000000000 -0400
@@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
int sysctl_enabled;
struct timezone sys_tz;
@@ -9642,9 +9738,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/vgtod.h linux-2.6.32.21/arch/x86
cycle_t (*vread)(void);
cycle_t cycle_last;
cycle_t mask;
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/vmi.h linux-2.6.32.21/arch/x86/include/asm/vmi.h
---- linux-2.6.32.21/arch/x86/include/asm/vmi.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/vmi.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/vmi.h linux-2.6.32.22/arch/x86/include/asm/vmi.h
+--- linux-2.6.32.22/arch/x86/include/asm/vmi.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/vmi.h 2010-09-04 15:54:51.000000000 -0400
@@ -191,6 +191,7 @@ struct vrom_header {
u8 reserved[96]; /* Reserved for headers */
char vmi_init[8]; /* VMI_Init jump point */
@@ -9653,9 +9749,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/vmi.h linux-2.6.32.21/arch/x86/i
} __attribute__((packed));
struct pnp_header {
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/vsyscall.h linux-2.6.32.21/arch/x86/include/asm/vsyscall.h
---- linux-2.6.32.21/arch/x86/include/asm/vsyscall.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/vsyscall.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/vsyscall.h linux-2.6.32.22/arch/x86/include/asm/vsyscall.h
+--- linux-2.6.32.22/arch/x86/include/asm/vsyscall.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/vsyscall.h 2010-09-04 15:54:51.000000000 -0400
@@ -15,9 +15,10 @@ enum vsyscall_num {
#ifdef __KERNEL__
@@ -9686,9 +9782,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/vsyscall.h linux-2.6.32.21/arch/
#endif /* __KERNEL__ */
#endif /* _ASM_X86_VSYSCALL_H */
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/xsave.h linux-2.6.32.21/arch/x86/include/asm/xsave.h
---- linux-2.6.32.21/arch/x86/include/asm/xsave.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/xsave.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/include/asm/xsave.h linux-2.6.32.22/arch/x86/include/asm/xsave.h
+--- linux-2.6.32.22/arch/x86/include/asm/xsave.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/include/asm/xsave.h 2010-09-04 15:54:51.000000000 -0400
@@ -56,6 +56,12 @@ static inline int xrstor_checking(struct
static inline int xsave_user(struct xsave_struct __user *buf)
{
@@ -9714,9 +9810,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/xsave.h linux-2.6.32.21/arch/x86
__asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
"2:\n"
".section .fixup,\"ax\"\n"
-diff -urNp linux-2.6.32.21/arch/x86/Kconfig linux-2.6.32.21/arch/x86/Kconfig
---- linux-2.6.32.21/arch/x86/Kconfig 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/Kconfig 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/Kconfig linux-2.6.32.22/arch/x86/Kconfig
+--- linux-2.6.32.22/arch/x86/Kconfig 2010-08-29 21:08:20.000000000 -0400
++++ linux-2.6.32.22/arch/x86/Kconfig 2010-09-04 15:54:51.000000000 -0400
@@ -997,7 +997,7 @@ choice
config NOHIGHMEM
@@ -9781,9 +9877,9 @@ diff -urNp linux-2.6.32.21/arch/x86/Kconfig linux-2.6.32.21/arch/x86/Kconfig
---help---
Map the 32-bit VDSO to the predictable old-style address too.
---help---
-diff -urNp linux-2.6.32.21/arch/x86/Kconfig.cpu linux-2.6.32.21/arch/x86/Kconfig.cpu
---- linux-2.6.32.21/arch/x86/Kconfig.cpu 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/Kconfig.cpu 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/Kconfig.cpu linux-2.6.32.22/arch/x86/Kconfig.cpu
+--- linux-2.6.32.22/arch/x86/Kconfig.cpu 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/Kconfig.cpu 2010-09-04 15:54:51.000000000 -0400
@@ -340,7 +340,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
@@ -9811,9 +9907,9 @@ diff -urNp linux-2.6.32.21/arch/x86/Kconfig.cpu linux-2.6.32.21/arch/x86/Kconfig
config X86_MINIMUM_CPU_FAMILY
int
-diff -urNp linux-2.6.32.21/arch/x86/Kconfig.debug linux-2.6.32.21/arch/x86/Kconfig.debug
---- linux-2.6.32.21/arch/x86/Kconfig.debug 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/Kconfig.debug 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/Kconfig.debug linux-2.6.32.22/arch/x86/Kconfig.debug
+--- linux-2.6.32.22/arch/x86/Kconfig.debug 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/Kconfig.debug 2010-09-04 15:54:51.000000000 -0400
@@ -99,7 +99,7 @@ config X86_PTDUMP
config DEBUG_RODATA
bool "Write protect kernel read-only data structures"
@@ -9823,9 +9919,9 @@ diff -urNp linux-2.6.32.21/arch/x86/Kconfig.debug linux-2.6.32.21/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.21/arch/x86/kernel/acpi/boot.c linux-2.6.32.21/arch/x86/kernel/acpi/boot.c
---- linux-2.6.32.21/arch/x86/kernel/acpi/boot.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/acpi/boot.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/acpi/boot.c linux-2.6.32.22/arch/x86/kernel/acpi/boot.c
+--- linux-2.6.32.22/arch/x86/kernel/acpi/boot.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/acpi/boot.c 2010-09-04 15:54:51.000000000 -0400
@@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a
DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
},
@@ -9835,9 +9931,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/acpi/boot.c linux-2.6.32.21/arch/x86/
};
/*
-diff -urNp linux-2.6.32.21/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.21/arch/x86/kernel/acpi/realmode/wakeup.S
---- linux-2.6.32.21/arch/x86/kernel/acpi/realmode/wakeup.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/acpi/realmode/wakeup.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.22/arch/x86/kernel/acpi/realmode/wakeup.S
+--- linux-2.6.32.22/arch/x86/kernel/acpi/realmode/wakeup.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/acpi/realmode/wakeup.S 2010-09-04 15:54:51.000000000 -0400
@@ -104,7 +104,7 @@ _start:
movl %eax, %ecx
orl %edx, %ecx
@@ -9847,9 +9943,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.2
wrmsr
1:
-diff -urNp linux-2.6.32.21/arch/x86/kernel/acpi/sleep.c linux-2.6.32.21/arch/x86/kernel/acpi/sleep.c
---- linux-2.6.32.21/arch/x86/kernel/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/acpi/sleep.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/acpi/sleep.c linux-2.6.32.22/arch/x86/kernel/acpi/sleep.c
+--- linux-2.6.32.22/arch/x86/kernel/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/acpi/sleep.c 2010-09-04 15:54:51.000000000 -0400
@@ -11,11 +11,12 @@
#include <linux/cpumask.h>
#include <asm/segment.h>
@@ -9894,9 +9990,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/acpi/sleep.c linux-2.6.32.21/arch/x86
}
-diff -urNp linux-2.6.32.21/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.21/arch/x86/kernel/acpi/wakeup_32.S
---- linux-2.6.32.21/arch/x86/kernel/acpi/wakeup_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/acpi/wakeup_32.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.22/arch/x86/kernel/acpi/wakeup_32.S
+--- linux-2.6.32.22/arch/x86/kernel/acpi/wakeup_32.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/acpi/wakeup_32.S 2010-09-04 15:54:51.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
@@ -9913,9 +10009,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.21/arch
bogus_magic:
jmp bogus_magic
-diff -urNp linux-2.6.32.21/arch/x86/kernel/alternative.c linux-2.6.32.21/arch/x86/kernel/alternative.c
---- linux-2.6.32.21/arch/x86/kernel/alternative.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/alternative.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/alternative.c linux-2.6.32.22/arch/x86/kernel/alternative.c
+--- linux-2.6.32.22/arch/x86/kernel/alternative.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/alternative.c 2010-09-04 15:54:51.000000000 -0400
@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str
BUG_ON(p->len > MAX_PATCH_LEN);
@@ -9998,9 +10094,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/alternative.c linux-2.6.32.21/arch/x8
+ BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]);
return addr;
}
-diff -urNp linux-2.6.32.21/arch/x86/kernel/amd_iommu.c linux-2.6.32.21/arch/x86/kernel/amd_iommu.c
---- linux-2.6.32.21/arch/x86/kernel/amd_iommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/amd_iommu.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/amd_iommu.c linux-2.6.32.22/arch/x86/kernel/amd_iommu.c
+--- linux-2.6.32.22/arch/x86/kernel/amd_iommu.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/amd_iommu.c 2010-09-04 15:54:51.000000000 -0400
@@ -2074,7 +2074,7 @@ static void prealloc_protection_domains(
}
}
@@ -10010,9 +10106,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/amd_iommu.c linux-2.6.32.21/arch/x86/
.alloc_coherent = alloc_coherent,
.free_coherent = free_coherent,
.map_page = map_page,
-diff -urNp linux-2.6.32.21/arch/x86/kernel/apic/io_apic.c linux-2.6.32.21/arch/x86/kernel/apic/io_apic.c
---- linux-2.6.32.21/arch/x86/kernel/apic/io_apic.c 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/apic/io_apic.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/apic/io_apic.c linux-2.6.32.22/arch/x86/kernel/apic/io_apic.c
+--- linux-2.6.32.22/arch/x86/kernel/apic/io_apic.c 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/apic/io_apic.c 2010-09-20 17:27:14.000000000 -0400
@@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi
ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
GFP_ATOMIC);
@@ -10049,9 +10145,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/apic/io_apic.c linux-2.6.32.21/arch/x
{
spin_unlock(&vector_lock);
}
-diff -urNp linux-2.6.32.21/arch/x86/kernel/apm_32.c linux-2.6.32.21/arch/x86/kernel/apm_32.c
---- linux-2.6.32.21/arch/x86/kernel/apm_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/apm_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/apm_32.c linux-2.6.32.22/arch/x86/kernel/apm_32.c
+--- linux-2.6.32.22/arch/x86/kernel/apm_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/apm_32.c 2010-09-04 15:54:51.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.
@@ -10153,9 +10249,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/apm_32.c linux-2.6.32.21/arch/x86/ker
proc_create("apm", 0, NULL, &apm_file_ops);
-diff -urNp linux-2.6.32.21/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.21/arch/x86/kernel/asm-offsets_32.c
---- linux-2.6.32.21/arch/x86/kernel/asm-offsets_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/asm-offsets_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.22/arch/x86/kernel/asm-offsets_32.c
+--- linux-2.6.32.22/arch/x86/kernel/asm-offsets_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/asm-offsets_32.c 2010-09-04 15:54:51.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);
@@ -10168,9 +10264,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.21/arch
#endif
#ifdef CONFIG_XEN
-diff -urNp linux-2.6.32.21/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.21/arch/x86/kernel/asm-offsets_64.c
---- linux-2.6.32.21/arch/x86/kernel/asm-offsets_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/asm-offsets_64.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.22/arch/x86/kernel/asm-offsets_64.c
+--- linux-2.6.32.22/arch/x86/kernel/asm-offsets_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/asm-offsets_64.c 2010-09-04 15:54:51.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);
@@ -10198,9 +10294,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.21/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.21/arch/x86/kernel/cpu/common.c linux-2.6.32.21/arch/x86/kernel/cpu/common.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/common.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/common.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/cpu/common.c linux-2.6.32.22/arch/x86/kernel/cpu/common.c
+--- linux-2.6.32.22/arch/x86/kernel/cpu/common.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/cpu/common.c 2010-09-04 15:54:51.000000000 -0400
@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -10309,9 +10405,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/common.c linux-2.6.32.21/arch/x86
struct thread_struct *thread = &curr->thread;
if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
-diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.21/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.22/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+--- linux-2.6.32.22/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-09-04 15:54:51.000000000 -0400
@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any
DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
},
@@ -10321,9 +10417,9 @@ diff -urNp linux-2.6.32.21/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.21/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.21/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.22/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
+--- linux-2.6.32.22/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-09-04 15:54:51.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 },
@@ -10333,9 +10429,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linu
};
#undef _BANIAS
#undef BANIAS
-diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/intel.c linux-2.6.32.21/arch/x86/kernel/cpu/intel.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/intel.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/intel.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/cpu/intel.c linux-2.6.32.22/arch/x86/kernel/cpu/intel.c
+--- linux-2.6.32.22/arch/x86/kernel/cpu/intel.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/cpu/intel.c 2010-09-04 15:54:51.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.
@@ -10345,9 +10441,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/intel.c linux-2.6.32.21/arch/x86/
load_idt(&idt_descr);
}
#endif
-diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.21/arch/x86/kernel/cpu/intel_cacheinfo.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.22/arch/x86/kernel/cpu/intel_cacheinfo.c
+--- linux-2.6.32.22/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-09-04 15:54:51.000000000 -0400
@@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob
return ret;
}
@@ -10357,9 +10453,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.21
.show = show,
.store = store,
};
-diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/Makefile linux-2.6.32.21/arch/x86/kernel/cpu/Makefile
---- linux-2.6.32.21/arch/x86/kernel/cpu/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/Makefile 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/cpu/Makefile linux-2.6.32.22/arch/x86/kernel/cpu/Makefile
+--- linux-2.6.32.22/arch/x86/kernel/cpu/Makefile 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/cpu/Makefile 2010-09-04 15:54:51.000000000 -0400
@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
CFLAGS_REMOVE_common.o = -pg
endif
@@ -10371,9 +10467,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/Makefile linux-2.6.32.21/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.21/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.21/arch/x86/kernel/cpu/mcheck/mce_amd.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.22/arch/x86/kernel/cpu/mcheck/mce_amd.c
+--- linux-2.6.32.22/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-09-04 15:54:51.000000000 -0400
@@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob
return ret;
}
@@ -10383,9 +10479,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.21/
.show = show,
.store = store,
};
-diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.21/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/mcheck/mce.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/mcheck/mce.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.22/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-2.6.32.22/arch/x86/kernel/cpu/mcheck/mce.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/cpu/mcheck/mce.c 2010-09-04 15:54:51.000000000 -0400
@@ -187,7 +187,7 @@ static void print_mce(struct mce *m)
!(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
m->cs, m->ip);
@@ -10438,9 +10534,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.21/arch
};
/*
-diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/amd.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/amd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/amd.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.22/arch/x86/kernel/cpu/mtrr/amd.c
+--- linux-2.6.32.22/arch/x86/kernel/cpu/mtrr/amd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/cpu/mtrr/amd.c 2010-09-04 15:54:51.000000000 -0400
@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base
return 0;
}
@@ -10450,9 +10546,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.21/arch/x
.vendor = X86_VENDOR_AMD,
.set = amd_set_mtrr,
.get = amd_get_mtrr,
-diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/centaur.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/centaur.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/centaur.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.22/arch/x86/kernel/cpu/mtrr/centaur.c
+--- linux-2.6.32.22/arch/x86/kernel/cpu/mtrr/centaur.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/cpu/mtrr/centaur.c 2010-09-04 15:54:51.000000000 -0400
@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long
return 0;
}
@@ -10462,9 +10558,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.21/ar
.vendor = X86_VENDOR_CENTAUR,
.set = centaur_set_mcr,
.get = centaur_get_mcr,
-diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/cyrix.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.22/arch/x86/kernel/cpu/mtrr/cyrix.c
+--- linux-2.6.32.22/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-09-04 15:54:51.000000000 -0400
@@ -265,7 +265,7 @@ static void cyrix_set_all(void)
post_set();
}
@@ -10474,9 +10570,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.21/arch
.vendor = X86_VENDOR_CYRIX,
.set_all = cyrix_set_all,
.set = cyrix_set_arr,
-diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/generic.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/generic.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/generic.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.22/arch/x86/kernel/cpu/mtrr/generic.c
+--- linux-2.6.32.22/arch/x86/kernel/cpu/mtrr/generic.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/cpu/mtrr/generic.c 2010-09-04 15:54:51.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 */
@@ -10495,9 +10591,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.21/ar
.use_intel_if = 1,
.set_all = generic_set_all,
.get = generic_get_mtrr,
-diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/main.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/main.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/main.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.22/arch/x86/kernel/cpu/mtrr/main.c
+--- linux-2.6.32.22/arch/x86/kernel/cpu/mtrr/main.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/cpu/mtrr/main.c 2010-09-04 15:54:51.000000000 -0400
@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
u64 size_or_mask, size_and_mask;
static bool mtrr_aps_delayed_init;
@@ -10516,9 +10612,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.21/arch/
{
if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
mtrr_ops[ops->vendor] = ops;
-diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/mtrr.h
---- linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.22/arch/x86/kernel/cpu/mtrr/mtrr.h
+--- linux-2.6.32.22/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-09-04 15:54:51.000000000 -0400
@@ -12,19 +12,19 @@
extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
@@ -10569,9 +10665,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.21/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.21/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.21/arch/x86/kernel/cpu/perfctr-watchdog.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.22/arch/x86/kernel/cpu/perfctr-watchdog.c
+--- linux-2.6.32.22/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-09-04 15:54:51.000000000 -0400
@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
/* Interface defining a CPU specific perfctr watchdog */
@@ -10605,9 +10701,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.2
static struct wd_ops intel_arch_wd_ops __read_mostly = {
.reserve = single_msr_reserve,
.unreserve = single_msr_unreserve,
-diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.21/arch/x86/kernel/cpu/perf_event.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/perf_event.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/perf_event.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.22/arch/x86/kernel/cpu/perf_event.c
+--- linux-2.6.32.22/arch/x86/kernel/cpu/perf_event.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/cpu/perf_event.c 2010-09-04 15:54:51.000000000 -0400
@@ -2357,7 +2357,7 @@ perf_callchain_user(struct pt_regs *regs
break;
@@ -10617,9 +10713,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.21/arch
}
}
-diff -urNp linux-2.6.32.21/arch/x86/kernel/crash.c linux-2.6.32.21/arch/x86/kernel/crash.c
---- linux-2.6.32.21/arch/x86/kernel/crash.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/crash.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/crash.c linux-2.6.32.22/arch/x86/kernel/crash.c
+--- linux-2.6.32.22/arch/x86/kernel/crash.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/crash.c 2010-09-04 15:54:51.000000000 -0400
@@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu,
regs = args->regs;
@@ -10629,9 +10725,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/crash.c linux-2.6.32.21/arch/x86/kern
crash_fixup_ss_esp(&fixed_regs, regs);
regs = &fixed_regs;
}
-diff -urNp linux-2.6.32.21/arch/x86/kernel/doublefault_32.c linux-2.6.32.21/arch/x86/kernel/doublefault_32.c
---- linux-2.6.32.21/arch/x86/kernel/doublefault_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/doublefault_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/doublefault_32.c linux-2.6.32.22/arch/x86/kernel/doublefault_32.c
+--- linux-2.6.32.22/arch/x86/kernel/doublefault_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/doublefault_32.c 2010-09-04 15:54:51.000000000 -0400
@@ -11,7 +11,7 @@
#define DOUBLEFAULT_STACKSIZE (1024)
@@ -10663,9 +10759,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/doublefault_32.c linux-2.6.32.21/arch
.fs = __KERNEL_PERCPU,
.__cr3 = __pa_nodebug(swapper_pg_dir),
-diff -urNp linux-2.6.32.21/arch/x86/kernel/dumpstack_32.c linux-2.6.32.21/arch/x86/kernel/dumpstack_32.c
---- linux-2.6.32.21/arch/x86/kernel/dumpstack_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/dumpstack_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/dumpstack_32.c linux-2.6.32.22/arch/x86/kernel/dumpstack_32.c
+--- linux-2.6.32.22/arch/x86/kernel/dumpstack_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/dumpstack_32.c 2010-09-04 15:54:51.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..
@@ -10710,9 +10806,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/dumpstack_32.c linux-2.6.32.21/arch/x
if (ip < PAGE_OFFSET)
return 0;
if (probe_kernel_address((unsigned short *)ip, ud2))
-diff -urNp linux-2.6.32.21/arch/x86/kernel/dumpstack.c linux-2.6.32.21/arch/x86/kernel/dumpstack.c
---- linux-2.6.32.21/arch/x86/kernel/dumpstack.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/dumpstack.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/dumpstack.c linux-2.6.32.22/arch/x86/kernel/dumpstack.c
+--- linux-2.6.32.22/arch/x86/kernel/dumpstack.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/dumpstack.c 2010-09-04 15:54:51.000000000 -0400
@@ -180,7 +180,7 @@ void dump_stack(void)
#endif
@@ -10740,9 +10836,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/dumpstack.c linux-2.6.32.21/arch/x86/
report_bug(regs->ip, regs);
if (__die(str, regs, err))
-diff -urNp linux-2.6.32.21/arch/x86/kernel/e820.c linux-2.6.32.21/arch/x86/kernel/e820.c
---- linux-2.6.32.21/arch/x86/kernel/e820.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/e820.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/e820.c linux-2.6.32.22/arch/x86/kernel/e820.c
+--- linux-2.6.32.22/arch/x86/kernel/e820.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/e820.c 2010-09-04 15:54:51.000000000 -0400
@@ -733,7 +733,7 @@ struct early_res {
};
static struct early_res early_res[MAX_EARLY_RES] __initdata = {
@@ -10752,9 +10848,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/e820.c linux-2.6.32.21/arch/x86/kerne
};
static int __init find_overlapped_early(u64 start, u64 end)
-diff -urNp linux-2.6.32.21/arch/x86/kernel/efi_32.c linux-2.6.32.21/arch/x86/kernel/efi_32.c
---- linux-2.6.32.21/arch/x86/kernel/efi_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/efi_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/efi_32.c linux-2.6.32.22/arch/x86/kernel/efi_32.c
+--- linux-2.6.32.22/arch/x86/kernel/efi_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/efi_32.c 2010-09-04 15:54:51.000000000 -0400
@@ -38,70 +38,38 @@
*/
@@ -10835,9 +10931,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/efi_32.c linux-2.6.32.21/arch/x86/ker
/*
* After the lock is released, the original page table is restored.
-diff -urNp linux-2.6.32.21/arch/x86/kernel/efi_stub_32.S linux-2.6.32.21/arch/x86/kernel/efi_stub_32.S
---- linux-2.6.32.21/arch/x86/kernel/efi_stub_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/efi_stub_32.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/efi_stub_32.S linux-2.6.32.22/arch/x86/kernel/efi_stub_32.S
+--- linux-2.6.32.22/arch/x86/kernel/efi_stub_32.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/efi_stub_32.S 2010-09-04 15:54:51.000000000 -0400
@@ -6,6 +6,7 @@
*/
@@ -10936,9 +11032,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/efi_stub_32.S linux-2.6.32.21/arch/x8
saved_return_addr:
.long 0
efi_rt_function_ptr:
-diff -urNp linux-2.6.32.21/arch/x86/kernel/entry_32.S linux-2.6.32.21/arch/x86/kernel/entry_32.S
---- linux-2.6.32.21/arch/x86/kernel/entry_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/entry_32.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/entry_32.S linux-2.6.32.22/arch/x86/kernel/entry_32.S
+--- linux-2.6.32.22/arch/x86/kernel/entry_32.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/entry_32.S 2010-09-04 15:54:51.000000000 -0400
@@ -191,7 +191,67 @@
#endif /* CONFIG_X86_32_LAZY_GS */
@@ -11249,9 +11345,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/entry_32.S linux-2.6.32.21/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.21/arch/x86/kernel/entry_64.S linux-2.6.32.21/arch/x86/kernel/entry_64.S
---- linux-2.6.32.21/arch/x86/kernel/entry_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/entry_64.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/entry_64.S linux-2.6.32.22/arch/x86/kernel/entry_64.S
+--- linux-2.6.32.22/arch/x86/kernel/entry_64.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/entry_64.S 2010-09-04 15:54:51.000000000 -0400
@@ -53,6 +53,7 @@
#include <asm/paravirt.h>
#include <asm/ftrace.h>
@@ -11709,9 +11805,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/entry_64.S linux-2.6.32.21/arch/x86/k
RESTORE_ALL 8
jmp irq_return
nmi_userspace:
-diff -urNp linux-2.6.32.21/arch/x86/kernel/ftrace.c linux-2.6.32.21/arch/x86/kernel/ftrace.c
---- linux-2.6.32.21/arch/x86/kernel/ftrace.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/ftrace.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/ftrace.c linux-2.6.32.22/arch/x86/kernel/ftrace.c
+--- linux-2.6.32.22/arch/x86/kernel/ftrace.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/ftrace.c 2010-09-04 15:54:51.000000000 -0400
@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void)
{
if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
@@ -11777,9 +11873,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/ftrace.c linux-2.6.32.21/arch/x86/ker
if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
return -EFAULT;
-diff -urNp linux-2.6.32.21/arch/x86/kernel/head32.c linux-2.6.32.21/arch/x86/kernel/head32.c
---- linux-2.6.32.21/arch/x86/kernel/head32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/head32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/head32.c linux-2.6.32.22/arch/x86/kernel/head32.c
+--- linux-2.6.32.22/arch/x86/kernel/head32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/head32.c 2010-09-04 15:54:51.000000000 -0400
@@ -16,6 +16,7 @@
#include <asm/apic.h>
#include <asm/io_apic.h>
@@ -11797,9 +11893,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/head32.c linux-2.6.32.21/arch/x86/ker
#ifdef CONFIG_BLK_DEV_INITRD
/* Reserve INITRD */
-diff -urNp linux-2.6.32.21/arch/x86/kernel/head_32.S linux-2.6.32.21/arch/x86/kernel/head_32.S
---- linux-2.6.32.21/arch/x86/kernel/head_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/head_32.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/head_32.S linux-2.6.32.22/arch/x86/kernel/head_32.S
+--- linux-2.6.32.22/arch/x86/kernel/head_32.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/head_32.S 2010-09-04 15:54:51.000000000 -0400
@@ -19,10 +19,17 @@
#include <asm/setup.h>
#include <asm/processor-flags.h>
@@ -12246,9 +12342,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/head_32.S linux-2.6.32.21/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.21/arch/x86/kernel/head_64.S linux-2.6.32.21/arch/x86/kernel/head_64.S
---- linux-2.6.32.21/arch/x86/kernel/head_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/head_64.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/head_64.S linux-2.6.32.22/arch/x86/kernel/head_64.S
+--- linux-2.6.32.22/arch/x86/kernel/head_64.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/head_64.S 2010-09-04 15:54:51.000000000 -0400
@@ -19,6 +19,7 @@
#include <asm/cache.h>
#include <asm/processor-flags.h>
@@ -12519,9 +12615,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/head_64.S linux-2.6.32.21/arch/x86/ke
__PAGE_ALIGNED_BSS
.align PAGE_SIZE
-diff -urNp linux-2.6.32.21/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.21/arch/x86/kernel/i386_ksyms_32.c
---- linux-2.6.32.21/arch/x86/kernel/i386_ksyms_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/i386_ksyms_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.22/arch/x86/kernel/i386_ksyms_32.c
+--- linux-2.6.32.22/arch/x86/kernel/i386_ksyms_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/i386_ksyms_32.c 2010-09-04 15:54:51.000000000 -0400
@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
EXPORT_SYMBOL(cmpxchg8b_emu);
#endif
@@ -12543,9 +12639,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.21/arch/
+#ifdef CONFIG_PAX_KERNEXEC
+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
+#endif
-diff -urNp linux-2.6.32.21/arch/x86/kernel/init_task.c linux-2.6.32.21/arch/x86/kernel/init_task.c
---- linux-2.6.32.21/arch/x86/kernel/init_task.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/init_task.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/init_task.c linux-2.6.32.22/arch/x86/kernel/init_task.c
+--- linux-2.6.32.22/arch/x86/kernel/init_task.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/init_task.c 2010-09-04 15:54:51.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.
@@ -12554,9 +12650,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/init_task.c linux-2.6.32.21/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.21/arch/x86/kernel/ioport.c linux-2.6.32.21/arch/x86/kernel/ioport.c
---- linux-2.6.32.21/arch/x86/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/ioport.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/ioport.c linux-2.6.32.22/arch/x86/kernel/ioport.c
+--- linux-2.6.32.22/arch/x86/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/ioport.c 2010-09-04 15:54:51.000000000 -0400
@@ -6,6 +6,7 @@
#include <linux/sched.h>
#include <linux/kernel.h>
@@ -12600,9 +12696,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/ioport.c linux-2.6.32.21/arch/x86/ker
if (!capable(CAP_SYS_RAWIO))
return -EPERM;
}
-diff -urNp linux-2.6.32.21/arch/x86/kernel/irq_32.c linux-2.6.32.21/arch/x86/kernel/irq_32.c
---- linux-2.6.32.21/arch/x86/kernel/irq_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/irq_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/irq_32.c linux-2.6.32.22/arch/x86/kernel/irq_32.c
+--- linux-2.6.32.22/arch/x86/kernel/irq_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/irq_32.c 2010-09-04 15:54:51.000000000 -0400
@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc
return 0;
@@ -12621,9 +12717,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/irq_32.c linux-2.6.32.21/arch/x86/ker
call_on_stack(__do_softirq, isp);
/*
-diff -urNp linux-2.6.32.21/arch/x86/kernel/kgdb.c linux-2.6.32.21/arch/x86/kernel/kgdb.c
---- linux-2.6.32.21/arch/x86/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/kgdb.c linux-2.6.32.22/arch/x86/kernel/kgdb.c
+--- linux-2.6.32.22/arch/x86/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400
@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception
return instruction_pointer(regs);
}
@@ -12633,9 +12729,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/kgdb.c linux-2.6.32.21/arch/x86/kerne
/* Breakpoint instruction: */
.gdb_bpt_instr = { 0xcc },
.flags = KGDB_HW_BREAKPOINT,
-diff -urNp linux-2.6.32.21/arch/x86/kernel/kprobes.c linux-2.6.32.21/arch/x86/kernel/kprobes.c
---- linux-2.6.32.21/arch/x86/kernel/kprobes.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/kprobes.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/kprobes.c linux-2.6.32.22/arch/x86/kernel/kprobes.c
+--- linux-2.6.32.22/arch/x86/kernel/kprobes.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/kprobes.c 2010-09-04 15:54:51.000000000 -0400
@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f
char op;
s32 raddr;
@@ -12728,9 +12824,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/kprobes.c linux-2.6.32.21/arch/x86/ke
return ret;
switch (val) {
-diff -urNp linux-2.6.32.21/arch/x86/kernel/ldt.c linux-2.6.32.21/arch/x86/kernel/ldt.c
---- linux-2.6.32.21/arch/x86/kernel/ldt.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/ldt.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/ldt.c linux-2.6.32.22/arch/x86/kernel/ldt.c
+--- linux-2.6.32.22/arch/x86/kernel/ldt.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/ldt.c 2010-09-04 15:54:51.000000000 -0400
@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i
if (reload) {
#ifdef CONFIG_SMP
@@ -12795,9 +12891,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/ldt.c linux-2.6.32.21/arch/x86/kernel
fill_ldt(&ldt, &ldt_info);
if (oldmode)
ldt.avl = 0;
-diff -urNp linux-2.6.32.21/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.21/arch/x86/kernel/machine_kexec_32.c
---- linux-2.6.32.21/arch/x86/kernel/machine_kexec_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/machine_kexec_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.22/arch/x86/kernel/machine_kexec_32.c
+--- linux-2.6.32.22/arch/x86/kernel/machine_kexec_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/machine_kexec_32.c 2010-09-04 15:54:51.000000000 -0400
@@ -26,7 +26,7 @@
#include <asm/system.h>
#include <asm/cacheflush.h>
@@ -12825,9 +12921,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.21/ar
relocate_kernel_ptr = control_page;
page_list[PA_CONTROL_PAGE] = __pa(control_page);
-diff -urNp linux-2.6.32.21/arch/x86/kernel/microcode_amd.c linux-2.6.32.21/arch/x86/kernel/microcode_amd.c
---- linux-2.6.32.21/arch/x86/kernel/microcode_amd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/microcode_amd.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/microcode_amd.c linux-2.6.32.22/arch/x86/kernel/microcode_amd.c
+--- linux-2.6.32.22/arch/x86/kernel/microcode_amd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/microcode_amd.c 2010-09-04 15:54:51.000000000 -0400
@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c
uci->mc = NULL;
}
@@ -12846,9 +12942,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/microcode_amd.c linux-2.6.32.21/arch/
{
return &microcode_amd_ops;
}
-diff -urNp linux-2.6.32.21/arch/x86/kernel/microcode_core.c linux-2.6.32.21/arch/x86/kernel/microcode_core.c
---- linux-2.6.32.21/arch/x86/kernel/microcode_core.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/microcode_core.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/microcode_core.c linux-2.6.32.22/arch/x86/kernel/microcode_core.c
+--- linux-2.6.32.22/arch/x86/kernel/microcode_core.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/microcode_core.c 2010-09-04 15:54:51.000000000 -0400
@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL");
#define MICROCODE_VERSION "2.00"
@@ -12858,9 +12954,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/microcode_core.c linux-2.6.32.21/arch
/*
* Synchronization.
-diff -urNp linux-2.6.32.21/arch/x86/kernel/microcode_intel.c linux-2.6.32.21/arch/x86/kernel/microcode_intel.c
---- linux-2.6.32.21/arch/x86/kernel/microcode_intel.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/microcode_intel.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/microcode_intel.c linux-2.6.32.22/arch/x86/kernel/microcode_intel.c
+--- linux-2.6.32.22/arch/x86/kernel/microcode_intel.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/microcode_intel.c 2010-09-04 15:54:51.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)
@@ -12895,9 +12991,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/microcode_intel.c linux-2.6.32.21/arc
{
return &microcode_intel_ops;
}
-diff -urNp linux-2.6.32.21/arch/x86/kernel/module.c linux-2.6.32.21/arch/x86/kernel/module.c
---- linux-2.6.32.21/arch/x86/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/module.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/module.c linux-2.6.32.22/arch/x86/kernel/module.c
+--- linux-2.6.32.22/arch/x86/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/module.c 2010-09-04 15:54:51.000000000 -0400
@@ -34,7 +34,7 @@
#define DEBUGP(fmt...)
#endif
@@ -13038,9 +13134,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/module.c linux-2.6.32.21/arch/x86/ker
#if 0
if ((s64)val != *(s32 *)loc)
goto overflow;
-diff -urNp linux-2.6.32.21/arch/x86/kernel/paravirt.c linux-2.6.32.21/arch/x86/kernel/paravirt.c
---- linux-2.6.32.21/arch/x86/kernel/paravirt.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/paravirt.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/paravirt.c linux-2.6.32.22/arch/x86/kernel/paravirt.c
+--- linux-2.6.32.22/arch/x86/kernel/paravirt.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/paravirt.c 2010-09-04 15:54:51.000000000 -0400
@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu
* corresponding structure. */
static void *get_call_destination(u8 type)
@@ -13144,9 +13240,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/paravirt.c linux-2.6.32.21/arch/x86/k
};
EXPORT_SYMBOL_GPL(pv_time_ops);
-diff -urNp linux-2.6.32.21/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.21/arch/x86/kernel/paravirt-spinlocks.c
---- linux-2.6.32.21/arch/x86/kernel/paravirt-spinlocks.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/paravirt-spinlocks.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.22/arch/x86/kernel/paravirt-spinlocks.c
+--- linux-2.6.32.22/arch/x86/kernel/paravirt-spinlocks.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/paravirt-spinlocks.c 2010-09-04 15:54:51.000000000 -0400
@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *
__raw_spin_lock(lock);
}
@@ -13156,9 +13252,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.21/
#ifdef CONFIG_SMP
.spin_is_locked = __ticket_spin_is_locked,
.spin_is_contended = __ticket_spin_is_contended,
-diff -urNp linux-2.6.32.21/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.21/arch/x86/kernel/pci-calgary_64.c
---- linux-2.6.32.21/arch/x86/kernel/pci-calgary_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/pci-calgary_64.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.22/arch/x86/kernel/pci-calgary_64.c
+--- linux-2.6.32.22/arch/x86/kernel/pci-calgary_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/pci-calgary_64.c 2010-09-04 15:54:51.000000000 -0400
@@ -477,7 +477,7 @@ static void calgary_free_coherent(struct
free_pages((unsigned long)vaddr, get_order(size));
}
@@ -13168,9 +13264,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.21/arch
.alloc_coherent = calgary_alloc_coherent,
.free_coherent = calgary_free_coherent,
.map_sg = calgary_map_sg,
-diff -urNp linux-2.6.32.21/arch/x86/kernel/pci-dma.c linux-2.6.32.21/arch/x86/kernel/pci-dma.c
---- linux-2.6.32.21/arch/x86/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/pci-dma.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/pci-dma.c linux-2.6.32.22/arch/x86/kernel/pci-dma.c
+--- linux-2.6.32.22/arch/x86/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/pci-dma.c 2010-09-04 15:54:51.000000000 -0400
@@ -14,7 +14,7 @@
static int forbid_dac __read_mostly;
@@ -13189,9 +13285,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/pci-dma.c linux-2.6.32.21/arch/x86/ke
#ifdef CONFIG_PCI
if (mask > 0xffffffff && forbid_dac > 0) {
-diff -urNp linux-2.6.32.21/arch/x86/kernel/pci-gart_64.c linux-2.6.32.21/arch/x86/kernel/pci-gart_64.c
---- linux-2.6.32.21/arch/x86/kernel/pci-gart_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/pci-gart_64.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/pci-gart_64.c linux-2.6.32.22/arch/x86/kernel/pci-gart_64.c
+--- linux-2.6.32.22/arch/x86/kernel/pci-gart_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/pci-gart_64.c 2010-09-04 15:54:51.000000000 -0400
@@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag
return -1;
}
@@ -13201,9 +13297,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/pci-gart_64.c linux-2.6.32.21/arch/x8
.map_sg = gart_map_sg,
.unmap_sg = gart_unmap_sg,
.map_page = gart_map_page,
-diff -urNp linux-2.6.32.21/arch/x86/kernel/pci-nommu.c linux-2.6.32.21/arch/x86/kernel/pci-nommu.c
---- linux-2.6.32.21/arch/x86/kernel/pci-nommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/pci-nommu.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/pci-nommu.c linux-2.6.32.22/arch/x86/kernel/pci-nommu.c
+--- linux-2.6.32.22/arch/x86/kernel/pci-nommu.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/pci-nommu.c 2010-09-04 15:54:51.000000000 -0400
@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str
flush_write_buffers();
}
@@ -13213,9 +13309,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/pci-nommu.c linux-2.6.32.21/arch/x86/
.alloc_coherent = dma_generic_alloc_coherent,
.free_coherent = nommu_free_coherent,
.map_sg = nommu_map_sg,
-diff -urNp linux-2.6.32.21/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.21/arch/x86/kernel/pci-swiotlb.c
---- linux-2.6.32.21/arch/x86/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/pci-swiotlb.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.22/arch/x86/kernel/pci-swiotlb.c
+--- linux-2.6.32.22/arch/x86/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/pci-swiotlb.c 2010-09-04 15:54:51.000000000 -0400
@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(
return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
}
@@ -13225,9 +13321,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.21/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.21/arch/x86/kernel/process_32.c linux-2.6.32.21/arch/x86/kernel/process_32.c
---- linux-2.6.32.21/arch/x86/kernel/process_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/process_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/process_32.c linux-2.6.32.22/arch/x86/kernel/process_32.c
+--- linux-2.6.32.22/arch/x86/kernel/process_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/process_32.c 2010-09-04 15:54:51.000000000 -0400
@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
unsigned long thread_saved_pc(struct task_struct *tsk)
{
@@ -13322,9 +13418,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/process_32.c linux-2.6.32.21/arch/x86
+ load_sp0(init_tss + smp_processor_id(), thread);
+}
+#endif
-diff -urNp linux-2.6.32.21/arch/x86/kernel/process_64.c linux-2.6.32.21/arch/x86/kernel/process_64.c
---- linux-2.6.32.21/arch/x86/kernel/process_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/process_64.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/process_64.c linux-2.6.32.22/arch/x86/kernel/process_64.c
+--- linux-2.6.32.22/arch/x86/kernel/process_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/process_64.c 2010-09-04 15:54:51.000000000 -0400
@@ -91,7 +91,7 @@ static void __exit_idle(void)
void exit_idle(void)
{
@@ -13367,9 +13463,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/process_64.c linux-2.6.32.21/arch/x86
return 0;
ip = *(u64 *)(fp+8);
if (!in_sched_functions(ip))
-diff -urNp linux-2.6.32.21/arch/x86/kernel/process.c linux-2.6.32.21/arch/x86/kernel/process.c
---- linux-2.6.32.21/arch/x86/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/process.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/process.c linux-2.6.32.22/arch/x86/kernel/process.c
+--- linux-2.6.32.22/arch/x86/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/process.c 2010-09-04 15:54:51.000000000 -0400
@@ -73,7 +73,7 @@ void exit_thread(void)
unsigned long *bp = t->io_bitmap_ptr;
@@ -13407,9 +13503,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/process.c linux-2.6.32.21/arch/x86/ke
- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
-}
-
-diff -urNp linux-2.6.32.21/arch/x86/kernel/ptrace.c linux-2.6.32.21/arch/x86/kernel/ptrace.c
---- linux-2.6.32.21/arch/x86/kernel/ptrace.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/ptrace.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/ptrace.c linux-2.6.32.22/arch/x86/kernel/ptrace.c
+--- linux-2.6.32.22/arch/x86/kernel/ptrace.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/ptrace.c 2010-09-04 15:54:51.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)
{
@@ -13478,9 +13574,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/ptrace.c linux-2.6.32.21/arch/x86/ker
/* Send us the fake SIGTRAP */
force_sig_info(SIGTRAP, &info, tsk);
-diff -urNp linux-2.6.32.21/arch/x86/kernel/reboot.c linux-2.6.32.21/arch/x86/kernel/reboot.c
---- linux-2.6.32.21/arch/x86/kernel/reboot.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/reboot.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/reboot.c linux-2.6.32.22/arch/x86/kernel/reboot.c
+--- linux-2.6.32.22/arch/x86/kernel/reboot.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/reboot.c 2010-09-04 15:54:51.000000000 -0400
@@ -33,7 +33,7 @@ void (*pm_power_off)(void);
EXPORT_SYMBOL(pm_power_off);
@@ -13557,9 +13653,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/reboot.c linux-2.6.32.21/arch/x86/ker
/* Set up the IDT for real mode. */
load_idt(&real_mode_idt);
-diff -urNp linux-2.6.32.21/arch/x86/kernel/setup.c linux-2.6.32.21/arch/x86/kernel/setup.c
---- linux-2.6.32.21/arch/x86/kernel/setup.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/setup.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/setup.c linux-2.6.32.22/arch/x86/kernel/setup.c
+--- linux-2.6.32.22/arch/x86/kernel/setup.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/setup.c 2010-09-04 15:54:51.000000000 -0400
@@ -782,14 +782,14 @@ void __init setup_arch(char **cmdline_p)
if (!boot_params.hdr.root_flags)
@@ -13580,9 +13676,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/setup.c linux-2.6.32.21/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.21/arch/x86/kernel/setup_percpu.c linux-2.6.32.21/arch/x86/kernel/setup_percpu.c
---- linux-2.6.32.21/arch/x86/kernel/setup_percpu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/setup_percpu.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/setup_percpu.c linux-2.6.32.22/arch/x86/kernel/setup_percpu.c
+--- linux-2.6.32.22/arch/x86/kernel/setup_percpu.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/setup_percpu.c 2010-09-04 15:54:51.000000000 -0400
@@ -25,19 +25,17 @@
# define DBG(x...)
#endif
@@ -13645,9 +13741,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/setup_percpu.c linux-2.6.32.21/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.21/arch/x86/kernel/signal.c linux-2.6.32.21/arch/x86/kernel/signal.c
---- linux-2.6.32.21/arch/x86/kernel/signal.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/signal.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/signal.c linux-2.6.32.22/arch/x86/kernel/signal.c
+--- linux-2.6.32.22/arch/x86/kernel/signal.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/signal.c 2010-09-04 15:54:51.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.
@@ -13719,9 +13815,28 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/signal.c linux-2.6.32.21/arch/x86/ker
return;
if (current_thread_info()->status & TS_RESTORE_SIGMASK)
-diff -urNp linux-2.6.32.21/arch/x86/kernel/smpboot.c linux-2.6.32.21/arch/x86/kernel/smpboot.c
---- linux-2.6.32.21/arch/x86/kernel/smpboot.c 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/smpboot.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/smpboot.c linux-2.6.32.22/arch/x86/kernel/smpboot.c
+--- linux-2.6.32.22/arch/x86/kernel/smpboot.c 2010-08-29 21:08:20.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/smpboot.c 2010-09-17 17:44:35.000000000 -0400
+@@ -95,14 +95,14 @@ static DEFINE_PER_CPU(struct task_struct
+ */
+ static DEFINE_MUTEX(x86_cpu_hotplug_driver_mutex);
+
+-void cpu_hotplug_driver_lock()
++void cpu_hotplug_driver_lock(void)
+ {
+- mutex_lock(&x86_cpu_hotplug_driver_mutex);
++ mutex_lock(&x86_cpu_hotplug_driver_mutex);
+ }
+
+-void cpu_hotplug_driver_unlock()
++void cpu_hotplug_driver_unlock(void)
+ {
+- mutex_unlock(&x86_cpu_hotplug_driver_mutex);
++ mutex_unlock(&x86_cpu_hotplug_driver_mutex);
+ }
+
+ ssize_t arch_cpu_probe(const char *buf, size_t count) { return -1; }
@@ -748,7 +748,11 @@ do_rest:
(unsigned long)task_stack_page(c_idle.idle) -
KERNEL_STACK_OFFSET + THREAD_SIZE;
@@ -13747,9 +13862,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/smpboot.c linux-2.6.32.21/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.21/arch/x86/kernel/step.c linux-2.6.32.21/arch/x86/kernel/step.c
---- linux-2.6.32.21/arch/x86/kernel/step.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/step.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/step.c linux-2.6.32.22/arch/x86/kernel/step.c
+--- linux-2.6.32.22/arch/x86/kernel/step.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/step.c 2010-09-04 15:54:51.000000000 -0400
@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
struct desc_struct *desc;
unsigned long base;
@@ -13782,17 +13897,17 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/step.c linux-2.6.32.21/arch/x86/kerne
/* 32-bit mode: register increment */
return 0;
/* 64-bit mode: REX prefix */
-diff -urNp linux-2.6.32.21/arch/x86/kernel/syscall_table_32.S linux-2.6.32.21/arch/x86/kernel/syscall_table_32.S
---- linux-2.6.32.21/arch/x86/kernel/syscall_table_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/syscall_table_32.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/syscall_table_32.S linux-2.6.32.22/arch/x86/kernel/syscall_table_32.S
+--- linux-2.6.32.22/arch/x86/kernel/syscall_table_32.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/syscall_table_32.S 2010-09-04 15:54:51.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.21/arch/x86/kernel/sys_i386_32.c linux-2.6.32.21/arch/x86/kernel/sys_i386_32.c
---- linux-2.6.32.21/arch/x86/kernel/sys_i386_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/sys_i386_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/sys_i386_32.c linux-2.6.32.22/arch/x86/kernel/sys_i386_32.c
+--- linux-2.6.32.22/arch/x86/kernel/sys_i386_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/sys_i386_32.c 2010-09-17 18:34:04.000000000 -0400
@@ -24,6 +24,21 @@
#include <asm/syscalls.h>
@@ -13815,7 +13930,7 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/sys_i386_32.c linux-2.6.32.21/arch/x8
/*
* Perform the select(nd, in, out, ex, tv) and mmap() system
* calls. Linux/i386 didn't use to be able to handle more than
-@@ -58,6 +73,205 @@ out:
+@@ -58,6 +73,208 @@ out:
return err;
}
@@ -13844,10 +13959,11 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/sys_i386_32.c linux-2.6.32.21/arch/x8
+
+ if (addr) {
+ addr = PAGE_ALIGN(addr);
-+ vma = find_vma(mm, addr);
-+ if (pax_task_size - len >= addr &&
-+ (!vma || addr + len <= vma->vm_start))
-+ return addr;
++ if (pax_task_size - len >= addr) {
++ vma = find_vma(mm, addr);
++ if (check_heap_stack_gap(vma, addr, len))
++ return addr;
++ }
+ }
+ if (len > mm->cached_hole_size) {
+ start_addr = addr = mm->free_area_cache;
@@ -13887,13 +14003,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/sys_i386_32.c linux-2.6.32.21/arch/x8
+ }
+ return -ENOMEM;
+ }
-+ if (!vma || addr + len <= vma->vm_start) {
-+ /*
-+ * Remember the place where we stopped the search:
-+ */
-+ mm->free_area_cache = addr + len;
-+ return addr;
-+ }
++ if (check_heap_stack_gap(vma, addr, len))
++ break;
+ if (addr + mm->cached_hole_size < vma->vm_start)
+ mm->cached_hole_size = vma->vm_start - addr;
+ addr = vma->vm_end;
@@ -13903,6 +14014,12 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/sys_i386_32.c linux-2.6.32.21/arch/x8
+ goto full_search;
+ }
+ }
++
++ /*
++ * Remember the place where we stopped the search:
++ */
++ mm->free_area_cache = addr + len;
++ return addr;
+}
+
+unsigned long
@@ -13938,10 +14055,11 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/sys_i386_32.c linux-2.6.32.21/arch/x8
+ /* requesting a specific address */
+ if (addr) {
+ addr = PAGE_ALIGN(addr);
-+ vma = find_vma(mm, addr);
-+ if (pax_task_size - len >= addr &&
-+ (!vma || addr + len <= vma->vm_start))
-+ return addr;
++ if (pax_task_size - len >= addr) {
++ vma = find_vma(mm, addr);
++ if (check_heap_stack_gap(vma, addr, len))
++ return addr;
++ }
+ }
+
+ /* check if free_area_cache is useful for us */
@@ -13956,7 +14074,7 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/sys_i386_32.c linux-2.6.32.21/arch/x8
+ /* make sure it can fit in the remaining address space */
+ if (addr > len) {
+ vma = find_vma(mm, addr-len);
-+ if (!vma || addr <= vma->vm_start)
++ if (check_heap_stack_gap(vma, addr - len, len))
+ /* remember the address as a hint for next time */
+ return (mm->free_area_cache = addr-len);
+ }
@@ -13973,7 +14091,7 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/sys_i386_32.c linux-2.6.32.21/arch/x8
+ * return with success:
+ */
+ vma = find_vma(mm, addr);
-+ if (!vma || addr+len <= vma->vm_start)
++ if (check_heap_stack_gap(vma, addr, len))
+ /* remember the address as a hint for next time */
+ return (mm->free_area_cache = addr);
+
@@ -14021,7 +14139,7 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/sys_i386_32.c linux-2.6.32.21/arch/x8
struct sel_arg_struct {
unsigned long n;
-@@ -93,7 +307,7 @@ asmlinkage int sys_ipc(uint call, int fi
+@@ -93,7 +310,7 @@ asmlinkage int sys_ipc(uint call, int fi
return sys_semtimedop(first, (struct sembuf __user *)ptr, second, NULL);
case SEMTIMEDOP:
return sys_semtimedop(first, (struct sembuf __user *)ptr, second,
@@ -14030,7 +14148,7 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/sys_i386_32.c linux-2.6.32.21/arch/x8
case SEMGET:
return sys_semget(first, second, third);
-@@ -140,7 +354,7 @@ asmlinkage int sys_ipc(uint call, int fi
+@@ -140,7 +357,7 @@ asmlinkage int sys_ipc(uint call, int fi
ret = do_shmat(first, (char __user *) ptr, second, &raddr);
if (ret)
return ret;
@@ -14039,9 +14157,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/sys_i386_32.c linux-2.6.32.21/arch/x8
}
case 1: /* iBCS2 emulator entry point */
if (!segment_eq(get_fs(), get_ds()))
-diff -urNp linux-2.6.32.21/arch/x86/kernel/sys_x86_64.c linux-2.6.32.21/arch/x86/kernel/sys_x86_64.c
---- linux-2.6.32.21/arch/x86/kernel/sys_x86_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/sys_x86_64.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/sys_x86_64.c linux-2.6.32.22/arch/x86/kernel/sys_x86_64.c
+--- linux-2.6.32.22/arch/x86/kernel/sys_x86_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/sys_x86_64.c 2010-09-17 18:34:04.000000000 -0400
@@ -32,8 +32,8 @@ out:
return error;
}
@@ -14062,7 +14180,7 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/sys_x86_64.c linux-2.6.32.21/arch/x86
*end = TASK_SIZE;
}
}
-@@ -69,11 +69,15 @@ arch_get_unmapped_area(struct file *filp
+@@ -69,16 +69,19 @@ arch_get_unmapped_area(struct file *filp
if (flags & MAP_FIXED)
return addr;
@@ -14079,7 +14197,22 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/sys_x86_64.c linux-2.6.32.21/arch/x86
if (addr) {
addr = PAGE_ALIGN(addr);
vma = find_vma(mm, addr);
-@@ -128,7 +132,7 @@ arch_get_unmapped_area_topdown(struct fi
+- if (end - len >= addr &&
+- (!vma || addr + len <= vma->vm_start))
++ if (end - len >= addr && check_heap_stack_gap(vma, addr, len))
+ return addr;
+ }
+ if (((flags & MAP_32BIT) || test_thread_flag(TIF_IA32))
+@@ -106,7 +109,7 @@ full_search:
+ }
+ return -ENOMEM;
+ }
+- if (!vma || addr + len <= vma->vm_start) {
++ if (check_heap_stack_gap(vma, addr, len)) {
+ /*
+ * Remember the place where we stopped the search:
+ */
+@@ -128,7 +131,7 @@ arch_get_unmapped_area_topdown(struct fi
{
struct vm_area_struct *vma;
struct mm_struct *mm = current->mm;
@@ -14088,7 +14221,7 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/sys_x86_64.c linux-2.6.32.21/arch/x86
/* requested length too big for entire address space */
if (len > TASK_SIZE)
-@@ -141,6 +145,10 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -141,12 +144,15 @@ arch_get_unmapped_area_topdown(struct fi
if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT))
goto bottomup;
@@ -14099,7 +14232,32 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/sys_x86_64.c linux-2.6.32.21/arch/x86
/* requesting a specific address */
if (addr) {
addr = PAGE_ALIGN(addr);
-@@ -198,13 +206,21 @@ bottomup:
+ vma = find_vma(mm, addr);
+- if (TASK_SIZE - len >= addr &&
+- (!vma || addr + len <= vma->vm_start))
++ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
+ return addr;
+ }
+
+@@ -162,7 +168,7 @@ arch_get_unmapped_area_topdown(struct fi
+ /* make sure it can fit in the remaining address space */
+ if (addr > len) {
+ vma = find_vma(mm, addr-len);
+- if (!vma || addr <= vma->vm_start)
++ if (check_heap_stack_gap(vma, addr - len, len))
+ /* remember the address as a hint for next time */
+ return mm->free_area_cache = addr-len;
+ }
+@@ -179,7 +185,7 @@ arch_get_unmapped_area_topdown(struct fi
+ * return with success:
+ */
+ vma = find_vma(mm, addr);
+- if (!vma || addr+len <= vma->vm_start)
++ if (check_heap_stack_gap(vma, addr, len))
+ /* remember the address as a hint for next time */
+ return mm->free_area_cache = addr;
+
+@@ -198,13 +204,21 @@ bottomup:
* can happen with large stack limits and large mmap()
* allocations.
*/
@@ -14123,9 +14281,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/sys_x86_64.c linux-2.6.32.21/arch/x86
mm->cached_hole_size = ~0UL;
return addr;
-diff -urNp linux-2.6.32.21/arch/x86/kernel/time.c linux-2.6.32.21/arch/x86/kernel/time.c
---- linux-2.6.32.21/arch/x86/kernel/time.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/time.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/time.c linux-2.6.32.22/arch/x86/kernel/time.c
+--- linux-2.6.32.22/arch/x86/kernel/time.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/time.c 2010-09-04 15:54:51.000000000 -0400
@@ -26,17 +26,13 @@
int timer_ack;
#endif
@@ -14164,9 +14322,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/time.c linux-2.6.32.21/arch/x86/kerne
}
return pc;
}
-diff -urNp linux-2.6.32.21/arch/x86/kernel/tls.c linux-2.6.32.21/arch/x86/kernel/tls.c
---- linux-2.6.32.21/arch/x86/kernel/tls.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/tls.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/tls.c linux-2.6.32.22/arch/x86/kernel/tls.c
+--- linux-2.6.32.22/arch/x86/kernel/tls.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/tls.c 2010-09-04 15:54:51.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;
@@ -14179,9 +14337,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/tls.c linux-2.6.32.21/arch/x86/kernel
set_tls_desc(p, idx, &info, 1);
return 0;
-diff -urNp linux-2.6.32.21/arch/x86/kernel/trampoline_32.S linux-2.6.32.21/arch/x86/kernel/trampoline_32.S
---- linux-2.6.32.21/arch/x86/kernel/trampoline_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/trampoline_32.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/trampoline_32.S linux-2.6.32.22/arch/x86/kernel/trampoline_32.S
+--- linux-2.6.32.22/arch/x86/kernel/trampoline_32.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/trampoline_32.S 2010-09-04 15:54:51.000000000 -0400
@@ -32,6 +32,12 @@
#include <asm/segment.h>
#include <asm/page_types.h>
@@ -14204,9 +14362,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/trampoline_32.S linux-2.6.32.21/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.21/arch/x86/kernel/traps.c linux-2.6.32.21/arch/x86/kernel/traps.c
---- linux-2.6.32.21/arch/x86/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/traps.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/traps.c linux-2.6.32.22/arch/x86/kernel/traps.c
+--- linux-2.6.32.22/arch/x86/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/traps.c 2010-09-04 15:54:51.000000000 -0400
@@ -69,12 +69,6 @@ asmlinkage int system_call(void);
/* Do we ignore FPU interrupts ? */
@@ -14356,10 +14514,10 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/traps.c linux-2.6.32.21/arch/x86/kern
handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code);
return;
}
-diff -urNp linux-2.6.32.21/arch/x86/kernel/tsc.c linux-2.6.32.21/arch/x86/kernel/tsc.c
---- linux-2.6.32.21/arch/x86/kernel/tsc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/tsc.c 2010-09-04 15:54:51.000000000 -0400
-@@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b
+diff -urNp linux-2.6.32.22/arch/x86/kernel/tsc.c linux-2.6.32.22/arch/x86/kernel/tsc.c
+--- linux-2.6.32.22/arch/x86/kernel/tsc.c 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/tsc.c 2010-09-20 17:27:14.000000000 -0400
+@@ -833,7 +833,7 @@ static struct dmi_system_id __initdata b
DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),
},
},
@@ -14368,9 +14526,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/tsc.c linux-2.6.32.21/arch/x86/kernel
};
static void __init check_system_tsc_reliable(void)
-diff -urNp linux-2.6.32.21/arch/x86/kernel/vm86_32.c linux-2.6.32.21/arch/x86/kernel/vm86_32.c
---- linux-2.6.32.21/arch/x86/kernel/vm86_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/vm86_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/vm86_32.c linux-2.6.32.22/arch/x86/kernel/vm86_32.c
+--- linux-2.6.32.22/arch/x86/kernel/vm86_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/vm86_32.c 2010-09-04 15:54:51.000000000 -0400
@@ -41,6 +41,7 @@
#include <linux/ptrace.h>
#include <linux/audit.h>
@@ -14435,9 +14593,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/vm86_32.c linux-2.6.32.21/arch/x86/ke
if (get_user(segoffs, intr_ptr))
goto cannot_handle;
if ((segoffs >> 16) == BIOSSEG)
-diff -urNp linux-2.6.32.21/arch/x86/kernel/vmi_32.c linux-2.6.32.21/arch/x86/kernel/vmi_32.c
---- linux-2.6.32.21/arch/x86/kernel/vmi_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/vmi_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/vmi_32.c linux-2.6.32.22/arch/x86/kernel/vmi_32.c
+--- linux-2.6.32.22/arch/x86/kernel/vmi_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/vmi_32.c 2010-09-04 15:54:51.000000000 -0400
@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1)))
typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
@@ -14597,24 +14755,15 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/vmi_32.c linux-2.6.32.21/arch/x86/ker
return;
local_irq_save(flags);
-diff -urNp linux-2.6.32.21/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.21/arch/x86/kernel/vmlinux.lds.S
---- linux-2.6.32.21/arch/x86/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/vmlinux.lds.S 2010-09-04 15:54:51.000000000 -0400
-@@ -26,6 +26,22 @@
+diff -urNp linux-2.6.32.22/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.22/arch/x86/kernel/vmlinux.lds.S
+--- linux-2.6.32.22/arch/x86/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/vmlinux.lds.S 2010-09-17 17:29:28.000000000 -0400
+@@ -26,6 +26,13 @@
#include <asm/page_types.h>
#include <asm/cache.h>
#include <asm/boot.h>
+#include <asm/segment.h>
+
-+#undef PMD_SIZE
-+#undef PMD_SHIFT
-+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
-+#define PMD_SHIFT 21
-+#else
-+#define PMD_SHIFT 22
-+#endif
-+#define PMD_SIZE (1 << PMD_SHIFT)
-+
+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
+#else
@@ -14623,7 +14772,7 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.21/arch/x8
#undef i386 /* in case the preprocessor is a 32bit one */
-@@ -34,40 +50,55 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONF
+@@ -34,40 +41,55 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONF
#ifdef CONFIG_X86_32
OUTPUT_ARCH(i386)
ENTRY(phys_startup_32)
@@ -14689,7 +14838,7 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.21/arch/x8
HEAD_TEXT
#ifdef CONFIG_X86_32
. = ALIGN(PAGE_SIZE);
-@@ -82,28 +113,69 @@ SECTIONS
+@@ -82,28 +104,69 @@ SECTIONS
IRQENTRY_TEXT
*(.fixup)
*(.gnu.warning)
@@ -14766,7 +14915,7 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.21/arch/x8
PAGE_ALIGNED_DATA(PAGE_SIZE)
-@@ -166,12 +238,6 @@ SECTIONS
+@@ -166,12 +229,6 @@ SECTIONS
}
vgetcpu_mode = VVIRT(.vgetcpu_mode);
@@ -14779,7 +14928,7 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.21/arch/x8
.vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) {
*(.vsyscall_3)
}
-@@ -187,12 +253,19 @@ SECTIONS
+@@ -187,12 +244,19 @@ SECTIONS
#endif /* CONFIG_X86_64 */
/* Init code and data - will be freed after init */
@@ -14802,7 +14951,7 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.21/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 +274,27 @@ SECTIONS
+@@ -201,12 +265,27 @@ SECTIONS
PERCPU_VADDR(0, :percpu)
#endif
@@ -14818,7 +14967,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.21/arch/x8
+ VMLINUX_SYMBOL(_einittext) = .;
+ . = ALIGN(PAGE_SIZE);
+ } :text.init
-+
+
+- INIT_DATA_SECTION(16)
+ /*
+ * .exit.text is discard at runtime, not link time, to deal with
+ * references from .altinstructions and .eh_frame
@@ -14828,14 +14978,13 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.21/arch/x8
+ . = ALIGN(16);
+ } :text.exit
+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
-
-- INIT_DATA_SECTION(16)
++
+ . = ALIGN(PAGE_SIZE);
+ INIT_DATA_SECTION(16) :init
.x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
__x86_cpu_dev_start = .;
-@@ -232,19 +320,11 @@ SECTIONS
+@@ -232,19 +311,11 @@ SECTIONS
*(.altinstr_replacement)
}
@@ -14856,7 +15005,7 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.21/arch/x8
PERCPU(PAGE_SIZE)
#endif
-@@ -267,12 +347,6 @@ SECTIONS
+@@ -267,12 +338,6 @@ SECTIONS
. = ALIGN(PAGE_SIZE);
}
@@ -14869,7 +15018,7 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.21/arch/x8
/* BSS */
. = ALIGN(PAGE_SIZE);
.bss : AT(ADDR(.bss) - LOAD_OFFSET) {
-@@ -288,6 +362,7 @@ SECTIONS
+@@ -288,6 +353,7 @@ SECTIONS
__brk_base = .;
. += 64 * 1024; /* 64k alignment slop space */
*(.brk_reservation) /* areas brk users have reserved */
@@ -14877,7 +15026,7 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.21/arch/x8
__brk_limit = .;
}
-@@ -316,13 +391,12 @@ SECTIONS
+@@ -316,13 +382,12 @@ SECTIONS
* for the boot processor.
*/
#define INIT_PER_CPU(x) init_per_cpu__##x = per_cpu__##x + __per_cpu_load
@@ -14892,9 +15041,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.21/arch/x8
"kernel image bigger than KERNEL_IMAGE_SIZE");
#ifdef CONFIG_SMP
-diff -urNp linux-2.6.32.21/arch/x86/kernel/vsyscall_64.c linux-2.6.32.21/arch/x86/kernel/vsyscall_64.c
---- linux-2.6.32.21/arch/x86/kernel/vsyscall_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/vsyscall_64.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/vsyscall_64.c linux-2.6.32.22/arch/x86/kernel/vsyscall_64.c
+--- linux-2.6.32.22/arch/x86/kernel/vsyscall_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/vsyscall_64.c 2010-09-04 15:54:51.000000000 -0400
@@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa
write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
@@ -14928,9 +15077,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/vsyscall_64.c linux-2.6.32.21/arch/x8
};
#endif
-diff -urNp linux-2.6.32.21/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.21/arch/x86/kernel/x8664_ksyms_64.c
---- linux-2.6.32.21/arch/x86/kernel/x8664_ksyms_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/x8664_ksyms_64.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.22/arch/x86/kernel/x8664_ksyms_64.c
+--- linux-2.6.32.22/arch/x86/kernel/x8664_ksyms_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/x8664_ksyms_64.c 2010-09-04 15:54:51.000000000 -0400
@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8);
EXPORT_SYMBOL(copy_user_generic);
@@ -14940,9 +15089,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.21/arch
EXPORT_SYMBOL(__copy_from_user_inatomic);
EXPORT_SYMBOL(copy_page);
-diff -urNp linux-2.6.32.21/arch/x86/kernel/xsave.c linux-2.6.32.21/arch/x86/kernel/xsave.c
---- linux-2.6.32.21/arch/x86/kernel/xsave.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/xsave.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kernel/xsave.c linux-2.6.32.22/arch/x86/kernel/xsave.c
+--- linux-2.6.32.22/arch/x86/kernel/xsave.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kernel/xsave.c 2010-09-04 15:54:51.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;
@@ -14970,9 +15119,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/xsave.c linux-2.6.32.21/arch/x86/kern
buf);
if (unlikely(err)) {
/*
-diff -urNp linux-2.6.32.21/arch/x86/kvm/emulate.c linux-2.6.32.21/arch/x86/kvm/emulate.c
---- linux-2.6.32.21/arch/x86/kvm/emulate.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kvm/emulate.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kvm/emulate.c linux-2.6.32.22/arch/x86/kvm/emulate.c
+--- linux-2.6.32.22/arch/x86/kvm/emulate.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kvm/emulate.c 2010-09-04 15:54:51.000000000 -0400
@@ -81,8 +81,8 @@
#define Src2CL (1<<29)
#define Src2ImmByte (2<<29)
@@ -15009,9 +15158,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kvm/emulate.c linux-2.6.32.21/arch/x86/kvm/e
switch ((_dst).bytes) { \
case 1: \
____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \
-diff -urNp linux-2.6.32.21/arch/x86/kvm/lapic.c linux-2.6.32.21/arch/x86/kvm/lapic.c
---- linux-2.6.32.21/arch/x86/kvm/lapic.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kvm/lapic.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kvm/lapic.c linux-2.6.32.22/arch/x86/kvm/lapic.c
+--- linux-2.6.32.22/arch/x86/kvm/lapic.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kvm/lapic.c 2010-09-04 15:54:51.000000000 -0400
@@ -52,7 +52,7 @@
#define APIC_BUS_CYCLE_NS 1
@@ -15021,9 +15170,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kvm/lapic.c linux-2.6.32.21/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.21/arch/x86/kvm/svm.c linux-2.6.32.21/arch/x86/kvm/svm.c
---- linux-2.6.32.21/arch/x86/kvm/svm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kvm/svm.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kvm/svm.c linux-2.6.32.22/arch/x86/kvm/svm.c
+--- linux-2.6.32.22/arch/x86/kvm/svm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kvm/svm.c 2010-09-04 15:54:51.000000000 -0400
@@ -2482,9 +2482,12 @@ static int handle_exit(struct kvm_run *k
static void reload_tss(struct kvm_vcpu *vcpu)
{
@@ -15047,9 +15196,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kvm/svm.c linux-2.6.32.21/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.21/arch/x86/kvm/vmx.c linux-2.6.32.21/arch/x86/kvm/vmx.c
---- linux-2.6.32.21/arch/x86/kvm/vmx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kvm/vmx.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kvm/vmx.c linux-2.6.32.22/arch/x86/kvm/vmx.c
+--- linux-2.6.32.22/arch/x86/kvm/vmx.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kvm/vmx.c 2010-09-04 15:54:51.000000000 -0400
@@ -569,7 +569,11 @@ static void reload_tss(void)
kvm_get_gdt(&gdt);
@@ -15131,9 +15280,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kvm/vmx.c linux-2.6.32.21/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.21/arch/x86/kvm/x86.c linux-2.6.32.21/arch/x86/kvm/x86.c
---- linux-2.6.32.21/arch/x86/kvm/x86.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kvm/x86.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/kvm/x86.c linux-2.6.32.22/arch/x86/kvm/x86.c
+--- linux-2.6.32.22/arch/x86/kvm/x86.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/kvm/x86.c 2010-09-04 15:54:51.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);
@@ -15235,9 +15384,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kvm/x86.c linux-2.6.32.21/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.21/arch/x86/lib/checksum_32.S linux-2.6.32.21/arch/x86/lib/checksum_32.S
---- linux-2.6.32.21/arch/x86/lib/checksum_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/checksum_32.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/lib/checksum_32.S linux-2.6.32.22/arch/x86/lib/checksum_32.S
+--- linux-2.6.32.22/arch/x86/lib/checksum_32.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/lib/checksum_32.S 2010-09-04 15:54:51.000000000 -0400
@@ -28,7 +28,8 @@
#include <linux/linkage.h>
#include <asm/dwarf2.h>
@@ -15483,9 +15632,9 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/checksum_32.S linux-2.6.32.21/arch/x86/l
#undef ROUND
#undef ROUND1
-diff -urNp linux-2.6.32.21/arch/x86/lib/clear_page_64.S linux-2.6.32.21/arch/x86/lib/clear_page_64.S
---- linux-2.6.32.21/arch/x86/lib/clear_page_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/clear_page_64.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/lib/clear_page_64.S linux-2.6.32.22/arch/x86/lib/clear_page_64.S
+--- linux-2.6.32.22/arch/x86/lib/clear_page_64.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/lib/clear_page_64.S 2010-09-04 15:54:51.000000000 -0400
@@ -43,7 +43,7 @@ ENDPROC(clear_page)
#include <asm/cpufeature.h>
@@ -15495,9 +15644,9 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/clear_page_64.S linux-2.6.32.21/arch/x86
1: .byte 0xeb /* jmp <disp8> */
.byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
2:
-diff -urNp linux-2.6.32.21/arch/x86/lib/copy_page_64.S linux-2.6.32.21/arch/x86/lib/copy_page_64.S
---- linux-2.6.32.21/arch/x86/lib/copy_page_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/copy_page_64.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/lib/copy_page_64.S linux-2.6.32.22/arch/x86/lib/copy_page_64.S
+--- linux-2.6.32.22/arch/x86/lib/copy_page_64.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/lib/copy_page_64.S 2010-09-04 15:54:51.000000000 -0400
@@ -104,7 +104,7 @@ ENDPROC(copy_page)
#include <asm/cpufeature.h>
@@ -15507,9 +15656,9 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/copy_page_64.S linux-2.6.32.21/arch/x86/
1: .byte 0xeb /* jmp <disp8> */
.byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
2:
-diff -urNp linux-2.6.32.21/arch/x86/lib/copy_user_64.S linux-2.6.32.21/arch/x86/lib/copy_user_64.S
---- linux-2.6.32.21/arch/x86/lib/copy_user_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/copy_user_64.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/lib/copy_user_64.S linux-2.6.32.22/arch/x86/lib/copy_user_64.S
+--- linux-2.6.32.22/arch/x86/lib/copy_user_64.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/lib/copy_user_64.S 2010-09-04 15:54:51.000000000 -0400
@@ -15,13 +15,14 @@
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
@@ -15584,9 +15733,9 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/copy_user_64.S linux-2.6.32.21/arch/x86/
movl %edx,%ecx
xorl %eax,%eax
rep
-diff -urNp linux-2.6.32.21/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.21/arch/x86/lib/copy_user_nocache_64.S
---- linux-2.6.32.21/arch/x86/lib/copy_user_nocache_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/copy_user_nocache_64.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.22/arch/x86/lib/copy_user_nocache_64.S
+--- linux-2.6.32.22/arch/x86/lib/copy_user_nocache_64.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/lib/copy_user_nocache_64.S 2010-09-04 15:54:51.000000000 -0400
@@ -14,6 +14,7 @@
#include <asm/current.h>
#include <asm/asm-offsets.h>
@@ -15611,9 +15760,9 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.21/a
cmpl $8,%edx
jb 20f /* less then 8 bytes, go to byte copy loop */
ALIGN_DESTINATION
-diff -urNp linux-2.6.32.21/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.21/arch/x86/lib/csum-wrappers_64.c
---- linux-2.6.32.21/arch/x86/lib/csum-wrappers_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/csum-wrappers_64.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.22/arch/x86/lib/csum-wrappers_64.c
+--- linux-2.6.32.22/arch/x86/lib/csum-wrappers_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/lib/csum-wrappers_64.c 2010-09-04 15:54:51.000000000 -0400
@@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _
len -= 2;
}
@@ -15632,9 +15781,9 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.21/arch/
return csum_partial_copy_generic(src, (void __force *)dst,
len, isum, NULL, errp);
}
-diff -urNp linux-2.6.32.21/arch/x86/lib/getuser.S linux-2.6.32.21/arch/x86/lib/getuser.S
---- linux-2.6.32.21/arch/x86/lib/getuser.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/getuser.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/lib/getuser.S linux-2.6.32.22/arch/x86/lib/getuser.S
+--- linux-2.6.32.22/arch/x86/lib/getuser.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/lib/getuser.S 2010-09-04 15:54:51.000000000 -0400
@@ -33,14 +33,38 @@
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
@@ -15771,9 +15920,9 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/getuser.S linux-2.6.32.21/arch/x86/lib/g
xor %edx,%edx
mov $(-EFAULT),%_ASM_AX
ret
-diff -urNp linux-2.6.32.21/arch/x86/lib/memcpy_64.S linux-2.6.32.21/arch/x86/lib/memcpy_64.S
---- linux-2.6.32.21/arch/x86/lib/memcpy_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/memcpy_64.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/lib/memcpy_64.S linux-2.6.32.22/arch/x86/lib/memcpy_64.S
+--- linux-2.6.32.22/arch/x86/lib/memcpy_64.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/lib/memcpy_64.S 2010-09-04 15:54:51.000000000 -0400
@@ -128,7 +128,7 @@ ENDPROC(__memcpy)
* It is also a lot simpler. Use this when possible:
*/
@@ -15783,9 +15932,9 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/memcpy_64.S linux-2.6.32.21/arch/x86/lib
1: .byte 0xeb /* jmp <disp8> */
.byte (memcpy_c - memcpy) - (2f - 1b) /* offset */
2:
-diff -urNp linux-2.6.32.21/arch/x86/lib/memset_64.S linux-2.6.32.21/arch/x86/lib/memset_64.S
---- linux-2.6.32.21/arch/x86/lib/memset_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/memset_64.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/lib/memset_64.S linux-2.6.32.22/arch/x86/lib/memset_64.S
+--- linux-2.6.32.22/arch/x86/lib/memset_64.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/lib/memset_64.S 2010-09-04 15:54:51.000000000 -0400
@@ -118,7 +118,7 @@ ENDPROC(__memset)
#include <asm/cpufeature.h>
@@ -15795,9 +15944,9 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/memset_64.S linux-2.6.32.21/arch/x86/lib
1: .byte 0xeb /* jmp <disp8> */
.byte (memset_c - memset) - (2f - 1b) /* offset */
2:
-diff -urNp linux-2.6.32.21/arch/x86/lib/mmx_32.c linux-2.6.32.21/arch/x86/lib/mmx_32.c
---- linux-2.6.32.21/arch/x86/lib/mmx_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/mmx_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/lib/mmx_32.c linux-2.6.32.22/arch/x86/lib/mmx_32.c
+--- linux-2.6.32.22/arch/x86/lib/mmx_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/lib/mmx_32.c 2010-09-04 15:54:51.000000000 -0400
@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
{
void *p;
@@ -16113,9 +16262,9 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/mmx_32.c linux-2.6.32.21/arch/x86/lib/mm
from += 64;
to += 64;
-diff -urNp linux-2.6.32.21/arch/x86/lib/putuser.S linux-2.6.32.21/arch/x86/lib/putuser.S
---- linux-2.6.32.21/arch/x86/lib/putuser.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/putuser.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/lib/putuser.S linux-2.6.32.22/arch/x86/lib/putuser.S
+--- linux-2.6.32.22/arch/x86/lib/putuser.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/lib/putuser.S 2010-09-04 15:54:51.000000000 -0400
@@ -15,7 +15,8 @@
#include <asm/thread_info.h>
#include <asm/errno.h>
@@ -16296,9 +16445,9 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/putuser.S linux-2.6.32.21/arch/x86/lib/p
movl $-EFAULT,%eax
EXIT
END(bad_put_user)
-diff -urNp linux-2.6.32.21/arch/x86/lib/usercopy_32.c linux-2.6.32.21/arch/x86/lib/usercopy_32.c
---- linux-2.6.32.21/arch/x86/lib/usercopy_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/usercopy_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/lib/usercopy_32.c linux-2.6.32.22/arch/x86/lib/usercopy_32.c
+--- linux-2.6.32.22/arch/x86/lib/usercopy_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/lib/usercopy_32.c 2010-09-04 15:54:51.000000000 -0400
@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned
* Copy a null terminated string from userspace.
*/
@@ -17267,9 +17416,9 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/usercopy_32.c linux-2.6.32.21/arch/x86/l
+#endif
+
+EXPORT_SYMBOL(set_fs);
-diff -urNp linux-2.6.32.21/arch/x86/lib/usercopy_64.c linux-2.6.32.21/arch/x86/lib/usercopy_64.c
---- linux-2.6.32.21/arch/x86/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/usercopy_64.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/lib/usercopy_64.c linux-2.6.32.22/arch/x86/lib/usercopy_64.c
+--- linux-2.6.32.22/arch/x86/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/lib/usercopy_64.c 2010-09-04 15:54:51.000000000 -0400
@@ -42,6 +42,8 @@ long
__strncpy_from_user(char *dst, const char __user *src, long count)
{
@@ -17306,9 +17455,9 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/usercopy_64.c linux-2.6.32.21/arch/x86/l
}
EXPORT_SYMBOL(copy_in_user);
-diff -urNp linux-2.6.32.21/arch/x86/Makefile linux-2.6.32.21/arch/x86/Makefile
---- linux-2.6.32.21/arch/x86/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/Makefile 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/Makefile linux-2.6.32.22/arch/x86/Makefile
+--- linux-2.6.32.22/arch/x86/Makefile 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/Makefile 2010-09-04 15:54:51.000000000 -0400
@@ -189,3 +189,12 @@ define archhelp
echo ' FDARGS="..." arguments for the booted kernel'
echo ' FDINITRD=file initrd for the booted kernel'
@@ -17322,9 +17471,9 @@ diff -urNp linux-2.6.32.21/arch/x86/Makefile linux-2.6.32.21/arch/x86/Makefile
+
+archprepare:
+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
-diff -urNp linux-2.6.32.21/arch/x86/mm/extable.c linux-2.6.32.21/arch/x86/mm/extable.c
---- linux-2.6.32.21/arch/x86/mm/extable.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/extable.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/mm/extable.c linux-2.6.32.22/arch/x86/mm/extable.c
+--- linux-2.6.32.22/arch/x86/mm/extable.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/mm/extable.c 2010-09-04 15:54:51.000000000 -0400
@@ -1,14 +1,71 @@
#include <linux/module.h>
#include <linux/spinlock.h>
@@ -17398,9 +17547,9 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/extable.c linux-2.6.32.21/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.21/arch/x86/mm/fault.c linux-2.6.32.21/arch/x86/mm/fault.c
---- linux-2.6.32.21/arch/x86/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/fault.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/mm/fault.c linux-2.6.32.22/arch/x86/mm/fault.c
+--- linux-2.6.32.22/arch/x86/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/mm/fault.c 2010-09-04 15:54:51.000000000 -0400
@@ -11,10 +11,19 @@
#include <linux/kprobes.h> /* __kprobes, ... */
#include <linux/mmiotrace.h> /* kmmio_handler, ... */
@@ -18068,9 +18217,9 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/fault.c linux-2.6.32.21/arch/x86/mm/fault
+
+ return ret ? -EFAULT : 0;
+}
-diff -urNp linux-2.6.32.21/arch/x86/mm/gup.c linux-2.6.32.21/arch/x86/mm/gup.c
---- linux-2.6.32.21/arch/x86/mm/gup.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/gup.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/mm/gup.c linux-2.6.32.22/arch/x86/mm/gup.c
+--- linux-2.6.32.22/arch/x86/mm/gup.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/mm/gup.c 2010-09-04 15:54:51.000000000 -0400
@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long
addr = start;
len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -18080,9 +18229,9 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/gup.c linux-2.6.32.21/arch/x86/mm/gup.c
(void __user *)start, len)))
return 0;
-diff -urNp linux-2.6.32.21/arch/x86/mm/highmem_32.c linux-2.6.32.21/arch/x86/mm/highmem_32.c
---- linux-2.6.32.21/arch/x86/mm/highmem_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/highmem_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/mm/highmem_32.c linux-2.6.32.22/arch/x86/mm/highmem_32.c
+--- linux-2.6.32.22/arch/x86/mm/highmem_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/mm/highmem_32.c 2010-09-04 15:54:51.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);
@@ -18094,9 +18243,9 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/highmem_32.c linux-2.6.32.21/arch/x86/mm/
return (void *)vaddr;
}
-diff -urNp linux-2.6.32.21/arch/x86/mm/hugetlbpage.c linux-2.6.32.21/arch/x86/mm/hugetlbpage.c
---- linux-2.6.32.21/arch/x86/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/hugetlbpage.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/mm/hugetlbpage.c linux-2.6.32.22/arch/x86/mm/hugetlbpage.c
+--- linux-2.6.32.22/arch/x86/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/mm/hugetlbpage.c 2010-09-17 18:34:04.000000000 -0400
@@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe
struct hstate *h = hstate_file(file);
struct mm_struct *mm = current->mm;
@@ -18120,7 +18269,7 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/hugetlbpage.c linux-2.6.32.21/arch/x86/mm
}
full_search:
-@@ -281,13 +286,13 @@ full_search:
+@@ -281,26 +286,27 @@ full_search:
for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
/* At this point: (!vma || addr < vma->vm_end). */
@@ -18137,18 +18286,38 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/hugetlbpage.c linux-2.6.32.21/arch/x86/mm
mm->cached_hole_size = 0;
goto full_search;
}
-@@ -310,9 +315,8 @@ static unsigned long hugetlb_get_unmappe
+ return -ENOMEM;
+ }
+- if (!vma || addr + len <= vma->vm_start) {
+- mm->free_area_cache = addr + len;
+- return addr;
+- }
++ if (check_heap_stack_gap(vma, addr, len))
++ break;
+ if (addr + mm->cached_hole_size < vma->vm_start)
+ mm->cached_hole_size = vma->vm_start - addr;
+ addr = ALIGN(vma->vm_end, huge_page_size(h));
+ }
++
++ mm->free_area_cache = addr + len;
++ return addr;
+ }
+
+ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
+@@ -309,10 +315,9 @@ static unsigned long hugetlb_get_unmappe
+ {
struct hstate *h = hstate_file(file);
struct mm_struct *mm = current->mm;
- struct vm_area_struct *vma, *prev_vma;
+- struct vm_area_struct *vma, *prev_vma;
- unsigned long base = mm->mmap_base, addr = addr0;
++ struct vm_area_struct *vma;
+ unsigned long base = mm->mmap_base, addr;
unsigned long largest_hole = mm->cached_hole_size;
- int first_time = 1;
/* don't allow allocations above current base */
if (mm->free_area_cache > base)
-@@ -322,7 +326,7 @@ static unsigned long hugetlb_get_unmappe
+@@ -322,7 +327,7 @@ static unsigned long hugetlb_get_unmappe
largest_hole = 0;
mm->free_area_cache = base;
}
@@ -18157,7 +18326,51 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/hugetlbpage.c linux-2.6.32.21/arch/x86/mm
/* make sure it can fit in the remaining address space */
if (mm->free_area_cache < len)
goto fail;
-@@ -364,22 +368,26 @@ try_again:
+@@ -330,33 +335,27 @@ try_again:
+ /* either no address requested or cant fit in requested address hole */
+ addr = (mm->free_area_cache - len) & huge_page_mask(h);
+ do {
++ vma = find_vma(mm, addr);
+ /*
+ * Lookup failure means no vma is above this address,
+ * i.e. return with success:
+- */
+- if (!(vma = find_vma_prev(mm, addr, &prev_vma)))
+- return addr;
+-
+- /*
+ * new region fits between prev_vma->vm_end and
+ * vma->vm_start, use it:
+ */
+- if (addr + len <= vma->vm_start &&
+- (!prev_vma || (addr >= prev_vma->vm_end))) {
++ if (check_heap_stack_gap(vma, addr, len)) {
+ /* remember the address as a hint for next time */
+- mm->cached_hole_size = largest_hole;
+- return (mm->free_area_cache = addr);
+- } else {
+- /* pull free_area_cache down to the first hole */
+- if (mm->free_area_cache == vma->vm_end) {
+- mm->free_area_cache = vma->vm_start;
+- mm->cached_hole_size = largest_hole;
+- }
++ mm->cached_hole_size = largest_hole;
++ return (mm->free_area_cache = addr);
++ }
++ /* pull free_area_cache down to the first hole */
++ if (mm->free_area_cache == vma->vm_end) {
++ mm->free_area_cache = vma->vm_start;
++ mm->cached_hole_size = largest_hole;
+ }
+
+ /* remember the largest hole we saw so far */
+ if (addr + largest_hole < vma->vm_start)
+- largest_hole = vma->vm_start - addr;
++ largest_hole = vma->vm_start - addr;
+
+ /* try just below the current vma->vm_start */
+ addr = (vma->vm_start - len) & huge_page_mask(h);
+@@ -364,22 +363,26 @@ try_again:
fail:
/*
@@ -18195,7 +18408,7 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/hugetlbpage.c linux-2.6.32.21/arch/x86/mm
mm->cached_hole_size = ~0UL;
addr = hugetlb_get_unmapped_area_bottomup(file, addr0,
len, pgoff, flags);
-@@ -387,6 +395,7 @@ fail:
+@@ -387,6 +390,7 @@ fail:
/*
* Restore the topdown base:
*/
@@ -18203,7 +18416,7 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/hugetlbpage.c linux-2.6.32.21/arch/x86/mm
mm->free_area_cache = base;
mm->cached_hole_size = ~0UL;
-@@ -400,10 +409,17 @@ hugetlb_get_unmapped_area(struct file *f
+@@ -400,10 +404,17 @@ hugetlb_get_unmapped_area(struct file *f
struct hstate *h = hstate_file(file);
struct mm_struct *mm = current->mm;
struct vm_area_struct *vma;
@@ -18222,18 +18435,19 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/hugetlbpage.c linux-2.6.32.21/arch/x86/mm
return -ENOMEM;
if (flags & MAP_FIXED) {
-@@ -415,7 +431,7 @@ hugetlb_get_unmapped_area(struct file *f
+@@ -415,8 +426,7 @@ hugetlb_get_unmapped_area(struct file *f
if (addr) {
addr = ALIGN(addr, huge_page_size(h));
vma = find_vma(mm, addr);
- if (TASK_SIZE - len >= addr &&
-+ if (pax_task_size - len >= addr &&
- (!vma || addr + len <= vma->vm_start))
+- (!vma || addr + len <= vma->vm_start))
++ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
return addr;
}
-diff -urNp linux-2.6.32.21/arch/x86/mm/init_32.c linux-2.6.32.21/arch/x86/mm/init_32.c
---- linux-2.6.32.21/arch/x86/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/init_32.c 2010-09-04 15:54:51.000000000 -0400
+ if (mm->get_unmapped_area == arch_get_unmapped_area)
+diff -urNp linux-2.6.32.22/arch/x86/mm/init_32.c linux-2.6.32.22/arch/x86/mm/init_32.c
+--- linux-2.6.32.22/arch/x86/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/mm/init_32.c 2010-09-04 15:54:51.000000000 -0400
@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
}
@@ -18537,9 +18751,9 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/init_32.c linux-2.6.32.21/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.21/arch/x86/mm/init_64.c linux-2.6.32.21/arch/x86/mm/init_64.c
---- linux-2.6.32.21/arch/x86/mm/init_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/init_64.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/mm/init_64.c linux-2.6.32.22/arch/x86/mm/init_64.c
+--- linux-2.6.32.22/arch/x86/mm/init_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/mm/init_64.c 2010-09-04 15:54:51.000000000 -0400
@@ -164,7 +164,9 @@ void set_pte_vaddr_pud(pud_t *pud_page,
pmd = fill_pmd(pud, vaddr);
pte = fill_pte(pmd, vaddr);
@@ -18600,9 +18814,9 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/init_64.c linux-2.6.32.21/arch/x86/mm/ini
return "[vdso]";
if (vma == &gate_vma)
return "[vsyscall]";
-diff -urNp linux-2.6.32.21/arch/x86/mm/init.c linux-2.6.32.21/arch/x86/mm/init.c
---- linux-2.6.32.21/arch/x86/mm/init.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/init.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/mm/init.c linux-2.6.32.22/arch/x86/mm/init.c
+--- linux-2.6.32.22/arch/x86/mm/init.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/mm/init.c 2010-09-16 22:50:17.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.
@@ -18616,6 +18830,15 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/init.c linux-2.6.32.21/arch/x86/mm/init.c
e820_table_start = find_e820_area(start, max_pfn_mapped<<PAGE_SHIFT,
tables, PAGE_SIZE);
if (e820_table_start == -1UL)
+@@ -147,7 +143,7 @@ unsigned long __init_refok init_memory_m
+ #endif
+
+ set_nx();
+- if (nx_enabled)
++ if (nx_enabled && cpu_has_nx)
+ printk(KERN_INFO "NX (Execute Disable) protection: active\n");
+
+ /* Enable PSE if available */
@@ -331,7 +327,13 @@ unsigned long __init_refok init_memory_m
*/
int devmem_is_allowed(unsigned long pagenr)
@@ -18720,9 +18943,9 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/init.c linux-2.6.32.21/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.21/arch/x86/mm/iomap_32.c linux-2.6.32.21/arch/x86/mm/iomap_32.c
---- linux-2.6.32.21/arch/x86/mm/iomap_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/iomap_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/mm/iomap_32.c linux-2.6.32.22/arch/x86/mm/iomap_32.c
+--- linux-2.6.32.22/arch/x86/mm/iomap_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/mm/iomap_32.c 2010-09-04 15:54:51.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();
@@ -18735,9 +18958,9 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/iomap_32.c linux-2.6.32.21/arch/x86/mm/io
arch_flush_lazy_mmu_mode();
return (void *)vaddr;
-diff -urNp linux-2.6.32.21/arch/x86/mm/ioremap.c linux-2.6.32.21/arch/x86/mm/ioremap.c
---- linux-2.6.32.21/arch/x86/mm/ioremap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/ioremap.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/mm/ioremap.c linux-2.6.32.22/arch/x86/mm/ioremap.c
+--- linux-2.6.32.22/arch/x86/mm/ioremap.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/mm/ioremap.c 2010-09-04 15:54:51.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.
@@ -18784,9 +19007,9 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/ioremap.c linux-2.6.32.21/arch/x86/mm/ior
/*
* The boot-ioremap range spans multiple pmds, for which
-diff -urNp linux-2.6.32.21/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.21/arch/x86/mm/kmemcheck/kmemcheck.c
---- linux-2.6.32.21/arch/x86/mm/kmemcheck/kmemcheck.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/kmemcheck/kmemcheck.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.22/arch/x86/mm/kmemcheck/kmemcheck.c
+--- linux-2.6.32.22/arch/x86/mm/kmemcheck/kmemcheck.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/mm/kmemcheck/kmemcheck.c 2010-09-04 15:54:51.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.
@@ -18799,9 +19022,9 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.21/arc
return false;
pte = kmemcheck_pte_lookup(address);
-diff -urNp linux-2.6.32.21/arch/x86/mm/mmap.c linux-2.6.32.21/arch/x86/mm/mmap.c
---- linux-2.6.32.21/arch/x86/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/mmap.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/mm/mmap.c linux-2.6.32.22/arch/x86/mm/mmap.c
+--- linux-2.6.32.22/arch/x86/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/mm/mmap.c 2010-09-04 15:54:51.000000000 -0400
@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
* Leave an at least ~128 MB hole with possible stack randomization.
*/
@@ -18883,9 +19106,9 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/mmap.c linux-2.6.32.21/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.21/arch/x86/mm/numa_32.c linux-2.6.32.21/arch/x86/mm/numa_32.c
---- linux-2.6.32.21/arch/x86/mm/numa_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/numa_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/mm/numa_32.c linux-2.6.32.22/arch/x86/mm/numa_32.c
+--- linux-2.6.32.22/arch/x86/mm/numa_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/mm/numa_32.c 2010-09-04 15:54:51.000000000 -0400
@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int
}
#endif
@@ -18894,9 +19117,9 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/numa_32.c linux-2.6.32.21/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.21/arch/x86/mm/pageattr.c linux-2.6.32.21/arch/x86/mm/pageattr.c
---- linux-2.6.32.21/arch/x86/mm/pageattr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/pageattr.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/mm/pageattr.c linux-2.6.32.22/arch/x86/mm/pageattr.c
+--- linux-2.6.32.22/arch/x86/mm/pageattr.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/mm/pageattr.c 2010-09-04 15:54:51.000000000 -0400
@@ -261,16 +261,17 @@ static inline pgprot_t static_protection
* PCI BIOS based config access (CONFIG_PCI_GOBIOS) support.
*/
@@ -18973,9 +19196,9 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/pageattr.c linux-2.6.32.21/arch/x86/mm/pa
}
static int
-diff -urNp linux-2.6.32.21/arch/x86/mm/pageattr-test.c linux-2.6.32.21/arch/x86/mm/pageattr-test.c
---- linux-2.6.32.21/arch/x86/mm/pageattr-test.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/pageattr-test.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/mm/pageattr-test.c linux-2.6.32.22/arch/x86/mm/pageattr-test.c
+--- linux-2.6.32.22/arch/x86/mm/pageattr-test.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/mm/pageattr-test.c 2010-09-04 15:54:51.000000000 -0400
@@ -36,7 +36,7 @@ enum {
static int pte_testbit(pte_t pte)
@@ -18985,9 +19208,9 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/pageattr-test.c linux-2.6.32.21/arch/x86/
}
struct split_state {
-diff -urNp linux-2.6.32.21/arch/x86/mm/pat.c linux-2.6.32.21/arch/x86/mm/pat.c
---- linux-2.6.32.21/arch/x86/mm/pat.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/pat.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/mm/pat.c linux-2.6.32.22/arch/x86/mm/pat.c
+--- linux-2.6.32.22/arch/x86/mm/pat.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/mm/pat.c 2010-09-04 15:54:51.000000000 -0400
@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct
conflict:
@@ -19035,9 +19258,9 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/pat.c linux-2.6.32.21/arch/x86/mm/pat.c
cattr_name(want_flags),
(unsigned long long)paddr,
(unsigned long long)(paddr + size),
-diff -urNp linux-2.6.32.21/arch/x86/mm/pgtable_32.c linux-2.6.32.21/arch/x86/mm/pgtable_32.c
---- linux-2.6.32.21/arch/x86/mm/pgtable_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/pgtable_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/mm/pgtable_32.c linux-2.6.32.22/arch/x86/mm/pgtable_32.c
+--- linux-2.6.32.22/arch/x86/mm/pgtable_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/mm/pgtable_32.c 2010-09-04 15:54:51.000000000 -0400
@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr,
return;
}
@@ -19052,9 +19275,9 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/pgtable_32.c linux-2.6.32.21/arch/x86/mm/
/*
* It's enough to flush this one mapping.
-diff -urNp linux-2.6.32.21/arch/x86/mm/pgtable.c linux-2.6.32.21/arch/x86/mm/pgtable.c
---- linux-2.6.32.21/arch/x86/mm/pgtable.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/pgtable.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/mm/pgtable.c linux-2.6.32.22/arch/x86/mm/pgtable.c
+--- linux-2.6.32.22/arch/x86/mm/pgtable.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/mm/pgtable.c 2010-09-04 15:54:51.000000000 -0400
@@ -83,8 +83,59 @@ static inline void pgd_list_del(pgd_t *p
list_del(&page->lru);
}
@@ -19308,9 +19531,9 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/pgtable.c linux-2.6.32.21/arch/x86/mm/pgt
pgd_dtor(pgd);
paravirt_pgd_free(mm, pgd);
free_page((unsigned long)pgd);
-diff -urNp linux-2.6.32.21/arch/x86/mm/setup_nx.c linux-2.6.32.21/arch/x86/mm/setup_nx.c
---- linux-2.6.32.21/arch/x86/mm/setup_nx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/setup_nx.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/mm/setup_nx.c linux-2.6.32.22/arch/x86/mm/setup_nx.c
+--- linux-2.6.32.22/arch/x86/mm/setup_nx.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/mm/setup_nx.c 2010-09-04 15:54:51.000000000 -0400
@@ -4,11 +4,10 @@
#include <asm/pgtable.h>
@@ -19376,9 +19599,9 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/setup_nx.c linux-2.6.32.21/arch/x86/mm/se
__supported_pte_mask &= ~_PAGE_NX;
}
#endif
-diff -urNp linux-2.6.32.21/arch/x86/mm/tlb.c linux-2.6.32.21/arch/x86/mm/tlb.c
---- linux-2.6.32.21/arch/x86/mm/tlb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/tlb.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/mm/tlb.c linux-2.6.32.22/arch/x86/mm/tlb.c
+--- linux-2.6.32.22/arch/x86/mm/tlb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/mm/tlb.c 2010-09-04 15:54:51.000000000 -0400
@@ -12,7 +12,7 @@
#include <asm/uv/uv.h>
@@ -19400,9 +19623,9 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/tlb.c linux-2.6.32.21/arch/x86/mm/tlb.c
}
EXPORT_SYMBOL_GPL(leave_mm);
-diff -urNp linux-2.6.32.21/arch/x86/oprofile/backtrace.c linux-2.6.32.21/arch/x86/oprofile/backtrace.c
---- linux-2.6.32.21/arch/x86/oprofile/backtrace.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/oprofile/backtrace.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/oprofile/backtrace.c linux-2.6.32.22/arch/x86/oprofile/backtrace.c
+--- linux-2.6.32.22/arch/x86/oprofile/backtrace.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/oprofile/backtrace.c 2010-09-04 15:54:51.000000000 -0400
@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back
struct frame_head bufhead[2];
@@ -19421,9 +19644,9 @@ diff -urNp linux-2.6.32.21/arch/x86/oprofile/backtrace.c linux-2.6.32.21/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.21/arch/x86/oprofile/op_model_p4.c linux-2.6.32.21/arch/x86/oprofile/op_model_p4.c
---- linux-2.6.32.21/arch/x86/oprofile/op_model_p4.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/oprofile/op_model_p4.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/oprofile/op_model_p4.c linux-2.6.32.22/arch/x86/oprofile/op_model_p4.c
+--- linux-2.6.32.22/arch/x86/oprofile/op_model_p4.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/oprofile/op_model_p4.c 2010-09-04 15:54:51.000000000 -0400
@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
#endif
}
@@ -19433,9 +19656,9 @@ diff -urNp linux-2.6.32.21/arch/x86/oprofile/op_model_p4.c linux-2.6.32.21/arch/
{
#ifdef CONFIG_SMP
return smp_num_siblings == 2 ? 2 : 1;
-diff -urNp linux-2.6.32.21/arch/x86/pci/common.c linux-2.6.32.21/arch/x86/pci/common.c
---- linux-2.6.32.21/arch/x86/pci/common.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/pci/common.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/pci/common.c linux-2.6.32.22/arch/x86/pci/common.c
+--- linux-2.6.32.22/arch/x86/pci/common.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/pci/common.c 2010-09-04 15:54:51.000000000 -0400
@@ -31,8 +31,8 @@ int noioapicreroute = 1;
int pcibios_last_bus = -1;
unsigned long pirq_table_addr;
@@ -19456,9 +19679,9 @@ diff -urNp linux-2.6.32.21/arch/x86/pci/common.c linux-2.6.32.21/arch/x86/pci/co
};
void __init dmi_check_pciprobe(void)
-diff -urNp linux-2.6.32.21/arch/x86/pci/direct.c linux-2.6.32.21/arch/x86/pci/direct.c
---- linux-2.6.32.21/arch/x86/pci/direct.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/pci/direct.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/pci/direct.c linux-2.6.32.22/arch/x86/pci/direct.c
+--- linux-2.6.32.22/arch/x86/pci/direct.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/pci/direct.c 2010-09-04 15:54:51.000000000 -0400
@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int
#undef PCI_CONF1_ADDRESS
@@ -19486,9 +19709,9 @@ diff -urNp linux-2.6.32.21/arch/x86/pci/direct.c linux-2.6.32.21/arch/x86/pci/di
{
u32 x = 0;
int year, devfn;
-diff -urNp linux-2.6.32.21/arch/x86/pci/fixup.c linux-2.6.32.21/arch/x86/pci/fixup.c
---- linux-2.6.32.21/arch/x86/pci/fixup.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/pci/fixup.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/pci/fixup.c linux-2.6.32.22/arch/x86/pci/fixup.c
+--- linux-2.6.32.22/arch/x86/pci/fixup.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/pci/fixup.c 2010-09-04 15:54:51.000000000 -0400
@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi
DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"),
},
@@ -19507,9 +19730,9 @@ diff -urNp linux-2.6.32.21/arch/x86/pci/fixup.c linux-2.6.32.21/arch/x86/pci/fix
};
static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
-diff -urNp linux-2.6.32.21/arch/x86/pci/irq.c linux-2.6.32.21/arch/x86/pci/irq.c
---- linux-2.6.32.21/arch/x86/pci/irq.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/pci/irq.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/pci/irq.c linux-2.6.32.22/arch/x86/pci/irq.c
+--- linux-2.6.32.22/arch/x86/pci/irq.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/pci/irq.c 2010-09-04 15:54:51.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) },
@@ -19528,9 +19751,9 @@ diff -urNp linux-2.6.32.21/arch/x86/pci/irq.c linux-2.6.32.21/arch/x86/pci/irq.c
};
int __init pcibios_irq_init(void)
-diff -urNp linux-2.6.32.21/arch/x86/pci/mmconfig_32.c linux-2.6.32.21/arch/x86/pci/mmconfig_32.c
---- linux-2.6.32.21/arch/x86/pci/mmconfig_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/pci/mmconfig_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/pci/mmconfig_32.c linux-2.6.32.22/arch/x86/pci/mmconfig_32.c
+--- linux-2.6.32.22/arch/x86/pci/mmconfig_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/pci/mmconfig_32.c 2010-09-04 15:54:51.000000000 -0400
@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int
return 0;
}
@@ -19540,9 +19763,9 @@ diff -urNp linux-2.6.32.21/arch/x86/pci/mmconfig_32.c linux-2.6.32.21/arch/x86/p
.read = pci_mmcfg_read,
.write = pci_mmcfg_write,
};
-diff -urNp linux-2.6.32.21/arch/x86/pci/mmconfig_64.c linux-2.6.32.21/arch/x86/pci/mmconfig_64.c
---- linux-2.6.32.21/arch/x86/pci/mmconfig_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/pci/mmconfig_64.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/pci/mmconfig_64.c linux-2.6.32.22/arch/x86/pci/mmconfig_64.c
+--- linux-2.6.32.22/arch/x86/pci/mmconfig_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/pci/mmconfig_64.c 2010-09-04 15:54:51.000000000 -0400
@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int
return 0;
}
@@ -19552,9 +19775,9 @@ diff -urNp linux-2.6.32.21/arch/x86/pci/mmconfig_64.c linux-2.6.32.21/arch/x86/p
.read = pci_mmcfg_read,
.write = pci_mmcfg_write,
};
-diff -urNp linux-2.6.32.21/arch/x86/pci/numaq_32.c linux-2.6.32.21/arch/x86/pci/numaq_32.c
---- linux-2.6.32.21/arch/x86/pci/numaq_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/pci/numaq_32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/pci/numaq_32.c linux-2.6.32.22/arch/x86/pci/numaq_32.c
+--- linux-2.6.32.22/arch/x86/pci/numaq_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/pci/numaq_32.c 2010-09-04 15:54:51.000000000 -0400
@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i
#undef PCI_CONF1_MQ_ADDRESS
@@ -19564,9 +19787,9 @@ diff -urNp linux-2.6.32.21/arch/x86/pci/numaq_32.c linux-2.6.32.21/arch/x86/pci/
.read = pci_conf1_mq_read,
.write = pci_conf1_mq_write
};
-diff -urNp linux-2.6.32.21/arch/x86/pci/olpc.c linux-2.6.32.21/arch/x86/pci/olpc.c
---- linux-2.6.32.21/arch/x86/pci/olpc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/pci/olpc.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/pci/olpc.c linux-2.6.32.22/arch/x86/pci/olpc.c
+--- linux-2.6.32.22/arch/x86/pci/olpc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/pci/olpc.c 2010-09-04 15:54:51.000000000 -0400
@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
return 0;
}
@@ -19576,9 +19799,9 @@ diff -urNp linux-2.6.32.21/arch/x86/pci/olpc.c linux-2.6.32.21/arch/x86/pci/olpc
.read = pci_olpc_read,
.write = pci_olpc_write,
};
-diff -urNp linux-2.6.32.21/arch/x86/pci/pcbios.c linux-2.6.32.21/arch/x86/pci/pcbios.c
---- linux-2.6.32.21/arch/x86/pci/pcbios.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/pci/pcbios.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/pci/pcbios.c linux-2.6.32.22/arch/x86/pci/pcbios.c
+--- linux-2.6.32.22/arch/x86/pci/pcbios.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/pci/pcbios.c 2010-09-04 15:54:51.000000000 -0400
@@ -56,50 +56,93 @@ union bios32 {
static struct {
unsigned long address;
@@ -19901,10 +20124,10 @@ diff -urNp linux-2.6.32.21/arch/x86/pci/pcbios.c linux-2.6.32.21/arch/x86/pci/pc
return !(ret & 0xff00);
}
EXPORT_SYMBOL(pcibios_set_irq_routing);
-diff -urNp linux-2.6.32.21/arch/x86/power/cpu.c linux-2.6.32.21/arch/x86/power/cpu.c
---- linux-2.6.32.21/arch/x86/power/cpu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/power/cpu.c 2010-09-04 15:54:51.000000000 -0400
-@@ -128,7 +128,7 @@ static void do_fpu_end(void)
+diff -urNp linux-2.6.32.22/arch/x86/power/cpu.c linux-2.6.32.22/arch/x86/power/cpu.c
+--- linux-2.6.32.22/arch/x86/power/cpu.c 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.22/arch/x86/power/cpu.c 2010-09-20 17:27:14.000000000 -0400
+@@ -129,7 +129,7 @@ static void do_fpu_end(void)
static void fix_processor_context(void)
{
int cpu = smp_processor_id();
@@ -19913,7 +20136,7 @@ diff -urNp linux-2.6.32.21/arch/x86/power/cpu.c linux-2.6.32.21/arch/x86/power/c
set_tss_desc(cpu, t); /*
* This just modifies memory; should not be
-@@ -138,7 +138,9 @@ static void fix_processor_context(void)
+@@ -139,7 +139,9 @@ static void fix_processor_context(void)
*/
#ifdef CONFIG_X86_64
@@ -19923,9 +20146,9 @@ diff -urNp linux-2.6.32.21/arch/x86/power/cpu.c linux-2.6.32.21/arch/x86/power/c
syscall_init(); /* This sets MSR_*STAR and related */
#endif
-diff -urNp linux-2.6.32.21/arch/x86/vdso/Makefile linux-2.6.32.21/arch/x86/vdso/Makefile
---- linux-2.6.32.21/arch/x86/vdso/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/vdso/Makefile 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/vdso/Makefile linux-2.6.32.22/arch/x86/vdso/Makefile
+--- linux-2.6.32.22/arch/x86/vdso/Makefile 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/vdso/Makefile 2010-09-04 15:54:51.000000000 -0400
@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@
$(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
-Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
@@ -19935,9 +20158,9 @@ diff -urNp linux-2.6.32.21/arch/x86/vdso/Makefile linux-2.6.32.21/arch/x86/vdso/
GCOV_PROFILE := n
#
-diff -urNp linux-2.6.32.21/arch/x86/vdso/vclock_gettime.c linux-2.6.32.21/arch/x86/vdso/vclock_gettime.c
---- linux-2.6.32.21/arch/x86/vdso/vclock_gettime.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/vdso/vclock_gettime.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/vdso/vclock_gettime.c linux-2.6.32.22/arch/x86/vdso/vclock_gettime.c
+--- linux-2.6.32.22/arch/x86/vdso/vclock_gettime.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/vdso/vclock_gettime.c 2010-09-04 15:54:51.000000000 -0400
@@ -22,24 +22,48 @@
#include <asm/hpet.h>
#include <asm/unistd.h>
@@ -20036,9 +20259,9 @@ diff -urNp linux-2.6.32.21/arch/x86/vdso/vclock_gettime.c linux-2.6.32.21/arch/x
}
int gettimeofday(struct timeval *, struct timezone *)
__attribute__((weak, alias("__vdso_gettimeofday")));
-diff -urNp linux-2.6.32.21/arch/x86/vdso/vdso32-setup.c linux-2.6.32.21/arch/x86/vdso/vdso32-setup.c
---- linux-2.6.32.21/arch/x86/vdso/vdso32-setup.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/vdso/vdso32-setup.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/vdso/vdso32-setup.c linux-2.6.32.22/arch/x86/vdso/vdso32-setup.c
+--- linux-2.6.32.22/arch/x86/vdso/vdso32-setup.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/vdso/vdso32-setup.c 2010-09-04 15:54:51.000000000 -0400
@@ -25,6 +25,7 @@
#include <asm/tlbflush.h>
#include <asm/vdso.h>
@@ -20139,9 +20362,9 @@ diff -urNp linux-2.6.32.21/arch/x86/vdso/vdso32-setup.c linux-2.6.32.21/arch/x86
return &gate_vma;
return NULL;
}
-diff -urNp linux-2.6.32.21/arch/x86/vdso/vdso.lds.S linux-2.6.32.21/arch/x86/vdso/vdso.lds.S
---- linux-2.6.32.21/arch/x86/vdso/vdso.lds.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/vdso/vdso.lds.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/vdso/vdso.lds.S linux-2.6.32.22/arch/x86/vdso/vdso.lds.S
+--- linux-2.6.32.22/arch/x86/vdso/vdso.lds.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/vdso/vdso.lds.S 2010-09-04 15:54:51.000000000 -0400
@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
#define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
#include "vextern.h"
@@ -20152,9 +20375,9 @@ diff -urNp linux-2.6.32.21/arch/x86/vdso/vdso.lds.S linux-2.6.32.21/arch/x86/vds
+VEXTERN(fallback_time)
+VEXTERN(getcpu)
+#undef VEXTERN
-diff -urNp linux-2.6.32.21/arch/x86/vdso/vextern.h linux-2.6.32.21/arch/x86/vdso/vextern.h
---- linux-2.6.32.21/arch/x86/vdso/vextern.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/vdso/vextern.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/vdso/vextern.h linux-2.6.32.22/arch/x86/vdso/vextern.h
+--- linux-2.6.32.22/arch/x86/vdso/vextern.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/vdso/vextern.h 2010-09-04 15:54:51.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. */
@@ -20162,9 +20385,9 @@ diff -urNp linux-2.6.32.21/arch/x86/vdso/vextern.h linux-2.6.32.21/arch/x86/vdso
-VEXTERN(jiffies)
VEXTERN(vgetcpu_mode)
VEXTERN(vsyscall_gtod_data)
-diff -urNp linux-2.6.32.21/arch/x86/vdso/vma.c linux-2.6.32.21/arch/x86/vdso/vma.c
---- linux-2.6.32.21/arch/x86/vdso/vma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/vdso/vma.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/vdso/vma.c linux-2.6.32.22/arch/x86/vdso/vma.c
+--- linux-2.6.32.22/arch/x86/vdso/vma.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/vdso/vma.c 2010-09-04 15:54:51.000000000 -0400
@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void)
if (!vbase)
goto oom;
@@ -20211,9 +20434,9 @@ diff -urNp linux-2.6.32.21/arch/x86/vdso/vma.c linux-2.6.32.21/arch/x86/vdso/vma
- return 0;
-}
-__setup("vdso=", vdso_setup);
-diff -urNp linux-2.6.32.21/arch/x86/xen/enlighten.c linux-2.6.32.21/arch/x86/xen/enlighten.c
---- linux-2.6.32.21/arch/x86/xen/enlighten.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/xen/enlighten.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/xen/enlighten.c linux-2.6.32.22/arch/x86/xen/enlighten.c
+--- linux-2.6.32.22/arch/x86/xen/enlighten.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/xen/enlighten.c 2010-09-17 17:30:16.000000000 -0400
@@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
struct shared_info xen_dummy_shared_info;
@@ -20241,10 +20464,10 @@ diff -urNp linux-2.6.32.21/arch/x86/xen/enlighten.c linux-2.6.32.21/arch/x86/xen
- check_efer();
+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
-+ (cpuid_edx(0x80000001) & (1 << (X86_FEATURE_NX & 31)))) {
++ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
+ unsigned l, h;
+
-+#if defined(CONFIG_X86_32)
++#ifdef CONFIG_X86_PAE
+ nx_enabled = 1;
+#endif
+ __supported_pte_mask |= _PAGE_NX;
@@ -20269,9 +20492,9 @@ diff -urNp linux-2.6.32.21/arch/x86/xen/enlighten.c linux-2.6.32.21/arch/x86/xen
xen_smp_init();
pgd = (pgd_t *)xen_start_info->pt_base;
-diff -urNp linux-2.6.32.21/arch/x86/xen/mmu.c linux-2.6.32.21/arch/x86/xen/mmu.c
---- linux-2.6.32.21/arch/x86/xen/mmu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/xen/mmu.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/xen/mmu.c linux-2.6.32.22/arch/x86/xen/mmu.c
+--- linux-2.6.32.22/arch/x86/xen/mmu.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/xen/mmu.c 2010-09-04 15:54:51.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);
@@ -20292,9 +20515,9 @@ diff -urNp linux-2.6.32.21/arch/x86/xen/mmu.c linux-2.6.32.21/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.21/arch/x86/xen/smp.c linux-2.6.32.21/arch/x86/xen/smp.c
---- linux-2.6.32.21/arch/x86/xen/smp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/xen/smp.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/xen/smp.c linux-2.6.32.22/arch/x86/xen/smp.c
+--- linux-2.6.32.22/arch/x86/xen/smp.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/xen/smp.c 2010-09-04 15:54:51.000000000 -0400
@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_
{
BUG_ON(smp_processor_id() != 0);
@@ -20318,9 +20541,9 @@ diff -urNp linux-2.6.32.21/arch/x86/xen/smp.c linux-2.6.32.21/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.21/arch/x86/xen/xen-head.S linux-2.6.32.21/arch/x86/xen/xen-head.S
---- linux-2.6.32.21/arch/x86/xen/xen-head.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/xen/xen-head.S 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/xen/xen-head.S linux-2.6.32.22/arch/x86/xen/xen-head.S
+--- linux-2.6.32.22/arch/x86/xen/xen-head.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/xen/xen-head.S 2010-09-04 15:54:51.000000000 -0400
@@ -19,6 +19,17 @@ ENTRY(startup_xen)
#ifdef CONFIG_X86_32
mov %esi,xen_start_info
@@ -20339,9 +20562,9 @@ diff -urNp linux-2.6.32.21/arch/x86/xen/xen-head.S linux-2.6.32.21/arch/x86/xen/
#else
mov %rsi,xen_start_info
mov $init_thread_union+THREAD_SIZE,%rsp
-diff -urNp linux-2.6.32.21/arch/x86/xen/xen-ops.h linux-2.6.32.21/arch/x86/xen/xen-ops.h
---- linux-2.6.32.21/arch/x86/xen/xen-ops.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/xen/xen-ops.h 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/arch/x86/xen/xen-ops.h linux-2.6.32.22/arch/x86/xen/xen-ops.h
+--- linux-2.6.32.22/arch/x86/xen/xen-ops.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/arch/x86/xen/xen-ops.h 2010-09-04 15:54:51.000000000 -0400
@@ -10,8 +10,6 @@
extern const char xen_hypervisor_callback[];
extern const char xen_failsafe_callback[];
@@ -20351,9 +20574,9 @@ diff -urNp linux-2.6.32.21/arch/x86/xen/xen-ops.h linux-2.6.32.21/arch/x86/xen/x
struct trap_info;
void xen_copy_trap_info(struct trap_info *traps);
-diff -urNp linux-2.6.32.21/block/blk-integrity.c linux-2.6.32.21/block/blk-integrity.c
---- linux-2.6.32.21/block/blk-integrity.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/block/blk-integrity.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/block/blk-integrity.c linux-2.6.32.22/block/blk-integrity.c
+--- linux-2.6.32.22/block/blk-integrity.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/block/blk-integrity.c 2010-09-04 15:54:51.000000000 -0400
@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs
NULL,
};
@@ -20363,9 +20586,9 @@ diff -urNp linux-2.6.32.21/block/blk-integrity.c linux-2.6.32.21/block/blk-integ
.show = &integrity_attr_show,
.store = &integrity_attr_store,
};
-diff -urNp linux-2.6.32.21/block/blk-iopoll.c linux-2.6.32.21/block/blk-iopoll.c
---- linux-2.6.32.21/block/blk-iopoll.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/block/blk-iopoll.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/block/blk-iopoll.c linux-2.6.32.22/block/blk-iopoll.c
+--- linux-2.6.32.22/block/blk-iopoll.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/block/blk-iopoll.c 2010-09-04 15:54:51.000000000 -0400
@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
}
EXPORT_SYMBOL(blk_iopoll_complete);
@@ -20375,9 +20598,9 @@ diff -urNp linux-2.6.32.21/block/blk-iopoll.c linux-2.6.32.21/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.21/block/blk-map.c linux-2.6.32.21/block/blk-map.c
---- linux-2.6.32.21/block/blk-map.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/block/blk-map.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/block/blk-map.c linux-2.6.32.22/block/blk-map.c
+--- linux-2.6.32.22/block/blk-map.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/block/blk-map.c 2010-09-04 15:54:51.000000000 -0400
@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
* direct dma. else, set up kernel bounce buffers
*/
@@ -20396,9 +20619,9 @@ diff -urNp linux-2.6.32.21/block/blk-map.c linux-2.6.32.21/block/blk-map.c
if (do_copy)
bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
else
-diff -urNp linux-2.6.32.21/block/blk-softirq.c linux-2.6.32.21/block/blk-softirq.c
---- linux-2.6.32.21/block/blk-softirq.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/block/blk-softirq.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/block/blk-softirq.c linux-2.6.32.22/block/blk-softirq.c
+--- linux-2.6.32.22/block/blk-softirq.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/block/blk-softirq.c 2010-09-04 15:54:51.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.
@@ -20408,9 +20631,9 @@ diff -urNp linux-2.6.32.21/block/blk-softirq.c linux-2.6.32.21/block/blk-softirq
{
struct list_head *cpu_list, local_list;
-diff -urNp linux-2.6.32.21/block/blk-sysfs.c linux-2.6.32.21/block/blk-sysfs.c
---- linux-2.6.32.21/block/blk-sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/block/blk-sysfs.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/block/blk-sysfs.c linux-2.6.32.22/block/blk-sysfs.c
+--- linux-2.6.32.22/block/blk-sysfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/block/blk-sysfs.c 2010-09-04 15:54:51.000000000 -0400
@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob
kmem_cache_free(blk_requestq_cachep, q);
}
@@ -20420,9 +20643,9 @@ diff -urNp linux-2.6.32.21/block/blk-sysfs.c linux-2.6.32.21/block/blk-sysfs.c
.show = queue_attr_show,
.store = queue_attr_store,
};
-diff -urNp linux-2.6.32.21/block/elevator.c linux-2.6.32.21/block/elevator.c
---- linux-2.6.32.21/block/elevator.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/block/elevator.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/block/elevator.c linux-2.6.32.22/block/elevator.c
+--- linux-2.6.32.22/block/elevator.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/block/elevator.c 2010-09-04 15:54:51.000000000 -0400
@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str
return error;
}
@@ -20432,9 +20655,9 @@ diff -urNp linux-2.6.32.21/block/elevator.c linux-2.6.32.21/block/elevator.c
.show = elv_attr_show,
.store = elv_attr_store,
};
-diff -urNp linux-2.6.32.21/crypto/lrw.c linux-2.6.32.21/crypto/lrw.c
---- linux-2.6.32.21/crypto/lrw.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/crypto/lrw.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/crypto/lrw.c linux-2.6.32.22/crypto/lrw.c
+--- linux-2.6.32.22/crypto/lrw.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/crypto/lrw.c 2010-09-04 15:54:51.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;
@@ -20444,9 +20667,9 @@ diff -urNp linux-2.6.32.21/crypto/lrw.c linux-2.6.32.21/crypto/lrw.c
int bsize = crypto_cipher_blocksize(child);
crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
-diff -urNp linux-2.6.32.21/Documentation/dontdiff linux-2.6.32.21/Documentation/dontdiff
---- linux-2.6.32.21/Documentation/dontdiff 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/Documentation/dontdiff 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/Documentation/dontdiff linux-2.6.32.22/Documentation/dontdiff
+--- linux-2.6.32.22/Documentation/dontdiff 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/Documentation/dontdiff 2010-09-04 15:54:51.000000000 -0400
@@ -3,6 +3,7 @@
*.bin
*.cpio
@@ -20564,9 +20787,9 @@ diff -urNp linux-2.6.32.21/Documentation/dontdiff linux-2.6.32.21/Documentation/
zImage*
zconf.hash.c
+zoffset.h
-diff -urNp linux-2.6.32.21/Documentation/kernel-parameters.txt linux-2.6.32.21/Documentation/kernel-parameters.txt
---- linux-2.6.32.21/Documentation/kernel-parameters.txt 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/Documentation/kernel-parameters.txt 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/Documentation/kernel-parameters.txt linux-2.6.32.22/Documentation/kernel-parameters.txt
+--- linux-2.6.32.22/Documentation/kernel-parameters.txt 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/Documentation/kernel-parameters.txt 2010-09-04 15:54:51.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.
@@ -20580,9 +20803,9 @@ diff -urNp linux-2.6.32.21/Documentation/kernel-parameters.txt linux-2.6.32.21/D
pcbit= [HW,ISDN]
pcd. [PARIDE]
-diff -urNp linux-2.6.32.21/drivers/acpi/acpi_pad.c linux-2.6.32.21/drivers/acpi/acpi_pad.c
---- linux-2.6.32.21/drivers/acpi/acpi_pad.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/acpi/acpi_pad.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/acpi/acpi_pad.c linux-2.6.32.22/drivers/acpi/acpi_pad.c
+--- linux-2.6.32.22/drivers/acpi/acpi_pad.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/acpi/acpi_pad.c 2010-09-04 15:54:51.000000000 -0400
@@ -30,7 +30,7 @@
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
@@ -20592,9 +20815,9 @@ diff -urNp linux-2.6.32.21/drivers/acpi/acpi_pad.c linux-2.6.32.21/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.21/drivers/acpi/battery.c linux-2.6.32.21/drivers/acpi/battery.c
---- linux-2.6.32.21/drivers/acpi/battery.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/acpi/battery.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/acpi/battery.c linux-2.6.32.22/drivers/acpi/battery.c
+--- linux-2.6.32.22/drivers/acpi/battery.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/acpi/battery.c 2010-09-04 15:54:51.000000000 -0400
@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
}
@@ -20604,9 +20827,9 @@ diff -urNp linux-2.6.32.21/drivers/acpi/battery.c linux-2.6.32.21/drivers/acpi/b
mode_t mode;
const char *name;
} acpi_battery_file[] = {
-diff -urNp linux-2.6.32.21/drivers/acpi/blacklist.c linux-2.6.32.21/drivers/acpi/blacklist.c
---- linux-2.6.32.21/drivers/acpi/blacklist.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/acpi/blacklist.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/acpi/blacklist.c linux-2.6.32.22/drivers/acpi/blacklist.c
+--- linux-2.6.32.22/drivers/acpi/blacklist.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/acpi/blacklist.c 2010-09-04 15:54:51.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},
@@ -20616,9 +20839,9 @@ diff -urNp linux-2.6.32.21/drivers/acpi/blacklist.c linux-2.6.32.21/drivers/acpi
};
#if CONFIG_ACPI_BLACKLIST_YEAR
-diff -urNp linux-2.6.32.21/drivers/acpi/dock.c linux-2.6.32.21/drivers/acpi/dock.c
---- linux-2.6.32.21/drivers/acpi/dock.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/acpi/dock.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/acpi/dock.c linux-2.6.32.22/drivers/acpi/dock.c
+--- linux-2.6.32.22/drivers/acpi/dock.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/acpi/dock.c 2010-09-04 15:54:51.000000000 -0400
@@ -77,7 +77,7 @@ struct dock_dependent_device {
struct list_head list;
struct list_head hotplug_list;
@@ -20637,9 +20860,9 @@ diff -urNp linux-2.6.32.21/drivers/acpi/dock.c linux-2.6.32.21/drivers/acpi/dock
void *context)
{
struct dock_dependent_device *dd;
-diff -urNp linux-2.6.32.21/drivers/acpi/osl.c linux-2.6.32.21/drivers/acpi/osl.c
---- linux-2.6.32.21/drivers/acpi/osl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/acpi/osl.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/acpi/osl.c linux-2.6.32.22/drivers/acpi/osl.c
+--- linux-2.6.32.22/drivers/acpi/osl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/acpi/osl.c 2010-09-04 15:54:51.000000000 -0400
@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
void __iomem *virt_addr;
@@ -20658,9 +20881,9 @@ diff -urNp linux-2.6.32.21/drivers/acpi/osl.c linux-2.6.32.21/drivers/acpi/osl.c
switch (width) {
case 8:
-diff -urNp linux-2.6.32.21/drivers/acpi/power_meter.c linux-2.6.32.21/drivers/acpi/power_meter.c
---- linux-2.6.32.21/drivers/acpi/power_meter.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/acpi/power_meter.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/acpi/power_meter.c linux-2.6.32.22/drivers/acpi/power_meter.c
+--- linux-2.6.32.22/drivers/acpi/power_meter.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/acpi/power_meter.c 2010-09-04 15:54:51.000000000 -0400
@@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d
return res;
@@ -20670,9 +20893,9 @@ diff -urNp linux-2.6.32.21/drivers/acpi/power_meter.c linux-2.6.32.21/drivers/ac
mutex_lock(&resource->lock);
resource->trip[attr->index - 7] = temp;
-diff -urNp linux-2.6.32.21/drivers/acpi/proc.c linux-2.6.32.21/drivers/acpi/proc.c
---- linux-2.6.32.21/drivers/acpi/proc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/acpi/proc.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/acpi/proc.c linux-2.6.32.22/drivers/acpi/proc.c
+--- linux-2.6.32.22/drivers/acpi/proc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/acpi/proc.c 2010-09-04 15:54:51.000000000 -0400
@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f
size_t count, loff_t * ppos)
{
@@ -20708,9 +20931,9 @@ diff -urNp linux-2.6.32.21/drivers/acpi/proc.c linux-2.6.32.21/drivers/acpi/proc
dev->wakeup.state.enabled =
dev->wakeup.state.enabled ? 0 : 1;
found_dev = dev;
-diff -urNp linux-2.6.32.21/drivers/acpi/processor_core.c linux-2.6.32.21/drivers/acpi/processor_core.c
---- linux-2.6.32.21/drivers/acpi/processor_core.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/acpi/processor_core.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/acpi/processor_core.c linux-2.6.32.22/drivers/acpi/processor_core.c
+--- linux-2.6.32.22/drivers/acpi/processor_core.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/acpi/processor_core.c 2010-09-04 15:54:51.000000000 -0400
@@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add(
return 0;
}
@@ -20720,9 +20943,9 @@ diff -urNp linux-2.6.32.21/drivers/acpi/processor_core.c linux-2.6.32.21/drivers
/*
* Buggy BIOS check
-diff -urNp linux-2.6.32.21/drivers/acpi/processor_idle.c linux-2.6.32.21/drivers/acpi/processor_idle.c
---- linux-2.6.32.21/drivers/acpi/processor_idle.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/acpi/processor_idle.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/acpi/processor_idle.c linux-2.6.32.22/drivers/acpi/processor_idle.c
+--- linux-2.6.32.22/drivers/acpi/processor_idle.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/acpi/processor_idle.c 2010-09-04 15:54:51.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")},
@@ -20732,9 +20955,9 @@ diff -urNp linux-2.6.32.21/drivers/acpi/processor_idle.c linux-2.6.32.21/drivers
};
-diff -urNp linux-2.6.32.21/drivers/acpi/sbshc.c linux-2.6.32.21/drivers/acpi/sbshc.c
---- linux-2.6.32.21/drivers/acpi/sbshc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/acpi/sbshc.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/acpi/sbshc.c linux-2.6.32.22/drivers/acpi/sbshc.c
+--- linux-2.6.32.22/drivers/acpi/sbshc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/acpi/sbshc.c 2010-09-04 15:54:51.000000000 -0400
@@ -17,7 +17,7 @@
#define PREFIX "ACPI: "
@@ -20744,9 +20967,9 @@ diff -urNp linux-2.6.32.21/drivers/acpi/sbshc.c linux-2.6.32.21/drivers/acpi/sbs
#define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC"
struct acpi_smb_hc {
-diff -urNp linux-2.6.32.21/drivers/acpi/sleep.c linux-2.6.32.21/drivers/acpi/sleep.c
---- linux-2.6.32.21/drivers/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/acpi/sleep.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/acpi/sleep.c linux-2.6.32.22/drivers/acpi/sleep.c
+--- linux-2.6.32.22/drivers/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/acpi/sleep.c 2010-09-04 15:54:51.000000000 -0400
@@ -283,7 +283,7 @@ static int acpi_suspend_state_valid(susp
}
}
@@ -20783,9 +21006,9 @@ diff -urNp linux-2.6.32.21/drivers/acpi/sleep.c linux-2.6.32.21/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.21/drivers/acpi/video.c linux-2.6.32.21/drivers/acpi/video.c
---- linux-2.6.32.21/drivers/acpi/video.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/acpi/video.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/acpi/video.c linux-2.6.32.22/drivers/acpi/video.c
+--- linux-2.6.32.22/drivers/acpi/video.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/acpi/video.c 2010-09-04 15:54:51.000000000 -0400
@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str
vd->brightness->levels[request_level]);
}
@@ -20795,9 +21018,9 @@ diff -urNp linux-2.6.32.21/drivers/acpi/video.c linux-2.6.32.21/drivers/acpi/vid
.get_brightness = acpi_video_get_brightness,
.update_status = acpi_video_set_brightness,
};
-diff -urNp linux-2.6.32.21/drivers/ata/ahci.c linux-2.6.32.21/drivers/ata/ahci.c
---- linux-2.6.32.21/drivers/ata/ahci.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/ahci.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/ahci.c linux-2.6.32.22/drivers/ata/ahci.c
+--- linux-2.6.32.22/drivers/ata/ahci.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/ahci.c 2010-09-04 15:54:51.000000000 -0400
@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh
.sdev_attrs = ahci_sdev_attrs,
};
@@ -20837,9 +21060,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/ahci.c linux-2.6.32.21/drivers/ata/ahci.c
};
-diff -urNp linux-2.6.32.21/drivers/ata/ata_generic.c linux-2.6.32.21/drivers/ata/ata_generic.c
---- linux-2.6.32.21/drivers/ata/ata_generic.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/ata_generic.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/ata_generic.c linux-2.6.32.22/drivers/ata/ata_generic.c
+--- linux-2.6.32.22/drivers/ata/ata_generic.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/ata_generic.c 2010-09-04 15:54:51.000000000 -0400
@@ -95,7 +95,7 @@ static struct scsi_host_template generic
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20849,9 +21072,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/ata_generic.c linux-2.6.32.21/drivers/ata
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_unknown,
.set_mode = generic_set_mode,
-diff -urNp linux-2.6.32.21/drivers/ata/ata_piix.c linux-2.6.32.21/drivers/ata/ata_piix.c
---- linux-2.6.32.21/drivers/ata/ata_piix.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/ata_piix.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/ata_piix.c linux-2.6.32.22/drivers/ata/ata_piix.c
+--- linux-2.6.32.22/drivers/ata/ata_piix.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/ata_piix.c 2010-09-04 15:54:51.000000000 -0400
@@ -300,7 +300,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) */
@@ -20915,9 +21138,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/ata_piix.c linux-2.6.32.21/drivers/ata/at
};
static const char *oemstrs[] = {
"Tecra M3,",
-diff -urNp linux-2.6.32.21/drivers/ata/libata-acpi.c linux-2.6.32.21/drivers/ata/libata-acpi.c
---- linux-2.6.32.21/drivers/ata/libata-acpi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/libata-acpi.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/libata-acpi.c linux-2.6.32.22/drivers/ata/libata-acpi.c
+--- linux-2.6.32.22/drivers/ata/libata-acpi.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/libata-acpi.c 2010-09-04 15:54:51.000000000 -0400
@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han
ata_acpi_uevent(dev->link->ap, dev, event);
}
@@ -20933,9 +21156,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/libata-acpi.c linux-2.6.32.21/drivers/ata
.handler = ata_acpi_ap_notify_dock,
.uevent = ata_acpi_ap_uevent,
};
-diff -urNp linux-2.6.32.21/drivers/ata/libata-core.c linux-2.6.32.21/drivers/ata/libata-core.c
---- linux-2.6.32.21/drivers/ata/libata-core.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/libata-core.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/libata-core.c linux-2.6.32.22/drivers/ata/libata-core.c
+--- linux-2.6.32.22/drivers/ata/libata-core.c 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/libata-core.c 2010-09-20 17:27:14.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 },
@@ -20963,7 +21186,7 @@ diff -urNp linux-2.6.32.21/drivers/ata/libata-core.c linux-2.6.32.21/drivers/ata
};
static int strn_pattern_cmp(const char *patt, const char *name, int wildchar)
-@@ -5969,7 +5969,7 @@ static void ata_host_stop(struct device
+@@ -5981,7 +5981,7 @@ static void ata_host_stop(struct device
* LOCKING:
* None.
*/
@@ -20972,7 +21195,7 @@ diff -urNp linux-2.6.32.21/drivers/ata/libata-core.c linux-2.6.32.21/drivers/ata
{
static DEFINE_SPINLOCK(lock);
const struct ata_port_operations *cur;
-@@ -5981,6 +5981,7 @@ static void ata_finalize_port_ops(struct
+@@ -5993,6 +5993,7 @@ static void ata_finalize_port_ops(struct
return;
spin_lock(&lock);
@@ -20980,7 +21203,7 @@ diff -urNp linux-2.6.32.21/drivers/ata/libata-core.c linux-2.6.32.21/drivers/ata
for (cur = ops->inherits; cur; cur = cur->inherits) {
void **inherit = (void **)cur;
-@@ -5994,8 +5995,9 @@ static void ata_finalize_port_ops(struct
+@@ -6006,8 +6007,9 @@ static void ata_finalize_port_ops(struct
if (IS_ERR(*pp))
*pp = NULL;
@@ -20991,7 +21214,7 @@ diff -urNp linux-2.6.32.21/drivers/ata/libata-core.c linux-2.6.32.21/drivers/ata
spin_unlock(&lock);
}
-@@ -6092,7 +6094,7 @@ int ata_host_start(struct ata_host *host
+@@ -6104,7 +6106,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,
@@ -21000,7 +21223,7 @@ diff -urNp linux-2.6.32.21/drivers/ata/libata-core.c linux-2.6.32.21/drivers/ata
{
spin_lock_init(&host->lock);
host->dev = dev;
-@@ -6755,7 +6757,7 @@ static void ata_dummy_error_handler(stru
+@@ -6767,7 +6769,7 @@ static void ata_dummy_error_handler(stru
/* truly dummy */
}
@@ -21009,10 +21232,10 @@ diff -urNp linux-2.6.32.21/drivers/ata/libata-core.c linux-2.6.32.21/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.21/drivers/ata/libata-eh.c linux-2.6.32.21/drivers/ata/libata-eh.c
---- linux-2.6.32.21/drivers/ata/libata-eh.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/libata-eh.c 2010-09-04 15:54:51.000000000 -0400
-@@ -3586,7 +3586,7 @@ void ata_do_eh(struct ata_port *ap, ata_
+diff -urNp linux-2.6.32.22/drivers/ata/libata-eh.c linux-2.6.32.22/drivers/ata/libata-eh.c
+--- linux-2.6.32.22/drivers/ata/libata-eh.c 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/libata-eh.c 2010-09-20 17:27:14.000000000 -0400
+@@ -3590,7 +3590,7 @@ void ata_do_eh(struct ata_port *ap, ata_
*/
void ata_std_error_handler(struct ata_port *ap)
{
@@ -21021,9 +21244,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/libata-eh.c linux-2.6.32.21/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.21/drivers/ata/libata-pmp.c linux-2.6.32.21/drivers/ata/libata-pmp.c
---- linux-2.6.32.21/drivers/ata/libata-pmp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/libata-pmp.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/libata-pmp.c linux-2.6.32.22/drivers/ata/libata-pmp.c
+--- linux-2.6.32.22/drivers/ata/libata-pmp.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/libata-pmp.c 2010-09-04 15:54:51.000000000 -0400
@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str
*/
static int sata_pmp_eh_recover(struct ata_port *ap)
@@ -21033,9 +21256,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/libata-pmp.c linux-2.6.32.21/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.21/drivers/ata/pata_acpi.c linux-2.6.32.21/drivers/ata/pata_acpi.c
---- linux-2.6.32.21/drivers/ata/pata_acpi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_acpi.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_acpi.c linux-2.6.32.22/drivers/ata/pata_acpi.c
+--- linux-2.6.32.22/drivers/ata/pata_acpi.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_acpi.c 2010-09-04 15:54:51.000000000 -0400
@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21045,9 +21268,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_acpi.c linux-2.6.32.21/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
.qc_issue = pacpi_qc_issue,
.cable_detect = pacpi_cable_detect,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_ali.c linux-2.6.32.21/drivers/ata/pata_ali.c
---- linux-2.6.32.21/drivers/ata/pata_ali.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_ali.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_ali.c linux-2.6.32.22/drivers/ata/pata_ali.c
+--- linux-2.6.32.22/drivers/ata/pata_ali.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_ali.c 2010-09-04 15:54:51.000000000 -0400
@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht
* Port operations for PIO only ALi
*/
@@ -21093,9 +21316,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_ali.c linux-2.6.32.21/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.21/drivers/ata/pata_amd.c linux-2.6.32.21/drivers/ata/pata_amd.c
---- linux-2.6.32.21/drivers/ata/pata_amd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_amd.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_amd.c linux-2.6.32.22/drivers/ata/pata_amd.c
+--- linux-2.6.32.22/drivers/ata/pata_amd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_amd.c 2010-09-04 15:54:51.000000000 -0400
@@ -397,28 +397,28 @@ static const struct ata_port_operations
.prereset = amd_pre_reset,
};
@@ -21145,9 +21368,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_amd.c linux-2.6.32.21/drivers/ata/pa
.inherits = &nv_base_port_ops,
.set_piomode = nv133_set_piomode,
.set_dmamode = nv133_set_dmamode,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_artop.c linux-2.6.32.21/drivers/ata/pata_artop.c
---- linux-2.6.32.21/drivers/ata/pata_artop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_artop.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_artop.c linux-2.6.32.22/drivers/ata/pata_artop.c
+--- linux-2.6.32.22/drivers/ata/pata_artop.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_artop.c 2010-09-04 15:54:51.000000000 -0400
@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21166,9 +21389,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_artop.c linux-2.6.32.21/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.cable_detect = artop6260_cable_detect,
.set_piomode = artop6260_set_piomode,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_at32.c linux-2.6.32.21/drivers/ata/pata_at32.c
---- linux-2.6.32.21/drivers/ata/pata_at32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_at32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_at32.c linux-2.6.32.22/drivers/ata/pata_at32.c
+--- linux-2.6.32.22/drivers/ata/pata_at32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_at32.c 2010-09-04 15:54:51.000000000 -0400
@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh
ATA_PIO_SHT(DRV_NAME),
};
@@ -21178,9 +21401,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_at32.c linux-2.6.32.21/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.21/drivers/ata/pata_at91.c linux-2.6.32.21/drivers/ata/pata_at91.c
---- linux-2.6.32.21/drivers/ata/pata_at91.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_at91.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_at91.c linux-2.6.32.22/drivers/ata/pata_at91.c
+--- linux-2.6.32.22/drivers/ata/pata_at91.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_at91.c 2010-09-04 15:54:51.000000000 -0400
@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at
ATA_PIO_SHT(DRV_NAME),
};
@@ -21190,9 +21413,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_at91.c linux-2.6.32.21/drivers/ata/p
.inherits = &ata_sff_port_ops,
.sff_data_xfer = pata_at91_data_xfer_noirq,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_atiixp.c linux-2.6.32.21/drivers/ata/pata_atiixp.c
---- linux-2.6.32.21/drivers/ata/pata_atiixp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_atiixp.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_atiixp.c linux-2.6.32.22/drivers/ata/pata_atiixp.c
+--- linux-2.6.32.22/drivers/ata/pata_atiixp.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_atiixp.c 2010-09-04 15:54:51.000000000 -0400
@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -21202,9 +21425,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_atiixp.c linux-2.6.32.21/drivers/ata
.inherits = &ata_bmdma_port_ops,
.qc_prep = ata_sff_dumb_qc_prep,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_atp867x.c linux-2.6.32.21/drivers/ata/pata_atp867x.c
---- linux-2.6.32.21/drivers/ata/pata_atp867x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_atp867x.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_atp867x.c linux-2.6.32.22/drivers/ata/pata_atp867x.c
+--- linux-2.6.32.22/drivers/ata/pata_atp867x.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_atp867x.c 2010-09-04 15:54:51.000000000 -0400
@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21214,9 +21437,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_atp867x.c linux-2.6.32.21/drivers/at
.inherits = &ata_bmdma_port_ops,
.cable_detect = atp867x_cable_detect,
.set_piomode = atp867x_set_piomode,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_bf54x.c linux-2.6.32.21/drivers/ata/pata_bf54x.c
---- linux-2.6.32.21/drivers/ata/pata_bf54x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_bf54x.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_bf54x.c linux-2.6.32.22/drivers/ata/pata_bf54x.c
+--- linux-2.6.32.22/drivers/ata/pata_bf54x.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_bf54x.c 2010-09-04 15:54:51.000000000 -0400
@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh
.dma_boundary = ATA_DMA_BOUNDARY,
};
@@ -21226,9 +21449,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_bf54x.c linux-2.6.32.21/drivers/ata/
.inherits = &ata_sff_port_ops,
.set_piomode = bfin_set_piomode,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_cmd640.c linux-2.6.32.21/drivers/ata/pata_cmd640.c
---- linux-2.6.32.21/drivers/ata/pata_cmd640.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_cmd640.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_cmd640.c linux-2.6.32.22/drivers/ata/pata_cmd640.c
+--- linux-2.6.32.22/drivers/ata/pata_cmd640.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_cmd640.c 2010-09-04 15:54:51.000000000 -0400
@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21238,9 +21461,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_cmd640.c linux-2.6.32.21/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.21/drivers/ata/pata_cmd64x.c linux-2.6.32.21/drivers/ata/pata_cmd64x.c
---- linux-2.6.32.21/drivers/ata/pata_cmd64x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_cmd64x.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_cmd64x.c linux-2.6.32.22/drivers/ata/pata_cmd64x.c
+--- linux-2.6.32.22/drivers/ata/pata_cmd64x.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_cmd64x.c 2010-09-04 15:54:51.000000000 -0400
@@ -275,18 +275,18 @@ static const struct ata_port_operations
.set_dmamode = cmd64x_set_dmamode,
};
@@ -21263,9 +21486,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_cmd64x.c linux-2.6.32.21/drivers/ata
.inherits = &cmd64x_base_ops,
.bmdma_stop = cmd648_bmdma_stop,
.cable_detect = cmd648_cable_detect,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_cs5520.c linux-2.6.32.21/drivers/ata/pata_cs5520.c
---- linux-2.6.32.21/drivers/ata/pata_cs5520.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_cs5520.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_cs5520.c linux-2.6.32.22/drivers/ata/pata_cs5520.c
+--- linux-2.6.32.22/drivers/ata/pata_cs5520.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_cs5520.c 2010-09-04 15:54:51.000000000 -0400
@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -21275,9 +21498,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_cs5520.c linux-2.6.32.21/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.21/drivers/ata/pata_cs5530.c linux-2.6.32.21/drivers/ata/pata_cs5530.c
---- linux-2.6.32.21/drivers/ata/pata_cs5530.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_cs5530.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_cs5530.c linux-2.6.32.22/drivers/ata/pata_cs5530.c
+--- linux-2.6.32.22/drivers/ata/pata_cs5530.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_cs5530.c 2010-09-04 15:54:51.000000000 -0400
@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -21287,9 +21510,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_cs5530.c linux-2.6.32.21/drivers/ata
.inherits = &ata_bmdma_port_ops,
.qc_prep = ata_sff_dumb_qc_prep,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_cs5535.c linux-2.6.32.21/drivers/ata/pata_cs5535.c
---- linux-2.6.32.21/drivers/ata/pata_cs5535.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_cs5535.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_cs5535.c linux-2.6.32.22/drivers/ata/pata_cs5535.c
+--- linux-2.6.32.22/drivers/ata/pata_cs5535.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_cs5535.c 2010-09-04 15:54:51.000000000 -0400
@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21299,9 +21522,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_cs5535.c linux-2.6.32.21/drivers/ata
.inherits = &ata_bmdma_port_ops,
.cable_detect = cs5535_cable_detect,
.set_piomode = cs5535_set_piomode,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_cs5536.c linux-2.6.32.21/drivers/ata/pata_cs5536.c
---- linux-2.6.32.21/drivers/ata/pata_cs5536.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_cs5536.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_cs5536.c linux-2.6.32.22/drivers/ata/pata_cs5536.c
+--- linux-2.6.32.22/drivers/ata/pata_cs5536.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_cs5536.c 2010-09-04 15:54:51.000000000 -0400
@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21311,9 +21534,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_cs5536.c linux-2.6.32.21/drivers/ata
.inherits = &ata_bmdma_port_ops,
.cable_detect = cs5536_cable_detect,
.set_piomode = cs5536_set_piomode,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_cypress.c linux-2.6.32.21/drivers/ata/pata_cypress.c
---- linux-2.6.32.21/drivers/ata/pata_cypress.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_cypress.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_cypress.c linux-2.6.32.22/drivers/ata/pata_cypress.c
+--- linux-2.6.32.22/drivers/ata/pata_cypress.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_cypress.c 2010-09-04 15:54:51.000000000 -0400
@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21323,9 +21546,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_cypress.c linux-2.6.32.21/drivers/at
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_40wire,
.set_piomode = cy82c693_set_piomode,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_efar.c linux-2.6.32.21/drivers/ata/pata_efar.c
---- linux-2.6.32.21/drivers/ata/pata_efar.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_efar.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_efar.c linux-2.6.32.22/drivers/ata/pata_efar.c
+--- linux-2.6.32.22/drivers/ata/pata_efar.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_efar.c 2010-09-04 15:54:51.000000000 -0400
@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21335,9 +21558,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_efar.c linux-2.6.32.21/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
.cable_detect = efar_cable_detect,
.set_piomode = efar_set_piomode,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_hpt366.c linux-2.6.32.21/drivers/ata/pata_hpt366.c
---- linux-2.6.32.21/drivers/ata/pata_hpt366.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_hpt366.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_hpt366.c linux-2.6.32.22/drivers/ata/pata_hpt366.c
+--- linux-2.6.32.22/drivers/ata/pata_hpt366.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_hpt366.c 2010-09-04 15:54:51.000000000 -0400
@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_
* Configuration for HPT366/68
*/
@@ -21347,9 +21570,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_hpt366.c linux-2.6.32.21/drivers/ata
.inherits = &ata_bmdma_port_ops,
.cable_detect = hpt36x_cable_detect,
.mode_filter = hpt366_filter,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_hpt37x.c linux-2.6.32.21/drivers/ata/pata_hpt37x.c
---- linux-2.6.32.21/drivers/ata/pata_hpt37x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_hpt37x.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_hpt37x.c linux-2.6.32.22/drivers/ata/pata_hpt37x.c
+--- linux-2.6.32.22/drivers/ata/pata_hpt37x.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_hpt37x.c 2010-09-04 15:54:51.000000000 -0400
@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_
* Configuration for HPT370
*/
@@ -21386,9 +21609,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_hpt37x.c linux-2.6.32.21/drivers/ata
.inherits = &hpt372_port_ops,
.prereset = hpt374_fn1_pre_reset,
};
-diff -urNp linux-2.6.32.21/drivers/ata/pata_hpt3x2n.c linux-2.6.32.21/drivers/ata/pata_hpt3x2n.c
---- linux-2.6.32.21/drivers/ata/pata_hpt3x2n.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_hpt3x2n.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_hpt3x2n.c linux-2.6.32.22/drivers/ata/pata_hpt3x2n.c
+--- linux-2.6.32.22/drivers/ata/pata_hpt3x2n.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_hpt3x2n.c 2010-09-04 15:54:51.000000000 -0400
@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n
* Configuration for HPT3x2n.
*/
@@ -21398,9 +21621,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_hpt3x2n.c linux-2.6.32.21/drivers/at
.inherits = &ata_bmdma_port_ops,
.bmdma_stop = hpt3x2n_bmdma_stop,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_hpt3x3.c linux-2.6.32.21/drivers/ata/pata_hpt3x3.c
---- linux-2.6.32.21/drivers/ata/pata_hpt3x3.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_hpt3x3.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_hpt3x3.c linux-2.6.32.22/drivers/ata/pata_hpt3x3.c
+--- linux-2.6.32.22/drivers/ata/pata_hpt3x3.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_hpt3x3.c 2010-09-04 15:54:51.000000000 -0400
@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21410,9 +21633,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_hpt3x3.c linux-2.6.32.21/drivers/ata
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_40wire,
.set_piomode = hpt3x3_set_piomode,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_icside.c linux-2.6.32.21/drivers/ata/pata_icside.c
---- linux-2.6.32.21/drivers/ata/pata_icside.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_icside.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_icside.c linux-2.6.32.22/drivers/ata/pata_icside.c
+--- linux-2.6.32.22/drivers/ata/pata_icside.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_icside.c 2010-09-04 15:54:51.000000000 -0400
@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct
}
}
@@ -21422,9 +21645,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_icside.c linux-2.6.32.21/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.21/drivers/ata/pata_isapnp.c linux-2.6.32.21/drivers/ata/pata_isapnp.c
---- linux-2.6.32.21/drivers/ata/pata_isapnp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_isapnp.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_isapnp.c linux-2.6.32.22/drivers/ata/pata_isapnp.c
+--- linux-2.6.32.22/drivers/ata/pata_isapnp.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_isapnp.c 2010-09-04 15:54:51.000000000 -0400
@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
ATA_PIO_SHT(DRV_NAME),
};
@@ -21440,9 +21663,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_isapnp.c linux-2.6.32.21/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.21/drivers/ata/pata_it8213.c linux-2.6.32.21/drivers/ata/pata_it8213.c
---- linux-2.6.32.21/drivers/ata/pata_it8213.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_it8213.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_it8213.c linux-2.6.32.22/drivers/ata/pata_it8213.c
+--- linux-2.6.32.22/drivers/ata/pata_it8213.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_it8213.c 2010-09-04 15:54:51.000000000 -0400
@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_
};
@@ -21452,9 +21675,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_it8213.c linux-2.6.32.21/drivers/ata
.inherits = &ata_bmdma_port_ops,
.cable_detect = it8213_cable_detect,
.set_piomode = it8213_set_piomode,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_it821x.c linux-2.6.32.21/drivers/ata/pata_it821x.c
---- linux-2.6.32.21/drivers/ata/pata_it821x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_it821x.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_it821x.c linux-2.6.32.22/drivers/ata/pata_it821x.c
+--- linux-2.6.32.22/drivers/ata/pata_it821x.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_it821x.c 2010-09-04 15:54:51.000000000 -0400
@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21482,9 +21705,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_it821x.c linux-2.6.32.21/drivers/ata
.inherits = &ata_bmdma_port_ops,
.check_atapi_dma= it821x_check_atapi_dma,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.21/drivers/ata/pata_ixp4xx_cf.c
---- linux-2.6.32.21/drivers/ata/pata_ixp4xx_cf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_ixp4xx_cf.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.22/drivers/ata/pata_ixp4xx_cf.c
+--- linux-2.6.32.22/drivers/ata/pata_ixp4xx_cf.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_ixp4xx_cf.c 2010-09-04 15:54:51.000000000 -0400
@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
ATA_PIO_SHT(DRV_NAME),
};
@@ -21494,9 +21717,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.21/drivers/
.inherits = &ata_sff_port_ops,
.sff_data_xfer = ixp4xx_mmio_data_xfer,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_jmicron.c linux-2.6.32.21/drivers/ata/pata_jmicron.c
---- linux-2.6.32.21/drivers/ata/pata_jmicron.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_jmicron.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_jmicron.c linux-2.6.32.22/drivers/ata/pata_jmicron.c
+--- linux-2.6.32.22/drivers/ata/pata_jmicron.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_jmicron.c 2010-09-04 15:54:51.000000000 -0400
@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21506,9 +21729,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_jmicron.c linux-2.6.32.21/drivers/at
.inherits = &ata_bmdma_port_ops,
.prereset = jmicron_pre_reset,
};
-diff -urNp linux-2.6.32.21/drivers/ata/pata_legacy.c linux-2.6.32.21/drivers/ata/pata_legacy.c
---- linux-2.6.32.21/drivers/ata/pata_legacy.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_legacy.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_legacy.c linux-2.6.32.22/drivers/ata/pata_legacy.c
+--- linux-2.6.32.22/drivers/ata/pata_legacy.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_legacy.c 2010-09-04 15:54:51.000000000 -0400
@@ -106,7 +106,7 @@ struct legacy_probe {
struct legacy_controller {
@@ -21620,9 +21843,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_legacy.c linux-2.6.32.21/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.21/drivers/ata/pata_marvell.c linux-2.6.32.21/drivers/ata/pata_marvell.c
---- linux-2.6.32.21/drivers/ata/pata_marvell.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_marvell.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_marvell.c linux-2.6.32.22/drivers/ata/pata_marvell.c
+--- linux-2.6.32.22/drivers/ata/pata_marvell.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_marvell.c 2010-09-04 15:54:51.000000000 -0400
@@ -100,7 +100,7 @@ static struct scsi_host_template marvell
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21632,9 +21855,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_marvell.c linux-2.6.32.21/drivers/at
.inherits = &ata_bmdma_port_ops,
.cable_detect = marvell_cable_detect,
.prereset = marvell_pre_reset,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_mpc52xx.c linux-2.6.32.21/drivers/ata/pata_mpc52xx.c
---- linux-2.6.32.21/drivers/ata/pata_mpc52xx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_mpc52xx.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_mpc52xx.c linux-2.6.32.22/drivers/ata/pata_mpc52xx.c
+--- linux-2.6.32.22/drivers/ata/pata_mpc52xx.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_mpc52xx.c 2010-09-04 15:54:51.000000000 -0400
@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
ATA_PIO_SHT(DRV_NAME),
};
@@ -21644,9 +21867,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_mpc52xx.c linux-2.6.32.21/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.21/drivers/ata/pata_mpiix.c linux-2.6.32.21/drivers/ata/pata_mpiix.c
---- linux-2.6.32.21/drivers/ata/pata_mpiix.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_mpiix.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_mpiix.c linux-2.6.32.22/drivers/ata/pata_mpiix.c
+--- linux-2.6.32.22/drivers/ata/pata_mpiix.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_mpiix.c 2010-09-04 15:54:51.000000000 -0400
@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
ATA_PIO_SHT(DRV_NAME),
};
@@ -21656,9 +21879,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_mpiix.c linux-2.6.32.21/drivers/ata/
.inherits = &ata_sff_port_ops,
.qc_issue = mpiix_qc_issue,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_netcell.c linux-2.6.32.21/drivers/ata/pata_netcell.c
---- linux-2.6.32.21/drivers/ata/pata_netcell.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_netcell.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_netcell.c linux-2.6.32.22/drivers/ata/pata_netcell.c
+--- linux-2.6.32.22/drivers/ata/pata_netcell.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_netcell.c 2010-09-04 15:54:51.000000000 -0400
@@ -34,7 +34,7 @@ static struct scsi_host_template netcell
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21668,9 +21891,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_netcell.c linux-2.6.32.21/drivers/at
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_80wire,
.read_id = netcell_read_id,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_ninja32.c linux-2.6.32.21/drivers/ata/pata_ninja32.c
---- linux-2.6.32.21/drivers/ata/pata_ninja32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_ninja32.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_ninja32.c linux-2.6.32.22/drivers/ata/pata_ninja32.c
+--- linux-2.6.32.22/drivers/ata/pata_ninja32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_ninja32.c 2010-09-04 15:54:51.000000000 -0400
@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21680,9 +21903,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_ninja32.c linux-2.6.32.21/drivers/at
.inherits = &ata_bmdma_port_ops,
.sff_dev_select = ninja32_dev_select,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_ns87410.c linux-2.6.32.21/drivers/ata/pata_ns87410.c
---- linux-2.6.32.21/drivers/ata/pata_ns87410.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_ns87410.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_ns87410.c linux-2.6.32.22/drivers/ata/pata_ns87410.c
+--- linux-2.6.32.22/drivers/ata/pata_ns87410.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_ns87410.c 2010-09-04 15:54:51.000000000 -0400
@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
ATA_PIO_SHT(DRV_NAME),
};
@@ -21692,9 +21915,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_ns87410.c linux-2.6.32.21/drivers/at
.inherits = &ata_sff_port_ops,
.qc_issue = ns87410_qc_issue,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_ns87415.c linux-2.6.32.21/drivers/ata/pata_ns87415.c
---- linux-2.6.32.21/drivers/ata/pata_ns87415.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_ns87415.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_ns87415.c linux-2.6.32.22/drivers/ata/pata_ns87415.c
+--- linux-2.6.32.22/drivers/ata/pata_ns87415.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_ns87415.c 2010-09-04 15:54:51.000000000 -0400
@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
}
#endif /* 87560 SuperIO Support */
@@ -21713,9 +21936,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_ns87415.c linux-2.6.32.21/drivers/at
.inherits = &ns87415_pata_ops,
.sff_tf_read = ns87560_tf_read,
.sff_check_status = ns87560_check_status,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_octeon_cf.c linux-2.6.32.21/drivers/ata/pata_octeon_cf.c
---- linux-2.6.32.21/drivers/ata/pata_octeon_cf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_octeon_cf.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_octeon_cf.c linux-2.6.32.22/drivers/ata/pata_octeon_cf.c
+--- linux-2.6.32.22/drivers/ata/pata_octeon_cf.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_octeon_cf.c 2010-09-04 15:54:51.000000000 -0400
@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s
return 0;
}
@@ -21724,9 +21947,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_octeon_cf.c linux-2.6.32.21/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.21/drivers/ata/pata_oldpiix.c linux-2.6.32.21/drivers/ata/pata_oldpiix.c
---- linux-2.6.32.21/drivers/ata/pata_oldpiix.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_oldpiix.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_oldpiix.c linux-2.6.32.22/drivers/ata/pata_oldpiix.c
+--- linux-2.6.32.22/drivers/ata/pata_oldpiix.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_oldpiix.c 2010-09-04 15:54:51.000000000 -0400
@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21736,9 +21959,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_oldpiix.c linux-2.6.32.21/drivers/at
.inherits = &ata_bmdma_port_ops,
.qc_issue = oldpiix_qc_issue,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_opti.c linux-2.6.32.21/drivers/ata/pata_opti.c
---- linux-2.6.32.21/drivers/ata/pata_opti.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_opti.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_opti.c linux-2.6.32.22/drivers/ata/pata_opti.c
+--- linux-2.6.32.22/drivers/ata/pata_opti.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_opti.c 2010-09-04 15:54:51.000000000 -0400
@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
ATA_PIO_SHT(DRV_NAME),
};
@@ -21748,9 +21971,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_opti.c linux-2.6.32.21/drivers/ata/p
.inherits = &ata_sff_port_ops,
.cable_detect = ata_cable_40wire,
.set_piomode = opti_set_piomode,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_optidma.c linux-2.6.32.21/drivers/ata/pata_optidma.c
---- linux-2.6.32.21/drivers/ata/pata_optidma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_optidma.c 2010-09-04 15:54:51.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_optidma.c linux-2.6.32.22/drivers/ata/pata_optidma.c
+--- linux-2.6.32.22/drivers/ata/pata_optidma.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_optidma.c 2010-09-04 15:54:51.000000000 -0400
@@ -337,7 +337,7 @@ static struct scsi_host_template optidma
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21769,9 +21992,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_optidma.c linux-2.6.32.21/drivers/at
.inherits = &optidma_port_ops,
.set_piomode = optiplus_set_pio_mode,
.set_dmamode = optiplus_set_dma_mode,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_palmld.c linux-2.6.32.21/drivers/ata/pata_palmld.c
---- linux-2.6.32.21/drivers/ata/pata_palmld.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_palmld.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_palmld.c linux-2.6.32.22/drivers/ata/pata_palmld.c
+--- linux-2.6.32.22/drivers/ata/pata_palmld.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_palmld.c 2010-09-04 15:54:52.000000000 -0400
@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
ATA_PIO_SHT(DRV_NAME),
};
@@ -21781,9 +22004,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_palmld.c linux-2.6.32.21/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.21/drivers/ata/pata_pcmcia.c linux-2.6.32.21/drivers/ata/pata_pcmcia.c
---- linux-2.6.32.21/drivers/ata/pata_pcmcia.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_pcmcia.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_pcmcia.c linux-2.6.32.22/drivers/ata/pata_pcmcia.c
+--- linux-2.6.32.22/drivers/ata/pata_pcmcia.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_pcmcia.c 2010-09-04 15:54:52.000000000 -0400
@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_
ATA_PIO_SHT(DRV_NAME),
};
@@ -21810,9 +22033,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_pcmcia.c linux-2.6.32.21/drivers/ata
info = kzalloc(sizeof(*info), GFP_KERNEL);
if (info == NULL)
-diff -urNp linux-2.6.32.21/drivers/ata/pata_pdc2027x.c linux-2.6.32.21/drivers/ata/pata_pdc2027x.c
---- linux-2.6.32.21/drivers/ata/pata_pdc2027x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_pdc2027x.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_pdc2027x.c linux-2.6.32.22/drivers/ata/pata_pdc2027x.c
+--- linux-2.6.32.22/drivers/ata/pata_pdc2027x.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_pdc2027x.c 2010-09-04 15:54:52.000000000 -0400
@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21830,9 +22053,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_pdc2027x.c linux-2.6.32.21/drivers/a
.inherits = &pdc2027x_pata100_ops,
.mode_filter = pdc2027x_mode_filter,
.set_piomode = pdc2027x_set_piomode,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.21/drivers/ata/pata_pdc202xx_old.c
---- linux-2.6.32.21/drivers/ata/pata_pdc202xx_old.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_pdc202xx_old.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.22/drivers/ata/pata_pdc202xx_old.c
+--- linux-2.6.32.22/drivers/ata/pata_pdc202xx_old.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_pdc202xx_old.c 2010-09-04 15:54:52.000000000 -0400
@@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21851,9 +22074,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.21/drive
.inherits = &pdc2024x_port_ops,
.check_atapi_dma = pdc2026x_check_atapi_dma,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_platform.c linux-2.6.32.21/drivers/ata/pata_platform.c
---- linux-2.6.32.21/drivers/ata/pata_platform.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_platform.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_platform.c linux-2.6.32.22/drivers/ata/pata_platform.c
+--- linux-2.6.32.22/drivers/ata/pata_platform.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_platform.c 2010-09-04 15:54:52.000000000 -0400
@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
ATA_PIO_SHT(DRV_NAME),
};
@@ -21863,9 +22086,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_platform.c linux-2.6.32.21/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.21/drivers/ata/pata_qdi.c linux-2.6.32.21/drivers/ata/pata_qdi.c
---- linux-2.6.32.21/drivers/ata/pata_qdi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_qdi.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_qdi.c linux-2.6.32.22/drivers/ata/pata_qdi.c
+--- linux-2.6.32.22/drivers/ata/pata_qdi.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_qdi.c 2010-09-04 15:54:52.000000000 -0400
@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
ATA_PIO_SHT(DRV_NAME),
};
@@ -21884,9 +22107,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_qdi.c linux-2.6.32.21/drivers/ata/pa
.inherits = &qdi6500_port_ops,
.set_piomode = qdi6580_set_piomode,
};
-diff -urNp linux-2.6.32.21/drivers/ata/pata_radisys.c linux-2.6.32.21/drivers/ata/pata_radisys.c
---- linux-2.6.32.21/drivers/ata/pata_radisys.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_radisys.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_radisys.c linux-2.6.32.22/drivers/ata/pata_radisys.c
+--- linux-2.6.32.22/drivers/ata/pata_radisys.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_radisys.c 2010-09-04 15:54:52.000000000 -0400
@@ -187,7 +187,7 @@ static struct scsi_host_template radisys
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21896,9 +22119,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_radisys.c linux-2.6.32.21/drivers/at
.inherits = &ata_bmdma_port_ops,
.qc_issue = radisys_qc_issue,
.cable_detect = ata_cable_unknown,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_rb532_cf.c linux-2.6.32.21/drivers/ata/pata_rb532_cf.c
---- linux-2.6.32.21/drivers/ata/pata_rb532_cf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_rb532_cf.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_rb532_cf.c linux-2.6.32.22/drivers/ata/pata_rb532_cf.c
+--- linux-2.6.32.22/drivers/ata/pata_rb532_cf.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_rb532_cf.c 2010-09-04 15:54:52.000000000 -0400
@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle
return IRQ_HANDLED;
}
@@ -21908,9 +22131,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_rb532_cf.c linux-2.6.32.21/drivers/a
.inherits = &ata_sff_port_ops,
.sff_data_xfer = ata_sff_data_xfer32,
};
-diff -urNp linux-2.6.32.21/drivers/ata/pata_rdc.c linux-2.6.32.21/drivers/ata/pata_rdc.c
---- linux-2.6.32.21/drivers/ata/pata_rdc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_rdc.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_rdc.c linux-2.6.32.22/drivers/ata/pata_rdc.c
+--- linux-2.6.32.22/drivers/ata/pata_rdc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_rdc.c 2010-09-04 15:54:52.000000000 -0400
@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p
pci_write_config_byte(dev, 0x48, udma_enable);
}
@@ -21920,9 +22143,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_rdc.c linux-2.6.32.21/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.21/drivers/ata/pata_rz1000.c linux-2.6.32.21/drivers/ata/pata_rz1000.c
---- linux-2.6.32.21/drivers/ata/pata_rz1000.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_rz1000.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_rz1000.c linux-2.6.32.22/drivers/ata/pata_rz1000.c
+--- linux-2.6.32.22/drivers/ata/pata_rz1000.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_rz1000.c 2010-09-04 15:54:52.000000000 -0400
@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
ATA_PIO_SHT(DRV_NAME),
};
@@ -21932,9 +22155,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_rz1000.c linux-2.6.32.21/drivers/ata
.inherits = &ata_sff_port_ops,
.cable_detect = ata_cable_40wire,
.set_mode = rz1000_set_mode,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_sc1200.c linux-2.6.32.21/drivers/ata/pata_sc1200.c
---- linux-2.6.32.21/drivers/ata/pata_sc1200.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_sc1200.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_sc1200.c linux-2.6.32.22/drivers/ata/pata_sc1200.c
+--- linux-2.6.32.22/drivers/ata/pata_sc1200.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_sc1200.c 2010-09-04 15:54:52.000000000 -0400
@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -21944,9 +22167,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_sc1200.c linux-2.6.32.21/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.21/drivers/ata/pata_scc.c linux-2.6.32.21/drivers/ata/pata_scc.c
---- linux-2.6.32.21/drivers/ata/pata_scc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_scc.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_scc.c linux-2.6.32.22/drivers/ata/pata_scc.c
+--- linux-2.6.32.22/drivers/ata/pata_scc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_scc.c 2010-09-04 15:54:52.000000000 -0400
@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21956,9 +22179,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_scc.c linux-2.6.32.21/drivers/ata/pa
.inherits = &ata_bmdma_port_ops,
.set_piomode = scc_set_piomode,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_sch.c linux-2.6.32.21/drivers/ata/pata_sch.c
---- linux-2.6.32.21/drivers/ata/pata_sch.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_sch.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_sch.c linux-2.6.32.22/drivers/ata/pata_sch.c
+--- linux-2.6.32.22/drivers/ata/pata_sch.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_sch.c 2010-09-04 15:54:52.000000000 -0400
@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21968,9 +22191,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_sch.c linux-2.6.32.21/drivers/ata/pa
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_unknown,
.set_piomode = sch_set_piomode,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_serverworks.c linux-2.6.32.21/drivers/ata/pata_serverworks.c
---- linux-2.6.32.21/drivers/ata/pata_serverworks.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_serverworks.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_serverworks.c linux-2.6.32.22/drivers/ata/pata_serverworks.c
+--- linux-2.6.32.22/drivers/ata/pata_serverworks.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_serverworks.c 2010-09-04 15:54:52.000000000 -0400
@@ -299,7 +299,7 @@ static struct scsi_host_template serverw
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21989,9 +22212,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_serverworks.c linux-2.6.32.21/driver
.inherits = &serverworks_osb4_port_ops,
.mode_filter = serverworks_csb_filter,
};
-diff -urNp linux-2.6.32.21/drivers/ata/pata_sil680.c linux-2.6.32.21/drivers/ata/pata_sil680.c
---- linux-2.6.32.21/drivers/ata/pata_sil680.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_sil680.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_sil680.c linux-2.6.32.22/drivers/ata/pata_sil680.c
+--- linux-2.6.32.22/drivers/ata/pata_sil680.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_sil680.c 2010-09-04 15:54:52.000000000 -0400
@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22001,9 +22224,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_sil680.c linux-2.6.32.21/drivers/ata
.inherits = &ata_bmdma32_port_ops,
.cable_detect = sil680_cable_detect,
.set_piomode = sil680_set_piomode,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_sis.c linux-2.6.32.21/drivers/ata/pata_sis.c
---- linux-2.6.32.21/drivers/ata/pata_sis.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_sis.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_sis.c linux-2.6.32.22/drivers/ata/pata_sis.c
+--- linux-2.6.32.22/drivers/ata/pata_sis.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_sis.c 2010-09-04 15:54:52.000000000 -0400
@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22059,9 +22282,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_sis.c linux-2.6.32.21/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.21/drivers/ata/pata_sl82c105.c linux-2.6.32.21/drivers/ata/pata_sl82c105.c
---- linux-2.6.32.21/drivers/ata/pata_sl82c105.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_sl82c105.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_sl82c105.c linux-2.6.32.22/drivers/ata/pata_sl82c105.c
+--- linux-2.6.32.22/drivers/ata/pata_sl82c105.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_sl82c105.c 2010-09-04 15:54:52.000000000 -0400
@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22071,9 +22294,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_sl82c105.c linux-2.6.32.21/drivers/a
.inherits = &ata_bmdma_port_ops,
.qc_defer = sl82c105_qc_defer,
.bmdma_start = sl82c105_bmdma_start,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_triflex.c linux-2.6.32.21/drivers/ata/pata_triflex.c
---- linux-2.6.32.21/drivers/ata/pata_triflex.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_triflex.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_triflex.c linux-2.6.32.22/drivers/ata/pata_triflex.c
+--- linux-2.6.32.22/drivers/ata/pata_triflex.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_triflex.c 2010-09-04 15:54:52.000000000 -0400
@@ -178,7 +178,7 @@ static struct scsi_host_template triflex
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22083,9 +22306,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_triflex.c linux-2.6.32.21/drivers/at
.inherits = &ata_bmdma_port_ops,
.bmdma_start = triflex_bmdma_start,
.bmdma_stop = triflex_bmdma_stop,
-diff -urNp linux-2.6.32.21/drivers/ata/pata_via.c linux-2.6.32.21/drivers/ata/pata_via.c
---- linux-2.6.32.21/drivers/ata/pata_via.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_via.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_via.c linux-2.6.32.22/drivers/ata/pata_via.c
+--- linux-2.6.32.22/drivers/ata/pata_via.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_via.c 2010-09-04 15:54:52.000000000 -0400
@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22104,9 +22327,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_via.c linux-2.6.32.21/drivers/ata/pa
.inherits = &via_port_ops,
.sff_data_xfer = ata_sff_data_xfer_noirq,
};
-diff -urNp linux-2.6.32.21/drivers/ata/pata_winbond.c linux-2.6.32.21/drivers/ata/pata_winbond.c
---- linux-2.6.32.21/drivers/ata/pata_winbond.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_winbond.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pata_winbond.c linux-2.6.32.22/drivers/ata/pata_winbond.c
+--- linux-2.6.32.22/drivers/ata/pata_winbond.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pata_winbond.c 2010-09-04 15:54:52.000000000 -0400
@@ -125,7 +125,7 @@ static struct scsi_host_template winbond
ATA_PIO_SHT(DRV_NAME),
};
@@ -22116,9 +22339,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_winbond.c linux-2.6.32.21/drivers/at
.inherits = &ata_sff_port_ops,
.sff_data_xfer = winbond_data_xfer,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.32.21/drivers/ata/pdc_adma.c linux-2.6.32.21/drivers/ata/pdc_adma.c
---- linux-2.6.32.21/drivers/ata/pdc_adma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pdc_adma.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/pdc_adma.c linux-2.6.32.22/drivers/ata/pdc_adma.c
+--- linux-2.6.32.22/drivers/ata/pdc_adma.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/pdc_adma.c 2010-09-04 15:54:52.000000000 -0400
@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at
.dma_boundary = ADMA_DMA_BOUNDARY,
};
@@ -22128,9 +22351,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/pdc_adma.c linux-2.6.32.21/drivers/ata/pd
.inherits = &ata_sff_port_ops,
.lost_interrupt = ATA_OP_NULL,
-diff -urNp linux-2.6.32.21/drivers/ata/sata_fsl.c linux-2.6.32.21/drivers/ata/sata_fsl.c
---- linux-2.6.32.21/drivers/ata/sata_fsl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_fsl.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/sata_fsl.c linux-2.6.32.22/drivers/ata/sata_fsl.c
+--- linux-2.6.32.22/drivers/ata/sata_fsl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/sata_fsl.c 2010-09-04 15:54:52.000000000 -0400
@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
.dma_boundary = ATA_DMA_BOUNDARY,
};
@@ -22140,9 +22363,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_fsl.c linux-2.6.32.21/drivers/ata/sa
.inherits = &sata_pmp_port_ops,
.qc_defer = ata_std_qc_defer,
-diff -urNp linux-2.6.32.21/drivers/ata/sata_inic162x.c linux-2.6.32.21/drivers/ata/sata_inic162x.c
---- linux-2.6.32.21/drivers/ata/sata_inic162x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_inic162x.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/sata_inic162x.c linux-2.6.32.22/drivers/ata/sata_inic162x.c
+--- linux-2.6.32.22/drivers/ata/sata_inic162x.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/sata_inic162x.c 2010-09-04 15:54:52.000000000 -0400
@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po
return 0;
}
@@ -22152,9 +22375,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_inic162x.c linux-2.6.32.21/drivers/a
.inherits = &sata_port_ops,
.check_atapi_dma = inic_check_atapi_dma,
-diff -urNp linux-2.6.32.21/drivers/ata/sata_mv.c linux-2.6.32.21/drivers/ata/sata_mv.c
---- linux-2.6.32.21/drivers/ata/sata_mv.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_mv.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/sata_mv.c linux-2.6.32.22/drivers/ata/sata_mv.c
+--- linux-2.6.32.22/drivers/ata/sata_mv.c 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/sata_mv.c 2010-09-20 17:27:14.000000000 -0400
@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht
.dma_boundary = MV_DMA_BOUNDARY,
};
@@ -22182,9 +22405,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_mv.c linux-2.6.32.21/drivers/ata/sat
.inherits = &mv6_ops,
.dev_config = ATA_OP_NULL,
.qc_prep = mv_qc_prep_iie,
-diff -urNp linux-2.6.32.21/drivers/ata/sata_nv.c linux-2.6.32.21/drivers/ata/sata_nv.c
---- linux-2.6.32.21/drivers/ata/sata_nv.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_nv.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/sata_nv.c linux-2.6.32.22/drivers/ata/sata_nv.c
+--- linux-2.6.32.22/drivers/ata/sata_nv.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/sata_nv.c 2010-09-04 15:54:52.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.
@@ -22227,9 +22450,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_nv.c linux-2.6.32.21/drivers/ata/sat
.inherits = &nv_generic_ops,
.qc_defer = ata_std_qc_defer,
-diff -urNp linux-2.6.32.21/drivers/ata/sata_promise.c linux-2.6.32.21/drivers/ata/sata_promise.c
---- linux-2.6.32.21/drivers/ata/sata_promise.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_promise.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/sata_promise.c linux-2.6.32.22/drivers/ata/sata_promise.c
+--- linux-2.6.32.22/drivers/ata/sata_promise.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/sata_promise.c 2010-09-04 15:54:52.000000000 -0400
@@ -195,7 +195,7 @@ static const struct ata_port_operations
.error_handler = pdc_error_handler,
};
@@ -22256,9 +22479,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_promise.c linux-2.6.32.21/drivers/at
.inherits = &pdc_common_ops,
.cable_detect = pdc_pata_cable_detect,
.freeze = pdc_freeze,
-diff -urNp linux-2.6.32.21/drivers/ata/sata_qstor.c linux-2.6.32.21/drivers/ata/sata_qstor.c
---- linux-2.6.32.21/drivers/ata/sata_qstor.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_qstor.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/sata_qstor.c linux-2.6.32.22/drivers/ata/sata_qstor.c
+--- linux-2.6.32.22/drivers/ata/sata_qstor.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/sata_qstor.c 2010-09-04 15:54:52.000000000 -0400
@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_
.dma_boundary = QS_DMA_BOUNDARY,
};
@@ -22268,9 +22491,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_qstor.c linux-2.6.32.21/drivers/ata/
.inherits = &ata_sff_port_ops,
.check_atapi_dma = qs_check_atapi_dma,
-diff -urNp linux-2.6.32.21/drivers/ata/sata_sil24.c linux-2.6.32.21/drivers/ata/sata_sil24.c
---- linux-2.6.32.21/drivers/ata/sata_sil24.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_sil24.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/sata_sil24.c linux-2.6.32.22/drivers/ata/sata_sil24.c
+--- linux-2.6.32.22/drivers/ata/sata_sil24.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/sata_sil24.c 2010-09-04 15:54:52.000000000 -0400
@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
.dma_boundary = ATA_DMA_BOUNDARY,
};
@@ -22280,9 +22503,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_sil24.c linux-2.6.32.21/drivers/ata/
.inherits = &sata_pmp_port_ops,
.qc_defer = sil24_qc_defer,
-diff -urNp linux-2.6.32.21/drivers/ata/sata_sil.c linux-2.6.32.21/drivers/ata/sata_sil.c
---- linux-2.6.32.21/drivers/ata/sata_sil.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_sil.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/sata_sil.c linux-2.6.32.22/drivers/ata/sata_sil.c
+--- linux-2.6.32.22/drivers/ata/sata_sil.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/sata_sil.c 2010-09-04 15:54:52.000000000 -0400
@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
.sg_tablesize = ATA_MAX_PRD
};
@@ -22292,9 +22515,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_sil.c linux-2.6.32.21/drivers/ata/sa
.inherits = &ata_bmdma32_port_ops,
.dev_config = sil_dev_config,
.set_mode = sil_set_mode,
-diff -urNp linux-2.6.32.21/drivers/ata/sata_sis.c linux-2.6.32.21/drivers/ata/sata_sis.c
---- linux-2.6.32.21/drivers/ata/sata_sis.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_sis.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/sata_sis.c linux-2.6.32.22/drivers/ata/sata_sis.c
+--- linux-2.6.32.22/drivers/ata/sata_sis.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/sata_sis.c 2010-09-04 15:54:52.000000000 -0400
@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22304,9 +22527,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_sis.c linux-2.6.32.21/drivers/ata/sa
.inherits = &ata_bmdma_port_ops,
.scr_read = sis_scr_read,
.scr_write = sis_scr_write,
-diff -urNp linux-2.6.32.21/drivers/ata/sata_svw.c linux-2.6.32.21/drivers/ata/sata_svw.c
---- linux-2.6.32.21/drivers/ata/sata_svw.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_svw.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/sata_svw.c linux-2.6.32.22/drivers/ata/sata_svw.c
+--- linux-2.6.32.22/drivers/ata/sata_svw.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/sata_svw.c 2010-09-04 15:54:52.000000000 -0400
@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
};
@@ -22316,9 +22539,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_svw.c linux-2.6.32.21/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.21/drivers/ata/sata_sx4.c linux-2.6.32.21/drivers/ata/sata_sx4.c
---- linux-2.6.32.21/drivers/ata/sata_sx4.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_sx4.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/sata_sx4.c linux-2.6.32.22/drivers/ata/sata_sx4.c
+--- linux-2.6.32.22/drivers/ata/sata_sx4.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/sata_sx4.c 2010-09-04 15:54:52.000000000 -0400
@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat
};
@@ -22328,9 +22551,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_sx4.c linux-2.6.32.21/drivers/ata/sa
.inherits = &ata_sff_port_ops,
.check_atapi_dma = pdc_check_atapi_dma,
-diff -urNp linux-2.6.32.21/drivers/ata/sata_uli.c linux-2.6.32.21/drivers/ata/sata_uli.c
---- linux-2.6.32.21/drivers/ata/sata_uli.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_uli.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/sata_uli.c linux-2.6.32.22/drivers/ata/sata_uli.c
+--- linux-2.6.32.22/drivers/ata/sata_uli.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/sata_uli.c 2010-09-04 15:54:52.000000000 -0400
@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22340,9 +22563,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_uli.c linux-2.6.32.21/drivers/ata/sa
.inherits = &ata_bmdma_port_ops,
.scr_read = uli_scr_read,
.scr_write = uli_scr_write,
-diff -urNp linux-2.6.32.21/drivers/ata/sata_via.c linux-2.6.32.21/drivers/ata/sata_via.c
---- linux-2.6.32.21/drivers/ata/sata_via.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_via.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/sata_via.c linux-2.6.32.22/drivers/ata/sata_via.c
+--- linux-2.6.32.22/drivers/ata/sata_via.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/sata_via.c 2010-09-04 15:54:52.000000000 -0400
@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22380,9 +22603,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_via.c linux-2.6.32.21/drivers/ata/sa
.inherits = &svia_base_ops,
.hardreset = sata_std_hardreset,
.scr_read = vt8251_scr_read,
-diff -urNp linux-2.6.32.21/drivers/ata/sata_vsc.c linux-2.6.32.21/drivers/ata/sata_vsc.c
---- linux-2.6.32.21/drivers/ata/sata_vsc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_vsc.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ata/sata_vsc.c linux-2.6.32.22/drivers/ata/sata_vsc.c
+--- linux-2.6.32.22/drivers/ata/sata_vsc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ata/sata_vsc.c 2010-09-04 15:54:52.000000000 -0400
@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat
};
@@ -22392,9 +22615,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_vsc.c linux-2.6.32.21/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.21/drivers/atm/adummy.c linux-2.6.32.21/drivers/atm/adummy.c
---- linux-2.6.32.21/drivers/atm/adummy.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/adummy.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/atm/adummy.c linux-2.6.32.22/drivers/atm/adummy.c
+--- linux-2.6.32.22/drivers/atm/adummy.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/atm/adummy.c 2010-09-04 15:54:52.000000000 -0400
@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct
vcc->pop(vcc, skb);
else
@@ -22404,9 +22627,9 @@ diff -urNp linux-2.6.32.21/drivers/atm/adummy.c linux-2.6.32.21/drivers/atm/adum
return 0;
}
-diff -urNp linux-2.6.32.21/drivers/atm/ambassador.c linux-2.6.32.21/drivers/atm/ambassador.c
---- linux-2.6.32.21/drivers/atm/ambassador.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/ambassador.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/atm/ambassador.c linux-2.6.32.22/drivers/atm/ambassador.c
+--- linux-2.6.32.22/drivers/atm/ambassador.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/atm/ambassador.c 2010-09-04 15:54:52.000000000 -0400
@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev,
PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
@@ -22443,9 +22666,9 @@ diff -urNp linux-2.6.32.21/drivers/atm/ambassador.c linux-2.6.32.21/drivers/atm/
return -ENOMEM; // ?
}
-diff -urNp linux-2.6.32.21/drivers/atm/atmtcp.c linux-2.6.32.21/drivers/atm/atmtcp.c
---- linux-2.6.32.21/drivers/atm/atmtcp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/atmtcp.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/atm/atmtcp.c linux-2.6.32.22/drivers/atm/atmtcp.c
+--- linux-2.6.32.22/drivers/atm/atmtcp.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/atm/atmtcp.c 2010-09-04 15:54:52.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);
@@ -22495,9 +22718,9 @@ diff -urNp linux-2.6.32.21/drivers/atm/atmtcp.c linux-2.6.32.21/drivers/atm/atmt
done:
if (vcc->pop) vcc->pop(vcc,skb);
else dev_kfree_skb(skb);
-diff -urNp linux-2.6.32.21/drivers/atm/eni.c linux-2.6.32.21/drivers/atm/eni.c
---- linux-2.6.32.21/drivers/atm/eni.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/eni.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/atm/eni.c linux-2.6.32.22/drivers/atm/eni.c
+--- linux-2.6.32.22/drivers/atm/eni.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/atm/eni.c 2010-09-04 15:54:52.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);
@@ -22543,9 +22766,9 @@ diff -urNp linux-2.6.32.21/drivers/atm/eni.c linux-2.6.32.21/drivers/atm/eni.c
wake_up(&eni_dev->tx_wait);
dma_complete++;
}
-diff -urNp linux-2.6.32.21/drivers/atm/firestream.c linux-2.6.32.21/drivers/atm/firestream.c
---- linux-2.6.32.21/drivers/atm/firestream.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/firestream.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/atm/firestream.c linux-2.6.32.22/drivers/atm/firestream.c
+--- linux-2.6.32.22/drivers/atm/firestream.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/atm/firestream.c 2010-09-04 15:54:52.000000000 -0400
@@ -748,7 +748,7 @@ static void process_txdone_queue (struct
}
}
@@ -22579,9 +22802,9 @@ diff -urNp linux-2.6.32.21/drivers/atm/firestream.c linux-2.6.32.21/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.21/drivers/atm/fore200e.c linux-2.6.32.21/drivers/atm/fore200e.c
---- linux-2.6.32.21/drivers/atm/fore200e.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/fore200e.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/atm/fore200e.c linux-2.6.32.22/drivers/atm/fore200e.c
+--- linux-2.6.32.22/drivers/atm/fore200e.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/atm/fore200e.c 2010-09-04 15:54:52.000000000 -0400
@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200
#endif
/* check error condition */
@@ -22638,9 +22861,9 @@ diff -urNp linux-2.6.32.21/drivers/atm/fore200e.c linux-2.6.32.21/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.21/drivers/atm/he.c linux-2.6.32.21/drivers/atm/he.c
---- linux-2.6.32.21/drivers/atm/he.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/he.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/atm/he.c linux-2.6.32.22/drivers/atm/he.c
+--- linux-2.6.32.22/drivers/atm/he.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/atm/he.c 2010-09-04 15:54:52.000000000 -0400
@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i
if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -22722,9 +22945,9 @@ diff -urNp linux-2.6.32.21/drivers/atm/he.c linux-2.6.32.21/drivers/atm/he.c
return 0;
}
-diff -urNp linux-2.6.32.21/drivers/atm/horizon.c linux-2.6.32.21/drivers/atm/horizon.c
---- linux-2.6.32.21/drivers/atm/horizon.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/horizon.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/atm/horizon.c linux-2.6.32.22/drivers/atm/horizon.c
+--- linux-2.6.32.22/drivers/atm/horizon.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/atm/horizon.c 2010-09-04 15:54:52.000000000 -0400
@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev,
{
struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
@@ -22743,9 +22966,9 @@ diff -urNp linux-2.6.32.21/drivers/atm/horizon.c linux-2.6.32.21/drivers/atm/hor
// free the skb
hrz_kfree_skb (skb);
-diff -urNp linux-2.6.32.21/drivers/atm/idt77252.c linux-2.6.32.21/drivers/atm/idt77252.c
---- linux-2.6.32.21/drivers/atm/idt77252.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/idt77252.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/atm/idt77252.c linux-2.6.32.22/drivers/atm/idt77252.c
+--- linux-2.6.32.22/drivers/atm/idt77252.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/atm/idt77252.c 2010-09-04 15:54:52.000000000 -0400
@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str
else
dev_kfree_skb(skb);
@@ -22900,9 +23123,9 @@ diff -urNp linux-2.6.32.21/drivers/atm/idt77252.c linux-2.6.32.21/drivers/atm/id
return -ENOMEM;
}
atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
-diff -urNp linux-2.6.32.21/drivers/atm/iphase.c linux-2.6.32.21/drivers/atm/iphase.c
---- linux-2.6.32.21/drivers/atm/iphase.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/iphase.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/atm/iphase.c linux-2.6.32.22/drivers/atm/iphase.c
+--- linux-2.6.32.22/drivers/atm/iphase.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/atm/iphase.c 2010-09-04 15:54:52.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))
@@ -22999,9 +23222,9 @@ diff -urNp linux-2.6.32.21/drivers/atm/iphase.c linux-2.6.32.21/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.21/drivers/atm/lanai.c linux-2.6.32.21/drivers/atm/lanai.c
---- linux-2.6.32.21/drivers/atm/lanai.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/lanai.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/atm/lanai.c linux-2.6.32.22/drivers/atm/lanai.c
+--- linux-2.6.32.22/drivers/atm/lanai.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/atm/lanai.c 2010-09-04 15:54:52.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);
@@ -23056,9 +23279,9 @@ diff -urNp linux-2.6.32.21/drivers/atm/lanai.c linux-2.6.32.21/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.21/drivers/atm/nicstar.c linux-2.6.32.21/drivers/atm/nicstar.c
---- linux-2.6.32.21/drivers/atm/nicstar.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/nicstar.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/atm/nicstar.c linux-2.6.32.22/drivers/atm/nicstar.c
+--- linux-2.6.32.22/drivers/atm/nicstar.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/atm/nicstar.c 2010-09-04 15:54:52.000000000 -0400
@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc,
if ((vc = (vc_map *) vcc->dev_data) == NULL)
{
@@ -23261,9 +23484,9 @@ diff -urNp linux-2.6.32.21/drivers/atm/nicstar.c linux-2.6.32.21/drivers/atm/nic
}
}
-diff -urNp linux-2.6.32.21/drivers/atm/solos-pci.c linux-2.6.32.21/drivers/atm/solos-pci.c
---- linux-2.6.32.21/drivers/atm/solos-pci.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/solos-pci.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/atm/solos-pci.c linux-2.6.32.22/drivers/atm/solos-pci.c
+--- linux-2.6.32.22/drivers/atm/solos-pci.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/atm/solos-pci.c 2010-09-04 15:54:52.000000000 -0400
@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg)
}
atm_charge(vcc, skb->truesize);
@@ -23282,9 +23505,9 @@ diff -urNp linux-2.6.32.21/drivers/atm/solos-pci.c linux-2.6.32.21/drivers/atm/s
solos_pop(vcc, oldskb);
} else
dev_kfree_skb_irq(oldskb);
-diff -urNp linux-2.6.32.21/drivers/atm/suni.c linux-2.6.32.21/drivers/atm/suni.c
---- linux-2.6.32.21/drivers/atm/suni.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/suni.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/atm/suni.c linux-2.6.32.22/drivers/atm/suni.c
+--- linux-2.6.32.22/drivers/atm/suni.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/atm/suni.c 2010-09-04 15:54:52.000000000 -0400
@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
@@ -23296,9 +23519,9 @@ diff -urNp linux-2.6.32.21/drivers/atm/suni.c linux-2.6.32.21/drivers/atm/suni.c
static void suni_hz(unsigned long from_timer)
-diff -urNp linux-2.6.32.21/drivers/atm/uPD98402.c linux-2.6.32.21/drivers/atm/uPD98402.c
---- linux-2.6.32.21/drivers/atm/uPD98402.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/uPD98402.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/atm/uPD98402.c linux-2.6.32.22/drivers/atm/uPD98402.c
+--- linux-2.6.32.22/drivers/atm/uPD98402.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/atm/uPD98402.c 2010-09-04 15:54:52.000000000 -0400
@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d
struct sonet_stats tmp;
int error = 0;
@@ -23343,9 +23566,9 @@ diff -urNp linux-2.6.32.21/drivers/atm/uPD98402.c linux-2.6.32.21/drivers/atm/uP
return 0;
}
-diff -urNp linux-2.6.32.21/drivers/atm/zatm.c linux-2.6.32.21/drivers/atm/zatm.c
---- linux-2.6.32.21/drivers/atm/zatm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/zatm.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/atm/zatm.c linux-2.6.32.22/drivers/atm/zatm.c
+--- linux-2.6.32.22/drivers/atm/zatm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/atm/zatm.c 2010-09-04 15:54:52.000000000 -0400
@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
}
if (!size) {
@@ -23373,9 +23596,9 @@ diff -urNp linux-2.6.32.21/drivers/atm/zatm.c linux-2.6.32.21/drivers/atm/zatm.c
wake_up(&zatm_vcc->tx_wait);
}
-diff -urNp linux-2.6.32.21/drivers/base/bus.c linux-2.6.32.21/drivers/base/bus.c
---- linux-2.6.32.21/drivers/base/bus.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/base/bus.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/base/bus.c linux-2.6.32.22/drivers/base/bus.c
+--- linux-2.6.32.22/drivers/base/bus.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/base/bus.c 2010-09-04 15:54:52.000000000 -0400
@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob
return ret;
}
@@ -23403,9 +23626,9 @@ diff -urNp linux-2.6.32.21/drivers/base/bus.c linux-2.6.32.21/drivers/base/bus.c
.filter = bus_uevent_filter,
};
-diff -urNp linux-2.6.32.21/drivers/base/class.c linux-2.6.32.21/drivers/base/class.c
---- linux-2.6.32.21/drivers/base/class.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/base/class.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/base/class.c linux-2.6.32.22/drivers/base/class.c
+--- linux-2.6.32.22/drivers/base/class.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/base/class.c 2010-09-04 15:54:52.000000000 -0400
@@ -63,7 +63,7 @@ static void class_release(struct kobject
kfree(cp);
}
@@ -23415,9 +23638,9 @@ diff -urNp linux-2.6.32.21/drivers/base/class.c linux-2.6.32.21/drivers/base/cla
.show = class_attr_show,
.store = class_attr_store,
};
-diff -urNp linux-2.6.32.21/drivers/base/core.c linux-2.6.32.21/drivers/base/core.c
---- linux-2.6.32.21/drivers/base/core.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/base/core.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/base/core.c linux-2.6.32.22/drivers/base/core.c
+--- linux-2.6.32.22/drivers/base/core.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/base/core.c 2010-09-04 15:54:52.000000000 -0400
@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob
return ret;
}
@@ -23436,9 +23659,9 @@ diff -urNp linux-2.6.32.21/drivers/base/core.c linux-2.6.32.21/drivers/base/core
.filter = dev_uevent_filter,
.name = dev_uevent_name,
.uevent = dev_uevent,
-diff -urNp linux-2.6.32.21/drivers/base/memory.c linux-2.6.32.21/drivers/base/memory.c
---- linux-2.6.32.21/drivers/base/memory.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/base/memory.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/base/memory.c linux-2.6.32.22/drivers/base/memory.c
+--- linux-2.6.32.22/drivers/base/memory.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/base/memory.c 2010-09-04 15:54:52.000000000 -0400
@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks
return retval;
}
@@ -23448,9 +23671,9 @@ diff -urNp linux-2.6.32.21/drivers/base/memory.c linux-2.6.32.21/drivers/base/me
.name = memory_uevent_name,
.uevent = memory_uevent,
};
-diff -urNp linux-2.6.32.21/drivers/base/sys.c linux-2.6.32.21/drivers/base/sys.c
---- linux-2.6.32.21/drivers/base/sys.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/base/sys.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/base/sys.c linux-2.6.32.22/drivers/base/sys.c
+--- linux-2.6.32.22/drivers/base/sys.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/base/sys.c 2010-09-04 15:54:52.000000000 -0400
@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc
return -EIO;
}
@@ -23469,9 +23692,9 @@ diff -urNp linux-2.6.32.21/drivers/base/sys.c linux-2.6.32.21/drivers/base/sys.c
.show = sysdev_class_show,
.store = sysdev_class_store,
};
-diff -urNp linux-2.6.32.21/drivers/block/pktcdvd.c linux-2.6.32.21/drivers/block/pktcdvd.c
---- linux-2.6.32.21/drivers/block/pktcdvd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/block/pktcdvd.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/block/pktcdvd.c linux-2.6.32.22/drivers/block/pktcdvd.c
+--- linux-2.6.32.22/drivers/block/pktcdvd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/block/pktcdvd.c 2010-09-04 15:54:52.000000000 -0400
@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob
return len;
}
@@ -23481,9 +23704,9 @@ diff -urNp linux-2.6.32.21/drivers/block/pktcdvd.c linux-2.6.32.21/drivers/block
.show = kobj_pkt_show,
.store = kobj_pkt_store
};
-diff -urNp linux-2.6.32.21/drivers/char/agp/frontend.c linux-2.6.32.21/drivers/char/agp/frontend.c
---- linux-2.6.32.21/drivers/char/agp/frontend.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/agp/frontend.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/agp/frontend.c linux-2.6.32.22/drivers/char/agp/frontend.c
+--- linux-2.6.32.22/drivers/char/agp/frontend.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/agp/frontend.c 2010-09-04 15:54:52.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;
@@ -23493,9 +23716,9 @@ diff -urNp linux-2.6.32.21/drivers/char/agp/frontend.c linux-2.6.32.21/drivers/c
return -EFAULT;
client = agp_find_client_by_pid(reserve.pid);
-diff -urNp linux-2.6.32.21/drivers/char/agp/intel-agp.c linux-2.6.32.21/drivers/char/agp/intel-agp.c
---- linux-2.6.32.21/drivers/char/agp/intel-agp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/agp/intel-agp.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/agp/intel-agp.c linux-2.6.32.22/drivers/char/agp/intel-agp.c
+--- linux-2.6.32.22/drivers/char/agp/intel-agp.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/agp/intel-agp.c 2010-09-04 15:54:52.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),
@@ -23505,9 +23728,9 @@ diff -urNp linux-2.6.32.21/drivers/char/agp/intel-agp.c linux-2.6.32.21/drivers/
};
MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
-diff -urNp linux-2.6.32.21/drivers/char/hpet.c linux-2.6.32.21/drivers/char/hpet.c
---- linux-2.6.32.21/drivers/char/hpet.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/hpet.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/hpet.c linux-2.6.32.22/drivers/char/hpet.c
+--- linux-2.6.32.22/drivers/char/hpet.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/hpet.c 2010-09-04 15:54:52.000000000 -0400
@@ -430,7 +430,7 @@ static int hpet_release(struct inode *in
return 0;
}
@@ -23535,9 +23758,9 @@ diff -urNp linux-2.6.32.21/drivers/char/hpet.c linux-2.6.32.21/drivers/char/hpet
static int __init hpet_init(void)
{
-diff -urNp linux-2.6.32.21/drivers/char/hvc_beat.c linux-2.6.32.21/drivers/char/hvc_beat.c
---- linux-2.6.32.21/drivers/char/hvc_beat.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/hvc_beat.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/hvc_beat.c linux-2.6.32.22/drivers/char/hvc_beat.c
+--- linux-2.6.32.22/drivers/char/hvc_beat.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/hvc_beat.c 2010-09-04 15:54:52.000000000 -0400
@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v
return cnt;
}
@@ -23547,9 +23770,9 @@ diff -urNp linux-2.6.32.21/drivers/char/hvc_beat.c linux-2.6.32.21/drivers/char/
.get_chars = hvc_beat_get_chars,
.put_chars = hvc_beat_put_chars,
};
-diff -urNp linux-2.6.32.21/drivers/char/hvc_console.c linux-2.6.32.21/drivers/char/hvc_console.c
---- linux-2.6.32.21/drivers/char/hvc_console.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/hvc_console.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/hvc_console.c linux-2.6.32.22/drivers/char/hvc_console.c
+--- linux-2.6.32.22/drivers/char/hvc_console.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/hvc_console.c 2010-09-04 15:54:52.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.
@@ -23577,9 +23800,9 @@ diff -urNp linux-2.6.32.21/drivers/char/hvc_console.c linux-2.6.32.21/drivers/ch
{
struct hvc_struct *hp;
int i;
-diff -urNp linux-2.6.32.21/drivers/char/hvc_console.h linux-2.6.32.21/drivers/char/hvc_console.h
---- linux-2.6.32.21/drivers/char/hvc_console.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/hvc_console.h 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/hvc_console.h linux-2.6.32.22/drivers/char/hvc_console.h
+--- linux-2.6.32.22/drivers/char/hvc_console.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/hvc_console.h 2010-09-04 15:54:52.000000000 -0400
@@ -55,7 +55,7 @@ struct hvc_struct {
int outbuf_size;
int n_outbuf;
@@ -23603,9 +23826,9 @@ diff -urNp linux-2.6.32.21/drivers/char/hvc_console.h linux-2.6.32.21/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.21/drivers/char/hvc_iseries.c linux-2.6.32.21/drivers/char/hvc_iseries.c
---- linux-2.6.32.21/drivers/char/hvc_iseries.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/hvc_iseries.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/hvc_iseries.c linux-2.6.32.22/drivers/char/hvc_iseries.c
+--- linux-2.6.32.22/drivers/char/hvc_iseries.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/hvc_iseries.c 2010-09-04 15:54:52.000000000 -0400
@@ -197,7 +197,7 @@ done:
return sent;
}
@@ -23615,9 +23838,9 @@ diff -urNp linux-2.6.32.21/drivers/char/hvc_iseries.c linux-2.6.32.21/drivers/ch
.get_chars = get_chars,
.put_chars = put_chars,
.notifier_add = notifier_add_irq,
-diff -urNp linux-2.6.32.21/drivers/char/hvc_iucv.c linux-2.6.32.21/drivers/char/hvc_iucv.c
---- linux-2.6.32.21/drivers/char/hvc_iucv.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/hvc_iucv.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/hvc_iucv.c linux-2.6.32.22/drivers/char/hvc_iucv.c
+--- linux-2.6.32.22/drivers/char/hvc_iucv.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/hvc_iucv.c 2010-09-04 15:54:52.000000000 -0400
@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru
@@ -23627,9 +23850,9 @@ diff -urNp linux-2.6.32.21/drivers/char/hvc_iucv.c linux-2.6.32.21/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.21/drivers/char/hvc_rtas.c linux-2.6.32.21/drivers/char/hvc_rtas.c
---- linux-2.6.32.21/drivers/char/hvc_rtas.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/hvc_rtas.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/hvc_rtas.c linux-2.6.32.22/drivers/char/hvc_rtas.c
+--- linux-2.6.32.22/drivers/char/hvc_rtas.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/hvc_rtas.c 2010-09-04 15:54:52.000000000 -0400
@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_
return i;
}
@@ -23639,9 +23862,9 @@ diff -urNp linux-2.6.32.21/drivers/char/hvc_rtas.c linux-2.6.32.21/drivers/char/
.get_chars = hvc_rtas_read_console,
.put_chars = hvc_rtas_write_console,
};
-diff -urNp linux-2.6.32.21/drivers/char/hvcs.c linux-2.6.32.21/drivers/char/hvcs.c
---- linux-2.6.32.21/drivers/char/hvcs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/hvcs.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/hvcs.c linux-2.6.32.22/drivers/char/hvcs.c
+--- linux-2.6.32.22/drivers/char/hvcs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/hvcs.c 2010-09-04 15:54:52.000000000 -0400
@@ -269,7 +269,7 @@ struct hvcs_struct {
unsigned int index;
@@ -23736,9 +23959,9 @@ diff -urNp linux-2.6.32.21/drivers/char/hvcs.c linux-2.6.32.21/drivers/char/hvcs
return 0;
return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-diff -urNp linux-2.6.32.21/drivers/char/hvc_udbg.c linux-2.6.32.21/drivers/char/hvc_udbg.c
---- linux-2.6.32.21/drivers/char/hvc_udbg.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/hvc_udbg.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/hvc_udbg.c linux-2.6.32.22/drivers/char/hvc_udbg.c
+--- linux-2.6.32.22/drivers/char/hvc_udbg.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/hvc_udbg.c 2010-09-04 15:54:52.000000000 -0400
@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
return i;
}
@@ -23748,9 +23971,9 @@ diff -urNp linux-2.6.32.21/drivers/char/hvc_udbg.c linux-2.6.32.21/drivers/char/
.get_chars = hvc_udbg_get,
.put_chars = hvc_udbg_put,
};
-diff -urNp linux-2.6.32.21/drivers/char/hvc_vio.c linux-2.6.32.21/drivers/char/hvc_vio.c
---- linux-2.6.32.21/drivers/char/hvc_vio.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/hvc_vio.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/hvc_vio.c linux-2.6.32.22/drivers/char/hvc_vio.c
+--- linux-2.6.32.22/drivers/char/hvc_vio.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/hvc_vio.c 2010-09-04 15:54:52.000000000 -0400
@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
return got;
}
@@ -23760,9 +23983,9 @@ diff -urNp linux-2.6.32.21/drivers/char/hvc_vio.c linux-2.6.32.21/drivers/char/h
.get_chars = filtered_get_chars,
.put_chars = hvc_put_chars,
.notifier_add = notifier_add_irq,
-diff -urNp linux-2.6.32.21/drivers/char/hvc_xen.c linux-2.6.32.21/drivers/char/hvc_xen.c
---- linux-2.6.32.21/drivers/char/hvc_xen.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/hvc_xen.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/hvc_xen.c linux-2.6.32.22/drivers/char/hvc_xen.c
+--- linux-2.6.32.22/drivers/char/hvc_xen.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/hvc_xen.c 2010-09-04 15:54:52.000000000 -0400
@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno
return recv;
}
@@ -23772,9 +23995,9 @@ diff -urNp linux-2.6.32.21/drivers/char/hvc_xen.c linux-2.6.32.21/drivers/char/h
.get_chars = read_console,
.put_chars = write_console,
.notifier_add = notifier_add_irq,
-diff -urNp linux-2.6.32.21/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.21/drivers/char/ipmi/ipmi_msghandler.c
---- linux-2.6.32.21/drivers/char/ipmi/ipmi_msghandler.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/ipmi/ipmi_msghandler.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.22/drivers/char/ipmi/ipmi_msghandler.c
+--- linux-2.6.32.22/drivers/char/ipmi/ipmi_msghandler.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/ipmi/ipmi_msghandler.c 2010-09-04 15:54:52.000000000 -0400
@@ -414,7 +414,7 @@ struct ipmi_smi {
struct proc_dir_entry *proc_dir;
char proc_dir_name[10];
@@ -23805,9 +24028,9 @@ diff -urNp linux-2.6.32.21/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.21/d
intf->proc_dir = NULL;
-diff -urNp linux-2.6.32.21/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.21/drivers/char/ipmi/ipmi_si_intf.c
---- linux-2.6.32.21/drivers/char/ipmi/ipmi_si_intf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/ipmi/ipmi_si_intf.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.22/drivers/char/ipmi/ipmi_si_intf.c
+--- linux-2.6.32.22/drivers/char/ipmi/ipmi_si_intf.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/ipmi/ipmi_si_intf.c 2010-09-04 15:54:52.000000000 -0400
@@ -277,7 +277,7 @@ struct smi_info {
unsigned char slave_addr;
@@ -23838,9 +24061,9 @@ diff -urNp linux-2.6.32.21/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.21/driv
new_smi->interrupt_disabled = 0;
atomic_set(&new_smi->stop_operation, 0);
-diff -urNp linux-2.6.32.21/drivers/char/keyboard.c linux-2.6.32.21/drivers/char/keyboard.c
---- linux-2.6.32.21/drivers/char/keyboard.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/keyboard.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/keyboard.c linux-2.6.32.22/drivers/char/keyboard.c
+--- linux-2.6.32.22/drivers/char/keyboard.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/keyboard.c 2010-09-04 15:54:52.000000000 -0400
@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u
kbd->kbdmode == VC_MEDIUMRAW) &&
value != KVAL(K_SAK))
@@ -23867,9 +24090,9 @@ diff -urNp linux-2.6.32.21/drivers/char/keyboard.c linux-2.6.32.21/drivers/char/
};
MODULE_DEVICE_TABLE(input, kbd_ids);
-diff -urNp linux-2.6.32.21/drivers/char/mem.c linux-2.6.32.21/drivers/char/mem.c
---- linux-2.6.32.21/drivers/char/mem.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/mem.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/mem.c linux-2.6.32.22/drivers/char/mem.c
+--- linux-2.6.32.22/drivers/char/mem.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/mem.c 2010-09-04 15:54:52.000000000 -0400
@@ -18,6 +18,7 @@
#include <linux/raw.h>
#include <linux/tty.h>
@@ -24046,9 +24269,9 @@ diff -urNp linux-2.6.32.21/drivers/char/mem.c linux-2.6.32.21/drivers/char/mem.c
};
static int memory_open(struct inode *inode, struct file *filp)
-diff -urNp linux-2.6.32.21/drivers/char/nvram.c linux-2.6.32.21/drivers/char/nvram.c
---- linux-2.6.32.21/drivers/char/nvram.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/nvram.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/nvram.c linux-2.6.32.22/drivers/char/nvram.c
+--- linux-2.6.32.22/drivers/char/nvram.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/nvram.c 2010-09-04 15:54:52.000000000 -0400
@@ -435,7 +435,10 @@ static const struct file_operations nvra
static struct miscdevice nvram_dev = {
NVRAM_MINOR,
@@ -24061,9 +24284,9 @@ diff -urNp linux-2.6.32.21/drivers/char/nvram.c linux-2.6.32.21/drivers/char/nvr
};
static int __init nvram_init(void)
-diff -urNp linux-2.6.32.21/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.21/drivers/char/pcmcia/ipwireless/tty.c
---- linux-2.6.32.21/drivers/char/pcmcia/ipwireless/tty.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/pcmcia/ipwireless/tty.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.22/drivers/char/pcmcia/ipwireless/tty.c
+--- linux-2.6.32.22/drivers/char/pcmcia/ipwireless/tty.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/pcmcia/ipwireless/tty.c 2010-09-04 15:54:52.000000000 -0400
@@ -51,7 +51,7 @@ struct ipw_tty {
int tty_type;
struct ipw_network *network;
@@ -24178,9 +24401,9 @@ diff -urNp linux-2.6.32.21/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.21/
do_ipw_close(ttyj);
ipwireless_disassociate_network_ttys(network,
ttyj->channel_idx);
-diff -urNp linux-2.6.32.21/drivers/char/pty.c linux-2.6.32.21/drivers/char/pty.c
---- linux-2.6.32.21/drivers/char/pty.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/pty.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/pty.c linux-2.6.32.22/drivers/char/pty.c
+--- linux-2.6.32.22/drivers/char/pty.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/pty.c 2010-09-04 15:54:52.000000000 -0400
@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode
return ret;
}
@@ -24211,9 +24434,9 @@ diff -urNp linux-2.6.32.21/drivers/char/pty.c linux-2.6.32.21/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.21/drivers/char/random.c linux-2.6.32.21/drivers/char/random.c
---- linux-2.6.32.21/drivers/char/random.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/random.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/random.c linux-2.6.32.22/drivers/char/random.c
+--- linux-2.6.32.22/drivers/char/random.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/random.c 2010-09-04 15:54:52.000000000 -0400
@@ -254,8 +254,13 @@
/*
* Configuration information
@@ -24255,9 +24478,9 @@ diff -urNp linux-2.6.32.21/drivers/char/random.c linux-2.6.32.21/drivers/char/ra
static int max_write_thresh = INPUT_POOL_WORDS * 32;
static char sysctl_bootid[16];
-diff -urNp linux-2.6.32.21/drivers/char/sonypi.c linux-2.6.32.21/drivers/char/sonypi.c
---- linux-2.6.32.21/drivers/char/sonypi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/sonypi.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/sonypi.c linux-2.6.32.22/drivers/char/sonypi.c
+--- linux-2.6.32.22/drivers/char/sonypi.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/sonypi.c 2010-09-04 15:54:52.000000000 -0400
@@ -491,7 +491,7 @@ static struct sonypi_device {
spinlock_t fifo_lock;
wait_queue_head_t fifo_proc_list;
@@ -24288,9 +24511,9 @@ diff -urNp linux-2.6.32.21/drivers/char/sonypi.c linux-2.6.32.21/drivers/char/so
mutex_unlock(&sonypi_device.lock);
unlock_kernel();
return 0;
-diff -urNp linux-2.6.32.21/drivers/char/tpm/tpm_bios.c linux-2.6.32.21/drivers/char/tpm/tpm_bios.c
---- linux-2.6.32.21/drivers/char/tpm/tpm_bios.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/tpm/tpm_bios.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/tpm/tpm_bios.c linux-2.6.32.22/drivers/char/tpm/tpm_bios.c
+--- linux-2.6.32.22/drivers/char/tpm/tpm_bios.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/tpm/tpm_bios.c 2010-09-04 15:54:52.000000000 -0400
@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start
event = addr;
@@ -24331,9 +24554,9 @@ diff -urNp linux-2.6.32.21/drivers/char/tpm/tpm_bios.c linux-2.6.32.21/drivers/c
memcpy(log->bios_event_log, virt, len);
-diff -urNp linux-2.6.32.21/drivers/char/tty_io.c linux-2.6.32.21/drivers/char/tty_io.c
---- linux-2.6.32.21/drivers/char/tty_io.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/tty_io.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/tty_io.c linux-2.6.32.22/drivers/char/tty_io.c
+--- linux-2.6.32.22/drivers/char/tty_io.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/tty_io.c 2010-09-04 15:54:52.000000000 -0400
@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list
DEFINE_MUTEX(tty_mutex);
EXPORT_SYMBOL(tty_mutex);
@@ -24472,9 +24695,9 @@ diff -urNp linux-2.6.32.21/drivers/char/tty_io.c linux-2.6.32.21/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.21/drivers/char/tty_ldisc.c linux-2.6.32.21/drivers/char/tty_ldisc.c
---- linux-2.6.32.21/drivers/char/tty_ldisc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/tty_ldisc.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/tty_ldisc.c linux-2.6.32.22/drivers/char/tty_ldisc.c
+--- linux-2.6.32.22/drivers/char/tty_ldisc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/tty_ldisc.c 2010-09-04 15:54:52.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;
@@ -24520,9 +24743,9 @@ diff -urNp linux-2.6.32.21/drivers/char/tty_ldisc.c linux-2.6.32.21/drivers/char
module_put(ldops->owner);
spin_unlock_irqrestore(&tty_ldisc_lock, flags);
}
-diff -urNp linux-2.6.32.21/drivers/char/virtio_console.c linux-2.6.32.21/drivers/char/virtio_console.c
---- linux-2.6.32.21/drivers/char/virtio_console.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/virtio_console.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/virtio_console.c linux-2.6.32.22/drivers/char/virtio_console.c
+--- linux-2.6.32.22/drivers/char/virtio_console.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/virtio_console.c 2010-09-04 15:54:52.000000000 -0400
@@ -44,6 +44,7 @@ static unsigned int in_len;
static char *in, *inbuf;
@@ -24531,9 +24754,9 @@ diff -urNp linux-2.6.32.21/drivers/char/virtio_console.c linux-2.6.32.21/drivers
static struct hv_ops virtio_cons;
/* The hvc device */
-diff -urNp linux-2.6.32.21/drivers/char/vt_ioctl.c linux-2.6.32.21/drivers/char/vt_ioctl.c
---- linux-2.6.32.21/drivers/char/vt_ioctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/vt_ioctl.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/char/vt_ioctl.c linux-2.6.32.22/drivers/char/vt_ioctl.c
+--- linux-2.6.32.22/drivers/char/vt_ioctl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/char/vt_ioctl.c 2010-09-04 15:54:52.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;
@@ -24577,9 +24800,9 @@ diff -urNp linux-2.6.32.21/drivers/char/vt_ioctl.c linux-2.6.32.21/drivers/char/
if (!perm) {
ret = -EPERM;
goto reterr;
-diff -urNp linux-2.6.32.21/drivers/cpufreq/cpufreq.c linux-2.6.32.21/drivers/cpufreq/cpufreq.c
---- linux-2.6.32.21/drivers/cpufreq/cpufreq.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/cpufreq/cpufreq.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/cpufreq/cpufreq.c linux-2.6.32.22/drivers/cpufreq/cpufreq.c
+--- linux-2.6.32.22/drivers/cpufreq/cpufreq.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/cpufreq/cpufreq.c 2010-09-04 15:54:52.000000000 -0400
@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct
complete(&policy->kobj_unregister);
}
@@ -24589,9 +24812,9 @@ diff -urNp linux-2.6.32.21/drivers/cpufreq/cpufreq.c linux-2.6.32.21/drivers/cpu
.show = show,
.store = store,
};
-diff -urNp linux-2.6.32.21/drivers/cpuidle/sysfs.c linux-2.6.32.21/drivers/cpuidle/sysfs.c
---- linux-2.6.32.21/drivers/cpuidle/sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/cpuidle/sysfs.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/cpuidle/sysfs.c linux-2.6.32.22/drivers/cpuidle/sysfs.c
+--- linux-2.6.32.22/drivers/cpuidle/sysfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/cpuidle/sysfs.c 2010-09-04 15:54:52.000000000 -0400
@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj
return ret;
}
@@ -24619,9 +24842,9 @@ diff -urNp linux-2.6.32.21/drivers/cpuidle/sysfs.c linux-2.6.32.21/drivers/cpuid
{
kobject_put(&device->kobjs[i]->kobj);
wait_for_completion(&device->kobjs[i]->kobj_unregister);
-diff -urNp linux-2.6.32.21/drivers/dma/ioat/dma.c linux-2.6.32.21/drivers/dma/ioat/dma.c
---- linux-2.6.32.21/drivers/dma/ioat/dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/dma/ioat/dma.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/dma/ioat/dma.c linux-2.6.32.22/drivers/dma/ioat/dma.c
+--- linux-2.6.32.22/drivers/dma/ioat/dma.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/dma/ioat/dma.c 2010-09-04 15:54:52.000000000 -0400
@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str
return entry->show(&chan->common, page);
}
@@ -24631,9 +24854,9 @@ diff -urNp linux-2.6.32.21/drivers/dma/ioat/dma.c linux-2.6.32.21/drivers/dma/io
.show = ioat_attr_show,
};
-diff -urNp linux-2.6.32.21/drivers/dma/ioat/dma.h linux-2.6.32.21/drivers/dma/ioat/dma.h
---- linux-2.6.32.21/drivers/dma/ioat/dma.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/dma/ioat/dma.h 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/dma/ioat/dma.h linux-2.6.32.22/drivers/dma/ioat/dma.h
+--- linux-2.6.32.22/drivers/dma/ioat/dma.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/dma/ioat/dma.h 2010-09-04 15:54:52.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);
@@ -24643,9 +24866,9 @@ diff -urNp linux-2.6.32.21/drivers/dma/ioat/dma.h linux-2.6.32.21/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.21/drivers/edac/edac_core.h linux-2.6.32.21/drivers/edac/edac_core.h
---- linux-2.6.32.21/drivers/edac/edac_core.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/edac/edac_core.h 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/edac/edac_core.h linux-2.6.32.22/drivers/edac/edac_core.h
+--- linux-2.6.32.22/drivers/edac/edac_core.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/edac/edac_core.h 2010-09-04 15:54:52.000000000 -0400
@@ -99,11 +99,11 @@ extern int edac_debug_level;
#else /* !CONFIG_EDAC_DEBUG */
@@ -24663,9 +24886,9 @@ diff -urNp linux-2.6.32.21/drivers/edac/edac_core.h linux-2.6.32.21/drivers/edac
#endif /* !CONFIG_EDAC_DEBUG */
-diff -urNp linux-2.6.32.21/drivers/edac/edac_device_sysfs.c linux-2.6.32.21/drivers/edac/edac_device_sysfs.c
---- linux-2.6.32.21/drivers/edac/edac_device_sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/edac/edac_device_sysfs.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/edac/edac_device_sysfs.c linux-2.6.32.22/drivers/edac/edac_device_sysfs.c
+--- linux-2.6.32.22/drivers/edac/edac_device_sysfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/edac/edac_device_sysfs.c 2010-09-04 15:54:52.000000000 -0400
@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s
}
@@ -24693,9 +24916,9 @@ diff -urNp linux-2.6.32.21/drivers/edac/edac_device_sysfs.c linux-2.6.32.21/driv
.show = edac_dev_block_show,
.store = edac_dev_block_store
};
-diff -urNp linux-2.6.32.21/drivers/edac/edac_mc_sysfs.c linux-2.6.32.21/drivers/edac/edac_mc_sysfs.c
---- linux-2.6.32.21/drivers/edac/edac_mc_sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/edac/edac_mc_sysfs.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/edac/edac_mc_sysfs.c linux-2.6.32.22/drivers/edac/edac_mc_sysfs.c
+--- linux-2.6.32.22/drivers/edac/edac_mc_sysfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/edac/edac_mc_sysfs.c 2010-09-04 15:54:52.000000000 -0400
@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob
return -EIO;
}
@@ -24714,9 +24937,9 @@ diff -urNp linux-2.6.32.21/drivers/edac/edac_mc_sysfs.c linux-2.6.32.21/drivers/
.show = mcidev_show,
.store = mcidev_store
};
-diff -urNp linux-2.6.32.21/drivers/edac/edac_pci_sysfs.c linux-2.6.32.21/drivers/edac/edac_pci_sysfs.c
---- linux-2.6.32.21/drivers/edac/edac_pci_sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/edac/edac_pci_sysfs.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/edac/edac_pci_sysfs.c linux-2.6.32.22/drivers/edac/edac_pci_sysfs.c
+--- linux-2.6.32.22/drivers/edac/edac_pci_sysfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/edac/edac_pci_sysfs.c 2010-09-04 15:54:52.000000000 -0400
@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s
}
@@ -24735,9 +24958,9 @@ diff -urNp linux-2.6.32.21/drivers/edac/edac_pci_sysfs.c linux-2.6.32.21/drivers
.show = edac_pci_dev_show,
.store = edac_pci_dev_store
};
-diff -urNp linux-2.6.32.21/drivers/firewire/core-cdev.c linux-2.6.32.21/drivers/firewire/core-cdev.c
---- linux-2.6.32.21/drivers/firewire/core-cdev.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/firewire/core-cdev.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/firewire/core-cdev.c linux-2.6.32.22/drivers/firewire/core-cdev.c
+--- linux-2.6.32.22/drivers/firewire/core-cdev.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/firewire/core-cdev.c 2010-09-04 15:54:52.000000000 -0400
@@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie
int ret;
@@ -24748,9 +24971,9 @@ diff -urNp linux-2.6.32.21/drivers/firewire/core-cdev.c linux-2.6.32.21/drivers/
return -EINVAL;
r = kmalloc(sizeof(*r), GFP_KERNEL);
-diff -urNp linux-2.6.32.21/drivers/firmware/dmi_scan.c linux-2.6.32.21/drivers/firmware/dmi_scan.c
---- linux-2.6.32.21/drivers/firmware/dmi_scan.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/firmware/dmi_scan.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/firmware/dmi_scan.c linux-2.6.32.22/drivers/firmware/dmi_scan.c
+--- linux-2.6.32.22/drivers/firmware/dmi_scan.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/firmware/dmi_scan.c 2010-09-04 15:54:52.000000000 -0400
@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void)
}
}
@@ -24763,9 +24986,9 @@ diff -urNp linux-2.6.32.21/drivers/firmware/dmi_scan.c linux-2.6.32.21/drivers/f
p = dmi_ioremap(0xF0000, 0x10000);
if (p == NULL)
goto error;
-diff -urNp linux-2.6.32.21/drivers/firmware/edd.c linux-2.6.32.21/drivers/firmware/edd.c
---- linux-2.6.32.21/drivers/firmware/edd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/firmware/edd.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/firmware/edd.c linux-2.6.32.22/drivers/firmware/edd.c
+--- linux-2.6.32.22/drivers/firmware/edd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/firmware/edd.c 2010-09-04 15:54:52.000000000 -0400
@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str
return ret;
}
@@ -24775,9 +24998,9 @@ diff -urNp linux-2.6.32.21/drivers/firmware/edd.c linux-2.6.32.21/drivers/firmwa
.show = edd_attr_show,
};
-diff -urNp linux-2.6.32.21/drivers/firmware/efivars.c linux-2.6.32.21/drivers/firmware/efivars.c
---- linux-2.6.32.21/drivers/firmware/efivars.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/firmware/efivars.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/firmware/efivars.c linux-2.6.32.22/drivers/firmware/efivars.c
+--- linux-2.6.32.22/drivers/firmware/efivars.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/firmware/efivars.c 2010-09-04 15:54:52.000000000 -0400
@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct
return ret;
}
@@ -24787,9 +25010,9 @@ diff -urNp linux-2.6.32.21/drivers/firmware/efivars.c linux-2.6.32.21/drivers/fi
.show = efivar_attr_show,
.store = efivar_attr_store,
};
-diff -urNp linux-2.6.32.21/drivers/firmware/iscsi_ibft.c linux-2.6.32.21/drivers/firmware/iscsi_ibft.c
---- linux-2.6.32.21/drivers/firmware/iscsi_ibft.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/firmware/iscsi_ibft.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/firmware/iscsi_ibft.c linux-2.6.32.22/drivers/firmware/iscsi_ibft.c
+--- linux-2.6.32.22/drivers/firmware/iscsi_ibft.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/firmware/iscsi_ibft.c 2010-09-04 15:54:52.000000000 -0400
@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc
return ret;
}
@@ -24799,9 +25022,9 @@ diff -urNp linux-2.6.32.21/drivers/firmware/iscsi_ibft.c linux-2.6.32.21/drivers
.show = ibft_show_attribute,
};
-diff -urNp linux-2.6.32.21/drivers/firmware/memmap.c linux-2.6.32.21/drivers/firmware/memmap.c
---- linux-2.6.32.21/drivers/firmware/memmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/firmware/memmap.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/firmware/memmap.c linux-2.6.32.22/drivers/firmware/memmap.c
+--- linux-2.6.32.22/drivers/firmware/memmap.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/firmware/memmap.c 2010-09-04 15:54:52.000000000 -0400
@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = {
NULL
};
@@ -24811,9 +25034,9 @@ diff -urNp linux-2.6.32.21/drivers/firmware/memmap.c linux-2.6.32.21/drivers/fir
.show = memmap_attr_show,
};
-diff -urNp linux-2.6.32.21/drivers/gpu/drm/drm_drv.c linux-2.6.32.21/drivers/gpu/drm/drm_drv.c
---- linux-2.6.32.21/drivers/gpu/drm/drm_drv.c 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/drm_drv.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/gpu/drm/drm_drv.c linux-2.6.32.22/drivers/gpu/drm/drm_drv.c
+--- linux-2.6.32.22/drivers/gpu/drm/drm_drv.c 2010-08-29 21:08:20.000000000 -0400
++++ linux-2.6.32.22/drivers/gpu/drm/drm_drv.c 2010-09-04 15:54:52.000000000 -0400
@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc
char *kdata = NULL;
@@ -24823,9 +25046,9 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/drm_drv.c linux-2.6.32.21/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.21/drivers/gpu/drm/drm_fops.c linux-2.6.32.21/drivers/gpu/drm/drm_fops.c
---- linux-2.6.32.21/drivers/gpu/drm/drm_fops.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/drm_fops.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/gpu/drm/drm_fops.c linux-2.6.32.22/drivers/gpu/drm/drm_fops.c
+--- linux-2.6.32.22/drivers/gpu/drm/drm_fops.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/gpu/drm/drm_fops.c 2010-09-04 15:54:52.000000000 -0400
@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device *
}
@@ -24877,9 +25100,9 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/drm_fops.c linux-2.6.32.21/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.21/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.21/drivers/gpu/drm/drm_ioctl.c
---- linux-2.6.32.21/drivers/gpu/drm/drm_ioctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/drm_ioctl.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.22/drivers/gpu/drm/drm_ioctl.c
+--- linux-2.6.32.22/drivers/gpu/drm/drm_ioctl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/gpu/drm/drm_ioctl.c 2010-09-04 15:54:52.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);
@@ -24889,9 +25112,9 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.21/drivers/g
stats->data[i].type = dev->types[i];
}
-diff -urNp linux-2.6.32.21/drivers/gpu/drm/drm_lock.c linux-2.6.32.21/drivers/gpu/drm/drm_lock.c
---- linux-2.6.32.21/drivers/gpu/drm/drm_lock.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/drm_lock.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/gpu/drm/drm_lock.c linux-2.6.32.22/drivers/gpu/drm/drm_lock.c
+--- linux-2.6.32.22/drivers/gpu/drm/drm_lock.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/gpu/drm/drm_lock.c 2010-09-04 15:54:52.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;
@@ -24910,9 +25133,9 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/drm_lock.c linux-2.6.32.21/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.21/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.21/drivers/gpu/drm/i810/i810_dma.c
---- linux-2.6.32.21/drivers/gpu/drm/i810/i810_dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/i810/i810_dma.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.22/drivers/gpu/drm/i810/i810_dma.c
+--- linux-2.6.32.22/drivers/gpu/drm/i810/i810_dma.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/gpu/drm/i810/i810_dma.c 2010-09-04 15:54:52.000000000 -0400
@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de
dma->buflist[vertex->idx],
vertex->discard, vertex->used);
@@ -24935,9 +25158,9 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.21/drive
sarea_priv->last_enqueue = dev_priv->counter - 1;
sarea_priv->last_dispatch = (int)hw_status[5];
-diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7017.c
---- linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7017.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7017.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.22/drivers/gpu/drm/i915/dvo_ch7017.c
+--- linux-2.6.32.22/drivers/gpu/drm/i915/dvo_ch7017.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/gpu/drm/i915/dvo_ch7017.c 2010-09-04 15:54:52.000000000 -0400
@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_
}
}
@@ -24947,9 +25170,9 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.21/dri
.init = ch7017_init,
.detect = ch7017_detect,
.mode_valid = ch7017_mode_valid,
-diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7xxx.c
---- linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.22/drivers/gpu/drm/i915/dvo_ch7xxx.c
+--- linux-2.6.32.22/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-09-04 15:54:52.000000000 -0400
@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_
}
}
@@ -24959,9 +25182,9 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.21/dri
.init = ch7xxx_init,
.detect = ch7xxx_detect,
.mode_valid = ch7xxx_mode_valid,
-diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/dvo.h linux-2.6.32.21/drivers/gpu/drm/i915/dvo.h
---- linux-2.6.32.21/drivers/gpu/drm/i915/dvo.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/i915/dvo.h 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/gpu/drm/i915/dvo.h linux-2.6.32.22/drivers/gpu/drm/i915/dvo.h
+--- linux-2.6.32.22/drivers/gpu/drm/i915/dvo.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/gpu/drm/i915/dvo.h 2010-09-04 15:54:52.000000000 -0400
@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops {
*
* \return singly-linked list of modes or NULL if no modes found.
@@ -24994,9 +25217,9 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/dvo.h linux-2.6.32.21/drivers/gp
+extern const struct intel_dvo_dev_ops ch7017_ops;
#endif /* _INTEL_DVO_H */
-diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ivch.c
---- linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ivch.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ivch.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.22/drivers/gpu/drm/i915/dvo_ivch.c
+--- linux-2.6.32.22/drivers/gpu/drm/i915/dvo_ivch.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/gpu/drm/i915/dvo_ivch.c 2010-09-04 15:54:52.000000000 -0400
@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv
}
}
@@ -25006,9 +25229,9 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.21/drive
.init = ivch_init,
.dpms = ivch_dpms,
.save = ivch_save,
-diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.21/drivers/gpu/drm/i915/dvo_sil164.c
---- linux-2.6.32.21/drivers/gpu/drm/i915/dvo_sil164.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/i915/dvo_sil164.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.22/drivers/gpu/drm/i915/dvo_sil164.c
+--- linux-2.6.32.22/drivers/gpu/drm/i915/dvo_sil164.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/gpu/drm/i915/dvo_sil164.c 2010-09-04 15:54:52.000000000 -0400
@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_
}
}
@@ -25018,9 +25241,9 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.21/dri
.init = sil164_init,
.detect = sil164_detect,
.mode_valid = sil164_mode_valid,
-diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.21/drivers/gpu/drm/i915/dvo_tfp410.c
---- linux-2.6.32.21/drivers/gpu/drm/i915/dvo_tfp410.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/i915/dvo_tfp410.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.22/drivers/gpu/drm/i915/dvo_tfp410.c
+--- linux-2.6.32.22/drivers/gpu/drm/i915/dvo_tfp410.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/gpu/drm/i915/dvo_tfp410.c 2010-09-04 15:54:52.000000000 -0400
@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_
}
}
@@ -25030,9 +25253,9 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.21/dri
.init = tfp410_init,
.detect = tfp410_detect,
.mode_valid = tfp410_mode_valid,
-diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.21/drivers/gpu/drm/i915/i915_drv.c
---- linux-2.6.32.21/drivers/gpu/drm/i915/i915_drv.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/i915/i915_drv.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.22/drivers/gpu/drm/i915/i915_drv.c
+--- linux-2.6.32.22/drivers/gpu/drm/i915/i915_drv.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/gpu/drm/i915/i915_drv.c 2010-09-04 15:54:52.000000000 -0400
@@ -285,7 +285,7 @@ i915_pci_resume(struct pci_dev *pdev)
return i915_resume(dev);
}
@@ -25042,9 +25265,9 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.21/drive
.fault = i915_gem_fault,
.open = drm_gem_vm_open,
.close = drm_gem_vm_close,
-diff -urNp linux-2.6.32.21/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.21/drivers/gpu/drm/radeon/mkregtable.c
---- linux-2.6.32.21/drivers/gpu/drm/radeon/mkregtable.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/radeon/mkregtable.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.22/drivers/gpu/drm/radeon/mkregtable.c
+--- linux-2.6.32.22/drivers/gpu/drm/radeon/mkregtable.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/gpu/drm/radeon/mkregtable.c 2010-09-04 15:54:52.000000000 -0400
@@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
regex_t mask_rex;
regmatch_t match[4];
@@ -25062,9 +25285,9 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.21/d
if (regcomp
(&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
-diff -urNp linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_atombios.c
---- linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_atombios.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_atombios.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.22/drivers/gpu/drm/radeon/radeon_atombios.c
+--- linux-2.6.32.22/drivers/gpu/drm/radeon/radeon_atombios.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/gpu/drm/radeon/radeon_atombios.c 2010-09-04 15:54:52.000000000 -0400
@@ -513,13 +513,13 @@ static uint16_t atombios_get_connector_o
}
}
@@ -25089,9 +25312,9 @@ diff -urNp linux-2.6.32.21/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.21/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_display.c
---- linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_display.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_display.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.22/drivers/gpu/drm/radeon/radeon_display.c
+--- linux-2.6.32.22/drivers/gpu/drm/radeon/radeon_display.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/gpu/drm/radeon/radeon_display.c 2010-09-04 15:54:52.000000000 -0400
@@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl
if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
@@ -25101,9 +25324,9 @@ diff -urNp linux-2.6.32.21/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.21/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_state.c
---- linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_state.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_state.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.22/drivers/gpu/drm/radeon/radeon_state.c
+--- linux-2.6.32.22/drivers/gpu/drm/radeon/radeon_state.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/gpu/drm/radeon/radeon_state.c 2010-09-04 15:54:52.000000000 -0400
@@ -3021,7 +3021,7 @@ static int radeon_cp_getparam(struct drm
{
drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -25113,9 +25336,9 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.21
DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
-diff -urNp linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_ttm.c
---- linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_ttm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_ttm.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.22/drivers/gpu/drm/radeon/radeon_ttm.c
+--- linux-2.6.32.22/drivers/gpu/drm/radeon/radeon_ttm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/gpu/drm/radeon/radeon_ttm.c 2010-09-04 15:54:52.000000000 -0400
@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic
DRM_INFO("radeon: ttm finalized\n");
}
@@ -25167,9 +25390,9 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.21/d
}
-diff -urNp linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_bo.c
---- linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_bo.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_bo.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.22/drivers/gpu/drm/ttm/ttm_bo.c
+--- linux-2.6.32.22/drivers/gpu/drm/ttm/ttm_bo.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/gpu/drm/ttm/ttm_bo.c 2010-09-04 15:54:52.000000000 -0400
@@ -39,7 +39,7 @@
#include <linux/module.h>
@@ -25188,9 +25411,9 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.21/drivers/
.show = &ttm_bo_global_show
};
-diff -urNp linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_bo_vm.c
---- linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.22/drivers/gpu/drm/ttm/ttm_bo_vm.c
+--- linux-2.6.32.22/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-09-04 15:54:52.000000000 -0400
@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are
{
struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
@@ -25211,9 +25434,9 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.21/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.21/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_global.c
---- linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_global.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_global.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.22/drivers/gpu/drm/ttm/ttm_global.c
+--- linux-2.6.32.22/drivers/gpu/drm/ttm/ttm_global.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/gpu/drm/ttm/ttm_global.c 2010-09-04 15:54:52.000000000 -0400
@@ -36,7 +36,7 @@
struct ttm_global_item {
struct mutex mutex;
@@ -25271,9 +25494,9 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.21/driv
ref->release(ref);
item->object = NULL;
}
-diff -urNp linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_memory.c
---- linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_memory.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_memory.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.22/drivers/gpu/drm/ttm/ttm_memory.c
+--- linux-2.6.32.22/drivers/gpu/drm/ttm/ttm_memory.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/gpu/drm/ttm/ttm_memory.c 2010-09-04 15:54:52.000000000 -0400
@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at
NULL
};
@@ -25283,9 +25506,9 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.21/driv
.show = &ttm_mem_zone_show,
.store = &ttm_mem_zone_store
};
-diff -urNp linux-2.6.32.21/drivers/hid/usbhid/hiddev.c linux-2.6.32.21/drivers/hid/usbhid/hiddev.c
---- linux-2.6.32.21/drivers/hid/usbhid/hiddev.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/hid/usbhid/hiddev.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/hid/usbhid/hiddev.c linux-2.6.32.22/drivers/hid/usbhid/hiddev.c
+--- linux-2.6.32.22/drivers/hid/usbhid/hiddev.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/hid/usbhid/hiddev.c 2010-09-04 15:54:52.000000000 -0400
@@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi
return put_user(HID_VERSION, (int __user *)arg);
@@ -25295,9 +25518,9 @@ diff -urNp linux-2.6.32.21/drivers/hid/usbhid/hiddev.c linux-2.6.32.21/drivers/h
return -EINVAL;
for (i = 0; i < hid->maxcollection; i++)
-diff -urNp linux-2.6.32.21/drivers/hwmon/k8temp.c linux-2.6.32.21/drivers/hwmon/k8temp.c
---- linux-2.6.32.21/drivers/hwmon/k8temp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/hwmon/k8temp.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/hwmon/k8temp.c linux-2.6.32.22/drivers/hwmon/k8temp.c
+--- linux-2.6.32.22/drivers/hwmon/k8temp.c 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.22/drivers/hwmon/k8temp.c 2010-09-20 17:27:14.000000000 -0400
@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n
static struct pci_device_id k8temp_ids[] = {
@@ -25307,9 +25530,9 @@ diff -urNp linux-2.6.32.21/drivers/hwmon/k8temp.c linux-2.6.32.21/drivers/hwmon/
};
MODULE_DEVICE_TABLE(pci, k8temp_ids);
-diff -urNp linux-2.6.32.21/drivers/hwmon/sis5595.c linux-2.6.32.21/drivers/hwmon/sis5595.c
---- linux-2.6.32.21/drivers/hwmon/sis5595.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/hwmon/sis5595.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/hwmon/sis5595.c linux-2.6.32.22/drivers/hwmon/sis5595.c
+--- linux-2.6.32.22/drivers/hwmon/sis5595.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/hwmon/sis5595.c 2010-09-04 15:54:52.000000000 -0400
@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda
static struct pci_device_id sis5595_pci_ids[] = {
@@ -25319,9 +25542,9 @@ diff -urNp linux-2.6.32.21/drivers/hwmon/sis5595.c linux-2.6.32.21/drivers/hwmon
};
MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
-diff -urNp linux-2.6.32.21/drivers/hwmon/via686a.c linux-2.6.32.21/drivers/hwmon/via686a.c
---- linux-2.6.32.21/drivers/hwmon/via686a.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/hwmon/via686a.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/hwmon/via686a.c linux-2.6.32.22/drivers/hwmon/via686a.c
+--- linux-2.6.32.22/drivers/hwmon/via686a.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/hwmon/via686a.c 2010-09-04 15:54:52.000000000 -0400
@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda
static struct pci_device_id via686a_pci_ids[] = {
@@ -25331,9 +25554,9 @@ diff -urNp linux-2.6.32.21/drivers/hwmon/via686a.c linux-2.6.32.21/drivers/hwmon
};
MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
-diff -urNp linux-2.6.32.21/drivers/hwmon/vt8231.c linux-2.6.32.21/drivers/hwmon/vt8231.c
---- linux-2.6.32.21/drivers/hwmon/vt8231.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/hwmon/vt8231.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/hwmon/vt8231.c linux-2.6.32.22/drivers/hwmon/vt8231.c
+--- linux-2.6.32.22/drivers/hwmon/vt8231.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/hwmon/vt8231.c 2010-09-04 15:54:52.000000000 -0400
@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri
static struct pci_device_id vt8231_pci_ids[] = {
@@ -25343,9 +25566,9 @@ diff -urNp linux-2.6.32.21/drivers/hwmon/vt8231.c linux-2.6.32.21/drivers/hwmon/
};
MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
-diff -urNp linux-2.6.32.21/drivers/hwmon/w83791d.c linux-2.6.32.21/drivers/hwmon/w83791d.c
---- linux-2.6.32.21/drivers/hwmon/w83791d.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/hwmon/w83791d.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/hwmon/w83791d.c linux-2.6.32.22/drivers/hwmon/w83791d.c
+--- linux-2.6.32.22/drivers/hwmon/w83791d.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/hwmon/w83791d.c 2010-09-04 15:54:52.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);
@@ -25357,9 +25580,9 @@ diff -urNp linux-2.6.32.21/drivers/hwmon/w83791d.c linux-2.6.32.21/drivers/hwmon
static struct w83791d_data *w83791d_update_device(struct device *dev);
#ifdef DEBUG
-diff -urNp linux-2.6.32.21/drivers/i2c/busses/i2c-i801.c linux-2.6.32.21/drivers/i2c/busses/i2c-i801.c
---- linux-2.6.32.21/drivers/i2c/busses/i2c-i801.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/i2c/busses/i2c-i801.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/i2c/busses/i2c-i801.c linux-2.6.32.22/drivers/i2c/busses/i2c-i801.c
+--- linux-2.6.32.22/drivers/i2c/busses/i2c-i801.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/i2c/busses/i2c-i801.c 2010-09-04 15:54:52.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) },
@@ -25369,9 +25592,9 @@ diff -urNp linux-2.6.32.21/drivers/i2c/busses/i2c-i801.c linux-2.6.32.21/drivers
};
MODULE_DEVICE_TABLE (pci, i801_ids);
-diff -urNp linux-2.6.32.21/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.21/drivers/i2c/busses/i2c-piix4.c
---- linux-2.6.32.21/drivers/i2c/busses/i2c-piix4.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/i2c/busses/i2c-piix4.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.22/drivers/i2c/busses/i2c-piix4.c
+--- linux-2.6.32.22/drivers/i2c/busses/i2c-piix4.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/i2c/busses/i2c-piix4.c 2010-09-04 15:54:52.000000000 -0400
@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat
.ident = "IBM",
.matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
@@ -25390,9 +25613,9 @@ diff -urNp linux-2.6.32.21/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.21/driver
};
MODULE_DEVICE_TABLE (pci, piix4_ids);
-diff -urNp linux-2.6.32.21/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.21/drivers/i2c/busses/i2c-sis630.c
---- linux-2.6.32.21/drivers/i2c/busses/i2c-sis630.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/i2c/busses/i2c-sis630.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.22/drivers/i2c/busses/i2c-sis630.c
+--- linux-2.6.32.22/drivers/i2c/busses/i2c-sis630.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/i2c/busses/i2c-sis630.c 2010-09-04 15:54:52.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) },
@@ -25402,9 +25625,9 @@ diff -urNp linux-2.6.32.21/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.21/drive
};
MODULE_DEVICE_TABLE (pci, sis630_ids);
-diff -urNp linux-2.6.32.21/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.21/drivers/i2c/busses/i2c-sis96x.c
---- linux-2.6.32.21/drivers/i2c/busses/i2c-sis96x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/i2c/busses/i2c-sis96x.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.22/drivers/i2c/busses/i2c-sis96x.c
+--- linux-2.6.32.22/drivers/i2c/busses/i2c-sis96x.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/i2c/busses/i2c-sis96x.c 2010-09-04 15:54:52.000000000 -0400
@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter
static struct pci_device_id sis96x_ids[] = {
@@ -25414,9 +25637,9 @@ diff -urNp linux-2.6.32.21/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.21/drive
};
MODULE_DEVICE_TABLE (pci, sis96x_ids);
-diff -urNp linux-2.6.32.21/drivers/ide/ide-cd.c linux-2.6.32.21/drivers/ide/ide-cd.c
---- linux-2.6.32.21/drivers/ide/ide-cd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ide/ide-cd.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ide/ide-cd.c linux-2.6.32.22/drivers/ide/ide-cd.c
+--- linux-2.6.32.22/drivers/ide/ide-cd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ide/ide-cd.c 2010-09-04 15:54:52.000000000 -0400
@@ -774,7 +774,7 @@ static void cdrom_do_block_pc(ide_drive_
alignment = queue_dma_alignment(q) | q->dma_pad_mask;
if ((unsigned long)buf & alignment
@@ -25426,9 +25649,9 @@ diff -urNp linux-2.6.32.21/drivers/ide/ide-cd.c linux-2.6.32.21/drivers/ide/ide-
drive->dma = 0;
}
}
-diff -urNp linux-2.6.32.21/drivers/ieee1394/dv1394.c linux-2.6.32.21/drivers/ieee1394/dv1394.c
---- linux-2.6.32.21/drivers/ieee1394/dv1394.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ieee1394/dv1394.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ieee1394/dv1394.c linux-2.6.32.22/drivers/ieee1394/dv1394.c
+--- linux-2.6.32.22/drivers/ieee1394/dv1394.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ieee1394/dv1394.c 2010-09-04 15:54:52.000000000 -0400
@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
based upon DIF section and sequence
*/
@@ -25447,9 +25670,9 @@ diff -urNp linux-2.6.32.21/drivers/ieee1394/dv1394.c linux-2.6.32.21/drivers/iee
};
MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
-diff -urNp linux-2.6.32.21/drivers/ieee1394/eth1394.c linux-2.6.32.21/drivers/ieee1394/eth1394.c
---- linux-2.6.32.21/drivers/ieee1394/eth1394.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ieee1394/eth1394.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ieee1394/eth1394.c linux-2.6.32.22/drivers/ieee1394/eth1394.c
+--- linux-2.6.32.22/drivers/ieee1394/eth1394.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ieee1394/eth1394.c 2010-09-04 15:54:52.000000000 -0400
@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e
.specifier_id = ETHER1394_GASP_SPECIFIER_ID,
.version = ETHER1394_GASP_VERSION,
@@ -25459,9 +25682,9 @@ diff -urNp linux-2.6.32.21/drivers/ieee1394/eth1394.c linux-2.6.32.21/drivers/ie
};
MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table);
-diff -urNp linux-2.6.32.21/drivers/ieee1394/hosts.c linux-2.6.32.21/drivers/ieee1394/hosts.c
---- linux-2.6.32.21/drivers/ieee1394/hosts.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ieee1394/hosts.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ieee1394/hosts.c linux-2.6.32.22/drivers/ieee1394/hosts.c
+--- linux-2.6.32.22/drivers/ieee1394/hosts.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ieee1394/hosts.c 2010-09-04 15:54:52.000000000 -0400
@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso
}
@@ -25470,9 +25693,9 @@ diff -urNp linux-2.6.32.21/drivers/ieee1394/hosts.c linux-2.6.32.21/drivers/ieee
.transmit_packet = dummy_transmit_packet,
.devctl = dummy_devctl,
.isoctl = dummy_isoctl
-diff -urNp linux-2.6.32.21/drivers/ieee1394/ohci1394.c linux-2.6.32.21/drivers/ieee1394/ohci1394.c
---- linux-2.6.32.21/drivers/ieee1394/ohci1394.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ieee1394/ohci1394.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ieee1394/ohci1394.c linux-2.6.32.22/drivers/ieee1394/ohci1394.c
+--- linux-2.6.32.22/drivers/ieee1394/ohci1394.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ieee1394/ohci1394.c 2010-09-04 15:54:52.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)
@@ -25494,9 +25717,9 @@ diff -urNp linux-2.6.32.21/drivers/ieee1394/ohci1394.c linux-2.6.32.21/drivers/i
};
MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl);
-diff -urNp linux-2.6.32.21/drivers/ieee1394/raw1394.c linux-2.6.32.21/drivers/ieee1394/raw1394.c
---- linux-2.6.32.21/drivers/ieee1394/raw1394.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ieee1394/raw1394.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ieee1394/raw1394.c linux-2.6.32.22/drivers/ieee1394/raw1394.c
+--- linux-2.6.32.22/drivers/ieee1394/raw1394.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ieee1394/raw1394.c 2010-09-04 15:54:52.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,
@@ -25506,9 +25729,9 @@ diff -urNp linux-2.6.32.21/drivers/ieee1394/raw1394.c linux-2.6.32.21/drivers/ie
};
MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
-diff -urNp linux-2.6.32.21/drivers/ieee1394/sbp2.c linux-2.6.32.21/drivers/ieee1394/sbp2.c
---- linux-2.6.32.21/drivers/ieee1394/sbp2.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ieee1394/sbp2.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ieee1394/sbp2.c linux-2.6.32.22/drivers/ieee1394/sbp2.c
+--- linux-2.6.32.22/drivers/ieee1394/sbp2.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ieee1394/sbp2.c 2010-09-04 15:54:52.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,
@@ -25527,9 +25750,9 @@ diff -urNp linux-2.6.32.21/drivers/ieee1394/sbp2.c linux-2.6.32.21/drivers/ieee1
{
int ret;
-diff -urNp linux-2.6.32.21/drivers/ieee1394/video1394.c linux-2.6.32.21/drivers/ieee1394/video1394.c
---- linux-2.6.32.21/drivers/ieee1394/video1394.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ieee1394/video1394.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/ieee1394/video1394.c linux-2.6.32.22/drivers/ieee1394/video1394.c
+--- linux-2.6.32.22/drivers/ieee1394/video1394.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/ieee1394/video1394.c 2010-09-04 15:54:52.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
@@ -25539,9 +25762,9 @@ diff -urNp linux-2.6.32.21/drivers/ieee1394/video1394.c linux-2.6.32.21/drivers/
};
MODULE_DEVICE_TABLE(ieee1394, video1394_id_table);
-diff -urNp linux-2.6.32.21/drivers/infiniband/core/cm.c linux-2.6.32.21/drivers/infiniband/core/cm.c
---- linux-2.6.32.21/drivers/infiniband/core/cm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/infiniband/core/cm.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/infiniband/core/cm.c linux-2.6.32.22/drivers/infiniband/core/cm.c
+--- linux-2.6.32.22/drivers/infiniband/core/cm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/infiniband/core/cm.c 2010-09-04 15:54:52.000000000 -0400
@@ -112,7 +112,7 @@ static char const counter_group_names[CM
struct cm_counter_group {
@@ -25685,9 +25908,9 @@ diff -urNp linux-2.6.32.21/drivers/infiniband/core/cm.c linux-2.6.32.21/drivers/
.show = cm_show_counter
};
-diff -urNp linux-2.6.32.21/drivers/infiniband/core/sysfs.c linux-2.6.32.21/drivers/infiniband/core/sysfs.c
---- linux-2.6.32.21/drivers/infiniband/core/sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/infiniband/core/sysfs.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/infiniband/core/sysfs.c linux-2.6.32.22/drivers/infiniband/core/sysfs.c
+--- linux-2.6.32.22/drivers/infiniband/core/sysfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/infiniband/core/sysfs.c 2010-09-04 15:54:52.000000000 -0400
@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob
return port_attr->show(p, port_attr, buf);
}
@@ -25697,9 +25920,9 @@ diff -urNp linux-2.6.32.21/drivers/infiniband/core/sysfs.c linux-2.6.32.21/drive
.show = port_attr_show
};
-diff -urNp linux-2.6.32.21/drivers/input/keyboard/atkbd.c linux-2.6.32.21/drivers/input/keyboard/atkbd.c
---- linux-2.6.32.21/drivers/input/keyboard/atkbd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/input/keyboard/atkbd.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/input/keyboard/atkbd.c linux-2.6.32.22/drivers/input/keyboard/atkbd.c
+--- linux-2.6.32.22/drivers/input/keyboard/atkbd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/input/keyboard/atkbd.c 2010-09-04 15:54:52.000000000 -0400
@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri
.id = SERIO_ANY,
.extra = SERIO_ANY,
@@ -25709,9 +25932,9 @@ diff -urNp linux-2.6.32.21/drivers/input/keyboard/atkbd.c linux-2.6.32.21/driver
};
MODULE_DEVICE_TABLE(serio, atkbd_serio_ids);
-diff -urNp linux-2.6.32.21/drivers/input/mouse/lifebook.c linux-2.6.32.21/drivers/input/mouse/lifebook.c
---- linux-2.6.32.21/drivers/input/mouse/lifebook.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/input/mouse/lifebook.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/input/mouse/lifebook.c linux-2.6.32.22/drivers/input/mouse/lifebook.c
+--- linux-2.6.32.22/drivers/input/mouse/lifebook.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/input/mouse/lifebook.c 2010-09-04 15:54:52.000000000 -0400
@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo
DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
},
@@ -25721,9 +25944,9 @@ diff -urNp linux-2.6.32.21/drivers/input/mouse/lifebook.c linux-2.6.32.21/driver
};
static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse)
-diff -urNp linux-2.6.32.21/drivers/input/mouse/psmouse-base.c linux-2.6.32.21/drivers/input/mouse/psmouse-base.c
---- linux-2.6.32.21/drivers/input/mouse/psmouse-base.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/input/mouse/psmouse-base.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/input/mouse/psmouse-base.c linux-2.6.32.22/drivers/input/mouse/psmouse-base.c
+--- linux-2.6.32.22/drivers/input/mouse/psmouse-base.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/input/mouse/psmouse-base.c 2010-09-04 15:54:52.000000000 -0400
@@ -1415,7 +1415,7 @@ static struct serio_device_id psmouse_se
.id = SERIO_ANY,
.extra = SERIO_ANY,
@@ -25733,9 +25956,9 @@ diff -urNp linux-2.6.32.21/drivers/input/mouse/psmouse-base.c linux-2.6.32.21/dr
};
MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
-diff -urNp linux-2.6.32.21/drivers/input/mouse/synaptics.c linux-2.6.32.21/drivers/input/mouse/synaptics.c
---- linux-2.6.32.21/drivers/input/mouse/synaptics.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/input/mouse/synaptics.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/input/mouse/synaptics.c linux-2.6.32.22/drivers/input/mouse/synaptics.c
+--- linux-2.6.32.22/drivers/input/mouse/synaptics.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/input/mouse/synaptics.c 2010-09-04 15:54:52.000000000 -0400
@@ -437,7 +437,7 @@ static void synaptics_process_packet(str
break;
case 2:
@@ -25764,9 +25987,9 @@ diff -urNp linux-2.6.32.21/drivers/input/mouse/synaptics.c linux-2.6.32.21/drive
};
#endif
-diff -urNp linux-2.6.32.21/drivers/input/mousedev.c linux-2.6.32.21/drivers/input/mousedev.c
---- linux-2.6.32.21/drivers/input/mousedev.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/input/mousedev.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/input/mousedev.c linux-2.6.32.22/drivers/input/mousedev.c
+--- linux-2.6.32.22/drivers/input/mousedev.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/input/mousedev.c 2010-09-04 15:54:52.000000000 -0400
@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han
#ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
@@ -25776,9 +25999,9 @@ diff -urNp linux-2.6.32.21/drivers/input/mousedev.c linux-2.6.32.21/drivers/inpu
};
static int psaux_registered;
#endif
-diff -urNp linux-2.6.32.21/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.21/drivers/input/serio/i8042-x86ia64io.h
---- linux-2.6.32.21/drivers/input/serio/i8042-x86ia64io.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/input/serio/i8042-x86ia64io.h 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.22/drivers/input/serio/i8042-x86ia64io.h
+--- linux-2.6.32.22/drivers/input/serio/i8042-x86ia64io.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/input/serio/i8042-x86ia64io.h 2010-09-04 15:54:52.000000000 -0400
@@ -179,7 +179,7 @@ static const struct dmi_system_id __init
DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
},
@@ -25833,9 +26056,9 @@ diff -urNp linux-2.6.32.21/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.21
};
#endif /* CONFIG_X86 */
-diff -urNp linux-2.6.32.21/drivers/input/serio/serio_raw.c linux-2.6.32.21/drivers/input/serio/serio_raw.c
---- linux-2.6.32.21/drivers/input/serio/serio_raw.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/input/serio/serio_raw.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/input/serio/serio_raw.c linux-2.6.32.22/drivers/input/serio/serio_raw.c
+--- linux-2.6.32.22/drivers/input/serio/serio_raw.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/input/serio/serio_raw.c 2010-09-04 15:54:52.000000000 -0400
@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_
.id = SERIO_ANY,
.extra = SERIO_ANY,
@@ -25845,9 +26068,9 @@ diff -urNp linux-2.6.32.21/drivers/input/serio/serio_raw.c linux-2.6.32.21/drive
};
MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids);
-diff -urNp linux-2.6.32.21/drivers/isdn/gigaset/common.c linux-2.6.32.21/drivers/isdn/gigaset/common.c
---- linux-2.6.32.21/drivers/isdn/gigaset/common.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/isdn/gigaset/common.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/isdn/gigaset/common.c linux-2.6.32.22/drivers/isdn/gigaset/common.c
+--- linux-2.6.32.22/drivers/isdn/gigaset/common.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/isdn/gigaset/common.c 2010-09-04 15:54:52.000000000 -0400
@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct
cs->commands_pending = 0;
cs->cur_at_seq = 0;
@@ -25857,9 +26080,9 @@ diff -urNp linux-2.6.32.21/drivers/isdn/gigaset/common.c linux-2.6.32.21/drivers
cs->dev = NULL;
cs->tty = NULL;
cs->tty_dev = NULL;
-diff -urNp linux-2.6.32.21/drivers/isdn/gigaset/gigaset.h linux-2.6.32.21/drivers/isdn/gigaset/gigaset.h
---- linux-2.6.32.21/drivers/isdn/gigaset/gigaset.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/isdn/gigaset/gigaset.h 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/isdn/gigaset/gigaset.h linux-2.6.32.22/drivers/isdn/gigaset/gigaset.h
+--- linux-2.6.32.22/drivers/isdn/gigaset/gigaset.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/isdn/gigaset/gigaset.h 2010-09-04 15:54:52.000000000 -0400
@@ -446,7 +446,7 @@ struct cardstate {
spinlock_t cmdlock;
unsigned curlen, cmdbytes;
@@ -25869,9 +26092,9 @@ diff -urNp linux-2.6.32.21/drivers/isdn/gigaset/gigaset.h linux-2.6.32.21/driver
struct tty_struct *tty;
struct tasklet_struct if_wake_tasklet;
unsigned control_state;
-diff -urNp linux-2.6.32.21/drivers/isdn/gigaset/interface.c linux-2.6.32.21/drivers/isdn/gigaset/interface.c
---- linux-2.6.32.21/drivers/isdn/gigaset/interface.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/isdn/gigaset/interface.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/isdn/gigaset/interface.c linux-2.6.32.22/drivers/isdn/gigaset/interface.c
+--- linux-2.6.32.22/drivers/isdn/gigaset/interface.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/isdn/gigaset/interface.c 2010-09-04 15:54:52.000000000 -0400
@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt
return -ERESTARTSYS; // FIXME -EINTR?
tty->driver_data = cs;
@@ -25959,9 +26182,9 @@ diff -urNp linux-2.6.32.21/drivers/isdn/gigaset/interface.c linux-2.6.32.21/driv
dev_warn(cs->dev, "%s: device not opened\n", __func__);
goto out;
}
-diff -urNp linux-2.6.32.21/drivers/isdn/hardware/avm/b1.c linux-2.6.32.21/drivers/isdn/hardware/avm/b1.c
---- linux-2.6.32.21/drivers/isdn/hardware/avm/b1.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/isdn/hardware/avm/b1.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/isdn/hardware/avm/b1.c linux-2.6.32.22/drivers/isdn/hardware/avm/b1.c
+--- linux-2.6.32.22/drivers/isdn/hardware/avm/b1.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/isdn/hardware/avm/b1.c 2010-09-04 15:54:52.000000000 -0400
@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo
}
if (left) {
@@ -25980,9 +26203,9 @@ diff -urNp linux-2.6.32.21/drivers/isdn/hardware/avm/b1.c linux-2.6.32.21/driver
return -EFAULT;
} else {
memcpy(buf, dp, left);
-diff -urNp linux-2.6.32.21/drivers/isdn/icn/icn.c linux-2.6.32.21/drivers/isdn/icn/icn.c
---- linux-2.6.32.21/drivers/isdn/icn/icn.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/isdn/icn/icn.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/isdn/icn/icn.c linux-2.6.32.22/drivers/isdn/icn/icn.c
+--- linux-2.6.32.22/drivers/isdn/icn/icn.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/isdn/icn/icn.c 2010-09-04 15:54:52.000000000 -0400
@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len
if (count > len)
count = len;
@@ -25992,9 +26215,9 @@ diff -urNp linux-2.6.32.21/drivers/isdn/icn/icn.c linux-2.6.32.21/drivers/isdn/i
return -EFAULT;
} else
memcpy(msg, buf, count);
-diff -urNp linux-2.6.32.21/drivers/lguest/core.c linux-2.6.32.21/drivers/lguest/core.c
---- linux-2.6.32.21/drivers/lguest/core.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/lguest/core.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/lguest/core.c linux-2.6.32.22/drivers/lguest/core.c
+--- linux-2.6.32.22/drivers/lguest/core.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/lguest/core.c 2010-09-04 15:54:52.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.
@@ -26013,9 +26236,9 @@ diff -urNp linux-2.6.32.21/drivers/lguest/core.c linux-2.6.32.21/drivers/lguest/
if (!switcher_vma) {
err = -ENOMEM;
printk("lguest: could not map switcher pages high\n");
-diff -urNp linux-2.6.32.21/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.21/drivers/macintosh/via-pmu-backlight.c
---- linux-2.6.32.21/drivers/macintosh/via-pmu-backlight.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/macintosh/via-pmu-backlight.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.22/drivers/macintosh/via-pmu-backlight.c
+--- linux-2.6.32.22/drivers/macintosh/via-pmu-backlight.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/macintosh/via-pmu-backlight.c 2010-09-04 15:54:52.000000000 -0400
@@ -15,7 +15,7 @@
#define MAX_PMU_LEVEL 0xFF
@@ -26034,9 +26257,9 @@ diff -urNp linux-2.6.32.21/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.21
.get_brightness = pmu_backlight_get_brightness,
.update_status = pmu_backlight_update_status,
-diff -urNp linux-2.6.32.21/drivers/macintosh/via-pmu.c linux-2.6.32.21/drivers/macintosh/via-pmu.c
---- linux-2.6.32.21/drivers/macintosh/via-pmu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/macintosh/via-pmu.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/macintosh/via-pmu.c linux-2.6.32.22/drivers/macintosh/via-pmu.c
+--- linux-2.6.32.22/drivers/macintosh/via-pmu.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/macintosh/via-pmu.c 2010-09-04 15:54:52.000000000 -0400
@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state
&& (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
}
@@ -26046,9 +26269,9 @@ diff -urNp linux-2.6.32.21/drivers/macintosh/via-pmu.c linux-2.6.32.21/drivers/m
.enter = powerbook_sleep,
.valid = pmu_sleep_valid,
};
-diff -urNp linux-2.6.32.21/drivers/md/bitmap.c linux-2.6.32.21/drivers/md/bitmap.c
---- linux-2.6.32.21/drivers/md/bitmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/md/bitmap.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/md/bitmap.c linux-2.6.32.22/drivers/md/bitmap.c
+--- linux-2.6.32.22/drivers/md/bitmap.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/md/bitmap.c 2010-09-04 15:54:52.000000000 -0400
@@ -58,7 +58,7 @@
# if DEBUG > 0
# define PRINTK(x...) printk(KERN_DEBUG x)
@@ -26058,9 +26281,9 @@ diff -urNp linux-2.6.32.21/drivers/md/bitmap.c linux-2.6.32.21/drivers/md/bitmap
# endif
#endif
-diff -urNp linux-2.6.32.21/drivers/md/dm-sysfs.c linux-2.6.32.21/drivers/md/dm-sysfs.c
---- linux-2.6.32.21/drivers/md/dm-sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/md/dm-sysfs.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/md/dm-sysfs.c linux-2.6.32.22/drivers/md/dm-sysfs.c
+--- linux-2.6.32.22/drivers/md/dm-sysfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/md/dm-sysfs.c 2010-09-04 15:54:52.000000000 -0400
@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = {
NULL,
};
@@ -26070,9 +26293,9 @@ diff -urNp linux-2.6.32.21/drivers/md/dm-sysfs.c linux-2.6.32.21/drivers/md/dm-s
.show = dm_attr_show,
};
-diff -urNp linux-2.6.32.21/drivers/md/dm-table.c linux-2.6.32.21/drivers/md/dm-table.c
---- linux-2.6.32.21/drivers/md/dm-table.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/md/dm-table.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/md/dm-table.c linux-2.6.32.22/drivers/md/dm-table.c
+--- linux-2.6.32.22/drivers/md/dm-table.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/md/dm-table.c 2010-09-04 15:54:52.000000000 -0400
@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct
if (!dev_size)
return 0;
@@ -26082,9 +26305,9 @@ diff -urNp linux-2.6.32.21/drivers/md/dm-table.c linux-2.6.32.21/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.21/drivers/md/md.c linux-2.6.32.21/drivers/md/md.c
---- linux-2.6.32.21/drivers/md/md.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/md/md.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/md/md.c linux-2.6.32.22/drivers/md/md.c
+--- linux-2.6.32.22/drivers/md/md.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/md/md.c 2010-09-04 15:54:52.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);
@@ -26121,9 +26344,9 @@ diff -urNp linux-2.6.32.21/drivers/md/md.c linux-2.6.32.21/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.21/drivers/md/md.h linux-2.6.32.21/drivers/md/md.h
---- linux-2.6.32.21/drivers/md/md.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/md/md.h 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/md/md.h linux-2.6.32.22/drivers/md/md.h
+--- linux-2.6.32.22/drivers/md/md.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/md/md.h 2010-09-04 15:54:52.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)
@@ -26133,9 +26356,9 @@ diff -urNp linux-2.6.32.21/drivers/md/md.h linux-2.6.32.21/drivers/md/md.h
}
struct mdk_personality
-diff -urNp linux-2.6.32.21/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.21/drivers/media/dvb/dvb-core/dvbdev.c
---- linux-2.6.32.21/drivers/media/dvb/dvb-core/dvbdev.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/media/dvb/dvb-core/dvbdev.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.22/drivers/media/dvb/dvb-core/dvbdev.c
+--- linux-2.6.32.22/drivers/media/dvb/dvb-core/dvbdev.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/media/dvb/dvb-core/dvbdev.c 2010-09-04 15:54:52.000000000 -0400
@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt
const struct dvb_device *template, void *priv, int type)
{
@@ -26144,9 +26367,9 @@ diff -urNp linux-2.6.32.21/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.21/d
struct file_operations *dvbdevfops;
struct device *clsdev;
int minor;
-diff -urNp linux-2.6.32.21/drivers/media/radio/radio-cadet.c linux-2.6.32.21/drivers/media/radio/radio-cadet.c
---- linux-2.6.32.21/drivers/media/radio/radio-cadet.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/media/radio/radio-cadet.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/media/radio/radio-cadet.c linux-2.6.32.22/drivers/media/radio/radio-cadet.c
+--- linux-2.6.32.22/drivers/media/radio/radio-cadet.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/media/radio/radio-cadet.c 2010-09-04 15:54:52.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++];
@@ -26156,9 +26379,9 @@ diff -urNp linux-2.6.32.21/drivers/media/radio/radio-cadet.c linux-2.6.32.21/dri
return -EFAULT;
return i;
}
-diff -urNp linux-2.6.32.21/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.21/drivers/media/video/usbvideo/konicawc.c
---- linux-2.6.32.21/drivers/media/video/usbvideo/konicawc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/media/video/usbvideo/konicawc.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.22/drivers/media/video/usbvideo/konicawc.c
+--- linux-2.6.32.22/drivers/media/video/usbvideo/konicawc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/media/video/usbvideo/konicawc.c 2010-09-04 15:54:52.000000000 -0400
@@ -225,7 +225,7 @@ static void konicawc_register_input(stru
int error;
@@ -26168,9 +26391,9 @@ diff -urNp linux-2.6.32.21/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.21/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.21/drivers/media/video/usbvideo/quickcam_messenger.c
---- linux-2.6.32.21/drivers/media/video/usbvideo/quickcam_messenger.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/media/video/usbvideo/quickcam_messenger.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.22/drivers/media/video/usbvideo/quickcam_messenger.c
+--- linux-2.6.32.22/drivers/media/video/usbvideo/quickcam_messenger.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/media/video/usbvideo/quickcam_messenger.c 2010-09-04 15:54:52.000000000 -0400
@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc
int error;
@@ -26180,9 +26403,9 @@ diff -urNp linux-2.6.32.21/drivers/media/video/usbvideo/quickcam_messenger.c lin
cam->input = input_dev = input_allocate_device();
if (!input_dev) {
-diff -urNp linux-2.6.32.21/drivers/message/fusion/mptbase.c linux-2.6.32.21/drivers/message/fusion/mptbase.c
---- linux-2.6.32.21/drivers/message/fusion/mptbase.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/message/fusion/mptbase.c 2010-09-14 21:32:19.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/message/fusion/mptbase.c linux-2.6.32.22/drivers/message/fusion/mptbase.c
+--- linux-2.6.32.22/drivers/message/fusion/mptbase.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/message/fusion/mptbase.c 2010-09-14 21:32:19.000000000 -0400
@@ -6709,8 +6709,14 @@ procmpt_iocinfo_read(char *buf, char **s
len += sprintf(buf+len, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
len += sprintf(buf+len, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
@@ -26198,9 +26421,9 @@ diff -urNp linux-2.6.32.21/drivers/message/fusion/mptbase.c linux-2.6.32.21/driv
/*
* Rounding UP to nearest 4-kB boundary here...
*/
-diff -urNp linux-2.6.32.21/drivers/message/fusion/mptdebug.h linux-2.6.32.21/drivers/message/fusion/mptdebug.h
---- linux-2.6.32.21/drivers/message/fusion/mptdebug.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/message/fusion/mptdebug.h 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/message/fusion/mptdebug.h linux-2.6.32.22/drivers/message/fusion/mptdebug.h
+--- linux-2.6.32.22/drivers/message/fusion/mptdebug.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/message/fusion/mptdebug.h 2010-09-04 15:54:52.000000000 -0400
@@ -71,7 +71,7 @@
CMD; \
}
@@ -26210,9 +26433,9 @@ diff -urNp linux-2.6.32.21/drivers/message/fusion/mptdebug.h linux-2.6.32.21/dri
#endif
-diff -urNp linux-2.6.32.21/drivers/message/fusion/mptsas.c linux-2.6.32.21/drivers/message/fusion/mptsas.c
---- linux-2.6.32.21/drivers/message/fusion/mptsas.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/message/fusion/mptsas.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/message/fusion/mptsas.c linux-2.6.32.22/drivers/message/fusion/mptsas.c
+--- linux-2.6.32.22/drivers/message/fusion/mptsas.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/message/fusion/mptsas.c 2010-09-04 15:54:52.000000000 -0400
@@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin
return 0;
}
@@ -26261,9 +26484,9 @@ diff -urNp linux-2.6.32.21/drivers/message/fusion/mptsas.c linux-2.6.32.21/drive
static inline struct sas_port *
mptsas_get_port(struct mptsas_phyinfo *phy_info)
{
-diff -urNp linux-2.6.32.21/drivers/message/i2o/i2o_proc.c linux-2.6.32.21/drivers/message/i2o/i2o_proc.c
---- linux-2.6.32.21/drivers/message/i2o/i2o_proc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/message/i2o/i2o_proc.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/message/i2o/i2o_proc.c linux-2.6.32.22/drivers/message/i2o/i2o_proc.c
+--- linux-2.6.32.22/drivers/message/i2o/i2o_proc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/message/i2o/i2o_proc.c 2010-09-04 15:54:52.000000000 -0400
@@ -259,13 +259,6 @@ static char *scsi_devices[] = {
"Array Controller Device"
};
@@ -26350,9 +26573,9 @@ diff -urNp linux-2.6.32.21/drivers/message/i2o/i2o_proc.c linux-2.6.32.21/driver
return 0;
}
-diff -urNp linux-2.6.32.21/drivers/misc/kgdbts.c linux-2.6.32.21/drivers/misc/kgdbts.c
---- linux-2.6.32.21/drivers/misc/kgdbts.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/misc/kgdbts.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/misc/kgdbts.c linux-2.6.32.22/drivers/misc/kgdbts.c
+--- linux-2.6.32.22/drivers/misc/kgdbts.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/misc/kgdbts.c 2010-09-04 15:54:52.000000000 -0400
@@ -118,7 +118,7 @@
} while (0)
#define MAX_CONFIG_LEN 40
@@ -26371,9 +26594,9 @@ diff -urNp linux-2.6.32.21/drivers/misc/kgdbts.c linux-2.6.32.21/drivers/misc/kg
.name = "kgdbts",
.read_char = kgdbts_get_char,
.write_char = kgdbts_put_char,
-diff -urNp linux-2.6.32.21/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.21/drivers/misc/sgi-gru/gruhandles.c
---- linux-2.6.32.21/drivers/misc/sgi-gru/gruhandles.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/misc/sgi-gru/gruhandles.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.22/drivers/misc/sgi-gru/gruhandles.c
+--- linux-2.6.32.22/drivers/misc/sgi-gru/gruhandles.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/misc/sgi-gru/gruhandles.c 2010-09-04 15:54:52.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)
@@ -26385,9 +26608,9 @@ diff -urNp linux-2.6.32.21/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.21/dri
if (mcs_op_statistics[op].max < clks)
mcs_op_statistics[op].max = clks;
}
-diff -urNp linux-2.6.32.21/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.21/drivers/misc/sgi-gru/gruprocfs.c
---- linux-2.6.32.21/drivers/misc/sgi-gru/gruprocfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/misc/sgi-gru/gruprocfs.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.22/drivers/misc/sgi-gru/gruprocfs.c
+--- linux-2.6.32.22/drivers/misc/sgi-gru/gruprocfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/misc/sgi-gru/gruprocfs.c 2010-09-04 15:54:52.000000000 -0400
@@ -32,9 +32,9 @@
#define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
@@ -26411,9 +26634,9 @@ diff -urNp linux-2.6.32.21/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.21/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.21/drivers/misc/sgi-gru/grutables.h linux-2.6.32.21/drivers/misc/sgi-gru/grutables.h
---- linux-2.6.32.21/drivers/misc/sgi-gru/grutables.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/misc/sgi-gru/grutables.h 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/misc/sgi-gru/grutables.h linux-2.6.32.22/drivers/misc/sgi-gru/grutables.h
+--- linux-2.6.32.22/drivers/misc/sgi-gru/grutables.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/misc/sgi-gru/grutables.h 2010-09-04 15:54:52.000000000 -0400
@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids;
* GRU statistics.
*/
@@ -26597,9 +26820,9 @@ diff -urNp linux-2.6.32.21/drivers/misc/sgi-gru/grutables.h linux-2.6.32.21/driv
} while (0)
#ifdef CONFIG_SGI_GRU_DEBUG
-diff -urNp linux-2.6.32.21/drivers/mtd/devices/doc2000.c linux-2.6.32.21/drivers/mtd/devices/doc2000.c
---- linux-2.6.32.21/drivers/mtd/devices/doc2000.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/mtd/devices/doc2000.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/mtd/devices/doc2000.c linux-2.6.32.22/drivers/mtd/devices/doc2000.c
+--- linux-2.6.32.22/drivers/mtd/devices/doc2000.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/mtd/devices/doc2000.c 2010-09-04 15:54:52.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 */
@@ -26609,9 +26832,9 @@ diff -urNp linux-2.6.32.21/drivers/mtd/devices/doc2000.c linux-2.6.32.21/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.21/drivers/mtd/devices/doc2001.c linux-2.6.32.21/drivers/mtd/devices/doc2001.c
---- linux-2.6.32.21/drivers/mtd/devices/doc2001.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/mtd/devices/doc2001.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/mtd/devices/doc2001.c linux-2.6.32.22/drivers/mtd/devices/doc2001.c
+--- linux-2.6.32.22/drivers/mtd/devices/doc2001.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/mtd/devices/doc2001.c 2010-09-04 15:54:52.000000000 -0400
@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
struct Nand *mychip = &this->chips[from >> (this->chipshift)];
@@ -26621,9 +26844,9 @@ diff -urNp linux-2.6.32.21/drivers/mtd/devices/doc2001.c linux-2.6.32.21/drivers
return -EINVAL;
/* Don't allow a single read to cross a 512-byte block boundary */
-diff -urNp linux-2.6.32.21/drivers/mtd/ubi/build.c linux-2.6.32.21/drivers/mtd/ubi/build.c
---- linux-2.6.32.21/drivers/mtd/ubi/build.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/mtd/ubi/build.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/mtd/ubi/build.c linux-2.6.32.22/drivers/mtd/ubi/build.c
+--- linux-2.6.32.22/drivers/mtd/ubi/build.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/mtd/ubi/build.c 2010-09-04 15:54:52.000000000 -0400
@@ -1255,7 +1255,7 @@ module_exit(ubi_exit);
static int __init bytes_str_to_int(const char *str)
{
@@ -26663,9 +26886,9 @@ diff -urNp linux-2.6.32.21/drivers/mtd/ubi/build.c linux-2.6.32.21/drivers/mtd/u
}
/**
-diff -urNp linux-2.6.32.21/drivers/net/cxgb3/cxgb3_main.c linux-2.6.32.21/drivers/net/cxgb3/cxgb3_main.c
---- linux-2.6.32.21/drivers/net/cxgb3/cxgb3_main.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/cxgb3/cxgb3_main.c 2010-09-16 14:27:30.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/cxgb3/cxgb3_main.c linux-2.6.32.22/drivers/net/cxgb3/cxgb3_main.c
+--- linux-2.6.32.22/drivers/net/cxgb3/cxgb3_main.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/cxgb3/cxgb3_main.c 2010-09-16 14:27:30.000000000 -0400
@@ -2274,6 +2274,8 @@ static int cxgb_extension_ioctl(struct n
case CHELSIO_GET_QSET_NUM:{
struct ch_reg edata;
@@ -26675,9 +26898,9 @@ diff -urNp linux-2.6.32.21/drivers/net/cxgb3/cxgb3_main.c linux-2.6.32.21/driver
edata.cmd = CHELSIO_GET_QSET_NUM;
edata.val = pi->nqsets;
if (copy_to_user(useraddr, &edata, sizeof(edata)))
-diff -urNp linux-2.6.32.21/drivers/net/e1000e/82571.c linux-2.6.32.21/drivers/net/e1000e/82571.c
---- linux-2.6.32.21/drivers/net/e1000e/82571.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/e1000e/82571.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/e1000e/82571.c linux-2.6.32.22/drivers/net/e1000e/82571.c
+--- linux-2.6.32.22/drivers/net/e1000e/82571.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/e1000e/82571.c 2010-09-04 15:54:52.000000000 -0400
@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s
{
struct e1000_hw *hw = &adapter->hw;
@@ -26731,9 +26954,9 @@ diff -urNp linux-2.6.32.21/drivers/net/e1000e/82571.c linux-2.6.32.21/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.21/drivers/net/e1000e/e1000.h linux-2.6.32.21/drivers/net/e1000e/e1000.h
---- linux-2.6.32.21/drivers/net/e1000e/e1000.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/e1000e/e1000.h 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/e1000e/e1000.h linux-2.6.32.22/drivers/net/e1000e/e1000.h
+--- linux-2.6.32.22/drivers/net/e1000e/e1000.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/e1000e/e1000.h 2010-09-04 15:54:52.000000000 -0400
@@ -375,9 +375,9 @@ struct e1000_info {
u32 pba;
u32 max_hw_frame_size;
@@ -26747,9 +26970,9 @@ diff -urNp linux-2.6.32.21/drivers/net/e1000e/e1000.h linux-2.6.32.21/drivers/ne
};
/* hardware capability, feature, and workaround flags */
-diff -urNp linux-2.6.32.21/drivers/net/e1000e/es2lan.c linux-2.6.32.21/drivers/net/e1000e/es2lan.c
---- linux-2.6.32.21/drivers/net/e1000e/es2lan.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/e1000e/es2lan.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/e1000e/es2lan.c linux-2.6.32.22/drivers/net/e1000e/es2lan.c
+--- linux-2.6.32.22/drivers/net/e1000e/es2lan.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/e1000e/es2lan.c 2010-09-04 15:54:52.000000000 -0400
@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es
{
struct e1000_hw *hw = &adapter->hw;
@@ -26785,9 +27008,9 @@ diff -urNp linux-2.6.32.21/drivers/net/e1000e/es2lan.c linux-2.6.32.21/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.21/drivers/net/e1000e/hw.h linux-2.6.32.21/drivers/net/e1000e/hw.h
---- linux-2.6.32.21/drivers/net/e1000e/hw.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/e1000e/hw.h 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/e1000e/hw.h linux-2.6.32.22/drivers/net/e1000e/hw.h
+--- linux-2.6.32.22/drivers/net/e1000e/hw.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/e1000e/hw.h 2010-09-04 15:54:52.000000000 -0400
@@ -756,34 +756,34 @@ struct e1000_mac_operations {
/* Function pointers for the PHY. */
@@ -26847,9 +27070,9 @@ diff -urNp linux-2.6.32.21/drivers/net/e1000e/hw.h linux-2.6.32.21/drivers/net/e
};
struct e1000_mac_info {
-diff -urNp linux-2.6.32.21/drivers/net/e1000e/ich8lan.c linux-2.6.32.21/drivers/net/e1000e/ich8lan.c
---- linux-2.6.32.21/drivers/net/e1000e/ich8lan.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/e1000e/ich8lan.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/e1000e/ich8lan.c linux-2.6.32.22/drivers/net/e1000e/ich8lan.c
+--- linux-2.6.32.22/drivers/net/e1000e/ich8lan.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/e1000e/ich8lan.c 2010-09-04 15:54:52.000000000 -0400
@@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan
}
}
@@ -26877,9 +27100,9 @@ diff -urNp linux-2.6.32.21/drivers/net/e1000e/ich8lan.c linux-2.6.32.21/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.21/drivers/net/eql.c linux-2.6.32.21/drivers/net/eql.c
---- linux-2.6.32.21/drivers/net/eql.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/eql.c 2010-09-16 14:28:21.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/eql.c linux-2.6.32.22/drivers/net/eql.c
+--- linux-2.6.32.22/drivers/net/eql.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/eql.c 2010-09-16 14:28:21.000000000 -0400
@@ -554,6 +554,8 @@ static int eql_g_master_cfg(struct net_d
equalizer_t *eql;
master_config_t mc;
@@ -26889,9 +27112,9 @@ diff -urNp linux-2.6.32.21/drivers/net/eql.c linux-2.6.32.21/drivers/net/eql.c
if (eql_is_master(dev)) {
eql = netdev_priv(dev);
mc.max_slaves = eql->max_slaves;
-diff -urNp linux-2.6.32.21/drivers/net/ibmveth.c linux-2.6.32.21/drivers/net/ibmveth.c
---- linux-2.6.32.21/drivers/net/ibmveth.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/ibmveth.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/ibmveth.c linux-2.6.32.22/drivers/net/ibmveth.c
+--- linux-2.6.32.22/drivers/net/ibmveth.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/ibmveth.c 2010-09-04 15:54:52.000000000 -0400
@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr
NULL,
};
@@ -26901,9 +27124,9 @@ diff -urNp linux-2.6.32.21/drivers/net/ibmveth.c linux-2.6.32.21/drivers/net/ibm
.show = veth_pool_show,
.store = veth_pool_store,
};
-diff -urNp linux-2.6.32.21/drivers/net/igb/e1000_82575.c linux-2.6.32.21/drivers/net/igb/e1000_82575.c
---- linux-2.6.32.21/drivers/net/igb/e1000_82575.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/igb/e1000_82575.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/igb/e1000_82575.c linux-2.6.32.22/drivers/net/igb/e1000_82575.c
+--- linux-2.6.32.22/drivers/net/igb/e1000_82575.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/igb/e1000_82575.c 2010-09-04 15:54:52.000000000 -0400
@@ -1410,7 +1410,7 @@ void igb_vmdq_set_replication_pf(struct
wr32(E1000_VT_CTL, vt_ctl);
}
@@ -26929,9 +27152,9 @@ diff -urNp linux-2.6.32.21/drivers/net/igb/e1000_82575.c linux-2.6.32.21/drivers
.acquire = igb_acquire_nvm_82575,
.read = igb_read_nvm_eerd,
.release = igb_release_nvm_82575,
-diff -urNp linux-2.6.32.21/drivers/net/igb/e1000_hw.h linux-2.6.32.21/drivers/net/igb/e1000_hw.h
---- linux-2.6.32.21/drivers/net/igb/e1000_hw.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/igb/e1000_hw.h 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/igb/e1000_hw.h linux-2.6.32.22/drivers/net/igb/e1000_hw.h
+--- linux-2.6.32.22/drivers/net/igb/e1000_hw.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/igb/e1000_hw.h 2010-09-04 15:54:52.000000000 -0400
@@ -305,17 +305,17 @@ struct e1000_phy_operations {
};
@@ -26957,9 +27180,9 @@ diff -urNp linux-2.6.32.21/drivers/net/igb/e1000_hw.h linux-2.6.32.21/drivers/ne
};
extern const struct e1000_info e1000_82575_info;
-diff -urNp linux-2.6.32.21/drivers/net/irda/vlsi_ir.c linux-2.6.32.21/drivers/net/irda/vlsi_ir.c
---- linux-2.6.32.21/drivers/net/irda/vlsi_ir.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/irda/vlsi_ir.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/irda/vlsi_ir.c linux-2.6.32.22/drivers/net/irda/vlsi_ir.c
+--- linux-2.6.32.22/drivers/net/irda/vlsi_ir.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/irda/vlsi_ir.c 2010-09-04 15:54:52.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);
@@ -26976,9 +27199,9 @@ diff -urNp linux-2.6.32.21/drivers/net/irda/vlsi_ir.c linux-2.6.32.21/drivers/ne
spin_unlock_irqrestore(&idev->lock, flags);
dev_kfree_skb_any(skb);
return NETDEV_TX_OK;
-diff -urNp linux-2.6.32.21/drivers/net/iseries_veth.c linux-2.6.32.21/drivers/net/iseries_veth.c
---- linux-2.6.32.21/drivers/net/iseries_veth.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/iseries_veth.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/iseries_veth.c linux-2.6.32.22/drivers/net/iseries_veth.c
+--- linux-2.6.32.22/drivers/net/iseries_veth.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/iseries_veth.c 2010-09-04 15:54:52.000000000 -0400
@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul
NULL
};
@@ -26997,9 +27220,9 @@ diff -urNp linux-2.6.32.21/drivers/net/iseries_veth.c linux-2.6.32.21/drivers/ne
.show = veth_port_attribute_show
};
-diff -urNp linux-2.6.32.21/drivers/net/pcnet32.c linux-2.6.32.21/drivers/net/pcnet32.c
---- linux-2.6.32.21/drivers/net/pcnet32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/pcnet32.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/pcnet32.c linux-2.6.32.22/drivers/net/pcnet32.c
+--- linux-2.6.32.22/drivers/net/pcnet32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/pcnet32.c 2010-09-04 15:54:52.000000000 -0400
@@ -79,7 +79,7 @@ static int cards_found;
/*
* VLB I/O addresses
@@ -27009,9 +27232,9 @@ diff -urNp linux-2.6.32.21/drivers/net/pcnet32.c linux-2.6.32.21/drivers/net/pcn
{ 0x300, 0x320, 0x340, 0x360, 0 };
static int pcnet32_debug = 0;
-diff -urNp linux-2.6.32.21/drivers/net/tg3.h linux-2.6.32.21/drivers/net/tg3.h
---- linux-2.6.32.21/drivers/net/tg3.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/tg3.h 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/tg3.h linux-2.6.32.22/drivers/net/tg3.h
+--- linux-2.6.32.22/drivers/net/tg3.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/tg3.h 2010-09-04 15:54:52.000000000 -0400
@@ -95,6 +95,7 @@
#define CHIPREV_ID_5750_A0 0x4000
#define CHIPREV_ID_5750_A1 0x4001
@@ -27020,9 +27243,9 @@ diff -urNp linux-2.6.32.21/drivers/net/tg3.h linux-2.6.32.21/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.21/drivers/net/tulip/de4x5.c linux-2.6.32.21/drivers/net/tulip/de4x5.c
---- linux-2.6.32.21/drivers/net/tulip/de4x5.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/tulip/de4x5.c 2010-09-16 14:26:16.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/tulip/de4x5.c linux-2.6.32.22/drivers/net/tulip/de4x5.c
+--- linux-2.6.32.22/drivers/net/tulip/de4x5.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/tulip/de4x5.c 2010-09-16 14:26:16.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];
@@ -27050,9 +27273,9 @@ diff -urNp linux-2.6.32.21/drivers/net/tulip/de4x5.c linux-2.6.32.21/drivers/net
break;
#define DE4X5_DUMP 0x0f /* Dump the DE4X5 Status */
-diff -urNp linux-2.6.32.21/drivers/net/usb/hso.c linux-2.6.32.21/drivers/net/usb/hso.c
---- linux-2.6.32.21/drivers/net/usb/hso.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/usb/hso.c 2010-09-16 14:33:14.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/usb/hso.c linux-2.6.32.22/drivers/net/usb/hso.c
+--- linux-2.6.32.22/drivers/net/usb/hso.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/usb/hso.c 2010-09-16 14:33:14.000000000 -0400
@@ -258,7 +258,7 @@ struct hso_serial {
/* from usb_serial_port */
@@ -27141,9 +27364,9 @@ diff -urNp linux-2.6.32.21/drivers/net/usb/hso.c linux-2.6.32.21/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.21/drivers/net/wireless/b43/debugfs.c linux-2.6.32.21/drivers/net/wireless/b43/debugfs.c
---- linux-2.6.32.21/drivers/net/wireless/b43/debugfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/wireless/b43/debugfs.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/wireless/b43/debugfs.c linux-2.6.32.22/drivers/net/wireless/b43/debugfs.c
+--- linux-2.6.32.22/drivers/net/wireless/b43/debugfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/wireless/b43/debugfs.c 2010-09-04 15:54:52.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);
@@ -27153,9 +27376,9 @@ diff -urNp linux-2.6.32.21/drivers/net/wireless/b43/debugfs.c linux-2.6.32.21/dr
/* Offset of struct b43_dfs_file in struct b43_dfsentry */
size_t file_struct_offset;
};
-diff -urNp linux-2.6.32.21/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.21/drivers/net/wireless/b43legacy/debugfs.c
---- linux-2.6.32.21/drivers/net/wireless/b43legacy/debugfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/wireless/b43legacy/debugfs.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.22/drivers/net/wireless/b43legacy/debugfs.c
+--- linux-2.6.32.22/drivers/net/wireless/b43legacy/debugfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/wireless/b43legacy/debugfs.c 2010-09-04 15:54:52.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);
@@ -27165,9 +27388,9 @@ diff -urNp linux-2.6.32.21/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.21/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-1000.c
---- linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-1000.c
+--- linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-09-04 15:54:52.000000000 -0400
@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib =
},
};
@@ -27177,9 +27400,9 @@ diff -urNp linux-2.6.32.21/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.21/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-3945.c
---- linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-3945.c
+--- linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-09-04 15:54:52.000000000 -0400
@@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945
.build_addsta_hcmd = iwl3945_build_addsta_hcmd,
};
@@ -27189,9 +27412,9 @@ diff -urNp linux-2.6.32.21/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.21/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-4965.c
---- linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-4965.c
+--- linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-09-04 15:54:52.000000000 -0400
@@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib =
},
};
@@ -27201,9 +27424,9 @@ diff -urNp linux-2.6.32.21/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.21/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-5000.c
---- linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-5000.c
+--- linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-09-04 15:54:52.000000000 -0400
@@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib =
},
};
@@ -27221,9 +27444,9 @@ diff -urNp linux-2.6.32.21/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.21/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-6000.c
---- linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-6000.c
+--- linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-09-04 15:54:52.000000000 -0400
@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000
.calc_rssi = iwl5000_calc_rssi,
};
@@ -27233,9 +27456,9 @@ diff -urNp linux-2.6.32.21/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.21/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-debug.h
---- linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-debug.h
+--- linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-09-04 15:54:52.000000000 -0400
@@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri
#endif
@@ -27247,9 +27470,9 @@ diff -urNp linux-2.6.32.21/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.21/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-dev.h
---- linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-dev.h
+--- linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-09-04 15:54:52.000000000 -0400
@@ -68,7 +68,7 @@ struct iwl_tx_queue;
/* shared structures from iwl-5000.c */
@@ -27259,9 +27482,9 @@ diff -urNp linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.2
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.21/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.21/drivers/net/wireless/libertas/debugfs.c
---- linux-2.6.32.21/drivers/net/wireless/libertas/debugfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/wireless/libertas/debugfs.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.22/drivers/net/wireless/libertas/debugfs.c
+--- linux-2.6.32.22/drivers/net/wireless/libertas/debugfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/wireless/libertas/debugfs.c 2010-09-04 15:54:52.000000000 -0400
@@ -708,7 +708,7 @@ out_unlock:
struct lbs_debugfs_files {
const char *name;
@@ -27271,9 +27494,9 @@ diff -urNp linux-2.6.32.21/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.
};
static const struct lbs_debugfs_files debugfs_files[] = {
-diff -urNp linux-2.6.32.21/drivers/net/wireless/rndis_wlan.c linux-2.6.32.21/drivers/net/wireless/rndis_wlan.c
---- linux-2.6.32.21/drivers/net/wireless/rndis_wlan.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/wireless/rndis_wlan.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/net/wireless/rndis_wlan.c linux-2.6.32.22/drivers/net/wireless/rndis_wlan.c
+--- linux-2.6.32.22/drivers/net/wireless/rndis_wlan.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/net/wireless/rndis_wlan.c 2010-09-04 15:54:52.000000000 -0400
@@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn
devdbg(usbdev, "set_rts_threshold %i", rts_threshold);
@@ -27283,10 +27506,10 @@ diff -urNp linux-2.6.32.21/drivers/net/wireless/rndis_wlan.c linux-2.6.32.21/dri
rts_threshold = 2347;
tmp = cpu_to_le32(rts_threshold);
-diff -urNp linux-2.6.32.21/drivers/oprofile/buffer_sync.c linux-2.6.32.21/drivers/oprofile/buffer_sync.c
---- linux-2.6.32.21/drivers/oprofile/buffer_sync.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/oprofile/buffer_sync.c 2010-09-04 15:54:52.000000000 -0400
-@@ -340,7 +340,7 @@ static void add_data(struct op_entry *en
+diff -urNp linux-2.6.32.22/drivers/oprofile/buffer_sync.c linux-2.6.32.22/drivers/oprofile/buffer_sync.c
+--- linux-2.6.32.22/drivers/oprofile/buffer_sync.c 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.22/drivers/oprofile/buffer_sync.c 2010-09-20 17:27:14.000000000 -0400
+@@ -341,7 +341,7 @@ static void add_data(struct op_entry *en
if (cookie == NO_COOKIE)
offset = pc;
if (cookie == INVALID_COOKIE) {
@@ -27295,7 +27518,7 @@ diff -urNp linux-2.6.32.21/drivers/oprofile/buffer_sync.c linux-2.6.32.21/driver
offset = pc;
}
if (cookie != last_cookie) {
-@@ -384,14 +384,14 @@ add_sample(struct mm_struct *mm, struct
+@@ -385,14 +385,14 @@ add_sample(struct mm_struct *mm, struct
/* add userspace sample */
if (!mm) {
@@ -27312,7 +27535,7 @@ diff -urNp linux-2.6.32.21/drivers/oprofile/buffer_sync.c linux-2.6.32.21/driver
return 0;
}
-@@ -560,7 +560,7 @@ void sync_buffer(int cpu)
+@@ -561,7 +561,7 @@ void sync_buffer(int cpu)
/* ignore backtraces if failed to add a sample */
if (state == sb_bt_start) {
state = sb_bt_ignore;
@@ -27321,9 +27544,9 @@ diff -urNp linux-2.6.32.21/drivers/oprofile/buffer_sync.c linux-2.6.32.21/driver
}
}
release_mm(mm);
-diff -urNp linux-2.6.32.21/drivers/oprofile/event_buffer.c linux-2.6.32.21/drivers/oprofile/event_buffer.c
---- linux-2.6.32.21/drivers/oprofile/event_buffer.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/oprofile/event_buffer.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/oprofile/event_buffer.c linux-2.6.32.22/drivers/oprofile/event_buffer.c
+--- linux-2.6.32.22/drivers/oprofile/event_buffer.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/oprofile/event_buffer.c 2010-09-04 15:54:52.000000000 -0400
@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
}
@@ -27333,9 +27556,9 @@ diff -urNp linux-2.6.32.21/drivers/oprofile/event_buffer.c linux-2.6.32.21/drive
return;
}
-diff -urNp linux-2.6.32.21/drivers/oprofile/oprof.c linux-2.6.32.21/drivers/oprofile/oprof.c
---- linux-2.6.32.21/drivers/oprofile/oprof.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/oprofile/oprof.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/oprofile/oprof.c linux-2.6.32.22/drivers/oprofile/oprof.c
+--- linux-2.6.32.22/drivers/oprofile/oprof.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/oprofile/oprof.c 2010-09-04 15:54:52.000000000 -0400
@@ -110,7 +110,7 @@ static void switch_worker(struct work_st
if (oprofile_ops.switch_events())
return;
@@ -27345,9 +27568,9 @@ diff -urNp linux-2.6.32.21/drivers/oprofile/oprof.c linux-2.6.32.21/drivers/opro
start_switch_worker();
}
-diff -urNp linux-2.6.32.21/drivers/oprofile/oprofilefs.c linux-2.6.32.21/drivers/oprofile/oprofilefs.c
---- linux-2.6.32.21/drivers/oprofile/oprofilefs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/oprofile/oprofilefs.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/oprofile/oprofilefs.c linux-2.6.32.22/drivers/oprofile/oprofilefs.c
+--- linux-2.6.32.22/drivers/oprofile/oprofilefs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/oprofile/oprofilefs.c 2010-09-04 15:54:52.000000000 -0400
@@ -187,7 +187,7 @@ static const struct file_operations atom
@@ -27357,9 +27580,9 @@ diff -urNp linux-2.6.32.21/drivers/oprofile/oprofilefs.c linux-2.6.32.21/drivers
{
struct dentry *d = __oprofilefs_create_file(sb, root, name,
&atomic_ro_fops, 0444);
-diff -urNp linux-2.6.32.21/drivers/oprofile/oprofile_stats.c linux-2.6.32.21/drivers/oprofile/oprofile_stats.c
---- linux-2.6.32.21/drivers/oprofile/oprofile_stats.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/oprofile/oprofile_stats.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/oprofile/oprofile_stats.c linux-2.6.32.22/drivers/oprofile/oprofile_stats.c
+--- linux-2.6.32.22/drivers/oprofile/oprofile_stats.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/oprofile/oprofile_stats.c 2010-09-04 15:54:52.000000000 -0400
@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
cpu_buf->sample_invalid_eip = 0;
}
@@ -27377,9 +27600,9 @@ diff -urNp linux-2.6.32.21/drivers/oprofile/oprofile_stats.c linux-2.6.32.21/dri
}
-diff -urNp linux-2.6.32.21/drivers/oprofile/oprofile_stats.h linux-2.6.32.21/drivers/oprofile/oprofile_stats.h
---- linux-2.6.32.21/drivers/oprofile/oprofile_stats.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/oprofile/oprofile_stats.h 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/oprofile/oprofile_stats.h linux-2.6.32.22/drivers/oprofile/oprofile_stats.h
+--- linux-2.6.32.22/drivers/oprofile/oprofile_stats.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/oprofile/oprofile_stats.h 2010-09-04 15:54:52.000000000 -0400
@@ -13,11 +13,11 @@
#include <asm/atomic.h>
@@ -27397,9 +27620,9 @@ diff -urNp linux-2.6.32.21/drivers/oprofile/oprofile_stats.h linux-2.6.32.21/dri
};
extern struct oprofile_stat_struct oprofile_stats;
-diff -urNp linux-2.6.32.21/drivers/parisc/pdc_stable.c linux-2.6.32.21/drivers/parisc/pdc_stable.c
---- linux-2.6.32.21/drivers/parisc/pdc_stable.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/parisc/pdc_stable.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/parisc/pdc_stable.c linux-2.6.32.22/drivers/parisc/pdc_stable.c
+--- linux-2.6.32.22/drivers/parisc/pdc_stable.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/parisc/pdc_stable.c 2010-09-04 15:54:52.000000000 -0400
@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj
return ret;
}
@@ -27409,9 +27632,9 @@ diff -urNp linux-2.6.32.21/drivers/parisc/pdc_stable.c linux-2.6.32.21/drivers/p
.show = pdcspath_attr_show,
.store = pdcspath_attr_store,
};
-diff -urNp linux-2.6.32.21/drivers/parport/procfs.c linux-2.6.32.21/drivers/parport/procfs.c
---- linux-2.6.32.21/drivers/parport/procfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/parport/procfs.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/parport/procfs.c linux-2.6.32.22/drivers/parport/procfs.c
+--- linux-2.6.32.22/drivers/parport/procfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/parport/procfs.c 2010-09-04 15:54:52.000000000 -0400
@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
*ppos += len;
@@ -27430,9 +27653,9 @@ diff -urNp linux-2.6.32.21/drivers/parport/procfs.c linux-2.6.32.21/drivers/parp
}
#endif /* IEEE1284.3 support. */
-diff -urNp linux-2.6.32.21/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.21/drivers/pci/hotplug/acpiphp_glue.c
---- linux-2.6.32.21/drivers/pci/hotplug/acpiphp_glue.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pci/hotplug/acpiphp_glue.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.22/drivers/pci/hotplug/acpiphp_glue.c
+--- linux-2.6.32.22/drivers/pci/hotplug/acpiphp_glue.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/pci/hotplug/acpiphp_glue.c 2010-09-04 15:54:52.000000000 -0400
@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif
}
@@ -27442,9 +27665,9 @@ diff -urNp linux-2.6.32.21/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.21/dr
.handler = handle_hotplug_event_func,
};
-diff -urNp linux-2.6.32.21/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.21/drivers/pci/hotplug/cpqphp_nvram.c
---- linux-2.6.32.21/drivers/pci/hotplug/cpqphp_nvram.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pci/hotplug/cpqphp_nvram.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.22/drivers/pci/hotplug/cpqphp_nvram.c
+--- linux-2.6.32.22/drivers/pci/hotplug/cpqphp_nvram.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/pci/hotplug/cpqphp_nvram.c 2010-09-04 15:54:52.000000000 -0400
@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
void compaq_nvram_init (void __iomem *rom_start)
@@ -27459,9 +27682,9 @@ diff -urNp linux-2.6.32.21/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.21/dr
dbg("int15 entry = %p\n", compaq_int15_entry_point);
/* initialize our int15 lock */
-diff -urNp linux-2.6.32.21/drivers/pci/hotplug/fakephp.c linux-2.6.32.21/drivers/pci/hotplug/fakephp.c
---- linux-2.6.32.21/drivers/pci/hotplug/fakephp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pci/hotplug/fakephp.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/pci/hotplug/fakephp.c linux-2.6.32.22/drivers/pci/hotplug/fakephp.c
+--- linux-2.6.32.22/drivers/pci/hotplug/fakephp.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/pci/hotplug/fakephp.c 2010-09-04 15:54:52.000000000 -0400
@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec
}
@@ -27471,9 +27694,9 @@ diff -urNp linux-2.6.32.21/drivers/pci/hotplug/fakephp.c linux-2.6.32.21/drivers
.store = legacy_store, .show = legacy_show
},
.release = &legacy_release,
-diff -urNp linux-2.6.32.21/drivers/pci/intel-iommu.c linux-2.6.32.21/drivers/pci/intel-iommu.c
---- linux-2.6.32.21/drivers/pci/intel-iommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pci/intel-iommu.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/pci/intel-iommu.c linux-2.6.32.22/drivers/pci/intel-iommu.c
+--- linux-2.6.32.22/drivers/pci/intel-iommu.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/pci/intel-iommu.c 2010-09-04 15:54:52.000000000 -0400
@@ -2647,7 +2647,7 @@ error:
return 0;
}
@@ -27543,9 +27766,9 @@ diff -urNp linux-2.6.32.21/drivers/pci/intel-iommu.c linux-2.6.32.21/drivers/pci
.alloc_coherent = intel_alloc_coherent,
.free_coherent = intel_free_coherent,
.map_sg = intel_map_sg,
-diff -urNp linux-2.6.32.21/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.21/drivers/pci/pcie/portdrv_pci.c
---- linux-2.6.32.21/drivers/pci/pcie/portdrv_pci.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pci/pcie/portdrv_pci.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.22/drivers/pci/pcie/portdrv_pci.c
+--- linux-2.6.32.22/drivers/pci/pcie/portdrv_pci.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/pci/pcie/portdrv_pci.c 2010-09-04 15:54:52.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 */
@@ -27555,9 +27778,9 @@ diff -urNp linux-2.6.32.21/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.21/driver
};
MODULE_DEVICE_TABLE(pci, port_pci_ids);
-diff -urNp linux-2.6.32.21/drivers/pci/probe.c linux-2.6.32.21/drivers/pci/probe.c
---- linux-2.6.32.21/drivers/pci/probe.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pci/probe.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/pci/probe.c linux-2.6.32.22/drivers/pci/probe.c
+--- linux-2.6.32.22/drivers/pci/probe.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/pci/probe.c 2010-09-04 15:54:52.000000000 -0400
@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
return ret;
}
@@ -27575,9 +27798,9 @@ diff -urNp linux-2.6.32.21/drivers/pci/probe.c linux-2.6.32.21/drivers/pci/probe
struct device_attribute *attr,
char *buf)
{
-diff -urNp linux-2.6.32.21/drivers/pci/proc.c linux-2.6.32.21/drivers/pci/proc.c
---- linux-2.6.32.21/drivers/pci/proc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pci/proc.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/pci/proc.c linux-2.6.32.22/drivers/pci/proc.c
+--- linux-2.6.32.22/drivers/pci/proc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/pci/proc.c 2010-09-04 15:54:52.000000000 -0400
@@ -480,7 +480,16 @@ static const struct file_operations proc
static int __init pci_proc_init(void)
{
@@ -27595,9 +27818,9 @@ diff -urNp linux-2.6.32.21/drivers/pci/proc.c linux-2.6.32.21/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.21/drivers/pci/slot.c linux-2.6.32.21/drivers/pci/slot.c
---- linux-2.6.32.21/drivers/pci/slot.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pci/slot.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/pci/slot.c linux-2.6.32.22/drivers/pci/slot.c
+--- linux-2.6.32.22/drivers/pci/slot.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/pci/slot.c 2010-09-04 15:54:52.000000000 -0400
@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc
return attribute->store ? attribute->store(slot, buf, len) : -EIO;
}
@@ -27607,9 +27830,9 @@ diff -urNp linux-2.6.32.21/drivers/pci/slot.c linux-2.6.32.21/drivers/pci/slot.c
.show = pci_slot_attr_show,
.store = pci_slot_attr_store,
};
-diff -urNp linux-2.6.32.21/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.21/drivers/pcmcia/pcmcia_ioctl.c
---- linux-2.6.32.21/drivers/pcmcia/pcmcia_ioctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pcmcia/pcmcia_ioctl.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.22/drivers/pcmcia/pcmcia_ioctl.c
+--- linux-2.6.32.22/drivers/pcmcia/pcmcia_ioctl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/pcmcia/pcmcia_ioctl.c 2010-09-04 15:54:52.000000000 -0400
@@ -819,7 +819,7 @@ static int ds_ioctl(struct inode * inode
return -EFAULT;
}
@@ -27619,9 +27842,9 @@ diff -urNp linux-2.6.32.21/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.21/drivers
if (!buf)
return -ENOMEM;
-diff -urNp linux-2.6.32.21/drivers/pcmcia/ti113x.h linux-2.6.32.21/drivers/pcmcia/ti113x.h
---- linux-2.6.32.21/drivers/pcmcia/ti113x.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pcmcia/ti113x.h 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/pcmcia/ti113x.h linux-2.6.32.22/drivers/pcmcia/ti113x.h
+--- linux-2.6.32.22/drivers/pcmcia/ti113x.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/pcmcia/ti113x.h 2010-09-04 15:54:52.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),
@@ -27631,9 +27854,9 @@ diff -urNp linux-2.6.32.21/drivers/pcmcia/ti113x.h linux-2.6.32.21/drivers/pcmci
};
static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
-diff -urNp linux-2.6.32.21/drivers/pcmcia/yenta_socket.c linux-2.6.32.21/drivers/pcmcia/yenta_socket.c
---- linux-2.6.32.21/drivers/pcmcia/yenta_socket.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pcmcia/yenta_socket.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/pcmcia/yenta_socket.c linux-2.6.32.22/drivers/pcmcia/yenta_socket.c
+--- linux-2.6.32.22/drivers/pcmcia/yenta_socket.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/pcmcia/yenta_socket.c 2010-09-04 15:54:52.000000000 -0400
@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table
/* match any cardbus bridge */
@@ -27643,9 +27866,9 @@ diff -urNp linux-2.6.32.21/drivers/pcmcia/yenta_socket.c linux-2.6.32.21/drivers
};
MODULE_DEVICE_TABLE(pci, yenta_table);
-diff -urNp linux-2.6.32.21/drivers/platform/x86/acer-wmi.c linux-2.6.32.21/drivers/platform/x86/acer-wmi.c
---- linux-2.6.32.21/drivers/platform/x86/acer-wmi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/platform/x86/acer-wmi.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/platform/x86/acer-wmi.c linux-2.6.32.22/drivers/platform/x86/acer-wmi.c
+--- linux-2.6.32.22/drivers/platform/x86/acer-wmi.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/platform/x86/acer-wmi.c 2010-09-04 15:54:52.000000000 -0400
@@ -918,7 +918,7 @@ static int update_bl_status(struct backl
return 0;
}
@@ -27655,9 +27878,9 @@ diff -urNp linux-2.6.32.21/drivers/platform/x86/acer-wmi.c linux-2.6.32.21/drive
.get_brightness = read_brightness,
.update_status = update_bl_status,
};
-diff -urNp linux-2.6.32.21/drivers/platform/x86/asus_acpi.c linux-2.6.32.21/drivers/platform/x86/asus_acpi.c
---- linux-2.6.32.21/drivers/platform/x86/asus_acpi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/platform/x86/asus_acpi.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/platform/x86/asus_acpi.c linux-2.6.32.22/drivers/platform/x86/asus_acpi.c
+--- linux-2.6.32.22/drivers/platform/x86/asus_acpi.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/platform/x86/asus_acpi.c 2010-09-04 15:54:52.000000000 -0400
@@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_
return 0;
}
@@ -27667,9 +27890,9 @@ diff -urNp linux-2.6.32.21/drivers/platform/x86/asus_acpi.c linux-2.6.32.21/driv
.get_brightness = read_brightness,
.update_status = set_brightness_status,
};
-diff -urNp linux-2.6.32.21/drivers/platform/x86/asus-laptop.c linux-2.6.32.21/drivers/platform/x86/asus-laptop.c
---- linux-2.6.32.21/drivers/platform/x86/asus-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/platform/x86/asus-laptop.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/platform/x86/asus-laptop.c linux-2.6.32.22/drivers/platform/x86/asus-laptop.c
+--- linux-2.6.32.22/drivers/platform/x86/asus-laptop.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/platform/x86/asus-laptop.c 2010-09-04 15:54:52.000000000 -0400
@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac
*/
static int read_brightness(struct backlight_device *bd);
@@ -27679,9 +27902,9 @@ diff -urNp linux-2.6.32.21/drivers/platform/x86/asus-laptop.c linux-2.6.32.21/dr
.get_brightness = read_brightness,
.update_status = update_bl_status,
};
-diff -urNp linux-2.6.32.21/drivers/platform/x86/compal-laptop.c linux-2.6.32.21/drivers/platform/x86/compal-laptop.c
---- linux-2.6.32.21/drivers/platform/x86/compal-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/platform/x86/compal-laptop.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/platform/x86/compal-laptop.c linux-2.6.32.22/drivers/platform/x86/compal-laptop.c
+--- linux-2.6.32.22/drivers/platform/x86/compal-laptop.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/platform/x86/compal-laptop.c 2010-09-04 15:54:52.000000000 -0400
@@ -163,7 +163,7 @@ static int bl_update_status(struct backl
return set_lcd_level(b->props.brightness);
}
@@ -27691,9 +27914,9 @@ diff -urNp linux-2.6.32.21/drivers/platform/x86/compal-laptop.c linux-2.6.32.21/
.get_brightness = bl_get_brightness,
.update_status = bl_update_status,
};
-diff -urNp linux-2.6.32.21/drivers/platform/x86/dell-laptop.c linux-2.6.32.21/drivers/platform/x86/dell-laptop.c
---- linux-2.6.32.21/drivers/platform/x86/dell-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/platform/x86/dell-laptop.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/platform/x86/dell-laptop.c linux-2.6.32.22/drivers/platform/x86/dell-laptop.c
+--- linux-2.6.32.22/drivers/platform/x86/dell-laptop.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/platform/x86/dell-laptop.c 2010-09-04 15:54:52.000000000 -0400
@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac
return buffer.output[1];
}
@@ -27703,9 +27926,9 @@ diff -urNp linux-2.6.32.21/drivers/platform/x86/dell-laptop.c linux-2.6.32.21/dr
.get_brightness = dell_get_intensity,
.update_status = dell_send_intensity,
};
-diff -urNp linux-2.6.32.21/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.21/drivers/platform/x86/eeepc-laptop.c
---- linux-2.6.32.21/drivers/platform/x86/eeepc-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/platform/x86/eeepc-laptop.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.22/drivers/platform/x86/eeepc-laptop.c
+--- linux-2.6.32.22/drivers/platform/x86/eeepc-laptop.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/platform/x86/eeepc-laptop.c 2010-09-04 15:54:52.000000000 -0400
@@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device
*/
static int read_brightness(struct backlight_device *bd);
@@ -27715,9 +27938,9 @@ diff -urNp linux-2.6.32.21/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.21/d
.get_brightness = read_brightness,
.update_status = update_bl_status,
};
-diff -urNp linux-2.6.32.21/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.21/drivers/platform/x86/fujitsu-laptop.c
---- linux-2.6.32.21/drivers/platform/x86/fujitsu-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/platform/x86/fujitsu-laptop.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.22/drivers/platform/x86/fujitsu-laptop.c
+--- linux-2.6.32.22/drivers/platform/x86/fujitsu-laptop.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/platform/x86/fujitsu-laptop.c 2010-09-04 15:54:52.000000000 -0400
@@ -436,7 +436,7 @@ static int bl_update_status(struct backl
return ret;
}
@@ -27727,9 +27950,9 @@ diff -urNp linux-2.6.32.21/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.21
.get_brightness = bl_get_brightness,
.update_status = bl_update_status,
};
-diff -urNp linux-2.6.32.21/drivers/platform/x86/msi-laptop.c linux-2.6.32.21/drivers/platform/x86/msi-laptop.c
---- linux-2.6.32.21/drivers/platform/x86/msi-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/platform/x86/msi-laptop.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/platform/x86/msi-laptop.c linux-2.6.32.22/drivers/platform/x86/msi-laptop.c
+--- linux-2.6.32.22/drivers/platform/x86/msi-laptop.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/platform/x86/msi-laptop.c 2010-09-04 15:54:52.000000000 -0400
@@ -161,7 +161,7 @@ static int bl_update_status(struct backl
return set_lcd_level(b->props.brightness);
}
@@ -27739,9 +27962,9 @@ diff -urNp linux-2.6.32.21/drivers/platform/x86/msi-laptop.c linux-2.6.32.21/dri
.get_brightness = bl_get_brightness,
.update_status = bl_update_status,
};
-diff -urNp linux-2.6.32.21/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.21/drivers/platform/x86/panasonic-laptop.c
---- linux-2.6.32.21/drivers/platform/x86/panasonic-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/platform/x86/panasonic-laptop.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.22/drivers/platform/x86/panasonic-laptop.c
+--- linux-2.6.32.22/drivers/platform/x86/panasonic-laptop.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/platform/x86/panasonic-laptop.c 2010-09-04 15:54:52.000000000 -0400
@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh
return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
}
@@ -27751,9 +27974,9 @@ diff -urNp linux-2.6.32.21/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.21/drivers/platform/x86/sony-laptop.c linux-2.6.32.21/drivers/platform/x86/sony-laptop.c
---- linux-2.6.32.21/drivers/platform/x86/sony-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/platform/x86/sony-laptop.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/platform/x86/sony-laptop.c linux-2.6.32.22/drivers/platform/x86/sony-laptop.c
+--- linux-2.6.32.22/drivers/platform/x86/sony-laptop.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/platform/x86/sony-laptop.c 2010-09-04 15:54:52.000000000 -0400
@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness
}
@@ -27763,9 +27986,9 @@ diff -urNp linux-2.6.32.21/drivers/platform/x86/sony-laptop.c linux-2.6.32.21/dr
.update_status = sony_backlight_update_status,
.get_brightness = sony_backlight_get_brightness,
};
-diff -urNp linux-2.6.32.21/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.21/drivers/platform/x86/thinkpad_acpi.c
---- linux-2.6.32.21/drivers/platform/x86/thinkpad_acpi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/platform/x86/thinkpad_acpi.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.22/drivers/platform/x86/thinkpad_acpi.c
+--- linux-2.6.32.22/drivers/platform/x86/thinkpad_acpi.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/platform/x86/thinkpad_acpi.c 2010-09-04 15:54:52.000000000 -0400
@@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha
BACKLIGHT_UPDATE_HOTKEY);
}
@@ -27775,9 +27998,9 @@ diff -urNp linux-2.6.32.21/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.21/
.get_brightness = brightness_get,
.update_status = brightness_update_status,
};
-diff -urNp linux-2.6.32.21/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.21/drivers/platform/x86/toshiba_acpi.c
---- linux-2.6.32.21/drivers/platform/x86/toshiba_acpi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/platform/x86/toshiba_acpi.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.22/drivers/platform/x86/toshiba_acpi.c
+--- linux-2.6.32.22/drivers/platform/x86/toshiba_acpi.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/platform/x86/toshiba_acpi.c 2010-09-04 15:54:52.000000000 -0400
@@ -671,7 +671,7 @@ static acpi_status remove_device(void)
return AE_OK;
}
@@ -27787,9 +28010,9 @@ diff -urNp linux-2.6.32.21/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.21/d
.get_brightness = get_lcd,
.update_status = set_lcd_status,
};
-diff -urNp linux-2.6.32.21/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.21/drivers/pnp/pnpbios/bioscalls.c
---- linux-2.6.32.21/drivers/pnp/pnpbios/bioscalls.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pnp/pnpbios/bioscalls.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.22/drivers/pnp/pnpbios/bioscalls.c
+--- linux-2.6.32.22/drivers/pnp/pnpbios/bioscalls.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/pnp/pnpbios/bioscalls.c 2010-09-04 15:54:52.000000000 -0400
@@ -60,7 +60,7 @@ do { \
set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
} while(0)
@@ -27846,9 +28069,9 @@ diff -urNp linux-2.6.32.21/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.21/drive
+
+ pax_close_kernel();
}
-diff -urNp linux-2.6.32.21/drivers/pnp/quirks.c linux-2.6.32.21/drivers/pnp/quirks.c
---- linux-2.6.32.21/drivers/pnp/quirks.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pnp/quirks.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/pnp/quirks.c linux-2.6.32.22/drivers/pnp/quirks.c
+--- linux-2.6.32.22/drivers/pnp/quirks.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/pnp/quirks.c 2010-09-04 15:54:52.000000000 -0400
@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = {
/* PnP resources that might overlap PCI BARs */
{"PNP0c01", quirk_system_pci_resources},
@@ -27858,9 +28081,9 @@ diff -urNp linux-2.6.32.21/drivers/pnp/quirks.c linux-2.6.32.21/drivers/pnp/quir
};
void pnp_fixup_device(struct pnp_dev *dev)
-diff -urNp linux-2.6.32.21/drivers/pnp/resource.c linux-2.6.32.21/drivers/pnp/resource.c
---- linux-2.6.32.21/drivers/pnp/resource.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pnp/resource.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/pnp/resource.c linux-2.6.32.22/drivers/pnp/resource.c
+--- linux-2.6.32.22/drivers/pnp/resource.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/pnp/resource.c 2010-09-04 15:54:52.000000000 -0400
@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
return 1;
@@ -27879,9 +28102,9 @@ diff -urNp linux-2.6.32.21/drivers/pnp/resource.c linux-2.6.32.21/drivers/pnp/re
return 0;
/* check if the resource is reserved */
-diff -urNp linux-2.6.32.21/drivers/s390/cio/qdio_perf.c linux-2.6.32.21/drivers/s390/cio/qdio_perf.c
---- linux-2.6.32.21/drivers/s390/cio/qdio_perf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/s390/cio/qdio_perf.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/s390/cio/qdio_perf.c linux-2.6.32.22/drivers/s390/cio/qdio_perf.c
+--- linux-2.6.32.22/drivers/s390/cio/qdio_perf.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/s390/cio/qdio_perf.c 2010-09-04 15:54:52.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)
{
@@ -27957,9 +28180,9 @@ diff -urNp linux-2.6.32.21/drivers/s390/cio/qdio_perf.c linux-2.6.32.21/drivers/
seq_printf(m, "\n");
return 0;
}
-diff -urNp linux-2.6.32.21/drivers/s390/cio/qdio_perf.h linux-2.6.32.21/drivers/s390/cio/qdio_perf.h
---- linux-2.6.32.21/drivers/s390/cio/qdio_perf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/s390/cio/qdio_perf.h 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/s390/cio/qdio_perf.h linux-2.6.32.22/drivers/s390/cio/qdio_perf.h
+--- linux-2.6.32.22/drivers/s390/cio/qdio_perf.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/s390/cio/qdio_perf.h 2010-09-04 15:54:52.000000000 -0400
@@ -13,46 +13,46 @@
struct qdio_perf_stats {
@@ -28032,9 +28255,9 @@ diff -urNp linux-2.6.32.21/drivers/s390/cio/qdio_perf.h linux-2.6.32.21/drivers/
}
int qdio_setup_perf_stats(void);
-diff -urNp linux-2.6.32.21/drivers/scsi/ipr.c linux-2.6.32.21/drivers/scsi/ipr.c
---- linux-2.6.32.21/drivers/scsi/ipr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/scsi/ipr.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/scsi/ipr.c linux-2.6.32.22/drivers/scsi/ipr.c
+--- linux-2.6.32.22/drivers/scsi/ipr.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/scsi/ipr.c 2010-09-04 15:54:52.000000000 -0400
@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
return true;
}
@@ -28044,9 +28267,9 @@ diff -urNp linux-2.6.32.21/drivers/scsi/ipr.c linux-2.6.32.21/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.21/drivers/scsi/libfc/fc_exch.c linux-2.6.32.21/drivers/scsi/libfc/fc_exch.c
---- linux-2.6.32.21/drivers/scsi/libfc/fc_exch.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/scsi/libfc/fc_exch.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/scsi/libfc/fc_exch.c linux-2.6.32.22/drivers/scsi/libfc/fc_exch.c
+--- linux-2.6.32.22/drivers/scsi/libfc/fc_exch.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/scsi/libfc/fc_exch.c 2010-09-04 15:54:52.000000000 -0400
@@ -86,12 +86,12 @@ struct fc_exch_mgr {
* all together if not used XXX
*/
@@ -28168,9 +28391,9 @@ diff -urNp linux-2.6.32.21/drivers/scsi/libfc/fc_exch.c linux-2.6.32.21/drivers/
fc_frame_free(fp);
}
-diff -urNp linux-2.6.32.21/drivers/scsi/libsas/sas_ata.c linux-2.6.32.21/drivers/scsi/libsas/sas_ata.c
---- linux-2.6.32.21/drivers/scsi/libsas/sas_ata.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/scsi/libsas/sas_ata.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/scsi/libsas/sas_ata.c linux-2.6.32.22/drivers/scsi/libsas/sas_ata.c
+--- linux-2.6.32.22/drivers/scsi/libsas/sas_ata.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/scsi/libsas/sas_ata.c 2010-09-04 15:54:52.000000000 -0400
@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l
}
}
@@ -28180,9 +28403,9 @@ diff -urNp linux-2.6.32.21/drivers/scsi/libsas/sas_ata.c linux-2.6.32.21/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.21/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.21/drivers/scsi/mpt2sas/mpt2sas_debug.h
---- linux-2.6.32.21/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.22/drivers/scsi/mpt2sas/mpt2sas_debug.h
+--- linux-2.6.32.22/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-09-04 15:54:52.000000000 -0400
@@ -79,7 +79,7 @@
CMD; \
}
@@ -28192,9 +28415,9 @@ diff -urNp linux-2.6.32.21/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.21/
#endif /* CONFIG_SCSI_MPT2SAS_LOGGING */
-diff -urNp linux-2.6.32.21/drivers/scsi/scsi_logging.h linux-2.6.32.21/drivers/scsi/scsi_logging.h
---- linux-2.6.32.21/drivers/scsi/scsi_logging.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/scsi/scsi_logging.h 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/scsi/scsi_logging.h linux-2.6.32.22/drivers/scsi/scsi_logging.h
+--- linux-2.6.32.22/drivers/scsi/scsi_logging.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/scsi/scsi_logging.h 2010-09-04 15:54:52.000000000 -0400
@@ -51,7 +51,7 @@ do { \
} while (0); \
} while (0)
@@ -28204,9 +28427,9 @@ diff -urNp linux-2.6.32.21/drivers/scsi/scsi_logging.h linux-2.6.32.21/drivers/s
#endif /* CONFIG_SCSI_LOGGING */
/*
-diff -urNp linux-2.6.32.21/drivers/scsi/sg.c linux-2.6.32.21/drivers/scsi/sg.c
---- linux-2.6.32.21/drivers/scsi/sg.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/scsi/sg.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/scsi/sg.c linux-2.6.32.22/drivers/scsi/sg.c
+--- linux-2.6.32.22/drivers/scsi/sg.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/scsi/sg.c 2010-09-04 15:54:52.000000000 -0400
@@ -2292,7 +2292,7 @@ struct sg_proc_leaf {
const struct file_operations * fops;
};
@@ -28225,9 +28448,9 @@ diff -urNp linux-2.6.32.21/drivers/scsi/sg.c linux-2.6.32.21/drivers/scsi/sg.c
sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
if (!sg_proc_sgp)
-diff -urNp linux-2.6.32.21/drivers/serial/8250_pci.c linux-2.6.32.21/drivers/serial/8250_pci.c
---- linux-2.6.32.21/drivers/serial/8250_pci.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/serial/8250_pci.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/serial/8250_pci.c linux-2.6.32.22/drivers/serial/8250_pci.c
+--- linux-2.6.32.22/drivers/serial/8250_pci.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/serial/8250_pci.c 2010-09-04 15:54:52.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,
@@ -28237,9 +28460,9 @@ diff -urNp linux-2.6.32.21/drivers/serial/8250_pci.c linux-2.6.32.21/drivers/ser
};
static struct pci_driver serial_pci_driver = {
-diff -urNp linux-2.6.32.21/drivers/serial/kgdboc.c linux-2.6.32.21/drivers/serial/kgdboc.c
---- linux-2.6.32.21/drivers/serial/kgdboc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/serial/kgdboc.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/serial/kgdboc.c linux-2.6.32.22/drivers/serial/kgdboc.c
+--- linux-2.6.32.22/drivers/serial/kgdboc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/serial/kgdboc.c 2010-09-04 15:54:52.000000000 -0400
@@ -18,7 +18,7 @@
#define MAX_CONFIG_LEN 40
@@ -28258,9 +28481,9 @@ diff -urNp linux-2.6.32.21/drivers/serial/kgdboc.c linux-2.6.32.21/drivers/seria
.name = "kgdboc",
.read_char = kgdboc_get_char,
.write_char = kgdboc_put_char,
-diff -urNp linux-2.6.32.21/drivers/staging/android/binder.c linux-2.6.32.21/drivers/staging/android/binder.c
---- linux-2.6.32.21/drivers/staging/android/binder.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/android/binder.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/android/binder.c linux-2.6.32.22/drivers/staging/android/binder.c
+--- linux-2.6.32.22/drivers/staging/android/binder.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/android/binder.c 2010-09-04 15:54:52.000000000 -0400
@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a
binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
}
@@ -28270,9 +28493,9 @@ diff -urNp linux-2.6.32.21/drivers/staging/android/binder.c linux-2.6.32.21/driv
.open = binder_vma_open,
.close = binder_vma_close,
};
-diff -urNp linux-2.6.32.21/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.21/drivers/staging/b3dfg/b3dfg.c
---- linux-2.6.32.21/drivers/staging/b3dfg/b3dfg.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/b3dfg/b3dfg.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.22/drivers/staging/b3dfg/b3dfg.c
+--- linux-2.6.32.22/drivers/staging/b3dfg/b3dfg.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/b3dfg/b3dfg.c 2010-09-04 15:54:52.000000000 -0400
@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are
return VM_FAULT_NOPAGE;
}
@@ -28291,9 +28514,9 @@ diff -urNp linux-2.6.32.21/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.21/drivers
.owner = THIS_MODULE,
.open = b3dfg_open,
.release = b3dfg_release,
-diff -urNp linux-2.6.32.21/drivers/staging/comedi/comedi_fops.c linux-2.6.32.21/drivers/staging/comedi/comedi_fops.c
---- linux-2.6.32.21/drivers/staging/comedi/comedi_fops.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/comedi/comedi_fops.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/comedi/comedi_fops.c linux-2.6.32.22/drivers/staging/comedi/comedi_fops.c
+--- linux-2.6.32.22/drivers/staging/comedi/comedi_fops.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/comedi/comedi_fops.c 2010-09-04 15:54:52.000000000 -0400
@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct
mutex_unlock(&dev->mutex);
}
@@ -28303,9 +28526,9 @@ diff -urNp linux-2.6.32.21/drivers/staging/comedi/comedi_fops.c linux-2.6.32.21/
.close = comedi_unmap,
};
-diff -urNp linux-2.6.32.21/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.21/drivers/staging/dream/qdsp5/adsp_driver.c
---- linux-2.6.32.21/drivers/staging/dream/qdsp5/adsp_driver.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dream/qdsp5/adsp_driver.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.22/drivers/staging/dream/qdsp5/adsp_driver.c
+--- linux-2.6.32.22/drivers/staging/dream/qdsp5/adsp_driver.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/dream/qdsp5/adsp_driver.c 2010-09-04 15:54:52.000000000 -0400
@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi
static dev_t adsp_devno;
static struct class *adsp_class;
@@ -28315,9 +28538,9 @@ diff -urNp linux-2.6.32.21/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.21/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_aac.c
---- linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_aac.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_aac.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_aac.c
+--- linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_aac.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_aac.c 2010-09-04 15:54:52.000000000 -0400
@@ -1022,7 +1022,7 @@ done:
return rc;
}
@@ -28327,9 +28550,9 @@ diff -urNp linux-2.6.32.21/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.21/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_amrnb.c
---- linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_amrnb.c
+--- linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-09-04 15:54:52.000000000 -0400
@@ -833,7 +833,7 @@ done:
return rc;
}
@@ -28339,9 +28562,9 @@ diff -urNp linux-2.6.32.21/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.21/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_evrc.c
---- linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_evrc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_evrc.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_evrc.c
+--- linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_evrc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_evrc.c 2010-09-04 15:54:52.000000000 -0400
@@ -805,7 +805,7 @@ dma_fail:
return rc;
}
@@ -28351,9 +28574,9 @@ diff -urNp linux-2.6.32.21/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.21/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_in.c
---- linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_in.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_in.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_in.c
+--- linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_in.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_in.c 2010-09-04 15:54:52.000000000 -0400
@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino
return 0;
}
@@ -28372,9 +28595,9 @@ diff -urNp linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.2
.owner = THIS_MODULE,
.open = audpre_open,
.unlocked_ioctl = audpre_ioctl,
-diff -urNp linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_mp3.c
---- linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_mp3.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_mp3.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_mp3.c
+--- linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_mp3.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_mp3.c 2010-09-04 15:54:52.000000000 -0400
@@ -941,7 +941,7 @@ done:
return rc;
}
@@ -28384,9 +28607,9 @@ diff -urNp linux-2.6.32.21/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.21/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_out.c
---- linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_out.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_out.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_out.c
+--- linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_out.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_out.c 2010-09-04 15:54:52.000000000 -0400
@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod
return 0;
}
@@ -28405,9 +28628,9 @@ diff -urNp linux-2.6.32.21/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.21/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_qcelp.c
---- linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_qcelp.c
+--- linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-09-04 15:54:52.000000000 -0400
@@ -816,7 +816,7 @@ err:
return rc;
}
@@ -28417,9 +28640,9 @@ diff -urNp linux-2.6.32.21/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.21/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.21/drivers/staging/dream/qdsp5/snd.c
---- linux-2.6.32.21/drivers/staging/dream/qdsp5/snd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dream/qdsp5/snd.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.22/drivers/staging/dream/qdsp5/snd.c
+--- linux-2.6.32.22/drivers/staging/dream/qdsp5/snd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/dream/qdsp5/snd.c 2010-09-04 15:54:52.000000000 -0400
@@ -242,7 +242,7 @@ err:
return rc;
}
@@ -28429,9 +28652,9 @@ diff -urNp linux-2.6.32.21/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.21/dri
.owner = THIS_MODULE,
.open = snd_open,
.release = snd_release,
-diff -urNp linux-2.6.32.21/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.21/drivers/staging/dream/smd/smd_qmi.c
---- linux-2.6.32.21/drivers/staging/dream/smd/smd_qmi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dream/smd/smd_qmi.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.22/drivers/staging/dream/smd/smd_qmi.c
+--- linux-2.6.32.22/drivers/staging/dream/smd/smd_qmi.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/dream/smd/smd_qmi.c 2010-09-04 15:54:52.000000000 -0400
@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip,
return 0;
}
@@ -28441,9 +28664,9 @@ diff -urNp linux-2.6.32.21/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.21/d
.owner = THIS_MODULE,
.read = qmi_read,
.write = qmi_write,
-diff -urNp linux-2.6.32.21/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.21/drivers/staging/dream/smd/smd_rpcrouter_device.c
---- linux-2.6.32.21/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.22/drivers/staging/dream/smd/smd_rpcrouter_device.c
+--- linux-2.6.32.22/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-09-04 15:54:52.000000000 -0400
@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file
return rc;
}
@@ -28462,9 +28685,9 @@ diff -urNp linux-2.6.32.21/drivers/staging/dream/smd/smd_rpcrouter_device.c linu
.owner = THIS_MODULE,
.open = rpcrouter_open,
.release = rpcrouter_release,
-diff -urNp linux-2.6.32.21/drivers/staging/dst/dcore.c linux-2.6.32.21/drivers/staging/dst/dcore.c
---- linux-2.6.32.21/drivers/staging/dst/dcore.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dst/dcore.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/dst/dcore.c linux-2.6.32.22/drivers/staging/dst/dcore.c
+--- linux-2.6.32.22/drivers/staging/dst/dcore.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/dst/dcore.c 2010-09-04 15:54:52.000000000 -0400
@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi
return 0;
}
@@ -28483,9 +28706,9 @@ diff -urNp linux-2.6.32.21/drivers/staging/dst/dcore.c linux-2.6.32.21/drivers/s
snprintf(n->name, sizeof(n->name), "%s", ctl->name);
err = dst_node_sysfs_init(n);
-diff -urNp linux-2.6.32.21/drivers/staging/dst/trans.c linux-2.6.32.21/drivers/staging/dst/trans.c
---- linux-2.6.32.21/drivers/staging/dst/trans.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dst/trans.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/dst/trans.c linux-2.6.32.22/drivers/staging/dst/trans.c
+--- linux-2.6.32.22/drivers/staging/dst/trans.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/dst/trans.c 2010-09-04 15:54:52.000000000 -0400
@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n,
t->error = 0;
t->retries = 0;
@@ -28495,9 +28718,9 @@ diff -urNp linux-2.6.32.21/drivers/staging/dst/trans.c linux-2.6.32.21/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.21/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.21/drivers/staging/go7007/go7007-v4l2.c
---- linux-2.6.32.21/drivers/staging/go7007/go7007-v4l2.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/go7007/go7007-v4l2.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.22/drivers/staging/go7007/go7007-v4l2.c
+--- linux-2.6.32.22/drivers/staging/go7007/go7007-v4l2.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/go7007/go7007-v4l2.c 2010-09-04 15:54:52.000000000 -0400
@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are
return 0;
}
@@ -28507,9 +28730,9 @@ diff -urNp linux-2.6.32.21/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.21/
.open = go7007_vm_open,
.close = go7007_vm_close,
.fault = go7007_vm_fault,
-diff -urNp linux-2.6.32.21/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.21/drivers/staging/hv/blkvsc_drv.c
---- linux-2.6.32.21/drivers/staging/hv/blkvsc_drv.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/hv/blkvsc_drv.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.22/drivers/staging/hv/blkvsc_drv.c
+--- linux-2.6.32.22/drivers/staging/hv/blkvsc_drv.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/hv/blkvsc_drv.c 2010-09-04 15:54:52.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;
@@ -28519,9 +28742,9 @@ diff -urNp linux-2.6.32.21/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.21/drive
.owner = THIS_MODULE,
.open = blkvsc_open,
.release = blkvsc_release,
-diff -urNp linux-2.6.32.21/drivers/staging/hv/Hv.c linux-2.6.32.21/drivers/staging/hv/Hv.c
---- linux-2.6.32.21/drivers/staging/hv/Hv.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/hv/Hv.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/hv/Hv.c linux-2.6.32.22/drivers/staging/hv/Hv.c
+--- linux-2.6.32.22/drivers/staging/hv/Hv.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/hv/Hv.c 2010-09-04 15:54:52.000000000 -0400
@@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, vo
u64 outputAddress = (Output) ? virt_to_phys(Output) : 0;
u32 outputAddressHi = outputAddress >> 32;
@@ -28531,9 +28754,9 @@ diff -urNp linux-2.6.32.21/drivers/staging/hv/Hv.c linux-2.6.32.21/drivers/stagi
DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
Control, Input, Output);
-diff -urNp linux-2.6.32.21/drivers/staging/panel/panel.c linux-2.6.32.21/drivers/staging/panel/panel.c
---- linux-2.6.32.21/drivers/staging/panel/panel.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/panel/panel.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/panel/panel.c linux-2.6.32.22/drivers/staging/panel/panel.c
+--- linux-2.6.32.22/drivers/staging/panel/panel.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/panel/panel.c 2010-09-04 15:54:52.000000000 -0400
@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino
return 0;
}
@@ -28552,9 +28775,9 @@ diff -urNp linux-2.6.32.21/drivers/staging/panel/panel.c linux-2.6.32.21/drivers
.read = keypad_read, /* read */
.open = keypad_open, /* open */
.release = keypad_release, /* close */
-diff -urNp linux-2.6.32.21/drivers/staging/phison/phison.c linux-2.6.32.21/drivers/staging/phison/phison.c
---- linux-2.6.32.21/drivers/staging/phison/phison.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/phison/phison.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/phison/phison.c linux-2.6.32.22/drivers/staging/phison/phison.c
+--- linux-2.6.32.22/drivers/staging/phison/phison.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/phison/phison.c 2010-09-04 15:54:52.000000000 -0400
@@ -43,7 +43,7 @@ static struct scsi_host_template phison_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -28564,9 +28787,9 @@ diff -urNp linux-2.6.32.21/drivers/staging/phison/phison.c linux-2.6.32.21/drive
.inherits = &ata_bmdma_port_ops,
.prereset = phison_pre_reset,
};
-diff -urNp linux-2.6.32.21/drivers/staging/poch/poch.c linux-2.6.32.21/drivers/staging/poch/poch.c
---- linux-2.6.32.21/drivers/staging/poch/poch.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/poch/poch.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/poch/poch.c linux-2.6.32.22/drivers/staging/poch/poch.c
+--- linux-2.6.32.22/drivers/staging/poch/poch.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/poch/poch.c 2010-09-04 15:54:52.000000000 -0400
@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod
return 0;
}
@@ -28576,9 +28799,9 @@ diff -urNp linux-2.6.32.21/drivers/staging/poch/poch.c linux-2.6.32.21/drivers/s
.owner = THIS_MODULE,
.open = poch_open,
.release = poch_release,
-diff -urNp linux-2.6.32.21/drivers/staging/pohmelfs/inode.c linux-2.6.32.21/drivers/staging/pohmelfs/inode.c
---- linux-2.6.32.21/drivers/staging/pohmelfs/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/pohmelfs/inode.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/pohmelfs/inode.c linux-2.6.32.22/drivers/staging/pohmelfs/inode.c
+--- linux-2.6.32.22/drivers/staging/pohmelfs/inode.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/pohmelfs/inode.c 2010-09-04 15:54:52.000000000 -0400
@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su
mutex_init(&psb->mcache_lock);
psb->mcache_root = RB_ROOT;
@@ -28588,9 +28811,9 @@ diff -urNp linux-2.6.32.21/drivers/staging/pohmelfs/inode.c linux-2.6.32.21/driv
psb->trans_max_pages = 100;
-diff -urNp linux-2.6.32.21/drivers/staging/pohmelfs/mcache.c linux-2.6.32.21/drivers/staging/pohmelfs/mcache.c
---- linux-2.6.32.21/drivers/staging/pohmelfs/mcache.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/pohmelfs/mcache.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/pohmelfs/mcache.c linux-2.6.32.22/drivers/staging/pohmelfs/mcache.c
+--- linux-2.6.32.22/drivers/staging/pohmelfs/mcache.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/pohmelfs/mcache.c 2010-09-04 15:54:52.000000000 -0400
@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
m->data = data;
m->start = start;
@@ -28600,9 +28823,9 @@ diff -urNp linux-2.6.32.21/drivers/staging/pohmelfs/mcache.c linux-2.6.32.21/dri
mutex_lock(&psb->mcache_lock);
err = pohmelfs_mcache_insert(psb, m);
-diff -urNp linux-2.6.32.21/drivers/staging/pohmelfs/netfs.h linux-2.6.32.21/drivers/staging/pohmelfs/netfs.h
---- linux-2.6.32.21/drivers/staging/pohmelfs/netfs.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/pohmelfs/netfs.h 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/pohmelfs/netfs.h linux-2.6.32.22/drivers/staging/pohmelfs/netfs.h
+--- linux-2.6.32.22/drivers/staging/pohmelfs/netfs.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/pohmelfs/netfs.h 2010-09-04 15:54:52.000000000 -0400
@@ -570,7 +570,7 @@ struct pohmelfs_config;
struct pohmelfs_sb {
struct rb_root mcache_root;
@@ -28612,9 +28835,9 @@ diff -urNp linux-2.6.32.21/drivers/staging/pohmelfs/netfs.h linux-2.6.32.21/driv
unsigned long mcache_timeout;
unsigned int idx;
-diff -urNp linux-2.6.32.21/drivers/staging/sep/sep_driver.c linux-2.6.32.21/drivers/staging/sep/sep_driver.c
---- linux-2.6.32.21/drivers/staging/sep/sep_driver.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/sep/sep_driver.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/sep/sep_driver.c linux-2.6.32.22/drivers/staging/sep/sep_driver.c
+--- linux-2.6.32.22/drivers/staging/sep/sep_driver.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/sep/sep_driver.c 2010-09-04 15:54:52.000000000 -0400
@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver
static dev_t sep_devno;
@@ -28624,9 +28847,9 @@ diff -urNp linux-2.6.32.21/drivers/staging/sep/sep_driver.c linux-2.6.32.21/driv
.owner = THIS_MODULE,
.ioctl = sep_ioctl,
.poll = sep_poll,
-diff -urNp linux-2.6.32.21/drivers/staging/vme/devices/vme_user.c linux-2.6.32.21/drivers/staging/vme/devices/vme_user.c
---- linux-2.6.32.21/drivers/staging/vme/devices/vme_user.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/vme/devices/vme_user.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/staging/vme/devices/vme_user.c linux-2.6.32.22/drivers/staging/vme/devices/vme_user.c
+--- linux-2.6.32.22/drivers/staging/vme/devices/vme_user.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/staging/vme/devices/vme_user.c 2010-09-04 15:54:52.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);
@@ -28636,9 +28859,9 @@ diff -urNp linux-2.6.32.21/drivers/staging/vme/devices/vme_user.c linux-2.6.32.2
.open = vme_user_open,
.release = vme_user_release,
.read = vme_user_read,
-diff -urNp linux-2.6.32.21/drivers/uio/uio.c linux-2.6.32.21/drivers/uio/uio.c
---- linux-2.6.32.21/drivers/uio/uio.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/uio/uio.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/uio/uio.c linux-2.6.32.22/drivers/uio/uio.c
+--- linux-2.6.32.22/drivers/uio/uio.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/uio/uio.c 2010-09-04 15:54:52.000000000 -0400
@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj
return entry->show(mem, buf);
}
@@ -28657,9 +28880,9 @@ diff -urNp linux-2.6.32.21/drivers/uio/uio.c linux-2.6.32.21/drivers/uio/uio.c
.show = portio_type_show,
};
-diff -urNp linux-2.6.32.21/drivers/usb/atm/usbatm.c linux-2.6.32.21/drivers/usb/atm/usbatm.c
---- linux-2.6.32.21/drivers/usb/atm/usbatm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/atm/usbatm.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/usb/atm/usbatm.c linux-2.6.32.22/drivers/usb/atm/usbatm.c
+--- linux-2.6.32.22/drivers/usb/atm/usbatm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/usb/atm/usbatm.c 2010-09-04 15:54:52.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",
@@ -28739,21 +28962,21 @@ diff -urNp linux-2.6.32.21/drivers/usb/atm/usbatm.c linux-2.6.32.21/drivers/usb/
if (!left--) {
if (instance->disconnected)
-diff -urNp linux-2.6.32.21/drivers/usb/class/cdc-acm.c linux-2.6.32.21/drivers/usb/class/cdc-acm.c
---- linux-2.6.32.21/drivers/usb/class/cdc-acm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/class/cdc-acm.c 2010-09-04 15:54:52.000000000 -0400
-@@ -1537,7 +1537,7 @@ static struct usb_device_id acm_ids[] =
+diff -urNp linux-2.6.32.22/drivers/usb/class/cdc-acm.c linux-2.6.32.22/drivers/usb/class/cdc-acm.c
+--- linux-2.6.32.22/drivers/usb/class/cdc-acm.c 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.22/drivers/usb/class/cdc-acm.c 2010-09-20 17:32:02.000000000 -0400
+@@ -1618,7 +1618,7 @@ static struct usb_device_id acm_ids[] =
+ { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
USB_CDC_ACM_PROTO_AT_CDMA) },
- /* NOTE: COMM/ACM/0xff is likely MSFT RNDIS ... NOT a modem!! */
- { }
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
};
MODULE_DEVICE_TABLE(usb, acm_ids);
-diff -urNp linux-2.6.32.21/drivers/usb/class/cdc-wdm.c linux-2.6.32.21/drivers/usb/class/cdc-wdm.c
---- linux-2.6.32.21/drivers/usb/class/cdc-wdm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/class/cdc-wdm.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/usb/class/cdc-wdm.c linux-2.6.32.22/drivers/usb/class/cdc-wdm.c
+--- linux-2.6.32.22/drivers/usb/class/cdc-wdm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/usb/class/cdc-wdm.c 2010-09-04 15:54:52.000000000 -0400
@@ -314,7 +314,7 @@ static ssize_t wdm_write
if (r < 0)
goto outnp;
@@ -28763,9 +28986,9 @@ diff -urNp linux-2.6.32.21/drivers/usb/class/cdc-wdm.c linux-2.6.32.21/drivers/u
r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE,
&desc->flags));
else
-diff -urNp linux-2.6.32.21/drivers/usb/class/usblp.c linux-2.6.32.21/drivers/usb/class/usblp.c
---- linux-2.6.32.21/drivers/usb/class/usblp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/class/usblp.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/usb/class/usblp.c linux-2.6.32.22/drivers/usb/class/usblp.c
+--- linux-2.6.32.22/drivers/usb/class/usblp.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/usb/class/usblp.c 2010-09-04 15:54:52.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 */
@@ -28784,9 +29007,9 @@ diff -urNp linux-2.6.32.21/drivers/usb/class/usblp.c linux-2.6.32.21/drivers/usb
};
MODULE_DEVICE_TABLE (usb, usblp_ids);
-diff -urNp linux-2.6.32.21/drivers/usb/core/hcd.c linux-2.6.32.21/drivers/usb/core/hcd.c
---- linux-2.6.32.21/drivers/usb/core/hcd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/core/hcd.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/usb/core/hcd.c linux-2.6.32.22/drivers/usb/core/hcd.c
+--- linux-2.6.32.22/drivers/usb/core/hcd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/usb/core/hcd.c 2010-09-04 15:54:52.000000000 -0400
@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -28805,9 +29028,9 @@ diff -urNp linux-2.6.32.21/drivers/usb/core/hcd.c linux-2.6.32.21/drivers/usb/co
{
if (mon_ops)
-diff -urNp linux-2.6.32.21/drivers/usb/core/hcd.h linux-2.6.32.21/drivers/usb/core/hcd.h
---- linux-2.6.32.21/drivers/usb/core/hcd.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/core/hcd.h 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/usb/core/hcd.h linux-2.6.32.22/drivers/usb/core/hcd.h
+--- linux-2.6.32.22/drivers/usb/core/hcd.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/usb/core/hcd.h 2010-09-04 15:54:52.000000000 -0400
@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) {
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -28835,9 +29058,9 @@ diff -urNp linux-2.6.32.21/drivers/usb/core/hcd.h linux-2.6.32.21/drivers/usb/co
void usb_mon_deregister(void);
#else
-diff -urNp linux-2.6.32.21/drivers/usb/core/hub.c linux-2.6.32.21/drivers/usb/core/hub.c
---- linux-2.6.32.21/drivers/usb/core/hub.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/core/hub.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/usb/core/hub.c linux-2.6.32.22/drivers/usb/core/hub.c
+--- linux-2.6.32.22/drivers/usb/core/hub.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/usb/core/hub.c 2010-09-04 15:54:52.000000000 -0400
@@ -3401,7 +3401,7 @@ static struct usb_device_id hub_id_table
.bDeviceClass = USB_CLASS_HUB},
{ .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
@@ -28847,9 +29070,9 @@ diff -urNp linux-2.6.32.21/drivers/usb/core/hub.c linux-2.6.32.21/drivers/usb/co
};
MODULE_DEVICE_TABLE (usb, hub_id_table);
-diff -urNp linux-2.6.32.21/drivers/usb/core/message.c linux-2.6.32.21/drivers/usb/core/message.c
---- linux-2.6.32.21/drivers/usb/core/message.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/core/message.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/usb/core/message.c linux-2.6.32.22/drivers/usb/core/message.c
+--- linux-2.6.32.22/drivers/usb/core/message.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/usb/core/message.c 2010-09-04 15:54:52.000000000 -0400
@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device
buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
if (buf) {
@@ -28861,9 +29084,9 @@ diff -urNp linux-2.6.32.21/drivers/usb/core/message.c linux-2.6.32.21/drivers/us
if (!smallbuf)
return buf;
memcpy(smallbuf, buf, len);
-diff -urNp linux-2.6.32.21/drivers/usb/host/ehci-pci.c linux-2.6.32.21/drivers/usb/host/ehci-pci.c
---- linux-2.6.32.21/drivers/usb/host/ehci-pci.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/host/ehci-pci.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/usb/host/ehci-pci.c linux-2.6.32.22/drivers/usb/host/ehci-pci.c
+--- linux-2.6.32.22/drivers/usb/host/ehci-pci.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/usb/host/ehci-pci.c 2010-09-04 15:54:52.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,
@@ -28873,9 +29096,9 @@ diff -urNp linux-2.6.32.21/drivers/usb/host/ehci-pci.c linux-2.6.32.21/drivers/u
};
MODULE_DEVICE_TABLE(pci, pci_ids);
-diff -urNp linux-2.6.32.21/drivers/usb/host/uhci-hcd.c linux-2.6.32.21/drivers/usb/host/uhci-hcd.c
---- linux-2.6.32.21/drivers/usb/host/uhci-hcd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/host/uhci-hcd.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/usb/host/uhci-hcd.c linux-2.6.32.22/drivers/usb/host/uhci-hcd.c
+--- linux-2.6.32.22/drivers/usb/host/uhci-hcd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/usb/host/uhci-hcd.c 2010-09-04 15:54:52.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),
@@ -28885,9 +29108,9 @@ diff -urNp linux-2.6.32.21/drivers/usb/host/uhci-hcd.c linux-2.6.32.21/drivers/u
};
MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
-diff -urNp linux-2.6.32.21/drivers/usb/misc/appledisplay.c linux-2.6.32.21/drivers/usb/misc/appledisplay.c
---- linux-2.6.32.21/drivers/usb/misc/appledisplay.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/misc/appledisplay.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/usb/misc/appledisplay.c linux-2.6.32.22/drivers/usb/misc/appledisplay.c
+--- linux-2.6.32.22/drivers/usb/misc/appledisplay.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/usb/misc/appledisplay.c 2010-09-04 15:54:52.000000000 -0400
@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes
return pdata->msgdata[1];
}
@@ -28897,9 +29120,9 @@ diff -urNp linux-2.6.32.21/drivers/usb/misc/appledisplay.c linux-2.6.32.21/drive
.get_brightness = appledisplay_bl_get_brightness,
.update_status = appledisplay_bl_update_status,
};
-diff -urNp linux-2.6.32.21/drivers/usb/mon/mon_main.c linux-2.6.32.21/drivers/usb/mon/mon_main.c
---- linux-2.6.32.21/drivers/usb/mon/mon_main.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/mon/mon_main.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/usb/mon/mon_main.c linux-2.6.32.22/drivers/usb/mon/mon_main.c
+--- linux-2.6.32.22/drivers/usb/mon/mon_main.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/usb/mon/mon_main.c 2010-09-04 15:54:52.000000000 -0400
@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
/*
* Ops
@@ -28909,9 +29132,9 @@ diff -urNp linux-2.6.32.21/drivers/usb/mon/mon_main.c linux-2.6.32.21/drivers/us
.urb_submit = mon_submit,
.urb_submit_error = mon_submit_error,
.urb_complete = mon_complete,
-diff -urNp linux-2.6.32.21/drivers/usb/storage/debug.h linux-2.6.32.21/drivers/usb/storage/debug.h
---- linux-2.6.32.21/drivers/usb/storage/debug.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/storage/debug.h 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/usb/storage/debug.h linux-2.6.32.22/drivers/usb/storage/debug.h
+--- linux-2.6.32.22/drivers/usb/storage/debug.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/usb/storage/debug.h 2010-09-04 15:54:52.000000000 -0400
@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char
#define US_DEBUGPX(x...) printk( x )
#define US_DEBUG(x) x
@@ -28925,9 +29148,9 @@ diff -urNp linux-2.6.32.21/drivers/usb/storage/debug.h linux-2.6.32.21/drivers/u
#endif
#endif
-diff -urNp linux-2.6.32.21/drivers/usb/storage/usb.c linux-2.6.32.21/drivers/usb/storage/usb.c
---- linux-2.6.32.21/drivers/usb/storage/usb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/storage/usb.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/usb/storage/usb.c linux-2.6.32.22/drivers/usb/storage/usb.c
+--- linux-2.6.32.22/drivers/usb/storage/usb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/usb/storage/usb.c 2010-09-04 15:54:52.000000000 -0400
@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l
static struct us_unusual_dev us_unusual_dev_list[] = {
@@ -28937,9 +29160,9 @@ diff -urNp linux-2.6.32.21/drivers/usb/storage/usb.c linux-2.6.32.21/drivers/usb
};
#undef UNUSUAL_DEV
-diff -urNp linux-2.6.32.21/drivers/usb/storage/usual-tables.c linux-2.6.32.21/drivers/usb/storage/usual-tables.c
---- linux-2.6.32.21/drivers/usb/storage/usual-tables.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/storage/usual-tables.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/usb/storage/usual-tables.c linux-2.6.32.22/drivers/usb/storage/usual-tables.c
+--- linux-2.6.32.22/drivers/usb/storage/usual-tables.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/usb/storage/usual-tables.c 2010-09-04 15:54:52.000000000 -0400
@@ -48,7 +48,7 @@
struct usb_device_id usb_storage_usb_ids[] = {
@@ -28949,9 +29172,9 @@ diff -urNp linux-2.6.32.21/drivers/usb/storage/usual-tables.c linux-2.6.32.21/dr
};
EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
-diff -urNp linux-2.6.32.21/drivers/uwb/wlp/messages.c linux-2.6.32.21/drivers/uwb/wlp/messages.c
---- linux-2.6.32.21/drivers/uwb/wlp/messages.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/uwb/wlp/messages.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/uwb/wlp/messages.c linux-2.6.32.22/drivers/uwb/wlp/messages.c
+--- linux-2.6.32.22/drivers/uwb/wlp/messages.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/uwb/wlp/messages.c 2010-09-04 15:54:52.000000000 -0400
@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
size_t len = skb->len;
size_t used;
@@ -28961,9 +29184,9 @@ diff -urNp linux-2.6.32.21/drivers/uwb/wlp/messages.c linux-2.6.32.21/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.21/drivers/uwb/wlp/sysfs.c linux-2.6.32.21/drivers/uwb/wlp/sysfs.c
---- linux-2.6.32.21/drivers/uwb/wlp/sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/uwb/wlp/sysfs.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/uwb/wlp/sysfs.c linux-2.6.32.22/drivers/uwb/wlp/sysfs.c
+--- linux-2.6.32.22/drivers/uwb/wlp/sysfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/uwb/wlp/sysfs.c 2010-09-04 15:54:52.000000000 -0400
@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec
return ret;
}
@@ -28974,9 +29197,9 @@ diff -urNp linux-2.6.32.21/drivers/uwb/wlp/sysfs.c linux-2.6.32.21/drivers/uwb/w
.show = wlp_wss_attr_show,
.store = wlp_wss_attr_store,
};
-diff -urNp linux-2.6.32.21/drivers/video/atmel_lcdfb.c linux-2.6.32.21/drivers/video/atmel_lcdfb.c
---- linux-2.6.32.21/drivers/video/atmel_lcdfb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/atmel_lcdfb.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/atmel_lcdfb.c linux-2.6.32.22/drivers/video/atmel_lcdfb.c
+--- linux-2.6.32.22/drivers/video/atmel_lcdfb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/atmel_lcdfb.c 2010-09-04 15:54:52.000000000 -0400
@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc
return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
}
@@ -28986,9 +29209,9 @@ diff -urNp linux-2.6.32.21/drivers/video/atmel_lcdfb.c linux-2.6.32.21/drivers/v
.update_status = atmel_bl_update_status,
.get_brightness = atmel_bl_get_brightness,
};
-diff -urNp linux-2.6.32.21/drivers/video/aty/aty128fb.c linux-2.6.32.21/drivers/video/aty/aty128fb.c
---- linux-2.6.32.21/drivers/video/aty/aty128fb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/aty/aty128fb.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/aty/aty128fb.c linux-2.6.32.22/drivers/video/aty/aty128fb.c
+--- linux-2.6.32.22/drivers/video/aty/aty128fb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/aty/aty128fb.c 2010-09-04 15:54:52.000000000 -0400
@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru
return bd->props.brightness;
}
@@ -28998,9 +29221,9 @@ diff -urNp linux-2.6.32.21/drivers/video/aty/aty128fb.c linux-2.6.32.21/drivers/
.get_brightness = aty128_bl_get_brightness,
.update_status = aty128_bl_update_status,
};
-diff -urNp linux-2.6.32.21/drivers/video/aty/atyfb_base.c linux-2.6.32.21/drivers/video/aty/atyfb_base.c
---- linux-2.6.32.21/drivers/video/aty/atyfb_base.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/aty/atyfb_base.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/aty/atyfb_base.c linux-2.6.32.22/drivers/video/aty/atyfb_base.c
+--- linux-2.6.32.22/drivers/video/aty/atyfb_base.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/aty/atyfb_base.c 2010-09-04 15:54:52.000000000 -0400
@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct
return bd->props.brightness;
}
@@ -29010,9 +29233,9 @@ diff -urNp linux-2.6.32.21/drivers/video/aty/atyfb_base.c linux-2.6.32.21/driver
.get_brightness = aty_bl_get_brightness,
.update_status = aty_bl_update_status,
};
-diff -urNp linux-2.6.32.21/drivers/video/aty/radeon_backlight.c linux-2.6.32.21/drivers/video/aty/radeon_backlight.c
---- linux-2.6.32.21/drivers/video/aty/radeon_backlight.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/aty/radeon_backlight.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/aty/radeon_backlight.c linux-2.6.32.22/drivers/video/aty/radeon_backlight.c
+--- linux-2.6.32.22/drivers/video/aty/radeon_backlight.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/aty/radeon_backlight.c 2010-09-04 15:54:52.000000000 -0400
@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru
return bd->props.brightness;
}
@@ -29022,9 +29245,9 @@ diff -urNp linux-2.6.32.21/drivers/video/aty/radeon_backlight.c linux-2.6.32.21/
.get_brightness = radeon_bl_get_brightness,
.update_status = radeon_bl_update_status,
};
-diff -urNp linux-2.6.32.21/drivers/video/backlight/adp5520_bl.c linux-2.6.32.21/drivers/video/backlight/adp5520_bl.c
---- linux-2.6.32.21/drivers/video/backlight/adp5520_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/adp5520_bl.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/backlight/adp5520_bl.c linux-2.6.32.22/drivers/video/backlight/adp5520_bl.c
+--- linux-2.6.32.22/drivers/video/backlight/adp5520_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/backlight/adp5520_bl.c 2010-09-04 15:54:52.000000000 -0400
@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str
return error ? data->current_brightness : reg_val;
}
@@ -29034,9 +29257,9 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/adp5520_bl.c linux-2.6.32.21/
.update_status = adp5520_bl_update_status,
.get_brightness = adp5520_bl_get_brightness,
};
-diff -urNp linux-2.6.32.21/drivers/video/backlight/adx_bl.c linux-2.6.32.21/drivers/video/backlight/adx_bl.c
---- linux-2.6.32.21/drivers/video/backlight/adx_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/adx_bl.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/backlight/adx_bl.c linux-2.6.32.22/drivers/video/backlight/adx_bl.c
+--- linux-2.6.32.22/drivers/video/backlight/adx_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/backlight/adx_bl.c 2010-09-04 15:54:52.000000000 -0400
@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct
return 1;
}
@@ -29046,9 +29269,9 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/adx_bl.c linux-2.6.32.21/driv
.options = 0,
.update_status = adx_backlight_update_status,
.get_brightness = adx_backlight_get_brightness,
-diff -urNp linux-2.6.32.21/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.21/drivers/video/backlight/atmel-pwm-bl.c
---- linux-2.6.32.21/drivers/video/backlight/atmel-pwm-bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/atmel-pwm-bl.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.22/drivers/video/backlight/atmel-pwm-bl.c
+--- linux-2.6.32.22/drivers/video/backlight/atmel-pwm-bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/backlight/atmel-pwm-bl.c 2010-09-04 15:54:52.000000000 -0400
@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct
return pwm_channel_enable(&pwmbl->pwmc);
}
@@ -29058,9 +29281,9 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.2
.get_brightness = atmel_pwm_bl_get_intensity,
.update_status = atmel_pwm_bl_set_intensity,
};
-diff -urNp linux-2.6.32.21/drivers/video/backlight/backlight.c linux-2.6.32.21/drivers/video/backlight/backlight.c
---- linux-2.6.32.21/drivers/video/backlight/backlight.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/backlight.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/backlight/backlight.c linux-2.6.32.22/drivers/video/backlight/backlight.c
+--- linux-2.6.32.22/drivers/video/backlight/backlight.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/backlight/backlight.c 2010-09-04 15:54:52.000000000 -0400
@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update);
* ERR_PTR() or a pointer to the newly allocated device.
*/
@@ -29070,9 +29293,9 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/backlight.c linux-2.6.32.21/d
{
struct backlight_device *new_bd;
int rc;
-diff -urNp linux-2.6.32.21/drivers/video/backlight/corgi_lcd.c linux-2.6.32.21/drivers/video/backlight/corgi_lcd.c
---- linux-2.6.32.21/drivers/video/backlight/corgi_lcd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/corgi_lcd.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/backlight/corgi_lcd.c linux-2.6.32.22/drivers/video/backlight/corgi_lcd.c
+--- linux-2.6.32.22/drivers/video/backlight/corgi_lcd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/backlight/corgi_lcd.c 2010-09-04 15:54:52.000000000 -0400
@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit
}
EXPORT_SYMBOL(corgi_lcd_limit_intensity);
@@ -29082,9 +29305,9 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/corgi_lcd.c linux-2.6.32.21/d
.get_brightness = corgi_bl_get_intensity,
.update_status = corgi_bl_update_status,
};
-diff -urNp linux-2.6.32.21/drivers/video/backlight/cr_bllcd.c linux-2.6.32.21/drivers/video/backlight/cr_bllcd.c
---- linux-2.6.32.21/drivers/video/backlight/cr_bllcd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/cr_bllcd.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/backlight/cr_bllcd.c linux-2.6.32.22/drivers/video/backlight/cr_bllcd.c
+--- linux-2.6.32.22/drivers/video/backlight/cr_bllcd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/backlight/cr_bllcd.c 2010-09-04 15:54:52.000000000 -0400
@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st
return intensity;
}
@@ -29094,9 +29317,9 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/cr_bllcd.c linux-2.6.32.21/dr
.get_brightness = cr_backlight_get_intensity,
.update_status = cr_backlight_set_intensity,
};
-diff -urNp linux-2.6.32.21/drivers/video/backlight/da903x_bl.c linux-2.6.32.21/drivers/video/backlight/da903x_bl.c
---- linux-2.6.32.21/drivers/video/backlight/da903x_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/da903x_bl.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/backlight/da903x_bl.c linux-2.6.32.22/drivers/video/backlight/da903x_bl.c
+--- linux-2.6.32.22/drivers/video/backlight/da903x_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/backlight/da903x_bl.c 2010-09-04 15:54:52.000000000 -0400
@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne
return data->current_brightness;
}
@@ -29106,9 +29329,9 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/da903x_bl.c linux-2.6.32.21/d
.update_status = da903x_backlight_update_status,
.get_brightness = da903x_backlight_get_brightness,
};
-diff -urNp linux-2.6.32.21/drivers/video/backlight/generic_bl.c linux-2.6.32.21/drivers/video/backlight/generic_bl.c
---- linux-2.6.32.21/drivers/video/backlight/generic_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/generic_bl.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/backlight/generic_bl.c linux-2.6.32.22/drivers/video/backlight/generic_bl.c
+--- linux-2.6.32.22/drivers/video/backlight/generic_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/backlight/generic_bl.c 2010-09-04 15:54:52.000000000 -0400
@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit)
}
EXPORT_SYMBOL(corgibl_limit_intensity);
@@ -29118,9 +29341,9 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/generic_bl.c linux-2.6.32.21/
.options = BL_CORE_SUSPENDRESUME,
.get_brightness = genericbl_get_intensity,
.update_status = genericbl_send_intensity,
-diff -urNp linux-2.6.32.21/drivers/video/backlight/hp680_bl.c linux-2.6.32.21/drivers/video/backlight/hp680_bl.c
---- linux-2.6.32.21/drivers/video/backlight/hp680_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/hp680_bl.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/backlight/hp680_bl.c linux-2.6.32.22/drivers/video/backlight/hp680_bl.c
+--- linux-2.6.32.22/drivers/video/backlight/hp680_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/backlight/hp680_bl.c 2010-09-04 15:54:52.000000000 -0400
@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct
return current_intensity;
}
@@ -29130,9 +29353,9 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/hp680_bl.c linux-2.6.32.21/dr
.get_brightness = hp680bl_get_intensity,
.update_status = hp680bl_set_intensity,
};
-diff -urNp linux-2.6.32.21/drivers/video/backlight/jornada720_bl.c linux-2.6.32.21/drivers/video/backlight/jornada720_bl.c
---- linux-2.6.32.21/drivers/video/backlight/jornada720_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/jornada720_bl.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/backlight/jornada720_bl.c linux-2.6.32.22/drivers/video/backlight/jornada720_bl.c
+--- linux-2.6.32.22/drivers/video/backlight/jornada720_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/backlight/jornada720_bl.c 2010-09-04 15:54:52.000000000 -0400
@@ -93,7 +93,7 @@ out:
return ret;
}
@@ -29142,9 +29365,9 @@ diff -urNp linux-2.6.32.21/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.21/drivers/video/backlight/kb3886_bl.c linux-2.6.32.21/drivers/video/backlight/kb3886_bl.c
---- linux-2.6.32.21/drivers/video/backlight/kb3886_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/kb3886_bl.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/backlight/kb3886_bl.c linux-2.6.32.22/drivers/video/backlight/kb3886_bl.c
+--- linux-2.6.32.22/drivers/video/backlight/kb3886_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/backlight/kb3886_bl.c 2010-09-04 15:54:52.000000000 -0400
@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct
return kb3886bl_intensity;
}
@@ -29154,9 +29377,9 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/kb3886_bl.c linux-2.6.32.21/d
.get_brightness = kb3886bl_get_intensity,
.update_status = kb3886bl_send_intensity,
};
-diff -urNp linux-2.6.32.21/drivers/video/backlight/locomolcd.c linux-2.6.32.21/drivers/video/backlight/locomolcd.c
---- linux-2.6.32.21/drivers/video/backlight/locomolcd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/locomolcd.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/backlight/locomolcd.c linux-2.6.32.22/drivers/video/backlight/locomolcd.c
+--- linux-2.6.32.22/drivers/video/backlight/locomolcd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/backlight/locomolcd.c 2010-09-04 15:54:52.000000000 -0400
@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc
return current_intensity;
}
@@ -29166,9 +29389,9 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/locomolcd.c linux-2.6.32.21/d
.get_brightness = locomolcd_get_intensity,
.update_status = locomolcd_set_intensity,
};
-diff -urNp linux-2.6.32.21/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.21/drivers/video/backlight/mbp_nvidia_bl.c
---- linux-2.6.32.21/drivers/video/backlight/mbp_nvidia_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/mbp_nvidia_bl.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.22/drivers/video/backlight/mbp_nvidia_bl.c
+--- linux-2.6.32.22/drivers/video/backlight/mbp_nvidia_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/backlight/mbp_nvidia_bl.c 2010-09-04 15:54:52.000000000 -0400
@@ -33,7 +33,7 @@ struct dmi_match_data {
unsigned long iostart;
unsigned long iolen;
@@ -29178,9 +29401,9 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.
};
/* Module parameters. */
-diff -urNp linux-2.6.32.21/drivers/video/backlight/omap1_bl.c linux-2.6.32.21/drivers/video/backlight/omap1_bl.c
---- linux-2.6.32.21/drivers/video/backlight/omap1_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/omap1_bl.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/backlight/omap1_bl.c linux-2.6.32.22/drivers/video/backlight/omap1_bl.c
+--- linux-2.6.32.22/drivers/video/backlight/omap1_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/backlight/omap1_bl.c 2010-09-04 15:54:52.000000000 -0400
@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b
return bl->current_intensity;
}
@@ -29190,9 +29413,9 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/omap1_bl.c linux-2.6.32.21/dr
.get_brightness = omapbl_get_intensity,
.update_status = omapbl_update_status,
};
-diff -urNp linux-2.6.32.21/drivers/video/backlight/progear_bl.c linux-2.6.32.21/drivers/video/backlight/progear_bl.c
---- linux-2.6.32.21/drivers/video/backlight/progear_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/progear_bl.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/backlight/progear_bl.c linux-2.6.32.22/drivers/video/backlight/progear_bl.c
+--- linux-2.6.32.22/drivers/video/backlight/progear_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/backlight/progear_bl.c 2010-09-04 15:54:52.000000000 -0400
@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc
return intensity - HW_LEVEL_MIN;
}
@@ -29202,9 +29425,9 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/progear_bl.c linux-2.6.32.21/
.get_brightness = progearbl_get_intensity,
.update_status = progearbl_set_intensity,
};
-diff -urNp linux-2.6.32.21/drivers/video/backlight/pwm_bl.c linux-2.6.32.21/drivers/video/backlight/pwm_bl.c
---- linux-2.6.32.21/drivers/video/backlight/pwm_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/pwm_bl.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/backlight/pwm_bl.c linux-2.6.32.22/drivers/video/backlight/pwm_bl.c
+--- linux-2.6.32.22/drivers/video/backlight/pwm_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/backlight/pwm_bl.c 2010-09-04 15:54:52.000000000 -0400
@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness(
return bl->props.brightness;
}
@@ -29214,9 +29437,9 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/pwm_bl.c linux-2.6.32.21/driv
.update_status = pwm_backlight_update_status,
.get_brightness = pwm_backlight_get_brightness,
};
-diff -urNp linux-2.6.32.21/drivers/video/backlight/tosa_bl.c linux-2.6.32.21/drivers/video/backlight/tosa_bl.c
---- linux-2.6.32.21/drivers/video/backlight/tosa_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/tosa_bl.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/backlight/tosa_bl.c linux-2.6.32.22/drivers/video/backlight/tosa_bl.c
+--- linux-2.6.32.22/drivers/video/backlight/tosa_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/backlight/tosa_bl.c 2010-09-04 15:54:52.000000000 -0400
@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct
return props->brightness;
}
@@ -29226,9 +29449,9 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/tosa_bl.c linux-2.6.32.21/dri
.get_brightness = tosa_bl_get_brightness,
.update_status = tosa_bl_update_status,
};
-diff -urNp linux-2.6.32.21/drivers/video/backlight/wm831x_bl.c linux-2.6.32.21/drivers/video/backlight/wm831x_bl.c
---- linux-2.6.32.21/drivers/video/backlight/wm831x_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/wm831x_bl.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/backlight/wm831x_bl.c linux-2.6.32.22/drivers/video/backlight/wm831x_bl.c
+--- linux-2.6.32.22/drivers/video/backlight/wm831x_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/backlight/wm831x_bl.c 2010-09-04 15:54:52.000000000 -0400
@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne
return data->current_brightness;
}
@@ -29238,9 +29461,9 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/wm831x_bl.c linux-2.6.32.21/d
.options = BL_CORE_SUSPENDRESUME,
.update_status = wm831x_backlight_update_status,
.get_brightness = wm831x_backlight_get_brightness,
-diff -urNp linux-2.6.32.21/drivers/video/bf54x-lq043fb.c linux-2.6.32.21/drivers/video/bf54x-lq043fb.c
---- linux-2.6.32.21/drivers/video/bf54x-lq043fb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/bf54x-lq043fb.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/bf54x-lq043fb.c linux-2.6.32.22/drivers/video/bf54x-lq043fb.c
+--- linux-2.6.32.22/drivers/video/bf54x-lq043fb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/bf54x-lq043fb.c 2010-09-04 15:54:52.000000000 -0400
@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back
return 0;
}
@@ -29250,9 +29473,9 @@ diff -urNp linux-2.6.32.21/drivers/video/bf54x-lq043fb.c linux-2.6.32.21/drivers
.get_brightness = bl_get_brightness,
};
-diff -urNp linux-2.6.32.21/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.21/drivers/video/bfin-t350mcqb-fb.c
---- linux-2.6.32.21/drivers/video/bfin-t350mcqb-fb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/bfin-t350mcqb-fb.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.22/drivers/video/bfin-t350mcqb-fb.c
+--- linux-2.6.32.22/drivers/video/bfin-t350mcqb-fb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/bfin-t350mcqb-fb.c 2010-09-04 15:54:52.000000000 -0400
@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back
return 0;
}
@@ -29262,9 +29485,9 @@ diff -urNp linux-2.6.32.21/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.21/driv
.get_brightness = bl_get_brightness,
};
-diff -urNp linux-2.6.32.21/drivers/video/fbcmap.c linux-2.6.32.21/drivers/video/fbcmap.c
---- linux-2.6.32.21/drivers/video/fbcmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/fbcmap.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/fbcmap.c linux-2.6.32.22/drivers/video/fbcmap.c
+--- linux-2.6.32.22/drivers/video/fbcmap.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/fbcmap.c 2010-09-04 15:54:52.000000000 -0400
@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user
rc = -ENODEV;
goto out;
@@ -29275,9 +29498,9 @@ diff -urNp linux-2.6.32.21/drivers/video/fbcmap.c linux-2.6.32.21/drivers/video/
rc = -EINVAL;
goto out1;
}
-diff -urNp linux-2.6.32.21/drivers/video/fbmem.c linux-2.6.32.21/drivers/video/fbmem.c
---- linux-2.6.32.21/drivers/video/fbmem.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/fbmem.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/fbmem.c linux-2.6.32.22/drivers/video/fbmem.c
+--- linux-2.6.32.22/drivers/video/fbmem.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/fbmem.c 2010-09-04 15:54:52.000000000 -0400
@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
image->dx += image->width + 8;
}
@@ -29305,9 +29528,9 @@ diff -urNp linux-2.6.32.21/drivers/video/fbmem.c linux-2.6.32.21/drivers/video/f
return -EINVAL;
if (!registered_fb[con2fb.framebuffer])
request_module("fb%d", con2fb.framebuffer);
-diff -urNp linux-2.6.32.21/drivers/video/fbmon.c linux-2.6.32.21/drivers/video/fbmon.c
---- linux-2.6.32.21/drivers/video/fbmon.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/fbmon.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/fbmon.c linux-2.6.32.22/drivers/video/fbmon.c
+--- linux-2.6.32.22/drivers/video/fbmon.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/fbmon.c 2010-09-04 15:54:52.000000000 -0400
@@ -45,7 +45,7 @@
#ifdef DEBUG
#define DPRINTK(fmt, args...) printk(fmt,## args)
@@ -29317,9 +29540,9 @@ diff -urNp linux-2.6.32.21/drivers/video/fbmon.c linux-2.6.32.21/drivers/video/f
#endif
#define FBMON_FIX_HEADER 1
-diff -urNp linux-2.6.32.21/drivers/video/i810/i810_accel.c linux-2.6.32.21/drivers/video/i810/i810_accel.c
---- linux-2.6.32.21/drivers/video/i810/i810_accel.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/i810/i810_accel.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/i810/i810_accel.c linux-2.6.32.22/drivers/video/i810/i810_accel.c
+--- linux-2.6.32.22/drivers/video/i810/i810_accel.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/i810/i810_accel.c 2010-09-04 15:54:52.000000000 -0400
@@ -73,6 +73,7 @@ static inline int wait_for_space(struct
}
}
@@ -29328,9 +29551,9 @@ diff -urNp linux-2.6.32.21/drivers/video/i810/i810_accel.c linux-2.6.32.21/drive
i810_report_error(mmio);
par->dev_flags |= LOCKUP;
info->pixmap.scan_align = 1;
-diff -urNp linux-2.6.32.21/drivers/video/i810/i810_main.c linux-2.6.32.21/drivers/video/i810/i810_main.c
---- linux-2.6.32.21/drivers/video/i810/i810_main.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/i810/i810_main.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/i810/i810_main.c linux-2.6.32.22/drivers/video/i810/i810_main.c
+--- linux-2.6.32.22/drivers/video/i810/i810_main.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/i810/i810_main.c 2010-09-04 15:54:52.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,
@@ -29340,9 +29563,9 @@ diff -urNp linux-2.6.32.21/drivers/video/i810/i810_main.c linux-2.6.32.21/driver
};
static struct pci_driver i810fb_driver = {
-diff -urNp linux-2.6.32.21/drivers/video/modedb.c linux-2.6.32.21/drivers/video/modedb.c
---- linux-2.6.32.21/drivers/video/modedb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/modedb.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/modedb.c linux-2.6.32.22/drivers/video/modedb.c
+--- linux-2.6.32.22/drivers/video/modedb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/modedb.c 2010-09-04 15:54:52.000000000 -0400
@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[
{
/* 640x400 @ 70 Hz, 31.5 kHz hsync */
@@ -29643,9 +29866,9 @@ diff -urNp linux-2.6.32.21/drivers/video/modedb.c linux-2.6.32.21/drivers/video/
},
};
-diff -urNp linux-2.6.32.21/drivers/video/nvidia/nv_backlight.c linux-2.6.32.21/drivers/video/nvidia/nv_backlight.c
---- linux-2.6.32.21/drivers/video/nvidia/nv_backlight.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/nvidia/nv_backlight.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/nvidia/nv_backlight.c linux-2.6.32.22/drivers/video/nvidia/nv_backlight.c
+--- linux-2.6.32.22/drivers/video/nvidia/nv_backlight.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/nvidia/nv_backlight.c 2010-09-04 15:54:52.000000000 -0400
@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
return bd->props.brightness;
}
@@ -29655,9 +29878,9 @@ diff -urNp linux-2.6.32.21/drivers/video/nvidia/nv_backlight.c linux-2.6.32.21/d
.get_brightness = nvidia_bl_get_brightness,
.update_status = nvidia_bl_update_status,
};
-diff -urNp linux-2.6.32.21/drivers/video/riva/fbdev.c linux-2.6.32.21/drivers/video/riva/fbdev.c
---- linux-2.6.32.21/drivers/video/riva/fbdev.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/riva/fbdev.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/riva/fbdev.c linux-2.6.32.22/drivers/video/riva/fbdev.c
+--- linux-2.6.32.22/drivers/video/riva/fbdev.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/riva/fbdev.c 2010-09-04 15:54:52.000000000 -0400
@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
return bd->props.brightness;
}
@@ -29667,9 +29890,9 @@ diff -urNp linux-2.6.32.21/drivers/video/riva/fbdev.c linux-2.6.32.21/drivers/vi
.get_brightness = riva_bl_get_brightness,
.update_status = riva_bl_update_status,
};
-diff -urNp linux-2.6.32.21/drivers/video/uvesafb.c linux-2.6.32.21/drivers/video/uvesafb.c
---- linux-2.6.32.21/drivers/video/uvesafb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/uvesafb.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/uvesafb.c linux-2.6.32.22/drivers/video/uvesafb.c
+--- linux-2.6.32.22/drivers/video/uvesafb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/uvesafb.c 2010-09-04 15:54:52.000000000 -0400
@@ -18,6 +18,7 @@
#include <linux/fb.h>
#include <linux/io.h>
@@ -29745,9 +29968,9 @@ diff -urNp linux-2.6.32.21/drivers/video/uvesafb.c linux-2.6.32.21/drivers/video
}
framebuffer_release(info);
-diff -urNp linux-2.6.32.21/drivers/video/vesafb.c linux-2.6.32.21/drivers/video/vesafb.c
---- linux-2.6.32.21/drivers/video/vesafb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/vesafb.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/video/vesafb.c linux-2.6.32.22/drivers/video/vesafb.c
+--- linux-2.6.32.22/drivers/video/vesafb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/video/vesafb.c 2010-09-04 15:54:52.000000000 -0400
@@ -9,6 +9,7 @@
*/
@@ -29851,9 +30074,68 @@ diff -urNp linux-2.6.32.21/drivers/video/vesafb.c linux-2.6.32.21/drivers/video/
if (info->screen_base)
iounmap(info->screen_base);
framebuffer_release(info);
-diff -urNp linux-2.6.32.21/drivers/xen/sys-hypervisor.c linux-2.6.32.21/drivers/xen/sys-hypervisor.c
---- linux-2.6.32.21/drivers/xen/sys-hypervisor.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/xen/sys-hypervisor.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/drivers/xen/events.c linux-2.6.32.22/drivers/xen/events.c
+--- linux-2.6.32.22/drivers/xen/events.c 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.22/drivers/xen/events.c 2010-09-21 21:18:38.000000000 -0400
+@@ -106,7 +106,6 @@ static inline unsigned long *cpu_evtchn_
+ #define VALID_EVTCHN(chn) ((chn) != 0)
+
+ static struct irq_chip xen_dynamic_chip;
+-static struct irq_chip xen_percpu_chip;
+
+ /* Constructor for packed IRQ information. */
+ static struct irq_info mk_unbound_info(void)
+@@ -363,7 +362,7 @@ int bind_evtchn_to_irq(unsigned int evtc
+ irq = find_unbound_irq();
+
+ set_irq_chip_and_handler_name(irq, &xen_dynamic_chip,
+- handle_edge_irq, "event");
++ handle_level_irq, "event");
+
+ evtchn_to_irq[evtchn] = irq;
+ irq_info[irq] = mk_evtchn_info(evtchn);
+@@ -389,8 +388,8 @@ static int bind_ipi_to_irq(unsigned int
+ if (irq < 0)
+ goto out;
+
+- set_irq_chip_and_handler_name(irq, &xen_percpu_chip,
+- handle_percpu_irq, "ipi");
++ set_irq_chip_and_handler_name(irq, &xen_dynamic_chip,
++ handle_level_irq, "ipi");
+
+ bind_ipi.vcpu = cpu;
+ if (HYPERVISOR_event_channel_op(EVTCHNOP_bind_ipi,
+@@ -430,8 +429,8 @@ static int bind_virq_to_irq(unsigned int
+
+ irq = find_unbound_irq();
+
+- set_irq_chip_and_handler_name(irq, &xen_percpu_chip,
+- handle_percpu_irq, "virq");
++ set_irq_chip_and_handler_name(irq, &xen_dynamic_chip,
++ handle_level_irq, "virq");
+
+ evtchn_to_irq[evtchn] = irq;
+ irq_info[irq] = mk_virq_info(evtchn, virq);
+@@ -930,16 +929,6 @@ static struct irq_chip xen_dynamic_chip
+ .retrigger = retrigger_dynirq,
+ };
+
+-static struct irq_chip en_percpu_chip __read_mostly = {
+- .name = "xen-percpu",
+-
+- .disable = disable_dynirq,
+- .mask = disable_dynirq,
+- .unmask = enable_dynirq,
+-
+- .ack = ack_dynirq,
+-};
+-
+ void __init xen_init_IRQ(void)
+ {
+ int i;
+diff -urNp linux-2.6.32.22/drivers/xen/sys-hypervisor.c linux-2.6.32.22/drivers/xen/sys-hypervisor.c
+--- linux-2.6.32.22/drivers/xen/sys-hypervisor.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/drivers/xen/sys-hypervisor.c 2010-09-04 15:54:52.000000000 -0400
@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko
return 0;
}
@@ -29863,9 +30145,9 @@ diff -urNp linux-2.6.32.21/drivers/xen/sys-hypervisor.c linux-2.6.32.21/drivers/
.show = hyp_sysfs_show,
.store = hyp_sysfs_store,
};
-diff -urNp linux-2.6.32.21/fs/9p/vfs_inode.c linux-2.6.32.21/fs/9p/vfs_inode.c
---- linux-2.6.32.21/fs/9p/vfs_inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/9p/vfs_inode.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/fs/9p/vfs_inode.c linux-2.6.32.22/fs/9p/vfs_inode.c
+--- linux-2.6.32.22/fs/9p/vfs_inode.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/fs/9p/vfs_inode.c 2010-09-04 15:54:52.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)
@@ -29875,9 +30157,9 @@ diff -urNp linux-2.6.32.21/fs/9p/vfs_inode.c linux-2.6.32.21/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.21/fs/aio.c linux-2.6.32.21/fs/aio.c
---- linux-2.6.32.21/fs/aio.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/aio.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/fs/aio.c linux-2.6.32.22/fs/aio.c
+--- linux-2.6.32.22/fs/aio.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/fs/aio.c 2010-09-20 17:25:35.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;
@@ -29887,9 +30169,19 @@ diff -urNp linux-2.6.32.21/fs/aio.c linux-2.6.32.21/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.21/fs/attr.c linux-2.6.32.21/fs/attr.c
---- linux-2.6.32.21/fs/attr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/attr.c 2010-09-04 15:54:52.000000000 -0400
+@@ -1639,6 +1639,9 @@ SYSCALL_DEFINE3(io_submit, aio_context_t
+ if (unlikely(nr < 0))
+ return -EINVAL;
+
++ if (unlikely(nr > LONG_MAX/sizeof(*iocbpp)))
++ nr = LONG_MAX/sizeof(*iocbpp);
++
+ if (unlikely(!access_ok(VERIFY_READ, iocbpp, (nr*sizeof(*iocbpp)))))
+ return -EFAULT;
+
+diff -urNp linux-2.6.32.22/fs/attr.c linux-2.6.32.22/fs/attr.c
+--- linux-2.6.32.22/fs/attr.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/fs/attr.c 2010-09-04 15:54:52.000000000 -0400
@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode
unsigned long limit;
@@ -29898,9 +30190,9 @@ diff -urNp linux-2.6.32.21/fs/attr.c linux-2.6.32.21/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.21/fs/autofs/root.c linux-2.6.32.21/fs/autofs/root.c
---- linux-2.6.32.21/fs/autofs/root.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/autofs/root.c 2010-09-04 15:54:52.000000000 -0400
+diff -urNp linux-2.6.32.22/fs/autofs/root.c linux-2.6.32.22/fs/autofs/root.c
+--- linux-2.6.32.22/fs/autofs/root.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.22/fs/autofs/root.c 2010-09-04 15:54:52.000000000 -0400
@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in
set_bit(n,sbi->symlink_bitmap);
sl = &sbi->symlink[n];
@@ -29911,9 +30203,9 @@ diff -ur